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

Jump to bottom

Prevent pulling when teleporting #33252

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
+17 −0
Open

Prevent pulling when teleporting #33252

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
29fb092
No more teleporting pulling
thetolbean Nov 11, 2024
a412543
Merge branch 'space-wizards:master' into tele-drag
thetolbean Nov 11, 2024
abed9cf
pulled dash
thetolbean Nov 11, 2024
b052e7a
Merge remote-tracking branch 'origin/tele-drag' into tele-drag
thetolbean Nov 11, 2024
0e8163a
Update Content.Shared/Ninja/Systems/DashAbilitySystem.cs
thetolbean Nov 11, 2024
0c0c9b3
Update Content.Server/Implants/SubdermalImplantSystem.cs
thetolbean Nov 11, 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
4 changes: 4 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 @@ -109,6 +109,10 @@ private void OnScramImplant(EntityUid uid, SubdermalImplantComponent component,
if (TryComp<PullableComponent>(ent, out var pull) && _pullingSystem.IsPulled(ent, pull))
_pullingSystem.TryStopPull(ent, pull);

// Check if the user is pulling anything, and drop it if so
if (TryComp<PullerComponent>(ent, out var puller) && TryComp<PullableComponent>(puller.Pulling, out var pullable))
_pullingSystem.TryStopPull(puller.Pulling.Value, pullable);

var xform = Transform(ent);
var targetCoords = SelectRandomTileInRange(xform, implant.TeleportRadius);

Expand Down
13 changes: 13 additions & 0 deletions Content.Shared/Ninja/Systems/DashAbilitySystem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
using Content.Shared.Actions;
using Content.Shared.Charges.Components;
using Content.Shared.Charges.Systems;
using Content.Shared.Hands.Components;
using Content.Shared.Hands.EntitySystems;
using Content.Shared.Interaction;
using Content.Shared.Movement.Pulling.Components;
using Content.Shared.Movement.Pulling.Events;
using Content.Shared.Movement.Pulling.Systems;
using Content.Shared.Ninja.Components;
using Content.Shared.Popups;
using Content.Shared.Examine;
Expand All @@ -22,6 +26,7 @@ public sealed class DashAbilitySystem : EntitySystem
[Dependency] private readonly SharedHandsSystem _hands = default!;
[Dependency] private readonly ExamineSystemShared _examine = default!;
[Dependency] private readonly SharedPopupSystem _popup = default!;
[Dependency] private readonly PullingSystem _pullingSystem = default!;
[Dependency] private readonly SharedTransformSystem _transform = default!;

public override void Initialize()
Expand Down Expand Up @@ -80,6 +85,14 @@ private void OnDash(Entity<DashAbilityComponent> ent, ref DashEvent args)
return;
}

// Check if the user is BEING pulled, and escape if so
if (TryComp<PullableComponent>(user, out var pull) && _pullingSystem.IsPulled(user, pull))
_pullingSystem.TryStopPull(user, pull);

// Check if the user is pulling anything, and drop it if so
if (TryComp<PullerComponent>(user, out var puller) && TryComp<PullableComponent>(puller.Pulling, out var pullable))
_pullingSystem.TryStopPull(puller.Pulling.Value, pullable);

var xform = Transform(user);
_transform.SetCoordinates(user, xform, args.Target);
_transform.AttachToGridOrMap(user, xform);
Expand Down
Loading