From c64a77131af452c8bc2445cabf8780f1b1c615b4 Mon Sep 17 00:00:00 2001
From: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com>
Date: Tue, 1 Nov 2022 12:53:06 +1300
Subject: [PATCH] Fix disposal tube deconstruction (#12323)

---
 Content.Server/Disposal/Tube/DisposalTubeSystem.cs | 14 +++++++++-----
 .../Unit/EntitySystems/DisposableSystem.cs         |  2 +-
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/Content.Server/Disposal/Tube/DisposalTubeSystem.cs b/Content.Server/Disposal/Tube/DisposalTubeSystem.cs
index f08cbb4c59..acade65155 100644
--- a/Content.Server/Disposal/Tube/DisposalTubeSystem.cs
+++ b/Content.Server/Disposal/Tube/DisposalTubeSystem.cs
@@ -1,18 +1,16 @@
-using System.Text;
+using Content.Server.Construction.Completions;
 using Content.Server.Disposal.Tube.Components;
-using Content.Server.UserInterface;
 using Content.Server.Hands.Components;
+using Content.Server.UserInterface;
 using Content.Shared.Destructible;
 using Content.Shared.Disposal.Components;
-using Content.Shared.Movement;
 using Content.Shared.Movement.Events;
-using Content.Shared.Verbs;
 using Content.Shared.Popups;
-using Robust.Server.GameObjects;
 using Robust.Shared.Audio;
 using Robust.Shared.Map;
 using Robust.Shared.Player;
 using Robust.Shared.Timing;
+using System.Text;
 
 namespace Content.Server.Disposal.Tube
 {
@@ -32,6 +30,12 @@ namespace Content.Server.Disposal.Tube
             SubscribeLocalEvent<DisposalRouterComponent, ActivatableUIOpenAttemptEvent>(OnOpenRouterUIAttempt);
             SubscribeLocalEvent<DisposalTaggerComponent, ActivatableUIOpenAttemptEvent>(OnOpenTaggerUIAttempt);
             SubscribeLocalEvent<DisposalTubeComponent, ComponentStartup>(OnStartup);
+            SubscribeLocalEvent<DisposalTubeComponent, ConstructionBeforeDeleteEvent>(OnDeconstruct);
+        }
+
+        private void OnDeconstruct(EntityUid uid, DisposalTubeComponent component, ConstructionBeforeDeleteEvent args)
+        {
+            component.Disconnect();
         }
 
         private void OnStartup(EntityUid uid, DisposalTubeComponent component, ComponentStartup args)
diff --git a/Content.Server/Disposal/Unit/EntitySystems/DisposableSystem.cs b/Content.Server/Disposal/Unit/EntitySystems/DisposableSystem.cs
index b562deff01..5f9a69d823 100644
--- a/Content.Server/Disposal/Unit/EntitySystems/DisposableSystem.cs
+++ b/Content.Server/Disposal/Unit/EntitySystems/DisposableSystem.cs
@@ -65,7 +65,7 @@ namespace Content.Server.Disposal.Unit.EntitySystems
                 if (duc != null)
                     duc.Container.Insert(entity, EntityManager, xform, meta: meta);
                 else
-                    xform.AttachParentToContainerOrGrid(EntityManager);
+                    xform.AttachToGridOrMap();
             }
 
             if (duc != null)