From ceebf2de403aa1627358e88216af24f165ac5b98 Mon Sep 17 00:00:00 2001 From: AnturK Date: Tue, 25 Sep 2018 11:27:00 +0200 Subject: [PATCH] Fixes bullet stuff. (#40467) --- code/modules/projectiles/boxes_magazines/_box_magazine.dm | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/code/modules/projectiles/boxes_magazines/_box_magazine.dm b/code/modules/projectiles/boxes_magazines/_box_magazine.dm index 2202bd024f2..b1b50dc1dcb 100644 --- a/code/modules/projectiles/boxes_magazines/_box_magazine.dm +++ b/code/modules/projectiles/boxes_magazines/_box_magazine.dm @@ -125,12 +125,9 @@ //Behavior for magazines /obj/item/ammo_box/magazine/proc/ammo_count(countempties = TRUE) - if(countempties) - return stored_ammo.len - var/boolets = 0 for(var/obj/item/ammo_casing/bullet in stored_ammo) - if(bullet && bullet.BB) + if(bullet && (bullet.BB || countempties)) boolets++ return boolets