From 6d91ce670eac78a8fd4f23e097c6639b13cbd74d Mon Sep 17 00:00:00 2001 From: "mport2004@gmail.com" Date: Thu, 29 Dec 2011 08:17:54 +0000 Subject: [PATCH] Seems the old player panel had a few issues that did not crop up in my tests. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2852 316c924e-a436-60f5-8080-3fe189b3f50e --- code/modules/admin/player_panel.dm | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/code/modules/admin/player_panel.dm b/code/modules/admin/player_panel.dm index 98873bac5ee..373cc899398 100644 --- a/code/modules/admin/player_panel.dm +++ b/code/modules/admin/player_panel.dm @@ -365,18 +365,12 @@ dat += "Unknown" - if(M.mind && M.mind.assigned_role) // Adds a column to Player Panel that shows their current job. + if(istype(M,/mob/living/carbon/human)) var/mob/living/carbon/human/H = M - if (H.wear_id) - var/obj/item/weapon/card/id/id = H.wear_id - if(M.mind.assigned_role == id.assignment) // Polymorph - dat += "[M.mind.assigned_role]" - else - dat += "[M.mind.assigned_role] ([id.assignment])" - else - dat += "[M.mind.assigned_role] (No ID)" + if(H.mind && H.mind.assigned_role) + dat += "[H.mind.assigned_role]" else - dat += "No Assigned Role" + dat += "NA" dat += {"[(M.client ? "[M.client]" : "No client")]