Merge pull request #3914 from Citadel-Station-13/upstream-merge-31947

[MIRROR] Pirate ship event
2017-11-13 11:52:40 -06:00
parent 97c4372a86 dfcaf338cb
commit 304cfeb262
24 changed files with 3029 additions and 37 deletions
@@ -315,10 +315,19 @@

 /obj/machinery/computer/turbine_computer/Initialize()
 	. = ..()
+	return INITIALIZE_HINT_LATELOAD
+
+/obj/machinery/computer/turbine_computer/LateInitialize()
 	locate_machinery()

 /obj/machinery/computer/turbine_computer/locate_machinery()
-	compressor = locate(/obj/machinery/power/compressor) in range(5, src)
+	if(id)
+		for(var/obj/machinery/power/compressor/C in GLOB.machines)
+			if(C.comp_id == id)
+				compressor = C
+				return
+	else
+		compressor = locate(/obj/machinery/power/compressor) in range(5, src)

 /obj/machinery/computer/turbine_computer/attack_hand(var/mob/user as mob)
 	if(..())