From f89dbfd276a2857b910ec3bba9813a346d298937 Mon Sep 17 00:00:00 2001 From: "elly1989@rocketmail.com" Date: Mon, 5 Mar 2012 15:17:46 +0000 Subject: [PATCH] Fixed the new player-panel. A variable was missed out in the expand function when karma was removed. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3256 316c924e-a436-60f5-8080-3fe189b3f50e --- code/modules/admin/player_panel.dm | 65 ++++++++++++++++++------------ 1 file changed, 40 insertions(+), 25 deletions(-) diff --git a/code/modules/admin/player_panel.dm b/code/modules/admin/player_panel.dm index f4153391b0e..a787d06313c 100644 --- a/code/modules/admin/player_panel.dm +++ b/code/modules/admin/player_panel.dm @@ -60,7 +60,7 @@ } - function expand(id,job,name,real_name,image,key,ip,antagonist){ + function expand(id,job,name,real_name,image,key,ip,antagonist,ref){ clearAll(); @@ -221,32 +221,47 @@ var/M_job = "" - if(istype(M,/mob/new_player)) - M_job = "New player" if(isliving(M)) - M_job = "Living" - if(isobserver(M)) + + if(iscarbon(M)) //Carbon stuff + if(ishuman(M)) + M_job = M.job + else if(ismetroid(M)) + M_job = "Metroid" + else if(ismonkey(M)) + M_job = "Moneky" + else if(isalien(M)) //aliens + if(islarva(M)) + M_job = "Alien larva" + else + M_job = "Alien" + else + M_job = "Carbon-based" + + else if(issilicon(M)) //silicon + if(isAI(M)) + M_job = "AI" + else if(ispAI(M)) + M_job = "pAI" + else if(isrobot(M)) + M_job = "Cyborg" + else + M_job = "Silicon-based" + + else if(isanimal(M)) //simple animals + if(iscorgi(M)) + M_job = "Corgi" + else + M_job = "Animal" + + else + M_job = "Living" + + else if(istype(M,/mob/new_player)) + M_job = "New player" + + else if(isobserver(M)) M_job = "Ghost" - if(isalien(M)) - M_job = "Alien" - if(islarva(M)) - M_job = "Alien larva" - if(ishuman(M)) - M_job = M.job - if(ismetroid(M)) - M_job = "Metroid" - if(ismonkey(M)) - M_job = "Moneky" - if(isAI(M)) - M_job = "AI" - if(ispAI(M)) - M_job = "pAI" - if(isrobot(M)) - M_job = "Cyborg" - if(isanimal(M)) - M_job = "Animal" - if(iscorgi(M)) - M_job = "Corgi" M_job = dd_replacetext(M_job, "'", "") M_job = dd_replacetext(M_job, "\"", "")