Merge branch 'master' into development

code/modules/projectiles/guns/energy/magic.dm

@@ -18,6 +18,8 @@
 	charge_meter = 0
 	pin = /obj/item/device/firing_pin/magic
 
+/obj/item/weapon/gun/energy/staff/emp_act(severity) // to prevent it from breaking.
+	return
 
 obj/item/weapon/gun/energy/staff/special_check(var/mob/living/user)
 	if(HULK in user.mutations)

code/modules/projectiles/guns/energy/special.dm

@@ -453,6 +453,7 @@
 					)
 	is_charging = 1
 	if(!do_after(user, 40))
+		is_charging = FALSE
 		return 0
 	is_charging = 0
 	if(!istype(user.get_active_hand(), src))