From e1c03249fa0d73f528f8b988f00bb64530278002 Mon Sep 17 00:00:00 2001
From: Prole <172158352+Prole0@users.noreply.github.com>
Date: Tue, 7 Oct 2025 02:39:51 -0700
Subject: [PATCH] Golden Plunger General Fixes & Tweaks (#40619)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Plung Plunges

* C# solution replaced with yaml solution, made sprite in-line with normal plunger, & alt click works now

* Update Resources/Textures/Objects/Specific/Janitorial/janitorial_cart.rsi/meta.json

Co-authored-by: āda <ss.adasts@gmail.com>

* Chameleon Tag Added

* a TODO

---------

Co-authored-by: āda <ss.adasts@gmail.com>
---
 .../Objects/Specific/Janitorial/janitor.yml     |   4 +++-
 .../Structures/Specific/Janitor/janicart.yml    |   6 +-----
 .../janitorial_cart.rsi/cart_goldenplunger.png  | Bin 650 -> 638 bytes
 .../Janitorial/janitorial_cart.rsi/meta.json    |   2 +-
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml
index fb740f1cd6..0117ec1255 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml
@@ -278,9 +278,11 @@
   parent: Plunger
   description: A plunger with a plastic suction cup coated in a thin layer of gold given as a token of appreciation for years of service. Still used to unclog drains.
   components:
-  - type: Tag
+  - type: Tag # TODO change Plunger into a tool so we dont got to layer Tags like below.
     tags:
     - GoldenPlunger
+    - Plunger
+    - WhitelistChameleon
   - type: Sprite
     sprite: Objects/Specific/Janitorial/golden_plunger.rsi
     state: plunger
diff --git a/Resources/Prototypes/Entities/Structures/Specific/Janitor/janicart.yml b/Resources/Prototypes/Entities/Structures/Specific/Janitor/janicart.yml
index a24a03da3e..90893cd432 100644
--- a/Resources/Prototypes/Entities/Structures/Specific/Janitor/janicart.yml
+++ b/Resources/Prototypes/Entities/Structures/Specific/Janitor/janicart.yml
@@ -190,11 +190,7 @@
           whitelist:
             tags:
               - Plunger
-        goldenplunger_slot:
-          name: janitorial-trolley-slot-component-slot-name-goldenplunger
-          whitelist:
-            tags:
-            - GoldenPlunger
+              - GoldenPlunger
           priority: 8
         wetfloorsign_slot4:
           name: janitorial-trolley-slot-component-slot-name-sign
diff --git a/Resources/Textures/Objects/Specific/Janitorial/janitorial_cart.rsi/cart_goldenplunger.png b/Resources/Textures/Objects/Specific/Janitorial/janitorial_cart.rsi/cart_goldenplunger.png
index 13988bf1c404e5e08a76bacfcf7898b7266d582a..4829eb6c7b68a41596b505f462f9f4d6bc56f639 100644
GIT binary patch
delta 613
zcmV-r0-F7b1^xt(B!7BoLqkw=Qb$4{Nkv08F*!CiEix`K001bFb&$;~1aTP0KQlw*
zZ572qnuOD?7PWD4*v(tvuvXdSGCMo7tM+A@8A-0nb&C=gZwLMYuF6>{A|+SO#D#4%
zyIU*S=kojXeSY7k=lOydNvj#F#t)gSZH6a<@?tb5*S#RoLVpJ%bStW5%+60ls9K-*
z2=069b7xim_ir^OG)o1c9vD*%(*|J*m|3$8mv?}6HKim#I0L-qVl)QAovX)7{OWSD
z#NRHPk#GpaRzObv;`lFCQ)UK4KhT>=ud3yJ+)J9Y?7}?I19V{#W|AN>(~J`$z#yXp
z2;gIg0S2Lp-+y29&yhn$C5OQ}CMzUKVdF(+6$=d+9TN?WH0y5ue{;3;;i1y>rXbWl
zJI;F_)NMl{?>Jvaj#D@W=?N~g6@Ts!Mm|8wSG3*(@NB~QRYi;M!o?PJJ{pRt6eS4|
zbsgSLp*ad|H_)(D%B<Yy<N+cZFmnxi`_Qk0XZZ)KY=3A4n`tAc0002LNkl<Zc%1Fp
zu?@m76og?1iPjw*6+<vc_Fw_}P$OKkj8|X<&p>+=C{-jR#}O}f{;!Ob=<dl$^Wq!;
z0002sODSmRy@uY)I!mdshf>Jvq7<Z9{{R$!m*4$2PGz!>%?h>90RR91000000BlrC
zd&}8c*<M?&LYI4kqSx&{y?%WRt~*|`pJ#1W;K}hj)mh%L9xpKdc(Cd9^Xqx8zI@Ru
zaCq;ROJZd6-v9<+9l#m`unu620aynB003q_Y<x!U$!iS`00000NkvXXu0mjfb*&Jh

delta 625
zcmV-%0*?Lu1d0WaB!7WvLqkw=Qb$4{Nkv08F*!CiEix`K001bFb&<PE13?gnKNCgq
z4GLO_1c_EEF+zxqMS?~_Es_Ynn&k2l@;L4iB-jeJ0R_><SD}A_wt}@FD2gDqS}WS9
zoO6kgAZC`?`S!Ov!|p6tf=MN%*E%4T&T4+2$F{JzWUGJ1N`EU|xakckx;h(}3{urT
z?x->2&5&8E`ni9tDH7EcsA&)$S5z%4JS9A{mQ_vO7VcCMp@{IQ@Sr9a6uvd}aEV_`
zj+gk$WG(3Tf~8&97O&uN1uF?HB`hz;o=WDF-}{&^X^y7n0}}hhd(iRY!-I`!Ch+27
zgfW?24B=#0R)18<cNFvI$Vjdtvq~O~RpKPbGAL?Jsz)WpM32fyk~jPRx379^)LE+D
z?18!`!+7h5`Yre_7{=$JVSFEf^${-8<^0S6xZg!Dlr{T4v~9rIWmyaF!1*S0Kd2!s
zRFtgZmRJm4PoQNHI<BE{xzw}YeU9%TxGrCH1-pANAb;oER(=4hY-j~;9)kJ+006{E
zL_t(|obB4N4Z<)Gh2aYltvfm@hG3BF!2<NAMsdwDUV#-n1MN|uAR!v!*g2W}Uuo%*
zyJw}khyVZp007GKy;I*i)fDvC8cjjRx|+Q$LgTdI-*qXd#`*zlYQJFha&EswEdT%j
z000000BS%Lf3?fYwbU*Tg>}{qOr_E3<@$Yo9=vq>)8u)Y3qa%*!pFfOZ+H>b<Lw%M
zyjb-L{eC;n9=_>MVE5S0en!&)lt2L14Ok-p>jtb5fOP`^0Km)>XQD>#r2%&h00000
LNkvXXu0mjfQR*VH

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 7e5a11d313..eda0e5aa7b 100644
--- a/Resources/Textures/Objects/Specific/Janitorial/janitorial_cart.rsi/meta.json
+++ b/Resources/Textures/Objects/Specific/Janitorial/janitorial_cart.rsi/meta.json
@@ -5,7 +5,7 @@
         "y": 32
     },
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428, cart_goldenplunger modified from cart_plunger by TiniestShark (github)",
+    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428, cart_goldenplunger modified from cart_plunger by TiniestShark (github) and tweaked by Prole0 (github)",
     "states": [
         {
             "name": "cart",