From a60b91fd1bfb2a9ea2e8067f69e260f4509191f4 Mon Sep 17 00:00:00 2001
From: GinjaNinja32 <ginjaninja32@gmail.com>
Date: Wed, 17 Jun 2015 10:00:35 +0100
Subject: [PATCH] Adds a new configuration value, SERVERURL, for the IRC bot to
 use if set

---
 code/controllers/configuration.dm |  4 ++++
 code/modules/ext_scripts/irc.dm   |  2 +-
 config/example/config.txt         | 24 ++++++++++++++----------
 3 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/code/controllers/configuration.dm b/code/controllers/configuration.dm
index caed2c734c..166582a227 100644
--- a/code/controllers/configuration.dm
+++ b/code/controllers/configuration.dm
@@ -86,6 +86,7 @@
 	var/guests_allowed = 1
 	var/debugparanoid = 0
 
+	var/serverurl
 	var/server
 	var/banappeals
 	var/wikiurl
@@ -365,6 +366,9 @@
 				if ("hostedby")
 					config.hostedby = value
 
+				if ("serverurl")
+					config.serverurl = value
+
 				if ("server")
 					config.server = value
 
diff --git a/code/modules/ext_scripts/irc.dm b/code/modules/ext_scripts/irc.dm
index 8006652139..aa8f9f3a7f 100644
--- a/code/modules/ext_scripts/irc.dm
+++ b/code/modules/ext_scripts/irc.dm
@@ -26,6 +26,6 @@
 
 
 /hook/startup/proc/ircNotify()
-	send2mainirc("Server starting up on [config.server? "byond://[config.server]" : "byond://[world.address]:[world.port]"]")
+	send2mainirc("Server starting up on byond://[config.serverurl ? config.serverurl : (config.server ? config.server : "[world.address]:[world.port]")]")
 	return 1
 
diff --git a/config/example/config.txt b/config/example/config.txt
index 6119ab7cfd..f38e66f46f 100644
--- a/config/example/config.txt
+++ b/config/example/config.txt
@@ -73,12 +73,12 @@ LOG_PDA
 ## disconnect players who did nothing during 10 minutes
 # KICK_INACTIVE
 
-## Use Mentors instead of Moderators.  Mentors are designed with the idea that
-###they help in pushing new people to be better at roleplay.  If you uncomment
-###this it will reduce the rights that your mods have.
-#MENTORS
-
-
+## Use Mentors instead of Moderators.  Mentors are designed with the idea that
+###they help in pushing new people to be better at roleplay.  If you uncomment
+###this it will reduce the rights that your mods have.
+#MENTORS
+
+
 ## probablities for game modes chosen in "secret" and "random" modes
 ## 
 ## default probablity is 1, increase to make that mode more likely to be picked
@@ -100,9 +100,9 @@ TRAITOR_SCALING
 ## if objectives are disabled
 #OBJECTIVES_DISABLED
 
-## make ERT's be only called by admins
-#ERT_ADMIN_ONLY
-
+## make ERT's be only called by admins
+#ERT_ADMIN_ONLY
+
 ## If security is prohibited from being most antagonists
 #PROTECT_ROLES_FROM_ANTAGONIST
 
@@ -171,6 +171,10 @@ GUEST_BAN
 ## set a server location for world reboot. Don't include the byond://, just give the address and port.
 #SERVER server.net:port
 
+## set a server URL for the IRC bot to use; like SERVER, don't include the byond://
+## Unlike SERVER, this one shouldn't break auto-reconnect
+#SERVERURL server.net:port
+
 ## forum address
 # FORUMURL http://example.com
 
@@ -265,7 +269,7 @@ REQ_CULT_GHOSTWRITER 6
 CHARACTER_SLOTS 10
 
 ## Uncomment to use overmap system for zlevel travel
-#USE_OVERMAP
+#USE_OVERMAP
 
 ## Defines which Z-levels the station exists on. 
 STATION_LEVELS 1