diff --git a/code/modules/atmospherics/machinery/components/trinary_devices/filter.dm b/code/modules/atmospherics/machinery/components/trinary_devices/filter.dm
index 4e3ef0f3cc..9955235834 100644
--- a/code/modules/atmospherics/machinery/components/trinary_devices/filter.dm
+++ b/code/modules/atmospherics/machinery/components/trinary_devices/filter.dm
@@ -28,6 +28,12 @@
 	if(frequency)
 		radio_connection = SSradio.add_object(src, frequency, GLOB.RADIO_ATMOSIA)
 
+<<<<<<< HEAD
+=======
+/obj/machinery/atmospherics/components/trinary/filter/New()
+	..()
+
+>>>>>>> 945a58c... unfucks filters (#31599)
 /obj/machinery/atmospherics/components/trinary/filter/Destroy()
 	SSradio.remove_object(src,frequency)
 	return ..()
@@ -86,11 +92,20 @@
 		if(!removed)
 			return
 
+<<<<<<< HEAD
 		var/filtering = filter_type ? TRUE : FALSE
 
 		if(filtering && !istext(filter_type))
 			WARNING("Wrong gas ID in [src]'s filter_type var. filter_type == [filter_type]")
 			filtering = FALSE
+=======
+		var/filtering = TRUE
+		if(!ispath(filter_type))
+			if(filter_type)
+				filter_type = gas_id2path(filter_type) //support for mappers so they don't need to type out paths
+			else
+				filtering = FALSE
+>>>>>>> 945a58c... unfucks filters (#31599)
 
 		if(filtering && removed.gases[filter_type])
 			var/datum/gas_mixture/filtered_out = new
@@ -124,7 +139,14 @@
 	data["on"] = on
 	data["pressure"] = round(target_pressure)
 	data["max_pressure"] = round(MAX_OUTPUT_PRESSURE)
+<<<<<<< HEAD
 	data["filter_type"] = filter_type
+=======
+	if(filter_type)
+		data["filter_type"] = GLOB.meta_gas_info[filter_type][META_GAS_ID] //ui code is garbage and this is needed for it to work grr
+	else
+		data["filter_type"] = "none"
+>>>>>>> 945a58c... unfucks filters (#31599)
 	return data
 
 /obj/machinery/atmospherics/components/trinary/filter/ui_act(action, params)
@@ -153,7 +175,11 @@
 		if("filter")
 			filter_type = ""
 			var/filter_name = "nothing"
+<<<<<<< HEAD
 			var/gas = params["mode"]
+=======
+			var/gas = text2path(params["mode"]) || gas_id2path(params["mode"])
+>>>>>>> 945a58c... unfucks filters (#31599)
 			if(gas in GLOB.meta_gas_info)
 				filter_type = gas
 				filter_name	= GLOB.meta_gas_info[gas][META_GAS_NAME]
diff --git a/tgui/src/interfaces/atmos_filter.ract b/tgui/src/interfaces/atmos_filter.ract
index ded61a9189..9b342f5b7c 100644
--- a/tgui/src/interfaces/atmos_filter.ract
+++ b/tgui/src/interfaces/atmos_filter.ract
@@ -9,9 +9,10 @@
     <span>{{Math.round(adata.pressure)}} kPa</span>
   </ui-section>
   <ui-section label='Filter'>
-    <ui-button state='{{data.filter_type == "" ? "selected" : null}}'
+    <ui-button state='{{data.filter_type == "none" ? "selected" : null}}'
       action='filter' params='{"mode": ""}'>Nothing</ui-button>
     <ui-button state='{{data.filter_type == "plasma" ? "selected" : null}}'
+<<<<<<< HEAD
       action='filter' params='{"mode": "plasma"}'>Plasma</ui-button>
     <ui-button state='{{data.filter_type == "o2" ? "selected" : null}}'
       action='filter' params='{"mode": "o2"}'>O2</ui-button>
@@ -27,5 +28,22 @@
       action='filter' params='{"mode": "freon"}'>Freon</ui-button>	
 	<ui-button state='{{data.filter_type == "water_vapor" ? "selected" : null}}'
       action='filter' params='{"mode": "water_vapor"}'>Water Vapor</ui-button>	
+=======
+      action='filter' params='{"mode": "/datum/gas/plasma"}'>Plasma</ui-button>
+    <ui-button state='{{data.filter_type == "o2" ? "selected" : null}}'
+      action='filter' params='{"mode": "/datum/gas/oxygen"}'>O2</ui-button>
+    <ui-button state='{{data.filter_type == "n2" ? "selected" : null}}'
+      action='filter' params='{"mode": "/datum/gas/nitrogen"}'>N2</ui-button>
+    <ui-button state='{{data.filter_type == "co2" ? "selected" : null}}'
+      action='filter' params='{"mode": "/datum/gas/carbon_dioxide"}'>CO2</ui-button>
+    <ui-button state='{{data.filter_type == "n2o" ? "selected" : null}}'
+      action='filter' params='{"mode": "/datum/gas/nitrous_oxide"}'>N2O</ui-button>
+	<ui-button state='{{data.filter_type == "bz" ? "selected" : null}}'
+      action='filter' params='{"mode": "/datum/gas/bz"}'>BZ</ui-button>
+	<ui-button state='{{data.filter_type == "freon" ? "selected" : null}}'
+      action='filter' params='{"mode": "/datum/gas/freon"}'>Freon</ui-button>
+	<ui-button state='{{data.filter_type == "water_vapor" ? "selected" : null}}'
+      action='filter' params='{"mode": "/datum/gas/water_vapor"}'>Water Vapor</ui-button>
+>>>>>>> 945a58c... unfucks filters (#31599)
 	</ui-section>
 </ui-display>