diff --git a/code/modules/mob/abstract/new_player/sprite_accessories.dm b/code/modules/mob/abstract/new_player/sprite_accessories.dm index 713b6c73820..4eb08127ec3 100644 --- a/code/modules/mob/abstract/new_player/sprite_accessories.dm +++ b/code/modules/mob/abstract/new_player/sprite_accessories.dm @@ -246,17 +246,6 @@ Follow by example and make good judgement based on length which list to include icon_state = "hair_bob_shoulder" chatname = "short hair" -/datum/sprite_accessory/hair/bobcurl - name = "Bobcurl" - icon_state = "hair_bobcurl" - species_allowed = list(/datum/species/human,/datum/species/human/offworlder,/datum/species/machine/shell,/datum/species/machine/shell/rogue,/datum/species/zombie) - chatname = "curls" - -/datum/sprite_accessory/hair/bobcurl2 - name = "Bobcurl 2" - icon_state = "hair_bobcurl2" - chatname = "curls" - /datum/sprite_accessory/hair/bookish name = "Bookish" icon_state = "hair_bookish" @@ -513,11 +502,6 @@ Follow by example and make good judgement based on length which list to include chatname = "long fringe" length = 2 -/datum/sprite_accessory/hair/emofringe - name = "Emo Fringe" - icon_state = "hair_emofringe" - chatname = "fringe" - /datum/sprite_accessory/hair/emofringe_long name = "Emo Fringe Long" icon_state = "hair_emofringe_long" @@ -594,12 +578,6 @@ Follow by example and make good judgement based on length which list to include icon_state = "hair_father" chatname = "short hair" -/datum/sprite_accessory/hair/feather - name = "Feather" - icon_state = "hair_feather" - length = 2 - chatname = "short hair" - /datum/sprite_accessory/hair/flat_top name = "Flat Top" icon_state = "hair_flattop" @@ -1733,6 +1711,12 @@ Follow by example and make good judgement based on length which list to include length = 1 chatname = "balding hair" +/datum/sprite_accessory/hair/balding/bedhead_short + name = "Bedhead, Short" + icon_state = "hair_bedhead_short" + length = 2 + chatname = "messy hair" + /datum/sprite_accessory/hair/balding/bangs_light name = "Bangs, Light" icon_state = "hair_bangs_light" @@ -1745,6 +1729,18 @@ Follow by example and make good judgement based on length which list to include length = 1 chatname = "short hair" +/datum/sprite_accessory/hair/balding/bob_curl + name = "Bob, Curl" + icon_state = "hair_bob_curl" + length = 2 + chatname = "short hair" + +/datum/sprite_accessory/hair/balding/bob_wavy + name = "Bob, Wavy" + icon_state = "hair_bob_wavy" + length = 2 + chatname = "short hair" + /datum/sprite_accessory/hair/balding/braided_tail name = "Braided, Tail" icon_state = "hair_braided_tail" @@ -1811,6 +1807,18 @@ Follow by example and make good judgement based on length which list to include length = 1 chatname = "choppy hair" +/datum/sprite_accessory/hair/balding/emo_fringe + name = "Emo, Fringe" + icon_state = "hair_emo_fringe" + length = 2 + chatname = "fringe" + +/datum/sprite_accessory/hair/balding/emo_bangs + name = "Emo, Bangs" + icon_state = "hair_emo_bangs" + length = 2 + chatname = "bangs" + /datum/sprite_accessory/hair/balding/fade name = "Fade" icon_state = "hair_fade" @@ -1823,6 +1831,12 @@ Follow by example and make good judgement based on length which list to include length = 1 chatname = "groomed hair" +/datum/sprite_accessory/hair/balding/feather + name = "Feather" + icon_state = "hair_feather" + length = 2 + chatname = "short hair" + /datum/sprite_accessory/hair/balding/floof name = "Floof" icon_state = "hair_floof" diff --git a/html/changelogs/kano-dot-never-stylish-enough.yml b/html/changelogs/kano-dot-never-stylish-enough.yml new file mode 100644 index 00000000000..72f2482faa8 --- /dev/null +++ b/html/changelogs/kano-dot-never-stylish-enough.yml @@ -0,0 +1,6 @@ +author: Kano + +delete-after: True + +changes: + - rscadd: "Ported 6 hairstyles from Shiptest." diff --git a/icons/mob/human_face/hair.dmi b/icons/mob/human_face/hair.dmi index 4ba2a939292..a38c62beccd 100644 Binary files a/icons/mob/human_face/hair.dmi and b/icons/mob/human_face/hair.dmi differ diff --git a/icons/mob/human_face/hair_multiply.dmi b/icons/mob/human_face/hair_multiply.dmi index 03d47e0becf..3f89500c344 100644 Binary files a/icons/mob/human_face/hair_multiply.dmi and b/icons/mob/human_face/hair_multiply.dmi differ