diff --git a/code/game/antagonist/station/loyalist.dm b/code/game/antagonist/station/loyalist.dm index f8aa2c6d6b2..64dfb7a12ce 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") - protected_jobs = list("Lab Assistant", "Medical Resident", "Engineering Apprentice", "Assistant", "Security Cadet", "Captain", "Head of Security") + protected_jobs = list("Lab Assistant", "Medical Intern", "Engineering Apprentice", "Assistant", "Security Cadet", "Captain", "Head of Security") required_age = 31 /datum/antagonist/loyalists/New() diff --git a/code/game/antagonist/station/revolutionary.dm b/code/game/antagonist/station/revolutionary.dm index a35a4e35253..a70f7ae436b 100644 --- a/code/game/antagonist/station/revolutionary.dm +++ b/code/game/antagonist/station/revolutionary.dm @@ -29,7 +29,7 @@ var/datum/antagonist/revolutionary/revs faction_invisible = FALSE restricted_jobs = list("AI", "Cyborg") - protected_jobs = list("Lab Assistant", "Medical Resident", "Engineering Apprentice", "Assistant", "Security Cadet", "Captain", "Head of Security") + protected_jobs = list("Lab Assistant", "Medical Intern", "Engineering Apprentice", "Assistant", "Security Cadet", "Captain", "Head of Security") required_age = 31 /datum/antagonist/revolutionary/New() diff --git a/code/game/jobs/job/medical.dm b/code/game/jobs/job/medical.dm index 6a7c9efca53..480e69612ca 100644 --- a/code/game/jobs/job/medical.dm +++ b/code/game/jobs/job/medical.dm @@ -231,7 +231,7 @@ messengerbag = /obj/item/storage/backpack/messenger/med /datum/job/intern_med - title = "Medical Resident" + title = "Medical Intern" flag = INTERN_MED department_flag = MEDSCI faction = "Station" @@ -241,11 +241,11 @@ selection_color = "#FF97D1" access = list(access_medical, access_surgery, access_medical_equip) minimal_access = list(access_medical, access_surgery, access_medical_equip) - minimum_character_age = 25 + minimum_character_age = 18 outfit = /datum/outfit/job/intern_med /datum/outfit/job/intern_med - name = "Medical Resident" + name = "Medical Intern" jobtype = /datum/job/intern_med uniform = /obj/item/clothing/under/rank/medical/intern diff --git a/code/game/jobs/jobs.dm b/code/game/jobs/jobs.dm index e0e4baab14d..c4668f0f422 100644 --- a/code/game/jobs/jobs.dm +++ b/code/game/jobs/jobs.dm @@ -81,7 +81,7 @@ var/list/medical_positions = list( "Psychiatrist", "Pharmacist", "Emergency Medical Technician", - "Medical Resident" + "Medical Intern" ) diff --git a/code/modules/client/preference_setup/loadout/loadout_accessories.dm b/code/modules/client/preference_setup/loadout/loadout_accessories.dm index 5146e7d4ac1..563252724fc 100644 --- a/code/modules/client/preference_setup/loadout/loadout_accessories.dm +++ b/code/modules/client/preference_setup/loadout/loadout_accessories.dm @@ -111,7 +111,7 @@ /datum/gear/accessory/white_vest display_name = "webbing, medical" path = /obj/item/clothing/accessory/storage/white_vest - allowed_roles = list("Chief Medical Officer", "Physician", "Surgeon", "Pharmacist", "Psychiatrist", "Emergency Medical Technician", "Medical Resident") + allowed_roles = list("Chief Medical Officer", "Physician", "Surgeon", "Pharmacist", "Psychiatrist", "Emergency Medical Technician", "Medical Intern") /datum/gear/accessory/webbing display_name = "webbing, simple" @@ -131,7 +131,7 @@ /datum/gear/accessory/white_pouches display_name = "drop pouches, medical" path = /obj/item/clothing/accessory/storage/pouches/white - allowed_roles = list("Chief Medical Officer", "Physician", "Surgeon", "Pharmacist", "Psychiatrist", "Emergency Medical Technician", "Medical Resident") + allowed_roles = list("Chief Medical Officer", "Physician", "Surgeon", "Pharmacist", "Psychiatrist", "Emergency Medical Technician", "Medical Intern") /datum/gear/accessory/pouches display_name = "drop pouches, simple" diff --git a/code/modules/client/preference_setup/loadout/loadout_computer.dm b/code/modules/client/preference_setup/loadout/loadout_computer.dm index 9bf0376b994..f4e8dc2ee8b 100644 --- a/code/modules/client/preference_setup/loadout/loadout_computer.dm +++ b/code/modules/client/preference_setup/loadout/loadout_computer.dm @@ -26,7 +26,7 @@ /datum/gear/computer/wristbound/medical display_name = "wristbound computer (Medical)" path = /obj/item/modular_computer/wristbound/preset/advanced/medical - allowed_roles = list("Physician", "Surgeon", "Medical Resident", "Pharmacist", "Psychiatrist", "Emergency Medical Technician") + allowed_roles = list("Physician", "Surgeon", "Medical Intern", "Pharmacist", "Psychiatrist", "Emergency Medical Technician") /datum/gear/computer/wristbound/security display_name = "wristbound computer (Security)" diff --git a/code/modules/client/preference_setup/loadout/loadout_eyes.dm b/code/modules/client/preference_setup/loadout/loadout_eyes.dm index 2d5c02c2d46..edd2089e10a 100644 --- a/code/modules/client/preference_setup/loadout/loadout_eyes.dm +++ b/code/modules/client/preference_setup/loadout/loadout_eyes.dm @@ -68,7 +68,7 @@ display_name = "medical HUD selection" description = "A selection of medical HUDs." path = /obj/item/clothing/glasses/hud/health/aviator - allowed_roles = list("Physician", "Surgeon", "Chief Medical Officer", "Pharmacist", "Emergency Medical Technician", "Psychiatrist", "Medical Resident") + allowed_roles = list("Physician", "Surgeon", "Chief Medical Officer", "Pharmacist", "Emergency Medical Technician", "Psychiatrist", "Medical Intern") /datum/gear/eyes/medhuds/New() ..() diff --git a/code/modules/client/preference_setup/loadout/loadout_head.dm b/code/modules/client/preference_setup/loadout/loadout_head.dm index ffc13c7b135..032a3d8ee4f 100644 --- a/code/modules/client/preference_setup/loadout/loadout_head.dm +++ b/code/modules/client/preference_setup/loadout/loadout_head.dm @@ -110,7 +110,7 @@ /datum/gear/head/beret/medical display_name = "beret, medical" path = /obj/item/clothing/head/beret/medical - allowed_roles = list("Physician", "Surgeon", "Medical Resident", "Pharmacist", "Emergency Medical Technician", "Chief Medial Officer", "Psychiatrist") + allowed_roles = list("Physician", "Surgeon", "Medical Intern", "Pharmacist", "Emergency Medical Technician", "Chief Medial Officer", "Psychiatrist") /datum/gear/head/corp display_name = "cap, corporate (security)" @@ -230,7 +230,7 @@ /datum/gear/head/surgical display_name = "surgical cap selection" path = /obj/item/clothing/head/surgery/blue - allowed_roles = list("Scientist", "Chief Medical Officer", "Physician", "Surgeon", "Pharmacist", "Emergency Medical Technician", "Medical Resident", "Xenobiologist", "Roboticist", "Research Director", "Forensic Technician") + allowed_roles = list("Scientist", "Chief Medical Officer", "Physician", "Surgeon", "Pharmacist", "Emergency Medical Technician", "Medical Intern", "Xenobiologist", "Roboticist", "Research Director", "Forensic Technician") /datum/gear/head/surgical/New() ..() @@ -258,7 +258,7 @@ /datum/gear/head/iacberet display_name = "IAC Beret" path = /obj/item/clothing/head/softcap/iacberet - allowed_roles = list("Chief Medical Officer", "Physician", "Surgeon", "Pharmacist", "Emergency Medical Technician", "Medical Resident") + allowed_roles = list("Chief Medical Officer", "Physician", "Surgeon", "Pharmacist", "Emergency Medical Technician", "Medical Intern") flags = GEAR_HAS_DESC_SELECTION /datum/gear/head/circuitry diff --git a/code/modules/client/preference_setup/loadout/loadout_suit.dm b/code/modules/client/preference_setup/loadout/loadout_suit.dm index d0cf4d1b9c9..ab8a1ad85f6 100644 --- a/code/modules/client/preference_setup/loadout/loadout_suit.dm +++ b/code/modules/client/preference_setup/loadout/loadout_suit.dm @@ -94,13 +94,13 @@ display_name = "surgical apron" path = /obj/item/clothing/suit/apron/surgery cost = 1 - allowed_roles = list("Scientist", "Chief Medical Officer", "Physician", "Surgeon", "Pharmacist", "Emergency Medical Technician", "Medical Resident", "Xenobiologist", "Roboticist", "Research Director", "Forensic Technician") + allowed_roles = list("Scientist", "Chief Medical Officer", "Physician", "Surgeon", "Pharmacist", "Emergency Medical Technician", "Medical Intern", "Xenobiologist", "Roboticist", "Research Director", "Forensic Technician") /datum/gear/suit/iacvest display_name = "IAC vest" description = "It's a lightweight vest. Made of a dark, navy mesh with highly-reflective white material, designed to be worn by the Interstellar Aid Corps." path = /obj/item/clothing/suit/storage/iacvest - allowed_roles = list("Chief Medical Officer", "Physician", "Surgeon", "Pharmacist", "Emergency Medical Technician", "Medical Resident") + allowed_roles = list("Chief Medical Officer", "Physician", "Surgeon", "Pharmacist", "Emergency Medical Technician", "Medical Intern") flags = GEAR_HAS_DESC_SELECTION /datum/gear/suit/poncho diff --git a/code/modules/client/preference_setup/loadout/loadout_uniform.dm b/code/modules/client/preference_setup/loadout/loadout_uniform.dm index 3dd9454760e..fdf35cd5dff 100644 --- a/code/modules/client/preference_setup/loadout/loadout_uniform.dm +++ b/code/modules/client/preference_setup/loadout/loadout_uniform.dm @@ -8,7 +8,7 @@ /datum/gear/uniform/iacjumpsuit display_name = "IAC Jumpsuit" path = /obj/item/clothing/under/rank/iacjumpsuit - allowed_roles = list("Chief Medical Officer", "Physician", "Surgeon", "Pharmacist", "Emergency Medical Technician", "Medical Resident") + allowed_roles = list("Chief Medical Officer", "Physician", "Surgeon", "Pharmacist", "Emergency Medical Technician", "Medical Intern") /datum/gear/uniform/jumpsuit display_name = "generic jumpsuits" @@ -91,7 +91,7 @@ /datum/gear/uniform/scrubs display_name = "scrubs selection" path = /obj/item/clothing/under/rank/medical/black - allowed_roles = list("Scientist","Chief Medical Officer", "Physician", "Surgeon", "Pharmacist", "Emergency Medical Technician", "Medical Resident", "Xenobiologist", "Roboticist", "Research Director", "Forensic Technician") + allowed_roles = list("Scientist","Chief Medical Officer", "Physician", "Surgeon", "Pharmacist", "Emergency Medical Technician", "Medical Intern", "Xenobiologist", "Roboticist", "Research Director", "Forensic Technician") /datum/gear/uniform/scrubs/New() ..() diff --git a/code/modules/client/preference_setup/loadout/loadout_xeno/tajara.dm b/code/modules/client/preference_setup/loadout/loadout_xeno/tajara.dm index f730bfe2f01..c34c917944b 100644 --- a/code/modules/client/preference_setup/loadout/loadout_xeno/tajara.dm +++ b/code/modules/client/preference_setup/loadout/loadout_xeno/tajara.dm @@ -57,7 +57,7 @@ display_name = "PRA medical coat" path = /obj/item/clothing/suit/storage/toggle/labcoat/tajaran whitelisted = list(SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI) - allowed_roles = list("Chief Medical Officer", "Physician", "Surgeon", "Chemist", "Geneticist", "Emergency Medical Technician", "Medical Resident") + allowed_roles = list("Chief Medical Officer", "Physician", "Surgeon", "Chemist", "Geneticist", "Emergency Medical Technician", "Medical Intern") sort_category = "Xenowear - Tajara" /datum/gear/uniform/tajara diff --git a/code/modules/client/preference_setup/loadout/loadout_xeno/unathi.dm b/code/modules/client/preference_setup/loadout/loadout_xeno/unathi.dm index 265d20d6688..72faec54a99 100644 --- a/code/modules/client/preference_setup/loadout/loadout_xeno/unathi.dm +++ b/code/modules/client/preference_setup/loadout/loadout_xeno/unathi.dm @@ -73,7 +73,7 @@ whitelisted = list(SPECIES_UNATHI) sort_category = "Xenowear - Unathi" cost = 3 - allowed_roles = list("Chief Medical Officer", "Physician", "Surgeon", "Emergency Medical Technician", "Medical Resident", "Psychiatrist", "Chemist") + allowed_roles = list("Chief Medical Officer", "Physician", "Surgeon", "Emergency Medical Technician", "Medical Intern", "Psychiatrist", "Chemist") flags = GEAR_NO_SELECTION /datum/gear/augment/autakh_security diff --git a/code/modules/clothing/under/jobs/medsci.dm b/code/modules/clothing/under/jobs/medsci.dm index b70cd2f5134..ccae115cd40 100644 --- a/code/modules/clothing/under/jobs/medsci.dm +++ b/code/modules/clothing/under/jobs/medsci.dm @@ -132,7 +132,7 @@ /obj/item/clothing/under/rank/medical/intern desc = "It's made of a special fiber that provides minor protection against biohazards. It denotes that the wearer is still a medical intern." - name = "medical resident's jumpsuit" + name = "medical intern's jumpsuit" icon_state = "intern_medical" worn_state = "intern_medical" diff --git a/html/changelogs/johnwildkins-interns.yml b/html/changelogs/johnwildkins-interns.yml new file mode 100644 index 00000000000..30fa2b78372 --- /dev/null +++ b/html/changelogs/johnwildkins-interns.yml @@ -0,0 +1,6 @@ +author: JohnWildkins + +delete-after: True + +changes: + - tweak: "Renames Medical Resident to Medical Intern, lowers required age to 18." diff --git a/maps/aurora/aurora-3_sublevel.dmm b/maps/aurora/aurora-3_sublevel.dmm index db12bc9c86c..98bc5474358 100644 --- a/maps/aurora/aurora-3_sublevel.dmm +++ b/maps/aurora/aurora-3_sublevel.dmm @@ -34066,7 +34066,7 @@ /area/maintenance/engsublevel) "sWS" = ( /obj/effect/landmark/start{ - name = "Medical Resident" + name = "Medical Intern" }, /obj/effect/floor_decal/corner_wide/lime{ dir = 6 @@ -35434,7 +35434,7 @@ /area/rnd/isolation_c) "vMS" = ( /obj/effect/landmark/start{ - name = "Medical Resident" + name = "Medical Intern" }, /obj/effect/floor_decal/corner_wide/lime/full{ dir = 1 diff --git a/maps/exodus/exodus-1_station.dmm b/maps/exodus/exodus-1_station.dmm index 9776d58a1cb..9bdd8b98e87 100644 --- a/maps/exodus/exodus-1_station.dmm +++ b/maps/exodus/exodus-1_station.dmm @@ -75187,7 +75187,7 @@ "ljp" = ( /obj/structure/bed/chair, /obj/effect/landmark/start{ - name = "Medical Resident" + name = "Medical Intern" }, /turf/simulated/floor/tiled, /area/medical/surgeryobs)