From 10277880ee7180f711c1638131aa728e52d86cc7 Mon Sep 17 00:00:00 2001 From: SinTwo Date: Sun, 6 Dec 2015 01:47:38 -0500 Subject: [PATCH] Map and GitHub buttons --- code/controllers/configuration.dm | 4 ++ interface/interface.dm | 26 +++++++++++ interface/skin.dmf | 72 ++++++++++++++++++++++++++++--- 3 files changed, 97 insertions(+), 5 deletions(-) diff --git a/code/controllers/configuration.dm b/code/controllers/configuration.dm index e3037d8dbd..0c88772aeb 100644 --- a/code/controllers/configuration.dm +++ b/code/controllers/configuration.dm @@ -100,6 +100,7 @@ var/list/gamemode_cache = list() var/forumurl var/githuburl var/rulesurl + var/mapurl //Alert level description var/alert_desc_green = "All threats to the station have passed. Security may not have weapons visible, privacy laws are once again fully enforced." @@ -421,6 +422,9 @@ var/list/gamemode_cache = list() if ("rulesurl") config.rulesurl = value + if ("mapurl") + config.mapurl = value + if ("githuburl") config.githuburl = value if ("guest_jobban") diff --git a/interface/interface.dm b/interface/interface.dm index f5252b0063..51136da4fb 100644 --- a/interface/interface.dm +++ b/interface/interface.dm @@ -38,6 +38,32 @@ src << "The rules URL is not set in the server configuration." return +/client/verb/map() + set name = "Map" + set desc = "See the map." + set hidden = 1 + + if(config.mapurl) + if(alert("This will open the map in your browser. Are you sure?",,"Yes","No")=="No") + return + src << link(config.mapurl) + else + src << "The map URL is not set in the server configuration." + return + +/client/verb/github() + set name = "GitHub" + set desc = "Visit the GitHub" + set hidden = 1 + + if(config.githuburl) + if(alert("This will open the GitHub in your browser. Are you sure?",,"Yes","No")=="No") + return + src << link(config.githuburl) + else + src << "The GitHub 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 879afcf3ae..59d3d78431 100644 --- a/interface/skin.dmf +++ b/interface/skin.dmf @@ -1366,6 +1366,8 @@ window "chemdispenser" keep-aspect = false align = center text-wrap = false + allow-html = false + letterbox = true elem "eject" type = BUTTON pos = 264,4 @@ -1532,6 +1534,8 @@ window "chemdispenser" keep-aspect = false align = center text-wrap = false + allow-html = false + letterbox = true elem "child1" type = CHILD pos = 0,40 @@ -1653,6 +1657,8 @@ window "chemdispenser_reagents" keep-aspect = false align = center text-wrap = false + allow-html = false + letterbox = true window "mainwindow" elem "mainwindow" @@ -1978,7 +1984,7 @@ window "rpane" on-close = "" elem "rpanewindow" type = CHILD - pos = 0,0 + pos = 0,-3 size = 640x499 anchor1 = 0,0 anchor2 = 100,100 @@ -2002,9 +2008,65 @@ window "rpane" splitter = 50 show-splitter = true lock = none + elem "github" + type = BUTTON + pos = 392,0 + size = 60x16 + anchor1 = none + anchor2 = none + font-family = "" + font-size = 0 + font-style = "" + text-color = #000000 + background-color = none + is-visible = true + is-disabled = false + is-transparent = false + is-default = false + border = none + drop-zone = false + right-click = false + saved-params = "is-checked" + on-size = "" + text = "GitHub" + image = "" + command = "github" + is-flat = false + stretch = false + is-checked = false + group = "rpanemode" + button-type = pushbutton + elem "mapb" + type = BUTTON + pos = 332,0 + size = 60x16 + anchor1 = none + anchor2 = none + font-family = "" + font-size = 0 + font-style = "" + text-color = #000000 + background-color = none + is-visible = true + is-disabled = false + is-transparent = false + is-default = false + border = none + drop-zone = false + right-click = false + saved-params = "is-checked" + on-size = "" + text = "Map" + image = "" + command = "map" + is-flat = false + stretch = false + is-checked = false + group = "rpanemode" + button-type = pushbutton elem "rulesb" type = BUTTON - pos = 278,0 + pos = 272,0 size = 60x16 anchor1 = none anchor2 = none @@ -2032,7 +2094,7 @@ window "rpane" button-type = pushbutton elem "changelog" type = BUTTON - pos = 341,0 + pos = 488,0 size = 67x16 anchor1 = none anchor2 = none @@ -2060,7 +2122,7 @@ window "rpane" button-type = pushbutton elem "forumb" type = BUTTON - pos = 215,0 + pos = 212,0 size = 60x16 anchor1 = none anchor2 = none @@ -2144,7 +2206,7 @@ window "rpane" button-type = pushbox elem "browseb" type = BUTTON - pos = 464,0 + pos = 560,0 size = 60x16 anchor1 = none anchor2 = none