diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index 73bded4f7c..124fecfc2e 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -2082,7 +2082,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) features["xenodorsal"] = new_dors //every single primary/secondary/tertiary colouring done at once - if("xenodorsal_primary","xenodorsal_secondary","xenodorsal_tertiary","xenohead_primary","xenohead_secondary","xenohead_tertiary","tail_primary","tail_secondary","tail_tertiary","xenotail_primary","xenotail_secondary","xenotail_tertiary","mam_body_markings_primary","mam_body_markings_secondary","mam_body_markings_tertiary","insect_markings_primary","insect_markings_secondary","insect_markings_tertiary","body_markings_primary","body_markings_secondary","body_markings_tertiary","insect_fluff_primary","insect_fluff_secondary","insect_fluff_tertiary","ears_primary","ears_secondary","ears_tertiary","frills_primary","frills_secondary","frills_tertiary","ipc_antenna_primary","ipc_antenna_secondary","ipc_antenna_tertiary","taur_primary","taur_secondary","taur_tertiary","snout_primary","snout_secondary","snout_tertiary","mam_snouts_primary","mam_snouts_secondary","mam_snouts_tertiary","mam_ears_primary","mam_ears_secondary","mam_ears_tertiary","spines_primary","spines_secondary","spines_tertiary","tail_lizard_primary","tail_lizard_secondary","tail_lizard_tertiary","tail_human_primary","tail_human_secondary","tail_human_tertiary","mam_tail_primary","mam_tail_secondary","mam_tail_tertiary") + if("xenodorsal_primary","xenodorsal_secondary","xenodorsal_tertiary","xhead_primary","xhead_secondary","xhead_tertiary","tail_primary","tail_secondary","tail_tertiary","insect_markings_primary","insect_markings_secondary","insect_markings_tertiary","bodymarkings_primary","bodymarkings_secondary","bodymarkings_tertiary","insect_fluff_primary","insect_fluff_secondary","insect_fluff_tertiary","ears_primary","ears_secondary","ears_tertiary","frills_primary","frills_secondary","frills_tertiary","antenna_primary","antenna_secondary","antenna_tertiary","taur_primary","taur_secondary","taur_tertiary","snout_primary","snout_secondary","snout_tertiary","spines_primary","spines_secondary","spines_tertiary") var/the_feature = features[href_list["preference"]] if(!the_feature) features[href_list["preference"]] = "FFFFFF" diff --git a/code/modules/mob/dead/new_player/sprite_accessories/alienpeople.dm b/code/modules/mob/dead/new_player/sprite_accessories/alienpeople.dm index 4b0962e710..3972bdc2c3 100644 --- a/code/modules/mob/dead/new_player/sprite_accessories/alienpeople.dm +++ b/code/modules/mob/dead/new_player/sprite_accessories/alienpeople.dm @@ -27,7 +27,7 @@ *******************************************/ /datum/sprite_accessory/xeno_tail icon = 'modular_citadel/icons/mob/xeno_parts_greyscale.dmi' - mutant_part_string = "xenotail" + mutant_part_string = "tail" relevant_layers = list(BODY_BEHIND_LAYER, BODY_FRONT_LAYER) /datum/sprite_accessory/xeno_tail/is_not_visible(var/mob/living/carbon/human/H, var/tauric) @@ -46,7 +46,7 @@ *******************************************/ /datum/sprite_accessory/xeno_head icon = 'modular_citadel/icons/mob/xeno_parts_greyscale.dmi' - mutant_part_string = "xenohead" + mutant_part_string = "xhead" relevant_layers = list(BODY_ADJ_LAYER) /datum/sprite_accessory/xeno_head/is_not_visible(var/mob/living/carbon/human/H, var/tauric) diff --git a/code/modules/mob/dead/new_player/sprite_accessories/body_markings.dm b/code/modules/mob/dead/new_player/sprite_accessories/body_markings.dm index 383bdf4b7c..649a48f333 100644 --- a/code/modules/mob/dead/new_player/sprite_accessories/body_markings.dm +++ b/code/modules/mob/dead/new_player/sprite_accessories/body_markings.dm @@ -5,7 +5,7 @@ /datum/sprite_accessory/body_markings icon = 'icons/mob/mutant_bodyparts.dmi' relevant_layers = list(BODY_ADJ_LAYER) - mutant_part_string = "body_markings" + mutant_part_string = "bodymarkings" /datum/sprite_accessory/body_markings/none name = "None" @@ -49,7 +49,6 @@ gender_specific = 0 icon = 'modular_citadel/icons/mob/mam_markings.dmi' recommended_species = list("mammal", "xeno", "slimeperson", "podweak") - mutant_part_string = "mam_body_markings" matrixed_sections = MATRIX_ALL /datum/sprite_accessory/mam_body_markings/none diff --git a/code/modules/mob/dead/new_player/sprite_accessories/ears.dm b/code/modules/mob/dead/new_player/sprite_accessories/ears.dm index c4045d9afc..e09a0386ee 100644 --- a/code/modules/mob/dead/new_player/sprite_accessories/ears.dm +++ b/code/modules/mob/dead/new_player/sprite_accessories/ears.dm @@ -203,7 +203,6 @@ /datum/sprite_accessory/ears/mam_ears icon = 'modular_citadel/icons/mob/mam_ears.dmi' color_src = MATRIXED - mutant_part_string = "mam_ears" relevant_layers = list(BODY_BEHIND_LAYER, BODY_ADJ_LAYER, BODY_FRONT_LAYER) /datum/sprite_accessory/ears/mam_ears/is_not_visible(var/mob/living/carbon/human/H, var/tauric) diff --git a/code/modules/mob/dead/new_player/sprite_accessories/ipc_synths.dm b/code/modules/mob/dead/new_player/sprite_accessories/ipc_synths.dm index 1c434c9c2d..1c332c3f34 100644 --- a/code/modules/mob/dead/new_player/sprite_accessories/ipc_synths.dm +++ b/code/modules/mob/dead/new_player/sprite_accessories/ipc_synths.dm @@ -132,7 +132,7 @@ color_src = MUTCOLORS2 relevant_layers = list(BODY_ADJ_LAYER) recommended_species = list("ipc") - mutant_part_string = "ipcantenna" + mutant_part_string = "antenna" /datum/sprite_accessory/antenna/none name = "None" diff --git a/code/modules/mob/dead/new_player/sprite_accessories/snouts.dm b/code/modules/mob/dead/new_player/sprite_accessories/snouts.dm index 084e06dd93..75b62e8c0f 100644 --- a/code/modules/mob/dead/new_player/sprite_accessories/snouts.dm +++ b/code/modules/mob/dead/new_player/sprite_accessories/snouts.dm @@ -1,6 +1,6 @@ /datum/sprite_accessory/snouts icon = 'icons/mob/mutant_bodyparts.dmi' - mutant_part_string = "snouts" + mutant_part_string = "snout" relevant_layers = list(BODY_ADJ_LAYER, BODY_FRONT_LAYER) /datum/sprite_accessory/snouts/is_not_visible(var/mob/living/carbon/human/H, var/tauric) @@ -153,7 +153,6 @@ color_src = MATRIXED icon = 'modular_citadel/icons/mob/mam_snouts.dmi' recommended_species = list("mammal", "slimeperson", "insect", "podweak", "lizard") - mutant_part_string = "mam_snouts" relevant_layers = list(BODY_ADJ_LAYER, BODY_FRONT_LAYER) /datum/sprite_accessory/snouts/mam_snouts/is_not_visible(var/mob/living/carbon/human/H, var/tauric) diff --git a/code/modules/mob/dead/new_player/sprite_accessories/tails.dm b/code/modules/mob/dead/new_player/sprite_accessories/tails.dm index 00e770fdc1..0b06fd4f45 100644 --- a/code/modules/mob/dead/new_player/sprite_accessories/tails.dm +++ b/code/modules/mob/dead/new_player/sprite_accessories/tails.dm @@ -8,7 +8,7 @@ /datum/sprite_accessory/tails_animated icon = 'icons/mob/mutant_bodyparts.dmi' - mutant_part_string = "tail" //keep this the same, ALWAYS, this is incredibly important for colouring! + mutant_part_string = "tailwag" //keep this the same, ALWAYS, this is incredibly important for colouring! relevant_layers = list(BODY_BEHIND_LAYER, BODY_FRONT_LAYER) /****************************************** diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm index 28aa6eeb66..2553ce59e6 100644 --- a/code/modules/mob/living/carbon/human/species.dm +++ b/code/modules/mob/living/carbon/human/species.dm @@ -770,9 +770,12 @@ GLOBAL_LIST_EMPTY(roundstart_race_names) var/advanced_color_system = (H.dna.features["color_scheme"] == ADVANCED_CHARACTER_COLORING) - var/primary_string = advanced_color_system ? "[S.mutant_part_string]_primary" : "mcolor" - var/secondary_string = advanced_color_system ? "[S.mutant_part_string]_secondary" : "mcolor2" - var/tertiary_string = advanced_color_system ? "[S.mutant_part_string]_tertiary" : "mcolor3" + var/mutant_string = S.mutant_part_string + if(mutant_string == "tailwag") //wagging tails should be coloured the same way as your tail + mutant_string = "tail" + var/primary_string = advanced_color_system ? "[mutant_string]_primary" : "mcolor" + var/secondary_string = advanced_color_system ? "[mutant_string]_secondary" : "mcolor2" + var/tertiary_string = advanced_color_system ? "[mutant_string]_tertiary" : "mcolor3" //failsafe: if there's no value for any of these, set it to white if(!H.dna.features[primary_string]) H.dna.features[primary_string] = advanced_color_system ? H.dna.features["mcolor"] : "FFFFFF"