From f5fd3a92292f4ad65ce03f977e656b7b7f909ee1 Mon Sep 17 00:00:00 2001 From: FlamingLily <80451102+FlamingLily@users.noreply.github.com> Date: Fri, 31 Jan 2025 23:08:43 +1100 Subject: [PATCH] Assistant Overhaul (#20368) FORUM THREAD: https://forums.aurorastation.org/topic/20580-assistant-overhaul/#comment-179129 This one will probably need a wiki change or two. The Assistant Overhaul! A.K.A "FlamingLily commits to coding something and forgets for six months" Also, the "Lab Assistant" (Science's learner role) has been renamed to "Research Intern" with alt-titles to match, in the same vein as the medical intern. This serves the dual role of clarifying the role's nature as a departmental learner, AND makes space for the assistant alt title. This PR adds four new titles to the Assistant role, complete with access and loadouts to match. * Wait Staff: This one's pretty self explanatory. They haul food and drinks FROM the kitchen and bar TO customers. They do not cook, and do not get kitchen or bar access. * Technical Assistant: This one's job is to haul crates and parts for engineers. They get access to engineering's lobby and main hallways (as far as a Janitor can get), but otherwise get nothing. They CANNOT start the engines, shields, atmosphere, or anything. They spawn with a high-vis vest and a debugger, for token vending-machine fixing efforts. * Lab Assistant: This one's job is to haul crates and equipment for scientists. They get access to ACCESS_RESEARCH which is like, two doors in the research meeting room and not even the hallway outside I think (idk). They also get a labcoat and safety goggles. For safety. * Medical Orderly: This one's job is to haul equipment and corpses, clean up a messy GTR, and stay out of medical's way when an alert is called. Maybe they can man the reception as well. They spawn with a labcoat and sterilizine (not even cleaner, because it's funnier that way.) I want to insist that these are assistant alt titles, and not roles with responsibilities. They cannot do repairs, they cannot do science, they cannot do surgery, and they CERTAINLY can't cook. Changelog: - rscadd: "Added four new assistant alt titles: Wait Staff, Technical Assistant, Lab Assistant, and Medical Orderly (These are still ASSISTANTS, and cannot perform the relevant departmental skills. These are also different from learner roles, such as the Interns.)" - rscadd: "Renamed the existing "Lab Assistant" (The learner role) to "Research Intern" to better represent the intent for the role and to make space for the alt title." --------- Signed-off-by: FlamingLily <80451102+FlamingLily@users.noreply.github.com> --- code/game/antagonist/station/loyalist.dm | 2 +- code/game/antagonist/station/revolutionary.dm | 2 +- code/game/jobs/faction/zavodskoi.dm | 4 +- code/game/jobs/faction/zeng_hu.dm | 4 +- code/game/jobs/job/science.dm | 5 +- code/game/jobs/job/ship_crew.dm | 49 +++++++++++++-- code/game/jobs/jobs.dm | 2 +- .../loadout/items/augments.dm | 12 ++-- .../preference_setup/loadout/items/uniform.dm | 4 +- .../preference_setup/loadout/items/utility.dm | 2 +- .../loadout/items/xeno/machine.dm | 2 +- code/modules/clothing/under/jobs/medsci.dm | 6 +- html/changelogs/flaminglily-assistants.yml | 59 +++++++++++++++++++ 13 files changed, 127 insertions(+), 26 deletions(-) create mode 100644 html/changelogs/flaminglily-assistants.yml diff --git a/code/game/antagonist/station/loyalist.dm b/code/game/antagonist/station/loyalist.dm index dba99b06283..3531c4e3e8f 100644 --- a/code/game/antagonist/station/loyalist.dm +++ b/code/game/antagonist/station/loyalist.dm @@ -28,7 +28,7 @@ var/datum/antagonist/loyalists/loyalists faction_invisible = FALSE restricted_jobs = list("AI", "Cyborg", "Merchant") - protected_jobs = list("Lab Assistant", "Medical Intern", "Engineering Apprentice", "Assistant", "Security Cadet") + protected_jobs = list("Research Intern", "Medical Intern", "Engineering Apprentice", "Assistant", "Security Cadet") required_age = 31 /datum/antagonist/loyalists/New() diff --git a/code/game/antagonist/station/revolutionary.dm b/code/game/antagonist/station/revolutionary.dm index 014e8bf52dd..87ec2a6c03e 100644 --- a/code/game/antagonist/station/revolutionary.dm +++ b/code/game/antagonist/station/revolutionary.dm @@ -27,7 +27,7 @@ var/datum/antagonist/revolutionary/revs faction_invisible = FALSE restricted_jobs = list("AI", "Cyborg", "Merchant") - protected_jobs = list("Lab Assistant", "Medical Intern", "Engineering Apprentice", "Assistant", "Security Cadet", "Captain", "Head of Security") + protected_jobs = list("Research Intern", "Medical Intern", "Engineering Apprentice", "Assistant", "Security Cadet", "Captain", "Head of Security") required_age = 31 /datum/antagonist/revolutionary/New() diff --git a/code/game/jobs/faction/zavodskoi.dm b/code/game/jobs/faction/zavodskoi.dm index 89211ecfb48..244fc4dcfc6 100644 --- a/code/game/jobs/faction/zavodskoi.dm +++ b/code/game/jobs/faction/zavodskoi.dm @@ -56,7 +56,7 @@ "Scientist" = /obj/outfit/job/scientist/zavodskoi, "Xenobiologist" = /obj/outfit/job/scientist/xenobiologist/zavodskoi, "Xenobotanist" = /obj/outfit/job/scientist/xenobotanist/zavodskoi, - "Lab Assistant" = /obj/outfit/job/intern_sci/zavodskoi, + "Research Intern" = /obj/outfit/job/intern_sci/zavodskoi, "Xenoarchaeologist"= /obj/outfit/job/scientist/xenoarchaeologist/zavodskoi, "Anomalist"= /obj/outfit/job/scientist/anomalist/zavodskoi, "Engineer" = /obj/outfit/job/engineer/zavodskoi, @@ -192,7 +192,7 @@ messengerbag_faction = /obj/item/storage/backpack/messenger/zavod /obj/outfit/job/intern_sci/zavodskoi - name = "Lab Assistant - Zavodskoi Interstellar" + name = "Research Intern - Zavodskoi Interstellar" uniform = /obj/item/clothing/under/rank/scientist/intern/zavod id = /obj/item/card/id/zavodskoi diff --git a/code/game/jobs/faction/zeng_hu.dm b/code/game/jobs/faction/zeng_hu.dm index 9b077fe0040..516116199b6 100644 --- a/code/game/jobs/faction/zeng_hu.dm +++ b/code/game/jobs/faction/zeng_hu.dm @@ -53,7 +53,7 @@ "Xenobiologist" = /obj/outfit/job/scientist/xenobiologist/zeng_hu, "Anomalist" = /obj/outfit/job/scientist/anomalist/zeng_hu, "Xenobotanist" = /obj/outfit/job/scientist/xenobotanist/zeng_hu, - "Lab Assistant" = /obj/outfit/job/intern_sci/zeng_hu, + "Research Intern" = /obj/outfit/job/intern_sci/zeng_hu, "Xenoarchaeologist"= /obj/outfit/job/scientist/xenoarchaeologist/zeng_hu, "Corporate Reporter" = /obj/outfit/job/journalist/zeng_hu, "Corporate Liaison" = /obj/outfit/job/representative/zeng_hu, @@ -210,7 +210,7 @@ messengerbag_faction = /obj/item/storage/backpack/messenger/zeng /obj/outfit/job/intern_sci/zeng_hu - name = "Lab Assistant - Zeng-Hu" + name = "Research Intern - Zeng-Hu" uniform = /obj/item/clothing/under/rank/scientist/intern/zeng id = /obj/item/card/id/zeng_hu diff --git a/code/game/jobs/job/science.dm b/code/game/jobs/job/science.dm index 0c1dce2ab79..e80a1b888b4 100644 --- a/code/game/jobs/job/science.dm +++ b/code/game/jobs/job/science.dm @@ -229,11 +229,12 @@ uniform = /obj/item/clothing/under/rank/scientist/botany /datum/job/intern_sci - title = "Lab Assistant" + title = "Research Intern" flag = INTERN_SCI departments = SIMPLEDEPT(DEPARTMENT_SCIENCE) department_flag = MEDSCI faction = "Station" + alt_titles = list("Xenoarchaeology Intern", "Anomalistics Intern", "Xenobiology Intern", "Xenobotany Intern") total_positions = 3 spawn_positions = 3 supervisors = "the Research Director" @@ -244,7 +245,7 @@ blacklisted_species = list(SPECIES_VAURCA_BREEDER) /obj/outfit/job/intern_sci - name = "Lab Assistant" + name = "Research Intern" jobtype = /datum/job/intern_sci uniform = /obj/item/clothing/under/rank/scientist/intern diff --git a/code/game/jobs/job/ship_crew.dm b/code/game/jobs/job/ship_crew.dm index 009b83a6988..337633c4ec3 100644 --- a/code/game/jobs/job/ship_crew.dm +++ b/code/game/jobs/job/ship_crew.dm @@ -15,11 +15,31 @@ outfit = /obj/outfit/job/assistant blacklisted_species = list(SPECIES_VAURCA_BREEDER) + alt_titles = list("Lab Assistant", "Technical Assistant", "Medical Orderly", "Wait Staff") + alt_outfits = list("Lab Assistant" = /obj/outfit/job/assistant/lab_assistant, "Technical Assistant" = /obj/outfit/job/assistant/tech_assistant, "Medical Orderly" = /obj/outfit/job/assistant/med_assistant, "Wait Staff" = /obj/outfit/job/assistant/waiter) + alt_factions = list( + "Assistant" = list("NanoTrasen", "Idris Incorporated", "Hephaestus Industries", "Orion Express", "Zavodskoi Interstellar", "Zeng-Hu Pharmaceuticals", "Private Military Contracting Group"), + "Lab Assistant" = list("NanoTrasen", "Zeng-Hu Pharmaceuticals", "Zavodskoi Interstellar"), + "Technical Assistant" = list("Hephaestus Industries", "Zavodskoi Interstellar"), + "Medical Orderly" = list("NanoTrasen", "Zeng-Hu Pharmaceuticals", "Private Military Contracting Group"), + "Wait Staff" = list("NanoTrasen", "Idris Incorporated", "Orion Express") + ) + + /datum/job/assistant/get_access(selected_title) - if(GLOB.config.assistant_maint && selected_title == "Assistant") - return list(ACCESS_MAINT_TUNNELS) - else - return list() + var/list/out_list = list() + + if(GLOB.config.assistant_maint) + out_list += list(ACCESS_MAINT_TUNNELS) + + switch(selected_title) + if("Lab Assistant") + out_list += list(ACCESS_RESEARCH) + if("Technical Assistant") + out_list += list(ACCESS_ENGINE) + if("Medical Orderly") + out_list += list(ACCESS_MEDICAL) + return out_list /obj/outfit/job/assistant name = "Assistant" @@ -33,6 +53,27 @@ dufflebag_faction = /obj/item/storage/backpack/duffel/nt messengerbag_faction = /obj/item/storage/backpack/messenger/nt +/obj/outfit/job/assistant/lab_assistant + name = "Lab Assistant" + uniform = /obj/item/clothing/under/color/lightpurple + suit = /obj/item/clothing/suit/storage/toggle/labcoat + glasses = /obj/item/clothing/glasses/safety/goggles/science + +/obj/outfit/job/assistant/tech_assistant + name = "Technical Assistant" + uniform = /obj/item/clothing/under/color/yellowgreen + suit = /obj/item/clothing/suit/storage/hazardvest + backpack_contents = list(/obj/item/device/debugger = 1) + +/obj/outfit/job/assistant/med_assistant + name = "Medical Orderly" + uniform = /obj/item/clothing/under/color/blue + suit = /obj/item/clothing/suit/storage/toggle/labcoat + backpack_contents = list(/obj/item/reagent_containers/spray/sterilizine = 1) + +/obj/outfit/job/assistant/waiter + name = "Wait Staff" + uniform = /obj/item/clothing/under/waiter /datum/job/visitor title = "Off-Duty Crew Member" flag = VISITOR diff --git a/code/game/jobs/jobs.dm b/code/game/jobs/jobs.dm index bdd1d719e89..5beaf4791a8 100644 --- a/code/game/jobs/jobs.dm +++ b/code/game/jobs/jobs.dm @@ -117,7 +117,7 @@ var/list/science_positions = list( "Xenoarchaeologist", "Xenobiologist", "Xenobotanist", - "Lab Assistant", + "Research Intern", "Science Personnel" ) diff --git a/code/modules/client/preference_setup/loadout/items/augments.dm b/code/modules/client/preference_setup/loadout/items/augments.dm index 182402f9f53..e2e93a6f941 100644 --- a/code/modules/client/preference_setup/loadout/items/augments.dm +++ b/code/modules/client/preference_setup/loadout/items/augments.dm @@ -159,7 +159,7 @@ path = /obj/item/organ/internal/augment/memory_inhibitor whitelisted = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_ATTENDANT, SPECIES_VAURCA_BULWARK, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI) faction = "Zeng-Hu Pharmaceuticals" - allowed_roles = list("Physician", "Surgeon", "Chief Medical Officer", "Pharmacist", "Paramedic", "Psychiatrist", "Medical Intern", "Corporate Liaison", "Research Director","Scientist", "Xenobiologist", "Xenobotanist", "Xenoarchaeologist", "Lab Assistant", "Assistant", "Off-Duty Crew Member", "Corporate Reporter", "Captain", "Bridge Crew", "Medical Personnel", "Science Personnel") + allowed_roles = list("Physician", "Surgeon", "Chief Medical Officer", "Pharmacist", "Paramedic", "Psychiatrist", "Medical Intern", "Corporate Liaison", "Research Director","Scientist", "Xenobiologist", "Xenobotanist", "Xenoarchaeologist", "Research Intern", "Assistant", "Off-Duty Crew Member", "Corporate Reporter", "Captain", "Bridge Crew", "Medical Personnel", "Science Personnel") /datum/gear/augment/emotional_manipulator display_name = "emotional manipulator" @@ -167,7 +167,7 @@ path = /obj/item/organ/internal/augment/emotional_manipulator whitelisted = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_ATTENDANT, SPECIES_VAURCA_BULWARK, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI) faction = "Zeng-Hu Pharmaceuticals" - allowed_roles = list("Physician", "Surgeon", "Chief Medical Officer", "Pharmacist", "Paramedic", "Psychiatrist", "Medical Intern", "Corporate Liaison", "Research Director","Scientist", "Xenobiologist", "Xenobotanist", "Xenoarchaeologist", "Lab Assistant", "Assistant", "Off-Duty Crew Member", "Corporate Reporter", "Captain", "Bridge Crew", "Medical Personnel", "Science Personnel") + allowed_roles = list("Physician", "Surgeon", "Chief Medical Officer", "Pharmacist", "Paramedic", "Psychiatrist", "Medical Intern", "Corporate Liaison", "Research Director","Scientist", "Xenobiologist", "Xenobotanist", "Xenoarchaeologist", "Research Intern", "Assistant", "Off-Duty Crew Member", "Corporate Reporter", "Captain", "Bridge Crew", "Medical Personnel", "Science Personnel") /datum/gear/augment/enhanced_vision display_name = "vision enhanced retinas" @@ -176,7 +176,7 @@ whitelisted = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_ATTENDANT, SPECIES_VAURCA_BULWARK, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_IPC, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL) faction = "Zeng-Hu Pharmaceuticals" cost = 3 - allowed_roles = list("Physician", "Surgeon", "Chief Medical Officer", "Pharmacist", "Paramedic", "Psychiatrist", "Medical Intern", "Corporate Liaison", "Research Director","Scientist", "Xenobiologist", "Xenobotanist", "Xenoarchaeologist", "Lab Assistant", "Assistant", "Off-Duty Crew Member", "Corporate Reporter", "Captain", "Bridge Crew", "Medical Personnel", "Science Personnel") + allowed_roles = list("Physician", "Surgeon", "Chief Medical Officer", "Pharmacist", "Paramedic", "Psychiatrist", "Medical Intern", "Corporate Liaison", "Research Director","Scientist", "Xenobiologist", "Xenobotanist", "Xenoarchaeologist", "Research Intern", "Assistant", "Off-Duty Crew Member", "Corporate Reporter", "Captain", "Bridge Crew", "Medical Personnel", "Science Personnel") /datum/gear/augment/sightlights display_name = "ocular installed sightlights" @@ -185,7 +185,7 @@ whitelisted = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_ATTENDANT, SPECIES_VAURCA_BULWARK, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_IPC, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL) faction = "Zeng-Hu Pharmaceuticals" cost = 3 - allowed_roles = list("Physician", "Surgeon", "Chief Medical Officer", "Pharmacist", "Paramedic", "Psychiatrist", "Medical Intern", "Corporate Liaison", "Research Director","Scientist", "Xenobiologist", "Xenobotanist", "Xenoarchaeologist", "Lab Assistant", "Assistant", "Off-Duty Crew Member", "Corporate Reporter", "Captain", "Bridge Crew", "Medical Personnel", "Science Personnel") + allowed_roles = list("Physician", "Surgeon", "Chief Medical Officer", "Pharmacist", "Paramedic", "Psychiatrist", "Medical Intern", "Corporate Liaison", "Research Director","Scientist", "Xenobiologist", "Xenobotanist", "Xenoarchaeologist", "Research Intern", "Assistant", "Off-Duty Crew Member", "Corporate Reporter", "Captain", "Bridge Crew", "Medical Personnel", "Science Personnel") /datum/gear/augment/zenghu_mask display_name = "zeng-hu facial augment selection" @@ -193,7 +193,7 @@ path = /obj/item/organ/internal/augment/eye_sensors/medical/zenghu_plate whitelisted = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_ATTENDANT, SPECIES_VAURCA_BULWARK, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL) faction = "Zeng-Hu Pharmaceuticals" - allowed_roles = list("Physician", "Surgeon", "Chief Medical Officer", "Pharmacist", "Paramedic", "Psychiatrist", "Medical Intern", "Corporate Liaison", "Research Director","Scientist", "Xenobiologist", "Xenobotanist", "Xenoarchaeologist", "Lab Assistant", "Assistant", "Off-Duty Crew Member", "Corporate Reporter", "Captain", "Bridge Crew", "Medical Personnel", "Science Personnel") + allowed_roles = list("Physician", "Surgeon", "Chief Medical Officer", "Pharmacist", "Paramedic", "Psychiatrist", "Medical Intern", "Corporate Liaison", "Research Director","Scientist", "Xenobiologist", "Xenobotanist", "Xenoarchaeologist", "Research Intern", "Assistant", "Off-Duty Crew Member", "Corporate Reporter", "Captain", "Bridge Crew", "Medical Personnel", "Science Personnel") /datum/gear/augment/zenghu_mask/New() ..() @@ -256,7 +256,7 @@ path = /obj/item/organ/internal/augment/language/zeng whitelisted = list(SPECIES_HUMAN, SPECIES_HUMAN_OFFWORLD) faction = "Zeng-Hu Pharmaceuticals" - allowed_roles = list("Physician", "Surgeon", "Chief Medical Officer", "Pharmacist", "Paramedic", "Psychiatrist", "Medical Intern", "Corporate Liaison", "Research Director","Scientist", "Xenobiologist", "Xenobotanist", "Xenoarchaeologist", "Lab Assistant", "Assistant", "Off-Duty Crew Member", "Corporate Reporter", "Captain", "Bridge Crew", "Medical Personnel", "Science Personnel") + allowed_roles = list("Physician", "Surgeon", "Chief Medical Officer", "Pharmacist", "Paramedic", "Psychiatrist", "Medical Intern", "Corporate Liaison", "Research Director","Scientist", "Xenobiologist", "Xenobotanist", "Xenoarchaeologist", "Research Intern", "Assistant", "Off-Duty Crew Member", "Corporate Reporter", "Captain", "Bridge Crew", "Medical Personnel", "Science Personnel") cost = 3 /datum/gear/augment/phalanx_plate diff --git a/code/modules/client/preference_setup/loadout/items/uniform.dm b/code/modules/client/preference_setup/loadout/items/uniform.dm index 8e9f54b9ec2..98a728a1fd7 100644 --- a/code/modules/client/preference_setup/loadout/items/uniform.dm +++ b/code/modules/client/preference_setup/loadout/items/uniform.dm @@ -75,7 +75,7 @@ /datum/gear/uniform/scrubs display_name = "scrubs selection" path = /obj/item/clothing/under/rank/medical/surgeon/zavod - allowed_roles = list("Scientist", "Lab Assistant", "Chief Medical Officer", "Physician", "Surgeon", "Pharmacist", "Paramedic", "Medical Intern", "Xenobiologist", "Research Director", "Investigator", "Medical Personnel", "Science Personnel") + allowed_roles = list("Scientist", "Research Intern", "Chief Medical Officer", "Physician", "Surgeon", "Pharmacist", "Paramedic", "Medical Intern", "Xenobiologist", "Research Director", "Investigator", "Medical Personnel", "Science Personnel") /datum/gear/uniform/scrubs/New() ..() @@ -93,7 +93,7 @@ display_name = "colorable scrubs" description = "It's made of a special fiber that provides minor protection against biohazards." path = /obj/item/clothing/under/rank/medical/generic - allowed_roles = list("Scientist", "Lab Assistant", "Chief Medical Officer", "Physician", "Surgeon", "Pharmacist", "Paramedic", "Medical Intern", "Xenobiologist", "Research Director", "Investigator", "Medical Personnel", "Science Personnel") + allowed_roles = list("Scientist", "Research Intern", "Chief Medical Officer", "Physician", "Surgeon", "Pharmacist", "Paramedic", "Medical Intern", "Xenobiologist", "Research Director", "Investigator", "Medical Personnel", "Science Personnel") flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION | GEAR_HAS_ACCENT_COLOR_SELECTION /datum/gear/uniform/dress diff --git a/code/modules/client/preference_setup/loadout/items/utility.dm b/code/modules/client/preference_setup/loadout/items/utility.dm index 4ca036242ea..143cbb3aae4 100644 --- a/code/modules/client/preference_setup/loadout/items/utility.dm +++ b/code/modules/client/preference_setup/loadout/items/utility.dm @@ -114,7 +114,7 @@ /datum/gear/utility/assunzione_kit display_name = "assunzionii voidsuit kit" path = /obj/item/voidsuit_modkit/assunzione - allowed_roles = list("Research Director", "Scientist", "Xenoarchaeologist", "Xenobiologist", "Xenobotanist", "Lab Assistant", "Science Personnel") + allowed_roles = list("Research Director", "Scientist", "Xenoarchaeologist", "Xenobiologist", "Xenobotanist", "Research Intern", "Science Personnel") origin_restriction = list(/singleton/origin_item/origin/assunzione, /singleton/origin_item/origin/ipc_assunzione) /datum/gear/utility/wheelchair/color diff --git a/code/modules/client/preference_setup/loadout/items/xeno/machine.dm b/code/modules/client/preference_setup/loadout/items/xeno/machine.dm index 13d369aac22..a654c4cd720 100644 --- a/code/modules/client/preference_setup/loadout/items/xeno/machine.dm +++ b/code/modules/client/preference_setup/loadout/items/xeno/machine.dm @@ -335,7 +335,7 @@ ABSTRACT_TYPE(/datum/gear/augment/machine) /datum/gear/utility/ipc_assunzione_kit display_name = "synthetic assunzionii voidsuit kit" path = /obj/item/voidsuit_modkit/assunzione/ipc - allowed_roles = list("Research Director", "Scientist", "Xenoarchaeologist", "Xenobiologist", "Xenobotanist", "Lab Assistant", "Science Personnel") + allowed_roles = list("Research Director", "Scientist", "Xenoarchaeologist", "Xenobiologist", "Xenobotanist", "Research Intern", "Science Personnel") origin_restriction = list(/singleton/origin_item/origin/ipc_assunzione) whitelisted = list(SPECIES_IPC, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL) sort_category = "Xenowear - IPC" diff --git a/code/modules/clothing/under/jobs/medsci.dm b/code/modules/clothing/under/jobs/medsci.dm index b68132f8922..e92ee229e8b 100644 --- a/code/modules/clothing/under/jobs/medsci.dm +++ b/code/modules/clothing/under/jobs/medsci.dm @@ -71,10 +71,10 @@ icon_state = "zav_xenob" item_state = "zav_xenob" -// Lab Assistant. +// Research Intern. /obj/item/clothing/under/rank/scientist/intern - desc = "It's made of a special fiber that provides minor protection against biohazards. It has markings that denote the wearer as a laboratory assistant." - name = "laboratory assistant's jumpsuit" + desc = "It's made of a special fiber that provides minor protection against biohazards. It has markings that denote the wearer as a research intern." + name = "research intern's jumpsuit" icon_state = "nt_assistant" item_state = "nt_assistant" diff --git a/html/changelogs/flaminglily-assistants.yml b/html/changelogs/flaminglily-assistants.yml new file mode 100644 index 00000000000..e737ea29167 --- /dev/null +++ b/html/changelogs/flaminglily-assistants.yml @@ -0,0 +1,59 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# - (fixes bugs) +# wip +# - (work in progress) +# qol +# - (quality of life) +# soundadd +# - (adds a sound) +# sounddel +# - (removes a sound) +# rscadd +# - (adds a feature) +# rscdel +# - (removes a feature) +# imageadd +# - (adds an image or sprite) +# imagedel +# - (removes an image or sprite) +# spellcheck +# - (fixes spelling or grammar) +# experiment +# - (experimental change) +# balance +# - (balance changes) +# code_imp +# - (misc internal code change) +# refactor +# - (refactors code) +# config +# - (makes a change to the config files) +# admin +# - (makes changes to administrator tools) +# server +# - (miscellaneous changes to server) +################################# + +# Your name. +author: FlamingLily + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit. +# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Added four new assistant alt titles: Wait Staff, Technical Assistant, Lab Assistant, and Medical Orderly. (These are still ASSISTANTS, and cannot perform the relevant departmental skills. These are also different from learner roles, such as the Interns.)" + - rscadd: "Renamed the existing Lab Assistant (The learner role) to Research Intern to better represent the intent for the role and to make space for the alt title."