tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Half Revert #31978 (#33160)

Browse Source 
Hotfix
This commit is contained in:
keronshb
2024-11-13 23:54:31 -05:00
committed by GitHub
parent 197d9e68dc 21074bd98d
commit f2b7743bdd
14 changed files with 249 additions and 412 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Resources/Prototypes/Entities/Structures/Windows/clockwork.yml
View File

@@ -152,4 +152,4 @@
sprite: Structures/Windows/cracks_diagonal.rsi
- type: Construction
graph: WindowDiagonal
node: clockworkWindowDiagonal
node: clockworkWindowDiagonal

2
Resources/Prototypes/Entities/Structures/Windows/mining.yml
View File

@@ -91,4 +91,4 @@
- East
- type: DamageVisuals
damageOverlay:
sprite: Structures/Windows/cracks_diagonal.rsi
sprite: Structures/Windows/cracks_diagonal.rsi

2
Resources/Prototypes/Entities/Structures/Windows/plasma.yml
View File

@@ -152,4 +152,4 @@
sprite: Structures/Windows/cracks_diagonal.rsi
- type: Construction
graph: WindowDiagonal
node: plasmaWindowDiagonal
node: plasmaWindowDiagonal

2
Resources/Prototypes/Entities/Structures/Windows/plastitanium.yml
View File

@@ -195,4 +195,4 @@
doAfterDelay: 3
- type: Damageable
damageContainer: StructuralInorganic
damageModifierSet: RGlass
damageModifierSet: RGlass

2
Resources/Prototypes/Entities/Structures/Windows/reinforced.yml
View File

@@ -159,4 +159,4 @@
sprite: Structures/Windows/cracks_diagonal.rsi
- type: Construction
graph: WindowDiagonal
node: reinforcedWindowDiagonal
node: reinforcedWindowDiagonal

2
Resources/Prototypes/Entities/Structures/Windows/rplasma.yml
View File

@@ -155,4 +155,4 @@
sprite: Structures/Windows/cracks_diagonal.rsi
- type: Construction
graph: WindowDiagonal
node: reinforcedPlasmaWindowDiagonal
node: reinforcedPlasmaWindowDiagonal

2
Resources/Prototypes/Entities/Structures/Windows/ruranium.yml
View File

@@ -152,4 +152,4 @@
sprite: Structures/Windows/cracks_diagonal.rsi
- type: Construction
graph: WindowDiagonal
node: reinforcedUraniumWindowDiagonal
node: reinforcedUraniumWindowDiagonal

2
Resources/Prototypes/Entities/Structures/Windows/shuttle.yml
View File

@@ -94,4 +94,4 @@
- East
- type: DamageVisuals
damageOverlay:
sprite: Structures/Windows/cracks_diagonal.rsi
sprite: Structures/Windows/cracks_diagonal.rsi

2
Resources/Prototypes/Entities/Structures/Windows/uranium.yml
View File

@@ -147,4 +147,4 @@
sprite: Structures/Windows/cracks_diagonal.rsi
- type: Construction
graph: WindowDiagonal
node: uraniumWindowDiagonal
node: uraniumWindowDiagonal

2
Resources/Prototypes/Entities/Structures/Windows/window.yml
View File

@@ -284,4 +284,4 @@
sprite: Structures/Windows/cracks_diagonal.rsi
- type: Construction
graph: WindowDiagonal
node: windowDiagonal
node: windowDiagonal

271
Resources/Prototypes/Recipes/Construction/Graphs/structures/window.yml
View File

@@ -4,63 +4,61 @@
graph:
- node: start
edges:
- to: window # 50 hp
steps:
- material: Glass
amount: 2
doAfter: 2
- to: tintedWindow # 50 hp
steps:
- material: Glass
amount: 2
- material: Plastic
amount: 2
doAfter: 2
- to: plasmaWindow # 75 hp
- to: plasmaWindow
steps:
- material: PlasmaGlass
amount: 2
doAfter: 3
doAfter: 2
- to: uraniumWindow # 75 hp
steps:
- material: UraniumGlass
amount: 2
doAfter: 3
- to: clockworkWindow # 75 hp reinforced damage mod
steps:
- material: ClockworkGlass
amount: 2
doAfter: 3
- to: reinforcedWindow # 75 hp reinforced damage mod
- to: reinforcedWindow
steps:
- material: ReinforcedGlass
amount: 2
doAfter: 3
doAfter: 2
- to: reinforcedPlasmaWindow # 150 hp reinforced damage mod
- to: tintedWindow
steps:
- material: ReinforcedGlass
amount: 2
doAfter: 2
- to: reinforcedPlasmaWindow
steps:
- material: ReinforcedPlasmaGlass
amount: 2
doAfter: 4
doAfter: 3
- to: reinforcedUraniumWindow # 150 hp reinforced damage mod
- to: uraniumWindow
steps:
- material: UraniumGlass
amount: 2
doAfter: 2
- to: reinforcedUraniumWindow
steps:
- material: ReinforcedUraniumGlass
amount: 2
doAfter: 4
doAfter: 3
- to: shuttleWindow # 500 hp reinforced damage mod (wow)
- to: window
steps:
- material: Glass
amount: 2
doAfter: 3
- to: shuttleWindow
steps:
- material: Plasteel
amount: 2
- material: ReinforcedGlass
amount: 2
doAfter: 6
doAfter: 4
- to: clockworkWindow
steps:
- material: ClockworkGlass
amount: 2
doAfter: 3
- node: window
entity: Window
@@ -76,120 +74,6 @@
doAfter: 1
- tool: Anchoring
doAfter: 2
- to: tintedWindow
steps:
- material: Plastic
amount: 2
doAfter: 0.5
- to: plasmaWindow
steps:
- material: Plasma
amount: 2
doAfter: 1
- to: uraniumWindow
steps:
- material: Uranium
amount: 2
doAfter: 1
- to: clockworkWindow
steps:
- material: Brass
amount: 2
doAfter: 2
- to: reinforcedWindow
steps:
- material: MetalRod
amount: 2
doAfter: 2
- node: tintedWindow
entity: TintedWindow
edges:
- to: start
completed:
- !type:SpawnPrototype
prototype: SheetGlass1
amount: 2
- !type:SpawnPrototype
prototype: SheetPlastic1
amount: 2
- !type:DeleteEntity {}
steps:
- tool: Screwing
doAfter: 1
- tool: Anchoring
doAfter: 2
- node: plasmaWindow
entity: PlasmaWindow
edges:
- to: start
completed:
- !type:SpawnPrototype
prototype: SheetPGlass1
amount: 2
- !type:DeleteEntity {}
steps:
- tool: Screwing
doAfter: 2
- tool: Prying
doAfter: 3
- tool: Screwing
doAfter: 2
- tool: Anchoring
doAfter: 3
- to: reinforcedPlasmaWindow
steps:
- material: MetalRod
amount: 2
doAfter: 1
- node: uraniumWindow
entity: UraniumWindow
edges:
- to: start
completed:
- !type:SpawnPrototype
prototype: SheetUGlass1
amount: 2
- !type:DeleteEntity {}
steps:
- tool: Screwing
doAfter: 2
- tool: Prying
doAfter: 3
- tool: Screwing
doAfter: 2
- tool: Anchoring
doAfter: 3
- to: reinforcedUraniumWindow
steps:
- material: MetalRod
amount: 2
doAfter: 1
- node: clockworkWindow
entity: ClockworkWindow
edges:
- to: start
completed:
- !type:SpawnPrototype
prototype: SheetClockworkGlass1
amount: 2
- !type:DeleteEntity {}
steps:
- tool: Welding
doAfter: 5
- tool: Screwing
doAfter: 2
- tool: Prying
doAfter: 3
- tool: Welding
doAfter: 5
- tool: Screwing
doAfter: 2
- tool: Anchoring
doAfter: 3
- node: reinforcedWindow
entity: ReinforcedWindow
@@ -213,20 +97,43 @@
doAfter: 1
- tool: Anchoring
doAfter: 2
- to: reinforcedPlasmaWindow
steps:
- material: Plasma
- node: tintedWindow
entity: TintedWindow
edges:
- to: start
completed:
- !type:SpawnPrototype
prototype: SheetRGlass1
amount: 2
- !type:DeleteEntity {}
steps:
- tool: Screwing
doAfter: 1
- to: reinforcedUraniumWindow
steps:
- material: Uranium
amount: 2
- tool: Prying
doAfter: 2
- tool: Screwing
doAfter: 1
- to: shuttleWindow
steps:
- material: Plasteel
- tool: Anchoring
doAfter: 2
- node: plasmaWindow
entity: PlasmaWindow
edges:
- to: start
completed:
- !type:SpawnPrototype
prototype: SheetPGlass1
amount: 2
- !type:DeleteEntity {}
steps:
- tool: Screwing
doAfter: 2
- tool: Prying
doAfter: 3
- tool: Screwing
doAfter: 2
- tool: Anchoring
doAfter: 3
- node: reinforcedPlasmaWindow
@@ -252,6 +159,25 @@
- tool: Anchoring
doAfter: 3
- node: uraniumWindow
entity: UraniumWindow
edges:
- to: start
completed:
- !type:SpawnPrototype
prototype: SheetUGlass1
amount: 2
- !type:DeleteEntity {}
steps:
- tool: Screwing
doAfter: 2
- tool: Prying
doAfter: 3
- tool: Screwing
doAfter: 2
- tool: Anchoring
doAfter: 3
- node: reinforcedUraniumWindow
entity: ReinforcedUraniumWindow
edges:
@@ -274,6 +200,29 @@
doAfter: 2
- tool: Anchoring
doAfter: 3
- node: clockworkWindow
entity: ClockworkWindow
edges:
- to: start
completed:
- !type:SpawnPrototype
prototype: SheetClockworkGlass1
amount: 2
- !type:DeleteEntity {}
steps:
- tool: Welding
doAfter: 5
- tool: Screwing
doAfter: 2
- tool: Prying
doAfter: 3
- tool: Welding
doAfter: 5
- tool: Screwing
doAfter: 2
- tool: Anchoring
doAfter: 3
- node: shuttleWindow
entity: ShuttleWindow
@@ -304,4 +253,4 @@
- tool: Welding
doAfter: 4
- tool: Anchoring
doAfter: 1
doAfter: 1

194
Resources/Prototypes/Recipes/Construction/Graphs/structures/window_diagonal.yml
View File

@@ -4,30 +4,12 @@
graph:
- node: start
edges:
- to: windowDiagonal
steps:
- material: Glass
amount: 2
doAfter: 2
- to: plasmaWindowDiagonal
steps:
- material: PlasmaGlass
amount: 2
doAfter: 2
- to: uraniumWindowDiagonal
steps:
- material: UraniumGlass
amount: 2
doAfter: 2
- to: clockworkWindowDiagonal
steps:
- material: ClockworkGlass
amount: 2
doAfter: 3
- to: reinforcedWindowDiagonal
steps:
- material: ReinforcedGlass
@@ -40,12 +22,30 @@
amount: 2
doAfter: 3
- to: uraniumWindowDiagonal
steps:
- material: UraniumGlass
amount: 2
doAfter: 2
- to: reinforcedUraniumWindowDiagonal
steps:
- material: ReinforcedUraniumGlass
amount: 2
doAfter: 3
- to: clockworkWindowDiagonal
steps:
- material: ClockworkGlass
amount: 2
doAfter: 3
- to: windowDiagonal
steps:
- material: Glass
amount: 2
doAfter: 3
- node: windowDiagonal
entity: WindowDiagonal
edges:
@@ -60,97 +60,6 @@
doAfter: 1
- tool: Anchoring
doAfter: 2
- to: plasmaWindowDiagonal
steps:
- material: Plasma
amount: 2
doAfter: 1
- to: uraniumWindowDiagonal
steps:
- material: Uranium
amount: 2
doAfter: 1
- to: clockworkWindowDiagonal
steps:
- material: Brass
amount: 2
doAfter: 2
- to: reinforcedWindowDiagonal
steps:
- material: MetalRod
amount: 2
doAfter: 2
- node: plasmaWindowDiagonal
entity: PlasmaWindowDiagonal
edges:
- to: start
completed:
- !type:SpawnPrototype
prototype: SheetPGlass1
amount: 2
- !type:DeleteEntity {}
steps:
- tool: Screwing
doAfter: 2
- tool: Prying
doAfter: 3
- tool: Screwing
doAfter: 2
- tool: Anchoring
doAfter: 3
- to: reinforcedPlasmaWindowDiagonal
steps:
- material: MetalRod
amount: 2
doAfter: 1
- node: uraniumWindowDiagonal
entity: UraniumWindowDiagonal
edges:
- to: start
completed:
- !type:SpawnPrototype
prototype: SheetUGlass1
amount: 2
- !type:DeleteEntity {}
steps:
- tool: Screwing
doAfter: 2
- tool: Prying
doAfter: 3
- tool: Screwing
doAfter: 2
- tool: Anchoring
doAfter: 3
- to: reinforcedUraniumWindowDiagonal
steps:
- material: MetalRod
amount: 2
doAfter: 1
- node: clockworkWindowDiagonal
entity: ClockworkWindowDiagonal
edges:
- to: start
completed:
- !type:SpawnPrototype
prototype: SheetClockworkGlass1
amount: 2
- !type:DeleteEntity {}
steps:
- tool: Welding
doAfter: 5
- tool: Screwing
doAfter: 1
- tool: Prying
doAfter: 2
- tool: Welding
doAfter: 5
- tool: Screwing
doAfter: 1
- tool: Anchoring
doAfter: 2
- node: reinforcedWindowDiagonal
entity: ReinforcedWindowDiagonal
@@ -174,16 +83,48 @@
doAfter: 1
- tool: Anchoring
doAfter: 2
- to: reinforcedPlasmaWindowDiagonal
steps:
- material: Plasma
- node: clockworkWindowDiagonal
entity: ClockworkWindowDiagonal
edges:
- to: start
completed:
- !type:SpawnPrototype
prototype: SheetClockworkGlass1
amount: 2
doAfter: 1
- to: reinforcedUraniumWindowDiagonal
- !type:DeleteEntity {}
steps:
- material: Uranium
amount: 2
- tool: Welding
doAfter: 5
- tool: Screwing
doAfter: 1
- tool: Prying
doAfter: 2
- tool: Welding
doAfter: 5
- tool: Screwing
doAfter: 1
- tool: Anchoring
doAfter: 2
- node: plasmaWindowDiagonal
entity: PlasmaWindowDiagonal
edges:
- to: start
completed:
- !type:SpawnPrototype
prototype: SheetPGlass1
amount: 2
- !type:DeleteEntity {}
steps:
- tool: Screwing
doAfter: 2
- tool: Prying
doAfter: 3
- tool: Screwing
doAfter: 2
- tool: Anchoring
doAfter: 3
- node: reinforcedPlasmaWindowDiagonal
entity: ReinforcedPlasmaWindowDiagonal
@@ -208,6 +149,25 @@
- tool: Anchoring
doAfter: 3
- node: uraniumWindowDiagonal
entity: UraniumWindowDiagonal
edges:
- to: start
completed:
- !type:SpawnPrototype
prototype: SheetUGlass1
amount: 2
- !type:DeleteEntity {}
steps:
- tool: Screwing
doAfter: 2
- tool: Prying
doAfter: 3
- tool: Screwing
doAfter: 2
- tool: Anchoring
doAfter: 3
- node: reinforcedUraniumWindowDiagonal
entity: ReinforcedUraniumWindowDiagonal
edges:
@@ -229,4 +189,4 @@
- tool: Screwing
doAfter: 2
- tool: Anchoring
doAfter: 3
doAfter: 3

174
Resources/Prototypes/Recipes/Construction/Graphs/structures/windowdirectional.yml
View File

@@ -4,55 +4,47 @@
graph:
- node: start
edges:
- to: windowDirectional # 25 hp
- to: windowDirectional
steps:
- material: Glass
amount: 1
doAfter: 1
doAfter: 2
- to: windowFrostedDirectional # 25 hp
steps:
- material: Glass
amount: 1
- material: Plastic
amount: 1
doAfter: 1
- to: plasmaWindowDirectional # 37 hp
steps:
- material: PlasmaGlass
amount: 1
doAfter: 1.5
- to: uraniumWindowDirectional # 37 hp
steps:
- material: UraniumGlass
amount: 1
doAfter: 1.5
- to: windowClockworkDirectional # 37 hp reinforced damage mod
steps:
- material: ClockworkGlass
amount: 1
doAfter: 1.5
- to: windowReinforcedDirectional # 37 hp reinforced damage mod
- to: windowReinforcedDirectional
steps:
- material: ReinforcedGlass
amount: 1
doAfter: 1.5
doAfter: 3
- to: plasmaReinforcedWindowDirectional # 75 hp reinforced damage mod
- to: plasmaWindowDirectional
steps:
- material: PlasmaGlass
amount: 1
doAfter: 2
- to: plasmaReinforcedWindowDirectional
steps:
- material: ReinforcedPlasmaGlass
amount: 1
doAfter: 3
- to: uraniumWindowDirectional
steps:
- material: UraniumGlass
amount: 1
doAfter: 2
- to: uraniumReinforcedWindowDirectional # 75 hp reinforced damage mod
- to: uraniumReinforcedWindowDirectional
steps:
- material: ReinforcedUraniumGlass
amount: 1
doAfter: 2
doAfter: 3
- to: windowClockworkDirectional
steps:
- material: ClockworkGlass
amount: 1
doAfter: 3
- node: windowDirectional
entity: WindowDirectional
@@ -68,45 +60,21 @@
doAfter: 1
- tool: Anchoring
doAfter: 2
- to: windowFrostedDirectional
steps:
- material: Plastic
amount: 1
doAfter: 0.5
- to: plasmaWindowDirectional
steps:
- material: Plasma
amount: 1
doAfter: 0.5
- to: uraniumWindowDirectional
steps:
- material: Uranium
amount: 1
doAfter: 0.5
- to: windowClockworkDirectional
steps:
- material: Brass
amount: 1
doAfter: 1
- to: windowReinforcedDirectional
steps:
- material: MetalRod
amount: 1
doAfter: 1
- node: windowFrostedDirectional
entity: WindowFrostedDirectional
- node: windowReinforcedDirectional
entity: WindowReinforcedDirectional
edges:
- to: start
completed:
- !type:SpawnPrototype
prototype: SheetGlass1
amount: 1
- !type:SpawnPrototype
prototype: SheetPlastic1
prototype: SheetRGlass1
amount: 1
- !type:DeleteEntity {}
steps:
- tool: Screwing
doAfter: 1
- tool: Prying
doAfter: 2
- tool: Screwing
doAfter: 1
- tool: Anchoring
@@ -130,35 +98,6 @@
doAfter: 2
- tool: Anchoring
doAfter: 3
- to: plasmaReinforcedWindowDirectional
steps:
- material: MetalRod
amount: 1
doAfter: 0.5
- node: uraniumWindowDirectional
entity: UraniumWindowDirectional
edges:
- to: start
completed:
- !type:SpawnPrototype
prototype: SheetUGlass1
amount: 1
- !type:DeleteEntity {}
steps:
- tool: Screwing
doAfter: 2
- tool: Prying
doAfter: 3
- tool: Screwing
doAfter: 2
- tool: Anchoring
doAfter: 3
- to: uraniumReinforcedWindowDirectional
steps:
- material: MetalRod
amount: 1
doAfter: 0.5
- node: windowClockworkDirectional
entity: WindowClockworkDirectional
@@ -179,35 +118,6 @@
- tool: Anchoring
doAfter: 3
- node: windowReinforcedDirectional
entity: WindowReinforcedDirectional
edges:
- to: start
completed:
- !type:SpawnPrototype
prototype: SheetRGlass1
amount: 1
- !type:DeleteEntity {}
steps:
- tool: Screwing
doAfter: 1
- tool: Prying
doAfter: 2
- tool: Screwing
doAfter: 1
- tool: Anchoring
doAfter: 2
- to: plasmaReinforcedWindowDirectional
steps:
- material: Plasma
amount: 1
doAfter: 0.5
- to: uraniumReinforcedWindowDirectional
steps:
- material: Uranium
amount: 1
doAfter: 0.5
- node: plasmaReinforcedWindowDirectional
entity: PlasmaReinforcedWindowDirectional
edges:
@@ -226,6 +136,24 @@
doAfter: 2
- tool: Anchoring
doAfter: 3
- node: uraniumWindowDirectional
entity: UraniumWindowDirectional
edges:
- to: start
completed:
- !type:SpawnPrototype
prototype: SheetUGlass1
amount: 1
- !type:DeleteEntity {}
steps:
- tool: Screwing
doAfter: 2
- tool: Prying
doAfter: 3
- tool: Screwing
doAfter: 2
- tool: Anchoring
doAfter: 3
- node: uraniumReinforcedWindowDirectional
entity: UraniumReinforcedWindowDirectional
@@ -244,4 +172,4 @@
- tool: Screwing
doAfter: 2
- tool: Anchoring
doAfter: 3
doAfter: 3

2
Resources/Prototypes/Recipes/Construction/structures.yml
View File

@@ -1746,4 +1746,4 @@
sprite: Structures/Doors/secret_door.rsi
state: closed
conditions:
- !type:TileNotBlocked
- !type:TileNotBlocked