tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Closing bolt no longer removes cartridge (#19251)

Browse Source
This commit is contained in:
Volodius
2023-08-20 14:32:19 +03:00
committed by GitHub
parent e467f2b556
commit 59cdcd0fe3
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.ChamberMagazine.cs
View File

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