From e4b234c6cd57abf3f3727465cdcb3beb9ed8f0b3 Mon Sep 17 00:00:00 2001 From: TaralGit <76408146+TaralGit@users.noreply.github.com> Date: Tue, 2 May 2023 01:53:40 +0300 Subject: [PATCH] bulletproof and reflective armor (#15693) * bulletproof and reflective armor * bulletproof update * bulletproof correction * fix meta --------- Co-authored-by: and_a --- .../equipped-OUTERCLOTHING.png | Bin 1142 -> 449 bytes .../Armor/armor_reflec.rsi/icon.png | Bin 507 -> 344 bytes .../Armor/armor_reflec.rsi/inhand-left.png | Bin 415 -> 292 bytes .../Armor/armor_reflec.rsi/inhand-right.png | Bin 411 -> 289 bytes .../Armor/armor_reflec.rsi/meta.json | 46 +++++++++--------- .../equipped-OUTERCLOTHING.png | Bin 966 -> 411 bytes .../Armor/bulletproof.rsi/icon.png | Bin 406 -> 244 bytes .../Armor/bulletproof.rsi/inhand-left.png | Bin 422 -> 333 bytes .../Armor/bulletproof.rsi/inhand-right.png | Bin 431 -> 346 bytes .../Armor/bulletproof.rsi/meta.json | 46 +++++++++--------- 10 files changed, 46 insertions(+), 46 deletions(-) diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/armor_reflec.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Armor/armor_reflec.rsi/equipped-OUTERCLOTHING.png index 453708a972cdfde30af1af9903e0dec23cd4d02e..4d206ab3cdbb2aacf952cbb6fb2659b3c738d759 100644 GIT binary patch delta 435 zcmeyyagcd}L_G^L0|P^Zd(K-R#aJBV?!I!gHpt z25R6h3GxeO_>Tgf_Rd=dw24v3)5S5QV$Rzs8@-qv1=`ZZCsnD>(PU~YU39#$J;CBq zywJL94%;>q?-g!}U3F#Kw{KBD7*?+N%vQ-d|469IKixM+lAMo_D#k$T#)hR;<&Gsc4JL^LqMWt?sHXT>3nB z<$g->x9KmbbW41Y(x$y8;6HEcacQ9%oqLIQE$^|Py1)O_e3r;`4VxPV({BCAwqw|l XtbWx*cGneP*fDsz`njxgN@xNAnA*Q% delta 1133 zcmaLXc{tk#7{Kvgm@rb=jK_U-bZuSjYNFH-QgM3(ag1m)BPOI)wZ|28wvM{yctp?^ z8SR8lT}hpfTib}qB!Y}qh+|VENSiEs_V@Pp`#$eK-_P?7%L|oCwTMb!007!>w^jh) zBL{a^=YSvUc55-nFtpx;qxNI z=Z-a^gC@S-o+y<#z~@$|@S|tax+WtwKE=s1gF#5$(s5-cPNsDbzyvpS%9Yv}y?lHz zn+|FKcl`7Xh&RftJzeEl;4S z{sj|P9^s*4bs;z{6zgdQ9CT{$Ef-fv)_qk|u8k9G?DuV(OLi%bm@a|d767chM8h-( ze%cp@CeG;d&K!3Yc$63$DErJUGH2ht`!ad$7MAN=qL@EAT)e$1=NE|bL^LZV3{iGX za?(!863Yj_>8)7X=#bX^rH#1sX0(&0lvg1t?v@M}_Ab9QQB$D{QWY{kn+V(5-9pvX z6Ybc4@JZK(%4$cgyRCH#8>g#4=BDUik9OW|_EZzf75l^WhQV#fhiuLLWHOsk?@sAW zhQ-sV_Qq((vS1!(Q)^*iK{xB(_(lzxY+4q4=@%*E3c!Nac-f83MeD}I#)5gj&Qupm zs(l;4k%@`r4Flr(a^^F-;=-LNmLd@XWqWx&rM^FeI-^cKK%3T(VE@^HFY8!%S(cQh90cB#Sx4Za zTo`XY!ZDR~?5IP+9ttXxtfW2>qUM4`U=R^~;ey2yqspDaLlm86!pBs`&e04WmQuOh z@ERfq)E6dTobbDl=UtaOvB075P#fV-LnQbb$}|CIANo0C+FqlSjkpds=bv;ulik85 zS&VKjn8}#f9-W}m4sd>fOV-4NldDHJKJVUrLw^b7OGfDPW0C$9sYdbtL>u%QrgC-rhbm zH1y`wLUo`v!IB`qV21z5pdQE(5Or7xlwIiQ;uumf=jjATzQYC_EN7j3oL^b|ug^8_ ztjb`O&-k98_%=fz@9ljhrTD|?3|ChRgeoxRY&1V$Xj~FrX|U*?c5{)f`IEM^>>^@juVIr!L{X zp+yRt&tV4R1Y_2|&f5)@Ps%6l2>POuGOtb3wf^7LxvTy^+{0jVhsE=uczYnwwG5uF KelF{r5}E*}Z-Za?$2qZPg&}zhPt{d00p1`6n_Blz|N*nG-3hdGI;== zbUed&F{PFJ`tAqoH2D*N7MBBnFE5w1TZ8V9R_QAaMI%;sUl@S%)CrdtCdEI0@d+XK zoS7!gjSum71#SMP0PKAGYzyMvCkRC&md7ik`F?y4e|rF*5S*E&Ts|T2w+Gmd?{S_w z0l?!G^5*W7t$!ydo6pQm%i8?n5^i@Z>GTz&k=FnW4TO33=DnSf_5gC3Jh@Ds7MFuk zvA}Wam+VcBk1@Zv#N_zcfAvzaz~zN0^HNC_GXU^>VbCfS3v_k`>FMbOU}bex_FoMT z0}zYF_`bDGQ}ZJd6YI4J;Y|e%-D-8aI7l8cvbIS!ab*p_#>X(79RaS=8REKO%eX9C z87M2R8`|U9e#_}}kWE~3bo2uNr_;ef@{r$ezgA@qRo=i&1r1#$yxLRO1fW)``&X<0 i6o3Ly01BY)0RI57iK9e(;j!`n0000MQ0XCrGd^Zm?0{Xi+$zaX_QNcV1xR1r8m>B&jzYS6L>S zbXZioMKhMMdI_-RtQF*pSQ{`$lVzLJnnkvPtDB}aZ9c$tBwCqk<8LQ{SKN+{YxV(6 zOAra*`<8P+f4)ZBUXBK4Q>UNC(G3kvx-Dx2Y$_P`Hw8AZG2CVocrNgl&q*5S6b4UM KKbLh*2~7Zh&0{J6 delta 401 zcmZ3&G@p5bL_G%^0|UdV%))yN42)@>E{-7;bKc(E=EB()AP55&1qyG(?x-(On%|?ubyTVTj-I&IRjp~Fti|43ef;IS_g$Z9 z{&mv(scT#RIe45qvrB+4pNSzUT7|L>Csvzjo9y}WpWT&XysNSOefHMykS{^k z|Lk8>5xR3%xo*Aadabo7$>y3jEB_tqaX|(qHf-s)f3;RVoGg7inxSF$j#n$;^My1aa~MQ0XCrGd^ZZJ{cXt}|#7zk&Cl^F^hSmtmgz(U}R$9s*# zc}-P+KXM!S>;J0oR>HYdYc(fPjvudm)&(=DuLd!4*vI`o{nC6qXu6f(Rj7Z+uA3Pt%hXI}5RbYjn? z&(VC(pUPC++q{omK?w$axy!ug{`j`GG*)wQgx=x$*B=+8&6+V$C~yCfch`=!e=bWt zd;e4DzrI6vl3aX!ssy^%GBJEfX1@58gF#`U#gVtYojIpAyj9-vsef0@+dB@M`=7f# zzWm4Uwc2bWneR$Vppf>rS>%xxJS?9K$WzPS(m$5PE>89BA*WU+d zhgP4~Z=N;lu1#RQ(TbIIEpOE&uS}Weqy5_Ig^vp|Fp03A^=;jnwc6X`AHBJ<;p>h) z(&ygymwejWcRnz)&f&u3Ojd@AOIsJ#b*%g8vcfh?PI`Wjbv65`C}}h0y>T1rjArn0 phB{Ekvd$@?2>=EEww(X~ diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/armor_reflec.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Armor/armor_reflec.rsi/meta.json index 659ed1dddf..c7a0afcae3 100644 --- a/Resources/Textures/Clothing/OuterClothing/Armor/armor_reflec.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Armor/armor_reflec.rsi/meta.json @@ -1,26 +1,26 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/760f0be7af33a31f5a08a3291864e91539d0ebb7", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/dbc2435fa562f4ef130a7112d2a4cc9c80099894", + "size": { + "x": 32, + "y": 32 }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/bulletproof.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Armor/bulletproof.rsi/equipped-OUTERCLOTHING.png index 71a1c3d91f5eec5d7700cacbd8787522c80713e6..81512185135281cfe088087f850d732431838ab5 100644 GIT binary patch delta 397 zcmV;80doGv2b%+s7=Hu<00013M{Ml?0004VQb$4o*~u(_00009a7bBm000XU000XU z0RWnu7ytkO6;Mo6MF0Q*C?_jTOiwm7IAda7E-f(|8XS3l=hFZH00(qZPE!E?|NsC0 z|D}JX`v3p|3`s;mRCt{2l)-L5$f&^090n8HMo#DAP+%`a2&~PsR)T_U43i r`>O}hgRHI-ZKL3qQraEx&+`q(U?z<0000r~F00WIlL_t(|ob8&iYui8+#y^#&i$@b|NC+my z5R>3VLn+)Ev}Fp)5}GMX!0msKq5nW}0$Mx;x;XXJp%Ahjlnh=o<41b^&Kuu-X1 zGxr8ORsDg}tckOoV=HNU+BnUcD3;2P+6VnEbmAw@0H;|KjfHao0DBil!vCH8+*mjl zPO~PWem^b#_yE9IW%QEh#8=LM?cFW3-had%#wHBY7fPYL$&O2HnbmGT-uZpGeFytS9{?wC!b;qGfd|+sJIKJ!<)%eOoz#ll= z7EVhOg#URNp96ucOp3ArpFXs(vbqES`1bXC;63n6S%4~09U$9vIw0{Xz&uy1RTcpN z_WCmH^<}KAE{)y;z*=Py%yW&b0?czou~d#7=bU$j*?*xJUpWKre*8rH>IQ)9^>Mq* z29pf>U9|dLJlx-o+H&~<0K`s?lTexjrMouU01zAkZGH&=;0LG1CPC)8B9|}3PJ$2j zx61LAGa#2QV8eb10NAj{?bn^VK(CnM;r$o=<|7q9<` zogjHUud_9$wJ9ohVV(Z)u###&FpXLSt<&MCLw|{4sXVic*t<9qGG>$(l@3X4fYYoA z|H+F?JO9owU_KkdN91x#UYajYkCN(0Yyk6I5#Ifcsu$S*y=l|{Stc{7CLu~|99nZg zAXvSs}}9vaDlH(%b0v}+Qy?*k^)3z))0O~TX}5LGYmsygje zqkm~%-K1WVkl27+z7UvPj@UOlwnGhD6$Nl9$L+0L;Qm1^O70h6mhy?SUh z>~XQ=b>}WtYtm~@{VXtxq6m|*l?=$`3z4^2#QRu6S-UFjkq# zjS%M@^x8a?WBI990brOJy*5X$&9Q&5nKi~GV>zieMlsVMs}GX1 elNmrQfSNznQpq^}>$a-^0000SZ4)7?`T z`4)8Xi7+nU;{T)7(%Y*VFh?sXN2x(c;oYM?tpgE#kMtB?WF$z$Ffg#} zbjwu8?&c)A2<}3DOQC{`YZt9khl04?rGuNrf>5NiB}Gc<&^aASz8qRls)!};baQgK z?{iLaPNIFB+w4*YJ9Uo%Vt^Q6F99lj%aO!422kl+PA@Tb0DoGy7a=qEx|bL`QjkN* zW`J6=%JA}<7CwZ%m{V(3rANsDl$v3hI;mU%dolOosa(OkFO??w7*+a~YK9s+~! zN{kvEO#&c(1VQ7~*f3C)tpVIz4aw%y06acCht_Z;23Wfb%x>K&>PY~MQU;@xA)8No zYk;Dj#O&6$+kXYimv<(2Pk@`XA9t%E(b^SI?SVE?(;xRt)D+boZ1*KRJ~^dqoB>ca z{P_KB$>-av^f=il{w+Ic_F@3fXl39;89k44ofvPP)Tsw@I14-?iy0WW zg+Z8+Vb&Z8prB2FPlzj!_VV%)6BEEaktG3V{o z(|m^&cw7P>Clts8{rd60KKEv0h?kN`sd0KG>*5qvL52fUWrR0oAKGN{(EOWFQ^mXX zi7ON{)*M=uwo7iGe+=6W&iRdx3H4V=zB{4bQt?pD<0L&SK4a*=WYhtR9{+L z_iR_>H}!cx^_ew~|9--7@=Am4yvm{nqQ{RjoU39kiDCBsc-yH5sFuOg)z4*}Q$iB} DxAb@$ delta 407 zcmV;I0cifs0;U6y8Gi-<0063Kaozv`0c}Y{K~#90?b^Re!%!3k@UP-hTnZv~3`oF$ zPF*rwe1LPS=l6Da6ART;w60l3A794`$;-4a=Md*AT>=mns-n6G0 z^8Fw*2l`#Y%JH>KEoBPZ2V}G&dT#{I{TB~c{FX>{r zqJ6)ltF^lRIW?Vsx{F{g+q{isiA9@@7V?e@r91?aI(9y|vCi8N=>P!8Wk3~gd?MvP1{63#|Tr?Xkj0b(Jtga*PxPV38hR6nlK@Yn}2iPjS)n_NC zR{7g7z(zpk44ofvPP)Tsw@I14-?iy0WW zg+Z8+Vb&Z8prBKLPlzj!_VV%)6BEp^K*7~mXVQ}75xWfnpjDYUogXeY#^kucQH^!zo(01 zNX4AD(;USPDe$l|t4>&UMeEhy^;$bNzG9Oq|9A8J9{Df&l1 zAtTT(i#Bev{~}F!(+*gwMn7;$i3wP@OVoSe9gW#cUk{gT|M@__lHtJw=Aw8u)r~;q N44$rjF6*2Ung9dcc*g($ delta 416 zcmV;R0bl;w0@H2D?bP*>v!NsW`z$uH6%}LThFoSgP1C$%ObgIyy2#z`kU7XLMy^z*Rz&2Ms z`u{;lUdZszacPJ5hyVZp00000003Z@RQ@`EDeX>Is_UnRn}6K*+|%6*qgXN)$abeI z84F|>#Zvd&e-%cte1DsgI*Rh|>ux5!J~^&OockmewM~}ti%DUA?G7L!s#j<9{FqR^ zIx~^cIL`g0a~|yuIPwpE)Wcy($+p08JxY3g`uhB!TBAvh>k;MT*Dku%=nRDb0000< KMNUMnLSTXu8@^=# diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/bulletproof.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Armor/bulletproof.rsi/meta.json index 659ed1dddf..3f816376c7 100644 --- a/Resources/Textures/Clothing/OuterClothing/Armor/bulletproof.rsi/meta.json +++ b/Resources/Textures/Clothing/OuterClothing/Armor/bulletproof.rsi/meta.json @@ -1,26 +1,26 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/760f0be7af33a31f5a08a3291864e91539d0ebb7", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken/modified by Taral from tgstation at commit https://github.com/tgstation/tgstation/commit/dbc2435fa562f4ef130a7112d2a4cc9c80099894", + "size": { + "x": 32, + "y": 32 }, - { - "name": "equipped-OUTERCLOTHING", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] } -- 2.51.2