From ff8047baa0187428fcb65fd9bf0e3d5ea7fe1118 Mon Sep 17 00:00:00 2001 From: Walter0o Date: Thu, 21 Aug 2014 15:41:28 +0200 Subject: [PATCH] fixes #5907 issue caused by relaymove() not being checked properly. added comment to prevent this kind of issue in the future. --- code/game/atoms.dm | 2 ++ code/modules/recycling/disposal.dm | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/code/game/atoms.dm b/code/game/atoms.dm index 630746304f..e1e76dd3fa 100644 --- a/code/game/atoms.dm +++ b/code/game/atoms.dm @@ -200,6 +200,8 @@ its easier to just keep the beam vertical. //usr << "[name]: Dn:[density] dir:[dir] cont:[contents] icon:[icon] is:[icon_state] loc:[loc]" return +// called by mobs when e.g. having the atom as their machine, pulledby, loc (AKA mob being inside the atom) or buckled var set. +// see code/modules/mob/mob_movement.dm for more. /atom/proc/relaymove() return diff --git a/code/modules/recycling/disposal.dm b/code/modules/recycling/disposal.dm index e6fe39f903..72040550a7 100644 --- a/code/modules/recycling/disposal.dm +++ b/code/modules/recycling/disposal.dm @@ -190,7 +190,8 @@ /obj/machinery/disposal/relaymove(mob/user as mob) if(user.stat || src.flushing) return - src.go_out(user) + if(user.loc == src) + src.go_out(user) return // leave the disposal