From 4843ba9a5e77cec472673eafa250dab68901c405 Mon Sep 17 00:00:00 2001 From: Nim <128169402+Nimfar11@users.noreply.github.com> Date: Sat, 13 May 2023 17:41:35 +0300 Subject: [PATCH] Mime and clown masks (#16350) --- .../VendingMachines/Inventories/theater.yml | 4 ++ .../Entities/Clothing/Masks/masks.yml | 44 ++++++++++++++++++ .../Mask/sadmime.rsi/equipped-MASK.png | Bin 0 -> 439 bytes .../Clothing/Mask/sadmime.rsi/icon.png | Bin 0 -> 433 bytes .../Clothing/Mask/sadmime.rsi/meta.json | 18 +++++++ .../Mask/scaredmime.rsi/equipped-MASK.png | Bin 0 -> 432 bytes .../Clothing/Mask/scaredmime.rsi/icon.png | Bin 0 -> 491 bytes .../Clothing/Mask/scaredmime.rsi/meta.json | 18 +++++++ .../Mask/sexyclown.rsi/equipped-MASK.png | Bin 0 -> 816 bytes .../Clothing/Mask/sexyclown.rsi/icon.png | Bin 0 -> 404 bytes .../Clothing/Mask/sexyclown.rsi/meta.json | 18 +++++++ .../Mask/sexymime.rsi/equipped-MASK.png | Bin 0 -> 446 bytes .../Clothing/Mask/sexymime.rsi/icon.png | Bin 0 -> 432 bytes .../Clothing/Mask/sexymime.rsi/meta.json | 18 +++++++ 14 files changed, 120 insertions(+) create mode 100644 Resources/Textures/Clothing/Mask/sadmime.rsi/equipped-MASK.png create mode 100644 Resources/Textures/Clothing/Mask/sadmime.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Mask/sadmime.rsi/meta.json create mode 100644 Resources/Textures/Clothing/Mask/scaredmime.rsi/equipped-MASK.png create mode 100644 Resources/Textures/Clothing/Mask/scaredmime.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Mask/scaredmime.rsi/meta.json create mode 100644 Resources/Textures/Clothing/Mask/sexyclown.rsi/equipped-MASK.png create mode 100644 Resources/Textures/Clothing/Mask/sexyclown.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Mask/sexyclown.rsi/meta.json create mode 100644 Resources/Textures/Clothing/Mask/sexymime.rsi/equipped-MASK.png create mode 100644 Resources/Textures/Clothing/Mask/sexymime.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Mask/sexymime.rsi/meta.json diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml index 0826849475..366aaf574c 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml @@ -36,6 +36,10 @@ ClothingShoesDameDane: 2 ClothingOuterDameDane: 2 ClothingOuterClownPriest: 1 + ClothingMaskSadMime: 1 + ClothingMaskScaredMime: 1 emaggedInventory: ClothingShoesBling: 1 ClothingOuterDogi: 1 + ClothingMaskSexyClown: 1 + ClothingMaskSexyMime: 1 diff --git a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml index 189df1ecf2..e9329d9412 100644 --- a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml +++ b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml @@ -345,3 +345,47 @@ - type: Clothing sprite: Clothing/Mask/bat.rsi - type: BreathMask + +- type: entity + parent: ClothingMaskClown + id: ClothingMaskSexyClown + name: sexy clown mask + description: Some naughty clowns think this is what the Honkmother looks like. + components: + - type: Sprite + sprite: Clothing/Mask/sexyclown.rsi + - type: Clothing + sprite: Clothing/Mask/sexyclown.rsi + +- type: entity + parent: ClothingMaskMime + id: ClothingMaskSexyMime + name: sexy mime mask + description: Those ruddy cheeks just want to be rubbed. + components: + - type: Sprite + sprite: Clothing/Mask/sexymime.rsi + - type: Clothing + sprite: Clothing/Mask/sexymime.rsi + +- type: entity + parent: ClothingMaskMime + id: ClothingMaskSadMime + name: sad mime mask + description: Many people think this is what a real mime mask looks like. + components: + - type: Sprite + sprite: Clothing/Mask/sadmime.rsi + - type: Clothing + sprite: Clothing/Mask/sadmime.rsi + +- type: entity + parent: ClothingMaskMime + id: ClothingMaskScaredMime + name: scared mime mask + description: Looks like it would scream if it wasn't a mask + components: + - type: Sprite + sprite: Clothing/Mask/scaredmime.rsi + - type: Clothing + sprite: Clothing/Mask/scaredmime.rsi diff --git a/Resources/Textures/Clothing/Mask/sadmime.rsi/equipped-MASK.png b/Resources/Textures/Clothing/Mask/sadmime.rsi/equipped-MASK.png new file mode 100644 index 0000000000000000000000000000000000000000..d7d5bb0d6193d380cd1ca85d7a0f0f8833787a60 GIT binary patch literal 439 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|R5G zr;B4q#hkaZHs&5S5OB3`K>?;&)a7ma!QL)tmgK%j9F}l4USZ<6%yk< zaqzZ!i@@=H?^jRV;Nigcugd1p&ku6%Z)SY{R+_D%}! zOb&f44KkbzmO>0gDhwd!Ok|j#%!n${#lc~`(f!5WyVWf#S?B+rH2eB39fg|j$2V5b z)}LR&QK@$ZNs@@7C@Ai_j&d!_ zVpYMY0tc;TSY&js;Xrlv!HrTXVY}2JZ>x404S^P`xIjiwo-$qAigMW znuc8k762w1ll?HdFMH}k&M9=R&tQJYEx&`SS~9e}f))E4m&# z$B@1_XKVgRbN%iM^Y*l?TJ_JNRCt{2m9bKTKoEvE8N0|!V65^AVe%dpb`hzWyg*7FYC>$Z z@hvO@)L1xl4DS#biZq`J z=Q*uKtZ7>BkVK^Mp+B8jYU6*3Z zvcU5^ijyRv+=P{XK`7iBPU<+OPnNk3&)rti{0LEep zP)`0KF`k3Dc+X@qIa&oN0K+i8t;gdr8;wTQnzw_+aZE8D$KCv21Js2j4#N<9->>#? z7I@ELTmC6Q$PS}40JVU>85$JWiXHL616IaS6iHV>3IHb>C%eAayMKb-(xjN(c?2ee z<|jD?cno!22gh+>ww%GOrfp$3$m8`V*tT8e$VwWZUWJeOoc7)~o9a64aR4-zeS0N< zI>hsO4KD{;pkl5JfD#jqhM9A-1t=#zKk|)e1pvQ-`+iD)_B$33*orzt6Z6IZDAiuK h4$zi5fDYj70AKbZzpv7Q+!Fu*002ovPDHLkV1m-e%^v^& literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Mask/scaredmime.rsi/meta.json b/Resources/Textures/Clothing/Mask/scaredmime.rsi/meta.json new file mode 100644 index 0000000000..32b7b1acf3 --- /dev/null +++ b/Resources/Textures/Clothing/Mask/scaredmime.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/harmonyn/-tg-station/blob/11043a07f6136d3d196b0378c31deb3dc1a9532f/icons/obj/clothing/masks.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-MASK", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/Mask/sexyclown.rsi/equipped-MASK.png b/Resources/Textures/Clothing/Mask/sexyclown.rsi/equipped-MASK.png new file mode 100644 index 0000000000000000000000000000000000000000..93622d570c485e621172d757a8d2c4a1e2f4c01a GIT binary patch literal 816 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|V0| zPZ!6KiaBp*`DY6|N*tTNwo%55tEpA4tI5Oh{WOlpo_ z;PIDFb-P3H+eC3&(;w{(mz*6OH#`xz*k?UiFK6=FnKSS99{T;S=tlkI%6pa1&c17@ zTF@|*O=dHd}heZ zIQhLKX-1}lO+)_S_gU5N7xX&)mDGDEvVUVk{MzXi=66D_uhWS$<2umd@jw5%Qf=%O zBL%&fcXh7oxAgAzV|KF8XmPIjT_^qYl)FrxPBikc&uo}; z^jT7P>cLZoN=x6JyA@uLH~z28XZv1!S+eX_=<3i1 ztvmOHvE9*IyE^j6r!TyxRwQ1@S{T8fTomJ>{=`sAwDj+*)oVBYc204NxnKQGm2b`M zw}(F0aRt{dKEB|2<+;OAzF!U>yvNh;ZarJ0ExJ-B_P%y*NKdSinRg~nyS_fs{@PlhyQP8i%!*CvmCCy*GPcKhvGbqM*F- zI{zlkQwC-a7Bz9kr!MBOUsoXTHfiWPlD3=gWf6k z4;8xZ(NNav-T3zMDTbL@ALl#nNnq+_s5FY4BG~Ww{Ow1TmDd?Rozs7RYOg|o@g(!V zn-}$XSm)Ny)M@$G&LtSVhQ~lNVg`F=m(d#I2l49}9xv%^{mT%F)gk^NH<<`jE(?i}`hcYfBwAIkt3 z00UqE{tv)KbxbNAMvlni$poN3tlw+h(KpZNp!Uh16k;L3$KsFi6UY6_F09TmmN3H$ zN_h59aT7OrZl$uE3L?=8=)y|%-U9}98@u925DBsb#Pw~P>fRl$8mn`!2FVSex;Uxy zconLpb59%Y(AkA0v@6UBjU)wkhNEtcmjbIIB_vY`HEkZ9fP|b&W8b=Y9p?D@a}?0#FB$ yuj6E~SM7h{KOzlLq%SqVPsson00UqE48SW|V|1*V%Ciap0000lib@A%V@W|to8Ex zRQYwqubpNsJ9sdkQJw$NcBV@`w`1S!wy$D5tN7wa!e#dMhJPH5GMo&SLJUPJ3?Ta_ zGE7irRB&f<=woR>kWM2`%eQViH|}5yIf<>gTe~ HDWM4f>CdsM literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Mask/sexymime.rsi/icon.png b/Resources/Textures/Clothing/Mask/sexymime.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..4962ce0eefe10eb363edd3631b2d96041643b570 GIT binary patch literal 432 zcmV;h0Z;ykP)|7U9;v;ZE7>*TBg7>0qjZOa_Tp>Y&NEJ+gb<2Yt%nv&l%4doh! zp;QH}3fQ)d5>vB5Pylemg->EjTeKP=%Q9XR1q*^eX;I|jKVcXyRzV41F6{e0cU^ZJ zi|ycbU6YUFs0ykKAPtM7#AR8sJkQ5CdO_^@*nl!`Qvj6J^E_G{eK0q~q;OSL%2iMT zKu4pq;a@%~it(FAZw(W3?0Wwi;}GBF6yO-X!g&|J+iViCx1SuG7FAOQkX7LJpE%xJ z8vpd@Y5(SK4lspS%F$U<`!age;qrFe6#!qsL$6~AfvuQUVvYD}0GRGxZw|1Pod74m a;Q-&&g{t$1u0_890000