Merge pull request #1658 from Markolie/alarms

Attempted disposals fix
This commit is contained in:
TheDZD
2015-08-08 14:41:10 -04:00
+1 -4
View File
@@ -241,9 +241,6 @@
return
/obj/machinery/disposal/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1)
if(!air_contents) // I'm totally blaming Pete for you Donkie, because this is really shitty
return
var/data[0]
var/pressure = 100 * air_contents.return_pressure() / (SEND_PRESSURE)
@@ -349,7 +346,7 @@
return
if(!air_contents) // Potentially causes a runtime otherwise (if this is really shitty, blame pete //Donkie)
return
air_contents = new() // new empty gas resv.
flush_count++
if( flush_count >= flush_every_ticks )