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

fix unremovable items used in construction (#37292)

Browse Source
This commit is contained in:
Errant
2025-05-09 14:43:38 +02:00
committed by GitHub
parent 9610b23d55
commit 68d0a41bb4
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Content.Server/Construction/ConstructionSystem.Interactions.cs
View File

@@ -8,8 +8,10 @@ using Content.Shared.Construction.EntitySystems;
using Content.Shared.Construction.Steps; using Content.Shared.Construction.Steps;
using Content.Shared.DoAfter; using Content.Shared.DoAfter;
using Content.Shared.Interaction; using Content.Shared.Interaction;
using Content.Shared.Interaction.Components;
using Content.Shared.Prying.Systems; using Content.Shared.Prying.Systems;
using Content.Shared.Radio.EntitySystems; using Content.Shared.Radio.EntitySystems;
using Content.Shared.Stacks;
using Content.Shared.Temperature; using Content.Shared.Temperature;
using Content.Shared.Tools.Systems; using Content.Shared.Tools.Systems;
using Robust.Shared.Containers; using Robust.Shared.Containers;
@@ -274,6 +276,10 @@ namespace Content.Server.Construction
if(!insertStep.EntityValid(insert, EntityManager, _factory)) if(!insertStep.EntityValid(insert, EntityManager, _factory))
return HandleResult.False; return HandleResult.False;
// Unremovable items can't be inserted, unless they are a lingering stack
if(HasComp<UnremoveableComponent>(insert) && (!TryComp<StackComponent>(insert, out var comp) || !comp.Lingering))
return HandleResult.False;
// If we're only testing whether this step would be handled by the given event, then we're done. // If we're only testing whether this step would be handled by the given event, then we're done.
if (validation) if (validation)
return HandleResult.Validated; return HandleResult.Validated;