Revert "12/21 modernizations from TG live"

code/modules/projectiles/guns/magic.dm

@@ -6,7 +6,7 @@
 	item_state = "staff"
 	fire_sound = 'sound/weapons/emitter.ogg'
 	flags =  CONDUCT
-	w_class = WEIGHT_CLASS_HUGE
+	w_class = 5
 	var/max_charges = 6
 	var/charges = 0
 	var/recharge_rate = 4
@@ -23,6 +23,7 @@
 	righthand_file = 'icons/mob/inhands/items_righthand.dmi'
 
 /obj/item/weapon/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))
@@ -35,14 +36,15 @@
 /obj/item/weapon/gun/magic/can_shoot()
 	return charges
 
-/obj/item/weapon/gun/magic/recharge_newshot()
-	if (charges && chambered && !chambered.BB)
+/obj/item/weapon/gun/magic/newshot()
+	if (charges && chambered)
 		chambered.newshot()
+	return
 
 /obj/item/weapon/gun/magic/process_chamber()
 	if(chambered && !chambered.BB) //if BB is null, i.e the shot has been fired...
 		charges--//... drain a charge
-		recharge_newshot()
+	return
 
 /obj/item/weapon/gun/magic/New()
 	..()
@@ -64,8 +66,6 @@
 		return 0
 	charge_tick = 0
 	charges++
-	if(charges == 1)
-		recharge_newshot()
 	return 1
 
 /obj/item/weapon/gun/magic/update_icon()
@@ -73,14 +73,9 @@
 
 /obj/item/weapon/gun/magic/shoot_with_empty_chamber(mob/living/user as mob|obj)
 	user << "<span class='warning'>The [name] whizzles quietly.<span>"
+	return
 
 /obj/item/weapon/gun/magic/suicide_act(mob/user)
-	user.visible_message("<span class='suicide'>[user] is twisting [src] above [user.p_their()] head, releasing a magical blast! It looks like [user.p_theyre()] trying to commit suicide!</span>")
+	user.visible_message("<span class='suicide'>[user] is twisting the [src.name] above \his head, releasing a magical blast! It looks like \he's trying to commit suicide.</span>")
 	playsound(loc, fire_sound, 50, 1, -1)
-	return (FIRELOSS)
-
-/obj/item/weapon/gun/magic/vv_edit_var(var_name, var_value)
-	. = ..()
-	switch (var_name)
-		if ("charges")
-			recharge_newshot()
+	return (FIRELOSS)