cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2025-12-10 01:34:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes revolver reloading, again (#91414)

Browse Source 
## About The Pull Request

Closes #91110, broke due to lazyloaded bullets being considered empty

This needs a unit test, maybe will write one later in a separate PR

## Changelog
🆑
fix: Fixed revolver reloading, again
/🆑
This commit is contained in:
SmArtKar
2025-06-01 19:23:46 +02:00
committed by Roxy
parent 69a8cdf166
commit 0bcbe8767d
2 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/projectiles/boxes_magazines/internal/_cylinder.dm
View File

@@ -44,7 +44,7 @@
for(var/i in 1 to stored_ammo.len) for(var/i in 1 to stored_ammo.len)
var/obj/item/ammo_casing/bullet = stored_ammo[i] var/obj/item/ammo_casing/bullet = stored_ammo[i]
if (istype(bullet) && bullet.loaded_projectile) if (!istype(bullet) || bullet.loaded_projectile)
continue continue
// found a spent ammo // found a spent ammo
stored_ammo[i] = R stored_ammo[i] = R

2
code/modules/projectiles/guns/ballistic/revolver.dm
View File

@@ -21,7 +21,6 @@
if(.) if(.)
last_fire = world.time last_fire = world.time
/obj/item/gun/ballistic/revolver/chamber_round(spin_cylinder = TRUE, replace_new_round) /obj/item/gun/ballistic/revolver/chamber_round(spin_cylinder = TRUE, replace_new_round)
if(!magazine) //if it mag was qdel'd somehow. if(!magazine) //if it mag was qdel'd somehow.
CRASH("revolver tried to chamber a round without a magazine!") CRASH("revolver tried to chamber a round without a magazine!")
@@ -58,7 +57,6 @@
if(play_click) if(play_click)
playsound(src, 'sound/items/weapons/gun/general/ballistic_click.ogg', fire_sound_volume, vary_fire_sound, frequency = click_frequency_to_use) playsound(src, 'sound/items/weapons/gun/general/ballistic_click.ogg', fire_sound_volume, vary_fire_sound, frequency = click_frequency_to_use)
/obj/item/gun/ballistic/revolver/verb/spin() /obj/item/gun/ballistic/revolver/verb/spin()
set name = "Spin Chamber" set name = "Spin Chamber"
set category = "Object" set category = "Object"