From 4e26be8617d309c49e7127892d0f0cdc56a468b0 Mon Sep 17 00:00:00 2001
From: icekot8 <93311212+icekot8@users.noreply.github.com>
Date: Sat, 11 May 2024 18:04:17 +0300
Subject: [PATCH] revenant can no longer harvest souls while in solid objects
 (#27612)

meow
---
 .../Revenant/EntitySystems/RevenantSystem.Abilities.cs     | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/Content.Server/Revenant/EntitySystems/RevenantSystem.Abilities.cs b/Content.Server/Revenant/EntitySystems/RevenantSystem.Abilities.cs
index 68a2624500..4106630d52 100644
--- a/Content.Server/Revenant/EntitySystems/RevenantSystem.Abilities.cs
+++ b/Content.Server/Revenant/EntitySystems/RevenantSystem.Abilities.cs
@@ -15,6 +15,7 @@ using Content.Shared.Bed.Sleep;
 using System.Linq;
 using System.Numerics;
 using Content.Server.Revenant.Components;
+using Content.Shared.Physics;
 using Content.Shared.DoAfter;
 using Content.Shared.Emag.Systems;
 using Content.Shared.FixedPoint;
@@ -135,6 +136,12 @@ public sealed partial class RevenantSystem
             return;
         }
 
+        if(_physics.GetEntitiesIntersectingBody(uid, (int) CollisionGroup.Impassable).Count > 0)
+        {
+            _popup.PopupEntity(Loc.GetString("revenant-in-solid"), uid, uid);
+            return;
+        }
+
         var doAfter = new DoAfterArgs(EntityManager, uid, revenant.HarvestDebuffs.X, new HarvestEvent(), uid, target: target)
         {
             DistanceThreshold = 2,
-- 
2.51.2