diff --git a/code/modules/mob/living/carbon/update_icons.dm b/code/modules/mob/living/carbon/update_icons.dm
index 05224c28dde..cd3e937a8d7 100644
--- a/code/modules/mob/living/carbon/update_icons.dm
+++ b/code/modules/mob/living/carbon/update_icons.dm
@@ -19,8 +19,6 @@
 				if(dir & (EAST|WEST)) //Facing east or west
 					final_dir = pick(NORTH, SOUTH) //So you fall on your side rather than your face or ass
 
-		lying_prev = lying	//so we don't try to animate until there's been another change.
-
 	if(resize != RESIZE_DEFAULT_SIZE)
 		changed++
 		ntransform.Scale(resize)
diff --git a/code/modules/mob/living/status_procs.dm b/code/modules/mob/living/status_procs.dm
index 08eff7eada0..a0b25312e00 100644
--- a/code/modules/mob/living/status_procs.dm
+++ b/code/modules/mob/living/status_procs.dm
@@ -103,7 +103,6 @@
 
 	// Booleans
 	var/resting = FALSE
-	var/rest_CD = 0
 
 	/*
 	STATUS EFFECTS
diff --git a/code/modules/mob/living/update_status.dm b/code/modules/mob/living/update_status.dm
index 59b7077e79e..b7a0e9e3e18 100644
--- a/code/modules/mob/living/update_status.dm
+++ b/code/modules/mob/living/update_status.dm
@@ -91,6 +91,10 @@
 	update_transform()
 	if(!delay_action_updates)
 		update_action_buttons_icon()
+	if(!lying && lying_prev)
+		if(client)
+			client.move_delay = world.time + movement_delay()
+	lying_prev = lying
 	return canmove
 
 /mob/living/proc/update_stamina()
diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm
index 75f64c753e8..4a8a7b5b2f3 100644
--- a/code/modules/mob/mob_helpers.dm
+++ b/code/modules/mob/mob_helpers.dm
@@ -361,11 +361,9 @@ var/list/intents = list(I_HELP,I_DISARM,I_GRAB,I_HARM)
 	set name = "Rest"
 	set category = "IC"
 
-	if(!resting && (world.time > rest_CD))
-		rest_CD = world.time + 20
+	if(!resting)
 		StartResting()
-	else if(resting && (world.time > rest_CD))
-		rest_CD = world.time + 20
+	else if(resting)
 		StopResting()
 
 /proc/is_blind(A)