Merge resolution.

code/modules/admin/IsBanned.dm

@@ -20,17 +20,39 @@ world/IsBanned(key,address,computer_id)
 		return list("reason"="Using ToR", "desc"="\nReason: The network you are using to connect has been banned.\nIf you believe this is a mistake, please request help at [config.banappeals]")
 
 	if(config && config.ip_blacklist_enabled)
-		msg_scopes("Doing blacklist stuff")
-		if(!blacklist)
-			loadBlacklist()
-		if(blacklist)
-			if(address in blacklist)
-				log_access("Failed Login: [src] - Blacklisted IP")
-				message_admins("\blue Failed Login: [src] - Blacklisted IP")
-				AddBan(ckey(key), computer_id, "Bad IP", "Automated Ban", 0, 0)
-				return list("reason"="IP Blacklisted", "desc"="\nReason: This IP has been blacklisted from the server.\nIf you believe this is a mistake, please request help at [config.banappeals]")
+		var/banhe = 0
+		msg_scopes("Checking [key]'s IP for blacklist.")
+		if(!establish_db_connection())
+			//No database. Make do!
+			error("Database connection failed while checking blacklist. Reverted to old system.")
+
+			msg_scopes("Executing old blacklisting.")
+			if(!blacklist)
+				loadBlacklist()
+			if(blacklist)
+				if(address in blacklist)
+					banhe = 1
+			else
+				msg_scopes("Where is the blacklist!")
 		else
-			msg_scopes("Where is the blacklist!")
+			//Have data, will base.
+			var/DBQuery/query = dbcon.NewQuery("SELECT ip FROM aurora_ipblacklist WHERE ip = '[address]'")
+			query.Execute()
+
+			while(query.NextRow())
+				var/bip = query.item[1]
+
+				if(bip == address)
+					banhe = 1
+
+		if(banhe == 1)
+			log_access("Failed Login: [key] - Blacklisted IP")
+			message_admins("\blue Failed Login: [key] - Blacklisted IP")
+			message_mods("\blue Failed Login: [key] - Blacklisted IP")
+			AddBan(ckey(key), computer_id, "Bad IP", "Automated Ban", 0, 0)
+			return list("reason"="IP Blacklisted", "desc"="\nReason: This IP has been blacklisted from the server.\nIf you believe this is a mistake, please request help at [config.banappeals]")
+
+		msg_scopes("[key]'s blacklist check completed.")
 
 	if(config.ban_legacy_system)
 

code/modules/admin/admin_verbs.dm

@@ -159,8 +159,6 @@ var/list/admin_verbs_dev = list(
 	/client/proc/restart_controller,
 	/client/proc/enable_debug_verbs,
 	/client/proc/toggledebuglogs,
-	/client/proc/SDQL_query,
-	/client/proc/SDQL2_query,
 	/client/proc/cmd_dev_say,
 	/client/proc/cmd_dev_bst,
 	/client/proc/cmd_dev_reset_gravity,
@@ -184,6 +182,8 @@ var/list/admin_verbs_server = list(
 	/datum/admins/proc/toggleAI,
 	/client/proc/cmd_admin_delete,		/*delete an instance/object/mob/etc*/
 	/client/proc/cmd_debug_del_all,
+	/client/proc/SDQL_query,
+	/client/proc/SDQL2_query,
 	/datum/admins/proc/adrev,
 	/datum/admins/proc/adspawn,
 	/datum/admins/proc/adjump,
@@ -216,8 +216,6 @@ var/list/admin_verbs_debug = list(
 	/client/proc/enable_debug_verbs,
 	/client/proc/callproc,
 	/client/proc/toggledebuglogs,
-	/client/proc/SDQL_query,
-	/client/proc/SDQL2_query,
 	/client/proc/cmd_dev_reset_gravity,
 	/client/proc/cmd_dev_reset_floating,
 	/client/proc/fillspace,

code/modules/admin/player_panel.dm

@@ -553,7 +553,44 @@
 					dat += "<tr><td><i>Traitor not found!</i></td></tr>"
 			dat += "</table>"
 
+		var/datum/game_mode/mutiny/mutiny = get_mutiny_mode()
+		if(mutiny)
+			dat += mutiny.check_antagonists_ui(src)
+
 		dat += "</body></html>"
 		usr << browse(dat, "window=roundstatus;size=400x500")
 	else
 		alert("The game hasn't started yet!")
+
+/proc/check_role_table(name, list/members, admins, show_objectives=1)
+	var/txt = "<br><table cellspacing=5><tr><td><b>[name]</b></td><td></td></tr>"
+	for(var/datum/mind/M in members)
+		txt += check_role_table_row(M.current, admins, show_objectives)
+	txt += "</table>"
+	return txt
+
+/proc/check_role_table_row(mob/M, admins=src, show_objectives)
+	if (!istype(M))
+		return "<tr><td><i>Not found!</i></td></tr>"
+
+	var/txt = {"
+		<tr>
+			<td>
+				<a href='?src=\ref[admins];adminplayeropts=\ref[M]'>[M.real_name]</a>
+				[M.client ? "" : " <i>(logged out)</i>"]
+				[M.is_dead() ? " <b><font color='red'>(DEAD)</font></b>" : ""]
+			</td>
+			<td>
+				<a href='?src=\ref[usr];priv_msg=\ref[M]'>PM</a>
+			</td>
+	"}
+
+	if (show_objectives)
+		txt += {"
+			<td>
+				<a href='?src=\ref[admins];traitor=\ref[M]'>Show Objective</a>
+			</td>
+		"}
+
+	txt += "</tr>"
+	return txt

code/modules/admin/topic.dm

@@ -6,6 +6,10 @@
 		message_admins("[usr.key] has attempted to override the admin panel!")
 		return
 
+	if(ticker.mode && ticker.mode.check_antagonists_topic(href, href_list))
+		check_antagonists()
+		return
+
 	if(href_list["makeAntag"])
 		switch(href_list["makeAntag"])
 			if("1")

code/modules/admin/verbs/SDQL.dm

@@ -5,7 +5,7 @@
 
 /client/proc/SDQL_query(query_text as message)
 	set category = "Admin"
-	if(!check_rights(R_DEBUG))  //Shouldn't happen... but just to be safe.
+	if(!check_rights(R_SERVER))  //Shouldn't happen... but just to be safe.
 		message_admins("\red ERROR: Non-admin [usr.key] attempted to execute a SDQL query!")
 		log_admin("Non-admin [usr.key] attempted to execute a SDQL query!")
 

code/modules/admin/verbs/check_customitem_activity.dm

@@ -36,19 +36,10 @@ var/inactive_keys = "None<br>"
 	//grab all ckeys associated with custom items
 	var/list/ckeys_with_customitems = list()
 
-	var/file = file2text("config/custom_items.txt")
-	var/lines = text2list(file, "\n")
-
-	for(var/line in lines)
-		// split & clean up
-		var/list/Entry = text2list(line, ":")
-		for(var/i = 1 to Entry.len)
-			Entry[i] = trim(Entry[i])
-
-		if(Entry.len < 1)
-			continue
-
-		var/cur_key = Entry[1]
+	var/DBQuery/query_ckeys = dbcon.NewQuery("SELECT ckey FROM aurora_customitems")
+	query_ckeys.Execute()
+	while(query_ckeys.NextRow())
+		var/cur_key = query_ckeys.item[1]
 		if(!ckeys_with_customitems.Find(cur_key))
 			ckeys_with_customitems.Add(cur_key)
 

code/modules/admin/verbs/getlogs.dm

@@ -44,7 +44,7 @@
 	set desc = "Retrieve any session logfiles saved by dreamdeamon."
 	set category = null
 
-	var/path = browse_files("data/logs/runtime/")
+	var/path = browse_files("data/runtime/")
 	if(!path)
 		return