From 629d58f1e23a3a8a5409a52004d3c832809b83b7 Mon Sep 17 00:00:00 2001
From: MadmanMartian <30557196+MadmanMartian@users.noreply.github.com>
Date: Sun, 2 Sep 2018 13:01:21 +0100
Subject: [PATCH] Role datums player panel fix (#19544)

Turns out I'd dropped an argument at some point
---
 code/modules/admin/admin.dm        | 24 ++++++------------------
 code/modules/admin/player_panel.dm |  8 ++++----
 2 files changed, 10 insertions(+), 22 deletions(-)

diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm
index e36a7bdb2a2..41712c629dd 100644
--- a/code/modules/admin/admin.dm
+++ b/code/modules/admin/admin.dm
@@ -1213,53 +1213,41 @@ var/global/floorIsLava = 0
 	feedback_add_details("admin_verb","UP") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
 ////////////////////////////////////////////////////////////////////////////////////////////////ADMIN HELPER PROCS
-/*
-/proc/is_special_character(mob/M as mob) // returns 1 for specail characters and 2 for heroes of gamemode
+
+/proc/is_special_character(mob/M as mob) // returns 1 for special characters
 	if(!ticker || !ticker.mode)
 		return 0
 	if (!istype(M))
 		return 0
 	if(isrev(M) || isrevhead(M))
-		if (ticker.mode.config_tag == "revolution")
-			return 2
 		return 1
-	if(iscult(M))
-		if (ticker.mode.config_tag == "cult")
-			return 2
+	if(isanycultist(M))
 		return 1
 	if(ismalf(M))
-		if (ticker.mode.config_tag == "malfunction")
-			return 2
 		return 1
 	if(isnukeop(M))
-		if (ticker.mode.config_tag == "nuclear")
-			return 2
 		return 1
 	if(iswizard(M) || isapprentice(M))
-		if (ticker.mode.config_tag == "wizard")
-			return 2
 		return 1
 	if(ischangeling(M))
-		if (ticker.mode.config_tag == "changeling")
-			return 2
 		return 1
 	/*if(isborer(M)) //They ain't antags anymore
 		if (ticker.mode.config_tag == "borer")
 			return 2
 		return 1*/
 	if(isbadmonkey(M))
-		if (ticker.mode.config_tag == "monkey")
-			return 2
 		return 1
 	if(isrobot(M))
 		var/mob/living/silicon/robot/R = M
 		if(R.emagged)
 			return 1
+	if(isdeathsquad(M))
+		return 1
 	if(M.mind&&M.mind.special_role)//If they have a mind and special role, they are some type of traitor or antagonist.
 		return 1
 
 	return 0
-*/
+
 /*
 /datum/admins/proc/get_sab_desc(var/target)
 	switch(target)
diff --git a/code/modules/admin/player_panel.dm b/code/modules/admin/player_panel.dm
index 387c5ecdcb0..c491f2a4055 100644
--- a/code/modules/admin/player_panel.dm
+++ b/code/modules/admin/player_panel.dm
@@ -286,7 +286,7 @@
 			var/color = "#e6e6e6"
 			if(i%2 == 0)
 				color = "#f2f2f2"
-			//var/is_antagonist = is_special_character(M)
+			var/is_antagonist = is_special_character(M)
 
 			var/M_job = M.player_panel_job()
 
@@ -315,7 +315,7 @@
 					<td align='center' bgcolor='[color]'>
 						<span id='notice_span[i]'></span>
 						<a id='link[i]'
-						onmouseover='expand("item[i]","[M_job]","[M_name]","[M_rname]","--unused--","[M_key]","[M.lastKnownIP]","\ref[M]")'
+						onmouseover='expand("item[i]","[M_job]","[M_name]","[M_rname]","--unused--","[M_key]","[M.lastKnownIP]",[is_antagonist],"\ref[M]")'
 						>
 						<b id='search[i]'>[M_name] - [M_rname] - [M_key] ([M_job])</b>
 						</a>
@@ -392,14 +392,14 @@
 		<td align=center><A HREF='?src=\ref[src];adminplayeropts=\ref[M]'>X</A></td>
 		<td align=center><A href='?src=\ref[usr];priv_msg=\ref[M]'>PM</A></td>
 		"}
-		/*switch(is_special_character(M))
+		switch(is_special_character(M))
 			if(0)
 				dat += {"<td align=center><A HREF='?src=\ref[src];traitor=\ref[M]'>Traitor?</A></td>"}
 			if(1)
 				dat += {"<td align=center><A HREF='?src=\ref[src];traitor=\ref[M]'><font color=red>Traitor?</font></A></td>"}
 			if(2)
 				dat += {"<td align=center><A HREF='?src=\ref[src];traitor=\ref[M]'><font color=red><b>Traitor?</b></font></A></td>"}
-		*/
+
 	dat += "</table></body></html>"
 
 	usr << browse(dat, "window=players;size=640x480")