Merge pull request #5229 from Neerti/4/29/2018_remove_world_REMOVE_WORLD

for(var/bad_code in world)

code/modules/power/fusion/_setup.dm

@@ -17,7 +17,7 @@
 		to_chat(usr, "Error: you are not an admin!")
 		return
 
-	if(!(locate(/obj/machinery/power/fusion_core/mapped) in world))
+	if(!(locate(/obj/machinery/power/fusion_core/mapped) in machines))
 		to_chat(usr, "This map is not appropriate for this verb.")
 		return
 
@@ -40,7 +40,7 @@
 		var/list/delayed_objects = list()
 
 		// SETUP PHASE
-		for(var/obj/effect/engine_setup/S in world)
+		for(var/obj/effect/engine_setup/S in machines)
 			var/result = S.activate(0)
 			switch(result)
 				if(SETUP_OK)

code/modules/power/sensors/powernet_sensor.dm

@@ -35,7 +35,7 @@
 /obj/machinery/power/sensor/Destroy()
 	. = ..()
 	// TODO - Switch power_monitor to register deletion events instead of this.
-	for(var/obj/machinery/computer/power_monitor/PM in world)
+	for(var/obj/machinery/computer/power_monitor/PM in machines)
 		if(PM.power_monitor)
 			PM.power_monitor.refresh_sensors()
 

code/modules/power/singularity/singularity.dm

@@ -1,5 +1,7 @@
 //This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:33
 
+GLOBAL_LIST_BOILERPLATE(all_singularities, /obj/singularity)
+
 /obj/singularity/
 	name = "gravitational singularity"
 	desc = "A gravitational singularity."

code/modules/power/supermatter/setup_supermatter.dm

@@ -32,7 +32,7 @@
 
 	// CONFIGURATION PHASE
 	// Coolant canisters, set types according to response.
-	for(var/obj/effect/engine_setup/coolant_canister/C in world)
+	for(var/obj/effect/engine_setup/coolant_canister/C in all_engine_setup_markers)
 		switch(response)
 			if("N2")
 				C.canister_type = /obj/machinery/portable_atmospherics/canister/nitrogen/engine_setup/
@@ -44,7 +44,7 @@
 				C.canister_type = /obj/machinery/portable_atmospherics/canister/phoron/engine_setup/
 				continue
 
-	for(var/obj/effect/engine_setup/core/C in world)
+	for(var/obj/effect/engine_setup/core/C in all_engine_setup_markers)
 		switch(response)
 			if("N2")
 				C.energy_setting = ENERGY_NITROGEN
@@ -56,12 +56,12 @@
 				C.energy_setting = ENERGY_PHORON
 				continue
 
-	for(var/obj/effect/engine_setup/atmo_filter/F in world)
+	for(var/obj/effect/engine_setup/atmo_filter/F in all_engine_setup_markers)
 		F.coolant = response
 
 	var/list/delayed_objects = list()
 	// SETUP PHASE
-	for(var/obj/effect/engine_setup/S in world)
+	for(var/obj/effect/engine_setup/S in all_engine_setup_markers)
 		var/result = S.activate(0)
 		switch(result)
 			if(SETUP_OK)
@@ -108,6 +108,8 @@
 	icon = 'icons/mob/screen1.dmi'
 	icon_state = "x3"
 
+GLOBAL_LIST_BOILERPLATE(all_engine_setup_markers, /obj/effect/engine_setup)
+
 /obj/effect/engine_setup/proc/activate(var/last = 0)
 	return 1