From 265dd6e888bbbc9319924079b1ba7bdbd75d51a5 Mon Sep 17 00:00:00 2001 From: Erthilo Date: Sun, 6 May 2012 01:22:29 +0100 Subject: [PATCH] TG: 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. Revision: r3502 Author: elly1...@rocketmail.com --- baystation12.dme | 1 + code/datums/configuration.dm | 10 ++++- code/game/objects/transfer_valve.dm | 1 - config/config.txt | 6 +++ config/motd-auth.txt | 1 - html/changelog.html | 22 ++++++++++ interface/interface.dm | 15 +++++++ interface/skin.dmf | 64 +++++++++++++++++++++++++++-- 8 files changed, 113 insertions(+), 7 deletions(-) delete mode 100644 config/motd-auth.txt create mode 100644 interface/interface.dm diff --git a/baystation12.dme b/baystation12.dme index 786e75059d7..e3380e26203 100644 --- a/baystation12.dme +++ b/baystation12.dme @@ -1183,6 +1183,7 @@ #include "code\WorkInProgress\virus2\monkeydispensor.dm" #include "code\WorkInProgress\virus2\Prob.dm" #include "code\WorkInProgress\Wrongnumber\weldbackpack.dm" +#include "interface\interface.dm" #include "interface\skin.dmf" #include "maps\tgstation.2.0.8.dmm" // END_INCLUDE diff --git a/code/datums/configuration.dm b/code/datums/configuration.dm index 0dc45640b36..ca79489d257 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." @@ -218,6 +220,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 39660bbbe6f..395e7cd4ecf 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 b8d5df218a8..0fc6f68b5e2 100644 --- a/config/config.txt +++ b/config/config.txt @@ -126,6 +126,12 @@ GUEST_JOBBAN 1 ## 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://baystation12.net/forums/ + +## Wiki address +# WIKIURL http://baystation12.net/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 e5d6c79322e..00000000000 --- 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/html/changelog.html b/html/changelog.html index df3646f6f31..e8b4007cb1c 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -47,6 +47,28 @@ Stuff which is in development and not yet visible to players or just code relate should be listed in the changelog upon commit though. Thanks. --> +
+

06 May 2012

+

TG updated:

+ +
+

05 May 2012

Erthilo updated:

diff --git a/interface/interface.dm b/interface/interface.dm new file mode 100644 index 00000000000..3cf23dfabeb --- /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 4cc3f89132e..1fc01b3ed12 100644 --- a/interface/skin.dmf +++ b/interface/skin.dmf @@ -1340,10 +1340,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 = "" @@ -1371,7 +1427,7 @@ window "rpane" elem "browseb" type = BUTTON pos = 65,0 - size = 60x20 + size = 60x16 anchor1 = none anchor2 = none font-family = "" @@ -1379,7 +1435,7 @@ window "rpane" font-style = "" text-color = #000000 background-color = none - is-visible = false + is-visible = true is-disabled = false is-transparent = false is-default = false @@ -1399,7 +1455,7 @@ window "rpane" elem "infob" type = BUTTON pos = 130,0 - size = 60x20 + size = 60x16 anchor1 = none anchor2 = none font-family = ""