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 0000000000..a78b4f96a6 Binary files /dev/null and b/Resources/Textures/Clothing/Hands/Gloves/Color/olive.rsi/equipped-HAND.png differ 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 0000000000..db6378de51 Binary files /dev/null and b/Resources/Textures/Clothing/Hands/Gloves/Color/olive.rsi/icon.png differ 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 0000000000..3e6dd319b4 Binary files /dev/null and b/Resources/Textures/Clothing/Hands/Gloves/Color/olive.rsi/inhand-left.png differ 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 0000000000..f1c3af4ca2 Binary files /dev/null and b/Resources/Textures/Clothing/Hands/Gloves/Color/olive.rsi/inhand-right.png differ 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 0000000000..7878ecdc42 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/beret_merc.rsi/equipped-HELMET.png differ 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 0000000000..e04ccd7765 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/beret_merc.rsi/icon.png differ 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 0000000000..3605b07345 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/beret_merc.rsi/inhand-left.png differ 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 0000000000..85ccb58573 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/beret_merc.rsi/inhand-right.png differ 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 0000000000..9a52c7de5a Binary files /dev/null and b/Resources/Textures/Clothing/Head/Helmets/merc_helmet.rsi/equipped-HELMET.png differ 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 0000000000..bbf9b3700a Binary files /dev/null and b/Resources/Textures/Clothing/Head/Helmets/merc_helmet.rsi/icon.png differ 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 0000000000..d06c541e40 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Helmets/merc_helmet.rsi/inhand-left.png differ 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 0000000000..cfe18a3629 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Helmets/merc_helmet.rsi/inhand-right.png differ 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 0000000000..1ff7f0eb6d Binary files /dev/null and b/Resources/Textures/Clothing/Mask/merc.rsi/equipped-MASK.png differ 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 0000000000..7341ab8278 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/merc.rsi/icon.png differ 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 0000000000..7924f131a8 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/merc.rsi/inhand-left.png differ 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 0000000000..7145305d9f Binary files /dev/null and b/Resources/Textures/Clothing/Mask/merc.rsi/inhand-right.png differ 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 + } + ] +}