diff --git a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml index e9329d9412..cc78985790 100644 --- a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml +++ b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml @@ -262,6 +262,38 @@ - type: Clothing sprite: Clothing/Mask/swat.rsi +- type: entity + parent: ClothingMaskGasExplorer + id: ClothingMaskGasERT + name: ert gas mask + description: The gas mask of the elite squad of the ERT. + components: + - type: Sprite + sprite: Clothing/Mask/ert.rsi + - type: Clothing + sprite: Clothing/Mask/ert.rsi + - type: FlashImmunity + - type: EyeProtection + protectionTime: 5 + +- type: entity + parent: ClothingMaskGasERT + id: ClothingMaskGasDeathSquad + name: death squad gas mask + description: A unique gas mask for the NT's most elite squad. + components: + - type: Sprite + sprite: Clothing/Mask/squadron.rsi + - type: Clothing + sprite: Clothing/Mask/squadron.rsi + - type: Armor + modifiers: + coefficients: + Blunt: 0.80 + Slash: 0.80 + Piercing: 0.90 + Heat: 0.90 + - type: entity parent: ClothingMaskBase id: ClothingMaskRat diff --git a/Resources/Prototypes/Roles/Jobs/Fun/emergencyresponseteam.yml b/Resources/Prototypes/Roles/Jobs/Fun/emergencyresponseteam.yml index b877a24cee..3dbb6c18f3 100644 --- a/Resources/Prototypes/Roles/Jobs/Fun/emergencyresponseteam.yml +++ b/Resources/Prototypes/Roles/Jobs/Fun/emergencyresponseteam.yml @@ -33,7 +33,7 @@ jumpsuit: ClothingUniformJumpsuitERTLeader back: ClothingBackpackERTLeaderFilled shoes: ClothingShoesBootsMag - mask: ClothingMaskBreath + mask: ClothingMaskGasERT eyes: ClothingEyesGlassesSecurity gloves: ClothingHandsGlovesColorBlack outerClothing: ClothingOuterHardsuitERTLeader @@ -78,7 +78,7 @@ jumpsuit: ClothingUniformJumpsuitERTEngineer back: ClothingBackpackERTEngineerFilled shoes: ClothingShoesBootsMagAdv - mask: ClothingMaskBreath + mask: ClothingMaskGasERT eyes: ClothingEyesGlassesMeson gloves: ClothingHandsGlovesColorYellow outerClothing: ClothingOuterHardsuitERTEngineer @@ -123,7 +123,7 @@ jumpsuit: ClothingUniformJumpsuitERTSecurity back: ClothingBackpackERTSecurityFilled shoes: ClothingShoesBootsMag - mask: ClothingMaskBreath + mask: ClothingMaskGasERT eyes: ClothingEyesGlassesSecurity gloves: ClothingHandsGlovesColorBlack outerClothing: ClothingOuterHardsuitERTSecurity @@ -169,7 +169,7 @@ jumpsuit: ClothingUniformJumpsuitERTMedic back: ClothingBackpackERTMedicalFilled shoes: ClothingShoesBootsMag - mask: ClothingMaskBreath + mask: ClothingMaskGasERT eyes: ClothingEyesHudMedical gloves: ClothingHandsGlovesColorBlack outerClothing: ClothingOuterHardsuitERTMedical diff --git a/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml b/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml index aae21134ad..79fb317924 100644 --- a/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml +++ b/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml @@ -40,7 +40,7 @@ equipment: jumpsuit: ClothingUniformJumpsuitDeathSquad back: ClothingBackpackDuffelSyndicateAmmo - mask: ClothingMaskBreath + mask: ClothingMaskGasDeathSquad eyes: ClothingEyesGlassesSecurity ears: ClothingHeadsetAltCommand gloves: ClothingHandsGlovesCombat diff --git a/Resources/Textures/Clothing/Mask/ert.rsi/equipped-MASK.png b/Resources/Textures/Clothing/Mask/ert.rsi/equipped-MASK.png new file mode 100644 index 0000000000..da0578fbf0 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/ert.rsi/equipped-MASK.png differ diff --git a/Resources/Textures/Clothing/Mask/ert.rsi/icon.png b/Resources/Textures/Clothing/Mask/ert.rsi/icon.png new file mode 100644 index 0000000000..ca2cf982ca Binary files /dev/null and b/Resources/Textures/Clothing/Mask/ert.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Mask/ert.rsi/inhand-left.png b/Resources/Textures/Clothing/Mask/ert.rsi/inhand-left.png new file mode 100644 index 0000000000..637f21f5d0 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/ert.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Mask/ert.rsi/inhand-right.png b/Resources/Textures/Clothing/Mask/ert.rsi/inhand-right.png new file mode 100644 index 0000000000..d4f1028610 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/ert.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Mask/ert.rsi/meta.json b/Resources/Textures/Clothing/Mask/ert.rsi/meta.json new file mode 100644 index 0000000000..c46db45e2a --- /dev/null +++ b/Resources/Textures/Clothing/Mask/ert.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by Nimfar11 (GitHub) for Space Station 14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-MASK", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/Mask/squadron.rsi/equipped-MASK.png b/Resources/Textures/Clothing/Mask/squadron.rsi/equipped-MASK.png new file mode 100644 index 0000000000..d877124420 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/squadron.rsi/equipped-MASK.png differ diff --git a/Resources/Textures/Clothing/Mask/squadron.rsi/icon.png b/Resources/Textures/Clothing/Mask/squadron.rsi/icon.png new file mode 100644 index 0000000000..707d9c7c14 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/squadron.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Mask/squadron.rsi/inhand-left.png b/Resources/Textures/Clothing/Mask/squadron.rsi/inhand-left.png new file mode 100644 index 0000000000..70795a0465 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/squadron.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Mask/squadron.rsi/inhand-right.png b/Resources/Textures/Clothing/Mask/squadron.rsi/inhand-right.png new file mode 100644 index 0000000000..d1ecbf982a Binary files /dev/null and b/Resources/Textures/Clothing/Mask/squadron.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Mask/squadron.rsi/meta.json b/Resources/Textures/Clothing/Mask/squadron.rsi/meta.json new file mode 100644 index 0000000000..c46db45e2a --- /dev/null +++ b/Resources/Textures/Clothing/Mask/squadron.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by Nimfar11 (GitHub) for Space Station 14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-MASK", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +}