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

Fix admin ghosts not being able to see items in pockets or interact with them (#31076)

Browse Source 
* Fix admin ghosts not being able to see items in pouches or interact with them

* fix

* oops

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
This commit is contained in:
DrSmugleaf
2024-11-21 18:56:05 -08:00
committed by GitHub
parent 4f703ae9ce
commit 5a751a820a
6 changed files with 32 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Shared/Interaction/SharedInteractionSystem.cs
View File

@@ -21,6 +21,7 @@ using Content.Shared.Physics;
using Content.Shared.Players.RateLimiting;
using Content.Shared.Popups;
using Content.Shared.Storage;
using Content.Shared.Strip;
using Content.Shared.Tag;
using Content.Shared.Timing;
using Content.Shared.UserInterface;
@@ -67,6 +68,7 @@ namespace Content.Shared.Interaction
[Dependency] private readonly IRobustRandom _random = default!;
[Dependency] private readonly TagSystem _tagSystem = default!;
[Dependency] private readonly SharedUserInterfaceSystem _ui = default!;
[Dependency] private readonly SharedStrippableSystem _strippable = default!;
[Dependency] private readonly SharedPlayerRateLimitManager _rateLimit = default!;
[Dependency] private readonly IConfigurationManager _cfg = default!;
[Dependency] private readonly ISharedChatManager _chat = default!;
@@ -1321,7 +1323,7 @@ namespace Content.Shared.Interaction
if (wearer == user)
return true;
if (slotDef.StripHidden)
if (_strippable.IsStripHidden(slotDef, user))
return false;
return InRangeUnobstructed(user, wearer) && _containerSystem.IsInSameOrParentContainer(user, wearer);