Merge upstream

This commit is contained in:
Cyberboss
2017-04-02 22:27:22 -04:00
165 changed files with 152811 additions and 8563 deletions
+3 -2
View File
@@ -83,7 +83,8 @@ var/global/BSACooldown = 0
body += "<A href='?_src_=holder;traitor=\ref[M]'>Traitor panel</A> | "
body += "<A href='?_src_=holder;narrateto=\ref[M]'>Narrate to</A> | "
body += "<A href='?_src_=holder;subtlemessage=\ref[M]'>Subtle message</A> | "
body += "<A href='?_src_=holder;individuallog=\ref[M]'>Individual Round Logs</A>"
body += "<A href='?_src_=holder;individuallog=\ref[M]'>Individual Round Logs</A> | "
body += "<A href='?_src_=holder;languagemenu=\ref[M]'>Language Menu</A>"
if (M.client)
if(!isnewplayer(M))
@@ -823,4 +824,4 @@ var/global/BSACooldown = 0
string = pick(
"Admin login: [key_name(src)]")
if(string)
message_admins("[string]")
message_admins("[string]")