diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index f245dd330e..5ed8396da4 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -1385,48 +1385,32 @@ GLOBAL_LIST_EMPTY(preferences_datums) if("hair_style") var/new_hair_style - if(gender == MALE) - new_hair_style = input(user, "Choose your character's hair style:", "Character Preference") as null|anything in GLOB.hair_styles_male_list - else - new_hair_style = input(user, "Choose your character's hair style:", "Character Preference") as null|anything in GLOB.hair_styles_female_list + new_hair_style = input(user, "Choose your character's hair style:", "Character Preference") as null|anything in GLOB.hair_styles_list if(new_hair_style) hair_style = new_hair_style if("next_hair_style") - if (gender == MALE) - hair_style = next_list_item(hair_style, GLOB.hair_styles_male_list) - else - hair_style = next_list_item(hair_style, GLOB.hair_styles_female_list) + hair_style = next_list_item(hair_style, GLOB.hair_styles_list) if("previous_hair_style") - if (gender == MALE) - hair_style = previous_list_item(hair_style, GLOB.hair_styles_male_list) - else - hair_style = previous_list_item(hair_style, GLOB.hair_styles_female_list) + hair_style = previous_list_item(hair_style, GLOB.hair_styles_list) if("facial") var/new_facial = input(user, "Choose your character's facial-hair colour:", "Character Preference","#"+facial_hair_color) as color|null if(new_facial) facial_hair_color = sanitize_hexcolor(new_facial) - if("facial_hair_style") - var/new_facial_hair_style - if(gender == MALE) - new_facial_hair_style = input(user, "Choose your character's facial-hair style:", "Character Preference") as null|anything in GLOB.facial_hair_styles_male_list - else - new_facial_hair_style = input(user, "Choose your character's facial-hair style:", "Character Preference") as null|anything in GLOB.facial_hair_styles_female_list - if(new_facial_hair_style) - facial_hair_style = new_facial_hair_style + + if("facial_hair_style") + var/new_facial_hair_style + new_facial_hair_style = input(user, "Choose your character's facial-hair style:", "Character Preference") as null|anything in GLOB.facial_hair_styles_list + if(new_facial_hair_style) + facial_hair_style = new_facial_hair_style if("next_facehair_style") - if (gender == MALE) - facial_hair_style = next_list_item(facial_hair_style, GLOB.facial_hair_styles_male_list) - else - facial_hair_style = next_list_item(facial_hair_style, GLOB.facial_hair_styles_female_list) - if("previous_facehair_style") - if (gender == MALE) - facial_hair_style = previous_list_item(facial_hair_style, GLOB.facial_hair_styles_male_list) - else - facial_hair_style = previous_list_item(facial_hair_style, GLOB.facial_hair_styles_female_list) + facial_hair_style = next_list_item(facial_hair_style, GLOB.facial_hair_styles_list) + + if("previous_facehair_style") + facial_hair_style = previous_list_item(facial_hair_style, GLOB.facial_hair_styles_list) if("underwear") var/new_underwear @@ -1584,14 +1568,28 @@ GLOBAL_LIST_EMPTY(preferences_datums) features["tail_lizard"] = "None" if("snout") + var/list/snowflake_snouts_list = list() + for(var/path in GLOB.snouts_list) + var/datum/sprite_accessory/mam_snouts/instance = GLOB.snouts_list[path] + if(istype(instance, /datum/sprite_accessory)) + var/datum/sprite_accessory/S = instance + if((!S.ckeys_allowed) || (S.ckeys_allowed.Find(user.client.ckey))) + snowflake_snouts_list[S.name] = path var/new_snout - new_snout = input(user, "Choose your character's snout:", "Character Preference") as null|anything in GLOB.snouts_list + new_snout = input(user, "Choose your character's snout:", "Character Preference") as null|anything in snowflake_snouts_list if(new_snout) features["snout"] = new_snout if("mam_snouts") + var/list/snowflake_mam_snouts_list = list() + for(var/path in GLOB.mam_snouts_list) + var/datum/sprite_accessory/mam_snouts/instance = GLOB.mam_snouts_list[path] + if(istype(instance, /datum/sprite_accessory)) + var/datum/sprite_accessory/S = instance + if((!S.ckeys_allowed) || (S.ckeys_allowed.Find(user.client.ckey))) + snowflake_mam_snouts_list[S.name] = path var/new_mam_snouts - new_mam_snouts = input(user, "Choose your character's snout:", "Character Preference") as null|anything in GLOB.mam_snouts_list + new_mam_snouts = input(user, "Choose your character's snout:", "Character Preference") as null|anything in snowflake_mam_snouts_list if(new_mam_snouts) features["mam_snouts"] = new_mam_snouts @@ -1601,12 +1599,6 @@ GLOBAL_LIST_EMPTY(preferences_datums) if(new_horns) features["horns"] = new_horns - if("ears") - var/new_ears - new_ears = input(user, "Choose your character's ears:", "Character Preference") as null|anything in GLOB.ears_list - if(new_ears) - features["ears"] = new_ears - if("wings") var/new_wings new_wings = input(user, "Choose your character's wings:", "Character Preference") as null|anything in GLOB.r_wings_list diff --git a/modular_citadel/code/modules/mob/dead/new_player/sprite_accessories.dm b/modular_citadel/code/modules/mob/dead/new_player/sprite_accessories.dm index ecb4a57407..302a67f2c0 100644 --- a/modular_citadel/code/modules/mob/dead/new_player/sprite_accessories.dm +++ b/modular_citadel/code/modules/mob/dead/new_player/sprite_accessories.dm @@ -166,6 +166,7 @@ name = "Red Panda" icon_state = "wah" icon = 'modular_citadel/icons/mob/mam_tails.dmi' + color_src = MATRIXED /datum/sprite_accessory/ears/human/axolotl name = "Axolotl" @@ -176,11 +177,13 @@ name = "Axolotl" icon_state = "axolotl" icon = 'modular_citadel/icons/mob/mam_tails.dmi' + color_src = MATRIXED /datum/sprite_accessory/tails_animated/human/axolotl name = "Axolotl" icon_state = "axolotl" icon = 'modular_citadel/icons/mob/mam_tails.dmi' + color_src = MATRIXED /datum/sprite_accessory/ears/human/bear name = "Bear" @@ -188,25 +191,29 @@ icon = 'modular_citadel/icons/mob/mam_ears.dmi' color_src = MATRIXED -/datum/sprite_accessory/tails/human/bear +/datum/sprite_accessory/tails/human/bee name = "Bear" icon_state = "bear" icon = 'modular_citadel/icons/mob/mam_tails.dmi' + color_src = MATRIXED -/datum/sprite_accessory/tails_animated/human/bear +/datum/sprite_accessory/tails_animated/human/bee name = "Bear" icon_state = "bear" icon = 'modular_citadel/icons/mob/mam_tails.dmi' + color_src = MATRIXED /datum/sprite_accessory/tails/human/catbig name = "Cat, Big" icon_state = "catbig" icon = 'modular_citadel/icons/mob/mam_tails.dmi' + color_src = MATRIXED /datum/sprite_accessory/tails_animated/human/catbig name = "Cat, Big" icon_state = "catbig" icon = 'modular_citadel/icons/mob/mam_tails.dmi' + color_src = MATRIXED /datum/sprite_accessory/ears/human/cow name = "Cow" @@ -218,11 +225,13 @@ name = "Cow" icon_state = "cow" icon = 'modular_citadel/icons/mob/mam_tails.dmi' + color_src = MATRIXED /datum/sprite_accessory/tails_animated/human/cow name = "Cow" icon_state = "cow" icon = 'modular_citadel/icons/mob/mam_tails.dmi' + color_src = MATRIXED /datum/sprite_accessory/ears/human/curled name = "Curled Horn" @@ -240,11 +249,13 @@ name = "Eevee" icon_state = "eevee" icon = 'modular_citadel/icons/mob/mam_tails.dmi' + color_src = MATRIXED /datum/sprite_accessory/tails_animated/human/eevee name = "Eevee" icon_state = "eevee" icon = 'modular_citadel/icons/mob/mam_tails.dmi' + color_src = MATRIXED /datum/sprite_accessory/ears/human/elephant name = "Elephant" @@ -262,11 +273,13 @@ name = "Fennec" icon_state = "fennec" icon = 'modular_citadel/icons/mob/mam_tails.dmi' + color_src = MATRIXED /datum/sprite_accessory/tails_animated/human/fennec name = "Fennec" icon_state = "fennec" icon = 'modular_citadel/icons/mob/mam_tails.dmi' + color_src = MATRIXED /datum/sprite_accessory/ears/fish name = "Fish" @@ -278,11 +291,13 @@ name = "Fish" icon_state = "fish" icon = 'modular_citadel/icons/mob/mam_tails.dmi' + color_src = MATRIXED /datum/sprite_accessory/tails_animated/human/fish name = "Fish" icon_state = "fish" icon = 'modular_citadel/icons/mob/mam_tails.dmi' + color_src = MATRIXED /datum/sprite_accessory/ears/fox name = "Fox" @@ -294,11 +309,13 @@ name = "Fox" icon_state = "fox" icon = 'modular_citadel/icons/mob/mam_tails.dmi' + color_src = MATRIXED /datum/sprite_accessory/tails_animated/human/fox name = "Fox" icon_state = "fox" icon = 'modular_citadel/icons/mob/mam_tails.dmi' + color_src = MATRIXED /datum/sprite_accessory/tails/human/horse name = "Horse" @@ -316,21 +333,25 @@ name = "Husky" icon_state = "husky" icon = 'modular_citadel/icons/mob/mam_tails.dmi' + color_src = MATRIXED /datum/sprite_accessory/tails_animated/human/husky name = "Husky" icon_state = "husky" icon = 'modular_citadel/icons/mob/mam_tails.dmi' + color_src = MATRIXED /datum/sprite_accessory/tails/human/insect name = "Insect" icon_state = "insect" icon = 'modular_citadel/icons/mob/mam_tails.dmi' + color_src = MATRIXED /datum/sprite_accessory/tails_animated/human/insect name = "insect" icon_state = "insect" icon = 'modular_citadel/icons/mob/mam_tails.dmi' + color_src = MATRIXED /datum/sprite_accessory/ears/human/jellyfish name = "Jellyfish" @@ -505,7 +526,7 @@ color_src = MATRIXED icon = 'modular_citadel/icons/mob/mam_tails.dmi' -/datum/sprite_accessory/tails/human/yentacle +/datum/sprite_accessory/tails/human/tentacle name = "Tentacle" icon_state = "tentacle" color_src = MATRIXED @@ -517,6 +538,18 @@ color_src = MATRIXED icon = 'modular_citadel/icons/mob/mam_tails.dmi' +/datum/sprite_accessory/tails/human/tiger + name = "Tiger" + icon_state = "tiger" + color_src = MATRIXED + icon = 'modular_citadel/icons/mob/mam_tails.dmi' + +/datum/sprite_accessory/tails_animated/human/tiger + name = "Tiger" + icon_state = "tiger" + color_src = MATRIXED + icon = 'modular_citadel/icons/mob/mam_tails.dmi' + /datum/sprite_accessory/ears/wolf name = "Wolf" icon_state = "wolf" @@ -933,13 +966,13 @@ name = "Axolotl" icon_state = "axolotl" -/datum/sprite_accessory/mam_tails/bear - name = "Bear" - icon_state = "bear" +/datum/sprite_accessory/mam_tails/bee + name = "Bee" + icon_state = "bee" -/datum/sprite_accessory/mam_tails_animated/bear - name = "Bear" - icon_state = "bear" +/datum/sprite_accessory/mam_tails_animated/bee + name = "Bee" + icon_state = "bee" /datum/sprite_accessory/mam_tails/cat name = "Cat" diff --git a/modular_citadel/icons/mob/mam_tails.dmi b/modular_citadel/icons/mob/mam_tails.dmi index 8c97b869d6..74eccae2f8 100644 Binary files a/modular_citadel/icons/mob/mam_tails.dmi and b/modular_citadel/icons/mob/mam_tails.dmi differ