From 9b00e11628efc60e4d43bd6536fcda568b498acb Mon Sep 17 00:00:00 2001
From: Fox McCloud <Fox-McCloud@users.noreply.github.com>
Date: Fri, 3 May 2019 23:08:36 -0400
Subject: [PATCH] Fixes Warning Spam for Mob Transitions and Roundstart
 Spawning

---
 code/controllers/subsystem/jobs.dm                     |  4 ++--
 code/game/turfs/space/space.dm                         | 10 +++++-----
 .../mob/living/simple_animal/hostile/hostile.dm        |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/code/controllers/subsystem/jobs.dm b/code/controllers/subsystem/jobs.dm
index 02f2681b22d..a84aab47c0b 100644
--- a/code/controllers/subsystem/jobs.dm
+++ b/code/controllers/subsystem/jobs.dm
@@ -473,10 +473,10 @@ SUBSYSTEM_DEF(jobs)
 			T = S.loc
 
 		if(T)
-			H.loc = T
+			H.forceMove(T)
 			// Moving wheelchair if they have one
 			if(H.buckled && istype(H.buckled, /obj/structure/chair/wheelchair))
-				H.buckled.loc = H.loc
+				H.buckled.forceMove(H.loc)
 				H.buckled.dir = H.dir
 
 	if(job)
diff --git a/code/game/turfs/space/space.dm b/code/game/turfs/space/space.dm
index f007aebfff1..68c0cba83ff 100644
--- a/code/game/turfs/space/space.dm
+++ b/code/game/turfs/space/space.dm
@@ -91,17 +91,17 @@
 
 /turf/space/Entered(atom/movable/A as mob|obj, atom/OL, ignoreRest = 0)
 	..()
+	if((!(A) || !(src in A.locs)))
+		return
 
-	if(destination_z && A && (src in A.locs))
-		A.x = destination_x
-		A.y = destination_y
-		A.z = destination_z
+	if(destination_z && destination_x && destination_y)
+		A.forceMove(locate(destination_x, destination_y, destination_z))
 
 		if(isliving(A))
 			var/mob/living/L = A
 			if(L.pulling)
 				var/turf/T = get_step(L.loc,turn(A.dir, 180))
-				L.pulling.loc = T
+				L.pulling.forceMove(T)
 
 		//now we're on the new z_level, proceed the space drifting
 		sleep(0)//Let a diagonal move finish, if necessary
diff --git a/code/modules/mob/living/simple_animal/hostile/hostile.dm b/code/modules/mob/living/simple_animal/hostile/hostile.dm
index 852d7c406d1..1914ef476cf 100644
--- a/code/modules/mob/living/simple_animal/hostile/hostile.dm
+++ b/code/modules/mob/living/simple_animal/hostile/hostile.dm
@@ -412,7 +412,7 @@
 		toggle_ai(AI_Z_OFF)
 		return
 
-	var/cheap_search = isturf(T) && !(T.z == 1) // The original check for SSmapping's station z level trait, unfortunately it isn't here.
+	var/cheap_search = isturf(T) && !is_station_level(T.z)
 	if(cheap_search)
 		tlist = ListTargetsLazy(T.z)
 	else