diff --git a/Content.Server/GameObjects/Components/Weapon/Ranged/RangedWeapon.cs b/Content.Server/GameObjects/Components/Weapon/Ranged/RangedWeapon.cs index fe03f74eb8..b7df63fd0c 100644 --- a/Content.Server/GameObjects/Components/Weapon/Ranged/RangedWeapon.cs +++ b/Content.Server/GameObjects/Components/Weapon/Ranged/RangedWeapon.cs @@ -1,4 +1,5 @@ using System; +using Content.Server.GameObjects.Components.Mobs; using Content.Shared.GameObjects.Components.Weapons.Ranged; using Robust.Server.Interfaces.Player; using Robust.Shared.GameObjects; @@ -66,6 +67,10 @@ namespace Content.Server.GameObjects.Components.Weapon.Ranged return; } + if(!user.TryGetComponent(out CombatModeComponent combat) || !combat.IsInCombatMode) { + return; + } + if (!UserCanFire(user) || !WeaponCanFire()) { return;