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

Make the context and verb menus visible through walls for ghosts (#2415)

Browse Source
This commit is contained in:
DrSmugleaf
2020-10-30 04:52:37 +01:00
committed by GitHub
parent 097bde6ded
commit c86c378198
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Content.Shared/GameObjects/Verbs/SharedVerbSystem.cs
View File

@@ -5,6 +5,7 @@ using System.Linq;
using Content.Shared.Physics; using Content.Shared.Physics;
using Content.Shared.Utility; using Content.Shared.Utility;
using Robust.Shared.GameObjects; using Robust.Shared.GameObjects;
using Robust.Shared.GameObjects.Components.Eye;
using Robust.Shared.GameObjects.Systems; using Robust.Shared.GameObjects.Systems;
using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.GameObjects;
using Robust.Shared.Map; using Robust.Shared.Map;
@@ -46,7 +47,11 @@ namespace Content.Shared.GameObjects.Verbs
!occluder.Enabled; !occluder.Enabled;
} }
var result = player.InRangeUnobstructed(targetPos, distance, CollisionGroup.Opaque, Ignored); var mask = player.TryGetComponent(out SharedEyeComponent? eye) && eye.DrawFov
? CollisionGroup.Opaque
: CollisionGroup.None;
var result = player.InRangeUnobstructed(targetPos, distance, mask, Ignored);
if (!result) if (!result)
{ {