diff --git a/interface/interface.dm b/interface/interface.dm index b73820f3f9..abbf4049e5 100644 --- a/interface/interface.dm +++ b/interface/interface.dm @@ -11,30 +11,18 @@ to_chat(src, SPAN_DANGER("The wiki URL is not set in the server configuration.")) return -/client/verb/forum() - set name = "forum" - set desc = "Visit the forum." +/client/verb/worksheet() + set name = "Worksheet" + set desc = "Visit the worksheet." set hidden = TRUE if( CONFIG_GET(string/forumurl) ) - if(tgui_alert(src, "This will open the forum in your browser. Are you sure?", "Confirm", list("Yes", "No")) != "Yes") + if(tgui_alert(src, "This will open the worksheet in your browser. Are you sure?", "Confirm", list("Yes", "No")) != "Yes") return src << link(CONFIG_GET(string/forumurl)) else to_chat(src, SPAN_DANGER("The forum URL is not set in the server configuration.")) return -/client/verb/rules() - set name = "rules" - set desc = "Read our rules." - set hidden = TRUE - if( CONFIG_GET(string/rulesurl) ) - if(tgui_alert(src, "This will open the rules in your browser. Are you sure?", "Confirm", list("Yes", "No")) != "Yes") - return - src << link(CONFIG_GET(string/rulesurl)) - else - to_chat(src, SPAN_DANGER("The rules URL is not set in the server configuration.")) - return - /client/verb/changelog() set name = "Changelog" set category = "OOC" @@ -58,14 +46,11 @@ src << link("https://discord.gg/v6P6wns5dN") return -/client/verb/submitbug() - set name = "Submit Bug" - set desc = "Submit a bug." +/client/verb/github() + set name = "Github" + set desc = "View our github!." set hidden = TRUE - if(tgui_alert(src, "Please search for the bug first to make sure you aren't posting a duplicate.", "No dupe bugs please", list("OK", "Cancel")) != "OK") - return - if(tgui_alert(src, "This will open the GitHub in your browser. Are you sure?", "Confirm", list("Yes", "No")) != "Yes") return diff --git a/interface/skin.dmf b/interface/skin.dmf index 5d06bb40e8..a3c42ebf00 100644 --- a/interface/skin.dmf +++ b/interface/skin.dmf @@ -258,51 +258,43 @@ window "infowindow" saved-params = "is-checked" text = "Changelog" command = "Changelog" - elem "rules" + elem "wiki" type = BUTTON pos = 120,5 size = 100x20 anchor1 = 19,0 anchor2 = 34,0 saved-params = "is-checked" - text = "Rules" - command = "rules" - elem "wiki" + text = "Wiki" + command = "wiki" + elem "worksheet" type = BUTTON pos = 220,5 size = 100x20 anchor1 = 34,0 anchor2 = 50,0 saved-params = "is-checked" - text = "Wiki" - command = "wiki" - elem "forum" + text = "Worksheet" + command = "worksheet" + elem "github" type = BUTTON pos = 320,5 size = 100x20 anchor1 = 50,0 anchor2 = 66,0 saved-params = "is-checked" - text = "Forum" - command = "forum" - elem "report-issue" + text = "Github" + command = "github" + elem "discord" type = BUTTON pos = 420,5 - size = 100x20 + size = 210x50 anchor1 = 66,0 - anchor2 = 81,0 - saved-params = "is-checked" - text = "Submit Bug" - command = "submit-bug" - elem "discord" - type = BUTTON - pos = 520,5 - size = 100x20 - anchor1 = 81,0 anchor2 = 97,0 background-color = #7289da + font-size = 26px saved-params = "is-checked" - text = "Discord" + text = "discord.gg/v6P6wns5dN" command = "discord" window "outputwindow" diff --git a/tgui/packages/tgui-panel/themes.js b/tgui/packages/tgui-panel/themes.js index e0d232182c..9ff8605e76 100644 --- a/tgui/packages/tgui-panel/themes.js +++ b/tgui/packages/tgui-panel/themes.js @@ -47,14 +47,12 @@ export const setClientTheme = (name) => { // 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', - 'report-issue.background-color': 'none', - 'report-issue.text-color': '#000000', + 'worksheet.background-color': 'none', + 'worksheet.text-color': '#000000', + 'github.background-color': 'none', + 'github.text-color': '#000000', // Status and verb tabs 'output.background-color': 'none', 'output.text-color': '#000000', @@ -93,10 +91,10 @@ export const setClientTheme = (name) => { 'rules.text-color': COLOR_DARK_TEXT, 'wiki.background-color': '#494949', 'wiki.text-color': COLOR_DARK_TEXT, - 'forum.background-color': '#494949', - 'forum.text-color': COLOR_DARK_TEXT, - 'report-issue.background-color': '#492020', - 'report-issue.text-color': COLOR_DARK_TEXT, + 'worksheet.background-color': '#494949', + 'worksheet.text-color': COLOR_DARK_TEXT, + 'github.background-color': '#492020', + 'github.text-color': COLOR_DARK_TEXT, // Status and verb tabs 'output.background-color': COLOR_DARK_BG_DARKER, 'output.text-color': COLOR_DARK_TEXT,