From a0de61cd901465955d141715c9c83afed7ff6107 Mon Sep 17 00:00:00 2001 From: lukevale Date: Fri, 26 Mar 2021 02:30:11 -0500 Subject: [PATCH] A quick fix to saving. Should now save properly. --- code/modules/client/preferences.dm | 4 ++-- code/modules/client/preferences_savefile.dm | 2 +- code/modules/mob/living/carbon/human/human_defines.dm | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index 9ec0d7ef..0d4707f8 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -93,7 +93,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) var/facial_hair_style = "Shaved" //Face hair type var/facial_hair_color = "000" //Facial hair color var/grad_style = "None" //Hair Gradient style - var/grad_color = "#000000" //Hair Gradient color + var/grad_color = "000000" //Hair Gradient color var/skin_tone = "caucasian1" //Skin color var/eye_color = "000" //Eye color var/wing_color = "fff" //Wing color @@ -1760,7 +1760,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) if("grad") var/new_grad - new_grad = input(user, "Choose your character's gradiant color:", "Character Preference", new_grad) as color|null + new_grad = input(user, "Choose your character's gradiant color:", "Character Preference","#"+new_grad) as color|null if(new_grad) grad_color = sanitize_hexcolor(new_grad) diff --git a/code/modules/client/preferences_savefile.dm b/code/modules/client/preferences_savefile.dm index 56b3c7e3..06badf9e 100644 --- a/code/modules/client/preferences_savefile.dm +++ b/code/modules/client/preferences_savefile.dm @@ -492,7 +492,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car age = sanitize_integer(age, AGE_MIN, AGE_MAX, initial(age)) hair_color = sanitize_hexcolor(hair_color, 3, 0) facial_hair_color = sanitize_hexcolor(facial_hair_color, 3, 0) - grad_color = sanitize_hexcolor(grad_color, 6, 1) + grad_color = sanitize_hexcolor(grad_color, 3, 0, initial(grad_color)) eye_color = sanitize_hexcolor(eye_color, 3, 0) skin_tone = sanitize_inlist(skin_tone, GLOB.skin_tones) wing_color = sanitize_hexcolor(wing_color, 3, FALSE, "#FFFFFF") diff --git a/code/modules/mob/living/carbon/human/human_defines.dm b/code/modules/mob/living/carbon/human/human_defines.dm index bc429365..3687a52b 100644 --- a/code/modules/mob/living/carbon/human/human_defines.dm +++ b/code/modules/mob/living/carbon/human/human_defines.dm @@ -15,7 +15,7 @@ var/facial_hair_style = "Shaved" var/grad_style = "none" - var/grad_color = "#000000" + var/grad_color = "000000" //Eye colour var/eye_color = "000"