juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix: Wall-mounted SpawnPrototype Issue. (#36353)

Browse Source 
Fix #34569: Wall-mounted SpawnPrototype Issue.
Every wall-mounted prototype that uses SpawnPrototype in it's
deconstruction now uses GivePrototype
which gives the entity to the user, or drops it on the ground
in case their hands are full, no longer
spawning the entity inside the wall or on the other side of it
This commit is contained in:
Manuel Gusmão
2025-06-02 22:20:39 +01:00
committed by GitHub
parent 3fa3b39878
commit a614e719ff
8 changed files with 78 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
Resources/Prototypes/Recipes/Construction/Graphs/furniture/curtains.yml
View File

@@ -82,7 +82,7 @@
edges:
- to: start
completed:
- !type:SpawnPrototype
- !type:GivePrototype
prototype: MaterialCloth1
amount: 2
steps:
@@ -93,7 +93,7 @@
edges:
- to: start
completed:
- !type:SpawnPrototype
- !type:GivePrototype
prototype: MaterialCloth1
amount: 2
steps:
@@ -105,7 +105,7 @@
edges:
- to: start
completed:
- !type:SpawnPrototype
- !type:GivePrototype
prototype: FloorCarpetItemBlack
amount: 1
steps:
@@ -116,7 +116,7 @@
edges:
- to: start
completed:
- !type:SpawnPrototype
- !type:GivePrototype
prototype: FloorCarpetItemBlack
amount: 1
steps:
@@ -128,7 +128,7 @@
edges:
- to: start
completed:
- !type:SpawnPrototype
- !type:GivePrototype
prototype: FloorCarpetItemBlue
amount: 1
steps:
@@ -139,7 +139,7 @@
edges:
- to: start
completed:
- !type:SpawnPrototype
- !type:GivePrototype
prototype: FloorCarpetItemBlue
amount: 1
steps:
@@ -151,7 +151,7 @@
edges:
- to: start
completed:
- !type:SpawnPrototype
- !type:GivePrototype
prototype: FloorCarpetItemCyan
amount: 1
steps:
@@ -162,7 +162,7 @@
edges:
- to: start
completed:
- !type:SpawnPrototype
- !type:GivePrototype
prototype: FloorCarpetItemCyan
amount: 1
steps:
@@ -174,7 +174,7 @@
edges:
- to: start
completed:
- !type:SpawnPrototype
- !type:GivePrototype
prototype: FloorCarpetItemGreen
amount: 1
steps:
@@ -185,7 +185,7 @@
edges:
- to: start
completed:
- !type:SpawnPrototype
- !type:GivePrototype
prototype: FloorCarpetItemGreen
amount: 1
steps:
@@ -197,7 +197,7 @@
edges:
- to: start
completed:
- !type:SpawnPrototype
- !type:GivePrototype
prototype: FloorCarpetItemOrange
amount: 1
steps:
@@ -208,7 +208,7 @@
edges:
- to: start
completed:
- !type:SpawnPrototype
- !type:GivePrototype
prototype: FloorCarpetItemOrange
amount: 1
steps:
@@ -220,7 +220,7 @@
edges:
- to: start
completed:
- !type:SpawnPrototype
- !type:GivePrototype
prototype: FloorCarpetItemPink
amount: 1
steps:
@@ -231,7 +231,7 @@
edges:
- to: start
completed:
- !type:SpawnPrototype
- !type:GivePrototype
prototype: FloorCarpetItemPink
amount: 1
steps:
@@ -243,7 +243,7 @@
edges:
- to: start
completed:
- !type:SpawnPrototype
- !type:GivePrototype
prototype: FloorCarpetItemPurple
amount: 1
steps:
@@ -254,7 +254,7 @@
edges:
- to: start
completed:
- !type:SpawnPrototype
- !type:GivePrototype
prototype: FloorCarpetItemPurple
amount: 1
steps:
@@ -266,7 +266,7 @@
edges:
- to: start
completed:
- !type:SpawnPrototype
- !type:GivePrototype
prototype: FloorCarpetItemRed
amount: 1
steps:
@@ -277,7 +277,7 @@
edges:
- to: start
completed:
- !type:SpawnPrototype
- !type:GivePrototype
prototype: FloorCarpetItemRed
amount: 1
steps:
@@ -289,7 +289,7 @@
edges:
- to: start
completed:
- !type:SpawnPrototype
- !type:GivePrototype
prototype: FloorCarpetItemWhite
amount: 1
steps:
@@ -300,7 +300,7 @@
edges:
- to: start
completed:
- !type:SpawnPrototype
- !type:GivePrototype
prototype: FloorCarpetItemWhite
amount: 1
steps:

2
Resources/Prototypes/Recipes/Construction/Graphs/furniture/noticeboard.yml
View File

@@ -18,7 +18,7 @@
edges:
- to: start
completed:
- !type:SpawnPrototype
- !type:GivePrototype
prototype: MaterialWoodPlank
amount: 3
steps:

38
Resources/Prototypes/Recipes/Construction/Graphs/furniture/shelfs.yml
View File

@@ -109,7 +109,7 @@
- to: start
completed:
- !type:EmptyAllContainers
- !type:SpawnPrototype
- !type:GivePrototype
prototype: MaterialWoodPlank1
amount: 4
steps:
@@ -122,7 +122,7 @@
- to: start
completed:
- !type:EmptyAllContainers
- !type:SpawnPrototype
- !type:GivePrototype
prototype: SheetSteel1
amount: 5
steps:
@@ -135,7 +135,7 @@
- to: start
completed:
- !type:EmptyAllContainers
- !type:SpawnPrototype
- !type:GivePrototype
prototype: SheetGlass1
amount: 4
steps:
@@ -148,10 +148,10 @@
- to: start
completed:
- !type:EmptyAllContainers
- !type:SpawnPrototype
- !type:GivePrototype
prototype: MaterialWoodPlank1
amount: 8
- !type:SpawnPrototype
- !type:GivePrototype
prototype: CableApcStack1
amount: 2
steps:
@@ -166,13 +166,13 @@
- to: start
completed:
- !type:EmptyAllContainers
- !type:SpawnPrototype
- !type:GivePrototype
prototype: SheetPlasteel1
amount: 5
- !type:SpawnPrototype
- !type:GivePrototype
prototype: SheetRGlass1
amount: 5
- !type:SpawnPrototype
- !type:GivePrototype
prototype: CableApcStack1
amount: 3
steps:
@@ -187,13 +187,13 @@
- to: start
completed:
- !type:EmptyAllContainers
- !type:SpawnPrototype
- !type:GivePrototype
prototype: SheetPlastic1
amount: 5
- !type:SpawnPrototype
- !type:GivePrototype
prototype: SheetRGlass1
amount: 5
- !type:SpawnPrototype
- !type:GivePrototype
prototype: CableApcStack1
amount: 2
steps:
@@ -209,7 +209,7 @@
- to: start
completed:
- !type:EmptyAllContainers
- !type:SpawnPrototype
- !type:GivePrototype
prototype: MaterialWoodPlank1
amount: 6
steps:
@@ -222,13 +222,13 @@
- to: start
completed:
- !type:EmptyAllContainers
- !type:SpawnPrototype
- !type:GivePrototype
prototype: PartRodMetal
amount: 2
- !type:SpawnPrototype
- !type:GivePrototype
prototype: SheetSteel1
amount: 5
- !type:SpawnPrototype
- !type:GivePrototype
prototype: MaterialWoodPlank1
amount: 3
steps:
@@ -245,16 +245,16 @@
- to: start
completed:
- !type:EmptyAllContainers
- !type:SpawnPrototype
- !type:GivePrototype
prototype: SheetPlasteel1
amount: 2
- !type:SpawnPrototype
- !type:GivePrototype
prototype: SheetPlastic1
amount: 5
- !type:SpawnPrototype
- !type:GivePrototype
prototype: SheetRGlass1
amount: 5
- !type:SpawnPrototype
- !type:GivePrototype
prototype: CableApcStack1
amount: 2
steps:

24
Resources/Prototypes/Recipes/Construction/Graphs/machines/switching.yml
View File

@@ -52,10 +52,10 @@
- tool: Screwing
doAfter: 2.0
completed:
- !type:SpawnPrototype
- !type:GivePrototype
prototype: SheetSteel1
amount: 1
- !type:SpawnPrototype
- !type:GivePrototype
prototype: CableApcStack1
amount: 1
- !type:DeleteEntity {}
@@ -81,10 +81,10 @@
- tool: Screwing
doAfter: 2.0
completed:
- !type:SpawnPrototype
- !type:GivePrototype
prototype: SheetSteel1
amount: 1
- !type:SpawnPrototype
- !type:GivePrototype
prototype: CableApcStack1
amount: 1
- !type:DeleteEntity {}
@@ -110,10 +110,10 @@
- tool: Screwing
doAfter: 2.0
completed:
- !type:SpawnPrototype
- !type:GivePrototype
prototype: SheetSteel1
amount: 1
- !type:SpawnPrototype
- !type:GivePrototype
prototype: CableApcStack1
amount: 1
- !type:DeleteEntity {}
@@ -139,10 +139,10 @@
- tool: Screwing
doAfter: 2.0
completed:
- !type:SpawnPrototype
- !type:GivePrototype
prototype: SheetSteel1
amount: 1
- !type:SpawnPrototype
- !type:GivePrototype
prototype: CableApcStack1
amount: 1
- !type:DeleteEntity {}
@@ -168,10 +168,10 @@
- tool: Screwing
doAfter: 2.0
completed:
- !type:SpawnPrototype
- !type:GivePrototype
prototype: SheetSteel1
amount: 1
- !type:SpawnPrototype
- !type:GivePrototype
prototype: CableApcStack1
amount: 1
- !type:DeleteEntity {}
@@ -197,10 +197,10 @@
- tool: Screwing
doAfter: 2.0
completed:
- !type:SpawnPrototype
- !type:GivePrototype
prototype: SheetSteel1
amount: 1
- !type:SpawnPrototype
- !type:GivePrototype
prototype: CableApcStack1
amount: 1
- !type:DeleteEntity {}

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

@@ -65,7 +65,7 @@
edges:
- to: start
completed:
- !type:SpawnPrototype
- !type:GivePrototype
prototype: SheetGlass1
amount: 2
- !type:DeleteEntity {}
@@ -80,7 +80,7 @@
edges:
- to: start
completed:
- !type:SpawnPrototype
- !type:GivePrototype
prototype: SheetRGlass1
amount: 2
- !type:DeleteEntity {}
@@ -103,7 +103,7 @@
edges:
- to: start
completed:
- !type:SpawnPrototype
- !type:GivePrototype
prototype: SheetRGlass1
amount: 2
- !type:DeleteEntity {}
@@ -122,7 +122,7 @@
edges:
- to: start
completed:
- !type:SpawnPrototype
- !type:GivePrototype
prototype: SheetPGlass1
amount: 2
- !type:DeleteEntity {}
@@ -141,7 +141,7 @@
edges:
- to: start
completed:
- !type:SpawnPrototype
- !type:GivePrototype
prototype: SheetRPGlass1
amount: 2
- !type:DeleteEntity {}
@@ -164,7 +164,7 @@
edges:
- to: start
completed:
- !type:SpawnPrototype
- !type:GivePrototype
prototype: SheetUGlass1
amount: 2
- !type:DeleteEntity {}
@@ -183,7 +183,7 @@
edges:
- to: start
completed:
- !type:SpawnPrototype
- !type:GivePrototype
prototype: SheetRUGlass1
amount: 2
- !type:DeleteEntity {}
@@ -206,7 +206,7 @@
edges:
- to: start
completed:
- !type:SpawnPrototype
- !type:GivePrototype
prototype: SheetClockworkGlass1
amount: 2
- !type:DeleteEntity {}
@@ -229,10 +229,10 @@
edges:
- to: start
completed:
- !type:SpawnPrototype
- !type:GivePrototype
prototype: SheetRGlass1
amount: 2
- !type:SpawnPrototype
- !type:GivePrototype
prototype: SheetPlasteel1
amount: 2
- !type:DeleteEntity {}

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

@@ -51,7 +51,7 @@
edges:
- to: start
completed:
- !type:SpawnPrototype
- !type:GivePrototype
prototype: SheetGlass1
amount: 2
- !type:DeleteEntity {}
@@ -66,7 +66,7 @@
edges:
- to: start
completed:
- !type:SpawnPrototype
- !type:GivePrototype
prototype: SheetRGlass1
amount: 2
- !type:DeleteEntity {}
@@ -89,7 +89,7 @@
edges:
- to: start
completed:
- !type:SpawnPrototype
- !type:GivePrototype
prototype: SheetClockworkGlass1
amount: 2
- !type:DeleteEntity {}
@@ -112,7 +112,7 @@
edges:
- to: start
completed:
- !type:SpawnPrototype
- !type:GivePrototype
prototype: SheetPGlass1
amount: 2
- !type:DeleteEntity {}
@@ -131,7 +131,7 @@
edges:
- to: start
completed:
- !type:SpawnPrototype
- !type:GivePrototype
prototype: SheetRPGlass1
amount: 2
- !type:DeleteEntity {}
@@ -154,7 +154,7 @@
edges:
- to: start
completed:
- !type:SpawnPrototype
- !type:GivePrototype
prototype: SheetUGlass1
amount: 2
- !type:DeleteEntity {}
@@ -173,7 +173,7 @@
edges:
- to: start
completed:
- !type:SpawnPrototype
- !type:GivePrototype
prototype: SheetRUGlass1
amount: 2
- !type:DeleteEntity {}

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

@@ -51,7 +51,7 @@
edges:
- to: start
completed:
- !type:SpawnPrototype
- !type:GivePrototype
prototype: SheetGlass1
amount: 1
- !type:DeleteEntity {}
@@ -66,7 +66,7 @@
edges:
- to: start
completed:
- !type:SpawnPrototype
- !type:GivePrototype
prototype: SheetRGlass1
amount: 1
- !type:DeleteEntity {}
@@ -85,7 +85,7 @@
edges:
- to: start
completed:
- !type:SpawnPrototype
- !type:GivePrototype
prototype: SheetPGlass1
amount: 1
- !type:DeleteEntity {}
@@ -104,7 +104,7 @@
edges:
- to: start
completed:
- !type:SpawnPrototype
- !type:GivePrototype
prototype: SheetClockworkGlass1
amount: 1
- !type:DeleteEntity {}
@@ -123,7 +123,7 @@
edges:
- to: start
completed:
- !type:SpawnPrototype
- !type:GivePrototype
prototype: SheetRPGlass1
amount: 1
- !type:DeleteEntity {}
@@ -141,7 +141,7 @@
edges:
- to: start
completed:
- !type:SpawnPrototype
- !type:GivePrototype
prototype: SheetUGlass1
amount: 1
- !type:DeleteEntity {}
@@ -160,7 +160,7 @@
edges:
- to: start
completed:
- !type:SpawnPrototype
- !type:GivePrototype
prototype: SheetRUGlass1
amount: 1
- !type:DeleteEntity {}

4
Resources/Prototypes/Recipes/Construction/Graphs/utilities/cameras.yml
View File

@@ -20,7 +20,7 @@
doAfter: 1
- to: start
completed:
- !type:SpawnPrototype
- !type:GivePrototype
prototype: SheetSteel1
amount: 2
- !type:DeleteEntity {}
@@ -47,7 +47,7 @@
- !type:AllWiresCut {}
- !type:WirePanel {}
completed:
- !type:SpawnPrototype
- !type:GivePrototype
prototype: SheetSteel1
amount: 2
- !type:DeleteEntity {}