From: Tayrtahn <tayrtahn@gmail.com>
Date: Tue, 30 Jan 2024 01:33:34 +0000 (-0500)
Subject: Stop shift from cancelling follow as ghost (#24715)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=b0bd0689ce538251132f072aadfa7e45ed275389;p=space-station-14.git

Stop shift from cancelling follow as ghost (#24715)

Fixed pressing shift cancelling ghost follow
---

diff --git a/Content.Shared/Follower/FollowerSystem.cs b/Content.Shared/Follower/FollowerSystem.cs
index 41ee215fe2..672f3d6487 100644
--- a/Content.Shared/Follower/FollowerSystem.cs
+++ b/Content.Shared/Follower/FollowerSystem.cs
@@ -4,6 +4,7 @@ using Content.Shared.Follower.Components;
 using Content.Shared.Ghost;
 using Content.Shared.Hands;
 using Content.Shared.Movement.Events;
+using Content.Shared.Movement.Systems;
 using Content.Shared.Physics.Pull;
 using Content.Shared.Tag;
 using Content.Shared.Verbs;
@@ -96,7 +97,8 @@ public sealed class FollowerSystem : EntitySystem
 
     private void OnFollowerMove(EntityUid uid, FollowerComponent component, ref MoveInputEvent args)
     {
-        StopFollowingEntity(uid, component.Following);
+        if ((args.Component.HeldMoveButtons & MoveButtons.AnyDirection) != MoveButtons.None)
+            StopFollowingEntity(uid, component.Following);
     }
 
     private void OnPullStarted(EntityUid uid, FollowerComponent component, PullStartedMessage args)