From 6571767caad388971eef1d4c1362af599dfc45e2 Mon Sep 17 00:00:00 2001 From: CollenN Date: Sun, 22 Jun 2014 20:19:02 -0400 Subject: [PATCH] Fixes black lizardmen Everyone whose mutant color is set to black is now instead white. Also, now black mutantcolors are automatically set to the default color of your species if you select them. --- code/modules/client/preferences.dm | 6 ++++-- code/modules/client/preferences_savefile.dm | 2 ++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index f3085e14e0f..68889766010 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -632,7 +632,7 @@ datum/preferences if(result) var/newtype = roundstart_species[result] pref_species = new newtype() - if(!config.mutant_colors) + if(!config.mutant_colors || mutant_color == "#000") mutant_color = pref_species.default_color if("mutant_color") @@ -642,7 +642,9 @@ datum/preferences var/new_mutantcolor = input(user, "Choose your character's alien skin color:", "Character Preference") as color|null if(new_mutantcolor) var/temp_hsv = RGBtoHSV(new_mutantcolor) - if(ReadHSV(temp_hsv)[3] >= ReadHSV("#7F7F7F")[3]) // mutantcolors must be bright + if(new_mutantcolor) == "#000000") + mutant_color = pref_species.default_color + else if(ReadHSV(temp_hsv)[3] >= ReadHSV("#7F7F7F")[3]) // mutantcolors must be bright mutant_color = sanitize_hexcolor(new_mutantcolor) else user << "Invalid color. Your color is not bright enough." diff --git a/code/modules/client/preferences_savefile.dm b/code/modules/client/preferences_savefile.dm index 33768cb04c7..a6bd47f8516 100644 --- a/code/modules/client/preferences_savefile.dm +++ b/code/modules/client/preferences_savefile.dm @@ -155,6 +155,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car if(!S["species"] || !config.mutant_races) S["species"] << new /datum/species/human() + S["mutant_color"] << "#FFF" //Character S["OOC_Notes"] >> metadata @@ -194,6 +195,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car real_name = reject_bad_name(real_name) if(!(pref_species in species_list)) pref_species = new /datum/species/human() + mutant_color = "#FFF" if(!real_name) real_name = random_name(gender) be_random_name = sanitize_integer(be_random_name, 0, 1, initial(be_random_name)) gender = sanitize_gender(gender)