diff --git a/code/modules/mob/abstract/new_player/sprite_accessories.dm b/code/modules/mob/abstract/new_player/sprite_accessories.dm index 7ac04f3ede6..1a7b960b83b 100644 --- a/code/modules/mob/abstract/new_player/sprite_accessories.dm +++ b/code/modules/mob/abstract/new_player/sprite_accessories.dm @@ -3330,6 +3330,54 @@ Follow by example and make good judgement based on length which list to include length = 2 chatname = "bangs" +/datum/sprite_accessory/hair/taj_ears/taj_ears_ponytail_one + name = "Tajara Ponytail 1" + icon_state = "hair_ponytail1" + length = 2 + chatname = "ponytail" + +/datum/sprite_accessory/hair/taj_ears/taj_ears_ponytail_two + name = "Tajara Ponytail 2" + icon_state = "hair_ponytail2" + length = 2 + chatname = "ponytail" + +/datum/sprite_accessory/hair/taj_ears/taj_ears_ponytail_spiky + name = "Tajara Ponytail, Spiky" + icon_state = "hair_ponytail_spiky" + length = 2 + chatname = "ponytail" + +/datum/sprite_accessory/hair/taj_ears/taj_ears_ponytail_wisp + name = "Tajara Ponytail, Wisp" + icon_state = "hair_ponytail_wisp" + length = 3 + chatname = "ponytail" + +/datum/sprite_accessory/hair/taj_ears/taj_ears_ponytail_zieglertail + name = "Tajara Ponytail, Zieglertail" + icon_state = "hair_ponytail_ziegler" + length = 2 + chatname = "ponytail" + +/datum/sprite_accessory/hair/taj_ears/taj_ears_longfringe + name = "Tajara Long Fringe" + icon_state = "hair_longfringe" + length = 3 + chatname = "long mane" + +/datum/sprite_accessory/hair/taj_ears/taj_ears_longfringe_longer + name = "Tajara Long Fringe, Longer" + icon_state = "hair_longfringe_longer" + length = 4 + chatname = "long mane" + +/datum/sprite_accessory/hair/taj_ears/taj_ears_long_wavy + name = "Tajara Long Wavy" + icon_state = "hair_long_wavy" + length = 3 + chatname = "long mane" + //msai hair, longer ears /datum/sprite_accessory/hair/msai_ears icon = 'icons/mob/human_face/msai_hair.dmi' @@ -3627,6 +3675,54 @@ Follow by example and make good judgement based on length which list to include length = 2 chatname = "bangs" +/datum/sprite_accessory/hair/msai_ears/msai_ears_ponytail_one + name = "M'sai Ponytail 1" + icon_state = "msai_ponytail1" + length = 2 + chatname = "ponytail" + +/datum/sprite_accessory/hair/msai_ears/msai_ears_ponytail_two + name = "M'sai Ponytail 2" + icon_state = "msai_ponytail2" + length = 2 + chatname = "ponytail" + +/datum/sprite_accessory/hair/msai_ears/msai_ears_ponytail_spiky + name = "M'sai Ponytail, Spiky" + icon_state = "msai_ponytail_spiky" + length = 2 + chatname = "ponytail" + +/datum/sprite_accessory/hair/msai_ears/msai_ears_ponytail_wisp + name = "M'sai Ponytail, Wisp" + icon_state = "msai_ponytail_wisp" + length = 3 + chatname = "ponytail" + +/datum/sprite_accessory/hair/msai_ears/msai_ears_ponytail_zieglertail + name = "M'sai Ponytail, Zieglertail" + icon_state = "msai_ponytail_ziegler" + length = 2 + chatname = "ponytail" + +/datum/sprite_accessory/hair/msai_ears/msai_ears_longfringe + name = "M'sai Long Fringe" + icon_state = "msai_longfringe" + length = 3 + chatname = "long mane" + +/datum/sprite_accessory/hair/msai_ears/msai_ears_longfringe_longer + name = "M'sai Long Fringe, Longer" + icon_state = "msai_longfringe_longer" + length = 4 + chatname = "long mane" + +/datum/sprite_accessory/hair/msai_ears/msai_ears_long_wavy + name = "M'sai Long Wavy" + icon_state = "msai_long_wavy" + length = 3 + chatname = "long mane" + //tesla rejuvenation suit hair /datum/sprite_accessory/hair/tesla_ears icon = 'icons/mob/human_face/tesla_body_hair.dmi' diff --git a/html/changelogs/greenjoe - tajhair.yml b/html/changelogs/greenjoe - tajhair.yml new file mode 100644 index 00000000000..5e70f5879f9 --- /dev/null +++ b/html/changelogs/greenjoe - tajhair.yml @@ -0,0 +1,58 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# - (fixes bugs) +# wip +# - (work in progress) +# qol +# - (quality of life) +# soundadd +# - (adds a sound) +# sounddel +# - (removes a sound) +# rscadd +# - (adds a feature) +# rscdel +# - (removes a feature) +# imageadd +# - (adds an image or sprite) +# imagedel +# - (removes an image or sprite) +# spellcheck +# - (fixes spelling or grammar) +# experiment +# - (experimental change) +# balance +# - (balance changes) +# code_imp +# - (misc internal code change) +# refactor +# - (refactors code) +# config +# - (makes a change to the config files) +# admin +# - (makes changes to administrator tools) +# server +# - (miscellaneous changes to server) +################################# + +# Your name. +author: Greenjoe + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit. +# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Adds Tajara versions of several human hairstyles." diff --git a/icons/mob/human_face/msai_hair.dmi b/icons/mob/human_face/msai_hair.dmi index 00daa7dc638..1b5f03a45ae 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 f8009dc1bb7..1d492df0a28 100644 Binary files a/icons/mob/human_face/tajara_hair.dmi and b/icons/mob/human_face/tajara_hair.dmi differ