From 5b9ed564d5a29a4823352045666eefd489a68076 Mon Sep 17 00:00:00 2001 From: Flareguy <78941145+Flareguy@users.noreply.github.com> Date: Tue, 29 Aug 2023 18:32:32 -0500 Subject: [PATCH] ports shiptest's chair sprites (with paradise's palette) (#19645) --- .../chairs.rsi/chair-greyscale-knocked.png | Bin 714 -> 535 bytes .../Furniture/chairs.rsi/chair-greyscale.png | Bin 966 -> 1395 bytes .../Furniture/chairs.rsi/chair-knocked.png | Bin 766 -> 535 bytes .../Structures/Furniture/chairs.rsi/chair.png | Bin 1016 -> 1369 bytes .../Structures/Furniture/chairs.rsi/meta.json | 10 +++++----- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Resources/Textures/Structures/Furniture/chairs.rsi/chair-greyscale-knocked.png b/Resources/Textures/Structures/Furniture/chairs.rsi/chair-greyscale-knocked.png index be896ab2e7b0b6ea78a5b0f22f85b07fd4c0c0a8..a665b528f43d69a5ebe9d3e511be1a9eb3a9a420 100644 GIT binary patch delta 500 zcmVt-|n000bh zQchF<|NsC0|NsC0|Nj6I-_FjFAs2rEWJyFpR9Hvtmcf>TAPhw#7zO?R|D6yXs9wr$M%f=UHtd1UGy{1@BtV!ER4FVILW931~!d;2#szeI%t@56WnoRAvo{>h<*lK zbV8qono93_*fw{O_x&ZbP4BorPoFDy+?yljhycVK5rCK@0)G&5L;zxr2!O-xZe^lM zTw7bEQmJGtq|sVB16fV%H) zZ|U{*O`8XOsDD)UejaET-vPlzI3YYFc6PR@TrMkJ@G=;XYl_7p9ULA;?&InAdc9xw zR4&!N1Pg_Nf9`ai{ErIH%hUSC2DxN79BSJK@bJ)=(P*ShH~tDNk^@v21y}?J#32qa zWe^8&bwKdeTm%Q`egQzN1274?xHylU31Sjtdlm>#=YMzIllzBzZ63HFZXyS?YXPhS zpd4mVCc@tj<`1)=ta*h(d2!{0nP(P?zF<8t+t0by0%(Zm<&BkKEMho7bujCi>HEUC zWIIU)ctM+6||q!J*D{dt^S#wR2eAgld(U7D@}W0;Jua*I_F@!Kwq2un-PNgE&AOAP)Hd4oI?}XDdD- zu>e`^&&OdSK0zsf&HeeHKGk<@#3w`qu)RNzgEq_f1f>IP?$1vzoy8|a1aKAaLynL? jM2I;e05L}dAm)4l$$k%edTC=h00000NkvXXu0mjfk~cR> diff --git a/Resources/Textures/Structures/Furniture/chairs.rsi/chair-greyscale.png b/Resources/Textures/Structures/Furniture/chairs.rsi/chair-greyscale.png index 1bf59240fb0917c4bb3d4788b58c45b788cabc2f..1608b864abcb9024d14338ebfc90bc7c472e5705 100644 GIT binary patch delta 1357 zcmV-T1+x0a2lEP$BpLy8Qb$4nuFf3k00004XF*Lt006O%3;baPks%j<1qew*K~#8N z?V3GHEIkx}qrCPaXlbViBHG${K@jv02!4QnKubZe5(P{B1BxHuA5aj)*UnZEL9|=J z!b0sWy!*_}xi`$6nVhT{*txq8gk&b!=JWLQWUjBT&B@70C6u62 zz}eZEIXE~l4-XIaZ9YRoLuPSt(M(TI|2qoU+1W9BdwXVUYsU2yI168Xqhy)j!otE|0U9wul@kp0!deHU zfzjleARSv@U$;+xe?&Qge*PaG3W%l)FXk>>dL*rtA!*P>bn zFtq6u(^1i4h(!=9Kq((%6wp3S@A2``TwGk3$;rtiP9yJ$2L}ferx?u%(lI*43Xerj zULc=xl#hwnxX-yszLeKc$$x`%G#wg6*(JD6XLzb#Bp-wta$MN>=jNl^q z?s~w7cNUO2IAm%O0b{HPXS7K)kGfR)Ft#TOKeWG*4?2Ty|tkcTZ&DO3uOX{gQ*8|RVaJLRKLX8S4y zgidQ^OoJhWlvgPrWLkmH@;=IJUp);+^P|9dwZKyXdjy%WJP8Tg$g)-KR^H7>6w`sn`(YsS=~Nl(e?p0 z&SZao-=?aIuMh1JU}F{Y^Ycyb2t#Eo{4<0DIXyj1W&yUuNx!|l+1zZ7j*hE^LMhx7#ewwp z_9h#D3>-Z0_2q;p>yVW5L4@Exd5paP7wV*Lw!65nl?O5+t89wUhx!Oe(pji>g$0H; zr?s3C*9Ed~{~$NS%0fDybz7~j@Z>m5WVElncuke*!K(ZM@R%F%?G!4pi z8Ndl*lM)2iAH*i@Yb1z6Mz#u;U{*B3%PE$D_(w)1Yodc^BuKXA4wNz_t2~m+Al3VA)E%`+LEm>NsqBe76KB=Wql>y;K_-)9I~wL83qF0kZ>$pEVL- zJaoqiG74-)2uTQ&nVoq-s=NCJP|o29-~>#iwvvEEe|P5rQ7@6!Lbf+6H@dtxq zl8jk}M0b{eV39$Z>aw+I(j8w?AQ689F!;&W6ISlc_BOTKZNJfI7$pIHBGvu*=!liw ze6?vlDGK9J96{v;%!WOopsmV~>YLL6x=u(C^{EvFQ1LTAPhw#7zO?R|D6yXs9wr$M%f=UHtd1`MN delta 753 zcmVIIU)eQT3Q}gR3{r78>r*SBV&;5&5ayoz|hEO#Z>0#$1l3Nx>lY$KmVD_ zqw!tcouQN8zJB+%W8*LA^!Fca1#2HyJpmDn9D+L0xR;Z!v}M|wAJF{F8*g9L#wwM3 z?Z%Z#F1=f%rGJHGZ3Ts5!MlMEEAJ@_Q1|}ME?r(+YRjMv(-W_6Iy8vq0DmWVBKS!3 z^!3uSfqtb6PL7T#Yg*geXyEx^=s0?RZ~xP+V=9+wUxLL_!P_2wIq*Iz;DGjyhm<8} zC#Tx`1L!=o<)W;1iSbvUo*baUC_p_pAPRASsem|utA7Lhw`M&!K=%s(A{~H1(EQuE z$dMohL9R!E0CiUDu1w8NYsG7-GqA3xj$vEmAacu{eJ#2JO6 zEtn77ZD*{x0B!_UH-TpnkHgd69{O7@hg^gA#n#4_an6AI86F)DJzD6^rc#MM9~^qI zV0{x9B7Z|LG(OQ>03blrGvwn7wjQ(RqNoZ*#T4QMxz}94hH5O^>vL(uiHrOpLd+2X zh&dtvF-HU-=7<2q91(z+BLWa}L;zxrl>lkv=dsOleL`XZ(#p^4&beBjVC8@`^7FOb z%+@DZzXNRZ^Qz-6*C$vDV4I)U;c9(?QwJoWE@~WLgE&AOAP)Hd9grlS=W2aIVgb_1 z&qv{6eS%T|m-%_WKGiiY)+dAnaGjsWSC;D&ln!v2pRes^wmu;wfb0Bxu+EfX-K)I( jAwtX%0f;#w05Rtur_?SzE=l$=00000NkvXXu0mjfiNae! diff --git a/Resources/Textures/Structures/Furniture/chairs.rsi/chair.png b/Resources/Textures/Structures/Furniture/chairs.rsi/chair.png index 945f836dd553e31530653c8cd147d10c0211a787..025cdc8353d692e702eabdca08f0847a247edaee 100644 GIT binary patch delta 1331 zcmV-31FKFyWjbxzva}6g)0U-e0GqZf zEpGtTGPtp^QL~q7Ha9naJM3jc6EpywpPZaDJv}{UczD?Un$7+Fz4`d~FjrSsO<@F; z0Tve*&Gq%Qd3=1dzh*NyIA|s&Cd|RX!Ot&0$3=kWI>xtS~Fq@8! zj=nlX%DpdszIGOWs%HRx#Y#X*2Yqq#iw4(np$%VL{PKAO4M69Z+H{WP2)OqJWVz&? z|0O?u6YBAU9v$?>h4R|=RWm?3$qp~AaS`%egA|4Mcqq6@zLeLXc7aBMj`~tBDg(G1 z3)yU>i4e09(IE8^-0*id_=(8x5YxWO0CbLN%{DhAlyi-LQ3TY7i-81MU-%s;7t?;j zKMvDA9XvcdOgifB2z?}fVPQeN6AT(aw!tz28e~l_Vn;~(v`wAtGDENtlk%GORW5)< zsZcAFFA_#p_&s0@TB_J0f0PfQGJr(ctmgm`8KLh)kfZrn9%V_w6UZJVG7p>+4H`AYZfW?Cd1hYinznI{jl)HS_cHN$MYy z%W*ggmSqI$rv0q8;q2@zNwwt8fTg9ST7Q4PnVp?Y&e`wo?#%S`w9Wk+j-ye8H#9|@ z1-S5koIf`=mvo+!=PWKRF3iZtNOCfKe0*%4pP$YC{(hz|Q89p#mAAi4F<($D<~%MI z>3mw-=!9;uvoC0Xj*j&D2IW@9(*Rr_n%Hbk-1m6$E)xD_?)`H3&W_BDnFOX#7|sf-Zn= z+D~Hyl>utCni(A({h9?tTmQQNM3%v_pl;eoYg@h#Ku2^%XAP=jan|78-d-~>F!1&L zP1a_FJpf7;@oj($BTMIGFOb$Y+}zxlr>7_L_V!lXdjSp@s1W4cdluxgVJdnz$S#n7 z4NjAA%002ovPDHLkV1ic?j(q?C delta 977 zcmV;?11|j83it<*B#}WBe*>yXL_t(|ob6gMXcR#d{emD-Q6YHY5RHjZQy8#{3KkN@ z${?f?!9o;4I58k9(OQGrL<|U`SO{VjkO)GE!6Kl!N{B_&B$`5woCJ)h!D@4FxsgTO z{eLbqx4Z1TX7;#0GylK&yZ_IhSxp&-BY-jv5drP(9o~jb8^weEfB3#gQ&W?xC1O4yNV%pQNs)LDsAYaD1c3e4 zwjHe8?DUKkFOYhmgrp!u1gH;+)G!-qaBLnhH}?^t#KWK}9gYIrA4*jF8AEIy(7FGh zcjDAZ{~6&0*xcCYx9iufrJuik`_JDN7XJ2u+_NW7z2e((e`6%X;sMRgyL{s-#%K+S zR{;Gg%6KdB1dy-7nbZRS^{S#jw+N90sF(}m)#?MB2Otis{uKhq1Z+hi@kdY@C6zY~ zTTw_vK&>8N8j@FWduxl<0GIfzIC zFj@bNTQoR0e?U6Gjt%`*S`|Y7hK4nS-5^|Bk_tl(@*r(#=?^O}Dv1>ey`&3MB{3L- z{6mt11c48sqz_AgbRbjx!k`mQ5x%9e;=O<^1>%M~8KR8C5fJsK+6n6B^R@PiV}9v& zSR1Cc!?x#luK;Bnj)15?RYGIByj3qq^k+Q)8<5H_f6Pl82{68@d!!s&5ke8dWM!vb zkm~Nf0hDn#0yqIvrL8z1(VZm#mlDzniSBGoaD1Yenj2q1NOfmD07b^MLZUlMK=6=3 zTI#ZuH0jPSIUo^70Ze}J3SS+5aPK}HJKp2Hcs^v51dNGN_qhw_S=qa{2h0~mVLT2; zaPk6Xf5TcRXzOH1jm_x*T`MGr#?;CKaN>iL7aUTCwYFhe2bTy@#^DH{j6<6Mm0yRo z^?*qoSOU~#12y=ovDcBUO(Jx4kX)1y9ghPz@9(>Q)qg(Rbtts$yL^po07($W?!R-B z)d9K&b&rDR6~HA04Axt?6ngW*_J&Dac7P55N2dpLHgZAY-*bM>P}BDU!p7$GfbkMt zjNT8Z*S!Ffy0|b%8HXbv>QCMCc~kcS>Z!{z9^99D9tHYZ00000NkvXXu0mjf@s7Yr diff --git a/Resources/Textures/Structures/Furniture/chairs.rsi/meta.json b/Resources/Textures/Structures/Furniture/chairs.rsi/meta.json index 42085448d1..613d2a1b15 100644 --- a/Resources/Textures/Structures/Furniture/chairs.rsi/meta.json +++ b/Resources/Textures/Structures/Furniture/chairs.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/11402f6ae62facc2e8bcfa1f8ef5353b26663278, meat.png is CC0-1.0 by EmoGarbage404 (github) for Space Station 14", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/11402f6ae62facc2e8bcfa1f8ef5353b26663278, meat.png is CC0-1.0 by EmoGarbage404 (github) for Space Station 14. chair.png and its derrivatives taken from shiptest at commit https://github.com/shiptest-ss13/Shiptest/commit/f761c784812e827960a66cd10aac17ebc6edfac3, palette for chair.png and chair-greyscale.png taken from paradise equivalent chairs at commit https://github.com/ParadiseSS13/Paradise/commit/5ce5a66c814c4a60118d24885389357fd0240002", "size": { "x": 32, "y": 32 @@ -9,11 +9,11 @@ "states": [ { "name": "bar", - "directions": 4 + "directions": 1 }, { "name": "bar-knocked", - "directions": 4 + "directions": 1 }, { "name": "chair", @@ -61,11 +61,11 @@ }, { "name": "stool", - "directions": 4 + "directions": 1 }, { "name": "stool-knocked", - "directions": 4 + "directions": 1 }, { "name": "wooden",