adds new hairstyles

cmss13-devs · Jul 7, 2024 · 32be096 · 32be096
1 parent 55e5b05
commit 32be096
Show file tree

Hide file tree

Showing 2 changed files with 49 additions and 49 deletions.
diff --git a/code/modules/mob/new_player/sprite_accessories/hair.dm b/code/modules/mob/new_player/sprite_accessories/hair.dm
@@ -6,11 +6,6 @@
 	icon_state = "hair_crewcut"
 	gender = MALE
 
-/datum/sprite_accessory/hair/close_cut
-	name = "Closecut"
-	icon_state = "hair_close_cut"
-	gender = MALE
-
 /datum/sprite_accessory/hair/bald
 	name = "Bald"
 	icon_state = "bald"
@@ -102,10 +97,6 @@
 	icon_state = "hair_pompadour"
 	gender = MALE
 
-/datum/sprite_accessory/hair/firecracker
-	name = "Firecracker"
-	icon_state = "hair_firecracker"
-
 /datum/sprite_accessory/hair/cleancut
 	name = "Gentleman's Cut"
 	icon_state = "hair_cleancut"
@@ -221,11 +212,6 @@
 	gender = MALE
 	selectable = 0
 
-/datum/sprite_accessory/hair/slimtop
-	name = "Slim Top"
-	icon_state = "hair_slim_top"
-	gender = MALE
-
 /datum/sprite_accessory/hair/emo
 	name = "Emo"
 	icon_state = "hair_emo"
@@ -540,16 +526,6 @@
 	icon_state = "hair_ponytail7"
 	gender = FEMALE
 
-/datum/sprite_accessory/hair/ponytail9
-	name = "Ponytail 9"
-	icon_state = "hair_ponytail_9"
-	gender = FEMALE
-
-/datum/sprite_accessory/hair/ponytail10
-	name = "Ponytail 10"
-	icon_state = "hair_top_ponytail"
-	gender = FEMALE
-
 /datum/sprite_accessory/hair/shorthair3
 	name = "Short Hair 3"
 	icon_state = "hair_shorthair3"
@@ -563,35 +539,10 @@
 	name = "Bun 2"
 	icon_state = "hair_bun2"
 
-/datum/sprite_accessory/hair/bun3
-	name = "Bun"
-	icon_state = "hair_space_buns"
-	gender = FEMALE
-
 /datum/sprite_accessory/hair/shortbangs
 	name = "Short Bangs"
 	icon_state = "hair_shortbangs"
 
-/datum/sprite_accessory/hair/shortbangs2
-	name = "Short Bangs 2"
-	icon_state = "hair_short_bangs"
-
-/datum/sprite_accessory/hair/bangs
-	name = "Long Bangs"
-	icon_state = "hair_bangs"
-
-/datum/sprite_accessory/hair/bangsreversed
-	name = "Long Bangs (Reversed)"
-	icon_state = "hair_reversed_bangs"
-
-/datum/sprite_accessory/hair/flowey
-	name = "Flowey Sides"
-	icon_state = "hair_flowey_sides"
-
-/datum/sprite_accessory/hair/twirly
-	name = "Twirly Hair"
-	icon_state = "hair_twirly"
-
 /datum/sprite_accessory/hair/shavedbun
 	name = "Shaved Bun"
 	icon_state = "hair_shavedbun"
@@ -809,3 +760,52 @@
 	name = "Gentle Braid"
 	icon_state = "hair_braid3"
 	gender = FEMALE
+
+/datum/sprite_accessory/hair/close_cut
+	name = "Closecut"
+	icon_state = "hair_close_cut"
+	gender = MALE
+
+/datum/sprite_accessory/hair/shortbangs2
+	name = "Short Bangs 2"
+	icon_state = "hair_short_bangs"
+
+/datum/sprite_accessory/hair/bangs
+	name = "Long Bangs"
+	icon_state = "hair_bangs"
+
+/datum/sprite_accessory/hair/bangsreversed
+	name = "Long Bangs (Reversed)"
+	icon_state = "hair_reversed_bangs"
+
+/datum/sprite_accessory/hair/flowey
+	name = "Flowey Sides"
+	icon_state = "hair_flowey_sides"
+
+/datum/sprite_accessory/hair/twirly
+	name = "Twirly Hair"
+	icon_state = "hair_twirly"
+
+/datum/sprite_accessory/hair/ponytail9
+	name = "Ponytail 9"
+	icon_state = "hair_ponytail_9"
+	gender = FEMALE
+
+/datum/sprite_accessory/hair/ponytail10
+	name = "Ponytail 10"
+	icon_state = "hair_top_ponytail"
+	gender = FEMALE
+
+/datum/sprite_accessory/hair/firecracker
+	name = "Firecracker"
+	icon_state = "hair_firecracker"
+
+/datum/sprite_accessory/hair/slimtop
+	name = "Slim Top"
+	icon_state = "hair_slim_top"
+	gender = MALE
+
+/datum/sprite_accessory/hair/bun3
+	name = "Bun"
+	icon_state = "hair_space_buns"
+	gender = FEMALE
diff --git a/icons/mob/humans/human_hair.dmi b/icons/mob/humans/human_hair.dmi