cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-20 19:43:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Medbay Job Reshuffling (#7986)

Browse Source
This commit is contained in:
Matt Atlas
2020-01-25 11:15:04 +01:00
committed by GitHub
parent 8f5967440a
commit 3f87bb63ee
28 changed files with 128 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/awaymissions/corpse.dm
+2 -2
View File
@@ -146,8 +146,8 @@
corpsepocket1 = /obj/item/device/flashlight/pen
corpseshoes = /obj/item/clothing/shoes/black
corpseid = 1
corpseidjob = "Medical Doctor"
corpseidaccess = "Medical Doctor"
corpseidjob = "Physician"
corpseidaccess = "Physician"
/obj/effect/landmark/corpse/engineer
name = "Engineer"
code/modules/client/preference_setup/loadout/loadout_accessories.dm
+2 -2
View File
@@ -99,7 +99,7 @@
/datum/gear/accessory/white_vest
display_name = "webbing, medical"
path = /obj/item/clothing/accessory/storage/white_vest
allowed_roles = list("Chief Medical Officer", "Medical Doctor", "Pharmacist", "Psychiatrist", "Paramedic", "Medical Resident")
allowed_roles = list("Chief Medical Officer", "Physician", "Surgeon", "Pharmacist", "Psychiatrist", "Paramedic", "Medical Resident")
/datum/gear/accessory/webbing
display_name = "webbing, simple"
@@ -119,7 +119,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", "Medical Doctor", "Pharmacist","Psychiatrist", "Paramedic", "Medical Resident")
allowed_roles = list("Chief Medical Officer", "Physician", "Surgeon", "Pharmacist", "Psychiatrist", "Paramedic", "Medical Resident")
/datum/gear/accessory/pouches
display_name = "drop pouches, simple"
code/modules/client/preference_setup/loadout/loadout_eyes.dm
+2 -2
View File
@@ -64,7 +64,7 @@
/datum/gear/eyes/medical
display_name = "medical HUD"
path = /obj/item/clothing/glasses/hud/health
allowed_roles = list("Medical Doctor", "Chief Medical Officer", "Pharmacist", "Paramedic", "Psychiatrist", "Medical Resident")
allowed_roles = list("Physician", "Surgeon", "Chief Medical Officer", "Pharmacist", "Paramedic", "Psychiatrist", "Medical Resident")
/datum/gear/eyes/medical/aviator
display_name = "aviators, medical"
@@ -108,7 +108,7 @@
/datum/gear/eyes/medpatch
display_name = "HUDpatch, Medical"
path = /obj/item/clothing/glasses/eyepatch/hud/medical
allowed_roles = list("Medical Doctor", "Chief Medical Officer", "Pharmacist", "Paramedic", "Psychiatrist", "Medical Resident")
allowed_roles = list("Physician", "Surgeon", "Chief Medical Officer", "Pharmacist", "Paramedic", "Psychiatrist", "Medical Resident")
cost = 2
/datum/gear/eyes/mespatch
code/modules/client/preference_setup/loadout/loadout_head.dm
+3 -3
View File
@@ -80,7 +80,7 @@
/datum/gear/head/beret/medical
display_name = "beret, medical"
path = /obj/item/clothing/head/beret/medical
allowed_roles = list("Medical Doctor", "Medical Resident", "Pharmacist", "Paramedic", "Chief Medial Officer", "Psychiatrist")
allowed_roles = list("Physician", "Surgeon", "Medical Resident", "Pharmacist", "Paramedic", "Chief Medial Officer", "Psychiatrist")
/datum/gear/head/corp
display_name = "cap, corporate (security)"
@@ -201,7 +201,7 @@
/datum/gear/head/surgical
display_name = "surgical cap selection"
path = /obj/item/clothing/head/surgery/blue
allowed_roles = list("Scientist", "Chief Medical Officer", "Medical Doctor", "Geneticist", "Pharmacist", "Paramedic", "Medical Resident", "Xenobiologist", "Roboticist", "Research Director", "Forensic Technician")
allowed_roles = list("Scientist", "Chief Medical Officer", "Physician", "Surgeon", "Pharmacist", "Paramedic", "Medical Resident", "Xenobiologist", "Roboticist", "Research Director", "Forensic Technician")
/datum/gear/head/surgical/New()
..()
@@ -243,7 +243,7 @@
/datum/gear/head/iacberet
display_name = "IAC Beret"
path = /obj/item/clothing/head/soft/iacberet
allowed_roles = list("Chief Medical Officer", "Medical Doctor", "Pharmacist", "Paramedic", "Medical Resident")
allowed_roles = list("Chief Medical Officer", "Physician", "Surgeon", "Pharmacist", "Paramedic", "Medical Resident")
/datum/gear/head/circuitry
display_name = "headwear, circuitry (empty)"
code/modules/client/preference_setup/loadout/loadout_suit.dm
+3 -3
View File
@@ -95,13 +95,13 @@
display_name = "surgical apron"
path = /obj/item/clothing/suit/apron/surgery
cost = 1
allowed_roles = list("Scientist", "Chief Medical Officer", "Medical Doctor", "Pharmacist", "Geneticist", "Paramedic", "Medical Resident", "Xenobiologist", "Roboticist", "Research Director", "Forensic Technician")
allowed_roles = list("Scientist", "Chief Medical Officer", "Physician", "Surgeon", "Pharmacist", "Geneticist", "Paramedic", "Medical Resident", "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", "Medical Doctor", "Pharmacist", "Paramedic", "Medical Resident")
allowed_roles = list("Chief Medical Officer", "Physician", "Surgeon", "Pharmacist", "Paramedic", "Medical Resident")
/datum/gear/suit/poncho
display_name = "poncho selection"
@@ -190,7 +190,7 @@
/datum/gear/suit/winter/medical
display_name = "winter coat, medical"
path = /obj/item/clothing/suit/storage/hooded/wintercoat/medical
allowed_roles = list("Chief Medical Officer", "Medical Doctor", "Paramedic", "Medical Resident", "Psychiatrist", "Pharmacist")
allowed_roles = list("Chief Medical Officer", "Physician", "Surgeon", "Paramedic", "Medical Resident", "Psychiatrist", "Pharmacist")
/datum/gear/suit/winter/engineering
display_name = "winter coat, engineering"
code/modules/client/preference_setup/loadout/loadout_uniform.dm
+2 -2
View File
@@ -24,7 +24,7 @@
/datum/gear/uniform/iacjumpsuit
display_name = "IAC Jumpsuit"
path = /obj/item/clothing/under/rank/iacjumpsuit
allowed_roles = list("Chief Medical Officer", "Medical Doctor", "Pharmacist", "Paramedic", "Medical Resident")
allowed_roles = list("Chief Medical Officer", "Physician", "Surgeon", "Pharmacist", "Paramedic", "Medical Resident")
/datum/gear/uniform/jumpsuit
display_name = "generic jumpsuits"
@@ -103,7 +103,7 @@
/datum/gear/uniform/scrubs
display_name = "scrubs selection"
path = /obj/item/clothing/under/rank/medical/black
allowed_roles = list("Scientist","Chief Medical Officer", "Medical Doctor", "Pharmacist", "Geneticist", "Paramedic", "Medical Resident", "Xenobiologist", "Roboticist", "Research Director", "Forensic Technician")
allowed_roles = list("Scientist","Chief Medical Officer", "Physician", "Surgeon", "Pharmacist", "Geneticist", "Paramedic", "Medical Resident", "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
@@ -56,7 +56,7 @@
display_name = "PRA medical coat"
path = /obj/item/clothing/suit/storage/toggle/labcoat/tajaran
whitelisted = list("Tajara", "Zhan-Khazan Tajara", "M'sai Tajara")
allowed_roles = list("Chief Medical Officer", "Medical Doctor", "Chemist", "Geneticist", "Paramedic", "Medical Resident")
allowed_roles = list("Chief Medical Officer", "Physician", "Surgeon", "Chemist", "Geneticist", "Paramedic", "Medical Resident")
sort_category = "Xenowear - Tajara"
/datum/gear/uniform/tajara
code/modules/client/preference_setup/loadout/loadout_xeno/unathi.dm
+1 -1
View File
@@ -74,7 +74,7 @@
whitelisted = list("Aut'akh Unathi")
sort_category = "Xenowear - Unathi"
cost = 3
allowed_roles = list("Chief Medical Officer", "Medical Doctor", "Paramedic", "Medical Resident", "Psychiatrist", "Chemist")
allowed_roles = list("Chief Medical Officer", "Physician", "Surgeon", "Paramedic", "Medical Resident", "Psychiatrist", "Chemist")
/datum/gear/autakh_security
display_name = "security grasper"
code/modules/client/preferences.dm
+1 -1
View File
@@ -106,7 +106,7 @@ datum/preferences
var/list/organ_data = list()
var/list/rlimb_data = list()
var/list/body_markings = list() // "name" = "#rgbcolor"
var/list/player_alt_titles = new() // the default name of a job like "Medical Doctor"
var/list/player_alt_titles = new() // the default name of a job like "Physician"
var/list/flavor_texts = list()
var/list/flavour_texts_robot = list()
code/modules/clothing/under/jobs/medsci.dm
+1 -1
View File
@@ -155,7 +155,7 @@
/obj/item/clothing/under/rank/medical
desc = "It's made of a special fiber that provides minor protection against biohazards. It denotes that the wearer is trained medical personnel."
name = "medical doctor's jumpsuit"
name = "physician's jumpsuit"
icon_state = "medical"
item_state = "w_suit"
worn_state = "medical"
code/modules/integrated_electronics/subtypes/input.dm
+1 -1
View File
@@ -345,7 +345,7 @@
var/datum/radio_frequency/radio_connection
/obj/item/integrated_circuit/input/signaler/Initialize()
..()
. = ..()
set_frequency(frequency)
// Set the pins so when someone sees them, they won't show as null
set_pin_data(IC_INPUT, 1, frequency)
code/modules/mob/living/carbon/brain/death.dm
+1 -1
View File
@@ -6,7 +6,7 @@
return ..(gibbed,"no message")
/mob/living/carbon/brain/gib()
if(istype(container, /obj/item/device/mmi))
if(container)
QDEL_NULL(container)//Gets rid of the MMI if there is one
if(loc)
if(istype(loc,/obj/item/organ/internal/brain))