From c51ff80a4e5043d52bd59839e77ab400b96f6471 Mon Sep 17 00:00:00 2001 From: kxv <136233650+kxvvv@users.noreply.github.com> Date: Tue, 11 Jul 2023 22:31:13 +0300 Subject: [PATCH] kimono and casa for AutoDrobe (#17962) * sprite * author fix * code --- .../VendingMachines/Inventories/theater.yml | 2 ++ .../Entities/Clothing/Head/hats.yml | 11 ++++++++ .../Entities/Clothing/Uniforms/jumpsuits.yml | 11 ++++++++ .../Head/Hats/casa.rsi/equipped-HELMET.png | Bin 0 -> 831 bytes .../Clothing/Head/Hats/casa.rsi/icon.png | Bin 0 -> 356 bytes .../Head/Hats/casa.rsi/inhand-left.png | Bin 0 -> 609 bytes .../Head/Hats/casa.rsi/inhand-right.png | Bin 0 -> 694 bytes .../Clothing/Head/Hats/casa.rsi/meta.json | 26 ++++++++++++++++++ .../kimono.rsi/equipped-INNERCLOTHING.png | Bin 0 -> 618 bytes .../Uniforms/Jumpsuit/kimono.rsi/icon.png | Bin 0 -> 297 bytes .../Jumpsuit/kimono.rsi/inhand-left.png | Bin 0 -> 399 bytes .../Jumpsuit/kimono.rsi/inhand-right.png | Bin 0 -> 387 bytes .../Uniforms/Jumpsuit/kimono.rsi/meta.json | 26 ++++++++++++++++++ 13 files changed, 76 insertions(+) create mode 100644 Resources/Textures/Clothing/Head/Hats/casa.rsi/equipped-HELMET.png create mode 100644 Resources/Textures/Clothing/Head/Hats/casa.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Head/Hats/casa.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/Head/Hats/casa.rsi/inhand-right.png create mode 100644 Resources/Textures/Clothing/Head/Hats/casa.rsi/meta.json create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/kimono.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/kimono.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/kimono.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/kimono.rsi/inhand-right.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/kimono.rsi/meta.json diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml index 366aaf574c..c0c50d9e63 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml @@ -38,6 +38,8 @@ ClothingOuterClownPriest: 1 ClothingMaskSadMime: 1 ClothingMaskScaredMime: 1 + ClothingUniformJumpsuitKimono: 1 + ClothingHeadHatCasa: 1 emaggedInventory: ClothingShoesBling: 1 ClothingOuterDogi: 1 diff --git a/Resources/Prototypes/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/Entities/Clothing/Head/hats.yml index 03841d71a2..7813870d48 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/hats.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/hats.yml @@ -24,6 +24,17 @@ - HamsterWearable - WhitelistChameleon +- type: entity + parent: ClothingHeadBase + id: ClothingHeadHatCasa + name: casa + description: Cone-shaped hat + components: + - type: Sprite + sprite: Clothing/Head/Hats/casa.rsi + - type: Clothing + sprite: Clothing/Head/Hats/casa.rsi + - type: entity parent: ClothingHeadBase id: ClothingHeadHatBeretRND diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml index 4c2980f916..fc9981466f 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml @@ -356,6 +356,17 @@ - type: Clothing sprite: Clothing/Uniforms/Jumpsuit/janitor.rsi +- type: entity + parent: ClothingUniformBase + id: ClothingUniformJumpsuitKimono + name: kimono + description: traditional chinese clothing + components: + - type: Sprite + sprite: Clothing/Uniforms/Jumpsuit/kimono.rsi + - type: Clothing + sprite: Clothing/Uniforms/Jumpsuit/kimono.rsi + - type: entity parent: ClothingUniformBase id: ClothingUniformJumpsuitMedicalDoctor diff --git a/Resources/Textures/Clothing/Head/Hats/casa.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/casa.rsi/equipped-HELMET.png new file mode 100644 index 0000000000000000000000000000000000000000..93a02d540473cbfceecb17e908d8a15ca7dfc31e GIT binary patch literal 831 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-HD>V7l+=;uumf z=k2VG-qC>~$M#>>aymIdOLx7e>xQWh64+i!Sv;^$uwvVOW1U{?++AsfxsSrEmen^F z9Nb!RVWCLoLXRAWAZr%KRd@J4o_hOP_1@=6)3a}Xjuwi`yH|d0`sa7t@8>W$2i(_r zEx!If`!~a-R}7ZF;TE)feSGcP!n9Fv$l4Xg-JK9sM{QN(YyQe ziu`F?_qKI!W;9d#S)+HPXrqCdFwfa2SAB8r6VIJ)s0j$ZzRuq8;F+pz&u(_>==VmUAN77DEKe(-Mk_Fq4qh%SVq+HocZ=aFBCBNUnpX=oSWr+ty~aKX0-&uqv&+qV;@=PS3vDH%tz%KiRIG z6qeOndd{W1@ivE`t=}ixX^dVg8#`d8IBG zd@S@Wh?ALKv!AiGb!zX#*%$PG?qKBY<6PrVzWsV>i2~CLUbPlu$t~8gQ&#mVto2SP zua1?LjlSKtG9dFFbSL$g!gzzFdrL+wf^>!Dc=g zivu9=;K2ij3o>d+I?a+Dc{|tih&0b!Ceb{z)9~=Ba|IP10?CG+dv}_6|381SzUt5qa5wlPZhT(FDyuWBidA%#g%d6w8_GMS_#3@HSbQF$-tEjq6Dn6LN@T10~$V_Fs%8^vTo2suhBv_f*7`9zX oHO|@bWDYQJ_);T0(|mmyw18|5AO?X;!IMFhr>mdKI;Vst0B9$OVE_OC literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Head/Hats/casa.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hats/casa.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..2820aefb7d6272c800cbb6dab739fca96d6b0f4f GIT binary patch literal 609 zcmV-n0-pVeP)Px%0ZBwbRCt{2+OcZeKpY0}Pr=}XxN!;MGK5UUgqmn;rYw4dkSQ2S@KX8!eGCuX z+_eNsCX)y7aC=5WN(h;<2@kd-Qwt22B@(hDBg=QLE&TmP%YW$;iir)#p>(yE>kZ(OTUQ`O^7XgBLB>3W*5zSXEL zR6j4H0feIwHr}>vIMqrN!n~u^Zr0V==?QGxMmz-F(N1DC0ARB7v(YY1Qnz;#^(z>@MZwZ3xxQ>#8J<4*t(jf#q0vf|g% zWT{`fDe%9o)&GDzVgRddz^XBTRX1SOHa-9%A|fIpA|j%-GtW}H&T@S2R)kuOnlia% zo~r=DZF9$QCe97$Sn3H8lj7Uvp66jOve4;tqTS*}cZhNkK)mzu?e;K)>0>lmto;;7 z>ijtHA%wu*w$h#sxp)HZuD`3k9{@mfW*~ls;B8BOqZoMs0y&rh^q#TNCnBOv_X-9; v>f+KH044wc01jnXNoGw=04e|g00;m8000000Mb*F00000NkvXXu0mjfk4_DO literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Head/Hats/casa.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hats/casa.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..7f6dd0c704719ba1f1703d4cb007bfcf77b93f0d GIT binary patch literal 694 zcmV;n0!jUeP)Px%R!KxbRCt{2+A(X}Koke?|D|pcN=!?Jn&NtiBM8P2C>{)RFm&+; z(Bu!`ZW#pKJN5$z4!UFt6p9x&9hziFhd>~drcJpH(YYsER#GQKa{d2pI-RWdp3XMt z9Y91xL_|bHL^RKoQnBN1+tq1vN9Sk3#E}%sX#7cY7VHBlW$fb3S`~rs4L>C9W_e)8 z75JXstW{GVA^?b_L6iLYS_QvKoPQJhbC>a#sYi3I<^>mV9Ap1x^`AD?+RQj@uD~u%{Qr58VH?iv7bA z92}pbQhJE$(^cd#d7I;Q#L=g>dUvlsj2QsF9-iR%+bN#E^aXap*fnEcfoPd)rIc8H z1UPj-N~r+|rCN89$Biu4Uy1G4QY)pzQ8f0Vb$OgLf2;sXDM%?rl(Zr8`pch0DHV%< zQu07T0ip|l3I7nYA}wj#!qrp$Z!AF80c4E@$U10vFQa|82 zP0^^w@Q)$gt*PG#*@fx0U2V6~N6+WkjbDkGR{B=6G2BZqE6D>BIz!iG?;~)^MWES0 z;6r1Ex=K^604XItyz9o2zidSpvDIu~5cYK5zx&2iD`51=n|%bse*6rrgsB4zd{3Jm zyxB(p;O}07)|=cXf16S_BIOwyBe!T~R{;?b&8t5cg6IOFb4|?v000hUSV?A0O#mtY c000O800000007cclK=n!07*qoM6N<$g6D2GcK`qY literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Head/Hats/casa.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/casa.rsi/meta.json new file mode 100644 index 0000000000..09c159af0c --- /dev/null +++ b/Resources/Textures/Clothing/Head/Hats/casa.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprite by joestarguy, code by kxvvv", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/kimono.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/kimono.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..a7e4614b0556aff9352b5c3eeffc80c7e426a68f GIT binary patch literal 618 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`lm_^OxB}_e z*pvyAXI!~*>Bo;BM{C*NZxsOwQXSl6Wy^4Vzp!<1c<8&b{9?8c7Kmq&bZ6*fxXW}%f`R>z z+r^rKhJHIvBkyIhO$`fPGnq8loM*VX$BZ)}-|)bqMGdM4n5HmPn5FaF`jp&|HKR(N zvti~@5!E{BGe&!tGu8-Hv3)T8Hc|he_(VCjEj$V5itY+CPH#}Ty1aj7y}X0FLyg4s zf3*j)CQqBq5iDNIzv>L{|BH*=wN}TKc8G3c3fRJLx8LSmT#uMd*9?TmUPiXtUH+AslYqPz_ zBe5p?#N<-5$us?%C+mF{ci?6So4JSa!EOev^ON446I*cN%FWKWFSl3yd;f*~e}H{T pG_U1RgnPbV$u6{qBj?_A&;~BB_+B0{|{_+TCUr(_vN|(M>`k(TJ!y4;=_L-8)kD6%} ztvw?;F+Kgg(iWxT=NB*sJozFnzTiEh1;fVb$I_X~KWc3mxGkCVUi{mY3v>`)YJ_K+ buP=iZkj(+aAaE&oGKlhY^>bP0l+XkK14M5W literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/kimono.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/kimono.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..0e31169205fb78bf8410dda7dc6da7760be34577 GIT binary patch literal 399 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`$OZU>xE?rg zAT~B-!sHoOu3S1=%l>|=$XW)5X$%ZY85s*1870>JNdcR3_wawM9m8* z`rgyUF(jh(ZP;m{BMKbZ50w7@Kdk*_;nrOjY~M|Awho$n&?tFRZl{aV$MXztDpz0R zw)?Diz;?d)?BzAW4z=cXFO@V7`KUSUWhjvpRrt%Euw`2|YlxumirJwJ3|lUJb4pMb zPF%59KqIKjW9M~|K*pq`i3^#R3B5bOGDB|b28P$q5;LN@Kb7+RxZ?kcmJ2x zRlo3R%_DV&iyt=laDCw2@r*@p(<_As53>HG&J)#)q54mjikC?qDFfF>U lD9s4yb-vUH&op0O1}z|)1BgN3Qt)ID<>~6@vd$@?2>{M)qEi3> literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/kimono.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/kimono.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..b6263cdbc1c458d7de9f7e10f3fc002b11063beb GIT binary patch literal 387 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`NC)_YxE?rg zAT~B-!sHoOu3S1=%l>|=$bSZgLI#GV3=F=pk3R#Iah3%61vC7I0&}L>SAc@gJzX3_ zB3j>03*>G#;AxpHv*zFb_?*dnJ=|Im)I`zpT){*}Q&+`An