From d68261dac4f3b8a7689b40b1c2fa7dc326a48d63 Mon Sep 17 00:00:00 2001 From: Emisse <99158783+Emisse@users.noreply.github.com> Date: Wed, 3 Aug 2022 18:55:44 -0600 Subject: [PATCH] Sexy Clown (#10000) * real * yml shits * mask moment * Update masks.yml * Update clown.yml * Update theater.yml * remove tg cringe description moment --- .../VendingMachines/Inventories/theater.yml | 1 + .../Entities/Clothing/Masks/masks.yml | 12 ++++++++ .../Entities/Clothing/Uniforms/jumpskirts.yml | 10 +++++++ .../Prototypes/Roles/Jobs/Civilian/clown.yml | 1 + .../Mask/sexyclown.rsi/equipped-MASK.png | Bin 0 -> 816 bytes .../Clothing/Mask/sexyclown.rsi/icon.png | Bin 0 -> 404 bytes .../Mask/sexyclown.rsi/inhand-left.png | Bin 0 -> 458 bytes .../Mask/sexyclown.rsi/inhand-right.png | Bin 0 -> 462 bytes .../Clothing/Mask/sexyclown.rsi/meta.json | 26 ++++++++++++++++++ .../sexyclown.rsi/equipped-INNERCLOTHING.png | Bin 0 -> 1675 bytes .../Uniforms/Jumpskirt/sexyclown.rsi/icon.png | Bin 0 -> 562 bytes .../Jumpskirt/sexyclown.rsi/inhand-left.png | Bin 0 -> 596 bytes .../Jumpskirt/sexyclown.rsi/inhand-right.png | Bin 0 -> 619 bytes .../Jumpskirt/sexyclown.rsi/meta.json | 26 ++++++++++++++++++ 14 files changed, 76 insertions(+) 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/inhand-left.png create mode 100644 Resources/Textures/Clothing/Mask/sexyclown.rsi/inhand-right.png create mode 100644 Resources/Textures/Clothing/Mask/sexyclown.rsi/meta.json create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpskirt/sexyclown.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpskirt/sexyclown.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpskirt/sexyclown.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpskirt/sexyclown.rsi/inhand-right.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpskirt/sexyclown.rsi/meta.json diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml index 2a15090326..7e64d40173 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml @@ -5,6 +5,7 @@ startingInventory: ClothingOuterWinterClown: 1 ClothingOuterWinterMime: 1 + ClothingMaskSexyClown: 1 ClothingMaskJoy: 2 ClothingHeadHatCardborg: 2 ClothingOuterCardborg: 2 diff --git a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml index 906a5ea817..8d34ead042 100644 --- a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml +++ b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml @@ -143,6 +143,18 @@ - type: BreathMask - type: IdentityBlocker +- type: entity + parent: ClothingMaskBase + id: ClothingMaskSexyClown + name: sexy-clown mask and wig + description: A feminine clown mask for the best clowns. + components: + - type: Sprite + sprite: Clothing/Mask/sexyclown.rsi + - type: Clothing + sprite: Clothing/Mask/sexyclown.rsi + - type: BreathMask + - type: entity parent: ClothingMaskBase id: ClothingMaskJoy diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml index a2dbf6c95c..230900799b 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml @@ -553,3 +553,13 @@ - type: Clothing sprite: Clothing/Uniforms/Jumpskirt/janimaid.rsi +- type: entity + parent: ClothingUniformSkirtBase + id: ClothingUniformJumpskirtClown + name: sexy clown suit + description: It makes you look HONKable! + components: + - type: Sprite + sprite: Clothing/Uniforms/Jumpskirt/sexyclown.rsi + - type: Clothing + sprite: Clothing/Uniforms/Jumpskirt/sexyclown.rsi diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/clown.yml b/Resources/Prototypes/Roles/Jobs/Civilian/clown.yml index d1a9a534bb..c522b115d8 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/clown.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/clown.yml @@ -31,4 +31,5 @@ id: ClownPDA ears: ClothingHeadsetService satchel: ClothingBackpackSatchelFilled + innerclothingskirt: ClothingUniformJumpskirtClown duffelbag: ClothingBackpackDuffelClownFilled 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%Ciap0000kM&1F)7jPAokG35W#$-*%l_uDYtVlXBY&t|Aib6`_VqIbzNRJxiyal# zTLjm(X4z~P_)&M;H*en^879s<%t|mY$z}hB(!YnU-8DY0^f;{1^~8BrQTFa`%kJxs zZtmE4X8zsVO3IyQ_A)N#j(=~qrd;~eVMhPN*6AN6F5lo(X<;$%_gky(o+a<}7z(y+ z_?2;V%S|O|3k3yfi)ClUzFvHlw64@ms9b!(#xv}v5BEGxEVKFcXTotyhW6t4#}PK) zzkJ<#!sFBv-WAWBxMm7{F5_>g-Og>nk=5{9?(m+wizjFXo^6dYnq;8qu;%hh7KY6l zObP%09eZhE_ul%kSmbGghN87%3^hH+`!t$PKB;(PZ@exwu3^T}rdr!A;@9gY{re@j zY0vZyIPf?X`CVX1`eR0WTb5sQTQp@4YruGB3 szwO8m1M+kobV6-e#I86iB)t;;aoOj^hTY}gfsw=D>FVdQ&MBb@0KFf`%K!iX literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Mask/sexyclown.rsi/inhand-right.png b/Resources/Textures/Clothing/Mask/sexyclown.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..2fdbbef4f44bdfef00064465c4b5b2f8a255ee9d GIT binary patch literal 462 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zJ3L(+Ln`LH zy|v%(P=HL^!|x_*jLHj=3_kfmkb7DqQXJ=p%P z{IRlD^y=AliST4BSf>_(? z-n{jm+a7;hbxXBg_wL1wHfp{^TwIih4g|JOWg7 xBjxeeALT&C55I-X9XtPBYJK@G_R0Aw_Sh#rFACjPX9FXM!PC{xWt~$(697PJ*oXiC literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Mask/sexyclown.rsi/meta.json b/Resources/Textures/Clothing/Mask/sexyclown.rsi/meta.json new file mode 100644 index 0000000000..5718721a9f --- /dev/null +++ b/Resources/Textures/Clothing/Mask/sexyclown.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/6b3f58d7de4d4e374282819a7001eaa9bde1676d", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-MASK", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/sexyclown.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/sexyclown.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..ea58f2089db13045552520562b500cf909d48f83 GIT binary patch literal 1675 zcmV;626Xv}P)Cej@I zN)wqNqpWnML7eeV1NbL&oV3s!OtFyBtepHn!AXhGq83+CL5G!90nJTBW7On!-vej8 zEMNEB-MjqQeSUE6J?Cg z{U+nmgEI!+7ut7{bn$*M3^Jf2=DZg!9sBYe+T)+QYAo`;G7H6^DFaTH2HFNPvx7XG`;@#p2-UT#({5RaGz!8N$Y>pT?7uj_aBQ+kRh* z_h0?I6+iV~sCyzjpO63*jgMICm}-=oeGqCN*9)}3===AuJbfniq!ifsm!(BY(UV`& zG^c6-XpyU5k4M&(qnMMJB=>BUNCfKtcy$u;GEX5+9=BewNuv8uEk+OM23tQL)K=YY z(NFibS>xHbD1kwfjG~eiIQwe_!v5%mvWI4DUS-yG|2Jor z6c;-Q!9mYqYIHOv+IBWA{y-75WS&q4(Bg@F--bF2UjR&*Fb9DlfjGYI7Gg4H(<8d2 zKj)tqF`QjbG5WJZaP%NwRQBsj8NtTg@-`SUp$CTgg=0p@5|#xa6MDf{KAhZz3pZ>C z92tTr`5nMk>x1gc7R_^sy$fXbLP~Zi#*Gg_<^6IL$@~AB^)Bj5{E+qa&(IshUy*HP z{7AH*CZGz%Crqe6?1z(oUDPzEkN`I6I>G{HqSSO5rI8j)P3e!qw0e1@9*_TPK#%Ud zp(k4KuL5=%-a-$_;1s`V0S5F9l!*L!pBG@Qy@a5EQ2dfsjzPwexKUFM-<~g{zVQZo zuI@p#%g=$f_=(qO9N`qdDgmtZr=)@-d$Dh0Z(O=s#`<_5yyaM*Jqe3vt&xKIPj{IJ zdh)9hfF`3LfW25BZ^PK(Q*o}M5Vl8G80(7LN zo~OP$_`Qc9JRDvD;NkEJ01t;(0C+gO0>Hx|EC5wvcdyHDWm4!$aD#+n)mROL1faze z!JZTYs;^y>lqLmtI7B$OONE0B6P%mJsCF(P0hHzEz~Ep51;R}V+X_E$i$Q`oh)ZdZ zPzopc=w0tCNpNSc9=}1oUfu8s%?f_0&zGaRS;;bxeX^9bai8yr# z7N5QdOlvBZl1E_kmI&yLm^BfISvuX$$zpHWbA5dy)-Cr7ILG5F!Zl!T0h@&veii+&B?Zzk)hbDgj$NBOi z405tQF9MpITH<;l8SLC+Moh6k^UuA%QC6LgZ*mi*cVaU;jYE|HG}-F7pV;E5KL4n( zsYKmqXmpD|fIyXDssN|HeTLmTa#Ojy=QF+t9To;utDjeu0FhBku_cSH8oI@dk^TSCKn{pg{uYDt|zWICd*Jc?|PWaHOGm;ebmWBCRLv z8h?N?j`q1bf7O-H^ikNcCg0~-A0*D(p?if$iOhrV=KTBc9-Q?iX#OtXPESBbXv;4k z0`D(Eu9$>U(cN$rr)B|e-MNZ@!Tv2g0q!^p_}*9g6(|<1&@2G$xvt#*9r+bR@IQ_9 VkCmsReEa|a002ovPDHLkV1nCA8@2!d literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/sexyclown.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/sexyclown.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..aa7a9403b340bffc6382280592b79795333c2f40 GIT binary patch literal 562 zcmV-20?qx2P)Px$>`6pHR9J=Wlrd;iK^TC)6JyZ$qG>ZE5a}zlGz4B16Afw*M3RCOo54D$i*_(2 z5Hjmtii3kta8tp_#i=3=im@(2aR?Mkkmix$)uEt$RncJnPI=gZ;7Q{2J~;09@4x^5 zxPt>9A0Ho0L`0IIto$BJhO#0e@~1OB7jSG_lA)|O-YhQuAA$LWycBcO(#5fDZ(Yny z%ltxKTVjt+a-;JTfQi|0lu{}_G^CVLYGQVL$9`V~3MES_lQWp<0M$yFLdlYDyjm$^ zrUO(aXS{gN1prjb1i+WCj#f>rPx%4oO5oRCt{2**|C#VHgJR=YpX_te`kVI`jsup>SDFIMg6GnBt(#QW5`vx|mWZ z#nD|0x*vj*s~|4P;#lJ%1Z)eU&2r%=Q4mp2Q8~%$6e%GHy}lp0gXgy#H{5d{?|t_z z4?sjjL_|bHL`0N`h)Aj6$>6?J@I*x9f6t5~(-;wvUbicyf+wYdCoh{#l>umH8sYm5 z)G7-ySnxotvXFSOCNf9KX@<=$mT_cy+OjOmnp-TVHghMH0h~VnS!_3tmE|P>K(+43 z%JLFyH;-!FN%X}`WR7BK1y$>g%uYDif8rNjzv^Ii!ol0$n|SePGx0l2WDZl=0lweB z%}XAFc8pVQ74uimAZW*!zjZEEnWLzl0k)gRS^EllK@YZ@$D!}vQkl7v+5qleTu0E3 zaqrm;bi*$Q+A-=EnyJeiwofalSUisPH}5eSPNH=`0uUko^D}js!&DBFlSi+~!2^e} z(P<$kIZPF2u>D~ReXEbCzm2aydb@s)iOf+{eu3+EE?XO&7Rtve_!Ms;{P+%2#Tfv= z>chv07HT5X7~gN;$U{dvTaSW-L z^Y*5FhH#<;+lS{(3!T?2uyC>Z!nSr{L8PC>6$OhKj~1K_68zt=Yeta9(TlOHcli&V z3>BE3Qn;p2kZBw1#k8FTQ#3kOEMGC_Nom)FXZN2Lv44O0Ioio?(uXHccb8W(C_%xm z^PL?}jHZ>`du}wXql4$SUy#eBSeGSNbG-DDJ@t}Lc4vjIWb~PGcbm3`=(HuDon@CE z3VOsYU{<~A{=-8>a_wp9roNZAv_7q|=}b1t`?ij8j?Hh+664;jS49~dHs+kT^@qcJ}|nNzmCaPxPb2j713 z0#%mJi*vsGmuLCA#Wm}sq916qp4^xI-O;RCM0)-G#9MRS-mYUm(ER_md(2E_QMKyp zMHY2Gy58I`7nt2E6*TFPPZ^)}`|TI6-TH9L`p2ieQ*XFRm{ng_F8F%QHFtBM^FI$p z`MA#IYVA<_;4?a$w{iy0S5EcE8eEB|m&cnqEippRi?4>d_ z`?JT2nA!e5PjA&s*?0AZg4XqC%`8$4r?&poXgtjalul&2%K)STkKJMf%gKS{3~ayt w04Y7p5|sd?7PC~bgseNOeDKxGf3fupXK&t%GT&O?3QRo=p00i_>zopr0D2iFCIA2c literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/sexyclown.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/sexyclown.rsi/meta.json new file mode 100644 index 0000000000..357dab543a --- /dev/null +++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/sexyclown.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/6b3f58d7de4d4e374282819a7001eaa9bde1676d", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file