From fbb7a3118efc4bfe5fc3379a24378e2231adf0ea Mon Sep 17 00:00:00 2001 From: Aronai Sieyes Date: Fri, 2 Jul 2021 18:22:56 -0400 Subject: [PATCH] Add discord button to top --- code/controllers/configuration.dm | 5 + code/modules/vchat/js/vchat.js | 2 +- config/example/config.txt | 3 + interface/interface.dm | 13 ++ interface/skin.dmf | 250 +++++++++++++++--------------- 5 files changed, 150 insertions(+), 123 deletions(-) diff --git a/code/controllers/configuration.dm b/code/controllers/configuration.dm index 871b1e85f73..47579ec43ed 100644 --- a/code/controllers/configuration.dm +++ b/code/controllers/configuration.dm @@ -124,6 +124,7 @@ var/list/gamemode_cache = list() var/static/wikisearchurl var/static/forumurl var/static/githuburl + var/static/discordurl var/static/rulesurl var/static/mapurl @@ -543,6 +544,10 @@ var/list/gamemode_cache = list() if ("githuburl") config.githuburl = value + + if ("discordurl") + config.discordurl = value + if ("guest_jobban") config.guest_jobban = 1 diff --git a/code/modules/vchat/js/vchat.js b/code/modules/vchat/js/vchat.js index cb185101459..91c7d1a5016 100644 --- a/code/modules/vchat/js/vchat.js +++ b/code/modules/vchat/js/vchat.js @@ -934,7 +934,7 @@ function get_cookie(key, deffo) { // Button Controls that need background-color and text-color set. var SKIN_BUTTONS = [ - /* Rpane */ "rpane.textb", "rpane.infob", "rpane.wikib", "rpane.forumb", "rpane.rulesb", "rpane.github", "rpane.mapb", "rpane.changelog", + /* Rpane */ "rpane.textb", "rpane.infob", "rpane.wikib", "rpane.forumb", "rpane.rulesb", "rpane.github", "rpane.discord", "rpane.mapb", "rpane.changelog", /* Mainwindow */ "mainwindow.saybutton", "mainwindow.mebutton", "mainwindow.hotkey_toggle" ]; diff --git a/config/example/config.txt b/config/example/config.txt index 4f9320331e8..d9e81fc96b2 100644 --- a/config/example/config.txt +++ b/config/example/config.txt @@ -245,6 +245,9 @@ SERVER your.domain:6000 ## GitHub address #GITHUBURL https://github.com/owner/repo +## Discord address +#DISCORDURL https://discord.gg/someinvite + ## Rules URL #RULESURL https://rules.your.domain/ diff --git a/interface/interface.dm b/interface/interface.dm index 0c9d1f67a36..02fdecedb6d 100644 --- a/interface/interface.dm +++ b/interface/interface.dm @@ -67,6 +67,19 @@ to_chat(src, "The GitHub URL is not set in the server configuration.") return +/client/verb/discord() + set name = "Discord" + set desc = "Visit the discord" + set hidden = 1 + + if(config.discordurl) + if(tgui_alert(usr, "This will open the Discord in your browser. Are you sure?","Visit Website",list("Yes","No"))=="No") + return + src << link(config.discordurl) + else + to_chat(src, "The Discord URL is not set in the server configuration.") + return + /client/verb/hotkeys_help() set name = "hotkeys-help" set category = "OOC" diff --git a/interface/skin.dmf b/interface/skin.dmf index b1d9a6267e2..1dbd0e6ab20 100644 --- a/interface/skin.dmf +++ b/interface/skin.dmf @@ -53,16 +53,16 @@ macro "borghotkeymode" elem name = "SOUTH+REP" command = ".movedown" - elem + elem name = "CTRL+SHIFT+NORTH" command = "shiftnorth" - elem + elem name = "CTRL+SHIFT+SOUTH" command = "shiftsouth" - elem + elem name = "CTRL+SHIFT+WEST" command = "shiftwest" - elem + elem name = "CTRL+SHIFT+EAST" command = "shifteast" elem @@ -286,16 +286,16 @@ macro "macro" elem name = "SOUTH+REP" command = ".movedown" - elem + elem name = "CTRL+SHIFT+NORTH" command = "shiftnorth" - elem + elem name = "CTRL+SHIFT+SOUTH" command = "shiftsouth" - elem + elem name = "CTRL+SHIFT+WEST" command = "shiftwest" - elem + elem name = "CTRL+SHIFT+EAST" command = "shifteast" elem @@ -471,16 +471,16 @@ macro "hotkeymode" elem name = "SOUTH+REP" command = ".movedown" - elem + elem name = "CTRL+SHIFT+NORTH" command = "shiftnorth" - elem + elem name = "CTRL+SHIFT+SOUTH" command = "shiftsouth" - elem + elem name = "CTRL+SHIFT+WEST" command = "shiftwest" - elem + elem name = "CTRL+SHIFT+EAST" command = "shifteast" elem @@ -606,10 +606,10 @@ macro "hotkeymode" elem name = "CTRL+Z" command = "Activate-Held-Object" - elem + elem name = "U" command = "Rest" - elem + elem name = "B" command = "Resist" elem @@ -725,16 +725,16 @@ macro "borgmacro" elem name = "SOUTH+REP" command = ".movedown" - elem + elem name = "CTRL+SHIFT+NORTH" command = "shiftnorth" - elem + elem name = "CTRL+SHIFT+SOUTH" command = "shiftsouth" - elem + elem name = "CTRL+SHIFT+WEST" command = "shiftwest" - elem + elem name = "CTRL+SHIFT+EAST" command = "shifteast" elem @@ -940,7 +940,7 @@ menu "menu" category = "&Icons" can-check = true saved-params = "is-checked" - elem + elem name = "&Scaling" command = "" saved-params = "is-checked" @@ -986,8 +986,8 @@ window "Telecomms IDE" type = MAIN pos = 281,0 size = 569x582 - anchor1 = none - anchor2 = none + anchor1 = -1,-1 + anchor2 = -1,-1 background-color = #ffffff is-visible = false saved-params = "pos;size;is-minimized;is-maximized" @@ -1066,8 +1066,8 @@ window "chemdispenser" type = MAIN pos = 281,0 size = 340x480 - anchor1 = none - anchor2 = none + anchor1 = -1,-1 + anchor2 = -1,-1 is-visible = false saved-params = "pos;size;is-minimized;is-maximized" title = "Chem Dispenser" @@ -1076,16 +1076,16 @@ window "chemdispenser" type = LABEL pos = 8,24 size = 56x16 - anchor1 = none - anchor2 = none + anchor1 = -1,-1 + anchor2 = -1,-1 saved-params = "" text = "Energy: 25" elem "eject" type = BUTTON pos = 264,4 size = 72x20 - anchor1 = none - anchor2 = none + anchor1 = -1,-1 + anchor2 = -1,-1 saved-params = "is-checked" text = "[Insert beaker]" command = "skincmd \"chemdispenser;eject\"" @@ -1093,8 +1093,8 @@ window "chemdispenser" type = BUTTON pos = 208,4 size = 48x20 - anchor1 = none - anchor2 = none + anchor1 = -1,-1 + anchor2 = -1,-1 saved-params = "is-checked" text = "[Other]" command = "skincmd \"chemdispenser;amountc\"" @@ -1102,8 +1102,8 @@ window "chemdispenser" type = BUTTON pos = 176,4 size = 24x20 - anchor1 = none - anchor2 = none + anchor1 = -1,-1 + anchor2 = -1,-1 saved-params = "is-checked" text = "[30]" command = "skincmd \"chemdispenser;amount30\"" @@ -1111,8 +1111,8 @@ window "chemdispenser" type = BUTTON pos = 144,4 size = 24x20 - anchor1 = none - anchor2 = none + anchor1 = -1,-1 + anchor2 = -1,-1 saved-params = "is-checked" text = "[20]" command = "skincmd \"chemdispenser;amount20\"" @@ -1120,8 +1120,8 @@ window "chemdispenser" type = BUTTON pos = 112,4 size = 24x20 - anchor1 = none - anchor2 = none + anchor1 = -1,-1 + anchor2 = -1,-1 saved-params = "is-checked" text = "[10]" command = "skincmd \"chemdispenser;amount10\"" @@ -1129,8 +1129,8 @@ window "chemdispenser" type = LABEL pos = 4,4 size = 100x20 - anchor1 = none - anchor2 = none + anchor1 = -1,-1 + anchor2 = -1,-1 font-size = 12 saved-params = "" text = "Amount: 30" @@ -1138,8 +1138,8 @@ window "chemdispenser" type = CHILD pos = 0,40 size = 340x440 - anchor1 = none - anchor2 = none + anchor1 = -1,-1 + anchor2 = -1,-1 saved-params = "splitter" left = "chemdispenser_reagents" is-vert = false @@ -1149,8 +1149,8 @@ window "chemdispenser_reagents" type = MAIN pos = 281,0 size = 340x448 - anchor1 = none - anchor2 = none + anchor1 = -1,-1 + anchor2 = -1,-1 saved-params = "pos;size;is-minimized;is-maximized" titlebar = false statusbar = false @@ -1163,8 +1163,8 @@ window "chemdispenser_reagents" type = BUTTON pos = 256,8 size = 64x32 - anchor1 = none - anchor2 = none + anchor1 = -1,-1 + anchor2 = -1,-1 is-visible = false saved-params = "is-checked" text = "Dispense" @@ -1175,8 +1175,8 @@ window "chemdispenser_reagents" type = LABEL pos = 18,8 size = 230x32 - anchor1 = none - anchor2 = none + anchor1 = -1,-1 + anchor2 = -1,-1 font-size = 15 is-visible = false saved-params = "" @@ -1189,8 +1189,8 @@ window "mainwindow" type = MAIN pos = 281,0 size = 640x440 - anchor1 = none - anchor2 = none + anchor1 = -1,-1 + anchor2 = -1,-1 is-default = true saved-params = "pos;size;is-minimized;is-maximized" title = "VOREStation" @@ -1202,17 +1202,16 @@ window "mainwindow" type = BROWSER pos = 0,0 size = 200x200 - anchor1 = none - anchor2 = none + anchor1 = -1,-1 + anchor2 = -1,-1 is-visible = false - auto-format = false saved-params = "" elem "hotkey_toggle" type = BUTTON pos = 560,420 size = 80x20 anchor1 = 100,100 - anchor2 = none + anchor2 = -1,-1 saved-params = "" text = "Hotkey Toggle" command = ".winset \"mainwindow.macro!=macro ? mainwindow.macro=macro hotkey_toggle.is-checked=false input.focus=true : mainwindow.macro=hotkeymode hotkey_toggle.is-checked=true mapwindow.map.focus=true\"" @@ -1241,7 +1240,7 @@ window "mainwindow" pos = 520,420 size = 40x20 anchor1 = 100,100 - anchor2 = none + anchor2 = -1,-1 saved-params = "is-checked" text = "Chat" command = ".winset \"saybutton.is-checked=true?input.command=\"!say \\\"\" macrobutton.is-checked=false:input.command=\"" @@ -1250,8 +1249,8 @@ window "mainwindow" type = BROWSER pos = 0,0 size = 999x999 - anchor1 = none - anchor2 = none + anchor1 = -1,-1 + anchor2 = -1,-1 is-visible = false saved-params = "" @@ -1260,8 +1259,8 @@ window "mapwindow" type = MAIN pos = 281,0 size = 640x480 - anchor1 = none - anchor2 = none + anchor1 = -1,-1 + anchor2 = -1,-1 saved-params = "pos;size;is-minimized;is-maximized" titlebar = false statusbar = false @@ -1282,16 +1281,15 @@ window "mapwindow" saved-params = "icon-size" on-show = ".winset\"mainwindow.mainvsplit.left=mapwindow\"" on-hide = ".winset\"mainwindow.mainvsplit.left=\"" - style=".center { text-align: center; } .runechatdiv {background-color: #20202070} .black_outline { -dm-text-outline: 1px black } .boldtext { font-weight: bold; } .maptext { font-family: 'Small Fonts'; font-size: 7px; color: white; line-height: 1.1; } .command_headset { font-weight: bold; font-size: 8px; } .small { font-size: 6px; } .very_small { font-size: 5px;} .big { font-size: 8px; } .reallybig { font-size: 8px; } .extremelybig { font-size: 8px; } .greentext { color: #00FF00; font-size: 7px; } .redtext { color: #FF0000; font-size: 7px; } .clown { color: #FF69Bf; font-size: 7px; font-weight: bold; } .his_grace { color: #15D512; } .hypnophrase { color: #0d0d0d; font-weight: bold; } .yell { font-weight: bold; } .italics { font-size: 7px; font-style: italic; }" + style = ".center { text-align: center; } .runechatdiv {background-color: #20202070} .black_outline { -dm-text-outline: 1px black } .boldtext { font-weight: bold; } .maptext { font-family: 'Small Fonts'; font-size: 7px; color: white; line-height: 1.1; } .command_headset { font-weight: bold;\tfont-size: 8px; } .small { font-size: 6px; } .very_small { font-size: 5px;} .big { font-size: 8px; } .reallybig { font-size: 8px; } .extremelybig { font-size: 8px; } .greentext { color: #00FF00; font-size: 7px; } .redtext { color: #FF0000; font-size: 7px; } .clown { color: #FF69Bf; font-size: 7px; font-weight: bold; } .his_grace { color: #15D512; } .hypnophrase { color: #0d0d0d; font-weight: bold; } .yell { font-weight: bold; } .italics { font-size: 7px; font-style: italic; }" window "outputwindow" elem "outputwindow" type = MAIN pos = 281,0 size = 640x480 - anchor1 = none - anchor2 = none - background-color = none + anchor1 = -1,-1 + anchor2 = -1,-1 saved-params = "pos;size;is-minimized;is-maximized" titlebar = false statusbar = false @@ -1299,7 +1297,6 @@ window "outputwindow" can-minimize = false can-resize = false is-pane = true - outer-size = 654x494 elem "chatloadlabel" type = LABEL pos = 0,0 @@ -1311,7 +1308,6 @@ window "outputwindow" font-style = "bold" text-color = #ffffff background-color = #222222 - is-visible = true saved-params = "" text = "Chat is loading.\nIf nothing happens after 20s,\nuse OOC > \"Reload VChat\"." elem "htmloutput" @@ -1320,100 +1316,105 @@ window "outputwindow" size = 640x480 anchor1 = 0,0 anchor2 = 100,100 - background-color = none is-visible = false saved-params = "" - auto-format = false elem "oldoutput" type = OUTPUT pos = 0,0 size = 640x480 anchor1 = 0,0 anchor2 = 100,100 - background-color = none - text-color = #000000 - background-color = #ffffff is-visible = false is-default = true - style = ".system {color:#FF0000;}" - max-lines = 0 saved-params = "" + style = ".system {color:#FF0000;}" enable-http-images = true + max-lines = 0 window "rpane" elem "rpane" type = MAIN pos = 281,0 size = 640x480 - anchor1 = none - anchor2 = none + anchor1 = -1,-1 + anchor2 = -1,-1 + background-color = none saved-params = "pos;size;is-minimized;is-maximized" is-pane = true + outer-size = 656x538 + inner-size = 640x499 elem "rpanewindow" type = CHILD pos = 0,-3 size = 640x499 anchor1 = 0,0 anchor2 = 100,100 + background-color = none saved-params = "splitter" right = "outputwindow" is-vert = false + elem "discord" + type = BUTTON + pos = 428,0 + size = 60x16 + anchor1 = -1,-1 + anchor2 = -1,-1 + background-color = none + saved-params = "is-checked" + text = "Discord" + command = "discord" + group = "rpanemode" elem "github" type = BUTTON - pos = 392,0 + pos = 368,0 size = 60x16 - anchor1 = none - anchor2 = none + anchor1 = -1,-1 + anchor2 = -1,-1 + background-color = none saved-params = "is-checked" text = "GitHub" command = "github" group = "rpanemode" elem "mapb" type = BUTTON - pos = 332,0 + pos = 308,0 size = 60x16 - anchor1 = none - anchor2 = none + anchor1 = -1,-1 + anchor2 = -1,-1 + background-color = none saved-params = "is-checked" text = "Map" command = "map" group = "rpanemode" elem "rulesb" type = BUTTON - pos = 272,0 + pos = 248,0 size = 60x16 - anchor1 = none - anchor2 = none + anchor1 = -1,-1 + anchor2 = -1,-1 + background-color = none saved-params = "is-checked" text = "Rules" command = "rules" group = "rpanemode" - elem "changelog" - type = BUTTON - pos = 488,0 - size = 67x16 - anchor1 = none - anchor2 = none - saved-params = "is-checked" - text = "Changelog" - command = "Changelog" - group = "rpanemode" elem "forumb" type = BUTTON - pos = 212,0 + pos = 188,0 size = 60x16 - anchor1 = none - anchor2 = none + anchor1 = -1,-1 + anchor2 = -1,-1 + background-color = none saved-params = "is-checked" text = "Forum" command = "forum" group = "rpanemode" elem "wikib" type = BUTTON - pos = 152,0 + pos = 128,0 size = 60x16 - anchor1 = none - anchor2 = none + anchor1 = -1,-1 + anchor2 = -1,-1 + background-color = none saved-params = "is-checked" text = "Wiki" command = "wiki" @@ -1422,8 +1423,9 @@ window "rpane" type = BUTTON pos = 0,0 size = 60x16 - anchor1 = none - anchor2 = none + anchor1 = -1,-1 + anchor2 = -1,-1 + background-color = none is-visible = false saved-params = "is-checked" text = "Text" @@ -1433,10 +1435,11 @@ window "rpane" button-type = pushbox elem "browseb" type = BUTTON - pos = 560,0 + pos = 580,0 size = 60x16 - anchor1 = none - anchor2 = none + anchor1 = 100,0 + anchor2 = 100,0 + background-color = none is-visible = false saved-params = "is-checked" text = "Browser" @@ -1445,10 +1448,11 @@ window "rpane" button-type = pushbox elem "infob" type = BUTTON - pos = 64,0 + pos = 60,0 size = 60x16 - anchor1 = none - anchor2 = none + anchor1 = -1,-1 + anchor2 = -1,-1 + background-color = none is-visible = false saved-params = "is-checked" text = "Info" @@ -1459,8 +1463,9 @@ window "rpane" type = BROWSER pos = 392,25 size = 1x1 - anchor1 = none - anchor2 = none + anchor1 = -1,-1 + anchor2 = -1,-1 + background-color = none is-visible = false saved-params = "" @@ -1469,8 +1474,8 @@ window "browserwindow" type = MAIN pos = 281,0 size = 640x480 - anchor1 = none - anchor2 = none + anchor1 = -1,-1 + anchor2 = -1,-1 saved-params = "pos;size;is-minimized;is-maximized" title = "Browser" is-pane = true @@ -1491,8 +1496,8 @@ window "preferences_window" type = MAIN pos = 281,0 size = 1000x800 - anchor1 = none - anchor2 = none + anchor1 = -1,-1 + anchor2 = -1,-1 is-visible = false saved-params = "pos;size;is-minimized;is-maximized" statusbar = false @@ -1510,14 +1515,15 @@ window "preferences_window" anchor1 = 80,0 anchor2 = 100,100 right-click = true + saved-params = "zoom;letterbox;zoom-mode" window "infowindow" elem "infowindow" type = MAIN pos = 281,0 size = 640x480 - anchor1 = none - anchor2 = none + anchor1 = -1,-1 + anchor2 = -1,-1 saved-params = "pos;size;is-minimized;is-maximized" title = "Info" is-pane = true @@ -1538,8 +1544,8 @@ window "text_editor" type = MAIN pos = 281,0 size = 360x488 - anchor1 = none - anchor2 = none + anchor1 = -1,-1 + anchor2 = -1,-1 is-visible = false border = sunken saved-params = "pos;size;is-minimized;is-maximized" @@ -1550,8 +1556,8 @@ window "text_editor" type = BUTTON pos = 248,456 size = 104x24 - anchor1 = none - anchor2 = none + anchor1 = -1,-1 + anchor2 = -1,-1 saved-params = "is-checked" text = "Exit without saving" command = "" @@ -1559,8 +1565,8 @@ window "text_editor" type = BUTTON pos = 128,456 size = 104x24 - anchor1 = none - anchor2 = none + anchor1 = -1,-1 + anchor2 = -1,-1 saved-params = "is-checked" text = "Save" command = "" @@ -1568,8 +1574,8 @@ window "text_editor" type = BUTTON pos = 8,456 size = 104x24 - anchor1 = none - anchor2 = none + anchor1 = -1,-1 + anchor2 = -1,-1 saved-params = "is-checked" text = "Save + Exit" command = "" @@ -1577,8 +1583,8 @@ window "text_editor" type = INPUT pos = 0,0 size = 360x448 - anchor1 = none - anchor2 = none + anchor1 = -1,-1 + anchor2 = -1,-1 border = line saved-params = "" multi-line = true