diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.ChamberMagazine.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.ChamberMagazine.cs index 2b82e0051f..04e92e8c1d 100644 --- a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.ChamberMagazine.cs +++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.ChamberMagazine.cs @@ -198,10 +198,11 @@ public abstract partial class SharedGunSystem { // Try to put a new round in if possible. var magEnt = GetMagazineEntity(uid); + var chambered = GetChamberEntity(uid); // Similar to what takeammo does though that uses an optimised version where // multiple bullets may be fired in a single tick. - if (magEnt != null) + if (magEnt != null && chambered == null) { var relayedArgs = new TakeAmmoEvent(1, new List<(EntityUid? Entity, IShootable Shootable)>(),