diff --git a/code/game/machinery/atmo_control.dm b/code/game/machinery/atmo_control.dm
index b5d5af6183e..f11aafeb446 100644
--- a/code/game/machinery/atmo_control.dm
+++ b/code/game/machinery/atmo_control.dm
@@ -1,4 +1,4 @@
-obj/machinery/air_sensor
+/obj/machinery/air_sensor
icon = 'icons/obj/stationobjs.dmi'
icon_state = "gsensor1"
name = "Gas Sensor"
@@ -22,59 +22,58 @@ obj/machinery/air_sensor
var/datum/radio_frequency/radio_connection
- update_icon()
- icon_state = "gsensor[on]"
+/obj/machinery/air_sensor/update_icon()
+ icon_state = "gsensor[on]"
- process()
- if(on)
- var/datum/signal/signal = new
- signal.transmission_method = 1 //radio signal
- signal.data["tag"] = id_tag
- signal.data["timestamp"] = world.time
+/obj/machinery/air_sensor/process()
+ if(on)
+ var/datum/signal/signal = new
+ signal.transmission_method = 1 //radio signal
+ signal.data["tag"] = id_tag
+ signal.data["timestamp"] = world.time
- var/datum/gas_mixture/air_sample = return_air()
+ var/datum/gas_mixture/air_sample = return_air()
- if(output&1)
- signal.data["pressure"] = num2text(round(air_sample.return_pressure(),0.1),)
- if(output&2)
- signal.data["temperature"] = round(air_sample.temperature,0.1)
+ if(output&1)
+ signal.data["pressure"] = num2text(round(air_sample.return_pressure(),0.1),)
+ if(output&2)
+ signal.data["temperature"] = round(air_sample.temperature,0.1)
- if(output>4)
- var/total_moles = air_sample.total_moles
- if(total_moles > 0)
- if(output&4)
- signal.data["oxygen"] = round(100*air_sample.gas["oxygen"]/total_moles,0.1)
- if(output&8)
- signal.data["phoron"] = round(100*air_sample.gas["phoron"]/total_moles,0.1)
- if(output&16)
- signal.data["nitrogen"] = round(100*air_sample.gas["nitrogen"]/total_moles,0.1)
- if(output&32)
- signal.data["carbon_dioxide"] = round(100*air_sample.gas["carbon_dioxide"]/total_moles,0.1)
- else
- signal.data["oxygen"] = 0
- signal.data["phoron"] = 0
- signal.data["nitrogen"] = 0
- signal.data["carbon_dioxide"] = 0
- signal.data["sigtype"]="status"
- radio_connection.post_signal(src, signal, filter = RADIO_ATMOSIA)
+ if(output>4)
+ var/total_moles = air_sample.total_moles
+ if(total_moles > 0)
+ if(output&4)
+ signal.data["oxygen"] = round(100*air_sample.gas["oxygen"]/total_moles,0.1)
+ if(output&8)
+ signal.data["phoron"] = round(100*air_sample.gas["phoron"]/total_moles,0.1)
+ if(output&16)
+ signal.data["nitrogen"] = round(100*air_sample.gas["nitrogen"]/total_moles,0.1)
+ if(output&32)
+ signal.data["carbon_dioxide"] = round(100*air_sample.gas["carbon_dioxide"]/total_moles,0.1)
+ else
+ signal.data["oxygen"] = 0
+ signal.data["phoron"] = 0
+ signal.data["nitrogen"] = 0
+ signal.data["carbon_dioxide"] = 0
+ signal.data["sigtype"]="status"
+ 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_ATMOSIA)
+/obj/machinery/air_sensor/proc/set_frequency(new_frequency)
+ radio_controller.remove_object(src, frequency)
+ frequency = new_frequency
+ radio_connection = radio_controller.add_object(src, frequency, RADIO_ATMOSIA)
- initialize()
+/obj/machinery/air_sensor/initialize()
+ set_frequency(frequency)
+
+/obj/machinery/air_sensor/New()
+ ..()
+
+ if(radio_controller)
set_frequency(frequency)
- New()
- ..()
-
- if(radio_controller)
- set_frequency(frequency)
-
-obj/machinery/computer/general_air_control
+/obj/machinery/computer/general_air_control
icon = 'icons/obj/computer.dmi'
icon_state = "tank"
@@ -87,298 +86,298 @@ obj/machinery/computer/general_air_control
var/datum/radio_frequency/radio_connection
circuit = /obj/item/weapon/circuitboard/air_management
- attack_hand(mob/user)
- if(..(user))
- return
- user << browse(return_text(),"window=computer")
- user.set_machine(src)
- onclose(user, "computer")
+/obj/machinery/computer/general_air_control/attack_hand(mob/user)
+ if(..(user))
+ return
+ user << browse(return_text(),"window=computer")
+ user.set_machine(src)
+ onclose(user, "computer")
- process()
- ..()
- src.updateUsrDialog()
+/obj/machinery/computer/general_air_control/process()
+ ..()
+ src.updateUsrDialog()
- receive_signal(datum/signal/signal)
- if(!signal || signal.encryption) return
+/obj/machinery/computer/general_air_control/receive_signal(datum/signal/signal)
+ if(!signal || signal.encryption) return
- var/id_tag = signal.data["tag"]
- if(!id_tag || !sensors.Find(id_tag)) return
+ var/id_tag = signal.data["tag"]
+ if(!id_tag || !sensors.Find(id_tag)) return
- sensor_information[id_tag] = signal.data
+ sensor_information[id_tag] = signal.data
- proc/return_text()
- var/sensor_data
- if(sensors.len)
- for(var/id_tag in sensors)
- var/long_name = sensors[id_tag]
- var/list/data = sensor_information[id_tag]
- var/sensor_part = "[long_name]:
"
+/obj/machinery/computer/general_air_control/proc/return_text()
+ var/sensor_data
+ if(sensors.len)
+ for(var/id_tag in sensors)
+ var/long_name = sensors[id_tag]
+ var/list/data = sensor_information[id_tag]
+ var/sensor_part = "[long_name]:
"
- if(data)
- if(data["pressure"])
- sensor_part += " Pressure: [data["pressure"]] kPa
"
- if(data["temperature"])
- sensor_part += " Temperature: [data["temperature"]] K
"
- if(data["oxygen"]||data["phoron"]||data["nitrogen"]||data["carbon_dioxide"])
- sensor_part += " Gas Composition :"
- if(data["oxygen"])
- sensor_part += "[data["oxygen"]]% O2; "
- if(data["nitrogen"])
- sensor_part += "[data["nitrogen"]]% N; "
- if(data["carbon_dioxide"])
- sensor_part += "[data["carbon_dioxide"]]% CO2; "
- if(data["phoron"])
- sensor_part += "[data["phoron"]]% TX; "
- sensor_part += "
"
+ if(data)
+ if(data["pressure"])
+ sensor_part += " Pressure: [data["pressure"]] kPa
"
+ if(data["temperature"])
+ sensor_part += " Temperature: [data["temperature"]] K
"
+ if(data["oxygen"]||data["phoron"]||data["nitrogen"]||data["carbon_dioxide"])
+ sensor_part += " Gas Composition :"
+ if(data["oxygen"])
+ sensor_part += "[data["oxygen"]]% O2; "
+ if(data["nitrogen"])
+ sensor_part += "[data["nitrogen"]]% N; "
+ if(data["carbon_dioxide"])
+ sensor_part += "[data["carbon_dioxide"]]% CO2; "
+ if(data["phoron"])
+ sensor_part += "[data["phoron"]]% TX; "
+ sensor_part += "
"
- else
- sensor_part = "[long_name] can not be found!
"
+ else
+ sensor_part = "[long_name] can not be found!
"
- sensor_data += sensor_part
+ sensor_data += sensor_part
- else
- sensor_data = "No sensors connected."
+ else
+ sensor_data = "No sensors connected."
- var/output = {"[name]
+ var/output = {"[name]
Sensor Data:
[sensor_data]"}
- return output
+ return output
- proc
- set_frequency(new_frequency)
- radio_controller.remove_object(src, frequency)
- frequency = new_frequency
- radio_connection = radio_controller.add_object(src, frequency, RADIO_ATMOSIA)
+/obj/machinery/computer/general_air_control/proc/set_frequency(new_frequency)
+ radio_controller.remove_object(src, frequency)
+ frequency = new_frequency
+ radio_connection = radio_controller.add_object(src, frequency, RADIO_ATMOSIA)
- initialize()
- set_frequency(frequency)
-
- large_tank_control
- icon = 'icons/obj/computer.dmi'
- icon_state = "tank"
-
- var/input_tag
- var/output_tag
-
- var/list/input_info
- var/list/output_info
-
- var/pressure_setting = ONE_ATMOSPHERE * 45
- circuit = /obj/item/weapon/circuitboard/air_management/tank_control
+/obj/machinery/computer/general_air_control/initialize()
+ set_frequency(frequency)
- return_text()
- var/output = ..()
- //if(signal.data)
- // input_info = signal.data // Attempting to fix intake control -- TLE
+/obj/machinery/computer/general_air_control/large_tank_control
+ icon = 'icons/obj/computer.dmi'
+ icon_state = "tank"
- output += "Tank Control System
"
- if(input_info)
- var/power = (input_info["power"])
- var/volume_rate = input_info["volume_rate"]
- output += {"Input: [power?("Injecting"):("On Hold")] Refresh
+ var/input_tag
+ var/output_tag
+
+ var/list/input_info
+ var/list/output_info
+
+ var/pressure_setting = ONE_ATMOSPHERE * 45
+ circuit = /obj/item/weapon/circuitboard/air_management/tank_control
+
+
+/obj/machinery/computer/general_air_control/large_tank_control/return_text()
+ var/output = ..()
+ //if(signal.data)
+ // input_info = signal.data // Attempting to fix intake control -- TLE
+
+ output += "Tank Control System
"
+ if(input_info)
+ var/power = (input_info["power"])
+ var/volume_rate = input_info["volume_rate"]
+ output += {"Input: [power?("Injecting"):("On Hold")] Refresh
Rate: [volume_rate] L/sec
"}
- output += "Command: Toggle Power
"
+ output += "Command: Toggle Power
"
- else
- output += "ERROR: Can not find input port Search
"
+ else
+ output += "ERROR: Can not find input port Search
"
- output += "
"
+ output += "
"
- if(output_info)
- var/power = (output_info["power"])
- var/output_pressure = output_info["internal"]
- output += {"Output: [power?("Open"):("On Hold")] Refresh
+ if(output_info)
+ var/power = (output_info["power"])
+ var/output_pressure = output_info["internal"]
+ output += {"Output: [power?("Open"):("On Hold")] Refresh
Max Output Pressure: [output_pressure] kPa
"}
- output += "Command: Toggle Power Set Pressure
"
+ output += "Command: Toggle Power Set Pressure
"
- else
- output += "ERROR: Can not find output port Search
"
+ else
+ output += "ERROR: Can not find output port Search
"
- output += "Max Output Pressure Set: - - - - [pressure_setting] kPa + + + +
"
+ output += "Max Output Pressure Set: - - - - [pressure_setting] kPa + + + +
"
- return output
+ return output
- receive_signal(datum/signal/signal)
- if(!signal || signal.encryption) return
+/obj/machinery/computer/general_air_control/large_tank_control/receive_signal(datum/signal/signal)
+ if(!signal || signal.encryption) return
- var/id_tag = signal.data["tag"]
+ var/id_tag = signal.data["tag"]
- if(input_tag == id_tag)
- input_info = signal.data
- else if(output_tag == id_tag)
- output_info = signal.data
- else
- ..(signal)
+ if(input_tag == id_tag)
+ input_info = signal.data
+ else if(output_tag == id_tag)
+ output_info = signal.data
+ else
+ ..(signal)
- Topic(href, href_list)
- if(..())
- return
+/obj/machinery/computer/general_air_control/large_tank_control/Topic(href, href_list)
+ if(..())
+ return
- if(href_list["adj_pressure"])
- var/change = text2num(href_list["adj_pressure"])
- pressure_setting = between(0, pressure_setting + change, 50*ONE_ATMOSPHERE)
- spawn(1)
- src.updateUsrDialog()
- return
+ if(href_list["adj_pressure"])
+ var/change = text2num(href_list["adj_pressure"])
+ pressure_setting = between(0, pressure_setting + change, 50*ONE_ATMOSPHERE)
+ spawn(1)
+ src.updateUsrDialog()
+ return
- if(!radio_connection)
- return 0
- var/datum/signal/signal = new
- signal.transmission_method = 1 //radio signal
- signal.source = src
- if(href_list["in_refresh_status"])
- input_info = null
- signal.data = list ("tag" = input_tag, "status")
+ if(!radio_connection)
+ return 0
+ var/datum/signal/signal = new
+ signal.transmission_method = 1 //radio signal
+ signal.source = src
+ if(href_list["in_refresh_status"])
+ input_info = null
+ signal.data = list ("tag" = input_tag, "status")
- if(href_list["in_toggle_injector"])
- input_info = null
- signal.data = list ("tag" = input_tag, "power_toggle")
+ if(href_list["in_toggle_injector"])
+ input_info = null
+ signal.data = list ("tag" = input_tag, "power_toggle")
- if(href_list["out_refresh_status"])
- output_info = null
- signal.data = list ("tag" = output_tag, "status")
+ if(href_list["out_refresh_status"])
+ output_info = null
+ signal.data = list ("tag" = output_tag, "status")
- if(href_list["out_toggle_power"])
- output_info = null
- signal.data = list ("tag" = output_tag, "power_toggle")
+ if(href_list["out_toggle_power"])
+ output_info = null
+ signal.data = list ("tag" = output_tag, "power_toggle")
- if(href_list["out_set_pressure"])
- output_info = null
- signal.data = list ("tag" = output_tag, "set_internal_pressure" = "[pressure_setting]")
+ if(href_list["out_set_pressure"])
+ output_info = null
+ signal.data = list ("tag" = output_tag, "set_internal_pressure" = "[pressure_setting]")
- signal.data["sigtype"]="command"
- radio_connection.post_signal(src, signal, filter = RADIO_ATMOSIA)
+ signal.data["sigtype"]="command"
+ radio_connection.post_signal(src, signal, filter = RADIO_ATMOSIA)
- spawn(5)
- src.updateUsrDialog()
+ spawn(5)
+ src.updateUsrDialog()
- fuel_injection
- icon = 'icons/obj/computer.dmi'
- icon_state = "atmos"
+/obj/machinery/computer/general_air_control/fuel_injection
+ icon = 'icons/obj/computer.dmi'
+ icon_state = "atmos"
- var/device_tag
- var/list/device_info
+ var/device_tag
+ var/list/device_info
- var/automation = 0
+ var/automation = 0
- var/cutoff_temperature = 2000
- var/on_temperature = 1200
- circuit = /obj/item/weapon/circuitboard/air_management/injector_control
+ var/cutoff_temperature = 2000
+ var/on_temperature = 1200
+ circuit = /obj/item/weapon/circuitboard/air_management/injector_control
- process()
- if(automation)
- if(!radio_connection)
- return 0
+/obj/machinery/computer/general_air_control/fuel_injection/process()
+ if(automation)
+ if(!radio_connection)
+ return 0
- var/injecting = 0
- for(var/id_tag in sensor_information)
- var/list/data = sensor_information[id_tag]
- if(data["temperature"])
- if(data["temperature"] >= cutoff_temperature)
- injecting = 0
- break
- if(data["temperature"] <= on_temperature)
- injecting = 1
+ var/injecting = 0
+ for(var/id_tag in sensor_information)
+ var/list/data = sensor_information[id_tag]
+ if(data["temperature"])
+ if(data["temperature"] >= cutoff_temperature)
+ injecting = 0
+ break
+ if(data["temperature"] <= on_temperature)
+ injecting = 1
- var/datum/signal/signal = new
- signal.transmission_method = 1 //radio signal
- signal.source = src
+ var/datum/signal/signal = new
+ signal.transmission_method = 1 //radio signal
+ signal.source = src
- signal.data = list(
- "tag" = device_tag,
- "power" = injecting,
- "sigtype"="command"
- )
+ signal.data = list(
+ "tag" = device_tag,
+ "power" = injecting,
+ "sigtype"="command"
+ )
- radio_connection.post_signal(src, signal, filter = RADIO_ATMOSIA)
+ radio_connection.post_signal(src, signal, filter = RADIO_ATMOSIA)
- ..()
+ ..()
- return_text()
- var/output = ..()
+/obj/machinery/computer/general_air_control/fuel_injection/return_text()
+ var/output = ..()
- output += "Fuel Injection System
"
- if(device_info)
- var/power = device_info["power"]
- var/volume_rate = device_info["volume_rate"]
- output += {"Status: [power?("Injecting"):("On Hold")] Refresh
+ output += "Fuel Injection System
"
+ if(device_info)
+ var/power = device_info["power"]
+ var/volume_rate = device_info["volume_rate"]
+ output += {"Status: [power?("Injecting"):("On Hold")] Refresh
Rate: [volume_rate] L/sec
"}
- if(automation)
- output += "Automated Fuel Injection: Engaged
"
- output += "Injector Controls Locked Out
"
- else
- output += "Automated Fuel Injection: Disengaged
"
- output += "Injector: Toggle Power Inject (1 Cycle)
"
+ if(automation)
+ output += "Automated Fuel Injection: Engaged
"
+ output += "Injector Controls Locked Out
"
+ else
+ output += "Automated Fuel Injection: Disengaged
"
+ output += "Injector: Toggle Power Inject (1 Cycle)
"
- else
- output += "ERROR: Can not find device Search
"
+ else
+ output += "ERROR: Can not find device Search
"
- return output
+ return output
- receive_signal(datum/signal/signal)
- if(!signal || signal.encryption) return
+/obj/machinery/computer/general_air_control/fuel_injection/receive_signal(datum/signal/signal)
+ if(!signal || signal.encryption) return
- var/id_tag = signal.data["tag"]
+ var/id_tag = signal.data["tag"]
- if(device_tag == id_tag)
- device_info = signal.data
- else
- ..(signal)
+ if(device_tag == id_tag)
+ device_info = signal.data
+ else
+ ..(signal)
- Topic(href, href_list)
- if(..())
- return
+/obj/machinery/computer/general_air_control/fuel_injection/Topic(href, href_list)
+ if(..())
+ return
- if(href_list["refresh_status"])
- device_info = null
- if(!radio_connection)
- return 0
+ if(href_list["refresh_status"])
+ device_info = null
+ if(!radio_connection)
+ return 0
- var/datum/signal/signal = new
- signal.transmission_method = 1 //radio signal
- signal.source = src
- signal.data = list(
- "tag" = device_tag,
- "status",
- "sigtype"="command"
- )
- radio_connection.post_signal(src, signal, filter = RADIO_ATMOSIA)
+ var/datum/signal/signal = new
+ signal.transmission_method = 1 //radio signal
+ signal.source = src
+ signal.data = list(
+ "tag" = device_tag,
+ "status",
+ "sigtype"="command"
+ )
+ radio_connection.post_signal(src, signal, filter = RADIO_ATMOSIA)
- if(href_list["toggle_automation"])
- automation = !automation
+ if(href_list["toggle_automation"])
+ automation = !automation
- if(href_list["toggle_injector"])
- device_info = null
- if(!radio_connection)
- return 0
+ if(href_list["toggle_injector"])
+ device_info = null
+ if(!radio_connection)
+ return 0
- var/datum/signal/signal = new
- signal.transmission_method = 1 //radio signal
- signal.source = src
- signal.data = list(
- "tag" = device_tag,
- "power_toggle",
- "sigtype"="command"
- )
+ var/datum/signal/signal = new
+ signal.transmission_method = 1 //radio signal
+ signal.source = src
+ signal.data = list(
+ "tag" = device_tag,
+ "power_toggle",
+ "sigtype"="command"
+ )
- radio_connection.post_signal(src, signal, filter = RADIO_ATMOSIA)
+ radio_connection.post_signal(src, signal, filter = RADIO_ATMOSIA)
- if(href_list["injection"])
- if(!radio_connection)
- return 0
+ if(href_list["injection"])
+ if(!radio_connection)
+ return 0
- var/datum/signal/signal = new
- signal.transmission_method = 1 //radio signal
- signal.source = src
- signal.data = list(
- "tag" = device_tag,
- "inject",
- "sigtype"="command"
- )
+ var/datum/signal/signal = new
+ signal.transmission_method = 1 //radio signal
+ signal.source = src
+ signal.data = list(
+ "tag" = device_tag,
+ "inject",
+ "sigtype"="command"
+ )
- radio_connection.post_signal(src, signal, filter = RADIO_ATMOSIA)
+ radio_connection.post_signal(src, signal, filter = RADIO_ATMOSIA)