From 7322a9df666eaa4c7c0982edce6c7d05e600c6e6 Mon Sep 17 00:00:00 2001
From: FlitchTime <karamaclo@gmail.com>
Date: Sun, 22 Dec 2024 12:36:29 +0300
Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=BE=D0=BC=D0=B5=D0=BD=D1=8F=D0=BB=20?=
 =?UTF-8?q?=D0=BD=D0=B0=D0=B7=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20=D0=BF=D0=B5?=
 =?UTF-8?q?=D1=80=D0=B5=D0=BC=D0=B5=D0=BD=D0=BD=D1=8B=D1=85,=20=D1=83?=
 =?UTF-8?q?=D0=B1=D1=80=D0=B0=D0=BB=20=D0=BB=D0=B8=D1=88=D0=BD=D0=B8=D0=B5?=
 =?UTF-8?q?=20=D0=B2=D0=B0=D1=80=D1=8B,=20Define=20DEAD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 code/modules/admin/player_panel.dm | 29 +++++++++++------------------
 1 file changed, 11 insertions(+), 18 deletions(-)

diff --git a/code/modules/admin/player_panel.dm b/code/modules/admin/player_panel.dm
index 85cbe0721d6..c3d169d6d4a 100644
--- a/code/modules/admin/player_panel.dm
+++ b/code/modules/admin/player_panel.dm
@@ -653,17 +653,11 @@
 
 /datum/admins/proc/check_security_line(mob/living/carbon/human/human, close = 1)
 	var/logout_status = human.client ? "" : " <i>(logged out)</i>"
-	var/dname = human.real_name
+	var/list/coords = ATOM_COORDS(human)
 	var/job = human.job
-	var/area/area = get_area(human)
-	var/area_name = get_area_name(area)
-	var/turf/GT = get_turf(human)
-	var/list/coords = ATOM_COORDS(GT)
-	if(!dname)
-		dname = human
 	if(issilicon(human))
 		job = "Cyborg"
-	return {"<tr><td><a href='byond://?src=[UID()];adminplayeropts=[human.UID()]'>[dname]</a>[logout_status]</td><td>[job][human.stat == 2 ? " <b><font color=red>(Dead)</font></b>" : "<font color=green> [human.health]%</font>"] <b>[area_name]</b> [coords[1]],[coords[2]],[coords[3]]</td><td><a href='byond://?src=[usr.UID()];priv_msg=[human.client?.ckey]'>PM</A> [ADMIN_FLW(human, "FLW")]</td>[close ? "</tr>" : ""]"}
+	return {"<tr><td><a href='byond://?src=[UID()];adminplayeropts=[human.UID()]'>[human.real_name]</a>[logout_status]</td><td>[job][human.stat == DEAD ? " <b><font color=red>(Dead)</font></b>" : "<font color=green> [human.health]%</font>"] <b>[get_area_name(human)]</b> [coords[1]],[coords[2]],[coords[3]]</td><td><a href='byond://?src=[usr.UID()];priv_msg=[human.client?.ckey]'>PM</A> [ADMIN_FLW(human, "FLW")]</td>[close ? "</tr>" : ""]"}
 
 /datum/admins/proc/check_security()
 	if(!check_rights(R_ADMIN))
@@ -681,10 +675,9 @@
 		dat += "</body></html>"
 
 		dat += "<br><table cellspacing=5><tr><td><B>Security</B></td><td></td></tr>"
-		for(var/datum/mind/N in SSticker.mode.get_all_sec())
-			var/mob/M = N.current
-			if(M)
-				dat += check_security_line(M)
+		for(var/datum/mind/mind in SSticker.mode.get_all_sec())
+			if(mind.current)
+				dat += check_security_line(mind.current)
 		dat += "</table>"
 
 		if(SSticker.mode.ert.len)
@@ -697,21 +690,21 @@
 
 /datum/admins/proc/check_role_table_sec(name, list/members, show_objectives=0)
 	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_sec(M.current, show_objectives)
+	for(var/datum/mind/mind in members)
+		txt += check_role_table_row_sec(mind.current, show_objectives)
 	txt += "</table>"
 	return txt
 
-/datum/admins/proc/check_role_table_row_sec(mob/M, show_objectives)
-	if(!istype(M))
+/datum/admins/proc/check_role_table_row_sec(mob/mob, show_objectives)
+	if(!istype(mob))
 		return "<tr><td><i>Not found!</i></td></tr>"
 
-	var/txt = check_security_line(M, close = 0)
+	var/txt = check_security_line(mob, close = 0)
 
 	if(show_objectives)
 		txt += {"
 			<td>
-				<a href='byond://?src=[UID()];traitor=[M.UID()]'>Show Objective</a>
+				<a href='byond://?src=[UID()];traitor=[mob.UID()]'>Show Objective</a>
 			</td>
 		"}