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!ia0vp^4j|0I1|(Ny7T#lEV4UXZ;uuoF_;!|I9+RPf>)zEN
z-mVjKGb|))wbpG2U*I)=@|(bnj0FoAr>H5-R1x*sm!8{`@;9H8(?qWN*?H-(1oOuh
zY|kzlsps$XW)O5(*AUep!%)k)iuDT96Rs7kCm1gTJLoPDQwVR^$2w1d;qZqdTe<Uz
z8($oLTEutw!>t8B(~Re@o85XhPyX5GnWvxcH<jOLFLHos^ON8EepjWh{}G`#zh3=s
zhuHT6#$NB`MIV$@{qMWL@uBDKH-R38&)M%UBrN^jt|;{>_xHnN_gReOg-`#n(QS6A
zJ@T*jpQxLv!iIxl3Mb<Cv$`-aKhtm*Y`BuRp_8FaYq5+gLs0ucH71EwJw+mn9<pq+
zITBVFoeE@8D3!=jYFKy*Q?Zz>>^@P&vb6ni>(|Xb8~sJ@;M-mE&eyM<TP>fsi9zhe
z72|6EqLsx(@0C?J4ZfbSGqvoGe^=YG<Z<EQb4{mh|9@9`F>|u8|0ITa3$kV|KAxaE
zRZDa^hsM$z-Pc_WQCgu|eu4pBH>0jCRevDNxMte26V7SBfDy&u>FVdQ&MBb@0KYiI
A?EnA(

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Hands/Gloves/Color/olive.rsi/icon.png b/Resources/Textures/Clothing/Hands/Gloves/Color/olive.rsi/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..db6378de51d8abea50cd7aa69da52349d51f51d8
GIT binary patch
literal 396
zcmV;70dxL|P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80003~Nkl<ZSPAWv
zL2kk@5Ji)URS!VdIRzK1I0WKQ*>Z}kn**=~y{g}u3}fs-rEF{o#Tn21|2){~$8qeo
z93NYn<J|yS2U-U<@4)WAz5}Pz_f1;I<GI(o^z7Gs33DdI_xsP}HP6?s7NQy;XQKEp
zd?kQs`ssjRlt79A+BG|jOnf|1{7o*G>35a`$pXmua2UL1de=^$<tQ1D2qL@%m?K&v
zEQ8V$Ep5u?J^;wvCcQhSQ~V-`1%S*|P-{$nG^E4X;ZQ~p3Ba0@Opyd~;<|1+@#I+;
zZ!8F_mjF~u60Jgrxj*?TW-U5Y#5r&RL5mpg+!$Y%01#u5B$-nzFhp6e8Pf6)QEdXS
zix^pRPi=EGmzmx@1o22`0iYs@s1w8$<LS+aA@1+G^c43x)D=HOzR2EXzlPx2kp);Q
q^lJX%FL+htow^3lI?y_>c?a%|h#S5amYPKX0000<MNUMnLSTZ`hOKn~

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!ia0vp^4j|0I1|(Ny7TyC=cRgJkLn;{G-ZJECHsE1!xV2SS
z{)PCD|HeO@><?VoIhDPeGnA>?qcl>f<&A~=j7OP990Cds4GfG-EXa%k$Arjv^SK|k
zFO02x->yBcLeTZx=j2s-+qCm@Hu5NR#azFhd;6aHi@J7~dne+1quC}LJ<9n)qH<Hx
z+*5y286rdKR@SVWVeKF0T3dw8e7KDl^b5Xj+wrGpOa1BJT%xtihnYgYD)Vp$T<tf|
oarnm}`<G+pZ6C1n{>41t&i!lmnJY4{4(L$^Pgg&ebxsLQ03J|a_5c6?

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Hands/Gloves/Color/olive.rsi/inhand-right.png b/Resources/Textures/Clothing/Hands/Gloves/Color/olive.rsi/inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..f1c3af4ca2d69bdce0aaaaf559bc946cfc4aef3d
GIT binary patch
literal 286
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=Pd!~6Ln;{G-r6X5$bg46z}b5$
zYeeJU<0rUuCUi;pwOWgBI@wrUsaI?F^Lgalpf1-221X_p4gm!RBt~P~fyagQ=G&Iv
zes#9;Y>lHx?6l~Yy7N}<eLi#I9L)xfow@5btvi2u4aY?7Pp;?YO=VjlD=_^_%!k#R
zzZNQ`pZ8+yIq|LK#^;>3S8TIaVYLBj=Yuy)oBg_~@2Q%~<ciA7Ji7hWpXz)Gg{JGC
zZzftl)NZ)>U-CrBb%O&F|4E*3uy6)D(NE(8<HyN%pP6LeT>yHR!PC{xWt~$(698&s
BZEXMm

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!ia0vp^4j|0I1|(Ny7T#lEV4Uyi;uuoF`1Y2e_hAQ#V;_T;
zTv*$zVd251xx=I2^|g~b?_brwu=d3j$AT3dJGKVD6k3(=MtDbooa`^TCj!6hGbTIf
zo&WuBmhSpu_kDgrzvTP#v-js))%xygzdyf-=kxa4`R23ts$MTh({*@w_+jdfwFghI
z3O-*SCT%Wt_sU8RwVehr2gUb_hsXTg@x0%9dtCUs>=q0AKjPC)`(Bz{V9>xH{+Mg^
zs`Uo<&pw~ee*g7(x5xZ{Zx?RMyZHY5tXWp8oexevS-W=e#%DUyr#~(IUi$a?v&|gB
zO$<yN3Jti3f;CK4k*oTDeLo%}W_SMjgZkx9W<O`HIef6EVZQi^-F3EdslQ{En_qMC
zIBCCim8M3<JzloI%NSnQ2Cc8x5I-Asb-}T(7lULq{hMBLUeM0CzlT5XQhB^o=*f+8
z^SkcK9H^EK6?y))@>D0MgEL3rW2tEuykrA6itSZjK9@V7_FC$^R~_jr-$YW@Hog{g
iU|?hsz(o{s{9)?so_0RmThbXAV+@|IelF{r5}E+|_sRMI

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Head/Hats/beret_merc.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/beret_merc.rsi/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..e04ccd7765fa2155fdb15c5c5ab2ca81c1584289
GIT binary patch
literal 298
zcmV+_0oDGAP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80002-Nkl<ZSPAWv
zF$=;l5QWd;A}%e6h=bV0wg3MoICgZ9ii0=^?ILbfPI=)BNt&qOa)FXdn!E4ir74j%
zbwC|Z2h@Q-J23i&UsbESonP0-q?$>K0Ry-wrkFB)+g_h>tdJxDHaO2G28^KVZj>To
zjKray;k;uPROaG6M96opICD+fa}wS(7vjg)*nyNb=zxU#3a3J4ouB|0yewxjp8(&?
z_q1O2bU0<S-7VhMga%PZ;41)l?0LKD1RdZ66vxMfB7kH3+V$D&{%6;akAWfforf?8
wkbNwibE5tO5b-HQ=4q@Br~~SNI$%5S0BToIx`!4y!2kdN07*qoM6N<$g6>0tX8-^I

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Head/Hats/beret_merc.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hats/beret_merc.rsi/inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..3605b07345bad72d6112ada3c5f98437a20c87b7
GIT binary patch
literal 539
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEV0`51;uuoF_;%LDtiuKZZC8c3
z;=I}#!u@Cd=9u?OV(zYz)3eS-U(1QL`YQU1X&zT?tH>_v;FCg^_%ihr66H^9teq~j
zFkV0<a^K~<%O|(rk!)sTQeeP90@97zD-WkedWCj8`D`P8vft&B+`~l`w{9<8RPl~?
zr{4bCe`g(iv~)Y)?*A*}*358ckhGt>Ebso+RaSkwn;v|6{q<PL)nnX_QjFKn1+_Zf
ztuVS%vw!yQ-TuaM>dWd@?OVI!PvG%~Pfhlke*U?*TWkKG3D2_x6MDC+Z@c@?<V~br
zy!BhxzM{yWDJte|^NMXRaRmHkyAZqeocFsm{$*y>H;SK2x3K$NS;ruGuPmJX*7GCh
z9@=PzGdrBBS?-=a{Z<HL%&N(`WsDBeb0w|`FdEJ&n%&>gU}j~w##NrtP{yc+g;9V3
z17!%kn6f^*>(Be1^!dNv)oGPWT(NgDJM6Rf?^o7C_xafx&f49cmnE=k+1;I&zg8MB
ztT@*oW$7205pAu|x?q~z`e57RKi(=^UtzDYyc%g%n0!(}g2Cpq&sU~vg<A6@ZZ$C;
zkiD`>oa34F0mh88j1Ju?E2;z-7tWhA?QREy?xcmU99debilWN?Gp@fgRsCTtZzV9&
O89ZJ6T-G@yGywoO`{Y^x

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Head/Hats/beret_merc.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hats/beret_merc.rsi/inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..85ccb585735815980f7c38406a347247dc0bc356
GIT binary patch
literal 524
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEV7%<<;uuoF_;%L9yu$_pZFe(g
zi5N|7<rm=>Wq)hf=61~M^dYa)Zf)OG9IHER9lMuJS|xqrm%Ekr$2nTv%DT`0Ok8EL
z^8DZb@AVjMr4Ki=cr;+3ge;ac*FcuabDMND>`W{|{%`enm}ft|$o_nMn$fkQb+7H`
z?mL_I`PQq4;tVYMVk^IDb!Rd@e0Bdlf7;$Ut=kGQk;|Vu+DbG&`+V2tPW_CZHY@k7
zJ}>+D#?|;r3vS=bx4D}9H`lUz7&MjbZnl)$FZFr*ZS#D|-nX(1IlFHqs(9vU`LE;u
z&G8^o@N@3dOA1Dpy3O9MzMA}URy*r&4h4ak`OyhW>a0(HnwigVz;(?t{lHD41(`u-
z?h87cx%u`{ujqx=pfkl0jE3pkySJYVcM$iO<IJSufPn<W8T0qA&okWe|KI(+hj)qJ
zxA-BiXcGGI;G?2%e=kJ5XJwqwXY@_@M1*w9J%%G2QpBn`mdNXWH<^=L{YO9PVpg2q
z`&9zhO>VuJ)fdOG;pPF;zH3%|xw6mV7!ri64PVW?mKL++JJSNg%SktEzt?f@;?CTw
x#;|s#w3oSdg2tq%>xrxxXYT~;Qjce}=g^(Qq&@NCePApzc)I$ztaD0e0stxV;CTQ5

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!ia0vp^4j|0I1|(Ny7T#lEVA|;E;uuoF_;%JtKWRr1SM@+E
zC6%rvjEr9CoSpFn^Wz_UezEe!%8VdI!JW<x3mOjzDQ!J`^GDR-D)DE%do?Fn3#}<n
z|900p{oWeY{k|{l^X0Ri*~|5(z5RXeoLcC{TZLZduCJ6g>-~|jW&ektU%ssVSyNd#
zS5GhR@JF#mF8ePp@87pyHp}%##ERQI+1<s3#l?$XT3g)kZ*Sl2J@aD8x|j36Y~N-k
zRB!S!KfiwErT-!y+c<n5{oI@4bp31187q7L<@HASS7#h$*s^Q#$*-qf?3cg%Qn_&M
zeB->1wGJ`c=53pEr1YGa0(X3r$9@ThiGqza*W(U9xFC5T#k0~kYM#ZUxj(wMT`+EV
zP`mnexoy^pe4B#G3tWfp-MfB7K62s7%@!A3HP{ZYl$Y)M`ZIgoWqT2hO?vGG#h)jf
zJ72H1ZHdw3f9u}VoG$s1{rbg=-*0~WD0#VW-|PI&>t8<lUiiweW@b%q-TQFfW2=~c
zsR<h};zK{OS*F$9*AIR7OVTE4ipJHf{^;dpE6g;MB^JoI&h=ZmqH<%BnF-4l&Gx6e
zrkp<ZIAm#TjMU{PnoX;G&Y7yMn<aB>SD5?vbya87^<$475x!RvSH;7uuwm7P%Bf}Z
z7=0HOac~?FsmOfjD)*!_d!pDaCap&8zk;Xki%&3IntsINWW=h&CXZgvW!a>cU(q9y
z;mn|-a?5JooIfk-W@tUDKE5uUJMtjY28B<b;^vgqXK*{jRr{~Ln7T&S=*rG5AC=-S
zzTr+~X!;o^(y~x3LTGyD`S{+<O%4HG?^1n2U%krY&W-DOQ5C=7$^os%73vS)y;~Jo
z`^e?nKdoKs-yLmf*z-!_M~jb3b%JEOIi65ztnWUM&v3%=Oyw_&f50@%;OXk;vd$@?
F2>@p$S#$sZ

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
zcmV-+0g3*JP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80003!Nkl<ZSPAV^
zv5EpQ6nu&Z?uxL5HiCPtu#3N7f4|^Q3)Z3s7J9{k=oZ&_PQ1Vx-fl+0LM|!PB=cq_
z<4Z)s2nmD){(AzgX9AebCKs)4x%_&VucHywty$qL`;fsPzJnc)XUvVUM~u*pAr4^-
zSKKUKKmJU}YPAv8MB5g#-*w`sZ`!Nlrwmk2pCtFuSBdQ&lCpnSbzl2U_rPxVE#vV}
zw%dcG=}6-;d)NS$9o`<mN$kmzq%TErYUHkBisJ0;1u6kcx?b<4EPomeKoo{=HRfhC
z;;9~pqMjl2i9-n(h@*xXlmUk5S&Y{J?lbOn9P5pz2?NW%1ym2fM4soDDC%l@>KgkH
zsm0pjV)3cI|1OrrxpmZ>C1-Jzs0(6VxcPiarR8!{bDx2iic<~)C?pUPc((+80X(v2
U+;~-vl>h($07*qoM6N<$f*mrbwEzGB

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!ia0vp^4j|0I1|(Ny7T#lEU<&heaSW+od^_uW7L%dCvCEfc
zyMDM3H$`hNXVdxzd)GgB{F7^M^(VcEJ)*i*nf%<B=B=IoR>#?F_st!FyS{Lrcy>R<
zX#d=kO~T0$9t|v5(1ZDcJFMFGE)J~EUvE8E&-?W%t^C(|S<~-@TvV#!nf?BIb>{WF
z@1<+>#k7s*@2~v&^kn{ac{P@#U5x%uZyC#(<mAg8I-B-*$FYP9#)ls|A2Z&<G%<gx
z6q~)s#Qg2=_k5~ayXoufO~R+o999cV`5eVI@4>6<#U-|$bvEwb=Ps7xZP;`7X;G=c
zmuo5~(|5(+J!TWGu|R&IvZC^#OKuzoy7`W3>VI~gf04n#(5%z^c~_{!i_Z)a+|$Ju
zr~2AFjE%4_>#Sl+C|<Wc`iedqBOjkv<At~Pr2jk+O|p6LOW{;iDp2cz4}Q-#2IwFA
z%y2N<q~+_cyJyn$*%VdhwH8h<7uEX8Q)TZh_w&q$ia%TC`^+<b{p{;)?g!ovtQgKG
z?pbT?70u^dZ77lUeWNdviUU40U3J3G|Nl0<I=p4)zo_-IG*<F5%(Y@SQ}LhR=6r1h
zS4+mqjT_1(&7!6G50^e$@oI0QJwL;-(|eh7cce^Moz}B>+3~~ovVYz@A+=b+UZb4%
zi>XY{)4SFOA_7;Qm0Zv};c&pEXA;fjPg3V?T@(BNvtmNNM6TtR2a-i<2dw=xw{kE}
zPc-=R{glsAeMenqhH_rB+1I~h7j(VmzH+Ow;mH1$Mu|h}oD&#0Cmi5p*~hqW;t!^K
T8UY-@gvQ|M>gTe~DWM4fp8O+K

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Head/Helmets/merc_helmet.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Helmets/merc_helmet.rsi/inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..cfe18a362910a898eaf0ab2b18559779fba7900d
GIT binary patch
literal 630
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEV6ydeaSW+od^^i9o5@h*_~lDy
zl`OV&2Q8hg@I&;@Z_z&$@BHr0jj`es3)kJT<#6Mc&0q8Xw$JF^CLZ|ym3_e-)yk85
zzgO#9?hsE7adBY5f*u^=h-rQEwq%y~{#t_>EUC3SZLVy7G2e)*dG^`1t;rjIMA`Qr
z4>p$CyY$K01V6d5m-h4PXG{=YAG`PO!57-oy|X8Vtxml4wml?e$K&&Veg0}sopi9(
z>F?^RyBGX3Uw28s>0!cl{)qxv<*A>(%u%tQ_<OdW7{gxcnLgod_hza5+>(6P>dB`a
zA`8T)=}p&}nl9_j5V%Jx`d2i=i$;MHt=G8XCVb~;*vL^S<vY8;z2van{+zdrFYY|O
z8~gTO%kx!-EpM#gTo||Ce20LjiQKubb2AtZ9Ef^bxc=XZ^V%FPYq=B6s?85STzzm-
zTFT=4{qL@%uf1Ix^{wiBecpZVH#~EH2(_3UnDEi@>ki3Zb7$Ph501qaMo0nI<*M-Y
zzy0c83-3Rz`=t1K&hjbuPw}SJ8uqx~;{0i`Y>t^{XKJ8=3$p`L>&udcWHUAeGj<&=
z#)Hq;Hdo1iI<sxp&4?z3ITt>4RGv3H?&8W2{FJ9&<HbB}1s1*TWT}D|cLEuH1i3N1
z|NHOs!P#2R?XKE#G1z$PKklmvG_#e@*>d~`>wy+mOUGx@{Z%FmJZW08f(?g-7Z$Tl
t*xk|8EXq<O$adO8P=HbJ2S3X`#>8jO4Bst0pbJb-44$rjF6*2Ung9j47xDlA

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
zcmV;t14I0YP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF000AnNkl<ZcmeHN
zL2DC16n=>s7R)7xN|Ac0SmI5OIpr$kDB`6BX?qZ{MF_n%;!O%td+^W(!GcKfm>&=?
zy;YB)LN1mdHl#&JB`v{qzojn>QpvteHZyEyE^lUccE0z%_s#6#O`=+@(m1!|I0ui|
z$DV+TVHL2nH0$!WYisWl+#i*ln|tWi>j#OcscUYzyd4@plmZZZCUco4C$A8!O2#M%
zK=A3b<3qt>92Qqh0D@iLyhG*fd1|*izQuS{B;@mXLeL-{4HjcO57R_jfP=r4Ep)ow
zF7TX7sS6!%OzWHEJe!|&qudS%^6ambK)+D9>sBgX6Z|Jr-UsGFL;$baKK|i%!F=bW
zNp!+*qP5uXUK0GQd%?4HOQk1tbaYJKdpICE4@3k&@~>X}q~(=eXX8zq_V-)#viR9q
zSWNrR@jlANhu(QA<3mx3-;+<j4|$Iv3)$=qKX@F1AOW^kYxox9K~Ci$ez4@#xnbmw
z??np02grhF{8JafBI|1KAS23lUhu&C-}8RHB>PR^_bLEqm``GiSqY`mThSim^>x|6
zTR@kCQR4<yK-7-tTHg|&i+NLUtpZHRgf2g<0(3EN3a(XvDVfmahgE<s=1sx13NR%T
zy8N&T(8atdxK;tCWI~r8Rsp)0HwD)!z?4kr^1~`1Eb}NuaakHg(@|B2;jfCP`Vl6U
zP;~(~!1X!wQ4K<c2*uK3@pYtyk=51bE@Pn>qx!*p2@&EgfEpYFaq!D4*Xcv$X(#I9
zC;|fpuz(5T;RBw-C$3*&9JGlE;1Zb{ymDV4DDFV>a5n*%|B}GINfs9qfWUe0GZ5|z
z;GO`s0B3~X4bx(6zLUUr6nK636b4&d9cKA63AiV)u(<0ye)PpBAj;}6*2ccSpWATW
zeY{7&M#Hw?f-Msg)P_0)d2x_{y8>J#ZnZkpXdKYt;cwd7`ZUzTaAxL#J28==R_hn#
za<_dKa4Q6*`LMxb5wQX|cvt|l5~inb(%#;8Iz9d4T~)cNP8&)eYu4*c0tq`i-+F5f
z5<C_eNC7=B&N|2v9IaMsLtU3~yt_c&-M}WLQptg`&g;QO;;0H>dSCn(Fg+ltf0h6#
zV{w~r6%e<KO5?E#kTMpx`BnjO%cwLSs{kouahq=y5Vwp<<FN{mG8VV_RsnI#s5Bm{
e04ZZ}oBtQWS92<a@vEi)0000<MNUMnLSTYIy}bJX

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Mask/merc.rsi/icon.png b/Resources/Textures/Clothing/Mask/merc.rsi/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..7341ab8278b60fe284aac41dd45332df561a8ff0
GIT binary patch
literal 551
zcmV+?0@(eDP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80005*Nkl<ZSPAWv
zF-t;G6vuB77$k%mg@if?ii=WhPJMy))}Xbq#-hgh5UuTf0VlT#8;S%66Op8JQE)SU
z2hZd6@cHhep`mx+-TUr2=br!no^$RsCXy%vQ3n2d2A0AmAfMly`t518`k~{k_yzOo
z6*!YgiAiS`oz9oK3%M{vmUXAiTq<oFfQQ5J4|mq+v4<6_lyQ3Zi2+O`)*LMFnvB?H
z!MX(T_^LU(*fM)N2j=1F-W(l18g!%4#N6KPI{NF&4~Lk|k97$Yd^B#GVxcUc007P!
zJ>>8UBY^}+f3;eWn1C!2wd1c%yT~6~Ac3F&zqQXLu)klLRw`Nf0MM>~Yd#Ae^U3jx
zbUw3N@AlUi#FLG42H#u2CIzO^xCK`?ISD}nl4kAxdcEoN#QAAk-US*I;kMLjuf90G
z2H8CusAr{;GlRiMGz51&K0*$XNHQ5WjYix08qO_&MDh%i$y9=)2E1I(%ITPu4B+@7
znaqZ7+QnfuSP|e+>2~`P91sLh%HjpbFO^ys9~%-@1c=sXygMXVE4aRpoE-32EM|JW
zp-HC`xCM$;54fY~{njSKruFCK3eMc=d<Mo3bZ~>a|CI<jN~G!L<hJ1KwJrh9UMUu{
pj!I7(2He>k{X`jvGVqrf_y!tn<N8QW3N!!!002ovPDHLkV1h3$06+i$

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!ia0vp^4j|0I1|(Ny7T#lEV9fS(aSW+oe0ytS_MrfQ;~%p-
zEi9%4ym<EH$vyi6H}5)TwCA<{dM~oeGUCO92T!gYy!ijX$%QG}Qvx!!H5Ijf*Ld}4
zcQHpD^Fft@{V{f(m#qcOSOgpx7%_<h3Kw3NnzwywUOKC?D`xM_rw6Uo;;yKD{-YIE
zZL(JK?YFHj?!CXi>v7zXyk7Q&7pH$TP_wn$;~7|UGHIjNF8>o(dVc<Xp}&2qt!nDg
zWo3Mu<`!Shj12n}TziDac6;8eh5YsAGdv>eq91>I6>EA}`tq{Rds3@@FTDJJX0Kat
z+UBL%=hr3PDp_7E{D1lDugksvX&Nyb?B`HuU|_;cTyb%@&ZoO}*E#kGDbJNx+qa)n
zz9OcuMryy``=!5X@4Z;(EONX~aNTD{&HRf&j}7}DY^uqv<nYe@!KL$=V=G&LO&Yt-
ie1WY%3l8k$&S7LPC=d#|8g>O3`V5|~elF{r5}E)LqP2nm

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!ia0vp^4j|0I1|(Ny7T#lEU@Y=<aSW+oe0$3<`;ddkfsd<8
zUMnno@a)NxcMo1%@Dw-pJf0`}$3oYFqpyz1oPEEmdix`_DLQEyVnOphIJJE)nyJVB
zzhO@0y}9rI7NzVoZsTTT5pZC@BsOsPs2x5el$YvJ^!4oa$Ey}tc}^<v{d&(-?@9jU
zmn&X;pWj<k^Qm^n^ff%wJi}&R-*o!-?Q3)V?4K3<*k!%$jm!)0f8Q&kS8kr(FYOe&
zuYaA*W*zhCe|Eo7`kuRgNkQb=-G49XJbQhsWUhZuc%#TX75}yMzk+gS^>x4gdfhr+
zy}`#q;>)S&_diywd#j)96u0rI^rf!<Zde?OaQp|c4>#++&C>~RfBusp+VAS3WJ}|O
z)y~Q1-WI-Hvi6<WYq>o~o}Otqa=RwY;q&&by$mT$66bkta9xjh{5CI^)o`xlg{0iv
pWQLh7wiVK<hM;h1{K4{%(Rxb$f8WB)Hee($c)I$ztaD0e0syG!w{8Fc

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Clothing/Mask/merc.rsi/meta.json b/Resources/Textures/Clothing/Mask/merc.rsi/meta.json
new file mode 100644
index 0000000000..0fe84a690d
--- /dev/null
+++ b/Resources/Textures/Clothing/Mask/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-MASK",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}