Merge pull request #4081 from Cameron653/512_FILTER_FIX

BYOND 512 Compiling Errors Fix

code/modules/admin/verbs/diagnostics.dm

@@ -83,12 +83,12 @@
 		if (!fqs)
 			output += "&nbsp;&nbsp;<b>ERROR</b><br>"
 			continue
-		for (var/filter in fqs.devices)
-			var/list/f = fqs.devices[filter]
+		for (var/radio_filter in fqs.devices)
+			var/list/f = fqs.devices[radio_filter]
 			if (!f)
-				output += "&nbsp;&nbsp;[filter]: ERROR<br>"
+				output += "&nbsp;&nbsp;[radio_filter]: ERROR<br>"
 				continue
-			output += "&nbsp;&nbsp;[filter]: [f.len]<br>"
+			output += "&nbsp;&nbsp;[radio_filter]: [f.len]<br>"
 			for (var/device in f)
 				if (isobj(device))
 					output += "&nbsp;&nbsp;&nbsp;&nbsp;[device] ([device:x],[device:y],[device:z] in area [get_area(device:loc)])<br>"
@@ -177,11 +177,11 @@
 	set desc = "This searches all the active jobban entries for the current round and outputs the results to standard output."
 	set category = "Debug"
 
-	var/filter = input("Contains what?","Filter") as text|null
-	if(!filter)
+	var/job_filter = input("Contains what?","Job Filter") as text|null
+	if(!job_filter)
 		return
 
 	usr << "<b>Jobbans active in this round.</b>"
 	for(var/t in jobban_keylist)
-		if(findtext(t, filter))
+		if(findtext(t, job_filter))
 			usr << "[t]"

code/modules/clothing/masks/gasmask.dm

@@ -15,17 +15,17 @@
 	armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 75, rad = 0)
 
 /obj/item/clothing/mask/gas/filter_air(datum/gas_mixture/air)
-	var/datum/gas_mixture/filtered = new
+	var/datum/gas_mixture/gas_filtered = new
 
 	for(var/g in filtered_gases)
 		if(air.gas[g])
-			filtered.gas[g] = air.gas[g] * gas_filter_strength
-			air.gas[g] -= filtered.gas[g]
+			gas_filtered.gas[g] = air.gas[g] * gas_filter_strength
+			air.gas[g] -= gas_filtered.gas[g]
 
 	air.update_values()
-	filtered.update_values()
+	gas_filtered.update_values()
 
-	return filtered
+	return gas_filtered
 
 /obj/item/clothing/mask/gas/half
 	name = "face mask"

code/modules/examine/descriptions/atmospherics.dm

@@ -127,7 +127,7 @@
 	It can be controlled from an Air Alarm.  It can be configured to drain all air rapidly with a 'panic syphon' from an air alarm."
 
 //Omni filters
-/obj/machinery/atmospherics/omni/filter
+/obj/machinery/atmospherics/omni/atmos_filter
 	description_info = "Filters gas from a custom input direction, with up to two filtered outputs and a 'everything else' \
 	output.  The filtered output's arrows glow orange."
 

code/modules/mob/living/carbon/breathe.dm

@@ -63,8 +63,8 @@
 		//handle mask filtering
 		if(istype(wear_mask, /obj/item/clothing/mask) && breath)
 			var/obj/item/clothing/mask/M = wear_mask
-			var/datum/gas_mixture/filtered = M.filter_air(breath)
-			loc.assume_air(filtered)
+			var/datum/gas_mixture/gas_filtered = M.filter_air(breath)
+			loc.assume_air(gas_filtered)
 		return breath
 	return null
 

code/modules/power/supermatter/setup_supermatter.dm

@@ -56,7 +56,7 @@
 				C.energy_setting = ENERGY_PHORON
 				continue
 
-	for(var/obj/effect/engine_setup/filter/F in world)
+	for(var/obj/effect/engine_setup/atmo_filter/F in world)
 		F.coolant = response
 
 	var/list/delayed_objects = list()
@@ -227,13 +227,13 @@
 
 
 // Sets up filters. This assumes filters are set to filter out N2 back to the core loop by default!
-/obj/effect/engine_setup/filter/
+/obj/effect/engine_setup/atmo_filter/
 	name = "Omni Filter Marker"
 	var/coolant = null
 
-/obj/effect/engine_setup/filter/activate()
+/obj/effect/engine_setup/atmo_filter/activate()
 	..()
-	var/obj/machinery/atmospherics/omni/filter/F = locate() in get_turf(src)
+	var/obj/machinery/atmospherics/omni/atmos_filter/F = locate() in get_turf(src)
 	if(!F)
 		log_and_message_admins("## WARNING: Unable to locate omni filter at [x] [y] [z]!")
 		return SETUP_WARNING

code/modules/research/designs.dm

@@ -671,7 +671,7 @@ other types of metals and chemistry for reagents).
 	id = "s-filter"
 	req_tech = list(TECH_DATA = 3, TECH_MAGNET = 3)
 	materials = list(DEFAULT_WALL_MATERIAL = 40, "silver" = 10)
-	build_path = /obj/item/weapon/stock_parts/subspace/filter
+	build_path = /obj/item/weapon/stock_parts/subspace/sub_filter
 	sort_string = "UAAAB"
 
 /datum/design/item/stock_part/subspace_amplifier