Make advanced mop show up on janitor trolley (#20124)

* Make advanced mop show up on janitor trolley

* Make blue trash bag show up on janitor trolley

* Revert "Make blue trash bag show up on janitor trolley"

This reverts commit 3f94b3cf81fba68255f60ca4b2ff085f4ab0c48f.

diff --git a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml
index 07e04b473b5c0e12ee5072500d387f51011107da..37b302e177fad929dbb79c60451c53c1971452f4 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml
@@ -33,6 +33,7 @@
     tags:
       - DroneUsable #No bucket because it holds chems, they can drag the cart or use a drain
       - Mop
+      - MopBasic
   - type: GuideHelp
     guides:
     - Janitorial
@@ -83,6 +84,7 @@
       tags:
         - DroneUsable #No bucket because it holds chems, they can drag the cart or use a drain
         - Mop
+        - MopAdv
 
 - type: entity
   name: mop bucket
@@ -361,7 +363,11 @@
         cart_mop:
           whitelist:
             tags:
-              - Mop
+              - MopBasic
+        cart_advmop:
+          whitelist:
+            tags:
+              - MopAdv
         cart_garbage:
           whitelist:
             tags:

diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml
index d4fb34b5479835506f223d423f8b929e9092c212..db260b5155a0cabf7a730121ecddf4d5bc048a4e 100644 (file)
--- a/Resources/Prototypes/tags.yml
+++ b/Resources/Prototypes/tags.yml
@@ -719,6 +719,12 @@
 - type: Tag
   id: Mop
 
+- type: Tag
+  id: MopAdv
+
+- type: Tag
+  id: MopBasic
+
 - type: Tag
   id: Mouse
 

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

diff --git a/Resources/Textures/Objects/Specific/Janitorial/janitorial_cart.rsi/meta.json b/Resources/Textures/Objects/Specific/Janitorial/janitorial_cart.rsi/meta.json
index 8691dc073cd70fa1fbbc15184bd6b21c39759ba2..db10fa1c5c91a00bcc056733a9330776630e5555 100644 (file)
--- a/Resources/Textures/Objects/Specific/Janitorial/janitorial_cart.rsi/meta.json
+++ b/Resources/Textures/Objects/Specific/Janitorial/janitorial_cart.rsi/meta.json
@@ -19,6 +19,10 @@
             "name": "cart_mop",
             "directions": 4
         },
+        {
+            "name": "cart_advmop",
+            "directions": 4
+        },
         {
             "name": "cart_bucket",
             "directions": 4