Original mirrored too much.

This commit is contained in:
LetterJay
2017-06-05 07:18:29 -05:00
parent b93c49bd1d
commit 60da3ff9b8
12 changed files with 238 additions and 83 deletions
+14 -9
View File
@@ -28,7 +28,8 @@
SetupLogs()
GLOB.revdata.DownloadPRDetails()
if(!RunningService()) //tgs2 support
GLOB.revdata.DownloadPRDetails()
load_motd()
load_admins()
@@ -40,7 +41,8 @@
GLOB.timezoneOffset = text2num(time2text(0,"hh")) * 36000
Master.Initialize(10, FALSE)
if(config.irc_announce_new_game)
IRCBroadcast("New round starting on [SSmapping.config.map_name]!")
/world/proc/SetupExternalRSC()
#if (PRELOAD_RSC == 0)
@@ -88,14 +90,15 @@
if(GLOB.round_id)
log_game("Round ID: [GLOB.round_id]")
#define IRC_STATUS_THROTTLE 50
/world/Topic(T, addr, master, key)
if(config && config.log_world_topic)
GLOB.world_game_log << "TOPIC: \"[T]\", from:[addr], master:[master], key:[key]"
var/list/input = params2list(T)
if(input[SERVICE_CMD_PARAM_KEY])
return ServiceCommand(input)
var/key_valid = (global.comms_allowed && input["key"] == global.comms_key)
var/static/last_irc_status = 0
if("ping" in input)
var/x = 1
@@ -110,8 +113,9 @@
n++
return n
else if("ircstatus" in input)
if(world.time - last_irc_status < IRC_STATUS_THROTTLE)
else if("ircstatus" in input) //tgs2 support
var/static/last_irc_status = 0
if(world.time - last_irc_status < 50)
return
var/list/adm = get_admin_counts()
var/list/allmins = adm["total"]
@@ -179,20 +183,20 @@
if(input["crossmessage"] == "News_Report")
minor_announce(input["message"], "Breaking Update From [input["message_sender"]]")
else if("adminmsg" in input)
else if("adminmsg" in input) //tgs2 support
if(!key_valid)
return "Bad Key"
else
return IrcPm(input["adminmsg"],input["msg"],input["sender"])
else if("namecheck" in input)
else if("namecheck" in input) //tgs2 support
if(!key_valid)
return "Bad Key"
else
log_admin("IRC Name Check: [input["sender"]] on [input["namecheck"]]")
message_admins("IRC name checking on [input["namecheck"]] from [input["sender"]]")
return keywords_lookup(input["namecheck"],1)
else if("adminwho" in input)
else if("adminwho" in input) //tgs2 support
if(!key_valid)
return "Bad Key"
else
@@ -218,6 +222,7 @@
C.AnnouncePR(final_composed)
/world/Reboot(reason = 0, fast_track = FALSE)
ServiceReboot() //handles alternative actions if necessary
if (reason || fast_track) //special reboot, do none of the normal stuff
if (usr)
log_admin("[key_name(usr)] Has requested an immediate world restart via client side debugging tools")