cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-22 12:29:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Renames Medical Resident to Medical Intern, lowers age to 18. (#10300)

Browse Source
This commit is contained in:
JohnWildkins
2020-10-23 11:45:02 +02:00
committed by GitHub
parent 183f06b344
commit bd18a4b8da
16 changed files with 29 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/antagonist/station/loyalist.dm
+1 -1
View File
@@ -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()
code/game/antagonist/station/revolutionary.dm
+1 -1
View File
@@ -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()
code/game/jobs/job/medical.dm
+3 -3
View File
@@ -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
code/game/jobs/jobs.dm
+1 -1
View File
@@ -81,7 +81,7 @@ var/list/medical_positions = list(
"Psychiatrist",
"Pharmacist",
"Emergency Medical Technician",
"Medical Resident"
"Medical Intern"
)
code/modules/client/preference_setup/loadout/loadout_accessories.dm
+2 -2
View File
@@ -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"
code/modules/client/preference_setup/loadout/loadout_computer.dm
+1 -1
View File
@@ -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)"
code/modules/client/preference_setup/loadout/loadout_eyes.dm
+1 -1
View File
@@ -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()
..()
code/modules/client/preference_setup/loadout/loadout_head.dm
+3 -3
View File
@@ -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
code/modules/client/preference_setup/loadout/loadout_suit.dm
+2 -2
View File
@@ -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
code/modules/client/preference_setup/loadout/loadout_uniform.dm
+2 -2
View File
@@ -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()
..()
code/modules/client/preference_setup/loadout/loadout_xeno/tajara.dm
+1 -1
View File
@@ -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
code/modules/client/preference_setup/loadout/loadout_xeno/unathi.dm
+1 -1
View File
@@ -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
code/modules/clothing/under/jobs/medsci.dm
+1 -1
View File
@@ -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"