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 ebd53b1512..8d8561c080 100644 Binary files a/icons/mob/hud_jobs_vr.dmi and b/icons/mob/hud_jobs_vr.dmi differ