From a7e85fe446d4562735b4ed2fdeea1245d541e17f Mon Sep 17 00:00:00 2001 From: deltanedas <39013340+deltanedas@users.noreply.github.com> Date: Thu, 14 Dec 2023 23:54:27 +0000 Subject: [PATCH] open bag in combat mode (#22512) * open bag in combat mode * !!!!! --------- Co-authored-by: deltanedas <@deltanedas:kde.org> --- Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs b/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs index c5a130495d..5c98cb011b 100644 --- a/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs +++ b/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs @@ -1,7 +1,6 @@ using System.Diagnostics.CodeAnalysis; using System.Linq; using Content.Shared.ActionBlocker; -using Content.Shared.CombatMode; using Content.Shared.Containers.ItemSlots; using Content.Shared.Destructible; using Content.Shared.DoAfter; @@ -40,7 +39,6 @@ public abstract class SharedStorageSystem : EntitySystem [Dependency] protected readonly ActionBlockerSystem ActionBlocker = default!; [Dependency] private readonly SharedAppearanceSystem _appearance = default!; [Dependency] protected readonly SharedAudioSystem Audio = default!; - [Dependency] private readonly SharedCombatModeSystem _combatMode = default!; [Dependency] protected readonly SharedTransformSystem TransformSystem = default!; [Dependency] private readonly SharedStackSystem _stack = default!; [Dependency] private readonly SharedUserInterfaceSystem _ui = default!; @@ -145,7 +143,7 @@ public abstract class SharedStorageSystem : EntitySystem /// private void OnActivate(EntityUid uid, StorageComponent storageComp, ActivateInWorldEvent args) { - if (args.Handled || _combatMode.IsInCombatMode(args.User) || TryComp(uid, out LockComponent? lockComponent) && lockComponent.Locked) + if (args.Handled || TryComp(uid, out var lockComponent) && lockComponent.Locked) return; OpenStorageUI(uid, args.User, storageComp);