From ad8e911c343bbf4f849ca6445b5d41d7828dfb22 Mon Sep 17 00:00:00 2001 From: Heroman Date: Sun, 4 Jul 2021 10:48:59 +1000 Subject: [PATCH] More hud icon stuff --- code/_helpers/global_lists_vr.dm | 18 +++++++++++++++--- code/game/jobs/access.dm | 2 +- code/game/jobs/job/assistant_vr.dm | 6 +----- icons/mob/hud_jobs_vr.dmi | Bin 4246 -> 4470 bytes 4 files changed, 17 insertions(+), 9 deletions(-) diff --git a/code/_helpers/global_lists_vr.dm b/code/_helpers/global_lists_vr.dm index 16622d1ee6..87cd24a36f 100644 --- a/code/_helpers/global_lists_vr.dm +++ b/code/_helpers/global_lists_vr.dm @@ -492,6 +492,18 @@ var/global/list/remainless_species = list(SPECIES_PROMETHEAN, SPECIES_GOLEM, //Some special species that may or may not be ever used in event too, SPECIES_SHADEKIN) //Shadefluffers just poof away +/var/global/list/alt_titles_with_icons = list( + "Virologist", + "Apprentice Engineer", + "Medical Intern", + "Research Intern", + "Security Cadet", + "Jr. Cargo Tech", + "Jr. Explorer", + "Server", + "Electrician", + "Barista") + /var/global/list/existing_solargrubs = list() /hook/startup/proc/init_vore_datum_ref_lists() @@ -512,10 +524,10 @@ var/global/list/remainless_species = list(SPECIES_PROMETHEAN, var/cost = instance.cost traits_costs[path] = cost all_traits[path] = instance - + // Shakey shakey shake sortTim(all_traits, /proc/cmp_trait_datums_name, associative = TRUE) - + // Split 'em up for(var/traitpath in all_traits) var/datum/trait/T = all_traits[traitpath] @@ -529,7 +541,7 @@ var/global/list/remainless_species = list(SPECIES_PROMETHEAN, everyone_traits[traitpath] = T if(0.1 to INFINITY) positive_traits[traitpath] = T - + // Weaver recipe stuff paths = typesof(/datum/weaver_recipe/structure) - /datum/weaver_recipe/structure diff --git a/code/game/jobs/access.dm b/code/game/jobs/access.dm index 72eda8b94a..ddf4b9be33 100644 --- a/code/game/jobs/access.dm +++ b/code/game/jobs/access.dm @@ -236,7 +236,7 @@ return C.registered_name /proc/get_all_job_icons() //For all existing HUD icons - return joblist + list("Prisoner") + return joblist + alt_titles_with_icons + list("Prisoner") /obj/proc/GetJobName() //Used in secHUD icon generation var/obj/item/weapon/card/id/I = GetID() diff --git a/code/game/jobs/job/assistant_vr.dm b/code/game/jobs/job/assistant_vr.dm index f2fac2e72b..48f240d0ca 100644 --- a/code/game/jobs/job/assistant_vr.dm +++ b/code/game/jobs/job/assistant_vr.dm @@ -16,8 +16,7 @@ access = list() //See /datum/job/intern/get_access() minimal_access = list() //See /datum/job/intern/get_access() outfit_type = /decl/hierarchy/outfit/job/assistant/intern - alt_titles = list("Intern" = /datum/alt_title/intern, - "Apprentice Engineer" = /datum/alt_title/intern_eng, + alt_titles = list("Apprentice Engineer" = /datum/alt_title/intern_eng, "Medical Intern" = /datum/alt_title/intern_med, "Research Intern" = /datum/alt_title/intern_sci, "Security Cadet" = /datum/alt_title/intern_sec, @@ -28,9 +27,6 @@ another job. Though they are part of the crew, they have no real authority." timeoff_factor = 0 // Interns, noh -/datum/alt_title/intern - title = "Intern" - /datum/alt_title/intern_eng title = "Apprentice Engineer" title_blurb = "An Apprentice Engineer attempts to provide whatever the Engineering department needs. They are not proper Engineers, and are \ diff --git a/icons/mob/hud_jobs_vr.dmi b/icons/mob/hud_jobs_vr.dmi index ebd53b1512ce135d8f071c2eca9354cdb598ba0d..8d8561c0809515b16ebfafb5543936444decd0b5 100644 GIT binary patch literal 4470 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 GiTN)my_0(Y