Merge remote-tracking branch 'upstream/master' into universal-damage

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