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

code/modules/unit_tests/designs.dm

@@ -72,7 +72,7 @@
 
 	for (var/obj/item/disk/surgery/design_disk as anything in subtypesof(/obj/item/disk/surgery))
 		design_disk = new design_disk()
-		for (var/surgery_type as anything in design_disk.surgeries)
+		for (var/surgery_type in design_disk.surgeries)
 			for (var/design_id in all_designs)
 				var/datum/design/surgery/design = all_designs[design_id]
 				if (ispath(design, /datum/design/surgery) && design::surgery == surgery_type)

code/modules/unit_tests/dna_infusion.dm

@@ -3,7 +3,7 @@
 
 /datum/unit_test/valid_dna_infusion/Run()
 	for(var/datum/infuser_entry/infuser_entry as anything in flatten_list(GLOB.infuser_entries))
-		for(var/input_type as anything in infuser_entry.input_obj_or_mob)
+		for(var/input_type in infuser_entry.input_obj_or_mob)
 			if(ispath(input_type, /mob/living))
 				continue
 			var/atom/movable/movable = allocate(input_type)

code/modules/unit_tests/fish_unit_tests.dm

@@ -449,7 +449,7 @@
 /datum/fish_source/unit_test_all_fish
 
 /datum/fish_source/unit_test_all_fish/New()
-	for(var/fish_type as anything in subtypesof(/obj/item/fish))
+	for(var/fish_type in subtypesof(/obj/item/fish))
 		fish_table[fish_type] = 10
 	return ..()
 

code/modules/unit_tests/geyser.dm

@@ -9,7 +9,7 @@
 /datum/unit_test/geyser/Run()
 	//While we're at it just check em all
 	var/list/geysers = subtypesof(/obj/structure/geyser)
-	for(var/geyser_type as anything in geysers)
+	for(var/geyser_type in geysers)
 		var/obj/structure/geyser/wittel/geyser = allocate(geyser_type)
 		geyser.potency = geyser.max_volume //make it recharge in 1 tick
 

code/modules/unit_tests/plane_double_transform.dm

@@ -13,13 +13,13 @@
 
 	// Generates a list of render target -> PM for future use
 	var/list/render_target_to_plane = list()
-	for(var/plane_key as anything in our_group.plane_masters)
+	for(var/plane_key in our_group.plane_masters)
 		var/atom/movable/screen/plane_master/plane = our_group.plane_masters[plane_key]
 		if(plane.render_target)
 			render_target_to_plane[plane.render_target] = plane
 
 
-	for(var/plane_key as anything in our_group.plane_masters)
+	for(var/plane_key in our_group.plane_masters)
 		var/atom/movable/screen/plane_master/plane = our_group.plane_masters[plane_key]
 
 		if(!plane.multiz_scaled)
@@ -33,12 +33,10 @@
 				consider making a new render plate that they can both draw to instead, or something of that nature.")
 
 		// Now we walk for filters that take from us
-		for(var/filter_id in plane.filter_data)
-			var/list/filter = plane.filter_data[filter_id]
+		for(var/list/filter in plane.filter_data)
 			if(!filter["render_source"])
 				continue
 			var/atom/movable/screen/plane_master/target = render_target_to_plane[filter["render_source"]]
 			if(target.multiz_scaled)
 				TEST_FAIL("[plane.type] draws a render relay into [target.type]. Both are scaled by multiz, so this will cause strange transforms.\n\
 				consider making a new render plate that they can both draw to instead, or something of that nature.")
-

code/modules/unit_tests/reagent_recipe_collisions.dm

@@ -6,8 +6,8 @@
 	// Exclude soup from this test, they all have the same "reagents" just about
 	var/list/reactions_sans_soup = GLOB.chemical_reactions_list - subtypesof(/datum/chemical_reaction/food/soup)
 
-	for(var/reaction_type_a as anything in reactions_sans_soup)
-		for(var/reaction_type_b as anything in reactions_sans_soup)
+	for(var/reaction_type_a in reactions_sans_soup)
+		for(var/reaction_type_b in reactions_sans_soup)
 			if(reaction_type_a == reaction_type_b)
 				continue
 			var/datum/chemical_reaction/reaction_a = reactions_sans_soup[reaction_type_a]

code/modules/unit_tests/say.dm

@@ -125,9 +125,6 @@
 /datum/unit_test/speech/proc/handle_hearing(datum/source, list/hearing_args)
 	SIGNAL_HANDLER
 
-	// So it turns out that the `message` arg for COMSIG_MOVABLE_HEAR is super redundant and should probably
-	// be gutted out of both the Hear() proc and signal since it's never used
-	//TEST_ASSERT(hearing_args[HEARING_MESSAGE], "Handle hearing signal does not have a message arg")
 	TEST_ASSERT(hearing_args[HEARING_SPEAKER], "Handle hearing signal does not have a speaker arg")
 	TEST_ASSERT(hearing_args[HEARING_LANGUAGE], "Handle hearing signal does not have a language arg")
 	TEST_ASSERT(hearing_args[HEARING_RAW_MESSAGE], "Handle hearing signal does not have a raw message arg")
@@ -166,7 +163,7 @@
 	var/datum/client_interface/mock_client = new()
 	listener.mock_client = mock_client
 
-	RegisterSignal(speaker, COMSIG_MOB_SAY, PROC_REF(handle_speech)) //
+	RegisterSignal(speaker, COMSIG_MOB_SAY, PROC_REF(handle_speech))
 	RegisterSignal(speaker_radio, COMSIG_RADIO_NEW_MESSAGE, PROC_REF(handle_radio_hearing))
 
 	RegisterSignal(listener, COMSIG_MOVABLE_HEAR, PROC_REF(handle_hearing))