From 78ad83ddec537aa6004e98f06adfd7c6180c0ee0 Mon Sep 17 00:00:00 2001
From: LetterJay <jgilbert1991@gmail.com>
Date: Mon, 14 Aug 2017 18:44:51 -0500
Subject: [PATCH] Update apc.dm

---
 code/modules/power/apc.dm | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm
index e36c639eb9..da09564bd3 100644
--- a/code/modules/power/apc.dm
+++ b/code/modules/power/apc.dm
@@ -177,15 +177,18 @@
 	var/area/A = src.loc.loc
 
 	//if area isn't specified use current
-	if(isarea(A) && src.areastring == null)
+	if(areastring)
+		src.area = get_area_instance_from_text(areastring)
+		if(!src.area)
+			src.area = A
+			stack_trace("Bad areastring path for [src], [src.areastring]")
+	else if(isarea(A) && src.areastring == null)
 		src.area = A
-	else
-		src.area = get_area_by_name(areastring)
 	update_icon()
 
 	make_terminal()
 
-	addtimer(CALLBACK(src, .proc/update), 5)
+addtimer(CALLBACK(src, .proc/update), 5)
 
 /obj/machinery/power/apc/examine(mob/user)
 	..()