Merge branch 'master' of https://github.com/tgstation/tgstation into upstream-sync

code/controllers/subsystem/blackbox.dm

@@ -431,7 +431,7 @@ Versioning
 /datum/controller/subsystem/blackbox/proc/ReportRoundstartManifest(list/characters)
 	var/list/query_rows = list()
 	var/list/special_columns = list("server_ip" = "INET_ATON(?)")
-	for(var/mob_ckey as anything in characters)
+	for(var/mob_ckey in characters)
 		var/mob/living/new_character = characters[mob_ckey]
 		query_rows += list(list(
 			"server_ip" = world.internet_address || 0,

code/controllers/subsystem/movement/ai_movement.dm

@@ -14,6 +14,6 @@ MOVEMENT_SUBSYSTEM_DEF(ai_movement)
 
 /datum/controller/subsystem/movement/ai_movement/proc/SetupAIMovementInstances()
 	movement_types = list()
-	for(var/key as anything in subtypesof(/datum/ai_movement))
+	for(var/key in subtypesof(/datum/ai_movement))
 		var/datum/ai_movement/ai_movement = new key
 		movement_types[key] = ai_movement

code/controllers/subsystem/ore_generation.dm

@@ -21,26 +21,12 @@ SUBSYSTEM_DEF(ore_generation)
 	 */
 	var/list/ore_vent_minerals = list()
 
-	/// A tracker of how many of each ore vent size we have in the game. Useful for tracking purposes.
-
 /datum/controller/subsystem/ore_generation/Initialize()
 	//Basically, we're going to round robin through the list of ore vents and assign a mineral to them until complete.
-	while(length(ore_vent_minerals) > 0) //Keep looping if there's more to assign
-		var/stallbreaker = 0
-		for(var/obj/structure/ore_vent/vent as anything in possible_vents)
-			if(length(ore_vent_minerals) <= 0) //But break early if there's none left.
-				break
-			if(vent.unique_vent)
-				continue //Ya'll already got your minerals.
-			if(length(difflist(first = ore_vent_minerals, second = vent.mineral_breakdown, skiprep = 1)))
-				vent.generate_mineral_breakdown(new_minerals = 1, map_loading = TRUE)
-			else
-				stallbreaker++
-				if(stallbreaker >= length(possible_vents))
-					break //We've done all we can here. break inner loop
-				continue
-		if(stallbreaker >= length(possible_vents))
-			break //We've done all we can here. break outer loop
+	for(var/obj/structure/ore_vent/vent as anything in possible_vents)
+		if(vent.unique_vent)
+			continue //Ya'll already got your minerals.
+		vent.generate_mineral_breakdown(map_loading = TRUE)
 
 	/// Handles roundstart logging
 	logger.Log(

code/controllers/subsystem/processing/fishing.dm

@@ -117,7 +117,7 @@ PROCESSING_SUBSYSTEM_DEF(fishing)
 				continue
 			LAZYOR(fish_safe_turfs_by_type[fish_path], source.associated_safe_turfs)
 	//If a subtype doesn't have set safe turfs, it'll inherit them from the parent type.
-	for(var/fish_type as anything in fish_safe_turfs_by_type)
+	for(var/fish_type in fish_safe_turfs_by_type)
 		for(var/fish_subtype in subtypesof(fish_type))
 			if(!length(fish_safe_turfs_by_type[fish_subtype]))
 				fish_safe_turfs_by_type[fish_subtype] = fish_safe_turfs_by_type[fish_type]

code/controllers/subsystem/processing/greyscale.dm

@@ -34,7 +34,7 @@ PROCESSING_SUBSYSTEM_DEF(greyscale)
 #endif
 
 	// This final verification step is for things that need other greyscale configurations to be finished loading
-	for(var/greyscale_type as anything in configurations)
+	for(var/greyscale_type in configurations)
 		CHECK_TICK
 		var/datum/greyscale_config/config = configurations[greyscale_type]
 		config.CrossVerify()