Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Delete Virologist, Create Biochemist (Bring The Sanitizer) #4549

Closed
wants to merge 2 commits into from
Closed

Delete Virologist, Create Biochemist (Bring The Sanitizer) #4549

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fc67999
Deleted virologist, altered chemist to BioChemist.
JackBewt Apr 6, 2018
28dbf27
Typo fix.
JackBewt Apr 7, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
30 changes: 5 additions & 25 deletions code/game/jobs/job/medical.dm
View file
Open in desktop
Expand Up @@ -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
Expand All @@ -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))
Expand All @@ -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
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Types should be lowercase.

title = "Biochemist"
flag = BIOCHEMIST
department = "Medical"
department_flag = MEDSCI
faction = "Station"
Expand All @@ -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
Expand Down
17 changes: 8 additions & 9 deletions code/game/jobs/jobs.dm
View file
Open in desktop
Expand Up @@ -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)

Expand Down Expand Up @@ -77,7 +76,7 @@ var/list/medical_positions = list(
"Chief Medical Officer",
"Medical Doctor",
"Psychiatrist",
"Chemist",
"BioChemist",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm pretty sure chemist should be lowercase here.

"Paramedic",
"Medical Resident"
)
Expand Down