diff --git a/code/__DEFINES/misc.dm b/code/__DEFINES/misc.dm
index b055cad5f54..85b5f50167d 100644
--- a/code/__DEFINES/misc.dm
+++ b/code/__DEFINES/misc.dm
@@ -219,9 +219,6 @@ GLOBAL_LIST_INIT(ghost_others_options, list(GHOST_OTHERS_SIMPLE, GHOST_OTHERS_DE
GLOBAL_LIST_INIT(pda_styles, list(MONO, VT, ORBITRON, SHARE))
-//Color Defines
-#define OOC_COLOR "#386aff"
-
/////////////////////////////////////
// atom.appearence_flags shortcuts //
/////////////////////////////////////
diff --git a/code/game/mecha/equipment/tools/medical_tools.dm b/code/game/mecha/equipment/tools/medical_tools.dm
index 008bf5cbb3a..ea3b2d8b777 100644
--- a/code/game/mecha/equipment/tools/medical_tools.dm
+++ b/code/game/mecha/equipment/tools/medical_tools.dm
@@ -165,9 +165,9 @@
Respiratory Damage: [patient.getOxyLoss()]%
Toxin Content: [patient.getToxLoss()]%
Burn Severity: [patient.getFireLoss()]%
- [patient.getCloneLoss() ? "Subject appears to have cellular damage." : ""]
- [patient.getBrainLoss() ? "Significant brain damage detected." : ""]
- [length(patient.get_traumas()) ? "Brain Traumas detected." : ""]
+ [patient.getCloneLoss() ? "Subject appears to have cellular damage." : ""]
+ [patient.getBrainLoss() ? "Significant brain damage detected." : ""]
+ [length(patient.get_traumas()) ? "Brain Traumas detected." : ""]
"}
/obj/item/mecha_parts/mecha_equipment/medical/sleeper/proc/get_patient_reagents()
diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm
index 1647cfc9bde..c29fa7d6dff 100644
--- a/code/game/objects/items/devices/scanners.dm
+++ b/code/game/objects/items/devices/scanners.dm
@@ -627,7 +627,7 @@ GENE SCANNER
to_chat(user, "Growth progress: [T.amount_grown]/[SLIME_EVOLUTION_THRESHOLD]")
if(T.effectmod)
to_chat(user, "Core mutation in progress: [T.effectmod]")
- to_chat(user, "Progress in core mutation: [T.applied] / [SLIME_EXTRACT_CROSSING_REQUIRED]")
+ to_chat(user, "Progress in core mutation: [T.applied] / [SLIME_EXTRACT_CROSSING_REQUIRED]")
to_chat(user, "========================")
diff --git a/code/modules/admin/verbs/adminpm.dm b/code/modules/admin/verbs/adminpm.dm
index 1cb80d22c90..465d944c7f6 100644
--- a/code/modules/admin/verbs/adminpm.dm
+++ b/code/modules/admin/verbs/adminpm.dm
@@ -6,7 +6,7 @@
set category = null
set name = "Admin PM Mob"
if(!holder)
- to_chat(src, "Error: Admin-PM-Context: Only administrators may use this command.")
+ to_chat(src, "Error: Admin-PM-Context: Only administrators may use this command.")
return
if( !ismob(M) || !M.client )
return
@@ -18,7 +18,7 @@
set category = "Admin"
set name = "Admin PM"
if(!holder)
- to_chat(src, "Error: Admin-PM-Panel: Only administrators may use this command.")
+ to_chat(src, "Error: Admin-PM-Panel: Only administrators may use this command.")
return
var/list/client/targets[0]
for(var/client/T)
@@ -37,7 +37,7 @@
/client/proc/cmd_ahelp_reply(whom)
if(prefs.muted & MUTE_ADMINHELP)
- to_chat(src, "Error: Admin-PM: You are unable to use admin PM-s (muted).")
+ to_chat(src, "Error: Admin-PM: You are unable to use admin PM-s (muted).")
return
var/client/C
if(istext(whom))
@@ -48,7 +48,7 @@
C = whom
if(!C)
if(holder)
- to_chat(src, "Error: Admin-PM: Client not found.")
+ to_chat(src, "Error: Admin-PM: Client not found.")
return
var/datum/admin_help/AH = C.current_ticket
@@ -65,12 +65,12 @@
//Fetching a message if needed. src is the sender and C is the target client
/client/proc/cmd_admin_pm(whom, msg)
if(prefs.muted & MUTE_ADMINHELP)
- to_chat(src, "Error: Admin-PM: You are unable to use admin PM-s (muted).")
+ to_chat(src, "Error: Admin-PM: You are unable to use admin PM-s (muted).")
return
if(!holder && !current_ticket) //no ticket? https://www.youtube.com/watch?v=iHSPf6x1Fdo
- to_chat(src, "You can no longer reply to this ticket, please open another one by using the Adminhelp verb if need be.")
- to_chat(src, "Message: [msg]")
+ to_chat(src, "You can no longer reply to this ticket, please open another one by using the Adminhelp verb if need be.")
+ to_chat(src, "Message: [msg]")
return
var/client/recipient
@@ -95,14 +95,14 @@
if(!msg)
return
if(holder)
- to_chat(src, "Error: Use the admin IRC channel, nerd.")
+ to_chat(src, "Error: Use the admin IRC channel, nerd.")
return
else
if(!recipient)
if(holder)
- to_chat(src, "Error: Admin-PM: Client not found.")
+ to_chat(src, "Error: Admin-PM: Client not found.")
if(msg)
to_chat(src, msg)
return
@@ -118,12 +118,12 @@
return
if(prefs.muted & MUTE_ADMINHELP)
- to_chat(src, "Error: Admin-PM: You are unable to use admin PM-s (muted).")
+ to_chat(src, "Error: Admin-PM: You are unable to use admin PM-s (muted).")
return
if(!recipient)
if(holder)
- to_chat(src, "Error: Admin-PM: Client not found.")
+ to_chat(src, "Error: Admin-PM: Client not found.")
else
current_ticket.MessageNoRecipient(msg)
return
@@ -145,15 +145,15 @@
var/keywordparsedmsg = keywords_lookup(msg)
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]")
+ 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]")
ircreplyamount--
send2irc("[AH ? "#[AH.id] " : ""]Reply: [ckey]", rawmsg)
else
if(recipient.holder)
if(holder) //both are admins
- to_chat(recipient, "Admin PM from-[key_name(src, recipient, 1)]: [keywordparsedmsg]")
- to_chat(src, "Admin PM to-[key_name(recipient, src, 1)]: [keywordparsedmsg]")
+ to_chat(recipient, "Admin PM from-[key_name(src, recipient, 1)]: [keywordparsedmsg]")
+ 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]"
@@ -162,10 +162,10 @@
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]"
+ 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]")
+ to_chat(src, "PM to-Admins: [msg]")
//play the receiving admin the adminhelp sound (if they have them enabled)
if(recipient.prefs.toggles & SOUND_ADMINHELP)
@@ -177,11 +177,11 @@
new /datum/admin_help(msg, recipient, TRUE)
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]")
+ 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'))
@@ -200,20 +200,20 @@
return
else //neither are admins
- to_chat(src, "Error: Admin-PM: Non-admin to non-admin PM communication is forbidden.")
+ to_chat(src, "Error: Admin-PM: Non-admin to non-admin PM communication is forbidden.")
return
if(irc)
log_admin_private("PM: [key_name(src)]->IRC: [rawmsg]")
for(var/client/X in GLOB.admins)
- to_chat(X, "PM: [key_name(src, X, 0)]->IRC: [keywordparsedmsg]")
+ to_chat(X, "PM: [key_name(src, X, 0)]->IRC: [keywordparsedmsg]")
else
window_flash(recipient, ignorepref = TRUE)
log_admin_private("PM: [key_name(src)]->[key_name(recipient)]: [rawmsg]")
//we don't use message_admins here because the sender/receiver might get it too
for(var/client/X in GLOB.admins)
if(X.key!=key && X.key!=recipient.key) //check client/X is an admin and isn't the sender or recipient
- to_chat(X, "PM: [key_name(src, X, 0)]->[key_name(recipient, X, 0)]: [keywordparsedmsg]" )
+ to_chat(X, "PM: [key_name(src, X, 0)]->[key_name(recipient, X, 0)]: [keywordparsedmsg]" )
@@ -296,10 +296,10 @@
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, "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/client/darkmode.dm b/code/modules/client/darkmode.dm
index 74e795e3457..f24052980be 100644
--- a/code/modules/client/darkmode.dm
+++ b/code/modules/client/darkmode.dm
@@ -52,6 +52,8 @@ Thanks to spacemaniac and mcdonald for help with the JS side of this.
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")
//Say, OOC, me Buttons etc.
winset(src, "saybutton", "background-color = #272727;background-color = none")
winset(src, "saybutton", "text-color = #99aab5;text-color = #000000")
@@ -66,16 +68,17 @@ Thanks to spacemaniac and mcdonald for help with the JS side of this.
/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 = #2c2f33")
- winset(src, "infowindow", "text-color = #000000;text-color = #99aab5")
- winset(src, "info", "background-color = none;background-color = #272727")
- winset(src, "info", "text-color = #000000;text-color = #99aab5")
- winset(src, "browseroutput", "background-color = none;background-color = #272727")
- winset(src, "browseroutput", "text-color = #000000;text-color = #99aab5")
- winset(src, "outputwindow", "background-color = none;background-color = #272727")
- winset(src, "outputwindow", "text-color = #000000;text-color = #99aab5")
- winset(src, "mainwindow", "background-color = none;background-color = #2c2f33")
- winset(src, "split", "background-color = none;background-color = #272727")
+ 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, "input", "background-color = none;background-color = #202020")
//Buttons
winset(src, "changelog", "background-color = none;background-color = #494949")
winset(src, "changelog", "text-color = #000000;text-color = #99aab5")
@@ -90,26 +93,28 @@ Thanks to spacemaniac and mcdonald for help with the JS side of this.
winset(src, "report-issue", "background-color = none;background-color = #492020")
winset(src, "report-issue", "text-color = #000000;text-color = #99aab5")
//Status and verb tabs
- winset(src, "output", "background-color = none;background-color = #272727")
- winset(src, "output", "text-color = #000000;text-color = #99aab5")
- winset(src, "outputwindow", "background-color = none;background-color = #272727")
- winset(src, "outputwindow", "text-color = #000000;text-color = #99aab5")
- winset(src, "statwindow", "background-color = none;background-color = #272727")
- winset(src, "statwindow", "text-color = #000000;text-color = #eaeaea")
- winset(src, "stat", "background-color = #FFFFFF;background-color = #2c2f33")
- winset(src, "stat", "tab-background-color = none;tab-background-color = #272727")
- winset(src, "stat", "text-color = #000000;text-color = #99aab5")
- winset(src, "stat", "tab-text-color = #000000;tab-text-color = #99aab5")
+ 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")
//Say, OOC, me Buttons etc.
- winset(src, "saybutton", "background-color = none;background-color = #272727")
+ 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 = #272727")
+ 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 = #272727")
+ 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 = #272727")
+ 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 = #272727")
+ winset(src, "tooltip", "background-color = none;background-color = #202020")
winset(src, "tooltip", "text-color = #000000;text-color = #99aab5")
/datum/asset/simple/goonchat
@@ -125,4 +130,4 @@ Thanks to spacemaniac and mcdonald for help with the JS side of this.
"font-awesome.css" = 'code/modules/goonchat/browserassets/css/font-awesome.css',
"browserOutput.css" = 'code/modules/goonchat/browserassets/css/browserOutput.css',
"browserOutput_white.css" = 'code/modules/goonchat/browserassets/css/browserOutput_white.css',
- )
\ No newline at end of file
+ )
diff --git a/code/modules/client/verbs/ooc.dm b/code/modules/client/verbs/ooc.dm
index ab92edc495d..5ebf6db2361 100644
--- a/code/modules/client/verbs/ooc.dm
+++ b/code/modules/client/verbs/ooc.dm
@@ -1,3 +1,6 @@
+GLOBAL_VAR_INIT(OOC_COLOR, null)//If this is null, use the CSS for OOC. Otherwise, use a custom colour.
+GLOBAL_VAR_INIT(normal_ooc_colour, "#002eb8")
+
/client/verb/ooc(msg as text)
set name = "OOC" //Gave this shit a shorter name so you only have to time out "ooc" rather than "ooc message" to use it --NeoFite
set category = "OOC"
@@ -66,9 +69,16 @@
else
to_chat(C, "OOC: [keyname][holder.fakekey ? "/([holder.fakekey])" : ""]: [msg]")
else
- to_chat(C, "OOC: [holder.fakekey ? holder.fakekey : key]: [msg]")
+ if(GLOB.OOC_COLOR)
+ to_chat(C, "OOC: [holder.fakekey ? holder.fakekey : key]: [msg]")
+ else
+ to_chat(C, "OOC: [holder.fakekey ? holder.fakekey : key]: [msg]")
+
else if(!(key in C.prefs.ignoring))
- to_chat(C, "OOC: [keyname]: [msg]")
+ if(GLOB.OOC_COLOR)
+ to_chat(C, "OOC: [keyname]: [msg]")
+ else
+ to_chat(C, "OOC: [keyname]: [msg]")
/proc/toggle_ooc(toggle = null)
if(toggle != null) //if we're specifically en/disabling ooc
@@ -89,19 +99,17 @@
else
GLOB.dooc_allowed = !GLOB.dooc_allowed
-GLOBAL_VAR_INIT(normal_ooc_colour, OOC_COLOR)
-
/client/proc/set_ooc(newColor as color)
set name = "Set Player OOC Color"
set desc = "Modifies player OOC Color"
set category = "Fun"
- GLOB.normal_ooc_colour = sanitize_ooccolor(newColor)
+ GLOB.OOC_COLOR = sanitize_ooccolor(newColor)
/client/proc/reset_ooc()
set name = "Reset Player OOC Color"
set desc = "Returns player OOC Color to default"
set category = "Fun"
- GLOB.normal_ooc_colour = OOC_COLOR
+ GLOB.OOC_COLOR = null
/client/verb/colorooc()
set name = "Set Your OOC Color"
diff --git a/code/modules/goonchat/browserassets/css/browserOutput.css b/code/modules/goonchat/browserassets/css/browserOutput.css
index d7a3c02862a..ece944018b1 100644
--- a/code/modules/goonchat/browserassets/css/browserOutput.css
+++ b/code/modules/goonchat/browserassets/css/browserOutput.css
@@ -7,20 +7,20 @@ html, body {
padding: 0;
margin: 0;
height: 100%;
- color: #99aab5;
+ color: #8ba5c4;
}
body {
- background: #2c2f33;
+ background: #171717;
font-family: Verdana, sans-serif;
font-size: 9pt;
- font-color: #99aab5;
+ font-color: #8ba5c4;
line-height: 1.2;
overflow-x: hidden;
overflow-y: scroll;
word-wrap: break-word;
scrollbar-face-color:#1A1A1A;
- scrollbar-track-color:#2c2f33;
- scrollbar-highlight-color:#2c2f33;
+ scrollbar-track-color:#171717;
+ scrollbar-highlight-color:#171717;
}
em {
@@ -92,21 +92,21 @@ a.popt {text-decoration: none;}
bottom: 0;
right: 0;
padding: 8px;
- background: #ddd;
+ background: #202020;
text-decoration: none;
font-variant: small-caps;
font-size: 1.1em;
font-weight: bold;
- color: #333;
+ color: #8ba5c4;
}
-#newMessages:hover {background: #ccc;}
+#newMessages:hover {background: #171717;}
#newMessages i {vertical-align: middle; padding-left: 3px;}
#ping {
position: fixed;
top: 0;
right: 115px;
width: 45px;
- background: #ddd;
+ background: #202020;
height: 30px;
padding: 8px 0 2px 0;
}
@@ -123,19 +123,19 @@ a.popt {text-decoration: none;}
right: 0;
}
#userBar .subCell {
- background: #ddd;
+ background: #202020;
height: 30px;
padding: 5px 0;
display: block;
- color: #333;
+ color: #8ba5c4;
text-decoration: none;
line-height: 28px;
- border-top: 1px solid #b4b4b4;
+ border-top: 1px solid #171717;
}
-#userBar .subCell:hover {background: #ccc;}
+#userBar .subCell:hover {background: #202020;}
#userBar .toggle {
width: 40px;
- background: #ccc;
+ background: #202020;
border-top: 0;
float: right;
text-align: center;
@@ -245,9 +245,9 @@ a.popt {text-decoration: none;}
******************************************/
/* MOTD */
-.motd {color: #99aab5; font-family: Verdana, sans-serif;}
-.motd h1, .motd h2, .motd h3, .motd h4, .motd h5, .motd h6 {color: #99aab5; text-decoration: underline;}
-.motd a, .motd a:link, .motd a:visited, .motd a:active, .motd a:hover {color: #99aab5;}
+.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;}
/* ADD HERE FOR BOLD */
.bold, .name, .prefix, .ooc, .looc, .adminooc, .admin, .medal, .yell {font-weight: bold;}
@@ -258,50 +258,50 @@ a.popt {text-decoration: none;}
/* OUTPUT COLORS */
.highlight {background: yellow;}
-h1, h2, h3, h4, h5, h6 {color: #99aab5;font-family: Georgia, Verdana, sans-serif;}
-h1.alert, h2.alert {color: #99aab5;}
+h1, h2, h3, h4, h5, h6 {color: #8ba5c4;font-family: Georgia, Verdana, sans-serif;}
+h1.alert, h2.alert {color: #8ba5c4;}
em {font-style: normal; font-weight: bold;}
-.ooc { font-weight: bold;}
+.ooc {color: #cca300; font-weight: bold;}
.adminobserverooc {color: #0099cc; font-weight: bold;}
.adminooc {color: #3d5bc3; font-weight: bold;}
-.adminsay {color: #3d5bc3; font-weight: bold;}
-.admin {color: #3d5bc3; font-weight: bold;}
+.adminsay {color: #ff0000; font-weight: bold;}
+.admin {color: #5975da; font-weight: bold;}
.name { font-weight: bold;}
.say {}
-.deadsay {color: #7c00e6;}
+.deadsay {color: #e2c1ff}
.binarysay {color: #20c20e; background-color: #000000; display: block;}
.binarysay a {color: #00ff00;}
.binarysay a:active, .binarysay a:visited {color: #88ff88;}
-.radio {color: #059223;}
-.sciradio {color: #7c00e6;}
-.comradio {color: #3d5bc3;}
-.secradio {color: #a30000;}
-.medradio {color: #397ea5;}
-.engradio {color: #c75f35;}
-.suppradio {color: #8b6532;}
-.servradio {color: #577c2d;}
-.syndradio {color: #6d3f40;}
-.centcomradio {color: #2b677e;}
-.aiprivradio {color: #811981;}
-.redteamradio {color: #ff0000;}
-.blueteamradio {color: #0000ff;}
+.radio {color: #1ecc43;}
+.sciradio {color: #c68cfa;}
+.comradio {color: #5177ff;}
+.secradio {color: #dd3535;}
+.medradio {color: #57b8f0;}
+.engradio {color: #f37746;}
+.suppradio {color: #b88646;}
+.servradio {color: #6ca729;}
+.syndradio {color: #8f4a4b;}
+.centcomradio {color: #2681a5;}
+.aiprivradio {color: #d65d95;}
+.redteamradio {color: #ff4444;}
+.blueteamradio {color: #3434fd;}
.yell { font-weight: bold;}
-.alert {color: #c51e1e;}
+.alert {color: #d82020;}
h1.alert, h2.alert {color: #99aab5;}
.emote { font-style: italic;}
.selecteddna {color: #ffffff; background-color: #001B1B}
-.attack {color: #c51e1e;}
-.disarm {color: #780202;}
-.passive {color: #510000;}
+.attack {color: #e01c1c;}
+.disarm {color: #b42525;}
+.passive {color: #a00f0f;}
.userdanger {color: #c51e1e; font-weight: bold; font-size: 24px;}
.danger {color: #c51e1e;}
@@ -311,30 +311,30 @@ h1.alert, h2.alert {color: #99aab5;}
.boldannounce {color: #c51e1e; font-weight: bold;}
.greenannounce {color: #059223; font-weight: bold;}
.rose {color: #ff5050;}
-.info {color: #3d5bc3;}
-.notice {color: #3d5bc3;}
-.boldnotice {color: #3d5bc3; font-weight: bold;}
-.adminnotice {color: #3d5bc3;}
-.adminhelp {color: #c51e1e; font-weight: bold;}
-.unconscious {color: #99aab5; font-weight: bold;}
+.info {color: #5373e9;}
+.notice {color: #5373e9;}
+.boldnotice {color: #5373e9; font-weight: bold;}
+.adminnotice {color: #5373e9;}
+.adminhelp {color: #ff0000; font-weight: bold;}
+.unconscious {color: #8ba5c4; font-weight: bold;}
.suicide {color: #ff5050; font-style: italic;}
.green {color: #059223;}
-.nicegreen {color: #059223;}
+.nicegreen {color: #059223;}
.shadowling {color: #3b2769;}
-.cult {color: #740202;}
+.cult {color: #aa1c1c;}
-.cultitalic {color: #740202; font-style: italic;}
-.cultbold {color: #740202; font-style: italic; font-weight: bold;}
-.cultboldtalic {color: #740202; font-weight: bold; font-size: 24px;}
+.cultitalic {color: #aa1c1c; font-style: italic;}
+.cultbold {color: #aa1c1c; font-style: italic; font-weight: bold;}
+.cultboldtalic {color: #aa1c1c; font-weight: bold; font-size: 24px;}
-.cultlarge {color: #740202; font-weight: bold; font-size: 24px;}
-.narsie {color: #740202; font-weight: bold; font-size: 120px;}
-.narsiesmall {color: #740202; font-weight: bold; font-size: 48px;}
+.cultlarge {color: #aa1c1c; font-weight: bold; font-size: 24px;}
+.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: #660099; font-weight: bold; font-style: italic;}
-.hierophant_warning {color: #660099; font-style: italic;}
-.purple {color: #7c00e6;}
-.holoparasite {color: #35333a;}
+.hierophant {color: #a22bdd; font-weight: bold; font-style: italic;}
+.hierophant_warning {color: #c56bf1; font-style: italic;}
+.purple {color: #a03ff5;}
+.holoparasite {color: #88809c;}
.revennotice {color: #1d2953;}
.revenboldnotice {color: #1d2953; font-weight: bold;}
@@ -371,18 +371,18 @@ h1.alert, h2.alert {color: #99aab5;}
.neovgre {color: #6E001A; font-weight: bold; font-style: italic;}
.neovgre_small {color: #6E001A;}
-.newscaster {color: #800000;}
-.ghostalert {color: #5c00e6; font-style: italic; font-weight: bold;}
+.newscaster {color: #c05d5d;}
+.ghostalert {color: #6600ff; font-style: italic; font-weight: bold;}
-.alien {color: #543354;}
+.alien {color: #855d85;}
.noticealien {color: #059223;}
.alertalien {color: #059223; font-weight: bold;}
.changeling {color: #059223; font-style: italic;}
.assimilator {color: #059223; font-size: 16px ; font-weight: bold;}
-.spider {color: #7c00e6;}
+.spider {color: #8800ff;}
-.interface {color: #330033;}
+.interface {color: #750e75;}
.sans {font-family: "Comic Sans MS", cursive, sans-serif;}
.papyrus {font-family: "Papyrus", cursive, sans-serif;}
@@ -395,38 +395,38 @@ h1.alert, h2.alert {color: #99aab5;}
.extremelybig {font-size: 40px;}
.greentext {color: #059223; font-size: 24px;}
.redtext {color: #c51e1e; font-size: 24px;}
-.clown {color: #FF69Bf; font-size: 24px; font-family: "Comic Sans MS", cursive, sans-serif; font-weight: bold;}
+.clown {color: #ff70c1; font-size: 24px; font-family: "Comic Sans MS", cursive, sans-serif; font-weight: bold;}
.his_grace {color: #15D512; font-family: "Courier New", cursive, sans-serif; font-style: italic;}
-.hypnophrase {color: #2c2f33; font-weight: bold; animation: hypnocolor 1500ms infinite;}
+.hypnophrase {color: #202020; font-weight: bold; animation: hypnocolor 1500ms infinite;}
@keyframes hypnocolor {
- 0% { color: #2c2f33; }
- 25% { color: #410194; }
- 50% { color: #7f17d8; }
- 75% { color: #410194; }
- 100% { color: #3bb5d3; }
+ 0% { color: #202020; }
+ 25% { color: #4b02ac; }
+ 50% { color: #9f41f1; }
+ 75% { color: #541c9c; }
+ 100% { color: #7adbf3; }
}
.phobia {color: #dd0000; font-weight: bold; animation: phobia 750ms infinite;}
@keyframes phobia {
- 0% { color: #0d0d0d; }
+ 0% { color: #f75a5a; }
50% { color: #dd0000; }
- 100% { color: #0d0d0d; }
+ 100% { color: #f75a5a; }
}
.icon {height: 1em; width: auto;}
.memo {color: #638500; text-align: center;}
.memoedit {text-align: center; font-size: 16px;}
-.abductor {color: #800080; font-style: italic;}
-.mind_control {color: #A00D6F; font-size: 3; font-weight: bold; font-style: italic;}
+.abductor {color: #c204c2; font-style: italic;}
+.mind_control {color: #df3da9; font-size: 3; font-weight: bold; font-style: italic;}
.slime {color: #00CED1;}
.drone {color: #848482;}
.monkey {color: #975032;}
.swarmer {color: #2C75FF;}
.resonate {color: #298F85;}
-.monkeyhive {color: #774704;}
-.monkeylead {color: #774704; font-size: 2;}
+.monkeyhive {color: #a56408;}
+.monkeylead {color: #af6805; font-size: 2;}
.connectionClosed, .fatalError {background: red; color: white; padding: 5px;}
.connectionClosed.restored {background: green;}
diff --git a/code/modules/goonchat/browserassets/css/browserOutput_white.css b/code/modules/goonchat/browserassets/css/browserOutput_white.css
index 12978246c79..899e4c4d358 100644
--- a/code/modules/goonchat/browserassets/css/browserOutput_white.css
+++ b/code/modules/goonchat/browserassets/css/browserOutput_white.css
@@ -260,12 +260,12 @@ h1.alert, h2.alert {color: #000000;}
em {font-style: normal; font-weight: bold;}
-.ooc { font-weight: bold;}
+.ooc {color: #002eb8; font-weight: bold;}
.adminobserverooc {color: #0099cc; font-weight: bold;}
.adminooc {color: #700038; font-weight: bold;}
-.adminsay {color: #FF4500; font-weight: bold;}
-.admin {color: #386aff; font-weight: bold;}
+.adminsay {color: #ff0000; font-weight: bold;}
+.admin {color: #4473ff; font-weight: bold;}
.name { font-weight: bold;}
@@ -432,4 +432,4 @@ h1.alert, h2.alert {color: #000000;}
/* HELPER CLASSES */
.text-normal {font-weight: normal; font-style: normal;}
-.hidden {display: none; visibility: hidden;}
\ No newline at end of file
+.hidden {display: none; visibility: hidden;}
diff --git a/code/modules/goonchat/browserassets/js/browserOutput.js b/code/modules/goonchat/browserassets/js/browserOutput.js
index 4b24c0a39e2..65f58c6fe48 100644
--- a/code/modules/goonchat/browserassets/js/browserOutput.js
+++ b/code/modules/goonchat/browserassets/js/browserOutput.js
@@ -35,7 +35,7 @@ var opts = {
'wasd': false, //Is the user in wasd mode?
'priorChatHeight': 0, //Thing for height-resizing detection
'restarting': false, //Is the round restarting?
- 'darkmode':true, //Are we using darkmode? If not WHY ARE YOU LIVING IN 2009???
+ 'darkmode':false, //Are we using darkmode? If not WHY ARE YOU LIVING IN 2009???
//Options menu
'selectedSubLoop': null, //Contains the interval loop for closing the selected sub menu
@@ -1010,7 +1010,7 @@ $(function() {
$.ajax({
type: 'GET',
- url: 'browserOutput.css',
+ url: 'browserOutput_white.css',
success: function(styleData) {
var blob = new Blob(['Chat Log', $messages.html(), '']);
diff --git a/interface/skin.dmf b/interface/skin.dmf
index 62fd6850624..af55fc8f0da 100644
--- a/interface/skin.dmf
+++ b/interface/skin.dmf
@@ -1,5 +1,6 @@
macro "default"
+
menu "menu"
elem
name = "&File"
@@ -53,7 +54,6 @@ window "mainwindow"
size = 640x440
anchor1 = none
anchor2 = none
- background-color = #272727
is-default = true
saved-params = "pos;size;is-minimized;is-maximized"
icon = 'icons\\ss13_64.png'
@@ -65,7 +65,6 @@ window "mainwindow"
size = 634x417
anchor1 = 0,0
anchor2 = 100,100
- background-color = #272727
saved-params = "splitter"
left = "mapwindow"
right = "infowindow"
@@ -76,8 +75,6 @@ window "mainwindow"
size = 517x20
anchor1 = 0,100
anchor2 = 100,100
- background-color = #272727
- font-size = 10
background-color = #d3b5b5
is-default = true
border = sunken
@@ -88,8 +85,6 @@ window "mainwindow"
size = 40x20
anchor1 = 100,100
anchor2 = none
- background-color = #272727
- text-color = #eaeaea
saved-params = "is-checked"
text = "Chat"
command = ".winset \"saybutton.is-checked=true ? input.command=\"!say \\\"\" : input.command=\"\"saybutton.is-checked=true ? mebutton.is-checked=false\"\"saybutton.is-checked=true ? oocbutton.is-checked=false\""
@@ -100,8 +95,6 @@ window "mainwindow"
size = 40x20
anchor1 = 100,100
anchor2 = none
- background-color = #272727
- text-color = #eaeaea
saved-params = "is-checked"
text = "OOC"
command = ".winset \"oocbutton.is-checked=true ? input.command=\"!ooc \\\"\" : input.command=\"\"oocbutton.is-checked=true ? mebutton.is-checked=false\"\"oocbutton.is-checked=true ? saybutton.is-checked=false\""
@@ -112,8 +105,6 @@ window "mainwindow"
size = 40x20
anchor1 = 100,100
anchor2 = none
- background-color = #272727
- text-color = #eaeaea
saved-params = "is-checked"
text = "Me"
command = ".winset \"mebutton.is-checked=true ? input.command=\"!me \\\"\" : input.command=\"\"mebutton.is-checked=true ? saybutton.is-checked=false\"\"mebutton.is-checked=true ? oocbutton.is-checked=false\""
@@ -124,7 +115,6 @@ window "mainwindow"
size = 200x200
anchor1 = none
anchor2 = none
- background-color = #272727
is-visible = false
saved-params = ""
elem "tooltip"
@@ -133,7 +123,6 @@ window "mainwindow"
size = 999x999
anchor1 = none
anchor2 = none
- background-color = #272727
is-visible = false
saved-params = ""
@@ -144,7 +133,6 @@ window "mapwindow"
size = 640x480
anchor1 = none
anchor2 = none
- background-color = #000000
saved-params = "pos;size;is-minimized;is-maximized"
is-pane = true
elem "map"
@@ -153,7 +141,6 @@ window "mapwindow"
size = 640x480
anchor1 = 0,0
anchor2 = 100,100
- background-color = #000000
font-family = "Arial"
font-size = 7
text-color = none
@@ -168,8 +155,6 @@ window "infowindow"
size = 640x480
anchor1 = none
anchor2 = none
- text-color = #99aab5
- background-color = #272727
saved-params = "pos;size;is-minimized;is-maximized"
is-pane = true
elem "info"
@@ -178,8 +163,6 @@ window "infowindow"
size = 640x445
anchor1 = 0,0
anchor2 = 100,100
- text-color = #99aab5
- background-color = #272727
saved-params = "splitter"
left = "statwindow"
right = "outputwindow"
@@ -190,8 +173,6 @@ window "infowindow"
size = 104x20
anchor1 = 3,0
anchor2 = 19,0
- text-color = #99aab5
- background-color = #494949
saved-params = "is-checked"
text = "Changelog"
command = "changelog"
@@ -201,8 +182,6 @@ window "infowindow"
size = 100x20
anchor1 = 19,0
anchor2 = 34,0
- text-color = #99aab5
- background-color = #494949
saved-params = "is-checked"
text = "Rules"
command = "rules"
@@ -212,8 +191,6 @@ window "infowindow"
size = 100x20
anchor1 = 34,0
anchor2 = 50,0
- text-color = #99aab5
- background-color = #494949
saved-params = "is-checked"
text = "Wiki"
command = "wiki"
@@ -223,8 +200,6 @@ window "infowindow"
size = 100x20
anchor1 = 50,0
anchor2 = 66,0
- text-color = #99aab5
- background-color = #494949
saved-params = "is-checked"
text = "Forum"
command = "forum"
@@ -234,8 +209,6 @@ window "infowindow"
size = 100x20
anchor1 = 66,0
anchor2 = 81,0
- text-color = #99aab5
- background-color = #3a3a3a
saved-params = "is-checked"
text = "Github"
command = "github"
@@ -245,8 +218,6 @@ window "infowindow"
size = 100x20
anchor1 = 81,0
anchor2 = 97,0
- text-color = #99aab5
- background-color = #492020
saved-params = "is-checked"
text = "Report Issue"
command = "report-issue"
@@ -258,8 +229,6 @@ window "outputwindow"
size = 640x480
anchor1 = none
anchor2 = none
- text-color = #99aab5
- background-color = #272727
saved-params = "pos;size;is-minimized;is-maximized"
is-pane = true
elem "browseroutput"
@@ -268,8 +237,7 @@ window "outputwindow"
size = 640x480
anchor1 = 0,0
anchor2 = 100,100
- text-color = #99aab5
- background-color = #272727
+ background-color = #ffffff
is-visible = false
is-disabled = true
saved-params = ""
@@ -280,8 +248,6 @@ window "outputwindow"
size = 640x480
anchor1 = 0,0
anchor2 = 100,100
- text-color = #99aab5
- background-color = #272727
is-default = true
saved-params = ""
@@ -312,7 +278,7 @@ window "preferences_window"
anchor2 = 100,100
right-click = true
saved-params = "zoom;letterbox;zoom-mode"
-
+
window "statwindow"
elem "statwindow"
type = MAIN
@@ -320,8 +286,6 @@ window "statwindow"
size = 640x480
anchor1 = none
anchor2 = none
- text-color = #eaeaea
- background-color = #272727
saved-params = "pos;size;is-minimized;is-maximized"
is-pane = true
elem "stat"
@@ -330,11 +294,6 @@ window "statwindow"
size = 640x480
anchor1 = 0,0
anchor2 = 100,100
- text-color = #99aab5
- background-color = #2c2f33
is-default = true
saved-params = ""
- tab-text-color = #99aab5
- tab-background-color = #272727
- prefix-color = #ebebeb
- suffix-color = #ebebeb
\ No newline at end of file
+