From 067797fcb1e265c5d4a510c04bd68158c5eaa69e Mon Sep 17 00:00:00 2001
From: Psychpsyo <60073468+Psychpsyo@users.noreply.github.com>
Date: Mon, 18 Sep 2023 02:23:35 +0200
Subject: [PATCH] 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.
---
 .../Objects/Specific/Janitorial/janitor.yml       |   8 +++++++-
 Resources/Prototypes/tags.yml                     |   6 ++++++
 .../janitorial_cart.rsi/cart_advmop.png           | Bin 0 -> 371 bytes
 .../Janitorial/janitorial_cart.rsi/meta.json      |   4 ++++
 4 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 Resources/Textures/Objects/Specific/Janitorial/janitorial_cart.rsi/cart_advmop.png

diff --git a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml
index 07e04b473b..37b302e177 100644
--- 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 d4fb34b547..db260b5155 100644
--- 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
index 0000000000000000000000000000000000000000..81754e90bf1106aeaea2390c6147840a5efc6f7f
GIT binary patch
literal 371
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9
z?C1WI$O`0(2Ka=y9zA-r-|X13Wy|UeH+m@+F}URbWmKJWK)TsWg8YL2g8_q-H?td1
zh_k>WvY3H^?=T269?xHq0u;RB>Eaj?;r@2oLB1mj94@S@{{KJ8Y7!{TFT3kxTt)jd
zlaG#X5;fi`+Y3)|TFfNLlr|}DVM*gR_VdA#YyXDM&<jvF@}`wr>GSCs3%Qrv7H~=5
za5y%BpXbpkHr*J3hN#qh8IcJ$*47IAs8m;r_!s4)a9v|jQ>9%M`(%+N2Rt0PdR8Qy
zKgLjPc1!v$|F)c-H|)`7QS}84w$i2cD;@yFU;UZ7P*CpXigl~}8r;ohW!6<4G?ZqQ
zcsQf?#H`YDZY6=Qb(*gJo);>h#Hwi!G=b^y{ibVq>+53Qo(p*M7wA6*Pgg&ebxsLQ
E0HubFq5uE@

literal 0
HcmV?d00001

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 8691dc073c..db10fa1c5c 100644
--- 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
-- 
2.51.2