From: SolidSyn Date: Sat, 10 Jan 2026 16:48:33 +0000 (-0800) Subject: Foldable wig on clowns mask (#42208) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=32dafcf2ea7567cf7745e7b18abe99810bd2bdd3;p=space-station-14.git 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! --- 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 0000000000..6b86fae3d1 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/clown.rsi/icon-opened.png differ 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 0000000000..a715be5914 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/clown.rsi/opened-equipped-MASK-hamster.png differ diff --git a/Resources/Textures/Clothing/Mask/clown.rsi/opened-equipped-MASK-reptilian.png b/Resources/Textures/Clothing/Mask/clown.rsi/opened-equipped-MASK-reptilian.png new file mode 100644 index 0000000000..cb3dca0ef3 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/clown.rsi/opened-equipped-MASK-reptilian.png differ 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 0000000000..c00b4106e9 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/clown.rsi/opened-equipped-MASK-vox.png differ diff --git a/Resources/Textures/Clothing/Mask/clown.rsi/opened-equipped-MASK-vulpkanin.png b/Resources/Textures/Clothing/Mask/clown.rsi/opened-equipped-MASK-vulpkanin.png new file mode 100644 index 0000000000..dce368a1b0 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/clown.rsi/opened-equipped-MASK-vulpkanin.png differ diff --git a/Resources/Textures/Clothing/Mask/clown.rsi/opened-equipped-MASK.png b/Resources/Textures/Clothing/Mask/clown.rsi/opened-equipped-MASK.png new file mode 100644 index 0000000000..da4a338d44 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/clown.rsi/opened-equipped-MASK.png differ