diff --git a/code/__DEFINES/preferences_defines.dm b/code/__DEFINES/preferences_defines.dm index 8272092d330..d31152b3c7c 100644 --- a/code/__DEFINES/preferences_defines.dm +++ b/code/__DEFINES/preferences_defines.dm @@ -125,10 +125,11 @@ #define MAX_SAVE_SLOTS 30 // Save slots for regular players #define MAX_SAVE_SLOTS_MEMBER 30 // Save slots for BYOND members -#define TAB_CHAR 0 -#define TAB_GAME 1 -#define TAB_GEAR 2 -#define TAB_KEYS 3 +#define TAB_CHAR 0 +#define TAB_GAME 1 +#define TAB_ANTAG 2 +#define TAB_GEAR 3 +#define TAB_KEYS 4 // Colourblind modes #define COLOURBLIND_MODE_NONE "None" diff --git a/code/modules/client/preference/preferences.dm b/code/modules/client/preference/preferences.dm index 9e45568ee41..e4678032a0f 100644 --- a/code/modules/client/preference/preferences.dm +++ b/code/modules/client/preference/preferences.dm @@ -162,12 +162,13 @@ GLOBAL_LIST_INIT(special_role_times, list( //minimum age (in days) for accounts var/list/dat = list() dat += "
" - dat += "Character Settings" - dat += "Game Preferences" - dat += "Loadout" - dat += "Key Bindings" + dat += "Character Settings" + dat += "Game Preferences" + dat += "Antagonists" + dat += "Loadout" + dat += "Key Bindings" dat += "
" - dat += "
" + dat += "
" switch(current_tab) if(TAB_CHAR) // Character Settings @@ -390,7 +391,7 @@ GLOBAL_LIST_INIT(special_role_times, list( //minimum age (in days) for accounts if(TAB_GAME) // General Preferences // LEFT SIDE OF THE PAGE - dat += "
" + dat += "
" dat += "

General Settings

" dat += "2FA Setup: [_2fastatus_to_text()]
" if(user.client.holder) @@ -402,14 +403,8 @@ GLOBAL_LIST_INIT(special_role_times, list( //minimum age (in days) for accounts dat += "BYOND Membership Publicity: [(toggles & PREFTOGGLE_MEMBER_PUBLIC) ? "Public" : "Hidden"]
" dat += "CKEY Anonymity: [toggles2 & PREFTOGGLE_2_ANON ? "Anonymous" : "Not Anonymous"]
" dat += "Colourblind Mode: [colourblind_mode]
" - dat += "Custom UI settings:
" - dat += " - Alpha (transparency): [UI_style_alpha]
" - dat += " - Color: [UI_style_color]    
" - dat += " - UI Style: [UI_style]
" if(user.client.donator_level > 0) dat += "Donator Publicity: [(toggles & PREFTOGGLE_DONATOR_PUBLIC) ? "Public" : "Hidden"]
" - dat += "Fancy TGUI: [(toggles2 & PREFTOGGLE_2_FANCYUI) ? "Yes" : "No"]
" - dat += "Input Lists: [(toggles2 & PREFTOGGLE_2_DISABLE_TGUI_LISTS) ? "Default" : "TGUI"]
" dat += "FPS: [clientfps]
" dat += "Ghost Ears: [(toggles & PREFTOGGLE_CHAT_GHOSTEARS) ? "All Speech" : "Nearest Creatures"]
" dat += "Ghost Radio: [(toggles & PREFTOGGLE_CHAT_GHOSTRADIO) ? "All Chatter" : "Nearest Speakers"]
" @@ -433,17 +428,29 @@ GLOBAL_LIST_INIT(special_role_times, list( //minimum age (in days) for accounts dat += "High" dat += "
" dat += "Parallax in darkness: [toggles2 & PREFTOGGLE_2_PARALLAX_IN_DARKNESS ? "Enabled" : "Disabled"]
" - dat += "Set screentip mode: [(screentip_mode == 0) ? "Disabled" : "[screentip_mode]px"]
" - dat += "Screentip color:     Change
" dat += "Play Admin MIDIs: [(sound & SOUND_MIDI) ? "Yes" : "No"]
" dat += "Play Lobby Music: [(sound & SOUND_LOBBY) ? "Yes" : "No"]
" dat += "Randomized Character Slot: [toggles2 & PREFTOGGLE_2_RANDOMSLOT ? "Yes" : "No"]
" - dat += "Thought Bubble: [(toggles2 & PREFTOGGLE_2_THOUGHT_BUBBLE) ? "Yes" : "No"]
" dat += "View Range: [viewrange]
" dat += "Window Flashing: [(toggles2 & PREFTOGGLE_2_WINDOWFLASHING) ? "Yes" : "No"]
" dat += "Modsuit Activation Method: [(toggles2 & PREFTOGGLE_2_MOD_ACTIVATION_METHOD) ? "Middle Click" : "Alt Click"]
" // RIGHT SIDE OF THE PAGE - dat += "		" + dat += "" + dat += "

Interface Settings

" + dat += "Set screentip mode: [(screentip_mode == 0) ? "Disabled" : "[screentip_mode]px"]
" + dat += "Screentip color:     Change
" + dat += "Thought Bubble: [(toggles2 & PREFTOGGLE_2_THOUGHT_BUBBLE) ? "Yes" : "No"]
" + dat += "Custom UI settings:
" + dat += " - Alpha (transparency): [UI_style_alpha]
" + dat += " - Color: [UI_style_color]    
" + dat += " - UI Style: [UI_style]
" + dat += "TGUI settings:
" + dat += " - Fancy TGUI: [(toggles2 & PREFTOGGLE_2_FANCYUI) ? "Yes" : "No"]
" + dat += " - Input Lists: [(toggles2 & PREFTOGGLE_2_DISABLE_TGUI_LISTS) ? "Default" : "TGUI"]
" + dat += "
" + + if(TAB_ANTAG) // Antagonist's Preferences + dat += "
" dat += "

Special Role Settings

" if(jobban_isbanned(user, ROLE_SYNDICATE)) dat += "You are banned from special roles." @@ -462,7 +469,8 @@ GLOBAL_LIST_INIT(special_role_times, list( //minimum age (in days) for accounts else dat += "Be [capitalize(i)]: \[ERROR]
" else - dat += "Be [capitalize(i)]: [(i in src.be_special) ? "Yes" : "No"]
" + var/is_special = (i in src.be_special) + dat += "Be [capitalize(i)]:[(is_special) ? "Yes" : "No"]
" dat += "
" if(TAB_GEAR) diff --git a/html/browser/common.css b/html/browser/common.css index 3480183d129..3332473586a 100644 --- a/html/browser/common.css +++ b/html/browser/common.css @@ -1,5 +1,5 @@ -body -{ +body +{ padding: 0; margin: 0; background-color: #272727; @@ -15,8 +15,8 @@ hr } a, a:link, a:visited, a:active, .linkOn, .linkOff -{ - color: #ffffff; +{ + color: #ffffff; text-decoration: none; background: #40628a; border: 1px solid #161616; @@ -26,8 +26,8 @@ a, a:link, a:visited, a:active, .linkOn, .linkOff } a.nobg, a.nobg:link, a.nobg:visited, a.nobg:active -{ - color: #ffffff; +{ + color: #ffffff; text-decoration: none; background: transparent; border: none; @@ -36,20 +36,43 @@ a.nobg, a.nobg:link, a.nobg:visited, a.nobg:active cursor:default; font-weight:bold; } -a.nobg:hover -{ +a.nobg:hover +{ color:#40628a; } -a:hover -{ +a:hover +{ color: #40628a; background: #ffffff; } + +a.red +{ + background: #b30000; +} + +a.red:hover +{ + color: #ffffff; + background: #ff0000; +} + +a.green +{ + background: #408000; +} + +a.green:hover +{ + color: #ffffff; + background: #59b300; +} + a.white, a.white:link, a.white:visited, a.white:active -{ - color: #40628a; +{ + color: #40628a; text-decoration: none; background: #ffffff; border: 1px solid #161616; @@ -58,22 +81,22 @@ a.white, a.white:link, a.white:visited, a.white:active cursor:default; } -a.white:hover -{ +a.white:hover +{ color: #ffffff; background: #40628a; } .linkOn, a.linkOn:link, a.linkOn:visited, a.linkOn:active, a.linkOn:hover -{ - color: #ffffff; +{ + color: #ffffff; background: #2f943c; border-color: #24722e; } .linkOff, a.linkOff:link, a.linkOff:visited, a.linkOff:active, a.linkOff:hover -{ - color: #ffffff; +{ + color: #ffffff; background: #999999; border-color: #666666; } @@ -105,15 +128,15 @@ li padding: 0 0 2px 0; } -img, a img -{ - border-style:none; +img, a img +{ + border-style:none; } h1, h2, h3, h4, h5, h6 { margin: 0; - padding: 16px 0 8px 0; + padding: 16px 0 8px 0; color: #517087; } @@ -163,7 +186,7 @@ h4 right:0px; z-index: 10 } - + .uiTitleButtons { position:fixed; @@ -182,7 +205,7 @@ h4 } .uiContent -{ +{ clear: both; padding: 8px; font-family: Verdana, Geneva, sans-serif; @@ -225,7 +248,7 @@ h4 } .notice.icon -{ +{ padding: 2px 4px 0 20px; }