ctrl-rclick tweaks (#7170)

Content.Shared/Pulling/Systems/SharedPullingSystem.cs

@@ -4,6 +4,7 @@ using System.Diagnostics.CodeAnalysis;
 using Content.Shared.Alert;
 using Content.Shared.GameTicking;
 using Content.Shared.Input;
+using Content.Shared.Movement.Components;
 using Content.Shared.Physics.Pull;
 using Content.Shared.Pulling.Components;
 using Content.Shared.Rotatable;
@@ -33,9 +34,6 @@ namespace Content.Shared.Pulling
         private readonly Dictionary<EntityUid, EntityUid> _pullers =
             new();
 
-        private readonly HashSet<SharedPullableComponent> _moving = new();
-        private readonly HashSet<SharedPullableComponent> _stoppedMoving = new();
-
         /// <summary>
         ///     If distance between puller and pulled entity lower that this threshold,
         ///     pulled entity will not change its rotation.
@@ -51,8 +49,6 @@ namespace Content.Shared.Pulling
         /// </summary>
         private const float ThresholdRotAngle = 22.5f;
 
-        public IReadOnlySet<SharedPullableComponent> Moving => _moving;
-
         public override void Initialize()
         {
             base.Initialize();
@@ -106,7 +102,7 @@ namespace Content.Shared.Pulling
         {
             if (args.Pulled.Owner != uid)
                 return;
-            
+
             _alertsSystem.ShowAlert(component.Owner, AlertType.Pulled);
         }
 
@@ -118,19 +114,9 @@ namespace Content.Shared.Pulling
             _alertsSystem.ClearAlert(component.Owner, AlertType.Pulled);
         }
 
-        public override void Update(float frameTime)
-        {
-            base.Update(frameTime);
-
-            _moving.ExceptWith(_stoppedMoving);
-            _stoppedMoving.Clear();
-        }
-
         public void Reset(RoundRestartCleanupEvent ev)
         {
             _pullers.Clear();
-            _moving.Clear();
-            _stoppedMoving.Clear();
         }
 
         private void OnPullStarted(PullStartedMessage message)
@@ -143,16 +129,6 @@ namespace Content.Shared.Pulling
             RemovePuller(message.Puller.Owner);
         }
 
-        protected void OnPullableMove(EntityUid uid, SharedPullableComponent component, PullableMoveMessage args)
-        {
-            _moving.Add(component);
-        }
-
-        protected void OnPullableStopMove(EntityUid uid, SharedPullableComponent component, PullableStopMovingMessage args)
-        {
-            _stoppedMoving.Add(component);
-        }
-
         private void PullerMoved(ref MoveEvent ev)
         {
             var puller = ev.Sender;
@@ -217,6 +193,9 @@ namespace Content.Shared.Pulling
                 return false;
             }
 
+            // No leverage until this is tweaked more
+            if (player.IsWeightless(entityManager: EntityManager)) return false;
+
             TryMoveTo(pullable, coords);
 
             return false;