From c35e3a2ce472308f8904af174579eba53b7cc02f Mon Sep 17 00:00:00 2001 From: Snakebittenn Date: Sun, 30 Aug 2020 13:31:23 -0600 Subject: [PATCH] Unapologetic M'sai Buffs (#9803) --- .../abstract/new_player/sprite_accessories.dm | 94 +++++++++++++++++- .../station/tajara/tajaran_subspecies.dm | 2 + html/changelogs/snakebittenn-overgrowth.yml | 41 ++++++++ icons/mob/human_face/msai_hair.dmi | Bin 0 -> 7630 bytes 4 files changed, 136 insertions(+), 1 deletion(-) create mode 100644 html/changelogs/snakebittenn-overgrowth.yml create mode 100644 icons/mob/human_face/msai_hair.dmi 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 0000000000000000000000000000000000000000..bd693a366d77361e6d0fdd1f27c8450fe5811755 GIT binary patch literal 7630 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