From 7702e334d77add0da1af51a057cde1539c3593df Mon Sep 17 00:00:00 2001
From: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
Date: Sat, 10 Dec 2022 16:00:04 -0500
Subject: [PATCH] fix ripley grabber bugs (#12962)

---
 .../Mech/Equipment/EntitySystems/MechGrabberSystem.cs        | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Content.Server/Mech/Equipment/EntitySystems/MechGrabberSystem.cs b/Content.Server/Mech/Equipment/EntitySystems/MechGrabberSystem.cs
index 2cffe2c41f..a225334532 100644
--- a/Content.Server/Mech/Equipment/EntitySystems/MechGrabberSystem.cs
+++ b/Content.Server/Mech/Equipment/EntitySystems/MechGrabberSystem.cs
@@ -134,6 +134,9 @@ public sealed class MechGrabberSystem : EntitySystem
         if (component.Token != null)
             return;
 
+        if (!_interaction.InRangeUnobstructed(args.User, args.Target.Value))
+            return;
+
         args.Handled = true;
         component.Token = new();
         component.AudioStream = _audio.PlayPvs(component.GrabSound, uid);
@@ -142,7 +145,7 @@ public sealed class MechGrabberSystem : EntitySystem
             BreakOnTargetMove = true,
             BreakOnUserMove = true,
             UsedFinishedEvent = new MechGrabberGrabFinishedEvent(args.Target.Value),
-            UserCancelledEvent = new MechGrabberGrabCancelledEvent()
+            UsedCancelledEvent = new MechGrabberGrabCancelledEvent()
         });
     }