From 92ab30b165b4809207977dac5491d4cf25e8672c Mon Sep 17 00:00:00 2001 From: Dave Date: Mon, 16 Sep 2019 03:03:01 -0400 Subject: [PATCH] There's a new sheriff of magic town --- code/modules/projectiles/guns/magic.dm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/code/modules/projectiles/guns/magic.dm b/code/modules/projectiles/guns/magic.dm index 75f94dd83d0..c2dc67f5773 100644 --- a/code/modules/projectiles/guns/magic.dm +++ b/code/modules/projectiles/guns/magic.dm @@ -23,7 +23,6 @@ righthand_file = 'icons/mob/inhands/items_righthand.dmi' /obj/item/gun/magic/afterattack(atom/target, mob/living/user, flag) - newshot() if(no_den_usage) var/area/A = get_area(user) if(istype(A, /area/wizard_station)) @@ -37,10 +36,14 @@ return charges /obj/item/gun/magic/newshot(params) - if(charges && chambered) + if(charges && chambered && !chambered.BB) chambered.newshot(params) return +/obj/item/gun/magic/process_fire() + newshot() + return ..() + /obj/item/gun/magic/process_chamber() if(chambered && !chambered.BB) //if BB is null, i.e the shot has been fired... charges--//... drain a charge