content

code/datums/dash_weapon.dm

@@ -6,7 +6,6 @@
 	var/current_charges = 1
 	var/max_charges = 1
 	var/charge_rate = 250
-	var/mob/living/carbon/human/holder
 	var/obj/item/dashing_item
 	var/dash_sound = 'sound/magic/blink.ogg'
 	var/recharge_sound = 'sound/magic/charge.ogg'
@@ -17,7 +16,6 @@
 /datum/action/innate/dash/Grant(mob/user, obj/dasher)
 	. = ..()
 	dashing_item = dasher
-	holder = user
 
 /datum/action/innate/dash/IsAvailable(silent = FALSE)
 	if(current_charges > 0)
@@ -26,7 +24,7 @@
 		return FALSE
 
 /datum/action/innate/dash/Activate()
-	dashing_item.attack_self(holder) //Used to toggle dash behavior in the dashing item
+	dashing_item.attack_self(owner) //Used to toggle dash behavior in the dashing item
 
 /datum/action/innate/dash/proc/Teleport(mob/user, atom/target)
 	if(!IsAvailable())
@@ -38,12 +36,12 @@
 			var/obj/spot2 = new phasein(get_turf(user), user.dir)
 			spot1.Beam(spot2,beam_effect,time=20)
 			current_charges--
-		holder.update_action_buttons_icon()
+		owner.update_action_buttons_icon()
 		addtimer(CALLBACK(src, PROC_REF(charge)), charge_rate)
 
 /datum/action/innate/dash/proc/charge()
 	current_charges = clamp(current_charges + 1, 0, max_charges)
-	holder.update_action_buttons_icon()
+	owner.update_action_buttons_icon()
 	if(recharge_sound)
 		playsound(dashing_item, recharge_sound, 50, 1)
-	to_chat(holder, "<span class='notice'>[src] now has [current_charges]/[max_charges] charges.</span>")
+	to_chat(owner, "<span class='notice'>[src] now has [current_charges]/[max_charges] charges.</span>")