From 89fa7c2914962af6ca3a43194d9d3f46a25c6b09 Mon Sep 17 00:00:00 2001 From: FlipBrooke <87075384+FlipBrooke@users.noreply.github.com> Date: Thu, 17 Jul 2025 10:29:36 -0600 Subject: [PATCH] Wearable banana peels (#38868) * Add wearable helmet sprites for banana and mimana peels Made it so banana peels and their variants can be worn as head gear. The sprites were done by myself, so feel free to change or update them! Includes hamster compatibility. * fixed a minor state bug * Review fixes - Removed blank space - Added "FlipBrooke" to all modified meta.jsons, with the added note of which sprites I got the colors from/referenced. * I forgot a comma adds a comma and some periods --- .../Objects/Consumable/Food/produce.yml | 17 ++++++++++++++++ .../Entities/Objects/Weapons/Bombs/funny.yml | 5 +++++ .../Objects/Materials/materials.rsi/meta.json | 10 ++++++++- .../peel-equipped-HELMET-hamster.png | Bin 0 -> 375 bytes .../materials.rsi/peel-equipped-HELMET.png | Bin 0 -> 376 bytes .../baked-peel-equipped-HELMET-hamster.png | Bin 0 -> 338 bytes .../banana.rsi/baked-peel-equipped-HELMET.png | Bin 0 -> 328 bytes .../Specific/Hydroponics/banana.rsi/meta.json | 19 +++++++++++++++++- .../peel-equipped-HELMET-hamster.png | Bin 0 -> 386 bytes .../banana.rsi/peel-equipped-HELMET.png | Bin 0 -> 386 bytes .../mimana.rsi/equipped-HELMET-hamster.png | Bin 0 -> 377 bytes .../mimana.rsi/equipped-HELMET.png | Bin 0 -> 377 bytes .../Specific/Hydroponics/mimana.rsi/meta.json | 10 ++++++++- 13 files changed, 58 insertions(+), 3 deletions(-) create mode 100644 Resources/Textures/Objects/Materials/materials.rsi/peel-equipped-HELMET-hamster.png create mode 100644 Resources/Textures/Objects/Materials/materials.rsi/peel-equipped-HELMET.png create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/banana.rsi/baked-peel-equipped-HELMET-hamster.png create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/banana.rsi/baked-peel-equipped-HELMET.png create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/banana.rsi/peel-equipped-HELMET-hamster.png create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/banana.rsi/peel-equipped-HELMET.png create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/mimana.rsi/equipped-HELMET-hamster.png create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/mimana.rsi/equipped-HELMET.png diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml index 2cdd881510..60a4ae9406 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml @@ -437,6 +437,8 @@ - Recyclable - Trash - BananaPeel + - WhitelistChameleon + - HamsterWearable - type: SolutionContainerManager solutions: food: @@ -449,12 +451,21 @@ - type: SpaceGarbage - type: Food requiresSpecialDigestion: true + - type: Clothing + sprite: Objects/Specific/Hydroponics/banana.rsi + equippedState: peel-equipped-HELMET + slots: + - HEAD + quickEquip: false - type: entity name: baked banana peel parent: TrashBananaPeel id: TrashBakedBananaPeel components: + - type: Clothing + sprite: Objects/Specific/Hydroponics/banana.rsi + equippedState: baked-peel-equipped-HELMET - type: Sprite sprite: Objects/Specific/Hydroponics/banana.rsi state: baked-peel @@ -483,6 +494,9 @@ - type: Item sprite: Objects/Specific/Hydroponics/mimana.rsi heldPrefix: peel + - type: Clothing + sprite: Objects/Specific/Hydroponics/mimana.rsi + equippedState: equipped-HELMET - type: Slippery slipSound: path: /Audio/Effects/slip.ogg @@ -501,6 +515,9 @@ sprite: Objects/Materials/materials.rsi heldPrefix: peel - type: Slippery + - type: Clothing + sprite: Objects/Materials/materials.rsi + equippedState: peel-equipped-HELMET - type: entity name: carrot diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Bombs/funny.yml b/Resources/Prototypes/Entities/Objects/Weapons/Bombs/funny.yml index 27a6188584..73c021748c 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Bombs/funny.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Bombs/funny.yml @@ -102,6 +102,11 @@ - !type:TriggerBehavior - !type:DoActsBehavior acts: ["Destruction"] + - type: Tag + tags: + - Recyclable + - Trash + - BananaPeel - type: entity parent: BaseItem diff --git a/Resources/Textures/Objects/Materials/materials.rsi/meta.json b/Resources/Textures/Objects/Materials/materials.rsi/meta.json index 9fbad41e48..d49eb61b76 100644 --- a/Resources/Textures/Objects/Materials/materials.rsi/meta.json +++ b/Resources/Textures/Objects/Materials/materials.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/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24 , bear pelt remade by Alekshhh, wood sprite modified by MisterMecky, wood_2 and wood_3 made by MisterMecky based on wood sprite, cardboard sprites made by MisterMecky, bananium, bananium_1 and peel made by brainfood1183 (github) for ss14. Pyrotton sprites are drawn by Ubaser, using the cotton material sprites as a base. Bananium, cardboard, corgihide, cloth, cotton, pyrotton, bones and durathread inhands by mubururu_ (github).", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24 , bear pelt remade by Alekshhh, wood sprite modified by MisterMecky, wood_2 and wood_3 made by MisterMecky based on wood sprite, cardboard sprites made by MisterMecky, bananium, bananium_1 and peel made by brainfood1183 (github) for ss14. Pyrotton sprites are drawn by Ubaser, using the cotton material sprites as a base. Bananium, cardboard, corgihide, cloth, cotton, pyrotton, bones and durathread inhands by mubururu_ (github). Bananium peel's on-head sprite by FlipBrooke, based on the bananaium peel sprite.", "size": { "x": 32, "y": 32 @@ -193,6 +193,14 @@ { "name": "peel" }, + { + "name": "peel-equipped-HELMET", + "directions": 4 + }, + { + "name": "peel-equipped-HELMET-hamster", + "directions": 4 + }, { "name": "phoron_gem_spent" }, diff --git a/Resources/Textures/Objects/Materials/materials.rsi/peel-equipped-HELMET-hamster.png b/Resources/Textures/Objects/Materials/materials.rsi/peel-equipped-HELMET-hamster.png new file mode 100644 index 0000000000000000000000000000000000000000..e607cf252f98f2abbc75316a73b0f1d83b3a8bd5 GIT binary patch literal 375 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%z4Lw~PLn`LH zy=9o!Y#?&%V}IAiAZ4{(#s(Wx&kIh{-m*R8JX5$w-vP-PHYPKTD!L>jw0C;Tnsyvr z*s|j9e>ax8{`Bf9e?K_oS_JdotDE3;e!TG0VJFE1V>aly-XeGHl#& zuw~W%`x2_}Z=V17WuD1}dyuFZ{k8Ua%(ssK&(iTv7ZwcA$44pyN&4-h=HT)nN}5 z)0q6`=6#vBnQ6K)qcgYNirKGjKbe%0tDn4Ug>2G&vGbeKJ%euFIw<>a!OsTo)2%bN ztPQ>VCdFsDiSH7Q>j#c|Uv@cGk~QnDuUUOD(4q)oWy54t6lZ-K%rX^hEMerNiXa!d5b*1ZkKUi@wNu|Tq%b>3Un zp1h9PLTYwDUPk!m1^ah+t6R&yRtuT*);@h67km7B_9^RTUsnIcd+YW6;P?3%O@FVy eXNDMBQEM)JIPCnb`?tP<1Uy~+T-G@yGywnw_?0#Q literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Hydroponics/banana.rsi/baked-peel-equipped-HELMET.png b/Resources/Textures/Objects/Specific/Hydroponics/banana.rsi/baked-peel-equipped-HELMET.png new file mode 100644 index 0000000000000000000000000000000000000000..ac69dd5d600ad9bbbccaf71e2f3cb6d182eaf2ce GIT binary patch literal 328 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%znLJ$_Ln`LH zy|uBg$wA=QNB+$_leAY=w>(vSp;?nuJ^#?XV}~MQ3wNgI2*iBVnO16f=5IZxqKLuf z$qQ#q{B)Ch-$%c~^-c1VXIM+_?zX>~^{V^e>0M$~~d zA1Zl8dY-Htb$g<(dmZ1qB`z6M-I3d34$+h0-yzf`{%kO#fL3eK5 zssCJCC)d{9IkxXSJJ8t>ppifA<^!d(8?--cn%i*W$=`+_3yj}#+1%zlq1AEPQ^W2@ z;eG!+Z@-Rgb!oRpb5mx&Wl}qI@O0Moc-H#njeqMqx5_vdz5kXAGmha8dpcKX;P*T8 R&sl=RJYD@<);T3K0RZeWjz|Ci literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Hydroponics/banana.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/banana.rsi/meta.json index 064ed98da3..64523fe470 100644 --- a/Resources/Textures/Objects/Specific/Hydroponics/banana.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Hydroponics/banana.rsi/meta.json @@ -1,7 +1,8 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/6be7633abca9f1a51cab1020500cf0776ce78e5c, inhands by mubururu_ (github), Growth stages, harvest, dead, and produce created by Chaoticaa (GitHub), inhands modified by Prole0 (GitHub)", + + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/6be7633abca9f1a51cab1020500cf0776ce78e5c, inhands by mubururu_ (github), Growth stages, harvest, dead, and produce created by Chaoticaa (GitHub), inhands modified by Prole0 (GitHub), On-head sprites by FlipBrooke,.", "size": { "x": 32, "y": 32 @@ -42,6 +43,14 @@ { "name": "baked-peel3" }, + { + "name": "baked-peel-equipped-HELMET", + "directions": 4 + }, + { + "name": "baked-peel-equipped-HELMET-hamster", + "directions": 4 + }, { "name": "baked-peel-inhand-left", "directions": 4 @@ -71,6 +80,14 @@ { "name": "stage-6" }, + { + "name": "peel-equipped-HELMET", + "directions": 4 + }, + { + "name": "peel-equipped-HELMET-hamster", + "directions": 4 + }, { "name": "produce-inhand-left", "directions": 4 diff --git a/Resources/Textures/Objects/Specific/Hydroponics/banana.rsi/peel-equipped-HELMET-hamster.png b/Resources/Textures/Objects/Specific/Hydroponics/banana.rsi/peel-equipped-HELMET-hamster.png new file mode 100644 index 0000000000000000000000000000000000000000..e01ef05a5d49477709da4d4a613ddb5e062e200b GIT binary patch literal 386 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zZ9H8ZLn`LH zy|po`IY8vt$MbxwjvS2^X{WRzU*AylUZ8)W{N$7y0hB%}TxSeM*jvbiKe$EwkNki!Q|8 z$eq3{TX0^CT;A=MCY@}WPSJOw|G6w@s;Qf^9;oJE$(rEMY?IkBlV1MTxbgL}iqYbm zF3VSi8OX->HJv@*`ux|S^YMB6BC5Z|#masC^zZ4Od8jn85nrY|agwd|JJPL;We{e1M6wHW)<*-oMRrpvPh`5!;9?qz%9s+#ph!6pBG#7|e7__8=@$@{O25Uc*w Y-j^<((Ru0m6E%>4r>mdKI;Vst04B$)`2YX_ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Hydroponics/banana.rsi/peel-equipped-HELMET.png b/Resources/Textures/Objects/Specific/Hydroponics/banana.rsi/peel-equipped-HELMET.png new file mode 100644 index 0000000000000000000000000000000000000000..225f0db6da6a2827216e0fc1504be710012c5700 GIT binary patch literal 386 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zZ9H8ZLn`LH zy|uBc*+HP;;m0m!M~=pbWnS8u=Z#!v9oTzd@9C@Gwf42}3(OWN^5wc5p~d1Tkn^o; z!$FT(wwq@?{y-=pis>_AuFT*Wl z%d=jn?U`Xy^WIxM(BP!nozuT(+h5FJ-e;$O-Gp!I_Br0srbf}a>yF;AWANcZ{m#S2~=Kb*1e!r!OYZtq?E-qck$U;h5Fk3On_3u5l?K6!UNJJ44Uupwv7 zy$8XYY_&g#7&FG+ZSAwvzA&FtV%NjwT`PC_>M30c>kWy_-0HmM_M`R2;Vv$({@CnL z&M}d{u>Ib`DcoG7G4t+HH`OG= zm7H1s_ZxcEOy6vK*OP%E=I!6FNB=F~k-jM>@3+UXqs1SqC#Dwfj?=BW+xj&taktpR zgU_FOTj%=R@)p!Py7!q%mFR=Fk0XEG`+Krt)gBFzmSkVJpoeXF9vKYW?%mGp?BV){5<(%MbJo1PI*Fz4fHrP`u!z zZW`;mB)tW5d#YxLW}Ig&(X3jYw<>$GcTk+js#Qi6?Kid_oA0LVd8uss%PXSaX7Oiu zPfFc#H@C#%U1;diS<9v|#WHVCyL@HUs-X7A`#zulZC+PwP;hd{Tq z&x&9FdjpHo=Rbbwm-XWD-?OH@AE$qsck=Vf>|{f``RDI<+05VdH0jzaO&xLL>svVd z74_q-Gm|%kbrtBo&;NI10aK5C{L=ZC<@wyS)`U*_(%0QtD_T>NY&2cPR`gnyg@o+- zrug^{zZdMw_s7gSXZ$UrDSZL^~b^Jjs*$*CH{puJRnzjA@y_C=9=|0bre0z@c@WL!=`2RpUX3w0ftSfdb P0f~9K`njxgN@xNA_>-l- literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Hydroponics/mimana.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/mimana.rsi/meta.json index 25ec879674..9bc2def611 100644 --- a/Resources/Textures/Objects/Specific/Hydroponics/mimana.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Hydroponics/mimana.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/6be7633abca9f1a51cab1020500cf0776ce78e5c, inhands by mubururu_ (github)", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/6be7633abca9f1a51cab1020500cf0776ce78e5c, inhands by mubururu_ (github). Mimana peel on-head sprite by FlipBrooke, based on the mimana item sprite.", "size": { "x": 32, "y": 32 @@ -10,6 +10,14 @@ { "name": "dead" }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "equipped-HELMET-hamster", + "directions": 4 + }, { "name": "harvest" },