cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-24 04:27:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #209 from Abi79/master

Browse Source 
Fixed a case where the player panel wouldn't open
This commit is contained in:
CIB
2012-01-04 09:59:25 -08:00
parent 4bd8c070d0 9c2224e6d8
commit 8865f71cb6
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/admin.dm
+12 -8
View File
@@ -1888,16 +1888,20 @@
if (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))
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>"
id = PDA.id // The ID is contained inside the PDA
else
dat += "<td>[M.mind.assigned_role] ([id.assignment])"
id = H.wear_id
if(isnull(id.assignment))
usr << "<font color=red>ERROR:</font> Inform the coders that an [id.name] was checked for its assignment variable."
dat += "<td><font color=red>ERROR</font></td>"
else
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>"