Medical Cyborg Tweaks (#5126)

* Allow health analyzers to work if you switch hands

* Added consistency to empty hand borg locales

* Added pills and jet injectors to chemical module. Added soap to advanced surgery. Fixed borg locale strings.

* DeltaV comment

* Also added the ability for surgery modules to hold organs. Fixes #4479.

Resources/Locale/en-US/_DV/robotics/borg_modules.ftl

@@ -1,9 +1,11 @@
-borg-slot-surgery-tool = Surgery tools
+borg-slot-surgery-tool-empty = Surgery tools
+borg-slot-pill-empty = Pills and pill canisters
+borg-slot-organ-empty = Organs
 
-borg-slot-handcuffs = Handcuffs and Zipties
+borg-slot-handcuffs-empty = Handcuffs and zipties
 
-borg-slot-spraypaint = Spraypaint Supplies
+borg-slot-spraypaint-empty = Spraypaint supplies
 
-borg-slot-pka-upgrade = PKA Upgrades
+borg-slot-pka-upgrade-empty = PKA upgrades
 
-borg-slot-forensic-empty = Forensic Reports and Bureaucracy Supplies
+borg-slot-forensic-empty = Forensic reports and bureaucracy supplies

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

@@ -19,6 +19,7 @@
     storedRotation: -90
   - type: ActivatableUI
     key: enum.HealthAnalyzerUiKey.Key
+    requireActiveHand: false # DeltaV - Allow health analyzers to work if you switch hands
   - type: UserInterface
     interfaces:
       enum.HealthAnalyzerUiKey.Key:

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

@@ -918,6 +918,7 @@
   - type: ItemBorgModule
     hands:
     - item: HandheldHealthAnalyzerUnpowered
+    - item: JetInjector # DeltaV
     - item: Syringe
     - item: BorgDropper
     - item: BaseChemistryEmptyVial
@@ -941,6 +942,32 @@
         whitelist:
           components:
           - FitsInDispenser
+    # DeltaV - Add Borg Pill Administering
+    - hand:
+        emptyLabel: borg-slot-pill-empty
+        emptyRepresentative: PillTricordrazine
+        whitelist:
+          components:
+          - Pill
+          tags:
+          - PillCanister
+    - hand:
+        emptyLabel: borg-slot-pill-empty
+        emptyRepresentative: PillCanister
+        whitelist:
+          components:
+          - Pill
+          tags:
+          - PillCanister
+    - hand:
+        emptyLabel: borg-slot-pill-empty
+        emptyRepresentative: PillCanister
+        whitelist:
+          components:
+          - Pill
+          tags:
+          - PillCanister
+    # END DeltaV
   - type: BorgModuleIcon
     icon: { sprite: Interface/Actions/actions_borg.rsi, state: chem-module }
 

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

@@ -89,14 +89,14 @@
     - item: Handcuffs
       hand:
         emptyRepresentative: Handcuffs
-        emptyLabel: borg-slot-handcuffs
+        emptyLabel: borg-slot-handcuffs-empty
         whitelist:
           tags:
           - Handcuffs
     - item: Zipties
       hand:
         emptyRepresentative: Zipties
-        emptyLabel: borg-slot-handcuffs
+        emptyLabel: borg-slot-handcuffs-empty
         whitelist:
           tags:
           - Handcuffs
@@ -224,7 +224,7 @@
     - item: WeaponCrusherDagger
     - hand:
         emptyRepresentative: PKAUpgradeRange
-        emptyLabel: borg-slot-pka-upgrade
+        emptyLabel: borg-slot-pka-upgrade-empty
         whitelist:
           tags:
           - PKAUpgrade
@@ -251,7 +251,7 @@
     - item: SprayPainter
       hand:
         emptyRepresentative: SprayPainter
-        emptyLabel: borg-slot-spraypaint
+        emptyLabel: borg-slot-spraypaint-empty
         whitelist:
           components:
           - SprayPainter
@@ -259,7 +259,7 @@
     - item: SprayPainterAmmo
       hand:
         emptyRepresentative: SprayPainterAmmo
-        emptyLabel: borg-slot-spraypaint
+        emptyLabel: borg-slot-spraypaint-empty
         whitelist:
           components:
           - SprayPainter

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

@@ -25,6 +25,12 @@
         whitelist:
           tags:
           - Soap
+    - hand: 
+        emptyLabel: borg-slot-organ-empty
+        emptyRepresentative: OrganHumanBrain
+        whitelist:
+          components:
+          - Organ
   - type: BorgModuleIcon
     icon: { sprite: _Shitmed/Interface/Actions/actions_borg.rsi, state: surgery-module }
 
@@ -44,31 +50,44 @@
     - item: HandheldHealthAnalyzerUnpowered # DeltaV - Add Scanners to Surgery Modules.
     - item: EnergyScalpel
       hand:
-        emptyLabel: borg-slot-surgery-tool
+        emptyLabel: borg-slot-surgery-tool-empty
         emptyRepresentative: EnergyScalpel
         whitelist:
           components:
           - MedicalSurgeryTool
     - item: EnergyCautery
       hand:
-        emptyLabel: borg-slot-surgery-tool
+        emptyLabel: borg-slot-surgery-tool-empty
         emptyRepresentative: EnergyCautery
         whitelist:
           components:
           - MedicalSurgeryTool
     - item: AdvancedRetractor
       hand:
-        emptyLabel: borg-slot-surgery-tool
+        emptyLabel: borg-slot-surgery-tool-empty
         emptyRepresentative: AdvancedRetractor
         whitelist:
           components:
           - MedicalSurgeryTool
     - item: BoneGel
       hand:
-        emptyLabel: borg-slot-surgery-tool
+        emptyLabel: borg-slot-surgery-tool-empty
         emptyRepresentative: BoneGel
         whitelist:
           components:
           - MedicalSurgeryTool
+    - item: SoapNT
+      hand:
+        emptyLabel: borg-slot-soap-empty
+        emptyRepresentative: SoapNT
+        whitelist:
+          tags:
+          - Soap
+    - hand: 
+        emptyLabel: borg-slot-organ-empty
+        emptyRepresentative: OrganHumanBrain
+        whitelist:
+          components:
+          - Organ
   - type: BorgModuleIcon
     icon: { sprite: _Shitmed/Interface/Actions/actions_borg.rsi, state: adv-surgery-module }