From 13567cb6811f56d71fe3c3f6119b4b27e9405c4c Mon Sep 17 00:00:00 2001 From: Anewbe Date: Mon, 25 Jun 2018 19:38:26 -0500 Subject: [PATCH] Merge pull request #5373 from VOREStation/pol-podfix Fix invalid logic in clonepod beaker function --- code/game/machinery/cloning.dm | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/code/game/machinery/cloning.dm b/code/game/machinery/cloning.dm index b5787b5089..a1ef2a8a83 100644 --- a/code/game/machinery/cloning.dm +++ b/code/game/machinery/cloning.dm @@ -244,20 +244,14 @@ locked = 0 to_chat(user, "System unlocked.") else if(istype(W,/obj/item/weapon/reagent_containers/glass)) - var/obj/item/weapon/reagent_containers/glass/G = W - if(LAZYLEN(containers)) - if(containers.len >= container_limit) - to_chat(user, "\The [src] has too many containers loaded!") - return - else if(do_after(user, 1 SECOND)) - user.visible_message("[user] has loaded \the [G] into \the [src].", "You load \the [G] into \the [src].") - containers += G - user.drop_item() - G.forceMove(src) - return - else - to_chat(user, "\The [src] doesn't have room for \the [G.name].") - return + if(LAZYLEN(containers) >= container_limit) + to_chat(user, "\The [src] has too many containers loaded!") + else if(do_after(user, 1 SECOND)) + user.visible_message("[user] has loaded \the [W] into \the [src].", "You load \the [W] into \the [src].") + containers += W + user.drop_item() + W.forceMove(src) + return else if(istype(W, /obj/item/weapon/wrench)) if(locked && (anchored || occupant)) to_chat(user, "Can not do that while [src] is in use.")