diff --git a/Content.Client/Weapons/Ranged/Systems/GunSystem.cs b/Content.Client/Weapons/Ranged/Systems/GunSystem.cs index 67d50e3f0d..55d670d054 100644 --- a/Content.Client/Weapons/Ranged/Systems/GunSystem.cs +++ b/Content.Client/Weapons/Ranged/Systems/GunSystem.cs @@ -149,6 +149,15 @@ public sealed partial class GunSystem : SharedGunSystem return; var mousePos = _eyeManager.ScreenToMap(_inputManager.MouseScreenPosition); + + if (mousePos.MapId == MapId.Nullspace) + { + if (gun.ShotCounter != 0) + EntityManager.RaisePredictiveEvent(new RequestStopShootEvent { Gun = gun.Owner }); + + return; + } + EntityCoordinates coordinates; // Bro why would I want a ternary here