From 1a1882287d929aa5c74a6f05d117557ef399ae6a Mon Sep 17 00:00:00 2001 From: Ty-Omaha Date: Fri, 24 Aug 2018 14:46:01 -0400 Subject: [PATCH 1/3] button stuff --- code/controllers/configuration.dm | 6 +++++- interface/interface.dm | 12 ++++++++++++ interface/skin.dmf | 19 +++++++++++++++---- 3 files changed, 32 insertions(+), 5 deletions(-) diff --git a/code/controllers/configuration.dm b/code/controllers/configuration.dm index 7f60fd0cac3..5b2bb73b3bf 100644 --- a/code/controllers/configuration.dm +++ b/code/controllers/configuration.dm @@ -85,6 +85,7 @@ var/githuburl = "http://example.org" var/donationsurl = "http://example.org" var/repositoryurl = "http://example.org" + var/discordurl ="http://example.org" var/overflow_server_url var/forbid_singulo_possession = 0 @@ -388,7 +389,10 @@ if("githuburl") config.githuburl = value - + + if("discordurl") + config.discordurl = value + if("donationsurl") config.donationsurl = value diff --git a/interface/interface.dm b/interface/interface.dm index eb99b7dd0fd..0aa6636b335 100644 --- a/interface/interface.dm +++ b/interface/interface.dm @@ -78,6 +78,18 @@ to_chat(src, "The GitHub URL is not set in the server configuration.") return +/client/verb/discord() + set name = "Discord" + set desc = "Join our Discord server." + set hidden = 1 + if(config.discordurl) + if(alert("This will invite you to our Discord server. Are you sure?",,"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/donate() set name = "Donate" set desc = "Donate to help with hosting costs." diff --git a/interface/skin.dmf b/interface/skin.dmf index 813abc66b98..1a852ce94e9 100644 --- a/interface/skin.dmf +++ b/interface/skin.dmf @@ -1674,18 +1674,29 @@ window "rpane" size = 67x16 text = "Changelog" command = "Changelog" - elem "karma" + elem "discordb" type = BUTTON pos = 487,0 - size = 67x16 + size = 60x16 + background-color = #7289DA + text-color = #FFFFFF + font-style = bold + text = "Discord" + command = "discord" + elem "karma" + type = BUTTON + pos = 552,0 + size = 77x16 background-color = #ff8040 + font-style = bold text = "Karma Shop" command = "karmashop" elem "donate" type = BUTTON - pos = 559,0 + pos = 634,0 size = 60x16 - background-color = #8080ff + background-color = #008000 + font-style = bold text = "Donate" command = "Donate" elem "browseb" From aee8c926dd3117676f5bd3eb310d12a442c84bc9 Mon Sep 17 00:00:00 2001 From: Ty-Omaha Date: Fri, 24 Aug 2018 15:40:53 -0400 Subject: [PATCH 2/3] spacing --- code/controllers/configuration.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/controllers/configuration.dm b/code/controllers/configuration.dm index 5b2bb73b3bf..1919df19ae6 100644 --- a/code/controllers/configuration.dm +++ b/code/controllers/configuration.dm @@ -85,7 +85,7 @@ var/githuburl = "http://example.org" var/donationsurl = "http://example.org" var/repositoryurl = "http://example.org" - var/discordurl ="http://example.org" + var/discordurl = "http://example.org" var/overflow_server_url var/forbid_singulo_possession = 0 @@ -786,4 +786,4 @@ if(M.can_start()) runnable_modes[M] = probabilities[M.config_tag] // to_chat(world, "DEBUG: runnable_mode\[[runnable_modes.len]\] = [M.config_tag]") - return runnable_modes \ No newline at end of file + return runnable_modes From aa65a2cabec8d215dd2722d7dba4428fa6761924 Mon Sep 17 00:00:00 2001 From: Ty-Omaha Date: Sat, 25 Aug 2018 07:51:51 -0400 Subject: [PATCH 3/3] example --- config/example/config.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/config/example/config.txt b/config/example/config.txt index c8bdc8cffc9..08792117b1f 100644 --- a/config/example/config.txt +++ b/config/example/config.txt @@ -183,6 +183,9 @@ CHECK_RANDOMIZER ## GitHub address # GITHUBURL http://example.org +## Discord address +# DISCORDURL http://example.org + ## Donations address # DONATIONSURL http://example.org