Uplink extention: nukie edition (#18011)

* added and rebalanced some uplink stuff

Signed-off-by: vanx <vanx#5477>

* typo

Signed-off-by: vanx <vanx#5477>

* added combat medipen to the meds bundle

Signed-off-by: vanx <vanx#5477>

* raised healing prices a bit

Signed-off-by: vanx <vanx#5477>

* mosin ammo box finally
Signed-off-by: vanx <vanx#5477>

* implants price swap + buff

Signed-off-by: vanx <vanx#5477>

* more meds for less yay

Signed-off-by: vanx <vanx#5477>

* free samples
Signed-off-by: vanx <#vanxxxx>

* microbombs for everyone

Signed-off-by: vanx <#vanxxxx>

* grenadier rig cheapening

Signed-off-by: vanx <#vanxxxx>

* merge conflict

Signed-off-by: vanx <#vanxxxx>

* More meds fuck it

* locale
Signed-off-by: vanx <#vanxxxx>

---------

Signed-off-by: vanx <vanx#5477>
Signed-off-by: vanx <#vanxxxx>
Co-authored-by: vanx <vanx#5477>
Co-authored-by: vanx <#vanxxxx>

Resources/Locale/en-US/store/uplink-catalog.ftl

@@ -45,6 +45,9 @@ uplink-c4-desc = Use it to breach walls, airlocks or sabotage equipment. It can
 uplink-c4-bundle-name = C-4 bundle
 uplink-c4-bundle-desc = Because sometimes quantity is quality. Contains 8 C-4 plastic explosives.
 
+uplink-grenadier-rig-name = grenadier chest rig
+uplink-grenadier-rig-desc = All you need for a loud party: 4 explosive grenades, 2 EMP grenades and 2 minibombs in a chest rig.
+
 uplink-emp-grenade-name = EMP Grenade
 uplink-emp-grenade-desc = A grenade designed to disrupt electronic systems. Useful for disrupting communications, security's energy weapons, and APCs when you're in a tight spot."
 
@@ -61,7 +64,7 @@ uplink-pistol-magazine-caseless-desc = Pistol magazine with 10 catridges. Compat
 uplink-speedloader-magnum-name = Speedloader (.45 magnum)
 uplink-speedloader-magnu-desc = Revolver speedloader with 6 catridges. Compatible with Python.
 
-uplink-mosin-ammo-name = Box of .30 rifle magazines
+uplink-mosin-ammo-name = ammunition box (.30 rifle)
 uplink-mosin-ammo-desc = A box of cartridges for the surplus rifle.
 
 # Utility
@@ -115,6 +118,9 @@ uplink-dna-scrambler-implanter-desc = A single use implant that can be activated
 uplink-emp-implanter-name = EMP Implanter
 uplink-emp-implanter-desc = Detonates a small EMP pulse on activation that drains nearby electronics of their power, can be used three times before the internal battery runs out.
 
+uplink-micro-bomb-implanter-name = Micro Bomb Implanter
+uplink-micro-bomb-implanter-desc = Explode on death or manual activation with this implant. Destroys the body with all equipment.
+
 uplink-macro-bomb-implanter-name = Macro Bomb Implanter
 uplink-macro-bomb-implanter-desc = Inject this and on death you'll create a large explosion. Huge team casualty cost, use at own risk. Replaces internal micro bomb.
 
@@ -125,6 +131,12 @@ uplink-deathrattle-implant-name = Box Of Deathrattle Implants
 uplink-deathrattle-implant-desc = A box containing enough deathrattle implants for the whole squad. Relays a message containing your position to the syndicate channel when you go into a critical state or die.
 
 # Bundles
+uplink-meds-bundle-name = Medical Bundle
+uplink-meds-bundle-desc = All you need to get your comrades back in the fight: mainly a combat medkit, a defibrillator and three combat medipens.
+
+uplink-ammo-bundle-name = Ammo Bundle
+uplink-ammo-bundle-desc = Reloading! Contains 4 magazines for the C-20r, 4 drums for the Bulldog, and 2 ammo boxes for the L6 SAW.
+
 uplink-c20r-bundle-name = C-20r Bundle
 uplink-c20r-bundle-desc = Old faithful: The classic C-20r Submachine Gun, bundled with three magazines.
 
@@ -240,6 +252,12 @@ uplink-ultrabright-lantern-desc = Blinding.
 uplink-nocturine-chemistry-bottle-name = Nocturine Bottle
 uplink-nocturine-chemistry-bottle-desc = A chemical that makes it very hard for your target to stand up.
 
+uplink-combat-medkit-name = Combat Medical Kit
+uplink-combat-medkit-desc = A medkit made for fixing combat injuries.
+
+uplink-combat-medipen-name = Combat Medipen
+uplink-combat-medipen-desc = A single-use medipen containing chemicals that regenerate most types of damage.
+
 uplink-stimpack-name = Stimpack
 uplink-stimpack-desc = The legendary chemical produced by Donk Co. for the Syndicate. Injecting yourself with this will increase your run speed and let you recover from stuns faster for 30 seconds.
 

Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml

@@ -46,7 +46,7 @@
       - id: ScalpelAdvanced
 
 - type: entity
-  parent: ClothingBackpackDuffelSyndicateAmmoBundle
+  parent: ClothingBackpackDuffelSyndicateBundle
   id: ClothingBackpackDuffelSyndicateFilledShotgun
   name: Bulldog bundle
   description: "Lean and mean: Contains the popular Bulldog Shotgun, a 12g beanbag drum and 3 12g buckshot drums." #, and a pair of Thermal Imaging Goggles.
@@ -60,7 +60,7 @@
 #     - id: ThermalImagingGoggles
 
 - type: entity
-  parent: ClothingBackpackDuffelSyndicateAmmoBundle
+  parent: ClothingBackpackDuffelSyndicateBundle
   id: ClothingBackpackDuffelSyndicateFilledSMG
   name: C-20r bundle
   description: "Old faithful: The classic C-20r Submachine Gun, bundled with three magazines." #, and a Suppressor.
@@ -73,7 +73,7 @@
 #     - id: SMGSuppressor
 
 - type: entity
-  parent: ClothingBackpackDuffelSyndicateAmmoBundle
+  parent: ClothingBackpackDuffelSyndicateBundle
   id: ClothingBackpackDuffelSyndicateFilledRevolver
   name: Python bundle
   description: "Go loud and proud with a fully loaded Magnum Python, bundled with two speed loaders."
@@ -85,7 +85,7 @@
         amount: 2
 
 - type: entity
-  parent: ClothingBackpackDuffelSyndicateAmmoBundle
+  parent: ClothingBackpackDuffelSyndicateBundle
   id: ClothingBackpackDuffelSyndicateFilledLMG
   name: L6 Saw bundle
   description: "More dakka: The iconic L6 lightmachinegun, bundled with 2 box magazines."
@@ -96,7 +96,7 @@
       - id: MagazineLightRifleBox
 
 - type: entity
-  parent: ClothingBackpackDuffelSyndicateAmmoBundle
+  parent: ClothingBackpackDuffelSyndicateBundle
   id: ClothingBackpackDuffelSyndicateFilledGrenadeLauncher
   name: China-Lake bundle
   description: "An old China-Lake grenade launcher bundled with 8 rounds of various destruction capability."
@@ -110,7 +110,7 @@
         amount: 4
 
 - type: entity
-  parent: ClothingBackpackDuffelSyndicateAmmoBundle
+  parent: ClothingBackpackDuffelSyndicateBundle
   id: ClothingBackpackDuffelSyndicateFilledCarbine
   name: M-90gl bundle
   description: "A versatile battle rifle with an attached grenade launcher, bundled with 3 magazines and 6 grenades of various capabilities."
@@ -127,6 +127,21 @@
       - id: GrenadeFrag
         amount: 2
 
+- type: entity
+  parent: ClothingBackpackDuffelSyndicateAmmo
+  id: ClothingBackpackDuffelSyndicateAmmoFilled
+  name: ammo bundle
+  description: "Reloading! Contains 4 magazines for the C-20r, 4 drums for the Bulldog, and 2 ammo boxes for the L6 SAW."
+  components:
+  - type: StorageFill
+    contents:
+      - id: MagazinePistolSubMachineGun
+        amount: 4
+      - id: MagazineShotgun
+        amount: 4
+      - id: MagazineLightRifleBox
+        amount: 2
+
 - type: entity
   parent: ClothingBackpackDuffel
   id: ClothingBackpackDuffelSyndicateCostumeCentcom
@@ -282,3 +297,21 @@
       - id: WeaponPistolViper
       - id: PinpointerNuclear
       - id: HandheldHealthAnalyzer
+      - id: CombatMedipen
+
+- type: entity
+  parent: ClothingBackpackDuffelSyndicateMedicalBundle
+  id: ClothingBackpackDuffelSyndicateMedicalBundleFilled
+  name: medical bundle
+  description: "All you need to get your comrades back in the fight."
+  components:
+  - type: StorageFill
+    contents:
+      - id: MedkitCombatFilled
+      - id: Defibrillator
+      - id: CombatMedipen
+        amount: 3
+      - id: ClothingHandsGlovesLatex
+      - id: SyringeTranexamicAcid
+      - id: SyringeSpaceacillin
+      - id: SyringeHyronalin

Resources/Prototypes/Catalog/Fills/Items/belt.yml

@@ -118,6 +118,21 @@
     contents:
       - id: CaptainSabre
 
+- type: entity
+  id: ClothingBeltMilitaryWebbingGrenadeFilled
+  parent: ClothingBeltMilitaryWebbing
+  name: grenadier chest rig
+  suffix: Filled
+  components:
+  - type: StorageFill
+    contents:
+      - id: ExGrenade
+        amount: 4
+      - id: SyndieMiniBomb
+        amount: 2
+      - id: EmpGrenade
+        amount: 2
+
 - type: entity
   id: ClothingBeltMilitaryWebbingMedFilled
   parent: ClothingBeltMilitaryWebbingMed

Resources/Prototypes/Catalog/Fills/Items/firstaidkits.yml

@@ -116,10 +116,9 @@
       - id: SyringeEphedrine
       - id: SyringeTranexamicAcid
       - id: SyringeBicaridine
+      - id: SyringeDermaline
       - id: AntiPoisonMedipen
       - id: Bloodpack
-      - id: PillTricordrazine
-        amount: 2
 
 - type: entity
   id: StimkitFilled

Resources/Prototypes/Catalog/uplink_catalog.yml

@@ -158,6 +158,21 @@
   categories:
   - UplinkExplosives
 
+- type: listing
+  id: UplinkGrenadierRig
+  name: uplink-grenadier-rig-name
+  description: uplink-grenadier-rig-desc
+  productEntity: ClothingBeltMilitaryWebbingGrenadeFilled
+  cost:
+    Telecrystal: 12
+  categories:
+  - UplinkExplosives
+  conditions:
+  - !type:StoreWhitelistCondition
+    whitelist:
+      tags:
+      - NukeOpsUplink
+
 - type: listing
   id: UplinkC4Bundle
   name: uplink-c4-bundle-name
@@ -231,7 +246,7 @@
   id: UplinkMosinAmmo
   name: uplink-mosin-ammo-name
   description: uplink-mosin-ammo-desc
-  productEntity: BoxMagazineLightRifle
+  productEntity: MagazineBoxLightRifle
   cost:
     Telecrystal: 1
   categories:
@@ -415,14 +430,29 @@
   icon: { sprite: /Textures/Actions/Implants/implants.rsi, state: freedom }
   productEntity: FreedomImplanter
   cost:
-    Telecrystal: 10
+    Telecrystal: 8
+  categories:
+    - UplinkImplants
+
+- type: listing
+  id: UplinkMicroBombImplanter
+  name: uplink-micro-bomb-implanter-name
+  description: uplink-micro-bomb-implanter-desc
+  icon: { sprite: /Textures/Actions/Implants/implants.rsi, state: explosive }
+  productEntity: MicroBombImplanter
+  cost:
+    Telecrystal: 2
   categories:
     - UplinkImplants
   conditions:
     - !type:StoreWhitelistCondition
-      blacklist:
+      whitelist:
         tags:
           - NukeOpsUplink
+    - !type:BuyerWhitelistCondition
+      blacklist:
+        components:
+          - SurplusBundle
 
 - type: listing
   id: UplinkDnaScramblerImplant
@@ -453,7 +483,7 @@
   icon: { sprite: /Textures/Actions/Implants/implants.rsi, state: explosive }
   productEntity: MacroBombImplanter
   cost:
-    Telecrystal: 25
+    Telecrystal: 20
   categories:
     - UplinkImplants
   conditions:
@@ -503,6 +533,44 @@
 
 # Bundles
 
+- type: listing
+  id: UplinkAmmoBundle
+  name: uplink-ammo-bundle-name
+  description: uplink-ammo-bundle-desc
+  productEntity: ClothingBackpackDuffelSyndicateAmmoFilled
+  cost:
+    Telecrystal: 15
+  categories:
+  - UplinkBundles
+  conditions:
+    - !type:StoreWhitelistCondition
+      whitelist:
+        tags:
+          - NukeOpsUplink
+    - !type:BuyerWhitelistCondition
+      blacklist:
+        components:
+          - SurplusBundle
+
+- type: listing
+  id: UplinkMedsBundle
+  name: uplink-meds-bundle-name
+  description: uplink-meds-bundle-desc
+  productEntity: ClothingBackpackDuffelSyndicateMedicalBundleFilled
+  cost:
+    Telecrystal: 20
+  categories:
+  - UplinkBundles
+  conditions:
+    - !type:StoreWhitelistCondition
+      whitelist:
+        tags:
+          - NukeOpsUplink
+    - !type:BuyerWhitelistCondition
+      blacklist:
+        components:
+          - SurplusBundle
+
 - type: listing
   id: UplinkC20RBundle
   name: uplink-c20r-bundle-name
@@ -1009,6 +1077,26 @@
   categories:
   - UplinkMisc
 
+- type: listing
+  id: UplinkCombatMedkit
+  name: uplink-combat-medkit-name
+  description: uplink-combat-medkit-desc
+  productEntity: MedkitCombatFilled
+  cost:
+    Telecrystal: 5
+  categories:
+  - UplinkMisc
+
+- type: listing
+  id: UplinkCombatMedipen
+  name: uplink-combat-medipen-name
+  description: uplink-combat-medipen-desc
+  productEntity: CombatMedipen
+  cost:
+    Telecrystal: 8
+  categories:
+  - UplinkMisc
+
 - type: listing
   id: UplinkStimpack
   name: uplink-stimpack-name

Resources/Prototypes/Entities/Clothing/Back/duffel.yml

@@ -187,7 +187,7 @@
     equippedPrefix: ammo
 
 - type: entity
-  parent: ClothingBackpackDuffelSyndicate
+  parent: ClothingBackpackDuffelSyndicateAmmo
   id: ClothingBackpackDuffelSyndicateAmmoBundle
   abstract: true
   components:
@@ -208,7 +208,7 @@
     equippedPrefix: med
 
 - type: entity
-  parent: ClothingBackpackDuffelSyndicate
+  parent: ClothingBackpackDuffelSyndicateMedical
   id: ClothingBackpackDuffelSyndicateMedicalBundle
   abstract: true
   components:

Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml

@@ -486,6 +486,32 @@
         - ReagentId: Bicaridine
           Quantity: 15
 
+- type: entity
+  name: dermaline syringe
+  parent: BaseSyringe
+  id: SyringeDermaline
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      injector:
+        maxVol: 15
+        reagents:
+        - ReagentId: Dermaline
+          Quantity: 15
+
+- type: entity
+  name: hyronalin syringe
+  parent: BaseSyringe
+  id: SyringeHyronalin
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      injector:
+        maxVol: 15
+        reagents:
+        - ReagentId: Hyronalin
+          Quantity: 15
+
 - type: entity
   name: ipecac syringe
   parent: BaseSyringe

Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml

@@ -217,6 +217,37 @@
   - type: Tag
     tags: []
 
+- type: entity
+  name: combat medipen
+  parent: ChemicalMedipen
+  id: CombatMedipen
+  description: A single-use medipen containing chemicals that regenerate most types of damage.
+  components:
+  - type: Sprite
+    sprite: Objects/Specific/Medical/medipen.rsi
+    layers:
+    - state: morphen
+      map: ["enum.SolutionContainerLayers.Fill"]
+  - type: Item
+    sprite: Objects/Specific/Medical/medipen.rsi
+    size: 5
+  - type: SolutionContainerManager
+    solutions:
+      pen:
+        maxVol: 30
+        reagents:
+        - ReagentId: Omnizine
+          Quantity: 25
+        - ReagentId: TranexamicAcid
+          Quantity: 5
+  - type: Hypospray
+    solutionName: pen
+    transferAmount: 30
+  - type: StaticPrice
+    price: 500
+  - type: Tag
+    tags: []
+
 - type: entity
   name: pen
   suffix: Hypopen