From c86c378198adbdd0faf01458d21ea1737d4e8905 Mon Sep 17 00:00:00 2001
From: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
Date: Fri, 30 Oct 2020 04:52:37 +0100
Subject: [PATCH] Make the context and verb menus visible through walls for
 ghosts (#2415)

---
 Content.Shared/GameObjects/Verbs/SharedVerbSystem.cs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/Content.Shared/GameObjects/Verbs/SharedVerbSystem.cs b/Content.Shared/GameObjects/Verbs/SharedVerbSystem.cs
index 82c5a940e2..6ed33924d4 100644
--- a/Content.Shared/GameObjects/Verbs/SharedVerbSystem.cs
+++ b/Content.Shared/GameObjects/Verbs/SharedVerbSystem.cs
@@ -5,6 +5,7 @@ using System.Linq;
 using Content.Shared.Physics;
 using Content.Shared.Utility;
 using Robust.Shared.GameObjects;
+using Robust.Shared.GameObjects.Components.Eye;
 using Robust.Shared.GameObjects.Systems;
 using Robust.Shared.Interfaces.GameObjects;
 using Robust.Shared.Map;
@@ -46,7 +47,11 @@ namespace Content.Shared.GameObjects.Verbs
                        !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)
             {