From: Alekshhh <44923899+Alekshhh@users.noreply.github.com> Date: Mon, 13 Mar 2023 17:47:56 +0000 (+0200) Subject: Added Warden's Hardsuit (#14521) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=e460963964bde47ee897af03a50fb3ddbd294f45;p=space-station-14.git Added Warden's Hardsuit (#14521) --- diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml index 874447a720..144f6119a7 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml @@ -20,6 +20,7 @@ - id: ClothingOuterWinterWarden - id: RubberStampWarden - id: DoorRemoteArmory + - id: ClothingOuterHardsuitWarden - type: entity id: LockerSecurityFilled diff --git a/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml index 754b272c59..9f8e5b9dd1 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml @@ -231,6 +231,29 @@ Slash: 0.8 Piercing: 0.8 +- type: entity + parent: ClothingHeadHardsuitWithLightBase + id: ClothingHeadHelmetHardsuitWarden + noSpawn: true + name: warden's hardsuit helmet + description: A modified riot helmet. Oddly comfortable. + components: + - type: Sprite + sprite: Clothing/Head/Hardsuits/security-warden.rsi + - type: Clothing + sprite: Clothing/Head/Hardsuits/security-warden.rsi + - type: PointLight + color: "#ffeead" + - type: PressureProtection + highPressureMultiplier: 0.525 + lowPressureMultiplier: 10000 + - type: Armor + modifiers: + coefficients: + Blunt: 0.8 + Slash: 0.8 + Piercing: 0.8 + - type: entity parent: ClothingHeadHardsuitWithLightBase id: ClothingHeadHelmetHardsuitSyndie diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml index d7f0cbaf93..e2b110f800 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml @@ -343,6 +343,32 @@ - type: ToggleableClothing clothingPrototype: ClothingHeadHelmetHardsuitSecurityRed +- type: entity + parent: ClothingOuterHardsuitBase + id: ClothingOuterHardsuitWarden + name: warden's hardsuit + description: A specialized riot suit geared to combat low pressure environments while maintaining agility. + components: + - type: Sprite + sprite: Clothing/OuterClothing/Hardsuits/security-warden.rsi + - type: Clothing + sprite: Clothing/OuterClothing/Hardsuits/security-warden.rsi + - type: PressureProtection + highPressureMultiplier: 0.525 + lowPressureMultiplier: 10000 + - type: Armor + modifiers: + coefficients: + Blunt: 0.5 + Slash: 0.6 + Piercing: 0.6 + Heat: 0.8 + Radiation: 0.25 + - type: ExplosionResistance + damageCoefficient: 0.4 + - type: ToggleableClothing + clothingPrototype: ClothingHeadHelmetHardsuitWarden + - type: entity parent: ClothingOuterHardsuitBase id: ClothingOuterHardsuitSyndie @@ -591,7 +617,7 @@ walkModifier: 1.0 sprintModifier: 1.0 - type: TemperatureProtection - coefficient: 0.001 + coefficient: 0.001 - type: Armor modifiers: coefficients: @@ -632,7 +658,7 @@ sprite: Clothing/OuterClothing/Hardsuits/ERTSuits/ertengineer.rsi - type: ToggleableClothing clothingPrototype: ClothingHeadHelmetHardsuitERTEngineer - + - type: entity parent: ClothingOuterHardsuitERTLeader id: ClothingOuterHardsuitERTMedical @@ -656,7 +682,7 @@ sprite: Clothing/OuterClothing/Hardsuits/ERTSuits/ertsecurity.rsi - type: ToggleableClothing clothingPrototype: ClothingHeadHelmetHardsuitERTSecurity - + - type: entity parent: ClothingOuterHardsuitERTLeader id: ClothingOuterHardsuitERTJanitor diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security-warden.rsi/icon-flash.png b/Resources/Textures/Clothing/Head/Hardsuits/security-warden.rsi/icon-flash.png new file mode 100644 index 0000000000..1e843dce4b Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/security-warden.rsi/icon-flash.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security-warden.rsi/icon.png b/Resources/Textures/Clothing/Head/Hardsuits/security-warden.rsi/icon.png new file mode 100644 index 0000000000..a191340e76 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/security-warden.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security-warden.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/security-warden.rsi/meta.json new file mode 100644 index 0000000000..d77d41281c --- /dev/null +++ b/Resources/Textures/Clothing/Head/Hardsuits/security-warden.rsi/meta.json @@ -0,0 +1,25 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by Alekshhh for SS14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "icon-flash" + }, + { + "name": "off-equipped-HELMET", + "directions": 4 + }, + { + "name": "on-equipped-HELMET", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security-warden.rsi/off-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/security-warden.rsi/off-equipped-HELMET.png new file mode 100644 index 0000000000..47044b0629 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/security-warden.rsi/off-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/security-warden.rsi/on-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/security-warden.rsi/on-equipped-HELMET.png new file mode 100644 index 0000000000..5cb57f76ff Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/security-warden.rsi/on-equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-warden.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-warden.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000..0f4fe96e9b Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-warden.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-warden.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-warden.rsi/icon.png new file mode 100644 index 0000000000..f42a8a96ae Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-warden.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-warden.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-warden.rsi/inhand-left.png new file mode 100644 index 0000000000..2b5da34689 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-warden.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-warden.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-warden.rsi/inhand-right.png new file mode 100644 index 0000000000..a76acc62d7 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-warden.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-warden.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-warden.rsi/meta.json new file mode 100644 index 0000000000..a13986d728 --- /dev/null +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/security-warden.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by Alekshhh for SS14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +}