diff --git a/code/modules/shuttles/shuttle.dm b/code/modules/shuttles/shuttle.dm
index 8c6e611886..207dba5433 100644
--- a/code/modules/shuttles/shuttle.dm
+++ b/code/modules/shuttles/shuttle.dm
@@ -101,15 +101,14 @@
 			throwy = T.y
 
 	for(var/turf/T in dstturfs)
-		var/turf/D = locate(T.x, throwy - 1, 1)
-		for(var/atom/movable/AM as mob|obj in T)
-			AM.Move(D)
-
-	for(var/mob/living/carbon/bug in destination)
-		bug.gib()
-
-	for(var/mob/living/simple_animal/pest in destination)
-		pest.gib()
+		var/turf/D = locate(T.x, throwy - 1, T.z)
+		for(var/I in T)
+			if(istype(I,/mob/living))
+				var/mob/living/L = I
+				L.gib()
+			else if(istype(I,/obj))
+				var/obj/O = I
+				O.forceMove(D)
 
 	origin.move_contents_to(destination, direction=direction)
 
diff --git a/code/modules/turbolift/turbolift.dm b/code/modules/turbolift/turbolift.dm
index 90273250cb..b00dfe2253 100644
--- a/code/modules/turbolift/turbolift.dm
+++ b/code/modules/turbolift/turbolift.dm
@@ -93,12 +93,12 @@
 		return 0
 
 	for(var/turf/T in destination)
-		for(var/atom/movable/AM in T)
-			if(istype(AM, /mob/living))
-				var/mob/living/M = AM
-				M.gib()
-			else if(AM.simulated)
-				qdel(AM)
+		for(var/I in T)
+			if(istype(I, /mob/living))
+				var/mob/living/L = I
+				L.gib()
+			else if(istype(I,/obj))
+				qdel(I)
 
 	origin.move_contents_to(destination)