From d7810e6d6ab7f6d2ecfe2d50a4274f4fd2b80efb Mon Sep 17 00:00:00 2001
From: Doru991 <75124791+Doru991@users.noreply.github.com>
Date: Sat, 11 Nov 2023 08:43:13 +0200
Subject: [PATCH] Borg QOL, part 3 (#21567)

* Basic and advanced cleaning modules

* Roundstart entry level modules

* Oops forgot recipe

* Gold
---
 .../Objects/Specific/Robotics/borg_modules.yml |  17 +++++++++++++++--
 .../Entities/Structures/Machines/lathe.yml     |   7 ++++---
 .../Prototypes/Recipes/Lathes/robotics.yml     |  10 ++++++++++
 Resources/Prototypes/Research/biochemical.yml  |   1 -
 .../Prototypes/Research/civilianservices.yml   |   3 +--
 .../Robotics/borgmodule.rsi/icon-mop-adv.png   | Bin 0 -> 240 bytes
 .../Specific/Robotics/borgmodule.rsi/meta.json |   3 +++
 7 files changed, 33 insertions(+), 8 deletions(-)
 create mode 100644 Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/icon-mop-adv.png

diff --git a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
index ce4ad79953..327703f950 100644
--- 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 84b0b0171c..073f403810 100644
--- 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 cd2060bb38..17c5a5902b 100644
--- 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 a3b9090fe6..f9c7a27515 100644
--- 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 671700e81e..23dbceb16a 100644
--- 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
index 0000000000000000000000000000000000000000..7afd3081ca59ba5a344307bd0a07a740a8f2314c
GIT binary patch
literal 240
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WCiji0(?ST_w-yozvxN7*|9pqjSOx%%a$!Wdh{qzGFG*57m(s83Gxg64*?AK
zn)gNm#W)K*B8wRq_zr_G<MI3zDL_GAPZ!4!3;(xg4EY!oIa~tUM0fn}oz61*X3hqq
zjUUPv`>Tq@2FS9rG-&N#IQ2WHLHJkJUkQwE{3Tls+_9~nxmrmfjq^pv!FchI+m1)L
Y&-qAmCYmyJ0u5&HboFyt=akR{09MOVKL7v#

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/meta.json b/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/meta.json
index 62f02dda7e..20b8e18b9e 100644
--- 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"
     },
-- 
2.51.2