From 0d14417a07d6ebf6ff1f4420f7b532524f1eb2e1 Mon Sep 17 00:00:00 2001 From: "elly1989@rocketmail.com" Date: Wed, 25 Apr 2012 03:29:55 +0000 Subject: [PATCH] Adds a forum and wiki button to the game interface. Set the urls within config.txt. Both buttons do nothing by default, you have to set the urls yourself. Removed two unused txt files that I forgot to remove. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3502 316c924e-a436-60f5-8080-3fe189b3f50e --- code/datums/configuration.dm | 10 ++++- code/game/objects/transfer_valve.dm | 1 - config/config.txt | 6 +++ config/motd-auth.txt | 1 - config/motd-noauth.txt | 0 interface/interface.dm | 15 +++++++ interface/skin.dmf | 62 +++++++++++++++++++++++++++-- tgstation.dme | 1 + 8 files changed, 90 insertions(+), 6 deletions(-) delete mode 100644 config/motd-auth.txt delete mode 100644 config/motd-noauth.txt create mode 100644 interface/interface.dm diff --git a/code/datums/configuration.dm b/code/datums/configuration.dm index c50afadb60..5abaae459d 100644 --- a/code/datums/configuration.dm +++ b/code/datums/configuration.dm @@ -2,7 +2,7 @@ var/server_name = null // server name (for world name / status) var/server_suffix = 0 // generate numeric suffix based on server port - var/log_ooc = 0 // log OOC channek + var/log_ooc = 0 // log OOC channel var/log_access = 0 // log login/logout var/log_say = 0 // log client say var/log_admin = 0 // log admin actions @@ -49,6 +49,8 @@ var/server var/banappeals + var/wikiurl + var/forumurl //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." @@ -215,6 +217,12 @@ if ("banappeals") config.banappeals = value + if ("wikiurl") + config.wikiurl = value + + if ("forumurl") + config.forumurl = value + if ("guest_jobban") config.guest_jobban = 1 diff --git a/code/game/objects/transfer_valve.dm b/code/game/objects/transfer_valve.dm index 39660bbbe6..395e7cd4ec 100644 --- a/code/game/objects/transfer_valve.dm +++ b/code/game/objects/transfer_valve.dm @@ -75,7 +75,6 @@ onclose(user, "trans_valve") return - //CARN: MARKER Topic(href, href_list) ..() if ( usr.stat || usr.restrained() ) diff --git a/config/config.txt b/config/config.txt index 8b584de994..6f1a9c1c45 100644 --- a/config/config.txt +++ b/config/config.txt @@ -122,6 +122,12 @@ HOSTEDBY Yournamehere ## set a server location for world reboot. Don't include the byond://, just give the address and port. # SERVER ss13.example.com:2506 +## forum address +# FORUMURL http://justanotherday.example.com + +## Wiki address +# WIKIURL http://www.nanotrasen.com/wiki/index.php + ## Ban appeals URL - usually for a forum or wherever people should go to contact your admins. # BANAPPEALS http://justanotherday.example.com diff --git a/config/motd-auth.txt b/config/motd-auth.txt deleted file mode 100644 index e5d6c79322..0000000000 --- a/config/motd-auth.txt +++ /dev/null @@ -1 +0,0 @@ -Boom boom tap, a-Boom boomboom tap \ No newline at end of file diff --git a/config/motd-noauth.txt b/config/motd-noauth.txt deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/interface/interface.dm b/interface/interface.dm new file mode 100644 index 0000000000..e2f1a0406b --- /dev/null +++ b/interface/interface.dm @@ -0,0 +1,15 @@ +/client/verb/wiki() + set name = "wiki" + set desc = "Visit the wiki." + set hidden = 1 + if( config.wikiurl ) + src << link(config.wikiurl) + return + +/client/verb/forum() + set name = "forum" + set desc = "Visit the forum." + set hidden = 1 + if( config.forumurl ) + src << link(config.forumurl) + return \ No newline at end of file diff --git a/interface/skin.dmf b/interface/skin.dmf index 3656ac18b2..4ef8537e69 100644 --- a/interface/skin.dmf +++ b/interface/skin.dmf @@ -1171,10 +1171,66 @@ window "rpane" splitter = 50 show-splitter = true lock = none + elem "forumb" + type = BUTTON + pos = 260,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 = "Forum" + image = "" + command = "forum" + is-flat = false + stretch = false + is-checked = false + group = "rpanemode" + button-type = pushbutton + elem "wikib" + type = BUTTON + pos = 195,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 = "Wiki" + image = "" + command = "wiki" + is-flat = false + stretch = false + is-checked = false + group = "rpanemode" + button-type = pushbutton elem "textb" type = BUTTON pos = 0,0 - size = 60x20 + size = 60x16 anchor1 = none anchor2 = none font-family = "" @@ -1202,7 +1258,7 @@ window "rpane" elem "browseb" type = BUTTON pos = 65,0 - size = 60x20 + size = 60x16 anchor1 = none anchor2 = none font-family = "" @@ -1230,7 +1286,7 @@ window "rpane" elem "infob" type = BUTTON pos = 130,0 - size = 60x20 + size = 60x16 anchor1 = none anchor2 = none font-family = "" diff --git a/tgstation.dme b/tgstation.dme index aa77e8c211..3fa563ded7 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -1067,6 +1067,7 @@ #include "code\WorkInProgress\mapload\reader.dm" #include "code\WorkInProgress\organs\implants.dm" #include "code\WorkInProgress\organs\organs.dm" +#include "interface\interface.dm" #include "interface\skin.dmf" #include "maps\tgstation.2.0.8.dmm" // END_INCLUDE