Merge 24b30e457b into c3c6a6abd9

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

@@ -1,6 +1,7 @@
 borg-slot-surgery-tool-empty = Surgery tools
 borg-slot-pill-empty = Pills and pill canisters
 borg-slot-organ-empty = Organs
+borg-slot-medical-transport-empty = Patient transportation
 
 borg-slot-handcuffs-empty = Handcuffs and zipties
 

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

@@ -94,6 +94,10 @@
   components:
   - type: Foldable
     folded: true
+  - type: Tag # DeltaV - Whitelist for Medical Borg
+    tags:
+    - PatientTransportation
+    - BodyBag
 #  - type: BodyBagItem #TODO: we need some kind of generic placable, like thus:
 # - type: Placeable
 #   prototype: someId

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

@@ -920,6 +920,13 @@
         whitelist:
           components:
           - Healing
+    - item: Bloodpack # DeltaV - Readded Topical Slot
+      hand:
+        emptyLabel: borg-slot-topicals-empty
+        emptyRepresentative: Bloodpack
+        whitelist:
+          components:
+          - Healing
   - type: BorgModuleIcon
     icon: { sprite: Interface/Actions/actions_borg.rsi, state: treatment-module }
 
@@ -937,9 +944,16 @@
     - item: HandheldHealthAnalyzer
     - item: DefibrillatorOneHandedUnpowered
     - item: HandheldCrewMonitorUnpowered # DeltaV
-    - item: Crowbar
+#    - item: Crowbar # DeltaV - Readded Tools Module
     - item: BorgFireExtinguisher
     - item: BorgHandheldGPSBasic
+    - item: EmergencyRollerBedSpawnFolded # DeltaV
+      hand:
+        emptyLabel: borg-slot-medical-transport-empty
+        emptyRepresentative: EmergencyRollerBedSpawnFolded
+        whitelist:
+          tags:
+          - PatientTransportation
   - type: BorgModuleIcon
     icon: { sprite: Interface/Actions/actions_borg.rsi, state: defib-module }
 
@@ -1052,6 +1066,13 @@
         whitelist:
           components:
           - Healing
+    - item: Bloodpack # DeltaV - Added Topical Slot
+      hand:
+        emptyLabel: borg-slot-topicals-empty
+        emptyRepresentative: Bloodpack
+        whitelist:
+          components:
+          - Healing
   - type: BorgModuleIcon
     icon: { sprite: Interface/Actions/actions_borg.rsi, state: adv-chem-module }
 

Resources/Prototypes/Entities/Structures/Furniture/rollerbeds.yml

@@ -91,6 +91,9 @@
     folded: true
   - type: Strap
     enabled: False
+  - type: Tag # DeltaV - Whitelist for Medical Borg
+    tags:
+    - PatientTransportation
 
 - type: entity
   id: CheapRollerBed
@@ -120,6 +123,9 @@
     folded: true
   - type: Strap
     enabled: False
+  - type: Tag # DeltaV - Whitelist for Medical Borg
+    tags:
+    - PatientTransportation
 
 - type: entity
   id: EmergencyRollerBed
@@ -149,3 +155,6 @@
     folded: true
   - type: Strap
     enabled: False
+  - type: Tag # DeltaV - Whitelist for Medical Borg
+    tags:
+    - PatientTransportation

Resources/Prototypes/Recipes/Lathes/Packs/robotics.yml

@@ -41,6 +41,7 @@
   - BorgModuleAdvancedTool
   - BorgModuleAdvancedClowning
   - BorgModuleAdvancedTopical
+  - BorgModuleAdvancedChemicalDV # DeltaV
   - BorgModuleAdvancedMining
 
 - type: latheRecipePack

Resources/Prototypes/Research/civilianservices.yml

@@ -147,6 +147,7 @@
   cost: 5000
   recipeUnlocks:
   - BorgModuleAdvancedTopical
+  - BorgModuleAdvancedChemicalDV # DeltaV - Readd Chemical Module
   - AdvancedJetInjector
 
 - type: technology

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

@@ -485,3 +485,166 @@
   - type: Sprite
     sprite: Objects/Tools/access_breaker.rsi # Finally using this awesome icon
     state: icon
+
+# Medical Modules
+
+- type: entity
+  id: BorgModuleChemicalDV
+  parent: [ BaseBorgModuleMedical, BaseProviderBorgModule ]
+  name: chemical cyborg module
+  components:
+  - type: Sprite
+    layers:
+    - state: medical
+    - state: icon-chem
+  - type: ItemBorgModule
+    hands:
+    - item: HandheldHealthAnalyzer
+    - item: JetInjector
+    - item: Syringe
+      hand:
+        emptyLabel: borg-slot-injector-dropper-empty
+        emptyRepresentative: Syringe
+        whitelist:
+          tags:
+          - Dropper
+          - Syringe
+    - item: BorgDropper
+      hand:
+        emptyLabel: borg-slot-injector-dropper-empty
+        emptyRepresentative: Dropper
+        whitelist:
+          tags:
+          - Dropper
+          - Syringe
+    - hand:
+        emptyLabel: borg-slot-pill-empty
+        emptyRepresentative: PillTricordrazine
+        whitelist:
+          components:
+          tags:
+          - PillCanister
+          - Bottle
+          - Pill
+    - item: PillCanisterTricordrazine
+      hand:
+        emptyLabel: borg-slot-pill-empty
+        emptyRepresentative: PillCanister
+        whitelist:
+          components:
+          tags:
+          - PillCanister
+          - Bottle
+          - Pill
+    - item: ChemistryEmptyVial
+      hand:
+        emptyLabel: borg-slot-small-containers-empty
+        emptyRepresentative: ChemistryEmptyVial
+        whitelist:
+          components:
+          - FitsInDispenser
+          tags:
+          - ChemDispensable
+    - item: ChemistryEmptyVial
+      hand:
+        emptyLabel: borg-slot-small-containers-empty
+        emptyRepresentative: ChemistryEmptyVial
+        whitelist:
+          components:
+          - FitsInDispenser
+          tags:
+          - ChemDispensable
+    - item: ChemistryEmptyVial
+      hand:
+        emptyLabel: borg-slot-small-containers-empty
+        emptyRepresentative: ChemistryEmptyVial
+        whitelist:
+          components:
+          - FitsInDispenser
+          tags:
+          - ChemDispensable
+    - item: HandLabeler
+  - type: BorgModuleIcon
+    icon: { sprite: Interface/Actions/actions_borg.rsi, state: chem-module }
+
+
+- type: entity
+  id: BorgModuleAdvancedChemicalDV
+  parent: [ BaseBorgModuleMedical, BaseProviderBorgModule ]
+  name: advanced chemical cyborg module
+  description: Advanced medical module containing the cyborg adaptation of the highly coveted hypospray. Now your cyborgs can inject crew-harmers with chloral hydrate even faster!
+  components:
+  - type: Sprite
+    layers:
+    - state: medical
+    - state: icon-chemist
+  - type: ItemBorgModule
+    hands:
+    - item: HandheldHealthAnalyzer
+    - item: BorgHypo
+    - item: Syringe
+      hand:
+        emptyLabel: borg-slot-injector-dropper-empty
+        emptyRepresentative: Syringe
+        whitelist:
+          tags:
+          - Dropper
+          - Syringe
+    - item: BorgDropper
+      hand:
+        emptyLabel: borg-slot-injector-dropper-empty
+        emptyRepresentative: Dropper
+        whitelist:
+          tags:
+          - Dropper
+          - Syringe
+    - hand:
+        emptyLabel: borg-slot-pill-empty
+        emptyRepresentative: PillTricordrazine
+        whitelist:
+          components:
+          - Pill
+          tags:
+          - PillCanister
+          - Bottle
+          - Pill
+    - item: PillCanisterTricordrazine
+      hand:
+        emptyLabel: borg-slot-pill-empty
+        emptyRepresentative: PillCanister
+        whitelist:
+          components:
+          tags:
+          - PillCanister
+          - Bottle
+          - Pill
+    - item: Beaker
+      hand:
+        emptyLabel: borg-slot-chemical-containers-empty
+        emptyRepresentative: Beaker
+        whitelist:
+          components:
+          - FitsInDispenser
+          tags:
+          - ChemDispensable
+    - item: Beaker
+      hand:
+        emptyLabel: borg-slot-chemical-containers-empty
+        emptyRepresentative: Beaker
+        whitelist:
+          components:
+          - FitsInDispenser
+          tags:
+          - ChemDispensable
+    - item: Beaker
+      hand:
+        emptyLabel: borg-slot-chemical-containers-empty
+        emptyRepresentative: Beaker
+        whitelist:
+          components:
+          - FitsInDispenser
+          tags:
+          - ChemDispensable
+    - item: HandLabeler
+  - type: BorgModuleIcon
+    icon: { sprite: Interface/Actions/actions_borg.rsi, state: adv-chem-module }

Resources/Prototypes/_DV/Entities/Structures/Furniture/rollerbeds.yml

@@ -88,3 +88,6 @@
     enabled: False
   - type: PointLight
     enabled: false
+  - type: Tag
+    tags:
+    - PatientTransportation

Resources/Prototypes/_DV/Recipes/Lathes/Packs/robotics.yml

@@ -36,6 +36,7 @@
   - BorgModuleAdvancedCleaning
   - BorgModuleAdvancedTool
   - BorgModuleAdvancedTopical
+  - BorgModuleAdvancedChemicalDV
   - BorgModuleAdvancedMining
   - BorgModuleAdvancedSurgery
 

Resources/Prototypes/_DV/Recipes/Lathes/robotics.yml

@@ -288,3 +288,10 @@
     Silver: 100
     Plasma: 500
     Bluespace: 300
+
+# Medical
+
+- type: latheRecipe
+  parent: BaseGoldBorgModuleRecipe
+  id: BorgModuleAdvancedChemicalDV
+  result: BorgModuleAdvancedChemicalDV

Resources/Prototypes/_DV/tags.yml

@@ -284,8 +284,12 @@
 
 - type: Tag
   id: ReinforcedCameraSupply # Reinforced Cameras - Logistics
+
 - type: Tag
   id: GenderScarf
 
 - type: Tag
   id: GenderCloak
+
+- type: Tag
+  id: PatientTransportation # Rollerbed/Hoverbed/Bodybags Whitelist for Medical Borg

Resources/Prototypes/borg_types.yml

@@ -196,7 +196,8 @@
     - BorgModuleMedical
 
   defaultModules:
-  - BorgModuleChemical
+  - BorgModuleTool # DeltaV
+  - BorgModuleChemicalDV # DeltaV
   - BorgModuleTopicals
   - BorgModuleRescue
 
@@ -217,6 +218,7 @@
     damageContainers:
     - Biological
     - BiologicalMetaphysical # DeltaV - Kitsune
+  - type: ShowTriageIcons # DeltaV - Display Triage Icons
   - type: FabricateCandy # DeltaV - The medical cyborg can generate candies filled with medicine.
     actions:
     - ActionFabricateLollipop