Merge conflict fix

code/game/objects/structures/crates_lockers/closets/secure/depot.dm

@@ -6,6 +6,8 @@
 	anchored = 1
 	health = 200
 	req_access = list()
+	var/is_armory = FALSE
+	var/ignore_use = FALSE
 
 
 /obj/structure/closet/secure_closet/syndicate/depot/New()
@@ -26,9 +28,12 @@
 	. = ..()
 
 /obj/structure/closet/secure_closet/syndicate/depot/proc/loot_pickup()
-	var/area/syndicate_depot/core/depotarea = areaMaster
-	if(depotarea)
-		depotarea.locker_looted()
+	if(!ignore_use)
+		var/area/syndicate_depot/core/depotarea = areaMaster
+		if(istype(depotarea))
+			depotarea.locker_looted()
+			if(is_armory)
+				depotarea.armory_locker_looted()
 
 /obj/structure/closet/secure_closet/syndicate/depot/attack_animal(mob/M)
 	if(isanimal(M) && "syndicate" in M.faction)
@@ -36,10 +41,26 @@
 		return
 	return ..(M)
 
+/obj/structure/closet/secure_closet/syndicate/depot/attackby(obj/item/W, mob/user, params)
+	if(istype(W, /obj/item/rcs))
+		to_chat(user, "<span class='warning'>Bluespace interference prevents the [W] from locking onto [src]!</span>")
+		return
+	return ..()
+
 /obj/structure/closet/secure_closet/syndicate/depot/emp_act(severity)
 	return
 
 /obj/structure/closet/secure_closet/syndicate/depot/togglelock(mob/user)
 	. = ..()
 	if(!locked)
-		loot_pickup()
+		loot_pickup()
+
+/obj/structure/closet/secure_closet/syndicate/depot/attack_ghost(mob/user)
+	if(user.can_advanced_admin_interact())
+		ignore_use = TRUE
+		toggle(user)
+		ignore_use = FALSE
+
+/obj/structure/closet/secure_closet/syndicate/depot/armory
+	req_access = list(access_syndicate)
+	is_armory = TRUE

code/game/objects/structures/depot.dm

@@ -7,15 +7,24 @@
 	anchored = 1
 	max_integrity = 50
 	var/area/syndicate_depot/core/depotarea
+	var/has_overloaded = FALSE
 
 /obj/structure/fusionreactor/Initialize()
-	. = ..()
+	..()
 	depotarea = areaMaster
-	if(depotarea)
+	if(istype(depotarea))
 		depotarea.reactor = src
+	return INITIALIZE_HINT_LATELOAD
+
+/obj/structure/fusionreactor/LateInitialize()
+	for(var/obj/machinery/porta_turret/syndicate/T in range(50, loc))
+		if(!istype(T.depotarea))
+			T.depotarea = depotarea
 
 /obj/structure/fusionreactor/Destroy()
-	if(depotarea)
+	if(istype(depotarea))
+		if(!has_overloaded)
+			overload(TRUE, TRUE)
 		depotarea.reactor = null
 	..()
 
@@ -30,7 +39,7 @@
 	healthcheck()
 
 /obj/structure/fusionreactor/proc/healthcheck()
-	if(obj_integrity <= 0)
+	if(obj_integrity <= 0 && istype(depotarea))
 		overload(TRUE)
 
 /obj/structure/fusionreactor/attackby(obj/item/I, mob/user, params)
@@ -47,13 +56,20 @@
 	else
 		return ..()
 
-/obj/structure/fusionreactor/proc/overload(containment_failure)
+/obj/structure/fusionreactor/proc/overload(containment_failure = FALSE, skip_qdel = FALSE)
+	if(has_overloaded)
+		return
+	has_overloaded = TRUE
+	if(istype(depotarea) && !depotarea.used_self_destruct)
+		depotarea.activate_self_destruct("Fusion reactor cracked open. Core loose!", TRUE)
 	var/obj/effect/overload/O = new /obj/effect/overload(get_turf(src))
 	if(containment_failure)
 		playsound(loc, 'sound/machines/Alarm.ogg', 100, 0, 0)
 		O.deliberate = TRUE
 		O.max_cycles = 6
-	qdel(src)
+	if(!skip_qdel)
+		qdel(src)
+
 
 /obj/effect/overload
 	icon = 'icons/obj/tesla_engine/energy_ball.dmi'

code/game/objects/structures/girders.dm

@@ -47,6 +47,11 @@
 		new /obj/item/stack/sheet/metal(get_turf(src))
 		qdel(src)
 
+/obj/structure/girder/temperature_expose(datum/gas_mixture/air, exposed_temperature)
+	var/temp_check = exposed_temperature
+	if(temp_check >= GIRDER_MELTING_TEMP)
+		take_damage(10)
+
 /obj/structure/girder/attackby(obj/item/W, mob/user, params)
 	add_fingerprint(user)
 	if(isscrewdriver(W))