From 438decaa8f4fa10fbaba92e752873b6ab3818453 Mon Sep 17 00:00:00 2001 From: MrMelbert <51863163+MrMelbert@users.noreply.github.com> Date: Thu, 15 Jun 2023 20:52:32 -0500 Subject: [PATCH] Fixes chem master replace beaker runtime (#76062) ## About The Pull Request I think it was rather silly to put this call in this proc, but I'm not about to audit it `new_beaker` can be `null` if this proc is being called to drop the current beaker, so this needed a sanity check ## Why It's Good For The Game Runtime ## Changelog :cl: Melbert fix: Runtime from ejecting beakers from a chem-master /:cl: --- code/modules/reagents/chemistry/machinery/chem_master.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/reagents/chemistry/machinery/chem_master.dm b/code/modules/reagents/chemistry/machinery/chem_master.dm index 941f46cec12..f4962da8cfe 100644 --- a/code/modules/reagents/chemistry/machinery/chem_master.dm +++ b/code/modules/reagents/chemistry/machinery/chem_master.dm @@ -201,7 +201,7 @@ GLOBAL_LIST_INIT(chem_master_containers, list( /// Insert new beaker and/or eject the inserted one /obj/machinery/chem_master/proc/replace_beaker(mob/living/user, obj/item/reagent_containers/new_beaker) - if(!user?.transferItemToLoc(new_beaker, src)) + if(new_beaker && user && !user.transferItemToLoc(new_beaker, src)) return FALSE if(beaker) try_put_in_hand(beaker, user)