From a3251e0014ff6514e2fc31aa956bc95bd592c63e Mon Sep 17 00:00:00 2001 From: Alberyk Date: Sat, 6 May 2017 16:00:40 -0300 Subject: [PATCH] Fix death by organ failure (#2185) Fix #2004, implementing skull's solution to the issue related to the megavend. --- code/game/machinery/megavend.dm | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/code/game/machinery/megavend.dm b/code/game/machinery/megavend.dm index d7ac8d9626f..17e19f42f99 100644 --- a/code/game/machinery/megavend.dm +++ b/code/game/machinery/megavend.dm @@ -211,16 +211,11 @@ var/obj/item/weapon/storage/box/gearbox = new(src) gearbox.name = "\improper Personal possessions box" gearbox.desc = "All of the personal effects of [H.real_name], packaged neatly by the Auto-Locker." - var/list/items = H.contents - for(var/obj/item/W in items) + for(var/obj/item/W in H.contents) if(istype(W,/obj/item/organ)) - items -= W continue H.drop_from_inventory(W,gearbox) - items -= W - gearbox.contents += W - if(items.len == 0) - break + W.forceMove(gearbox) sleep(20) job_master.EquipRank(H, H.job, 1, 1)