From 8149f1c104c1263d67bcdde0da4819251586fb35 Mon Sep 17 00:00:00 2001
From: SimpleStation14 <Unknown>
Date: Mon, 22 Apr 2024 05:48:23 -0400
Subject: [PATCH] Cherry-picked commit eb80d9752e0309f8485478a43bcba6fb15fc3711
 from space-wizards/space-station-14/master

---
 Content.Server/Implants/SubdermalImplantSystem.cs | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/Content.Server/Implants/SubdermalImplantSystem.cs b/Content.Server/Implants/SubdermalImplantSystem.cs
index ac415a04342..11bd8a26483 100644
--- a/Content.Server/Implants/SubdermalImplantSystem.cs
+++ b/Content.Server/Implants/SubdermalImplantSystem.cs
@@ -19,6 +19,8 @@
 using Robust.Shared.Physics.Components;
 using Robust.Shared.Random;
 using System.Numerics;
+using Content.Shared.Movement.Pulling.Components;
+using Content.Shared.Movement.Pulling.Systems;
 
 namespace Content.Server.Implants;
 
@@ -34,6 +36,7 @@ public sealed class SubdermalImplantSystem : SharedSubdermalImplantSystem
     [Dependency] private readonly SharedPopupSystem _popup = default!;
     [Dependency] private readonly SharedTransformSystem _xform = default!;
     [Dependency] private readonly ForensicsSystem _forensicsSystem = default!;
+    [Dependency] private readonly PullingSystem _pullingSystem = default!;
 
     private EntityQuery<PhysicsComponent> _physicsQuery;
 
@@ -98,6 +101,11 @@ private void OnScramImplant(EntityUid uid, SubdermalImplantComponent component,
         if (!TryComp<ScramImplantComponent>(uid, out var implant))
             return;
 
+        // We need stop the user from being pulled so they don't just get "attached" with whoever is pulling them.
+        // This can for example happen when the user is cuffed and being pulled.
+        if (TryComp<PullableComponent>(ent, out var pull) && _pullingSystem.IsPulled(ent, pull))
+            _pullingSystem.TryStopPull(ent, pull);
+
         var xform = Transform(ent);
         var entityCoords = xform.Coordinates.ToMap(EntityManager);