From 7a059fcec2cff87ad646ad058d8e0b6dd0886e43 Mon Sep 17 00:00:00 2001
From: Batrachophreno <Batrochophreno@gmail.com>
Date: Mon, 11 May 2026 14:12:56 -0400
Subject: [PATCH] Monkeys and Golems No Longer Spawn With Hair (#22440)

Fixes https://github.com/Aurorastation/Aurora.3/issues/22424.
changes:
  - bugfix: "Hairstyles no longer rendered on monkeys or golems."
---
 code/modules/mob/living/carbon/human/update_icons.dm | 2 +-
 html/changelogs/Bat-Haircuts.yml                     | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)
 create mode 100644 html/changelogs/Bat-Haircuts.yml

diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm
index d6c0cec2833..d2d7c0d2457 100644
--- a/code/modules/mob/living/carbon/human/update_icons.dm
+++ b/code/modules/mob/living/carbon/human/update_icons.dm
@@ -472,7 +472,7 @@ There are several things that need to be remembered:
 		if(update_icons)   update_icon()
 		return
 
-	var/has_visible_hair = h_style && !(head && (head.flags_inv & BLOCKHEADHAIR)) && !(l_ear && (l_ear.flags_inv & BLOCKHEADHAIR)) && !(r_ear && (r_ear.flags_inv & BLOCKHEADHAIR)) && !(wear_suit && (wear_suit.flags_inv & BLOCKHEADHAIR))
+	var/has_visible_hair = h_style && !(head && (head.flags_inv & BLOCKHEADHAIR)) && !(l_ear && (l_ear.flags_inv & BLOCKHEADHAIR)) && !(r_ear && (r_ear.flags_inv & BLOCKHEADHAIR)) && !(wear_suit && (wear_suit.flags_inv & BLOCKHEADHAIR)) && !isMonkey() && !isgolem()
 
 	var/icon/hair_icon = generate_hair_icon(has_visible_hair)
 
diff --git a/html/changelogs/Bat-Haircuts.yml b/html/changelogs/Bat-Haircuts.yml
new file mode 100644
index 00000000000..f5f47551413
--- /dev/null
+++ b/html/changelogs/Bat-Haircuts.yml
@@ -0,0 +1,4 @@
+author: Batrachophrenoboocosmomachia
+delete-after: True
+changes:
+  - bugfix: "Hairstyles no longer rendered on monkeys or golems."