Borg QOL, part 3 (#21567)

* Basic and advanced cleaning modules

* Roundstart entry level modules

* Oops forgot recipe

* Gold

diff --git a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
index ce4ad7995351bd5490474eaa1a8f424fc1c0524b..327703f9501df2ca82040c5d405e3958ddffd9db 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
@@ -288,8 +288,6 @@
     items:
     - MopItem
     - Bucket
-    - Holoprojector
-    - SprayBottleSpaceCleaner
 
 - type: entity
   id: BorgModuleTrashCollection
@@ -304,6 +302,21 @@
     items:
     - TrashBagBlue
 
+- type: entity
+  id: BorgModuleAdvancedCleaning
+  parent: [ BaseBorgModuleJanitor, BaseProviderBorgModule ]
+  name: advanced cleaning cyborg module
+  components:
+  - type: Sprite
+    layers:
+    - state: janitor
+    - state: icon-mop-adv
+  - type: ItemBorgModule
+    items:
+    - AdvMopItem
+    - Holoprojector
+    - SprayBottleSpaceCleaner
+
 # medical modules
 - type: entity
   id: BorgModuleDiagnosis

diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
index 84b0b0171c36f683540b775fb89c39ff7e93a96a..073f4038107ebc9869c00690c027d6c12e39f234 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -413,6 +413,9 @@
     - BorgModuleTool
     - BorgModuleAppraisal
     - BorgModuleConstruction
+    - BorgModuleService
+    - BorgModuleTreatment
+    - BorgModuleCleaning
     - CyborgEndoskeleton
     - LeftArmBorg
     - RightArmBorg
@@ -451,7 +454,7 @@
     dynamicRecipes:
     - ProximitySensor
     - BorgModuleLightReplacer
-    - BorgModuleCleaning
+    - BorgModuleAdvancedCleaning
     - BorgModuleTrashCollection
     - BorgModuleMining
     - BorgModuleGrapplingGun
@@ -463,10 +466,8 @@
     - BorgModuleGardening
     - BorgModuleHarvesting
     - BorgModuleMusique
-    - BorgModuleService
     - BorgModuleClowning
     - BorgModuleDiagnosis
-    - BorgModuleTreatment
     - BorgModuleDefibrillator
     - BorgModuleAdvancedTreatment
     - RipleyHarness

diff --git a/Resources/Prototypes/Recipes/Lathes/robotics.yml b/Resources/Prototypes/Recipes/Lathes/robotics.yml
index cd2060bb3899b58e53850465291aa29c62335215..17c5a5902b9a5dd7b2db0e9d36a3f637a25afdf3 100644 (file)
--- a/Resources/Prototypes/Recipes/Lathes/robotics.yml
+++ b/Resources/Prototypes/Recipes/Lathes/robotics.yml
@@ -447,6 +447,16 @@
     Glass: 250
     Plastic: 250
 
+- type: latheRecipe
+  id: BorgModuleAdvancedCleaning
+  result: BorgModuleAdvancedCleaning
+  completetime: 3
+  materials:
+    Steel: 250
+    Glass: 250
+    Plastic: 250
+    Gold: 50
+
 - type: latheRecipe
   id: BorgModuleTrashCollection
   result: BorgModuleTrashCollection

diff --git a/Resources/Prototypes/Research/biochemical.yml b/Resources/Prototypes/Research/biochemical.yml
index a3b9090fe6820081ae6c827c60eb435252041e26..f9c7a27515570e9ed991cae3522c7811ae2f4949 100644 (file)
--- a/Resources/Prototypes/Research/biochemical.yml
+++ b/Resources/Prototypes/Research/biochemical.yml
@@ -58,7 +58,6 @@
   cost: 7500
   recipeUnlocks:
   - BorgModuleDiagnosis
-  - BorgModuleTreatment
   - BorgModuleDefibrillator
 
 - type: technology

diff --git a/Resources/Prototypes/Research/civilianservices.yml b/Resources/Prototypes/Research/civilianservices.yml
index 671700e81e0b4027688826cbb679bab8971b5d1b..23dbceb16ad56cd656ec281b28a87d59452ad409 100644 (file)
--- a/Resources/Prototypes/Research/civilianservices.yml
+++ b/Resources/Prototypes/Research/civilianservices.yml
@@ -110,7 +110,6 @@
     - ComputerTelevisionCircuitboard
     - SynthesizerInstrument
     - BorgModuleMusique
-    - BorgModuleService
     - BorgModuleClowning
     - DawInstrumentMachineCircuitboard
     - MassMediaCircuitboard
@@ -128,7 +127,7 @@
   cost: 5000
   recipeUnlocks:
   - BorgModuleLightReplacer
-  - BorgModuleCleaning
+  - BorgModuleAdvancedCleaning
   - BorgModuleTrashCollection
 
 - type: technology

diff --git a/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/icon-mop-adv.png b/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/icon-mop-adv.png
new file mode 100644 (file)
index 0000000..7afd308
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/icon-mop-adv.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 62f02dda7eb035d9ad41156a46475bd6932c130a..20b8e18b9efc629c493c936b390d1a86d73991d4 100644 (file)
--- a/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/meta.json
+++ b/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/meta.json
@@ -70,6 +70,9 @@
     {
       "name": "icon-mop"
     },
+    {
+      "name": "icon-mop-adv"
+    },
     {
       "name": "icon-musique"
     },