diff --git a/code/game/jobs/access.dm b/code/game/jobs/access.dm index 34e14958a2d..fab08b5786c 100644 --- a/code/game/jobs/access.dm +++ b/code/game/jobs/access.dm @@ -177,13 +177,11 @@ switch(job) if("VIP Guest") return list(access_cent_general) - if("Prisoner") - return if("Custodian") return list(access_cent_general, access_cent_living, access_cent_storage) if("Thunderdome Overseer") return list(access_cent_general, access_cent_thunder) - if("Intel Officer") + if("CentCom Official") return list(access_cent_general, access_cent_living) if("Medical Officer") return list(access_cent_general, access_cent_living, access_cent_medical) @@ -191,9 +189,11 @@ return list(access_cent_general, access_cent_specops, access_cent_living, access_cent_storage) if("Research Officer") return list(access_cent_general, access_cent_specops, access_cent_medical, access_cent_teleporter, access_cent_storage) - if("BlackOps Commander") + if("Special Ops Officer") return list(access_cent_general, access_cent_thunder, access_cent_specops, access_cent_living, access_cent_storage, access_cent_creed) - if("Supreme Commander") + if("Admiral") + return get_all_centcom_access() + if("CentCom Commander") return get_all_centcom_access() /proc/get_all_accesses() @@ -410,10 +410,13 @@ "Atmospheric Technician", "Chief Medical Officer", "Medical Doctor", "Chemist", "Geneticist", "Virologist", "Research Director", "Scientist", "Roboticist", "Head of Security", "Warden", "Detective", "Security Officer") -/proc/get_all_centcom_jobs() - return list("VIP Guest","Custodian","Thunderdome Overseer","Intel Officer","Medical Officer","Death Commando","Research Officer","BlackOps Commander","Supreme Commander") +proc/get_all_job_icons() //For all existing HUD icons + return get_all_jobs() + list("Prisoner") -/obj/proc/GetJobName() +/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") + +/obj/proc/GetJobName() //Used in secHUD icon generation if (!istype(src, /obj/item/device/pda) && !istype(src,/obj/item/weapon/card/id)) return @@ -425,8 +428,8 @@ if(istype(src, /obj/item/weapon/card/id)) jobName = src:assignment - if(jobName in get_all_jobs()) //Check station jobs + if(jobName in get_all_job_icons()) //Check if the job has a hud icon return jobName - if(jobName == "Prisoner") //Check for Prisoner - return "Prisoner" + 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 diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm index a5570dc567b..c1d3aecb021 100644 --- a/code/game/objects/items/devices/radio/headset.dm +++ b/code/game/objects/items/devices/radio/headset.dm @@ -149,6 +149,13 @@ item_state = "headset" keyslot2 = new /obj/item/device/encryptionkey/headset_service +/obj/item/device/radio/headset/headset_cent + name = "centcom headset" + desc = "A headset used by the upper echelons of Nanotrasen. Channels are as follows: :c - command, :s - security, :e - engineering, :u - supply, :v - service, :m - medical, :n - science." + icon_state = "cent_headset" + item_state = "headset" + keyslot2 = new /obj/item/device/encryptionkey/heads/captain + /obj/item/device/radio/headset/attackby(obj/item/weapon/W as obj, mob/user as mob) // ..() user.set_machine(src) diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm index ce0086175f5..c1271f35e85 100644 --- a/code/modules/admin/verbs/debug.dm +++ b/code/modules/admin/verbs/debug.dm @@ -858,7 +858,7 @@ var/global/list/g_fancy_list_of_safe_types = null W.name = "[M.real_name]'s ID Card" W.icon_state = "centcom" W.access = get_all_accesses()//They get full station access. - W.access += list(access_cent_general, access_cent_specops, access_cent_living, access_cent_storage)//Let's add their alloted CentCom access. + W.access += get_centcom_access("Death Commando")//Let's add their alloted CentCom access. W.assignment = "Death Commando" W.registered_name = M.real_name M.equip_to_slot_or_del(W, slot_wear_id) @@ -870,7 +870,7 @@ var/global/list/g_fancy_list_of_safe_types = null M.equip_to_slot_or_del(new /obj/item/clothing/under/rank/centcom_officer(M), slot_w_uniform) M.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(M), slot_shoes) M.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(M), slot_gloves) - M.equip_to_slot_or_del(new /obj/item/device/radio/headset/heads/hop(M), slot_ears) + M.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_com(M), slot_ears) M.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses(M), slot_glasses) M.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/gun(M), slot_belt) M.equip_to_slot_or_del(new /obj/item/weapon/pen(M), slot_l_store) @@ -887,8 +887,7 @@ var/global/list/g_fancy_list_of_safe_types = null var/obj/item/weapon/card/id/W = new(M) W.name = "[M.real_name]'s ID Card (CentCom Official)" W.icon_state = "centcom" - W.access = get_all_accesses() - W.access += list("VIP Guest","Custodian","Thunderdome Overseer","Intel Officer","Medical Officer","Death Commando","Research Officer") + W.access = get_centcom_access("CentCom Official") W.assignment = "CentCom Official" W.registered_name = M.real_name M.equip_to_slot_or_del(W, slot_wear_id) @@ -898,7 +897,7 @@ var/global/list/g_fancy_list_of_safe_types = null M.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/bulletproof(M), slot_wear_suit) M.equip_to_slot_or_del(new /obj/item/clothing/shoes/swat(M), slot_shoes) M.equip_to_slot_or_del(new /obj/item/clothing/gloves/swat(M), slot_gloves) - M.equip_to_slot_or_del(new /obj/item/device/radio/headset/heads/captain(M), slot_ears) + M.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_cent(M), slot_ears) M.equip_to_slot_or_del(new /obj/item/clothing/glasses/eyepatch(M), slot_glasses) M.equip_to_slot_or_del(new /obj/item/clothing/mask/cigarette/cigar/cohiba(M), slot_wear_mask) M.equip_to_slot_or_del(new /obj/item/clothing/head/centhat(M), slot_head) @@ -910,7 +909,7 @@ var/global/list/g_fancy_list_of_safe_types = null W.name = "[M.real_name]'s ID Card (CentCom Commander)" W.icon_state = "centcom" W.access = get_all_accesses() - W.access += get_all_centcom_access() + W.access += get_centcom_access("CentCom Commander") W.assignment = "CentCom Commander" W.registered_name = M.real_name M.equip_to_slot_or_del(W, slot_wear_id) @@ -920,7 +919,7 @@ var/global/list/g_fancy_list_of_safe_types = null M.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/swat/officer(M), slot_wear_suit) M.equip_to_slot_or_del(new /obj/item/clothing/shoes/swat/combat(M), slot_shoes) M.equip_to_slot_or_del(new /obj/item/clothing/gloves/combat(M), slot_gloves) - M.equip_to_slot_or_del(new /obj/item/device/radio/headset/heads/captain(M), slot_ears) + M.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_cent(M), slot_ears) M.equip_to_slot_or_del(new /obj/item/clothing/glasses/thermal/eyepatch(M), slot_glasses) M.equip_to_slot_or_del(new /obj/item/clothing/mask/cigarette/cigar/havana(M), slot_wear_mask) M.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/space/deathsquad/beret(M), slot_head) @@ -932,7 +931,7 @@ var/global/list/g_fancy_list_of_safe_types = null W.name = "[M.real_name]'s ID Card (Special Ops Officer)" W.icon_state = "centcom" W.access = get_all_accesses() - W.access += get_all_centcom_access() + W.access += get_centcom_access("Special Ops Officer") W.assignment = "Special Ops Officer" W.registered_name = M.real_name M.equip_to_slot_or_del(W, slot_wear_id) @@ -976,7 +975,7 @@ var/global/list/g_fancy_list_of_safe_types = null M.equip_to_slot_or_del(new /obj/item/clothing/head/hgpiratecap(M), slot_head) M.equip_to_slot_or_del(new /obj/item/clothing/shoes/swat/combat(M), slot_shoes) M.equip_to_slot_or_del(new /obj/item/clothing/gloves/combat(M), slot_gloves) - M.equip_to_slot_or_del(new /obj/item/device/radio/headset/heads/captain(M), slot_ears) + M.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_cent(M), slot_ears) M.equip_to_slot_or_del(new /obj/item/clothing/glasses/thermal/eyepatch(M), slot_glasses) M.equip_to_slot_or_del(new /obj/item/clothing/suit/hgpirate(M), slot_wear_suit) M.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(M), slot_back) @@ -986,7 +985,7 @@ var/global/list/g_fancy_list_of_safe_types = null W.name = "[M.real_name]'s ID Card (Admiral)" W.icon_state = "centcom" W.access = get_all_accesses() - W.access += get_all_centcom_access() + W.access += get_centcom_access("Admiral") W.assignment = "Admiral" W.registered_name = M.real_name M.equip_to_slot_or_del(W, slot_wear_id) diff --git a/code/modules/clothing/glasses/hud.dm b/code/modules/clothing/glasses/hud.dm index e9776ab7155..7b24260305a 100644 --- a/code/modules/clothing/glasses/hud.dm +++ b/code/modules/clothing/glasses/hud.dm @@ -116,11 +116,11 @@ C.images += holder else perpname = perp.name - holder.icon_state = "hudunknown" + holder.icon_state = "hudno_id" C.images += holder else perpname = perp.name - holder.icon_state = "hudunknown" + holder.icon_state = "hudno_id" C.images += holder for(var/datum/data/record/E in data_core.general) diff --git a/code/modules/mob/living/silicon/pai/hud.dm b/code/modules/mob/living/silicon/pai/hud.dm index a7838cf25b9..f374aebbc78 100644 --- a/code/modules/mob/living/silicon/pai/hud.dm +++ b/code/modules/mob/living/silicon/pai/hud.dm @@ -19,10 +19,10 @@ client.images += holder else perpname = perp.name - holder.icon_state = "hudunknown" + holder.icon_state = "hudno_id" client.images += holder else - holder.icon_state = "hudunknown" + holder.icon_state = "hudno_id" client.images += holder for(var/datum/data/record/E in data_core.general) diff --git a/icons/mob/hud.dmi b/icons/mob/hud.dmi index 709e3b2f5fb..1fcea5ee0ec 100644 Binary files a/icons/mob/hud.dmi and b/icons/mob/hud.dmi differ