diff --git a/code/ATMOSPHERICS/components/binary_devices/dp_vent_pump.dm b/code/ATMOSPHERICS/components/binary_devices/dp_vent_pump.dm
index d2fc8cbed43..0d7291a972f 100644
--- a/code/ATMOSPHERICS/components/binary_devices/dp_vent_pump.dm
+++ b/code/ATMOSPHERICS/components/binary_devices/dp_vent_pump.dm
@@ -110,7 +110,7 @@
 			radio_controller.remove_object(src, frequency)
 			frequency = new_frequency
 			if(frequency)
-				radio_connection = radio_controller.add_object(src, frequency)
+				radio_connection = radio_controller.add_object(src, frequency, filter = RADIO_ATMOSIA)
 
 		broadcast_status()
 			if(!radio_connection)
@@ -129,7 +129,7 @@
 			signal.data["output"] = output_pressure_max
 			signal.data["external"] = external_pressure_bound
 
-			radio_connection.post_signal(src, signal)
+			radio_connection.post_signal(src, signal, filter = RADIO_ATMOSIA)
 
 			return 1
 
@@ -143,7 +143,7 @@
 			set_frequency(frequency)
 
 	receive_signal(datum/signal/signal)
-		if(signal.data["tag"] && (signal.data["tag"] != id))
+		if(!signal.data["tag"] || (signal.data["tag"] != id))
 			return 0
 
 		switch(signal.data["command"])
@@ -193,6 +193,7 @@
 
 				external_pressure_bound = number
 
-		if(signal.data["tag"])
-			spawn(5) broadcast_status()
+		//if(signal.data["tag"])
+		spawn(5)
+			broadcast_status()
 		update_icon()
\ No newline at end of file
diff --git a/code/ATMOSPHERICS/components/binary_devices/pump.dm b/code/ATMOSPHERICS/components/binary_devices/pump.dm
index 2fe3d0b12ce..99527a41b11 100644
--- a/code/ATMOSPHERICS/components/binary_devices/pump.dm
+++ b/code/ATMOSPHERICS/components/binary_devices/pump.dm
@@ -77,7 +77,7 @@ obj/machinery/atmospherics/binary/pump
 			radio_controller.remove_object(src, frequency)
 			frequency = new_frequency
 			if(frequency)
-				radio_connection = radio_controller.add_object(src, frequency)
+				radio_connection = radio_controller.add_object(src, frequency, filter = RADIO_ATMOSIA)
 
 		broadcast_status()
 			if(!radio_connection)
@@ -92,7 +92,7 @@ obj/machinery/atmospherics/binary/pump
 			signal.data["power"] = on
 			signal.data["target_output"] = target_pressure
 
-			radio_connection.post_signal(src, signal)
+			radio_connection.post_signal(src, signal, filter = RADIO_ATMOSIA)
 
 			return 1
 		interact(mob/user as mob)
@@ -114,7 +114,7 @@ obj/machinery/atmospherics/binary/pump
 			set_frequency(frequency)
 
 	receive_signal(datum/signal/signal)
-		if(signal.data["tag"] && (signal.data["tag"] != id))
+		if(!signal.data["tag"] || (signal.data["tag"] != id))
 			return 0
 
 		switch(signal.data["command"])
@@ -132,8 +132,8 @@ obj/machinery/atmospherics/binary/pump
 				number = min(max(number, 0), ONE_ATMOSPHERE*50)
 
 				target_pressure = number
-
-		broadcast_status()
+		spawn(5)
+			broadcast_status()
 		update_icon()
 		return
 
diff --git a/code/ATMOSPHERICS/components/binary_devices/volume_pump.dm b/code/ATMOSPHERICS/components/binary_devices/volume_pump.dm
index 32531686567..fa9e5278cb1 100644
--- a/code/ATMOSPHERICS/components/binary_devices/volume_pump.dm
+++ b/code/ATMOSPHERICS/components/binary_devices/volume_pump.dm
@@ -89,7 +89,7 @@ obj/machinery/atmospherics/binary/volume_pump
 		set_frequency(frequency)
 
 	receive_signal(datum/signal/signal)
-		if(signal.data["tag"] && (signal.data["tag"] != id))
+		if(!signal.data["tag"] || (signal.data["tag"] != id))
 			return 0
 
 		switch(signal.data["command"])
@@ -108,6 +108,6 @@ obj/machinery/atmospherics/binary/volume_pump
 
 				transfer_rate = number
 
-		if(signal.data["tag"])
-			spawn(5) broadcast_status()
+		spawn(5)
+			broadcast_status()
 		update_icon()
\ No newline at end of file
diff --git a/code/ATMOSPHERICS/components/filter.dm b/code/ATMOSPHERICS/components/filter.dm
index 9f1ac6b0957..f65e4a0e28f 100644
--- a/code/ATMOSPHERICS/components/filter.dm
+++ b/code/ATMOSPHERICS/components/filter.dm
@@ -45,7 +45,7 @@ Filter types:
 			radio_controller.remove_object(src, frequency)
 			frequency = new_frequency
 			if(frequency)
-				radio_connection = radio_controller.add_object(src, frequency)
+				radio_connection = radio_controller.add_object(src, frequency, RADIO_ATMOSIA)
 
 	New()
 		..()
diff --git a/code/ATMOSPHERICS/components/unary/outlet_injector.dm b/code/ATMOSPHERICS/components/unary/outlet_injector.dm
index d59a96eb60b..2efb9506729 100644
--- a/code/ATMOSPHERICS/components/unary/outlet_injector.dm
+++ b/code/ATMOSPHERICS/components/unary/outlet_injector.dm
@@ -95,7 +95,7 @@
 		set_frequency(frequency)
 
 	receive_signal(datum/signal/signal)
-		if(signal.data["tag"] && (signal.data["tag"] != id))
+		if(!signal.data["tag"] || (signal.data["tag"] != id) || !signal.data["command"])
 			return 0
 
 		switch(signal.data["command"])
@@ -110,6 +110,7 @@
 
 			if("inject")
 				spawn inject()
+				return
 
 			if("set_volume_rate")
 				var/number = text2num(signal.data["parameter"])
@@ -117,8 +118,14 @@
 
 				volume_rate = number
 
-		if(signal.data["tag"])
-			spawn(5) broadcast_status()
+			if("status")
+				//broadcast_status
+
+			else
+				log_admin("DEBUG \[[world.timeofday]\]: outlet_injector/receive_signal: unknown command \"[signal.data["command"]]\"\n[signal.debug_print()]")
+				return
+		spawn(5)
+			broadcast_status()
 		update_icon()
 
 	hide(var/i) //to make the little pipe section invisible, the icon changes.
diff --git a/code/ATMOSPHERICS/components/unary/vent_pump.dm b/code/ATMOSPHERICS/components/unary/vent_pump.dm
index 564710a5be0..5de726a9972 100644
--- a/code/ATMOSPHERICS/components/unary/vent_pump.dm
+++ b/code/ATMOSPHERICS/components/unary/vent_pump.dm
@@ -7,7 +7,7 @@
 
 	level = 1
 	var/area_uid
-	var/id = null
+	var/id_tag = null
 
 	var/on = 0
 	var/pump_direction = 1 //0 = siphoning, 1 = releasing
@@ -33,7 +33,9 @@
 		if (A.master)
 			A = A.master
 		area_uid = A.uid
-		id = "\ref[src]"
+		if (!id_tag)
+			assign_uid()
+			id_tag = num2text(uid)
 		..()
 
 	high_volume
@@ -127,15 +129,17 @@
 			signal.transmission_method = 1 //radio signal
 			signal.source = src
 
-			signal.data["area"] = src.area_uid
-			signal.data["tag"] = src.id
-			signal.data["device"] = "AVP"
-			signal.data["power"] = on?("on"):("off")
-			signal.data["direction"] = pump_direction?("release"):("siphon")
-			signal.data["checks"] = pressure_checks
-			signal.data["internal"] = internal_pressure_bound
-			signal.data["external"] = external_pressure_bound
-			signal.data["timestamp"] = air_master.current_cycle
+			signal.data = list(
+				"area" = src.area_uid,
+				"tag" = src.id_tag,
+				"device" = "AVP",
+				"power" = on?("on"):("off"),
+				"direction" = pump_direction?("release"):("siphon"),
+				"checks" = pressure_checks,
+				"internal" = internal_pressure_bound,
+				"external" = external_pressure_bound,
+				"timestamp" = air_master.current_cycle,
+			)
 
 			radio_connection.post_signal(src, signal, radio_filter_out)
 
@@ -153,7 +157,8 @@
 		update_icon()
 
 	receive_signal(datum/signal/signal)
-		if(!signal.data["tag"] || (signal.data["tag"] != id))
+		//log_admin("DEBUG \[[world.timeofday]\]: /obj/machinery/atmospherics/unary/vent_pump/receive_signal([signal.debug_print()])")
+		if(!signal.data["tag"] || (signal.data["tag"] != id_tag) || !signal.data["command"])
 			return 0
 
 		switch(signal.data["command"])
@@ -203,11 +208,17 @@
 
 			if("init")
 				name = signal.data["parameter"]
+				return
 
-		if(signal.data["tag"])
-			spawn(2)
-				broadcast_status()
-				update_icon()
+			if("status")
+				//broadcast_status
+
+			else
+				log_admin("DEBUG \[[world.timeofday]\]: vent_pump/receive_signal: unknown command \"[signal.data["command"]]\"\n[signal.debug_print()]")
+				return
+		spawn(2)
+			broadcast_status()
+			update_icon()
 		return
 
 	hide(var/i) //to make the little pipe section invisible, the icon changes.
diff --git a/code/ATMOSPHERICS/components/unary/vent_scrubber.dm b/code/ATMOSPHERICS/components/unary/vent_scrubber.dm
index f1af3e73b6e..43e1b571fe7 100644
--- a/code/ATMOSPHERICS/components/unary/vent_scrubber.dm
+++ b/code/ATMOSPHERICS/components/unary/vent_scrubber.dm
@@ -28,7 +28,9 @@
 		if (A.master)
 			A = A.master
 		area_uid = A.uid
-		id_tag = "\ref[src]"
+		if (!id_tag)
+			assign_uid()
+			id_tag = num2text(uid)
 		..()
 
 	update_icon()
@@ -54,16 +56,18 @@
 			var/datum/signal/signal = new
 			signal.transmission_method = 1 //radio signal
 			signal.source = src
-			signal.data["area"] = area_uid
-			signal.data["tag"] = id_tag
-			signal.data["device"] = "AScr"
-			signal.data["timestamp"] = air_master.current_cycle
-			signal.data["on"] = on
-			signal.data["scrubbing"] = scrubbing
-			signal.data["panic"] = panic
-			signal.data["filter_co2"] = scrub_CO2
-			signal.data["filter_toxins"] = scrub_Toxins
-			signal.data["filter_n2o"] = scrub_N2O
+			signal.data = list(
+				"area" = area_uid,
+				"tag" = id_tag,
+				"device" = "AScr",
+				"timestamp" = air_master.current_cycle,
+				"on" = on,
+				"scrubbing" = scrubbing,
+				"panic" = panic,
+				"filter_co2" = scrub_CO2,
+				"filter_toxins" = scrub_Toxins,
+				"filter_n2o" = scrub_N2O,
+			)
 			radio_connection.post_signal(src, signal, radio_filter_out)
 
 			return 1
@@ -154,8 +158,8 @@
 */
 
 	receive_signal(datum/signal/signal)
-		if(!signal.data["tag"] || (signal.data["tag"] != id_tag))
-			return ..()
+		if(!signal.data["tag"] || (signal.data["tag"] != id_tag) || !signal.data["command"])
+			return 0
 
 		switch(signal.data["command"])
 			if("toggle_power")
@@ -179,10 +183,17 @@
 					volume_rate = initial(volume_rate)
 			if("init")
 				name = signal.data["parameter"]
-		if(signal.data["tag"])
-			spawn(2)
-				broadcast_status()
-				update_icon()
+				return
+
+			if("status")
+				//broadcast_status
+
+			else
+				log_admin("DEBUG \[[world.timeofday]\]: vent_scrubber/receive_signal: unknown command \"[signal.data["command"]]\"\n[signal.debug_print()]")
+				return
+		spawn(2)
+			broadcast_status()
+			update_icon()
 		return
 
 	power_change()
diff --git a/code/ATMOSPHERICS/components/valve.dm b/code/ATMOSPHERICS/components/valve.dm
index 4ddbf49ccf5..f383927d2e3 100644
--- a/code/ATMOSPHERICS/components/valve.dm
+++ b/code/ATMOSPHERICS/components/valve.dm
@@ -265,7 +265,7 @@ obj/machinery/atmospherics/valve
 				radio_controller.remove_object(src, frequency)
 				frequency = new_frequency
 				if(frequency)
-					radio_connection = radio_controller.add_object(src, frequency)
+					radio_connection = radio_controller.add_object(src, frequency, RADIO_ATMOSIA)
 
 		var/frequency = 0
 		var/id = null
@@ -277,7 +277,7 @@ obj/machinery/atmospherics/valve
 				set_frequency(frequency)
 
 		receive_signal(datum/signal/signal)
-			if(signal.data["tag"] && (signal.data["tag"] != id))
+			if(!signal.data["tag"] || (signal.data["tag"] != id))
 				return 0
 
 			switch(signal.data["command"])
diff --git a/code/defines/obj/machinery.dm b/code/defines/obj/machinery.dm
index d95a0aa25ca..880f16ea478 100644
--- a/code/defines/obj/machinery.dm
+++ b/code/defines/obj/machinery.dm
@@ -12,6 +12,9 @@
 		active_power_usage = 0
 		power_channel = EQUIP
 		//EQUIP,ENVIRON or LIGHT
+		uid
+		global
+			gl_uid = 1
 
 /obj/machinery/alarm
 	name = "alarm"
diff --git a/code/game/area/areas.dm b/code/game/area/areas.dm
index 7e1a34193ce..e48d928009e 100644
--- a/code/game/area/areas.dm
+++ b/code/game/area/areas.dm
@@ -215,17 +215,13 @@
 // called when power status changes
 
 /area/proc/power_change()
-
-
 	for(var/area/RA in related)
 		for(var/obj/machinery/M in RA)	// for each machine in the area
 			M.power_change()				// reverify power status (to update icons etc.)
-
-		RA.updateicon()
-
+		if (fire || eject || party)
+			RA.updateicon()
 
 /area/proc/usage(var/chan)
-
 	var/used = 0
 	switch(chan)
 		if(LIGHT)
diff --git a/code/game/communications.dm b/code/game/communications.dm
index b4b4ab6ddf9..c2748c90a2d 100644
--- a/code/game/communications.dm
+++ b/code/game/communications.dm
@@ -5,7 +5,7 @@
   Note that /obj/item/device/radio handles transmission using nonstandard way.
   procs:
 
-    add_object(obj/device as obj, var/new_frequency as num, var/filter as num|null = null)
+    add_object(obj/device as obj, var/new_frequency as num, var/filter as text|null = null)
       Adds listening object.
       parameters:
         device - device receiving signals, must have proc receive_signal (see description below).
@@ -30,7 +30,7 @@
   radio_frequency is a global object maintaining list of devices that listening specific frequency.
   procs:
 
-    post_signal(obj/source as obj|null, datum/signal/signal, var/filter as num|null = null, var/range as num|null = null)
+    post_signal(obj/source as obj|null, datum/signal/signal, var/filter as text|null = null, var/range as num|null = null)
       Sends signal to all devices that wants such signal.
       parameters:
         source - object, emitted signal. Usually, devices will not receive their own signals.
@@ -114,16 +114,21 @@ var/const/SYND_FREQ = 1213
 #define TRANSMISSION_RADIO	1
 
 /* filters */
-var/const/RADIO_TO_AIRALARM = 1
-var/const/RADIO_FROM_AIRALARM = 2
-var/const/RADIO_CHAT = 3
+var/const/RADIO_TO_AIRALARM = "1"
+var/const/RADIO_FROM_AIRALARM = "2"
+var/const/RADIO_CHAT = "3"
+var/const/RADIO_ATMOSIA = "4"
+var/const/RADIO_NAVBEACONS = "5"
+var/const/RADIO_AIRLOCK = "6"
+var/const/RADIO_SECBOT = "7"
+var/const/RADIO_MULEBOT = "8"
 
 var/global/datum/controller/radio/radio_controller
 
 datum/controller/radio
 	var/list/datum/radio_frequency/frequencies = list()
 
-	proc/add_object(obj/device as obj, var/new_frequency as num, var/filter = null as num|null)
+	proc/add_object(obj/device as obj, var/new_frequency as num, var/filter = null as text|null)
 		var/f_text = num2text(new_frequency)
 		var/datum/radio_frequency/frequency = frequencies[f_text]
 
@@ -157,19 +162,19 @@ datum/radio_frequency
 	var/list/list/obj/devices = list()
 
 	proc
-		post_signal(obj/source as obj|null, datum/signal/signal, var/filter = null as num|null, var/range = null as num|null)
-//			var/N=0
+		post_signal(obj/source as obj|null, datum/signal/signal, var/filter = null as text|null, var/range = null as num|null)
+			//log_admin("DEBUG \[[world.timeofday]\]: post_signal {source=\"[source]\", [signal.debug_print()], filter=[filter]}")
+//			var/N_f=0
+//			var/N_nf=0
 //			var/Nt=0
-			var/filter_str = num2text(filter)
 			var/turf/start_point
 			if(range)
 				start_point = get_turf(source)
 				if(!start_point)
 					del(signal)
 					return 0
-			if (filter)
-				var/list/obj/devices_line = devices[filter_str]
-				for(var/obj/device in devices_line)
+			if (filter) //here goes some copypasta. It is for optimisation. -rastaf0
+				for(var/obj/device in devices[filter])
 					if(device == source)
 						continue
 					if(range)
@@ -180,6 +185,18 @@ datum/radio_frequency
 						if(start_point.z!=end_point.z || get_dist(start_point, end_point) > range)
 							continue
 					device.receive_signal(signal, TRANSMISSION_RADIO, frequency)
+				for(var/obj/device in devices["_default"])
+					if(device == source)
+						continue
+					if(range)
+						var/turf/end_point = get_turf(device)
+						if(!end_point)
+							continue
+						//if(max(abs(start_point.x-end_point.x), abs(start_point.y-end_point.y)) <= range)
+						if(start_point.z!=end_point.z || get_dist(start_point, end_point) > range)
+							continue
+					device.receive_signal(signal, TRANSMISSION_RADIO, frequency)
+//					N_f++
 			else
 				for (var/next_filter in devices)
 //					var/list/obj/DDD = devices[next_filter]
@@ -195,20 +212,21 @@ datum/radio_frequency
 							if(start_point.z!=end_point.z || get_dist(start_point, end_point) > range)
 								continue
 						device.receive_signal(signal, TRANSMISSION_RADIO, frequency)
-//						N++
-//				log_admin("DEBUG: post_signal(source=[source] ([source.x], [source.y]),filter=[filter]) frequency=[frequency], N=[N],Nt=[Nt]")
+//						N_nf++
 
+//			log_admin("DEBUG: post_signal(source=[source] ([source.x], [source.y], [source.z]),filter=[filter]) frequency=[frequency], N_f=[N_f], N_nf=[N_nf]")
 
 
 			del(signal)
 
-		add_listener(obj/device as obj, var/filter as num|null)
+		add_listener(obj/device as obj, var/filter as text|null)
+			if (!filter)
+				filter = "_default"
 			//log_admin("add_listener(device=[device],filter=[filter]) frequency=[frequency]")
-			var/filter_str = num2text(filter)
-			var/list/obj/devices_line = devices[filter_str]
+			var/list/obj/devices_line = devices[filter]
 			if (!devices_line)
 				devices_line = new
-				devices[filter_str] = devices_line
+				devices[filter] = devices_line
 			devices_line+=device
 //			var/list/obj/devices_line___ = devices[filter_str]
 //			var/l = devices_line___.len
@@ -217,7 +235,14 @@ datum/radio_frequency
 
 		remove_listener(obj/device)
 			for (var/devices_filter in devices)
-				devices[devices_filter]-=device
+				var/list/devices_line = devices[devices_filter]
+				devices_line-=device
+				while (null in devices_line)
+					devices_line -= null
+				if (devices_line.len==0)
+					devices -= devices_filter
+					del(devices_line)
+					
 
 obj/proc
 	receive_signal(datum/signal/signal, receive_method, receive_param)
@@ -237,4 +262,12 @@ datum/signal
 		source = model.source
 		transmission_method = model.transmission_method
 		data = model.data
-		encryption = model.encryption
\ No newline at end of file
+		encryption = model.encryption
+
+	proc/debug_print()
+		if (source)
+			. = "signal = {source = '[source]' ([source:x],[source:y],[source:z])\n"
+		else
+			. = "signal = {source = '[source]' ()\n"
+		for (var/i in data)
+			. += "data\[\"[i]\"\] = \"[data[i]]\"\n"
diff --git a/code/game/machinery/airlock_control.dm b/code/game/machinery/airlock_control.dm
index b0805525fd8..a3a9517a7db 100644
--- a/code/game/machinery/airlock_control.dm
+++ b/code/game/machinery/airlock_control.dm
@@ -59,7 +59,7 @@ obj/machinery/door/airlock
 			signal.data["door_status"] = density?("closed"):("open")
 			signal.data["lock_status"] = locked?("locked"):("unlocked")
 
-			radio_connection.post_signal(src, signal, range = AIRLOCK_CONTROL_RANGE)
+			radio_connection.post_signal(src, signal, range = AIRLOCK_CONTROL_RANGE, filter = RADIO_AIRLOCK)
 
 	open(surpress_send)
 		. = ..()
@@ -74,7 +74,7 @@ obj/machinery/door/airlock
 			radio_controller.remove_object(src, frequency)
 			if(new_frequency)
 				frequency = new_frequency
-				radio_connection = radio_controller.add_object(src, frequency)
+				radio_connection = radio_controller.add_object(src, frequency, RADIO_AIRLOCK)
 
 	initialize()
 		if(frequency)
@@ -119,7 +119,7 @@ obj/machinery/airlock_sensor
 		signal.data["tag"] = master_tag
 		signal.data["command"] = "cycle"
 
-		radio_connection.post_signal(src, signal, range = AIRLOCK_CONTROL_RANGE)
+		radio_connection.post_signal(src, signal, range = AIRLOCK_CONTROL_RANGE, filter = RADIO_AIRLOCK)
 		flick("airlock_sensor_cycle", src)
 
 	process()
@@ -136,7 +136,7 @@ obj/machinery/airlock_sensor
 
 			signal.data["pressure"] = num2text(pressure)
 
-			radio_connection.post_signal(src, signal, range = AIRLOCK_CONTROL_RANGE)
+			radio_connection.post_signal(src, signal, range = AIRLOCK_CONTROL_RANGE, filter = RADIO_AIRLOCK)
 
 		update_icon()
 
@@ -144,7 +144,7 @@ obj/machinery/airlock_sensor
 		set_frequency(new_frequency)
 			radio_controller.remove_object(src, frequency)
 			frequency = new_frequency
-			radio_connection = radio_controller.add_object(src, frequency)
+			radio_connection = radio_controller.add_object(src, frequency, RADIO_AIRLOCK)
 
 	initialize()
 		set_frequency(frequency)
@@ -183,14 +183,14 @@ obj/machinery/access_button
 			signal.data["tag"] = master_tag
 			signal.data["command"] = command
 
-			radio_connection.post_signal(src, signal, range = AIRLOCK_CONTROL_RANGE)
+			radio_connection.post_signal(src, signal, range = AIRLOCK_CONTROL_RANGE, filter = RADIO_AIRLOCK)
 		flick("access_button_cycle", src)
 
 	proc
 		set_frequency(new_frequency)
 			radio_controller.remove_object(src, frequency)
 			frequency = new_frequency
-			radio_connection = radio_controller.add_object(src, frequency)
+			radio_connection = radio_controller.add_object(src, frequency, RADIO_AIRLOCK)
 
 	initialize()
 		set_frequency(frequency)
diff --git a/code/game/machinery/alarm.dm b/code/game/machinery/alarm.dm
index e7d2846d738..b97ec81c5fa 100644
--- a/code/game/machinery/alarm.dm
+++ b/code/game/machinery/alarm.dm
@@ -43,7 +43,7 @@
 			return
 		if (signal.data["area"] != area_uid)
 			return
-		if((!sensors[id_tag] && !vents[id_tag]))
+		if(!(id_tag in sensors) && !(id_tag in vents))
 			register_env_machine(id_tag, signal.data["device"])
 		if(signal.data["device"] == "AScr")
 			sensor_information[id_tag] = signal.data
diff --git a/code/game/machinery/atmo_control.dm b/code/game/machinery/atmo_control.dm
index 36e0a4f0c56..9d61fe411ba 100644
--- a/code/game/machinery/atmo_control.dm
+++ b/code/game/machinery/atmo_control.dm
@@ -55,14 +55,14 @@ obj/machinery/air_sensor
 					signal.data["toxins"] = 0
 					signal.data["nitrogen"] = 0
 					signal.data["carbon_dioxide"] = 0
-			radio_connection.post_signal(src, signal)
+			radio_connection.post_signal(src, signal, filter = RADIO_ATMOSIA)
 
 
 	proc
 		set_frequency(new_frequency)
 			radio_controller.remove_object(src, frequency)
 			frequency = new_frequency
-			radio_connection = radio_controller.add_object(src, frequency)
+			radio_connection = radio_controller.add_object(src, frequency, RADIO_ATMOSIA)
 
 	initialize()
 		set_frequency(frequency)
@@ -178,7 +178,7 @@ obj/machinery/computer/general_air_control
 		set_frequency(new_frequency)
 			radio_controller.remove_object(src, frequency)
 			frequency = new_frequency
-			radio_connection = radio_controller.add_object(src, frequency)
+			radio_connection = radio_controller.add_object(src, frequency, RADIO_ATMOSIA)
 
 	initialize()
 		set_frequency(frequency)
@@ -254,9 +254,9 @@ Max Output Pressure: [output_pressure] kPa<BR>"}
 				signal.source = src
 
 				signal.data["tag"] = input_tag
-				signal.data["status"] = 1
+				signal.data["command"] = "status"
 
-				radio_connection.post_signal(src, signal)
+				radio_connection.post_signal(src, signal, filter = RADIO_ATMOSIA)
 
 			if(href_list["in_toggle_injector"])
 				input_info = null
@@ -270,7 +270,7 @@ Max Output Pressure: [output_pressure] kPa<BR>"}
 				signal.data["tag"] = input_tag
 				signal.data["command"] = "power_toggle"
 
-				radio_connection.post_signal(src, signal)
+				radio_connection.post_signal(src, signal, filter = RADIO_ATMOSIA)
 
 			if(href_list["out_refresh_status"])
 				output_info = null
@@ -282,9 +282,9 @@ Max Output Pressure: [output_pressure] kPa<BR>"}
 				signal.source = src
 
 				signal.data["tag"] = output_tag
-				signal.data["status"] = 1
+				signal.data["command"] = "status"
 
-				radio_connection.post_signal(src, signal)
+				radio_connection.post_signal(src, signal, filter = RADIO_ATMOSIA)
 
 			if(href_list["out_toggle_power"])
 				output_info = null
@@ -298,7 +298,7 @@ Max Output Pressure: [output_pressure] kPa<BR>"}
 				signal.data["tag"] = output_tag
 				signal.data["command"] = "power_toggle"
 
-				radio_connection.post_signal(src, signal)
+				radio_connection.post_signal(src, signal, filter = RADIO_ATMOSIA)
 
 			if(href_list["out_set_pressure"])
 				output_info = null
@@ -313,7 +313,7 @@ Max Output Pressure: [output_pressure] kPa<BR>"}
 				signal.data["command"] = "set_internal_pressure"
 				signal.data["parameter"] = "[pressure_setting]"
 
-				radio_connection.post_signal(src, signal)
+				radio_connection.post_signal(src, signal, filter = RADIO_ATMOSIA)
 
 			if(href_list["adj_pressure"])
 				var/change = text2num(href_list["adj_pressure"])
@@ -393,7 +393,7 @@ Max Output Pressure: [output_pressure] kPa<BR>"}
 				else
 					signal.data["command"] = "power_off"
 
-				radio_connection.post_signal(src, signal)
+				radio_connection.post_signal(src, signal, filter = RADIO_ATMOSIA)
 
 			..()
 
@@ -443,9 +443,9 @@ Rate: [volume_rate] L/sec<BR>"}
 				signal.source = src
 
 				signal.data["tag"] = device_tag
-				signal.data["status"] = 1
+				signal.data["command"] = "status"
 
-				radio_connection.post_signal(src, signal)
+				radio_connection.post_signal(src, signal, filter = RADIO_ATMOSIA)
 
 			if(href_list["toggle_automation"])
 				automation = !automation
@@ -462,7 +462,7 @@ Rate: [volume_rate] L/sec<BR>"}
 				signal.data["tag"] = device_tag
 				signal.data["command"] = "power_toggle"
 
-				radio_connection.post_signal(src, signal)
+				radio_connection.post_signal(src, signal, filter = RADIO_ATMOSIA)
 
 			if(href_list["injection"])
 				if(!radio_connection)
@@ -475,7 +475,7 @@ Rate: [volume_rate] L/sec<BR>"}
 				signal.data["tag"] = device_tag
 				signal.data["command"] = "inject"
 
-				radio_connection.post_signal(src, signal)
+				radio_connection.post_signal(src, signal, filter = RADIO_ATMOSIA)
 
 /obj/machinery/computer/atmos_alert
 	var/datum/radio_frequency/radio_connection
@@ -504,7 +504,7 @@ Rate: [volume_rate] L/sec<BR>"}
 		set_frequency(new_frequency)
 			radio_controller.remove_object(src, receive_frequency)
 			receive_frequency = new_frequency
-			radio_connection = radio_controller.add_object(src, receive_frequency)
+			radio_connection = radio_controller.add_object(src, receive_frequency, RADIO_ATMOSIA)
 
 
 	attack_hand(mob/user)
diff --git a/code/game/machinery/atmoalter/canister.dm b/code/game/machinery/atmoalter/canister.dm
index 097b3170857..4a1be3644ed 100644
--- a/code/game/machinery/atmoalter/canister.dm
+++ b/code/game/machinery/atmoalter/canister.dm
@@ -277,6 +277,20 @@ Release Pressure: <A href='?src=\ref[src];pressure_adj=-1000'>-</A> <A href='?sr
 	src.update_icon()
 	return 1
 
+//Dirty way to fill room with gas. However it is a bit easier to do than creating some floor/engine/n2o -rastaf0
+/obj/machinery/portable_atmospherics/canister/sleeping_agent/roomfiller/New()
+	..()
+	var/datum/gas/sleeping_agent/trace_gas = air_contents.trace_gases[1]
+	trace_gas.moles = 9*4000
+	spawn(10)
+		var/turf/simulated/location = src.loc
+		if (istype(src.loc))
+			while (!location.air)
+				sleep(10)
+			location.assume_air(air_contents)
+			air_contents = new
+	return 1
+
 /obj/machinery/portable_atmospherics/canister/nitrogen/New()
 
 	..()
diff --git a/code/game/machinery/bots/ed209bot.dm b/code/game/machinery/bots/ed209bot.dm
index bdb8cb13181..62cda87a4df 100644
--- a/code/game/machinery/bots/ed209bot.dm
+++ b/code/game/machinery/bots/ed209bot.dm
@@ -80,8 +80,8 @@
 			src.cam.c_tag = src.name
 			src.cam.network = "SS13"
 			if(radio_controller)
-				radio_controller.add_object(src, control_freq)
-				radio_controller.add_object(src, beacon_freq)
+				radio_controller.add_object(src, control_freq, filter = RADIO_SECBOT)
+				radio_controller.add_object(src, beacon_freq, filter = RADIO_NAVBEACONS)
 
 	examine()
 		set src in view()
@@ -553,24 +553,25 @@ Auto Patrol: []"},
 		var/datum/signal/signal = new()
 		signal.source = src
 		signal.transmission_method = 1
-		for(var/key in keyval)
-			signal.data[key] = keyval[key]
+		//for(var/key in keyval)
+		//	signal.data[key] = keyval[key]
 			//world << "sent [key],[keyval[key]] on [freq]"
-
+		signal.data = keyval
 		if (signal.data["findbeacon"])
-			frequency.post_signal(src, signal, null)
+			frequency.post_signal(src, signal, filter = RADIO_NAVBEACONS)
 		else if (signal.data["type"] == "secbot")
-			frequency.post_signal(src, signal, null)
+			frequency.post_signal(src, signal, filter = RADIO_SECBOT)
 		else
 			frequency.post_signal(src, signal)
 
 	// signals bot status etc. to controller
 	proc/send_status()
-		var/list/kv = new()
-		kv["type"] = "secbot"
-		kv["name"] = name
-		kv["loca"] = loc.loc	// area
-		kv["mode"] = mode
+		var/list/kv = list(
+			"type" = "secbot",
+			"name" = name,
+			"loca" = loc.loc,	// area
+			"mode" = mode,
+		)
 		post_signal_multiple(control_freq, kv)
 
 
diff --git a/code/game/machinery/bots/mulebot.dm b/code/game/machinery/bots/mulebot.dm
index 975d28b640e..890cac9d833 100644
--- a/code/game/machinery/bots/mulebot.dm
+++ b/code/game/machinery/bots/mulebot.dm
@@ -80,8 +80,8 @@
 
 		spawn(5)	// must wait for map loading to finish
 			if(radio_controller)
-				radio_controller.add_object(src, control_freq)
-				radio_controller.add_object(src, beacon_freq)
+				radio_controller.add_object(src, control_freq, filter = RADIO_MULEBOT)
+				radio_controller.add_object(src, beacon_freq, filter = RADIO_NAVBEACONS)
 
 			var/count = 0
 			for(var/obj/machinery/bot/mulebot/other in world)
@@ -890,24 +890,31 @@
 		var/datum/signal/signal = new()
 		signal.source = src
 		signal.transmission_method = 1
-		for(var/key in keyval)
-			signal.data[key] = keyval[key]
+		//for(var/key in keyval)
+		//	signal.data[key] = keyval[key]
+		signal.data = keyval
 			//world << "sent [key],[keyval[key]] on [freq]"
-		frequency.post_signal(src, signal)
+		if (signal.data["findbeacon"])
+			frequency.post_signal(src, signal, filter = RADIO_NAVBEACONS)
+		else if (signal.data["type"] == "mulebot")
+			frequency.post_signal(src, signal, filter = RADIO_MULEBOT)
+		else
+			frequency.post_signal(src, signal)
 
 	// signals bot status etc. to controller
 	proc/send_status()
-		var/list/kv = new()
-		kv["type"] = "mulebot"
-		kv["name"] = suffix
-		kv["loca"] = loc.loc	// area
-		kv["mode"] = mode
-		kv["powr"] = cell ? cell.percent() : 0
-		kv["dest"] = destination
-		kv["home"] = home_destination
-		kv["load"] = load
-		kv["retn"] = auto_return
-		kv["pick"] = auto_pickup
+		var/list/kv = list(
+			"type" = "mulebot",
+			"name" = suffix,
+			"loca" = loc.loc,	// area
+			"mode" = mode,
+			"powr" = (cell ? cell.percent() : 0),
+			"dest" = destination,
+			"home" = home_destination,
+			"load" = load,
+			"retn" = auto_return,
+			"pick" = auto_pickup,
+		)
 		post_signal_multiple(control_freq, kv)
 
 
diff --git a/code/game/machinery/bots/secbot.dm b/code/game/machinery/bots/secbot.dm
index 487818cbb78..294f6d1445b 100644
--- a/code/game/machinery/bots/secbot.dm
+++ b/code/game/machinery/bots/secbot.dm
@@ -80,8 +80,8 @@
 			src.cam.c_tag = src.name
 			src.cam.network = "SS13"
 			if(radio_controller)
-				radio_controller.add_object(src, control_freq)
-				radio_controller.add_object(src, beacon_freq)
+				radio_controller.add_object(src, control_freq, filter = RADIO_SECBOT)
+				radio_controller.add_object(src, beacon_freq, filter = RADIO_NAVBEACONS)
 
 	examine()
 		set src in view()
@@ -445,7 +445,7 @@ Auto Patrol: []"},
 	// used for beacon reception
 
 	receive_signal(datum/signal/signal)
-
+		//log_admin("DEBUG \[[world.timeofday]\]: /obj/machinery/bot/secbot/receive_signal([signal.debug_print()])")
 		if(!on)
 			return
 
@@ -532,10 +532,16 @@ Auto Patrol: []"},
 		var/datum/signal/signal = new()
 		signal.source = src
 		signal.transmission_method = 1
-		for(var/key in keyval)
-			signal.data[key] = keyval[key]
+		//for(var/key in keyval)
+		//	signal.data[key] = keyval[key]
+		signal.data = keyval
 			//world << "sent [key],[keyval[key]] on [freq]"
-		frequency.post_signal(src, signal)
+		if (signal.data["findbeacon"])
+			frequency.post_signal(src, signal, filter = RADIO_NAVBEACONS)
+		else if (signal.data["type"] == "secbot")
+			frequency.post_signal(src, signal, filter = RADIO_SECBOT)
+		else
+			frequency.post_signal(src, signal)
 
 	// signals bot status etc. to controller
 	proc/send_status()
diff --git a/code/game/machinery/machinery.dm b/code/game/machinery/machinery.dm
index 5f65916aac6..9f4366ec922 100644
--- a/code/game/machinery/machinery.dm
+++ b/code/game/machinery/machinery.dm
@@ -97,4 +97,8 @@
 			return 1
 
 	src.add_fingerprint(user)
-	return 0
\ No newline at end of file
+	return 0
+
+/obj/machinery/proc/assign_uid()
+	uid = gl_uid
+	gl_uid++
diff --git a/code/game/machinery/navbeacon.dm b/code/game/machinery/navbeacon.dm
index 85ac6339178..88711376da9 100644
--- a/code/game/machinery/navbeacon.dm
+++ b/code/game/machinery/navbeacon.dm
@@ -30,7 +30,7 @@
 
 		spawn(5)	// must wait for map loading to finish
 			if(radio_controller)
-				radio_controller.add_object(src, freq)
+				radio_controller.add_object(src, freq, RADIO_NAVBEACONS)
 
 	// set the transponder codes assoc list from codes_txt
 	proc/set_codes()
@@ -96,7 +96,7 @@
 		for(var/key in codes)
 			signal.data[key] = codes[key]
 
-		frequency.post_signal(src, signal)
+		frequency.post_signal(src, signal, filter = RADIO_NAVBEACONS)
 
 
 	attackby(var/obj/item/I, var/mob/user)
diff --git a/code/game/objects/devices/PDA/radio.dm b/code/game/objects/devices/PDA/radio.dm
index 5f33c01c5a7..de232604e5f 100644
--- a/code/game/objects/devices/PDA/radio.dm
+++ b/code/game/objects/devices/PDA/radio.dm
@@ -13,7 +13,7 @@
 		if (istype(loc.loc, /obj/item/device/pda))
 			hostpda = loc.loc
 
-	proc/post_signal(var/freq, var/key, var/value, var/key2, var/value2, var/key3, var/value3)
+	proc/post_signal(var/freq, var/key, var/value, var/key2, var/value2, var/key3, var/value3, s_filter)
 
 		//world << "Post: [freq]: [key]=[value], [key2]=[value2]"
 		var/datum/radio_frequency/frequency = radio_controller.return_frequency(freq)
@@ -29,7 +29,7 @@
 		if(key3)
 			signal.data[key3] = value3
 
-		frequency.post_signal(src, signal)
+		frequency.post_signal(src, signal, filter = s_filter)
 
 	proc/print_to_host(var/text)
 		if (isnull(src.hostpda))
@@ -56,7 +56,7 @@
 		..()
 		spawn(5)
 			if(radio_controller)
-				radio_controller.add_object(src, control_freq)
+				radio_controller.add_object(src, control_freq, filter = RADIO_SECBOT)
 
 	// receive radio signals
 	// can detect bot status signals
@@ -91,23 +91,23 @@
 
 			if("control")
 				active = locate(href_list["bot"])
-				post_signal(control_freq, "command", "bot_status", "active", active)
+				post_signal(control_freq, "command", "bot_status", "active", active, s_filter = RADIO_SECBOT)
 
 			if("scanbots")		// find all bots
 				botlist = null
-				post_signal(control_freq, "command", "bot_status")
+				post_signal(control_freq, "command", "bot_status", s_filter = RADIO_SECBOT)
 
 			if("botlist")
 				active = null
 
 
 			if("stop", "go")
-				post_signal(control_freq, "command", href_list["op"], "active", active)
-				post_signal(control_freq, "command", "bot_status", "active", active)
+				post_signal(control_freq, "command", href_list["op"], "active", active, s_filter = RADIO_SECBOT)
+				post_signal(control_freq, "command", "bot_status", "active", active, s_filter = RADIO_SECBOT)
 
 			if("summon")
-				post_signal(control_freq, "command", "summon", "active", active, "target", get_turf(PDA) )
-				post_signal(control_freq, "command", "bot_status", "active", active)
+				post_signal(control_freq, "command", "summon", "active", active, "target", get_turf(PDA) , s_filter = RADIO_SECBOT)
+				post_signal(control_freq, "command", "bot_status", "active", active, s_filter = RADIO_SECBOT)
 		PDA.cartridge.unlock()
 
 /obj/item/radio/integrated/mule
@@ -124,10 +124,10 @@
 		..()
 		spawn(5)
 			if(radio_controller)
-				radio_controller.add_object(src, control_freq)
-				radio_controller.add_object(src, beacon_freq)
+				radio_controller.add_object(src, control_freq, filter = RADIO_MULEBOT)
+				radio_controller.add_object(src, beacon_freq, filter = RADIO_NAVBEACONS)
 				spawn(10)
-					post_signal(beacon_freq, "findbeacon", "delivery")
+					post_signal(beacon_freq, "findbeacon", "delivery", filter = RADIO_NAVBEACONS)
 
 	// receive radio signals
 	// can detect bot status signals
@@ -172,43 +172,43 @@
 
 			if("control")
 				active = locate(href_list["bot"])
-				post_signal(control_freq, cmd, "bot_status")
+				post_signal(control_freq, cmd, "bot_status", s_filter = RADIO_MULEBOT)
 
 			if("scanbots")		// find all bots
 				botlist = null
-				post_signal(control_freq, "command", "bot_status")
+				post_signal(control_freq, "command", "bot_status", s_filter = RADIO_MULEBOT)
 
 			if("botlist")
 				active = null
 
 
 			if("unload")
-				post_signal(control_freq, cmd, "unload")
-				post_signal(control_freq, cmd, "bot_status")
+				post_signal(control_freq, cmd, "unload", s_filter = RADIO_MULEBOT)
+				post_signal(control_freq, cmd, "bot_status", s_filter = RADIO_MULEBOT)
 			if("setdest")
 				if(beacons)
 					var/dest = input("Select Bot Destination", "Mulebot [active.suffix] Interlink", active.destination) as null|anything in beacons
 					if(dest)
-						post_signal(control_freq, cmd, "target", "destination", dest)
-						post_signal(control_freq, cmd, "bot_status")
+						post_signal(control_freq, cmd, "target", "destination", dest, s_filter = RADIO_MULEBOT)
+						post_signal(control_freq, cmd, "bot_status", s_filter = RADIO_MULEBOT)
 
 			if("retoff")
-				post_signal(control_freq, cmd, "autoret", "value", 0)
-				post_signal(control_freq, cmd, "bot_status")
+				post_signal(control_freq, cmd, "autoret", "value", 0, s_filter = RADIO_MULEBOT)
+				post_signal(control_freq, cmd, "bot_status", s_filter = RADIO_MULEBOT)
 			if("reton")
-				post_signal(control_freq, cmd, "autoret", "value", 1)
-				post_signal(control_freq, cmd, "bot_status")
+				post_signal(control_freq, cmd, "autoret", "value", 1, s_filter = RADIO_MULEBOT)
+				post_signal(control_freq, cmd, "bot_status", s_filter = RADIO_MULEBOT)
 
 			if("pickoff")
-				post_signal(control_freq, cmd, "autopick", "value", 0)
-				post_signal(control_freq, cmd, "bot_status")
+				post_signal(control_freq, cmd, "autopick", "value", 0, s_filter = RADIO_MULEBOT)
+				post_signal(control_freq, cmd, "bot_status", s_filter = RADIO_MULEBOT)
 			if("pickon")
-				post_signal(control_freq, cmd, "autopick", "value", 1)
-				post_signal(control_freq, cmd, "bot_status")
+				post_signal(control_freq, cmd, "autopick", "value", 1, s_filter = RADIO_MULEBOT)
+				post_signal(control_freq, cmd, "bot_status", s_filter = RADIO_MULEBOT)
 
 			if("stop", "go", "home")
-				post_signal(control_freq, cmd, href_list["op"])
-				post_signal(control_freq, cmd, "bot_status")
+				post_signal(control_freq, cmd, href_list["op"], s_filter = RADIO_MULEBOT)
+				post_signal(control_freq, cmd, "bot_status", s_filter = RADIO_MULEBOT)
 		PDA.cartridge.unlock()
 
 
diff --git a/code/game/objects/radio/radio.dm b/code/game/objects/radio/radio.dm
index 36d91c50599..8d8a64adc2c 100644
--- a/code/game/objects/radio/radio.dm
+++ b/code/game/objects/radio/radio.dm
@@ -15,33 +15,11 @@
 	
 	for (var/ch_name in channels)
 		secure_radio_connections[ch_name] = radio_controller.add_object(src, radiochannels[ch_name],  RADIO_CHAT)
-	/*
-	if(src.secure_frequency)
-		secure_radio_connection = radio_controller.add_object(src, secure_frequency,  RADIO_CHAT)
-	if(src.channels.Find("Medical"))
-		med_connection = radio_controller.add_object(src, med_freq,  RADIO_CHAT)
-	if(src.channels.Find("Science"))
-		sci_connection = radio_controller.add_object(src, sci_freq,  RADIO_CHAT)
-	if(src.channels.Find("Security"))
-		sec_connection = radio_controller.add_object(src, sec_freq,  RADIO_CHAT)
-	if(src.channels.Find("Command"))
-		com_connection = radio_controller.add_object(src, com_freq,  RADIO_CHAT)
-	if(src.channels.Find("Engineer"))
-		eng_connection = radio_controller.add_object(src, eng_freq,  RADIO_CHAT)*/
 
 /obj/item/device/radio
 	var
 		datum/radio_frequency/radio_connection
-		
 		list/datum/radio_frequency/secure_radio_connections = new
-		/*
-		datum/radio_frequency/secure_radio_connection // Shared by Mport2004 for the security headsets -- TLE
-		datum/radio_frequency/med_connection
-		datum/radio_frequency/sci_connection
-		datum/radio_frequency/com_connection
-		datum/radio_frequency/eng_connection
-		datum/radio_frequency/sec_connection*/
-
 	proc
 		set_frequency(new_frequency)
 			radio_controller.remove_object(src, frequency)
diff --git a/code/modules/admin/verbs/diagnostics.dm b/code/modules/admin/verbs/diagnostics.dm
index 7ba632f97e9..24606ed6c05 100644
--- a/code/modules/admin/verbs/diagnostics.dm
+++ b/code/modules/admin/verbs/diagnostics.dm
@@ -116,18 +116,34 @@
 		set category = "Debug"
 		set name = "Radio report"
 
-		var/output = "<b>Radio Report</b><hr>"/*
+		var/filters = list(
+			"1" = "RADIO_TO_AIRALARM",
+			"2" = "RADIO_FROM_AIRALARM",
+			"3" = "RADIO_CHAT",
+			"4" = "RADIO_ATMOSIA",
+			"5" = "RADIO_NAVBEACONS",
+			"6" = "RADIO_AIRLOCK",
+			"7" = "RADIO_SECBOT",
+			"8" = "RADIO_MULEBOT",
+			"_default" = "NO_FILTER"
+			)
+		var/output = "<b>Radio Report</b><hr>"
 		for (var/fq in radio_controller.frequencies)
 			output += "<b>Freq: [fq]</b><br>"
 			var/list/datum/radio_frequency/fqs = radio_controller.frequencies[fq]
-			output += "&nbsp;&nbsp;Voice: [fqs.voice.len]<br>"
-			output += "&nbsp;&nbsp;Broadcast: [fqs.broadcast.len]<br>"
-			output += "&nbsp;&nbsp;Tags: <br>"
-			for (var/tag in fqs.tags)
-				var/list/ctag = fqs.tags[tag]
-				output += "&nbsp;&nbsp;&nbsp;&nbsp;[tag]: [ctag.len]<br>"
-			output += "&nbsp;&nbsp;Groups: <br>"
-			for (var/group in fqs.groups)
-				var/list/cgroup = fqs.groups[group]
-				output += "&nbsp;&nbsp;&nbsp;&nbsp;[group]: [cgroup.len]<br>"*/
+			if (!fqs)
+				output += "&nbsp;&nbsp;<b>ERROR</b><br>"
+				continue
+			for (var/filter in fqs.devices)
+				var/list/f = fqs.devices[filter]
+				if (!f)
+					output += "&nbsp;&nbsp;[filters[filter]]: ERROR<br>"
+					continue
+				output += "&nbsp;&nbsp;[filters[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>"
+					else
+						output += "&nbsp;&nbsp;&nbsp;&nbsp;[device]<br>"
+					
 		usr << browse(output,"window=radioreport")
diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm
index c6fd87555f9..b7b66db72c8 100644
--- a/code/modules/mob/new_player/new_player.dm
+++ b/code/modules/mob/new_player/new_player.dm
@@ -1,6 +1,4 @@
 mob/new_player
-	anchored = 1
-
 	var/datum/preferences/preferences
 	var/ready = 0
 	var/spawning = 0
@@ -14,7 +12,8 @@ mob/new_player
 	anchored = 1	//  don't get pushed around
 
 	Login()
-		..()
+		//Next line is commented out because seem it does nothing helpful and on the other hand it calls mob/new_player/Move() to EACH turf in the world. --rastaf0
+		//..()
 
 		if(!preferences)
 			preferences = new
diff --git a/maps/tgstation.2.0.0.dmm b/maps/tgstation.2.0.0.dmm
index bb3bb81692b..185282d6d8c 100644
--- a/maps/tgstation.2.0.0.dmm
+++ b/maps/tgstation.2.0.0.dmm
@@ -983,7 +983,7 @@
 "asU" = (/obj/grille,/obj/window/reinforced{tag = "icon-rwindow (NORTH)"; icon_state = "rwindow"; dir = 1},/obj/window/reinforced{tag = "icon-rwindow (EAST)"; icon_state = "rwindow"; dir = 4},/obj/window/reinforced,/turf/simulated/floor/plating,/area/storage/tech)
 "asV" = (/obj/machinery/atmospherics/pipe/simple,/obj/machinery/door/airlock/external{autoclose = 0; frequency = 1449; icon_state = "door_locked"; id_tag = "EVA_airlock_exterior"; locked = 1; name = "External Access"; req_access = null; req_access_txt = "13"},/turf/simulated/floor/plating,/area/ai_monitored/storage/eva)
 "asW" = (/obj/machinery/airlock_sensor{pixel_x = 0; pixel_y = -20; id_tag = "EVA_airlock_sensor"; master_tag = "EVA_airlock_control"},/obj/machinery/atmospherics/pipe/simple,/turf/simulated/floor/plating,/area/ai_monitored/storage/eva)
-"asX" = (/obj/machinery/atmospherics/unary/vent_pump/high_volume{frequency = 1449; id = "EVA_airlock_pump"; internal_pressure_bound = 5000; pixel_y = 1; pressure_checks = 1},/turf/simulated/floor/plating,/area/ai_monitored/storage/eva)
+"asX" = (/obj/machinery/atmospherics/unary/vent_pump/high_volume{frequency = 1449; id_tag = "EVA_airlock_pump"; internal_pressure_bound = 5000; pixel_y = 1; pressure_checks = 1},/turf/simulated/floor/plating,/area/ai_monitored/storage/eva)
 "asY" = (/obj/machinery/door/airlock/external{autoclose = 0; frequency = 1449; icon_state = "door_locked"; id_tag = "EVA_airlock_interior"; locked = 1; name = "External Access"; req_access = null; req_access_txt = "13"},/turf/simulated/floor/plating,/area/ai_monitored/storage/eva)
 "asZ" = (/turf/simulated/floor,/area/ai_monitored/storage/eva)
 "ata" = (/obj/table{icon_state = "tabledir"; dir = 10},/obj/item/weapon/storage/toolbox/mechanical,/obj/machinery/light{dir = 1},/turf/simulated/floor,/area/ai_monitored/storage/eva)
@@ -3915,7 +3915,7 @@
 "bxo" = (/obj/machinery/atmospherics/pipe/simple{color = "yellow"; dir = 4; icon_state = "intact-y"; layer = 3; level = 2},/obj/machinery/meter,/turf/simulated/floor{tag = "icon-green (SOUTHEAST)"; icon_state = "green"; dir = 6},/area/atmos)
 "bxp" = (/obj/machinery/atmospherics/pipe/simple{dir = 4; level = 1},/obj/grille,/obj/window/reinforced/west,/obj/window/reinforced/east,/turf/simulated/floor/plating,/area/atmos)
 "bxq" = (/obj/machinery/atmospherics/pipe/simple{color = "yellow"; dir = 4; icon_state = "intact-y"; initialize_directions = 12; layer = 3; level = 1},/obj/lattice,/obj/machinery/atmospherics/pipe/simple{color = "blue"; icon_state = "intact-b"; level = 2},/turf/space,/area)
-"bxr" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; external_pressure_bound = 0; frequency = 1441; icon_state = "in"; id = "waste_out"; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/turf/simulated/floor/engine,/area/atmos)
+"bxr" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; external_pressure_bound = 0; frequency = 1441; icon_state = "in"; id_tag = "waste_out"; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/turf/simulated/floor/engine,/area/atmos)
 "bxs" = (/obj/machinery/computer/operating,/obj/cable{icon_state = "0-4"; d2 = 4},/obj/cable{icon_state = "0-2"; d2 = 2},/obj/cable,/turf/simulated/floor{icon_state = "white"},/area/medical/surgery)
 "bxt" = (/obj/cable{icon_state = "4-8"; d1 = 4; d2 = 8},/turf/simulated/floor{icon_state = "white"},/area/medical/surgery)
 "bxu" = (/obj/machinery/atmospherics/pipe/simple,/obj/cable{icon_state = "1-2"; d1 = 1; d2 = 2},/obj/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor{icon_state = "white"},/area/medical/surgery)
@@ -4216,7 +4216,7 @@
 "bDd" = (/obj/machinery/atmospherics/valve/digital{color = "yellow"; dir = 4; name = "N2O Outlet Valve"},/turf/simulated/floor{tag = "icon-escape (SOUTHEAST)"; icon_state = "escape"; dir = 6},/area/atmos)
 "bDe" = (/obj/machinery/atmospherics/pipe/simple{color = "yellow"; dir = 4; icon_state = "intact-y"; initialize_directions = 12; layer = 3; level = 1},/obj/grille,/obj/window/reinforced/west,/obj/window/reinforced/east,/turf/simulated/floor/plating,/area/atmos)
 "bDf" = (/obj/lattice,/obj/machinery/atmospherics/pipe/simple{color = "yellow"; dir = 4; icon_state = "intact-y"; layer = 3; level = 2},/turf/space,/area)
-"bDg" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; external_pressure_bound = 0; frequency = 1441; icon_state = "in"; id = "n2o_out"; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/turf/simulated/floor/engine,/area/atmos)
+"bDg" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; external_pressure_bound = 0; frequency = 1441; icon_state = "in"; id_tag = "n2o_out"; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/turf/simulated/floor/engine,/area/atmos)
 "bDh" = (/mob/living/carbon/monkey{name = "Dave"},/turf/simulated/floor{icon_state = "white"},/area/medical/virology)
 "bDi" = (/mob/living/carbon/monkey{name = "John"},/turf/simulated/floor{icon_state = "white"},/area/medical/virology)
 "bDj" = (/obj/lattice,/obj/machinery/atmospherics/pipe/simple/insulated,/turf/space,/area)
@@ -4360,7 +4360,7 @@
 "bFR" = (/obj/machinery/atmospherics/pipe/simple{color = "green"; dir = 10; icon_state = "intact-g"; initialize_directions = 10; layer = 3; level = 2},/turf/simulated/wall,/area/atmos)
 "bFS" = (/obj/machinery/atmospherics/valve/digital{color = "yellow"; dir = 4; name = "Plasma Outlet Valve"},/turf/simulated/floor,/area/atmos)
 "bFT" = (/obj/machinery/atmospherics/valve/digital{color = "yellow"; dir = 4; name = "Plasma Outlet Valve"},/turf/simulated/floor{dir = 6; icon_state = "warning"; tag = "icon-warning"},/area/atmos)
-"bFU" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; external_pressure_bound = 0; frequency = 1441; icon_state = "in"; id = "tox_out"; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/turf/simulated/floor/engine{carbon_dioxide = 0; name = "plasma floor"; nitrogen = 0; oxygen = 0; toxins = 70000},/area/atmos)
+"bFU" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; external_pressure_bound = 0; frequency = 1441; icon_state = "in"; id_tag = "tox_out"; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/turf/simulated/floor/engine{carbon_dioxide = 0; name = "plasma floor"; nitrogen = 0; oxygen = 0; toxins = 70000},/area/atmos)
 "bFV" = (/turf/simulated/floor,/area/toxins/test_area)
 "bFW" = (/obj/machinery/light{dir = 1},/turf/simulated/floor,/area/toxins/test_area)
 "bFX" = (/obj/window/reinforced/east{dir = 5},/turf/simulated/floor,/area/toxins/test_area)
@@ -4514,7 +4514,7 @@
 "bIP" = (/obj/machinery/atmospherics/portables_connector{dir = 1; name = "Connector Port (CO2)"},/turf/simulated/floor,/area/atmos)
 "bIQ" = (/obj/machinery/atmospherics/pipe/simple{color = "yellow"; dir = 5; icon_state = "intact-y"; layer = 3; level = 2},/turf/simulated/floor,/area/atmos)
 "bIR" = (/obj/machinery/atmospherics/valve/digital{color = "yellow"; dir = 4; name = "CO2 Outlet Valve"},/turf/simulated/floor{dir = 6; icon_state = "yellow"; tag = "icon-yellow (SOUTHEAST)"},/area/atmos)
-"bIS" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; external_pressure_bound = 0; frequency = 1441; icon_state = "in"; id = "co2_out"; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/turf/simulated/floor/engine{carbon_dioxide = 50000; name = "co2 floor"; nitrogen = 0; oxygen = 0},/area/atmos)
+"bIS" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; external_pressure_bound = 0; frequency = 1441; icon_state = "in"; id_tag = "co2_out"; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/turf/simulated/floor/engine{carbon_dioxide = 50000; name = "co2 floor"; nitrogen = 0; oxygen = 0},/area/atmos)
 "bIT" = (/obj/machinery/light{tag = "icon-tube1 (WEST)"; icon_state = "tube1"; dir = 8},/turf/simulated/floor,/area/toxins/test_area)
 "bIU" = (/obj/cable{icon_state = "2-4"; d1 = 2; d2 = 4},/turf/simulated/floor{icon_state = "white"},/area/toxins/mixing)
 "bIV" = (/obj/machinery/driver_button{id = "toxinsdriver"; pixel_y = -24},/obj/cable{icon_state = "4-8"; d1 = 4; d2 = 8},/turf/simulated/floor{icon_state = "white"},/area/toxins/mixing)
@@ -4717,15 +4717,15 @@
 "bMK" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor,/area/engine/engine_hallway)
 "bML" = (/obj/item/stack/sheet/metal{amount = 50},/obj/item/stack/sheet/metal{amount = 50},/obj/item/stack/sheet/metal{amount = 50},/obj/machinery/atmospherics/pipe/manifold{dir = 4},/turf/simulated/floor,/area/engine/engine_hallway)
 "bMM" = (/obj/table{icon_state = "tabledir"; dir = 10},/obj/item/weapon/airlock_electronics,/obj/item/weapon/airlock_electronics,/obj/item/weapon/airlock_electronics,/obj/item/weapon/module/power_control,/obj/item/weapon/module/power_control,/obj/item/weapon/module/power_control,/turf/simulated/floor,/area/engine/engine_hallway)
-"bMN" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; external_pressure_bound = 0; frequency = 1441; icon_state = "in"; id = "n2_out"; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/turf/simulated/floor/engine{name = "n2 floor"; nitrogen = 100000; oxygen = 0},/area/atmos)
+"bMN" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; external_pressure_bound = 0; frequency = 1441; icon_state = "in"; id_tag = "n2_out"; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/turf/simulated/floor/engine{name = "n2 floor"; nitrogen = 100000; oxygen = 0},/area/atmos)
 "bMO" = (/obj/machinery/air_sensor{frequency = 1441; id_tag = "n2_sensor"},/turf/simulated/floor/engine{name = "n2 floor"; nitrogen = 100000; oxygen = 0},/area/atmos)
 "bMP" = (/obj/machinery/atmospherics/unary/outlet_injector{dir = 1; frequency = 1441; icon_state = "on"; id = "n2_in"; on = 1},/turf/simulated/floor/engine{name = "n2 floor"; nitrogen = 100000; oxygen = 0},/area/atmos)
-"bMQ" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; external_pressure_bound = 0; frequency = 1441; icon_state = "in"; id = "o2_out"; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/turf/simulated/floor/engine{name = "o2 floor"; nitrogen = 0; oxygen = 100000},/area/atmos)
+"bMQ" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; external_pressure_bound = 0; frequency = 1441; icon_state = "in"; id_tag = "o2_out"; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/turf/simulated/floor/engine{name = "o2 floor"; nitrogen = 0; oxygen = 100000},/area/atmos)
 "bMR" = (/obj/machinery/air_sensor{frequency = 1441; id_tag = "o2_sensor"},/turf/simulated/floor/engine{name = "o2 floor"; nitrogen = 0; oxygen = 100000},/area/atmos)
 "bMS" = (/obj/machinery/atmospherics/unary/outlet_injector{dir = 1; frequency = 1441; icon_state = "on"; id = "o2_in"; on = 1},/turf/simulated/floor/engine{name = "o2 floor"; nitrogen = 0; oxygen = 100000},/area/atmos)
 "bMT" = (/obj/machinery/atmospherics/unary/outlet_injector{dir = 1; frequency = 1443; icon_state = "on"; id = "air_in"; on = 1},/turf/simulated/floor/engine{name = "air floor"; nitrogen = 10580; oxygen = 2644},/area/atmos)
 "bMU" = (/obj/machinery/air_sensor{frequency = 1443; id_tag = "air_sensor"; output = 7},/turf/simulated/floor/engine{name = "air floor"; nitrogen = 10580; oxygen = 2644},/area/atmos)
-"bMV" = (/obj/machinery/atmospherics/unary/vent_pump/high_volume{dir = 1; external_pressure_bound = 0; frequency = 1443; icon_state = "in"; id = "air_out"; internal_pressure_bound = 2000; on = 1; pressure_checks = 2; pump_direction = 0},/turf/simulated/floor/engine{name = "air floor"; nitrogen = 10580; oxygen = 2644},/area/atmos)
+"bMV" = (/obj/machinery/atmospherics/unary/vent_pump/high_volume{dir = 1; external_pressure_bound = 0; frequency = 1443; icon_state = "in"; id_tag = "air_out"; internal_pressure_bound = 2000; on = 1; pressure_checks = 2; pump_direction = 0},/turf/simulated/floor/engine{name = "air floor"; nitrogen = 10580; oxygen = 2644},/area/atmos)
 "bMW" = (/obj/machinery/light{tag = "icon-tube1 (EAST)"; icon_state = "tube1"; dir = 4},/turf/simulated/floor,/area/toxins/test_area)
 "bMX" = (/obj/grille,/obj/window/reinforced{tag = "icon-rwindow (WEST)"; icon_state = "rwindow"; dir = 8},/obj/window/reinforced{tag = "icon-rwindow (NORTH)"; icon_state = "rwindow"; dir = 1},/obj/window/reinforced,/turf/simulated/floor/plating,/area/maintenance/aft)
 "bMY" = (/obj/grille,/obj/window/reinforced{tag = "icon-rwindow (NORTH)"; icon_state = "rwindow"; dir = 1},/obj/window/reinforced,/turf/simulated/floor/plating,/area/maintenance/aft)
diff --git a/maps/tgstation.2.0.1.dmm b/maps/tgstation.2.0.1.dmm
index 1bec757635d..a47c5b5e0ae 100644
--- a/maps/tgstation.2.0.1.dmm
+++ b/maps/tgstation.2.0.1.dmm
@@ -956,7 +956,7 @@
 "ast" = (/obj/grille,/obj/window/reinforced{tag = "icon-rwindow (NORTH)"; icon_state = "rwindow"; dir = 1},/obj/window/reinforced{tag = "icon-rwindow (EAST)"; icon_state = "rwindow"; dir = 4},/obj/window/reinforced,/turf/simulated/floor/plating,/area/storage/tech)
 "asu" = (/obj/machinery/atmospherics/pipe/simple,/obj/machinery/door/airlock/external{autoclose = 0; frequency = 1449; icon_state = "door_locked"; id_tag = "EVA_airlock_exterior"; locked = 1; name = "External Access"; req_access = null; req_access_txt = "13"},/turf/simulated/floor/plating,/area/ai_monitored/storage/eva)
 "asv" = (/obj/machinery/airlock_sensor{pixel_x = 0; pixel_y = -20; id_tag = "EVA_airlock_sensor"; master_tag = "EVA_airlock_control"},/obj/machinery/atmospherics/pipe/simple,/turf/simulated/floor/plating,/area/ai_monitored/storage/eva)
-"asw" = (/obj/machinery/atmospherics/unary/vent_pump/high_volume{frequency = 1449; id = "EVA_airlock_pump"; internal_pressure_bound = 5000; pixel_y = 1; pressure_checks = 1},/turf/simulated/floor/plating,/area/ai_monitored/storage/eva)
+"asw" = (/obj/machinery/atmospherics/unary/vent_pump/high_volume{frequency = 1449; id_tag = "EVA_airlock_pump"; internal_pressure_bound = 5000; pixel_y = 1; pressure_checks = 1},/turf/simulated/floor/plating,/area/ai_monitored/storage/eva)
 "asx" = (/obj/machinery/door/airlock/external{autoclose = 0; frequency = 1449; icon_state = "door_locked"; id_tag = "EVA_airlock_interior"; locked = 1; name = "External Access"; req_access = null; req_access_txt = "13"},/turf/simulated/floor/plating,/area/ai_monitored/storage/eva)
 "asy" = (/turf/simulated/floor,/area/ai_monitored/storage/eva)
 "asz" = (/obj/table{icon_state = "tabledir"; dir = 10},/obj/item/weapon/storage/toolbox/mechanical,/obj/machinery/light{dir = 1},/turf/simulated/floor,/area/ai_monitored/storage/eva)
@@ -3908,7 +3908,7 @@
 "bxh" = (/obj/machinery/atmospherics/pipe/simple{dir = 6; icon_state = "intact"; initialize_directions = 6; layer = 3; level = 2},/obj/machinery/light{dir = 4; icon_state = "tube1"; tag = "icon-tube1 (EAST)"},/turf/simulated/floor{icon_state = "white"},/area/toxins/lab)
 "bxi" = (/obj/machinery/atmospherics/binary/pump{color = "green"; dir = 8; icon_state = "intact_off"; name = "Gas Pump"; on = 0},/turf/simulated/wall/r_wall,/area/toxins/server)
 "bxj" = (/obj/machinery/atmospherics/pipe/simple{dir = 4; icon_state = "intact-f"; initialize_directions = 12; layer = 3},/turf/simulated/floor/grid{name = "Server Base"; nitrogen = 500; oxygen = 0; temperature = 80},/area/toxins/server)
-"bxk" = (/obj/cable{icon_state = "1-2"; d1 = 1; d2 = 2},/obj/machinery/atmospherics/unary/vent_pump{dir = 8; external_pressure_bound = 0; frequency = 1441; icon_state = "in"; id = "n2o_out"; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/turf/simulated/floor{icon_state = "dark"; name = "server floor"; nitrogen = 500; oxygen = 0; temperature = 80},/area/toxins/server)
+"bxk" = (/obj/cable{icon_state = "1-2"; d1 = 1; d2 = 2},/obj/machinery/atmospherics/unary/vent_pump{dir = 8; external_pressure_bound = 0; frequency = 1441; icon_state = "in"; id_tag = "n2o_out"; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/turf/simulated/floor{icon_state = "dark"; name = "server floor"; nitrogen = 500; oxygen = 0; temperature = 80},/area/toxins/server)
 "bxl" = (/turf/simulated/wall/r_wall,/area/medical/research{name = "Research Division"})
 "bxm" = (/obj/machinery/door/poddoor{density = 0; icon_state = "pdoor0"; id = "Biohazard"; name = "Biohazard Shutter"; opacity = 0},/turf/simulated/floor{icon_state = "bot"},/area/medical/research{name = "Research Division"})
 "bxn" = (/obj/machinery/door/poddoor{density = 0; icon_state = "pdoor0"; id = "Biohazard"; name = "Biohazard Shutter"; opacity = 0},/obj/cable{icon_state = "1-2"; d1 = 1; d2 = 2},/turf/simulated/floor{icon_state = "bot"},/area/medical/research{name = "Research Division"})
@@ -4015,7 +4015,7 @@
 "bzk" = (/obj/machinery/atmospherics/pipe/simple{color = "yellow"; dir = 4; icon_state = "intact-y"; layer = 3; level = 2},/obj/machinery/meter,/turf/simulated/floor{tag = "icon-green (SOUTHEAST)"; icon_state = "green"; dir = 6},/area/atmos)
 "bzl" = (/obj/machinery/atmospherics/pipe/simple{dir = 4; level = 1},/obj/grille,/obj/window/reinforced/west,/obj/window/reinforced/east,/turf/simulated/floor/plating,/area/atmos)
 "bzm" = (/obj/machinery/atmospherics/pipe/simple{color = "yellow"; dir = 4; icon_state = "intact-y"; initialize_directions = 12; layer = 3; level = 1},/obj/lattice,/obj/machinery/atmospherics/pipe/simple{color = "blue"; icon_state = "intact-b"; level = 2},/turf/space,/area)
-"bzn" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; external_pressure_bound = 0; frequency = 1441; icon_state = "in"; id = "waste_out"; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/turf/simulated/floor/engine,/area/atmos)
+"bzn" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; external_pressure_bound = 0; frequency = 1441; icon_state = "in"; id_tag = "waste_out"; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/turf/simulated/floor/engine,/area/atmos)
 "bzo" = (/obj/grille,/obj/window/reinforced,/obj/window/reinforced{tag = "icon-rwindow (EAST)"; icon_state = "rwindow"; dir = 4},/obj/window/reinforced{tag = "icon-rwindow (WEST)"; icon_state = "rwindow"; dir = 8},/turf/simulated/floor/plating,/area/maintenance/asmaint)
 "bzp" = (/obj/table{icon_state = "tabledir"; dir = 6},/turf/simulated/floor{icon_state = "white"},/area/toxins/lab)
 "bzq" = (/obj/table{icon_state = "tabledir"; dir = 6},/obj/item/weapon/paper{name = "Work in Progress"},/turf/simulated/floor{icon_state = "white"},/area/toxins/lab)
@@ -4354,7 +4354,7 @@
 "bFL" = (/obj/machinery/atmospherics/valve/digital{color = "yellow"; dir = 4; name = "N2O Outlet Valve"},/turf/simulated/floor{tag = "icon-escape (SOUTHEAST)"; icon_state = "escape"; dir = 6},/area/atmos)
 "bFM" = (/obj/machinery/atmospherics/pipe/simple{color = "yellow"; dir = 4; icon_state = "intact-y"; initialize_directions = 12; layer = 3; level = 1},/obj/grille,/obj/window/reinforced/west,/obj/window/reinforced/east,/turf/simulated/floor/plating,/area/atmos)
 "bFN" = (/obj/lattice,/obj/machinery/atmospherics/pipe/simple{color = "yellow"; dir = 4; icon_state = "intact-y"; layer = 3; level = 2},/turf/space,/area)
-"bFO" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; external_pressure_bound = 0; frequency = 1441; icon_state = "in"; id = "n2o_out"; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/turf/simulated/floor/engine,/area/atmos)
+"bFO" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; external_pressure_bound = 0; frequency = 1441; icon_state = "in"; id_tag = "n2o_out"; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/turf/simulated/floor/engine,/area/atmos)
 "bFP" = (/obj/disposalpipe/segment{dir = 1; icon_state = "pipe-c"},/turf/simulated/wall/r_wall,/area/toxins/lab)
 "bFQ" = (/obj/disposalpipe/segment{dir = 8; icon_state = "pipe-c"},/turf/simulated/wall/r_wall,/area/toxins/lab)
 "bFR" = (/obj/securearea{desc = "A warning sign which reads 'NO SMOKING'"; icon_state = "nosmoking2"; name = "NO SMOKING"; tag = "icon-nosmoking2"},/turf/simulated/wall/r_wall,/area/toxins/lab)
@@ -4547,7 +4547,7 @@
 "bJw" = (/obj/machinery/atmospherics/pipe/simple{color = "green"; dir = 10; icon_state = "intact-g"; initialize_directions = 10; layer = 3; level = 2},/turf/simulated/wall,/area/atmos)
 "bJx" = (/obj/machinery/atmospherics/valve/digital{color = "yellow"; dir = 4; name = "Plasma Outlet Valve"},/turf/simulated/floor,/area/atmos)
 "bJy" = (/obj/machinery/atmospherics/valve/digital{color = "yellow"; dir = 4; name = "Plasma Outlet Valve"},/turf/simulated/floor{dir = 6; icon_state = "warning"; tag = "icon-warning"},/area/atmos)
-"bJz" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; external_pressure_bound = 0; frequency = 1441; icon_state = "in"; id = "tox_out"; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/turf/simulated/floor/engine{carbon_dioxide = 0; name = "plasma floor"; nitrogen = 0; oxygen = 0; toxins = 70000},/area/atmos)
+"bJz" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; external_pressure_bound = 0; frequency = 1441; icon_state = "in"; id_tag = "tox_out"; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/turf/simulated/floor/engine{carbon_dioxide = 0; name = "plasma floor"; nitrogen = 0; oxygen = 0; toxins = 70000},/area/atmos)
 "bJA" = (/obj/machinery/atmospherics/portables_connector{dir = 1},/obj/item/device/radio/intercom{pixel_x = -25},/turf/simulated/floor{icon_state = "white"},/area/toxins/lab)
 "bJB" = (/obj/machinery/atmospherics/portables_connector{dir = 1},/turf/simulated/floor{icon_state = "white"},/area/toxins/lab)
 "bJC" = (/obj/table{dir = 10; icon_state = "tabledir"},/obj/item/device/prox_sensor{pixel_x = -4; pixel_y = 1},/obj/item/device/prox_sensor{pixel_x = 0; pixel_y = 2},/obj/item/device/prox_sensor{pixel_x = 8; pixel_y = 9},/obj/item/device/prox_sensor{pixel_x = 9; pixel_y = -2},/turf/simulated/floor{icon_state = "white"},/area/toxins/lab)
@@ -4719,7 +4719,7 @@
 "bMM" = (/obj/machinery/atmospherics/portables_connector{dir = 1; name = "Connector Port (CO2)"},/turf/simulated/floor,/area/atmos)
 "bMN" = (/obj/machinery/atmospherics/pipe/simple{color = "yellow"; dir = 5; icon_state = "intact-y"; layer = 3; level = 2},/turf/simulated/floor,/area/atmos)
 "bMO" = (/obj/machinery/atmospherics/valve/digital{color = "yellow"; dir = 4; name = "CO2 Outlet Valve"},/turf/simulated/floor{dir = 6; icon_state = "yellow"; tag = "icon-yellow (SOUTHEAST)"},/area/atmos)
-"bMP" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; external_pressure_bound = 0; frequency = 1441; icon_state = "in"; id = "co2_out"; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/turf/simulated/floor/engine{carbon_dioxide = 50000; name = "co2 floor"; nitrogen = 0; oxygen = 0},/area/atmos)
+"bMP" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; external_pressure_bound = 0; frequency = 1441; icon_state = "in"; id_tag = "co2_out"; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/turf/simulated/floor/engine{carbon_dioxide = 50000; name = "co2 floor"; nitrogen = 0; oxygen = 0},/area/atmos)
 "bMQ" = (/obj/machinery/portable_atmospherics/pump,/obj/machinery/light/small{dir = 8},/turf/simulated/floor,/area/toxins/lab)
 "bMR" = (/obj/machinery/portable_atmospherics/canister,/obj/window/reinforced{tag = "icon-rwindow (EAST)"; icon_state = "rwindow"; dir = 4},/obj/window/reinforced{tag = "icon-rwindow (WEST)"; icon_state = "rwindow"; dir = 8},/turf/simulated/floor,/area/toxins/lab)
 "bMS" = (/obj/machinery/atmospherics/valve,/turf/simulated/floor{icon_state = "white"},/area/toxins/mixing)
@@ -4963,15 +4963,15 @@
 "bRw" = (/obj/machinery/light{dir = 8},/obj/table{dir = 5; icon_state = "tabledir"},/obj/item/weapon/zippo,/obj/item/weapon/cell{charge = 100; maxcharge = 15000},/turf/simulated/floor,/area/engine/engine_CE_office)
 "bRx" = (/obj/stool/chair,/obj/landmark/start{name = "Chief Engineer"},/turf/simulated/floor,/area/engine/engine_CE_office)
 "bRy" = (/obj/table/reinforced{dir = 5; icon_state = "reinf_tabledir"; tag = "icon-reinf_tabledir (SOUTHWEST)"},/obj/item/weapon/storage/utilitybelt,/obj/item/weapon/weldingtool,/obj/item/weapon/wrench,/obj/cable{icon_state = "1-2"; d1 = 1; d2 = 2},/turf/simulated/floor,/area/engine/engine_CE_office)
-"bRz" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; external_pressure_bound = 0; frequency = 1441; icon_state = "in"; id = "n2_out"; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/turf/simulated/floor/engine{name = "n2 floor"; nitrogen = 100000; oxygen = 0},/area/atmos)
+"bRz" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; external_pressure_bound = 0; frequency = 1441; icon_state = "in"; id_tag = "n2_out"; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/turf/simulated/floor/engine{name = "n2 floor"; nitrogen = 100000; oxygen = 0},/area/atmos)
 "bRA" = (/obj/machinery/air_sensor{frequency = 1441; id_tag = "n2_sensor"},/turf/simulated/floor/engine{name = "n2 floor"; nitrogen = 100000; oxygen = 0},/area/atmos)
 "bRB" = (/obj/machinery/atmospherics/unary/outlet_injector{dir = 1; frequency = 1441; icon_state = "on"; id = "n2_in"; on = 1},/turf/simulated/floor/engine{name = "n2 floor"; nitrogen = 100000; oxygen = 0},/area/atmos)
-"bRC" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; external_pressure_bound = 0; frequency = 1441; icon_state = "in"; id = "o2_out"; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/turf/simulated/floor/engine{name = "o2 floor"; nitrogen = 0; oxygen = 100000},/area/atmos)
+"bRC" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; external_pressure_bound = 0; frequency = 1441; icon_state = "in"; id_tag = "o2_out"; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/turf/simulated/floor/engine{name = "o2 floor"; nitrogen = 0; oxygen = 100000},/area/atmos)
 "bRD" = (/obj/machinery/air_sensor{frequency = 1441; id_tag = "o2_sensor"},/turf/simulated/floor/engine{name = "o2 floor"; nitrogen = 0; oxygen = 100000},/area/atmos)
 "bRE" = (/obj/machinery/atmospherics/unary/outlet_injector{dir = 1; frequency = 1441; icon_state = "on"; id = "o2_in"; on = 1},/turf/simulated/floor/engine{name = "o2 floor"; nitrogen = 0; oxygen = 100000},/area/atmos)
 "bRF" = (/obj/machinery/atmospherics/unary/outlet_injector{dir = 1; frequency = 1443; icon_state = "on"; id = "air_in"; on = 1},/turf/simulated/floor/engine{name = "air floor"; nitrogen = 10580; oxygen = 2644},/area/atmos)
 "bRG" = (/obj/machinery/air_sensor{frequency = 1443; id_tag = "air_sensor"; output = 7},/turf/simulated/floor/engine{name = "air floor"; nitrogen = 10580; oxygen = 2644},/area/atmos)
-"bRH" = (/obj/machinery/atmospherics/unary/vent_pump/high_volume{dir = 1; external_pressure_bound = 0; frequency = 1443; icon_state = "in"; id = "air_out"; internal_pressure_bound = 2000; on = 1; pressure_checks = 2; pump_direction = 0},/turf/simulated/floor/engine{name = "air floor"; nitrogen = 10580; oxygen = 2644},/area/atmos)
+"bRH" = (/obj/machinery/atmospherics/unary/vent_pump/high_volume{dir = 1; external_pressure_bound = 0; frequency = 1443; icon_state = "in"; id_tag = "air_out"; internal_pressure_bound = 2000; on = 1; pressure_checks = 2; pump_direction = 0},/turf/simulated/floor/engine{name = "air floor"; nitrogen = 10580; oxygen = 2644},/area/atmos)
 "bRI" = (/turf/simulated/floor/engine/vacuum,/area/toxins/mixing)
 "bRJ" = (/obj/machinery/atmospherics/pipe/simple/insulated,/turf/simulated/wall/r_wall,/area/toxins/mixing)
 "bRK" = (/obj/machinery/door/airlock/glass{autoclose = 0; frequency = 1449; icon_state = "door_locked"; id_tag = "tox_airlock_exterior"; locked = 1; name = "Mixing Room Exterior Airlock"; req_access_txt = "7"},/turf/simulated/floor{icon_state = "dark"},/area/toxins/mixing)
@@ -5008,7 +5008,7 @@
 "bSp" = (/turf/simulated/floor/engine{name = "air floor"; nitrogen = 10580; oxygen = 2644},/area/atmos)
 "bSq" = (/obj/machinery/light{dir = 8},/turf/simulated/floor/engine/vacuum,/area/toxins/mixing)
 "bSr" = (/obj/machinery/atmospherics/unary/outlet_injector{dir = 1; frequency = 1443; icon_state = "on"; id = "air_in"; on = 1},/obj/machinery/light{dir = 8},/turf/simulated/floor/engine/vacuum,/area/toxins/mixing)
-"bSs" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; external_pressure_bound = 0; frequency = 1441; icon_state = "in"; id = "o2_out"; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/obj/machinery/light{dir = 4; icon_state = "tube1"; tag = "icon-tube1 (EAST)"},/turf/simulated/floor/engine/vacuum,/area/toxins/mixing)
+"bSs" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; external_pressure_bound = 0; frequency = 1441; icon_state = "in"; id_tag = "o2_out"; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/obj/machinery/light{dir = 4; icon_state = "tube1"; tag = "icon-tube1 (EAST)"},/turf/simulated/floor/engine/vacuum,/area/toxins/mixing)
 "bSt" = (/obj/window/reinforced{tag = "icon-rwindow (EAST)"; icon_state = "rwindow"; dir = 4},/obj/machinery/portable_atmospherics/canister/air,/turf/simulated/floor,/area/toxins/storage)
 "bSu" = (/turf/simulated/floor{dir = 8; icon_state = "warning"; tag = "icon-warning"},/area/toxins/storage)
 "bSv" = (/obj/window/reinforced,/obj/machinery/portable_atmospherics/canister/carbon_dioxide,/turf/simulated/floor{dir = 8; icon_state = "warning"; tag = "icon-warning"},/area/toxins/storage)
diff --git a/maps/tgstation.2.0.2.dmm b/maps/tgstation.2.0.2.dmm
index 137cb61ec21..864f557c353 100644
--- a/maps/tgstation.2.0.2.dmm
+++ b/maps/tgstation.2.0.2.dmm
@@ -958,7 +958,7 @@
 "asv" = (/obj/grille,/obj/window/reinforced{tag = "icon-rwindow (NORTH)"; icon_state = "rwindow"; dir = 1},/obj/window/reinforced{tag = "icon-rwindow (EAST)"; icon_state = "rwindow"; dir = 4},/obj/window/reinforced,/turf/simulated/floor/plating,/area/storage/tech)
 "asw" = (/obj/machinery/atmospherics/pipe/simple,/obj/machinery/door/airlock/external{autoclose = 0; frequency = 1449; icon_state = "door_locked"; id_tag = "EVA_airlock_exterior"; locked = 1; name = "External Access"; req_access = null; req_access_txt = "13"},/turf/simulated/floor/plating,/area/ai_monitored/storage/eva)
 "asx" = (/obj/machinery/airlock_sensor{pixel_x = 0; pixel_y = -20; id_tag = "EVA_airlock_sensor"; master_tag = "EVA_airlock_control"},/obj/machinery/atmospherics/pipe/simple,/turf/simulated/floor/plating,/area/ai_monitored/storage/eva)
-"asy" = (/obj/machinery/atmospherics/unary/vent_pump/high_volume{frequency = 1449; id = "EVA_airlock_pump"; internal_pressure_bound = 5000; pixel_y = 1; pressure_checks = 1},/turf/simulated/floor/plating,/area/ai_monitored/storage/eva)
+"asy" = (/obj/machinery/atmospherics/unary/vent_pump/high_volume{frequency = 1449; id_tag = "EVA_airlock_pump"; internal_pressure_bound = 5000; pixel_y = 1; pressure_checks = 1},/turf/simulated/floor/plating,/area/ai_monitored/storage/eva)
 "asz" = (/obj/machinery/door/airlock/external{autoclose = 0; frequency = 1449; icon_state = "door_locked"; id_tag = "EVA_airlock_interior"; locked = 1; name = "External Access"; req_access = null; req_access_txt = "13"},/turf/simulated/floor/plating,/area/ai_monitored/storage/eva)
 "asA" = (/turf/simulated/floor,/area/ai_monitored/storage/eva)
 "asB" = (/obj/table{icon_state = "tabledir"; dir = 10},/obj/item/weapon/storage/toolbox/mechanical,/obj/machinery/light{dir = 1},/turf/simulated/floor,/area/ai_monitored/storage/eva)
@@ -1582,7 +1582,7 @@
 "aEv" = (/obj/machinery/firealarm{dir = 2; pixel_y = 24},/obj/disposalpipe/segment{dir = 1},/obj/machinery/requests_console{department = "Hydroponics"; departmentType = 2; name = "Hydro RC"; pixel_x = 30; pixel_y = 0},/turf/simulated/floor,/area/hydroponics)
 "aEw" = (/obj/machinery/atmospherics/pipe/simple{color = "red"; dir = 4; icon_state = "intact-r-f"; layer = 3; level = 1; name = "pipe"},/turf/simulated/wall,/area/crew_quarters/theatre)
 "aEx" = (/obj/machinery/atmospherics/pipe/manifold{color = "red"; icon_state = "manifold-r-f"; level = 1; name = "pipe manifold"},/turf/simulated/wall,/area/crew_quarters/theatre)
-"aEy" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; frequency = 1445; icon_state = "off"; id_tag = "tox_main_scrub_2"; on = 1; scrub_Toxins = 1},/obj/machinery/door/window{dir = 2; name = "Backstage"; req_access_txt = "46"},/turf/simulated/floor{icon_state = "grimy"},/area/crew_quarters/theatre)
+"aEy" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrub_Toxins = 1},/obj/machinery/door/window{dir = 2; name = "Backstage"; req_access_txt = "46"},/turf/simulated/floor{icon_state = "grimy"},/area/crew_quarters/theatre)
 "aEz" = (/obj/window/reinforced{name = "tinted window"; opacity = 1},/turf/simulated/floor{icon_state = "grimy"},/area/crew_quarters/theatre)
 "aEA" = (/obj/machinery/door/airlock{name = "Backstage"; req_access_txt = "46"},/obj/machinery/atmospherics/pipe/simple{color = "blue"; icon_state = "intact-b-f"; level = 1; name = "pipe"},/turf/simulated/floor,/area/crew_quarters/theatre)
 "aEB" = (/turf/simulated/floor,/area/crew_quarters/theatre)
@@ -1696,7 +1696,7 @@
 "aGF" = (/obj/cable{icon_state = "1-2"; d1 = 1; d2 = 2},/obj/machinery/atmospherics/pipe/manifold{dir = 8},/turf/simulated/floor,/area/crew_quarters/theatre)
 "aGG" = (/obj/rack,/obj/machinery/atmospherics/pipe/simple{color = "red"; dir = 4; icon_state = "intact-r-f"; layer = 3; level = 1; name = "pipe"},/obj/item/clothing/suit/judgerobe,/obj/item/clothing/head/powdered_wig,/obj/machinery/camera{c_tag = "Theatre Storage"; dir = 8; network = "SS13"},/turf/simulated/floor,/area/crew_quarters/theatre)
 "aGH" = (/obj/machinery/atmospherics/pipe/simple{color = "blue"; icon_state = "intact-b-f"; level = 1; name = "pipe"},/obj/machinery/atmospherics/pipe/simple{color = "red"; dir = 4; icon_state = "intact-r-f"; layer = 3; level = 1; name = "pipe"},/turf/simulated/wall,/area/crew_quarters/theatre)
-"aGI" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; frequency = 1445; icon_state = "off"; id_tag = "tox_main_scrub_2"; on = 1; scrub_Toxins = 1},/obj/stool/chair,/obj/item/device/radio/intercom{frequency = 1480; name = "Confessional Intercom"; pixel_x = -25},/turf/simulated/floor{icon_state = "dark"},/area/chapel/main)
+"aGI" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrub_Toxins = 1},/obj/stool/chair,/obj/item/device/radio/intercom{frequency = 1480; name = "Confessional Intercom"; pixel_x = -25},/turf/simulated/floor{icon_state = "dark"},/area/chapel/main)
 "aGJ" = (/turf/simulated/floor{dir = 1; icon_state = "chapel"},/area/chapel/main)
 "aGK" = (/turf/simulated/floor{dir = 4; icon_state = "chapel"},/area/chapel/main)
 "aGL" = (/obj/machinery/atmospherics/pipe/simple{color = "red"; dir = 5; icon_state = "intact-r-f"; layer = 3; level = 1; name = "pipe"},/turf/simulated/floor{dir = 1; icon_state = "chapel"},/area/chapel/main)
@@ -1834,7 +1834,7 @@
 "aJn" = (/turf/simulated/floor{dir = 5; icon_state = "carpetside"; tag = "icon-carpet"},/area/crew_quarters/theatre)
 "aJo" = (/obj/cable{icon_state = "1-2"; d1 = 1; d2 = 2},/obj/machinery/atmospherics/pipe/simple{color = "red"; dir = 5; icon_state = "intact-r-f"; layer = 3; level = 1; name = "pipe"},/turf/simulated/floor,/area/crew_quarters/theatre)
 "aJp" = (/obj/rack,/obj/item/clothing/under/owl,/obj/item/clothing/mask/owl_mask,/obj/machinery/atmospherics/pipe/simple{color = "red"; dir = 4; icon_state = "intact-r-f"; layer = 3; level = 1; name = "pipe"},/obj/machinery/light{dir = 4; icon_state = "tube1"; tag = "icon-tube1 (EAST)"},/turf/simulated/floor,/area/crew_quarters/theatre)
-"aJq" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; frequency = 1445; icon_state = "off"; id_tag = "tox_main_scrub_2"; on = 1; scrub_Toxins = 1},/obj/stool/chair{dir = 1},/obj/item/device/radio/intercom{frequency = 1480; name = "Confessional Intercom"; pixel_x = -25},/turf/simulated/floor{icon_state = "dark"},/area/chapel/main)
+"aJq" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrub_Toxins = 1},/obj/stool/chair{dir = 1},/obj/item/device/radio/intercom{frequency = 1480; name = "Confessional Intercom"; pixel_x = -25},/turf/simulated/floor{icon_state = "dark"},/area/chapel/main)
 "aJr" = (/obj/machinery/door{icon = 'icons/obj/doors/doormorgue.dmi'; name = "Confession Booth"; req_access_txt = "0"},/turf/simulated/floor{icon_state = "dark"},/area/chapel/main)
 "aJs" = (/turf/simulated/floor{dir = 6; icon_state = "carpetsymbol"; tag = "icon-carpet"},/area/chapel/main)
 "aJt" = (/obj/cable{icon_state = "1-2"; d1 = 1; d2 = 2},/turf/simulated/floor{dir = 1; icon_state = "carpetside"; tag = "icon-carpet"},/area/chapel/main)
@@ -3948,7 +3948,7 @@
 "bxV" = (/obj/machinery/atmospherics/pipe/simple{dir = 4; level = 1},/obj/grille,/obj/window/reinforced/west,/obj/window/reinforced/east,/obj/window/reinforced/north,/turf/simulated/floor/plating,/area/atmos)
 "bxW" = (/obj/machinery/atmospherics/pipe/simple{color = "green"; dir = 4; icon_state = "intact-g"; initialize_directions = 12; layer = 3; level = 1},/obj/lattice,/obj/machinery/atmospherics/pipe/simple{color = "blue"; icon_state = "intact-b"; level = 2},/turf/space,/area)
 "bxX" = (/obj/machinery/atmospherics/pipe/simple{dir = 4; level = 1},/obj/grille,/turf/simulated/wall/r_wall,/area/atmos)
-"bxY" = (/obj/machinery/atmospherics/unary/outlet_injector{dir = 8; frequency = 1234; icon_state = "on"; id = "waste_in"; on = 1; pixel_y = 1},/turf/simulated/floor/engine,/area/atmos)
+"bxY" = (/obj/machinery/atmospherics/unary/outlet_injector{dir = 8; frequency = 1441; icon_state = "on"; id = "waste_in"; on = 1; pixel_y = 1},/turf/simulated/floor/engine,/area/atmos)
 "bxZ" = (/obj/machinery/camera{c_tag = "Atmospherics Waste Tank"},/turf/simulated/floor/engine,/area/atmos)
 "bya" = (/turf/simulated/floor/engine,/area/atmos)
 "byb" = (/obj/grille,/obj/window/reinforced{tag = "icon-rwindow (NORTH)"; icon_state = "rwindow"; dir = 1},/obj/window/reinforced{tag = "icon-rwindow (EAST)"; icon_state = "rwindow"; dir = 4},/obj/window/reinforced{tag = "icon-rwindow (WEST)"; icon_state = "rwindow"; dir = 8},/turf/simulated/floor/plating,/area/maintenance/asmaint)
@@ -3956,7 +3956,7 @@
 "byd" = (/obj/machinery/atmospherics/pipe/simple{dir = 6; icon_state = "intact"; initialize_directions = 6; layer = 3; level = 2},/obj/machinery/light{dir = 4; icon_state = "tube1"; tag = "icon-tube1 (EAST)"},/turf/simulated/floor{icon_state = "white"},/area/toxins/lab)
 "bye" = (/obj/machinery/atmospherics/binary/pump{color = "green"; dir = 8; icon_state = "intact_off"; name = "Gas Pump"; on = 0},/turf/simulated/wall/r_wall,/area/toxins/server)
 "byf" = (/obj/machinery/atmospherics/pipe/simple{dir = 4; icon_state = "intact-f"; initialize_directions = 12; layer = 3},/turf/simulated/floor/grid{name = "Server Base"; nitrogen = 500; oxygen = 0; temperature = 80},/area/toxins/server)
-"byg" = (/obj/cable{icon_state = "1-2"; d1 = 1; d2 = 2},/obj/machinery/atmospherics/unary/vent_pump{dir = 8; external_pressure_bound = 0; frequency = 1441; icon_state = "in"; id = "n2o_out"; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/turf/simulated/floor{icon_state = "dark"; name = "server floor"; nitrogen = 500; oxygen = 0; temperature = 80},/area/toxins/server)
+"byg" = (/obj/cable{icon_state = "1-2"; d1 = 1; d2 = 2},/obj/machinery/atmospherics/unary/vent_pump{dir = 8; external_pressure_bound = 0; icon_state = "in"; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/turf/simulated/floor{icon_state = "dark"; name = "server floor"; nitrogen = 500; oxygen = 0; temperature = 80},/area/toxins/server)
 "byh" = (/turf/simulated/wall/r_wall,/area/medical/research{name = "Research Division"})
 "byi" = (/obj/machinery/door/poddoor{density = 0; icon_state = "pdoor0"; id = "Biohazard"; name = "Biohazard Shutter"; opacity = 0},/turf/simulated/floor{icon_state = "bot"},/area/medical/research{name = "Research Division"})
 "byj" = (/obj/machinery/door/poddoor{density = 0; icon_state = "pdoor0"; id = "Biohazard"; name = "Biohazard Shutter"; opacity = 0},/obj/cable{icon_state = "1-2"; d1 = 1; d2 = 2},/turf/simulated/floor{icon_state = "bot"},/area/medical/research{name = "Research Division"})
@@ -4004,9 +4004,9 @@
 "byZ" = (/obj/machinery/atmospherics/pipe/manifold{color = "red"; icon_state = "manifold-r"; level = 2},/obj/machinery/meter,/turf/simulated/floor,/area/atmos)
 "bza" = (/obj/machinery/atmospherics/pipe/simple{color = "green"; icon_state = "intact-g"; level = 2},/obj/machinery/atmospherics/binary/pump{color = "red"; dir = 8; icon_state = "intact_on"; name = "Gas pump (Waste loop)"; on = 1},/turf/simulated/floor,/area/atmos)
 "bzb" = (/obj/machinery/atmospherics/pipe/manifold{color = "red"; dir = 4; icon_state = "manifold-r"; initialize_directions = 11; level = 2},/turf/simulated/floor,/area/atmos)
-"bzc" = (/obj/machinery/computer/general_air_control/large_tank_control{frequency = 1234; input_tag = "waste_in"; name = "Waste Air Tank Control"; output_tag = "waste_out"; sensors = list("waste_sensor" = "Tank")},/turf/simulated/floor{tag = "icon-green (EAST)"; icon_state = "green"; dir = 4},/area/atmos)
+"bzc" = (/obj/machinery/computer/general_air_control/large_tank_control{frequency = 1441; input_tag = "waste_in"; name = "Waste Air Tank Control"; output_tag = "waste_out"; sensors = list("waste_sensor" = "Tank")},/turf/simulated/floor{tag = "icon-green (EAST)"; icon_state = "green"; dir = 4},/area/atmos)
 "bzd" = (/obj/grille,/obj/window/reinforced/west,/obj/window/reinforced/east,/turf/simulated/floor/plating,/area/atmos)
-"bze" = (/obj/machinery/air_sensor{frequency = 1234; id_tag = "waste_sensor"; output = 63},/turf/simulated/floor/engine,/area/atmos)
+"bze" = (/obj/machinery/air_sensor{frequency = 1441; id_tag = "waste_sensor"; output = 63},/turf/simulated/floor/engine,/area/atmos)
 "bzf" = (/obj/machinery/light/small{dir = 4},/turf/simulated/floor/engine,/area/atmos)
 "bzg" = (/obj/grille,/obj/window/reinforced{tag = "icon-rwindow (EAST)"; icon_state = "rwindow"; dir = 4},/obj/window/reinforced{tag = "icon-rwindow (WEST)"; icon_state = "rwindow"; dir = 8},/turf/simulated/floor/plating,/area/maintenance/asmaint)
 "bzh" = (/obj/table{dir = 9; icon_state = "tabledir"},/turf/simulated/floor{icon_state = "white"},/area/toxins/lab)
@@ -4063,7 +4063,7 @@
 "bAg" = (/obj/machinery/atmospherics/pipe/simple{color = "yellow"; dir = 4; icon_state = "intact-y"; layer = 3; level = 2},/obj/machinery/meter,/turf/simulated/floor{tag = "icon-green (SOUTHEAST)"; icon_state = "green"; dir = 6},/area/atmos)
 "bAh" = (/obj/machinery/atmospherics/pipe/simple{dir = 4; level = 1},/obj/grille,/obj/window/reinforced/west,/obj/window/reinforced/east,/turf/simulated/floor/plating,/area/atmos)
 "bAi" = (/obj/machinery/atmospherics/pipe/simple{color = "yellow"; dir = 4; icon_state = "intact-y"; initialize_directions = 12; layer = 3; level = 1},/obj/lattice,/obj/machinery/atmospherics/pipe/simple{color = "blue"; icon_state = "intact-b"; level = 2},/turf/space,/area)
-"bAj" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; external_pressure_bound = 0; frequency = 1234; icon_state = "in"; id = "waste_out"; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/turf/simulated/floor/engine,/area/atmos)
+"bAj" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; external_pressure_bound = 0; frequency = 1441; icon_state = "in"; id_tag = "waste_out"; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/turf/simulated/floor/engine,/area/atmos)
 "bAk" = (/obj/grille,/obj/window/reinforced,/obj/window/reinforced{tag = "icon-rwindow (EAST)"; icon_state = "rwindow"; dir = 4},/obj/window/reinforced{tag = "icon-rwindow (WEST)"; icon_state = "rwindow"; dir = 8},/turf/simulated/floor/plating,/area/maintenance/asmaint)
 "bAl" = (/obj/table{icon_state = "tabledir"; dir = 6},/turf/simulated/floor{icon_state = "white"},/area/toxins/lab)
 "bAm" = (/obj/table{icon_state = "tabledir"; dir = 6},/obj/item/weapon/paper{name = "Work in Progress"},/turf/simulated/floor{icon_state = "white"},/area/toxins/lab)
@@ -4264,7 +4264,7 @@
 "bDZ" = (/obj/machinery/atmospherics/pipe/simple{color = "green"; dir = 4; icon_state = "intact-g"; layer = 3; level = 2},/obj/machinery/atmospherics/pipe/simple{color = "yellow"; icon_state = "intact-y"; level = 2},/turf/simulated/floor,/area/atmos)
 "bEa" = (/obj/machinery/atmospherics/pipe/simple{color = "green"; dir = 4; icon_state = "intact-g"; layer = 3; level = 2},/obj/machinery/atmospherics/pipe/simple{color = "cyan"; icon_state = "intact-c"; level = 2},/turf/simulated/floor,/area/atmos)
 "bEb" = (/obj/machinery/atmospherics/pipe/simple{color = "green"; dir = 10; icon_state = "intact-g"; initialize_directions = 10; layer = 3; level = 2},/turf/simulated/floor,/area/atmos)
-"bEc" = (/obj/machinery/alarm{frequency = 1234; pixel_y = 23},/turf/simulated/floor,/area/atmos)
+"bEc" = (/obj/machinery/alarm{frequency = 1441; pixel_y = 23},/turf/simulated/floor,/area/atmos)
 "bEd" = (/obj/grille,/obj/window/reinforced/east,/obj/window/reinforced/west,/turf/simulated/floor/plating,/area/atmos)
 "bEe" = (/obj/cable{icon_state = "1-2"; d1 = 1; d2 = 2},/obj/machinery/light/small{dir = 4},/turf/simulated/floor/plating,/area/maintenance/asmaint)
 "bEf" = (/obj/table{dir = 2; icon_state = "tabledir"},/obj/machinery/cell_charger{pixel_x = -3; pixel_y = 5},/turf/simulated/floor{icon_state = "white"},/area/toxins/lab)
@@ -4321,7 +4321,7 @@
 "bFe" = (/obj/machinery/atmospherics/pipe/simple{color = "green"; dir = 4; icon_state = "intact-g"; layer = 3; level = 2},/obj/machinery/meter,/turf/simulated/floor{tag = "icon-escape (NORTHEAST)"; icon_state = "escape"; dir = 5},/area/atmos)
 "bFf" = (/obj/machinery/atmospherics/pipe/simple{color = "green"; dir = 4; icon_state = "intact-g"; initialize_directions = 12; layer = 3; level = 1},/obj/grille,/obj/window/reinforced/west,/obj/window/reinforced/east,/turf/simulated/floor/plating,/area/atmos)
 "bFg" = (/obj/lattice,/obj/machinery/atmospherics/pipe/simple{color = "green"; dir = 4; icon_state = "intact-g"; layer = 3; level = 2},/turf/space,/area)
-"bFh" = (/obj/machinery/atmospherics/unary/outlet_injector{dir = 8; frequency = 1234; icon_state = "on"; id = "n2o_in"; on = 1; pixel_y = 1},/turf/simulated/floor/engine,/area/atmos)
+"bFh" = (/obj/machinery/atmospherics/unary/outlet_injector{dir = 8; frequency = 1441; icon_state = "on"; id = "n2o_in"; on = 1; pixel_y = 1},/turf/simulated/floor/engine,/area/atmos)
 "bFi" = (/obj/disposalpipe/segment,/obj/machinery/door/airlock/maintenance{name = "Lab Maintenance"; req_access_txt = "7"},/turf/simulated/floor{icon_state = "white"},/area/toxins/lab)
 "bFj" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/atmospherics/pipe/simple{color = "blue"; icon_state = "intact-b-f"; level = 1; name = "pipe"},/obj/machinery/door/airlock/medical{name = "The Lab"; req_access_txt = "7"},/turf/simulated/floor{icon_state = "white"},/area/medical/research{name = "Research Division"})
 "bFk" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/medical{name = "The Lab"; req_access_txt = "7"},/turf/simulated/floor{icon_state = "white"},/area/medical/research{name = "Research Division"})
@@ -4363,9 +4363,9 @@
 "bFU" = (/obj/machinery/atmospherics/pipe/manifold{color = "cyan"; dir = 4; icon_state = "manifold-c"; initialize_directions = 11; level = 2},/turf/simulated/floor,/area/atmos)
 "bFV" = (/obj/machinery/atmospherics/pipe/simple{color = "yellow"; icon_state = "intact-y"; level = 2},/obj/machinery/meter,/turf/simulated/floor,/area/atmos)
 "bFW" = (/obj/machinery/atmospherics/portables_connector{name = "Connector Port (N2O)"},/turf/simulated/floor,/area/atmos)
-"bFX" = (/obj/machinery/light{tag = "icon-tube1 (EAST)"; icon_state = "tube1"; dir = 4},/obj/machinery/computer/general_air_control/large_tank_control{frequency = 1234; input_tag = "n2o_in"; name = "Nitrous Oxide Supply Control"; output_tag = "n2o_out"; sensors = list("n2o_sensor" = "Tank")},/turf/simulated/floor{tag = "icon-escape (EAST)"; icon_state = "escape"; dir = 4},/area/atmos)
-"bFY" = (/obj/machinery/air_sensor{frequency = 1234; id_tag = "n2o_sensor"},/turf/simulated/floor/engine,/area/atmos)
-"bFZ" = (/obj/machinery/portable_atmospherics/canister/sleeping_agent,/turf/simulated/floor/engine,/area/atmos)
+"bFX" = (/obj/machinery/light{tag = "icon-tube1 (EAST)"; icon_state = "tube1"; dir = 4},/obj/machinery/computer/general_air_control/large_tank_control{frequency = 1441; input_tag = "n2o_in"; name = "Nitrous Oxide Supply Control"; output_tag = "n2o_out"; sensors = list("n2o_sensor" = "Tank")},/turf/simulated/floor{tag = "icon-escape (EAST)"; icon_state = "escape"; dir = 4},/area/atmos)
+"bFY" = (/obj/machinery/air_sensor{frequency = 1441; id_tag = "n2o_sensor"},/turf/simulated/floor/engine,/area/atmos)
+"bFZ" = (/obj/machinery/portable_atmospherics/canister/sleeping_agent/roomfiller,/turf/simulated/floor/engine,/area/atmos)
 "bGa" = (/obj/machinery/disposal,/obj/disposalpipe/trunk,/turf/simulated/floor{icon_state = "white"},/area/toxins/lab)
 "bGb" = (/obj/table{dir = 9; icon_state = "tabledir"},/obj/item/device/transfer_valve{pixel_x = -5},/obj/item/device/transfer_valve{pixel_x = 0},/obj/item/device/transfer_valve{pixel_x = 5},/turf/simulated/floor{icon_state = "white"},/area/toxins/lab)
 "bGc" = (/obj/table{dir = 1; icon_state = "tabledir"},/obj/item/weapon/storage/toolbox/mechanical,/turf/simulated/floor{icon_state = "white"},/area/toxins/lab)
@@ -4412,7 +4412,7 @@
 "bGR" = (/obj/machinery/atmospherics/valve/digital{color = "yellow"; dir = 4; name = "N2O Outlet Valve"},/turf/simulated/floor{tag = "icon-escape (SOUTHEAST)"; icon_state = "escape"; dir = 6},/area/atmos)
 "bGS" = (/obj/machinery/atmospherics/pipe/simple{color = "yellow"; dir = 4; icon_state = "intact-y"; initialize_directions = 12; layer = 3; level = 1},/obj/grille,/obj/window/reinforced/west,/obj/window/reinforced/east,/turf/simulated/floor/plating,/area/atmos)
 "bGT" = (/obj/lattice,/obj/machinery/atmospherics/pipe/simple{color = "yellow"; dir = 4; icon_state = "intact-y"; layer = 3; level = 2},/turf/space,/area)
-"bGU" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; external_pressure_bound = 0; frequency = 1234; icon_state = "in"; id = "n2o_out"; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/turf/simulated/floor/engine,/area/atmos)
+"bGU" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; external_pressure_bound = 0; frequency = 1441; icon_state = "in"; id_tag = "n2o_out"; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/turf/simulated/floor/engine,/area/atmos)
 "bGV" = (/obj/disposalpipe/segment{dir = 1; icon_state = "pipe-c"},/turf/simulated/wall/r_wall,/area/toxins/lab)
 "bGW" = (/obj/disposalpipe/segment{dir = 8; icon_state = "pipe-c"},/turf/simulated/wall/r_wall,/area/toxins/lab)
 "bGX" = (/obj/securearea{desc = "A warning sign which reads 'NO SMOKING'"; icon_state = "nosmoking2"; name = "NO SMOKING"; tag = "icon-nosmoking2"},/turf/simulated/wall/r_wall,/area/toxins/lab)
@@ -4515,7 +4515,7 @@
 "bIQ" = (/obj/machinery/atmospherics/pipe/simple{color = "cyan"; icon_state = "intact-c"; level = 2},/turf/simulated/floor,/area/atmos)
 "bIR" = (/obj/machinery/atmospherics/valve/digital{color = "green"; dir = 4; name = "Plasma Intake Valve"},/turf/simulated/floor,/area/atmos)
 "bIS" = (/obj/machinery/atmospherics/pipe/simple{color = "green"; dir = 4; icon_state = "intact-g"; layer = 3; level = 2},/obj/machinery/meter,/turf/simulated/floor{dir = 5; icon_state = "warning"; tag = "icon-warning"},/area/atmos)
-"bIT" = (/obj/machinery/atmospherics/unary/outlet_injector{dir = 8; frequency = 1234; icon_state = "on"; id = "tox_in"; on = 1; pixel_y = 1},/turf/simulated/floor/engine{carbon_dioxide = 0; name = "plasma floor"; nitrogen = 0; oxygen = 0; toxins = 70000},/area/atmos)
+"bIT" = (/obj/machinery/atmospherics/unary/outlet_injector{dir = 8; frequency = 1441; icon_state = "on"; id = "tox_in"; on = 1; pixel_y = 1},/turf/simulated/floor/engine{carbon_dioxide = 0; name = "plasma floor"; nitrogen = 0; oxygen = 0; toxins = 70000},/area/atmos)
 "bIU" = (/turf/simulated/floor/engine{carbon_dioxide = 0; name = "plasma floor"; nitrogen = 0; oxygen = 0; toxins = 70000},/area/atmos)
 "bIV" = (/obj/landmark{name = "xeno_spawn"; pixel_x = -1},/turf/simulated/floor/engine{carbon_dioxide = 0; name = "plasma floor"; nitrogen = 0; oxygen = 0; toxins = 70000},/area/atmos)
 "bIW" = (/obj/machinery/atmospherics/pipe/simple{icon_state = "intact"; level = 2},/obj/machinery/meter,/turf/simulated/floor{icon_state = "white"},/area/toxins/lab)
@@ -4561,8 +4561,8 @@
 "bJK" = (/obj/machinery/atmospherics/pipe/simple{color = "green"; icon_state = "intact-g"; level = 2},/obj/cable{d2 = 8; icon_state = "0-8"},/obj/cable,/obj/cable{icon_state = "0-2"; d2 = 2},/turf/simulated/floor,/area/atmos)
 "bJL" = (/obj/machinery/pipedispenser,/turf/simulated/floor,/area/atmos)
 "bJM" = (/obj/machinery/atmospherics/portables_connector{name = "Connector Port (Toxins)"},/turf/simulated/floor,/area/atmos)
-"bJN" = (/obj/machinery/light{tag = "icon-tube1 (EAST)"; icon_state = "tube1"; dir = 4},/obj/machinery/computer/general_air_control/large_tank_control{frequency = 1234; input_tag = "tox_in"; name = "Toxin Supply Control"; output_tag = "tox_out"; sensors = list("tox_sensor" = "Tank")},/turf/simulated/floor{dir = 4; icon_state = "warning"; tag = "icon-warning"},/area/atmos)
-"bJO" = (/obj/machinery/air_sensor{frequency = 1234; id_tag = "tox_sensor"},/turf/simulated/floor/engine{carbon_dioxide = 0; name = "plasma floor"; nitrogen = 0; oxygen = 0; toxins = 70000},/area/atmos)
+"bJN" = (/obj/machinery/light{tag = "icon-tube1 (EAST)"; icon_state = "tube1"; dir = 4},/obj/machinery/computer/general_air_control/large_tank_control{frequency = 1441; input_tag = "tox_in"; name = "Toxin Supply Control"; output_tag = "tox_out"; sensors = list("tox_sensor" = "Tank")},/turf/simulated/floor{dir = 4; icon_state = "warning"; tag = "icon-warning"},/area/atmos)
+"bJO" = (/obj/machinery/air_sensor{frequency = 1441; id_tag = "tox_sensor"},/turf/simulated/floor/engine{carbon_dioxide = 0; name = "plasma floor"; nitrogen = 0; oxygen = 0; toxins = 70000},/area/atmos)
 "bJP" = (/obj/machinery/portable_atmospherics/canister/toxins,/turf/simulated/floor/engine{carbon_dioxide = 0; name = "plasma floor"; nitrogen = 0; oxygen = 0; toxins = 70000},/area/atmos)
 "bJQ" = (/obj/machinery/light/small{dir = 4},/turf/simulated/floor/engine{carbon_dioxide = 0; name = "plasma floor"; nitrogen = 0; oxygen = 0; toxins = 70000},/area/atmos)
 "bJR" = (/obj/cable{icon_state = "1-2"; d1 = 1; d2 = 2},/obj/landmark{name = "blobstart"; pixel_x = -1},/turf/simulated/floor/plating,/area/maintenance/asmaint)
@@ -4610,7 +4610,7 @@
 "bKH" = (/obj/machinery/atmospherics/pipe/simple{color = "green"; dir = 10; icon_state = "intact-g"; initialize_directions = 10; layer = 3; level = 2},/turf/simulated/wall,/area/atmos)
 "bKI" = (/obj/machinery/atmospherics/valve/digital{color = "yellow"; dir = 4; name = "Plasma Outlet Valve"},/turf/simulated/floor,/area/atmos)
 "bKJ" = (/obj/machinery/atmospherics/valve/digital{color = "yellow"; dir = 4; name = "Plasma Outlet Valve"},/turf/simulated/floor{dir = 6; icon_state = "warning"; tag = "icon-warning"},/area/atmos)
-"bKK" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; external_pressure_bound = 0; frequency = 1234; icon_state = "in"; id = "tox_out"; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/turf/simulated/floor/engine{carbon_dioxide = 0; name = "plasma floor"; nitrogen = 0; oxygen = 0; toxins = 70000},/area/atmos)
+"bKK" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; external_pressure_bound = 0; frequency = 1441; icon_state = "in"; id_tag = "tox_out"; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/turf/simulated/floor/engine{carbon_dioxide = 0; name = "plasma floor"; nitrogen = 0; oxygen = 0; toxins = 70000},/area/atmos)
 "bKL" = (/obj/machinery/atmospherics/portables_connector{dir = 1},/obj/item/device/radio/intercom{pixel_x = -25},/turf/simulated/floor{icon_state = "white"},/area/toxins/lab)
 "bKM" = (/obj/machinery/atmospherics/portables_connector{dir = 1},/turf/simulated/floor{icon_state = "white"},/area/toxins/lab)
 "bKN" = (/obj/table{dir = 10; icon_state = "tabledir"},/obj/item/device/prox_sensor{pixel_x = -4; pixel_y = 1},/obj/item/device/prox_sensor{pixel_x = 0; pixel_y = 2},/obj/item/device/prox_sensor{pixel_x = 8; pixel_y = 9},/obj/item/device/prox_sensor{pixel_x = 9; pixel_y = -2},/turf/simulated/floor{icon_state = "white"},/area/toxins/lab)
@@ -4702,7 +4702,7 @@
 "bMv" = (/obj/machinery/atmospherics/valve/digital{color = "yellow"; name = "CO2 Outlet Valve"},/turf/simulated/floor,/area/atmos)
 "bMw" = (/obj/machinery/atmospherics/valve/digital{color = "green"; dir = 4; name = "CO2 Intake Valve"},/turf/simulated/floor,/area/atmos)
 "bMx" = (/obj/machinery/atmospherics/pipe/simple{color = "green"; dir = 4; icon_state = "intact-g"; layer = 3; level = 2},/obj/machinery/meter,/turf/simulated/floor{dir = 5; icon_state = "yellow"; tag = "icon-yellow (NORTHEAST)"},/area/atmos)
-"bMy" = (/obj/machinery/atmospherics/unary/outlet_injector{dir = 8; frequency = 1234; icon_state = "on"; id = "co2_in"; on = 1; pixel_y = 1},/turf/simulated/floor/engine{carbon_dioxide = 50000; name = "co2 floor"; nitrogen = 0; oxygen = 0},/area/atmos)
+"bMy" = (/obj/machinery/atmospherics/unary/outlet_injector{dir = 8; frequency = 1441; icon_state = "on"; id = "co2_in"; on = 1; pixel_y = 1},/turf/simulated/floor/engine{carbon_dioxide = 50000; name = "co2 floor"; nitrogen = 0; oxygen = 0},/area/atmos)
 "bMz" = (/turf/simulated/floor/engine{carbon_dioxide = 50000; name = "co2 floor"; nitrogen = 0; oxygen = 0},/area/atmos)
 "bMA" = (/obj/window/reinforced{tag = "icon-rwindow (NORTH)"; icon_state = "rwindow"; dir = 1},/obj/machinery/portable_atmospherics/pump,/obj/machinery/camera{c_tag = "Toxins Secondary Storage"; dir = 4; network = "SS13"},/turf/simulated/floor{dir = 5; icon_state = "warning"; tag = "icon-warning"},/area/toxins/lab)
 "bMB" = (/turf/simulated/floor{icon_state = "delivery"},/area/toxins/lab)
@@ -4746,8 +4746,8 @@
 "bNn" = (/obj/machinery/atmospherics/pipe/manifold{color = "cyan"; icon_state = "manifold-c"; level = 2},/turf/simulated/floor,/area/atmos)
 "bNo" = (/obj/machinery/atmospherics/pipe/simple{color = "yellow"; dir = 5; icon_state = "intact-y"; layer = 3; level = 2},/obj/machinery/atmospherics/pipe/simple{color = "cyan"; dir = 10; icon_state = "intact-c"; initialize_directions = 10; layer = 3; level = 2},/turf/simulated/floor,/area/atmos)
 "bNp" = (/obj/machinery/atmospherics/pipe/manifold{color = "yellow"; dir = 1; icon_state = "manifold-y"; level = 2},/turf/simulated/floor,/area/atmos)
-"bNq" = (/obj/machinery/light{tag = "icon-tube1 (EAST)"; icon_state = "tube1"; dir = 4},/obj/machinery/computer/general_air_control/large_tank_control{frequency = 1234; input_tag = "co2_in"; name = "Carbon Dioxide Supply Control"; output_tag = "co2_out"; sensors = list("co2_sensor" = "Tank")},/turf/simulated/floor{dir = 4; icon_state = "yellow"; tag = "icon-yellow (EAST)"},/area/atmos)
-"bNr" = (/obj/machinery/air_sensor{frequency = 1234; id_tag = "co2_sensor"},/turf/simulated/floor/engine{carbon_dioxide = 50000; name = "co2 floor"; nitrogen = 0; oxygen = 0},/area/atmos)
+"bNq" = (/obj/machinery/light{tag = "icon-tube1 (EAST)"; icon_state = "tube1"; dir = 4},/obj/machinery/computer/general_air_control/large_tank_control{frequency = 1441; input_tag = "co2_in"; name = "Carbon Dioxide Supply Control"; output_tag = "co2_out"; sensors = list("co2_sensor" = "Tank")},/turf/simulated/floor{dir = 4; icon_state = "yellow"; tag = "icon-yellow (EAST)"},/area/atmos)
+"bNr" = (/obj/machinery/air_sensor{frequency = 1441; id_tag = "co2_sensor"},/turf/simulated/floor/engine{carbon_dioxide = 50000; name = "co2 floor"; nitrogen = 0; oxygen = 0},/area/atmos)
 "bNs" = (/obj/machinery/portable_atmospherics/canister/carbon_dioxide,/turf/simulated/floor/engine{carbon_dioxide = 50000; name = "co2 floor"; nitrogen = 0; oxygen = 0},/area/atmos)
 "bNt" = (/obj/machinery/light/small{dir = 4},/turf/simulated/floor/engine{carbon_dioxide = 50000; name = "co2 floor"; nitrogen = 0; oxygen = 0},/area/atmos)
 "bNu" = (/obj/machinery/portable_atmospherics/pump,/turf/simulated/floor,/area/toxins/lab)
@@ -4792,7 +4792,7 @@
 "bOh" = (/obj/machinery/atmospherics/portables_connector{dir = 1; name = "Connector Port (CO2)"},/turf/simulated/floor,/area/atmos)
 "bOi" = (/obj/machinery/atmospherics/pipe/simple{color = "yellow"; dir = 5; icon_state = "intact-y"; layer = 3; level = 2},/turf/simulated/floor,/area/atmos)
 "bOj" = (/obj/machinery/atmospherics/valve/digital{color = "yellow"; dir = 4; name = "CO2 Outlet Valve"},/turf/simulated/floor{dir = 6; icon_state = "yellow"; tag = "icon-yellow (SOUTHEAST)"},/area/atmos)
-"bOk" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; external_pressure_bound = 0; frequency = 1234; icon_state = "in"; id = "co2_out"; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/turf/simulated/floor/engine{carbon_dioxide = 50000; name = "co2 floor"; nitrogen = 0; oxygen = 0},/area/atmos)
+"bOk" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; external_pressure_bound = 0; frequency = 1441; icon_state = "in"; id_tag = "co2_out"; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/turf/simulated/floor/engine{carbon_dioxide = 50000; name = "co2 floor"; nitrogen = 0; oxygen = 0},/area/atmos)
 "bOl" = (/obj/machinery/portable_atmospherics/pump,/obj/machinery/light/small{dir = 8},/turf/simulated/floor,/area/toxins/lab)
 "bOm" = (/obj/machinery/portable_atmospherics/canister,/obj/window/reinforced{tag = "icon-rwindow (EAST)"; icon_state = "rwindow"; dir = 4},/obj/window/reinforced{tag = "icon-rwindow (WEST)"; icon_state = "rwindow"; dir = 8},/turf/simulated/floor,/area/toxins/lab)
 "bOn" = (/obj/machinery/atmospherics/valve,/turf/simulated/floor{icon_state = "white"},/area/toxins/mixing)
@@ -4871,10 +4871,10 @@
 "bPI" = (/obj/machinery/light/small,/obj/machinery/atmospherics/pipe/simple{color = "blue"; dir = 4; icon_state = "intact-b"; layer = 3; level = 2},/obj/machinery/portable_atmospherics/canister/carbon_dioxide,/turf/simulated/floor,/area/atmos)
 "bPJ" = (/obj/machinery/atmospherics/pipe/simple{color = "blue"; dir = 9; icon_state = "intact-b"; layer = 3; level = 2},/obj/machinery/portable_atmospherics/canister/carbon_dioxide,/turf/simulated/floor,/area/atmos)
 "bPK" = (/obj/machinery/atmospherics/valve/digital{color = "yellow"; icon_state = "valve1"; name = "Nitrogen Outlet Valve"; open = 1},/turf/simulated/floor{tag = "icon-red (SOUTHWEST)"; icon_state = "red"; dir = 10},/area/atmos)
-"bPL" = (/obj/machinery/light,/obj/machinery/computer/general_air_control/large_tank_control{frequency = 1234; input_tag = "n2_in"; name = "Nitrogen Supply Control"; output_tag = "n2_out"; sensors = list("n2_sensor" = "Tank")},/turf/simulated/floor{tag = "icon-red"; icon_state = "red"},/area/atmos)
+"bPL" = (/obj/machinery/light,/obj/machinery/computer/general_air_control/large_tank_control{frequency = 1441; input_tag = "n2_in"; name = "Nitrogen Supply Control"; output_tag = "n2_out"; sensors = list("n2_sensor" = "Tank")},/turf/simulated/floor{tag = "icon-red"; icon_state = "red"},/area/atmos)
 "bPM" = (/obj/machinery/atmospherics/pipe/simple{color = "green"; icon_state = "intact-g"; level = 2},/obj/machinery/meter,/turf/simulated/floor{tag = "icon-red (SOUTHEAST)"; icon_state = "red"; dir = 6},/area/atmos)
 "bPN" = (/obj/machinery/atmospherics/valve/digital{color = "yellow"; icon_state = "valve1"; name = "Oxygen Outlet Valve"; open = 1},/turf/simulated/floor{tag = "icon-blue (SOUTHWEST)"; icon_state = "blue"; dir = 10},/area/atmos)
-"bPO" = (/obj/machinery/light,/obj/machinery/computer/general_air_control/large_tank_control{frequency = 1234; input_tag = "o2_in"; name = "Oxygen Supply Control"; output_tag = "o2_out"; sensors = list("o2_sensor" = "Tank")},/turf/simulated/floor{dir = 0; icon_state = "blue"},/area/atmos)
+"bPO" = (/obj/machinery/light,/obj/machinery/computer/general_air_control/large_tank_control{frequency = 1441; input_tag = "o2_in"; name = "Oxygen Supply Control"; output_tag = "o2_out"; sensors = list("o2_sensor" = "Tank")},/turf/simulated/floor{dir = 0; icon_state = "blue"},/area/atmos)
 "bPP" = (/obj/machinery/atmospherics/pipe/simple{color = "green"; icon_state = "intact-g"; level = 2},/obj/machinery/meter,/turf/simulated/floor{tag = "icon-blue (SOUTHEAST)"; icon_state = "blue"; dir = 6},/area/atmos)
 "bPQ" = (/obj/machinery/atmospherics/pipe/simple{color = "cyan"; dir = 10; icon_state = "intact-c"; initialize_directions = 10; layer = 3; level = 2},/obj/machinery/meter{frequency = 1443; id = "mair_meter"},/turf/simulated/floor{tag = "icon-arrival (SOUTHWEST)"; icon_state = "arrival"; dir = 10},/area/atmos)
 "bPR" = (/obj/machinery/computer/general_air_control/large_tank_control{frequency = 1443; input_tag = "air_in"; name = "Mixed Air Supply Control"; output_tag = "air_out"; pressure_setting = 2000; sensors = list("air_sensor" = "Tank")},/turf/simulated/floor{tag = "icon-arrival"; icon_state = "arrival"},/area/atmos)
@@ -5063,15 +5063,15 @@
 "bTs" = (/obj/machinery/light{dir = 8},/obj/table{dir = 5; icon_state = "tabledir"},/obj/item/weapon/zippo,/obj/item/weapon/cell{charge = 100; maxcharge = 15000},/turf/simulated/floor,/area/engine/chiefs_office)
 "bTt" = (/obj/stool/chair,/obj/landmark/start{name = "Chief Engineer"},/turf/simulated/floor,/area/engine/chiefs_office)
 "bTu" = (/obj/table/reinforced{dir = 5; icon_state = "reinf_tabledir"; tag = "icon-reinf_tabledir (SOUTHWEST)"},/obj/item/weapon/storage/utilitybelt,/obj/item/weapon/weldingtool,/obj/item/weapon/wrench,/turf/simulated/floor,/area/engine/chiefs_office)
-"bTv" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; external_pressure_bound = 0; frequency = 1234; icon_state = "in"; id = "n2_out"; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/turf/simulated/floor/engine{name = "n2 floor"; nitrogen = 100000; oxygen = 0},/area/atmos)
-"bTw" = (/obj/machinery/air_sensor{frequency = 1234; id_tag = "n2_sensor"},/turf/simulated/floor/engine{name = "n2 floor"; nitrogen = 100000; oxygen = 0},/area/atmos)
-"bTx" = (/obj/machinery/atmospherics/unary/outlet_injector{dir = 1; frequency = 1234; icon_state = "on"; id = "n2_in"; on = 1},/turf/simulated/floor/engine{name = "n2 floor"; nitrogen = 100000; oxygen = 0},/area/atmos)
-"bTy" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; external_pressure_bound = 0; frequency = 1234; icon_state = "in"; id = "o2_out"; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/turf/simulated/floor/engine{name = "o2 floor"; nitrogen = 0; oxygen = 100000},/area/atmos)
-"bTz" = (/obj/machinery/air_sensor{frequency = 1234; id_tag = "o2_sensor"},/turf/simulated/floor/engine{name = "o2 floor"; nitrogen = 0; oxygen = 100000},/area/atmos)
-"bTA" = (/obj/machinery/atmospherics/unary/outlet_injector{dir = 1; frequency = 1234; icon_state = "on"; id = "o2_in"; on = 1},/turf/simulated/floor/engine{name = "o2 floor"; nitrogen = 0; oxygen = 100000},/area/atmos)
+"bTv" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; external_pressure_bound = 0; frequency = 1441; icon_state = "in"; id_tag = "n2_out"; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/turf/simulated/floor/engine{name = "n2 floor"; nitrogen = 100000; oxygen = 0},/area/atmos)
+"bTw" = (/obj/machinery/air_sensor{frequency = 1441; id_tag = "n2_sensor"},/turf/simulated/floor/engine{name = "n2 floor"; nitrogen = 100000; oxygen = 0},/area/atmos)
+"bTx" = (/obj/machinery/atmospherics/unary/outlet_injector{dir = 1; frequency = 1441; icon_state = "on"; id = "n2_in"; on = 1},/turf/simulated/floor/engine{name = "n2 floor"; nitrogen = 100000; oxygen = 0},/area/atmos)
+"bTy" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; external_pressure_bound = 0; frequency = 1441; icon_state = "in"; id_tag = "o2_out"; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/turf/simulated/floor/engine{name = "o2 floor"; nitrogen = 0; oxygen = 100000},/area/atmos)
+"bTz" = (/obj/machinery/air_sensor{frequency = 1441; id_tag = "o2_sensor"},/turf/simulated/floor/engine{name = "o2 floor"; nitrogen = 0; oxygen = 100000},/area/atmos)
+"bTA" = (/obj/machinery/atmospherics/unary/outlet_injector{dir = 1; frequency = 1441; icon_state = "on"; id = "o2_in"; on = 1},/turf/simulated/floor/engine{name = "o2 floor"; nitrogen = 0; oxygen = 100000},/area/atmos)
 "bTB" = (/obj/machinery/atmospherics/unary/outlet_injector{dir = 1; frequency = 1443; icon_state = "on"; id = "air_in"; on = 1},/turf/simulated/floor/engine{name = "air floor"; nitrogen = 10580; oxygen = 2644},/area/atmos)
 "bTC" = (/obj/machinery/air_sensor{frequency = 1443; id_tag = "air_sensor"; output = 7},/turf/simulated/floor/engine{name = "air floor"; nitrogen = 10580; oxygen = 2644},/area/atmos)
-"bTD" = (/obj/machinery/atmospherics/unary/vent_pump/high_volume{dir = 1; external_pressure_bound = 0; frequency = 1443; icon_state = "in"; id = "air_out"; internal_pressure_bound = 2000; on = 1; pressure_checks = 2; pump_direction = 0},/turf/simulated/floor/engine{name = "air floor"; nitrogen = 10580; oxygen = 2644},/area/atmos)
+"bTD" = (/obj/machinery/atmospherics/unary/vent_pump/high_volume{dir = 1; external_pressure_bound = 0; frequency = 1443; icon_state = "in"; id_tag = "air_out"; internal_pressure_bound = 2000; on = 1; pressure_checks = 2; pump_direction = 0},/turf/simulated/floor/engine{name = "air floor"; nitrogen = 10580; oxygen = 2644},/area/atmos)
 "bTE" = (/obj/cable{icon_state = "1-2"; d1 = 1; d2 = 2},/turf/simulated/floor/plating/airless,/area)
 "bTF" = (/turf/simulated/floor/engine/vacuum,/area/toxins/mixing)
 "bTG" = (/obj/machinery/atmospherics/pipe/simple/insulated,/turf/simulated/wall/r_wall,/area/toxins/mixing)
@@ -5115,7 +5115,7 @@
 "bUs" = (/turf/simulated/floor/engine{name = "air floor"; nitrogen = 10580; oxygen = 2644},/area/atmos)
 "bUt" = (/obj/machinery/light{dir = 8},/turf/simulated/floor/engine/vacuum,/area/toxins/mixing)
 "bUu" = (/obj/machinery/atmospherics/unary/outlet_injector{dir = 1; frequency = 1443; icon_state = "on"; id = "air_in"; on = 1},/obj/machinery/light{dir = 8},/turf/simulated/floor/engine/vacuum,/area/toxins/mixing)
-"bUv" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; external_pressure_bound = 0; frequency = 1441; icon_state = "in"; id = "o2_out"; initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/obj/machinery/light{dir = 4; icon_state = "tube1"; tag = "icon-tube1 (EAST)"},/turf/simulated/floor/engine/vacuum,/area/toxins/mixing)
+"bUv" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; external_pressure_bound = 0; icon_state = "in";  initialize_directions = 1; internal_pressure_bound = 4000; on = 1; pressure_checks = 2; pump_direction = 0},/obj/machinery/light{dir = 4; icon_state = "tube1"},/turf/simulated/floor/engine/vacuum,/area/toxins/mixing)
 "bUw" = (/obj/window/reinforced{tag = "icon-rwindow (EAST)"; icon_state = "rwindow"; dir = 4},/obj/machinery/portable_atmospherics/canister/air,/turf/simulated/floor,/area/toxins/storage)
 "bUx" = (/turf/simulated/floor{dir = 8; icon_state = "warning"; tag = "icon-warning"},/area/toxins/storage)
 "bUy" = (/obj/window/reinforced,/obj/machinery/portable_atmospherics/canister/carbon_dioxide,/turf/simulated/floor{dir = 8; icon_state = "warning"; tag = "icon-warning"},/area/toxins/storage)