diff --git a/code/__DEFINES/colors.dm b/code/__DEFINES/colors.dm index 4811d0041fb..1953651125f 100644 --- a/code/__DEFINES/colors.dm +++ b/code/__DEFINES/colors.dm @@ -3,26 +3,30 @@ #define COLOR_INPUT_DISABLED "#F0F0F0" #define COLOR_INPUT_ENABLED "#D3B5B5" -//#define COLOR_WHITE "#EEEEEE" -//#define COLOR_SILVER "#C0C0C0" -//#define COLOR_GRAY "#808080" +#define COLOR_DARKMODE_BACKGROUND "#202020" +#define COLOR_DARKMODE_DARKBACKGROUND "#171717" +#define COLOR_DARKMODE_TEXT "#a4bad6" + +#define COLOR_WHITE "#EEEEEE" +#define COLOR_SILVER "#C0C0C0" +#define COLOR_GRAY "#808080" #define COLOR_FLOORTILE_GRAY "#8D8B8B" #define COLOR_ALMOST_BLACK "#333333" -//#define COLOR_BLACK "#000000" +#define COLOR_BLACK "#000000" #define COLOR_RED "#FF0000" -//#define COLOR_RED_LIGHT "#FF3333" -//#define COLOR_MAROON "#800000" +#define COLOR_RED_LIGHT "#FF3333" +#define COLOR_MAROON "#800000" #define COLOR_YELLOW "#FFFF00" -//#define COLOR_OLIVE "#808000" -//#define COLOR_LIME "#32CD32" +#define COLOR_OLIVE "#808000" +#define COLOR_LIME "#32CD32" #define COLOR_GREEN "#008000" #define COLOR_CYAN "#00FFFF" -//#define COLOR_TEAL "#008080" +#define COLOR_TEAL "#008080" #define COLOR_BLUE "#0000FF" -//#define COLOR_BLUE_LIGHT "#33CCFF" -//#define COLOR_NAVY "#000080" +#define COLOR_BLUE_LIGHT "#33CCFF" +#define COLOR_NAVY "#000080" #define COLOR_PINK "#FFC0CB" -//#define COLOR_MAGENTA "#FF00FF" +#define COLOR_MAGENTA "#FF00FF" #define COLOR_PURPLE "#800080" #define COLOR_ORANGE "#FF9900" #define COLOR_BEIGE "#CEB689" @@ -53,4 +57,4 @@ #define COLOR_ASSEMBLY_GREEN "#44843C" #define COLOR_ASSEMBLY_LBLUE "#5D99BE" #define COLOR_ASSEMBLY_BLUE "#38559E" -#define COLOR_ASSEMBLY_PURPLE "#6F6192" \ No newline at end of file +#define COLOR_ASSEMBLY_PURPLE "#6F6192" diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm index c17971a63f8..aefe5d81fd5 100755 --- a/code/controllers/subsystem/ticker.dm +++ b/code/controllers/subsystem/ticker.dm @@ -395,7 +395,7 @@ SUBSYSTEM_DEF(ticker) m = pick(memetips) if(m) - to_chat(world, "Tip of the round: [html_encode(m)]") + to_chat(world, "Tip of the round: [html_encode(m)]") /datum/controller/subsystem/ticker/proc/check_queue() if(!queued_players.len) diff --git a/code/datums/components/spooky.dm b/code/datums/components/spooky.dm index 68304e0f941..cb7eea70a42 100644 --- a/code/datums/components/spooky.dm +++ b/code/datums/components/spooky.dm @@ -27,7 +27,7 @@ C.stuttering = 20 if((!istype(H.dna.species, /datum/species/skeleton)) && (!istype(H.dna.species, /datum/species/golem)) && (!istype(H.dna.species, /datum/species/android)) && (!istype(H.dna.species, /datum/species/jelly))) C.adjustStaminaLoss(25) //boneless humanoids don't lose the will to live - to_chat(C, "DOOT") + to_chat(C, "DOOT") spectral_change(H) else //the sound will spook monkeys. diff --git a/code/datums/datumvars.dm b/code/datums/datumvars.dm index 435e28ccb9f..1a434452f4b 100644 --- a/code/datums/datumvars.dm +++ b/code/datums/datumvars.dm @@ -1368,7 +1368,7 @@ var/log_msg = "[key_name(usr)] dealt [amount] amount of [Text] damage to [key_name(L)]" message_admins("[key_name(usr)] dealt [amount] amount of [Text] damage to [ADMIN_LOOKUPFLW(L)]") log_admin(log_msg) - admin_ticket_log(L, "[log_msg]") + admin_ticket_log(L, "[log_msg]") vv_update_display(L, Text, "[newamt]") else if(href_list["copyoutfit"]) if(!check_rights(R_SPAWN)) diff --git a/code/modules/admin/verbs/adminpm.dm b/code/modules/admin/verbs/adminpm.dm index 465d944c7f6..659b98b1060 100644 --- a/code/modules/admin/verbs/adminpm.dm +++ b/code/modules/admin/verbs/adminpm.dm @@ -146,7 +146,7 @@ if(irc) to_chat(src, "PM to-Admins: [rawmsg]") - var/datum/admin_help/AH = admin_ticket_log(src, "Reply PM from-[key_name(src, TRUE, TRUE)] to IRC: [keywordparsedmsg]") + var/datum/admin_help/AH = admin_ticket_log(src, "Reply PM from-[key_name(src, TRUE, TRUE)] to IRC: [keywordparsedmsg]") ircreplyamount-- send2irc("[AH ? "#[AH.id] " : ""]Reply: [ckey]", rawmsg) else @@ -156,15 +156,15 @@ to_chat(src, "Admin PM to-[key_name(recipient, src, 1)]: [keywordparsedmsg]") //omg this is dumb, just fill in both their tickets - var/interaction_message = "PM from-[key_name(src, recipient, 1)] to-[key_name(recipient, src, 1)]: [keywordparsedmsg]" + var/interaction_message = "PM from-[key_name(src, recipient, 1)] to-[key_name(recipient, src, 1)]: [keywordparsedmsg]" admin_ticket_log(src, interaction_message) if(recipient != src) //reeee admin_ticket_log(recipient, interaction_message) else //recipient is an admin but sender is not - var/replymsg = "Reply PM from-[key_name(src, recipient, 1)]: [keywordparsedmsg]" - admin_ticket_log(src, replymsg) - to_chat(recipient, replymsg) + var/replymsg = "Reply PM from-[key_name(src, recipient, 1)]: [keywordparsedmsg]" + admin_ticket_log(src, "[replymsg]") + to_chat(recipient, "[replymsg]") to_chat(src, "PM to-Admins: [msg]") //play the receiving admin the adminhelp sound (if they have them enabled) @@ -176,12 +176,12 @@ if(!recipient.current_ticket) new /datum/admin_help(msg, recipient, TRUE) - to_chat(recipient, "-- Administrator private message --") + to_chat(recipient, "-- Administrator private message --") to_chat(recipient, "Admin PM from-[key_name(src, recipient, 0)]: [msg]") to_chat(recipient, "Click on the administrator's name to reply.") to_chat(src, "Admin PM to-[key_name(recipient, src, 1)]: [msg]") - admin_ticket_log(recipient, "PM From [key_name_admin(src)]: [keywordparsedmsg]") + admin_ticket_log(recipient, "PM From [key_name_admin(src)]: [keywordparsedmsg]") //always play non-admin recipients the adminhelp sound SEND_SOUND(recipient, sound('sound/effects/adminhelp.ogg')) @@ -295,11 +295,11 @@ log_admin_private("IRC PM: [sender] -> [key_name(C)] : [msg]") msg = emoji_parse(msg) - to_chat(C, "-- Administrator private message --") - to_chat(C, "Admin PM from-[adminname]: [msg]") - to_chat(C, "Click on the administrator's name to reply.") + to_chat(C, "-- Administrator private message --") + to_chat(C, "Admin PM from-[adminname]: [msg]") + to_chat(C, "Click on the administrator's name to reply.") - admin_ticket_log(C, "PM From [irc_tagged]: [msg]") + admin_ticket_log(C, "PM From [irc_tagged]: [msg]") window_flash(C, ignorepref = TRUE) //always play non-admin recipients the adminhelp sound diff --git a/code/modules/admin/verbs/adminsay.dm b/code/modules/admin/verbs/adminsay.dm index 06e43ecd12b..431b89a6e87 100644 --- a/code/modules/admin/verbs/adminsay.dm +++ b/code/modules/admin/verbs/adminsay.dm @@ -11,7 +11,7 @@ mob.log_talk(msg, LOG_ASAY) msg = keywords_lookup(msg) - var/custom_asay_color = (CONFIG_GET(flag/allow_admin_asaycolor) && prefs.asaycolor) ? "" : null + var/custom_asay_color = (CONFIG_GET(flag/allow_admin_asaycolor) && prefs.asaycolor) ? "" : "" msg = "ADMIN: [key_name(usr, 1)] [ADMIN_FLW(mob)]: [custom_asay_color][msg][custom_asay_color ? "":null]" to_chat(GLOB.admins, msg) diff --git a/code/modules/client/darkmode.dm b/code/modules/client/darkmode.dm index d251b70fc7a..dc0e3153cf3 100644 --- a/code/modules/client/darkmode.dm +++ b/code/modules/client/darkmode.dm @@ -18,103 +18,104 @@ Thanks to spacemaniac and mcdonald for help with the JS side of this. /client/proc/force_white_theme() //There's no way round it. We're essentially changing the skin by hand. It's painful but it works, and is the way Lummox suggested. //Main windows - winset(src, "infowindow", "background-color = #2c2f33;background-color = none") - winset(src, "infowindow", "text-color = #99aab5;text-color = #000000") - winset(src, "info", "background-color = #272727;background-color = none") - winset(src, "info", "text-color = #99aab5;text-color = #000000") - winset(src, "browseroutput", "background-color = #272727;background-color = none") - winset(src, "browseroutput", "text-color = #99aab5;text-color = #000000") - winset(src, "outputwindow", "background-color = #272727;background-color = none") - winset(src, "outputwindow", "text-color = #99aab5;text-color = #000000") - winset(src, "mainwindow", "background-color = #2c2f33;background-color = none") - winset(src, "split", "background-color = #272727;background-color = none") + winset(src, "infowindow", "background-color = [COLOR_DARKMODE_DARKBACKGROUND];background-color = none") + winset(src, "infowindow", "text-color = [COLOR_DARKMODE_TEXT];text-color = #000000") + winset(src, "info", "background-color = [COLOR_DARKMODE_BACKGROUND];background-color = none") + winset(src, "info", "text-color = [COLOR_DARKMODE_TEXT];text-color = #000000") + winset(src, "browseroutput", "background-color = [COLOR_DARKMODE_BACKGROUND];background-color = none") + winset(src, "browseroutput", "text-color = [COLOR_DARKMODE_TEXT];text-color = #000000") + winset(src, "outputwindow", "background-color = [COLOR_DARKMODE_BACKGROUND];background-color = none") + winset(src, "outputwindow", "text-color = [COLOR_DARKMODE_TEXT];text-color = #000000") + winset(src, "mainwindow", "background-color = [COLOR_DARKMODE_DARKBACKGROUND];background-color = none") + winset(src, "split", "background-color = [COLOR_DARKMODE_BACKGROUND];background-color = none") //Buttons winset(src, "changelog", "background-color = #494949;background-color = none") - winset(src, "changelog", "text-color = #99aab5;text-color = #000000") + winset(src, "changelog", "text-color = [COLOR_DARKMODE_TEXT];text-color = #000000") winset(src, "rules", "background-color = #494949;background-color = none") - winset(src, "rules", "text-color = #99aab5;text-color = #000000") + winset(src, "rules", "text-color = [COLOR_DARKMODE_TEXT];text-color = #000000") winset(src, "wiki", "background-color = #494949;background-color = none") - winset(src, "wiki", "text-color = #99aab5;text-color = #000000") + winset(src, "wiki", "text-color = [COLOR_DARKMODE_TEXT];text-color = #000000") winset(src, "forum", "background-color = #494949;background-color = none") - winset(src, "forum", "text-color = #99aab5;text-color = #000000") + winset(src, "forum", "text-color = [COLOR_DARKMODE_TEXT];text-color = #000000") winset(src, "github", "background-color = #3a3a3a;background-color = none") - winset(src, "github", "text-color = #99aab5;text-color = #000000") + winset(src, "github", "text-color = [COLOR_DARKMODE_TEXT];text-color = #000000") winset(src, "report-issue", "background-color = #492020;background-color = none") - winset(src, "report-issue", "text-color = #99aab5;text-color = #000000") + winset(src, "report-issue", "text-color = [COLOR_DARKMODE_TEXT];text-color = #000000") //Status and verb tabs - winset(src, "output", "background-color = #272727;background-color = none") - winset(src, "output", "text-color = #99aab5;text-color = #000000") - winset(src, "outputwindow", "background-color = #272727;background-color = none") - winset(src, "outputwindow", "text-color = #99aab5;text-color = #000000") - winset(src, "statwindow", "background-color = #272727;background-color = none") + winset(src, "output", "background-color = [COLOR_DARKMODE_BACKGROUND];background-color = none") + winset(src, "output", "text-color = [COLOR_DARKMODE_TEXT];text-color = #000000") + winset(src, "outputwindow", "background-color = [COLOR_DARKMODE_BACKGROUND];background-color = none") + winset(src, "outputwindow", "text-color = [COLOR_DARKMODE_TEXT];text-color = #000000") + winset(src, "statwindow", "background-color = [COLOR_DARKMODE_BACKGROUND];background-color = none") winset(src, "statwindow", "text-color = #eaeaea;text-color = #000000") - winset(src, "stat", "background-color = #2c2f33;background-color = #FFFFFF") - winset(src, "stat", "tab-background-color = #272727;tab-background-color = none") - winset(src, "stat", "text-color = #99aab5;text-color = #000000") - winset(src, "stat", "tab-text-color = #99aab5;tab-text-color = #000000") - winset(src, "stat", "prefix-color = #8ba5c4;prefix-color = #000000") - winset(src, "stat", "suffix-color = #8ba5c4;suffix-color = #000000") + winset(src, "stat", "background-color = [COLOR_DARKMODE_DARKBACKGROUND];background-color = #FFFFFF") + winset(src, "stat", "tab-background-color = [COLOR_DARKMODE_BACKGROUND];tab-background-color = none") + winset(src, "stat", "text-color = [COLOR_DARKMODE_TEXT];text-color = #000000") + winset(src, "stat", "tab-text-color = [COLOR_DARKMODE_TEXT];tab-text-color = #000000") + winset(src, "stat", "prefix-color = [COLOR_DARKMODE_TEXT];prefix-color = #000000") + winset(src, "stat", "suffix-color = [COLOR_DARKMODE_TEXT];suffix-color = #000000") //Say, OOC, me Buttons etc. - winset(src, "saybutton", "background-color = #272727;background-color = none") - winset(src, "saybutton", "text-color = #99aab5;text-color = #000000") - winset(src, "oocbutton", "background-color = #272727;background-color = none") - winset(src, "oocbutton", "text-color = #99aab5;text-color = #000000") - winset(src, "mebutton", "background-color = #272727;background-color = none") - winset(src, "mebutton", "text-color = #99aab5;text-color = #000000") - winset(src, "asset_cache_browser", "background-color = #272727;background-color = none") - winset(src, "asset_cache_browser", "text-color = #99aab5;text-color = #000000") - winset(src, "tooltip", "background-color = #272727;background-color = none") - winset(src, "tooltip", "text-color = #99aab5;text-color = #000000") + winset(src, "saybutton", "background-color = [COLOR_DARKMODE_BACKGROUND];background-color = none") + winset(src, "saybutton", "text-color = [COLOR_DARKMODE_TEXT];text-color = #000000") + winset(src, "oocbutton", "background-color = [COLOR_DARKMODE_BACKGROUND];background-color = none") + winset(src, "oocbutton", "text-color = [COLOR_DARKMODE_TEXT];text-color = #000000") + winset(src, "mebutton", "background-color = [COLOR_DARKMODE_BACKGROUND];background-color = none") + winset(src, "mebutton", "text-color = [COLOR_DARKMODE_TEXT];text-color = #000000") + winset(src, "asset_cache_browser", "background-color = [COLOR_DARKMODE_BACKGROUND];background-color = none") + winset(src, "asset_cache_browser", "text-color = [COLOR_DARKMODE_TEXT];text-color = #000000") + winset(src, "tooltip", "background-color = [COLOR_DARKMODE_BACKGROUND];background-color = none") + winset(src, "tooltip", "text-color = [COLOR_DARKMODE_TEXT];text-color = #000000") /client/proc/force_dark_theme() //Inversely, if theyre using white theme and want to swap to the superior dark theme, let's get WINSET() ing //Main windows - winset(src, "infowindow", "background-color = none;background-color = #202020") - winset(src, "infowindow", "text-color = #000000;text-color = #8ba5c4") - winset(src, "info", "background-color = none;background-color = #202020") - winset(src, "info", "text-color = #000000;text-color = #8ba5c4") - winset(src, "browseroutput", "background-color = none;background-color = #202020") - winset(src, "browseroutput", "text-color = #000000;text-color = #8ba5c4") - winset(src, "outputwindow", "background-color = none;background-color = #202020") - winset(src, "outputwindow", "text-color = #000000;text-color = #8ba5c4") - winset(src, "mainwindow", "background-color = none;background-color = #202020") - winset(src, "split", "background-color = none;background-color = #202020") + winset(src, "infowindow", "background-color = none;background-color = [COLOR_DARKMODE_BACKGROUND]") + winset(src, "infowindow", "text-color = #000000;text-color = [COLOR_DARKMODE_TEXT]") + winset(src, "info", "background-color = none;background-color = [COLOR_DARKMODE_BACKGROUND]") + winset(src, "info", "text-color = #000000;text-color = [COLOR_DARKMODE_TEXT]") + winset(src, "browseroutput", "background-color = none;background-color = [COLOR_DARKMODE_BACKGROUND]") + winset(src, "browseroutput", "text-color = #000000;text-color = [COLOR_DARKMODE_TEXT]") + winset(src, "outputwindow", "background-color = none;background-color = [COLOR_DARKMODE_BACKGROUND]") + winset(src, "outputwindow", "text-color = #000000;text-color = [COLOR_DARKMODE_TEXT]") + winset(src, "mainwindow", "background-color = none;background-color = [COLOR_DARKMODE_BACKGROUND]") + winset(src, "split", "background-color = none;background-color = [COLOR_DARKMODE_BACKGROUND]") //Buttons winset(src, "changelog", "background-color = none;background-color = #494949") - winset(src, "changelog", "text-color = #000000;text-color = #99aab5") + winset(src, "changelog", "text-color = #000000;text-color = [COLOR_DARKMODE_TEXT]") winset(src, "rules", "background-color = none;background-color = #494949") - winset(src, "rules", "text-color = #000000;text-color = #99aab5") + winset(src, "rules", "text-color = #000000;text-color = [COLOR_DARKMODE_TEXT]") winset(src, "wiki", "background-color = none;background-color = #494949") - winset(src, "wiki", "text-color = #000000;text-color = #99aab5") + winset(src, "wiki", "text-color = #000000;text-color = [COLOR_DARKMODE_TEXT]") winset(src, "forum", "background-color = none;background-color = #494949") - winset(src, "forum", "text-color = #000000;text-color = #99aab5") + winset(src, "forum", "text-color = #000000;text-color = [COLOR_DARKMODE_TEXT]") winset(src, "github", "background-color = none;background-color = #3a3a3a") - winset(src, "github", "text-color = #000000;text-color = #99aab5") + winset(src, "github", "text-color = #000000;text-color = [COLOR_DARKMODE_TEXT]") winset(src, "report-issue", "background-color = none;background-color = #492020") - winset(src, "report-issue", "text-color = #000000;text-color = #99aab5") + winset(src, "report-issue", "text-color = #000000;text-color = [COLOR_DARKMODE_TEXT]") //Status and verb tabs - winset(src, "output", "background-color = none;background-color = #171717") - winset(src, "output", "text-color = #000000;text-color = #8ba5c4") - winset(src, "outputwindow", "background-color = none;background-color = #171717") - winset(src, "outputwindow", "text-color = #000000;text-color = #8ba5c4") - winset(src, "statwindow", "background-color = none;background-color = #171717") - winset(src, "statwindow", "text-color = #000000;text-color = #8ba5c4") - winset(src, "stat", "background-color = #FFFFFF;background-color = #171717") - winset(src, "stat", "tab-background-color = none;tab-background-color = #202020") - winset(src, "stat", "text-color = #000000;text-color = #8ba5c4") - winset(src, "stat", "tab-text-color = #000000;tab-text-color = #8ba5c4") - winset(src, "stat", "prefix-color = #000000;prefix-color = #8ba5c4") - winset(src, "stat", "suffix-color = #000000;suffix-color = #8ba5c4") + winset(src, "output", "background-color = none;background-color = [COLOR_DARKMODE_DARKBACKGROUND]") + winset(src, "output", "text-color = #000000;text-color = [COLOR_DARKMODE_TEXT]") + winset(src, "outputwindow", "background-color = none;background-color = [COLOR_DARKMODE_DARKBACKGROUND]") + winset(src, "outputwindow", "text-color = #000000;text-color = [COLOR_DARKMODE_TEXT]") + winset(src, "statwindow", "background-color = none;background-color = [COLOR_DARKMODE_DARKBACKGROUND]") + winset(src, "statwindow", "text-color = #000000;text-color = [COLOR_DARKMODE_TEXT]") + winset(src, "stat", "background-color = #FFFFFF;background-color = [COLOR_DARKMODE_DARKBACKGROUND]") + winset(src, "stat", "tab-background-color = none;tab-background-color = [COLOR_DARKMODE_BACKGROUND]") + winset(src, "stat", "text-color = #000000;text-color = [COLOR_DARKMODE_TEXT]") + winset(src, "stat", "tab-text-color = #000000;tab-text-color = [COLOR_DARKMODE_TEXT]") + winset(src, "stat", "prefix-color = #000000;prefix-color = [COLOR_DARKMODE_TEXT]") + winset(src, "stat", "suffix-color = #000000;suffix-color = [COLOR_DARKMODE_TEXT]") //Say, OOC, me Buttons etc. - winset(src, "saybutton", "background-color = none;background-color = #202020") - winset(src, "saybutton", "text-color = #000000;text-color = #99aab5") - winset(src, "oocbutton", "background-color = none;background-color = #202020") - winset(src, "oocbutton", "text-color = #000000;text-color = #99aab5") - winset(src, "mebutton", "background-color = none;background-color = #202020") - winset(src, "mebutton", "text-color = #000000;text-color = #99aab5") - winset(src, "asset_cache_browser", "background-color = none;background-color = #202020") - winset(src, "asset_cache_browser", "text-color = #000000;text-color = #99aab5") - winset(src, "tooltip", "background-color = none;background-color = #202020") - winset(src, "tooltip", "text-color = #000000;text-color = #99aab5") + winset(src, "saybutton", "background-color = none;background-color = [COLOR_DARKMODE_BACKGROUND]") + winset(src, "saybutton", "text-color = #000000;text-color = [COLOR_DARKMODE_TEXT]") + winset(src, "oocbutton", "background-color = none;background-color = [COLOR_DARKMODE_BACKGROUND]") + winset(src, "oocbutton", "text-color = #000000;text-color = [COLOR_DARKMODE_TEXT]") + winset(src, "mebutton", "background-color = none;background-color = [COLOR_DARKMODE_BACKGROUND]") + winset(src, "mebutton", "text-color = #000000;text-color = [COLOR_DARKMODE_TEXT]") + winset(src, "asset_cache_browser", "background-color = none;background-color = [COLOR_DARKMODE_BACKGROUND]") + winset(src, "asset_cache_browser", "text-color = #000000;text-color = [COLOR_DARKMODE_TEXT]") + winset(src, "tooltip", "background-color = none;background-color = [COLOR_DARKMODE_BACKGROUND]") + winset(src, "tooltip", "text-color = #000000;text-color = [COLOR_DARKMODE_TEXT]") + /datum/asset/simple/goonchat verify = FALSE diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index d7bee1e17f1..5f902501f25 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -14,7 +14,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) //game-preferences var/lastchangelog = "" //Saved changlog filesize to detect if there was a change - var/ooccolor = null + var/ooccolor = "#c43b23" var/asaycolor = null var/enable_tips = TRUE var/tip_delay = 500 //tip delay in milliseconds diff --git a/code/modules/goonchat/browserassets/css/browserOutput.css b/code/modules/goonchat/browserassets/css/browserOutput.css index ece944018b1..6c258070c21 100644 --- a/code/modules/goonchat/browserassets/css/browserOutput.css +++ b/code/modules/goonchat/browserassets/css/browserOutput.css @@ -7,13 +7,13 @@ html, body { padding: 0; margin: 0; height: 100%; - color: #8ba5c4; + color: #a4bad6; } body { background: #171717; font-family: Verdana, sans-serif; font-size: 9pt; - font-color: #8ba5c4; + font-color: #a4bad6; line-height: 1.2; overflow-x: hidden; overflow-y: scroll; @@ -97,7 +97,7 @@ a.popt {text-decoration: none;} font-variant: small-caps; font-size: 1.1em; font-weight: bold; - color: #8ba5c4; + color: #a4bad6; } #newMessages:hover {background: #171717;} #newMessages i {vertical-align: middle; padding-left: 3px;} @@ -127,7 +127,7 @@ a.popt {text-decoration: none;} height: 30px; padding: 5px 0; display: block; - color: #8ba5c4; + color: #a4bad6; text-decoration: none; line-height: 28px; border-top: 1px solid #171717; @@ -245,9 +245,9 @@ a.popt {text-decoration: none;} ******************************************/ /* MOTD */ -.motd {color: #8ba5c4; font-family: Verdana, sans-serif;} -.motd h1, .motd h2, .motd h3, .motd h4, .motd h5, .motd h6 {color: #8ba5c4; text-decoration: underline;} -.motd a, .motd a:link, .motd a:visited, .motd a:active, .motd a:hover {color: #8ba5c4;} +.motd {color: #a4bad6; font-family: Verdana, sans-serif;} +.motd h1, .motd h2, .motd h3, .motd h4, .motd h5, .motd h6 {color: #a4bad6; text-decoration: underline;} +.motd a, .motd a:link, .motd a:visited, .motd a:active, .motd a:hover {color: #a4bad6;} /* ADD HERE FOR BOLD */ .bold, .name, .prefix, .ooc, .looc, .adminooc, .admin, .medal, .yell {font-weight: bold;} @@ -258,8 +258,8 @@ a.popt {text-decoration: none;} /* OUTPUT COLORS */ .highlight {background: yellow;} -h1, h2, h3, h4, h5, h6 {color: #8ba5c4;font-family: Georgia, Verdana, sans-serif;} -h1.alert, h2.alert {color: #8ba5c4;} +h1, h2, h3, h4, h5, h6 {color: #a4bad6;font-family: Georgia, Verdana, sans-serif;} +h1.alert, h2.alert {color: #a4bad6;} em {font-style: normal; font-weight: bold;} @@ -267,7 +267,7 @@ em {font-style: normal; font-weight: bold;} .adminobserverooc {color: #0099cc; font-weight: bold;} .adminooc {color: #3d5bc3; font-weight: bold;} -.adminsay {color: #ff0000; font-weight: bold;} +.adminsay {color: #ff0000;} .admin {color: #5975da; font-weight: bold;} .name { font-weight: bold;} @@ -294,7 +294,6 @@ em {font-style: normal; font-weight: bold;} .yell { font-weight: bold;} .alert {color: #d82020;} -h1.alert, h2.alert {color: #99aab5;} .emote { font-style: italic;} .selecteddna {color: #ffffff; background-color: #001B1B} @@ -311,16 +310,16 @@ h1.alert, h2.alert {color: #99aab5;} .boldannounce {color: #c51e1e; font-weight: bold;} .greenannounce {color: #059223; font-weight: bold;} .rose {color: #ff5050;} -.info {color: #5373e9;} -.notice {color: #5373e9;} -.boldnotice {color: #5373e9; font-weight: bold;} -.adminnotice {color: #5373e9;} +.info {color: #6685f5;} +.notice {color: #6685f5;} +.boldnotice {color: #6685f5; font-weight: bold;} +.adminnotice {color: #6685f5;} .adminhelp {color: #ff0000; font-weight: bold;} -.unconscious {color: #8ba5c4; font-weight: bold;} +.unconscious {color: #a4bad6; font-weight: bold;} .suicide {color: #ff5050; font-style: italic;} .green {color: #059223;} .nicegreen {color: #059223;} -.shadowling {color: #3b2769;} +.shadowling {color: #8e8a99;} .cult {color: #aa1c1c;} .cultitalic {color: #aa1c1c; font-style: italic;} @@ -331,9 +330,9 @@ h1.alert, h2.alert {color: #99aab5;} .narsie {color: #aa1c1c; font-weight: bold; font-size: 120px;} .narsiesmall {color: #aa1c1c; font-weight: bold; font-size: 48px;} .colossus {color: #7F282A; font-size: 40px;} -.hierophant {color: #a22bdd; font-weight: bold; font-style: italic;} +.hierophant {color: #b441ee; font-weight: bold; font-style: italic;} .hierophant_warning {color: #c56bf1; font-style: italic;} -.purple {color: #a03ff5;} +.purple {color: #9956d3;} .holoparasite {color: #88809c;} .revennotice {color: #1d2953;} @@ -346,7 +345,7 @@ h1.alert, h2.alert {color: #99aab5;} .umbra_emphasis {color: #7c00e6; font-weight: bold; font-style: italic;} .umbra_large {color: #7c00e6; font-size: 24px; font-weight: bold; font-style: italic;} -.deconversion_message {color: #7c00e6; font-size: 24px; font-style: italic;} +.deconversion_message {color: #a947ff; font-size: 24px; font-style: italic;} .brass {color: #BE8700;} .heavy_brass {color: #BE8700; font-weight: bold; font-style: italic;} diff --git a/code/modules/goonchat/browserassets/css/browserOutput_white.css b/code/modules/goonchat/browserassets/css/browserOutput_white.css index 899e4c4d358..5adc410f62c 100644 --- a/code/modules/goonchat/browserassets/css/browserOutput_white.css +++ b/code/modules/goonchat/browserassets/css/browserOutput_white.css @@ -264,7 +264,7 @@ em {font-style: normal; font-weight: bold;} .adminobserverooc {color: #0099cc; font-weight: bold;} .adminooc {color: #700038; font-weight: bold;} -.adminsay {color: #ff0000; font-weight: bold;} +.adminsay {color: #ff0000;} .admin {color: #4473ff; font-weight: bold;} .name { font-weight: bold;} diff --git a/icons/member_content.dmi b/icons/member_content.dmi index bb597646276..77443711198 100644 Binary files a/icons/member_content.dmi and b/icons/member_content.dmi differ