diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml index 96b9131598..a7839348ce 100644 --- a/Resources/Prototypes/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/Catalog/uplink_catalog.yml @@ -283,6 +283,12 @@ description: A simple EVA suit that offers no protection other than what's needed to survive in space. price: 4 +- type: uplinkListing + id: UplinkClothingOuterHardsuitJuggernaut + category: Armor + itemId: ClothingOuterHardsuitJuggernaut + description: Hyper resilient armor made of materials tested in the Tau chromosphere facility. The only thing that's going to be slowing you down is this suit... and tasers. + price: 12 # Misc diff --git a/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml index 0596c68c18..73bdfe08d2 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml @@ -337,3 +337,18 @@ - type: PressureProtection highPressureMultiplier: 0.72 lowPressureMultiplier: 10000 + +- type: entity + parent: ClothingHeadHardsuitBase + id: ClothingHeadHelmetHardsuitCybersun + noSpawn: true + name: cybersun juggernaut helmet + description: Made of compressed red matter, this helmet was designed in the Tau chromosphere facility. + components: + - type: Sprite + sprite: Clothing/Head/Hardsuits/capspace.rsi + - type: Clothing + sprite: Clothing/Head/Hardsuits/capspace.rsi + - type: PressureProtection + highPressureMultiplier: 0.3 + lowPressureMultiplier: 1000 diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml index 0cf537ea5e..935292eaf0 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml @@ -479,3 +479,33 @@ Slash: 0.95 Heat: 0.90 Radiation: 0.75 + +- type: entity + parent: ClothingOuterHardsuitBase + id: ClothingOuterHardsuitJuggernaut + name: cybersun juggernaut suit + description: A suit made by the cutting edge R&D department at cybersun to be hyper resilient. + components: + - type: Sprite + sprite: Clothing/OuterClothing/Hardsuits/cybersun.rsi + - type: Clothing + sprite: Clothing/OuterClothing/Hardsuits/cybersun.rsi + - type: PressureProtection + highPressureMultiplier: 0.2 + lowPressureMultiplier: 1000 + - type: ClothingSpeedModifier + walkModifier: 0.5 + sprintModifier: 0.5 #extremely slow + - type: Armor + modifiers: + coefficients: + Blunt: 0.2 + Slash: 0.2 + Piercing: 0.2 + Heat: 0.35 + Radiation: 0.1 + - type: ExplosionResistance + resistance: 0.2 + - type: ToggleableClothing + clothingPrototype: ClothingHeadHelmetHardsuitCybersun + diff --git a/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/equipped-HELMET.png new file mode 100644 index 0000000000..d67b95fdff Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/icon.png b/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/icon.png new file mode 100644 index 0000000000..5cfffd9203 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/inhand-left.png new file mode 100644 index 0000000000..ee1c8d1c4b Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/inhand-right.png new file mode 100644 index 0000000000..fa19eea1f7 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/meta.json new file mode 100644 index 0000000000..855e3345c9 --- /dev/null +++ b/Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from Paradise SS13 at commit https://github.com/ParadiseSS13/Paradise/commit/a67c929b7394f78e7787114457ba42f4df6cc3a1", + "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/cybersun.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000..77ec6c04be Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/icon.png new file mode 100644 index 0000000000..4e25faccc7 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/inhand-left.png new file mode 100644 index 0000000000..671fe901fd Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/inhand-right.png new file mode 100644 index 0000000000..88a52ec7df Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/meta.json new file mode 100644 index 0000000000..20f48be4c1 --- /dev/null +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by emisse 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 + } + ] +} \ No newline at end of file