mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-30 16:47:13 +01:00
[MIRROR] fixes revolvers losing ammo capacity when you load in ammo [MDB IGNORE] (#22762)
* fixes revolvers losing ammo capacity when you load in ammo (#77157) ## About The Pull Request fixes https://github.com/tgstation/tgstation/issues/76681 Unfortunately, for revolvers, chambered is whatever is first on the list of stored_ammo rather than that ammo being removed from the magazine. If something works like a revolver does, we don't remove chambered from stored_ammo. ## Why It's Good For The Game The way revolvers work is literally so that we can have russian roulette, just so you know. ## Changelog 🆑 fix: Fixes revolvers losing ammo capacity when you reload them. /🆑 * fixes revolvers losing ammo capacity when you load in ammo --------- Co-authored-by: necromanceranne <40847847+necromanceranne@users.noreply.github.com>
This commit is contained in:
co-authored by
necromanceranne
parent
f869263f18
commit
99ca73c687
@@ -377,7 +377,8 @@
|
||||
if (bolt_type == BOLT_TYPE_NO_BOLT || internal_magazine)
|
||||
if (chambered && !chambered.loaded_projectile)
|
||||
chambered.forceMove(drop_location())
|
||||
magazine?.stored_ammo -= chambered
|
||||
if(chambered != magazine?.stored_ammo[1])
|
||||
magazine.stored_ammo -= chambered
|
||||
chambered = null
|
||||
var/num_loaded = magazine?.attackby(A, user, params, TRUE)
|
||||
if (num_loaded)
|
||||
|
||||
Reference in New Issue
Block a user