diff --git a/code/WorkInProgress/Mini/atmos_control.dm b/code/WorkInProgress/Mini/atmos_control.dm index 7ae23e7e4b8..3eed620ee9d 100644 --- a/code/WorkInProgress/Mini/atmos_control.dm +++ b/code/WorkInProgress/Mini/atmos_control.dm @@ -35,27 +35,6 @@ overridden = 0 return ui_interact(user) - /* - - var/dat = "Main Menu
" - if(current) - //dat += specific() - //return ui_interact(user) - else - for(var/obj/machinery/alarm/alarm in sortAtom(machines)) - if(!is_in_filter(alarm.alarm_area.type)) - continue // NO ACCESS 4 U - dat += "" - switch(max(alarm.danger_level, alarm.alarm_area.atmosalm)) - if (0) - dat += "" - if (1) - dat += "" - if (2) - dat += "" - dat += "[alarm]
" - user << browse(dat, "window=atmoscontrol") - */ /obj/machinery/computer/atmoscontrol/attackby(var/obj/item/I as obj, var/mob/user as mob) @@ -121,6 +100,10 @@ if(href_list["alarm"]) current = locate(href_list["alarm"]) + updateUsrDialog() + return + + if(current) if(href_list["command"]) var/device_id = href_list["id_tag"] switch(href_list["command"]) @@ -261,194 +244,3 @@ current.target_temperature = input_temperature + T0C return updateUsrDialog() - -//copypasta from alarm code, changed to work with this without derping hard -//---START COPYPASTA---- -/obj/machinery/computer/atmoscontrol/proc/fmtScrubberGasStatus(var/id_tag,var/code,var/list/data) - var/label=replacetext(uppertext(code),"2","2") - if(code=="tox") - label="Plasma" - return "[label]" - -/obj/machinery/computer/atmoscontrol/proc/return_controls() - var/output = ""//"[alarm_zone] Air [name]
" - - switch(current.screen) - if (AALARM_SCREEN_MAIN) - output += "
Thermostat:
[current.target_temperature - T0C]C
" - if(current.alarm_area.atmosalm) - output += {"Reset - Atmospheric Alarm
"} - else - output += {"Activate - Atmospheric Alarm
"} - - output += {" -Scrubbers Control
-Vents Control
-Set environmental mode
-Sensor Control
-
-"} - if (current.mode==AALARM_MODE_PANIC) - output += "PANIC SYPHON ACTIVE
turn syphoning off" - else - output += "ACTIVATE PANIC SYPHON IN AREA" - - //output += "

Atmospheric Lockdown: [current.alarm_area.air_doors_activated ? "ENABLED" : "Disabled"]" - if (AALARM_SCREEN_VENT) - var/sensor_data = "" - if(current.alarm_area.air_vent_names.len) - for(var/id_tag in current.alarm_area.air_vent_names) - var/long_name = current.alarm_area.air_vent_names[id_tag] - var/list/data = current.alarm_area.air_vent_info[id_tag] - var/state = "" - if(!data) - state = " can not be found!" - data = list("external" = 0) //for "0" instead of empty string - else if (data["timestamp"]+AALARM_REPORT_TIMEOUT < world.time) - state = " not responding!" - sensor_data += {" -[long_name][state]
-Operating: -[data["power"]?"on":"off"] -
-Pressure checks: -external -internal -
-External pressure bound: -- -- -- -- -[data["external"]] -+ -+ -+ -+ -
-"} - if (data["direction"] == "siphon") - sensor_data += {" -Direction: -siphoning -
-"} - sensor_data += {"
"} - else - sensor_data = "No vents connected.
" - output = {"Main menu
[sensor_data]"} - if (AALARM_SCREEN_SCRUB) - var/sensor_data = "" - if(current.alarm_area.air_scrub_names.len) - for(var/id_tag in current.alarm_area.air_scrub_names) - var/long_name = current.alarm_area.air_scrub_names[id_tag] - var/list/data = current.alarm_area.air_scrub_info[id_tag] - var/state = "" - if(!data) - state = " can not be found!" - data = list("external" = 0) //for "0" instead of empty string - else if (data["timestamp"]+AALARM_REPORT_TIMEOUT < world.time) - state = " not responding!" - - sensor_data += {" -[long_name][state]
-Operating: -[data["power"]?"on":"off"]
-Type: -[data["scrubbing"]?"scrubbing":"syphoning"]
-"} - - if(data["scrubbing"]) - sensor_data += {" -Filtering: -[fmtScrubberGasStatus(id_tag,"co2",data)], -[fmtScrubberGasStatus(id_tag,"tox",data)], -[fmtScrubberGasStatus(id_tag,"n2o",data)], -[fmtScrubberGasStatus(id_tag,"o2",data)] -
-"} - sensor_data += {" -Panic syphon: [data["panic"]?"PANIC SYPHON ACTIVATED":""] -Dea":"red'>A")]ctivate
-
-"} - else - sensor_data = "No scrubbers connected.
" - output = {"Main menu
[sensor_data]"} - - if (AALARM_SCREEN_MODE) - output += {" -Main menu
-Air machinery mode for the area: -

Sensor presets:
(Note, this only sets sensors, air supplied to vents must still be changed.)" - if (AALARM_SCREEN_SENSORS) - output += {" -Main menu
-Alarm thresholds:
-Partial pressure for gases - - - -"} - var/list/gases = list( - "oxygen" = "O2", - "carbon dioxide" = "CO2", - "plasma" = "Toxin", - "other" = "Other", - ) - var/list/tlv - for (var/g in gases) - output += "" - tlv = current.TLV[g] - for (var/i = 1, i <= 4, i++) - output += "" - output += "" - - tlv = current.TLV["pressure"] - output += "" - for (var/i = 1, i <= 4, i++) - output += "" - output += "" - - tlv = current.TLV["temperature"] - output += "" - for (var/i = 1, i <= 4, i++) - output += "" - - // AUTOFIXED BY fix_string_idiocy.py - // C:\Users\Rob\Documents\Projects\vgstation13\code\WorkInProgress\Mini\atmos_control.dm:357: output += "" - output += {" -
min2min1max1max2
[gases[g]][tlv[i] >= 0?tlv[i]:"OFF"]
Pressure[tlv[i]>= 0?tlv[i]:"OFF"]
Temperature[tlv[i]>= 0?tlv[i]:"OFF"]
"} - // END AUTOFIX - return output -//---END COPYPASTA---- diff --git a/nano/templates/atmos_control.tmpl b/nano/templates/atmos_control.tmpl index 69777eb4904..5a8301bc8e1 100644 --- a/nano/templates/atmos_control.tmpl +++ b/nano/templates/atmos_control.tmpl @@ -6,7 +6,7 @@ Used In File(s): /code/game/machinery/alarm.dm #define AALARM_MODE_SCRUBBING 1 #define AALARM_MODE_REPLACEMENT 2 //like scrubbing, but faster. #define AALARM_MODE_PANIC 3 //constantly sucks all air -#define AALARM_MODE_CYCLE 4 //sucks off all air, then refill and switches to scrubbing +#define AALARM_MODE_CYCLE 4 //sucks out all air, then refill and switches to scrubbing #define AALARM_MODE_FILL 5 //emergency fill #define AALARM_MODE_OFF 6 //Shuts it all down. @@ -39,9 +39,9 @@ Used In File(s): /code/game/machinery/alarm.dm
{{if !locked}} {{if mode == 3}} - {{:~link("DEACTIVATE PANIC SYPHON",null,{"alarm":alarm,"mode" : 1},null,'linkOn')}} + {{:~link("DEACTIVATE PANIC SYPHON",null,{"mode" : 1},null,'linkOn')}} {{else}} - {{:~link("ACTIVATE PANIC SYPHON",null,{"alarm":alarm,"mode" : 3},null,'red')}} + {{:~link("ACTIVATE PANIC SYPHON",null,{"mode" : 3},null,'red')}} {{/if}} {{/if}}
@@ -66,6 +66,13 @@ Used In File(s): /code/game/machinery/alarm.dm {{:~displayBar(air.contents.plasma, 0, 100, ~dangerToClass(air.danger.plasma))}} {{:~string("
{1}%
",~dangerToClass(air.danger.plasma),~precisionRound(air.contents.plasma,2))}} + {{if air.danger.other>0}} +
+
Other:
+ {{:~displayBar(air.contents.other, 0, 100, ~dangerToClass(air.danger.other))}} + {{:~string("
{1}%
",~dangerToClass(air.danger.other),~precisionRound(air.contents.other,2))}} +
+ {{/if}}
Temperature: @@ -87,9 +94,9 @@ Used In File(s): /code/game/machinery/alarm.dm {{/if}} {{if !locked}} {{if atmos_alarm}} - {{:~link('Reset Alarm',null,{"alarm":alarm,'atmos_reset':1},null,'linkOn floatRight')}} + {{:~link('Reset Alarm',null,{'atmos_reset':1},null,'linkOn floatRight')}} {{else}} - {{:~link('Activate Alarm',null,{"alarm":alarm,'atmos_alarm':1},null,'red floatRight')}} + {{:~link('Activate Alarm',null,{'atmos_alarm':1},null,'red floatRight')}} {{/if}} {{/if}}
@@ -101,13 +108,13 @@ Used In File(s): /code/game/machinery/alarm.dm #define RCON_YES 3 -->
Remote Control:
- {{:~link('Off', null, {"alarm":alarm,'rcon' : 1}, (rcon != 1) ? null : 'disabled')}} - {{:~link('Auto', null, {"alarm":alarm,'rcon' : 2}, (rcon != 2) ? null : 'disabled')}} - {{:~link('On', null, {"alarm":alarm,'rcon' : 3}, (rcon != 3) ? null : 'disabled')}} + {{:~link('Off', null, {'rcon' : 1}, (rcon != 1) ? null : 'disabled')}} + {{:~link('Auto', null, {'rcon' : 2}, (rcon != 2) ? null : 'disabled')}} + {{:~link('On', null, {'rcon' : 3}, (rcon != 3) ? null : 'disabled')}}
Thermostat:
- {{:~link(target_temp+" C", 'carat-2-n-s', {"alarm":alarm,'temperature': 1})}} + {{:~link(target_temp+" C", 'carat-2-n-s', {'temperature': 1})}}
{{/if}} @@ -119,11 +126,11 @@ Used In File(s): /code/game/machinery/alarm.dm
Screen:
- {{:~link('Main', 'gear',{"alarm":alarm,'screen':1},(screen==1)?'linkOn':'')}} - {{:~link('Vents', 'gear',{"alarm":alarm,'screen':2},(screen==2)?'linkOn':'')}} - {{:~link('Scrubbers', 'gear',{"alarm":alarm,'screen':3},(screen==3)?'linkOn':'')}} - {{:~link('Mode', 'gear',{"alarm":alarm,'screen':4},(screen==4)?'linkOn':'')}} - {{:~link('Thresholds','gear',{"alarm":alarm,'screen':5},(screen==5)?'linkOn':'')}} + {{:~link('Main', 'gear',{'screen':1},(screen==1)?'linkOn':'')}} + {{:~link('Vents', 'gear',{'screen':2},(screen==2)?'linkOn':'')}} + {{:~link('Scrubbers', 'gear',{'screen':3},(screen==3)?'linkOn':'')}} + {{:~link('Mode', 'gear',{'screen':4},(screen==4)?'linkOn':'')}} + {{:~link('Thresholds','gear',{'screen':5},(screen==5)?'linkOn':'')}}
{{!-- VENTS --}} @@ -137,19 +144,19 @@ Used In File(s): /code/game/machinery/alarm.dm
Operating:
- {{:~link(power ? 'On':'Off','power',{"alarm":alarm,'id_tag':id_tag,'command':'power','val':power?0:1},null,(power?'linkOn':'red'))}} + {{:~link(power ? 'On':'Off','power',{'id_tag':id_tag,'command':'power','val':power?0:1},null,(power?'linkOn':'red'))}} {{if direction=="siphon"}} - {{:~link('Siphoning','arrowthickstop-1-s',{"alarm":alarm,'id_tag':id_tag,'command':'set_dir','dir':'release'})}} + {{:~link('Siphoning','arrowthickstop-1-s',{'id_tag':id_tag,'command':'set_dir','dir':'release'})}} {{else}} - {{:~link('Blowing','arrowthick-1-n',{"alarm":alarm,'id_tag':id_tag,'command':'set_dir','dir':'siphon'})}} + {{:~link('Blowing','arrowthick-1-n',{'id_tag':id_tag,'command':'set_dir','dir':'siphon'})}} {{/if}}
Pressure checks:
- {{:~link('External','power',{"alarm":alarm,'id_tag':id_tag,'command':'checks','val':~xor(checks,1)},null,(checks & 1 ?'linkOn':'red'))}} - {{:~link('Internal','power',{"alarm":alarm,'id_tag':id_tag,'command':'checks','val':~xor(checks,2)},null,(checks & 2 ?'linkOn':'red'))}} + {{:~link('External','power',{'id_tag':id_tag,'command':'checks','val':~xor(checks,1)},null,(checks & 1 ?'linkOn':'red'))}} + {{:~link('Internal','power',{'id_tag':id_tag,'command':'checks','val':~xor(checks,2)},null,(checks & 2 ?'linkOn':'red'))}}
@@ -157,8 +164,8 @@ Used In File(s): /code/game/machinery/alarm.dm
{{:~precisionRound(external,4)}} kPa
- {{:~link('Set','gear',{"alarm":alarm,'id_tag':id_tag,'command':'set_external_pressure'})}} - {{:~link('Reset','arrowrefresh-1-n',{"alarm":alarm,'id_tag':id_tag,'command':'set_external_pressure','val':101.325},null,'linkOn')}} + {{:~link('Set','gear',{'id_tag':id_tag,'command':'set_external_pressure'})}} + {{:~link('Reset','arrowrefresh-1-n',{'id_tag':id_tag,'command':'set_external_pressure','val':101.325},null,'linkOn')}}
{{else}} @@ -175,16 +182,16 @@ Used In File(s): /code/game/machinery/alarm.dm
Operating:
- {{:~link(power ? 'On':'Off','power',{"alarm":alarm,'id_tag':id_tag,'command':'power','val':power?0:1},null,(power?'linkOn':'red'))}} + {{:~link(power ? 'On':'Off','power',{'id_tag':id_tag,'command':'power','val':power?0:1},null,(power?'linkOn':'red'))}}
Type:
{{if scrubbing==0}} - {{:~link('Siphoning','arrowthickstop-1-s',{"alarm":alarm,'id_tag':id_tag,'command':'scrubbing','val':1},null,'red')}} + {{:~link('Siphoning','arrowthickstop-1-s',{'id_tag':id_tag,'command':'scrubbing','val':1},null,'red')}} {{else}} - {{:~link('Scrubbing','transferthick-e-w',{"alarm":alarm,'id_tag':id_tag,'command':'scrubbing','val':0},null,'linkOn')}} + {{:~link('Scrubbing','transferthick-e-w',{'id_tag':id_tag,'command':'scrubbing','val':0},null,'linkOn')}} {{/if}}
@@ -192,10 +199,10 @@ Used In File(s): /code/game/machinery/alarm.dm
Filtering:
- {{:~link('CO2',null,{"alarm":alarm,'id_tag':id_tag,'command':'co2_scrub','val':(filter_co2==0?1:0)},null,(filter_co2?'linkOn':''))}} - {{:~link('Plasma', null,{"alarm":alarm,'id_tag':id_tag,'command':'tox_scrub','val':(filter_tox==0?1:0)},null,(filter_tox?'linkOn':''))}} - {{:~link('N2O',null,{"alarm":alarm,'id_tag':id_tag,'command':'n2o_scrub','val':(filter_n2o==0?1:0)},null,(filter_n2o?'linkOn':''))}} - {{:~link('O2', null,{"alarm":alarm,'id_tag':id_tag,'command':'o2_scrub', 'val':(filter_o2 ==0?1:0)},null,(filter_o2 ?'linkOn':''))}} + {{:~link('CO2',null,{'id_tag':id_tag,'command':'co2_scrub','val':(filter_co2==0?1:0)},null,(filter_co2?'linkOn':''))}} + {{:~link('Plasma', null,{'id_tag':id_tag,'command':'tox_scrub','val':(filter_tox==0?1:0)},null,(filter_tox?'linkOn':''))}} + {{:~link('N2O',null,{'id_tag':id_tag,'command':'n2o_scrub','val':(filter_n2o==0?1:0)},null,(filter_n2o?'linkOn':''))}} + {{:~link('O2', null,{'id_tag':id_tag,'command':'o2_scrub', 'val':(filter_o2 ==0?1:0)},null,(filter_o2 ?'linkOn':''))}}
{{/if}} @@ -209,7 +216,7 @@ Used In File(s): /code/game/machinery/alarm.dm
{{for modes}}
-
{{:~link(name,'gear',{"alarm":alarm,'mode':#index+1},null,(#index+1==~root.mode?'linkOn':''))}}
+
{{:~link(name,'gear',{'mode':#index+1},null,(#index+1==~root.mode?'linkOn':''))}}
{{:desc}}
@@ -221,7 +228,7 @@ Used In File(s): /code/game/machinery/alarm.dm
{{for presets}}
-
{{:~link(name,'gear',{"alarm":alarm,'preset':#index+1},null,(#index+1==~root.preset?'linkOn':''))}}
+
{{:~link(name,'gear',{'preset':#index+1},null,(#index+1==~root.preset?'linkOn':''))}}
{{:desc}}
@@ -244,37 +251,37 @@ Used In File(s): /code/game/machinery/alarm.dm O2 {{for sensors.oxygen}} - {{:~link(#data >= 0 ? ~precisionRound(#data,4) : "OFF",null,{"alarm":alarm,'command':'set_threshold','env':'oxygen','var':#index+1})}} + {{:~link(#data >= 0 ? ~precisionRound(#data,4) : "OFF",null,{'command':'set_threshold','env':'oxygen','var':#index+1})}} {{/for}} N2 {{for sensors.nitrogen}} - {{:~link(#data >= 0 ? ~precisionRound(#data,4) : "OFF",null,{"alarm":alarm,'command':'set_threshold','env':'nitrogen','var':#index+1})}} + {{:~link(#data >= 0 ? ~precisionRound(#data,4) : "OFF",null,{'command':'set_threshold','env':'nitrogen','var':#index+1})}} {{/for}} CO2 {{for sensors.carbon_dioxide}} - {{:~link(#data >= 0 ? ~precisionRound(#data,4) : "OFF",null,{"alarm":alarm,'command':'set_threshold','env':'carbon_dioxide','var':#index+1})}} + {{:~link(#data >= 0 ? ~precisionRound(#data,4) : "OFF",null,{'command':'set_threshold','env':'carbon_dioxide','var':#index+1})}} {{/for}} Toxins {{for sensors.plasma}} - {{:~link(#data >= 0 ? ~precisionRound(#data,4) : "OFF",null,{"alarm":alarm,'command':'set_threshold','env':'plasma','var':#index+1})}} + {{:~link(#data >= 0 ? ~precisionRound(#data,4) : "OFF",null,{'command':'set_threshold','env':'plasma','var':#index+1})}} {{/for}} Pressure {{for sensors.pressure}} - {{:~link(#data >= 0 ? ~precisionRound(#data,4) : "OFF",null,{"alarm":alarm,'command':'set_threshold','env':'pressure','var':#index+1})}} + {{:~link(#data >= 0 ? ~precisionRound(#data,4) : "OFF",null,{'command':'set_threshold','env':'pressure','var':#index+1})}} {{/for}} Temperature (K) {{for sensors.temperature}} - {{:~link(#data >= 0 ? ~precisionRound(#data,4) : "OFF",null,{"alarm":alarm,'command':'set_threshold','env':'temperature','var':#index+1})}} + {{:~link(#data >= 0 ? ~precisionRound(#data,4) : "OFF",null,{'command':'set_threshold','env':'temperature','var':#index+1})}} {{/for}}