Advanced treatment cyborg module for medical borg (#19667)

* chemical analysis goggles for medical borg

* module and its tools

* fix

* fix2

* icon

* module research

* meh

diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml
index 4a90e60b0cc943a32707ae16d22911cceed0adfd..dccbbc732878183a15904ac5e32242c6fec41393 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml
@@ -51,6 +51,29 @@
   - type: UseDelay
     delay: 0.5
 
+- type: entity
+  name: borghypo
+  parent: BaseItem
+  description: A sterile injector for rapid administration of drugs to patients. A cheaper and more specialised version for medical borgs.
+  id: BorgHypo
+  components:
+  - type: Sprite
+    sprite: Objects/Specific/Medical/hypospray.rsi
+    state: borghypo
+  - type: Item
+    sprite: Objects/Specific/Medical/hypospray.rsi
+  - type: SolutionContainerManager
+    solutions:
+      hypospray:
+        maxVol: 10
+  - type: RefillableSolution
+    solution: hypospray
+  - type: ExaminableSolution
+    solution: hypospray
+  - type: Hypospray
+  - type: UseDelay
+    delay: 0.5
+
 - type: entity
   name: experimental hypospray
   suffix: Admeme
@@ -123,7 +146,6 @@
   - type: Tag
     tags: []
 
-
 - type: entity
   name: poison auto-injector
   parent: ChemicalMedipen

diff --git a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
index 31d6831f378fe61165c6319ac999c18986c5b18c..5bb71ec04eefb52d99a87997c3895b5790a11adf 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
@@ -338,6 +338,22 @@
     items:
     - DefibrillatorOneHandedUnpowered
 
+- type: entity
+  id: BorgModuleAdvancedTreatment
+  parent: [ BaseBorgModuleMedical, BaseProviderBorgModule ]
+  name: advanced treatment cyborg module
+  components:
+  - type: Sprite
+    layers:
+    - state: medical
+    - state: icon-chemist
+  - type: ItemBorgModule
+    items:
+    - Beaker
+    - Beaker
+    - BorgDropper
+    - BorgHypo
+
 # science modules
 # todo: if science ever gets their own custom robot, add more "sci" modules.
 - type: entity

diff --git a/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml b/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml
index a0e57d520f9955f9cf5b2a7d3ebbbb565a35b434..8fbc2b2f956a6755598d5a883739ae83497629eb 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml
@@ -278,6 +278,26 @@
   - type: StaticPrice
     price: 40
 
+- type: entity
+  name: borgdropper
+  parent: Dropper
+  description: Used to transfer small amounts of chemical solution between containers. Extended for use by medical borgs.
+  id: BorgDropper
+  components:
+  - type: Sprite
+    sprite: Objects/Specific/Chemistry/dropper.rsi
+    layers:
+      - state: borgdropper
+      - state: dropper1
+        map: ["enum.SolutionContainerLayers.Fill"]
+        visible: false
+  - type: SolutionContainerManager
+    solutions:
+      injector:
+        maxVol: 10
+  - type: Item
+    sprite: Objects/Specific/Chemistry/dropper.rsi
+
 - type: entity
   name: syringe
   parent: BaseItem

diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
index e86882028e55ef4abc090c64e4f24089ac536658..f0d774c1fd4bf0456f4741307861a42d6a4ebc7d 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -459,6 +459,7 @@
     - BorgModuleDiagnosis
     - BorgModuleTreatment
     - BorgModuleDefibrillator
+    - BorgModuleAdvancedTreatment
     - RipleyHarness
     - RipleyLArm
     - RipleyRArm

diff --git a/Resources/Prototypes/Recipes/Lathes/robotics.yml b/Resources/Prototypes/Recipes/Lathes/robotics.yml
index 6e56988ea5cb9bbe1e7f048632662ced798eca78..4825adbe493641fb343e57d1d0c6b3e96f72d2bd 100644 (file)
--- a/Resources/Prototypes/Recipes/Lathes/robotics.yml
+++ b/Resources/Prototypes/Recipes/Lathes/robotics.yml
@@ -479,6 +479,16 @@
     Plastic: 250
     Gold: 50
 
+- type: latheRecipe
+  id: BorgModuleAdvancedTreatment
+  result: BorgModuleAdvancedTreatment
+  completetime: 3
+  materials:
+    Steel: 500
+    Glass: 750
+    Plastic: 250
+    Gold: 50
+
 - type: latheRecipe
   id: BorgModuleDefibrillator
   result: BorgModuleDefibrillator

diff --git a/Resources/Prototypes/Research/biochemical.yml b/Resources/Prototypes/Research/biochemical.yml
index 6b3733c6aae03851f0cd3fdc776147a35715a52e..18145052aed3211c118d293450861389bff2eb60 100644 (file)
--- a/Resources/Prototypes/Research/biochemical.yml
+++ b/Resources/Prototypes/Research/biochemical.yml
@@ -99,6 +99,7 @@
   recipeUnlocks:
   - ChemMasterMachineCircuitboard
   - ChemDispenserMachineCircuitboard
+  - BorgModuleAdvancedTreatment
   technologyPrerequisites:
   - Chemistry
 

diff --git a/Resources/Textures/Objects/Specific/Chemistry/dropper.rsi/borgdropper.png b/Resources/Textures/Objects/Specific/Chemistry/dropper.rsi/borgdropper.png
new file mode 100644 (file)
index 0000000..ba86a60
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chemistry/dropper.rsi/borgdropper.png differ

diff --git a/Resources/Textures/Objects/Specific/Chemistry/dropper.rsi/meta.json b/Resources/Textures/Objects/Specific/Chemistry/dropper.rsi/meta.json
index e7e78c01a6763c466a902b62e124bbbe452f48cf..646becdd087d729e8f31da2d96ae68f50b0ccefb 100644 (file)
--- a/Resources/Textures/Objects/Specific/Chemistry/dropper.rsi/meta.json
+++ b/Resources/Textures/Objects/Specific/Chemistry/dropper.rsi/meta.json
@@ -10,6 +10,9 @@
     {
       "name": "dropper"
     },
+    {
+      "name": "borgdropper"
+    },
     {
       "name": "dropper1"
     },

diff --git a/Resources/Textures/Objects/Specific/Medical/hypospray.rsi/borghypo.png b/Resources/Textures/Objects/Specific/Medical/hypospray.rsi/borghypo.png
index e96d92d7936308f2b3287c1e5ba1d04b59085710..e0eafad0f57ba4582f217106bc8707605bbaa872 100644 (file)
Binary files a/Resources/Textures/Objects/Specific/Medical/hypospray.rsi/borghypo.png and b/Resources/Textures/Objects/Specific/Medical/hypospray.rsi/borghypo.png differ

diff --git a/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/icon-chemist.png b/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/icon-chemist.png
new file mode 100644 (file)
index 0000000..bec24e7
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/icon-chemist.png differ

diff --git a/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/meta.json b/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/meta.json
index 681e84a96e817f2d722befc99798bcc881dd3cbe..62f02dda7eb035d9ad41156a46475bd6932c130a 100644 (file)
--- a/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/meta.json
+++ b/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/meta.json
@@ -28,6 +28,9 @@
     {
       "name": "icon-cables"
     },
+    {
+      "name": "icon-chemist"
+    },
     {
       "name": "icon-clown"
     },