diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index e273b8c557d..3a7e5aab647 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -431,7 +431,8 @@ else stop_pulling() . = ..() - if ((s_active && !( s_active in contents ) )) + + if (s_active && !( s_active in contents ) && get_turf(s_active) != get_turf(src)) //check !( s_active in contents ) first so we hopefully don't have to call get_turf() so much. s_active.close(src) if(update_slimes) @@ -717,4 +718,4 @@ floating = 1 else if(!on && floating) animate(src, pixel_y = initial(pixel_y), time = 10) - floating = 0 \ No newline at end of file + floating = 0