From 8bc4d2ab7a48becb1488f23eacc2504502cdf659 Mon Sep 17 00:00:00 2001 From: noctis <99278536+noctyrnal@users.noreply.github.com> Date: Sat, 9 Dec 2023 21:03:07 +0000 Subject: [PATCH] Familiar Garbs (#22253) * update time * removing maps and adding petah for pr * removed shitbox --------- Co-authored-by: camrynz <99278536+camrynz@users.noreply.github.com> --- .../Entities/Clothing/Uniforms/jumpsuits.yml | 11 +++++++ .../equipped-INNERCLOTHING-monkey.png | Bin 0 -> 1616 bytes .../equipped-INNERCLOTHING.png | Bin 0 -> 1701 bytes .../Jumpsuit/familiar_garbs.rsi/icon.png | Bin 0 -> 660 bytes .../familiar_garbs.rsi/inhand-left.png | Bin 0 -> 781 bytes .../familiar_garbs.rsi/inhand-right.png | Bin 0 -> 690 bytes .../Jumpsuit/familiar_garbs.rsi/meta.json | 30 ++++++++++++++++++ 7 files changed, 41 insertions(+) create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/familiar_garbs.rsi/equipped-INNERCLOTHING-monkey.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/familiar_garbs.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/familiar_garbs.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/familiar_garbs.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/familiar_garbs.rsi/inhand-right.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/familiar_garbs.rsi/meta.json diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml index ce8170a7b5..da5c620c59 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml @@ -1426,3 +1426,14 @@ - state: equipped-INNERCLOTHING-jumpsuit - state: equipped-INNERCLOTHING-shirt color: "#b30000" + +- type: entity + parent: ClothingUniformBase + id: ClothingUniformJumpsuitFamilyGuy + name: familiar garbs + description: Makes you remember the time you did something funny. + components: + - type: Sprite + sprite: Clothing/Uniforms/Jumpsuit/familiar_garbs.rsi + - type: Clothing + sprite: Clothing/Uniforms/Jumpsuit/familiar_garbs.rsi \ No newline at end of file diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/familiar_garbs.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/familiar_garbs.rsi/equipped-INNERCLOTHING-monkey.png new file mode 100644 index 0000000000000000000000000000000000000000..50ad9b716fe90fe499e4778b444453b690b650c5 GIT binary patch literal 1616 zcmV-W2Cw;vP)A24X|2()u`3eNRlJ~WLXyL*RKbludh$ij)y`a0r2qQL;CysrRDlq4V3dc zoz7DI?CdO0^6OpU>M}qh_xt?-T)K3L^XJbmgu~(X-rn9nQ>he(4js~(ib|MJ&VS{~ z6(%Pq$>nl5ole|tHwO+JFvYLS09lp+=;-JGVDH|&T)%$3_UhHE|6IIyk$wC2m5yoc z`}_O#YB0>-)6+v+TO0T8-J`v|olGV}OH0dB?R7y2@xo1(<(7Cn{^{W0pb$ccd_FJo z`Mek%9WDJALWse^K@pF~kIAwu84~e=!5=$zY)d>I?2%HjKlpsU z!y120O$`7wH8mPPKA-PRVA$bs%<1i0(i1EcMcD)tfXzSx5W!%O8#ivSXU`rKMSHIsN&x?V90VXFW>Fn&}^y$;sY&L0n zdU~_N;jr87_Sxgdk5B92&>IBrF9o34Xf!Iq;V|KFnDNkUcJA~7(A(Q90Lkz7&jLiF zQ4>Rc8l$75Y~8vwzQq3^8jXsB2M>}+B(T|RBoYbs@88eJ$cSiaYLc`-sT+Fc$&n*R zfZ`e19_SL!+F(v&iU$2W$g<4PuNQ=;tH_^@C8=w%<8E@3jwM<5yG^=%`!=9|9bm|S z?SZb+;L{Vy((%XYDrmx%k2^%i?oI#_w8#iu5%sUMCY0Q8nc)Z0kJ~fs^Rn<~CJzn{#Ff}#B z!omWJi;Dncvsr958w(2y6bc10nT(i>62KDvzWPi_~sw%NqjIOROvcnnb>guSS zhghs~cL6B!1Es+>H#bvPS4Vw)J%vKSaDQw5eSm2LYHLl+p8p+Qxhr6Pe%?_1i(vRP zE=Q!QDypiQ5?}<&@vM~F&`R)CLPb}CuM?^USS`S6R1L6NfYqoPV6_0NQ8mD70al}G zfYk!5#+o<4)IPh6Znp%+(s70jkY!l} z0s*Zknwy(Bb?THP%d!BZ)l7>&2ZG`&SOIY2#0dZ*k%(5W8-@%hPjz`b9?qUU3qW6A zp9qCQM!GVMTrQ{m6(>)gEY+veX;b|fiUHfUZ4-e&0FTG>SiQ&N!R2z95?~ZAmkXE6 zwXBAvE7MSBz;qB)6y-73gTWv!mrJbHhY`<#2nK_tLOPw+((|TZI0i%_k;lp_AvcS1 zPAwjp)nU{CNpoLO6cLF;2#3Qs-`&9M%?FH!ikaC;hQZ)F{p{@XmN+$x%w3Z{Y52%+ zf2MAO?|=J2X`XF5Se%RY&IWc2Epq2@WfLPihPv>SagNMg(+-KDu?vQ8%Z6e=E|+6R zPxrDx=4EAwU%+KJHM=U=jr2qkPj{;X(ESBKMXv&BiF4TxHH^a06)-$J3_SaLfR}j{ zJcHZt6ws9yc%8B4ABL(1SS`S6R1L6NfYqoPV6_0NQ8mD70ajzp8}J|8Q4DJC2aO^C O0000dwot}8)(D#|%4Ahx6f^cP z7+m(SE`2Cegr#rxp^%4?f8gpn7sGCrhKcIaX(xg;UrX3h*cgeL-dlTmxW9&3B z_qPXguStx#_axEVVm=U(d(S=R`@KKU`FZZSha(~!WsaF`z-(#(Fx!CH)B<3(0kf$E zz-$9%QwxCE2F#|uR3XQ4dB=hvP;+xL0AP4{SS$4Td;|c=WD+AIBl(popiuwTty{Fc zy^TyJgPxuq?R+Q{LVbNb>~=eD-@ct!NpGfGG61;g0qR`gXR#AN;0WgvT+sDSn6!k!oB-m^= z*ladDefm`UElHAAA$$F4!`-knAB~NTY287RBv>pKa2y9B0>^Q%TCIip1mKL3#!Ci3 z5QKW3=MzLU==b}7DJ(yA>eQY(e!u^BB69LPzdAZP+GfN=34I&S^UFl^o!{?YH&Vy% z_bWv7HP7?^0QgYvdc7Wy2?PQJK;(ITxUg_}dAaaZbYx`YdjPKkfj}LA1|z0RkPZX_ z9Dqfh=k0nIXEGT8sLSeG0W|5=DH#A!6zwjTD=muRX}{mUr@TlH;Ij4pb-7$`MNv%Y z8PL%`;c~gQL{U6bOura6Z{CC`irrVQUR@VO@ju-PdPykvSP%r7ot@PZO&}1^64dPM zY}K;A5&dK`Ns&l|wzs$Q^jYqYh>XtzRNC9yv9z=V0I*mrkR%C9OG`L=_AF~tWs$2N zi^Tw-B7IJcbkV|Wrd4q`9CYH#R&0hg@NE1qp#2K4@*6&Pe};yhCagb>BODG_btbr< zes;WTH1*oC{y2`s#l?e}2?D@&H()z=9JX`EF)(u(wDuZY%Vo6uuv7jf6=!LVnOuDU zpfv?t%WfKblZpe2Y;BhPFhpw#qOWAonxcPkm1(SRL}Ps;wl+4k-{r!b1AyI|2Y~1+ z87I+^_m?gV{Wgkc|c!Z9{^x-auTW3 z&K7|1!os2TfbhZs03el0VRCXZ&l4+5IlyYQ0svN4R&edwHSN4C%W!md!s&Fv>-Cmp z#3)Xu6OPVKZM>^KR#sN>JQ{_$2jt$kiaPcVGY1qK@5Q|7!L%%X?#J_F`IAF)Zwr!7 z*0l4@y)D?7O<;aJ49iz^ptHmD9~^bL9ccQ(zQ;rI$r{oZ34i~(yGNj^`vU+VeUV^o zZ@>rN?(To$?8jjH_&6Ls1wjsdn%&^o~)4i+f?# z_TPD!dq80jD530IcF^Q%mrF$pB9u__^1)#feI-{Mgo*-CF#b%TQV(UV2muA}`_ vQw2Bxq$b0%8##nW_;(uf`>@Fz`2hS6q95gvW+~b-00000NkvXXu0mjfH*qD> literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/familiar_garbs.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/familiar_garbs.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..d0d58dedc812ed3516ad1a281e0cc709d12b791d GIT binary patch literal 660 zcmV;F0&D$=P)yT+PEJlHoTh0`*y{BGyy`j8vi}gph`T71kA70c!e*)f19z46x%EMK@9i5_Y zZ{U?%0w9;mO$C^`5&h1Nj@##_7&|79-{$DKpNJ-N+}i2;+vleM93LMCKQI@->rQ3D zW^DB*UeEo7-|>kNBbwAgzdsYezoK*@@K9eqjxIgF<3s1K-tt=4a~QpQ{sv||>B7ju u?*mJKCBVV~LNCL+Pw!m|z``rAaDYDvE7U5-`vofi00007aP^>4BJi|xr*h8D=F)WS=b80_I zT0B3xk|BYCAvwo>Th!Ws9(Koq(A8(k=1=0%(6jTsJlXP?gvIkvb2-*zo*qM`6gNrE8h3`!1vmRzyDpVh~4|KqQ*i+=J?9B<${VWR}NZ=vsTXQ*64B( zaqU>-@uYI!eC=q~=U*OKtXmp>Z2u-Mj>7`WG7oLb-4dmnc-ze9vWrC9r7DIcU-cCC za=a6>U}RW)@kNTAr;v(g6BqZwhn4s2zix=;NDT~PJbHBP_1B9(J}R8L`v8--&W1g! zwja0@kq~+PouC)fi;w#@=x`rcd@^tQZu9I&v8p}#ReR!HKdq7zxyQO>KNG9`zFMbg zsV_>bBzV|57IDlz%l5fl;_Ys;o%d9yure^j-(T|Mb8_qX_xm6G`)V5%D|}*J-#yC^ z)&vHD{hQ`9Fnpfc`S!i;gk1jTnqT!6tzo)Vo~vAcVrl8LgNrOe%O+koNV)y^Xny1N z_cyLSul>JcQq_E`DLc(l8Estiz9p|Xi94RqVzl((obH=BWt$!cZWX+Jf+3`A@zlKT z`$E@C4djXrFcLmI62ib ZE^_XCqYxgw9+1%O literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/familiar_garbs.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/familiar_garbs.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..6a936d7c38122cf0c8b04d2c2fdbdbccff3de3e0 GIT binary patch literal 690 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9GG!XV7ZFl&wk0|Qfv zr;B4q#hkY@71!SikZ7B)m%Ml8%pII315`Ltjvgs^Du2a9!X?(Xoeggu_;g9*DeuNcq8UyLr!Te+eEh{7}1J?D4LTwerUcA3W@1eo%SO^?tCm z!`oa@)(5-RO-z+se37H#hL@v&Nvimheb)Q^mOD>NtrU1(!(Hwm(KcgQXYOr=Q`>TV zF01eyp7ri(EwQql)w8HWqica=x%|8r)glMN_c2Q3S1!I}vh@D@=f#<` z-tD_QrMrGp{zbun=7S3HORm3u+MRoRc9?qX+vqP6PyY7vt9UwXzny9$w>d&5V*T}+ zf1g`-PcPqk>-xd1`&t1&YW=NU7YmwA7ZQt46n*RaWi~w zJ^AcC+oZGqY9{Zvb^XHI551%W_ncbIU5j&j3q`$HH!KCxnp(1r+f0w8YDgbQOkNXn z{b=DF_g=%Z**$tene1EE8tOUU{NDgnuvAmj;kMLctq@D5-0U9jz^8^cb{*TnGnJ{~ po9VIXD}+FjK`+W8V6pw5;q4?XrcOb<^}s~P;OXk;vd$@?2>{0sGQa=; literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/familiar_garbs.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/familiar_garbs.rsi/meta.json new file mode 100644 index 0000000000..a02f7be81b --- /dev/null +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/familiar_garbs.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from bartender outfit in SS14, edited by noctyrnal.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-INNERCLOTHING-monkey", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} -- 2.51.2