Merge branch 'master' of https://github.com/tgstation/-tg-station into mimosmemomentionsminchinsmargerymargarine

Conflicts:
	code/modules/admin/topic.dm
This commit is contained in:
Jordie0608
2015-07-22 15:52:51 +10:00
160 changed files with 4667 additions and 4509 deletions

View File

@@ -2062,4 +2062,27 @@
query_memoedits.Execute()
if(query_memoedits.NextRow())
var/edit_log = query_memoedits.item[6]
usr << browse(edit_log,"window=memoeditlist")
usr << browse(edit_log,"window=memoeditlist")
else if(href_list["check_antagonist"])
if(!check_rights(R_ADMIN))
return
check_antagonists()
else if(href_list["kick_all_from_lobby"])
if(!check_rights(R_ADMIN))
return
if(ticker && ticker.current_state == GAME_STATE_PLAYING)
var/afkonly = text2num(href_list["afkonly"])
if(alert("Are you sure you want to kick all [afkonly ? "AFK" : ""] clients from the lobby??","Message","Yes","Cancel") != "Yes")
usr << "Kick clients from lobby aborted"
return
var/list/listkicked = kick_clients_in_lobby("<span class='danger'>You were kicked from the lobby by an Administrator.</span>", afkonly)
var/strkicked = ""
for(var/name in listkicked)
strkicked += "[name], "
message_admins("[key_name_admin(usr)] has kicked [afkonly ? "all AFK" : "all"] clients from the lobby. [length(listkicked)] clients kicked: [strkicked ? strkicked : "--"]")
log_admin("[key_name(usr)] has kicked [afkonly ? "all AFK" : "all"] clients from the lobby. [length(listkicked)] clients kicked: [strkicked ? strkicked : "--"]")
else
usr << "You may only use this when the game is running"