From 99aa7e52c7cf56ceb6e0c84accb756a2542ed388 Mon Sep 17 00:00:00 2001
From: Vasilis <vasilis@pikachu.systems>
Date: Sat, 29 Jul 2023 03:10:45 +0300
Subject: [PATCH] Plunger is now a hat (#18410)

* the plunger

* Copyright webedit
---
 .../Objects/Specific/Janitorial/janitor.yml   |  15 ++++++++--
 .../Janitorial/janitorial.rsi/meta.json       |  11 --------
 .../plunger.rsi/equipped-HELMET.png           | Bin 0 -> 387 bytes
 .../Specific/Janitorial/plunger.rsi/meta.json |  26 ++++++++++++++++++
 .../plunger-inhand-left.png                   | Bin
 .../plunger-inhand-right.png                  | Bin
 .../plunger.png                               | Bin
 7 files changed, 38 insertions(+), 14 deletions(-)
 create mode 100644 Resources/Textures/Objects/Specific/Janitorial/plunger.rsi/equipped-HELMET.png
 create mode 100644 Resources/Textures/Objects/Specific/Janitorial/plunger.rsi/meta.json
 rename Resources/Textures/Objects/Specific/Janitorial/{janitorial.rsi => plunger.rsi}/plunger-inhand-left.png (100%)
 rename Resources/Textures/Objects/Specific/Janitorial/{janitorial.rsi => plunger.rsi}/plunger-inhand-right.png (100%)
 rename Resources/Textures/Objects/Specific/Janitorial/{janitorial.rsi => plunger.rsi}/plunger.png (100%)

diff --git a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml
index e071930bb3..6cc6b65d15 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml
@@ -386,7 +386,7 @@
       guides:
       - Janitorial
     - type: TileFrictionModifier
-      modifier: 0.4 # makes it slide 
+      modifier: 0.4 # makes it slide
 
 - type: entity
   id: FloorDrain
@@ -458,17 +458,26 @@
     - type: Tag
       tags:
         - Plunger
+        - WhitelistChameleon
     - type: Sprite
       netsync: false
-      sprite: Objects/Specific/Janitorial/janitorial.rsi
+      sprite: Objects/Specific/Janitorial/plunger.rsi
       state: plunger
     - type: Item
-      sprite: Objects/Specific/Janitorial/janitorial.rsi
+      sprite: Objects/Specific/Janitorial/plunger.rsi
       heldPrefix: plunger
     - type: ItemCooldown
     - type: GuideHelp
       guides:
       - Janitorial
+    - type: Clothing
+      sprite: Objects/Specific/Janitorial/plunger.rsi
+      slots:
+        - HEAD
+      clothingVisuals:
+        head:
+          - state: equipped-HELMET
+            offset: "0, 0.15"
 
 - type: entity
   parent: BaseItem
diff --git a/Resources/Textures/Objects/Specific/Janitorial/janitorial.rsi/meta.json b/Resources/Textures/Objects/Specific/Janitorial/janitorial.rsi/meta.json
index 177bd8e619..ae3103e2be 100644
--- a/Resources/Textures/Objects/Specific/Janitorial/janitorial.rsi/meta.json
+++ b/Resources/Textures/Objects/Specific/Janitorial/janitorial.rsi/meta.json
@@ -24,9 +24,6 @@
     },
     {
       "name": "mopbucket_water-3"
-    },
-	{
-      "name": "plunger"
     },
     {
       "name": "inhand-left",
@@ -39,14 +36,6 @@
     {
       "name": "equipped-BELT",
       "directions": 4
-    },
-	{
-      "name": "plunger-inhand-left",
-	  "directions": 4
-    },
-	{
-      "name": "plunger-inhand-right",
-	  "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Objects/Specific/Janitorial/plunger.rsi/equipped-HELMET.png b/Resources/Textures/Objects/Specific/Janitorial/plunger.rsi/equipped-HELMET.png
new file mode 100644
index 0000000000000000000000000000000000000000..0c9979a2b6afd26b8d116f212de60566483bf8fa
GIT binary patch
literal 387
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%ztvy{FLn`9l
z&f3Vy<S63uzANB@!|e@B%m?|_Tt2{+<IK#eoAi|F=#T&B-yE?0Tzbr$pQr4&;>Svv
zu-w|ZzRvX?vTINHPhGDuK`~$=f5ScQFXxU!$rnu9pDwCBpBMjL<b+52sy_iAHETBC
z=ly>A>-AX9g+}%)3+DE{{eRqFWD0}UXJ-bbQ@iFdHoP`k6(_Mk>Fum$#&xGxR3$ca
zZOP_i+o8AkRV$;`rFE7P4|ese5@%cCvHMv9vf`PkTI-fqKVQznz@YC^p>$YUQO@)1
z*QpU#|JHoT-=Jmx#XO?YUY;>vraV&sj3J=;wu+5`Bx~S`&%NRO!H}|kha>+Ai>1IY
QW$<+Mb6Mw<(8Rz10Fcq7VE_OC

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Specific/Janitorial/plunger.rsi/meta.json b/Resources/Textures/Objects/Specific/Janitorial/plunger.rsi/meta.json
new file mode 100644
index 0000000000..8b2dfdf0b2
--- /dev/null
+++ b/Resources/Textures/Objects/Specific/Janitorial/plunger.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Plunger sprites taken from tgstation https://github.com/tgstation/tgstation/blob/master/icons/obj/watercloset.dmi, Helmet sprite made for ss14 by VasilisThePikachu on github",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "plunger"
+        },
+        {
+            "name": "plunger-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "plunger-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "equipped-HELMET",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Specific/Janitorial/janitorial.rsi/plunger-inhand-left.png b/Resources/Textures/Objects/Specific/Janitorial/plunger.rsi/plunger-inhand-left.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Janitorial/janitorial.rsi/plunger-inhand-left.png
rename to Resources/Textures/Objects/Specific/Janitorial/plunger.rsi/plunger-inhand-left.png
diff --git a/Resources/Textures/Objects/Specific/Janitorial/janitorial.rsi/plunger-inhand-right.png b/Resources/Textures/Objects/Specific/Janitorial/plunger.rsi/plunger-inhand-right.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Janitorial/janitorial.rsi/plunger-inhand-right.png
rename to Resources/Textures/Objects/Specific/Janitorial/plunger.rsi/plunger-inhand-right.png
diff --git a/Resources/Textures/Objects/Specific/Janitorial/janitorial.rsi/plunger.png b/Resources/Textures/Objects/Specific/Janitorial/plunger.rsi/plunger.png
similarity index 100%
rename from Resources/Textures/Objects/Specific/Janitorial/janitorial.rsi/plunger.png
rename to Resources/Textures/Objects/Specific/Janitorial/plunger.rsi/plunger.png