Pixel shift 2

code/game/objects/buckling.dm

@@ -21,6 +21,15 @@
 			if(user_unbuckle_mob(buckled_mobs[1],user))
 				return 1
 
+	// Unpixelshifting part
+	if(user.shifting)
+		if(ismob(src))
+			return ..()
+		if(!src.anchored)
+			src.unpixel_shift()
+			return TRUE
+
+
 //literally just the above extension of attack_hand(), but for silicons instead (with an adjacency check, since attack_robot() being called doesn't mean that you're adjacent to something)
 /atom/movable/attack_robot(mob/living/user)
 	. = ..()

code/modules/mob/mob.dm

@@ -897,7 +897,7 @@
  * * we are not restrained
  */
 /mob/proc/canface()
-	if(world.time < client.last_turn)
+	if(client && world.time < client.last_turn)
 		return FALSE
 	if(stat >= UNCONSCIOUS)
 		return FALSE

code/modules/mob/mob_defines.dm

@@ -223,9 +223,6 @@
 	/// Whether the typing indicator is on. Not on /living level because of verbs
 	var/typing_indicator = FALSE
 
-	///Is the mob pixel shifted?
-	var/is_shifted
-
 	///Is the mob actively shifting?
 	var/shifting
 

code/modules/mob/mob_movement.dm

@@ -90,6 +90,9 @@
 	if(mob.force_moving)
 		return FALSE
 	if(mob.shifting)
+		if (mob.pulling)
+			mob.pulling.pixel_shift(direct)
+			return FALSE
 		mob.pixel_shift(direct)
 		return FALSE
 	else if(mob.is_shifted) //Cancels pixel offset on movement

code/modules/pixelshifting/pixelshift.dm

@@ -1,55 +1,58 @@
 #define MAXIMUM_PIXEL_SHIFT 16
 #define PASSABLE_SHIFT_THRESHOLD 8
 
-/mob/proc/unpixel_shift()
-	return
+// Unpixelshifting keybind is handeled in game/object/buckling.dm to avoid having multiple definition of /atom/mobable/attack_hand(mod/living/user)
 
-/mob/proc/pixel_shift(direction)
-	return
+/atom/movable
+	// Is the atom shifted ?
+	var/is_shifted = FALSE
 
-/mob/living/unpixel_shift()
-	. = ..()
-	passthroughable = NONE
+/atom/movable/proc/unpixel_shift()
 	if(is_shifted)
 		is_shifted = FALSE
-		pixel_x = body_pixel_x_offset + base_pixel_x
-		pixel_y = body_pixel_y_offset + base_pixel_y
-/mob/living/set_pull_offsets(mob/living/pull_target, grab_state)
-	pull_target.unpixel_shift()
-	return ..()
+		pixel_x = base_pixel_x
+		pixel_y = base_pixel_y
 
-/mob/living/reset_pull_offsets(mob/living/pull_target, override)
-	pull_target.unpixel_shift()
-	return ..()
-
-/mob/living/pixel_shift(direction)
-	passthroughable = NONE
+/atom/movable/proc/pixel_shift(direction)
+	var/max_shift = (!density || ismob(src)) ? MAXIMUM_PIXEL_SHIFT : PASSABLE_SHIFT_THRESHOLD
 	switch(direction)
 		if(NORTH)
-			if(!canface())
-				return FALSE
-			if(pixel_y <= MAXIMUM_PIXEL_SHIFT + base_pixel_y)
+			if(pixel_y <= max_shift + base_pixel_y)
 				pixel_y++
 				is_shifted = TRUE
 		if(EAST)
-			if(!canface())
-				return FALSE
-			if(pixel_x <= MAXIMUM_PIXEL_SHIFT + base_pixel_x)
+			if(pixel_x <= max_shift + base_pixel_x)
 				pixel_x++
 				is_shifted = TRUE
 		if(SOUTH)
-			if(!canface())
-				return FALSE
-			if(pixel_y >= -MAXIMUM_PIXEL_SHIFT + base_pixel_y)
+			if(pixel_y >= -max_shift + base_pixel_y)
 				pixel_y--
 				is_shifted = TRUE
 		if(WEST)
-			if(!canface())
-				return FALSE
-			if(pixel_x >= -MAXIMUM_PIXEL_SHIFT + base_pixel_x)
+			if(pixel_x >= -max_shift + base_pixel_x)
 				pixel_x--
 				is_shifted = TRUE
 
+// Part about mobs
+/mob/living/unpixel_shift()
+	. = ..()
+	passthroughable = NONE
+
+/mob/living/set_pull_offsets(mob/living/pull_target, grab_state)
+	pull_target.unpixel_shift()
+	return ..()
+
+/mob/living/reset_pull_offsets(mob/living/pull_target, override)
+	if(!pull_target.is_shifted)
+		pull_target.unpixel_shift()
+	return ..()
+
+/mob/living/pixel_shift(direction)
+	passthroughable = NONE
+	if(!canface() && !pulledby)
+		return FALSE
+	..()
+
 	// Yes, I know this sets it to true for everything if more than one is matched.
 	// Movement doesn't check diagonals, and instead just checks EAST or WEST, depending on where you are for those.
 	if(pixel_y > PASSABLE_SHIFT_THRESHOLD)