From aeb53a302b6afb3f4f01a203921a0fd52d983884 Mon Sep 17 00:00:00 2001 From: Banedon <15725971+Lanedon@users.noreply.github.com> Date: Sun, 20 Apr 2025 23:17:12 +0200 Subject: [PATCH] Santa hat with a foldable beard (#36510) * Added foldable component to santa hat * Modified sprites, modified YAML. YAML is cursed * Changed santa hat description to mention the beard fold * Removed HideLayerClothing since it doesnt work * Changed the prefix from "beard" to "nobeard" to match with the fold/unfold verb * Credits for sprite changes --------- Co-authored-by: Lanedon --- .../Entities/Clothing/Head/hats.yml | 21 ++++-- .../Head/Hats/santahat.rsi/icon-nobeard.png | Bin 0 -> 346 bytes .../Clothing/Head/Hats/santahat.rsi/icon.png | Bin 346 -> 501 bytes .../Clothing/Head/Hats/santahat.rsi/meta.json | 63 ++++++++++++------ .../nobeard-equipped-HELMET-vox.png | Bin 0 -> 687 bytes .../santahat.rsi/nobeard-equipped-HELMET.png | Bin 0 -> 672 bytes .../Hats/santahat.rsi/nobeard-inhand-left.png | Bin 0 -> 612 bytes .../santahat.rsi/nobeard-inhand-right.png | Bin 0 -> 606 bytes 8 files changed, 58 insertions(+), 26 deletions(-) create mode 100644 Resources/Textures/Clothing/Head/Hats/santahat.rsi/icon-nobeard.png create mode 100644 Resources/Textures/Clothing/Head/Hats/santahat.rsi/nobeard-equipped-HELMET-vox.png create mode 100644 Resources/Textures/Clothing/Head/Hats/santahat.rsi/nobeard-equipped-HELMET.png create mode 100644 Resources/Textures/Clothing/Head/Hats/santahat.rsi/nobeard-inhand-left.png create mode 100644 Resources/Textures/Clothing/Head/Hats/santahat.rsi/nobeard-inhand-right.png diff --git a/Resources/Prototypes/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/Entities/Clothing/Head/hats.yml index 2477e1e996..b665708eba 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/hats.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/hats.yml @@ -421,15 +421,28 @@ sprite: Clothing/Head/Hats/redwizard.rsi - type: entity - parent: ClothingHeadBase + parent: [ClothingHeadBase, BaseFoldable] id: ClothingHeadHatSantahat name: santa hat - description: A festive hat worn by Santa Claus. + description: A festive hat worn by Santa Claus. Now with a foldable beard. components: - - type: Sprite - sprite: Clothing/Head/Hats/santahat.rsi - type: Clothing sprite: Clothing/Head/Hats/santahat.rsi + - type: Appearance + - type: Foldable + canFoldInsideContainer: true + - type: FoldableClothing + foldedEquippedPrefix: nobeard + foldedHeldPrefix: nobeard + - type: Sprite + sprite: Clothing/Head/Hats/santahat.rsi + layers: + - state: icon + map: ["unfoldedLayer"] + - state: icon-nobeard + map: [ "foldedLayer" ] + visible: true + - type: entity parent: ClothingHeadBase diff --git a/Resources/Textures/Clothing/Head/Hats/santahat.rsi/icon-nobeard.png b/Resources/Textures/Clothing/Head/Hats/santahat.rsi/icon-nobeard.png new file mode 100644 index 0000000000000000000000000000000000000000..88fb770f8d4905fe37096d5fd250f39d30f85a3c GIT binary patch literal 346 zcmV-g0j2(lP)GS}lc1Vi(^ zDr*u|;L^6kWcobLy#pO^1760fM9~$PGiSU%%)}-KV8%R@2Cm$zAW;;6B%=;EIhPgy z?ioJHKGd6YR8>XOG*Qs205RFmeFw3Ms(_9((7>^-@!n&tjp_%#(u!lvLC^=fpRsHQ zI623$u2(m@1@YF}bO6()z#@p`=!pT8Qj}%Md00PL-utuw*4kn^(@Lp_aed!^#wP^` sH(hEjQezRoR+A;|{!5ktGC&6S03AD8JwUNWpa1{>07*qoM6N<$f~&`o6951J literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Head/Hats/santahat.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/santahat.rsi/icon.png index 88fb770f8d4905fe37096d5fd250f39d30f85a3c..5b6ddcc296fb60c3474bdb009eb1da5c01be2f70 100644 GIT binary patch delta 475 zcmV<10VMv~0`&usB!9a}L_t(oN9~j`PQySDMaPnxNMvIQ*PaLWluKoPXiF0cW7 z;*>l>pfCa8du}O204PA2+s!w`1r`9+odbX+y3rbxQmlWoHj(}3fvIIXaBsw?(Dgn~ z1;7c2fjz*rpMT{50+1Mi__9Y~iqQcklL^Fe9Jqu(UvsY?o!Z$0xRG2ykWg$ko9>e& zdsYc>Q&ALcnx>E>NjGHNz^v=KhN`MyKA*Fa5;?G3F58Q%OE^}upaUOz4KGj6uvjd{ z2Pn(3J({U4KxBeQS`)ZNfX}stEX&3Ra2*H%?9Bnp&{TE7u0`MM*-c1dK8PXWVgT2P zq2j#&upja~-&SC?T8TT~E}y7l=^#N274PMM4I#brz9G`ff#5Xi@!=of3n*;FAwDDF Rz5oCK07*qoM6N<$f&ls#+Oz-w delta 319 zcmV-F0l@zC1KI+RB!3}EL_t(|ob8seZGXOG*Qs205RFmeFw3Ms(_9( z(7>^-@!n&tjp_%#(u!lvLC^=fpRsHQI623$u2(m@1@YF}bO6()z#@p`=!pT8Qj}%M zd00PL-utuw);QW?I@3z2hjD%1f5s;T2sd47E>dF=z*dtb?fy%a0Wv@a_y8R{T0KCq RMxX!y002ovPDHLkV1jF*k4gXl diff --git a/Resources/Textures/Clothing/Head/Hats/santahat.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/santahat.rsi/meta.json index cec1961dce..4399ee55c2 100644 --- a/Resources/Textures/Clothing/Head/Hats/santahat.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Hats/santahat.rsi/meta.json @@ -1,30 +1,49 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. vox state by Flareguy", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. vox state by Flareguy, no beard variant by Banedon", "size": { "x": 32, "y": 32 }, - "states": [ - { - "name": "icon" - }, - { - "name": "equipped-HELMET", - "directions": 4 - }, - { - "name": "equipped-HELMET-vox", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] + "states": [ + { + "name": "icon-nobeard" + }, + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "nobeard-equipped-HELMET", + "directions": 4 + }, + { + "name": "equipped-HELMET-vox", + "directions": 4 + }, + { + "name": "nobeard-equipped-HELMET-vox", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "nobeard-inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "nobeard-inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Clothing/Head/Hats/santahat.rsi/nobeard-equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Hats/santahat.rsi/nobeard-equipped-HELMET-vox.png new file mode 100644 index 0000000000000000000000000000000000000000..db598618573503c227d6e62c9823c29ea4d318ae GIT binary patch literal 687 zcmV;g0#N;lP)Xea8U%>x`4?B16yu zkQZJWfPHCj^1|t?GXSOjALFUm^vW~rOb4LVfbn<|oi)9=^~Y$y$wn#Znzo=5J#(t7e8kcwRZ{2QJYp}3aYomk^wA(^hSe-E-5hwncE2GwXZMX&du4M7V)($u_=uEXcS3xXi(boOHi{eIsa zfIK71Tn7kF9)V?sa;EiYu!&RC;|5Th2(}+?05)-I zdfWhN6T$Yw4ZtQ&O^+KuZ6eryxB=M2sp)Y8s7(ahPvHj0!wS`S^6+92p^ zJvjv+Phm}tpiK@DKSxB*}g1WjH-unA>)jjbmu0H)?B?`Hs%r-R{*8-PKXvIaMR z@^mn~aRV?YQ`X=HP@WEkH*Nq1Wy%`d0Ls(B@Wu_mpiEhV8$fwF7~Z%67?de%`~jRT VDo`Lm1Bw6u002ovPDHLkV1g-IGhYAz literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Head/Hats/santahat.rsi/nobeard-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/santahat.rsi/nobeard-equipped-HELMET.png new file mode 100644 index 0000000000000000000000000000000000000000..8950c1a5e95b329c14f5334bee0019b3e65f64b6 GIT binary patch literal 672 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEU`q3JaSW-5dppa}+bK}w`1%zZ zPc9@_ytwipPVj6k%ff?eSL#YNwb?m(o48~<&vt&`o>9<~#h+EwDZ|AhGD-aT!OrWS zS3Z|JXZ-%F#VgzAfBx_PT(9>%^~|JtBkyfMUq%&`XtFisvLf z7_Y?c;jb%AFyf1|_<9Q1ed{$*{jdEPPQQYZ8iPdR#h64;OA##i- zeRZSs^W_-zB3KWoKKGuhc3`@1QEdj(jwdxMFSGpEGM)Q;RmPHcG{UR#uV+llF3waQ{_6lHe-dOpuE)H4G*{$UGY4(oozyid;6k?>-2It zE`46haHL&bvduWt(c_ixMHAi76b1{9_(>1;^f+{yKj+zJ-Eb>sk_QvRv-7)Zi=(t# z1=|~cmw!*oPM#cc-Y_-z^M@}Ici!Z+uYYl5>$z9XMhx2z-&hfFA~oT`q8aY7D>T=I zvM}7+b1TOBywsd)@3%#Hax!eZaO2t0<}ExyziwryGB4mM``E)&P?$YwmMP;Tlh`*) eIZ5YyWp?Nj2@p4`S_w>e44$rjF6*2Univ4_aw@j~ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Head/Hats/santahat.rsi/nobeard-inhand-left.png b/Resources/Textures/Clothing/Head/Hats/santahat.rsi/nobeard-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..d3420b965a942c75c2e1b91c5c18e5b9d8428bae GIT binary patch literal 612 zcmV-q0-ODbP)vlgH~;JvvnApAujILY!2s9+o)h2}@Z11=2yzQ>3wTa| zTflPz@K=CafLp+G0^9pRfwai!P?AOUrUE>S@h=(LWz|rtyF0Oo@2jMsIGHDD5P5>+tF9pE5EI9C- z0Vwu=p3cN(P@Z#j9zYxW!yYFNm`*?A(`Jxse;o&$Y}8^^a2AA>0|4SjqZbkFbuxQj zw=(Gi6nec^y1>0Q7(8jYri zqFZMWmP%N+x-QoB`~A4vJxCx71_S>907QVWk}cq(!v7V6ObcKEVgOiVsl;UmP^lDF zp6mcDvQ*--1E^FAD^GR+7FjBB*#T54g_S2e0E;Y@xa7`SGprWlyd!gy+`q%5_^w@NCUKjuX y93Yrpo+uOm8`m)a8)`+`!wx7?HEpzf0sNKOL8rs~pZnf>!zB=&{{qkT3kJXr@SFg*faeC_O^{oFTflPy z+yb5(fKLH#0d4`$32+N|ZUFr$aI#rTRWR3|b8DQE&mDD?X;=_;)7e-Mu0nX3Ooizn zKzz5=)S9|1{|o?#hagzsc=TPUINmoE!e8Q%hz^1j`k#1Q0OE9TOxQ;lK+gVev$@y~ zYlYh63n(2hoBgC`?XcATHaOsPtC{8n>mU>WfcWwFT@3cS+TJ(8-pk~mZs5@C^+rQJ zrb3A>Z{@WlNwPgIa{xey|>m5i4!{N|B0006YXj_0n(zRG`TA-|O48S!@Q}wU|sKi{0X9u`eQK}wx0F{_) z@$3NCDoWME4xkcqEuJ0VT1BaP*a1{xuEnzhT&pNm4?BQL%(eKn9Dsv}JQQ^>VLGst z0qACNC>CaNwm?`3Kwi8~FvQpZfeZk}
6e|Y~O_I7s3YnjjkO1I>RUI#zVB>XiAOV0E0R;5}gLPhR!n0%m sCL~>D4h*15nl`S*4zRImRp$H){%O-ehXZ6)00000NkvXXu0mjf0Q^x7MgRZ+ literal 0 HcmV?d00001 -- 2.51.2