mirror of
https://github.com/CHOMPstation/CHOMPstation.git
synced 2026-07-16 09:32:47 +01:00
Merge branch 'master' into virgoPull
This commit is contained in:
@@ -1,20 +1,19 @@
|
||||
/proc/send2irc(var/channel, var/msg)
|
||||
if(config.use_irc_bot && config.irc_bot_host)
|
||||
for(var/IP in config.irc_bot_host)
|
||||
spawn(0)
|
||||
log_debug("send2irc: Sending [msg] to [channel]")
|
||||
paranoid_sanitize(msg)
|
||||
ext_python("ircbot_message.py", "[config.comms_password] [IP] [channel] [dbcon.Quote(msg)]")
|
||||
if(config.use_irc_bot)
|
||||
log_debug("send2irc: Sending [msg] to [channel]")
|
||||
paranoid_sanitize(msg)
|
||||
ext_python("ircbot_message.py", "[config.comms_password] [config.irc_bot_host] [channel] [dbcon.Quote(msg)]")
|
||||
return
|
||||
|
||||
/proc/send2mainirc(var/msg)
|
||||
if(config.main_irc)
|
||||
log_debug("send2mainirc: Sending [msg] to send2irc")
|
||||
send2irc(config.main_irc, msg)
|
||||
return
|
||||
|
||||
/proc/send2adminirc(var/msg)
|
||||
var/queuedmsg = "ADMIN - [msg]"
|
||||
|
||||
log_debug("send2adminirc: Sending [queuedmsg] to send2irc")
|
||||
send2irc(config.admin_irc, queuedmsg)
|
||||
return
|
||||
|
||||
|
||||
@@ -18,10 +18,10 @@
|
||||
|
||||
/proc/ext_python(var/script, var/args, var/scriptsprefix = 1)
|
||||
if(scriptsprefix) script = "scripts/" + script
|
||||
|
||||
if(world.system_type == MS_WINDOWS)
|
||||
script = replacetext(script, "/", "\\")
|
||||
|
||||
var/command = config.python_path + " " + script + " " + args
|
||||
log_debug("ext_python: Sending [command] to shell")
|
||||
shell("[command]")
|
||||
return
|
||||
|
||||
Reference in New Issue
Block a user