cyberpresidentvanellope/Yogstation
1
0
Fork 0
mirror of https://github.com/yogstation13/Yogstation.git synced 2025-02-26 09:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	_maps/map_files/TgStation/tgstation.2.1.3.dmm
This commit is contained in:
bgobandit
2015-07-24 11:58:52 -04:00
parent 5b5ba6582d 4e9693e185
commit 0d9f7dcb4a
61 changed files with 1519 additions and 1194 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
code/modules/admin/topic.dm
View File

@@ -2057,6 +2057,13 @@
FM.locked ^= 1
src.access_news_network()
else if(href_list["memoeditlist"])
var/DBQuery/query_memoedits = dbcon.NewQuery("SELECT edits FROM [format_table_name("memo")] WHERE (id = '[href_list["id"]]")
query_memoedits.Execute()
if(query_memoedits.NextRow())
var/edit_log = query_memoedits.item[6]
usr << browse(edit_log,"window=memoeditlist")
else if(href_list["check_antagonist"])
if(!check_rights(R_ADMIN))
return
@@ -2078,4 +2085,4 @@
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"
usr << "You may only use this when the game is running"