diff --git a/code/modules/mob/abstract/new_player/sprite_accessories.dm b/code/modules/mob/abstract/new_player/sprite_accessories.dm index 134047eb28c..1341ca75e17 100644 --- a/code/modules/mob/abstract/new_player/sprite_accessories.dm +++ b/code/modules/mob/abstract/new_player/sprite_accessories.dm @@ -359,6 +359,12 @@ Follow by example and make good judgement based on length which list to include length = 2 chatname = "hair bun" + bun_short2 + name = "Bun, Short 2" + icon_state = "hair_bun_short2" + length = 2 + chatname = "hair bun" + bun_tight name = "Bun, Tight" icon_state = "hair_bun_tight" @@ -2631,25 +2637,31 @@ Follow by example and make good judgement based on length which list to include name = "Tajara Bun" icon_state = "hair_bun" length = 2 - chatname = "bun" + chatname = "hair bun" taj_ears_smallbun name = "Tajara Bun (Small)" icon_state = "hair_bunsmall" length = 2 - chatname = "bun" + chatname = "hair bun" taj_ears_lowbun name = "Tajara Bun (Low)" icon_state = "hair_lowbun" length = 2 - chatname = "bun" + chatname = "hair bun" taj_ears_smalllowbun name = "Tajara Bun (Low, Small)" icon_state = "hair_lowbunsmall" length = 2 - chatname = "bun" + chatname = "hair bun" + + taj_ears_bunshort + name = "Tajara Bun (Short)" + icon_state = "hair_bunshort" + length = 2 + chatname = "hair bun" taj_ears_wedge name = "Tajara Wedge" @@ -2904,25 +2916,31 @@ Follow by example and make good judgement based on length which list to include name = "M'sai Bun" icon_state = "msai_bun" length = 2 - chatname = "bun" + chatname = "hair bun" taj_ears_smallbun name = "M'sai Bun (Small)" icon_state = "msai_bunsmall" length = 2 - chatname = "bun" + chatname = "hair bun" msai_ears_lowbun name = "M'sai Bun (Low)" icon_state = "msai_lowbun" length = 2 - chatname = "bun" + chatname = "hair bun" msai_ears_lowsmallbun name = "M'sai Bun (Low, Small)" icon_state = "msai_lowbunsmall" length = 2 - chatname = "bun" + chatname = "hair bun" + + msai_ears_bunshort + name = "M'sai Bun (Short)" + icon_state = "msai_bunshort" + length = 2 + chatname = "hair bun" msai_ears_wedge name = "M'sai Wedge" diff --git a/html/changelogs/wickedcybs_hairbun.yml b/html/changelogs/wickedcybs_hairbun.yml new file mode 100644 index 00000000000..325de3eca50 --- /dev/null +++ b/html/changelogs/wickedcybs_hairbun.yml @@ -0,0 +1,7 @@ +author: WickedCybs + +delete-after: True + +changes: + - rscadd: "Adds a new hairstyle for Humans and Tajara. Short Hair Bun 2 and Tajara Bun Short." + - tweak: "Changes some of the to chat names for a few Tajara hairstyles to be more descriptive." \ No newline at end of file diff --git a/icons/mob/human_face/hair.dmi b/icons/mob/human_face/hair.dmi index fe15b161a60..df90b1584a7 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/msai_hair.dmi b/icons/mob/human_face/msai_hair.dmi index 49fd411f81d..5bd50426773 100644 Binary files a/icons/mob/human_face/msai_hair.dmi and b/icons/mob/human_face/msai_hair.dmi differ diff --git a/icons/mob/human_face/tajara_hair.dmi b/icons/mob/human_face/tajara_hair.dmi index cbf016fad6c..a9b1b451be6 100644 Binary files a/icons/mob/human_face/tajara_hair.dmi and b/icons/mob/human_face/tajara_hair.dmi differ