From 31bcd39262035d87f8cf0f0619e9974a5c406417 Mon Sep 17 00:00:00 2001
From: farie82 <joepvelden@hotmail.com>
Date: Sat, 11 Apr 2020 04:57:58 +0200
Subject: [PATCH] Makes simple animals cut_overlays on regenerate_icons
 (#13228)

---
 code/modules/mob/living/simple_animal/hostile/carp.dm  | 10 +++-------
 .../living/simple_animal/hostile/mining/gutlunch.dm    |  3 +--
 code/modules/mob/living/simple_animal/simple_animal.dm |  2 +-
 code/modules/mob/living/simple_animal/slime/slime.dm   |  3 +--
 4 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/code/modules/mob/living/simple_animal/hostile/carp.dm b/code/modules/mob/living/simple_animal/hostile/carp.dm
index a0cb935ba25..7b0b52f0b4f 100644
--- a/code/modules/mob/living/simple_animal/hostile/carp.dm
+++ b/code/modules/mob/living/simple_animal/hostile/carp.dm
@@ -74,12 +74,11 @@
 		else
 			our_color = pick(carp_colors)
 			add_atom_colour(carp_colors[our_color], FIXED_COLOUR_PRIORITY)
-		add_carp_overlay()
+		regenerate_icons()
 
 /mob/living/simple_animal/hostile/carp/proc/add_carp_overlay()
 	if(!random_color)
 		return
-	cut_overlays()
 	var/mutable_appearance/base_overlay = mutable_appearance(icon, "base_mouth")
 	base_overlay.appearance_flags = RESET_COLOR
 	add_overlay(base_overlay)
@@ -87,7 +86,6 @@
 /mob/living/simple_animal/hostile/carp/proc/add_dead_carp_overlay()
 	if(!random_color)
 		return
-	cut_overlays()
 	var/mutable_appearance/base_dead_overlay = mutable_appearance(icon, "base_dead_mouth")
 	base_dead_overlay.appearance_flags = RESET_COLOR
 	add_overlay(base_dead_overlay)
@@ -103,24 +101,22 @@
 
 /mob/living/simple_animal/hostile/carp/death(gibbed)
 	. = ..()
-	cut_overlays()
 	if(!random_color || gibbed)
 		return
-	add_dead_carp_overlay()
+	regenerate_icons()
 
 /mob/living/simple_animal/hostile/carp/revive()
 	..()
 	regenerate_icons()
 
 /mob/living/simple_animal/hostile/carp/regenerate_icons()
-	cut_overlays()
+	..()
 	if(!random_color)
 		return
 	if(stat != DEAD)
 		add_carp_overlay()
 	else
 		add_dead_carp_overlay()
-	..()
 
 /mob/living/simple_animal/hostile/carp/holocarp
 	icon_state = "holocarp"
diff --git a/code/modules/mob/living/simple_animal/hostile/mining/gutlunch.dm b/code/modules/mob/living/simple_animal/hostile/mining/gutlunch.dm
index 2f896f4adb0..fb2c741cb30 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining/gutlunch.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining/gutlunch.dm
@@ -50,10 +50,9 @@
 	return ..()
 
 /mob/living/simple_animal/hostile/asteroid/gutlunch/regenerate_icons()
-	cut_overlays()
+	..()
 	if(udder.reagents.total_volume == udder.reagents.maximum_volume)
 		add_overlay("gl_full")
-	..()
 
 /mob/living/simple_animal/hostile/asteroid/gutlunch/attackby(obj/item/O, mob/user, params)
 	if(stat == CONSCIOUS && istype(O, /obj/item/reagent_containers/glass))
diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm
index b740c783ac7..73eebc62684 100644
--- a/code/modules/mob/living/simple_animal/simple_animal.dm
+++ b/code/modules/mob/living/simple_animal/simple_animal.dm
@@ -609,7 +609,7 @@
 		real_name = P.tagname
 
 /mob/living/simple_animal/regenerate_icons()
+	cut_overlays()
 	if(pcollar && collar_type)
-		cut_overlays()
 		add_overlay("[collar_type]collar")
 		add_overlay("[collar_type]tag")
diff --git a/code/modules/mob/living/simple_animal/slime/slime.dm b/code/modules/mob/living/simple_animal/slime/slime.dm
index 339240af529..2f19bcb9f67 100644
--- a/code/modules/mob/living/simple_animal/slime/slime.dm
+++ b/code/modules/mob/living/simple_animal/slime/slime.dm
@@ -121,7 +121,7 @@
 	set_colour(pick(slime_colours))
 
 /mob/living/simple_animal/slime/regenerate_icons()
-	cut_overlays()
+	..()
 	var/icon_text = "[colour] [is_adult ? "adult" : "baby"] slime"
 	icon_dead = "[icon_text] dead"
 	if(stat != DEAD)
@@ -130,7 +130,6 @@
 			add_overlay("aslime-[mood]")
 	else
 		icon_state = icon_dead
-	..()
 
 /mob/living/simple_animal/slime/movement_delay()
 	if(bodytemperature >= 330.23) // 135 F or 57.08 C