Merge pull request #1057 from lukevale/master

A quick fix to saving. Should now save properly.
This commit is contained in:
QuoteFox
2021-03-26 13:41:32 +00:00
committed by GitHub
3 changed files with 4 additions and 4 deletions
+2 -2
View File
@@ -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)
+1 -1
View File
@@ -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")
@@ -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"