mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-15 12:43:13 +00:00
TG: - The alarm needed some more userfriendlyness:
* Spelling sorted * Turning off PANIC SYPHON now sets scrubbers to scrubbing (default) instead of off. * Instead of the stupid timeout and VENT NOT FOUND HURRDURR they will just get removed from the list. They were clogging that vent list up as fuck * Vents pressure settings now have an extra href which resets the vent to ONE_ATMOSPHERE kPa (101.32 or whatever it is) - The "Outlet position is obstructed" error message when opening exofab now only appears if the turf to south is obstructed, not to east like before. - AI Modules use attack_self instead of attack_hand - Fixed chatspam with reverse() and made the explode function use the builtin ss13 one instead of my custom, it proved to be faster. - Added my self to the changelog, because I can! Revision: r3367 Author: daniel.cf.hultgren
This commit is contained in:
@@ -591,12 +591,12 @@ Temperature: <span class='dl[temperature_dangerlevel]'>[environment.temperature]
|
|||||||
output += {"
|
output += {"
|
||||||
<a href='?src=\ref[src];screen=[AALARM_SCREEN_SCRUB]'>Scrubbers Control</a><br>
|
<a href='?src=\ref[src];screen=[AALARM_SCREEN_SCRUB]'>Scrubbers Control</a><br>
|
||||||
<a href='?src=\ref[src];screen=[AALARM_SCREEN_VENT]'>Vents Control</a><br>
|
<a href='?src=\ref[src];screen=[AALARM_SCREEN_VENT]'>Vents Control</a><br>
|
||||||
<a href='?src=\ref[src];screen=[AALARM_SCREEN_MODE]'>Set envirenomentals mode</a><br>
|
<a href='?src=\ref[src];screen=[AALARM_SCREEN_MODE]'>Set environmentals mode</a><br>
|
||||||
<a href='?src=\ref[src];screen=[AALARM_SCREEN_SENSORS]'>Sensor Control</a><br>
|
<a href='?src=\ref[src];screen=[AALARM_SCREEN_SENSORS]'>Sensor Settings</a><br>
|
||||||
<HR>
|
<HR>
|
||||||
"}
|
"}
|
||||||
if (mode==AALARM_MODE_PANIC)
|
if (mode==AALARM_MODE_PANIC)
|
||||||
output += "<font color='red'><B>PANIC SYPHON ACTIVE</B></font><br><A href='?src=\ref[src];mode=[AALARM_MODE_OFF]'>turn syphoning off</A>"
|
output += "<font color='red'><B>PANIC SYPHON ACTIVE</B></font><br><A href='?src=\ref[src];mode=[AALARM_MODE_SCRUBBING]'>Turn syphoning off</A>"
|
||||||
else
|
else
|
||||||
output += "<A href='?src=\ref[src];mode=[AALARM_MODE_PANIC]'><font color='red'><B>ACTIVATE PANIC SYPHON IN AREA</B></font></A>"
|
output += "<A href='?src=\ref[src];mode=[AALARM_MODE_PANIC]'><font color='red'><B>ACTIVATE PANIC SYPHON IN AREA</B></font></A>"
|
||||||
if (AALARM_SCREEN_VENT)
|
if (AALARM_SCREEN_VENT)
|
||||||
@@ -605,12 +605,10 @@ Temperature: <span class='dl[temperature_dangerlevel]'>[environment.temperature]
|
|||||||
for(var/id_tag in alarm_area.air_vent_names)
|
for(var/id_tag in alarm_area.air_vent_names)
|
||||||
var/long_name = alarm_area.air_vent_names[id_tag]
|
var/long_name = alarm_area.air_vent_names[id_tag]
|
||||||
var/list/data = alarm_area.air_vent_info[id_tag]
|
var/list/data = alarm_area.air_vent_info[id_tag]
|
||||||
var/state = ""
|
|
||||||
if(!data)
|
if(!data)
|
||||||
state = "<font color='red'> can not be found!</font>"
|
continue;
|
||||||
data = list("external" = 0) //for "0" instead of empty string
|
var/state = ""
|
||||||
else if (data["timestamp"]+AALARM_REPORT_TIMEOUT < world.time)
|
|
||||||
state = "<font color='red'> not responding!</font>"
|
|
||||||
sensor_data += {"
|
sensor_data += {"
|
||||||
<B>[long_name]</B>[state]<BR>
|
<B>[long_name]</B>[state]<BR>
|
||||||
<B>Operating:</B>
|
<B>Operating:</B>
|
||||||
@@ -630,6 +628,7 @@ Temperature: <span class='dl[temperature_dangerlevel]'>[environment.temperature]
|
|||||||
<A href='?src=\ref[src];id_tag=[id_tag];command=adjust_external_pressure;val=+10'>+</A>
|
<A href='?src=\ref[src];id_tag=[id_tag];command=adjust_external_pressure;val=+10'>+</A>
|
||||||
<A href='?src=\ref[src];id_tag=[id_tag];command=adjust_external_pressure;val=+100'>+</A>
|
<A href='?src=\ref[src];id_tag=[id_tag];command=adjust_external_pressure;val=+100'>+</A>
|
||||||
<A href='?src=\ref[src];id_tag=[id_tag];command=adjust_external_pressure;val=+1000'>+</A>
|
<A href='?src=\ref[src];id_tag=[id_tag];command=adjust_external_pressure;val=+1000'>+</A>
|
||||||
|
<A href='?src=\ref[src];id_tag=[id_tag];command=set_external_pressure;val=[ONE_ATMOSPHERE]'> (reset) </A>
|
||||||
<BR>
|
<BR>
|
||||||
"}
|
"}
|
||||||
if (data["direction"] == "siphon")
|
if (data["direction"] == "siphon")
|
||||||
@@ -648,12 +647,9 @@ siphoning
|
|||||||
for(var/id_tag in alarm_area.air_scrub_names)
|
for(var/id_tag in alarm_area.air_scrub_names)
|
||||||
var/long_name = alarm_area.air_scrub_names[id_tag]
|
var/long_name = alarm_area.air_scrub_names[id_tag]
|
||||||
var/list/data = alarm_area.air_scrub_info[id_tag]
|
var/list/data = alarm_area.air_scrub_info[id_tag]
|
||||||
var/state = ""
|
|
||||||
if(!data)
|
if(!data)
|
||||||
state = "<font color='red'> can not be found!</font>"
|
continue;
|
||||||
data = list("external" = 0) //for "0" instead of empty string
|
var/state = ""
|
||||||
else if (data["timestamp"]+AALARM_REPORT_TIMEOUT < world.time)
|
|
||||||
state = "<font color='red'> not responding!</font>"
|
|
||||||
|
|
||||||
sensor_data += {"
|
sensor_data += {"
|
||||||
<B>[long_name]</B>[state]<BR>
|
<B>[long_name]</B>[state]<BR>
|
||||||
@@ -787,6 +783,7 @@ table tr:first-child th:first-child { border: none;}
|
|||||||
if(
|
if(
|
||||||
"power",
|
"power",
|
||||||
"adjust_external_pressure",
|
"adjust_external_pressure",
|
||||||
|
"set_external_pressure",
|
||||||
"checks",
|
"checks",
|
||||||
"co2_scrub",
|
"co2_scrub",
|
||||||
"tox_scrub",
|
"tox_scrub",
|
||||||
@@ -797,6 +794,7 @@ table tr:first-child th:first-child { border: none;}
|
|||||||
send_signal(device_id, list (href_list["command"] = text2num(href_list["val"])))
|
send_signal(device_id, list (href_list["command"] = text2num(href_list["val"])))
|
||||||
spawn(3)
|
spawn(3)
|
||||||
src.updateUsrDialog()
|
src.updateUsrDialog()
|
||||||
|
|
||||||
//if("adjust_threshold") //was a good idea but required very wide window
|
//if("adjust_threshold") //was a good idea but required very wide window
|
||||||
if("set_threshold")
|
if("set_threshold")
|
||||||
var/env = href_list["env"]
|
var/env = href_list["env"]
|
||||||
@@ -843,6 +841,7 @@ table tr:first-child th:first-child { border: none;}
|
|||||||
apply_mode()
|
apply_mode()
|
||||||
spawn(5)
|
spawn(5)
|
||||||
src.updateUsrDialog()
|
src.updateUsrDialog()
|
||||||
|
|
||||||
return
|
return
|
||||||
|
|
||||||
/obj/machinery/alarm/proc/apply_mode()
|
/obj/machinery/alarm/proc/apply_mode()
|
||||||
@@ -888,15 +887,15 @@ table tr:first-child th:first-child { border: none;}
|
|||||||
send_signal(device_id, list(
|
send_signal(device_id, list(
|
||||||
"power"= 0
|
"power"= 0
|
||||||
))
|
))
|
||||||
if(AALARM_MODE_OFF)
|
/*if(AALARM_MODE_OFF) Commented out cause the "turn off panic" uses scrubbing mode now instead.
|
||||||
for(var/device_id in alarm_area.air_scrub_names)
|
for(var/device_id in alarm_area.air_scrub_names)
|
||||||
send_signal(device_id, list(
|
send_signal(device_id, list(
|
||||||
"power"= 0
|
"panic_siphon" = 0
|
||||||
))
|
))
|
||||||
for(var/device_id in alarm_area.air_vent_names)
|
for(var/device_id in alarm_area.air_vent_names)
|
||||||
send_signal(device_id, list(
|
send_signal(device_id, list(
|
||||||
"power"= 0
|
"power"= 1
|
||||||
))
|
))*/
|
||||||
|
|
||||||
/obj/machinery/alarm/update_icon()
|
/obj/machinery/alarm/update_icon()
|
||||||
if(wiresexposed)
|
if(wiresexposed)
|
||||||
|
|||||||
@@ -455,7 +455,7 @@
|
|||||||
if(!operation_allowed(user))
|
if(!operation_allowed(user))
|
||||||
return
|
return
|
||||||
user.machine = src
|
user.machine = src
|
||||||
var/turf/exit = get_step(src,EAST)
|
var/turf/exit = get_step(src,SOUTH)
|
||||||
if(exit.density)
|
if(exit.density)
|
||||||
src.visible_message("\icon[src] <b>[src]</b> beeps, \"Error! Part outlet is obstructed\".")
|
src.visible_message("\icon[src] <b>[src]</b> beeps, \"Error! Part outlet is obstructed\".")
|
||||||
return
|
return
|
||||||
|
|||||||
Reference in New Issue
Block a user