From: Emisse <99158783+Emisse@users.noreply.github.com> Date: Mon, 8 Jan 2024 12:55:40 +0000 (-0700) Subject: salvager maxim suit (#23734) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=6cba5b42781ed80071318f5a2742a1f4ecff3ead;p=space-station-14.git salvager maxim suit (#23734) * salvager maxim suit * why unversioned --- diff --git a/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml index deade89995..f42b3a9405 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml @@ -130,6 +130,29 @@ radius: 7 energy: 3 +- type: entity + parent: ClothingHeadHardsuitBase + id: ClothingHeadHelmetHardsuitMaxim + noSpawn: true + name: salvager maxim helmet + description: A predication of decay washes over your mind. + components: + - type: BreathMask + - type: Sprite + sprite: Clothing/Head/Hardsuits/maxim.rsi + - type: Clothing + sprite: Clothing/Head/Hardsuits/maxim.rsi + - type: PressureProtection + highPressureMultiplier: 0.08 + lowPressureMultiplier: 1000 + - type: Armor + modifiers: + coefficients: + Blunt: 0.9 + Slash: 0.9 + Piercing: 0.9 + Heat: 0.9 + #Security Hardsuit - type: entity parent: ClothingHeadHardsuitWithLightBase @@ -714,4 +737,4 @@ - type: PointLight color: "#f4ffad" radius: 5 - energy: 2 \ No newline at end of file + energy: 2 diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml index f88ad818ac..a2242efed7 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml @@ -156,6 +156,37 @@ - type: ToggleableClothing clothingPrototype: ClothingHeadHelmetHardsuitSalvage +- type: entity + parent: ClothingOuterHardsuitBase + id: ClothingOuterHardsuitMaxim + name: salvager maxim hardsuit + description: Fire. Heat. These things forge great weapons, they also forge great salvagers. + components: + - type: Sprite + sprite: Clothing/OuterClothing/Hardsuits/maxim.rsi + - type: Clothing + sprite: Clothing/OuterClothing/Hardsuits/maxim.rsi + - type: PressureProtection + highPressureMultiplier: 0.02 + lowPressureMultiplier: 1000 + - type: ClothingSpeedModifier + walkModifier: 1.0 + sprintModifier: 1.0 + - type: Armor + modifiers: + coefficients: + Blunt: 0.6 + Slash: 0.6 + Piercing: 0.5 + Heat: 0.3 + Radiation: 0.1 + - type: ExplosionResistance + damageCoefficient: 0.2 + - type: TemperatureProtection + coefficient: 0.001 + - type: ToggleableClothing + clothingPrototype: ClothingHeadHelmetHardsuitMaxim + #Security Hardsuit - type: entity parent: ClothingOuterHardsuitBase @@ -913,4 +944,4 @@ sprintModifier: 0.9 - type: HeldSpeedModifier - type: ToggleableClothing - clothingPrototype: ClothingHeadHelmetHardsuitSanta \ No newline at end of file + clothingPrototype: ClothingHeadHelmetHardsuitSanta diff --git a/Resources/Textures/Clothing/Head/Hardsuits/maxim.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/maxim.rsi/equipped-HELMET.png new file mode 100644 index 0000000000..e501c154bd Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/maxim.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/maxim.rsi/icon.png b/Resources/Textures/Clothing/Head/Hardsuits/maxim.rsi/icon.png new file mode 100644 index 0000000000..b69487120a Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/maxim.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/maxim.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/maxim.rsi/inhand-left.png new file mode 100644 index 0000000000..81e8a07fdd Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/maxim.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/maxim.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/maxim.rsi/inhand-right.png new file mode 100644 index 0000000000..e10648fd9b Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/maxim.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/maxim.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/maxim.rsi/meta.json new file mode 100644 index 0000000000..2d5aaae8c7 --- /dev/null +++ b/Resources/Textures/Clothing/Head/Hardsuits/maxim.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/6b3f58d7de4d4e374282819a7001eaa9bde1676d", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/maxim.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/maxim.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000..b4c05095df Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/maxim.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/maxim.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/maxim.rsi/icon.png new file mode 100644 index 0000000000..b4b447ab12 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/maxim.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/maxim.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/maxim.rsi/inhand-left.png new file mode 100644 index 0000000000..8c4a7e0264 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/maxim.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/maxim.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/maxim.rsi/inhand-right.png new file mode 100644 index 0000000000..c6f785c6a9 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/maxim.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/maxim.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/maxim.rsi/meta.json new file mode 100644 index 0000000000..3641da6f50 --- /dev/null +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/maxim.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/6b3f58d7de4d4e374282819a7001eaa9bde1676d", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file