Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix scram! implant keeping you pulled to someone when teleporting you #26309

Merged
merged 2 commits into from
Mar 21, 2024
Merged

Fix scram! implant keeping you pulled to someone when teleporting you #26309

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
86528ec
Fix scram! implant keeping you pulled to someone when teleporting you
nikthechampiongr Mar 21, 2024
c8f59f0
Exorcise sleep deprivation speak
nikthechampiongr Mar 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions Content.Server/Implants/SubdermalImplantSystem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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;

Expand Down Expand Up @@ -98,6 +101,10 @@ private void OnScramImplant(EntityUid uid, SubdermalImplantComponent component,
if (!TryComp<ScramImplantComponent>(uid, out var implant))
return;

// If we do not stop pulling then if the user is cuffed they will teleport they will be teleporter with their captor.
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, _xform);

Expand Down
Loading