diff --git a/Content.Shared/Interaction/SharedInteractionSystem.cs b/Content.Shared/Interaction/SharedInteractionSystem.cs index 35bfbe0c7f..de496a46ab 100644 --- a/Content.Shared/Interaction/SharedInteractionSystem.cs +++ b/Content.Shared/Interaction/SharedInteractionSystem.cs @@ -17,6 +17,7 @@ using Content.Shared.Inventory.Events; using Content.Shared.Item; using Content.Shared.Movement.Components; using Content.Shared.Movement.Pulling.Systems; +using Content.Shared.Movement.Systems; using Content.Shared.Physics; using Content.Shared.Players.RateLimiting; using Content.Shared.Popups; @@ -568,8 +569,11 @@ namespace Content.Shared.Interaction if (_transform.GetMapId(coordinates) != Transform(user).MapID) return false; - if (!HasComp(user)) + // Only rotate to face if they're not moving. + if (!HasComp(user) && (!TryComp(user, out InputMoverComponent? mover) || (mover.HeldMoveButtons & MoveButtons.AnyDirection) == 0x0)) + { _rotateToFaceSystem.TryFaceCoordinates(user, _transform.ToMapCoordinates(coordinates).Position); + } return true; }