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

Fix disposal tube deconstruction (#12323)

Browse Source
This commit is contained in:
Leon Friedrich
2022-11-01 12:53:06 +13:00
committed by GitHub
parent 7a1ebc6c97
commit c64a77131a
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Content.Server/Disposal/Tube/DisposalTubeSystem.cs
View File

@@ -1,18 +1,16 @@
using System.Text; using Content.Server.Construction.Completions;
using Content.Server.Disposal.Tube.Components; using Content.Server.Disposal.Tube.Components;
using Content.Server.UserInterface;
using Content.Server.Hands.Components; using Content.Server.Hands.Components;
using Content.Server.UserInterface;
using Content.Shared.Destructible; using Content.Shared.Destructible;
using Content.Shared.Disposal.Components; using Content.Shared.Disposal.Components;
using Content.Shared.Movement;
using Content.Shared.Movement.Events; using Content.Shared.Movement.Events;
using Content.Shared.Verbs;
using Content.Shared.Popups; using Content.Shared.Popups;
using Robust.Server.GameObjects;
using Robust.Shared.Audio; using Robust.Shared.Audio;
using Robust.Shared.Map; using Robust.Shared.Map;
using Robust.Shared.Player; using Robust.Shared.Player;
using Robust.Shared.Timing; using Robust.Shared.Timing;
using System.Text;
namespace Content.Server.Disposal.Tube namespace Content.Server.Disposal.Tube
{ {
@@ -32,6 +30,12 @@ namespace Content.Server.Disposal.Tube
SubscribeLocalEvent<DisposalRouterComponent, ActivatableUIOpenAttemptEvent>(OnOpenRouterUIAttempt); SubscribeLocalEvent<DisposalRouterComponent, ActivatableUIOpenAttemptEvent>(OnOpenRouterUIAttempt);
SubscribeLocalEvent<DisposalTaggerComponent, ActivatableUIOpenAttemptEvent>(OnOpenTaggerUIAttempt); SubscribeLocalEvent<DisposalTaggerComponent, ActivatableUIOpenAttemptEvent>(OnOpenTaggerUIAttempt);
SubscribeLocalEvent<DisposalTubeComponent, ComponentStartup>(OnStartup); 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) private void OnStartup(EntityUid uid, DisposalTubeComponent component, ComponentStartup args)

2
Content.Server/Disposal/Unit/EntitySystems/DisposableSystem.cs
View File

@@ -65,7 +65,7 @@ namespace Content.Server.Disposal.Unit.EntitySystems
if (duc != null) if (duc != null)
duc.Container.Insert(entity, EntityManager, xform, meta: meta); duc.Container.Insert(entity, EntityManager, xform, meta: meta);
else else
xform.AttachParentToContainerOrGrid(EntityManager); xform.AttachToGridOrMap();
} }
if (duc != null) if (duc != null)