From cd0960fbd760a9eebf51474616437ab7eee73cc6 Mon Sep 17 00:00:00 2001 From: Tiniest Shark Date: Sat, 19 Jul 2025 11:33:01 -0400 Subject: [PATCH] Golden plunger Trolley and Bucket Carp (#38494) * Golden plunger and Bucket Carp * attributions added --- .../janitorial/janitorial-slot-component.ftl | 1 + .../Entities/Objects/Fun/plushies.yml | 22 +++ .../Objects/Specific/Janitorial/janitor.yml | 3 + .../Structures/Specific/Janitor/janicart.yml | 20 +++ Resources/Prototypes/tags.yml | 9 ++ .../carp.rsi/holocarpplush-inhand-left.png | Bin 0 -> 1274 bytes .../carp.rsi/holocarpplush-inhand-right.png | Bin 0 -> 1339 bytes .../carp.rsi/magicarpplush-inhand-left.png | Bin 0 -> 498 bytes .../carp.rsi/magicarpplush-inhand-right.png | Bin 0 -> 535 bytes .../Objects/Fun/Plushies/carp.rsi/meta.json | 126 +++++++++++++++++- .../Janitorial/janitorial.rsi/meta.json | 25 +++- .../mopbucket_holocarpplush.png | Bin 0 -> 1220 bytes .../mopbucket_magicarpplush.png | Bin 0 -> 463 bytes .../cart_goldenplunger.png | Bin 0 -> 650 bytes .../Janitorial/janitorial_cart.rsi/meta.json | 6 +- 15 files changed, 209 insertions(+), 3 deletions(-) create mode 100644 Resources/Textures/Objects/Fun/Plushies/carp.rsi/holocarpplush-inhand-left.png create mode 100644 Resources/Textures/Objects/Fun/Plushies/carp.rsi/holocarpplush-inhand-right.png create mode 100644 Resources/Textures/Objects/Fun/Plushies/carp.rsi/magicarpplush-inhand-left.png create mode 100644 Resources/Textures/Objects/Fun/Plushies/carp.rsi/magicarpplush-inhand-right.png create mode 100644 Resources/Textures/Objects/Specific/Janitorial/janitorial.rsi/mopbucket_holocarpplush.png create mode 100644 Resources/Textures/Objects/Specific/Janitorial/janitorial.rsi/mopbucket_magicarpplush.png create mode 100644 Resources/Textures/Objects/Specific/Janitorial/janitorial_cart.rsi/cart_goldenplunger.png diff --git a/Resources/Locale/en-US/janitorial/janitorial-slot-component.ftl b/Resources/Locale/en-US/janitorial/janitorial-slot-component.ftl index bc03943a01..df4a11a3e2 100644 --- a/Resources/Locale/en-US/janitorial/janitorial-slot-component.ftl +++ b/Resources/Locale/en-US/janitorial/janitorial-slot-component.ftl @@ -3,6 +3,7 @@ mop-bucket-slot-component-slot-name-item = Item mop-bucket-slot-component-eject-verb = Take out # janitorial trolley janitorial-trolley-slot-component-slot-name-plunger = Plunger +janitorial-trolley-slot-component-slot-name-goldenplunger = Golden Plunger janitorial-trolley-slot-component-slot-name-sign = Sign janitorial-trolley-slot-component-slot-name-lightreplacer = Light Replacer janitorial-trolley-slot-component-slot-name-spray = Spray diff --git a/Resources/Prototypes/Entities/Objects/Fun/plushies.yml b/Resources/Prototypes/Entities/Objects/Fun/plushies.yml index f0ab2931c0..dc9976502a 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/plushies.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/plushies.yml @@ -876,9 +876,20 @@ components: - type: Sprite state: magicplush + - type: Item + inhandVisuals: + left: + - state: magicarpplush-inhand-left + right: + - state: magicarpplush-inhand-right - type: FoodSequenceElement entries: CottonBurger: MagicarpPlushie + - type: Tag + tags: + - Payload + - ClothMade + - PlushieCarpMagi - type: entity parent: PlushieCarp @@ -910,9 +921,20 @@ components: - type: Sprite state: holoplush + - type: Item + inhandVisuals: + left: + - state: holocarpplush-inhand-left + right: + - state: holocarpplush-inhand-right - type: FoodSequenceElement entries: CottonBurger: HolocarpPlushie + - type: Tag + tags: + - Payload + - ClothMade + - PlushieCarpHolo - type: entity parent: BasePlushie diff --git a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml index f23bd43866..d9d4851158 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml @@ -271,6 +271,9 @@ 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 + tags: + - GoldenPlunger - 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 c095951d96..3be6fb7d6f 100644 --- a/Resources/Prototypes/Entities/Structures/Specific/Janitor/janicart.yml +++ b/Resources/Prototypes/Entities/Structures/Specific/Janitor/janicart.yml @@ -51,6 +51,14 @@ whitelist: tags: - PlushieCarp + mopbucket_magicarpplush: + whitelist: + tags: + - PlushieCarpMagi + mopbucket_holocarpplush: + whitelist: + tags: + - PlushieCarpHolo sprite: Objects/Specific/Janitorial/janitorial.rsi - type: Transform noRot: true @@ -65,6 +73,8 @@ - PlushieSharkPink - PlushieSharkGrey - PlushieCarp + - PlushieCarpHolo + - PlushieCarpMagi components: - Rehydratable priority: 3 # Higher than drinking priority @@ -177,6 +187,11 @@ whitelist: tags: - Plunger + goldenplunger_slot: + name: janitorial-trolley-slot-component-slot-name-goldenplunger + whitelist: + tags: + - GoldenPlunger priority: 8 wetfloorsign_slot4: name: janitorial-trolley-slot-component-slot-name-sign @@ -286,6 +301,10 @@ whitelist: tags: - Plunger + cart_goldenplunger: + whitelist: + tags: + - GoldenPlunger cart_mop: whitelist: tags: @@ -349,6 +368,7 @@ trashbag_slot: !type:ContainerSlot {} bucket_slot: !type:ContainerSlot {} plunger_slot: !type:ContainerSlot {} + goldenplunger_slot: !type:ContainerSlot {} wetfloorsign_slot4: !type:ContainerSlot {} wetfloorsign_slot3: !type:ContainerSlot {} wetfloorsign_slot2: !type:ContainerSlot {} diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml index 8c36cc2886..aa3be06694 100644 --- a/Resources/Prototypes/tags.yml +++ b/Resources/Prototypes/tags.yml @@ -642,6 +642,9 @@ - type: Tag id: Goat +- type: Tag + id: GoldenPlunger + - type: Tag id: Goliath @@ -1090,6 +1093,12 @@ - type: Tag id: PlushieCarp +- type: Tag + id: PlushieCarpHolo + +- type: Tag + id: PlushieCarpMagi + - type: Tag id: PlushieGhost diff --git a/Resources/Textures/Objects/Fun/Plushies/carp.rsi/holocarpplush-inhand-left.png b/Resources/Textures/Objects/Fun/Plushies/carp.rsi/holocarpplush-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..7f22ecc21d5b6ab16bfab9d48c44eadd90576770 GIT binary patch literal 1274 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Fun/Plushies/carp.rsi/magicarpplush-inhand-left.png b/Resources/Textures/Objects/Fun/Plushies/carp.rsi/magicarpplush-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..234e7c2de0a4991f6e7733ef7173eccb53fdc9ae GIT binary patch literal 498 zcmeAS@N?(olHy`uVBq!ia0y~yU~m9o4mJh`hEk44ofy`glX=O&z_`ZK z#WAE}&f8lXvknD_usygh7VMlqEho07`NGx*CF1Q)3$vHy?Q8VExN>**j;VZ)9=y83 z{=qhcDLh*6Nr^>E*OW^ydUH?xZ+!6Ra|nL;>7QldQX-* zu`F)-nW%hTbw(9aQON@g6P8EBGdt)Bh{?IFW|VyN`M}DHQU7+co~sd$IdVX?p*@?M z;l)GQ=ZgauO0CbnA}4(ycuo1gvX!N$AJj5@WQt&X;jbXstySdIHuJ>L)pHpnqqr`Av?$(N#ejA$BT|CaVgR|ke`B|x&@Z;5X4=(sP2%fWi z8RHspq-yWKdk>#SpA{>)zAI60al5|kWKIhg>npF9x*2o+j%>O+=b-1GYs?y)CX**f s$^JXZ&-drwzkO?Bm;?m{|HjMP37k}@F-a6*U|?YIboFyt=akR{0Akk44ofy`glX=O&z^Ugg|3~mp)5U}ehUlFUMb?W(`8fLZD zHS@S)o%56h7ad>fC~%LDomG8fW{megjr06G+YIdV-(Q^A{+v}10w!AK@ogx*{z1r` zJ>u%ih?gn@%?wTFHdr#I-w{-`^?y7GSg?=MZ?@AZ8TzL)x8 zanqwL9*3|k5v9$WnDm5q>}~(dIVbFc@u79AfBMeI6lmW(MLpu>olnoRTwl$4T~&Q? z()pISmfm@DR{Ks4|GR%()_^g!1=W(SnghG8 hiwg=){C`+}{=JjwviDY9Wnf@n@O1TaS?83{1ORw5_TK;i literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Fun/Plushies/carp.rsi/meta.json b/Resources/Textures/Objects/Fun/Plushies/carp.rsi/meta.json index 8b92838d06..60d184a0db 100644 --- a/Resources/Textures/Objects/Fun/Plushies/carp.rsi/meta.json +++ b/Resources/Textures/Objects/Fun/Plushies/carp.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-NC-SA-3.0", - "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432, holoplush and magicplush modified by deltanedas (github), rainbowcarplush and inhand sprites modified from carpplush and inhand sprites by ArtisticRoomba", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432, holoplush and magicplush modified by deltanedas (github), rainbowcarplush and inhand sprites modified from carpplush and inhand sprites by ArtisticRoomba, magicarp and holocarp inhand sprites by TiniestShark (github)", "size": { "x": 32, "y": 32 @@ -21,6 +21,14 @@ { "name": "magicplush" }, + { + "name": "magicarpplush-inhand-left", + "directions": 4 + }, + { + "name": "magicarpplush-inhand-right", + "directions": 4 + }, { "name": "holoplush", "delays": [ @@ -42,6 +50,122 @@ ] ] }, + { + "name": "holocarpplush-inhand-left", + "directions": 4, + "delays": [ + [ + 0.3, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.3, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.3, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.3, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "holocarpplush-inhand-right", + "directions": 4, + "delays": [ + [ + 0.3, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.3, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.3, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.3, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, { "name": "rainbowcarpplush" }, diff --git a/Resources/Textures/Objects/Specific/Janitorial/janitorial.rsi/meta.json b/Resources/Textures/Objects/Specific/Janitorial/janitorial.rsi/meta.json index e4604b165f..e138281ef6 100644 --- a/Resources/Textures/Objects/Specific/Janitorial/janitorial.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Janitorial/janitorial.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428, mopbucket_shark_* by Psychpsyo, mopbucket_carpplush adapted by Psychpsyo from tgstation carpplush at commit https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432, mopbucket_cube is monkey cube taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi and modified by Hrosts", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428, mopbucket_shark_* by Psychpsyo, mopbucket_carpplush adapted by Psychpsyo from tgstation carpplush at commit https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432, mopbucket_cube is monkey cube taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi and modified by Hrosts, Holocarp and Magicarp mopbucket sprites by TiniestShark (github)", "size": { "x": 32, "y": 32 @@ -37,6 +37,29 @@ { "name": "mopbucket_carpplush" }, + { + "name": "mopbucket_magicarpplush" + }, + { + "name": "mopbucket_holocarpplush", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, { "name": "mopbucket_cube" }, diff --git a/Resources/Textures/Objects/Specific/Janitorial/janitorial.rsi/mopbucket_holocarpplush.png b/Resources/Textures/Objects/Specific/Janitorial/janitorial.rsi/mopbucket_holocarpplush.png new file mode 100644 index 0000000000000000000000000000000000000000..149f3e864f36cf27c1b3932970c8fdf4e7287d51 GIT binary patch literal 1220 zcmeAS@N?(olHy`uVBq!ia0y~yU`SwKU|7Jx#=yYvxgfKLfq{XsILO_JVcj{ImkbOn zb)GJcAr*7p-resnoi20yqj|>(d!geFLERdmD;IDJ3axb!NM6>mGU>zxzNuDjI^Teq}OE7XZA%Qvgji`T@ZB}Q3Drmp34iEK{K`b_R^{Bris&u1$Z z3E7?hd`DK})c0fu7cf{d`^$_tht*u?ZT`34zc1jg!sv12kq`gD-u}m7Z&&U;dhXdD z>G{0|hIKQ4{H%M_snQuS$LCV|lcfIA_KRBtzTN-Fc=p+!H*;ry{qVNv!#bN7o;jE9 zW?Jp{U8}#M>}z_S??lgEd#c3$g!Hbjtn4^{;7h>Q?@pE-9Z$Y*m9qQ(RAqAV;yqRD z-rB2cO#W~(u#5ITY?OF?TU2Ocg{_Q2d`YKxdsJ6XR$adK!}~R+M|bYK_kEpJ0DpZ* z1(QrG^O0_63%}Xr@kc(*-p#Pt^8cgO&wqYgp06`~TgA^L-UW4E=dZVCO-Qew9{=x0 z_omlH0Us?^R7{B#U%sQ^aYbG5Ou_T^Kc_FaIfsA4=I!U*-Y$I_^fftOiPb@8YFcLM z)Ceu!19#c`XYQ`G{g655k&|(BU(LUh^2cv6NySS4YdDk8b!dHd%KJMh-``3Hy>#67 z_g#9~w{Ok$KYp*jUH4_T)&CtwQ$NrC_h->_@p)T6c9bX9eZJq)|MA{b`{Zp;%kS9x zL`^)K|BLx=bIk4y=bt~Gey+xU+2@nb%>TA8y`KL6MR`Zw{rw%tpk&Ro|I9bP)YOH1 zdONSn;I4mw{Q~AKJL{|YkCfOesI1jhF_6E1`19B0>a+Uwcjs9sKU&thpZZScmI=OiO0Y8>622}f_-}8*WG7n|2a8%@tSR;rGCe|-RNP=B__~+TZ)m6?vF4oxStX(rN!_F>#&AH>-b)9~mk}e4H=HLGJ;G0JkxVH{QJ8;B+V&&`1jZ0@8932*PV7e`gp;kz_Qpm zkC^%{AN!EQ^7*agQscY+FMicEWZvEP|9|Q(`GlCmj5a!Z-|b`0NdEtdU1C|C1IMPH zXW!L)as_8jD6!;nAuHC;G1rzG+4-|d-#;kPcT%AM9jqCg!61#sf3YL7*cij5% z&D_1UW?A~W(^tv!KYyIO(!^VP^^u@VhIe)qGBf(w3%a;-^(>>V@OQMVn}1$B+jWt= gf)WI5`yu`AUfN!Nt|fmM7#J8lUHx3vIVCg!0GlpmG5`Po literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Janitorial/janitorial.rsi/mopbucket_magicarpplush.png b/Resources/Textures/Objects/Specific/Janitorial/janitorial.rsi/mopbucket_magicarpplush.png new file mode 100644 index 0000000000000000000000000000000000000000..17ee679df80994c030aac8b64415e78181188e33 GIT binary patch literal 463 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4mJh`hT^KKFANL}jKx9jP7LeL$-HD>VC?jC zaSVxQeLMNQ7gL}}`~H(3R~ZJYcs@x|@K8F$aeGU5oMOgBd5%Tt9WMlLeP!6|@W3tO z?z&LV3tCYvdQBI2G&zo6yqzTD9(W;8T=(7formY1{#pC{OiX}=2-ne$DSGFghRXb8 z+LWW{J#&dp^oa$fTMAV!G0nWBXvDfzZB6UL6;>%P8<2cZp1SRNll58f3imCvC+TN3myAUgj{$~6Lw;Y!@HSQ zw*$-1=Y(!N^x^6YdA>Z)RitZs*r&E(oy`m_ z&CGO-^b8poG$xi#-0jWmD9~;%?D~525(CAXw7Nvb_#hl{K2?}Y`ZvOnX-TLr5oroq+)uq?16sDfb zs+)g&+lCz}tLu+>X~*t($*Z}`N_qxQ&{ey4D-0i>oe;VD*UtL2nnG7aS7Zvvg@@>B z+o;-Xo)+qRPwZWY(87)nD?cny6BpTM`n8}l-luQ+kJBl-FTOV|jlChZ{y_n&Hm9zt zj{fm^UeBi7|2;!Lvv1jRW})9lsxN$ee7LzcQ|-f}q!z=Ou{;k`BEmvWmWzCTe!^p& z(q=EY-q1%XCyX?*{8qWE9&_nG~c?zr!&KgIO7-Im+~H&Y|I-yis?R${+GQ8#4Dnn%+jc;fsQqzYQC zTUfaB%I5pEeeV@_=*5?^?yfdacz!#qj$w6925X*N(=P@Fh9jOXjv*Cu-rm~Cd&oeb z^&z*=T5BtM>i~I{)x|gIcazL(p?=4AaLsQ z-r)PzS4F;Dm-2NyzH8QAU8l!e9^Nn2Tyg9dV@}rogs(+;`(1QFN;|CSg-?cGwwa$b-Pp00i_>zopr09!aC A)c^nh 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 28617ac255..7e5a11d313 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", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428, cart_goldenplunger modified from cart_plunger by TiniestShark (github)", "states": [ { "name": "cart", @@ -55,6 +55,10 @@ "name": "cart_plunger", "directions": 4 }, + { + "name": "cart_goldenplunger", + "directions": 4 + }, { "name": "icon-cart" },