cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-20 19:44:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of git://github.com/Baystation12/Baystation12

Browse Source
This commit is contained in:
Mister Fox
2011-12-26 14:07:48 -05:00
parent 30f4e7dea1 4a8c5e9478
commit 19b8a17557
25 changed files with 516 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/admin.dm
+13 -3
View File
@@ -1882,16 +1882,26 @@
if(istype(M, /mob/living/carbon/alien))
dat += "<td>Alien</td>"
if(M.mind && M.mind.assigned_role) // Adds a column to Player Panel that shows their current job.
if(M.mind && M.mind.assigned_role && istype(M, /mob/living/carbon/human)) // Adds a column to Player Panel that shows their current job.
var/mob/living/carbon/human/H = M
if (H.wear_id)
var/obj/item/weapon/card/id/id = H.wear_id
var/obj/item/weapon/card/id/id
if(istype(H.wear_id, /obj/item/weapon/card/id))
id = H.wear_id // The ID is on the ID slot
else if(istype(H.wear_id, /obj/item/device/pda))
var/obj/item/device/pda/PDA = H.wear_id
id = PDA.id // The ID is contained inside the PDA
if(M.mind.assigned_role == id.assignment) // Polymorph
dat += "<td>[M.mind.assigned_role]</td>"
else
dat += "<td>[M.mind.assigned_role] ([id.assignment])"
else
dat += "<td>[M.mind.assigned_role] (No ID)</td>"
else
dat += "<td>No Assigned Role</td>"
@@ -1960,7 +1970,7 @@
dat += "</table></body></html>"
usr << browse(dat, "window=players;size=540x480")
usr << browse(dat, "window=players;size=905x480")
/obj/admins/proc/Jobbans()