Skip to content
This repository has been archived by the owner on Sep 8, 2022. It is now read-only.

[MIRROR] Removes an unused proc /obj/item/proc/GetJobName() from the code #1016

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

[MIRROR] Removes an unused proc /obj/item/proc/GetJobName() from the code #1016

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2e12109
begone (#7605)
EvilDragonfiend Sep 3, 2022
bfa6617
Removes an unused proc `/obj/item/proc/GetJobName()` from the code
SinguloBot Sep 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions code/modules/jobs/access.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)