pixelshift + layering

code/modules/keybindings/keybind/movement.dm

@@ -74,7 +74,7 @@
 	var/mob/M = user.mob
 	M.westface()
 	return TRUE
-
+/*
 /datum/keybinding/mob/shift_north
 	hotkey_keys = list("CtrlShiftW", "CtrlShiftNorth")
 	name = "pixel_shift_north"
@@ -122,7 +122,7 @@
 	var/mob/M = user.mob
 	M.westshift()
 	return TRUE
-
+*/
 /datum/keybinding/living/hold_sprint
 	hotkey_keys = list()
 	classic_keys = list()

code/modules/mob/mob.dm

@@ -669,7 +669,7 @@ GLOBAL_VAR_INIT(exploit_warn_spam_prevention, 0)
 	setDir(SOUTH)
 	client.last_turn = world.time + MOB_FACE_DIRECTION_DELAY
 	return TRUE
-
+/*
 /mob/verb/eastshift()
 	set hidden = TRUE
 	if(!canface())
@@ -701,7 +701,7 @@ GLOBAL_VAR_INIT(exploit_warn_spam_prevention, 0)
 	if(pixel_y >= -32)
 		pixel_y--
 		is_shifted = TRUE
-
+*/
 /mob/proc/IsAdvancedToolUser()//This might need a rename but it should replace the can this mob use things check
 	return FALSE
 

code/modules/mob/mob_defines.dm

@@ -54,6 +54,8 @@
 	var/resting = 0			//Carbon
 	var/lying = 0
 	var/lying_prev = 0
+
+	/// Whether the mob is pixel shifted or not
 	var/is_shifted = FALSE
 
 	/// List of movement speed modifiers applying to this mob

code/modules/mob/mob_movement.dm

@@ -45,6 +45,14 @@
 	if(mob.force_moving)
 		return FALSE
 
+	// Sandstorm Edit
+	if(mob.shifting)
+		mob.pixel_shift(direction)
+		return FALSE
+	else if(mob.is_shifted)
+		mob.unpixel_shift()
+	//
+
 	var/mob/living/L = mob  //Already checked for isliving earlier
 	if(L.incorporeal_move)	//Move though walls
 		Process_Incorpmove(direction)