fixes simple animal rest state

bump
NebulaSS13 · Apr 26, 2022 · 9ad5a6d · 9ad5a6d
1 parent 7814174
commit 9ad5a6d
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 7 deletions.
diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
@@ -602,6 +602,7 @@ default behaviour is:
 			return
 		resting = !resting
 		UpdateLyingBuckledAndVerbStatus()
+		update_icon()
 		to_chat(src, SPAN_NOTICE("You are now [resting ? "resting" : "getting up"]."))
 
 //called when the mob receives a bright flash

diff --git a/code/modules/mob/living/simple_animal/friendly/mouse.dm b/code/modules/mob/living/simple_animal/friendly/mouse.dm
@@ -54,10 +54,6 @@
 		else if(prob(5))
 			INVOKE_ASYNC(src, .proc/audible_emote, "snuffles.")
 
-/mob/living/simple_animal/mouse/lay_down()
-	..()
-	icon_state = resting ? "mouse_[body_color]_sleep" : "mouse_[body_color]"
-
 /mob/living/simple_animal/mouse/Initialize()
 	verbs += /mob/living/proc/ventcrawl
 	verbs += /mob/living/proc/hide

diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm
@@ -119,10 +119,10 @@
 	icon_state = ICON_STATE_WORLD
 	if(stat == DEAD && (mob_icon_state_flags & MOB_ICON_HAS_DEAD_STATE))
 		icon_state += "-dead"
-	else if(!incapacitated() && resting && (mob_icon_state_flags & MOB_ICON_HAS_REST_STATE))
-		icon_state += "-resting"
-	else if((lying || incapacitated()) && (mob_icon_state_flags & MOB_ICON_HAS_SLEEP_STATE))
+	else if(stat == UNCONSCIOUS && (mob_icon_state_flags & MOB_ICON_HAS_SLEEP_STATE))
 		icon_state += "-sleeping"
+	else if(resting && (mob_icon_state_flags & MOB_ICON_HAS_REST_STATE))
+		icon_state += "-resting"
 
 	z_flags &= ~ZMM_MANGLE_PLANES
 	if(stat == CONSCIOUS)

diff --git a/icons/mob/simple_animal/mouse_brown.dmi b/icons/mob/simple_animal/mouse_brown.dmi
diff --git a/icons/mob/simple_animal/mouse_gray.dmi b/icons/mob/simple_animal/mouse_gray.dmi
diff --git a/icons/mob/simple_animal/mouse_white.dmi b/icons/mob/simple_animal/mouse_white.dmi