From 460262b4bc33832222fbb82cf15bcb1ba45eefd3 Mon Sep 17 00:00:00 2001 From: Shy-ivy Date: Mon, 25 May 2026 22:43:03 -0400 Subject: [PATCH 1/4] a --- .../en-US/_Triad/research/ship_stash.ftl | 3 +- .../Entities/Clothing/OuterClothing/suits.yml | 4 +- .../Entities/Structures/Machines/lathe.yml | 1 + .../Prototypes/_NF/Research/industrial.yml | 2 +- .../Construction/Lathes/Suitsadvanced.yml | 42 +++++++++++++++++++ .../_Triad/Recipes/Lathes/categories.yml | 3 ++ .../_Triad/Recipes/Lathes/packs.yml | 6 +++ .../Prototypes/_Triad/Research/Industrial.yml | 14 +++++++ 8 files changed, 71 insertions(+), 4 deletions(-) create mode 100644 Resources/Prototypes/_Triad/Recipes/Construction/Lathes/Suitsadvanced.yml create mode 100644 Resources/Prototypes/_Triad/Recipes/Lathes/categories.yml create mode 100644 Resources/Prototypes/_Triad/Recipes/Lathes/packs.yml create mode 100644 Resources/Prototypes/_Triad/Research/Industrial.yml diff --git a/Resources/Locale/en-US/_Triad/research/ship_stash.ftl b/Resources/Locale/en-US/_Triad/research/ship_stash.ftl index 19784ee70dd..239ef508627 100644 --- a/Resources/Locale/en-US/_Triad/research/ship_stash.ftl +++ b/Resources/Locale/en-US/_Triad/research/ship_stash.ftl @@ -1,2 +1,3 @@ research-technology-civilian-stash = Civilian Ship Stash -research-technology-military-stash = Military Ship Stash \ No newline at end of file +research-technology-military-stash = Military Ship Stash +research-technology-Suits-Advanced = Advanced Suits diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml index 1453d439a82..5a24368cb1c 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml @@ -19,7 +19,7 @@ Piercing: 0.9 Heat: 0.75 - type: ExplosionResistance - damageCoefficient: 0.15 + damageCoefficient: 0.5 - type: GroupExamine - type: Tag tags: @@ -117,7 +117,7 @@ modifiers: coefficients: Heat: 0.90 - Radiation: 0.01 + Radiation: 0 - type: Clothing sprite: Clothing/OuterClothing/Suits/rad.rsi - type: GroupExamine diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 55c07ce4255..b8561cd2525 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -272,6 +272,7 @@ - SmartGun # Goobstation # Einstein Engines Packs - Translators + - SuitsAdvancedRecipe #Triad - type: EmagLatheRecipes emagDynamicPacks: - DynamicAmmoRecipePack diff --git a/Resources/Prototypes/_NF/Research/industrial.yml b/Resources/Prototypes/_NF/Research/industrial.yml index ec122054f7e..30e0db41911 100644 --- a/Resources/Prototypes/_NF/Research/industrial.yml +++ b/Resources/Prototypes/_NF/Research/industrial.yml @@ -75,7 +75,7 @@ - ClothingOuterHardsuitRd technologyPrerequisites: - HardsuitsSpecialized - position: 1, 7 + position: 2, 7 # Tier 3 diff --git a/Resources/Prototypes/_Triad/Recipes/Construction/Lathes/Suitsadvanced.yml b/Resources/Prototypes/_Triad/Recipes/Construction/Lathes/Suitsadvanced.yml new file mode 100644 index 00000000000..60353987298 --- /dev/null +++ b/Resources/Prototypes/_Triad/Recipes/Construction/Lathes/Suitsadvanced.yml @@ -0,0 +1,42 @@ +- type: latheRecipe + id: SuitsAdvancedRecipe + abstract: true + +- type: latheRecipe + id: ClothingOuterSuitRad + parent: SuitsAdvancedRecipe + completetime: 6 + categories: + - AdvancedSuits + result: ClothingOuterSuitRad + materials: + Steel: 500 + Durathread: 2000 + Plastic: 500 + Plasteel: 500 + Plasma: 500 + +- type: latheRecipe + id: ClothingHeadHelmetBombSuit + parent: SuitsAdvancedRecipe + completetime: 5 + categories: + - AdvancedSuits + result: ClothingHeadHelmetBombSuit + materials: + Durathread: 2000 + Plastic: 1000 + Plasteel: 1000 + +- type: latheRecipe + id: ClothingOuterSuitBomb + parent: SuitsAdvancedRecipe + completetime: 3 + categories: + - AdvancedSuits + result: ClothingOuterSuitBomb + materials: + Steel: 250 + Durathread: 1000 + Plastic: 250 + Glass: 500 diff --git a/Resources/Prototypes/_Triad/Recipes/Lathes/categories.yml b/Resources/Prototypes/_Triad/Recipes/Lathes/categories.yml new file mode 100644 index 00000000000..b1ad12f8363 --- /dev/null +++ b/Resources/Prototypes/_Triad/Recipes/Lathes/categories.yml @@ -0,0 +1,3 @@ +- type: latheCategory + id: AdvancedSuits + name: lathe-category-AdvancedSuitsRecipe diff --git a/Resources/Prototypes/_Triad/Recipes/Lathes/packs.yml b/Resources/Prototypes/_Triad/Recipes/Lathes/packs.yml new file mode 100644 index 00000000000..7cb560a173f --- /dev/null +++ b/Resources/Prototypes/_Triad/Recipes/Lathes/packs.yml @@ -0,0 +1,6 @@ +- type: latheRecipePack + id: SuitsAdvancedRecipe + recipes: + - ClothingOuterSuitRad + - ClothingHeadHelmetBombSuit + - ClothingOuterSuitBomb diff --git a/Resources/Prototypes/_Triad/Research/Industrial.yml b/Resources/Prototypes/_Triad/Research/Industrial.yml new file mode 100644 index 00000000000..ffc1e5fc167 --- /dev/null +++ b/Resources/Prototypes/_Triad/Research/Industrial.yml @@ -0,0 +1,14 @@ +- type: technology + id: SuitsAdvanced + name: research-technology-Suits-Advanced + entityIcon: ClothingOuterSuitBomb + discipline: Industrial + tier: 2 + cost: 5000 + recipeUnlocks: + - ClothingOuterSuitRad + - ClothingHeadHelmetBombSuit + - ClothingOuterSuitBomb + technologyPrerequisites: + - HardsuitsSpecialized + position: 1, 7 From 583efa5781aac19bdaeef2d7c1eb044f17f5b468 Mon Sep 17 00:00:00 2001 From: Shy-ivy Date: Tue, 26 May 2026 18:01:32 -0400 Subject: [PATCH 2/4] Update suits.yml --- Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml index 5a24368cb1c..c5551cb0932 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml @@ -19,7 +19,7 @@ Piercing: 0.9 Heat: 0.75 - type: ExplosionResistance - damageCoefficient: 0.5 + damageCoefficient: 0.05 - type: GroupExamine - type: Tag tags: From 9c56cef6c547fb3e12767a346f2829850c9005c3 Mon Sep 17 00:00:00 2001 From: Shy-ivy Date: Tue, 26 May 2026 22:41:25 -0400 Subject: [PATCH 3/4] Create lathe-categories.ftl --- Resources/Locale/en-US/_Triad/lathe/lathe-categories.ftl | 1 + 1 file changed, 1 insertion(+) create mode 100644 Resources/Locale/en-US/_Triad/lathe/lathe-categories.ftl diff --git a/Resources/Locale/en-US/_Triad/lathe/lathe-categories.ftl b/Resources/Locale/en-US/_Triad/lathe/lathe-categories.ftl new file mode 100644 index 00000000000..30b63f8fe10 --- /dev/null +++ b/Resources/Locale/en-US/_Triad/lathe/lathe-categories.ftl @@ -0,0 +1 @@ +lathe-category-AdvancedSuitsRecipe = Advanced Suits From 8036fa60e9139da0c2e16e52f1c567e710e41cca Mon Sep 17 00:00:00 2001 From: Shy-ivy Date: Sat, 30 May 2026 16:07:49 -0400 Subject: [PATCH 4/4] fixes --- Resources/Locale/en-US/_Triad/lathe/lathe-categories.ftl | 2 +- Resources/Locale/en-US/_Triad/research/ship_stash.ftl | 2 +- Resources/Prototypes/_NF/Research/industrial.yml | 2 +- .../_Triad/Recipes/Construction/Lathes/Suitsadvanced.yml | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Resources/Locale/en-US/_Triad/lathe/lathe-categories.ftl b/Resources/Locale/en-US/_Triad/lathe/lathe-categories.ftl index 30b63f8fe10..4848776b81a 100644 --- a/Resources/Locale/en-US/_Triad/lathe/lathe-categories.ftl +++ b/Resources/Locale/en-US/_Triad/lathe/lathe-categories.ftl @@ -1 +1 @@ -lathe-category-AdvancedSuitsRecipe = Advanced Suits +lathe-category-advanced-suits-recipe = Advanced Suits diff --git a/Resources/Locale/en-US/_Triad/research/ship_stash.ftl b/Resources/Locale/en-US/_Triad/research/ship_stash.ftl index 239ef508627..50435678c3f 100644 --- a/Resources/Locale/en-US/_Triad/research/ship_stash.ftl +++ b/Resources/Locale/en-US/_Triad/research/ship_stash.ftl @@ -1,3 +1,3 @@ research-technology-civilian-stash = Civilian Ship Stash research-technology-military-stash = Military Ship Stash -research-technology-Suits-Advanced = Advanced Suits +research-technology-suits-advanced = Advanced Suits diff --git a/Resources/Prototypes/_NF/Research/industrial.yml b/Resources/Prototypes/_NF/Research/industrial.yml index 30e0db41911..067ec2c5140 100644 --- a/Resources/Prototypes/_NF/Research/industrial.yml +++ b/Resources/Prototypes/_NF/Research/industrial.yml @@ -75,7 +75,7 @@ - ClothingOuterHardsuitRd technologyPrerequisites: - HardsuitsSpecialized - position: 2, 7 + position: 2, 7 # Triad # Tier 3 diff --git a/Resources/Prototypes/_Triad/Recipes/Construction/Lathes/Suitsadvanced.yml b/Resources/Prototypes/_Triad/Recipes/Construction/Lathes/Suitsadvanced.yml index 60353987298..351f70b6308 100644 --- a/Resources/Prototypes/_Triad/Recipes/Construction/Lathes/Suitsadvanced.yml +++ b/Resources/Prototypes/_Triad/Recipes/Construction/Lathes/Suitsadvanced.yml @@ -1,10 +1,10 @@ - type: latheRecipe - id: SuitsAdvancedRecipe abstract: true + id: SuitsAdvancedRecipe - type: latheRecipe - id: ClothingOuterSuitRad parent: SuitsAdvancedRecipe + id: ClothingOuterSuitRad completetime: 6 categories: - AdvancedSuits @@ -17,8 +17,8 @@ Plasma: 500 - type: latheRecipe - id: ClothingHeadHelmetBombSuit parent: SuitsAdvancedRecipe + id: ClothingHeadHelmetBombSuit completetime: 5 categories: - AdvancedSuits