diff --git a/code/game/machinery/computer/pod.dm b/code/game/machinery/computer/pod.dm
index e529af68aa..9123a4bfc5 100644
--- a/code/game/machinery/computer/pod.dm
+++ b/code/game/machinery/computer/pod.dm
@@ -12,7 +12,7 @@
 /obj/machinery/computer/pod/New()
 	..()
 	spawn( 5 )
-		for(var/obj/machinery/mass_driver/M in machines)
+		for(var/obj/machinery/mass_driver/M in world)
 			if (M.id == id)
 				connected = M
 			else
@@ -28,7 +28,7 @@
 		viewers(null, null) << "Cannot locate mass driver connector. Cancelling firing sequence!"
 		return
 
-	for(var/obj/machinery/door/poddoor/M in machines)
+	for(var/obj/machinery/door/poddoor/M in world)
 		if (M.id == id)
 			spawn( 0 )
 				M.open()
@@ -36,13 +36,13 @@
 	sleep(20)
 
 	//connected.drive()		*****RM from 40.93.3S
-	for(var/obj/machinery/mass_driver/M in machines)
+	for(var/obj/machinery/mass_driver/M in world)
 		if(M.id == id)
 			M.power = connected.power
 			M.drive()
 
 	sleep(50)
-	for(var/obj/machinery/door/poddoor/M in machines)
+	for(var/obj/machinery/door/poddoor/M in world)
 		if (M.id == id)
 			spawn( 0 )
 				M.close()
@@ -188,7 +188,7 @@
 								if(syndicate_station_at_station == 0)
 									usr << "\red You need to launch the Syndicate Shuttle via the computer terminal at the head of the ship before departing."
 									return
-							for(var/obj/machinery/door/poddoor/M in machines)
+							for(var/obj/machinery/door/poddoor/M in world)
 								if (M.id == id)
 									if (M.density)
 										spawn( 0 )
diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm
index b92f8d19f7..076a3149f7 100644
--- a/code/game/machinery/doors/airlock.dm
+++ b/code/game/machinery/doors/airlock.dm
@@ -1155,7 +1155,7 @@ About the new airlock wires panel:
 	..()
 	if(src.closeOtherId != null)
 		spawn (5)
-			for (var/obj/machinery/door/airlock/A in machines)
+			for (var/obj/machinery/door/airlock/A in world)
 				if(A.closeOtherId == src.closeOtherId && A != src)
 					src.closeOther = A
 					break
diff --git a/code/game/machinery/igniter.dm b/code/game/machinery/igniter.dm
index 41be21bae5..9c4852d16a 100644
--- a/code/game/machinery/igniter.dm
+++ b/code/game/machinery/igniter.dm
@@ -123,12 +123,12 @@
 	active = 1
 	icon_state = "launcheract"
 
-	for(var/obj/machinery/sparker/M in machines)
+	for(var/obj/machinery/sparker/M in world)
 		if (M.id == src.id)
 			spawn( 0 )
 				M.ignite()
 
-	for(var/obj/machinery/igniter/M in machines)
+	for(var/obj/machinery/igniter/M in world)
 		if(M.id == src.id)
 			use_power(50)
 			M.on = !( M.on )