From fc679999a753a58428e7de02a1c331de7f810d49 Mon Sep 17 00:00:00 2001 From: Jackbewt Date: Fri, 6 Apr 2018 15:23:43 -0700 Subject: [PATCH 1/2] Deleted virologist, altered chemist to BioChemist. --- code/game/jobs/job/medical.dm | 30 +++++------------------------- code/game/jobs/jobs.dm | 17 ++++++++--------- 2 files changed, 13 insertions(+), 34 deletions(-) diff --git a/code/game/jobs/job/medical.dm b/code/game/jobs/job/medical.dm index bacad18d188..a0e088741f4 100644 --- a/code/game/jobs/job/medical.dm +++ b/code/game/jobs/job/medical.dm @@ -54,28 +54,13 @@ economic_modifier = 7 access = list(access_medical, access_medical_equip, access_morgue, access_surgery, access_chemistry, access_virology, access_genetics, access_eva) minimal_access = list(access_medical, access_medical_equip, access_morgue, access_surgery, access_virology, access_eva) - alt_titles = list("Surgeon","Emergency Physician","Nurse","Virologist") + alt_titles = list("Surgeon","Emergency Physician","Nurse") bag_type = /obj/item/weapon/storage/backpack/medic satchel_type = /obj/item/weapon/storage/backpack/satchel_med duffel_type = /obj/item/weapon/storage/backpack/duffel/med messenger_bag_type = /obj/item/weapon/storage/backpack/messenger/med - -/datum/job/doctor/equip_backpack(var/mob/living/carbon/human/H, var/alt_title) - if(has_alt_title(H, alt_title,"Virologist")) - bag_type = /obj/item/weapon/storage/backpack/virology - satchel_type = /obj/item/weapon/storage/backpack/satchel_vir - duffel_type = /obj/item/weapon/storage/backpack/duffel/med - messenger_bag_type = /obj/item/weapon/storage/backpack/messenger/viro - ..() - bag_type = initial(bag_type) - satchel_type = initial(satchel_type) - duffel_type = initial(duffel_type) - messenger_bag_type = initial(messenger_bag_type) - else - ..() - /datum/job/doctor/equip(var/mob/living/carbon/human/H, var/alt_title) if(!H) return FALSE @@ -92,11 +77,6 @@ H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/toggle/labcoat(H), slot_wear_suit) H.equip_to_slot_or_del(new /obj/item/clothing/head/surgery/blue(H), slot_head) H.equip_to_slot_or_del(new /obj/item/device/pda/medical(H), slot_belt) - else if(has_alt_title(H, alt_title,"Virologist")) - H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/virologist(H), slot_w_uniform) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/toggle/labcoat/virologist(H), slot_wear_suit) - H.equip_to_slot_or_del(new /obj/item/clothing/mask/surgical(H), slot_wear_mask) - H.equip_to_slot_or_del(new /obj/item/device/pda/viro(H), slot_belt) else if(has_alt_title(H, alt_title,"Nurse")) if(H.gender == FEMALE) if(prob(50)) @@ -121,9 +101,9 @@ //Chemist is a medical job damnit //YEAH FUCK YOU SCIENCE -Pete //Guys, behave -Erro -/datum/job/chemist - title = "Chemist" - flag = CHEMIST +/datum/job/Biochemist + title = "Biohemist" + flag = BIOCHEMIST department = "Medical" department_flag = MEDSCI faction = "Station" @@ -133,7 +113,7 @@ selection_color = "#ffeef0" economic_modifier = 5 access = list(access_medical, access_medical_equip, access_morgue, access_surgery, access_chemistry, access_virology, access_genetics) - minimal_access = list(access_medical, access_medical_equip, access_chemistry) + minimal_access = list(access_virology, access_medical, access_medical_equip, access_chemistry) alt_titles = list("Pharmacist") bag_type = /obj/item/weapon/storage/backpack/chemistry diff --git a/code/game/jobs/jobs.dm b/code/game/jobs/jobs.dm index c031290d947..e4e2dfc1775 100644 --- a/code/game/jobs/jobs.dm +++ b/code/game/jobs/jobs.dm @@ -21,17 +21,16 @@ var/const/MEDSCI =(1<<1) var/const/RD =(1<<0) var/const/SCIENTIST =(1<<1) -var/const/CHEMIST =(1<<2) +var/const/BIOCHEMIST =(1<<2) var/const/CMO =(1<<3) var/const/DOCTOR =(1<<4) var/const/GENETICIST =(1<<5) -var/const/VIROLOGIST =(1<<6) -var/const/PSYCHIATRIST =(1<<7) -var/const/ROBOTICIST =(1<<8) -var/const/XENOBIOLOGIST =(1<<9) -var/const/PARAMEDIC =(1<<10) -var/const/INTERN_MED =(1<<11) -var/const/INTERN_SCI =(1<<12) +var/const/PSYCHIATRIST =(1<<6) +var/const/ROBOTICIST =(1<<7) +var/const/XENOBIOLOGIST =(1<<8) +var/const/PARAMEDIC =(1<<9) +var/const/INTERN_MED =(1<<10) +var/const/INTERN_SCI =(1<<11) var/const/CIVILIAN =(1<<2) @@ -77,7 +76,7 @@ var/list/medical_positions = list( "Chief Medical Officer", "Medical Doctor", "Psychiatrist", - "Chemist", + "BioChemist", "Paramedic", "Medical Resident" ) From 28dbf271b16f3c2ddc924568ab362a3b51a6556d Mon Sep 17 00:00:00 2001 From: Jackbewt Date: Sat, 7 Apr 2018 02:13:43 -0700 Subject: [PATCH 2/2] Typo fix. --- code/game/jobs/job/medical.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/jobs/job/medical.dm b/code/game/jobs/job/medical.dm index a0e088741f4..02c6612d590 100644 --- a/code/game/jobs/job/medical.dm +++ b/code/game/jobs/job/medical.dm @@ -102,7 +102,7 @@ //Chemist is a medical job damnit //YEAH FUCK YOU SCIENCE -Pete //Guys, behave -Erro /datum/job/Biochemist - title = "Biohemist" + title = "Biochemist" flag = BIOCHEMIST department = "Medical" department_flag = MEDSCI