cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Making sec huds more fault tolerant. A number of sources never set id.rank, only id.assignment.

Browse Source
This commit is contained in:
PsiOmega
2014-08-26 11:14:15 +02:00
parent e2607e51f0
commit ea549fb5ee
1 changed files with 20 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
code/game/jobs/access.dm
View File

@@ -492,21 +492,27 @@ proc/get_all_job_icons() //For all existing HUD icons
return joblist + list("Prisoner")
/obj/proc/GetJobName() //Used in secHUD icon generation
if (!istype(src, /obj/item/device/pda) && !istype(src,/obj/item/weapon/card/id))
return
var/jobName
var/obj/item/weapon/card/id/I
if(istype(src, /obj/item/device/pda))
var/obj/item/device/pda/P = src
if(P.id)
jobName = P.id.rank
if(istype(src, /obj/item/weapon/card/id))
var/obj/item/weapon/card/id/I = src
jobName = I.rank
I = P.id
else if(istype(src, /obj/item/weapon/card/id))
I = src
if(I)
var/job_icons = get_all_job_icons()
var/centcom = get_all_centcom_jobs()
if(I.assignment in job_icons) //Check if the job has a hud icon
return I.assignment
if(I.rank in job_icons)
return I.rank
if(I.assignment in centcom) //Return with the NT logo if it is a Centcom job
return "Centcom"
if(I.rank in centcom)
return "Centcom"
else
return
if(jobName in get_all_job_icons()) //Check if the job has a hud icon
return jobName
if(jobName in get_all_centcom_jobs()) //Return with the NT logo if it is a Centcom job
return "Centcom"
return "Unknown" //Return unknown if none of the above apply