cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-11 10:22:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

something something skin texture revert. oh and oh fuck shit passkeys works again.

Browse Source
This commit is contained in:
Letter N
2020-08-22 15:07:02 +08:00
parent 08120ae8b9
commit 317480a3e7
9 changed files with 137 additions and 210 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/datums/components/ntnet_interface.dm
View File

@@ -39,6 +39,8 @@
parent.ntnet_receive(data) parent.ntnet_receive(data)
/datum/component/ntnet_interface/proc/__network_send(datum/netdata/data, netid) //Do not directly proccall! /datum/component/ntnet_interface/proc/__network_send(datum/netdata/data, netid) //Do not directly proccall!
// Process data before sending it
data.pre_send(src)
if(netid) if(netid)
if(networks_connected_by_id[netid]) if(networks_connected_by_id[netid])

17
code/modules/NTNet/netdata.dm
View File

@@ -11,6 +11,23 @@
var/list/passkey var/list/passkey
// Process data before sending it
/datum/netdata/proc/pre_send(datum/component/ntnet_interface/interface)
// Decrypt the passkey.
if(autopasskey)
if(data["encrypted_passkey"] && !passkey)
var/result = XorEncrypt(hextostr(data["encrypted_passkey"], TRUE), SScircuit.cipherkey)
if(length(result) > 1)
passkey = json_decode(XorEncrypt(hextostr(data["encrypted_passkey"], TRUE), SScircuit.cipherkey))
// Encrypt the passkey.
if(!data["encrypted_passkey"] && passkey)
data["encrypted_passkey"] = strtohex(XorEncrypt(json_encode(passkey), SScircuit.cipherkey))
// If there is no sender ID, set the default one.
if(!sender_id && interface)
sender_id = interface.hardware_id
/datum/netdata/proc/standard_format_data(primary, secondary, passkey) /datum/netdata/proc/standard_format_data(primary, secondary, passkey)
data["data"] = primary data["data"] = primary
data["data_secondary"] = secondary data["data_secondary"] = secondary

12
code/modules/client/client_procs.dm
View File

@@ -267,6 +267,7 @@ GLOBAL_LIST_INIT(blacklisted_builds, list(
else else
prefs = new /datum/preferences(src) prefs = new /datum/preferences(src)
GLOB.preferences_datums[ckey] = prefs GLOB.preferences_datums[ckey] = prefs
addtimer(CALLBACK(src, .proc/ensure_keys_set), 0) //prevents possible race conditions
prefs.last_ip = address //these are gonna be used for banning prefs.last_ip = address //these are gonna be used for banning
prefs.last_id = computer_id //these are gonna be used for banning prefs.last_id = computer_id //these are gonna be used for banning
@@ -334,9 +335,9 @@ GLOBAL_LIST_INIT(blacklisted_builds, list(
qdel(src) qdel(src)
return return
if(SSinput.initialized) // if(SSinput.initialized) placed here on tg.
set_macros() // set_macros()
update_movement_keys() // update_movement_keys()
// Initialize tgui panel // Initialize tgui panel
tgui_panel.initialize() tgui_panel.initialize()
@@ -474,6 +475,11 @@ GLOBAL_LIST_INIT(blacklisted_builds, list(
// fit_viewport() // fit_viewport()
Master.UpdateTickRate() Master.UpdateTickRate()
/client/proc/ensure_keys_set()
if(SSinput.initialized)
set_macros()
update_movement_keys(prefs)
////////////// //////////////
//DISCONNECT// //DISCONNECT//
////////////// //////////////

65
code/modules/client/darkmode.dm
View File

@@ -1,65 +0,0 @@
//Darkmode preference by Kmc2000//
/*
This lets you switch chat themes by using winset and CSS loading, you must relog to see this change (or rebuild your browseroutput datum)
Things to note:
If you change ANYTHING in interface/skin.dmf you need to change it here:
Format:
winset(src, "window as appears in skin.dmf after elem", "var to change = desired value")
How this works:
I've added a function to browseroutput.js which registers a cookie for darkmode and swaps the chat accordingly. You can find the button to do this under the "cog" icon next to the ping button (top right of chat)
This then swaps the window theme automatically
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 = [COLOR_WHITEMODE_DARKBACKGROUND];text-color = [COLOR_WHITEMODE_TEXT]")
winset(src, "info", "background-color = [COLOR_WHITEMODE_BACKGROUND];text-color = [COLOR_WHITEMODE_TEXT]")
winset(src, "browseroutput", "background-color = [COLOR_WHITEMODE_DARKBACKGROUND];text-color = [COLOR_WHITEMODE_TEXT]")
winset(src, "outputwindow", "background-color = [COLOR_WHITEMODE_DARKBACKGROUND];text-color = [COLOR_WHITEMODE_TEXT]")
winset(src, "mainwindow", "background-color = [COLOR_WHITEMODE_DARKBACKGROUND]")
winset(src, "split", "background-color = [COLOR_WHITEMODE_BACKGROUND]")
//Buttons
winset(src, "changelog", "background-color = [COLOR_WHITEMODE_INFO_BUTTONS_BG];text-color = [COLOR_WHITEMODE_TEXT]")
winset(src, "rules", "background-color = [COLOR_WHITEMODE_INFO_BUTTONS_BG];text-color = [COLOR_WHITEMODE_TEXT]")
winset(src, "wiki", "background-color = [COLOR_WHITEMODE_INFO_BUTTONS_BG];text-color = [COLOR_WHITEMODE_TEXT]")
winset(src, "forum", "background-color = [COLOR_WHITEMODE_INFO_BUTTONS_BG];text-color = [COLOR_WHITEMODE_TEXT]")
winset(src, "github", "background-color = [COLOR_WHITEMODE_INFO_BUTTONS_BG];text-color = [COLOR_WHITEMODE_TEXT]")
winset(src, "report-issue", "background-color = [COLOR_WHITEMODE_ISSUE_BUTTON_BG];text-color = [COLOR_WHITEMODE_TEXT]")
//Status and verb tabs
winset(src, "output", "background-color = [COLOR_WHITEMODE_BACKGROUND];text-color = [COLOR_WHITEMODE_TEXT]")
winset(src, "statwindow", "background-color = [COLOR_WHITEMODE_DARKBACKGROUND];text-color = [COLOR_WHITEMODE_TEXT]")
winset(src, "stat", "background-color = [COLOR_WHITEMODE_BACKGROUND];tab-background-color = [COLOR_WHITEMODE_DARKBACKGROUND];\
text-color = [COLOR_WHITEMODE_TEXT];tab-text-color = [COLOR_WHITEMODE_TEXT];\
prefix-color = [COLOR_WHITEMODE_TEXT];suffix-color = [COLOR_WHITEMODE_TEXT]")
//Etc.
winset(src, "say", "background-color = [COLOR_WHITEMODE_DARKBACKGROUND];text-color = [COLOR_WHITEMODE_TEXT]")
winset(src, "asset_cache_browser", "background-color = [COLOR_WHITEMODE_DARKBACKGROUND];text-color = [COLOR_WHITEMODE_TEXT]")
winset(src, "tooltip", "background-color = [COLOR_WHITEMODE_BACKGROUND];text-color = [COLOR_WHITEMODE_TEXT]")
/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 = [COLOR_DARKMODE_DARKBACKGROUND];text-color = [COLOR_DARKMODE_TEXT]")
winset(src, "info", "background-color = [COLOR_DARKMODE_BACKGROUND];text-color = [COLOR_DARKMODE_TEXT]")
winset(src, "browseroutput", "background-color = [COLOR_DARKMODE_BACKGROUND];text-color = [COLOR_DARKMODE_TEXT]")
winset(src, "outputwindow", "background-color = [COLOR_DARKMODE_BACKGROUND];text-color = [COLOR_DARKMODE_TEXT]")
winset(src, "mainwindow", "background-color = [COLOR_DARKMODE_DARKBACKGROUND]")
winset(src, "split", "background-color = [COLOR_DARKMODE_BACKGROUND]")
//Buttons
winset(src, "changelog", "background-color = [COLOR_DARKMODE_INFO_BUTTONS_BG];text-color = [COLOR_DARKMODE_TEXT]")
winset(src, "rules", "background-color = [COLOR_DARKMODE_INFO_BUTTONS_BG];text-color = [COLOR_DARKMODE_TEXT]")
winset(src, "wiki", "background-color = [COLOR_DARKMODE_INFO_BUTTONS_BG];text-color = [COLOR_DARKMODE_TEXT]")
winset(src, "forum", "background-color = [COLOR_DARKMODE_INFO_BUTTONS_BG];text-color = [COLOR_DARKMODE_TEXT]")
winset(src, "github", "background-color = [COLOR_DARKMODE_INFO_BUTTONS_BG];text-color = [COLOR_DARKMODE_TEXT]")
winset(src, "report-issue", "background-color = [COLOR_DARKMODE_ISSUE_BUTTON_BG];text-color = [COLOR_DARKMODE_TEXT]")
//Status and verb tabs
winset(src, "output", "background-color = [COLOR_DARKMODE_BACKGROUND];text-color = [COLOR_DARKMODE_TEXT]")
winset(src, "statwindow", "background-color = [COLOR_DARKMODE_DARKBACKGROUND];text-color = [COLOR_DARKMODE_TEXT]")
winset(src, "stat", "background-color = [COLOR_DARKMODE_DARKBACKGROUND];tab-background-color = [COLOR_DARKMODE_BACKGROUND];\
text-color = [COLOR_DARKMODE_TEXT];tab-text-color = [COLOR_DARKMODE_TEXT];\
prefix-color = [COLOR_DARKMODE_TEXT];suffix-color = [COLOR_DARKMODE_TEXT]")
//Etc.
winset(src, "say", "background-color = [COLOR_DARKMODE_BACKGROUND];text-color = [COLOR_DARKMODE_TEXT]")
winset(src, "asset_cache_browser", "background-color = [COLOR_DARKMODE_BACKGROUND];text-color = [COLOR_DARKMODE_TEXT]")
winset(src, "tooltip", "background-color = [COLOR_DARKMODE_BACKGROUND];text-color = [COLOR_DARKMODE_TEXT]")

88
interface/skin.dmf
View File

@@ -53,7 +53,6 @@ window "mainwindow"
size = 640x440 size = 640x440
anchor1 = none anchor1 = none
anchor2 = none anchor2 = none
background-color = #242424
is-default = true is-default = true
saved-params = "pos;size;is-minimized;is-maximized" saved-params = "pos;size;is-minimized;is-maximized"
icon = 'icons\\ss13_64.png' icon = 'icons\\ss13_64.png'
@@ -65,57 +64,10 @@ window "mainwindow"
size = 634x417 size = 634x417
anchor1 = 0,0 anchor1 = 0,0
anchor2 = 100,100 anchor2 = 100,100
background-color = #272727
saved-params = "splitter" saved-params = "splitter"
left = "mapwindow" left = "mapwindow"
right = "infowindow" right = "infowindow"
is-vert = true is-vert = true
elem "input"
type = INPUT
pos = 3,420
size = 517x20
anchor1 = 0,100
anchor2 = 100,100
background-color = #d3b5b5
is-default = true
border = sunken
saved-params = "command"
elem "saybutton"
type = BUTTON
pos = 600,420
size = 40x20
anchor1 = 100,100
anchor2 = none
text-color = #e0e0e0
background-color = #272727
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\""
button-type = pushbox
elem "oocbutton"
type = BUTTON
pos = 520,420
size = 40x20
anchor1 = 100,100
anchor2 = none
text-color = #e0e0e0
background-color = #272727
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\""
button-type = pushbox
elem "mebutton"
type = BUTTON
pos = 560,420
size = 40x20
anchor1 = 100,100
anchor2 = none
text-color = #e0e0e0
background-color = #272727
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\""
button-type = pushbox
elem "asset_cache_browser" elem "asset_cache_browser"
type = BROWSER type = BROWSER
pos = 0,0 pos = 0,0
@@ -162,7 +114,6 @@ window "infowindow"
size = 640x480 size = 640x480
anchor1 = none anchor1 = none
anchor2 = none anchor2 = none
background-color = #242424
saved-params = "pos;size;is-minimized;is-maximized" saved-params = "pos;size;is-minimized;is-maximized"
is-pane = true is-pane = true
elem "info" elem "info"
@@ -171,7 +122,6 @@ window "infowindow"
size = 640x445 size = 640x445
anchor1 = 0,0 anchor1 = 0,0
anchor2 = 100,100 anchor2 = 100,100
background-color = #272727
saved-params = "splitter" saved-params = "splitter"
left = "statwindow" left = "statwindow"
right = "outputwindow" right = "outputwindow"
@@ -182,8 +132,6 @@ window "infowindow"
size = 104x20 size = 104x20
anchor1 = 3,0 anchor1 = 3,0
anchor2 = 19,0 anchor2 = 19,0
text-color = #e0e0e0
background-color = #40628a
saved-params = "is-checked" saved-params = "is-checked"
text = "Changelog" text = "Changelog"
command = "changelog" command = "changelog"
@@ -193,8 +141,6 @@ window "infowindow"
size = 100x20 size = 100x20
anchor1 = 19,0 anchor1 = 19,0
anchor2 = 34,0 anchor2 = 34,0
text-color = #e0e0e0
background-color = #40628a
saved-params = "is-checked" saved-params = "is-checked"
text = "Rules" text = "Rules"
command = "rules" command = "rules"
@@ -204,8 +150,6 @@ window "infowindow"
size = 100x20 size = 100x20
anchor1 = 34,0 anchor1 = 34,0
anchor2 = 50,0 anchor2 = 50,0
text-color = #e0e0e0
background-color = #40628a
saved-params = "is-checked" saved-params = "is-checked"
text = "Wiki" text = "Wiki"
command = "wiki" command = "wiki"
@@ -215,8 +159,6 @@ window "infowindow"
size = 100x20 size = 100x20
anchor1 = 50,0 anchor1 = 50,0
anchor2 = 66,0 anchor2 = 66,0
text-color = #e0e0e0
background-color = #40628a
saved-params = "is-checked" saved-params = "is-checked"
text = "Forum" text = "Forum"
command = "forum" command = "forum"
@@ -226,8 +168,6 @@ window "infowindow"
size = 100x20 size = 100x20
anchor1 = 66,0 anchor1 = 66,0
anchor2 = 81,0 anchor2 = 81,0
text-color = #e0e0e0
background-color = #40628a
saved-params = "is-checked" saved-params = "is-checked"
text = "Github" text = "Github"
command = "github" command = "github"
@@ -237,8 +177,6 @@ window "infowindow"
size = 100x20 size = 100x20
anchor1 = 81,0 anchor1 = 81,0
anchor2 = 97,0 anchor2 = 97,0
text-color = #e0e0e0
background-color = #40628a
saved-params = "is-checked" saved-params = "is-checked"
text = "Report Issue" text = "Report Issue"
command = "report-issue" command = "report-issue"
@@ -250,7 +188,6 @@ window "outputwindow"
size = 640x480 size = 640x480
anchor1 = none anchor1 = none
anchor2 = none anchor2 = none
background-color = #272727
saved-params = "pos;size;is-minimized;is-maximized" saved-params = "pos;size;is-minimized;is-maximized"
is-pane = true is-pane = true
elem "browseroutput" elem "browseroutput"
@@ -259,7 +196,7 @@ window "outputwindow"
size = 640x480 size = 640x480
anchor1 = 0,0 anchor1 = 0,0
anchor2 = 100,100 anchor2 = 100,100
background-color = #272727 background-color = #ffffff
is-visible = false is-visible = false
is-disabled = true is-disabled = true
saved-params = "" saved-params = ""
@@ -270,10 +207,29 @@ window "outputwindow"
size = 640x480 size = 640x480
anchor1 = 0,0 anchor1 = 0,0
anchor2 = 100,100 anchor2 = 100,100
text-color = #e0e0e0
background-color = #272727
is-default = true is-default = true
saved-params = "" saved-params = ""
elem "input"
type = INPUT
pos = 2,460
size = 595x20
anchor1 = 0,100
anchor2 = 100,100
background-color = #d3b5b5
is-default = true
border = sunken
saved-params = "command"
elem "saybutton"
type = BUTTON
pos = 600,460
size = 37x20
anchor1 = 100,100
anchor2 = none
saved-params = "is-checked"
text = "Chat"
command = ".winset \"say.is-checked=true ? input.command=\"!say \\\"\" : input.command=\""
is-flat = true
button-type = pushbox
window "popupwindow" window "popupwindow"
elem "popupwindow" elem "popupwindow"

2
tgui/packages/tgui-panel/styles/goon/chat-light.scss
View File

@@ -11,7 +11,7 @@
} }
body { body {
background: #fff; background: #E0E0E0; /*CIT CHANGE - darkens chatbox a lil*/
font-family: Verdana, sans-serif; font-family: Verdana, sans-serif;
font-size: 13px; font-size: 13px;
line-height: 1.2; line-height: 1.2;

157
tgui/packages/tgui-panel/themes.js
View File

@@ -5,10 +5,21 @@
*/ */
export const THEMES = ['light', 'dark', 'default']; export const THEMES = ['light', 'dark', 'default'];
/*
const COLOR_DARK_BG = '#202020'; const COLOR_DARK_BG = '#202020';
const COLOR_DARK_BG_DARKER = '#171717'; const COLOR_DARK_BG_DARKER = '#171717';
const COLOR_DARK_TEXT = '#a4bad6'; const COLOR_DARK_TEXT = '#a4bad6';
*/
/* CIT SPECIFIC DEFINES. */
const COLOR_DARK_INFO_BUTTONS_BG = "#40628A";
const COLOR_DARK_BG = "#272727";
const COLOR_DARK_DARKBG = "#242424";
const COLOR_DARK_TEXT = "#E0E0E0";
const COLOR_WHITE_INFO_BUTTONS_BG = "#90B3DD";
const COLOR_WHITE_BG = "#F0F0F0";
const COLOR_WHITE_DARKBG = "#E6E6E6";
const COLOR_WHITE_TEXT = "#000000";
/** /**
* Darkmode preference, originally by Kmc2000. * Darkmode preference, originally by Kmc2000.
@@ -24,57 +35,57 @@ export const setClientTheme = name => {
if (name === 'light') { if (name === 'light') {
return Byond.winset({ return Byond.winset({
// Main windows // Main windows
'infowindow.background-color': 'none', 'infowindow.background-color': COLOR_WHITE_DARKBG,
'infowindow.text-color': '#000000', 'infowindow.text-color': COLOR_WHITE_TEXT,
'info.background-color': 'none', 'info.background-color': COLOR_WHITE_BG,
'info.text-color': '#000000', 'info.text-color': COLOR_WHITE_TEXT,
'browseroutput.background-color': 'none', 'browseroutput.background-color': COLOR_WHITE_DARKBG,
'browseroutput.text-color': '#000000', 'browseroutput.text-color': COLOR_WHITE_TEXT,
'outputwindow.background-color': 'none', 'outputwindow.background-color': COLOR_WHITE_DARKBG,
'outputwindow.text-color': '#000000', 'outputwindow.text-color': COLOR_WHITE_TEXT,
'mainwindow.background-color': 'none', 'mainwindow.background-color': COLOR_WHITE_DARKBG,
'split.background-color': 'none', 'split.background-color': COLOR_WHITE_BG,
// Buttons // Buttons
'changelog.background-color': '#90B3DD', 'changelog.background-color': COLOR_WHITE_INFO_BUTTONS_BG,
'changelog.text-color': '#000000', 'changelog.text-color': COLOR_WHITE_TEXT,
'rules.background-color': '#90B3DD', 'rules.background-color': COLOR_WHITE_INFO_BUTTONS_BG,
'rules.text-color': '#000000', 'rules.text-color': COLOR_WHITE_TEXT,
'wiki.background-color': '#90B3DD', 'wiki.background-color': COLOR_WHITE_INFO_BUTTONS_BG,
'wiki.text-color': '#000000', 'wiki.text-color': COLOR_WHITE_TEXT,
'forum.background-color': '#90B3DD', 'forum.background-color': COLOR_WHITE_INFO_BUTTONS_BG,
'forum.text-color': '#000000', 'forum.text-color': COLOR_WHITE_TEXT,
'github.background-color': '#90B3DD', 'github.background-color': COLOR_WHITE_INFO_BUTTONS_BG,
'github.text-color': '#000000', 'github.text-color': COLOR_WHITE_TEXT,
'report-issue.background-color': '#90B3DD', 'report-issue.background-color': '#EF7F7F',
'report-issue.text-color': '#000000', 'report-issue.text-color': COLOR_WHITE_TEXT,
// Status and verb tabs // Status and verb tabs
'output.background-color': 'none', 'output.background-color': COLOR_WHITE_BG,
'output.text-color': '#000000', 'output.text-color': COLOR_WHITE_TEXT,
'statwindow.background-color': 'none', 'statwindow.background-color': COLOR_WHITE_DARKBG,
'statwindow.text-color': '#000000', 'statwindow.text-color': COLOR_WHITE_TEXT,
'stat.background-color': '#FFFFFF', 'stat.background-color': COLOR_WHITE_BG,
'stat.tab-background-color': 'none', 'stat.tab-background-color': COLOR_WHITE_DARKBG,
'stat.text-color': '#000000', 'stat.text-color': COLOR_WHITE_TEXT,
'stat.tab-text-color': '#000000', 'stat.tab-text-color': COLOR_WHITE_TEXT,
'stat.prefix-color': '#000000', 'stat.prefix-color': COLOR_WHITE_TEXT,
'stat.suffix-color': '#000000', 'stat.suffix-color': COLOR_WHITE_TEXT,
// Say, OOC, me Buttons etc. // Say, OOC, me Buttons etc.
'saybutton.background-color': 'none', 'saybutton.background-color': COLOR_WHITE_DARKBG,
'saybutton.text-color': '#000000', 'saybutton.text-color': COLOR_WHITE_TEXT,
'oocbutton.background-color': 'none', // 'oocbutton.background-color': COLOR_WHITE_DARKBG,
'oocbutton.text-color': '#000000', // 'oocbutton.text-color': COLOR_WHITE_TEXT,
'mebutton.background-color': 'none', // 'mebutton.background-color': COLOR_WHITE_DARKBG,
'mebutton.text-color': '#000000', // 'mebutton.text-color': COLOR_WHITE_TEXT,
'asset_cache_browser.background-color': 'none', 'asset_cache_browser.background-color': COLOR_WHITE_DARKBG,
'asset_cache_browser.text-color': '#000000', 'asset_cache_browser.text-color': COLOR_WHITE_TEXT,
'tooltip.background-color': 'none', 'tooltip.background-color': COLOR_WHITE_BG,
'tooltip.text-color': '#000000', 'tooltip.text-color': COLOR_WHITE_TEXT,
}); });
} }
if (name === 'dark') { if (name === 'dark') {
Byond.winset({ Byond.winset({
// Main windows // Main windows
'infowindow.background-color': COLOR_DARK_BG, 'infowindow.background-color': COLOR_DARK_DARKBG,
'infowindow.text-color': COLOR_DARK_TEXT, 'infowindow.text-color': COLOR_DARK_TEXT,
'info.background-color': COLOR_DARK_BG, 'info.background-color': COLOR_DARK_BG,
'info.text-color': COLOR_DARK_TEXT, 'info.text-color': COLOR_DARK_TEXT,
@@ -82,27 +93,27 @@ export const setClientTheme = name => {
'browseroutput.text-color': COLOR_DARK_TEXT, 'browseroutput.text-color': COLOR_DARK_TEXT,
'outputwindow.background-color': COLOR_DARK_BG, 'outputwindow.background-color': COLOR_DARK_BG,
'outputwindow.text-color': COLOR_DARK_TEXT, 'outputwindow.text-color': COLOR_DARK_TEXT,
'mainwindow.background-color': COLOR_DARK_BG, 'mainwindow.background-color': COLOR_DARK_DARKBG,
'split.background-color': COLOR_DARK_BG, 'split.background-color': COLOR_DARK_BG,
// Buttons // Buttons
'changelog.background-color': '#40628A', 'changelog.background-color': COLOR_DARK_INFO_BUTTONS_BG,
'changelog.text-color': COLOR_DARK_TEXT, 'changelog.text-color': COLOR_DARK_TEXT,
'rules.background-color': '#40628A', 'rules.background-color': COLOR_DARK_INFO_BUTTONS_BG,
'rules.text-color': COLOR_DARK_TEXT, 'rules.text-color': COLOR_DARK_TEXT,
'wiki.background-color': '#40628A', 'wiki.background-color': COLOR_DARK_INFO_BUTTONS_BG,
'wiki.text-color': COLOR_DARK_TEXT, 'wiki.text-color': COLOR_DARK_TEXT,
'forum.background-color': '#40628A', 'forum.background-color': COLOR_DARK_INFO_BUTTONS_BG,
'forum.text-color': COLOR_DARK_TEXT, 'forum.text-color': COLOR_DARK_TEXT,
'github.background-color': '#40628A', 'github.background-color': COLOR_DARK_INFO_BUTTONS_BG,
'github.text-color': COLOR_DARK_TEXT, 'github.text-color': COLOR_DARK_TEXT,
'report-issue.background-color': '#40628A', 'report-issue.background-color': '#A92C2C',
'report-issue.text-color': COLOR_DARK_TEXT, 'report-issue.text-color': COLOR_DARK_TEXT,
// Status and verb tabs // Status and verb tabs
'output.background-color': COLOR_DARK_BG_DARKER, 'output.background-color': COLOR_DARK_BG,
'output.text-color': COLOR_DARK_TEXT, 'output.text-color': COLOR_DARK_TEXT,
'statwindow.background-color': COLOR_DARK_BG_DARKER, 'statwindow.background-color': COLOR_DARK_DARKBG,
'statwindow.text-color': COLOR_DARK_TEXT, 'statwindow.text-color': COLOR_DARK_TEXT,
'stat.background-color': COLOR_DARK_BG_DARKER, 'stat.background-color': COLOR_DARK_DARKBG,
'stat.tab-background-color': COLOR_DARK_BG, 'stat.tab-background-color': COLOR_DARK_BG,
'stat.text-color': COLOR_DARK_TEXT, 'stat.text-color': COLOR_DARK_TEXT,
'stat.tab-text-color': COLOR_DARK_TEXT, 'stat.tab-text-color': COLOR_DARK_TEXT,
@@ -111,10 +122,10 @@ export const setClientTheme = name => {
// Say, OOC, me Buttons etc. // Say, OOC, me Buttons etc.
'saybutton.background-color': COLOR_DARK_BG, 'saybutton.background-color': COLOR_DARK_BG,
'saybutton.text-color': COLOR_DARK_TEXT, 'saybutton.text-color': COLOR_DARK_TEXT,
'oocbutton.background-color': COLOR_DARK_BG, // 'oocbutton.background-color': COLOR_DARK_BG,
'oocbutton.text-color': COLOR_DARK_TEXT, // 'oocbutton.text-color': COLOR_DARK_TEXT,
'mebutton.background-color': COLOR_DARK_BG, // 'mebutton.background-color': COLOR_DARK_BG,
'mebutton.text-color': COLOR_DARK_TEXT, // 'mebutton.text-color': COLOR_DARK_TEXT,
'asset_cache_browser.background-color': COLOR_DARK_BG, 'asset_cache_browser.background-color': COLOR_DARK_BG,
'asset_cache_browser.text-color': COLOR_DARK_TEXT, 'asset_cache_browser.text-color': COLOR_DARK_TEXT,
'tooltip.background-color': COLOR_DARK_BG, 'tooltip.background-color': COLOR_DARK_BG,
@@ -124,7 +135,7 @@ export const setClientTheme = name => {
if (name === 'default') { // white-theme (chat) BUT game is using dorktheme if (name === 'default') { // white-theme (chat) BUT game is using dorktheme
Byond.winset({ Byond.winset({
// Main windows // Main windows
'infowindow.background-color': COLOR_DARK_BG, 'infowindow.background-color': COLOR_DARK_DARKBG,
'infowindow.text-color': COLOR_DARK_TEXT, 'infowindow.text-color': COLOR_DARK_TEXT,
'info.background-color': COLOR_DARK_BG, 'info.background-color': COLOR_DARK_BG,
'info.text-color': COLOR_DARK_TEXT, 'info.text-color': COLOR_DARK_TEXT,
@@ -132,27 +143,27 @@ export const setClientTheme = name => {
'browseroutput.text-color': COLOR_DARK_TEXT, 'browseroutput.text-color': COLOR_DARK_TEXT,
'outputwindow.background-color': COLOR_DARK_BG, 'outputwindow.background-color': COLOR_DARK_BG,
'outputwindow.text-color': COLOR_DARK_TEXT, 'outputwindow.text-color': COLOR_DARK_TEXT,
'mainwindow.background-color': COLOR_DARK_BG, 'mainwindow.background-color': COLOR_DARK_DARKBG,
'split.background-color': COLOR_DARK_BG, 'split.background-color': COLOR_DARK_BG,
// Buttons // Buttons
'changelog.background-color': '#40628A', 'changelog.background-color': COLOR_DARK_INFO_BUTTONS_BG,
'changelog.text-color': COLOR_DARK_TEXT, 'changelog.text-color': COLOR_DARK_TEXT,
'rules.background-color': '#40628A', 'rules.background-color': COLOR_DARK_INFO_BUTTONS_BG,
'rules.text-color': COLOR_DARK_TEXT, 'rules.text-color': COLOR_DARK_TEXT,
'wiki.background-color': '#40628A', 'wiki.background-color': COLOR_DARK_INFO_BUTTONS_BG,
'wiki.text-color': COLOR_DARK_TEXT, 'wiki.text-color': COLOR_DARK_TEXT,
'forum.background-color': '#40628A', 'forum.background-color': COLOR_DARK_INFO_BUTTONS_BG,
'forum.text-color': COLOR_DARK_TEXT, 'forum.text-color': COLOR_DARK_TEXT,
'github.background-color': '#40628A', 'github.background-color': COLOR_DARK_INFO_BUTTONS_BG,
'github.text-color': COLOR_DARK_TEXT, 'github.text-color': COLOR_DARK_TEXT,
'report-issue.background-color': '#40628A', 'report-issue.background-color': '#A92C2C',
'report-issue.text-color': COLOR_DARK_TEXT, 'report-issue.text-color': COLOR_DARK_TEXT,
// Status and verb tabs // Status and verb tabs
'output.background-color': COLOR_DARK_BG_DARKER, 'output.background-color': COLOR_DARK_BG,
'output.text-color': COLOR_DARK_TEXT, 'output.text-color': COLOR_DARK_TEXT,
'statwindow.background-color': COLOR_DARK_BG_DARKER, 'statwindow.background-color': COLOR_DARK_DARKBG,
'statwindow.text-color': COLOR_DARK_TEXT, 'statwindow.text-color': COLOR_DARK_TEXT,
'stat.background-color': COLOR_DARK_BG_DARKER, 'stat.background-color': COLOR_DARK_DARKBG,
'stat.tab-background-color': COLOR_DARK_BG, 'stat.tab-background-color': COLOR_DARK_BG,
'stat.text-color': COLOR_DARK_TEXT, 'stat.text-color': COLOR_DARK_TEXT,
'stat.tab-text-color': COLOR_DARK_TEXT, 'stat.tab-text-color': COLOR_DARK_TEXT,
@@ -161,10 +172,10 @@ export const setClientTheme = name => {
// Say, OOC, me Buttons etc. // Say, OOC, me Buttons etc.
'saybutton.background-color': COLOR_DARK_BG, 'saybutton.background-color': COLOR_DARK_BG,
'saybutton.text-color': COLOR_DARK_TEXT, 'saybutton.text-color': COLOR_DARK_TEXT,
'oocbutton.background-color': COLOR_DARK_BG, // 'oocbutton.background-color': COLOR_DARK_BG,
'oocbutton.text-color': COLOR_DARK_TEXT, // 'oocbutton.text-color': COLOR_DARK_TEXT,
'mebutton.background-color': COLOR_DARK_BG, // 'mebutton.background-color': COLOR_DARK_BG,
'mebutton.text-color': COLOR_DARK_TEXT, // 'mebutton.text-color': COLOR_DARK_TEXT,
'asset_cache_browser.background-color': COLOR_DARK_BG, 'asset_cache_browser.background-color': COLOR_DARK_BG,
'asset_cache_browser.text-color': COLOR_DARK_TEXT, 'asset_cache_browser.text-color': COLOR_DARK_TEXT,
'tooltip.background-color': COLOR_DARK_BG, 'tooltip.background-color': COLOR_DARK_BG,

2
tgui/packages/tgui/public/tgui-panel.bundle.css
View File

File diff suppressed because one or more lines are too long

2
tgui/packages/tgui/public/tgui-panel.bundle.js
View File

File diff suppressed because one or more lines are too long