From ab2be541d344f188185f0c260b0c2c6c6ff9f35e Mon Sep 17 00:00:00 2001 From: EvilDragonfiend <87972842+EvilDragonfiend@users.noreply.github.com> Date: Sun, 4 Sep 2022 03:47:28 +0900 Subject: [PATCH 1/2] begone (#7605) Co-authored-by: EvilDragonfiend --- code/modules/jobs/access.dm | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/code/modules/jobs/access.dm b/code/modules/jobs/access.dm index e530915222f..6cae8dfd601 100644 --- a/code/modules/jobs/access.dm +++ b/code/modules/jobs/access.dm @@ -390,6 +390,7 @@ /proc/get_all_centcom_jobs() return list("VIP Guest","Custodian","Thunderdome Overseer","CentCom Official","Medical Officer","Death Commando","Research Officer","Special Ops Officer","Admiral","CentCom Commander","Emergency Response Team Commander","Security Response Officer","Engineer Response Officer", "Medical Response Officer","CentCom Bartender","Comedy Response Officer", "HONK Squad Trooper") +<<<<<<< HEAD /obj/item/proc/GetJobName() //Used in secHUD icon generation var/obj/item/card/id/I = GetID() if(!I) @@ -400,3 +401,13 @@ 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 +======= +/obj/item/proc/GetJobIcon() //Used in secHUD icon generation (the new one) + var/obj/item/card/id/I = GetID() + if(!I) + return + var/I_hud = I.hud_state + if(I_hud) + return I_hud + return "unknown" +>>>>>>> e7f9578c1f... begone (#7605) From a6e68d2166cbf04e4dda4fe78ea9743a78206feb Mon Sep 17 00:00:00 2001 From: SinguloBot <88859067+SinguloBot@users.noreply.github.com> Date: Sat, 3 Sep 2022 20:48:34 +0200 Subject: [PATCH 2/2] Removes an unused proc `/obj/item/proc/GetJobName()` from the code