diff --git a/code/ATMOSPHERICS/components/omni_devices/_omni_extras.dm b/code/ATMOSPHERICS/components/omni_devices/_omni_extras.dm
deleted file mode 100644
index d03329e24fc..00000000000
--- a/code/ATMOSPHERICS/components/omni_devices/_omni_extras.dm
+++ /dev/null
@@ -1,94 +0,0 @@
-//--------------------------------------------
-// Omni device port types
-//--------------------------------------------
-#define ATM_NONE	0
-#define ATM_INPUT	1
-#define ATM_OUTPUT	2
-
-#define ATM_O2		3
-#define ATM_N2		4
-#define ATM_CO2		5
-#define ATM_P		6	//Plasma
-#define ATM_N2O		7
-
-//--------------------------------------------
-// Omni port datum
-//
-// Used by omni devices to manage connections
-//  to other atmospheric objects.
-//--------------------------------------------
-/datum/omni_port
-	var/obj/machinery/atmospherics/omni/master
-	var/dir
-	var/update = 1
-	var/mode = 0
-	var/concentration = 0
-	var/con_lock = 0
-	var/transfer_moles = 0
-	var/datum/gas_mixture/air
-	var/obj/machinery/atmospherics/node
-	var/datum/pipeline/parent
-
-/datum/omni_port/New(var/obj/machinery/atmospherics/omni/M, var/direction = NORTH)
-	..()
-	dir = direction
-	if(istype(M))
-		master = M
-	air = new
-	air.volume = 200
-
-/datum/omni_port/proc/connect()
-	if(node)
-		return
-	master.atmos_init()
-	if(node)
-		node.atmos_init()
-		node.addMember(master)
-	master.build_network()
-
-/datum/omni_port/proc/disconnect()
-	if(node)
-		node.disconnect(master)
-		node = null
-		master.nullifyPipenet(parent)
-
-//--------------------------------------------
-// Need to find somewhere else for these
-//--------------------------------------------
-
-//returns a text string based on the direction flag input
-// if capitalize is true, it will return the string capitalized
-// otherwise it will return the direction string in lower case
-/proc/dir_name(var/dir, var/capitalize = 0)
-	var/string = null
-	switch(dir)
-		if(NORTH)
-			string = "North"
-		if(SOUTH)
-			string = "South"
-		if(EAST)
-			string = "East"
-		if(WEST)
-			string = "West"
-
-	if(!capitalize && string)
-		string = lowertext(string)
-
-	return string
-
-//returns a direction flag based on the string passed to it
-// case insensitive
-/proc/dir_flag(var/dir)
-	dir = lowertext(dir)
-	switch(dir)
-		if("north")
-			return NORTH
-		if("south")
-			return SOUTH
-		if("east")
-			return EAST
-		if("west")
-			return WEST
-		else
-			return 0
-		
diff --git a/code/ATMOSPHERICS/components/omni_devices/filter.dm b/code/ATMOSPHERICS/components/omni_devices/filter.dm
deleted file mode 100644
index 0803d34e522..00000000000
--- a/code/ATMOSPHERICS/components/omni_devices/filter.dm
+++ /dev/null
@@ -1,273 +0,0 @@
-//--------------------------------------------
-// Gas filter - omni variant
-//--------------------------------------------
-/obj/machinery/atmospherics/omni/filter
-	name = "omni gas filter"
-	icon_state = "map_filter"
-
-	var/list/o_filters = new()
-	var/datum/omni_port/input
-	var/datum/omni_port/output
-
-/obj/machinery/atmospherics/omni/filter/Destroy()
-	input = null
-	output = null
-	o_filters.Cut()
-	return ..()
-
-/obj/machinery/atmospherics/omni/filter/sort_ports()
-	for(var/datum/omni_port/P in ports)
-		if(P.update)
-			if(output == P)
-				output = null
-			if(input == P)
-				input = null
-			if(o_filters.Find(P))
-				o_filters -= P
-
-			P.air.volume = 200
-			switch(P.mode)
-				if(ATM_INPUT)
-					input = P
-				if(ATM_OUTPUT)
-					output = P
-				if(ATM_O2 to ATM_N2O)
-					o_filters += P
-
-/obj/machinery/atmospherics/omni/filter/error_check()
-	if(!input || !output || !o_filters)
-		return 1
-	if(o_filters.len < 1 || o_filters.len > 2) //requires 1 or 2 o_filters ~otherwise why are you using a filter?
-		return 1
-
-	return 0
-
-/obj/machinery/atmospherics/omni/filter/process_atmos()
-	..()
-	if(!on)
-		return 0
-
-	if(!input || !output)
-		return 0
-
-	var/datum/gas_mixture/output_air = output.air	//BYOND doesn't like referencing "output.air.return_pressure()" so we need to make a direct reference
-	var/datum/gas_mixture/input_air = input.air		// it's completely happy with them if they're in a loop though i.e. "P.air.return_pressure()"... *shrug*
-
-	var/output_pressure = output_air.return_pressure()
-
-	if(output_pressure >= target_pressure)
-		return 1
-	for(var/datum/omni_port/P in o_filters)
-		if(P.air.return_pressure() >= target_pressure)
-			return 1
-
-	var/pressure_delta = target_pressure - output_pressure
-
-	if(input_air.return_temperature() > 0)
-		input.transfer_moles = pressure_delta * output_air.volume / (input_air.return_temperature() * R_IDEAL_GAS_EQUATION)
-
-	if(input.transfer_moles > 0)
-		var/datum/gas_mixture/removed = input_air.remove(input.transfer_moles)
-
-		if(!removed)
-			return 1
-
-		for(var/datum/omni_port/P in o_filters)
-			var/datum/gas_mixture/filtered_out = new
-			filtered_out.temperature = removed.return_temperature()
-
-			switch(P.mode)
-				if(ATM_O2)
-					filtered_out.oxygen = removed.oxygen
-					removed.oxygen = 0
-				if(ATM_N2)
-					filtered_out.nitrogen = removed.nitrogen
-					removed.nitrogen = 0
-				if(ATM_CO2)
-					filtered_out.carbon_dioxide = removed.carbon_dioxide
-					removed.carbon_dioxide = 0
-				if(ATM_P)
-					filtered_out.toxins = removed.toxins
-					removed.toxins = 0
-
-					filtered_out.agent_b = removed.agent_b
-					removed.agent_b = 0
-				if(ATM_N2O)
-					filtered_out.sleeping_agent = removed.sleeping_agent
-					removed.sleeping_agent = 0
-				else
-					filtered_out = null
-
-			P.air.merge(filtered_out)
-			P.parent.update = 1
-
-		output_air.merge(removed)
-		output.parent.update = 1
-
-		input.transfer_moles = 0
-		input.parent.update = 1
-
-	return 1
-
-/obj/machinery/atmospherics/omni/filter/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, force_open = 0)
-	usr.set_machine(src)
-
-	ui = SSnanoui.try_update_ui(user, src, ui_key, ui, force_open)
-	if(!ui)
-		ui = new(user, src, ui_key, "omni_filter.tmpl", "Omni Filter Control", 330, 330)
-		ui.open()
-
-/obj/machinery/atmospherics/omni/filter/ui_data(mob/user, datum/topic_state/state)
-	var/data[0]
-
-	data["power"] = on
-	data["config"] = configuring
-
-	var/portData[0]
-	for(var/datum/omni_port/P in ports)
-		if(!configuring && P.mode == 0)
-			continue
-
-		var/input = 0
-		var/output = 0
-		var/filter = 1
-		var/f_type = null
-		switch(P.mode)
-			if(ATM_INPUT)
-				input = 1
-				filter = 0
-			if(ATM_OUTPUT)
-				output = 1
-				filter = 0
-			if(ATM_O2 to ATM_N2O)
-				f_type = mode_send_switch(P.mode)
-
-		portData[++portData.len] = list("dir" = dir_name(P.dir, capitalize = 1), \
-										"input" = input, \
-										"output" = output, \
-										"filter" = filter, \
-										"f_type" = f_type)
-
-	if(portData.len)
-		data["ports"] = portData
-	if(output)
-		data["pressure"] = target_pressure
-
-	return data
-
-/obj/machinery/atmospherics/omni/filter/proc/mode_send_switch(var/mode = ATM_NONE)
-	switch(mode)
-		if(ATM_O2)
-			return "Oxygen"
-		if(ATM_N2)
-			return "Nitrogen"
-		if(ATM_CO2)
-			return "Carbon Dioxide"
-		if(ATM_P)
-			return "Plasma" //*cough* Plasma *cough*
-		if(ATM_N2O)
-			return "Nitrous Oxide"
-		else
-			return null
-
-/obj/machinery/atmospherics/omni/filter/Topic(href, href_list)
-	if(..())
-		return 1
-	switch(href_list["command"])
-		if("power")
-			if(!configuring)
-				on = !on
-			else
-				on = 0
-		if("configure")
-			configuring = !configuring
-			if(configuring)
-				on = 0
-
-	//only allows config changes when in configuring mode ~otherwise you'll get weird pressure stuff going on
-	if(configuring && !on)
-		switch(href_list["command"])
-			if("set_pressure")
-				var/new_pressure = input(usr,"Enter new output pressure (0-4500kPa)","Pressure control",target_pressure) as num
-				target_pressure = between(0, new_pressure, 4500)
-			if("switch_mode")
-				switch_mode(dir_flag(href_list["dir"]), mode_return_switch(href_list["mode"]))
-			if("switch_filter")
-				var/new_filter = input(usr,"Select filter mode:","Change filter",href_list["mode"]) in list("None", "Oxygen", "Nitrogen", "Carbon Dioxide", "Plasma", "Nitrous Oxide")
-				switch_filter(dir_flag(href_list["dir"]), mode_return_switch(new_filter))
-
-	update_icon()
-	SSnanoui.update_uis(src)
-	return
-
-/obj/machinery/atmospherics/omni/filter/proc/mode_return_switch(var/mode)
-	switch(mode)
-		if("Oxygen")
-			return ATM_O2
-		if("Nitrogen")
-			return ATM_N2
-		if("Carbon Dioxide")
-			return ATM_CO2
-		if("Plasma")
-			return ATM_P
-		if("Nitrous Oxide")
-			return ATM_N2O
-		if("in")
-			return ATM_INPUT
-		if("out")
-			return ATM_OUTPUT
-		if("None")
-			return ATM_NONE
-		else
-			return null
-
-/obj/machinery/atmospherics/omni/filter/proc/switch_filter(var/dir, var/mode)
-	//check they aren't trying to disable the input or output ~this can only happen if they hack the cached tmpl file
-	for(var/datum/omni_port/P in ports)
-		if(P.dir == dir)
-			if(P.mode == ATM_INPUT || P.mode == ATM_OUTPUT)
-				return
-
-	switch_mode(dir, mode)
-
-/obj/machinery/atmospherics/omni/filter/proc/switch_mode(var/port, var/mode)
-	if(mode == null || !port)
-		return
-	var/datum/omni_port/target_port = null
-	var/list/other_ports = new()
-
-	for(var/datum/omni_port/P in ports)
-		if(P.dir == port)
-			target_port = P
-		else
-			other_ports += P
-
-	var/previous_mode = null
-	if(target_port)
-		previous_mode = target_port.mode
-		target_port.mode = mode
-		if(target_port.mode != previous_mode)
-			handle_port_change(target_port)
-		else
-			return
-	else
-		return
-
-	for(var/datum/omni_port/P in other_ports)
-		if(P.mode == mode)
-			var/old_mode = P.mode
-			P.mode = previous_mode
-			if(P.mode != old_mode)
-				handle_port_change(P)
-
-	update_ports()
-
-/obj/machinery/atmospherics/omni/filter/proc/handle_port_change(var/datum/omni_port/P)
-	switch(P.mode)
-		if(ATM_NONE)
-			initialize_directions &= ~P.dir
-			P.disconnect()
-		else
-			initialize_directions |= P.dir
-			P.connect()
-	P.update = 1
diff --git a/code/ATMOSPHERICS/components/omni_devices/mixer.dm b/code/ATMOSPHERICS/components/omni_devices/mixer.dm
deleted file mode 100644
index 5586bdc3a98..00000000000
--- a/code/ATMOSPHERICS/components/omni_devices/mixer.dm
+++ /dev/null
@@ -1,291 +0,0 @@
-//--------------------------------------------
-// Gas mixer - omni variant
-//--------------------------------------------
-/obj/machinery/atmospherics/omni/mixer
-	name = "omni gas mixer"
-	icon_state = "map_mixer"
-
-	var/list/inputs = new()
-	var/datum/omni_port/output
-
-	//setup tags for initial concentration values (must be decimal)
-	var/tag_north_con
-	var/tag_south_con
-	var/tag_east_con
-	var/tag_west_con
-
-/obj/machinery/atmospherics/omni/mixer/New()
-	..()
-	if(mapper_set())
-		var/con = 0
-		for(var/datum/omni_port/P in ports)
-			switch(P.dir)
-				if(NORTH)
-					if(tag_north_con && tag_north == 1)
-						P.concentration = tag_north_con
-						con += max(0, tag_north_con)
-				if(SOUTH)
-					if(tag_south_con && tag_south == 1)
-						P.concentration = tag_south_con
-						con += max(0, tag_south_con)
-				if(EAST)
-					if(tag_east_con && tag_east == 1)
-						P.concentration = tag_east_con
-						con += max(0, tag_east_con)
-				if(WEST)
-					if(tag_west_con && tag_west == 1)
-						P.concentration = tag_west_con
-						con += max(0, tag_west_con)
-
-		//mappers who are bad at maths will be punished (total concentration must be 100%)
-		if(con != 1)
-			tag_north_con = null
-			tag_south_con = null
-			tag_east_con = null
-			tag_west_con = null
-
-/obj/machinery/atmospherics/omni/mixer/Destroy()
-	inputs.Cut()
-	output = null
-	return ..()
-
-/obj/machinery/atmospherics/omni/mixer/sort_ports()
-	for(var/datum/omni_port/P in ports)
-		if(P.update)
-			if(output == P)
-				output = null
-			if(inputs.Find(P))
-				inputs -= P
-
-			P.air.volume = 200
-			switch(P.mode)
-				if(ATM_INPUT)
-					inputs += P
-				if(ATM_OUTPUT)
-					output = P
-
-	if(!mapper_set())
-		for(var/datum/omni_port/P in inputs)
-			P.concentration = 1 / max(1, inputs.len)
-
-	if(output)
-		output.air.volume *= 0.75 * inputs.len
-		output.concentration = 1
-
-/obj/machinery/atmospherics/omni/mixer/proc/mapper_set()
-	return (tag_north_con || tag_south_con || tag_east_con || tag_west_con)
-
-/obj/machinery/atmospherics/omni/mixer/error_check()
-	if(!output || !inputs)
-		return 1
-	if(inputs.len < 2 || inputs.len > 3) //requires 2 or 3 inputs ~otherwise why are you using a mixer?
-		return 1
-
-	return 0
-
-/obj/machinery/atmospherics/omni/mixer/process_atmos()
-	..()
-	if(!on)
-		return 0
-
-	var/datum/gas_mixture/output_air = output.air
-	var/output_pressure = output_air.return_pressure()
-
-
-	if(output_pressure >= target_pressure * 0.999)
-		//No need to mix if target is already full! - 0.1% margin of error so we minimize processing minor gas volumes
-		return 1
-
-	//Calculate necessary moles to transfer using PV=nRT
-
-	var/pressure_delta = target_pressure - output_pressure
-
-	for(var/datum/omni_port/P in inputs)
-		if(P.air.return_temperature() > 0)
-			P.transfer_moles = (P.concentration * pressure_delta) * output_air.return_volume() / (P.air.return_temperature() * R_IDEAL_GAS_EQUATION)
-
-	var/ratio_check = null
-
-	for(var/datum/omni_port/P in inputs)
-		if(!P.transfer_moles)
-			return 1
-		if(P.air.total_moles() < P.transfer_moles)
-			ratio_check = 1
-			continue
-
-	if(ratio_check)
-		var/list/ratio_list = new()
-		for(var/datum/omni_port/P in inputs)
-			ratio_list.Add(P.air.total_moles() / P.transfer_moles)
-
-		var/ratio = min(ratio_list)
-
-		for(var/datum/omni_port/P in inputs)
-			P.transfer_moles *= ratio
-
-	for(var/datum/omni_port/P in inputs)
-		if(P.transfer_moles > 0)
-			output_air.merge(P.air.remove(P.transfer_moles))
-			P.parent.update = 1
-			P.transfer_moles = 0
-
-	output.parent.update = 1
-
-	return 1
-
-/obj/machinery/atmospherics/omni/mixer/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, force_open = 0)
-	usr.set_machine(src)
-
-	ui = SSnanoui.try_update_ui(user, src, ui_key, ui, force_open)
-	if(!ui)
-		ui = new(user, src, ui_key, "omni_mixer.tmpl", "Omni Mixer Control", 360, 330)
-		ui.open()
-
-/obj/machinery/atmospherics/omni/mixer/ui_data(mob/user, datum/topic_state/state)
-	var/data[0]
-
-	data["power"] = on
-	data["config"] = configuring
-
-	var/portData[0]
-	for(var/datum/omni_port/P in ports)
-		if(!configuring && P.mode == 0)
-			continue
-
-		var/input = 0
-		var/output = 0
-		switch(P.mode)
-			if(ATM_INPUT)
-				input = 1
-			if(ATM_OUTPUT)
-				output = 1
-
-		portData[++portData.len] = list("dir" = dir_name(P.dir, capitalize = 1), \
-										"concentration" = P.concentration, \
-										"input" = input, \
-										"output" = output, \
-										"con_lock" = P.con_lock)
-
-	if(portData.len)
-		data["ports"] = portData
-	if(output)
-		data["pressure"] = target_pressure
-
-	return data
-
-/obj/machinery/atmospherics/omni/mixer/Topic(href, href_list)
-	if(..())
-		return 1
-
-	switch(href_list["command"])
-		if("power")
-			if(!configuring)
-				on = !on
-			else
-				on = 0
-		if("configure")
-			configuring = !configuring
-			if(configuring)
-				on = 0
-
-	//only allows config changes when in configuring mode ~otherwise you'll get weird pressure stuff going on
-	if(configuring && !on)
-		switch(href_list["command"])
-			if("set_pressure")
-				var/new_pressure = input(usr,"Enter new output pressure (0-4500kPa)","Pressure control",target_pressure) as num
-				target_pressure = between(0, new_pressure, 4500)
-			if("switch_mode")
-				switch_mode(dir_flag(href_list["dir"]), href_list["mode"])
-			if("switch_con")
-				change_concentration(dir_flag(href_list["dir"]))
-			if("switch_conlock")
-				con_lock(dir_flag(href_list["dir"]))
-
-	update_icon()
-	SSnanoui.update_uis(src)
-	return
-
-/obj/machinery/atmospherics/omni/mixer/proc/switch_mode(var/port = NORTH, var/mode = ATM_NONE)
-	if(mode != ATM_INPUT && mode != ATM_OUTPUT)
-		switch(mode)
-			if("in")
-				mode = ATM_INPUT
-			if("out")
-				mode = ATM_OUTPUT
-			else
-				mode = ATM_NONE
-
-	for(var/datum/omni_port/P in ports)
-		var/old_mode = P.mode
-		if(P.dir == port)
-			switch(mode)
-				if(ATM_INPUT)
-					if(P.mode == ATM_OUTPUT)
-						return
-					P.mode = mode
-				if(ATM_OUTPUT)
-					P.mode = mode
-				if(ATM_NONE)
-					if(P.mode == ATM_OUTPUT)
-						return
-					if(P.mode == ATM_INPUT && inputs.len > 2)
-						P.mode = mode
-		else if(P.mode == ATM_OUTPUT && mode == ATM_OUTPUT)
-			P.mode = ATM_INPUT
-		if(P.mode != old_mode)
-			switch(P.mode)
-				if(ATM_NONE)
-					initialize_directions &= ~P.dir
-					P.disconnect()
-				else
-					initialize_directions |= P.dir
-					P.connect()
-			P.update = 1
-
-	update_ports()
-
-/obj/machinery/atmospherics/omni/mixer/proc/change_concentration(var/port = NORTH)
-	tag_north_con = null
-	tag_south_con = null
-	tag_east_con = null
-	tag_west_con = null
-
-	var/old_con = 0
-	var/non_locked = 0
-	var/remain_con = 1
-
-	for(var/datum/omni_port/P in inputs)
-		if(P.dir == port)
-			old_con = P.concentration
-		else if(!P.con_lock)
-			non_locked++
-		else
-			remain_con -= P.concentration
-
-	//return if no adjustable ports
-	if(non_locked < 1)
-		return
-
-	var/new_con = (input(usr,"Enter a new concentration (0-[round(remain_con * 100, 0.5)])%","Concentration control", min(remain_con, old_con)*100) as num) / 100
-
-	//cap it between 0 and the max remaining concentration
-	new_con = between(0, new_con, remain_con)
-
-	//new_con = min(remain_con, new_con)
-
-	//clamp remaining concentration so we don't go into negatives
-	remain_con = max(0, remain_con - new_con)
-
-	//distribute remaining concentration between unlocked ports evenly
-	remain_con /= max(1, non_locked)
-
-	for(var/datum/omni_port/P in inputs)
-		if(P.dir == port)
-			P.concentration = new_con
-		else if(!P.con_lock)
-			P.concentration = remain_con
-
-/obj/machinery/atmospherics/omni/mixer/proc/con_lock(var/port = NORTH)
-	for(var/datum/omni_port/P in inputs)
-		if(P.dir == port)
-			P.con_lock = !P.con_lock
diff --git a/code/ATMOSPHERICS/components/omni_devices/omni_base.dm b/code/ATMOSPHERICS/components/omni_devices/omni_base.dm
deleted file mode 100644
index d75e2e683c1..00000000000
--- a/code/ATMOSPHERICS/components/omni_devices/omni_base.dm
+++ /dev/null
@@ -1,302 +0,0 @@
-//--------------------------------------------
-// Base omni device
-//--------------------------------------------
-/obj/machinery/atmospherics/omni
-	name = "omni device"
-	icon = 'icons/atmos/omni_devices.dmi'
-	icon_state = "base"
-	use_power = IDLE_POWER_USE
-	initialize_directions = 0
-
-	can_unwrench = 1
-
-	var/on = 0
-	var/configuring = 0
-	var/target_pressure = ONE_ATMOSPHERE
-
-	var/tag_north = ATM_NONE
-	var/tag_south = ATM_NONE
-	var/tag_east = ATM_NONE
-	var/tag_west = ATM_NONE
-
-	var/overlays_on[5]
-	var/overlays_off[5]
-	var/overlays_error[2]
-	var/underlays_current[4]
-
-	var/list/ports = new()
-
-/obj/machinery/atmospherics/omni/New()
-	..()
-	icon_state = "base"
-
-	ports = new()
-	for(var/d in GLOB.cardinal)
-		var/datum/omni_port/new_port = new(src, d)
-		switch(d)
-			if(NORTH)
-				new_port.mode = tag_north
-			if(SOUTH)
-				new_port.mode = tag_south
-			if(EAST)
-				new_port.mode = tag_east
-			if(WEST)
-				new_port.mode = tag_west
-		if(new_port.mode > 0)
-			initialize_directions |= d
-		ports += new_port
-
-	build_icons()
-
-/obj/machinery/atmospherics/omni/Destroy()
-	for(var/datum/omni_port/P in ports)
-		if(P.node)
-			P.node.disconnect(src)
-			P.node = null
-			nullifyPipenet(P.parent)
-	return ..()
-
-/obj/machinery/atmospherics/omni/atmos_init()
-	..()
-	for(var/datum/omni_port/P in ports)
-		if(P.node || P.mode == 0)
-			continue
-		for(var/obj/machinery/atmospherics/target in get_step(src, P.dir))
-			if(target.initialize_directions & get_dir(target,src))
-				P.node = target
-				break
-
-	for(var/datum/omni_port/P in ports)
-		P.update = 1
-
-	update_ports()
-
-/obj/machinery/atmospherics/omni/update_icon()
-	..()
-
-	if(stat & NOPOWER)
-		overlays = overlays_off
-		on = 0
-	else if(error_check())
-		overlays = overlays_error
-		on = 0
-	else
-		overlays = on ? (overlays_on) : (overlays_off)
-
-	underlays = underlays_current
-
-/obj/machinery/atmospherics/omni/proc/error_check()
-	return
-
-/obj/machinery/atmospherics/omni/power_change()
-	var/old_stat = stat
-	..()
-	if(old_stat != stat)
-		update_icon()
-
-/obj/machinery/atmospherics/omni/attackby(var/obj/item/W as obj, var/mob/user as mob, params)
-	if(!istype(W, /obj/item/wrench))
-		return ..()
-
-	if(can_unwrench)
-		var/int_pressure = 0
-		for(var/datum/omni_port/P in ports)
-			int_pressure += P.air.return_pressure()
-		var/datum/gas_mixture/env_air = loc.return_air()
-		if((int_pressure - env_air.return_pressure()) > 2*ONE_ATMOSPHERE)
-			to_chat(user, "<span class='danger'>You cannot unwrench [src], it is too exerted due to internal pressure.</span>")
-			add_fingerprint(user)
-			return 1
-		playsound(loc, W.usesound, 50, 1)
-		to_chat(user, "<span class='notice'>You begin to unfasten \the [src]...</span>")
-		if(do_after(user, 40 * W.toolspeed, target = src))
-			user.visible_message( \
-				"[user] unfastens \the [src].", \
-				"<span class='notice'>You have unfastened \the [src].</span>", \
-				"You hear a ratchet.")
-			new /obj/item/pipe(loc, make_from=src)
-			qdel(src)
-	else
-		return ..()
-
-/obj/machinery/atmospherics/omni/attack_hand(mob/user)
-	if(..())
-		return
-
-	add_fingerprint(usr)
-	ui_interact(user)
-
-/obj/machinery/atmospherics/omni/attack_ghost(mob/user)
-	ui_interact(user)
-
-/obj/machinery/atmospherics/omni/proc/build_icons()
-	if(!check_icon_cache())
-		return
-
-	var/core_icon = null
-	if(istype(src, /obj/machinery/atmospherics/omni/mixer))
-		core_icon = "mixer"
-	else if(istype(src, /obj/machinery/atmospherics/omni/filter))
-		core_icon = "filter"
-	else
-		return
-
-	//directional icons are layers 1-4, with the core icon on layer 5
-	if(core_icon)
-		overlays_off[5] = GLOB.pipe_icon_manager.get_atmos_icon("omni", , , core_icon)
-		overlays_on[5] = GLOB.pipe_icon_manager.get_atmos_icon("omni", , , core_icon + "_glow")
-
-		overlays_error[1] = GLOB.pipe_icon_manager.get_atmos_icon("omni", , , core_icon)
-		overlays_error[2] = GLOB.pipe_icon_manager.get_atmos_icon("omni", , , "error")
-
-/obj/machinery/atmospherics/omni/proc/update_port_icons()
-	if(!check_icon_cache())
-		return
-
-	for(var/datum/omni_port/P in ports)
-		if(P.update)
-			var/ref_layer = 0
-			switch(P.dir)
-				if(NORTH)
-					ref_layer = 1
-				if(SOUTH)
-					ref_layer = 2
-				if(EAST)
-					ref_layer = 3
-				if(WEST)
-					ref_layer = 4
-
-			if(!ref_layer)
-				continue
-
-			var/list/port_icons = select_port_icons(P)
-			if(port_icons)
-				if(P.node)
-					underlays_current[ref_layer] = port_icons["pipe_icon"]
-				else
-					underlays_current[ref_layer] = null
-				overlays_off[ref_layer] = port_icons["off_icon"]
-				overlays_on[ref_layer] = port_icons["on_icon"]
-			else
-				underlays_current[ref_layer] = null
-				overlays_off[ref_layer] = null
-				overlays_on[ref_layer] = null
-
-	update_icon()
-
-/obj/machinery/atmospherics/omni/proc/select_port_icons(var/datum/omni_port/P)
-	if(!istype(P))
-		return
-
-	if(P.mode > 0)
-		var/ic_dir = dir_name(P.dir)
-		var/ic_on = ic_dir
-		var/ic_off = ic_dir
-		switch(P.mode)
-			if(ATM_INPUT)
-				ic_on += "_in_glow"
-				ic_off += "_in"
-			if(ATM_OUTPUT)
-				ic_on += "_out_glow"
-				ic_off += "_out"
-			if(ATM_O2 to ATM_N2O)
-				ic_on += "_filter"
-				ic_off += "_out"
-
-		ic_on = GLOB.pipe_icon_manager.get_atmos_icon("omni", , , ic_on)
-		ic_off = GLOB.pipe_icon_manager.get_atmos_icon("omni", , , ic_off)
-
-		var/pipe_state
-		var/turf/T = get_turf(src)
-		if(!istype(T))
-			return
-		if(T.intact && istype(P.node, /obj/machinery/atmospherics/pipe) && P.node.level == 1 )
-			//pipe_state = GLOB.pipe_icon_manager.get_atmos_icon("underlay_down", P.dir, color_cache_name(P.node))
-			pipe_state = GLOB.pipe_icon_manager.get_atmos_icon("underlay", P.dir, color_cache_name(P.node), "down")
-		else
-			//pipe_state = GLOB.pipe_icon_manager.get_atmos_icon("underlay_intact", P.dir, color_cache_name(P.node))
-			pipe_state = GLOB.pipe_icon_manager.get_atmos_icon("underlay", P.dir, color_cache_name(P.node), "intact")
-
-		return list("on_icon" = ic_on, "off_icon" = ic_off, "pipe_icon" = pipe_state)
-
-/obj/machinery/atmospherics/omni/update_underlays()
-	for(var/datum/omni_port/P in ports)
-		P.update = 1
-	update_ports()
-
-/obj/machinery/atmospherics/omni/hide(var/i)
-	update_underlays()
-
-/obj/machinery/atmospherics/omni/proc/update_ports()
-	sort_ports()
-	update_port_icons()
-	for(var/datum/omni_port/P in ports)
-		P.update = 0
-
-/obj/machinery/atmospherics/omni/proc/sort_ports()
-	return
-
-// Pipenet procs
-/obj/machinery/atmospherics/omni/build_network(remove_deferral = FALSE)
-	for(var/datum/omni_port/P in ports)
-		if(!P.parent)
-			P.parent = new /datum/pipeline()
-			P.parent.build_pipeline(src)
-	..()
-
-/obj/machinery/atmospherics/omni/disconnect(obj/machinery/atmospherics/reference)
-	for(var/datum/omni_port/P in ports)
-		if(reference == P.node)
-			if(istype(P.node, /obj/machinery/atmospherics/pipe))
-				qdel(P.parent)
-			P.node = null
-	update_ports()
-
-/obj/machinery/atmospherics/omni/nullifyPipenet(datum/pipeline/P)
-	..()
-	if(!P)
-		return
-	for(var/datum/omni_port/PO in ports)
-		if(P == PO.parent)
-			PO.parent.other_airs -= PO.air
-			PO.parent = null
-
-/obj/machinery/atmospherics/omni/returnPipenetAir(datum/pipeline/P)
-	for(var/datum/omni_port/PO in ports)
-		if(P == PO.parent)
-			return PO.air
-
-/obj/machinery/atmospherics/omni/pipeline_expansion(datum/pipeline/P)
-	if(P)
-		for(var/datum/omni_port/PO in ports)
-			if(PO.parent == P)
-				return list(PO.node)
-	else
-		var/list/nodes = list()
-		for(var/datum/omni_port/PO in ports)
-			nodes += PO.node
-
-		return nodes
-
-/obj/machinery/atmospherics/omni/setPipenet(datum/pipeline/P, obj/machinery/atmospherics/A)
-	for(var/datum/omni_port/PO in ports)
-		if(A == PO.node)
-			PO.parent = P
-
-/obj/machinery/atmospherics/omni/returnPipenet(obj/machinery/atmospherics/A)
-	for(var/datum/omni_port/P in ports)
-		if(A == P.node)
-			return P.parent
-
-/obj/machinery/atmospherics/omni/replacePipenet(datum/pipeline/Old, datum/pipeline/New)
-	for(var/datum/omni_port/P in ports)
-		if(Old == P.parent)
-			P.parent = New
-
-
-/obj/machinery/atmospherics/omni/process_atmos()
-	..()
-	for(var/datum/omni_port/port in ports)
-		if(!port.parent)
-			return 0
-	return 1
diff --git a/code/ATMOSPHERICS/datum_icon_manager.dm b/code/ATMOSPHERICS/datum_icon_manager.dm
index 2286b3523a0..014fafc5c18 100644
--- a/code/ATMOSPHERICS/datum_icon_manager.dm
+++ b/code/ATMOSPHERICS/datum_icon_manager.dm
@@ -33,7 +33,6 @@
 	//var/list/underlays_intact[]
 	//var/list/pipe_underlays_exposed[]
 	//var/list/pipe_underlays_intact[]
-	var/list/omni_icons[]
 
 /datum/pipe_icon_manager/New()
 	check_icons()
@@ -53,8 +52,6 @@
 			return manifold_icons[state + color]
 		if("device")
 			return device_icons[state]
-		if("omni")
-			return omni_icons[state]
 		if("underlay")
 			return underlays[state + dir + color]
 		//if("underlay_intact")
@@ -75,8 +72,6 @@
 		gen_manifold_icons()
 	if(!device_icons)
 		gen_device_icons()
-	if(!omni_icons)
-		gen_omni_icons()
 	//if(!underlays_intact || !underlays_down || !underlays_exposed || !pipe_underlays_exposed || !pipe_underlays_intact)
 	if(!underlays)
 		gen_underlay_icons()
@@ -150,18 +145,6 @@
 			continue
 		device_icons["scrubber" + state] = image('icons/atmos/vent_scrubber.dmi', icon_state = state)
 
-/datum/pipe_icon_manager/proc/gen_omni_icons()
-	if(!omni_icons)
-		omni_icons = new()
-
-	var/icon/omni = new('icons/atmos/omni_devices.dmi')
-
-	for(var/state in omni.IconStates())
-		if(!state || findtext(state, "map"))
-			continue
-		omni_icons[state] = image('icons/atmos/omni_devices.dmi', icon_state = state)
-
-
 /datum/pipe_icon_manager/proc/gen_underlay_icons()
 
 	if(!underlays)
diff --git a/code/__DEFINES/pipes.dm b/code/__DEFINES/pipes.dm
index c855a5e4260..d56d446ca1d 100644
--- a/code/__DEFINES/pipes.dm
+++ b/code/__DEFINES/pipes.dm
@@ -21,8 +21,6 @@
 #define PIPE_TVALVE					18
 #define PIPE_MANIFOLD4W				19
 #define PIPE_CAP					20
-#define PIPE_OMNI_MIXER				21
-#define PIPE_OMNI_FILTER			22
 #define PIPE_UNIVERSAL				23
 #define PIPE_SUPPLY_STRAIGHT		24
 #define PIPE_SUPPLY_BENT			25
diff --git a/code/datums/pipe_datums.dm b/code/datums/pipe_datums.dm
index 83b77425447..8d3b0807f9c 100644
--- a/code/datums/pipe_datums.dm
+++ b/code/datums/pipe_datums.dm
@@ -351,16 +351,6 @@ GLOBAL_LIST_EMPTY(rpd_pipe_list)			//Some pipes we don't want to be dispensable
 	pipe_id = PIPE_CIRCULATOR
 	pipe_icon = "circ"
 
-/datum/pipes/atmospheric/omni_filter
-	pipe_name = "omni filter"
-	pipe_id = PIPE_OMNI_FILTER
-	pipe_icon = "omni_filter"
-
-/datum/pipes/atmospheric/omni_mixer
-	pipe_name = "omni mixer"
-	pipe_id = PIPE_OMNI_MIXER
-	pipe_icon = "omni_mixer"
-
 /datum/pipes/atmospheric/insulated
 	pipe_name = "insulated pipe"
 	pipe_id = PIPE_INSULATED_STRAIGHT
diff --git a/code/game/machinery/pipe/construction.dm b/code/game/machinery/pipe/construction.dm
index 42452a9f8e2..a8c9710ff6c 100644
--- a/code/game/machinery/pipe/construction.dm
+++ b/code/game/machinery/pipe/construction.dm
@@ -106,10 +106,6 @@
 		else if(istype(make_from, /obj/machinery/atmospherics/unary/passive_vent))
 			src.pipe_type = PIPE_PASV_VENT
 
-		else if(istype(make_from, /obj/machinery/atmospherics/omni/mixer))
-			src.pipe_type = PIPE_OMNI_MIXER
-		else if(istype(make_from, /obj/machinery/atmospherics/omni/filter))
-			src.pipe_type = PIPE_OMNI_FILTER
 		else if(istype(make_from, /obj/machinery/atmospherics/binary/circulator))
 			src.pipe_type = PIPE_CIRCULATOR
 
@@ -259,7 +255,7 @@
 			return dir //dir|acw
 		if(PIPE_CONNECTOR, PIPE_UVENT, PIPE_PASV_VENT, PIPE_SCRUBBER, PIPE_HEAT_EXCHANGE, PIPE_INJECTOR)
 			return dir|flip
-		if(PIPE_MANIFOLD4W, PIPE_SUPPLY_MANIFOLD4W, PIPE_SCRUBBERS_MANIFOLD4W, PIPE_OMNI_MIXER, PIPE_OMNI_FILTER)
+		if(PIPE_MANIFOLD4W, PIPE_SUPPLY_MANIFOLD4W, PIPE_SCRUBBERS_MANIFOLD4W)
 			return dir|flip|cw|acw
 		if(PIPE_MANIFOLD, PIPE_SUPPLY_MANIFOLD, PIPE_SCRUBBERS_MANIFOLD)
 			return flip|cw|acw
@@ -317,7 +313,7 @@
 			dir = 1
 		else if(dir==8)
 			dir = 4
-	else if(pipe_type in list(PIPE_MANIFOLD4W, PIPE_SUPPLY_MANIFOLD4W, PIPE_SCRUBBERS_MANIFOLD4W, PIPE_OMNI_MIXER, PIPE_OMNI_FILTER))
+	else if(pipe_type in list(PIPE_MANIFOLD4W, PIPE_SUPPLY_MANIFOLD4W, PIPE_SCRUBBERS_MANIFOLD4W))
 		dir = 2
 
 /obj/item/pipe/attack_self(mob/user as mob)
@@ -499,14 +495,6 @@
 				P.name = pipename
 			P.on_construction(dir, pipe_dir, color)
 
-		if(PIPE_OMNI_MIXER)
-			var/obj/machinery/atmospherics/omni/mixer/P = new(loc)
-			P.on_construction(dir, pipe_dir, color)
-
-		if(PIPE_OMNI_FILTER)
-			var/obj/machinery/atmospherics/omni/filter/P = new(loc)
-			P.on_construction(dir, pipe_dir, color)
-
 	user.visible_message( \
 		"[user] fastens the [src].", \
 		"<span class='notice'>You have fastened the [src].</span>", \
diff --git a/code/modules/examine/descriptions/atmospherics.dm b/code/modules/examine/descriptions/atmospherics.dm
index 2b113a303d8..fb723336d85 100644
--- a/code/modules/examine/descriptions/atmospherics.dm
+++ b/code/modules/examine/descriptions/atmospherics.dm
@@ -127,15 +127,6 @@
 	description_info = "This filters the atmosphere of harmful gas.  Filtered gas goes to the pipes connected to it, typically a scrubber pipe. \
 	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
-	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."
-
-//Omni mixers
-/obj/machinery/atmospherics/omni/mixer
-	description_info = "Combines gas from custom input and output directions.  The percentage of combined gas can be defined."
-
 //Canisters
 /obj/machinery/portable_atmospherics/canister
 	description_info = "The canister can be connected to a connector port with a wrench.  Tanks of gas (the kind you can hold in your hand) \
diff --git a/icons/atmos/omni_devices.dmi b/icons/atmos/omni_devices.dmi
deleted file mode 100644
index 3e7325b0556..00000000000
Binary files a/icons/atmos/omni_devices.dmi and /dev/null differ
diff --git a/nano/templates/omni_filter.tmpl b/nano/templates/omni_filter.tmpl
deleted file mode 100644
index 8a3ffac0af7..00000000000
--- a/nano/templates/omni_filter.tmpl
+++ /dev/null
@@ -1,86 +0,0 @@
-<div class="item">
-	<div class="itemContent" style="padding: 5px">
-		{{:helper.link(data.power ? 'On' : 'Off', null, {'command' : 'power'}, data.config ? 'disabled' : null)}}
-	</div>
-	<div class="itemContent" style="padding: 5px">
-		{{:helper.link('Configure', null, {'command' : 'configure'}, null, data.config ? 'selected' : null)}}
-	</div>
-
-    {{if data.config}}
-
-        <div style="width: 315px; text-align: center">
-            <div style="float: left">
-                <div class="white" style="height: 26">Port</div>
-                {{for data.ports}}
-                    <div class="average" style="height: 26">{{:value.dir}} Port</div>
-                {{/for}}
-            </div>
-            <div style="float: left; margin-left: 10">
-                <div class="white" style="height: 26">Input</div>
-                {{for data.ports}}
-                    <div style="height: 26">
-                        {{:helper.link(' ', null, {'command' : 'switch_mode', 'mode' : 'in', 'dir' : value.dir}, null, value.input ? 'selected' : null)}}
-                    </div>
-                {{/for}}
-            </div>
-            <div style="float: left; margin-left: 10">
-                <div class="white" style="height: 26">Output</div>
-                {{for data.ports}}
-                    <div style="height: 26">
-                        {{:helper.link(' ', null, {'command' : 'switch_mode', 'mode' : 'out', 'dir' : value.dir}, null, value.output ? 'selected' : null)}}
-                    </div>
-                {{/for}}
-            </div>
-            <div style="float: left; margin-left: 10">
-                <div class="white" style="height: 26">Filter</div>
-                {{for data.ports}}
-                    <div style="height: 26">
-                        {{:helper.link(value.f_type ? value.f_type : 'None', null, {'command' : 'switch_filter', 'mode' : value.f_type, 'dir' : value.dir}, value.filter ? null : 'disabled', value.f_type ? 'selected' : null)}}
-                    </div>
-                {{/for}}
-            </div>
-        </div>
-
-        <div class="itemContent" style="padding: 5px">
-            Set Flow Rate Limit: {{:(data.set_flow_rate/10)}} L/s
-        </div>
-        <div class="itemContent" style="padding: 5px">
-            {{:helper.link('Set Flow Rate Limit', null, {'command' : 'set_flow_rate'})}}
-        </div>
-
-    {{else}}
-
-        <div style="width: 315px; text-align: center">
-            <div style="float: left">
-                <div class="white" style="height: 26">Port</div>
-                {{for data.ports}}
-                    <div class="average" style="height: 26">{{:value.dir}} Port</div>
-                {{/for}}
-            </div>
-            <div style="float: left; margin-left: 10">
-                <div class="white" style="height: 26">Mode</div>
-                {{for data.ports}}
-                    <div style="height: 26">
-                            {{if value.input}}
-                                Input
-                            {{else value.output}}
-                                Output
-                            {{else value.f_type}}
-                                {{:value.f_type}}
-                            {{else}}
-                                Disabled
-                            {{/if}}
-                    </div>
-                {{/for}}
-            </div>
-        </div>
-
-        <div class="itemContent" style="padding: 5px">
-            Set Flow Rate Limit: {{:(data.set_flow_rate/10)}} L/s
-        </div>
-		
-        <div class="itemContent" style="padding: 5px">
-            Flow Rate: {{:(data.last_flow_rate/10)}} L/s
-        </div>
-    {{/if}}
-</div>
\ No newline at end of file
diff --git a/nano/templates/omni_mixer.tmpl b/nano/templates/omni_mixer.tmpl
deleted file mode 100644
index 3d637687553..00000000000
--- a/nano/templates/omni_mixer.tmpl
+++ /dev/null
@@ -1,101 +0,0 @@
-<div class="item">
-	<div class="itemContent" style="padding: 5px">
-		{{:helper.link(data.power ? 'On' : 'Off', null, {'command' : 'power'}, data.config ? 'disabled' : null)}}
-	</div>
-	<div class="itemContent" style="padding: 5px">
-		{{:helper.link('Configure', null, {'command' : 'configure'}, null, data.config ? 'selected' : null)}}
-	</div>
-	
-	{{if data.config}}
-	
-        <div style="width: 315px; text-align: center">
-            <div style="float: left">
-                <div class="white" style="height: 26">Port</div>
-                {{for data.ports}}
-                    <div class="average" style="height: 26">{{:value.dir}} Port</div>
-                {{/for}}
-            </div>
-            <div style="float: left; margin-left: 10">
-                <div class="white" style="height: 26">Input</div>
-                {{for data.ports}}
-                    <div style="height: 26">
-                        {{:helper.link(' ', null, value.input ? {'command' : 'switch_mode', 'mode' : 'none', 'dir' : value.dir} : {'command' : 'switch_mode', 'mode' : 'in', 'dir' : value.dir}, value.output ? 'disabled' : null, value.input ? 'selected' : null)}}
-                    </div>
-                {{/for}}
-            </div>
-            <div style="float: left; margin-left: 10">
-                <div class="white" style="height: 26">Output</div>
-                {{for data.ports}}
-                    <div style="height: 26">
-                        {{:helper.link(' ', null, value.output ? null : {'command' : 'switch_mode', 'mode' : 'out', 'dir' : value.dir}, null, value.output ? 'selected' : null)}}
-                    </div>
-                {{/for}}
-            </div>
-            <div style="float: left; margin-left: 10">
-                <div class="white" style="height: 26">Concentration</div>
-                {{for data.ports}}
-                    <div style="height: 26">
-                        {{:helper.link( value.input ? helper.round(value.concentration*100)+' %' : '-', null, {'command' : 'switch_con', 'dir' : value.dir}, value.input ? null : 'disabled')}}
-                    </div>
-                {{/for}}
-            </div>
-            <div style="float: left; margin-left: 10">
-                <div class="white" style="height: 26">Lock</div>
-                {{for data.ports}}
-                    <div style="height: 26">
-                        {{:helper.link(' ', value.con_lock ? 'lock' : 'unlock', {'command' : 'switch_conlock', 'dir' : value.dir}, value.input ? null : 'disabled', value.con_lock ? 'selected' : null)}}
-                    </div>
-                {{/for}}
-            </div>
-        </div>
-
-        <div class="itemContent" style="padding: 5px">
-            Set Flow Rate Limit: {{:(data.set_flow_rate/10)}} L/s
-        </div>
-        <div class="itemContent" style="padding: 5px">
-            {{:helper.link('Set Flow Rate Limit', null, {'command' : 'set_flow_rate'})}}
-        </div>
-	
-	{{else}}
-	
-        <div style="width: 315px; text-align: center">
-            <div style="float: left">
-                <div class="white" style="height: 26">Port</div>
-                {{for data.ports}}
-                    <div class="average" style="height: 26">{{:value.dir}} Port</div>
-                {{/for}}
-            </div>
-            <div style="float: left; margin-left: 10">
-                <div class="white" style="height: 26">Mode</div>
-                {{for data.ports}}
-                    <div style="height: 26">
-                            {{if value.input}}
-                                Input
-                            {{else value.output}}
-                                Output
-                            {{else}}
-                                Disabled
-                            {{/if}}
-                    </div>
-                {{/for}}
-            </div>
-            <div style="float: left; margin-left: 10">
-                <div class="white" style="height: 26">Concentration</div>
-                {{for data.ports}}
-                    <div style="height: 26">
-                        {{if value.input}}
-                            {{:helper.round(value.concentration*100)}} %
-                        {{else}}
-                            -
-                        {{/if}}
-                    </div>
-                {{/for}}
-            </div>
-        </div>
-
-        <div class="itemContent" style="padding: 5px">
-            Flow Rate: {{:(data.last_flow_rate/10)}} L/s
-        </div>
-
-	{{/if}}
-</div>
\ No newline at end of file
diff --git a/paradise.dme b/paradise.dme
index 5222b6b0067..411ecaf49be 100644
--- a/paradise.dme
+++ b/paradise.dme
@@ -174,10 +174,6 @@
 #include "code\ATMOSPHERICS\components\binary_devices\pump.dm"
 #include "code\ATMOSPHERICS\components\binary_devices\valve.dm"
 #include "code\ATMOSPHERICS\components\binary_devices\volume_pump.dm"
-#include "code\ATMOSPHERICS\components\omni_devices\_omni_extras.dm"
-#include "code\ATMOSPHERICS\components\omni_devices\filter.dm"
-#include "code\ATMOSPHERICS\components\omni_devices\mixer.dm"
-#include "code\ATMOSPHERICS\components\omni_devices\omni_base.dm"
 #include "code\ATMOSPHERICS\components\trinary_devices\filter.dm"
 #include "code\ATMOSPHERICS\components\trinary_devices\mixer.dm"
 #include "code\ATMOSPHERICS\components\trinary_devices\trinary_base.dm"