Cyborg Rebalance

Resources/Prototypes/Entities/Objects/Materials/Sheets/glass.yml

@@ -197,6 +197,15 @@
           Quantity: 0.5
         canReact: false
 
+- type: entity
+  parent: SheetRGlass
+  id: SheetRGlassLingering0
+  suffix: Lingering, 0
+  components:
+  - type: Stack
+    lingering: true
+    count: 0
+
 - type: entity
   parent: SheetGlassBase
   id: SheetPGlass

Resources/Prototypes/Entities/Objects/Materials/Sheets/metal.yml

@@ -229,3 +229,12 @@
   - type: Stack
     stackType: Plasteel
     count: 1
+
+- type: entity
+  parent: SheetPlasteel
+  id: SheetPlasteelLingering0
+  suffix: Lingering, 0
+  components:
+  - type: Stack
+    lingering: true
+    count: 0

Resources/Prototypes/Entities/Objects/Specific/Janitorial/spray.yml

@@ -99,6 +99,49 @@
   - type: Tag
     tags:
       - Spray
+
+- type: entity
+  name: spray nozzle
+  description: A pressurized nozzle for spraying reagents.
+  id: BorgSprayBottle
+  parent: SprayBottle
+  suffix: ""
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      spray:
+        maxVol: 200
+        reagents:
+        - ReagentId: SpaceCleaner
+          Quantity: 200
+  - type: Tag
+    tags:
+      - Spray
+
+- type: entity
+  name: super spray nozzle
+  id: BorgMegaSprayBottle
+  parent: SprayBottle
+  suffix: Empty
+  description: A high capacity, high pressure spray nozzle, for cleaning even the biggest of spills.
+  components:
+  - type: Sprite
+    sprite: Objects/Specific/Janitorial/janitorial.rsi
+    state: cleaner_large
+  - type: SolutionContainerManager
+    solutions:
+      spray:
+        maxVol: 300
+        reagents:
+        - ReagentId: SpaceCleaner
+          Quantity: 300
+  - type: Spray
+    transferAmount: 15
+    sprayedPrototype: BigVapor
+    sprayVelocity: 3
+    sprayDistance: 4.5
+    spraySound:
+      path: /Audio/Effects/spray2.ogg
 # Vapor
 
 - type: entity

Resources/Prototypes/Entities/Objects/Specific/Janitorial/trashbag.yml

@@ -64,3 +64,26 @@
     quickInsert: true
     areaInsert: true
     areaInsertRadius: 5
+
+- type: entity
+  name: internal trash bag
+  id: BorgTrashBag
+  description: A upgraded trash bag capable of holding nearly anything.
+  parent: TrashBag
+  components:
+  - type: Sprite
+    sprite: Objects/Specific/Janitorial/trashbag.rsi
+    layers:
+      - state: icon-0
+        map: ["enum.StorageFillLayers.Fill"]
+  - type: Storage
+    maxItemSize: Huge
+    grid:
+    - 0,0,7,5
+    quickInsert: true
+    areaInsert: true
+    storageOpenSound:
+      collection: trashBagRustle
+    storageInsertSound:
+      collection: trashBagRustle
+    whitelist: null

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

@@ -106,6 +106,15 @@
     stackType: RegenerativeMesh
     count: 1
 
+- type: entity
+  id: RegenerativeMesh0Lingering
+  parent: RegenerativeMesh
+  suffix: 0, Lingering
+  components:
+  - type: Stack
+    lingering: true
+    count: 0
+
 - type: entity
   name: bruise pack
   description: A therapeutic gel pack and bandages designed to treat blunt-force trauma.
@@ -193,6 +202,15 @@
     stackType: MedicatedSuture
     count: 1
 
+- type: entity
+  id: MedicatedSuture0Lingering
+  parent: MedicatedSuture
+  suffix: 0, Lingering
+  components:
+  - type: Stack
+    lingering: true
+    count: 0
+
 - type: entity
   name: blood pack
   description: Contains a groundbreaking universal blood replacement created by Nanotrasen's advanced medical science.

Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml

@@ -186,8 +186,9 @@
     - Wrench
     - Screwdriver
     - Wirecutter
-    - Multitool
     - WelderIndustrial
+    - Multitool
+    - RemoteSignaller
   - type: BorgModuleIcon
     icon: { sprite: Interface/Actions/actions_borg.rsi, state: tool-module }
 
@@ -221,16 +222,14 @@
     - MiningDrill
     - Shovel
     - MineralScannerUnpowered
-    - OreBag
-    - Crowbar
-    - RadioHandheld
+    - BorgOreBag
   - type: BorgModuleIcon
     icon: { sprite: Interface/Actions/actions_borg.rsi, state: mining-module }
 
 - type: entity
   id: BorgModuleGrapplingGun
   parent: [ BaseBorgModuleCargo, BaseProviderBorgModule ]
-  name: grappling gun cyborg module
+  name: salvaging cyborg module
   components:
   - type: Sprite
     layers:
@@ -239,7 +238,9 @@
   - type: ItemBorgModule
     items:
     - WeaponGrapplingGun
+    - FireExtinguisher
     - HandheldGPSBasic
+    - RadioHandheld
   - type: BorgModuleIcon
     icon: { sprite: Interface/Actions/actions_borg.rsi, state: grappling-module }
 
@@ -257,11 +258,11 @@
     items:
     - JawsOfLife
     - PowerDrill
-    - Multitool
     - WelderExperimental
-    - RemoteSignaller
+    - Multitool
     - GasAnalyzer
     - GeigerCounter
+    - RemoteSignallerAdvanced
   - type: BorgModuleIcon
     icon: { sprite: Interface/Actions/actions_borg.rsi, state: adv-tools-module }
 
@@ -278,6 +279,8 @@
     items:
     - SheetSteelLingering0
     - SheetGlassLingering0
+    - SheetRGlassLingering0
+    - SheetPlasteelLingering0
     - PartRodMetalLingering0
     - FloorTileItemSteelLingering0
   - type: BorgModuleIcon
@@ -302,7 +305,7 @@
 - type: entity
   id: BorgModuleLightReplacer
   parent: [ BaseBorgModuleJanitor, BaseProviderBorgModule ]
-  name: light replacer cyborg module
+  name: custodial cyborg module
   components:
   - type: Sprite
     layers:
@@ -311,8 +314,7 @@
   - type: ItemBorgModule
     items:
     - LightReplacer
-    - Crowbar
-    - Screwdriver
+    - BorgTrashBag
   - type: BorgModuleIcon
     icon: { sprite: Interface/Actions/actions_borg.rsi, state: light-replacer-module }
 
@@ -328,8 +330,9 @@
   - type: ItemBorgModule
     items:
     - MopItem
-    - Bucket
-    - TrashBag
+    - BorgBucket
+    - BorgSprayBottle
+    - HoloprojectorBorg
   - type: BorgModuleIcon
     icon: { sprite: Interface/Actions/actions_borg.rsi, state: cleaning-module }
 
@@ -345,27 +348,29 @@
   - type: ItemBorgModule
     items:
     - AdvMopItem
+    - BorgMegaSprayBottle
     - HoloprojectorBorg
-    - SprayBottleSpaceCleaner
-    - Dropper
-    - TrashBag
   - type: BorgModuleIcon
     icon: { sprite: Interface/Actions/actions_borg.rsi, state: adv-cleaning-module }
 
 # medical modules
 - type: entity
   id: BorgModuleDiagnosis # todo: reuse when med refractor is finished
   parent: [ BaseBorgModuleMedical, BaseProviderBorgModule ]
-  name: diagnosis cyborg module
+  name: topicals cyborg module
   components:
   - type: Sprite
     layers:
     - state: medical
     - state: icon-diagnosis
   - type: ItemBorgModule
     items:
-    - HandheldHealthAnalyzerUnpowered
-    - ClothingNeckStethoscope
+    - Gauze10Lingering
+    - Brutepack10Lingering
+    - Ointment10Lingering
+    - Bloodpack10Lingering
+    - RegenerativeMesh0Lingering
+    - MedicatedSuture0Lingering
   - type: BorgModuleIcon
     icon: { sprite: Interface/Actions/actions_borg.rsi, state: diagnosis-module }
 
@@ -381,16 +386,17 @@
   - type: ItemBorgModule
     items:
     - HandheldHealthAnalyzerUnpowered
-    - Brutepack10Lingering
-    - Ointment10Lingering
-    - Gauze10Lingering
-    - Bloodpack10Lingering
+    - Beaker
+    - Beaker
+    - Syringe
     - Syringe
+    - DefibrillatorOneHandedUnpowered
+
   - type: BorgModuleIcon
     icon: { sprite: Interface/Actions/actions_borg.rsi, state: treatment-module }
 
 - type: entity
-  id: BorgModuleDefibrillator
+  id: BorgModuleDefibrillator # integrated into both treatment modules
   parent: [ BaseBorgModuleMedical, BaseProviderBorgModule ]
   name: defibrillator cyborg module
   components:
@@ -418,8 +424,9 @@
     - HandheldHealthAnalyzerUnpowered
     - Beaker
     - Beaker
-    - BorgDropper
+    - Syringe
     - BorgHypo
+    - DefibrillatorOneHandedUnpowered
   - type: BorgModuleIcon
     icon: { sprite: Interface/Actions/actions_borg.rsi, state: adv-diagnosis-module }
 

Resources/Prototypes/Entities/Objects/Specific/Salvage/ore_bag.yml

@@ -26,3 +26,27 @@
         - ArtifactFragment
         - Ore
   - type: Dumpable
+
+- type: entity
+  name: borg ore bag
+  id: BorgOreBag
+  parent: OreBag
+  description: A robust bag for salvage specialists and miners alike to carry large amounts of ore. Magnetises any nearby ores when attached to a belt.
+  components:
+  - type: MagnetPickup
+  - type: Sprite
+    sprite: Objects/Specific/Mining/ore_bag.rsi
+    state: icon
+  - type: Item
+    size: Ginormous
+  - type: Storage
+    maxItemSize: Normal
+    grid:
+    - 0,0,9,3
+    quickInsert: true
+    areaInsert: true
+    whitelist:
+      tags:
+        - ArtifactFragment
+        - Ore
+  - type: Dumpable

Resources/Prototypes/Entities/Objects/Tools/bucket.yml

@@ -68,3 +68,14 @@
     materialComposition:
       Plastic: 50
   - type: DnaSubstanceTrace
+
+- type: entity
+  parent: Bucket
+  id: BorgBucket
+  name: water tank
+  description: The internal reservoir of a Janitor Cyborg.
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      bucket:
+        maxVol: 600

Resources/Prototypes/Maps/meta.yml

@@ -22,10 +22,11 @@
             Bartender: [ 2, 2 ]
             Botanist: [ 2, 3 ]
             Chef: [ 2, 2 ]
-            Janitor: [ 1, 2 ]
+            Janitor: [ 2, 3 ]
             Chaplain: [ 1, 1 ]
             Librarian: [ 1, 1 ]
             ServiceWorker: [ 2, 2 ]
+            Reporter: [ 2, 2 ]
             #engineering
             ChiefEngineer: [ 1, 1 ]
             AtmosphericTechnician: [ 3, 3 ]
@@ -36,27 +37,27 @@
             Chemist: [ 2, 2 ]
             MedicalDoctor: [ 5, 5 ]
             MedicalIntern: [ 3, 6 ]
-            Paramedic: [ 1, 1 ]
+            Paramedic: [ 1, 2 ]
             #science
             ResearchDirector: [ 1, 1 ]
             Scientist: [ 5, 7 ]
             ResearchAssistant: [ 3, 6 ]
             #security
             HeadOfSecurity: [ 1, 1 ]
             Warden: [ 1, 1 ]
-            SecurityOfficer: [ 5, 7 ]
+            SecurityOfficer: [ 6, 8 ]
             Detective: [ 1, 1 ]
             SecurityCadet: [ 3, 6 ]
             Lawyer: [ 2, 2 ]
             #supply
             Quartermaster: [ 1, 1 ]
             SalvageSpecialist: [ 3, 3 ]
-            CargoTechnician: [ 3, 3 ]
+            CargoTechnician: [ 3, 5 ]
             #civilian
             Passenger: [ -1, -1 ]
             Clown: [ 1, 1 ]
             Mime: [ 1, 1 ]
             Musician: [ 1, 1 ]
             #silicon
             StationAi: [ 1, 1 ]
-            Borg: [ 2, 2 ]
+            Borg: [ 4, 4 ]