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

feat: allow admins to interact under subfloors (#38813)

Browse Source 
* feat: allow admins to interact under subfloors

* feat: use BypassInteractionChecks instead
This commit is contained in:
Perry Fraser
2025-07-10 07:14:37 -04:00
committed by GitHub
parent 9b85def0a7
commit decaa58dfe
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Content.Shared/SubFloor/SharedSubFloorHideSystem.cs
View File

@@ -2,6 +2,7 @@ using Content.Shared.Audio;
using Content.Shared.Construction.Components; using Content.Shared.Construction.Components;
using Content.Shared.Explosion; using Content.Shared.Explosion;
using Content.Shared.Eye; using Content.Shared.Eye;
using Content.Shared.Interaction.Components;
using Content.Shared.Interaction.Events; using Content.Shared.Interaction.Events;
using Content.Shared.Maps; using Content.Shared.Maps;
using Content.Shared.Popups; using Content.Shared.Popups;
@@ -83,6 +84,10 @@ namespace Content.Shared.SubFloor
private void OnInteractionAttempt(EntityUid uid, SubFloorHideComponent component, ref GettingInteractedWithAttemptEvent args) private void OnInteractionAttempt(EntityUid uid, SubFloorHideComponent component, ref GettingInteractedWithAttemptEvent args)
{ {
// Allow admins (e.g., mappers/aghosts) to twiddle with stuff under subfloors
if (HasComp<BypassInteractionChecksComponent>(args.Uid))
return;
// No interactions with entities hidden under floor tiles. // No interactions with entities hidden under floor tiles.
if (component.BlockInteractions && component.IsUnderCover) if (component.BlockInteractions && component.IsUnderCover)
args.Cancelled = true; args.Cancelled = true;