From f8d404d783bd68a70094e8415b2467821b5ee96c Mon Sep 17 00:00:00 2001 From: Jackal298 <129199891+Jackal298@users.noreply.github.com> Date: Tue, 23 May 2023 00:57:15 +0300 Subject: [PATCH] Mercenary Items (#16665) * Mercenary Items Adding Mercenary Items * Fix * icon jumpsuit fix * Bot * bot fix --- Resources/Locale/en-US/forensics/fibers.ftl | 1 + .../Prototypes/Catalog/Fills/Items/misc.yml | 10 ++++++ .../Entities/Clothing/Back/backpacks.yml | 9 +++++ .../Entities/Clothing/Belt/belts.yml | 11 ++++++ .../Entities/Clothing/Eyes/glasses.yml | 14 ++++++++ .../Entities/Clothing/Hands/gloves.yml | 14 ++++++++ .../Entities/Clothing/Head/bandanas.yml | 12 +++++++ .../Entities/Clothing/Shoes/boots.yml | 15 ++++++++ .../Entities/Clothing/Uniforms/jumpsuits.yml | 11 ++++++ .../Entities/Objects/Weapons/Melee/knife.yml | 19 ++++++++++ .../Backpacks/merc.rsi/equipped-BACKPACK.png | Bin 0 -> 901 bytes .../Clothing/Back/Backpacks/merc.rsi/icon.png | Bin 0 -> 553 bytes .../Back/Backpacks/merc.rsi/inhand-left.png | Bin 0 -> 628 bytes .../Back/Backpacks/merc.rsi/inhand-right.png | Bin 0 -> 610 bytes .../Back/Backpacks/merc.rsi/meta.json | 26 ++++++++++++++ .../Belt/mercwebbing.rsi/equipped-BELT.png | Bin 0 -> 855 bytes .../Clothing/Belt/mercwebbing.rsi/icon.png | Bin 0 -> 427 bytes .../Belt/mercwebbing.rsi/inhand-left.png | Bin 0 -> 565 bytes .../Belt/mercwebbing.rsi/inhand-right.png | Bin 0 -> 567 bytes .../Clothing/Belt/mercwebbing.rsi/meta.json | 26 ++++++++++++++ .../Glasses/mercglasses.rsi/equipped-EYES.png | Bin 0 -> 296 bytes .../Eyes/Glasses/mercglasses.rsi/icon.png | Bin 0 -> 257 bytes .../Glasses/mercglasses.rsi/inhand-left.png | Bin 0 -> 285 bytes .../Glasses/mercglasses.rsi/inhand-right.png | Bin 0 -> 294 bytes .../Eyes/Glasses/mercglasses.rsi/meta.json | 26 ++++++++++++++ .../mercfingerless.rsi/equipped-HAND.png | Bin 0 -> 373 bytes .../Hands/Gloves/mercfingerless.rsi/icon.png | Bin 0 -> 448 bytes .../Gloves/mercfingerless.rsi/inhand-left.png | Bin 0 -> 278 bytes .../mercfingerless.rsi/inhand-right.png | Bin 0 -> 286 bytes .../Hands/Gloves/mercfingerless.rsi/meta.json | 26 ++++++++++++++ .../Bandanas/merc.rsi/equipped-HELMET.png | Bin 0 -> 446 bytes .../Clothing/Head/Bandanas/merc.rsi/icon.png | Bin 0 -> 410 bytes .../Head/Bandanas/merc.rsi/icon_mask.png | Bin 0 -> 307 bytes .../Head/Bandanas/merc.rsi/inhand-left.png | Bin 0 -> 453 bytes .../Head/Bandanas/merc.rsi/inhand-right.png | Bin 0 -> 438 bytes .../merc.rsi/mask-equipped-HELMET.png | Bin 0 -> 369 bytes .../Clothing/Head/Bandanas/merc.rsi/meta.json | 33 ++++++++++++++++++ .../Boots/mercboots.rsi/equipped-FEET.png | Bin 0 -> 558 bytes .../Shoes/Boots/mercboots.rsi/icon.png | Bin 0 -> 402 bytes .../Shoes/Boots/mercboots.rsi/inhand-left.png | Bin 0 -> 399 bytes .../Boots/mercboots.rsi/inhand-right.png | Bin 0 -> 395 bytes .../Shoes/Boots/mercboots.rsi/meta.json | 26 ++++++++++++++ .../equipped-INNERCLOTHING-monkey.png | Bin 0 -> 924 bytes .../mercenary.rsi/equipped-INNERCLOTHING.png | Bin 0 -> 1265 bytes .../Uniforms/Jumpsuit/mercenary.rsi/icon.png | Bin 0 -> 442 bytes .../Jumpsuit/mercenary.rsi/inhand-left.png | Bin 0 -> 588 bytes .../Jumpsuit/mercenary.rsi/inhand-right.png | Bin 0 -> 583 bytes .../Uniforms/Jumpsuit/mercenary.rsi/meta.json | 30 ++++++++++++++++ .../Melee/kukri_knife.rsi/equipped-BELT.png | Bin 0 -> 286 bytes .../Weapons/Melee/kukri_knife.rsi/icon.png | Bin 0 -> 404 bytes .../Melee/kukri_knife.rsi/inhand-left.png | Bin 0 -> 355 bytes .../Melee/kukri_knife.rsi/inhand-right.png | Bin 0 -> 361 bytes .../Weapons/Melee/kukri_knife.rsi/meta.json | 26 ++++++++++++++ 53 files changed, 335 insertions(+) create mode 100644 Resources/Textures/Clothing/Back/Backpacks/merc.rsi/equipped-BACKPACK.png create mode 100644 Resources/Textures/Clothing/Back/Backpacks/merc.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Back/Backpacks/merc.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/Back/Backpacks/merc.rsi/inhand-right.png create mode 100644 Resources/Textures/Clothing/Back/Backpacks/merc.rsi/meta.json create mode 100644 Resources/Textures/Clothing/Belt/mercwebbing.rsi/equipped-BELT.png create mode 100644 Resources/Textures/Clothing/Belt/mercwebbing.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Belt/mercwebbing.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/Belt/mercwebbing.rsi/inhand-right.png create mode 100644 Resources/Textures/Clothing/Belt/mercwebbing.rsi/meta.json create mode 100644 Resources/Textures/Clothing/Eyes/Glasses/mercglasses.rsi/equipped-EYES.png create mode 100644 Resources/Textures/Clothing/Eyes/Glasses/mercglasses.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Eyes/Glasses/mercglasses.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/Eyes/Glasses/mercglasses.rsi/inhand-right.png create mode 100644 Resources/Textures/Clothing/Eyes/Glasses/mercglasses.rsi/meta.json create mode 100644 Resources/Textures/Clothing/Hands/Gloves/mercfingerless.rsi/equipped-HAND.png create mode 100644 Resources/Textures/Clothing/Hands/Gloves/mercfingerless.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Hands/Gloves/mercfingerless.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/Hands/Gloves/mercfingerless.rsi/inhand-right.png create mode 100644 Resources/Textures/Clothing/Hands/Gloves/mercfingerless.rsi/meta.json create mode 100644 Resources/Textures/Clothing/Head/Bandanas/merc.rsi/equipped-HELMET.png create mode 100644 Resources/Textures/Clothing/Head/Bandanas/merc.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Head/Bandanas/merc.rsi/icon_mask.png create mode 100644 Resources/Textures/Clothing/Head/Bandanas/merc.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/Head/Bandanas/merc.rsi/inhand-right.png create mode 100644 Resources/Textures/Clothing/Head/Bandanas/merc.rsi/mask-equipped-HELMET.png create mode 100644 Resources/Textures/Clothing/Head/Bandanas/merc.rsi/meta.json create mode 100644 Resources/Textures/Clothing/Shoes/Boots/mercboots.rsi/equipped-FEET.png create mode 100644 Resources/Textures/Clothing/Shoes/Boots/mercboots.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Shoes/Boots/mercboots.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/Shoes/Boots/mercboots.rsi/inhand-right.png create mode 100644 Resources/Textures/Clothing/Shoes/Boots/mercboots.rsi/meta.json create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/mercenary.rsi/equipped-INNERCLOTHING-monkey.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/mercenary.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/mercenary.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/mercenary.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/mercenary.rsi/inhand-right.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/mercenary.rsi/meta.json create mode 100644 Resources/Textures/Objects/Weapons/Melee/kukri_knife.rsi/equipped-BELT.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/kukri_knife.rsi/icon.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/kukri_knife.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/kukri_knife.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/kukri_knife.rsi/meta.json diff --git a/Resources/Locale/en-US/forensics/fibers.ftl b/Resources/Locale/en-US/forensics/fibers.ftl index f1117c662c..c12bcf5b13 100644 --- a/Resources/Locale/en-US/forensics/fibers.ftl +++ b/Resources/Locale/en-US/forensics/fibers.ftl @@ -21,3 +21,4 @@ fibers-orange = orange fibers-white = white fibers-yellow = yellow fibers-regal-blue = regal blue +fibers-olive = olive diff --git a/Resources/Prototypes/Catalog/Fills/Items/misc.yml b/Resources/Prototypes/Catalog/Fills/Items/misc.yml index cc1153cca1..8f58df7ce5 100644 --- a/Resources/Prototypes/Catalog/Fills/Items/misc.yml +++ b/Resources/Prototypes/Catalog/Fills/Items/misc.yml @@ -6,3 +6,13 @@ - type: StorageFill contents: - id: CombatKnife + +- type: entity + id: ClothingShoesBootsMercFilled + parent: ClothingShoesBootsMerc + suffix: Filled + components: + - type: StorageFill + contents: + - id: KukriKnife + diff --git a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml index ea0f951e83..c0360c80ca 100644 --- a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml +++ b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml @@ -159,6 +159,15 @@ - type: Sprite sprite: Clothing/Back/Backpacks/salvage.rsi +- type: entity + parent: ClothingBackpack + id: ClothingBackpackMerc + name: merc bag + description: A backpack that has been in many dangerous places, a reliable combat backpack. + components: + - type: Sprite + sprite: Clothing/Back/Backpacks/merc.rsi + #ERT - type: entity parent: ClothingBackpack diff --git a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml index adc040e656..404c1624e4 100644 --- a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml +++ b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml @@ -478,6 +478,17 @@ - type: Clothing sprite: Clothing/Belt/securitywebbing.rsi +- type: entity + parent: ClothingBeltStorageBase + id: ClothingBeltMercWebbing + name: mercenarie webbing + description: Ideal for storing everything from ammo to weapons and combat essentials. + components: + - type: Sprite + sprite: Clothing/Belt/mercwebbing.rsi + - type: Clothing + sprite: Clothing/Belt/mercwebbing.rsi + - type: entity parent: ClothingBeltStorageBase id: ClothingBeltSalvageWebbing diff --git a/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml b/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml index 4d68aeca73..59ab9d17bc 100644 --- a/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml +++ b/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml @@ -128,6 +128,20 @@ - type: EyeProtection protectionTime: 5 +- type: entity + parent: ClothingEyesBase + id: ClothingEyesGlassesMercenary + name: mercenary glasses + description: Glasses made for combat, to protect the eyes from bright blinding flashes. + components: + - type: Sprite + sprite: Clothing/Eyes/Glasses/mercglasses.rsi + - type: Clothing + sprite: Clothing/Eyes/Glasses/mercglasses.rsi + - type: FlashImmunity + - type: EyeProtection + protectionTime: 5 + #Make a scanner category when these actually function and we get the trayson - type: entity parent: ClothingEyesBase diff --git a/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml b/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml index 5dac8bddae..a738bb5cab 100644 --- a/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml +++ b/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml @@ -249,6 +249,20 @@ fiberMaterial: fibers-synthetic fiberColor: fibers-black +- type: entity + parent: ClothingHandsBase + id: ClothingHandsGlovesMercFingerless + name: mercenary fingerless gloves + description: Gloves that may not protect you from finger burns, but will make you cooler. + components: + - type: Sprite + sprite: Clothing/Hands/Gloves/mercfingerless.rsi + - type: Clothing + sprite: Clothing/Hands/Gloves/mercfingerless.rsi + - type: Fiber + fiberMaterial: fibers-synthetic + fiberColor: fibers-olive + - type: entity parent: ClothingHandsBase id: ThievingGloves diff --git a/Resources/Prototypes/Entities/Clothing/Head/bandanas.yml b/Resources/Prototypes/Entities/Clothing/Head/bandanas.yml index b719e9b5c4..55219edac7 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/bandanas.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/bandanas.yml @@ -85,3 +85,15 @@ sprite: Clothing/Head/Bandanas/skull.rsi - type: Clothing sprite: Clothing/Head/Bandanas/skull.rsi + +- type: entity + parent: ClothingHeadBaseButcherable + id: HatBandMerc + name: mercenary bandana + description: To protect the head from the sun, insects and other dangers of the higher path. + components: + - type: Sprite + sprite: Clothing/Head/Bandanas/merc.rsi + - type: Clothing + sprite: Clothing/Head/Bandanas/merc.rsi + diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/boots.yml b/Resources/Prototypes/Entities/Clothing/Shoes/boots.yml index 433b8a8569..3c2acc6ec3 100644 --- a/Resources/Prototypes/Entities/Clothing/Shoes/boots.yml +++ b/Resources/Prototypes/Entities/Clothing/Shoes/boots.yml @@ -57,6 +57,21 @@ tags: - Knife +- type: entity + parent: ClothingShoesStorageBase + id: ClothingShoesBootsMerc + name: mercenary boots + description: Boots that have gone through many conflicts and that have proven their combat reliability. + components: + - type: Sprite + sprite: Clothing/Shoes/Boots/mercboots.rsi + - type: Clothing + sprite: Clothing/Shoes/Boots/mercboots.rsi + - type: Storage + whitelist: + tags: + - Knife + - type: entity parent: ClothingShoesBaseButcherable id: ClothingShoesBootsLaceup diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml index 4a36f35fe6..7622a84b1a 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml @@ -887,6 +887,17 @@ - type: Clothing sprite: Clothing/Uniforms/Jumpsuit/operative.rsi +- type: entity + parent: UnsensoredClothingUniformBase + id: ClothingUniformJumpsuitMercenary + name: mercenary jumpsuit + description: Clothing for real mercenaries who have gone through fire, water and the jungle of planets flooded with dangerous monsters or targets for which a reward has been assigned. + components: + - type: Sprite + sprite: Clothing/Uniforms/Jumpsuit/mercenary.rsi + - type: Clothing + sprite: Clothing/Uniforms/Jumpsuit/mercenary.rsi + - type: entity parent: ClothingUniformBase id: ClothingUniformJumpsuitAtmos diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml index ee55a432e2..38fcc918fc 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml @@ -216,3 +216,22 @@ - type: Item size: 10 sprite: Objects/Weapons/Melee/survival_knife.rsi + +- type: entity + name: kukri knife + parent: CombatKnife + id: KukriKnife + description: Professionals have standards. Be polite. Be efficient. Have a plan to kill everyone you meet. + components: + - type: Sprite + sprite: Objects/Weapons/Melee/kukri_knife.rsi + size: 2 + state: icon + - type: MeleeWeapon + attackRate: 1.0 + damage: + types: + Slash: 15 + - type: Item + size: 10 + sprite: Objects/Weapons/Melee/kukri_knife.rsi diff --git a/Resources/Textures/Clothing/Back/Backpacks/merc.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Backpacks/merc.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000000000000000000000000000000000..72d641a561a7d75405d0e0499e756a923168886a GIT binary patch literal 901 zcmV;01A6?4P)u(zU&IKfGON>EACB+rv=tAuAwHS> zh+hAZwT`z*Ba-A}ZeF+hBHP+(sN>^zxiPQOh(W9mCp(?zde+9qs=B_u*Vlu=rD`@; zqSr4S0ayih7*4th`a==onitat=TXx1yRPXx+Z@+}B~On_%4sp5lZ2BbF&g7#Tdk*R zJpP=UxVE;gZf|dL{h^L106r&ua6(4Jj5iv!`4+I}4F>T5qPBp~Ny4#>`crK_=&;uj z@~C;RjkPFOcHJldX ziS+wlweDJHSE)~z`jt0PFK2zf9*ni-u9^;qs^5>>22rmpyy{%9Kzbb-r`)17^lxsi z>*;(IqJgb|GM(NipM6@$Iz<7%+{44S+4=ccZEv@fT^}9wqV-w!1e<_RBoym>ksj$6 z0zyCt2mv7=1cZPP5CTF#2nYcoAOwVf5D)@FKnVP^1WNsj>&mvAp1v)a00*tkQ|Ms z^R$zxkk<@9-U0S6t48Q6l~321-wzlO;e_A>00)?F!MR(dYtKIIDU2YZN3dmMRo|9W6QdB*?=tzoB8abFD{!3BLL}Uq@fuJ zuE|xu0brBM26GEQhQ8q1F3t!*nz`2-YFUI+>_-RoB2~0uGxtAyflsdD1VE~oba(ef z)$30R6}XgE-3Pm2Gi;~h^vSl(`)kh5#TO~Dl~&#UTkWozo2)Mcgn$qb0zyCt2mvAR bUlI5T9F~q-c$;G(00000NkvXXu0mjfBT=G; literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Back/Backpacks/merc.rsi/icon.png b/Resources/Textures/Clothing/Back/Backpacks/merc.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..b99080f54887d346839f660452b8045f0f1f9ea8 GIT binary patch literal 553 zcmV+^0@nSBP)Cl-X*u3${mAZlB1c9y2`_}v@46kkHR?k{@0eL*1X5`%c~L@jL#GMPg!Zsbk< zg5yD|)SSt6gyNSN;MP342qLY3+3c003Wa0d2ZI;h{p4Y^@Jmd$dr!g>hJ{Tlpw$|2 zjQpv9RH^45@-Ra2OAIi=6NZOPE1=VPk^$upk$Szz9DZ^(1a9!R+kLkBI0C56QIc#d rnx|^@)cT9aCb1?>Y>q4N_Z9d8@Z1B7boCS-00000NkvXXu0mjfgN*xv literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Back/Backpacks/merc.rsi/inhand-left.png b/Resources/Textures/Clothing/Back/Backpacks/merc.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..b49a8326d74fccba9a2f219a721449f0c00cf729 GIT binary patch literal 628 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEV6ygfaSW+od^_uW)*%OhW7~r= zmR5WSXbtLWkEs$ke{av1!Wx77PBqO6OTVbOPPou4qPu1Kt-8jEsl93D)}l=D4wL_W zKl?_1wy8xj55JHCBM#IU!PI>4uwK|ottbQJ;SX z9p1{^d%Ahn2`&q38MQ^5UYAL$`7V{HEBm_a^7QV4sgIRI!Wrhg{r>*@wSu{+_P>i> zw7$sQ9-p@Lm%-k9xhq^U>rEL7#IBjm&S!4_c+iwD^ECIoc!_3CXXg^J?(*{&|J@Cd zXS8@@6&dpU^}N+jt@W17*J=oRedP~C>hCjJY zsfU|xUH#VZ^_TJf-x1qx`~(_2$1VDWVwI7e=ek~Qms?5aR`nmq`Ihy8@50MFPwi4~ zURtp3Rbqdx8RMp1*9_%D>Vp%H)PD55yj??jTilv!h8%0uafK0Bd<8e-@A$`BcB@(4 zR!Ll!5T4z=KuW^VMO<*<$tRXtVh_04z9kh40z=|Zg5ghweZubcK51~yA2W4?b-i9YEHwn3@4u&J5>pzP&Y?2UpZ#J_h z^y$2wo1)W&9TpdUdn{TYx$2UH7$@(?#fiZ_*?tTGCgFG9ESKcbJ#P2Z%R(~#mE4A# zdtP2W{`gAP)i14fG6`!|@t!QVdj9*vrboW44BVS=s%%^_E19=_4y>%RvhXzT~H&3fr^K%Y9^LO25iGR>SkL?UBoV6$d7q=z;rzKkrx1Pb*EcKF^wy z=yl1Wz-HMj#%R3>mi@Kj;r?xZg^J7N79?uI#=+gC^$ z)c(H0kjnV6jx|U9h*{*c$4ZauA0C%>I5CUy^7rp{0WA+3`^+0Am@<3bXTK>TQ1O-# zXyT-O+)uJXKQb|J7u}Ovly=}t?%8Dx8!kld|05w(pE~bg_j{vSuX%g^yEDbtbiCnM U^LlGHFzqmSy85}Sb4q9e08y<0VE_OC literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Back/Backpacks/merc.rsi/meta.json b/Resources/Textures/Clothing/Back/Backpacks/merc.rsi/meta.json new file mode 100644 index 0000000000..98ddf1691f --- /dev/null +++ b/Resources/Textures/Clothing/Back/Backpacks/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/547852588166c8e091b441e4e67169e156bb09c1", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/Belt/mercwebbing.rsi/equipped-BELT.png b/Resources/Textures/Clothing/Belt/mercwebbing.rsi/equipped-BELT.png new file mode 100644 index 0000000000000000000000000000000000000000..dfc06b431463e4319fadd99f6fb8c225a93a45b3 GIT binary patch literal 855 zcmV-d1E~CoP)s@5QQC-jh85jyfw=>IYR`eV9QOo3R{#*pd5f*oF(j#6-6xBk?0%rMnz|As@&6d zELBTZP5(^2S8uA@t)7`ovZMm3Kq`<5qynixDv%2J6*xct{Kt+i>$b1Ob%|HjBbe_Z zgBc6hboycP^z^&GRrTxZA7OvJ6X(U)`0t&#uZ9skL919X)Yj78-~XD-=O23r>a*EV zUyodb1z4?~J8&DcG9UuH?O5Rxv2F=YIX*t>u&uQj8R6g-0QGUaSS&gbhAjOW$Mx6+fthZPkIxgb&|2EJ zc>pc}lzJ>Qs7@KO^h2bD2>4{KZ^{7rqu4G1P!`3px3>=)t;V%@`uG$Fn*rja{s^{v z5j;Kp)Ng*Y>Xuf(H#a}seszz>!U5mPNZmtLu=uK9?H=nUigN|L&awJi39t@#XYDo% zhCtuyAG+sY+MnWiu6o+-3hT3(HwV@2K zH|iSI30!ZB)!xeTguwz6?AlT#04K0Ihv%DtT@`(d0e0;vaFqZAtS2ICr^MKT;9Hp{ zTZ>U808e1wrIthZ%}^Qe%Nnri=HqnwV#_gO)rYX=^Rc`;{0yZxt1|OY*5RgVh{YQE z&mZEr2{1GThE`pDqlewacL88n%rdwkj^&uFkEK8~-NwSTerh?mcY-A-8xf_Vch_Zo zjB!oyq`dYb+wcgj0V1t=#%FPW)^0}RH)6pATi*zaQ^ZHrSP1MR@RIcZ!lUGs^;94g hNCi@XRNw#<_zP_I4BO=Sj}ZU>002ovPDHLkV1npmmTUk3 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Belt/mercwebbing.rsi/icon.png b/Resources/Textures/Clothing/Belt/mercwebbing.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..5c2cff2a9b5ad52b0a9e624018ea9208477034c4 GIT binary patch literal 427 zcmV;c0aX5pP)b>!3`N=vp;HSHFho%F z=hqi0vus&`tUy-aFDg(~Z>^8_SlpMZ*n^zdl_Im*vt2GVx~{vsrwP@F^63foQ!Gj*0O|hzbUld}KV}*xufUz{ z`Mehl`KNr5W(^Su5*VKPe7<#fj4zd{%Gxm!Q9Yp3vZned5VD{GoPdJ+{YN+7te89h zV?Luu{(8OWCdcgH_xO5Pt|xY-o_g$PE=ICwK)UxCS8LV;xN{iYd?i_t!ouq=2O6r(oyYtib9+6l1Qy6!#7hsef;H9JA)Do<6oQ{aJ0% zp(MAKUKWoAoamomUrrqJjiwJrA0;NQ4frwT zR2yp|To@VWXZ9+>vHM!o6ip^~cAT#jF*89vSv?|6J? z4KuI%^|PlFHiVzP=*n?+(MrY-f1kSTd44zlG2ij9Y|VZ7Wfv1xN1a`NUbkH0P4w-X z2_FyZY!c?X^>+DP{sU$8`~RoCald@6bHmRWIDHEZhy#-tE=5gqUti>-Yuxf;y`tTh z%=rEVv*h-tNd5lt)q%G$R<=>9A@6%-YlxXbO0DpvE6OVvIhq_UOq6oZvgYRa&{)-S zam9|8GiLt^Wo{@b+ate!)64m8k0wr9fBkvW#ZsUjS1>wgS-+a_-FoZXxS~r=A^i*= zR(Ln~I~ZiH`p+~mnI&nmQ2)94#)sHlmala;ICp!#a7{ U^;>WnFgY-Iy85}Sb4q9e0N8!_kN^Mx literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Belt/mercwebbing.rsi/inhand-right.png b/Resources/Textures/Clothing/Belt/mercwebbing.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..7974a3011211b5b525d40c249578e50bf8c66495 GIT binary patch literal 567 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEVEpIl;uuoF_;%J=ze5fpt@3Je4^&VA9L@6}cCUPo}7)Rz1J7 z{_-Y^@RnW{j|QCRpJ1a`$hyTBFHiS)d^LXa-uXWBl&`xVJ@tC~mRZ>!4{iJYG5gdu zrJc{R=6s3ESAH@5iq%|mNB>Js{U&`ut4k}GnR558^OzaWoZm2Mg1N{hO}My!GURt4Of%0)~{# z3t4M7R-8Kd_xq2CmtiVf_fB@}UCV!gRclcigMWPF{l_1Z)7Cp_F$gryYJ9rsVdZmB}Htt8InrSvDF@+NQHV%t2-UEXIgWiPygGR0#UZ+t#U3eD=W3h6;PmKZQ*9 YB?OQ0`*V0L0VW6rPgg&ebxsLQ0J1Li9{>OV literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Belt/mercwebbing.rsi/meta.json b/Resources/Textures/Clothing/Belt/mercwebbing.rsi/meta.json new file mode 100644 index 0000000000..56b74413eb --- /dev/null +++ b/Resources/Textures/Clothing/Belt/mercwebbing.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/c838ba21dae97db345e0113f99596decd1d66039", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-BELT", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/Eyes/Glasses/mercglasses.rsi/equipped-EYES.png b/Resources/Textures/Clothing/Eyes/Glasses/mercglasses.rsi/equipped-EYES.png new file mode 100644 index 0000000000000000000000000000000000000000..7181602fbe98ea3cc349c9ba6cfb2e44bb23d909 GIT binary patch literal 296 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=?>$`{Ln;{G-ZJDmzt+X?f2bFR-qrImaf{q?%Lu1Gap#?@R-Z%df65&CSiv#Z@AI#1-CtC0 z)@(`3^xu5*M`FOk+00z$x6Z59%#E0U%jh4~jofX_=8w7*W-$T1&fw|l=d#Wzp$Pyp Cg=|Cs literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Eyes/Glasses/mercglasses.rsi/icon.png b/Resources/Textures/Clothing/Eyes/Glasses/mercglasses.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..17e6d89020810264b196e8cf01a732aedb5690b4 GIT binary patch literal 257 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ6P_-PArYL(2@`TP6)z>vl#4h(6QT`EHCPXuEWJufgS9G-7me~4kz zpWo#j%n5c(C-3el<<$HC=BDw6t(Pt(@fh#~b5A<(jHBse>$=VfjVC_E#i{+@o@>p# tojFBplTDC9uaUcRf(eTolz8C8z@WD`-H<1BZ6?r944$rjF6*2UngFp4WCQ>J literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Eyes/Glasses/mercglasses.rsi/inhand-left.png b/Resources/Textures/Clothing/Eyes/Glasses/mercglasses.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..a386caae79269428cda87200202f3c854fc47a90 GIT binary patch literal 285 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=Pdr^5Ln;{G-m>O9WWd94p~HA% zA>))r| literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Eyes/Glasses/mercglasses.rsi/inhand-right.png b/Resources/Textures/Clothing/Eyes/Glasses/mercglasses.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..490d98089389a4ba308a1a530d967d38b9589a8a GIT binary patch literal 294 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=Z#`WcLn;{G-ZJECG7w=)cr^3Q zo`#2Y^NyUHdR2lyxu=`+*~~q?QdTpz{Ms1c75(q~LAUmUjtvZqOe`D%3JwUyfk_8S z?w$YsJTY$9b+7m*-E&MU&6XZ~yrWiMtlRDP#~r-WUvD(o)A{d&xTSJ_lFM$Z7(XlD z-B}l3wby1k)o@O0RZ0hti9dirwe4(_s#6JjWU*FBLt@$m@9m(BllAu6{1- HoD!M<8%=So literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Eyes/Glasses/mercglasses.rsi/meta.json b/Resources/Textures/Clothing/Eyes/Glasses/mercglasses.rsi/meta.json new file mode 100644 index 0000000000..76e39a32d7 --- /dev/null +++ b/Resources/Textures/Clothing/Eyes/Glasses/mercglasses.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/5a73e8f825ff279e82949b9329783a9e3070e2da", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-EYES", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/Hands/Gloves/mercfingerless.rsi/equipped-HAND.png b/Resources/Textures/Clothing/Hands/Gloves/mercfingerless.rsi/equipped-HAND.png new file mode 100644 index 0000000000000000000000000000000000000000..738cb44dd2818917f8264a8ebda12511f56a642e GIT binary patch literal 373 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEV6^dcaSW+oe0yszUz34I+rw8J z!p%A=ZC5*wawj}%n!A%hT&-MKTwE>U;`t>l5-T}al4~MYY_(s`fA^eW8#^P5fCB?6 z@nAno*t*ARC%17j-LIIJ|7w>}WnEF<^{C8U*>8SqTH_Nq=l;2u-HDxluh-6A9e?n( zLE?*<7Wa0vZTp`&=UDc=DTnp9?*IJy#`={BeC>;ibF>TcQ*Q3N_0zSfC*TCX&w*SgA>o@H?^>=mIgPmy(l6RlmS(m^1ef8F>%^NjT|9gr> zf3$eb{EO)tvXClAMbxIuIR*4*atN4}ZnK*}OHv+V4Ln<4!IFe2j#AnkM3RWm&taA|?wM zBT+ufo;v|~Ubxe#^zrfdb(7=fAqdOmi??>MNZo3cbtFac?I&gOG4lC*=IfJWHtNVz zhuGUNSzT8?dp=iwqC9th;D{n%b)Qx6{2&V zk2c_gqKV%KK=uN$b?jBgd!=5>)`P(rIi_cCe^+_}0TggiECM^31*dN4qax3=sui)~ z-R>j!^8x_?q7VRpq?TsoG->}S0`hW2IdH}V2Wl+ncKhB)gqrzABuY8;*fUK@PJ&c- q_Y+V7-whT4q65)^=sWP~uMOk?0000?qcl>f<&A~=j7OP990Cds4GfG-EXa%k$Arjv^SK|k zFO02x->yBcLeTZx=j2s-+qCm@Hu5NR#azFhd;6aHi@J7~dne+1quC}LJ<9n)qH41t&i!lmnJY4{4(L$^Pgg&ebxsLQ03J|a_5c6? literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Hands/Gloves/mercfingerless.rsi/inhand-right.png b/Resources/Textures/Clothing/Hands/Gloves/mercfingerless.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}3S8TIaVYLBj=Yuy)oBg_~@2Q%~U-CrBb%O&F|4E*3uy6)D(NE(8yHR!PC{xWt~$(698&s BZEXMm literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Hands/Gloves/mercfingerless.rsi/meta.json b/Resources/Textures/Clothing/Hands/Gloves/mercfingerless.rsi/meta.json new file mode 100644 index 0000000000..8daacc3340 --- /dev/null +++ b/Resources/Textures/Clothing/Hands/Gloves/mercfingerless.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/54ecdcc05bcaf335489938b1253a2a733ba12271", + "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/Bandanas/merc.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Bandanas/merc.rsi/equipped-HELMET.png new file mode 100644 index 0000000000000000000000000000000000000000..c6caee656c3f6ce6a01c2ecbde7c1243f29f6cb1 GIT binary patch literal 446 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEU~KhtaSW+od^>An)?ot?*U%T& zG@Y+M+8TU9{>SCd?25tRleaoAJEv#O5gnHFp7#mZjD2FMj?qN9gfJP8-)p z`P=g!r+uDu?)myBKPzln&;82(`#g%7?|$iePka8g+Zz<--d(r(&C$dC{S)d;8Sd}M zvzL#`x8!SosH84$IU$PwDuaqe>E&HBqdva)%%%Te*U!WsK5c@Q>u**|8=7xl{{H^) zJxr|0`~OFzPTSez`dWAOx)TAX+e26{eZCVUt;^xSz$DPXz@oswh>f|yi)mrqtq}9H zb(vM%T3MaGrHhsS9@Jvsn^!OXpyAb}EEk_2J(GUkl3R7_G2iv?nP(I=YVNJoYf-R!t5-eR3eQH!6uHs0jH>NKc>f6P8$zVOE!&xqNJJb>}S;OXk; Jvd$@?2>>e9xvl^J literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Head/Bandanas/merc.rsi/icon.png b/Resources/Textures/Clothing/Head/Bandanas/merc.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..1992c497aa248a83ac5892173090103f456d2b23 GIT binary patch literal 410 zcmV;L0cHM)P)#*D87lWVt+3o_XsvNg0{g*13^X3Tv2+*A z?Cj3Y_wP)iNEo34p#q@-?_Pn%vjvz;hF8~_e!nZ*?M@bpRpq>u0|`!&mf>G6pJom) z#xrolM|hMCz(=Fbzpy;d%o>EP*GJ=5os?F<1qa}8XcipaUbkR69bcm;lU^^8+3d^7 z`S2PpaY@i(& zgF#%s1%U8ZWczy%4lv=^A`~~D&%YZGwArNMYk~JGKyvn#Pzupt#$ZjC{Wf0}N6=Ee z$2?vE2+|-Pq9vHVZUNV5AHlKb6##%1U<0%4%>1>jR{-EPlqA5@^oMR?UAMdovK;4E zfH?FmjvxP3Xm}kkb$A6(1cPn+3fRsS{7`{Vf%mPzFCv$q&fBgV!2kdN07*qoM6N<$ Ef?K4w3jhEB literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Head/Bandanas/merc.rsi/icon_mask.png b/Resources/Textures/Clothing/Head/Bandanas/merc.rsi/icon_mask.png new file mode 100644 index 0000000000000000000000000000000000000000..0ca22bafbf88f7ab41bf5126255455377b26b8b2 GIT binary patch literal 307 zcmV-30nGl1P)(pn;sf=XD}R|_C<-(RD+)AR^da#&1>>(mKK zbM+q{>pf`xA+bhB-p!n2N8w}dC5C>fpLvzrTBoMX^-OA27l>M$_U~MMQ*PSsK5iy~ z1_l-d21X7C1~9X(??Bn^U2a#SlNQg~x?}pS_A{0FE8h1n&faz;?TSUznZ?`{!g0x` z_8hGe0z^cgA+%l(>CdGwrI!DDRel}ldLJGG7lZAFL7Vx#{ UIo?{r1dJXAPgg&ebxsLQ0N%>Hwg3PC literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Head/Bandanas/merc.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Bandanas/merc.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..1ee5637bc8e72164e73c99824b2980e850ffd988 GIT binary patch literal 438 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEV663YaSW+oe0$3_kI7J=?V+#B zM7`+?Je#LT7fAFSP5j0-G2>DJr__`X7iW{z{RiVJr5|a4Auk(g*+P-kDZ!Fm(3N{-M3wK;WDjsHdDqM zHLe%FZfZ7R)@aJJOt&yzz^`*`^Xox>21c$v-Ay-0*d1f#~+4Uf7<^^Pv5}`j1LA+S3j3^P6zgfd@VChW^R)}cE3Z<9W@5c1G#?dQV+LO_vFqic&~3ey;mZy=ijT6{ch#&ZtTpg zZ@9gOWpcJ=!s^BM_gqU^d7R||_Zp6k_xC-yE;H+L_~lpo{eRjyi*8L@7ho#P&d4I* gz<@z~Q~bcVS}3D$qh&-tFen*3UHx3vIVCg!0DYd0Qvd(} literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Head/Bandanas/merc.rsi/meta.json b/Resources/Textures/Clothing/Head/Bandanas/merc.rsi/meta.json new file mode 100644 index 0000000000..94ecdbc846 --- /dev/null +++ b/Resources/Textures/Clothing/Head/Bandanas/merc.rsi/meta.json @@ -0,0 +1,33 @@ +{ + "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": "icon_mask" + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "mask-equipped-HELMET", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/Shoes/Boots/mercboots.rsi/equipped-FEET.png b/Resources/Textures/Clothing/Shoes/Boots/mercboots.rsi/equipped-FEET.png new file mode 100644 index 0000000000000000000000000000000000000000..defa7ea83c9df30f5c77c73e75781fc733ab5023 GIT binary patch literal 558 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEVEpRo;uuoF_;%LbEG9>R!v!Ve~_s#b&l%_1<<3jwf%B;t>ViM05O4as-IdKkCd zE)QHdA^4;B(hPpav(D`avUOf3e=OU-TE<6($pSpgLXCc@}LIETbpw#jE-aq6fY7MLTxVeV=5&V;i;qTgDo5de1jErXWtLJRZ zTl4(W$r)x=_w0(Y9CcTmbe+TCvt0lFa+7UYZv8)P_}m`6DtX7>cQKaBdK1&f##7C|7$zasjr~^hrU^E0qLtr!nSjZ`gXU(eqPprPQv{puZY8gqbj9`{aNpYi? z`|R0QFdv&ZK1Yz120)hV-hG2XK!6F1VJ^WXo}VB0AB17*kZH0U0J0baRHb@QxKp_Ik9c*mO3=bZ>W@u=bj*%7! zMghoj5s|-e!^Ok|z-*A^$l@>sAo)9YzA>n%aKVJYmInpt!THDxyorz;%Rz>NEC)FP z20)hU>1AU09wbjN1Ym~1d=BHoXk6kTM}V>^2;eJ-@H*h?)yFVqeuQeE)?UnlDSV++@y3ktvgdwOsn};T@Yh+zHuL+< zn7ie}QJ=4C-@QH)aOPR)YaPZlX7-_*C#_Lt`7b{qg>jNn!-05?8ixOiiw@3F`1u4F O&nhe87b2JwU? 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 bLkj!>eHbIcHBzLz00000NkvXXu0mjfOZ`UL literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/mercenary.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/mercenary.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..d4e4613b65b4fd3f95972f8ff4897c12e81c87ab GIT binary patch literal 442 zcmV;r0Y(0aP)1(TWH?y7TD723`DuWP(lNv_j(LP}R#vx2+H77W_!bKfPz7wHUcX4h=JO}E5-bJq z&$ewgdlt}m{J0$wN~FLYfVl%t!M^_n%VhwhM7w<{a@4E9KmV=S6qy3B6u^8ej)sk( zk?gb*PI)4U@nO9I;-QCV+h+vHl@$87DUg-+?69w3&vhjoyMbQsM$R|gH?gRDHIL$d zt?Vg?qE&)NEvg2B;8@*e`s@af$#Gl=f_Jd2(|9UApxeEM$>bp(y%UKy8pX__Y681~ z^|}nTS{Y1}3KV1i1v;H`D3uBjMTD#L**^OXj7E22WT(?t2*b|=v*(3?I5s&P-sc+a k1d-lo1+)TMfrC`w8xc}?D5@PzjQ{`u07*qoM6N<$f?@!}MgRZ+ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/mercenary.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/mercenary.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..deeceae816e1805ab12d1a301c29a33a4d3cee7a GIT binary patch literal 588 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEU=sFpaSW+od^>Z07L%jEG54K% zbDne@)a&Iad&s37uM``1fc-<@5%CM|C$uFt@GjZrEjWRL&3RTqf|0n}x4zQ%_eCN< z$-a1ZZu{@E_uhZgkx`0KU|_<9N;%Fv|L*>8Ms}`YaQW9XE8lltf+4@mV8_YdX~)(~Z(Z;&rg^Vf z^zq`;<=5ZF&71a-_sw_qS$^_b&o6$n&eggeXvw&2xs7S2?^?h3nk8!=Ka5(;lwj0p zy#LeBv(HMew?&*jpa1IlDe)agv~DGRbO|i^Sp393(`Mh&ufKkp$n~yU6|uB<>)&&^ z4y+E7T11X3mRiMcxw}o1<6edZ&&uoEFAH`oQ?Zd-QQF)!I6Q*0SB^CNLVd$JIQtXqEE{+0)=wtu6B#jo4iZ$_w}`I z)$9(ttKP^mynVH?oZ-ig?67`qQ5}n)@jJJyIvzKV;j^O0!;q+8?aSYV8q&T-EVYPg z+wx6j?W>K`8BA6mkK4zzLN0s1{|DyA|K1OzpQ#z$+GToq3NV#0c)I$ztaD0e0sy~# B1{44Q literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/mercenary.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/mercenary.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..225759fb4ae96f3517234b0b394cd7940eb7160a GIT binary patch literal 583 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEVB+(1aSW+od^>Yv7L%huoBK|^ zIZrwc>h*Gz9Xxbuy2o_!4~#V;A6dT$e&S-wVP5$*h()F8-~=_989fG@%Fi9$8$BuZ zq4>GIf1j5)1$cGd17oYCj`{JW_ zO~?98K)D&N>#o25eQ8O>OmCz9()6Hi`H$hp@^v>)Hhj4FXvyrer<+f4n$6bjb>nY+ z&By=$vv27BSDXfWxkDw-Ms$3C6nrdLE|lSLqW)*?`S*3??WaCj|G3gV^^cqDvt^gn zy(V?fSN`wWd{9?c?0kFW{`$}@XJ*G;UC*W9oBZl)QkKcSjIFDJMfL`6mkwSndbzCH zH}ln6Khurf@n1z}oR!NC{NnieXSSN+`N-!LY7Z)l^6G3KJ5}KdA%P8Q3reF+&sH5~ zkPG=QaY`SZC= zy_4MI8$5>vy87R2y?W;YugA;qkIE|hMK{%=84kAv$l%is2tMx+Sbrdj^(#-vHDiG) z*|^mea;tZyFZfZr|J%IAN74(@AKb4`oC9-Q!hNRvb`9(4ZAXkWfF5S>boFyt=akR{ E0A7%3O8@`> literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Melee/kukri_knife.rsi/icon.png b/Resources/Textures/Objects/Weapons/Melee/kukri_knife.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..b6c0e4ebfe4ba8ea4cb5234cd648862db83c3260 GIT binary patch literal 404 zcmV;F0c-w=P)5>l2-s4u`>Y5F#prn;$h6 zKHJ2Fv`cM?h&!A6{`-A|F}Iup&H?AZe|NxZ%78RYIcfz#AeAhNLd1EVD?DH9-tcA6 z@AK7WbE*)>v9?kehRAa&;${Kp9PkSK4N^orw%aVrGL|HXw5M1i?bZZt#F!T;VAR`a@G(*^bTuKZgQFmky3IR|%k<15TkPAQkpw0VcRDkP5h`iAynT|2!VW zomZV-3kS;6tPq6rpTwQ^qQi!g1|d8uk{$x_Fm(7?ciOnk^^GJoHe z+%x;!MxE1%=kmY3GS)p`?p>g1X8uK@P2qo`jK6b=?fa>{mj6sn?5Ox**7N+`(bvm@ zy^hv=ws{|aX4ks+M(6fPWzWs~c=^kn5@XX&mAG>&JKriDi`rwlkFzQKV%&2xMtmr1%XWN+!{}w`la*UH}1Z?D#@9Fkww4(iD;}B-tqE) z@8vyTc5c14d;R;VMSG^dT-Pj-yvjYc-@d%|-v+tpLmRK?&y3mkb6dsX+WY?T2Mu^0 z{}9^G!nxkLJa+pDYxa-lWZiDtsSCVMd#1iF@2?U6)aa}VPU)@xR!sJ6<@~nv%1i~T zV5J5ICJqH$L=M-VYr1!5c