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

Undoes Theme shit

Browse Source
This commit is contained in:
Artur
2020-09-02 19:44:19 +03:00
parent d47a670f84
commit a2d34b7524
3 changed files with 124 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
code/datums/diseases/advance/symptoms/fire.dm
View File

@@ -99,7 +99,6 @@ Bonus
*/
/datum/symptom/alkali
name = "Alkali perspiration"
desc = "The virus attaches to sudoriparous glands, synthesizing a chemical that bursts into flames when reacting with water, leading to self-immolation."
stealth = 2
@@ -113,9 +112,9 @@ Bonus
symptom_delay_max = 90
var/chems = FALSE
var/explosion_power = 1
threshold_desc = "<b>Resistance 9:</b> Doubles the intensity of the effect, but reduces its frequency.<br>\
<b>Stage Speed 8:</b> Increases explosion radius when the host is wet.<br>\
<b>Transmission 8:</b> Additionally synthesizes chlorine trifluoride and napalm inside the host."
threshold_desc = list( "Resistance 9: Doubles the intensity of the effect, but reduces its frequency.",
"Stage Speed 8: Increases explosion radius when the host is wet.",
"Transmission 8: Additionally synthesizes chlorine trifluoride and napalm inside the host.")
/datum/symptom/alkali/Start(datum/disease/advance/A)
if(!..())

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

@@ -4,11 +4,22 @@
* @license MIT
*/
export const THEMES = ['light', 'dark'];
export const THEMES = ['light', 'dark', 'default'];
/*
const COLOR_DARK_BG = '#202020';
const COLOR_DARK_BG_DARKER = '#171717';
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";
let setClientThemeTimer = null;
@@ -34,57 +45,57 @@ export const setClientTheme = name => {
if (name === 'light') {
return Byond.winset({
// Main windows
'infowindow.background-color': 'none',
'infowindow.text-color': '#000000',
'info.background-color': 'none',
'info.text-color': '#000000',
'browseroutput.background-color': 'none',
'browseroutput.text-color': '#000000',
'outputwindow.background-color': 'none',
'outputwindow.text-color': '#000000',
'mainwindow.background-color': 'none',
'split.background-color': 'none',
'infowindow.background-color': COLOR_WHITE_DARKBG,
'infowindow.text-color': COLOR_WHITE_TEXT,
'info.background-color': COLOR_WHITE_BG,
'info.text-color': COLOR_WHITE_TEXT,
'browseroutput.background-color': COLOR_WHITE_DARKBG,
'browseroutput.text-color': COLOR_WHITE_TEXT,
'outputwindow.background-color': COLOR_WHITE_DARKBG,
'outputwindow.text-color': COLOR_WHITE_TEXT,
'mainwindow.background-color': COLOR_WHITE_DARKBG,
'split.background-color': COLOR_WHITE_BG,
// Buttons
'changelog.background-color': 'none',
'changelog.text-color': '#000000',
'rules.background-color': 'none',
'rules.text-color': '#000000',
'wiki.background-color': 'none',
'wiki.text-color': '#000000',
'forum.background-color': 'none',
'forum.text-color': '#000000',
'github.background-color': 'none',
'github.text-color': '#000000',
'report-issue.background-color': 'none',
'report-issue.text-color': '#000000',
'changelog.background-color': COLOR_WHITE_INFO_BUTTONS_BG,
'changelog.text-color': COLOR_WHITE_TEXT,
'rules.background-color': COLOR_WHITE_INFO_BUTTONS_BG,
'rules.text-color': COLOR_WHITE_TEXT,
'wiki.background-color': COLOR_WHITE_INFO_BUTTONS_BG,
'wiki.text-color': COLOR_WHITE_TEXT,
'forum.background-color': COLOR_WHITE_INFO_BUTTONS_BG,
'forum.text-color': COLOR_WHITE_TEXT,
'github.background-color': COLOR_WHITE_INFO_BUTTONS_BG,
'github.text-color': COLOR_WHITE_TEXT,
'report-issue.background-color': '#EF7F7F',
'report-issue.text-color': COLOR_WHITE_TEXT,
// Status and verb tabs
'output.background-color': 'none',
'output.text-color': '#000000',
'statwindow.background-color': 'none',
'statwindow.text-color': '#000000',
'stat.background-color': '#FFFFFF',
'stat.tab-background-color': 'none',
'stat.text-color': '#000000',
'stat.tab-text-color': '#000000',
'stat.prefix-color': '#000000',
'stat.suffix-color': '#000000',
'output.background-color': COLOR_WHITE_BG,
'output.text-color': COLOR_WHITE_TEXT,
'statwindow.background-color': COLOR_WHITE_DARKBG,
'statwindow.text-color': COLOR_WHITE_TEXT,
'stat.background-color': COLOR_WHITE_BG,
'stat.tab-background-color': COLOR_WHITE_DARKBG,
'stat.text-color': COLOR_WHITE_TEXT,
'stat.tab-text-color': COLOR_WHITE_TEXT,
'stat.prefix-color': COLOR_WHITE_TEXT,
'stat.suffix-color': COLOR_WHITE_TEXT,
// Say, OOC, me Buttons etc.
'saybutton.background-color': 'none',
'saybutton.text-color': '#000000',
'oocbutton.background-color': 'none',
'oocbutton.text-color': '#000000',
'mebutton.background-color': 'none',
'mebutton.text-color': '#000000',
'asset_cache_browser.background-color': 'none',
'asset_cache_browser.text-color': '#000000',
'tooltip.background-color': 'none',
'tooltip.text-color': '#000000',
'saybutton.background-color': COLOR_WHITE_DARKBG,
'saybutton.text-color': COLOR_WHITE_TEXT,
// 'oocbutton.background-color': COLOR_WHITE_DARKBG,
// 'oocbutton.text-color': COLOR_WHITE_TEXT,
// 'mebutton.background-color': COLOR_WHITE_DARKBG,
// 'mebutton.text-color': COLOR_WHITE_TEXT,
'asset_cache_browser.background-color': COLOR_WHITE_DARKBG,
'asset_cache_browser.text-color': COLOR_WHITE_TEXT,
'tooltip.background-color': COLOR_WHITE_BG,
'tooltip.text-color': COLOR_WHITE_TEXT,
});
}
if (name === 'dark') {
Byond.winset({
// Main windows
'infowindow.background-color': COLOR_DARK_BG,
'infowindow.background-color': COLOR_DARK_DARKBG,
'infowindow.text-color': COLOR_DARK_TEXT,
'info.background-color': COLOR_DARK_BG,
'info.text-color': COLOR_DARK_TEXT,
@@ -92,27 +103,27 @@ export const setClientTheme = name => {
'browseroutput.text-color': COLOR_DARK_TEXT,
'outputwindow.background-color': COLOR_DARK_BG,
'outputwindow.text-color': COLOR_DARK_TEXT,
'mainwindow.background-color': COLOR_DARK_BG,
'mainwindow.background-color': COLOR_DARK_DARKBG,
'split.background-color': COLOR_DARK_BG,
// Buttons
'changelog.background-color': '#494949',
'changelog.background-color': COLOR_DARK_INFO_BUTTONS_BG,
'changelog.text-color': COLOR_DARK_TEXT,
'rules.background-color': '#494949',
'rules.background-color': COLOR_DARK_INFO_BUTTONS_BG,
'rules.text-color': COLOR_DARK_TEXT,
'wiki.background-color': '#494949',
'wiki.background-color': COLOR_DARK_INFO_BUTTONS_BG,
'wiki.text-color': COLOR_DARK_TEXT,
'forum.background-color': '#494949',
'forum.background-color': COLOR_DARK_INFO_BUTTONS_BG,
'forum.text-color': COLOR_DARK_TEXT,
'github.background-color': '#3a3a3a',
'github.background-color': COLOR_DARK_INFO_BUTTONS_BG,
'github.text-color': COLOR_DARK_TEXT,
'report-issue.background-color': '#492020',
'report-issue.background-color': '#A92C2C',
'report-issue.text-color': COLOR_DARK_TEXT,
// Status and verb tabs
'output.background-color': COLOR_DARK_BG_DARKER,
'output.background-color': COLOR_DARK_BG,
'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,
'stat.background-color': COLOR_DARK_BG_DARKER,
'stat.background-color': COLOR_DARK_DARKBG,
'stat.tab-background-color': COLOR_DARK_BG,
'stat.text-color': COLOR_DARK_TEXT,
'stat.tab-text-color': COLOR_DARK_TEXT,
@@ -121,10 +132,60 @@ export const setClientTheme = name => {
// Say, OOC, me Buttons etc.
'saybutton.background-color': COLOR_DARK_BG,
'saybutton.text-color': COLOR_DARK_TEXT,
'oocbutton.background-color': COLOR_DARK_BG,
'oocbutton.text-color': COLOR_DARK_TEXT,
'mebutton.background-color': COLOR_DARK_BG,
'mebutton.text-color': COLOR_DARK_TEXT,
// 'oocbutton.background-color': COLOR_DARK_BG,
// 'oocbutton.text-color': COLOR_DARK_TEXT,
// 'mebutton.background-color': COLOR_DARK_BG,
// 'mebutton.text-color': COLOR_DARK_TEXT,
'asset_cache_browser.background-color': COLOR_DARK_BG,
'asset_cache_browser.text-color': COLOR_DARK_TEXT,
'tooltip.background-color': COLOR_DARK_BG,
'tooltip.text-color': COLOR_DARK_TEXT,
});
}
if (name === 'default') { // white-theme (chat) BUT game is using dorktheme
Byond.winset({
// Main windows
'infowindow.background-color': COLOR_DARK_DARKBG,
'infowindow.text-color': COLOR_DARK_TEXT,
'info.background-color': COLOR_DARK_BG,
'info.text-color': COLOR_DARK_TEXT,
'browseroutput.background-color': COLOR_DARK_BG,
'browseroutput.text-color': COLOR_DARK_TEXT,
'outputwindow.background-color': COLOR_DARK_BG,
'outputwindow.text-color': COLOR_DARK_TEXT,
'mainwindow.background-color': COLOR_DARK_DARKBG,
'split.background-color': COLOR_DARK_BG,
// Buttons
'changelog.background-color': COLOR_DARK_INFO_BUTTONS_BG,
'changelog.text-color': COLOR_DARK_TEXT,
'rules.background-color': COLOR_DARK_INFO_BUTTONS_BG,
'rules.text-color': COLOR_DARK_TEXT,
'wiki.background-color': COLOR_DARK_INFO_BUTTONS_BG,
'wiki.text-color': COLOR_DARK_TEXT,
'forum.background-color': COLOR_DARK_INFO_BUTTONS_BG,
'forum.text-color': COLOR_DARK_TEXT,
'github.background-color': COLOR_DARK_INFO_BUTTONS_BG,
'github.text-color': COLOR_DARK_TEXT,
'report-issue.background-color': '#A92C2C',
'report-issue.text-color': COLOR_DARK_TEXT,
// Status and verb tabs
'output.background-color': COLOR_DARK_BG,
'output.text-color': COLOR_DARK_TEXT,
'statwindow.background-color': COLOR_DARK_DARKBG,
'statwindow.text-color': COLOR_DARK_TEXT,
'stat.background-color': COLOR_DARK_DARKBG,
'stat.tab-background-color': COLOR_DARK_BG,
'stat.text-color': COLOR_DARK_TEXT,
'stat.tab-text-color': COLOR_DARK_TEXT,
'stat.prefix-color': COLOR_DARK_TEXT,
'stat.suffix-color': COLOR_DARK_TEXT,
// Say, OOC, me Buttons etc.
'saybutton.background-color': COLOR_DARK_BG,
'saybutton.text-color': COLOR_DARK_TEXT,
// 'oocbutton.background-color': COLOR_DARK_BG,
// 'oocbutton.text-color': COLOR_DARK_TEXT,
// 'mebutton.background-color': COLOR_DARK_BG,
// 'mebutton.text-color': COLOR_DARK_TEXT,
'asset_cache_browser.background-color': COLOR_DARK_BG,
'asset_cache_browser.text-color': COLOR_DARK_TEXT,
'tooltip.background-color': COLOR_DARK_BG,

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

File diff suppressed because one or more lines are too long