diff --git a/code/modules/mob/abstract/new_player/sprite_accessories.dm b/code/modules/mob/abstract/new_player/sprite_accessories.dm index a7024f9a2e4..1f6e8742fa1 100644 --- a/code/modules/mob/abstract/new_player/sprite_accessories.dm +++ b/code/modules/mob/abstract/new_player/sprite_accessories.dm @@ -2167,7 +2167,7 @@ Follow by example and make good judgement based on length which list to include icon = 'icons/mob/human_face/tajara_hair.dmi' name = "Tajaran Ears" icon_state = "ears_plain" - species_allowed = list(/datum/species/tajaran,/datum/species/tajaran/zhan_khazan,/datum/species/tajaran/m_sai,/datum/species/zombie/tajara) + species_allowed = list(/datum/species/tajaran,/datum/species/tajaran/zhan_khazan,/datum/species/zombie/tajara) taj_ears_bangs name = "Tajara Bangs" @@ -2254,6 +2254,98 @@ Follow by example and make good judgement based on length which list to include icon_state = "hair_victory" chatname = "curls" +//msai hair, longer ears + msai_ears + icon = 'icons/mob/human_face/msai_hair.dmi' + name = "M'sai Ears" + icon_state = "msai_plain" + species_allowed = list(/datum/species/tajaran/m_sai) + + msai_ears_bangs + name = "M'sai Bangs" + icon_state = "msai_bangs" + chatname = "bangs" + + msai_ears_bob + name = "M'sai Bob" + icon_state = "msai_bob" + chatname = "groomed short mane" + + msai_ears_braid + name = "M'sai Braid" + icon_state = "msai_braid" + chatname = "braid" + + msai_ears_clean + name = "M'sai Clean" + icon_state = "msai_clean" + chatname = "short mane" + + msai_ears_curls + name = "M'sai Curly" + icon_state = "msai_curly" + chatname = "curly mane" + + msai_ears_fingercurl + name = "M'sai Finger Curls" + icon_state = "msai_fingerwave" + chatname = "curls" + + msai_ears_pompadour + name = "M'sai Greaser" + icon_state = "msai_greaser" + chatname = "pompadour" + + msai_ears_housewife + name = "M'sai Housewife" + icon_state = "msai_housewife" + chatname = "long mane" + + msai_ears_long + name = "M'sai Long" + icon_state = "msai_long" + chatname = "long mane" + + msai_ears_messy + name = "M'sai Messy" + icon_state = "msai_messy" + chatname = "messy mane" + + msai_ears_mohawk + name = "M'sai Mohawk" + icon_state = "msai_mohawk" + chatname = "mohawk" + + msai_ears_plait + name = "M'sai Plait" + icon_state = "msai_plait" + chatname = "braid" + + msai_ears_rattail + name = "M'sai Rat Tail" + icon_state = "msai_rattail" + chatname = "thin ponytail" + + msai_ears_shaggy + name = "M'sai Shaggy" + icon_state = "msai_shaggy" + chatname = "messy mane" + + msai_ears_straight + name = "M'sai Straight" + icon_state = "msai_straight" + chatname = "short mane" + + msai_ears_spiky + name = "M'sai Spiky" + icon_state = "msai_spiky" + chatname = "spiky mane" + + msai_ears_victory + name = "M'sai Victory Curls" + icon_state = "msai_victory" + chatname = "curls" + //vox hair vox_quills_kingly diff --git a/code/modules/mob/living/carbon/human/species/station/tajara/tajaran_subspecies.dm b/code/modules/mob/living/carbon/human/species/station/tajara/tajaran_subspecies.dm index 0596731521f..3fcf5c4a5b1 100644 --- a/code/modules/mob/living/carbon/human/species/station/tajara/tajaran_subspecies.dm +++ b/code/modules/mob/living/carbon/human/species/station/tajara/tajaran_subspecies.dm @@ -58,5 +58,7 @@ primitive_form = SPECIES_MONKEY_TAJARA_MSAI + default_h_style = "M'sai Ears" + secondary_langs = list(LANGUAGE_SIIK_MAAS, LANGUAGE_SIIK_TAJR, LANGUAGE_SIGN_TAJARA) allowed_accents = list(ACCENT_REPUBICLANSIIK, ACCENT_NAZIRASIIK, ACCENT_CREVAN, ACCENT_DASNRRASIIK, ACCENT_HIGHHARRSIIK, ACCENT_LOWHARRSIIK, ACCENT_AMOHDASIIK) diff --git a/html/changelogs/snakebittenn-overgrowth.yml b/html/changelogs/snakebittenn-overgrowth.yml new file mode 100644 index 00000000000..a38c7acb8f2 --- /dev/null +++ b/html/changelogs/snakebittenn-overgrowth.yml @@ -0,0 +1,41 @@ +################################ +# 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 +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: Snakebittenn + +# 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, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Makes M'sai ears longer." diff --git a/icons/mob/human_face/msai_hair.dmi b/icons/mob/human_face/msai_hair.dmi new file mode 100644 index 00000000000..bd693a366d7 Binary files /dev/null and b/icons/mob/human_face/msai_hair.dmi differ