diff --git a/code/modules/turbolift/turbolift.dm b/code/modules/turbolift/turbolift.dm index 395cbe608d6..86bc8d761da 100644 --- a/code/modules/turbolift/turbolift.dm +++ b/code/modules/turbolift/turbolift.dm @@ -154,12 +154,12 @@ return 0 for(var/turf/T in destination) - for(var/I in T) - if(istype(I, /mob/living)) - var/mob/living/L = I - L.gib() - else if(istype(I,/obj)) - qdel(I) + for(var/atom/movable/AM in T) + if(istype(AM, /mob/living)) + var/mob/living/M = AM + M.gib() + else if(AM.simulated && !(istype(AM, /mob/observer))) + qdel(AM) origin.move_contents_to(destination) @@ -180,4 +180,4 @@ // TODO: dummy machine ('lift mechanism') in powered area for functionality/blackout checks. /datum/turbolift/proc/is_functional() - return 1 \ No newline at end of file + return 1