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..4848776b81a --- /dev/null +++ b/Resources/Locale/en-US/_Triad/lathe/lathe-categories.ftl @@ -0,0 +1 @@ +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 19784ee70dd..50435678c3f 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..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.15 + damageCoefficient: 0.05 - 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..067ec2c5140 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 # Triad # 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..351f70b6308 --- /dev/null +++ b/Resources/Prototypes/_Triad/Recipes/Construction/Lathes/Suitsadvanced.yml @@ -0,0 +1,42 @@ +- type: latheRecipe + abstract: true + id: SuitsAdvancedRecipe + +- type: latheRecipe + parent: SuitsAdvancedRecipe + id: ClothingOuterSuitRad + completetime: 6 + categories: + - AdvancedSuits + result: ClothingOuterSuitRad + materials: + Steel: 500 + Durathread: 2000 + Plastic: 500 + Plasteel: 500 + Plasma: 500 + +- type: latheRecipe + parent: SuitsAdvancedRecipe + id: ClothingHeadHelmetBombSuit + 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