Mercenary Items (#16665)

* Mercenary Items

Adding Mercenary Items

* Fix

* icon jumpsuit fix

* Bot

* bot fix

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

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
+

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

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

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

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

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
+

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

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

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

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
+    }
+  ]
+}

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
+    }
+  ]
+}

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
+    }
+  ]
+}

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
+    }
+  ]
+}

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
+    }
+  ]
+}

Resources/Textures/Clothing/Shoes/Boots/mercboots.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/7e4e9d432d88981fb9bb463970c5b98ce85c0abe",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-FEET",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}

Resources/Textures/Clothing/Uniforms/Jumpsuit/mercenary.rsi/meta.json

@@ -0,0 +1,30 @@
+{
+  "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/d7e905e4d5ab2b0a8ce210c6ad686aeeebbab426, monkey made by Jackal298 for ss14",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-INNERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "equipped-INNERCLOTHING-monkey",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}

Resources/Textures/Objects/Weapons/Melee/kukri_knife.rsi/meta.json

@@ -0,0 +1,26 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "sprite made by Jackal298",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "equipped-BELT",
+            "directions": 4
+        }
+    ]
+}