map cleanups (#7504)

cleanup map files

code/modules/holodeck/HolodeckControl.dm

@@ -189,7 +189,9 @@
 	current_program = powerdown_program
 	linkedholodeck = locate(projection_area)
 	if(!linkedholodeck)
-		to_chat(world, "<span class='danger'>Holodeck computer at [x],[y],[z] failed to locate projection area.</span>")
+		log_mapping("[src] at [AREACOORD(src)] has no matching holodeck area.")
+		qdel(src)
+		return
 
 //This could all be done better, but it works for now.
 /obj/machinery/computer/HolodeckControl/Destroy()

code/modules/mapping/utility/merge_conflict_marker.dm

@@ -7,7 +7,7 @@
 	icon = 'icons/effects/mapping_helpers.dmi'
 	icon_state = "merge_conflict_marker"
 	desc = "If you are seeing this in-game: someone REALLY, REALLY, REALLY fucked up. They physically mapped in a fucking Merge Conflict Marker. What the shit."
-	plane = ABOVE_PLANE
+	plane = POINT_PLANE
 
 ///We REALLY do not want un-addressed merge conflicts in maps for an inexhaustible list of reasons. This should help ensure that this will not be missed in case linters fail to catch it for any reason what-so-ever.
 /obj/merge_conflict_marker/Initialize(mapload)

code/modules/power/apc/apc.dm

@@ -319,16 +319,20 @@ CREATE_WALL_MOUNTING_TYPES_SHIFTED(/obj/machinery/power/apc, 22)
 		src.cell = new cell_type(src)
 		cell.charge = start_charge * cell.max_charge / 100.0 		// (convert percentage to actual value)
 
-	var/area/A = src.loc.loc
-
-	//if area isn't specified use current
-	if(isarea(A) && src.areastring == null)
-		src.area = A
-		name = "\improper [area.name] APC"
-	else
-		src.area = get_area_name(areastring)
-		name = "\improper [area.name] APC"
-	area.apc = src
+	//Assign it to its area. If mappers already assigned an area string fast load the area from it else get the current area
+	var/area/our_area = get_area(loc)
+	if(areastring)
+		area = get_area_instance_from_text(areastring)
+		if(!area)
+			area = our_area
+			stack_trace("Bad areastring path for [src], [areastring]")
+	else if(isarea(our_area) && areastring == null)
+		area = our_area
+	if(area)
+		// TODO fix dupe apcs then enable this
+		// if(area.apc)
+		// 	log_mapping("Duplicate APC created at [AREACOORD(src)] [area.type]. Original at [AREACOORD(area.apc)] [area.type].")
+		area.apc = src
 
 	if(istype(area, /area/submap))
 		alarms_hidden = TRUE

code/modules/power/lighting/lighting.dm

@@ -306,6 +306,20 @@ var/global/list/light_type_cache = list()
 	icon_state = "tube_map"
 	#endif
 
+/obj/machinery/light/Initialize(mapload)
+	. = ..()
+
+	// Detect and scream about double stacked lights
+	if(PERFORM_ALL_TESTS(maptest_log_mapping))
+		var/turf/our_location = get_turf(src)
+		for(var/obj/machinery/light/on_turf in our_location)
+			if(on_turf == src)
+				continue
+			if(on_turf.dir != dir)
+				continue
+			log_mapping("Conflicting double stacked light [on_turf.type] found at [AREACOORD(src)]")
+			return INITIALIZE_HINT_QDEL
+
 /obj/machinery/light/flicker
 	auto_flicker = TRUE