From 073b419bd3d6267c58263d4f4b7443fdedd89cc7 Mon Sep 17 00:00:00 2001
From: Jordie0608 <jordie0608@gmail.com>
Date: Tue, 21 Jul 2015 04:21:38 +1000
Subject: [PATCH] fixes kick and ca links in pp

---
 code/modules/admin/player_panel.dm |  2 +-
 code/modules/admin/secrets.dm      | 22 ----------------------
 code/modules/admin/topic.dm        | 23 +++++++++++++++++++++++
 3 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/code/modules/admin/player_panel.dm b/code/modules/admin/player_panel.dm
index 5c290f9ba11..1320ae695c2 100644
--- a/code/modules/admin/player_panel.dm
+++ b/code/modules/admin/player_panel.dm
@@ -194,7 +194,7 @@
 			<tr id='title_tr'>
 				<td align='center'>
 					<font size='5'><b>Player panel</b></font><br>
-					Hover over a line to see more information - <a href='?_src_=holder;secretsadmin=check_antagonist'>Check antagonists</a> - Kick <a href='?_src_=holder;secretsadmin=kick_all_from_lobby;afkonly=0'>everyone</a>/<a href='?_src_=holder;secretsadmin=kick_all_from_lobby;afkonly=1'>AFKers</a> in lobby
+					Hover over a line to see more information - <a href='?_src_=holder;check_antagonist=1'>Check antagonists</a> - Kick <a href='?_src_=holder;kick_all_from_lobby=1;afkonly=0'>everyone</a>/<a href='?_src_=holder;kick_all_from_lobby=1;afkonly=1'>AFKers</a> in lobby
 					<p>
 				</td>
 			</tr>
diff --git a/code/modules/admin/secrets.dm b/code/modules/admin/secrets.dm
index 3aa09ecd6b3..737f1110cb8 100644
--- a/code/modules/admin/secrets.dm
+++ b/code/modules/admin/secrets.dm
@@ -166,11 +166,6 @@
 				dat += "[sig]<BR>"
 			usr << browse(dat, "window=lawchanges;size=800x500")
 
-		if("check_antagonist")
-			if(!check_rights(R_ADMIN))
-				return
-			check_antagonists()
-
 		if("moveminingshuttle")
 			if(!check_rights(R_ADMIN))
 				return
@@ -198,23 +193,6 @@
 				message_admins("[key_name_admin(usr)] moved the centcom ferry")
 				log_admin("[key_name(usr)] moved the centcom ferry")
 
-		if("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'>The admin [usr.ckey] issued a 'kick all clients from lobby' command.</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"
-
 		if("showailaws")
 			if(!check_rights(R_ADMIN))
 				return
diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm
index 062cc7f9378..bcc55ee136a 100644
--- a/code/modules/admin/topic.dm
+++ b/code/modules/admin/topic.dm
@@ -2056,3 +2056,26 @@
 		var/datum/newscaster/feed_message/FM = locate(href_list["ac_lock_comment"])
 		FM.locked ^= 1
 		src.access_news_network()
+
+	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"
\ No newline at end of file