From: August Sun <45527070+august-sun@users.noreply.github.com> Date: Thu, 30 Jan 2025 04:45:56 +0000 (-0700) Subject: The Goliath Hardsuit (#34721) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=4085fe70e899d691cd37618b3174ded5c956d6c6;p=space-station-14.git The Goliath Hardsuit (#34721) * Entities for hardsuit and helmet, graph and crafting recipe; modifies goliath hide drop rate * Added hardsuit sprites, corrected some crafting YAML * fixed crafting recipe, adjusted resource requirements * Added durathread material req --------- Co-authored-by: august-sun <45527070+august.sun@users.noreply.github.com> --- diff --git a/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml index b97df840a7..4ce8bbb960 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml @@ -136,6 +136,41 @@ radius: 7 energy: 3 +- type: entity + parent: ClothingHeadHardsuitWithLightBase + id: ClothingHeadHelmetHardsuitGoliath + name: goliath hardsuit helmet + description: A sturdy hardsuit helmet, infused with a goliath's hide and an eerie, unblinking eye cut from its mass. + components: + - type: Sprite + sprite: Clothing/Head/Hardsuits/goliathhelm.rsi + layers: + - state: icon + - state: icon-unshaded + shader: unshaded + - state: light-overlay + visible: false + shader: unshaded + map: [ "light" ] + - type: HandheldLight + addPrefix: false + - type: ToggleableLightVisuals + clothingVisuals: + head: + - state: equipped-head-light + shader: unshaded + - type: Clothing + clothingVisuals: + head: + - state: equipped-head + - state: equipped-head-unshaded + shader: unshaded + - type: PointLight + radius: 6 + - type: PressureProtection + highPressureMultiplier: 0.72 + lowPressureMultiplier: 1000 + - type: entity parent: ClothingHeadHardsuitBase id: ClothingHeadHelmetHardsuitMaxim diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml index 0e84fca06d..d2ece7e1d5 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml @@ -124,6 +124,11 @@ - type: HeldSpeedModifier - type: ToggleableClothing clothingPrototype: ClothingHeadHelmetHardsuitSpatio + - type: Tag + tags: + - Hardsuit + - WhitelistChameleon + - HardsuitSpatio #Salvage Hardsuit - type: entity @@ -156,6 +161,42 @@ - type: ToggleableClothing clothingPrototype: ClothingHeadHelmetHardsuitSalvage +#Goliath Hardsuit +- type: entity + parent: [ClothingOuterHardsuitBase, BaseCargoContraband] + id: ClothingOuterHardsuitGoliath + name: goliath hardsuit + description: A lightweight hardsuit, adorned with a patchwork of thick, chitinous goliath hide. + components: + - type: Sprite + sprite: Clothing/OuterClothing/Hardsuits/goliath.rsi + - type: Clothing + sprite: Clothing/OuterClothing/Hardsuits/goliath.rsi + - type: PressureProtection + highPressureMultiplier: 0.5 + lowPressureMultiplier: 1000 + - type: ExplosionResistance + damageCoefficient: 0.3 + - type: Armor + modifiers: + coefficients: + Blunt: 0.7 + Slash: 0.7 + Piercing: 0.5 + Heat: 0.7 #Goliath hide gets grilled instead of you + Radiation: 0.3 + Caustic: 0.8 + - type: ClothingSpeedModifier + walkModifier: 0.8 + sprintModifier: 0.8 + - type: HeldSpeedModifier + - type: ToggleableClothing + clothingPrototype: ClothingHeadHelmetHardsuitGoliath + - type: Construction + graph: HardsuitGoliath + node: hardsuitGoliath + +#Maxim Hardsuit - type: entity parent: [ClothingOuterHardsuitBase, BaseCargoContraband] id: ClothingOuterHardsuitMaxim diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/asteroid.yml b/Resources/Prototypes/Entities/Mobs/NPCs/asteroid.yml index 270e20e5c5..dcc8c4fbb8 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/asteroid.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/asteroid.yml @@ -90,6 +90,7 @@ - id: FoodMeatGoliath amount: 3 - id: MaterialGoliathHide1 + amount: 3 - type: entity id: ActionGoliathTentacle diff --git a/Resources/Prototypes/Recipes/Crafting/Graphs/goliath_hardsuit.yml b/Resources/Prototypes/Recipes/Crafting/Graphs/goliath_hardsuit.yml new file mode 100644 index 0000000000..0bb82cf261 --- /dev/null +++ b/Resources/Prototypes/Recipes/Crafting/Graphs/goliath_hardsuit.yml @@ -0,0 +1,22 @@ +- type: constructionGraph + id: HardsuitGoliath + start: start + graph: + - node: start + edges: + - to: hardsuitGoliath + steps: + - tag: HardsuitSpatio + icon: + sprite: Clothing/OuterClothing/Hardsuits/spatio.rsi + state: icon + name: spationaut hardsuit + doAfter: 10 + - material: Durathread + amount: 5 + doAfter: 10 + - material: GoliathHide + amount: 12 + doAfter: 10 + - node: hardsuitGoliath + entity: ClothingOuterHardsuitGoliath diff --git a/Resources/Prototypes/Recipes/Crafting/improvised.yml b/Resources/Prototypes/Recipes/Crafting/improvised.yml index 55ffdf5176..9a203a4d62 100644 --- a/Resources/Prototypes/Recipes/Crafting/improvised.yml +++ b/Resources/Prototypes/Recipes/Crafting/improvised.yml @@ -240,3 +240,16 @@ icon: sprite: Objects/Storage/petcarrier.rsi state: icon + +- type: construction + name: goliath hardsuit + id: HardsuitGoliath + graph: HardsuitGoliath + startNode: start + targetNode: hardsuitGoliath + category: construction-category-clothing + objectType: Item + description: A lightweight hardsuit, adorned with a patchwork of thick, chitinous goliath hide. + icon: + sprite: Clothing/OuterClothing/Hardsuits/goliath.rsi + state: icon diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml index 7847e8da0d..f1283f96e6 100644 --- a/Resources/Prototypes/tags.yml +++ b/Resources/Prototypes/tags.yml @@ -662,6 +662,9 @@ - type: Tag id: Hardsuit # Prevent melee injectors that can't penetrate hardsuits from injecting the wearer (nettles) +- type: Tag + id: HardsuitSpatio + - type: Tag id: Haunted diff --git a/Resources/Textures/Clothing/Head/Hardsuits/goliathhelm.rsi/equipped-head-light-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/goliathhelm.rsi/equipped-head-light-vox.png new file mode 100644 index 0000000000..7f6154cd67 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/goliathhelm.rsi/equipped-head-light-vox.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/goliathhelm.rsi/equipped-head-light.png b/Resources/Textures/Clothing/Head/Hardsuits/goliathhelm.rsi/equipped-head-light.png new file mode 100644 index 0000000000..197e253429 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/goliathhelm.rsi/equipped-head-light.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/goliathhelm.rsi/equipped-head-unshaded-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/goliathhelm.rsi/equipped-head-unshaded-vox.png new file mode 100644 index 0000000000..4486bff562 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/goliathhelm.rsi/equipped-head-unshaded-vox.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/goliathhelm.rsi/equipped-head-unshaded.png b/Resources/Textures/Clothing/Head/Hardsuits/goliathhelm.rsi/equipped-head-unshaded.png new file mode 100644 index 0000000000..e8aaf06567 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/goliathhelm.rsi/equipped-head-unshaded.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/goliathhelm.rsi/equipped-head-vox.png b/Resources/Textures/Clothing/Head/Hardsuits/goliathhelm.rsi/equipped-head-vox.png new file mode 100644 index 0000000000..5082ccf0b8 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/goliathhelm.rsi/equipped-head-vox.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/goliathhelm.rsi/equipped-head.png b/Resources/Textures/Clothing/Head/Hardsuits/goliathhelm.rsi/equipped-head.png new file mode 100644 index 0000000000..9571c0e2c4 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/goliathhelm.rsi/equipped-head.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/goliathhelm.rsi/icon-flash.png b/Resources/Textures/Clothing/Head/Hardsuits/goliathhelm.rsi/icon-flash.png new file mode 100644 index 0000000000..4e8b8a345b Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/goliathhelm.rsi/icon-flash.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/goliathhelm.rsi/icon-unshaded.png b/Resources/Textures/Clothing/Head/Hardsuits/goliathhelm.rsi/icon-unshaded.png new file mode 100644 index 0000000000..b6e9cb615d Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/goliathhelm.rsi/icon-unshaded.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/goliathhelm.rsi/icon.png b/Resources/Textures/Clothing/Head/Hardsuits/goliathhelm.rsi/icon.png new file mode 100644 index 0000000000..7f2b5b41ec Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/goliathhelm.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/goliathhelm.rsi/light-overlay.png b/Resources/Textures/Clothing/Head/Hardsuits/goliathhelm.rsi/light-overlay.png new file mode 100644 index 0000000000..34262103f7 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hardsuits/goliathhelm.rsi/light-overlay.png differ diff --git a/Resources/Textures/Clothing/Head/Hardsuits/goliathhelm.rsi/meta.json b/Resources/Textures/Clothing/Head/Hardsuits/goliathhelm.rsi/meta.json new file mode 100644 index 0000000000..d3ac9adcb7 --- /dev/null +++ b/Resources/Textures/Clothing/Head/Hardsuits/goliathhelm.rsi/meta.json @@ -0,0 +1,48 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "All sprites created by https://github.com/Pronana / princesscheeseballs (Discord)", + + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "icon-unshaded" + }, + { + "name": "icon-flash" + }, + { + "name": "light-overlay" + }, + { + "name": "equipped-head", + "directions": 4 + }, + { + "name": "equipped-head-light", + "directions": 4 + }, + { + "name": "equipped-head-unshaded", + "directions": 4 + }, + { + "name": "equipped-head-vox", + "directions": 4 + }, + { + "name": "equipped-head-light-vox", + "directions": 4 + }, + { + "name": "equipped-head-unshaded-vox", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/goliath.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/goliath.rsi/equipped-OUTERCLOTHING-vox.png new file mode 100644 index 0000000000..3e5c4e24ee Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/goliath.rsi/equipped-OUTERCLOTHING-vox.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/goliath.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/goliath.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000..a55e3eb9a8 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/goliath.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/goliath.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/goliath.rsi/icon.png new file mode 100644 index 0000000000..29f2e23828 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/goliath.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/goliath.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/goliath.rsi/inhand-left.png new file mode 100644 index 0000000000..e41244ac63 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/goliath.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/goliath.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/goliath.rsi/inhand-right.png new file mode 100644 index 0000000000..a44cb21e07 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Hardsuits/goliath.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/goliath.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Hardsuits/goliath.rsi/meta.json new file mode 100644 index 0000000000..fe0cc3ebbd --- /dev/null +++ b/Resources/Textures/Clothing/OuterClothing/Hardsuits/goliath.rsi/meta.json @@ -0,0 +1,32 @@ + +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "All sprites created by https://github.com/Pronana / princesscheeseballs (Discord)", + + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-OUTERCLOTHING-vox", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +}