diff --git a/code/__HELPERS/global_lists.dm b/code/__HELPERS/global_lists.dm index 325e0ab51da..77bbbc48dc0 100644 --- a/code/__HELPERS/global_lists.dm +++ b/code/__HELPERS/global_lists.dm @@ -43,7 +43,7 @@ var/global/list/facial_hair_styles_male_list = list() var/global/list/facial_hair_styles_female_list = list() var/global/list/skin_styles_female_list = list() //unused //Underwear -var/global/list/underwear_m = list("White", "Grey", "Green", "Blue", "Black", "Mankini", "None") +var/global/list/underwear_m = list("White", "Grey", "Green", "Blue", "Black", "Mankini", "None") var/global/list/underwear_f = list("Red", "White", "Yellow", "Blue", "Black", "Thong", "None") var/global/list/underwear_list = underwear_m + underwear_f //undershirt @@ -51,6 +51,10 @@ var/global/list/undershirt_t = list("White Shirt", "White Tank top", "Black shir var/global/list/undershirt_list = undershirt_t //Backpacks var/global/list/backbaglist = list("Nothing", "Backpack", "Satchel", "Satchel Alt") + //Slime Colors +var/global/slime_colorh = list("grey", "gold", "silver", "metal", "purple", "darkpurple", "orange", "yellow", "red", "blue", "darkblue", "pink", "green", "lightpink", "black", "oil", "adamantine") + + ////////////////////////// /////Initial Building///// diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index d462d90bcc4..2a1624d7bed 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -79,6 +79,9 @@ datum/preferences var/species = "Human" var/language = "None" //Secondary language + var/slime_color = "blue" //need this for assigning to chars + var/HRslime_color = "" + var/speciesprefs = 0//I hate having to do this, I really do (Using this for oldvox code, making names universal I guess //Mob preview @@ -306,6 +309,11 @@ datum/preferences dat += "
Body Color
" dat += "Change Color
__
" + if(species == "Slime People") + HRslime_color = capitalize(slime_color) + dat += "
Slime Color
" + dat += "Change Slime Color [HRslime_color]" + dat += "
" if (1) // General Preferences @@ -1150,6 +1158,16 @@ datum/preferences g_skin = hex2num(copytext(new_skin, 4, 6)) b_skin = hex2num(copytext(new_skin, 6, 8)) + if("slime_color") + var/list/slime_colors + slime_colors = slime_colorh + if(species == "Slime People") + var/new_slime = input(user, "Choose your slime color: ", "Character Preference") as null|anything in slime_colors + if(new_slime) + slime_color = slime_colors[slime_colors.Find(new_slime)] + ShowChoices(user) + + if("ooccolor") var/new_ooccolor = input(user, "Choose your OOC colour:", "Game Preference") as color|null if(new_ooccolor) @@ -1392,6 +1410,8 @@ datum/preferences character.h_style = h_style character.f_style = f_style + character.slime_color = slime_color + // Destroy/cyborgize organs for(var/name in organ_data) var/datum/organ/external/O = character.organs_by_name[name]