]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
revenant can no longer harvest souls while in solid objects (#27612)
authoricekot8 <93311212+icekot8@users.noreply.github.com>
Sat, 11 May 2024 15:04:17 +0000 (18:04 +0300)
committerGitHub <noreply@github.com>
Sat, 11 May 2024 15:04:17 +0000 (11:04 -0400)
meow

Content.Server/Revenant/EntitySystems/RevenantSystem.Abilities.cs

index 68a2624500062df973556e20e8c17331eadf52e2..4106630d526ad551ea0c25bc50ebee56e2ebb730 100644 (file)
@@ -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,