diff --git a/code/modules/mob/abstract/new_player/sprite_accessories.dm b/code/modules/mob/abstract/new_player/sprite_accessories.dm index b979d1d7a70..713b6c73820 100644 --- a/code/modules/mob/abstract/new_player/sprite_accessories.dm +++ b/code/modules/mob/abstract/new_player/sprite_accessories.dm @@ -1231,12 +1231,6 @@ Follow by example and make good judgement based on length which list to include length = 2 chatname = "ponytail" -/datum/sprite_accessory/hair/ponytail_spiky - name = "Ponytail, Spiky" - icon_state = "hair_ponytail_spiky" - length = 4 - chatname = "ponytail" - /datum/sprite_accessory/hair/ponytail_wisp name = "Ponytail, Wisp" icon_state = "hair_ponytail_wisp" @@ -2020,6 +2014,30 @@ Follow by example and make good judgement based on length which list to include length = 2 chatname = "ponytail" +/datum/sprite_accessory/hair/balding/bun_short3 + name = "Bun, Short 3" + icon_state = "hair_bun_short3" + length = 2 + chatname = "hair bun" + +/datum/sprite_accessory/hair/balding/bun_loose + name = "Bun, Loose" + icon_state = "hair_bun_loose" + length = 2 + chatname = "hair bun" + +/datum/sprite_accessory/hair/balding/ponytail_simple + name = "Ponytail, Simple" + icon_state = "hair_ponytail_simple" + length = 2 + chatname = "ponytail" + +/datum/sprite_accessory/hair/balding/ponytail_spiky + name = "Ponytail, Spiky" + icon_state = "hair_ponytail_spiky" + length = 4 + chatname = "ponytail" + /* ///////////////////////////////////// / =-----------------------------= / diff --git a/html/changelogs/kano-dot-hairstyle-port.yml b/html/changelogs/kano-dot-hairstyle-port.yml new file mode 100644 index 00000000000..fd09d79a8d3 --- /dev/null +++ b/html/changelogs/kano-dot-hairstyle-port.yml @@ -0,0 +1,6 @@ +author: Kano + +delete-after: True + +changes: + - rscadd: "Ported some hairstyles from Shiptest." diff --git a/icons/mob/human_face/hair.dmi b/icons/mob/human_face/hair.dmi index 7f88ea5ba45..4ba2a939292 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 0cd002ef9a8..03d47e0becf 100644 Binary files a/icons/mob/human_face/hair_multiply.dmi and b/icons/mob/human_face/hair_multiply.dmi differ