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 0000000000..72d641a561 Binary files /dev/null and b/Resources/Textures/Clothing/Back/Backpacks/merc.rsi/equipped-BACKPACK.png differ 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 0000000000..b99080f548 Binary files /dev/null and b/Resources/Textures/Clothing/Back/Backpacks/merc.rsi/icon.png differ 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 0000000000..b49a8326d7 Binary files /dev/null and b/Resources/Textures/Clothing/Back/Backpacks/merc.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Back/Backpacks/merc.rsi/inhand-right.png b/Resources/Textures/Clothing/Back/Backpacks/merc.rsi/inhand-right.png new file mode 100644 index 0000000000..93624bf969 Binary files /dev/null and b/Resources/Textures/Clothing/Back/Backpacks/merc.rsi/inhand-right.png differ 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 0000000000..dfc06b4314 Binary files /dev/null and b/Resources/Textures/Clothing/Belt/mercwebbing.rsi/equipped-BELT.png differ 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 0000000000..5c2cff2a9b Binary files /dev/null and b/Resources/Textures/Clothing/Belt/mercwebbing.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Belt/mercwebbing.rsi/inhand-left.png b/Resources/Textures/Clothing/Belt/mercwebbing.rsi/inhand-left.png new file mode 100644 index 0000000000..ea8de8bb1d Binary files /dev/null and b/Resources/Textures/Clothing/Belt/mercwebbing.rsi/inhand-left.png differ 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 0000000000..7974a30112 Binary files /dev/null and b/Resources/Textures/Clothing/Belt/mercwebbing.rsi/inhand-right.png differ 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 0000000000..7181602fbe Binary files /dev/null and b/Resources/Textures/Clothing/Eyes/Glasses/mercglasses.rsi/equipped-EYES.png differ 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 0000000000..17e6d89020 Binary files /dev/null and b/Resources/Textures/Clothing/Eyes/Glasses/mercglasses.rsi/icon.png differ 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 0000000000..a386caae79 Binary files /dev/null and b/Resources/Textures/Clothing/Eyes/Glasses/mercglasses.rsi/inhand-left.png differ 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 0000000000..490d980893 Binary files /dev/null and b/Resources/Textures/Clothing/Eyes/Glasses/mercglasses.rsi/inhand-right.png differ 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 0000000000..738cb44dd2 Binary files /dev/null and b/Resources/Textures/Clothing/Hands/Gloves/mercfingerless.rsi/equipped-HAND.png differ diff --git a/Resources/Textures/Clothing/Hands/Gloves/mercfingerless.rsi/icon.png b/Resources/Textures/Clothing/Hands/Gloves/mercfingerless.rsi/icon.png new file mode 100644 index 0000000000..5c7fde0e3a Binary files /dev/null and b/Resources/Textures/Clothing/Hands/Gloves/mercfingerless.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Hands/Gloves/mercfingerless.rsi/inhand-left.png b/Resources/Textures/Clothing/Hands/Gloves/mercfingerless.rsi/inhand-left.png new file mode 100644 index 0000000000..3e6dd319b4 Binary files /dev/null and b/Resources/Textures/Clothing/Hands/Gloves/mercfingerless.rsi/inhand-left.png differ 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 0000000000..f1c3af4ca2 Binary files /dev/null and b/Resources/Textures/Clothing/Hands/Gloves/mercfingerless.rsi/inhand-right.png differ 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 0000000000..c6caee656c Binary files /dev/null and b/Resources/Textures/Clothing/Head/Bandanas/merc.rsi/equipped-HELMET.png differ 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 0000000000..1992c497aa Binary files /dev/null and b/Resources/Textures/Clothing/Head/Bandanas/merc.rsi/icon.png differ 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 0000000000..0ca22bafbf Binary files /dev/null and b/Resources/Textures/Clothing/Head/Bandanas/merc.rsi/icon_mask.png differ diff --git a/Resources/Textures/Clothing/Head/Bandanas/merc.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Bandanas/merc.rsi/inhand-left.png new file mode 100644 index 0000000000..fbecc21ad9 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Bandanas/merc.rsi/inhand-left.png differ 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 0000000000..1ee5637bc8 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Bandanas/merc.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Bandanas/merc.rsi/mask-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Bandanas/merc.rsi/mask-equipped-HELMET.png new file mode 100644 index 0000000000..d898842e44 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Bandanas/merc.rsi/mask-equipped-HELMET.png differ 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 0000000000..defa7ea83c Binary files /dev/null and b/Resources/Textures/Clothing/Shoes/Boots/mercboots.rsi/equipped-FEET.png differ diff --git a/Resources/Textures/Clothing/Shoes/Boots/mercboots.rsi/icon.png b/Resources/Textures/Clothing/Shoes/Boots/mercboots.rsi/icon.png new file mode 100644 index 0000000000..7fba7bb0c2 Binary files /dev/null and b/Resources/Textures/Clothing/Shoes/Boots/mercboots.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Shoes/Boots/mercboots.rsi/inhand-left.png b/Resources/Textures/Clothing/Shoes/Boots/mercboots.rsi/inhand-left.png new file mode 100644 index 0000000000..e104efc03a Binary files /dev/null and b/Resources/Textures/Clothing/Shoes/Boots/mercboots.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Shoes/Boots/mercboots.rsi/inhand-right.png b/Resources/Textures/Clothing/Shoes/Boots/mercboots.rsi/inhand-right.png new file mode 100644 index 0000000000..ccdfdd41f8 Binary files /dev/null and b/Resources/Textures/Clothing/Shoes/Boots/mercboots.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Shoes/Boots/mercboots.rsi/meta.json b/Resources/Textures/Clothing/Shoes/Boots/mercboots.rsi/meta.json new file mode 100644 index 0000000000..f9a7088d3f --- /dev/null +++ b/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 + } + ] +} diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/mercenary.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/mercenary.rsi/equipped-INNERCLOTHING-monkey.png new file mode 100644 index 0000000000..56e74d57e1 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/mercenary.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/mercenary.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/mercenary.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000..28e67ab9f5 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/mercenary.rsi/equipped-INNERCLOTHING.png differ 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 0000000000..d4e4613b65 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/mercenary.rsi/icon.png differ 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 0000000000..deeceae816 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/mercenary.rsi/inhand-left.png differ 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 0000000000..225759fb4a Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/mercenary.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/mercenary.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/mercenary.rsi/meta.json new file mode 100644 index 0000000000..c5682d0a19 --- /dev/null +++ b/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 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Weapons/Melee/kukri_knife.rsi/equipped-BELT.png b/Resources/Textures/Objects/Weapons/Melee/kukri_knife.rsi/equipped-BELT.png new file mode 100644 index 0000000000..8f1f517dbd Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/kukri_knife.rsi/equipped-BELT.png differ 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 0000000000..b6c0e4ebfe Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/kukri_knife.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/kukri_knife.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/kukri_knife.rsi/inhand-left.png new file mode 100644 index 0000000000..0fb0606548 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/kukri_knife.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/kukri_knife.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/kukri_knife.rsi/inhand-right.png new file mode 100644 index 0000000000..c33431fe3e Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/kukri_knife.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Weapons/Melee/kukri_knife.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/kukri_knife.rsi/meta.json new file mode 100644 index 0000000000..e9485768dc --- /dev/null +++ b/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 + } + ] +}