From 4cd29c350a1d9219cd7a061ad57631938c240465 Mon Sep 17 00:00:00 2001
From: BramvanZijp <bramvanzijp@gmail.com>
Date: Wed, 11 Mar 2026 13:11:11 +0100
Subject: [PATCH 1/2] Prevent people from breaking out of grabs while stunned.

---
 Content.Shared/Stunnable/SharedStunSystem.cs | 22 ++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/Content.Shared/Stunnable/SharedStunSystem.cs b/Content.Shared/Stunnable/SharedStunSystem.cs
index fac1348cca3..77d4e315d37 100644
--- a/Content.Shared/Stunnable/SharedStunSystem.cs
+++ b/Content.Shared/Stunnable/SharedStunSystem.cs
@@ -95,6 +95,12 @@
 using Robust.Shared.Prototypes;
 using Robust.Shared.Timing;
 
+
+using Content.Shared.Movement.Pulling.Systems;
+using Content.Shared.Pulling.Events;
+using Content.Shared.Movement.Pulling.Components;
+using Content.Shared.Movement.Pulling.Events;
+
 namespace Content.Shared.Stunnable;
 
 public abstract partial class SharedStunSystem : EntitySystem
@@ -134,6 +140,7 @@ public override void Initialize()
         SubscribeLocalEvent<StunnedComponent, PickupAttemptEvent>(OnAttempt);
         SubscribeLocalEvent<StunnedComponent, IsEquippingAttemptEvent>(OnEquipAttempt);
         SubscribeLocalEvent<StunnedComponent, IsUnequippingAttemptEvent>(OnUnequipAttempt);
+        SubscribeLocalEvent<StunnedComponent, AttemptStopPullingEvent>(HandleStopPull);
         SubscribeLocalEvent<MobStateComponent, MobStateChangedEvent>(OnMobStateChanged);
 
         // New Status Effect subscriptions
@@ -520,5 +527,20 @@ private void OnUnequipAttempt(EntityUid uid, StunnedComponent stunned, IsUnequip
             args.Cancel();
     }
 
+    
+    private void HandleStopPull(EntityUid uid, StunnedComponent stunned, ref AttemptStopPullingEvent args)
+    {
+        if (args.User == null || !Exists(args.User.Value))
+            return;
+
+        if (args.User.Value == uid)
+        {
+            //TODO: UX feedback. Simply blocking the normal interaction feels like an interface bug
+
+            args.Cancelled = true;
+        }
+
+    }
+
     #endregion
 }

From ba49d33dc14a780fe8ab8481941edcb39ebf75b4 Mon Sep 17 00:00:00 2001
From: BramvanZijp <bramvanzijp@gmail.com>
Date: Wed, 11 Mar 2026 13:14:24 +0100
Subject: [PATCH 2/2] Get rid of un-needed newlines.

---
 Content.Shared/Stunnable/SharedStunSystem.cs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/Content.Shared/Stunnable/SharedStunSystem.cs b/Content.Shared/Stunnable/SharedStunSystem.cs
index 77d4e315d37..955a85b7524 100644
--- a/Content.Shared/Stunnable/SharedStunSystem.cs
+++ b/Content.Shared/Stunnable/SharedStunSystem.cs
@@ -94,8 +94,6 @@
 using Content.Shared.StatusEffect;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Timing;
-
-
 using Content.Shared.Movement.Pulling.Systems;
 using Content.Shared.Pulling.Events;
 using Content.Shared.Movement.Pulling.Components;