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

[MIRROR] Fixes pandemic no beaker UI runtime
2017-10-10 22:33:33 -04:00
parent 0a10785ac5 d119bad8ac
commit 56f7bcddcc
1 changed files with 7 additions and 4 deletions
--- a/code/modules/reagents/chemistry/machinery/pandemic.dm
+++ b/code/modules/reagents/chemistry/machinery/pandemic.dm
@@ -159,14 +159,17 @@
 		return
 	switch(action)
 		if("eject_beaker")
-			eject_beaker()
+			if(beaker)
+				eject_beaker()
 			. = TRUE
 		if("empty_beaker")
-			beaker.reagents.clear_reagents()
+			if(beaker)
+				beaker.reagents.clear_reagents()
 			. = TRUE
 		if("empty_eject_beaker")
-			beaker.reagents.clear_reagents()
-			eject_beaker()
+			if(beaker)
+				beaker.reagents.clear_reagents()
+				eject_beaker()
 			. = TRUE
 		if("rename_disease")
 			var/id = get_virus_id_by_index(text2num(params["index"]))