From 179534f18d7001ad0922561ea56e5fa17c44ccd3 Mon Sep 17 00:00:00 2001 From: Flareguy <78941145+Flareguy@users.noreply.github.com> Date: Sat, 10 Aug 2024 16:06:50 -0500 Subject: [PATCH] Vox Minor Clothing Update 2: Electric Boogaloo (#30838) * more vox masks n stuff * cluwne * fix * merc gas mask * bunny tail height fix --- .../Bandanas/brown.rsi/equipped-HELMET-vox.png | Bin 0 -> 449 bytes .../Bandanas/brown.rsi/equipped-MASK-vox.png | Bin 0 -> 362 bytes .../Clothing/Head/Bandanas/brown.rsi/meta.json | 10 +++++++++- .../Bandanas/merc.rsi/equipped-HELMET-vox.png | Bin 0 -> 395 bytes .../Head/Bandanas/merc.rsi/equipped-MASK-vox.png | Bin 0 -> 354 bytes .../Clothing/Head/Bandanas/merc.rsi/meta.json | 10 +++++++++- .../Head/Hoods/moth.rsi/equipped-HELMET-vox.png | Bin 0 -> 1256 bytes .../Clothing/Head/Hoods/moth.rsi/meta.json | 6 +++++- .../Head/Misc/bunny.rsi/equipped-HELMET-vox.png | Bin 0 -> 539 bytes .../Clothing/Head/Misc/bunny.rsi/meta.json | 6 +++++- .../flower-wreath.rsi/equipped-HELMET-vox.png | Bin 0 -> 427 bytes .../Head/Misc/flower-wreath.rsi/meta.json | 6 +++++- .../Misc/head_mirror.rsi/equipped-HELMET-vox.png | Bin 0 -> 251 bytes .../Clothing/Head/Misc/head_mirror.rsi/meta.json | 6 +++++- .../Misc/hides.rsi/corgi-equipped-HELMET-vox.png | Bin 0 -> 1559 bytes .../hides.rsi/corgi2-equipped-HELMET-vox.png | Bin 0 -> 1566 bytes .../Clothing/Head/Misc/hides.rsi/meta.json | 10 +++++++++- .../Mask/clown_banana.rsi/equipped-MASK-vox.png | Bin 0 -> 1094 bytes .../Clothing/Mask/clown_banana.rsi/meta.json | 12 ++++++++---- .../Mask/cluwne.rsi/equipped-MASK-vox.png | Bin 0 -> 1466 bytes .../Textures/Clothing/Mask/cluwne.rsi/meta.json | 6 +++++- .../Clothing/Mask/ert.rsi/equipped-MASK-vox.png | Bin 0 -> 867 bytes .../Textures/Clothing/Mask/ert.rsi/meta.json | 12 ++++++++---- .../Mask/gascentcom.rsi/equipped-MASK-vox.png | Bin 0 -> 686 bytes .../Clothing/Mask/gascentcom.rsi/meta.json | 12 ++++++++---- .../Clothing/Mask/joy.rsi/equipped-MASK-vox.png | Bin 0 -> 470 bytes .../Textures/Clothing/Mask/joy.rsi/meta.json | 6 +++++- .../Clothing/Mask/merc.rsi/equipped-MASK-vox.png | Bin 0 -> 1193 bytes .../Textures/Clothing/Mask/merc.rsi/meta.json | 12 ++++++++---- .../Mask/neckgaiterred.rsi/equipped-MASK-vox.png | Bin 0 -> 739 bytes .../Clothing/Mask/neckgaiterred.rsi/meta.json | 6 +++++- .../Mask/squadron.rsi/equipped-MASK-vox.png | Bin 0 -> 941 bytes .../Clothing/Mask/squadron.rsi/meta.json | 12 ++++++++---- 33 files changed, 102 insertions(+), 30 deletions(-) create mode 100644 Resources/Textures/Clothing/Head/Bandanas/brown.rsi/equipped-HELMET-vox.png create mode 100644 Resources/Textures/Clothing/Head/Bandanas/brown.rsi/equipped-MASK-vox.png create mode 100644 Resources/Textures/Clothing/Head/Bandanas/merc.rsi/equipped-HELMET-vox.png create mode 100644 Resources/Textures/Clothing/Head/Bandanas/merc.rsi/equipped-MASK-vox.png create mode 100644 Resources/Textures/Clothing/Head/Hoods/moth.rsi/equipped-HELMET-vox.png create mode 100644 Resources/Textures/Clothing/Head/Misc/bunny.rsi/equipped-HELMET-vox.png create mode 100644 Resources/Textures/Clothing/Head/Misc/flower-wreath.rsi/equipped-HELMET-vox.png create mode 100644 Resources/Textures/Clothing/Head/Misc/head_mirror.rsi/equipped-HELMET-vox.png create mode 100644 Resources/Textures/Clothing/Head/Misc/hides.rsi/corgi-equipped-HELMET-vox.png create mode 100644 Resources/Textures/Clothing/Head/Misc/hides.rsi/corgi2-equipped-HELMET-vox.png create mode 100644 Resources/Textures/Clothing/Mask/clown_banana.rsi/equipped-MASK-vox.png create mode 100644 Resources/Textures/Clothing/Mask/cluwne.rsi/equipped-MASK-vox.png create mode 100644 Resources/Textures/Clothing/Mask/ert.rsi/equipped-MASK-vox.png create mode 100644 Resources/Textures/Clothing/Mask/gascentcom.rsi/equipped-MASK-vox.png create mode 100644 Resources/Textures/Clothing/Mask/joy.rsi/equipped-MASK-vox.png create mode 100644 Resources/Textures/Clothing/Mask/merc.rsi/equipped-MASK-vox.png create mode 100644 Resources/Textures/Clothing/Mask/neckgaiterred.rsi/equipped-MASK-vox.png create mode 100644 Resources/Textures/Clothing/Mask/squadron.rsi/equipped-MASK-vox.png diff --git a/Resources/Textures/Clothing/Head/Bandanas/brown.rsi/equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Bandanas/brown.rsi/equipped-HELMET-vox.png new file mode 100644 index 0000000000000000000000000000000000000000..0cfe46ed28eb7e317f7b73c9b07c0ecc6dbfd842 GIT binary patch literal 449 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zt36#DLn`LH zy=Ca%>>$GaVZUgWf{GNIgv4FR8NXV8h{^sHt5Z~GD?i4UYA|Dhke4WXv2K&cj>(gc z{Lfd++*w_|zC89GbH~4}+A|#sUzqL7O{lkUw2_}5zvS7k*FPq+A6l^!S{W+4<2gH*5w2mF)@9vxlTumN~EPF z=dmf%kM~8%>^eK;XUft_*864x7HVa#y(a4gDyLnES^Y6w@7Si*kGWJLZ{E&%66vui zD9bLlK4yRF3#oIpf5kknPmNvzwBeS&5&|qT^jf;)eV0)2H?EF-4SG{2&A8&Qu`s>% z?rUL&hDSe^?b)!ff}zSV^pWQLhIfm~TzMaSR$+K0njH9Fcz?}<84UZ>qJMKT=*DN(`i?1jx-fZ|v{jJf?X?BgO*Pd=&n|bo< j57qU(9Wam~XveT9^2oBR36s|Xv-&&SpLKo^6-1YfVuDILeWuiabVcfi*DLaW{6-5eM1CJO$KWUx-$-n-8>*7|5M z_p)^Ux}!ZW1NEHbH!%MUJ6>LPz`vt){rf_}lyRFIq3){vDbb?KywtJaZ<9y=o75?R%T_mng}u0SS1z`njxgN@xNA D6;qj5 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Head/Bandanas/brown.rsi/meta.json b/Resources/Textures/Clothing/Head/Bandanas/brown.rsi/meta.json index ae74562560..5539c0fb7a 100644 --- a/Resources/Textures/Clothing/Head/Bandanas/brown.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Bandanas/brown.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/4f6190e2895e09116663ef282d3ce1d8b35c032e, modified by лазік#7305", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, modified by лазік#7305. equipped-MASK-vox & equipped-HELMET-vox states taken from Paradise at https://github.com/ParadiseSS13/Paradise/blob/bc095ad398790a2b718b2bab4f2157cdd80a51da/icons/mob/clothing/species/vox/mask.dmi and modified by Flareguy", "size": { "x": 32, "y": 32 @@ -17,10 +17,18 @@ "name": "equipped-HELMET", "directions": 4 }, + { + "name": "equipped-HELMET-vox", + "directions": 4 + }, { "name": "equipped-MASK", "directions": 4 }, + { + "name": "equipped-MASK-vox", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Head/Bandanas/merc.rsi/equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Bandanas/merc.rsi/equipped-HELMET-vox.png new file mode 100644 index 0000000000000000000000000000000000000000..00cd7d82d0e94ea74f0aa3703861b5995e56e4fb GIT binary patch literal 395 zcmV;60d)R}P)Px$MM*?KRCt{2+OclKAP|7zYn3gN2d@@uCd3=?=y?N_sVmBw!Bb{;y411aSU^pY z`hSZhJ8)-wWI05Df9)e@khR0qbw?S;yXf_Dxn|Av*YOXz!Hwy~nEvU0jYXKp7m>#` zH-6Fp?@!Y>-dCS@-BHfxuiX~G+F^3eNQ^g`=b;M{LQJlNqzc$7HEV|{WxiZm`o{E+ z#h6!PiqDiEZ>?^PEf7K!=giYR=Zu69v*xSz$Msv*w&C8}uSvDGT$8*%P4g=N00000 z0002MmZDbDtER-BX9cu1zEsi@%NnRJzSfbA@m8Ezt$4*1uuMvm(FSH|HE91&zx=Cs z)hj^c=jHW<)!rT2<+jrta^of+kx}}EYqzAA@w}I}r&hKU9g(SdFzTIoo4m?7ffoDn p)pBaNAK!9r000000002cgm3Z-u%s-pk?b$<z{x9NSQyrLMT!O6O9&n1W0}jNAS9{)-NC_P)Px(qDe$SRCt{2noVdMM-<2ZTgL=BD?tQaix{kYR7D`AAZv37hL|Q77iyP4LQx!fMu1^|F4^T*G>(*C=%52#Q8kUcV_kG^tj{CUV{R?>W(G?$lBxcBrK zZOguTiMjcBUybf2Uw!z9w&i~Mky}3V4Vi>$65%8ARn!fQD)IR@xq&;N-||1;5k3`L zY-*p1Ekb?x2$_Uxo^fkmXf@vc%`2bD0f1%f(CbI=j0{7sA0eBZ!N$ru zZr!;(C_Rx+$7y(Lm|pMuJM1*O$ZM5ZTcA2FWvhhwR} zZ-#cm{DB~3k4*av-N4TF7X8m6pLq%R13{+texmr4Hsb;7x$h4Iq4*T$F_|3Ta(mIJ zRdN5xV{ELf1F&ZQ{*%XO)T;DFWKfXt4c!2FF(SWtpxfglz3+jl=S8Nai= zHIVSP%MV3W9PaI6bbNxg8@d76BcrgEW0ubp0pVCm+S%ShWxqlrp;4=%vR@gv@dQIR zFgiX#Bf#Fy1GmEVP3b%gx62JhRRE_m4}fd-0pJp^BIjvzD~Ef#P3!$|Zf~u@XPN9azOFdw_lh5F!u3en`{8IAfi>@|AO~OOp-k^M#m@Ma(ijM zz;oj|3i;ANvc#E$Y8LV(cy3&$$M7z<7o+17D-5+0Ho!m6g6~iK90W+YP4`7 z1DO4)7sw=3lZ;z8G+Y~VV|gh>`{(B4+;X^<08y$nS8pf#>Lma;E}9_GWUojeoK+lg z9!sF3BII{u_C-g9dAaxW86vYU+T`>DM-I@+#irDB-Oy;EMEJ9>0l?9IK<*`DO~n?Q z3~!as1GfW6$c3URv~m%3L&J!Cl@>}2OG6ktK0su8lFJF1gla~nCoy(>fMIC}fK{A9 z>VmX#5hO$8WSMbog5*qI@hLEL1EHvj!decVKoCRTn@t52PPz8rQ~Yw*8f(aV6PHf@ zp~f4!0mY|KeR%Q%%n?8`#Qs3ADP0|ks)5rZu zN4MnO?m710*7q6DD{pemd%SADQQa2CeH_y-ot)kyZ*%Y-bDvJlmpw7BZ+!mtj&ZkW zfk|h~)c~uyOJWu7M;Nv-m?bepGe{dY=r;6991uI;#*@IEAUubC&djxH?%8v<_)Qg^ zpk2A(5m$lbq#aAWm~#$UrtyX5F+RxWdDeeCXyr8qYq{SyxEMb9%w1)sz>aFzv&Xz1 z?^y4Yf0%YrLSv~Mzv_7tb;Ub+1rlwcvaa{}e#kz9vBGBZ`@Iuv4uyT%*LUTf z!bt}66+x>4y-dw4noVWvLf=eGIZ!)Gj<-X%c)O-%=r6sf*Y&*w%+TeRj zwtBAUYQt|%tl9}@&w5|i{dc8xtLq;X{n+g{E=Cyormt%<&K72I6ku_*khRbIB)LXA TQT_=qwi!HK{an^LB{Ts5zW?Lz literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Head/Misc/bunny.rsi/meta.json b/Resources/Textures/Clothing/Head/Misc/bunny.rsi/meta.json index a470e00944..2049d3a486 100644 --- a/Resources/Textures/Clothing/Head/Misc/bunny.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Misc/bunny.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/4f6190e2895e09116663ef282d3ce1d8b35c032e", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, vox edit by Flareguy", "size": { "x": 32, "y": 32 @@ -14,6 +14,10 @@ "name": "equipped-HELMET", "directions": 4 }, + { + "name": "equipped-HELMET-vox", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Head/Misc/flower-wreath.rsi/equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Misc/flower-wreath.rsi/equipped-HELMET-vox.png new file mode 100644 index 0000000000000000000000000000000000000000..daa702cc700b4d88bfaa35f78c8c469106a9c568 GIT binary patch literal 427 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zQ$1ZALn`LH zy|v%#aDd41kNHB;UJIL#dMqp{`^YKc^6G-s4;HqA;wKbX7tUUs9e3cUU8BhElE680 zYTFk~;1g|`_RVU_4Y96S*LaTJPv50je{SdVG;4O3f2P_mxdSC;RO~GeOWD2W=wV;m zkL8yHo`>oD+ z8sAs%We&fn`!_S_y1EUQQ0;ZUNe6y!?!EotrT8+(V|#h7+U(&;FrR*}zu;$@&Ws$H zWwZO&GqNp@@bt6a_(Mc2Gd$<>-C99pFmbC`Yh&l{Pn)wF4tMXi&z>eXr#vWg&%a%^ z`#K&cdd13be>geUH=TWvfk9@@y^jWOyK?Qy)aJg(;TArxqm%uT$wE#|E@*~q*b8x{ zJ8kD5zvg@#mp1jzzDEo;yssIGH**xe3GLocX40*ogaDgb{Q0;l)skJKSb?F>;OXk; Jvd$@?2>|ACv-JP~ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Head/Misc/flower-wreath.rsi/meta.json b/Resources/Textures/Clothing/Head/Misc/flower-wreath.rsi/meta.json index c3dc06f19c..9759b9c5ae 100644 --- a/Resources/Textures/Clothing/Head/Misc/flower-wreath.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Misc/flower-wreath.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-4.0", - "copyright": "Kevin Zheng 2022 | equipped-NECK and icon Drawn by Ubaser.", + "copyright": "Kevin Zheng 2022 | equipped-NECK and icon Drawn by Ubaser. Vox edit made by Flareguy", "size": { "x": 32, "y": 32 @@ -17,6 +17,10 @@ { "name": "equipped-HELMET", "directions": 4 + }, + { + "name": "equipped-HELMET-vox", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Head/Misc/head_mirror.rsi/equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Misc/head_mirror.rsi/equipped-HELMET-vox.png new file mode 100644 index 0000000000000000000000000000000000000000..f60f23da1ca672da3adccc2e769f4603752dc1ce GIT binary patch literal 251 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|wtBiahE&XX zd&`jTkO5EYL-s>^{kQw=4LUz5y7YDJuQmhMMM18a3I-qQi)E@mJX2?^e;X7%Bj}W% z;_X?>R{okFzx$e)Tg$I~;Vv~r^VaX4TWQ1NJZ;Ik*D2AbH=Wpatnke1U0#!(RpxEu zU0OeLVNSx!ySwax)TP)Px)(Md!>RCt{2noVmPM;OQdQ>tA%j#UYvtPx0dKm-ZrkV9_w_y}Y(Dp9CwY#!eMZzeQoGS{S zhk2?0<0kZ-698%FexC3<_a^Syn?FP46;6QDbLJf$gX4#D@d5nKJwQ*5Kh#qg7T)%G zBN*u+&_6x*9aQ>v{?Ffcqy?BpZ&y`L^F>+!{qd%+sq0@qnadCW0Q6r4-%B9u1Dttw zB@5tuRyvlg3_@4R5BqRqT;M5<9;IWkXD@~F6|w-crg0RpUX^ERP zO{fAQ*oPaOCyT=yuLC4T&qwLFeYhc%_e=rIn#Py++oPTb5-r=;*%^frBXO4Z+khew z+>JL1rFT8Ar`}!vy#e~KoNodd5rixtepW_r`*>>a191N9Z670kRu;)tir)6|@Q0q7 znDg1-AIAcmbbaXCPVcWCP5QfRWq?G>X4H5UL%}}W;8#{#N>u7BvVvLZ zg=c}F-Y2^Gm{2+yj6!Lw@vPH;;}1sgWD%^>aPDO+P*?yX`v8D{?-SX|z)7b9TJX3< z^)}w`Ii+_mn5HpP0IOLCUYk?D0KN22&lz5u$}E9q7a4+PD=)JIU`F-YS9_OkyqouA>p-yAW+}(H^J#EHvGur~pKbY05Lw~#(X#Rv&{vCL2I`2iH zw+m={7fwE`)4-M0o;nN&)@cYe9uU|N85}*K zxM;I1;DZtX7&hqgAjaKJZuN+RzBs+B(2q_4@(D{@>kwJ;e(*kE8X{kLB7ATbAj?N< z0jgLCaN8BQZ9aJcLPdtWcpZ&u=jrFjRFx5E0gSP+YZ~4dy=wf<2Z+{t7D|Qy?H$hJ zjDYI0A`3tjqD_jM6oK+)od#5ipv(#KWD&Wl4debJTwh-+7vcK)nj7~YAy>6$ZivVb zNdWh@IRIQ9!~i{obUGcmVqVheG@z%3WsFc^1yXxaejoFAutM8={qMken!A4BSJ*jjT!;;l(Gs5(SJ2PNGeGr0mgQH_0(KekDT+d z#z)mn=G;u%vEi6 zc@RT4Km0&Rv}`slb{7SAxT~9wAy>5{hu(k)0?3}kPz?n^qShm{0B^s~Ogy82gsL4| zHVzX zx2}7$rXgDyVD*Tjr)VM|Q>VsL1W46Etk43G1ESvV?E+ob{~~7zMDWWe(XyF^ItMUz zdL+!@Oj#e`c-}Q5gIv{Sz1`b6C+t2w64v~I2o^w2iKagwTo1^Stqfq+H1u}uVI3km zTw&Gdla@9hsP_SN<}QQ#;6yhc<6-v$7A#n>V8Ma~3l@B;{15EsV%S;hWXJ#j002ov JPDHLkV1j-v(~JNB literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Head/Misc/hides.rsi/corgi2-equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Misc/hides.rsi/corgi2-equipped-HELMET-vox.png new file mode 100644 index 0000000000000000000000000000000000000000..36ddbc1cb89feb06aae389b4dc8b9beec9fe29d6 GIT binary patch literal 1566 zcmV+(2I2XMP)Px)*hxe|RCt{2o6l?GMij@tQ)(&MY+M`T)w1Bk3uduN4}0h>5D31cuuy2vJ~UnO zN5tp&zepCE^A-w)1{Sjr$Z31*5>tGrZ7@-Bi0d@l*eXm9)>Fo|EX_ztQg8hML8Oc{ z?|t>=hvtm|4>;$pM{_U6z0Pm@P^sUKPkc*^(W+?tvGD}0ipJf}Z=0y=XI}ptSCA?L zfHSl0ToJ`J8c;GBD9wcaP6V$qe5Zii_Q^- zPlMdl|9%bnH%9={&iP%!A3T~kXCM9u^eklo`fuL@02^-}m)ndZ7Yk&B3jDz%Ku?Wc z)KeH*({{PT8|5YdpMGQ32qM5VW>T0S0=N!0`ireQ83q9W{d4bg1*8R_aaMn^* z(E=MZ4QoF;Dscb&<`^qy?PsN*D5BJ8fVoLzi6Jx{)t35@&Iz4MZe@=)93H-n?-=b#wgl0qCDQ za{?6+q#_`GTtaW-aO&F!h7r)s#n9V0MEtlU^H?Q%8;8R`^wh+d&jx=v5#W@Q#8ZG) zMdPHZ?Gyum<%7xoF0(s8qHZyAK8mJb?PvL!*;W#jUKT}xUwP?H(Ch6J-CRtnoC-$1 zIO06JIEB+6*zjZl?BdipSBXI7VbJaE6Peus^v&p|#q_~r)~e36ap&ExQ+e@&X&Sx) zn6)Z!)dD0ZI{mlr8LnC*Mu&k$7ZqrBz&;V$ALx^Mmd5zzXLnYAkP%{9;PC$!S9z*Wn+FC+}Oag1G@;>>JMZ3fOw zLxH5k_gxSf9DWYKc1(ew_laC?JLd6)_0G(B#<373;^PgHld)UAy zE@LwhNfV&8!@Jlc5OrOl1t5cHk>WN*pl7p-Q$!^~WSt;S7O+ybU_5<}PNx&O2%S!c z8&98OrEK{wh^P=s0CCwI0D9j7&{IgK(_!tJAe~MFdTLmQO%zd}^!+S$aO2Js+Sflz zKa)Bsm5y`p!~xh%PCztL#bBq75E)^SXavwxN(Q+(tRe#X z=hKs{S{jIw5v&vSB{$9;%-fM7#E;EF)h; zZ{rZ3{rJU1{eFb{7NAkUL=}m;#jZ~p9LRFG2&-ZgW6X7A5S(Y-T+DS8Qbnl=v??0s z$%0q*m0h1S(0?8Mexd&BEysDc|HqF@;K_pWydd-_VAiTg)Ga3*0kCPgyD*69E_+ot zk_2pE0eTyUFl$w;lr7fH#h6znR%wWnxW^Wpt&}Zh)~d?8LPP@h0rBG!{sz$8i}986 zaE+dGj>~N}lC_Bndge{K%R+N6#>tkTglYmb1d$(8musPZ^*@-GUy$W~{&hh;xAWE3oF?=tgOoy#zA2J*T-B zL%eLU9*(#;7YKq<6Ugiin3$8NA1d4@kBuic^O3QyLK#9u0KI)+GAVgmIQ5hn;;+DZ zXz*?>d|x01Eq;of9<@=wA36o8%kO#O;t1I_ODocI=FFKhXU?2CbMBLW0Zz1t6k_kP Q82|tP07*qoM6N<$f`V4!VE_OC literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Head/Misc/hides.rsi/meta.json b/Resources/Textures/Clothing/Head/Misc/hides.rsi/meta.json index b58f55cf05..10971a4a97 100644 --- a/Resources/Textures/Clothing/Head/Misc/hides.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Misc/hides.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/4f6190e2895e09116663ef282d3ce1d8b35c032e , bear pelt remade by Alekshhh", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e , bear pelt remade by Alekshhh. Vox edit made by Flareguy", "size": { "x": 32, "y": 32 @@ -52,6 +52,14 @@ { "name": "corgi2-equipped-HELMET", "directions": 4 + }, + { + "name": "corgi-equipped-HELMET-vox", + "directions": 4 + }, + { + "name": "corgi2-equipped-HELMET-vox", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Mask/clown_banana.rsi/equipped-MASK-vox.png b/Resources/Textures/Clothing/Mask/clown_banana.rsi/equipped-MASK-vox.png new file mode 100644 index 0000000000000000000000000000000000000000..aa5da26ee0467d3fef0dab6c772f56b102a04f0d GIT binary patch literal 1094 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 UoLR5dNdN!<07*qoM6N<$f*T3Ib^rhX literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Mask/cluwne.rsi/meta.json b/Resources/Textures/Clothing/Mask/cluwne.rsi/meta.json index 245ae49644..bd410c6de9 100644 --- a/Resources/Textures/Clothing/Mask/cluwne.rsi/meta.json +++ b/Resources/Textures/Clothing/Mask/cluwne.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Made by brainfood1183 (github) for ss14. Reptilian edit by Nairod(Github)", + "copyright": "Made by brainfood1183 (github) for ss14. Reptilian edit by Nairod(Github), vox edit by Flareguy", "size": { "x": 32, "y": 32 @@ -17,6 +17,10 @@ { "name": "equipped-MASK-reptilian", "directions": 4 + }, + { + "name": "equipped-MASK-vox", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Mask/ert.rsi/equipped-MASK-vox.png b/Resources/Textures/Clothing/Mask/ert.rsi/equipped-MASK-vox.png new file mode 100644 index 0000000000000000000000000000000000000000..b7f2ad7f68ffa9b69e2e0df8e3af483ba73e8bd6 GIT binary patch literal 867 zcmV-p1DyPcP)Px&9Z5t%RCt{2n!jt@NEF9EK2m5Q$7~u&!C~0KAUBJ(?>lcai{1m_|IOai z8<)#vKYYKsx|%%Cx3>Res`10a!||p5Yl^U3F8e&sna}5}R;wucKZV|)weDxL*cS4sgeo6Y?7+uK_JthF>vv$IUlTKCR5 zvMghq0mc~Gwk1iDVEaK^Kq=)7S!+>BVXXyVaBP<-rEt!9n*hcbKOPn*gdhQ|wS4~N zGb&Z6mx|`JLBH0#fAgOGbRT4o4MkDV zoHqWNb1vGU|Kh{XA1I1~EXzoe#DB6ZAnJ7om~K@bE%5ClOG1VIo4K@fzm z$X4FsK2#ar_UrLo*_hNHFh*&_=gIg*4k(hqB6i*i!o-SD7jcH0H~@e zW@^vH#RUL)o&!+Vwf`+ilIZy-3*emd!4E+jW2ozz?AHwaQUhRrpWZW|ltTTs-ct6h zrTt^woG}*T{sM#&+#@u`IY(KR7-LXMdB<+L8|+)l^{Z>zw*6NP@iC-n+P7`X^{ZPx%Xh}ptRCt{2+COXCKo|z_$0dczq9Rz!xql29BHu|Y#9)fi}?OPB5$`UL_3 z6Dah9bjcD(cZaxxX~ztq#$G~Q*VYh+pkjMy;X0(J%1N76(h1k)`GE(Y?bCbb_fDXD z0U}Dn_JvfhS;eqgTg!ayg)~31eIZX?JjCsai7(v|mhfH<>p>xFFtd<&0&HJM$8)iI z@DV|408uT&@mzF(xtxR>Nxp3RLY6ky`==|*{h&1f00gZ8PFI%urOoyJESE!Csg?i$ z6ioy79#qgf>gtT=TDC9b-u7;kWm|_eG#ZWQ^QSMLCC$gxzzD zM-!;_JeR?0ZB2$}AppQCSpa|q<0j5N52LnsJ8u(RKT!q@>p`Js8WKP>c&oCAachF! zQ8(AY13;(QhU2+-^=RkHb+!&`veRrQ?laLI0086BBvHFgd)vE(-wm?UY$Lur{#L4g zOl@{W(})H>k9UB~=5g02A|fIpA|fIpA|lc(kH_VCJ%UesGISkPFyVME!u<_x0f+k= z((zp6QIMhSG{^RZ6xA}q?m2*qv%{b@$b4dySHDW?~7lrBoy_{1?T=($DzxqRD;J~hH`_*yUgNn5vQ z;{tAptxBG^1WqP--kK1oJ?TEzW9$8AcYJ^He*Jl+$eQAp6)*mz*6AmGo&M9m$=!zk zRK=#b2J@Cl_+Pd^zUt5}hUX_af#~&HL520)lJshQXYy{!pqWN2~aMg9e*>BW$9r$SS_1607 zI%2u|e(5z`XJR-|wE1w281skC5xs`{XS&$$b7=Cf9PYdrmP{S$VHb>+HOs^@pWz^k|1-~E(NMv4kA1V$8tr>mdK II;Vst05(O};{X5v literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Mask/joy.rsi/meta.json b/Resources/Textures/Clothing/Mask/joy.rsi/meta.json index 98e76beb9e..bcdae32f9b 100644 --- a/Resources/Textures/Clothing/Mask/joy.rsi/meta.json +++ b/Resources/Textures/Clothing/Mask/joy.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/4f6190e2895e09116663ef282d3ce1d8b35c032e. Reptilian edit by Nairod(Github)", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Reptilian edit by Nairod(Github). Vox edit by Flareguy", "size": { "x": 32, "y": 32 @@ -17,6 +17,10 @@ { "name": "equipped-MASK-reptilian", "directions": 4 + }, + { + "name": "equipped-MASK-vox", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Mask/merc.rsi/equipped-MASK-vox.png b/Resources/Textures/Clothing/Mask/merc.rsi/equipped-MASK-vox.png new file mode 100644 index 0000000000000000000000000000000000000000..31647e95e2003b708e4ca698ac4c5c627eeb6df9 GIT binary patch literal 1193 zcmV;a1XlZrP)Px(V@X6oRCt{2nlW$NMij^YM;?!)bdXF4h=HV(2Lo;7!Gr-XL17?E(-r{=bZv($ z`3zZujL8^hi&G##yJXE5$Oj0L%8RBfCS1c!1yu%RQRI==K_X!}ZSAAfX2|^jLgF3y z?%m_NBXRc!G@4HuqIyFRv|(8$(lnDrnPr(IO*3@62g~*D9P8^>K&b&Ca>*Daz20x= zbgm*vgrw9ULgaY&?sp}dhRVf3(8ktw18JH`&#R+2(lnD>+YJOkTdDCX2$4(99oRO- z&6^$AHU;MngvjN^cYlad0JgRpc>DT9?(S{i*^9df!#G5=6(=r35VXO$14>OejztI| z#BrFM{#t}m6P!EBc9jB95RHz&xr0vU8aQ__&i*LtgvhFxypYw^CIHB0vj*F?z_|?o z;M|67TWB_G0HFK;lmqbS!7+aL`ezdWq9_Ic{P@i;c=X^HQ53^42-erHsG7ZyI8L#- z*~V~qDh-23DIq<*fu3$*hdt_@Vq((gAqKhjwp)J>m9=P zTR1&UWTW9KJ8}_@V_|>)0KVTsp67%RLZT=pgbUrBb+-3!#)5Y z4Erd~rx`FIv+=l8y4?ee#|Z$ClaujW-Rzvq>XoSUA(SN3Oh^(T8KWf6bGWVzLV#wo zhF7n8%8q<2D!n@a%uRHvUtb!HMx)VaG#ZUYqtR$I8jVKtv8cQ#3d}EzGDgAJ{5Hd~ zw#(0NxF(4xSEhl*7G*2#4Hiz#IxGQ5(=^Ke0Ho`(rR)?3K^v~i=4_vBi!r)TJCy=Z zG{_j0lp2IFN=(xzHzs|*h4DC%mSryFTp`97j}z(pt+L!S4apcKv$o|~pH!)w0hm4k z;y4Vo8Urxx`0m~Yo;<%(3MUq@4*;bY?_gArY{dSfaG8+s=007&rmZCw>hHX#hl)+$x1Q|a2{9D|+zY5Q*pI3xbp34@^ zfZ`~LMn{Mz?*U9RVlolR^FcB0ClgVoemr@PXmoTbA5>U01BwFx@bqzne)z`x?#n&1 z&<_>!fvWLh+!uDf-}woD9{!4_kE4I}p-Lwf;;d@S^Xg?e=T501nC&E!%f1$8*&>Vk zeZN(TF@WiiSe7zPNgwccbh`&d5XfLK`rt{Qb^Njjk%3aP+;Z>r4(Ieg%ar9UG6YJx z-2auP)`27^(h&I3T6OGHsziY_>JkY#z9?#t99E}Q`cg+rarRdDXib-s9F zmnBI=sRo&905d|V`JW3hH5!dZqtR$I8jVJy(P%W9Pk_Gw0u9e8RK)9o00000NkvXX Hu0mjfW4R^| literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Mask/merc.rsi/meta.json b/Resources/Textures/Clothing/Mask/merc.rsi/meta.json index 77574344f3..5b745bcfd0 100644 --- a/Resources/Textures/Clothing/Mask/merc.rsi/meta.json +++ b/Resources/Textures/Clothing/Mask/merc.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "modified sprite from Jackal298 based on the sprite from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Reptilian edit by Nairod(Github)", + "copyright": "modified sprite from Jackal298 based on the sprite from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Reptilian edit by Nairod(Github), equipped-MASK-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/4638130fab5ff0e9faa220688811349d3297a33e and modified to look like mercenary gas mask by Flareguy", "size": { "x": 32, "y": 32 @@ -15,15 +15,19 @@ "directions": 4 }, { - "name": "inhand-left", + "name": "equipped-MASK-reptilian", "directions": 4 }, { - "name": "inhand-right", + "name": "equipped-MASK-vox", "directions": 4 }, { - "name": "equipped-MASK-reptilian", + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", "directions": 4 } ] diff --git a/Resources/Textures/Clothing/Mask/neckgaiterred.rsi/equipped-MASK-vox.png b/Resources/Textures/Clothing/Mask/neckgaiterred.rsi/equipped-MASK-vox.png new file mode 100644 index 0000000000000000000000000000000000000000..078e73e5926f74a0fc5c0d4ee5a30340ca7be38c GIT binary patch literal 739 zcmV<90v!E`P)Px%ok>JNRCt{2n!k?IKoG{iML}mHq)6Ey;lwFoB_&Ys1oY|7-4$0*xJODJgp&Tc z(4~fFfHqMmh|m=zQJS+OJXGNS`sR@ff60iMW+i)#-!`5zivXJgJL%h*#s*C2F++E6<(h` zBmk=0eU96a$ru2z z%2EuP5xvM#V*#dU0CNEIZ7f8d4>rYy2PT6@*;-BW#gAq)R6W1giD{PNQ|-w~7e7=L z#fyzR9~xWp*_5HG7{@m<0D17Y`OYI3z@iq*rRj9We9TQ)WocplJil%;pV1?5>75nN z;51J`;AdLKv>}}E5h%UrejCH|D_}Ibrb7V0E7}mhh&Tgy2V8#=Pinyaf55+psR73C zfd36Kz_kF^hyktzxJC?cExqOMhtK*z%^ok?Tv9>pV##klu|nfljwjF9gwcKjOW+&R&hUH+mFNZ#-%Z)9Fzfr zW<)VhLN{G0N7~1zGD1Sl=wcWol-ci#o>Q0pMyf zMlTF^<}6pG+3fX=eOcZ*0|4Ot;<|ADy!Mp1OXJ<*T6H?l@Zt6jFM)$n^v&&^T0MG< z$+s`)H`>Id`Eu+-INDc$1(h=b*miB$bZ-3WKA!tnix&hz5ClOG1VIo4K@fy{$PZ6V V18aNgD8T>#002ovPDHLkV1h}0OaTA@ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Mask/neckgaiterred.rsi/meta.json b/Resources/Textures/Clothing/Mask/neckgaiterred.rsi/meta.json index 9094fa918f..d5005eec9f 100644 --- a/Resources/Textures/Clothing/Mask/neckgaiterred.rsi/meta.json +++ b/Resources/Textures/Clothing/Mask/neckgaiterred.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Originally sprited by belay5 (Discord) then recolored by Nairod (Github)", + "copyright": "Originally sprited by belay5 (Discord) then recolored by Nairod (Github). equipped-MASK-vox sprited by PuroSlavKing (Github) and recolored by Flareguy", "size": { "x": 32, "y": 32 @@ -18,6 +18,10 @@ "name": "equipped-MASK-reptilian", "directions": 4 }, + { + "name": "equipped-MASK-vox", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Mask/squadron.rsi/equipped-MASK-vox.png b/Resources/Textures/Clothing/Mask/squadron.rsi/equipped-MASK-vox.png new file mode 100644 index 0000000000000000000000000000000000000000..c12b3308bbab228bca820e59ce0cdab2d015115c GIT binary patch literal 941 zcmV;e15*5nP)Px&XGugsRCt{2nn7zDM-<0@F}9h7$b)iNFCvT#ZqXqKYJ(7@1YvUOG3Olp1$uQp zKyvLD@X@DyfS!sEp*gx0K8du!cEGF`6R}Z1gALgpl-aDTQnIs>d&v9UG|SF^-v6y; zhkXx(Z<{;5H@4gD3`hZee0=OZPepwIs^~BKia&h!jxDA1AJ#&nYEVn^>u9c4pj% zQU+LSsdGRwd0LKMP-rwKfm_-^}(&K^~z2d zhMB7ryP%6^jBC4ug&qRmr@$DK6-)5NLTu3tx0WPHO6!#F5pq~->GgWVag5fQD2noI z)UOXnhARxuCp`qU&Arma)7s`*-_&rrzQMyB4nmGF3^Tj>BLM2^_o-{`_wP%+5!}vyeDB`WcyazJ zK^K|pVa0W8z?bd~m#MNFp*!`t4Bwo4PD>U9K@bE%5ClOG1VIplZ;gKdpdZ>7EwvSt P00000NkvXXu0mjf0F%IC literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Mask/squadron.rsi/meta.json b/Resources/Textures/Clothing/Mask/squadron.rsi/meta.json index 9e9be3d62f..b8ea712aff 100644 --- a/Resources/Textures/Clothing/Mask/squadron.rsi/meta.json +++ b/Resources/Textures/Clothing/Mask/squadron.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Made by Nimfar11 (GitHub) for Space Station 14. Reptilian edit by Nairod(Github)", + "copyright": "Made by Nimfar11 (GitHub) for Space Station 14. Reptilian edit by Nairod(Github), vox edit by Flareguy", "size": { "x": 32, "y": 32 @@ -15,15 +15,19 @@ "directions": 4 }, { - "name": "inhand-left", + "name": "equipped-MASK-reptilian", "directions": 4 }, { - "name": "inhand-right", + "name": "equipped-MASK-vox", "directions": 4 }, { - "name": "equipped-MASK-reptilian", + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", "directions": 4 } ] -- 2.52.0