Merge pull request #3296 from Citadel-Station-13/upstream-merge-31443

[MIRROR] Fixes pandemic no beaker UI runtime
This commit is contained in:
LetterJay
2017-10-10 22:33:33 -04:00
committed by GitHub
@@ -159,14 +159,17 @@
return return
switch(action) switch(action)
if("eject_beaker") if("eject_beaker")
eject_beaker() if(beaker)
eject_beaker()
. = TRUE . = TRUE
if("empty_beaker") if("empty_beaker")
beaker.reagents.clear_reagents() if(beaker)
beaker.reagents.clear_reagents()
. = TRUE . = TRUE
if("empty_eject_beaker") if("empty_eject_beaker")
beaker.reagents.clear_reagents() if(beaker)
eject_beaker() beaker.reagents.clear_reagents()
eject_beaker()
. = TRUE . = TRUE
if("rename_disease") if("rename_disease")
var/id = get_virus_id_by_index(text2num(params["index"])) var/id = get_virus_id_by_index(text2num(params["index"]))