Porting "Mobs now turn towards and are shifted based on grab state towards something pulling them"

code/game/atoms_movable.dm

@@ -25,6 +25,7 @@
 	var/inertia_move_delay = 5
 	var/pass_flags = 0
 	var/moving_diagonally = 0 //0: not doing a diagonal move. 1 and 2: doing the first/second step of the diagonal move
+	var/atom/movable/moving_from_pull		//attempt to resume grab after moving instead of before.
 	var/list/client_mobs_in_contents // This contains all the client mobs within this container
 	var/list/acted_explosions	//for explosion dodging
 	glide_size = 8
@@ -207,6 +208,7 @@
 	if(!Process_Spacemove(get_dir(pulling.loc, A)))
 		return
 	step(pulling, get_dir(pulling.loc, A))
+	return TRUE
 
 /atom/movable/proc/check_pulling()
 	if(pulling)
@@ -224,6 +226,8 @@
 		if(pulling.anchored || pulling.move_resist > move_force)
 			stop_pulling()
 			return
+	if(pulledby && moving_diagonally != FIRST_DIAG_STEP && get_dist(src, pulledby) > 1)		//separated from our puller and not in the middle of a diagonal move.
+		pulledby.stop_pulling()
 
 /atom/movable/Destroy(force)
 	QDEL_NULL(proximity_monitor)

code/game/atoms_movement.dm

@@ -51,13 +51,8 @@
 /atom/movable/Move(atom/newloc, direct)
 	var/atom/movable/pullee = pulling
 	var/turf/T = loc
-	if(pulling)
-		if(pullee && get_dist(src, pullee) > 1)
-			stop_pulling()
-
-		if(pullee && pullee.loc != loc && !isturf(pullee.loc) ) //to be removed once all code that changes an object's loc uses forceMove().
-			log_game("DEBUG:[src]'s pull on [pullee] wasn't broken despite [pullee] being in [pullee.loc]. Pull stopped manually.")
-			stop_pulling()
+	if(!moving_from_pull)
+		check_pulling()
 	if(!loc || !newloc)
 		return FALSE
 	var/atom/oldloc = loc
@@ -130,19 +125,16 @@
 		if(has_buckled_mobs() && !handle_buckled_mob_movement(loc,direct)) //movement failed due to buckled mob(s)
 			return FALSE
 
-		if(pulling && pulling == pullee) //we were pulling a thing and didn't lose it during our move.
+		if(pulling && pulling == pullee && pulling != moving_from_pull) //we were pulling a thing and didn't lose it during our move.
 			if(pulling.anchored)
 				stop_pulling()
 			else
 				var/pull_dir = get_dir(src, pulling)
 				//puller and pullee more than one tile away or in diagonal position
 				if(get_dist(src, pulling) > 1 || (moving_diagonally != SECOND_DIAG_STEP && ((pull_dir - 1) & pull_dir)))
+					pulling.moving_from_pull = src
 					pulling.Move(T, get_dir(pulling, T)) //the pullee tries to reach our previous position
-					if(pulling && get_dist(src, pulling) > 1) //the pullee couldn't keep up
-						stop_pulling()
-				if(pulledby && moving_diagonally != FIRST_DIAG_STEP && get_dist(src, pulledby) > 1)//separated from our puller and not in the middle of a diagonal move.
-					pulledby.stop_pulling()
-
+					pulling.moving_from_pull = null
 		Moved(oldloc, direct)
 
 /atom/movable/proc/handle_buckled_mob_movement(newloc,direct)

code/game/objects/buckling.dm

@@ -55,8 +55,12 @@
 		M.buckling = null
 		return FALSE
 
-	if(M.pulledby && buckle_prevents_pull)
-		M.pulledby.stop_pulling()
+	if(M.pulledby)
+		if(buckle_prevents_pull)
+			M.pulledby.stop_pulling()
+		else if(isliving(M.pulledby))
+			var/mob/living/L = M.pulledby
+			L.reset_pull_offsets(M, TRUE)
 
 	if(!check_loc && M.loc != loc)
 		M.forceMove(loc)
@@ -137,4 +141,7 @@
 				"<span class='notice'>You unbuckle yourself from [src].</span>",\
 				"<span class='italics'>You hear metal clanking.</span>")
 		add_fingerprint(user)
+	if(isliving(M.pulledby))
+		var/mob/living/L = M.pulledby
+		L.set_pull_offsets(M, L.grab_state)
 	return M