Atmos bug fixes

This commit is contained in:
Markolie
2015-01-30 15:42:55 +01:00
parent 5734a3e991
commit acda8e7730
6 changed files with 18 additions and 18 deletions
+1 -1
View File
@@ -302,7 +302,7 @@
/obj/machinery/atmospherics/valve/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob)
if (!istype(W, /obj/item/weapon/wrench))
return ..()
if (istype(src, /obj/machinery/atmospherics/valve/digital))
if (istype(src, /obj/machinery/atmospherics/valve/digital) && src:frequency)
user << "\red You cannot unwrench this [src], it's too complicated."
return 1
var/datum/gas_mixture/int_air = return_air()
+3 -2
View File
@@ -691,7 +691,7 @@
}
if (!ui)
// the ui does not exist, so we'll create a new one
ui = new(user, src, ui_key, "air_alarm.tmpl", name, 550, 410)
ui = new(user, src, ui_key, "air_alarm.tmpl", name, 570, 410)
// When the UI is first opened this is the data it will use
ui.set_initial_data(data)
ui.open()
@@ -758,7 +758,8 @@
"n2o_scrub",
"o2_scrub",
"panic_siphon",
"scrubbing")
"scrubbing",
"direction")
var/val
if(href_list["val"])
val=text2num(href_list["val"])
+1 -1
View File
@@ -104,7 +104,7 @@ Buildable meters
src.pipe_type = PIPE_UVENT
else if(istype(make_from, /obj/machinery/atmospherics/valve))
src.pipe_type = PIPE_MVALVE
else if(istype(make_from, /obj/machinery/atmospherics/binary/volume_pump))
else if(istype(make_from, /obj/machinery/atmospherics/binary/pump))
src.pipe_type = PIPE_PUMP
else if(istype(make_from, /obj/machinery/atmospherics/trinary/filter/m_filter))
src.pipe_type = PIPE_GAS_FILTER_M
-1
View File
@@ -1206,7 +1206,6 @@
update()
else if (last_ch != charging)
queue_icon_update()
src.updateDialog()
// val 0=off, 1=off(auto) 2=on 3=on(auto)
// on 0=off, 1=on, 2=autooff