Adds advanced mop and research (#14917)

* add advanced mop

* make advmop clean faster

* works now

* tweak stats

* tweak speed again

* typo!!!

* copyright change for nerds

diff --git a/Resources/Locale/en-US/prototypes/catalog/research/technologies.ftl b/Resources/Locale/en-US/prototypes/catalog/research/technologies.ftl
index 2f3bcbf7173bc52332f56bec5244abc10ef2b534..9bddde00fb94cfee21eb25de16c8ae4a8e36b9b6 100644 (file)
--- a/Resources/Locale/en-US/prototypes/catalog/research/technologies.ftl
+++ b/Resources/Locale/en-US/prototypes/catalog/research/technologies.ftl
@@ -4,6 +4,9 @@ technologies-basic-research-technology-description = Nanotrasen basic research t
 technologies-cleaning-technology = Cleaning technology
 technologies-cleaning-technology-description = Start to a shiny clean station.
 
+technologies-advanced-cleaning-technology = Advanced cleaning technology
+technologies-advanced-cleaning-technology-description = Advanced mop won't stop people from trashing the station, sadly.
+
 technologies-foodbev-technology = Food and beverage technology
 technologies-food-and-beverage-technology-description = Robust service from better technology.
 
@@ -89,4 +92,4 @@ technologies-adv-parts-technology-description = Like the previous ones, but bett
 technologies-adv-parts-technology = Advanced parts technology
 
 technologies-super-parts-technology = Super parts technology
-technologies-super-parts-technology-description = New heights of machine performance.
\ No newline at end of file
+technologies-super-parts-technology-description = New heights of machine performance.

diff --git a/Resources/Prototypes/Catalog/Research/technologies.yml b/Resources/Prototypes/Catalog/Research/technologies.yml
index 08156f9437a58fd79d4917c9b29961e2bc300508..5c605abffc420d3473a614c3950685240b55fb6e 100644 (file)
--- a/Resources/Prototypes/Catalog/Research/technologies.yml
+++ b/Resources/Prototypes/Catalog/Research/technologies.yml
@@ -16,7 +16,7 @@
 
 - type: technology
   name: technologies-cleaning-technology
-  id: MopBucket
+  id: CleaningTechnology
   description: technologies-cleaning-technology-description
   icon:
     sprite: Objects/Specific/Janitorial/janitorial.rsi
@@ -29,6 +29,19 @@
   - MopItem
   - SprayBottle
   - BodyBag
+- type: technology
+  name: technologies-advanced-cleaning-technology
+  id: AdvancedCleaningTechnology
+  description: technologies-advanced-cleaning-technology-description
+  icon:
+    sprite: Objects/Specific/Janitorial/advmop.rsi
+    state: advmop
+  requiredPoints: 5000
+  requiredTechnologies:
+    - BasicResearch
+    - CleaningTechnology
+  unlockedRecipes:
+    - AdvMopItem
 
 # Food/Bev Service Technology Tree
 
@@ -600,4 +613,4 @@
   - SuperMatterBinStockPart
   - UltraHighPowerMicroLaserStockPart
   - PicoManipulatorStockPart
-  - PhasicScanningModuleStockPart
\ No newline at end of file
+  - PhasicScanningModuleStockPart

diff --git a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml
index 6c087ed0c525757d6ea4dcfff7c9bdc8638b9742..17a9b504dc31e377f7b9e4775a64f0c19097ebe4 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml
@@ -30,6 +30,35 @@
       - DroneUsable #No bucket because it holds chems, they can drag the cart or use a drain
       - Mop
 
+- type: entity
+  parent: BaseItem
+  name: advanced mop
+  id: AdvMopItem
+  description: Motorized mop that have a bigger reservoir and can mop multiple puddles at once. Automatic Clown Countermeasure no included.
+  components:
+    - type: Sprite
+      sprite: Objects/Specific/Janitorial/advmop.rsi
+      state: advmop
+    - type: MeleeWeapon
+      damage:
+        types:
+          Blunt: 10
+    - type: Item
+      size: 15
+      sprite: Objects/Specific/Janitorial/advmop.rsi
+    - type: Absorbent
+      maxEntities: 3
+      pickupAmount: 25
+      speed: 12.5
+    - type: SolutionContainerManager
+      solutions:
+        absorbed:
+          maxVol: 100
+    - type: Tag
+      tags:
+        - DroneUsable #No bucket because it holds chems, they can drag the cart or use a drain
+        - Mop
+
 - type: entity
   name: mop bucket
   id: MopBucket

diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
index 582b9ce04b2766b37a9792c3dd12bdd2782e6554..f7599c12c9bba667b342e9f86da6e80134695897 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -219,6 +219,7 @@
       - MailingUnitElectronics
       - Bucket
       - MopItem
+      - AdvMopItem
       - SprayBottle
       - FireExtinguisher
       - KitchenKnife
@@ -232,7 +233,7 @@
       - VoiceTrigger
       - PowerCellSmall
       - PowerCellMedium
-      - PowerCellHigh  
+      - PowerCellHigh
       - SynthesizerInstrument
       - RPED
       - NodeScanner

diff --git a/Resources/Prototypes/Recipes/Lathes/janitorial.yml b/Resources/Prototypes/Recipes/Lathes/janitorial.yml
index 26d0d67e4f59d0c6f48843fbf0708a6d8830d000..4c537c30e5a43d98fe5dd50a0b2608b42fb65646 100644 (file)
--- a/Resources/Prototypes/Recipes/Lathes/janitorial.yml
+++ b/Resources/Prototypes/Recipes/Lathes/janitorial.yml
@@ -48,3 +48,12 @@
   materials:
     Steel: 100
     Glass: 1000
+
+- type: latheRecipe
+  id: AdvMopItem
+  result: AdvMopItem
+  completetime: 2
+  materials:
+    Plastic: 100
+    Steel: 100
+    Glass: 100

diff --git a/Resources/Textures/Objects/Specific/Janitorial/advmop.rsi/advmop.png b/Resources/Textures/Objects/Specific/Janitorial/advmop.rsi/advmop.png
new file mode 100644 (file)
index 0000000..6abe169
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Janitorial/advmop.rsi/advmop.png differ

diff --git a/Resources/Textures/Objects/Specific/Janitorial/advmop.rsi/inhand-left.png b/Resources/Textures/Objects/Specific/Janitorial/advmop.rsi/inhand-left.png
new file mode 100644 (file)
index 0000000..77a2014
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Janitorial/advmop.rsi/inhand-left.png differ

diff --git a/Resources/Textures/Objects/Specific/Janitorial/advmop.rsi/inhand-right.png b/Resources/Textures/Objects/Specific/Janitorial/advmop.rsi/inhand-right.png
new file mode 100644 (file)
index 0000000..a980da3
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Janitorial/advmop.rsi/inhand-right.png differ

diff --git a/Resources/Textures/Objects/Specific/Janitorial/advmop.rsi/meta.json b/Resources/Textures/Objects/Specific/Janitorial/advmop.rsi/meta.json
new file mode 100644 (file)
index 0000000..91d2146
--- /dev/null
+++ b/Resources/Textures/Objects/Specific/Janitorial/advmop.rsi/meta.json
@@ -0,0 +1,22 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/b136cf653c4926e475f8d39b34cd1b713331865a",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "advmop"
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}