Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix cloth chairs to not claim your soul #2678

Merged
merged 4 commits into from
Jan 12, 2025
Merged

Fix cloth chairs to not claim your soul #2678

Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6574e1f
Comments
dvir001 Jan 10, 2025
6bb0e99
Make sure chairs wont claim your soul
dvir001 Jan 11, 2025
5ef8869
Merge branch 'master' into 2025-01-10-ClothChair
dvir001 Jan 11, 2025
30b2919
Empty strap condition, fancy chair graphs
whatston3 Jan 11, 2025
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
189 changes: 118 additions & 71 deletions Resources/Prototypes/Recipes/Construction/Graphs/furniture/seats.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,72 @@
- material: Cloth
amount: 1

# Frontier: fancy wooden chairs
- to: chairWoodFancyBlack
steps:
- material: WoodPlank
amount: 3
doAfter: 1
- material: FloorCarpetBlack
amount: 1
- to: chairWoodFancyBlue
steps:
- material: WoodPlank
amount: 3
doAfter: 1
- material: FloorCarpetBlue
amount: 1
- to: chairWoodFancyCyan
steps:
- material: WoodPlank
amount: 3
doAfter: 1
- material: FloorCarpetCyan
amount: 1
- to: chairWoodFancyGreen
steps:
- material: WoodPlank
amount: 3
doAfter: 1
- material: FloorCarpetGreen
amount: 1
- to: chairWoodFancyOrange
steps:
- material: WoodPlank
amount: 3
doAfter: 1
- material: FloorCarpetOrange
amount: 1
- to: chairWoodFancyPink
steps:
- material: WoodPlank
amount: 3
doAfter: 1
- material: FloorCarpetPink
amount: 1
- to: chairWoodFancyPurple
steps:
- material: WoodPlank
amount: 3
doAfter: 1
- material: FloorCarpetPurple
amount: 1
- to: chairWoodFancyRed
steps:
- material: WoodPlank
amount: 3
doAfter: 1
- material: FloorCarpetRed
amount: 1
- to: chairWoodFancyWhite
steps:
- material: WoodPlank
amount: 3
doAfter: 1
- material: FloorCarpetWhite
amount: 1
# End Frontier
whatston3 marked this conversation as resolved.
Show resolved Hide resolved

- node: chair
entity: Chair
edges:
Expand Down Expand Up @@ -192,53 +258,6 @@
- tool: Screwing
doAfter: 1

#Frontier: fancy wooden chairs
- to: chairWoodFancyBlack
steps:
- material: FloorCarpetBlack
amount: 1

- to: chairWoodFancyBlue
steps:
- material: FloorCarpetBlue
amount: 1

- to: chairWoodFancyCyan
steps:
- material: FloorCarpetCyan
amount: 1

- to: chairWoodFancyGreen
steps:
- material: FloorCarpetGreen
amount: 1

- to: chairWoodFancyOrange
steps:
- material: FloorCarpetOrange
amount: 1

- to: chairWoodFancyPurple
steps:
- material: FloorCarpetPurple
amount: 1

- to: chairWoodFancyPink
steps:
- material: FloorCarpetPink
amount: 1

- to: chairWoodFancyRed
steps:
- material: FloorCarpetRed
amount: 1

- to: chairWoodFancyWhite
steps:
- material: FloorCarpetWhite
amount: 1
#End Frontier

- node: chairMeat
entity: ChairMeat
edges:
Expand Down Expand Up @@ -328,107 +347,135 @@
- node: chairWoodFancyBlack
entity: ChairWoodFancyBlack
edges:
- to: chairWood
- to: start
completed:
- !type:SpawnPrototype
prototype: MaterialWoodPlank1
amount: 3
- !type:SpawnPrototype
prototype: FloorCarpetItemBlack
amount: 1
steps:
- tool: Prying
- tool: Screwing
doAfter: 1

- node: chairWoodFancyBlue
entity: ChairWoodFancyBlue
edges:
- to: chairWood
- to: start
completed:
- !type:SpawnPrototype
prototype: MaterialWoodPlank1
amount: 3
- !type:SpawnPrototype
prototype: FloorCarpetItemBlue
amount: 1
steps:
- tool: Prying
- tool: Screwing
doAfter: 1

- node: chairWoodFancyCyan
entity: ChairWoodFancyCyan
edges:
- to: chairWood
- to: start
completed:
- !type:SpawnPrototype
prototype: MaterialWoodPlank1
amount: 3
- !type:SpawnPrototype
prototype: FloorCarpetItemCyan
amount: 1
steps:
- tool: Prying
- tool: Screwing
doAfter: 1

- node: chairWoodFancyGreen
entity: ChairWoodFancyGreen
edges:
- to: chairWood
- to: start
completed:
- !type:SpawnPrototype
prototype: MaterialWoodPlank1
amount: 3
- !type:SpawnPrototype
prototype: FloorCarpetItemGreen
amount: 1
steps:
- tool: Prying
- tool: Screwing
doAfter: 1

- node: chairWoodFancyOrange
entity: ChairWoodFancyOrange
edges:
- to: chairWood
- to: start
completed:
- !type:SpawnPrototype
prototype: MaterialWoodPlank1
amount: 3
- !type:SpawnPrototype
prototype: FloorCarpetItemOrange
amount: 1
steps:
- tool: Prying
- tool: Screwing
doAfter: 1

- node: chairWoodFancyPink
entity: ChairWoodFancyPink
- node: chairWoodFancyPurple
entity: ChairWoodFancyPurple
edges:
- to: chairWood
- to: start
completed:
- !type:SpawnPrototype
prototype: FloorCarpetItemPink
prototype: MaterialWoodPlank1
amount: 3
- !type:SpawnPrototype
prototype: FloorCarpetItemPurple
amount: 1
steps:
- tool: Prying
- tool: Screwing
doAfter: 1

- node: chairWoodFancyPurple
entity: ChairWoodFancyPurple
- node: chairWoodFancyPink
entity: ChairWoodFancyPink
edges:
- to: chairWood
- to: start
completed:
- !type:SpawnPrototype
prototype: FloorCarpetItemPurple
prototype: MaterialWoodPlank1
amount: 3
- !type:SpawnPrototype
prototype: FloorCarpetItemPink
amount: 1
steps:
- tool: Prying
- tool: Screwing
doAfter: 1

- node: chairWoodFancyRed
entity: ChairWoodFancyRed
edges:
- to: chairWood
- to: start
completed:
- !type:SpawnPrototype
prototype: MaterialWoodPlank1
amount: 3
- !type:SpawnPrototype
prototype: FloorCarpetItemRed
amount: 1
steps:
- tool: Prying
- tool: Screwing
doAfter: 1

- node: chairWoodFancyWhite
entity: ChairWoodFancyWhite
edges:
- to: chairWood
- to: start
completed:
- !type:SpawnPrototype
prototype: MaterialWoodPlank1
amount: 3
- !type:SpawnPrototype
prototype: FloorCarpetItemWhite
amount: 1
steps:
- tool: Prying
- tool: Screwing
doAfter: 1
# End Frontier
Loading