From df88c93574231c28185fe96faeb1d0063e10b1ae Mon Sep 17 00:00:00 2001 From: "Mr. 27" <45323883+Dutch-VanDerLinde@users.noreply.github.com> Date: Fri, 23 Aug 2024 00:59:17 -0400 Subject: [PATCH] Added clown skirt (#31207) inital --- .../Entities/Clothing/Uniforms/jumpskirts.yml | 15 ++++++++++ .../Loadouts/Jobs/Civilian/clown.yml | 5 ++++ .../Prototypes/Loadouts/loadout_groups.yml | 1 + .../clown.rsi/equipped-INNERCLOTHING.png | Bin 0 -> 770 bytes .../Uniforms/Jumpskirt/clown.rsi/icon.png | Bin 0 -> 391 bytes .../Jumpskirt/clown.rsi/inhand-left.png | Bin 0 -> 461 bytes .../Jumpskirt/clown.rsi/inhand-right.png | Bin 0 -> 472 bytes .../Uniforms/Jumpskirt/clown.rsi/meta.json | 26 ++++++++++++++++++ 8 files changed, 47 insertions(+) create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpskirt/clown.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpskirt/clown.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpskirt/clown.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpskirt/clown.rsi/inhand-right.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpskirt/clown.rsi/meta.json diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml index 3a552cd91b..9a91f92715 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml @@ -854,3 +854,18 @@ sprite: Clothing/Uniforms/Jumpskirt/psychologist.rsi - type: Clothing sprite: Clothing/Uniforms/Jumpskirt/psychologist.rsi + +- type: entity + parent: ClothingUniformSkirtBase + id: ClothingUniformJumpskirtClown + name: clown skirt + description: HONK! + components: + - type: Sprite + sprite: Clothing/Uniforms/Jumpskirt/clown.rsi + - type: Clothing + sprite: Clothing/Uniforms/Jumpskirt/clown.rsi + - type: Tag + tags: + - ClownSuit + - WhitelistChameleon \ No newline at end of file diff --git a/Resources/Prototypes/Loadouts/Jobs/Civilian/clown.yml b/Resources/Prototypes/Loadouts/Jobs/Civilian/clown.yml index 6503667798..3e4823d449 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Civilian/clown.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Civilian/clown.yml @@ -15,6 +15,11 @@ equipment: jumpsuit: ClothingUniformJumpsuitClown +- type: loadout + id: ClownSkirt + equipment: + jumpsuit: ClothingUniformJumpskirtClown + - type: loadout id: JesterSuit equipment: diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml index 01db51af92..aab58d0ef4 100644 --- a/Resources/Prototypes/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/Loadouts/loadout_groups.yml @@ -406,6 +406,7 @@ name: loadout-group-clown-jumpsuit loadouts: - ClownSuit + - ClownSkirt - JesterSuit - JesterAltSuit diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/clown.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/clown.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..4d7105e8d6d51d15e8efcfa82594693c06d9e916 GIT binary patch literal 770 zcmV+d1O5DoP)Px#1ZP1_K>z@;j|==^1poj5Gf+%aMXam@qzDNA!2kdM0Q2+n{{R5i006K60K@Nxf-Q9iw0Ez_#?(Xi*kj>|)=KufzE-~vU0000HbW%=J|NsC0|NsC0|NsC0|NsC0 z041%NVgLXD32;bRa{vGi!vFvd!vV){sAK>D0y{}WK~z{r?Uvz^qaYB385AYzC3*j+ z-R@yTP;jsIw(9<*Q&FIYkI__R#=ZYhAHWAd{VKqT$JI*@>O^pr+Ak(Dcp1l0{J^-Y zWN==y74W8Wrf3+v)|UG%AoJtI~d1>LG!xug7H}Hzw-^i zLlCsU!WUy(J=F6vfWqGi-0S9DEx!W%L?6HhKz#sb!1fnBx7i@6+OY-iGxi8NYlzJQ z@0~|L$wME3+8^uEo`nFo+H2SfbO6voXyFaGHwg?tkw;J&kO8n!wb4KD(jue)^~-=A zfDRz}jDTNu2dWg1{4!t%qz-@)$nn%2s4Rf{tAP9nEWGQ={$phcw$(xiAc6tdo&%1T z$PPg3Kkl}2QZt|cKwAH8+|)Io2K+$(8}NRA0d1JrZ@R}HKmY&$07*qoM6N<$g4fhw AKmY&$ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/clown.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/clown.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..5d5787d325a560b985d7bc520342bdeab46ccc02 GIT binary patch literal 391 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCikd1AIbU*Q{Y#!ol(X!2i{&S2uB}{{PSL`Sa&Td|Lk*7&b64Tw`E3!oYC% z?%g_|dIpB%OUhHpMf3(!vtp00i_>zopr0FK6=!~g&Q literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/clown.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/clown.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..48cbc3898b9d067eac62d57aec2c51e869e8899f GIT binary patch literal 461 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEV4ULV;uumf=k3jneun}?j(xOW zrgFVyB74Cn%Naa{Yo%@CO0}B175!}5C-WchaB5dOzA(l?=;Jh*tgL6bCy|?^c zW~rbA1JkumpXm~K^CMQUX=-Yk{onJZ#X)x}SdX%vpLRR{{o~Is+t$sUd}=KNLuK6N z2>$Qqw;4sRX@62#8`!rtXa7y_qM#ij3pft;S*Ini9ZT6zZyudj|Mp%c-{gaet6lx1 zXS$!*vx?0pKUeJfKC7tv?_6yB^Jm{Lo$xvR%!W;8bjr@&u$5kG^=#_oLrW(ecQ+C_ zYkT(dtfPx86R!R#xNxrYy!LY5>Dmkh;h|^c{Wq}1HTKLhWH_5<=lnuPed_JluDjAl zc^Q%)$nLnWYq2!j@cH6Z6$><-wq#D6eClg*(Yx1o(k{kXYTjALaKO8)qxyCZTmRyV zuJXF;Wdvd1r~Mwa6YCCNTvy>Yp*oV`!)%xD>lorDzc^8RPtAlWg;Kz@w3K!HnEh2Po0;7q+)78&qol`;+08Wa_ AuK)l5 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/clown.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/clown.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..965b9229cbb22672b1b32b3cf48e8fa109ccee1c GIT binary patch literal 472 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEV4Uyi;uumf=j~0yyk-Ltwg>aO zJo=^>vcI@eoU&@sx)Sd`ck6=}mUdY^m6==B&@=H7^k-zt`C=5Y8!Eer!kF_WuXOlZ)d;85kxlaj2W& z_$|nGihP>Kq@-1Q>Ya+UZ+7!M%@a{Db(0c}aTRc2S;4jO=G;BES>N6XeHI$hd-s&= zb^UGE+#=4WE-rqX{e8an?@jZjf3HmWbVq4|PPePJrbRsWo~WPO40lS4uFMylJngxf zC)bn8oq=z@ZAz@U#k&9GT?;0Lg8bZ{k0mV_DwqWp9}r>)@cWl~rsd;uL$mK!wX#g@ z*B(_qb@Iwbn@0cD>rK8paWf`xK43oJ?EmhZ_{-m?e*gHC<@0W}G6TcYz+M0c5`DV*os#n&16nM_W@UX1+w}q&}m314t&+T)FUJ?8FWa}-{ zcaOIuEiCJewUA|0xC2sn6{yeViF>2-TdD7bc1#Sr*SmcAU&HLvq1nl!wABU}V+@|I KelF{r5}E)hrP0d( literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/clown.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/clown.rsi/meta.json new file mode 100644 index 0000000000..490b3088d9 --- /dev/null +++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/clown.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from ParadiseStation at commit https://github.com/ParadiseSS13/Paradise/commit/95c46662c5a5cd4911132da8e695a7cc21fb4297", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} -- 2.51.2