From 351c9ffae40a327098d61f9b8cb5adcad31b527b Mon Sep 17 00:00:00 2001
From: WickedCybs <52309324+WickedCybs@users.noreply.github.com>
Date: Tue, 6 Jul 2021 19:31:12 -0600
Subject: [PATCH] Hair Combs Can Now Be Recoloured + Rearranges the Cosmetics
 Ordering (#12141)

---
 .../preference_setup/loadout/loadout_cosmetics.dm    | 12 +++++++-----
 html/changelogs/wickedcybs_comb.yml                  |  6 ++++++
 2 files changed, 13 insertions(+), 5 deletions(-)
 create mode 100644 html/changelogs/wickedcybs_comb.yml

diff --git a/code/modules/client/preference_setup/loadout/loadout_cosmetics.dm b/code/modules/client/preference_setup/loadout/loadout_cosmetics.dm
index 2747bd59b5f..4bc6d29fa44 100644
--- a/code/modules/client/preference_setup/loadout/loadout_cosmetics.dm
+++ b/code/modules/client/preference_setup/loadout/loadout_cosmetics.dm
@@ -1,7 +1,12 @@
 /datum/gear/cosmetic
-	display_name = "purple comb"
+	display_name = "handheld mirror"
+	path = /obj/item/mirror
+	sort_category = "Cosmetics" 
+
+/datum/gear/cosmetic/haircomb
+	display_name = "comb"
 	path = /obj/item/haircomb
-	sort_category = "Cosmetics"
+	flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION
 
 /datum/gear/cosmetic/lipstick
 	display_name = "lipstick selection"
@@ -30,6 +35,3 @@
 
 	gear_tweaks += new/datum/gear_tweak/path(lipsticks)
 
-/datum/gear/cosmetic/mirror
-	display_name = "handheld mirror"
-	path = /obj/item/mirror
diff --git a/html/changelogs/wickedcybs_comb.yml b/html/changelogs/wickedcybs_comb.yml
new file mode 100644
index 00000000000..7ae6e20fe1c
--- /dev/null
+++ b/html/changelogs/wickedcybs_comb.yml
@@ -0,0 +1,6 @@
+author: WickedCybs
+
+delete-after: True
+
+changes:
+  - tweak: "The purple comb in the cosmetics section wasn't purple, it was gray. It's been renamed to 'comb' and can now be recoloured too."