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

open bag in combat mode (#22512)

Browse Source 
* open bag in combat mode

* !!!!!

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
This commit is contained in:
deltanedas
2023-12-14 23:54:27 +00:00
committed by GitHub
parent d8638a8814
commit a7e85fe446
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs
View File

@@ -1,7 +1,6 @@
using System.Diagnostics.CodeAnalysis; using System.Diagnostics.CodeAnalysis;
using System.Linq; using System.Linq;
using Content.Shared.ActionBlocker; using Content.Shared.ActionBlocker;
using Content.Shared.CombatMode;
using Content.Shared.Containers.ItemSlots; using Content.Shared.Containers.ItemSlots;
using Content.Shared.Destructible; using Content.Shared.Destructible;
using Content.Shared.DoAfter; using Content.Shared.DoAfter;
@@ -40,7 +39,6 @@ public abstract class SharedStorageSystem : EntitySystem
[Dependency] protected readonly ActionBlockerSystem ActionBlocker = default!; [Dependency] protected readonly ActionBlockerSystem ActionBlocker = default!;
[Dependency] private readonly SharedAppearanceSystem _appearance = default!; [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
[Dependency] protected readonly SharedAudioSystem Audio = default!; [Dependency] protected readonly SharedAudioSystem Audio = default!;
[Dependency] private readonly SharedCombatModeSystem _combatMode = default!;
[Dependency] protected readonly SharedTransformSystem TransformSystem = default!; [Dependency] protected readonly SharedTransformSystem TransformSystem = default!;
[Dependency] private readonly SharedStackSystem _stack = default!; [Dependency] private readonly SharedStackSystem _stack = default!;
[Dependency] private readonly SharedUserInterfaceSystem _ui = default!; [Dependency] private readonly SharedUserInterfaceSystem _ui = default!;
@@ -145,7 +143,7 @@ public abstract class SharedStorageSystem : EntitySystem
/// </summary> /// </summary>
private void OnActivate(EntityUid uid, StorageComponent storageComp, ActivateInWorldEvent args) 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<LockComponent>(uid, out var lockComponent) && lockComponent.Locked)
return; return;
OpenStorageUI(uid, args.User, storageComp); OpenStorageUI(uid, args.User, storageComp);