Media
![image](https://github.com/user-attachments/assets/697e70cb-e1da-4590-aa2b-01555b88f40d)
![image](https://github.com/user-attachments/assets/60977362-18aa-4253-9045-61129866fad7)
![image](https://github.com/user-attachments/assets/79ed2ffd-19a3-4a4d-9412-51ba96de82ac)
![image](https://github.com/user-attachments/assets/070e99d0-48d6-40ad-add5-a1e51b23f77b)
# Changelog
:cl:
- add: Added Advanced Tacsuits, and Prototype Tacsuits to Arsenal
research. Along with them comes Security Techfab recipes for said
tacsuits.
---
.../Locale/en-US/lathe/lathe-categories.ftl | 1 +
.../clothing/outerClothing/hardsuits.ftl | 4 +-
.../Locale/en-US/research/technologies.ftl | 2 +
.../Entities/Objects/Materials/materials.yml | 3 +-
.../Entities/Structures/Machines/lathe.yml | 44 +++++++
.../Prototypes/Recipes/Lathes/categories.yml | 4 +
.../Prototypes/Recipes/Lathes/hardsuits.yml | 108 ++++++++++++++++++
Resources/Prototypes/Research/arsenal.yml | 55 ++++-----
8 files changed, 192 insertions(+), 29 deletions(-)
create mode 100644 Resources/Prototypes/Recipes/Lathes/hardsuits.yml
diff --git a/Resources/Locale/en-US/lathe/lathe-categories.ftl b/Resources/Locale/en-US/lathe/lathe-categories.ftl
index a7261c2b51..9fa331f3a4 100644
--- a/Resources/Locale/en-US/lathe/lathe-categories.ftl
+++ b/Resources/Locale/en-US/lathe/lathe-categories.ftl
@@ -4,5 +4,6 @@ lathe-category-lights = Lights
lathe-category-mechs = Mechs
lathe-category-parts = Parts
lathe-category-robotics = Robotics
+lathe-category-tacsuits = Tacsuits
lathe-category-tools = Tools
lathe-category-weapons = Weapons
diff --git a/Resources/Locale/en-US/prototypes/entities/clothing/outerClothing/hardsuits.ftl b/Resources/Locale/en-US/prototypes/entities/clothing/outerClothing/hardsuits.ftl
index 8232ac352d..95348243e7 100644
--- a/Resources/Locale/en-US/prototypes/entities/clothing/outerClothing/hardsuits.ftl
+++ b/Resources/Locale/en-US/prototypes/entities/clothing/outerClothing/hardsuits.ftl
@@ -90,7 +90,7 @@ ent-ClothingOuterHardsuitSyndieCommander = CSA-54c - "Tianming" tacsuit
ent-ClothingOuterHardsuitJuggernaut = CSA-80UA - "Guan Yu" tacsuit
.desc = The pride and joy of the Cybersun-Armaments Corporation, named after an ancient Sol' War God. Commonly known throughout the galaxy as a "Juggernaut".
Matching its bulky appearance, it protects against all forms of damage. It feels VERY heavy.
-end-ClothingOuterHardsuitJuggernautReverseEngineered = CSA-80UA - "Guan Yu" tacsuit
+ent-ClothingOuterHardsuitJuggernautReverseEngineered = CSA-80UA - "Guan Yu" tacsuit
.desc = The pride and joy of the Cybersun-Armaments Corporation, named after an ancient Sol' War God. Commonly known throughout the galaxy as a "Juggernaut".
Matching its bulky appearance, it protects against all forms of damage. It feels VERY heavy.
ent-ClothingOuterHardsuitWizard = WZD-84 - "Mana" tacsuit
@@ -133,4 +133,4 @@ ent-ClothingOuterHardsuitClown = clown vacsuit
ent-ClothingOuterHardsuitMime = mime vacsuit
.desc = A custom-made mime vacsuit. On closer inspection, it appears to be a normal vacsuit with suspenders and paint applied on top.
ent-ClothingOuterHardsuitSanta = DNK-31 "Jolly" hardsuit
- .desc = A festive hardsuit produced by Donk Co. for their time-limited celebratory events, provides protection for its jolly gift-giver to sleighride safely in space without worrying about asteroid strikes.
\ No newline at end of file
+ .desc = A festive hardsuit produced by Donk Co. for their time-limited celebratory events, provides protection for its jolly gift-giver to sleighride safely in space without worrying about asteroid strikes.
diff --git a/Resources/Locale/en-US/research/technologies.ftl b/Resources/Locale/en-US/research/technologies.ftl
index 9e0a2eea7e..6d04cb19fe 100644
--- a/Resources/Locale/en-US/research/technologies.ftl
+++ b/Resources/Locale/en-US/research/technologies.ftl
@@ -31,6 +31,8 @@ research-technology-nonlethal-ammunition = Nonlethal Ammunition
research-technology-practice-ammunition = Practice Ammunition
research-technology-advanced-weapons = Advanced Weapons
research-technology-prototype-weapons = Prototype Weapons
+research-technology-advanced-tacsuits = Advanced Tacsuits
+research-technology-prototype-tacsuits = Prototype Tacsuits
research-technology-basic-robotics = Basic Robotics
research-technology-basic-anomalous-research = Basic Anomalous Research
diff --git a/Resources/Prototypes/Entities/Objects/Materials/materials.yml b/Resources/Prototypes/Entities/Objects/Materials/materials.yml
index 75a02f05a4..d35550e049 100644
--- a/Resources/Prototypes/Entities/Objects/Materials/materials.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/materials.yml
@@ -558,6 +558,7 @@
description: A webby material.
suffix: Full
components:
+ - type: Material
- type: PhysicalComposition
materialComposition:
WebSilk: 100
@@ -698,4 +699,4 @@
suffix: 1
components:
- type: Stack
- count: 1
\ No newline at end of file
+ count: 1
diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
index 0ab1133922..7355c3e5d1 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -112,6 +112,10 @@
- Sheet
- RawMaterial
- Ingot
+ - Wooden
+ - ClothMade
+ - Gauze
+ - Metal
- type: Lathe
idleState: icon
runningState: building
@@ -279,6 +283,10 @@
- Sheet
- RawMaterial
- Ingot
+ - Wooden
+ - ClothMade
+ - Gauze
+ - Metal
- type: Lathe
idleState: icon
runningState: building
@@ -578,6 +586,10 @@
- Sheet
- RawMaterial
- Ingot
+ - Wooden
+ - ClothMade
+ - Gauze
+ - Metal
- type: RequireProjectileTarget
- type: entity
@@ -715,6 +727,10 @@
- Sheet
- RawMaterial
- Ingot
+ - Wooden
+ - ClothMade
+ - Gauze
+ - Metal
- type: GuideHelp
guides:
- Robotics
@@ -745,6 +761,11 @@
tags:
- Sheet
- RawMaterial
+ - Ingot
+ - Wooden
+ - ClothMade
+ - Gauze
+ - Metal
- type: Lathe
idleState: icon
runningState: building
@@ -957,12 +978,22 @@
- MagazineBoxSpecialMindbreaker
- SecurityCyberneticEyes
- MedicalCyberneticEyes
+ - ClothingOuterHardsuitCombatStandard
+ - ClothingOuterHardsuitCombatMedical
+ - ClothingOuterHardsuitCombatRiot
+ - ClothingOuterHardsuitCombatAdvanced
+ - ClothingOuterHardsuitSyndieReverseEngineered
+ - ClothingOuterHardsuitJuggernautReverseEngineered
- type: MaterialStorage
whitelist:
tags:
- Sheet
- RawMaterial
- Ingot
+ - Wooden
+ - ClothMade
+ - Gauze
+ - Metal
- type: entity
id: AmmoTechFab
@@ -1020,6 +1051,10 @@
- Sheet
- RawMaterial
- Ingot
+ - Wooden
+ - ClothMade
+ - Gauze
+ - Metal
- type: entity
id: MedicalTechFab
@@ -1326,6 +1361,10 @@
- Sheet
- RawMaterial
- Ingot
+ - Wooden
+ - ClothMade
+ - Gauze
+ - Metal
- type: entity
parent: [BaseLathe, BaseMaterialSiloUtilizer]
@@ -1604,6 +1643,11 @@
tags:
- Sheet
- RawMaterial
+ - Ingot
+ - Wooden
+ - ClothMade
+ - Gauze
+ - Metal
- type: Lathe
idleState: limbgrower_idleoff
runningState: limbgrower_idleon
diff --git a/Resources/Prototypes/Recipes/Lathes/categories.yml b/Resources/Prototypes/Recipes/Lathes/categories.yml
index 8faa67af1b..3788373255 100644
--- a/Resources/Prototypes/Recipes/Lathes/categories.yml
+++ b/Resources/Prototypes/Recipes/Lathes/categories.yml
@@ -22,6 +22,10 @@
id: Robotics
name: lathe-category-robotics
+- type: latheCategory
+ id: Tacsuits
+ name: lathe-category-tacsuits
+
- type: latheCategory
id: Tools
name: lathe-category-tools
diff --git a/Resources/Prototypes/Recipes/Lathes/hardsuits.yml b/Resources/Prototypes/Recipes/Lathes/hardsuits.yml
new file mode 100644
index 0000000000..061ece47c1
--- /dev/null
+++ b/Resources/Prototypes/Recipes/Lathes/hardsuits.yml
@@ -0,0 +1,108 @@
+# Tier 1 Vacsuits
+
+# Tier 2 Hardsuits
+
+# Tier 3 Hardsuits
+
+# Tier 2 Tacsuits
+- type: latheRecipe
+ id: ClothingOuterHardsuitCombatStandard
+ result: ClothingOuterHardsuitCombatStandard
+ category: Tacsuits
+ completetime: 60
+ materials:
+ Plasteel: 3000
+ Durathread: 300
+ ReinforcedGlass: 1000
+ Uranium: 100
+ Plastic: 500
+ Gold: 100
+
+- type: latheRecipe
+ id: ClothingOuterHardsuitCombatMedical
+ result: ClothingOuterHardsuitCombatMedical
+ category: Tacsuits
+ completetime: 60
+ materials:
+ Plasteel: 3000
+ Durathread: 300
+ ReinforcedGlass: 1000
+ Uranium: 100
+ Plastic: 500
+ Gold: 100
+
+# Unpainted variant of the Warden's tacsuit.
+- type: latheRecipe
+ id: ClothingOuterHardsuitCombatRiot
+ result: ClothingOuterHardsuitCombatRiot
+ category: Tacsuits
+ completetime: 90
+ materials:
+ Plasteel: 3500
+ ReinforcedGlass: 1250
+ Durathread: 500
+ Plastic: 500
+ Uranium: 200
+ Gold: 200
+
+# Tier 3 Tacsuits
+
+# Notably, this is not the Head of Security's tacsuit. It's the base version that's unpainted.
+- type: latheRecipe
+ id: ClothingOuterHardsuitCombatAdvanced
+ result: ClothingOuterHardsuitCombatAdvanced
+ category: Tacsuits
+ completetime: 120
+ materials:
+ Plasteel: 5000
+ WebSilk: 3000
+ ReinforcedGlass: 1500
+ Plastic: 1000
+ Uranium: 400
+ Gold: 400
+
+# TODO: I still need to make these "Unpainted"
+- type: latheRecipe
+ id: ClothingOuterHardsuitSyndieReverseEngineered
+ result: ClothingOuterHardsuitSyndieReverseEngineered
+ category: Tacsuits
+ completetime: 180
+ materials:
+ Plasteel: 8000
+ WebSilk: 3000
+ ReinforcedGlass: 1500
+ Plastic: 1500
+ Uranium: 800
+ Plasma: 800
+ Gold: 600
+
+# This one's an IOU.
+# - type: latheRecipe
+# id: ClothingOuterHardsuitCybersunEliteUnpainted
+# result: ClothingOuterHardsuitCybersunEliteUnpainted
+# category: Tacsuits
+# completetime: 120
+# materials:
+# Plasteel: 8000
+# WebSilk: 3000
+# ReinforcedGlass: 1500
+# Plastic: 1500
+# Uranium: 800
+# Plasma: 800
+# Gold: 600
+
+# TODO: IOU one "Unpainted" juggsuit sprite.
+- type: latheRecipe
+ id: ClothingOuterHardsuitJuggernautReverseEngineered
+ result: ClothingOuterHardsuitJuggernautReverseEngineered
+ category: Tacsuits
+ completetime: 300
+ materials: # GOOD LUCK.
+ Plasteel: 30000
+ ReinforcedPlasmaGlass: 4500
+ WebSilk: 3500
+ Plastic: 3000
+ Uranium: 1500
+ Gold: 1500
+ Plasma: 1000
+ Diamond: 300
diff --git a/Resources/Prototypes/Research/arsenal.yml b/Resources/Prototypes/Research/arsenal.yml
index 88aa8dd60f..17b602ffb7 100644
--- a/Resources/Prototypes/Research/arsenal.yml
+++ b/Resources/Prototypes/Research/arsenal.yml
@@ -112,19 +112,19 @@
# Tier 2
-# TODO: Make lathe recipes for a variety of advanced tacsuits.
-# TODO: Also make the "Unpainted Gunmetal Grey" versions of the suits.
-# - type: technology
-# id: AdvancedTacsuits
-# name: research-technology-advanced-tacsuits
-# icon:
-# sprite: DeltaV/Clothing/OuterClothing/Hardsuits/Combat/standard.rsi
-# state: icon
-# discipline: Arsenal
-# tier: 2
-# cost: 15000
-# recipeUnlocks:
-# - ClothingOuterHardsuitCombatStandard
+- type: technology
+ id: AdvancedTacsuits
+ name: research-technology-advanced-tacsuits
+ icon:
+ sprite: DeltaV/Clothing/OuterClothing/Hardsuits/Combat/standard.rsi
+ state: icon
+ discipline: Arsenal
+ tier: 2
+ cost: 15000
+ recipeUnlocks:
+ - ClothingOuterHardsuitCombatStandard
+ - ClothingOuterHardsuitCombatMedical
+ - ClothingOuterHardsuitCombatRiot
- type: technology
id: ExplosiveTechnology
@@ -172,19 +172,22 @@
# Tier 3
-# TODO: Make lathe recipes for a variety of prototype tacsuits.
-# TODO: Also make the "Unpainted Gunmetal Grey" versions of the suits.
-# - type: technology
-# id: PrototypeTacsuits
-# name: research-technology-prototype-tacsuits
-# icon:
-# sprite: Nyanotrasen/Clothing/OuterClothing/ReverseEngineering/syndicate.rsi
-# state: icon
-# discipline: Arsenal
-# tier: 3
-# cost: 20000
-# recipeUnlocks:
-# - ClothingOuterHardsuitSyndieReverseEngineered
+- type: technology
+ id: PrototypeTacsuits
+ name: research-technology-prototype-tacsuits
+ icon:
+ sprite: Nyanotrasen/Clothing/OuterClothing/ReverseEngineering/syndicate.rsi
+ state: icon
+ discipline: Arsenal
+ tier: 3
+ cost: 25000
+ recipeUnlocks:
+ - ClothingOuterHardsuitCombatAdvanced
+ - ClothingOuterHardsuitSyndieReverseEngineered
+ - ClothingOuterHardsuitJuggernautReverseEngineered
+ #- ClothingOuterHardsuitCybersunEliteUnpainted # IOU
+ technologyPrerequisites:
+ - AdvancedTacsuits
- type: technology
id: PrototypeWeapons
From 6cd57c0fcb59b26ce91ce1828e4370cd242f73f8 Mon Sep 17 00:00:00 2001
From: SimpleStation Changelogs