From 32dafcf2ea7567cf7745e7b18abe99810bd2bdd3 Mon Sep 17 00:00:00 2001 From: SolidSyn Date: Sat, 10 Jan 2026 08:48:33 -0800 Subject: [PATCH] Foldable wig on clowns mask (#42208) * Clowns base mask now has the ability to toggle the wig on and off. * Changes the clown mask to have a foldable wig. * Adds my credit for the wigless sprites in the meta.json * Redid the description. * Added an a to the description. Smiles. * Resolved changes, thanks beck! --- .../Entities/Clothing/Masks/masks.yml | 37 ++++++++++++++++-- .../Clothing/Mask/clown.rsi/icon-opened.png | Bin 0 -> 214 bytes .../Clothing/Mask/clown.rsi/meta.json | 25 +++++++++++- .../opened-equipped-MASK-hamster.png | Bin 0 -> 243 bytes .../opened-equipped-MASK-reptilian.png | Bin 0 -> 424 bytes .../clown.rsi/opened-equipped-MASK-vox.png | Bin 0 -> 553 bytes .../opened-equipped-MASK-vulpkanin.png | Bin 0 -> 429 bytes .../Mask/clown.rsi/opened-equipped-MASK.png | Bin 0 -> 396 bytes 8 files changed, 58 insertions(+), 4 deletions(-) create mode 100644 Resources/Textures/Clothing/Mask/clown.rsi/icon-opened.png create mode 100644 Resources/Textures/Clothing/Mask/clown.rsi/opened-equipped-MASK-hamster.png create mode 100644 Resources/Textures/Clothing/Mask/clown.rsi/opened-equipped-MASK-reptilian.png create mode 100644 Resources/Textures/Clothing/Mask/clown.rsi/opened-equipped-MASK-vox.png create mode 100644 Resources/Textures/Clothing/Mask/clown.rsi/opened-equipped-MASK-vulpkanin.png create mode 100644 Resources/Textures/Clothing/Mask/clown.rsi/opened-equipped-MASK.png diff --git a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml index 0af2cb0a77..87744b4d91 100644 --- a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml +++ b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml @@ -209,9 +209,24 @@ - Snout - type: entity - parent: ClothingMaskClownBase + parent: [ClothingMaskClownBase, BaseFoldable] id: ClothingMaskClown + description: A clown mask featuring a foldable wig; a true prankster's attire. components: + - type: Appearance + - type: Foldable + canFoldInsideContainer: true + - type: FoldableClothing + foldedEquippedPrefix: opened + foldedHeldPrefix: opened + - type: Sprite + sprite: Clothing/Mask/clown.rsi + layers: + - state: icon + map: [ "unfoldedLayer" ] + - state: icon-opened + map: [ "foldedLayer" ] + visible: false - type: Tag tags: - ClownMask @@ -222,7 +237,7 @@ - Snout - type: entity - parent: ClothingMaskClown + parent: ClothingMaskClownBase id: ClothingMaskClownBanana name: banana clown wig and mask components: @@ -233,9 +248,17 @@ - type: Construction graph: BananaClownMask node: mask + - type: Tag + tags: + - ClownMask + - HamsterWearable + - WhitelistChameleon + - type: HideLayerClothing + slots: + - Snout - type: entity - parent: [ClothingMaskClown, BaseSecurityContraband] + parent: [ClothingMaskClownBase, BaseSecurityContraband] id: ClothingMaskClownSecurity name: security clown wig and mask description: A debatably oxymoronic but protective mask and wig. @@ -251,6 +274,14 @@ Slash: 0.95 Piercing: 0.95 Heat: 0.95 + - type: Tag + tags: + - ClownMask + - HamsterWearable + - WhitelistChameleon + - type: HideLayerClothing + slots: + - Snout - type: entity parent: ClothingMaskBase diff --git a/Resources/Textures/Clothing/Mask/clown.rsi/icon-opened.png b/Resources/Textures/Clothing/Mask/clown.rsi/icon-opened.png new file mode 100644 index 0000000000000000000000000000000000000000..6b86fae3d19e78d01a57078b0be89b0b55e903bf GIT binary patch literal 214 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}6FglULn2z= zUUuYSGURD}7|&TT^^p-z)rNV8TE!X;U z_S|*u^V`x~d*78&(>$3p>KK>|s&=QG-tgDtVPVzgjXyiy=RZ~FWe_P>;^9#0c{ERR zay~ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Mask/clown.rsi/meta.json b/Resources/Textures/Clothing/Mask/clown.rsi/meta.json index c465987d07..8b4143ca93 100644 --- a/Resources/Textures/Clothing/Mask/clown.rsi/meta.json +++ b/Resources/Textures/Clothing/Mask/clown.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/4f6190e2895e09116663ef282d3ce1d8b35c032e. Reptilian edit by Nairod(Github). equipped-MASK-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/4638130fab5ff0e9faa220688811349d3297a33e and slightly modified by Flareguy | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d edited by Floofers", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Reptilian edit by Nairod(Github). equipped-MASK-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/4638130fab5ff0e9faa220688811349d3297a33e and slightly modified by Flareguy | vulpkanin version taken from Paradise station at https://github.com/ParadiseSS13/Paradise/commit/f0fa4e1fd809482fbc104a310aa34cebf7df157d edited by Floofers | Wigless variants edited by Solid_Syn", "size": { "x": 32, "y": 32 @@ -37,6 +37,29 @@ { "name": "equipped-MASK-vox", "directions": 4 + }, + { + "name": "icon-opened" + }, + { + "name": "opened-equipped-MASK", + "directions": 4 + }, + { + "name": "opened-equipped-MASK-hamster", + "directions": 4 + }, + { + "name": "opened-equipped-MASK-vulpkanin", + "directions": 4 + }, + { + "name": "opened-equipped-MASK-reptilian", + "directions": 4 + }, + { + "name": "opened-equipped-MASK-vox", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Mask/clown.rsi/opened-equipped-MASK-hamster.png b/Resources/Textures/Clothing/Mask/clown.rsi/opened-equipped-MASK-hamster.png new file mode 100644 index 0000000000000000000000000000000000000000..a715be59141972fad3d06b3a8e33fd2573d30857 GIT binary patch literal 243 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|)_S@)hE&XX zd&^L$$v}YhLT~t`-}4!w*KHQ_o6#Y{lqmCMZ(kGd?{+Nx(n#N+)v)WymaLtwziX}u*qQM;hY98?_&+xIQ^p{;UUAF6q)MP& zK#;IY!S=T0>femsuh?bp3TN!*+qZ;v5?84+O4E)GTTc=?g06=o2VxF7*1XwWLbqoYxU9jxb^N zDc?;en%}x9U;Q?TO<-cSSdrD%G?{I8r>2Ij@!oy*ZNw2F21b^W-k)bPQq1?io$#)X zY&t^e?vm!Uz)Z2}{MBb$h!m4CL)P4|TT>kKRPHm=Y1(K@eLo4+-xaQ9t1 zp4-nq|GZta)8>Em3e)6lw@EeYvnQowS^s`e?-}*w2KWE0J*#&!Dj@-J!?Ly$#e3Gg z`Jm~lFdHSJBda7{{jd%M$%;HN5`0ZI!B&t4IlxIpo$%9d+8j-0*KkhQU5>)m%x zGn(3~8vh+?cra&W+A61)=DV_aHs5?>_czvWx&Q04&n}i1q^xyPgg&e IbxsLQ0IA%zZvX%Q literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Mask/clown.rsi/opened-equipped-MASK-vox.png b/Resources/Textures/Clothing/Mask/clown.rsi/opened-equipped-MASK-vox.png new file mode 100644 index 0000000000000000000000000000000000000000..c00b4106e93fa5f4e5087ebf514b53d132027a0d GIT binary patch literal 553 zcmV+^0@nSBP)Px$<4Ht8RCt{2+OcZeKpe;M@0CEG#a-pK5T|(T;3w#&H%JCU38CP@d4hP$69`N; zlM={!TAig^UZS1;9nR-UN=nh$awGivfUzz6?sTXBNyGmSB1g@oG+KLa&0`;i!=%3c zx0BR{gDl&Aek#kooJ=pQy|>rA78QN)F0ENJ+It!OK+7{fB_EY470Em zy1p08W;0u@R-c;3$K&z+bUN+!O8g0b%*-r@+V?(ggVtN%*Y!1EESw_)7A{0WINrU# zE%Lz@e_0fkgL$x<&3g{EEQ;P;{bb9c*iQcD*d`w>i^BY|PCh#7$%}}Hh=_=Yh=_>v z(cW@t)yzy+`N2bsk))Y2UwgmTJYnqb&8FkKtQqLK9wD(lpnihYYLOsB=a1*-UAwRJ zQIGgRmhB}W+PXyM+trnQe|UJ2pMNULP1#JW7jWE7AO~9{-fMEOyUB#l#+}rLn`LH zy=9np$UuVi!SroG=O^|3*~t)MDVX$-foG#d;1y|$o`R`q4(pwz6f~!H8ER(U-!7pe zX?>&Z;opW6`=_<=+^RZXci(#&YwflCYA)FsQEUwiLT|L>^IgB^y|(ofNLX%Lu668z zVvdBP+T5}=P3s)q%FGi#vToG`sX%M?Gie*ImtD)+niM&0{oj8!=kHHD{q${p`z-Ab zoMjc3*R%y%4EBk$dYb9xY-s=guAA>}!vp2wUl%x61^#30>Og>)oY#LBT#PvLlj-uq z^+Bg+E%wO9Dw zdREIlY2we^=Ey$`6IZ7#E6LjPe8bywJ3Y_u+H!lPtnh0Ffrf+ozCCm^**trr?5^$k zKGr|KRsCB1gWFA?fkEY3lL-UIC54S