Merge pull request #4426 from Citadel-Station-13/upstream-merge-33601

[MIRROR] Fixes cross comms
This commit is contained in:
LetterJay
2018-01-03 04:56:38 -06:00
committed by GitHub
3 changed files with 14 additions and 13 deletions
+11 -8
View File
@@ -615,15 +615,18 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
/proc/send2otherserver(source,msg,type = "Ahelp")
var/comms_key = CONFIG_GET(string/comms_key)
if(comms_key)
var/list/message = list()
message["message_sender"] = source
message["message"] = msg
message["source"] = "([CONFIG_GET(string/cross_comms_name)])"
message["key"] = comms_key
message["crossmessage"] = type
if(!comms_key)
return
var/list/message = list()
message["message_sender"] = source
message["message"] = msg
message["source"] = "([CONFIG_GET(string/cross_comms_name)])"
message["key"] = comms_key
message += type
world.Export("[CONFIG_GET(string/cross_server_address)]?[list2params(message)]")
var/list/servers = CONFIG_GET(keyed_string_list/cross_server)
for(var/I in servers)
world.Export("[servers[I]]?[list2params(message)]")
/proc/ircadminwho()