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

Separate Tables n' Counters #32673

Merged
merged 4 commits into from
Jan 2, 2025
Merged

Separate Tables n' Counters #32673

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1d5fcdf
Update tables.yml
ps3moira Oct 6, 2024
6ffe6c8
Remove Extra base: state_
ps3moira Oct 6, 2024
fe3703e
Update tables.yml
ps3moira Oct 13, 2024
ee054ef
Merge remote-tracking branch 'upstream/master' into Seperate-Tables/C…
ps3moira Nov 21, 2024
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
47 changes: 47 additions & 0 deletions Resources/Prototypes/Entities/Structures/Furniture/Tables/tables.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,9 @@
max: 1
- !type:DoActsBehavior
acts: [ "Destruction" ]
- type: IconSmooth
key: metaltable
base: state_
- type: Construction
graph: Table
node: Table
Expand Down Expand Up @@ -230,6 +233,8 @@
max: 2
- !type:DoActsBehavior
acts: [ "Destruction" ]
- type: IconSmooth
key: metalreinforcedtable
- type: Construction
graph: Table
node: TableReinforced
Expand Down Expand Up @@ -286,6 +291,8 @@
node: TableFrame
- !type:DoActsBehavior
acts: [ "Destruction" ]
- type: IconSmooth
key: glasstable
- type: Construction
graph: Table
node: TableGlass
Expand Down Expand Up @@ -341,6 +348,8 @@
max: 1
- !type:DoActsBehavior
acts: [ "Destruction" ]
- type: IconSmooth
key: reinforcedglasstable
- type: Construction
graph: Table
node: TableReinforcedGlass
Expand Down Expand Up @@ -396,6 +405,8 @@
max: 1
- !type:DoActsBehavior
acts: [ "Destruction" ]
- type: IconSmooth
key: plasmaglasstable
- type: Construction
graph: Table
node: TablePlasmaGlass
Expand Down Expand Up @@ -440,6 +451,8 @@
max: 1
- !type:DoActsBehavior
acts: [ "Destruction" ]
- type: IconSmooth
key: brasstable
- type: Construction
graph: Table
node: TableBrass
Expand Down Expand Up @@ -481,6 +494,8 @@
max: 1
- !type:DoActsBehavior
acts: [ "Destruction" ]
- type: IconSmooth
key: woodtable
- type: Construction
graph: Table
node: TableWood
Expand Down Expand Up @@ -522,6 +537,8 @@
max: 1
- !type:DoActsBehavior
acts: [ "Destruction" ]
- type: IconSmooth
key: woodgambletable
- type: Construction
graph: Table
node: TableCarpet
Expand Down Expand Up @@ -553,6 +570,8 @@
path: /Audio/Effects/picaxe2.ogg
- !type:DoActsBehavior
acts: [ "Destruction" ]
- type: IconSmooth
key: stonetable
- type: FootstepModifier
footstepSoundCollection:
collection: FootstepFloor
Expand Down Expand Up @@ -582,6 +601,8 @@
Brute:
path:
"/Audio/Weapons/slash.ogg"
- type: IconSmooth
key: webtable
- type: Construction
graph: WebStructures
node: table
Expand Down Expand Up @@ -619,6 +640,8 @@
max: 1
- !type:DoActsBehavior
acts: [ "Destruction" ]
- type: IconSmooth
key: fancytable
- type: Tag
tags:
- Wooden
Expand All @@ -638,6 +661,8 @@
- type: Construction
graph: Table
node: TableFancyBlue
- type: IconSmooth
key: fancytableblue

- type: entity
id: TableFancyCyan
Expand All @@ -651,6 +676,8 @@
- type: Construction
graph: Table
node: TableFancyCyan
- type: IconSmooth
key: fancytablecyan

- type: entity
id: TableFancyBlack
Expand All @@ -664,6 +691,8 @@
- type: Construction
graph: Table
node: TableFancyBlack
- type: IconSmooth
key: fancytableblack

- type: entity
id: TableFancyRed
Expand All @@ -677,6 +706,8 @@
- type: Construction
graph: Table
node: TableFancyRed
- type: IconSmooth
key: fancytablered

- type: entity
id: TableFancyPurple
Expand All @@ -690,6 +721,8 @@
- type: Construction
graph: Table
node: TableFancyPurple
- type: IconSmooth
key: fancytablepurple

- type: entity
id: TableFancyPink
Expand All @@ -703,6 +736,8 @@
- type: Construction
graph: Table
node: TableFancyPink
- type: IconSmooth
key: fancytablepink

- type: entity
id: TableFancyGreen
Expand All @@ -716,6 +751,8 @@
- type: Construction
graph: Table
node: TableFancyGreen
- type: IconSmooth
key: fancytablegreen

- type: entity
id: TableFancyOrange
Expand All @@ -729,6 +766,8 @@
- type: Construction
graph: Table
node: TableFancyOrange
- type: IconSmooth
key: fancytableorange

- type: entity
id: TableFancyWhite
Expand All @@ -742,6 +781,8 @@
- type: Construction
graph: Table
node: TableFancyWhite
- type: IconSmooth
key: fancytablewhite

#Debug

Expand Down Expand Up @@ -806,6 +847,9 @@
max: 1
- !type:DoActsBehavior
acts: [ "Destruction" ]
- type: IconSmooth
key: counterwood
base: state_
- type: Construction
graph: Table
node: CounterWood
Expand Down Expand Up @@ -851,6 +895,9 @@
max: 1
- !type:DoActsBehavior
acts: [ "Destruction" ]
- type: IconSmooth
key: countermetal
base: state_
- type: Construction
graph: Table
node: CounterMetal
Loading