diff --git a/code/game/verbs/ooc.dm b/code/game/verbs/ooc.dm index 46f90b4e591..21ad9f1c01d 100644 --- a/code/game/verbs/ooc.dm +++ b/code/game/verbs/ooc.dm @@ -232,7 +232,7 @@ window.reinitialize() /client/verb/fix_stat_panel() - set name = "Fix Stat Panel" + set name = "Fix-Stat-Panel" set hidden = TRUE init_verbs() diff --git a/code/modules/client/darkmode.dm b/code/modules/client/darkmode.dm index 1abf7f8438f..5554d9fee19 100644 --- a/code/modules/client/darkmode.dm +++ b/code/modules/client/darkmode.dm @@ -14,8 +14,8 @@ 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_DARKMODE_DARKBACKGROUND];background-color = none") - winset(src, "infowindow", "text-color = [COLOR_DARKMODE_TEXT];text-color = #000000") + winset(src, "mainwindow", "background-color = [COLOR_DARKMODE_DARKBACKGROUND];background-color = none") + winset(src, "mainwindow", "text-color = [COLOR_DARKMODE_TEXT];text-color = #000000") winset(src, "rpane", "background-color = [COLOR_DARKMODE_DARKBACKGROUND];background-color = none") winset(src, "rpane", "text-color = [COLOR_DARKMODE_TEXT];text-color = #000000") winset(src, "info", "background-color = [COLOR_DARKMODE_BACKGROUND];background-color = none") @@ -73,8 +73,8 @@ 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 = [COLOR_DARKMODE_BACKGROUND]") - winset(src, "infowindow", "text-color = #000000;text-color = [COLOR_DARKMODE_TEXT]") + winset(src, "mainwindow", "background-color = none;background-color = [COLOR_DARKMODE_BACKGROUND]") + winset(src, "mainwindow", "text-color = #000000;text-color = [COLOR_DARKMODE_TEXT]") winset(src, "rpane", "background-color = none;background-color = [COLOR_DARKMODE_BACKGROUND]") winset(src, "rpane", "text-color = #000000;text-color = [COLOR_DARKMODE_TEXT]") winset(src, "info", "background-color = none;background-color = [COLOR_DARKMODE_BACKGROUND]") diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index aff8ab266b4..b1d91dcaac6 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -552,8 +552,8 @@ var/datum/asset/changelog = get_asset_datum(/datum/asset/simple/changelog) changelog.send(src) - var/datum/browser/changelog_win = new(src, "changes", "Changelog", 675, 650) - changelog_win.set_content('html/changelog.html') + var/datum/browser/changelog_win = new(mob, "changes", "Changelog", 675, 650) + changelog_win.set_content(file2text('html/changelog.html')) changelog_win.open() if(prefs.lastchangelog != changelog_hash) prefs.lastchangelog = changelog_hash diff --git a/html/changelogs/mattatlas-fixthingsforreal.yml b/html/changelogs/mattatlas-fixthingsforreal.yml new file mode 100644 index 00000000000..f2ba2faea8e --- /dev/null +++ b/html/changelogs/mattatlas-fixthingsforreal.yml @@ -0,0 +1,42 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: MattAtlas + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - bugfix: "Fixed there not being a print bounties button." + - bugfix: "Fixed the changelog not showing up." diff --git a/tgui/packages/tgui-panel/themes.js b/tgui/packages/tgui-panel/themes.js index 472ad2c8ee9..b199756b01e 100644 --- a/tgui/packages/tgui-panel/themes.js +++ b/tgui/packages/tgui-panel/themes.js @@ -34,8 +34,8 @@ export const setClientTheme = (name) => { if (name === 'light') { return Byond.winset({ // Main windows - 'infowindow.background-color': 'none', - 'infowindow.text-color': '#000000', + 'mainwindow.background-color': 'none', + 'mainwindow.text-color': '#000000', 'info.background-color': 'none', 'info.text-color': '#000000', 'rpane.background-color': 'none', @@ -46,7 +46,6 @@ export const setClientTheme = (name) => { 'browseroutput.text-color': '#000000', 'outputwindow.background-color': 'none', 'outputwindow.text-color': '#000000', - 'mainwindow.background-color': 'none', // Buttons 'changelog.background-color': 'none', 'changelog.text-color': '#000000', @@ -81,8 +80,8 @@ export const setClientTheme = (name) => { if (name === 'dark') { Byond.winset({ // Main windows - 'infowindow.background-color': COLOR_DARK_BG, - 'infowindow.text-color': COLOR_DARK_TEXT, + 'mainwindow.background-color': COLOR_DARK_BG, + 'mainwindow.text-color': COLOR_DARK_TEXT, 'info.background-color': COLOR_DARK_BG, 'info.text-color': COLOR_DARK_TEXT, 'rpane.background-color': COLOR_DARK_BG, @@ -93,7 +92,6 @@ 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, // Buttons 'changelog.background-color': '#494949', 'changelog.text-color': COLOR_DARK_TEXT, diff --git a/tgui/packages/tgui/interfaces/CargoControl.tsx b/tgui/packages/tgui/interfaces/CargoControl.tsx index 0f16e4b5a7c..3e99ae9a80a 100644 --- a/tgui/packages/tgui/interfaces/CargoControl.tsx +++ b/tgui/packages/tgui/interfaces/CargoControl.tsx @@ -569,7 +569,7 @@ export const Bounties = (props, context) => { return (
{