Passive gate, pump, volume pump, filter and mixer nano-uis.

code/ATMOSPHERICS/components/binary_devices/passive_gate.dm

@@ -88,20 +88,6 @@
 
 	return 1
 
-/obj/machinery/atmospherics/binary/passive_gate/interact(mob/user)
-	user.set_machine(src)
-	add_fingerprint(user)
-
-	var/dat = {"<b>Power: </b><a href='?src=[UID()];power=1'>[on?"On":"Off"]</a><br>
-				<b>Desirable output pressure: </b>
-				[round(target_pressure,0.1)]kPa | <a href='?src=[UID()];set_press=1'>Change</a>
-				"}
-
-	var/datum/browser/popup = new(user, "atmo_pump", name, 400, 400)
-	popup.set_content(dat)
-	popup.open(0)
-	onclose(user, "atmo_pump")
-
 /obj/machinery/atmospherics/binary/passive_gate/receive_signal(datum/signal/signal)
 	if(!signal.data["tag"] || (signal.data["tag"] != id) || (signal.data["sigtype"]!="command"))
 		return 0
@@ -142,27 +128,54 @@
 		to_chat(user, "<span class='alert'>Access denied.</span>")
 		return
 
-	interact(user)
-	
+	add_fingerprint(user)
+	ui_interact(user)
+
 /obj/machinery/atmospherics/binary/passive_gate/attack_ghost(mob/user)
-	interact(user)
+	ui_interact(user)
+
+/obj/machinery/atmospherics/binary/passive_gate/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = 1, var/master_ui = null, var/datum/topic_state/state = default_state)
+	user.set_machine(src)
+	ui = nanomanager.try_update_ui(user, src, ui_key, ui, force_open)
+	if(!ui)
+		ui = new(user, src, ui_key, "atmos_pump.tmpl", name, 385, 115, state = state)
+		ui.open()
+
+/obj/machinery/atmospherics/binary/passive_gate/ui_data(mob/user)
+	var/list/data = list()
+	data["on"] = on
+	data["pressure"] = round(target_pressure)
+	data["max_pressure"] = round(MAX_OUTPUT_PRESSURE)
+	return data
 
 /obj/machinery/atmospherics/binary/passive_gate/Topic(href,href_list)
-	if(..()) 
+	if(..())
 		return 1
+
 	if(href_list["power"])
 		on = !on
 		investigate_log("was turned [on ? "on" : "off"] by [key_name(usr)]", "atmos")
-	if(href_list["set_press"])
-		var/new_pressure = input(usr,"Enter new output pressure (0-4500kPa)","Pressure control",target_pressure) as num
-		target_pressure = max(0, min(4500, new_pressure))
-		investigate_log("was set to [target_pressure] kPa by [key_name(usr)]", "atmos")
-	usr.set_machine(src)
-	update_icon()
-	updateUsrDialog()
-	return
+		. = TRUE
+	if(href_list["pressure"])
+		var/pressure = href_list["pressure"]
+		if(pressure == "max")
+			pressure = MAX_OUTPUT_PRESSURE
+			. = TRUE
+		else if(pressure == "input")
+			pressure = input("New output pressure (0-[MAX_OUTPUT_PRESSURE] kPa):", name, target_pressure) as num|null
+			if(!isnull(pressure))
+				. = TRUE
+		else if(text2num(pressure) != null)
+			pressure = text2num(pressure)
+			. = TRUE
+		if(.)
+			target_pressure = Clamp(pressure, 0, MAX_OUTPUT_PRESSURE)
+			investigate_log("was set to [target_pressure] kPa by [key_name(usr)]", "atmos")
 
-/obj/machinery/atmospherics/binary/passive_gate/attackby(var/obj/item/weapon/W, var/mob/user, params)
+	update_icon()
+	nanomanager.update_uis(src)
+
+/obj/machinery/atmospherics/binary/passive_gate/attackby(obj/item/weapon/W, mob/user, params)
 	if(!istype(W, /obj/item/weapon/wrench))
 		return ..()
 	if(on)

code/ATMOSPHERICS/components/binary_devices/pump.dm

@@ -103,20 +103,6 @@ Thus, the two variables affect pump operation are set in New():
 	radio_connection.post_signal(src, signal, filter = RADIO_ATMOSIA)
 	return 1
 
-/obj/machinery/atmospherics/binary/pump/interact(mob/user)
-	user.set_machine(src)
-	add_fingerprint(user)
-
-	var/dat = {"<b>Power: </b><a href='?src=[UID()];power=1'>[on?"On":"Off"]</a><br>
-				<b>Desirable output pressure: </b>
-				[round(target_pressure,0.1)]kPa | <a href='?src=[UID()];set_press=1'>Change</a>
-				"}
-
-	var/datum/browser/popup = new(user, "atmo_pump", name, 400, 400)
-	popup.set_content(dat)
-	popup.open(0)
-	onclose(user, "atmo_pump")
-
 /obj/machinery/atmospherics/binary/pump/initialize()
 	..()
 	if(frequency)
@@ -162,24 +148,52 @@ Thus, the two variables affect pump operation are set in New():
 		to_chat(user, "<span class='alert'>Access denied.</span>")
 		return
 
-	interact(user)
-	
+	add_fingerprint(user)
+	ui_interact(user)
+
 /obj/machinery/atmospherics/binary/pump/attack_ghost(mob/user)
-	interact(user)
+	ui_interact(user)
+
+/obj/machinery/atmospherics/binary/pump/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = 1, var/master_ui = null, var/datum/topic_state/state = default_state)
+	user.set_machine(src)
+	ui = nanomanager.try_update_ui(user, src, ui_key, ui, force_open)
+	if(!ui)
+		ui = new(user, src, ui_key, "atmos_pump.tmpl", name, 385, 115, state = state)
+		ui.open()
+
+/obj/machinery/atmospherics/binary/pump/ui_data(mob/user)
+	var/list/data = list()
+	data["on"] = on
+	data["pressure"] = round(target_pressure)
+	data["max_pressure"] = round(MAX_OUTPUT_PRESSURE)
+	return data
 
 /obj/machinery/atmospherics/binary/pump/Topic(href,href_list)
 	if(..())
 		return 1
+
 	if(href_list["power"])
 		on = !on
 		investigate_log("was turned [on ? "on" : "off"] by [key_name(usr)]", "atmos")
-	if(href_list["set_press"])
-		var/new_pressure = input(usr,"Enter new output pressure (0-4500kPa)","Pressure control",target_pressure) as num
-		target_pressure = max(0, min(4500, new_pressure))
-		investigate_log("was set to [target_pressure] kPa by [key_name(usr)]", "atmos")
-	usr.set_machine(src)
+		. = TRUE
+	if(href_list["pressure"])
+		var/pressure = href_list["pressure"]
+		if(pressure == "max")
+			pressure = MAX_OUTPUT_PRESSURE
+			. = TRUE
+		else if(pressure == "input")
+			pressure = input("New output pressure (0-[MAX_OUTPUT_PRESSURE] kPa):", name, target_pressure) as num|null
+			if(!isnull(pressure))
+				. = TRUE
+		else if(text2num(pressure) != null)
+			pressure = text2num(pressure)
+			. = TRUE
+		if(.)
+			target_pressure = Clamp(pressure, 0, MAX_OUTPUT_PRESSURE)
+			investigate_log("was set to [target_pressure] kPa by [key_name(usr)]", "atmos")
+
 	update_icon()
-	updateUsrDialog()
+	nanomanager.update_uis(src)
 
 /obj/machinery/atmospherics/binary/pump/power_change()
 	var/old_stat = stat
@@ -187,7 +201,7 @@ Thus, the two variables affect pump operation are set in New():
 	if(old_stat != stat)
 		update_icon()
 
-/obj/machinery/atmospherics/binary/pump/attackby(var/obj/item/weapon/W, var/mob/user, params)
+/obj/machinery/atmospherics/binary/pump/attackby(obj/item/weapon/W, mob/user, params)
 	if(!istype(W, /obj/item/weapon/wrench))
 		return ..()
 	if(!(stat & NOPOWER) && on)

code/ATMOSPHERICS/components/binary_devices/volume_pump.dm

@@ -99,21 +99,6 @@ Thus, the two variables affect pump operation are set in New():
 
 	return 1
 
-/obj/machinery/atmospherics/binary/volume_pump/interact(mob/user)
-	user.set_machine(src)
-	add_fingerprint(user)
-
-	var/dat = {"<b>Power: </b><a href='?src=[UID()];power=1'>[on?"On":"Off"]</a><br>
-				<b>Desirable output flow: </b>
-				[round(transfer_rate,1)]l/s | <a href='?src=[UID()];set_transfer_rate=1'>Change</a>
-				"}
-
-	var/datum/browser/popup = new(user, "atmo_pump", name, 400, 400)
-	popup.set_content(dat)
-	popup.open(0)
-	onclose(user, "atmo_pump")
-
-
 /obj/machinery/atmospherics/binary/volume_pump/receive_signal(datum/signal/signal)
 	if(!signal.data["tag"] || (signal.data["tag"] != id) || (signal.data["sigtype"]!="command"))
 		return 0
@@ -153,24 +138,52 @@ Thus, the two variables affect pump operation are set in New():
 		to_chat(user, "<span class='alert'>Access denied.</span>")
 		return
 
-	interact(user)
-	
+	add_fingerprint(user)
+	ui_interact(user)
+
 /obj/machinery/atmospherics/binary/volume_pump/attack_ghost(mob/user)
-	interact(user)
+	ui_interact(user)
+
+/obj/machinery/atmospherics/binary/volume_pump/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = 1, var/master_ui = null, var/datum/topic_state/state = default_state)
+	user.set_machine(src)
+	ui = nanomanager.try_update_ui(user, src, ui_key, ui, force_open)
+	if(!ui)
+		ui = new(user, src, ui_key, "atmos_pump.tmpl", name, 310, 115, state = state)
+		ui.open()
+
+/obj/machinery/atmospherics/binary/volume_pump/ui_data(mob/user)
+	var/list/data = list()
+	data["on"] = on
+	data["rate"] = round(transfer_rate)
+	data["max_rate"] = round(MAX_TRANSFER_RATE)
+	return data
 
 /obj/machinery/atmospherics/binary/volume_pump/Topic(href,href_list)
 	if(..())
 		return 1
+
 	if(href_list["power"])
 		on = !on
 		investigate_log("was turned [on ? "on" : "off"] by [key_name(usr)]", "atmos")
-	if(href_list["set_transfer_rate"])
-		var/new_transfer_rate = input(usr,"Enter new output volume (0-200l/s)","Flow control",transfer_rate) as num
-		transfer_rate = max(0, min(200, new_transfer_rate))
-		investigate_log("was set to [transfer_rate] L/s by [key_name(usr)]", "atmos")
-	usr.set_machine(src)
+		. = TRUE
+	if(href_list["rate"])
+		var/rate = href_list["rate"]
+		if(rate == "max")
+			rate = MAX_TRANSFER_RATE
+			. = TRUE
+		else if(rate == "input")
+			rate = input("New transfer rate (0-[MAX_TRANSFER_RATE] L/s):", name, transfer_rate) as num|null
+			if(!isnull(rate))
+				. = TRUE
+		else if(text2num(rate) != null)
+			rate = text2num(rate)
+			. = TRUE
+		if(.)
+			transfer_rate = Clamp(rate, 0, MAX_TRANSFER_RATE)
+			investigate_log("was set to [transfer_rate] L/s by [key_name(usr)]", "atmos")
+
 	update_icon()
-	updateUsrDialog()
+	nanomanager.update_uis(src)
 
 /obj/machinery/atmospherics/binary/volume_pump/power_change()
 	var/old_stat = stat
@@ -178,7 +191,7 @@ Thus, the two variables affect pump operation are set in New():
 	if(old_stat != stat)
 		update_icon()
 
-/obj/machinery/atmospherics/binary/volume_pump/attackby(var/obj/item/weapon/W, var/mob/user, params)
+/obj/machinery/atmospherics/binary/volume_pump/attackby(obj/item/weapon/W, mob/user, params)
 	if(!istype(W, /obj/item/weapon/wrench))
 		return ..()
 	if(!(stat & NOPOWER) && on)

code/ATMOSPHERICS/components/trinary_devices/filter.dm

@@ -6,8 +6,6 @@
 
 	name = "gas filter"
 
-	var/temp = null // -- TLE
-
 	var/target_pressure = ONE_ATMOSPHERE
 
 	var/filter_type = 0
@@ -146,9 +144,9 @@ Filter types:
 /obj/machinery/atmospherics/trinary/filter/initialize()
 	set_frequency(frequency)
 	..()
-	
-/obj/machinery/atmospherics/trinary/filter/attack_ghost(mob/user) 
-	interact(user)
+
+/obj/machinery/atmospherics/trinary/filter/attack_ghost(mob/user)
+	ui_interact(user)
 
 /obj/machinery/atmospherics/trinary/filter/attack_hand(mob/user)
 	if(..())
@@ -157,63 +155,52 @@ Filter types:
 	if(!allowed(user))
 		to_chat(user, "<span class='alert'>Access denied.</span>")
 		return
-		
-	interact(user)
-		
-/obj/machinery/atmospherics/trinary/filter/interact(mob/user)	
-	user.set_machine(src)
+
 	add_fingerprint(user)
-	
-	var/dat
-	var/current_filter_type
-	switch(filter_type)
-		if(0)
-			current_filter_type = "Toxins"
-		if(1)
-			current_filter_type = "Oxygen"
-		if(2)
-			current_filter_type = "Nitrogen"
-		if(3)
-			current_filter_type = "Carbon Dioxide"
-		if(4)
-			current_filter_type = "Nitrous Oxide"
-		if(-1)
-			current_filter_type = "Nothing"
-		else
-			current_filter_type = "ERROR - Report this bug to the admin, please!"
+	ui_interact(user)
 
-	dat += {"
-			<b>Power: </b><a href='?src=[UID()];power=1'>[on?"On":"Off"]</a><br>
-			<b>Filtering: </b>[current_filter_type]<br><HR>
-			<h4>Set Filter Type:</h4>
-			<A href='?src=[UID()];filterset=0'>Toxins</A><BR>
-			<A href='?src=[UID()];filterset=1'>Oxygen</A><BR>
-			<A href='?src=[UID()];filterset=2'>Nitrogen</A><BR>
-			<A href='?src=[UID()];filterset=3'>Carbon Dioxide</A><BR>
-			<A href='?src=[UID()];filterset=4'>Nitrous Oxide</A><BR>
-			<A href='?src=[UID()];filterset=-1'>Nothing</A><BR>
-			<HR><B>Desirable output pressure:</B>
-			[target_pressure]kPa | <a href='?src=[UID()];set_press=1'>Change</a>
-			"}
+/obj/machinery/atmospherics/trinary/filter/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = 1, var/master_ui = null, var/datum/topic_state/state = default_state)
+	user.set_machine(src)
+	ui = nanomanager.try_update_ui(user, src, ui_key, ui, force_open)
+	if(!ui)
+		ui = new(user, src, ui_key, "atmos_filter.tmpl", name, 475, 155, state = state)
+		ui.open()
 
-	var/datum/browser/popup = new(user, "atmo_filter", name, 400, 400)
-	popup.set_content(dat)
-	popup.open(0)
-	onclose(user, "atmo_filter")
+/obj/machinery/atmospherics/trinary/filter/ui_data(mob/user)
+	var/list/data = list()
+	data["on"] = on
+	data["pressure"] = round(target_pressure)
+	data["max_pressure"] = round(MAX_OUTPUT_PRESSURE)
+	data["filter_type"] = filter_type
+	return data
 
 /obj/machinery/atmospherics/trinary/filter/Topic(href, href_list) // -- TLE
 	if(..())
 		return 1
-	usr.set_machine(src)
-	add_fingerprint(usr)
-	if(href_list["filterset"])
-		filter_type = text2num(href_list["filterset"])
-	if(href_list["temp"])
-		temp = null
-	if(href_list["set_press"])
-		var/new_pressure = input(usr,"Enter new output pressure (0-4500kPa)","Pressure control",target_pressure) as num
-		target_pressure = max(0, min(4500, new_pressure))
+
 	if(href_list["power"])
-		on=!on
+		on = !on
+		investigate_log("was turned [on ? "on" : "off"] by [key_name(usr)]", "atmos")
+		. = TRUE
+	if(href_list["pressure"])
+		var/pressure = href_list["pressure"]
+		if(pressure == "max")
+			pressure = MAX_OUTPUT_PRESSURE
+			. = TRUE
+		else if(pressure == "input")
+			pressure = input("New output pressure (0-[MAX_OUTPUT_PRESSURE] kPa):", name, target_pressure) as num|null
+			if(!isnull(pressure) && !..())
+				. = TRUE
+		else if(text2num(pressure) != null)
+			pressure = text2num(pressure)
+			. = TRUE
+		if(.)
+			target_pressure = Clamp(pressure, 0, MAX_OUTPUT_PRESSURE)
+			investigate_log("was set to [target_pressure] kPa by [key_name(usr)]", "atmos")
+	if(href_list["filter"])
+		filter_type = text2num(href_list["filter"])
+		investigate_log("was set to filter [filter_type] by [key_name(usr)]", "atmos")
+		. = TRUE
+
 	update_icon()
-	updateUsrDialog()
+	nanomanager.update_uis(src)

code/ATMOSPHERICS/components/trinary_devices/mixer.dm

@@ -16,7 +16,7 @@
 	icon_state = "mmap"
 	flipped = 1
 
-/obj/machinery/atmospherics/trinary/mixer/update_icon(var/safety = 0)
+/obj/machinery/atmospherics/trinary/mixer/update_icon(safety = 0)
 	if(flipped)
 		icon_state = "m"
 	else
@@ -107,9 +107,9 @@
 	parent3.update = 1
 
 	return 1
-	
-/obj/machinery/atmospherics/trinary/mixer/attack_ghost(mob/user) 
-	interact(user)
+
+/obj/machinery/atmospherics/trinary/mixer/attack_ghost(mob/user)
+	ui_interact(user)
 
 /obj/machinery/atmospherics/trinary/mixer/attack_hand(mob/user)
 	if(..())
@@ -118,52 +118,61 @@
 	if(!allowed(user))
 		to_chat(user, "<span class='alert'>Access denied.</span>")
 		return
-		
-	interact(user)
-	
-/obj/machinery/atmospherics/trinary/mixer/interact(mob/user)	
-	user.set_machine(src)
-	add_fingerprint(user)
-	var/dat = {"<b>Power: </b><a href='?src=[UID()];power=1'>[on?"On":"Off"]</a><br>
-				<b>Desirable output pressure: </b>
-				[target_pressure]kPa | <a href='?src=[UID()];set_press=1'>Change</a>
-				<br>
-				<b>Node 1 Concentration:</b>
-				<a href='?src=[UID()];node1_c=-0.1'><b>-</b></a>
-				<a href='?src=[UID()];node1_c=-0.01'>-</a>
-				[node1_concentration]([node1_concentration*100]%)
-				<a href='?src=[UID()];node1_c=0.01'><b>+</b></a>
-				<a href='?src=[UID()];node1_c=0.1'>+</a>
-				<br>
-				<b>Node 2 Concentration:</b>
-				<a href='?src=[UID()];node2_c=-0.1'><b>-</b></a>
-				<a href='?src=[UID()];node2_c=-0.01'>-</a>
-				[node2_concentration]([node2_concentration*100]%)
-				<a href='?src=[UID()];node2_c=0.01'><b>+</b></a>
-				<a href='?src=[UID()];node2_c=0.1'>+</a>
-				"}
 
-	var/datum/browser/popup = new(user, "atmo_mixer", name, 400, 400)
-	popup.set_content(dat)
-	popup.open(0)
-	onclose(user, "atmo_mixer")
+	add_fingerprint(user)
+	ui_interact(user)
+
+/obj/machinery/atmospherics/trinary/mixer/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = 1, var/master_ui = null, var/datum/topic_state/state = default_state)
+	user.set_machine(src)
+	ui = nanomanager.try_update_ui(user, src, ui_key, ui, force_open)
+	if(!ui)
+		ui = new(user, src, ui_key, "atmos_mixer.tmpl", name, 370, 165, state = state)
+		ui.open()
+
+/obj/machinery/atmospherics/trinary/mixer/ui_data(mob/user)
+	var/list/data = list()
+	data["on"] = on
+	data["pressure"] = round(target_pressure)
+	data["max_pressure"] = round(MAX_OUTPUT_PRESSURE)
+	data["node1_concentration"] = round(node1_concentration*100)
+	data["node2_concentration"] = round(node2_concentration*100)
+	return data
 
 /obj/machinery/atmospherics/trinary/mixer/Topic(href,href_list)
 	if(..())
 		return 1
+
 	if(href_list["power"])
 		on = !on
-	if(href_list["set_press"])
-		var/new_pressure = input(usr,"Enter new output pressure (0-4500kPa)","Pressure control",target_pressure) as num
-		target_pressure = max(0, min(4500, new_pressure))
-	if(href_list["node1_c"])
-		var/value = text2num(href_list["node1_c"])
+		investigate_log("was turned [on ? "on" : "off"] by [key_name(usr)]", "atmos")
+		. = TRUE
+	if(href_list["pressure"])
+		var/pressure = href_list["pressure"]
+		if(pressure == "max")
+			pressure = MAX_OUTPUT_PRESSURE
+			. = TRUE
+		else if(pressure == "input")
+			pressure = input("New output pressure (0-[MAX_OUTPUT_PRESSURE] kPa):", name, target_pressure) as num|null
+			if(!isnull(pressure) && !..())
+				. = TRUE
+		else if(text2num(pressure) != null)
+			pressure = text2num(pressure)
+			. = TRUE
+		if(.)
+			target_pressure = Clamp(pressure, 0, MAX_OUTPUT_PRESSURE)
+			investigate_log("was set to [target_pressure] kPa by [key_name(usr)]", "atmos")
+	if(href_list["node1"])
+		var/value = text2num(href_list["node1"])
 		node1_concentration = max(0, min(1, node1_concentration + value))
 		node2_concentration = max(0, min(1, node2_concentration - value))
-	if(href_list["node2_c"])
-		var/value = text2num(href_list["node2_c"])
+		investigate_log("was set to [node1_concentration] % on node 1 by [key_name(usr)]", "atmos")
+		. = TRUE
+	if(href_list["node2"])
+		var/value = text2num(href_list["node2"])
 		node2_concentration = max(0, min(1, node2_concentration + value))
 		node1_concentration = max(0, min(1, node1_concentration - value))
+		investigate_log("was set to [node2_concentration] % on node 2 by [key_name(usr)]", "atmos")
+		. = TRUE
+
 	update_icon()
-	updateUsrDialog()
-	return
+	nanomanager.update_uis(src)