From 1ba299b289fe7320299baeea4b9dedc300234dd6 Mon Sep 17 00:00:00 2001
From: Crazylemon64 <tlrgue17@gmail.com>
Date: Tue, 9 Feb 2016 00:59:49 -0800
Subject: [PATCH] Revamps that weird dialog about hacking the nearest APC to
 actually work

---
 code/modules/mob/living/silicon/ai/ai.dm   | 1 -
 code/modules/mob/living/silicon/ai/life.dm | 4 +---
 code/modules/nano/interaction/default.dm   | 3 +++
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm
index c870c742573..a9e4703a8ad 100644
--- a/code/modules/mob/living/silicon/ai/ai.dm
+++ b/code/modules/mob/living/silicon/ai/ai.dm
@@ -71,7 +71,6 @@ var/list/ai_verbs_default = list(
 
 	var/mob/living/silicon/ai/parent = null
 
-	var/apc_override = 0 //hack for letting the AI use its APC even when visionless
 	var/camera_light_on = 0	//Defines if the AI toggled the light on the camera it's looking through.
 	var/datum/trackable/track = null
 	var/last_paper_seen = null
diff --git a/code/modules/mob/living/silicon/ai/life.dm b/code/modules/mob/living/silicon/ai/life.dm
index 934cdb393c1..93ee8a54a2b 100644
--- a/code/modules/mob/living/silicon/ai/life.dm
+++ b/code/modules/mob/living/silicon/ai/life.dm
@@ -135,10 +135,8 @@
 								src << "Receiving control information from APC."
 								sleep(2)
 								//bring up APC dialog
-								apc_override = 1
-								theAPC.attack_ai(src)
-								apc_override = 0
 								aiRestorePowerRoutine = 3
+								theAPC.attack_ai(src)
 								src << "Here are your current laws:"
 								src.show_laws() //WHY THE FUCK IS THIS HERE
 						sleep(50)
diff --git a/code/modules/nano/interaction/default.dm b/code/modules/nano/interaction/default.dm
index bd5ba3ee0c8..e0e7c3a98f6 100644
--- a/code/modules/nano/interaction/default.dm
+++ b/code/modules/nano/interaction/default.dm
@@ -32,6 +32,9 @@
 
 /mob/living/silicon/ai/default_can_use_topic(var/src_object)
 	. = shared_nano_interaction()
+	// Fix the weird hacking blurb to actually let them restore power
+	if(aiRestorePowerRoutine == 3 && istype(src_object, /obj/machinery/power/apc))
+		return STATUS_INTERACTIVE
 	if(. != STATUS_INTERACTIVE)
 		return