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

Merge remote-tracking branch 'upstream/master' into dev-freeze

Browse Source 
Conflicts:
	config/example/config.txt
This commit is contained in:
PsiOmegaDelta
2015-06-19 09:55:48 +02:00
parent 078cfb2533 eea423ce0f
commit f5da9f70c5
3 changed files with 30 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
code/controllers/configuration.dm
View File

@@ -91,6 +91,7 @@ var/list/gamemode_cache = list()
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
@@ -163,6 +164,7 @@ var/list/gamemode_cache = list()
var/use_irc_bot = 0 var/use_irc_bot = 0
var/irc_bot_host = "" var/irc_bot_host = ""
var/irc_bot_export = 0 // whether the IRC bot in use is a Bot32 (or similar) instance; Bot32 uses world.Export() instead of nudge.py/libnudge
var/main_irc = "" var/main_irc = ""
var/admin_irc = "" var/admin_irc = ""
var/python_path = "" //Path to the python executable. Defaults to "python" on windows and "/usr/bin/env python2" on unix var/python_path = "" //Path to the python executable. Defaults to "python" on windows and "/usr/bin/env python2" on unix
@@ -384,6 +386,9 @@ var/list/gamemode_cache = list()
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
@@ -499,6 +504,9 @@ var/list/gamemode_cache = list()
if("use_irc_bot") if("use_irc_bot")
use_irc_bot = 1 use_irc_bot = 1
if("irc_bot_export")
irc_bot_export = 1
if("ticklag") if("ticklag")
Ticklag = text2num(value) Ticklag = text2num(value)

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

@@ -1,5 +1,8 @@
/proc/send2irc(var/channel, var/msg) /proc/send2irc(var/channel, var/msg)
if(config.use_irc_bot && config.irc_bot_host) if(config.use_irc_bot && config.irc_bot_host)
if(config.irc_bot_export)
world.Export("http://[config.irc_bot_host]:45678?[list2params(list(pwd=config.comms_password, chan=channel, mesg=msg))]")
else
if(config.use_lib_nudge) if(config.use_lib_nudge)
var/nudge_lib var/nudge_lib
if(world.system_type == MS_WINDOWS) if(world.system_type == MS_WINDOWS)
@@ -26,6 +29,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

7
config/example/config.txt
View File

@@ -174,6 +174,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
@@ -241,6 +245,9 @@ USEALIENWHITELIST
## Uncomment to enable sending data to the IRC bot. ## Uncomment to enable sending data to the IRC bot.
#USE_IRC_BOT #USE_IRC_BOT
## Uncomment if the IRC bot requires using world.Export() instead of nudge.py/libnudge
#IRC_BOT_EXPORT
## Host where the IRC bot is hosted. Port 45678 needs to be open. ## Host where the IRC bot is hosted. Port 45678 needs to be open.
#IRC_BOT_HOST localhost #IRC_BOT_HOST localhost