Changes

monkestation/code/modules/gauntlet/gauntlet.dm

@@ -883,6 +883,7 @@ GLOBAL_VAR_INIT(telescroll_time, 0)
 	name = "Badmin Stone Pinpointer"
 
 /atom/movable/screen/alert/status_effect/agent_pinpointer/gauntlet/Click()
+	. = ..()
 	var/mob/living/living_user = usr
 	if(!living_user || !istype(living_user))
 		return

monkestation/code/modules/gauntlet/ghost.dm

@@ -148,29 +148,29 @@
 	background_icon_state = "ghost"
 	cooldown_time = 20 SECONDS
 
-/datum/action/cooldown/spell/pointed/infinity/chariot/InterceptClickOn(mob/living/caller, params, atom/target)
+/datum/action/cooldown/spell/pointed/infinity/chariot/InterceptClickOn(mob/living/user, params, atom/target)
 	. = ..()
 	if(!.)
 		return FALSE
-	if(!caller.Adjacent(target))
-		to_chat(caller, span_notice("You need to be next to the target!"))
+	if(!user.Adjacent(target))
+		to_chat(user, span_notice("You need to be next to the target!"))
 		return FALSE
 	if(!isliving(target))
-		to_chat(caller, span_notice("That doesn't even have a soul."))
+		to_chat(user, span_notice("That doesn't even have a soul."))
 		return FALSE
 	var/mob/living/living_target = target
 	if(living_target.stat == DEAD)
-		to_chat(caller, span_notice("That's dead, stupid."))
+		to_chat(user, span_notice("That's dead, stupid."))
 		return FALSE
 	if(living_target.stat != UNCONSCIOUS)
-		to_chat(caller, span_notice("That's not unconscious."))
+		to_chat(user, span_notice("That's not unconscious."))
 		return FALSE
 	if(locate(/obj/item/badmin_stone) in living_target.get_all_contents())
-		to_chat(caller, span_notice("Something stops you from using The Chariot on that..."))
+		to_chat(user, span_notice("Something stops you from using The Chariot on that..."))
 		return FALSE
-	log_game("[living_target] was kicked out of their body by The Chariot (user: [caller])")
+	log_game("[living_target] was kicked out of their body by The Chariot (user: [user])")
 	to_chat(living_target, span_bolddanger("You feel your very soul detach from your body..."))
-	to_chat(caller, span_boldnotice("You weave [living_target]'s soul in a way that it's open for the spirits to take..."))
+	to_chat(user, span_boldnotice("You weave [living_target]'s soul in a way that it's open for the spirits to take..."))
 	offer_control(living_target, FALSE)
 	return TRUE
 
@@ -271,22 +271,22 @@
 	cooldown_time = 90 SECONDS
 	var/list/clowns = list()
 
-/datum/action/cooldown/spell/pointed/infinity/clown_rise_up/InterceptClickOn(mob/living/caller, params, atom/target)
+/datum/action/cooldown/spell/pointed/infinity/clown_rise_up/InterceptClickOn(mob/living/user, params, atom/target)
 	. = ..()
 	if(!.)
 		return FALSE
 	if(ishuman(target))
-		var/mob/living/carbon/human/clown = clowns[caller]
+		var/mob/living/carbon/human/clown = clowns[user]
 		if(istype(clown) && clown && !clown.stat >= HARD_CRIT)
-			to_chat(caller, span_danger("You still have a magical cluwne alive."))
+			to_chat(user, span_danger("You still have a magical cluwne alive."))
 			return FALSE
 		var/mob/living/carbon/human/human_target = target
 		if(human_target.stat != DEAD && human_target.stat == HARD_CRIT)
-			to_chat(caller, span_danger("They aren't dead enough yet."))
+			to_chat(user, span_danger("They aren't dead enough yet."))
 			return FALSE
 		human_target.revive(TRUE, TRUE)
-		clowns[caller] = human_target
-		human_target.mind.add_memory("[caller] is your master. Follow their orders at all costs.")
+		clowns[user] = human_target
+		human_target.mind.add_memory("[user] is your master. Follow their orders at all costs.")
 		var/datum/action/cooldown/spell/jaunt/bloodcrawl/clown_bloodcrawl = new
 		var/datum/action/cooldown/spell/jaunt/ethereal_jaunt/infinity_clown/clown_jaunt = new
 		var/datum/action/cooldown/spell/blink/infinity_clown/clown_blink = new
@@ -302,7 +302,7 @@
 		if(human_target.dropItemToGround(human_target_mask))
 			human_target.equip_to_slot_if_possible(new /obj/item/clothing/mask/gas/clown_hat, ITEM_SLOT_MASK)
 		human_target.visible_message(span_danger("[human_target] struggles back up, now a clown!"))
-		to_chat(human_target, span_userdanger("You are risen from the dead as a clown. [caller] is your master. Follow their orders at all costs."))
+		to_chat(human_target, span_userdanger("You are risen from the dead as a clown. [user] is your master. Follow their orders at all costs."))
 
 /datum/action/cooldown/spell/conjure_item/spellpacket/sandmans_dust
 	name = "Ghost Stone: Sandman's Dust"

monkestation/code/modules/gauntlet/supermatter.dm

@@ -102,7 +102,7 @@
 	background_icon = 'monkestation/icons/obj/infinity.dmi'
 	background_icon_state = "sm"
 
-/datum/action/cooldown/spell/pointed/infinity/delamination/InterceptClickOn(mob/living/caller, params, atom/target)
+/datum/action/cooldown/spell/pointed/infinity/delamination/InterceptClickOn(mob/living/user, params, atom/target)
 	. = ..()
 	if(!.)
 		return FALSE
@@ -112,10 +112,10 @@
 	if(locate(/obj/item/badmin_stone) in living_target.get_all_contents())
 		living_target.visible_message(span_bolddanger("[living_target] resists an unseen force!"))
 		return TRUE
-	if(!caller.Adjacent(living_target))
-		to_chat(caller, span_notice("They're too far away!"))
+	if(!user.Adjacent(living_target))
+		to_chat(user, span_notice("They're too far away!"))
 		return FALSE
-	if(do_after(caller, 30, target = living_target))
+	if(do_after(user, 30, target = living_target))
 		living_target.visible_message(span_bolddanger("[living_target] seems a bit hot..."), span_userdanger("You feel like you'll explode any second!"))
 		addtimer(CALLBACK(GLOBAL_PROC, PROC_REF(explosion), living_target, 0, 0, 2, 3, 3, FALSE), 150)
 	return TRUE