diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index e53af9a5014..2c6e6895d26 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -63,6 +63,9 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts #define MAX_SAVE_SLOTS 20 // Save slots for regular players #define MAX_SAVE_SLOTS_MEMBER 20 // Save slots for BYOND members +#define TAB_CHAR 0 +#define TAB_GAME 1 + /datum/preferences //doohickeys for savefiles // var/path @@ -174,7 +177,7 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts var/nanotrasen_relation = "Neutral" // 0 = character settings, 1 = game preferences - var/current_tab = 0 + var/current_tab = TAB_CHAR // OOC Metadata: var/metadata = "" @@ -207,229 +210,198 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts save_preferences(C) save_character(C) //let's save this new random character so it doesn't keep generating new ones. +/datum/preferences/proc/color_square(r, g, b) + return "___" // Hello I am a proc full of snowflake species checks how are you /datum/preferences/proc/ShowChoices(mob/user) - if(!user || !user.client) return + if(!user || !user.client) + return update_preview_icon() user << browse_rsc(preview_icon_front, "previewicon.png") user << browse_rsc(preview_icon_side, "previewicon2.png") - var/dat = "
| "
+ dat += "Name: "
+ dat += "[real_name]"
+ dat += "(Randomize)"
+ dat += "(Always Randomize) " + dat += " | "
dat += "Occupation Choices" - dat += "Set Occupation Preferences |
"
dat += "Identity" - dat += "
Body Markings " - dat += "Change Color
Style: [m_style] " - - dat += " Hair " - dat += "Change Color
Style: [h_style] " - - dat += " Facial Hair " - dat += "Change Color
Style: [f_style ? "[f_style]" : "Shaved"] " - - if(species != "Machine") - dat += " Eyes " - dat += "Change Color
" - - if((species in list("Unathi", "Tajaran", "Skrell", "Slime People", "Vulpkanin", "Machine")) || body_accessory_by_species[species] || check_rights(R_ADMIN, 0, user)) //admins can always fuck with this, because they are admins - dat += " Body Color " - dat += "Change Color
Body Accessory " - dat += "Accessory: [body_accessory ? "[body_accessory]" : "None"] " - - dat += " |
"
dat += "General Settings" - dat += "UI Style: [UI_style]" dat += "Fancy NanoUI: [(nanoui_fancy) ? "Yes" : "No"] " dat += "Ghost-Item Attack Animation: [(show_ghostitem_attack) ? "Yes" : "No"] " dat += "Custom UI settings: " - dat += "Color: [UI_style_color]
" - dat += "Alpha (transparency): [UI_style_alpha] " + dat += " - UI Style: [UI_style] " + dat += " - Color: [UI_style_color]
" + dat += " - Alpha (transparency): [UI_style_alpha] " + dat += " " dat += "Play admin midis: [(sound & SOUND_MIDI) ? "Yes" : "No"] " dat += "Play lobby music: [(sound & SOUND_LOBBY) ? "Yes" : "No"] " + if(user.client.holder) + dat += "Adminhelp sound: " + dat += "[(sound & SOUND_ADMINHELP)?"On":"Off"] " + + if(check_rights(R_ADMIN,0)) + dat += "OOC: Change " + if(config.allow_Metadata) + dat += "OOC notes: Edit " + if(unlock_content) + dat += "BYOND Membership Publicity: [(toggles & MEMBER_PUBLIC) ? "Public" : "Hidden"] " + dat += "Randomized character slot: [randomslot ? "Yes" : "No"] " dat += "Ghost ears: [(toggles & CHAT_GHOSTEARS) ? "Nearest Creatures" : "All Speech"] " dat += "Ghost sight: [(toggles & CHAT_GHOSTSIGHT) ? "Nearest Creatures" : "All Emotes"] " dat += "Ghost radio: [(toggles & CHAT_GHOSTRADIO) ? "Nearest Speakers" : "All Chatter"] " - if(config.allow_Metadata) - dat += "OOC notes: Edit " - - if(user.client) - if(user.client.holder) - dat += "Adminhelp sound: " - dat += "[(sound & SOUND_ADMINHELP)?"On":"Off"] " - - if(check_rights(R_ADMIN,0)) - dat += "OOC: Change " - - if(unlock_content) - dat += "BYOND Membership Publicity: [(toggles & MEMBER_PUBLIC) ? "Public" : "Hidden"] " dat += " | "
dat += "Special Role Settings" -// dat += "" if(jobban_isbanned(user, "Syndicate")) dat += "You are banned from special roles." - src.be_special = list() + be_special = list() else - for (var/i in special_roles) + for(var/i in special_roles) if(jobban_isbanned(user, i)) dat += "Be [capitalize(i)]: \[BANNED] " else if(!player_old_enough_antag(user.client,i)) @@ -437,17 +409,17 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts dat += "Be [capitalize(i)]: \[IN [(available_in_days_antag)] DAYS] " else dat += "Be [capitalize(i)]: [(i in src.be_special) ? "Yes" : "No"] " - dat += " |