I fear for my powernet

code/modules/power/apc.dm

@@ -56,6 +56,8 @@
 	integrity_failure = 50
 	var/damage_deflection = 10
 	resistance_flags = FIRE_PROOF
+	armor = list("melee" = 40, "bullet" = 40, "laser" = 40, "energy" = 100, "bomb" = 30, "bio" = 100, "rad" = 100, "fire" = 90, "acid" = 50)
+	req_access = list(ACCESS_ENGINE_EQUIP)
 	interaction_flags_machine = INTERACT_MACHINE_WIRES_IF_OPEN | INTERACT_MACHINE_ALLOW_SILICON | INTERACT_MACHINE_OPEN_SILICON
 
 	var/lon_range = 1.5
@@ -147,12 +149,39 @@
 	if(terminal)
 		terminal.connect_to_network()
 
-/obj/machinery/power/apc/New(turf/loc, var/ndir, var/building=0)
-	if (!req_access)
-		req_access = list(ACCESS_ENGINE_EQUIP)
-	if (!armor)
-		armor = list("melee" = 40, "bullet" = 40, "laser" = 40, "energy" = 100, "bomb" = 30, "bio" = 100, "rad" = 100, "fire" = 90, "acid" = 50)
-	..()
+/obj/machinery/power/apc/Initialize(mapload, ndir, building = FALSE)
+	. = ..()
+	var/area/A = get_base_area(src)
+	if(!building)
+		has_electronics = APC_ELECTRONICS_SECURED
+		// is starting with a power cell installed, create it and set its charge level
+		if(cell_type)
+			cell = new cell_type
+			cell.charge = start_charge * cell.maxcharge / 100 		// (convert percentage to actual value)
+
+		//if area isn't specified use current
+		if(areastring)
+			area = get_area_instance_from_text(areastring)
+			if(!area)
+				area = A
+				stack_trace("Bad areastring path for [src], [src.areastring]")
+		else if(isarea(A) && !areastring)
+			area = A
+		if(auto_name)
+			name = "\improper [A.name] APC"
+		update_icon()
+
+		make_terminal()
+
+	else
+		area = A
+		opened = APC_COVER_OPENED
+		operating = FALSE
+		name = "\improper [A.name] APC"
+		stat |= MAINT
+		update_icon()
+		addtimer(CALLBACK(src, .proc/update), 5)
+
 	GLOB.apcs_list += src
 
 	wires = new /datum/wires/apc(src)
@@ -163,9 +192,6 @@
 	src.tdir = dir		// to fix Vars bug
 	setDir(SOUTH)
 
-	if(auto_name)
-		name = "\improper [get_area(src)] APC"
-
 	switch(tdir)
 		if(NORTH)
 			pixel_y = 23
@@ -175,14 +201,6 @@
 			pixel_x = 24
 		if(WEST)
 			pixel_x = -25
-	if (building)
-		area = get_area(src)
-		opened = APC_COVER_OPENED
-		operating = FALSE
-		name = "[area.name] APC"
-		stat |= MAINT
-		src.update_icon()
-		addtimer(CALLBACK(src, .proc/update), 5)
 
 /obj/machinery/power/apc/Destroy()
 	GLOB.apcs_list -= src
@@ -216,32 +234,6 @@
 	terminal.setDir(tdir)
 	terminal.master = src
 
-/obj/machinery/power/apc/Initialize(mapload)
-	. = ..()
-	if(!mapload)
-		return
-	has_electronics = APC_ELECTRONICS_SECURED
-	// is starting with a power cell installed, create it and set its charge level
-	if(cell_type)
-		cell = new cell_type
-		cell.charge = start_charge * cell.maxcharge / 100 		// (convert percentage to actual value)
-
-	var/area/A = src.loc.loc
-
-	//if area isn't specified use current
-	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
-	update_icon()
-
-	make_terminal()
-
-	addtimer(CALLBACK(src, .proc/update), 5)
-
 /obj/machinery/power/apc/examine(mob/user)
 	. = ..()
 	if(stat & BROKEN)
@@ -1376,7 +1368,7 @@
 			return
 	for(var/A in GLOB.ai_list)
 		var/mob/living/silicon/ai/I = A
-		if(get_area(I) == area)
+		if(get_base_area(I) == area)
 			return
 
 	failure_timer = max(failure_timer, round(duration))

code/modules/power/lighting.dm

@@ -294,7 +294,7 @@
 	cut_overlays()
 	switch(status)		// set icon_states
 		if(LIGHT_OK)
-			var/area/A = get_area(src)
+			var/area/A = get_base_area(src)
 			if(emergency_mode || (A && A.fire))
 				icon_state = "[base_state]_emergency"
 			else
@@ -323,7 +323,7 @@
 		var/CO = bulb_colour
 		if(color)
 			CO = color
-		var/area/A = get_area(src)
+		var/area/A = get_base_area(src)
 		if (A && A.fire)
 			CO = bulb_emergency_colour
 		else if (nightshift_enabled)

code/modules/power/power.dm

@@ -382,6 +382,7 @@
 	return null
 
 /area/proc/get_apc()
+	var/target = master_area ? master_area : src
 	for(var/obj/machinery/power/apc/APC in GLOB.apcs_list)
-		if(APC.area == src)
+		if(APC.area == target)
 			return APC