sync

2017-08-29 09:29:45 -07:00
parent 4bfade5704
commit 61b8c48872
4 changed files with 2 additions and 16 deletions
@@ -195,7 +195,7 @@

 	make_terminal()

-addtimer(CALLBACK(src, .proc/update), 5)
+	addtimer(CALLBACK(src, .proc/update), 5)

 /obj/machinery/power/apc/examine(mob/user)
 	..()
@@ -1,14 +0,0 @@
-diff a/code/modules/power/apc.dm b/code/modules/power/apc.dm	(rejected hunks)
-@@ -178,11 +178,7 @@
- 
- 	//if area isn't specified use current
- 	if(areastring)
-		areastring = text2path(areastring) //resolves the string to path, then filters out instances generated by subtypes of the path in sortedAreas
-		for(var/V in GLOB.sortedAreas)
-			var/area/B = V
-			if(B.type == areastring)
-				src.area = V
-+		src.area = get_area_instance_from_text(areastring)
- 		if(!src.area)
- 			src.area = A
- 			stack_trace("Bad areastring path for [src], [src.areastring]")