shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

let's do that

Browse Source
This commit is contained in:
silicons
2021-04-28 07:04:29 -07:00
parent 488a6a6927
commit 3f09460b6e
6 changed files with 150 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tgui/packages/tgui-panel/Panel.js
View File

@@ -33,7 +33,7 @@ export const Panel = (props, context) => {
}
}
return (
<Pane theme={settings.theme}>
<Pane theme={settings.theme === 'default' ? 'light' : settings.theme}>
<Stack fill vertical>
<Stack.Item>
<Section fitted>
@@ -114,7 +114,7 @@ export const Panel = (props, context) => {
const HoboPanel = (props, context) => {
const settings = useSettings(context);
return (
<Pane theme={settings.theme}>
<Pane theme={settings.theme === 'default' ? 'light' : settings.theme}>
<Pane.Content scrollable>
<Button
style={{

16
tgui/packages/tgui-panel/chat/constants.js
View File

@@ -58,13 +58,13 @@ export const MESSAGE_TYPES = [
type: MESSAGE_TYPE_RADIO,
name: 'Radio',
description: 'All departments of radio messages',
selector: '.alert, .minorannounce, .syndradio, .centcomradio, .aiprivradio, .comradio, .secradio, .engradio, .medradio, .sciradio, .suppradio, .servradio, .radio, .deptradio, .binarysay, .newscaster',
selector: '.alert, .minorannounce, .syndradio, .airadio, .entradio, .centcomradio, .aiprivradio, .comradio, .secradio, .engradio, .medradio, .sciradio, .suppradio, .servradio, .radio, .deptradio, .binarysay, .newscaster',
},
{
type: MESSAGE_TYPE_INFO,
name: 'Info',
description: 'Non-urgent messages from the game and items',
selector: '.notice:not(.pm), .adminnotice, .info, .sinister, .cult, .infoplain, .announce',
selector: '.notice:not(.pm), .adminnotice, .info, .sinister, .cult, .infoplain',
},
{
type: MESSAGE_TYPE_WARNING,
@@ -84,6 +84,18 @@ export const MESSAGE_TYPES = [
description: 'The bluewall of global OOC messages',
selector: '.ooc, .adminooc',
},
{
type: 'looc',
name: 'LOOC',
description: 'Local OOC Chat. Less of a bluewall',
selector: '.filter_looc, .looc',
},
{
type: 'antagooc',
name: 'AOOC',
description: 'Antag OOC Chat.',
selector: '.filter_aooc, .antagooc',
},
{
type: MESSAGE_TYPE_ADMINPM,
name: 'Admin PMs',

4
tgui/packages/tgui-panel/chat/renderer.js
View File

@@ -176,7 +176,9 @@ class ChatRenderer {
this.highlightColor = null;
return;
}
const allowedRegex = /^[a-z0-9_\-\s]+$/ig;
// citadel update - ig changed to i for flags,
// to fix issues with highlighting only working for every other word.
const allowedRegex = /^[a-z0-9_\-\s]+$/i;
const lines = String(text)
.split(',')
.map(str => str.trim())

17
tgui/packages/tgui-panel/index.js
View File

@@ -93,13 +93,8 @@ const setupApp = () => {
'pos': '0x0',
'size': '0x0',
});
// Resize the panel to match the non-browser output
Byond.winget('output').then(output => {
Byond.winset('browseroutput', {
'size': output.size,
});
});
// Absolutely shit workaround for chatbox visiblity.
based_winset();
// Enable hot module reloading
if (module.hot) {
@@ -119,4 +114,12 @@ const setupApp = () => {
}
};
const based_winset = async (based_on_what = 'output') => {
// shitty workaround because winget is async.
const winget_output = await Byond.winget(based_on_what);
Byond.winset('browseroutput', {
'size': winget_output["size"],
});
};
setupApp();

2
tgui/packages/tgui-panel/settings/reducer.js
View File

@@ -12,7 +12,7 @@ const initialState = {
fontSize: 13,
fontFamily: FONTS[0],
lineHeight: 1.2,
theme: 'light',
theme: 'default',
adminMusicVolume: 0.5,
highlightText: '',
highlightColor: '#ffdd44',

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,