Syncs maps, and a bunch of other things that no one will care about/notice/give fucks about until they break. Welcome to conflict hell. (#2460)

* fuck pubby

* fuck you too ceres

* ree

* this is going to be a disaster isn't it

* disaster

* dme

* -_-

* tg

* woops

* proper sync

* Welcome to conflict hell.

* lets hope this fixes more things than it breaks

* gdi

* goddamnit

code/modules/power/apc.dm

@@ -177,10 +177,13 @@
 	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()

code/modules/power/supermatter/supermatter.dm

@@ -55,6 +55,8 @@
 #define SUPERMATTER_DANGER_PERCENT 50
 #define SUPERMATTER_WARNING_PERCENT 100
 
+GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_shard)
+
 /obj/machinery/power/supermatter_shard
 	name = "supermatter shard"
 	desc = "A strangely translucent and iridescent crystal that looks like it used to be part of a larger structure."
@@ -131,6 +133,7 @@
 	var/produces_gas = TRUE
 	var/obj/effect/countdown/supermatter/countdown
 
+	var/is_main_engine = FALSE
 
 /obj/machinery/power/supermatter_shard/Initialize()
 	. = ..()
@@ -143,7 +146,8 @@
 	radio.listening = 0
 	radio.recalculateChannels()
 	investigate_log("has been created.", INVESTIGATE_SUPERMATTER)
-
+	if(is_main_engine)
+		GLOB.main_supermatter_engine = src
 
 /obj/machinery/power/supermatter_shard/Destroy()
 	investigate_log("has been destroyed.", INVESTIGATE_SUPERMATTER)
@@ -151,6 +155,8 @@
 	QDEL_NULL(radio)
 	GLOB.poi_list -= src
 	QDEL_NULL(countdown)
+	if(is_main_engine && GLOB.main_supermatter_engine == src)
+		GLOB.main_supermatter_engine = null
 	. = ..()
 
 /obj/machinery/power/supermatter_shard/examine(mob/user)
@@ -584,6 +590,9 @@
 		else
 			L.show_message("<span class='italics'>You hear an unearthly ringing and notice your skin is covered in fresh radiation burns.</span>", 2)
 
+/obj/machinery/power/supermatter_shard/engine
+	is_main_engine = TRUE
+
 // When you wanna make a supermatter shard for the dramatic effect, but
 // don't want it exploding suddenly
 /obj/machinery/power/supermatter_shard/hugbox
@@ -599,6 +608,9 @@
 	gasefficency = 0.15
 	explosion_power = 35
 
+/obj/machinery/power/supermatter_shard/crystal/engine
+	is_main_engine = TRUE
+
 /obj/machinery/power/supermatter_shard/proc/supermatter_pull(turf/center, pull_range = 10)
 	playsound(src.loc, 'sound/weapons/marauder.ogg', 100, 1, extrarange = 7)
 	for(var/atom/P in orange(pull_range,center))