From dc5a4a8a84cf42da0ba5fc142783250d37a522d6 Mon Sep 17 00:00:00 2001 From: Rob Nelson Date: Sun, 29 Dec 2013 10:30:08 -0800 Subject: [PATCH] Fix beaker being ejected with occupant. --- code/game/dna/dna_modifier.dm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/code/game/dna/dna_modifier.dm b/code/game/dna/dna_modifier.dm index 52a6346ac50..b90837af82c 100644 --- a/code/game/dna/dna_modifier.dm +++ b/code/game/dna/dna_modifier.dm @@ -86,8 +86,11 @@ /obj/machinery/dna_scannernew/proc/eject_occupant() src.go_out() for(var/obj/O in src) - if((!istype(O,/obj/item/weapon/circuitboard/clonescanner)) && (!istype(O,/obj/item/weapon/stock_parts)) && (!istype(O,/obj/item/weapon/cable_coil))) - O.loc = get_turf(src)//Ejects items that manage to get in there (exluding the components) + if(!istype(O,/obj/item/weapon/circuitboard/clonescanner) && \ + !istype(O,/obj/item/weapon/stock_parts) && \ + !istype(O,/obj/item/weapon/cable_coil) && \ + O != beaker) + O.loc = get_turf(src)//Ejects items that manage to get in there (exluding the components and beaker) if(!occupant) for(var/mob/M in src)//Failsafe so you can get mobs out M.loc = get_turf(src)