Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Resources/Locale/en-US/_Triad/lathe/lathe-categories.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
lathe-category-advanced-suits-recipe = Advanced Suits
3 changes: 2 additions & 1 deletion Resources/Locale/en-US/_Triad/research/ship_stash.ftl
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
research-technology-civilian-stash = Civilian Ship Stash
research-technology-military-stash = Military Ship Stash
research-technology-military-stash = Military Ship Stash
research-technology-suits-advanced = Advanced Suits
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
Piercing: 0.9
Heat: 0.75
- type: ExplosionResistance
damageCoefficient: 0.15
damageCoefficient: 0.05

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Triad changes must be marked

- type: GroupExamine
- type: Tag
tags:
Expand Down Expand Up @@ -117,7 +117,7 @@
modifiers:
coefficients:
Heat: 0.90
Radiation: 0.01
Radiation: 0

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Triad changes must be marked

- type: Clothing
sprite: Clothing/OuterClothing/Suits/rad.rsi
- type: GroupExamine
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -272,6 +272,7 @@
- SmartGun # Goobstation
# Einstein Engines Packs
- Translators
- SuitsAdvancedRecipe #Triad
- type: EmagLatheRecipes
emagDynamicPacks:
- DynamicAmmoRecipePack
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/_NF/Research/industrial.yml
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
- ClothingOuterHardsuitRd
technologyPrerequisites:
- HardsuitsSpecialized
position: 1, 7
position: 2, 7 # Triad

# Tier 3

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
- type: latheRecipe
abstract: true

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Conventions state that abstract must always come first. Directly under type as the first entry in the list

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also, why is this a new latheRecipe? It doesn't seem to have much of a reason to exist as a parent since it doesn't seem to define anything. There is probably some common stuff between the suits you could add here if you'd like. categories maybe?

id: SuitsAdvancedRecipe

- type: latheRecipe
parent: SuitsAdvancedRecipe

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

parent must come before id

id: ClothingOuterSuitRad
completetime: 6
categories:
- AdvancedSuits
result: ClothingOuterSuitRad
materials:
Steel: 500
Durathread: 2000
Plastic: 500
Plasteel: 500
Plasma: 500

- type: latheRecipe
parent: SuitsAdvancedRecipe

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

parent must come before id

id: ClothingHeadHelmetBombSuit
completetime: 5
categories:
- AdvancedSuits
result: ClothingHeadHelmetBombSuit
materials:
Durathread: 2000
Plastic: 1000
Plasteel: 1000

- type: latheRecipe
id: ClothingOuterSuitBomb
parent: SuitsAdvancedRecipe

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

parent must come before id

completetime: 3
categories:
- AdvancedSuits
result: ClothingOuterSuitBomb
materials:
Steel: 250
Durathread: 1000
Plastic: 250
Glass: 500
3 changes: 3 additions & 0 deletions Resources/Prototypes/_Triad/Recipes/Lathes/categories.yml

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Assuming this does what I think it does: I don't think we need a dedicated category for a couple items? This adds a new dropdown selection to lathes, right? Please do correct me if I'm wrong

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it adds a new category for the protolathe to make i understand, I'm at work rn so I'll check it and fix most of it when i get home

Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
- type: latheCategory
id: AdvancedSuits
name: lathe-category-AdvancedSuitsRecipe
6 changes: 6 additions & 0 deletions Resources/Prototypes/_Triad/Recipes/Lathes/packs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
- type: latheRecipePack
id: SuitsAdvancedRecipe
recipes:
- ClothingOuterSuitRad
- ClothingHeadHelmetBombSuit
- ClothingOuterSuitBomb
14 changes: 14 additions & 0 deletions Resources/Prototypes/_Triad/Research/Industrial.yml
Original file line number Diff line number Diff line change
@@ -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
Loading