From 37d0cb9c9085befad4f7fe1ee21a15d1d3c2f66c Mon Sep 17 00:00:00 2001 From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Date: Sun, 5 May 2024 19:22:33 +1000 Subject: [PATCH] Revert "npc can no longer attack you through a locker" (#27680) Revert "npc can no longer attack you through a locker (#27677)" This reverts commit 83b486b63fd23e149bb0112aac4800e63b1f33dc. --- Content.Server/NPC/Systems/NPCUtilitySystem.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Content.Server/NPC/Systems/NPCUtilitySystem.cs b/Content.Server/NPC/Systems/NPCUtilitySystem.cs index a3b9aed57e..e8fb54022e 100644 --- a/Content.Server/NPC/Systems/NPCUtilitySystem.cs +++ b/Content.Server/NPC/Systems/NPCUtilitySystem.cs @@ -224,7 +224,7 @@ public sealed class NPCUtilitySystem : EntitySystem { if (TryComp(container.Owner, out var storageComponent)) { - if (storageComponent is { Open: false }) + if (storageComponent is { Open: false } && _weldable.IsWelded(container.Owner)) { return 0.0f; }