diff --git a/code/game/machinery/alarm.dm b/code/game/machinery/alarm.dm index 5138b3ec00..0a90829e14 100644 --- a/code/game/machinery/alarm.dm +++ b/code/game/machinery/alarm.dm @@ -591,12 +591,12 @@ Temperature: [environment.temperature] output += {" Scrubbers Control
Vents Control
-Set envirenomentals mode
-Sensor Control
+Set environmentals mode
+Sensor Settings

"} if (mode==AALARM_MODE_PANIC) - output += "PANIC SYPHON ACTIVE
turn syphoning off" + output += "PANIC SYPHON ACTIVE
Turn syphoning off" else output += "ACTIVATE PANIC SYPHON IN AREA" if (AALARM_SCREEN_VENT) @@ -605,12 +605,10 @@ Temperature: [environment.temperature] for(var/id_tag in alarm_area.air_vent_names) var/long_name = alarm_area.air_vent_names[id_tag] var/list/data = 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!" + continue; + var/state = "" + sensor_data += {" [long_name][state]
Operating: @@ -630,6 +628,7 @@ Temperature: [environment.temperature] + + + + (reset)
"} if (data["direction"] == "siphon") @@ -648,12 +647,9 @@ siphoning for(var/id_tag in alarm_area.air_scrub_names) var/long_name = alarm_area.air_scrub_names[id_tag] var/list/data = 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!" + continue; + var/state = "" sensor_data += {" [long_name][state]
@@ -787,6 +783,7 @@ table tr:first-child th:first-child { border: none;} if( "power", "adjust_external_pressure", + "set_external_pressure", "checks", "co2_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"]))) spawn(3) src.updateUsrDialog() + //if("adjust_threshold") //was a good idea but required very wide window if("set_threshold") var/env = href_list["env"] @@ -843,6 +841,7 @@ table tr:first-child th:first-child { border: none;} apply_mode() spawn(5) src.updateUsrDialog() + return /obj/machinery/alarm/proc/apply_mode() @@ -888,15 +887,15 @@ table tr:first-child th:first-child { border: none;} send_signal(device_id, list( "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) send_signal(device_id, list( - "power"= 0 + "panic_siphon" = 0 )) for(var/device_id in alarm_area.air_vent_names) send_signal(device_id, list( - "power"= 0 - )) + "power"= 1 + ))*/ /obj/machinery/alarm/update_icon() if(wiresexposed) diff --git a/code/game/mecha/mech_fabricator.dm b/code/game/mecha/mech_fabricator.dm index 01dd2e422e..9f9c9eee3e 100644 --- a/code/game/mecha/mech_fabricator.dm +++ b/code/game/mecha/mech_fabricator.dm @@ -455,7 +455,7 @@ if(!operation_allowed(user)) return user.machine = src - var/turf/exit = get_step(src,EAST) + var/turf/exit = get_step(src,SOUTH) if(exit.density) src.visible_message("\icon[src] [src] beeps, \"Error! Part outlet is obstructed\".") return