diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index bcd71399b9..73bded4f7c 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -568,6 +568,13 @@ GLOBAL_LIST_EMPTY(preferences_datums) var/primary_feature = "[accessory.mutant_part_string]_primary" var/secondary_feature = "[accessory.mutant_part_string]_secondary" var/tertiary_feature = "[accessory.mutant_part_string]_tertiary" + if(!features[primary_feature]) + features[primary_feature] = features["mcolor"] + if(!features[secondary_feature]) + features[secondary_feature] = features["mcolor2"] + if(!features[tertiary_feature]) + features[tertiary_feature] = features["mcolor3"] + var/matrixed_sections = accessory.matrixed_sections if(accessory.color_src == MATRIXED && !matrixed_sections) message_admins("Sprite Accessory Failure (customization): Accessory [accessory.type] is a matrixed item without any matrixed sections set!") @@ -583,18 +590,12 @@ GLOBAL_LIST_EMPTY(preferences_datums) if(MATRIX_GREEN_BLUE) //composed of a green and blue section primary_feature = secondary_feature //swap primary for secondary, as first option is green, which is linked to the secondary secondary_feature = tertiary_feature //swap secondary for tertiary, as second option is blue, which is linked to the tertiary - if(!features[primary_feature]) - features[primary_feature] = "FFFFFF" dat += "Primary Color
" dat += "    Change
" if((accessory.color_src == MATRIXED && (matrixed_sections == MATRIX_RED_BLUE || matrixed_sections == MATRIX_GREEN_BLUE || matrixed_sections == MATRIX_RED_GREEN || matrixed_sections == MATRIX_ALL)) || (accessory.extra && (accessory.extra_color_src == MUTCOLORS || accessory.extra_color_src == MUTCOLORS2 || accessory.extra_color_src == MUTCOLORS3))) - if(!features[secondary_feature]) - features[secondary_feature] = "FFFFFF" dat += "Secondary Color
" dat += "    Change
" if((accessory.color_src == MATRIXED && matrixed_sections == MATRIX_ALL) || (accessory.extra2 && (accessory.extra2_color_src == MUTCOLORS || accessory.extra2_color_src == MUTCOLORS2 || accessory.extra2_color_src == MUTCOLORS3))) - if(!features[tertiary_feature]) - features[tertiary_feature] = "FFFFFF" dat += "Tertiary Color
" dat += "    Change
" 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 97c6114e8d..00e770fdc1 100644 --- a/code/modules/mob/dead/new_player/sprite_accessories/tails.dm +++ b/code/modules/mob/dead/new_player/sprite_accessories/tails.dm @@ -1,6 +1,6 @@ /datum/sprite_accessory/tails icon = 'icons/mob/mutant_bodyparts.dmi' - mutant_part_string = "tails" + mutant_part_string = "tail" relevant_layers = list(BODY_BEHIND_LAYER, BODY_FRONT_LAYER) /datum/sprite_accessory/tails/is_not_visible(var/mob/living/carbon/human/H, var/tauric) @@ -8,7 +8,7 @@ /datum/sprite_accessory/tails_animated icon = 'icons/mob/mutant_bodyparts.dmi' - mutant_part_string = "tails" //keep this the same, ALWAYS, this is incredibly important for colouring! + mutant_part_string = "tail" //keep this the same, ALWAYS, this is incredibly important for colouring! relevant_layers = list(BODY_BEHIND_LAYER, BODY_FRONT_LAYER) /****************************************** @@ -564,7 +564,6 @@ color_src = MATRIXED icon = 'modular_citadel/icons/mob/mam_tails.dmi' recommended_species = list("mammal", "slimeperson", "podweak", "felinid", "insect") - mutant_part_string = "tail" relevant_layers = list(BODY_BEHIND_LAYER, BODY_FRONT_LAYER) /datum/sprite_accessory/tails/mam_tails/none @@ -576,7 +575,6 @@ /datum/sprite_accessory/tails_animated/mam_tails_animated color_src = MATRIXED icon = 'modular_citadel/icons/mob/mam_tails.dmi' - mutant_part_string = "tail" //KEEP IT THE SAME relevant_layers = list(BODY_BEHIND_LAYER, BODY_FRONT_LAYER) /datum/sprite_accessory/tails_animated/mam_tails_animated/is_not_visible(var/mob/living/carbon/human/H, var/tauric)