cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 03:33:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9846 from GinjaNinja32/irc

Browse Source 
Allows setting the URL for the IRC bot to report separately from the main SERVER config setting
This commit is contained in:
Ccomp5950
2015-06-18 13:46:32 -04:00
parent 93c3d03801 a60b91fd1b
commit 7ee7cafbff
3 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/controllers/configuration.dm
View File

@@ -86,6 +86,7 @@
var/guests_allowed = 1 var/guests_allowed = 1
var/debugparanoid = 0 var/debugparanoid = 0
var/serverurl
var/server var/server
var/banappeals var/banappeals
var/wikiurl var/wikiurl
@@ -365,6 +366,9 @@
if ("hostedby") if ("hostedby")
config.hostedby = value config.hostedby = value
if ("serverurl")
config.serverurl = value
if ("server") if ("server")
config.server = value config.server = value

2
code/modules/ext_scripts/irc.dm
View File

@@ -26,6 +26,6 @@
/hook/startup/proc/ircNotify() /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 return 1

24
config/example/config.txt
View File

@@ -73,12 +73,12 @@ LOG_PDA
## disconnect players who did nothing during 10 minutes ## disconnect players who did nothing during 10 minutes
# KICK_INACTIVE # KICK_INACTIVE
## Use Mentors instead of Moderators. Mentors are designed with the idea that ## 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 ###they help in pushing new people to be better at roleplay. If you uncomment
###this it will reduce the rights that your mods have. ###this it will reduce the rights that your mods have.
#MENTORS #MENTORS
## probablities for game modes chosen in "secret" and "random" modes ## probablities for game modes chosen in "secret" and "random" modes
## ##
## default probablity is 1, increase to make that mode more likely to be picked ## default probablity is 1, increase to make that mode more likely to be picked
@@ -100,9 +100,9 @@ TRAITOR_SCALING
## if objectives are disabled ## if objectives are disabled
#OBJECTIVES_DISABLED #OBJECTIVES_DISABLED
## make ERT's be only called by admins ## make ERT's be only called by admins
#ERT_ADMIN_ONLY #ERT_ADMIN_ONLY
## If security is prohibited from being most antagonists ## If security is prohibited from being most antagonists
#PROTECT_ROLES_FROM_ANTAGONIST #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. ## set a server location for world reboot. Don't include the byond://, just give the address and port.
#SERVER server.net: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 ## forum address
# FORUMURL http://example.com # FORUMURL http://example.com
@@ -265,7 +269,7 @@ REQ_CULT_GHOSTWRITER 6
CHARACTER_SLOTS 10 CHARACTER_SLOTS 10
## Uncomment to use overmap system for zlevel travel ## Uncomment to use overmap system for zlevel travel
#USE_OVERMAP #USE_OVERMAP
## Defines which Z-levels the station exists on. ## Defines which Z-levels the station exists on.
STATION_LEVELS 1 STATION_LEVELS 1