cmdrunematti/Delta-v
1
0
Fork 0
mirror of https://github.com/DeltaV-Station/Delta-v.git synced 2026-09-29 23:57:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4464 from SirWarock/Fix-Ammo-Counter-on-Shotguns

Browse Source 
Fix Shotgun ammocount not updating (#40568)
This commit is contained in:
William Lemon
2025-10-03 09:51:14 +10:00
committed by GitHub
parent a3b3f0eff4 d660042b2d
commit e7eba6c790
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Ballistic.cs
+4 -1
View File
@@ -58,6 +58,7 @@ public abstract partial class SharedGunSystem
Audio.PlayPredicted(component.SoundInsert, uid, args.User);
args.Handled = true;
UpdateBallisticAppearance(uid, component);
UpdateAmmoCount(args.Target);
DirtyField(uid, component, nameof(BallisticAmmoProviderComponent.Entities));
}
@@ -153,7 +154,9 @@ public abstract partial class SharedGunSystem
Del(ent.Value);
}
// repeat if there is more space in the target and more ammo to fill it
UpdateBallisticAppearance(args.Target.Value, component);
UpdateAmmoCount(args.Target.Value);
// repeat if there is more space in the target and more ammo to fill
var moreSpace = target.Entities.Count + target.UnspawnedCount < target.Capacity;
var moreAmmo = component.Entities.Count + component.UnspawnedCount > 0;
args.Repeat = moreSpace && moreAmmo;