From e1226fcd7240bef8b80e0683fd7e58437d0e6927 Mon Sep 17 00:00:00 2001
From: ElorgRHG <71735193+ElorgRHG@users.noreply.github.com>
Date: Fri, 5 Sep 2025 12:17:54 +0200
Subject: [PATCH] M'sai hair fix (#21282)

From changelog:
>bugfix: "Fixes M'sai curly, and diagonal bangs hair styles not having
sprites.
>bugfix: "Fixes M'sai not having the curly hairstyle, while having the
alt variant of it.

`icon_state` did not correspond to the contents of the file.
both curly and curly alt had the same path, so only curlyalt worked
---
 .../mob/abstract/new_player/sprite_accessories.dm  |  6 +++---
 html/changelogs/ElorgRHG-m'sai-hair-fix.yml        | 14 ++++++++++++++
 2 files changed, 17 insertions(+), 3 deletions(-)
 create mode 100644 html/changelogs/ElorgRHG-m'sai-hair-fix.yml

diff --git a/code/modules/mob/abstract/new_player/sprite_accessories.dm b/code/modules/mob/abstract/new_player/sprite_accessories.dm
index 6e9565e295f..63c7c566768 100644
--- a/code/modules/mob/abstract/new_player/sprite_accessories.dm
+++ b/code/modules/mob/abstract/new_player/sprite_accessories.dm
@@ -3358,7 +3358,7 @@ Follow by example and make good judgement based on length which list to include
 
 /datum/sprite_accessory/hair/msai_ears/msai_ears_bobcut_overeye
 	name = "M'sai Bobcut, overeye"
-	icon_state = "hair_bobcut_overeye"
+	icon_state = "msai_bobcut_overeye"
 	length = 2
 	chatname = "bobcut"
 
@@ -3386,7 +3386,7 @@ Follow by example and make good judgement based on length which list to include
 	length = 3
 	chatname = "curly mane"
 
-/datum/sprite_accessory/hair/msai_ears/msai_ears_curls
+/datum/sprite_accessory/hair/msai_ears/msai_ears_curlsalt
 	name = "M'sai Curly Alt"
 	icon_state = "msai_curlyalt"
 	length = 3
@@ -3617,7 +3617,7 @@ Follow by example and make good judgement based on length which list to include
 
 /datum/sprite_accessory/hair/msai_ears/msai_ears_diagonal_bangs
 	name = "M'sai Diagonal Bangs"
-	icon_state = "hair_diagonal_bangs"
+	icon_state = "msai_diagonal_bangs"
 	length = 2
 	chatname = "bangs"
 
diff --git a/html/changelogs/ElorgRHG-m'sai-hair-fix.yml b/html/changelogs/ElorgRHG-m'sai-hair-fix.yml
new file mode 100644
index 00000000000..661825cd6d3
--- /dev/null
+++ b/html/changelogs/ElorgRHG-m'sai-hair-fix.yml
@@ -0,0 +1,14 @@
+# Your name.
+author: ElorgRHG
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made.  See valid prefix list above.
+# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, this gets changed to [] after reading.  Just remove the brackets when you add new shit.
+# Please surround your changes in  double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog.
+changes:
+  - bugfix: "Fixes M'sai diagonal bangs, and overeye bobcut hair styles not having sprites."
+  - bugfix: "Fixes M'sai not having the curly hairstyle, while having the alt variant of it."