diff --git a/Content.Client/MouseRotator/MouseRotatorSystem.cs b/Content.Client/MouseRotator/MouseRotatorSystem.cs index 18d60d9a7b9..5b3eaff3e93 100644 --- a/Content.Client/MouseRotator/MouseRotatorSystem.cs +++ b/Content.Client/MouseRotator/MouseRotatorSystem.cs @@ -1,4 +1,5 @@ using Content.Shared.MouseRotator; +using Content.Shared.Mech.Components; using Robust.Client.Graphics; using Robust.Client.Input; using Robust.Client.Player; @@ -24,6 +25,11 @@ public override void Update(float frameTime) return; var player = _player.LocalEntity; + + if (TryComp(player, out var mechComponent)) + { + player = mechComponent.PilotSlot.ContainedEntity; + } if (player == null || !TryComp(player, out var rotator)) return;