From a614e719ffeebe539cab026e8d6115303d168adf Mon Sep 17 00:00:00 2001 From: =?utf8?q?Manuel=20Gusm=C3=A3o?= Date: Mon, 2 Jun 2025 22:20:39 +0100 Subject: [PATCH] Fix: Wall-mounted SpawnPrototype Issue. (#36353) 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 --- .../Graphs/furniture/curtains.yml | 40 +++++++++---------- .../Graphs/furniture/noticeboard.yml | 2 +- .../Construction/Graphs/furniture/shelfs.yml | 38 +++++++++--------- .../Graphs/machines/switching.yml | 24 +++++------ .../Construction/Graphs/structures/window.yml | 20 +++++----- .../Graphs/structures/window_diagonal.yml | 14 +++---- .../Graphs/structures/windowdirectional.yml | 14 +++---- .../Construction/Graphs/utilities/cameras.yml | 4 +- 8 files changed, 78 insertions(+), 78 deletions(-) diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/furniture/curtains.yml b/Resources/Prototypes/Recipes/Construction/Graphs/furniture/curtains.yml index 21492af6a9..e7e1086ea4 100644 --- a/Resources/Prototypes/Recipes/Construction/Graphs/furniture/curtains.yml +++ b/Resources/Prototypes/Recipes/Construction/Graphs/furniture/curtains.yml @@ -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: diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/furniture/noticeboard.yml b/Resources/Prototypes/Recipes/Construction/Graphs/furniture/noticeboard.yml index 324745cbb9..7268889c55 100644 --- a/Resources/Prototypes/Recipes/Construction/Graphs/furniture/noticeboard.yml +++ b/Resources/Prototypes/Recipes/Construction/Graphs/furniture/noticeboard.yml @@ -18,7 +18,7 @@ edges: - to: start completed: - - !type:SpawnPrototype + - !type:GivePrototype prototype: MaterialWoodPlank amount: 3 steps: diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/furniture/shelfs.yml b/Resources/Prototypes/Recipes/Construction/Graphs/furniture/shelfs.yml index 34541f2a10..55a97fcf32 100644 --- a/Resources/Prototypes/Recipes/Construction/Graphs/furniture/shelfs.yml +++ b/Resources/Prototypes/Recipes/Construction/Graphs/furniture/shelfs.yml @@ -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: diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/machines/switching.yml b/Resources/Prototypes/Recipes/Construction/Graphs/machines/switching.yml index b39229f39a..ab0377e42e 100644 --- a/Resources/Prototypes/Recipes/Construction/Graphs/machines/switching.yml +++ b/Resources/Prototypes/Recipes/Construction/Graphs/machines/switching.yml @@ -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 {} diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/structures/window.yml b/Resources/Prototypes/Recipes/Construction/Graphs/structures/window.yml index 37682eb091..a7aff42f03 100644 --- a/Resources/Prototypes/Recipes/Construction/Graphs/structures/window.yml +++ b/Resources/Prototypes/Recipes/Construction/Graphs/structures/window.yml @@ -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 {} diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/structures/window_diagonal.yml b/Resources/Prototypes/Recipes/Construction/Graphs/structures/window_diagonal.yml index 1efe1a8eac..1093686844 100644 --- a/Resources/Prototypes/Recipes/Construction/Graphs/structures/window_diagonal.yml +++ b/Resources/Prototypes/Recipes/Construction/Graphs/structures/window_diagonal.yml @@ -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 {} diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/structures/windowdirectional.yml b/Resources/Prototypes/Recipes/Construction/Graphs/structures/windowdirectional.yml index dc10ce9ecb..a44b4015f2 100644 --- a/Resources/Prototypes/Recipes/Construction/Graphs/structures/windowdirectional.yml +++ b/Resources/Prototypes/Recipes/Construction/Graphs/structures/windowdirectional.yml @@ -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 {} diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/utilities/cameras.yml b/Resources/Prototypes/Recipes/Construction/Graphs/utilities/cameras.yml index d3627a3bcd..95294d8e4f 100644 --- a/Resources/Prototypes/Recipes/Construction/Graphs/utilities/cameras.yml +++ b/Resources/Prototypes/Recipes/Construction/Graphs/utilities/cameras.yml @@ -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 {} -- 2.51.2