Merge pull request #6093 from Walter0o/disposals_fix

fixes #5907
This commit is contained in:
Chinsky
2014-08-21 21:49:21 +04:00
2 changed files with 4 additions and 1 deletions

View File

@@ -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

View File

@@ -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