OD Fixes (#742)

Author: MrMelbert

code/modules/mob/living/silicon/ai/ai_actions/remote_power.dm

@@ -14,14 +14,14 @@
 	enable_text = span_notice("You prepare to power any APC you see.")
 	disable_text = span_notice("You stop focusing on powering APCs.")
 
-/datum/action/innate/ai/ranged/power_apc/do_ability(mob/living/caller, atom/clicked_on)
+/datum/action/innate/ai/ranged/power_apc/do_ability(mob/living/clicker, atom/clicked_on)
 
-	if (!isAI(caller))
+	if (!isAI(clicker))
 		return FALSE
-	var/mob/living/silicon/ai/ai_caller = caller
+	var/mob/living/silicon/ai/ai_caller = clicker
 
-	if(caller.incapacitated()) // Non-module change
-		unset_ranged_ability(caller)
+	if(ai_caller.incapacitated()) // Non-module change
+		unset_ranged_ability(ai_caller)
 		return FALSE
 
 	if(!isapc(clicked_on))
@@ -36,6 +36,3 @@
 	var/obj/item/stock_parts/power_store/cell = apc.get_cell()
 	cell.give(STANDARD_BATTERY_CHARGE)
 	ai_caller.battery -= 50
-
-
-

code/modules/mob/living/silicon/robot/robot.dm

@@ -360,14 +360,14 @@
 	add_overlay(eye_lights)
 	return ..()
 
-/mob/living/silicon/robot/proc/self_destruct(mob/usr)
+/mob/living/silicon/robot/proc/self_destruct(mob/user)
 	var/turf/groundzero = get_turf(src)
-	message_admins(span_notice("[ADMIN_LOOKUPFLW(usr)] detonated [key_name_admin(src, client)] at [ADMIN_VERBOSEJMP(groundzero)]!"))
-	usr.log_message("detonated [key_name(src)]!", LOG_ATTACK)
-	log_message("was detonated by [key_name(usr)]!", LOG_ATTACK, log_globally = FALSE)
+	message_admins(span_notice("[ADMIN_LOOKUPFLW(user)] detonated [key_name_admin(src, client)] at [ADMIN_VERBOSEJMP(groundzero)]!"))
+	user.log_message("detonated [key_name(src)]!", LOG_ATTACK)
+	log_message("was detonated by [key_name(user)]!", LOG_ATTACK, log_globally = FALSE)
 
-	log_combat(usr, src, "detonated cyborg")
-	log_silicon("CYBORG: [key_name(src)] has been detonated by [key_name(usr)].")
+	log_combat(user, src, "detonated cyborg")
+	log_silicon("CYBORG: [key_name(src)] has been detonated by [key_name(user)].")
 	if(connected_ai)
 		to_chat(connected_ai, "<br><br>[span_alert("ALERT - Cyborg detonation detected: [name]")]<br>")