World loops 2: Electric Boogaloo.

code/WorkInProgress/Cael_Aislinn/Economy/Accounts.dm

@@ -27,7 +27,7 @@ var/global/datum/money_account/vendor_account
 
 		//add the account
 		station_account.transaction_log.Add(T)
-		for(var/obj/machinery/account_database/A in world)
+		for(var/obj/machinery/account_database/A in machines)
 			A.accounts.Add(station_account)
 
 /proc/create_department_account(department)
@@ -50,7 +50,7 @@ var/global/datum/money_account/vendor_account
 
 	//add the account
 	department_account.transaction_log.Add(T)
-	for(var/obj/machinery/account_database/A in world)
+	for(var/obj/machinery/account_database/A in machines)
 		A.accounts.Add(department_account)
 
 	department_accounts[department] = department_account
@@ -194,7 +194,7 @@ var/global/datum/money_account/vendor_account
 	if(href_list["choice"])
 		switch(href_list["choice"])
 			if("sync_accounts")
-				for(var/obj/machinery/account_database/A in world)
+				for(var/obj/machinery/account_database/A in machines)
 					for(var/datum/money_account/M in src.accounts)
 						if(!A.accounts.Find(M))
 							A.accounts.Add(M)
@@ -257,7 +257,7 @@ var/global/datum/money_account/vendor_account
 
 /obj/machinery/account_database/proc/add_account_across_all(var/new_owner_name = "Default user", var/starting_funds = 0, var/pre_existing = 0)
 	var/datum/money_account/M = add_account(new_owner_name, starting_funds, pre_existing)
-	for(var/obj/machinery/account_database/D in world)
+	for(var/obj/machinery/account_database/D in machines)
 		if(D == src)
 			continue
 		D.accounts.Add(M)

code/WorkInProgress/Cael_Aislinn/Economy/EFTPOS.dm

@@ -46,7 +46,7 @@
 	D.name = "small parcel - 'EFTPOS access code'"
 
 /obj/item/device/eftpos/proc/reconnect_database()
-	for(var/obj/machinery/account_database/DB in world)
+	for(var/obj/machinery/account_database/DB in machines)
 		if(DB.z == src.z)
 			linked_db = DB
 			break

code/WorkInProgress/Cael_Aislinn/Jungle/jungle.dm

@@ -35,7 +35,7 @@
 	New()
 		//pick a random temple to link to
 		var/list/waypoints = list()
-		for(var/obj/effect/landmark/temple/destination/T in world)
+		for(var/obj/effect/landmark/temple/destination/T in landmarks_list)
 			waypoints.Add(T)
 			if(!T)
 				return
@@ -163,7 +163,7 @@
 		num_spawned++
 
 	//make some randomly pathing rivers
-	for(var/obj/effect/landmark/river_waypoint/W in world)
+	for(var/obj/effect/landmark/river_waypoint/W in landmarks_list)
 		if (W.z != src.z || W.connected)
 			continue
 
@@ -236,7 +236,7 @@
 		num_spawned++
 
 	//get any path nodes placed on the map
-	for(var/obj/effect/landmark/path_waypoint/W in world)
+	for(var/obj/effect/landmark/path_waypoint/W in landmarks_list)
 		if (W.z == src.z)
 			path_nodes.Add(W)
 

code/WorkInProgress/Mini/ATM.dm

@@ -67,7 +67,7 @@ log transactions
 		break
 
 /obj/machinery/atm/proc/reconnect_database()
-	for(var/obj/machinery/account_database/DB in world)
+	for(var/obj/machinery/account_database/DB in machines)
 		if( DB.z == src.z && !(DB.stat & NOPOWER) && DB.activated )
 			linked_db = DB
 			break

code/WorkInProgress/Mini/atmos_control.dm

@@ -35,7 +35,7 @@
 	if(current)
 		dat += specific()
 	else
-		for(var/obj/machinery/alarm/alarm in world)
+		for(var/obj/machinery/alarm/alarm in machines)
 			dat += "<a href='?src=\ref[src]&alarm=\ref[alarm]'>"
 			switch(max(alarm.danger_level, alarm.alarm_area.atmosalm))
 				if (0)

code/WorkInProgress/kilakk/responseteam.dm

@@ -49,7 +49,7 @@ var/sent_emergency_team = 0
 	// Shamelessly stolen nuke code
 	var/nuke_code
 	var/temp_code
-	for(var/obj/machinery/nuclearbomb/N in world)
+	for(var/obj/machinery/nuclearbomb/N in machines)
 		temp_code = text2num(N.r_code)
 		if(temp_code)
 			nuke_code = N.r_code
@@ -94,7 +94,7 @@ var/sent_emergency_team = 0
 
 	command_alert("Sensors indicate that [station_name()] has entered Code Red and is in need of assistance. We will prepare and dispatch an emergency response team to deal with the situation.", "NMV Icarus Command")
 
-	for(var/obj/effect/landmark/L in world)
+	for(var/obj/effect/landmark/L in landmarks_list)
 		if(L.name == "Response Team")
 			leader_selected = member_number == 1?1:0 // The last person selected will be the leader