diff --git a/code/controllers/shuttle_controller.dm b/code/controllers/shuttle_controller.dm
index fdbcd885687..acbbe7c7cc7 100644
--- a/code/controllers/shuttle_controller.dm
+++ b/code/controllers/shuttle_controller.dm
@@ -440,11 +440,11 @@ datum/shuttle_controller
 
 
 /proc/push_mob_back(var/mob/living/L, var/dir)
-	if(iscarbon(L))
+	if(iscarbon(L) && isturf(L.loc))
 		if(prob(88))
 			var/turf/T = get_step(L, dir)
 			if(T)
 				for(var/obj/O in T) // For doors and such (kinda ugly but we can't have people opening doors)
 					if(!O.CanPass(L, L.loc, 1, 0))
 						return
-				step(L, dir)
\ No newline at end of file
+				L.Move(get_step(L, dir), dir)
\ No newline at end of file
diff --git a/code/game/area/Space Station 13 areas.dm b/code/game/area/Space Station 13 areas.dm
index d98d680ebb5..24ecf4c1a5c 100644
--- a/code/game/area/Space Station 13 areas.dm	
+++ b/code/game/area/Space Station 13 areas.dm	
@@ -153,10 +153,6 @@ proc/process_ghost_teleport_locs()
 	name = "\improper Emergency Shuttle Transit"
 	icon_state = "shuttle"
 
-	mob_activate(var/mob/living/L)
-		push_mob_back(L, push_dir)
-
-
 /area/shuttle/escape_pod1
 	name = "\improper Escape Pod One"
 	music = "music/escape.ogg"