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

Allow ghosts to ignore obstructions (#8397)

Browse Source
This commit is contained in:
Leon Friedrich
2022-05-28 13:46:17 +12:00
committed by GitHub
parent 01763bd897
commit d3844fdf7a
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4,6 +4,7 @@ using Content.Shared.ActionBlocker;
using Content.Shared.Administration.Logs;
using Content.Shared.CombatMode;
using Content.Shared.Database;
using Content.Shared.Ghost;
using Content.Shared.Hands.Components;
using Content.Shared.Input;
using Content.Shared.Interaction.Components;
@@ -149,7 +150,7 @@ namespace Content.Shared.Interaction
return true;
}
UserInteraction(user.Value, coords, uid, altInteract: true);
UserInteraction(user.Value, coords, uid, altInteract: true, checkAccess: ShouldCheckAccess(user.Value));
return false;
}
@@ -163,11 +164,18 @@ namespace Content.Shared.Interaction
return true;
}
UserInteraction(userEntity.Value, coords, !Deleted(uid) ? uid : null);
UserInteraction(userEntity.Value, coords, !Deleted(uid) ? uid : null, checkAccess: ShouldCheckAccess(userEntity.Value));
return false;
}
private bool ShouldCheckAccess(EntityUid user)
{
// This is for Admin/mapping convenience. If ever there are other ghosts that can still interact, this check
// might need to be more selective.
return !HasComp<SharedGhostComponent>(user);
}
/// <summary>
/// Resolves user interactions with objects.
/// </summary>
@@ -669,7 +677,7 @@ namespace Content.Shared.Interaction
if (Deleted(uid))
return false;
InteractionActivate(user.Value, uid);
InteractionActivate(user.Value, uid, checkAccess: ShouldCheckAccess(user.Value));
return false;
}