From 87d2dbc3fb3edc8030c330dcdad1fd44c3a7649a Mon Sep 17 00:00:00 2001
From: Verkister <superverkelian@hotmail.com>
Date: Sat, 28 Apr 2018 13:19:35 +0300
Subject: [PATCH] got em

---
 .../mob/living/simple_animal/vore/badboi.dm   | 15 +++++-------
 .../mob/living/simple_animal/vore/otie.dm     | 24 +++++++------------
 2 files changed, 15 insertions(+), 24 deletions(-)

diff --git a/code/modules/mob/living/simple_animal/vore/badboi.dm b/code/modules/mob/living/simple_animal/vore/badboi.dm
index 1513db25500..a1388ca6e50 100644
--- a/code/modules/mob/living/simple_animal/vore/badboi.dm
+++ b/code/modules/mob/living/simple_animal/vore/badboi.dm
@@ -92,11 +92,10 @@
 	if(!eye_layer)
 		eye_layer = image(icon, "badboi-eyes")
 		eye_layer.plane = PLANE_LIGHTING_ABOVE
-		modifier_overlay = eye_layer
-	overlays += eye_layer
+	add_overlay(eye_layer)
 
 /mob/living/simple_animal/hostile/badboi/proc/remove_eyes()
-	overlays -= eye_layer
+	cut_overlay(eye_layer)
 
 /mob/living/simple_animal/hostile/badboi/New()
 	add_eyes()
@@ -104,13 +103,11 @@
 
 /mob/living/simple_animal/hostile/badboi/death(gibbed, deathmessage = "shudders and collapses!")
 	.=..()
-	remove_eyes()
 	resting = 0
 	icon_state = icon_dead
 
-/mob/living/simple_animal/hostile/badboi/lay_down()
-	..()
-	if(resting)
-		remove_eyes()
-	else
+/mob/living/simple_animal/hostile/badboi/update_icon()
+	. = ..()
+	remove_eyes()
+	if(stat == CONSCIOUS && !resting)
 		add_eyes()
\ No newline at end of file
diff --git a/code/modules/mob/living/simple_animal/vore/otie.dm b/code/modules/mob/living/simple_animal/vore/otie.dm
index 6b55c32a937..3a2601ef46c 100644
--- a/code/modules/mob/living/simple_animal/vore/otie.dm
+++ b/code/modules/mob/living/simple_animal/vore/otie.dm
@@ -330,29 +330,23 @@
 	if(!eye_layer)
 		eye_layer = image(icon, "[eyetype]-eyes")
 		eye_layer.plane = PLANE_LIGHTING_ABOVE
-		modifier_overlay = eye_layer
-	overlays += eye_layer
+	add_overlay(eye_layer)
 
 /mob/living/simple_animal/otie/proc/remove_eyes()
-	overlays -= eye_layer
+	cut_overlay(eye_layer)
 
 /mob/living/simple_animal/otie/New()
 	if(glowyeyes)
 		add_eyes()
 	..()
 
-/mob/living/simple_animal/otie/lay_down()
-	..()
-	if(glowyeyes)
-		if(resting)
-			remove_eyes()
-		else
-			add_eyes()
+/mob/living/simple_animal/otie/update_icon()
+	. = ..()
+	remove_eyes()
+	if(glowyeyes && stat == CONSCIOUS && !resting)
+		add_eyes()
 
 /mob/living/simple_animal/otie/death(gibbed, deathmessage = "dies!")
-	if(glowyeyes)
-		remove_eyes()
+	.=..()
 	resting = 0
-	icon_state = icon_dead
-	update_icon()
-	..()
+	icon_state = icon_dead
\ No newline at end of file