From 3cb919fe7702e55dc3da3097ad78bbee6f3f2034 Mon Sep 17 00:00:00 2001 From: Jackal298 <129199891+Jackal298@users.noreply.github.com> Date: Mon, 19 Jun 2023 20:38:57 +0300 Subject: [PATCH] Small addition to mercenary items (#17464) * Small addition to mercenary items try number three * Bot * Bot fix --- .../Entities/Clothing/Hands/gloves.yml | 18 ++++++++++++ .../Entities/Clothing/Head/hats.yml | 11 ++++++++ .../Entities/Clothing/Head/helmets.yml | 12 ++++++++ .../Entities/Clothing/Masks/masks.yml | 11 ++++++++ .../Gloves/Color/olive.rsi/equipped-HAND.png | Bin 0 -> 463 bytes .../Hands/Gloves/Color/olive.rsi/icon.png | Bin 0 -> 396 bytes .../Gloves/Color/olive.rsi/inhand-left.png | Bin 0 -> 278 bytes .../Gloves/Color/olive.rsi/inhand-right.png | Bin 0 -> 286 bytes .../Hands/Gloves/Color/olive.rsi/meta.json | 26 ++++++++++++++++++ .../Hats/beret_merc.rsi/equipped-HELMET.png | Bin 0 -> 472 bytes .../Head/Hats/beret_merc.rsi/icon.png | Bin 0 -> 298 bytes .../Head/Hats/beret_merc.rsi/inhand-left.png | Bin 0 -> 539 bytes .../Head/Hats/beret_merc.rsi/inhand-right.png | Bin 0 -> 524 bytes .../Head/Hats/beret_merc.rsi/meta.json | 26 ++++++++++++++++++ .../merc_helmet.rsi/equipped-HELMET.png | Bin 0 -> 746 bytes .../Head/Helmets/merc_helmet.rsi/icon.png | Bin 0 -> 374 bytes .../Helmets/merc_helmet.rsi/inhand-left.png | Bin 0 -> 655 bytes .../Helmets/merc_helmet.rsi/inhand-right.png | Bin 0 -> 630 bytes .../Head/Helmets/merc_helmet.rsi/meta.json | 26 ++++++++++++++++++ .../Clothing/Mask/merc.rsi/equipped-MASK.png | Bin 0 -> 956 bytes .../Textures/Clothing/Mask/merc.rsi/icon.png | Bin 0 -> 551 bytes .../Clothing/Mask/merc.rsi/inhand-left.png | Bin 0 -> 420 bytes .../Clothing/Mask/merc.rsi/inhand-right.png | Bin 0 -> 427 bytes .../Textures/Clothing/Mask/merc.rsi/meta.json | 26 ++++++++++++++++++ 24 files changed, 156 insertions(+) create mode 100644 Resources/Textures/Clothing/Hands/Gloves/Color/olive.rsi/equipped-HAND.png create mode 100644 Resources/Textures/Clothing/Hands/Gloves/Color/olive.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Hands/Gloves/Color/olive.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/Hands/Gloves/Color/olive.rsi/inhand-right.png create mode 100644 Resources/Textures/Clothing/Hands/Gloves/Color/olive.rsi/meta.json create mode 100644 Resources/Textures/Clothing/Head/Hats/beret_merc.rsi/equipped-HELMET.png create mode 100644 Resources/Textures/Clothing/Head/Hats/beret_merc.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Head/Hats/beret_merc.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/Head/Hats/beret_merc.rsi/inhand-right.png create mode 100644 Resources/Textures/Clothing/Head/Hats/beret_merc.rsi/meta.json create mode 100644 Resources/Textures/Clothing/Head/Helmets/merc_helmet.rsi/equipped-HELMET.png create mode 100644 Resources/Textures/Clothing/Head/Helmets/merc_helmet.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Head/Helmets/merc_helmet.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/Head/Helmets/merc_helmet.rsi/inhand-right.png create mode 100644 Resources/Textures/Clothing/Head/Helmets/merc_helmet.rsi/meta.json create mode 100644 Resources/Textures/Clothing/Mask/merc.rsi/equipped-MASK.png create mode 100644 Resources/Textures/Clothing/Mask/merc.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Mask/merc.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/Mask/merc.rsi/inhand-right.png create mode 100644 Resources/Textures/Clothing/Mask/merc.rsi/meta.json diff --git a/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml b/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml index f2d5a5842e..b468268ec4 100644 --- a/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml +++ b/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml @@ -222,6 +222,24 @@ fiberColor: fibers-black - type: FingerprintMask +- type: entity + parent: ClothingHandsBase + id: ClothingHandsMercGlovesCombat + name: mercenary combat gloves + description: High-quality combat gloves to protect hands from mechanical damage during combat. + components: + - type: Sprite + sprite: Clothing/Hands/Gloves/Color/olive.rsi + - type: Clothing + sprite: Clothing/Hands/Gloves/Color/olive.rsi + - type: GloveHeatResistance + heatResistance: 1400 + - type: Insulated + - type: Fiber + fiberMaterial: fibers-insulative + fiberColor: fibers-olive + - type: FingerprintMask + - type: entity parent: ClothingHandsBase id: ClothingHandsGlovesFingerless diff --git a/Resources/Prototypes/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/Entities/Clothing/Head/hats.yml index c45c287a2e..e8de33a111 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/hats.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/hats.yml @@ -75,6 +75,17 @@ - type: Clothing sprite: Clothing/Head/Hats/beret_brigmedic.rsi +- type: entity + parent: ClothingHeadBase + id: ClothingHeadHatBeretMerc + name: mercenary beret + description: Olive beret, the badge depicts a jackal on a rock. + components: + - type: Sprite + sprite: Clothing/Head/Hats/beret_merc.rsi + - type: Clothing + sprite: Clothing/Head/Hats/beret_merc.rsi + - type: entity parent: ClothingHeadBase id: ClothingHeadHatBowlerHat diff --git a/Resources/Prototypes/Entities/Clothing/Head/helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/helmets.yml index 8f9396dcee..3117e4478d 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/helmets.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/helmets.yml @@ -29,6 +29,18 @@ - type: Clothing sprite: Clothing/Head/Helmets/securityold.rsi +#Mercenary Helmet +- type: entity + parent: ClothingHeadHelmetHelmet + id: ClothingHeadHelmetMerc + name: mercenary helmet + description: The combat helmet is commonly used by mercenaries, is strong, light and smells like gunpowder and the jungle. + components: + - type: Sprite + sprite: Clothing/Head/Helmets/merc_helmet.rsi + - type: Clothing + sprite: Clothing/Head/Helmets/merc_helmet.rsi + #SWAT Helmet - type: entity parent: ClothingHeadBase diff --git a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml index cc78985790..cc7450219f 100644 --- a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml +++ b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml @@ -262,6 +262,17 @@ - type: Clothing sprite: Clothing/Mask/swat.rsi +- type: entity + parent: ClothingMaskGasExplorer + id: ClothingMaskGasMerc + name: mercenary gas mask + description: Slightly outdated, but reliable military-style gas mask. + components: + - type: Sprite + sprite: Clothing/Mask/merc.rsi + - type: Clothing + sprite: Clothing/Mask/merc.rsi + - type: entity parent: ClothingMaskGasExplorer id: ClothingMaskGasERT diff --git a/Resources/Textures/Clothing/Hands/Gloves/Color/olive.rsi/equipped-HAND.png b/Resources/Textures/Clothing/Hands/Gloves/Color/olive.rsi/equipped-HAND.png new file mode 100644 index 0000000000000000000000000000000000000000..a78b4f96a6dc33d36db8886507db0fa22218b6c9 GIT binary patch literal 463 zcmeAS@N?(olHy`uVBq!ia0y~yU~m9o4mJh`hE%`m)3&~oobsNGLc+H>uCNLvo!2-r9YDzOzM7{Q<=k}!h&FADak*j`oUOFtn z{ILbwvx`RR`8&NC1Rd5jL^a4T)N-z3y~6Z_YX$2G#tXp?x(mbF4`RGq zn_X&;{OkQE>ZYo&;h>npiTM4jE)2}iG~5Lnt|V^gWN6b`EaS=$)P7KnNn%w`kqD!Q zEZc03gcU}o0$CJFC32J+7M{XXEM_aaPgJoiZGYVQb+gY#e~~-*cGtY~^=s!=%O`GP z5PNaOxZ1yHWpUAaWfe|?uV?H`E&Jo&)wV2oTzL3g(`noP-&J1BoGk1=iDBM?teK0C zC+JSq5?#)ru{1~bbyq`_R;ZSrV1U=nsB25r9|$w9nYQeNbJ{Nk1_lOCS3j3^P6i#UA@d>iFZG*Y|vRbG?SMSnbI7-{+s0p1;0MY>|{g`l25O zHL4Anzg{*ZOmXO9xMgbH<5Oc3_{Udo`pfcZ%qN*n{3wvvlU8-zZ~jva$q5`vdst^E zM=9$xUlP{MJ@w3v;lv%az1GWv|0s2^Hk=6!$o8o-S#tR1!vHq{&I7Y1`%GjhdbBIg z>f@70iF_T7)zcY5e1z6Ib?mhNsg`L~fXT62;{6?o_~{G+$rDv(2J0BOM6Q>- z^hqEvmuW+{L}amlZn5d~nfGj2K6<1xE>P-RA$&yi@yoLvitpa<`Xch(>WZkn%f1u$ zQunt#xHXYALiS#`@7x_>3!nUX1OvjFfe$!`njxgN@xNA D)rPHg literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Hands/Gloves/Color/olive.rsi/inhand-left.png b/Resources/Textures/Clothing/Hands/Gloves/Color/olive.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..3e6dd319b4be307238f127fb06af36deddd1f32f GIT binary patch literal 278 zcmeAS@N?(olHy`uVBq!ia0y~yU~m9o4mJh`hEg`n%X&&jLwwrS_*Y~)esin)G0_x3&Y7j^9}_fEw3Mzc*gdX)2p zMCGQWxu^c5GDL>dt*lu$!`eU0wYCVG`EVOA=oft5w&PFHmip7bxkPK34>N^)Rp#Li txY}=^C zfV1~h)`-Tx$4_wSOz4vGYqb{Nbh5FyQm@wT=kv(9L0zs542(=H90CdsNQ}m|1CI;q z&9^PT{pxJx*&0WY*lE!(b?2?z`+VlaIhqX|J9F1>T6g~R8jgwDpIpz)o65FAR$%&< zm=CKre=Sr>KkvoZbK+aejn6r6uh?djnoV{*yf6VBrjQqMybG#*dTjJ~PR_yTHJ}z~JfX=d#Wz Gp$PzLV{L5! literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Hands/Gloves/Color/olive.rsi/meta.json b/Resources/Textures/Clothing/Hands/Gloves/Color/olive.rsi/meta.json new file mode 100644 index 0000000000..5b65737755 --- /dev/null +++ b/Resources/Textures/Clothing/Hands/Gloves/Color/olive.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "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", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HAND", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/Head/Hats/beret_merc.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/beret_merc.rsi/equipped-HELMET.png new file mode 100644 index 0000000000000000000000000000000000000000..7878ecdc421532ec329379830e5324556828b302 GIT binary patch literal 472 zcmeAS@N?(olHy`uVBq!ia0y~yU~m9o4mJh`hEr$Nj?@x9{VF@JYF@3-C_7rrjL#lrrN__Wi$mnIh&H1LN% z=32dKy}|vn&*!t>e|_HVG5_D&h1>EjzW+XJmep$KgOg9zu3fzGna=d-PfNd-{=NQe zGly^!0~3cr11_Rq4O3O*s{UW!kH?7FoxlE|e)*Hx&zWluAM9zEFTP@TovmEz@0jK0 z*PJ{~+HYN@sgZGym+kK|hS#-0>+3bd&xT!HaO~^FAX!cSrk9)-v@`DS;m^BN9xoMo za--b*uDdb^s-;6kp1-X;)ye7L%u)DQYT5-a*}#ord)1fE@+lk(9NK muLT_#7+C~x5k(w-m^!{lA?tqp#)#fPrmJvaXP@g=i7yBV2xXe^syRC_yae&L!4DvV|p=hfMI7QD`zqLkEg zWZ}Grdy>UNo;|X4IZ?jOqS*IVvCuse@kht6-)Nj-_M)NXH`j8f)VT{7#P{f=8_j39 zf9Cs^xNjvEsax*q-n-Vq7U=#!o1x-O+8)o|I)8d=xE%ivD7n$5q=ZvdcR7q|hb4Og)7}`4by! zrwc8N7f^}Zclqw}$?bO}o7tEY7%-54bffml!>N&8p&d^?+lZg+cey0@a8bpr+e;T! zyyM-exBvFvSw|l&-OjiB|H`;EGu#;@?dLAbyMJ|+Rp0KW2cKSlJr;8H7`LMoLj0lf9;&e=hFUn*V3Q^DM!H-tFq!?*21* z6R8(({noXwC^Be@ih0|-V%tj`0l(QU#BM$3{ceqanOXIX;^)#W?0#3)F-YDk3unLe z{K&b7Hk#qg4yS6CyJt_o6~Y*^YI1HFql5HZiE9FkhI5K$_jfdySsAWzm1i`RF{)u< z6kxzW8A30ntk3TH^S&p2{_l5nTICW~?48UG`|SPumG#hlezu0QcDLtc3G7;Scjx7= zl?Dte&NWC``bB0$TPw6Km?pPA*!K93x60O6*lR4WMw%5SpHz@wu=(usmFZfc);x(@ zO^gR*udEX1cqV;-G2<+wLwCxGDgnlY^X5#u+rgkaY2hnJmX@lbsIvcz>+eiee^|>~ R$-uzC;OXk;vd$@?2>>|zP}n7?q!o!NuT)TZl(Qkj#js_?(;tr zS6Qq)|M&lUJw{vU!_6!n4HzgPizUr9kfrk6CLIks6N`}lTm2p8*-tOBKOdiFbggLJ zYx}wT&Zd37_3EKG1B<@c%CB18nT!u#-G9%Ywzp2}wn9wg^5>4W5{=J3-?h0@KjWv( z%6+TP%RatwHNMh<+xPNqt|tG@wd@`SO=Y{AE#>x0ecpcCJYTZ+t!zWi?pui}o_SjS z>-c|jJctzhocr{Wg3+aJv$w0SCcm83&ib1}L11Qnbi$H4>(ifR<}(~{UGq#oaFb|3 zX3&}Yf(~bHzJ1gydZ9JwOmPIGVfyy&?I*(>#69LXGpRUWAOUg4{Qc|m47dFMcYp8U zUE=pGe#k4Dgnm5usOa0@3lZ;G87K4^eG@(rA>DG1;mC#*v1*Pb^7`LR=HyoY(NDUV z6{q)pmB4kATW@Cd#W8HSdBC*qniXHJ?6WwA1R-m~S2M4r#ccV`w7~Fk(hb}1b)37n zGxw@7teq+CWv-o|F)8YLB5TIkI{~}Y;~DKabmuT>PrP`afq{X+)78&qol`;+04ej} Ac>n+a literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Head/Hats/beret_merc.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/beret_merc.rsi/meta.json new file mode 100644 index 0000000000..6e7020ce75 --- /dev/null +++ b/Resources/Textures/Clothing/Head/Hats/beret_merc.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "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", + "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/Head/Helmets/merc_helmet.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Helmets/merc_helmet.rsi/equipped-HELMET.png new file mode 100644 index 0000000000000000000000000000000000000000..9a52c7de5a4759baae1669319f869c6b36a0edc2 GIT binary patch literal 746 zcmeAS@N?(olHy`uVBq!ia0y~yU~m9o4mJh`hE#hz_wAR>a{Upp;xuDGJtn`hVXEAB+kM3<3 zj2j-*uD)Gvo3$d}rl9fy*P(m&t{;()TzGP`#YI;QwgW8XW&6JV%wBidUW8+lUVB0D z=LzS|*Q;$?Vl?^Rx;HhaOMYa(e(~b>n;$<)UhdoXI=}P!myf;|zA~(tS<_qhKAiX1 zDyCm*!Ul}^(2s1EX?6GYL*M<9w27LcaW$(ydU@FjGYw^l1v0L4{g$q%+?Zr$!m>rP z{pqeLr;j}jSsEK7b@_>A(<+~HrfTbE$sF4i=Kg(M)fsjD*rP{;@0G+=@h~fFShb;Y zYS}zS--SgS97jYdG9S9iJ?YGzD0YiUt5N%};HmrK6AYK8AMrRDvFfnNqt|m;HtFS8 z^oV3QGpMNCvYI#N&x*PkTF`;nSzMIc4=3+zxTo{;MyhuF*BRvUAHv zrTB|)xKkOLe#VKkEL4jSn%;RnzBhA|Lx9)2RG-jSuQIuFmdK II;Vst0B0pxbN~PV literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Head/Helmets/merc_helmet.rsi/icon.png b/Resources/Textures/Clothing/Head/Helmets/merc_helmet.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..bbf9b3700af4a648e701ed6e94d1df2fee73638c GIT binary patch literal 374 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4mJh`hT^KKFANNfww^AIArYK!LpF9X8H&_& zalGr=&}!CHy>>(Q{)GDd5B#~WEn*j|I@1ke3`JATq*xTh0 z2WJb*ziOtn=}a@us)?`7+xe$z#`?vASJy^9)cHN(pu)ap+5Yr1y&K(oF7zq#CGv#d z(TTJF=W`-!tKc=4+hUvVmp)pNe{1#Ql2aJlUPSg>XLx7)u2klA?{ZG&)B9LM_z$?udp=#` zRaVt2sow%CkKTHe^l|0B|9aDo?kv4BM>V~0$_nnJxE()hyp}#K3ND`CIK3;Fk6A-S gK&WCnOC6)lrt~`%p?y;s7#J8lUHx3vIVCg!039-@wEzGB literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Head/Helmets/merc_helmet.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Helmets/merc_helmet.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..d06c541e407dae34494d5e06656f741277677088 GIT binary patch literal 655 zcmeAS@N?(olHy`uVBq!ia0y~yU~m9o4mJh`hEn1b4TE=FWe`d z-A^&vKlfylaB_r40}B@PV7}lEtMkYA{*sC?*>8^?iezN4D@pPlDlWNokAf6)N%KGlK;8 zbn(ThzBUhIBkapMtJo5X*KLo!qR+<2$LG~};q5)?KMzEcY##hlI8~K8|02VI4}Q-# z2IwFA%y2N+3~~ovVYz@A+=b+ zUZb4%i>XY{)4SFOA_7;Qm0Zv};c&pEXA;fjPg3V?T@(BNvtmNNM6TtR2a-i<2dw=x zw{kE}Pc-=R{glsAeMenqhH_rB+1I~h7j(VmzH+Ow;mH1$Mu|h}oD�Cmi5p*~hqW X;t!^K8UY*(3=9mOu6{1-oD!Mi!I$jOJ^(m5WVwT^iRb*zq@l|tT@HOb$4tz+_+`)*ZjZjGrG5l2flx0UvNjY z^5ov{)%un@#FIl@99XcR2ZuOfTHm}andQB|)?fxpYVA&&E1O@;H{xoZeYS0D^2Q%g z_Wj3$jivT3eX=&ePp<5x{rvhF6NJ~t?)`i4h4yss?1^Ek6K}n34@uea`21g=zuHqL z9c*>_yZY+x1^>*~T@rA5n6RCHqCi%8>ZdPrRO~1Ip6w^bu-AH~Pk7tCSt>ubB;U1q z@@a?20`X~j({-k%%X%{e?$L_=70vLXQQ$=DHLkb`-#HpKa#TwB&Mt5-Ic&E-=Pl!l zJ5TS%zWvwoeAQvg8!I>$#_c!XAs}iZckb)l48{WoqTUv+|M%j&Hiyev?nJX{^TQ8U zADonyviN@gyDRByZ`VeBt2$qwci;OB&)gqEEoKKMe02P}L-N<$88`BSW3h!1Qowb& zDt!HKzxvn0`%mjWDZZYwe9HY(ylJ(DJ?^(Se_AY?W9HeJ8mQpH?7-CevZNu|j7`Ce zU5AVD;4`+(Rq~(CY}<7+qKRS7g-;!o=M9g$xH1Gk<*CF!XY~^#d9RI<3pvBeF@tJggl?ek+nwG3!!(rit x#jF!{cQiGNvJ?rjo%RqEU=;kp&$5p(@!2!OcMA{bGB7YOc)I$ztaD0e0ssZM7xDlA literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Head/Helmets/merc_helmet.rsi/meta.json b/Resources/Textures/Clothing/Head/Helmets/merc_helmet.rsi/meta.json new file mode 100644 index 0000000000..f4c7ee3e40 --- /dev/null +++ b/Resources/Textures/Clothing/Head/Helmets/merc_helmet.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "modified sprite from Jackal298 based on the sprite from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/a75dee2e6d236612dbd403dd5f8687ca930c01f1", + "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/Mask/merc.rsi/equipped-MASK.png b/Resources/Textures/Clothing/Mask/merc.rsi/equipped-MASK.png new file mode 100644 index 0000000000000000000000000000000000000000..1ff7f0eb6db0538afa134124a0bb7c25cd0c7bb9 GIT binary patch literal 956 zcmeAS@N?(olHy`uVBq!ia0y~yU~m9o4mJh`hE}3|Ln;{GMmc5+JBrkG zN{O9O?eLmdwKC$7Z@=YJttT3fma=A63v6`d*lYI4mn*3H!v(g3O&%X-$P4K24eej( zq&H2$Y>BIfs_wzk{Y&+Ef==%9H8ajh)5}jQFWdKh-}kd`9{MhdT6@W2`x6WH{u{^V zHFPJ6ZrEb-`qTF8?DxWVwp;HzS`ni1zr#kEp*zr0{D_;1Idhk8=XHG5*>u=fp zdsu$3=J^uOl0*56w%&LjC-i4c^})@h-b>X>N=kh0Ra+=n@w>1%d|Ds(XUWs4vFVR} zXMg)1{bkdSn~@Pdzt4ZPJ9Vu6UZvJ!=fJM}ll}MeSN1D%-+aSsUm??^z_=|e`-j+L zN57{EbsL^s-I@5L|Gg{M0rnG3>3@R74=TOR`kjJ?fc-n7DM_B z|D>Ks&ZU>4FUmdnT6*(9w8Qk~z{hN14p;hKMBNu!&|Mi^u$IZ^WQ(5t8m1D%e6Dq& z4Vp7AJZ%qc(0k^4a4VOAs_?Eq8@MhU-J`i9jB#0t({%YT#$7YaS+8pynBw!|(_t+I zozEJsg^^OOmjgrFAFl6O{!378T0kkI#euJuUjliZS~-qhO8Qv3q;=xetIze47fLMt zb+DFG@R4qVlnis>htt~EUpha{RDbnIgNd1KLj&idhs^U1tFMbslG)P9`9Nr<)SjYv z1&wzOp9{{qt`Z+^gN=e!%VUwg*kR!a`TttXL`wCp7G4 zic!tmYIP+;=EB2=`L}NUGP!cNAnjSBwc*5tVXwuX7HzK;FVJRL`g6mEPKDw|KpMoiL!(N_PQ)d?Y)wPD%L zvC|9p>~^?!_kh~cpp%W8&b>b9_GkrHLRI`9aRXb0mG#pYG?NQw=Zgw#@9}!Pk!ymH p*!G`cjD@FHn8>XrB=ukXPt=`Ln1iePBHX$3KTh> zFDRkXBGuYr#nIIrloj!TR}? zsKsQ@PS13)x#y4x^hANk9#z1Y|;x_U}s)%Q+DAC+q|I`3!o z+(PRjPl2X5s?7LWR^Q4?k~=m>3nyxw>B3HfM+#sv)fx1Lwsus?oQm{#OZh70TJ zv+cO$KA-&9U1GO6`u(@-5=SQY7PH-tKA^_B?BWjAaC1veN9IXsZ~s;8efj0c&&=q1 ztWqKmw_V9vzt3VH+f7^P73oVS88;vFFkvaTwR7T|ILiu+re)0F3+TmqipFiO`cjsjd+cExFVdQ&MBb@052{8KmY&$ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Mask/merc.rsi/inhand-left.png b/Resources/Textures/Clothing/Mask/merc.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..7924f131a875311414a7b91b666b700fac4e3148 GIT binary patch literal 420 zcmeAS@N?(olHy`uVBq!ia0y~yU~m9o4mJh`hE0S5*~OyYpTh1aF#ZJ(N#&Z_K+*?aTpL2I?RD{7zr zXoXdqtd)HGZR?AB@9*z=9CswImwn;I=^qW$Z0+`V2G*QR+UT{*|HPG^pTA$|Z=Y(b zntF6u8Q-S4#g{W9!#)Mq9^tXwo;PbDf4%t(kI1^{$KPJXnjV(EyzKLy)T-YLFaMv} z>lU20d1?0fb&0o1mKO{EU;g^*a_@hdM$88LITRWgm~azUTpX_R>8{;%jy*!kbLG|c z?dO!Qh$*a*+VA&%>95**FV;DW9Iq2x_nA>M|63rtc$`)Xg n#;!A8U@M10!-1XLIgIQD1wuhr!>%weFfe$!`njxgN@xNA6QZ?( literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Mask/merc.rsi/inhand-right.png b/Resources/Textures/Clothing/Mask/merc.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..7145305d9fc830085c9a2a05588cfa43ae9b2930 GIT binary patch literal 427 zcmeAS@N?(olHy`uVBq!ia0y~yU~m9o4mJh`hE$ZJ&!~ z>aqWCm{WOg?)$$*DLakZxEWal92hW(4IDmdhYtzmrFs;7J-hw!ss&b_lS+KQ-ZRyE zl7IQ-iWlGK_tw;Ws@*Yt4bL>su-Vr)o&J6M+8jUoX9YiYS+9E|^TPYz_sZy%o2U0n zJH_tnUuUyf$9(#q-EWk>=k8xp5V>~u-%C2rUf(L2>mL-}C^ApQe{KD*pxjw~-LJo1 zw~kkD@Uf8ia%%ehj}`0Q>L)wJZG0+ysq4QR7Kb7n|3U1-&AM;%bOPL;|73{vySgaZ z(l}wYbMm>jg>RRveJA!>ZqJdYXBv*&u1RzFynSmgLrRmxd7c|w*CQUk&5LC51Ro|6CHw=lDffq{X+)78&qol`;+0I2A