Adds the Pharmacist and Biochemist to replace the Chemist and Virologist (#6099)

code/game/gamemodes/objective.dm

@@ -645,7 +645,7 @@ datum/objective/heist
 
 datum/objective/heist/kidnap
 	choose_target()
-		var/list/roles = list("Chief Engineer","Research Director","Roboticist","Chemist","Station Engineer")
+		var/list/roles = list("Chief Engineer","Research Director","Roboticist","Pharmacist","Station Engineer")
 		var/list/possible_targets = list()
 		var/list/priority_targets = list()
 

code/game/jobs/access_datum.dm

@@ -207,10 +207,10 @@
 	desc = "Construction Areas"
 	region = ACCESS_REGION_ENGINEERING
 
-/var/const/access_chemistry = 33
-/datum/access/chemistry
-	id = access_chemistry
-	desc = "Chemistry Lab"
+/var/const/access_pharmacy = 33
+/datum/access/pharmacy
+	id = access_pharmacy
+	desc = "Pharmacy Lab"
 	region = ACCESS_REGION_MEDBAY
 
 /var/const/access_cargo_bot = 34

code/game/jobs/job/medical.dm

@@ -12,11 +12,11 @@
 	req_admin_notify = 1
 	economic_modifier = 10
 	access = list(access_medical, access_medical_equip, access_morgue, access_genetics, access_heads,
-			access_chemistry, access_virology, access_cmo, access_surgery, access_RC_announce, access_engine, access_construction,
+			access_pharmacy, access_virology, access_cmo, access_surgery, access_RC_announce, access_engine, access_construction,
 			access_keycard_auth, access_sec_doors, access_psychiatrist, access_eva, access_external_airlocks, access_research,
 			access_paramedic, access_maint_tunnels)
 	minimal_access = list(access_medical, access_medical_equip, access_morgue, access_genetics, access_heads,
-			access_chemistry, access_virology, access_cmo, access_surgery, access_RC_announce, access_engine, access_construction,
+			access_pharmacy, access_virology, access_cmo, access_surgery, access_RC_announce, access_engine, access_construction,
 			access_keycard_auth, access_sec_doors, access_psychiatrist, access_eva, access_external_airlocks, access_research,
 			access_paramedic, access_maint_tunnels)
 
@@ -53,12 +53,11 @@
 	supervisors = "the chief medical officer"
 	selection_color = "#ffeef0"
 	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")
+	access = list(access_medical, access_medical_equip, access_morgue, access_surgery, access_pharmacy, access_virology, access_genetics, access_eva)
+	minimal_access = list(access_medical, access_medical_equip, access_morgue, access_surgery, access_eva)
+	alt_titles = list("Surgeon","Emergency Physician","Nurse")
 	outfit = /datum/outfit/job/doctor
 	alt_outfits = list(
-		"Virologist"=/datum/outfit/job/doctor/virologist,
 		"Emergency Physician"=/datum/outfit/job/doctor/emergency_physician,
 		"Surgeon"=/datum/outfit/job/doctor/surgeon,
 		"Nurse"=/datum/outfit/job/doctor/nurse
@@ -81,19 +80,6 @@
 	dufflebag = /obj/item/weapon/storage/backpack/duffel/med
 	messengerbag = /obj/item/weapon/storage/backpack/messenger/med
 
-/datum/outfit/job/doctor/virologist
-	name = "Virologist"
-	jobtype = /datum/job/doctor
-
-	uniform = /obj/item/clothing/under/rank/virologist
-	suit = /obj/item/clothing/suit/storage/toggle/labcoat/virologist
-	mask = /obj/item/clothing/mask/surgical
-	pda = /obj/item/device/pda/viro
-
-	backpack = /obj/item/weapon/storage/backpack/virology
-	satchel = /obj/item/weapon/storage/backpack/satchel_vir
-	messengerbag = /obj/item/weapon/storage/backpack/messenger/viro
-
 /datum/outfit/job/doctor/emergency_physician
 	name = "Emergency Physician"
 	jobtype = /datum/job/doctor
@@ -119,8 +105,8 @@
 	head = /obj/item/clothing/head/nursehat
 
 
-/datum/job/chemist
-	title = "Chemist"
+/datum/job/pharmacist
+	title = "Pharmacist"
 	flag = CHEMIST
 	department = "Medical"
 	department_flag = MEDSCI
@@ -130,25 +116,40 @@
 	supervisors = "the chief medical officer"
 	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)
-	alt_titles = list("Pharmacist")
-	outfit = /datum/outfit/job/chemist
+	access = list(access_medical, access_medical_equip, access_morgue, access_surgery, access_pharmacy, access_virology, access_genetics)
+	minimal_access = list(access_medical, access_medical_equip, access_pharmacy, access_virology)
+	alt_titles = list("Biochemist")
+	outfit = /datum/outfit/job/pharmacist
+	alt_outfits = list(
+		"Biochemist"=/datum/outfit/job/pharmacist/biochemist
+		)
 
-/datum/outfit/job/chemist
-	name = "Chemist"
-	jobtype = /datum/job/chemist
+/datum/outfit/job/pharmacist
+	name = "Pharmacist"
+	jobtype = /datum/job/pharmacist
 
-	uniform = /obj/item/clothing/under/rank/chemist
-	suit = /obj/item/clothing/suit/storage/toggle/labcoat/chemist
+	uniform = /obj/item/clothing/under/rank/pharmacist
+	suit = /obj/item/clothing/suit/storage/toggle/labcoat/pharmacist
 	shoes = /obj/item/clothing/shoes/white
 	l_ear = /obj/item/device/radio/headset/headset_med
 	pda =  /obj/item/device/pda/chemist
 
-	backpack = /obj/item/weapon/storage/backpack/chemistry
-	satchel = /obj/item/weapon/storage/backpack/satchel_chem
-	dufflebag = /obj/item/weapon/storage/backpack/duffel/chem
-	messengerbag = /obj/item/weapon/storage/backpack/messenger/chem
+	backpack = /obj/item/weapon/storage/backpack/pharmacy
+	satchel = /obj/item/weapon/storage/backpack/satchel_pharm
+	dufflebag = /obj/item/weapon/storage/backpack/duffel/pharm
+	messengerbag = /obj/item/weapon/storage/backpack/messenger/pharm
+
+/datum/outfit/job/pharmacist/biochemist
+	name = "Biochemist"
+	jobtype = /datum/job/pharmacist
+
+	uniform = /obj/item/clothing/under/rank/biochemist
+	suit = /obj/item/clothing/suit/storage/toggle/labcoat/biochemist
+
+	backpack = /obj/item/weapon/storage/backpack/virology
+	satchel = /obj/item/weapon/storage/backpack/satchel_vir
+	dufflebag = /obj/item/weapon/storage/backpack/duffel/vir
+	messengerbag = /obj/item/weapon/storage/backpack/messenger/viro
 
 /datum/job/psychiatrist
 	title = "Psychiatrist"
@@ -161,7 +162,7 @@
 	economic_modifier = 5
 	supervisors = "the chief medical officer"
 	selection_color = "#ffeef0"
-	access = list(access_medical, access_medical_equip, access_morgue, access_surgery, access_chemistry, access_virology, access_genetics, access_psychiatrist)
+	access = list(access_medical, access_medical_equip, access_morgue, access_surgery, access_pharmacy, access_virology, access_genetics, access_psychiatrist)
 	minimal_access = list(access_medical, access_medical_equip, access_psychiatrist)
 	alt_titles = list("Psychologist")
 	outfit = /datum/outfit/job/psychiatrist
@@ -196,7 +197,7 @@
 	supervisors = "the chief medical officer"
 	selection_color = "#ffeef0"
 	economic_modifier = 4
-	access = list(access_medical, access_medical_equip, access_morgue, access_surgery, access_chemistry, access_virology, access_eva, access_maint_tunnels, access_external_airlocks, access_psychiatrist, access_paramedic)
+	access = list(access_medical, access_medical_equip, access_morgue, access_surgery, access_pharmacy, access_virology, access_eva, access_maint_tunnels, access_external_airlocks, access_psychiatrist, access_paramedic)
 	minimal_access = list(access_medical, access_medical_equip, access_morgue, access_eva, access_maint_tunnels, access_external_airlocks, access_paramedic)
 	alt_titles = list("Emergency Medical Technician")
 	outfit = /datum/outfit/job/paramedic

code/game/jobs/jobs.dm

@@ -76,7 +76,7 @@ var/list/medical_positions = list(
 	"Chief Medical Officer",
 	"Medical Doctor",
 	"Psychiatrist",
-	"Chemist",
+	"Pharmacist",
 	"Paramedic",
 	"Medical Resident"
 )

code/game/machinery/deployable.dm

@@ -38,7 +38,7 @@ for reference:
 	access_rd = 30
 	access_cargo = 31
 	access_construction = 32
-	access_chemistry = 33
+	access_pharmacy = 33
 	access_cargo_bot = 34
 	access_hydroponics = 35
 	access_manufacturing = 36

code/game/machinery/kitchen/smartfridge.dm

@@ -94,7 +94,7 @@
 	desc = "A refrigerated storage unit for storing medicine and chemicals."
 	icon_state = "smartfridge" //To fix the icon in the map editor.
 	icon_on = "smartfridge_chem"
-	req_one_access = list(access_medical,access_chemistry)
+	req_one_access = list(access_medical,access_pharmacy)
 
 /obj/machinery/smartfridge/secure/medbay/accept_check(var/obj/item/O as obj)
 	if(istype(O,/obj/item/weapon/reagent_containers/glass/))

code/game/objects/items/weapons/storage/backpack.dm

@@ -165,8 +165,8 @@
 	desc = "It's a sterile backpack able to withstand different pathogens from entering its fabric."
 	icon_state = "viropack"
 
-/obj/item/weapon/storage/backpack/chemistry
-	name = "chemistry backpack"
+/obj/item/weapon/storage/backpack/pharmacy
+	name = "pharmacy backpack"
 	desc = "It's an orange backpack which was designed to hold beakers, pill bottles and bottles."
 	icon_state = "chempack"
 
@@ -233,9 +233,9 @@
 	desc = "A sterile satchel with virologist colours."
 	icon_state = "satchel-vir"
 
-/obj/item/weapon/storage/backpack/satchel_chem
-	name = "chemist satchel"
-	desc = "A sterile satchel with chemist colours."
+/obj/item/weapon/storage/backpack/satchel_pharm
+	name = "pharmacist satchel"
+	desc = "A sterile satchel with pharmacist colours."
 	icon_state = "satchel-chem"
 
 /obj/item/weapon/storage/backpack/satchel_gen
@@ -383,8 +383,8 @@
 	desc = "It sure won't hold your genes together, but it'll keep the denim ones safe."
 	icon_state = "duffel-genetics"
 
-/obj/item/weapon/storage/backpack/duffel/chem
-	name = "chemistry duffel bag"
+/obj/item/weapon/storage/backpack/duffel/pharm
+	name = "pharmacy duffel bag"
 	desc = "Spice up the love life a little."
 	icon_state = "duffel-chemistry"
 	item_state_slots = list(
@@ -417,9 +417,9 @@
 	desc = "A sturdy backpack worn over one shoulder."
 	icon_state = "courierbag"
 
-/obj/item/weapon/storage/backpack/messenger/chem
-	name = "chemistry messenger bag"
-	desc = "A serile backpack worn over one shoulder.  This one is in chemsitry colors."
+/obj/item/weapon/storage/backpack/messenger/pharm
+	name = "pharmacy messenger bag"
+	desc = "A serile backpack worn over one shoulder.  This one is in pharmacy colors."
 	icon_state = "courierbagchem"
 
 /obj/item/weapon/storage/backpack/messenger/med

code/game/objects/random/random.dm

@@ -364,7 +364,7 @@
 		/obj/item/weapon/storage/backpack/hydroponics = 3,
 		/obj/item/weapon/storage/backpack/genetics = 3,
 		/obj/item/weapon/storage/backpack/virology = 3,
-		/obj/item/weapon/storage/backpack/chemistry = 3,
+		/obj/item/weapon/storage/backpack/pharmacy = 3,
 		/obj/item/weapon/storage/backpack/cloak = 2,
 		/obj/item/weapon/storage/backpack/syndie = 1,
 		/obj/item/weapon/storage/backpack/wizard = 1,
@@ -373,7 +373,7 @@
 		/obj/item/weapon/storage/backpack/satchel_eng = 3,
 		/obj/item/weapon/storage/backpack/satchel_med = 3,
 		/obj/item/weapon/storage/backpack/satchel_vir = 3,
-		/obj/item/weapon/storage/backpack/satchel_chem = 3,
+		/obj/item/weapon/storage/backpack/satchel_pharm = 3,
 		/obj/item/weapon/storage/backpack/satchel_gen = 3,
 		/obj/item/weapon/storage/backpack/satchel_tox = 3,
 		/obj/item/weapon/storage/backpack/satchel_sec = 3,
@@ -394,11 +394,11 @@
 		/obj/item/weapon/storage/backpack/duffel/tox = 3,
 		/obj/item/weapon/storage/backpack/duffel/sec = 3,
 		/obj/item/weapon/storage/backpack/duffel/gen = 3,
-		/obj/item/weapon/storage/backpack/duffel/chem = 3,
+		/obj/item/weapon/storage/backpack/duffel/pharm = 3,
 		/obj/item/weapon/storage/backpack/duffel/syndie = 1,
 		/obj/item/weapon/storage/backpack/duffel/wizard = 1,
 		/obj/item/weapon/storage/backpack/messenger = 2,
-		/obj/item/weapon/storage/backpack/messenger/chem = 2,
+		/obj/item/weapon/storage/backpack/messenger/pharm = 2,
 		/obj/item/weapon/storage/backpack/messenger/med = 2,
 		/obj/item/weapon/storage/backpack/messenger/viro = 2,
 		/obj/item/weapon/storage/backpack/messenger/tox = 2,

code/game/objects/structures/crates_lockers/closets/secure/medical.dm

@@ -163,7 +163,7 @@
 	icon_opened = "medicalopen"
 	icon_broken = "medicalbroken"
 	icon_off = "medicaloff"
-	req_access = list(access_chemistry)
+	req_access = list(access_pharmacy)
 
 	fill()
 		..()

code/game/objects/structures/crates_lockers/closets/wardrobe.dm

@@ -277,19 +277,19 @@
 	return
 
 
-/obj/structure/closet/wardrobe/chemistry_white
-	name = "chemistry wardrobe"
+/obj/structure/closet/wardrobe/pharmacy_white
+	name = "pharmacy wardrobe"
 	icon_state = "white"
 	icon_closed = "white"
 
-/obj/structure/closet/wardrobe/chemistry_white/fill()
+/obj/structure/closet/wardrobe/pharmacy_white/fill()
 	..()
-	new /obj/item/clothing/under/rank/chemist(src)
-	new /obj/item/clothing/under/rank/chemist(src)
+	new /obj/item/clothing/under/rank/pharmacist(src)
+	new /obj/item/clothing/under/rank/pharmacist(src)
 	new /obj/item/clothing/shoes/white(src)
 	new /obj/item/clothing/shoes/white(src)
-	new /obj/item/clothing/suit/storage/toggle/labcoat/chemist(src)
-	new /obj/item/clothing/suit/storage/toggle/labcoat/chemist(src)
+	new /obj/item/clothing/suit/storage/toggle/labcoat/pharmacist(src)
+	new /obj/item/clothing/suit/storage/toggle/labcoat/pharmacist(src)
 	return
 
 
@@ -320,8 +320,8 @@
 	new /obj/item/clothing/under/rank/virologist(src)
 	new /obj/item/clothing/shoes/white(src)
 	new /obj/item/clothing/shoes/white(src)
-	new /obj/item/clothing/suit/storage/toggle/labcoat/virologist(src)
-	new /obj/item/clothing/suit/storage/toggle/labcoat/virologist(src)
+	new /obj/item/clothing/suit/storage/toggle/labcoat/biochemist(src)
+	new /obj/item/clothing/suit/storage/toggle/labcoat/biochemist(src)
 	new /obj/item/clothing/mask/surgical(src)
 	new /obj/item/clothing/mask/surgical(src)
 	return

code/game/objects/structures/signs.dm

@@ -174,6 +174,11 @@
 	desc = "A warning sign which reads 'CHEMISTRY'."
 	icon_state = "chemistry1"
 
+/obj/structure/sign/pharmacy
+	name = "\improper Pharmacy"
+	desc = "A warning sign which reads 'PHARMACY'."
+	icon_state = "pharmacy1"
+
 /obj/structure/sign/botany
 	name = "\improper HYDROPONICS"
 	desc = "A warning sign which reads 'HYDROPONICS'."

code/modules/client/preference_setup/loadout/loadout_accessories.dm

@@ -96,7 +96,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", "Chemist", "Psychiatrist", "Paramedic", "Medical Resident")
+	allowed_roles = list("Chief Medical Officer", "Medical Doctor", "Pharmacist", "Psychiatrist", "Paramedic", "Medical Resident")
 
 /datum/gear/accessory/webbing
 	display_name = "webbing, simple"
@@ -116,7 +116,7 @@
 /datum/gear/accessory/white_pouches
 	display_name = "drop pouches, medical"
 	path = /obj/item/clothing/accessory/storage/white_pouches
-	allowed_roles = list("Chief Medical Officer", "Medical Doctor", "Chemist","Psychiatrist", "Paramedic", "Medical Resident")
+	allowed_roles = list("Chief Medical Officer", "Medical Doctor", "Pharmacist","Psychiatrist", "Paramedic", "Medical Resident")
 
 /datum/gear/accessory/pouches
 	display_name = "drop pouches, simple"

code/modules/client/preference_setup/loadout/loadout_eyes.dm

@@ -60,7 +60,7 @@
 /datum/gear/eyes/medical
 	display_name = "medical HUD"
 	path = /obj/item/clothing/glasses/hud/health
-	allowed_roles = list("Medical Doctor", "Chief Medical Officer", "Chemist", "Paramedic", "Psychiatrist", "Medical Resident")
+	allowed_roles = list("Medical Doctor", "Chief Medical Officer", "Pharmacist", "Paramedic", "Psychiatrist", "Medical Resident")
 
 /datum/gear/eyes/medical/aviator
 	display_name = "aviators, medical"
@@ -104,7 +104,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", "Chemist", "Paramedic", "Psychiatrist", "Medical Resident")
+	allowed_roles = list("Medical Doctor", "Chief Medical Officer", "Pharmacist", "Paramedic", "Psychiatrist", "Medical Resident")
 	cost = 2
 
 /datum/gear/eyes/mespatch

code/modules/client/preference_setup/loadout/loadout_head.dm

@@ -168,7 +168,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", "Chemist", "Paramedic", "Medical Resident", "Xenobiologist", "Roboticist", "Research Director", "Forensic Technician")
+	allowed_roles = list("Scientist", "Chief Medical Officer", "Medical Doctor", "Geneticist", "Pharmacist", "Paramedic", "Medical Resident", "Xenobiologist", "Roboticist", "Research Director", "Forensic Technician")
 
 /datum/gear/head/surgical/New()
 	..()
@@ -207,8 +207,8 @@
 /datum/gear/head/iacberet
 	display_name = "IAC Beret"
 	path = /obj/item/clothing/head/soft/iacberet
-	allowed_roles = list("Chief Medical Officer", "Medical Doctor", "Chemist", "Paramedic", "Medical Resident")
+	allowed_roles = list("Chief Medical Officer", "Medical Doctor", "Pharmacist", "Paramedic", "Medical Resident")
 
 /datum/gear/head/tcflberet
 	display_name = "Tau Ceti Foreign Legion dress beret"
-	path = /obj/item/clothing/head/legion_beret
+	path = /obj/item/clothing/head/legion_beret

code/modules/client/preference_setup/loadout/loadout_suit.dm

@@ -72,12 +72,12 @@
 	display_name = "surgical apron"
 	path = /obj/item/clothing/suit/apron/surgery
 	cost = 1
-	allowed_roles = list("Scientist", "Chief Medical Officer", "Medical Doctor", "Chemist", "Geneticist", "Paramedic", "Medical Resident", "Xenobiologist", "Roboticist", "Research Director", "Forensic Technician")
+	allowed_roles = list("Scientist", "Chief Medical Officer", "Medical Doctor", "Pharmacist", "Geneticist", "Paramedic", "Medical Resident", "Xenobiologist", "Roboticist", "Research Director", "Forensic Technician")
 
 /datum/gear/suit/iacvest
 	display_name = "IAC vest"
 	path = /obj/item/clothing/suit/iacvest
-	allowed_roles = list("Chief Medical Officer", "Medical Doctor", "Chemist", "Paramedic", "Medical Resident")
+	allowed_roles = list("Chief Medical Officer", "Medical Doctor", "Pharmacist", "Paramedic", "Medical Resident")
 
 /datum/gear/suit/poncho
 	display_name = "poncho selection"
@@ -160,7 +160,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", "Chemist")
+	allowed_roles = list("Chief Medical Officer", "Medical Doctor", "Paramedic", "Medical Resident", "Psychiatrist", "Pharmacist")
 
 /datum/gear/suit/winter/engineering
 	display_name = "winter coat, engineering"

code/modules/client/preference_setup/loadout/loadout_uniform.dm

@@ -12,7 +12,7 @@
 /datum/gear/uniform/iacjumpsuit
 	display_name = "IAC Jumpsuit"
 	path = /obj/item/clothing/under/rank/iacjumpsuit
-	allowed_roles = list("Chief Medical Officer", "Medical Doctor", "Chemist", "Paramedic", "Medical Resident")
+	allowed_roles = list("Chief Medical Officer", "Medical Doctor", "Pharmacist", "Paramedic", "Medical Resident")
 
 /datum/gear/uniform/jumpsuit
 	display_name = "generic jumpsuits"
@@ -87,7 +87,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", "Chemist", "Geneticist", "Paramedic", "Medical Resident", "Xenobiologist", "Roboticist", "Research Director", "Forensic Technician")
+	allowed_roles = list("Scientist","Chief Medical Officer", "Medical Doctor", "Pharmacist", "Geneticist", "Paramedic", "Medical Resident", "Xenobiologist", "Roboticist", "Research Director", "Forensic Technician")
 
 /datum/gear/uniform/scrubs/New()
 	..()

code/modules/clothing/suits/labcoat.dm

@@ -80,15 +80,16 @@
 	icon_open = "labcoat_gen_open"
 	icon_closed = "labcoat_gen"
 
-/obj/item/clothing/suit/storage/toggle/labcoat/chemist
-	name = "chemist labcoat"
-	desc = "A suit that protects against minor chemical spills. Has an orange stripe on the shoulder."
+/obj/item/clothing/suit/storage/toggle/labcoat/pharmacist
+	name = "pharmacist labcoat"
+	desc = "A suit that protects against minor chemical spills. Offers slightly more protection against biohazards than the standard model. Has an orange stripe on the shoulder."
 	icon_state = "labcoat_chem_open"
 	icon_open = "labcoat_chem_open"
 	icon_closed = "labcoat_chem"
+	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 60, rad = 0)
 
-/obj/item/clothing/suit/storage/toggle/labcoat/virologist
-	name = "virologist labcoat"
+/obj/item/clothing/suit/storage/toggle/labcoat/biochemist
+	name = "biochemist labcoat"
 	desc = "A suit that protects against minor chemical spills. Offers slightly more protection against biohazards than the standard model. Has a green stripe on the shoulder."
 	icon_state = "labcoat_vir_open"
 	icon_open = "labcoat_vir_open"

code/modules/clothing/under/jobs/medsci.dm

@@ -36,9 +36,9 @@
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 10, bio = 0, rad = 0)
 
 
-/obj/item/clothing/under/rank/chemist
-	desc = "It's made of a special fiber that gives special protection against biohazards. It has a chemist rank stripe on it."
-	name = "chemist's jumpsuit"
+/obj/item/clothing/under/rank/pharmacist
+	desc = "It's made of a special fiber that gives special protection against biohazards. It has a pharmacist rank stripe on it."
+	name = "pharmacist's jumpsuit"
 	icon_state = "chemistry"
 	item_state = "w_suit"
 	worn_state = "chemistrywhite"
@@ -204,7 +204,7 @@
 	permeability_coefficient = 0.50
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 10, bio = 0, rad = 0)
 
-/obj/item/clothing/under/rank/virologist_new
+/obj/item/clothing/under/rank/biochemist
 	desc = "Made of a special fiber that gives increased protection against biohazards."
 	name = "virologist's jumpsuit"
 	icon_state = "virologist_new"

code/modules/events/viral_infection.dm

@@ -10,7 +10,7 @@ datum/event/viral_infection/setup()
 	var/list/valid_diseases = list()
 
 	for(var/mob/living/carbon/human/H in mob_list)
-		if(H.mind && H.stat != DEAD && H.is_client_active(5) && H.get_assignment() == "Virologist")
+		if(H.mind && H.stat != DEAD && H.is_client_active(5) && H.get_assignment() == "Biochemist")
 			has_virologist = TRUE
 			break
 

code/modules/flufftext/Dreaming.dm

@@ -9,7 +9,7 @@ var/list/dreams = list(
 	"the head of personnel","the head of security","a chief engineer","a research director","a chief medical officer",
 	"the detective","the warden","a member of the internal affairs","a station engineer","the janitor","atmospheric technician",
 	"the quartermaster","a cargo technician","the botanist","a shaft miner","the psychologist","the chemist","the geneticist",
-	"the virologist","the roboticist","the chef","the bartender","the chaplain","the librarian","a mouse","an ert member",
+	"the Biochemist","the roboticist","the chef","the bartender","the chaplain","the librarian","a mouse","an ert member",
 	"a beach","the holodeck","a smokey room","a voice","the cold","a mouse","an operating table","the bar","the rain","a skrell",
 	"a unathi","a tajaran","the ai core","the mining station","the research station","a beaker of strange liquid"
 	)

code/modules/mob/living/bot/medbot.dm

@@ -5,7 +5,7 @@
 	req_one_access = list(access_medical, access_robotics)
 
 	var/skin = null //Set to "tox", "ointment" or "o2" for the other two firstaid kits.
-	botcard_access = list(access_medical, access_morgue, access_surgery, access_chemistry, access_virology, access_genetics)
+	botcard_access = list(access_medical, access_morgue, access_surgery, access_pharmacy, access_virology, access_genetics)
 
 	//AI vars
 	var/frustration = 0

code/modules/reagents/dispenser/supply.dm

@@ -77,7 +77,7 @@ datum/supply_packs/dispenser_cartridges/coffee_beans
 	cost = 150
 	containertype = /obj/structure/closet/crate/secure
 	containername = "chemical crate"
-	access = list(access_chemistry)
+	access = list(access_pharmacy)
 	group = "Reagents"
 
 /datum/supply_packs/alcohol_reagents
@@ -173,25 +173,25 @@ datum/supply_packs/dispenser_cartridges/coffee_beans
 
 // Chemistry-restricted (raw reagents excluding sugar/water)
 //      Datum path  Contents type                                                       Supply pack name                  Container name                         Cost  Container access
-SEC_PACK(hydrazine, /obj/item/weapon/reagent_containers/chem_disp_cartridge/hydrazine,  "Reagent refill - Hydrazine",     "hydrazine reagent cartridge crate",     15, access_chemistry)
-SEC_PACK(lithium,   /obj/item/weapon/reagent_containers/chem_disp_cartridge/lithium,    "Reagent refill - Lithium",       "lithium reagent cartridge crate",       15, access_chemistry)
-SEC_PACK(carbon,    /obj/item/weapon/reagent_containers/chem_disp_cartridge/carbon,     "Reagent refill - Carbon",        "carbon reagent cartridge crate",        15, access_chemistry)
-SEC_PACK(ammonia,   /obj/item/weapon/reagent_containers/chem_disp_cartridge/ammonia,    "Reagent refill - Ammonia",       "ammonia reagent cartridge crate",       15, access_chemistry)
-SEC_PACK(oxygen,    /obj/item/weapon/reagent_containers/chem_disp_cartridge/acetone,    "Reagent refill - Acetone",       "acetone reagent cartridge crate",       15, access_chemistry)
-SEC_PACK(sodium,    /obj/item/weapon/reagent_containers/chem_disp_cartridge/sodium,     "Reagent refill - Sodium",        "sodium reagent cartridge crate",        15, access_chemistry)
-SEC_PACK(aluminium, /obj/item/weapon/reagent_containers/chem_disp_cartridge/aluminum,   "Reagent refill - Aluminum",      "aluminum reagent cartridge crate",      15, access_chemistry)
-SEC_PACK(silicon,   /obj/item/weapon/reagent_containers/chem_disp_cartridge/silicon,    "Reagent refill - Silicon",       "silicon reagent cartridge crate",       15, access_chemistry)
-SEC_PACK(phosphorus,/obj/item/weapon/reagent_containers/chem_disp_cartridge/phosphorus, "Reagent refill - Phosphorus",    "phosphorus reagent cartridge crate",    15, access_chemistry)
-SEC_PACK(sulfur,    /obj/item/weapon/reagent_containers/chem_disp_cartridge/sulfur,     "Reagent refill - Sulfur",        "sulfur reagent cartridge crate",        15, access_chemistry)
-SEC_PACK(hclacid,   /obj/item/weapon/reagent_containers/chem_disp_cartridge/hclacid,    "Reagent refill - Hydrochloric Acid", "hydrochloric acid reagent cartridge crate", 15, access_chemistry)
-SEC_PACK(potassium, /obj/item/weapon/reagent_containers/chem_disp_cartridge/potassium,  "Reagent refill - Potassium",     "potassium reagent cartridge crate",     15, access_chemistry)
-SEC_PACK(iron,      /obj/item/weapon/reagent_containers/chem_disp_cartridge/iron,       "Reagent refill - Iron",          "iron reagent cartridge crate",          15, access_chemistry)
-SEC_PACK(copper,    /obj/item/weapon/reagent_containers/chem_disp_cartridge/copper,     "Reagent refill - Copper",        "copper reagent cartridge crate",        15, access_chemistry)
-SEC_PACK(mercury,   /obj/item/weapon/reagent_containers/chem_disp_cartridge/mercury,    "Reagent refill - Mercury",       "mercury reagent cartridge crate",       15, access_chemistry)
-SEC_PACK(radium,    /obj/item/weapon/reagent_containers/chem_disp_cartridge/radium,     "Reagent refill - Radium",        "radium reagent cartridge crate",        15, access_chemistry)
-SEC_PACK(ethanol,   /obj/item/weapon/reagent_containers/chem_disp_cartridge/ethanol,    "Reagent refill - Ethanol",       "ethanol reagent cartridge crate",       15, access_chemistry)
-SEC_PACK(sacid,     /obj/item/weapon/reagent_containers/chem_disp_cartridge/sacid,      "Reagent refill - Sulfuric Acid", "sulfuric acid reagent cartridge crate", 15, access_chemistry)
-SEC_PACK(tungsten,  /obj/item/weapon/reagent_containers/chem_disp_cartridge/tungsten,   "Reagent refill - Tungsten",      "tungsten reagent cartridge crate",      15, access_chemistry)
+SEC_PACK(hydrazine, /obj/item/weapon/reagent_containers/chem_disp_cartridge/hydrazine,  "Reagent refill - Hydrazine",     "hydrazine reagent cartridge crate",     15, access_pharmacy)
+SEC_PACK(lithium,   /obj/item/weapon/reagent_containers/chem_disp_cartridge/lithium,    "Reagent refill - Lithium",       "lithium reagent cartridge crate",       15, access_pharmacy)
+SEC_PACK(carbon,    /obj/item/weapon/reagent_containers/chem_disp_cartridge/carbon,     "Reagent refill - Carbon",        "carbon reagent cartridge crate",        15, access_pharmacy)
+SEC_PACK(ammonia,   /obj/item/weapon/reagent_containers/chem_disp_cartridge/ammonia,    "Reagent refill - Ammonia",       "ammonia reagent cartridge crate",       15, access_pharmacy)
+SEC_PACK(oxygen,    /obj/item/weapon/reagent_containers/chem_disp_cartridge/acetone,    "Reagent refill - Acetone",       "acetone reagent cartridge crate",       15, access_pharmacy)
+SEC_PACK(sodium,    /obj/item/weapon/reagent_containers/chem_disp_cartridge/sodium,     "Reagent refill - Sodium",        "sodium reagent cartridge crate",        15, access_pharmacy)
+SEC_PACK(aluminium, /obj/item/weapon/reagent_containers/chem_disp_cartridge/aluminum,   "Reagent refill - Aluminum",      "aluminum reagent cartridge crate",      15, access_pharmacy)
+SEC_PACK(silicon,   /obj/item/weapon/reagent_containers/chem_disp_cartridge/silicon,    "Reagent refill - Silicon",       "silicon reagent cartridge crate",       15, access_pharmacy)
+SEC_PACK(phosphorus,/obj/item/weapon/reagent_containers/chem_disp_cartridge/phosphorus, "Reagent refill - Phosphorus",    "phosphorus reagent cartridge crate",    15, access_pharmacy)
+SEC_PACK(sulfur,    /obj/item/weapon/reagent_containers/chem_disp_cartridge/sulfur,     "Reagent refill - Sulfur",        "sulfur reagent cartridge crate",        15, access_pharmacy)
+SEC_PACK(hclacid,   /obj/item/weapon/reagent_containers/chem_disp_cartridge/hclacid,    "Reagent refill - Hydrochloric Acid", "hydrochloric acid reagent cartridge crate", 15, access_pharmacy)
+SEC_PACK(potassium, /obj/item/weapon/reagent_containers/chem_disp_cartridge/potassium,  "Reagent refill - Potassium",     "potassium reagent cartridge crate",     15, access_pharmacy)
+SEC_PACK(iron,      /obj/item/weapon/reagent_containers/chem_disp_cartridge/iron,       "Reagent refill - Iron",          "iron reagent cartridge crate",          15, access_pharmacy)
+SEC_PACK(copper,    /obj/item/weapon/reagent_containers/chem_disp_cartridge/copper,     "Reagent refill - Copper",        "copper reagent cartridge crate",        15, access_pharmacy)
+SEC_PACK(mercury,   /obj/item/weapon/reagent_containers/chem_disp_cartridge/mercury,    "Reagent refill - Mercury",       "mercury reagent cartridge crate",       15, access_pharmacy)
+SEC_PACK(radium,    /obj/item/weapon/reagent_containers/chem_disp_cartridge/radium,     "Reagent refill - Radium",        "radium reagent cartridge crate",        15, access_pharmacy)
+SEC_PACK(ethanol,   /obj/item/weapon/reagent_containers/chem_disp_cartridge/ethanol,    "Reagent refill - Ethanol",       "ethanol reagent cartridge crate",       15, access_pharmacy)
+SEC_PACK(sacid,     /obj/item/weapon/reagent_containers/chem_disp_cartridge/sacid,      "Reagent refill - Sulfuric Acid", "sulfuric acid reagent cartridge crate", 15, access_pharmacy)
+SEC_PACK(tungsten,  /obj/item/weapon/reagent_containers/chem_disp_cartridge/tungsten,   "Reagent refill - Tungsten",      "tungsten reagent cartridge crate",      15, access_pharmacy)
 
 // Bar-restricted (alcoholic drinks)
 //      Datum path Contents type                                                     Supply pack name             Container name                    Cost  Container access

code/unit_tests/zas_tests.dm

@@ -78,16 +78,15 @@ proc/test_air_in_area(var/test_area, var/expectation = UT_NORMAL)
 					return test_result
 
 				if(expectation == UT_NORMAL)
-
 					if(abs(temp - T20C) > 10)
 						test_result["msg"] = "Temperature out of bounds: [temp] | [t_msg]"
 						return test_result
 
 				if(expectation == UT_NORMAL_COLD)
-
 					if(temp > 120)
 						test_result["msg"] = "Temperature out of bounds: [temp] | [t_msg]"
 						return test_result
+
 				if(expectation == UT_NORMAL_COOL)
 					if(temp > 283)
 						test_result["msg"] = "Temperature out of bounds: [temp] | [t_msg]"
@@ -127,10 +126,6 @@ datum/unit_test/zas_area_test/
 	name = "ZAS: Cargo Maintenance"
 	area_path = /area/maintenance/cargo
 
-datum/unit_test/zas_area_test/virology
-	name = "ZAS: Virology"
-	area_path = /area/medical/virology
-
 datum/unit_test/zas_area_test/xenobio
 	name = "ZAS: Xenobiology"
 	area_path = /area/rnd/xenobiology

config/example/access levels.txt

@@ -48,7 +48,7 @@ access_robotics = 29
 access_rd = 30
 access_cargo = 31
 access_construction = 32
-access_chemistry = 33
+access_pharmacy = 33
 access_cargo_bot = 34
 access_hydroponics = 35
 access_manufacturing = 36

config/example/jobs.txt

@@ -9,11 +9,9 @@ Station Engineer=5
 Roboticist=1
 
 Medical Doctor=5
-Geneticist=2
-Virologist=1
+Chemist=2
 
 Scientist=3
-Chemist=2
 
 Bartender=1
 Botanist=2

config/example/tips.txt

@@ -21,7 +21,7 @@ As a Medical Doctor, you can attempt to drain blood from a husk with a syringe t
 As a Medical Doctor, you can surgically implant or extract things from people's chests. This can range from putting in a bomb to pulling out an alien larva.
 As a Medical Doctor, you must target the correct limb and be on help intent when trying to perform surgery on someone.
 As a Chemist, there are dozens of chemicals that can heal, and even more that can cause harm. Experiment!
-As the Virologist, you only require small amounts of vaccine to heal a sick patient. Work with the Chemist to distribute your cures more efficiently.
+As the Biochemist, you only require small amounts of vaccine to heal a sick patient. Use your chemistry access to distribute your cures more efficiently.
 As the Research Director, you can take AIs out of their cores by loading them into an intelliCard, and then from there into an AI system integrity restorer computer to revive and/or repair them.
 As the Research Director, you can lock down cyborgs instead of blowing them up. Then you can have their laws reset or if that doesn't work, safely dismantled.
 As a Xenobiologist, you can inject yourself with the mutation toxin extracted from green slimes to become a slime person, who will never be attacked by slimes!

html/changelogs/arrow768-chemist-physician.yml

@@ -0,0 +1,43 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes: 
+#   bugfix
+#   wip (For works in progress)
+#   tweak
+#   soundadd
+#   sounddel
+#   rscadd (general adding of nice things)
+#   rscdel (general deleting of nice things)
+#   imageadd
+#   imagedel
+#   maptweak
+#   spellcheck (typo fixes)
+#   experiment
+#   balance
+#   admin
+#   backend
+#   security
+#   refactor
+#################################
+
+# Your name.  
+author: Arrow768 & Ferner
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made.  See valid prefix list above.
+# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes:
+  - tweak: "Removed the Virologist and Chemist. Replaced it with the Pharmacist and Biochemist"
+  - maptweak: "Renamed the medical chemistry to pharmacy"
+  - maptweak: "Remapped Virology and related areas"

maps/_common/areas/station/maintenance.dm

@@ -145,6 +145,10 @@
 /area/maintenance/medbay
 	name = "Medbay Maintenance"
 	icon_state = "maint_medbay"
+	
+/area/maintenance/medbay_interstitial
+	name = "\improper Medbay Interstitial Maintenance"
+	icon_state = "maint_medbay"
 
 /area/maintenance/research_port
 	name = "Research Maintenance - Port"

maps/_common/areas/station/medical.dm

@@ -50,6 +50,10 @@
 	icon_state = "medbay3"
 	ambience = list('sound/ambience/signal.ogg')
 
+/area/medical/upperlevel
+	name = "\improper Medical - Upper-Level Hallway"
+	icon_state = "medbay2"
+
 /area/crew_quarters/medbreak
 	name = "\improper Medical - Break Room"
 	icon_state = "medbay3"
@@ -119,14 +123,30 @@
 	name = "\improper Medical - Virology Access"
 	icon_state = "virology"
 
+/area/medical/virologytesting
+	name = "\improper Medical Sublevel - Virology Testing"
+	icon_state = "virology"
+
+/area/medical/quarantine
+	name = "\improper Medical Sublevel - Quarantine Ward"
+	icon_state = "virology"
+
+/area/medical/quarantineaccess
+	name = "\improper Medical Sublevel - Quarantine Access"
+	icon_state = "virology"
+
+/area/medical/quarantineautopsy
+	name = "\improper Medical Sublevel - Quarantine Autopsy"
+	icon_state = "virology"
+
 /area/medical/morgue
 	name = "\improper Medical - Long-term Morgue"
 	icon_state = "morgue"
 	ambience = list('sound/ambience/ambimo1.ogg','sound/ambience/ambimo2.ogg','sound/music/main.ogg')
 
-/area/medical/chemistry
-	name = "\improper Medical - Chemistry"
-	icon_state = "chem"
+/area/medical/pharmacy
+	name = "\improper Medical - Pharmacy"
+	icon_state = "phar"
 
 /area/medical/surgery
 	name = "\improper Medical - Operating Theatre"

maps/aurora/aurora-6_surface.dmm

@@ -17925,6 +17925,10 @@
 	icon_state = "0-2";
 	pixel_y = 0
 	},
+/obj/machinery/camera/network/civilian_surface{
+	c_tag = "Civilian - Surface Substation";
+	dir = 4
+	},
 /turf/simulated/floor/plating,
 /area/maintenance/substation/civilian_east)
 "Hr" = (

maps/aurora/code/aurora_lifts.dm

@@ -215,11 +215,12 @@
 
 	lift_size_x = 4
 	lift_size_y = 4
-	depth = 2
+	depth = 3
 
 	areas_to_use = list(
 		/area/turbolift/medical_sub,
-		/area/turbolift/medical_station
+		/area/turbolift/medical_station,
+		/area/turbolift/medical_interstitial
 		)
 
 /area/turbolift/medical_station
@@ -238,6 +239,13 @@
 
 	base_turf = /turf/simulated/floor/plating
 
+/area/turbolift/medical_interstitial
+	name = "Medical Lift - Interstitial"
+	lift_announce_str = "Arriving at the Medical Upper-Level. Facilities in this floor include: Psychiatry Wing, Psychiatrist's Office, Therapy Ward."
+
+	lift_floor_label = "Upper-Level (Medical)"
+	lift_floor_name = "Upper-Level (Medical)"
+
 //AI Access
 /obj/turbolift_map_holder/aurora/aiaccess
 	name = "Aurora lift placeholder - AI Access"

maps/exodus/exodus-1_station.dmm

@@ -35669,11 +35669,11 @@
 	},
 /obj/structure/table/glass,
 /turf/simulated/floor/tiled/white,
-/area/medical/chemistry)
+/area/medical/pharmacy)
 "bmX" = (
 /obj/machinery/chemical_dispenser/full,
 /turf/simulated/floor/tiled/white,
-/area/medical/chemistry)
+/area/medical/pharmacy)
 "bmY" = (
 /obj/structure/extinguisher_cabinet{
 	pixel_x = 0;
@@ -35684,7 +35684,7 @@
 	c_tag = "Medbay - Chemistry"
 	},
 /turf/simulated/floor/tiled/white,
-/area/medical/chemistry)
+/area/medical/pharmacy)
 "bmZ" = (
 /obj/item/stack/material/phoron,
 /obj/item/stack/material/phoron,
@@ -35693,7 +35693,7 @@
 /obj/item/stack/material/phoron,
 /obj/structure/table/glass,
 /turf/simulated/floor/tiled/white,
-/area/medical/chemistry)
+/area/medical/pharmacy)
 "bna" = (
 /obj/machinery/light{
 	dir = 4;
@@ -35707,11 +35707,11 @@
 /obj/machinery/reagentgrinder,
 /obj/structure/table/glass,
 /turf/simulated/floor/tiled/white,
-/area/medical/chemistry)
+/area/medical/pharmacy)
 "bnb" = (
 /obj/structure/sign/chemistry,
 /turf/simulated/wall/r_wall,
-/area/medical/chemistry)
+/area/medical/pharmacy)
 "bnc" = (
 /obj/structure/reagent_dispensers/water_cooler,
 /obj/machinery/computer/security/telescreen/entertainment{
@@ -36661,7 +36661,7 @@
 	dir = 8;
 	icon_state = "shutter0";
 	id = "chemwindow";
-	name = "Chemistry Window Shutters";
+	name = "Pharmacy Window Shutters";
 	opacity = 0
 	},
 /turf/simulated/floor/plating,
@@ -36670,31 +36670,31 @@
 /obj/item/weapon/reagent_containers/glass/beaker/large,
 /obj/structure/table/glass,
 /turf/simulated/floor/tiled/white,
-/area/medical/chemistry)
+/area/medical/pharmacy)
 "boL" = (
 /obj/structure/bed/chair/office/dark{
 	dir = 8
 	},
 /turf/simulated/floor/tiled/white,
-/area/medical/chemistry)
+/area/medical/pharmacy)
 "boM" = (
 /obj/machinery/atmospherics/unary/vent_pump/on{
 	dir = 4
 	},
 /turf/simulated/floor/tiled/white,
-/area/medical/chemistry)
+/area/medical/pharmacy)
 "boN" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
 /turf/simulated/floor/tiled/white,
-/area/medical/chemistry)
+/area/medical/pharmacy)
 "boO" = (
 /obj/structure/bed/chair/office/dark{
 	dir = 4
 	},
 /obj/effect/landmark/start{
-	name = "Chemist"
+	name = "Pharmacist"
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 10
@@ -36704,7 +36704,7 @@
 	dir = 6
 	},
 /turf/simulated/floor/tiled/white,
-/area/medical/chemistry)
+/area/medical/pharmacy)
 "boP" = (
 /obj/machinery/door/firedoor{
 	dir = 4;
@@ -36720,7 +36720,7 @@
 	},
 /obj/structure/table/reinforced,
 /obj/machinery/door/window/westright{
-	name = "Chemistry Desk";
+	name = "Pharmacy Desk";
 	req_access = list(33)
 	},
 /obj/effect/floor_decal/corner/beige{
@@ -36732,7 +36732,7 @@
 	dir = 9
 	},
 /turf/simulated/floor/tiled,
-/area/medical/chemistry)
+/area/medical/pharmacy)
 "boQ" = (
 /obj/effect/floor_decal/corner/paleblue{
 	icon_state = "corner_white";
@@ -37734,28 +37734,28 @@
 /obj/structure/table/glass,
 /obj/machinery/firealarm/west,
 /turf/simulated/floor/tiled/white,
-/area/medical/chemistry)
+/area/medical/pharmacy)
 "bqL" = (
 /obj/item/weapon/storage/box/beakers,
 /obj/item/weapon/storage/box/beakers,
 /obj/item/weapon/reagent_containers/dropper,
 /obj/structure/table/glass,
 /turf/simulated/floor/tiled/white,
-/area/medical/chemistry)
+/area/medical/pharmacy)
 "bqM" = (
 /obj/machinery/disposal,
 /obj/structure/disposalpipe/trunk{
 	dir = 4
 	},
 /turf/simulated/floor/tiled/white,
-/area/medical/chemistry)
+/area/medical/pharmacy)
 "bqN" = (
 /obj/structure/disposalpipe/segment{
 	dir = 2;
 	icon_state = "pipe-c"
 	},
 /turf/simulated/floor/tiled/white,
-/area/medical/chemistry)
+/area/medical/pharmacy)
 "bqO" = (
 /obj/item/device/radio/intercom{
 	frequency = 1459;
@@ -37766,15 +37766,15 @@
 /obj/item/weapon/hand_labeler,
 /obj/item/weapon/reagent_containers/spray/cleaner{
 	desc = "Someone has crossed out the 'Space' from Space Cleaner and written in Chemistry. Scrawled on the back is, 'Okay, whoever filled this with polytrinic acid, it was only funny the first time. It was hard enough replacing the CMO's first cat!'";
-	name = "Chemistry Cleaner"
+	name = "Pharmacy Cleaner"
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/structure/table/glass,
 /turf/simulated/floor/tiled/white,
-/area/medical/chemistry)
+/area/medical/pharmacy)
 "bqP" = (
 /turf/simulated/wall/r_wall,
-/area/medical/chemistry)
+/area/medical/pharmacy)
 "bqQ" = (
 /obj/structure/disposalpipe/segment,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -38751,14 +38751,14 @@
 	dir = 4
 	},
 /turf/simulated/floor/tiled/white,
-/area/medical/chemistry)
+/area/medical/pharmacy)
 "bsy" = (
 /obj/structure/disposalpipe/segment,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
 	},
 /turf/simulated/floor/tiled/white,
-/area/medical/chemistry)
+/area/medical/pharmacy)
 "bsz" = (
 /obj/item/weapon/storage/box/syringes,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -38768,7 +38768,7 @@
 /obj/item/weapon/screwdriver,
 /obj/structure/table/glass,
 /turf/simulated/floor/tiled/white,
-/area/medical/chemistry)
+/area/medical/pharmacy)
 "bsA" = (
 /obj/item/device/radio/intercom{
 	dir = 0;
@@ -39699,18 +39699,18 @@
 	},
 /obj/structure/table/glass,
 /turf/simulated/floor/tiled/white,
-/area/medical/chemistry)
+/area/medical/pharmacy)
 "bue" = (
 /obj/machinery/chem_master,
 /turf/simulated/floor/tiled/white,
-/area/medical/chemistry)
+/area/medical/pharmacy)
 "buf" = (
 /obj/structure/disposalpipe/segment{
 	dir = 1;
 	icon_state = "pipe-c"
 	},
 /turf/simulated/floor/tiled/white,
-/area/medical/chemistry)
+/area/medical/pharmacy)
 "bug" = (
 /obj/machinery/light_switch{
 	pixel_x = 22;
@@ -39718,7 +39718,7 @@
 	},
 /obj/machinery/button/remote/blast_door{
 	id = "chemwindow";
-	name = "Chemistry Laboratory Window Shutters Control";
+	name = "Pharmacy Window Shutters Control";
 	pixel_x = 26;
 	pixel_y = 8
 	},
@@ -39729,10 +39729,10 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /turf/simulated/floor/tiled/white,
-/area/medical/chemistry)
+/area/medical/pharmacy)
 "buh" = (
 /turf/simulated/wall,
-/area/medical/chemistry)
+/area/medical/pharmacy)
 "bui" = (
 /obj/structure/sign/greencross{
 	desc = "The Star of Life, a symbol of Medical Aid.";
@@ -40890,7 +40890,7 @@
 	dir = 8
 	},
 /turf/simulated/floor/plating,
-/area/medical/chemistry)
+/area/medical/pharmacy)
 "bvX" = (
 /obj/structure/grille,
 /obj/structure/window/reinforced{
@@ -40898,7 +40898,7 @@
 	},
 /obj/structure/window/reinforced,
 /turf/simulated/floor/plating,
-/area/medical/chemistry)
+/area/medical/pharmacy)
 "bvY" = (
 /obj/structure/grille,
 /obj/structure/window/reinforced{
@@ -40909,7 +40909,7 @@
 	},
 /obj/structure/window/reinforced,
 /turf/simulated/floor/plating,
-/area/medical/chemistry)
+/area/medical/pharmacy)
 "bvZ" = (
 /obj/machinery/smartfridge/secure/medbay{
 	req_one_access = list(33,66)
@@ -40918,11 +40918,11 @@
 	name = "transparent wall";
 	opacity = 0
 	},
-/area/medical/chemistry)
+/area/medical/pharmacy)
 "bwa" = (
 /obj/machinery/door/firedoor,
 /obj/machinery/door/airlock/glass_medical{
-	name = "Chemistry Laboratory";
+	name = "Pharmacy";
 	req_access = list(33)
 	},
 /obj/structure/sign/chemistry{
@@ -40932,7 +40932,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /turf/simulated/floor/tiled/white,
-/area/medical/chemistry)
+/area/medical/pharmacy)
 "bwb" = (
 /obj/machinery/door/blast/shutters{
 	density = 0;
@@ -41761,7 +41761,7 @@
 	dir = 1
 	},
 /turf/simulated/floor/tiled/white,
-/area/medical/chemistry)
+/area/medical/pharmacy)
 "bxB" = (
 /obj/structure/closet/secure_closet/medical1,
 /obj/effect/floor_decal/corner/beige{
@@ -41769,7 +41769,7 @@
 	dir = 5
 	},
 /turf/simulated/floor/tiled/white,
-/area/medical/chemistry)
+/area/medical/pharmacy)
 "bxC" = (
 /obj/machinery/light{
 	dir = 1
@@ -41785,14 +41785,14 @@
 	dir = 5
 	},
 /turf/simulated/floor/tiled/white,
-/area/medical/chemistry)
+/area/medical/pharmacy)
 "bxD" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4;
 	icon_state = "pipe-c"
 	},
 /turf/simulated/floor/tiled/white,
-/area/medical/chemistry)
+/area/medical/pharmacy)
 "bxE" = (
 /obj/structure/disposalpipe/segment{
 	dir = 8;
@@ -41810,7 +41810,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /turf/simulated/floor/tiled/white,
-/area/medical/chemistry)
+/area/medical/pharmacy)
 "bxF" = (
 /turf/simulated/wall,
 /area/medical/medbay)
@@ -42451,14 +42451,14 @@
 	dir = 1
 	},
 /turf/simulated/floor/tiled/white,
-/area/medical/chemistry)
+/area/medical/pharmacy)
 "byU" = (
 /turf/simulated/floor/tiled/white,
-/area/medical/chemistry)
+/area/medical/pharmacy)
 "byV" = (
 /obj/structure/disposalpipe/segment,
 /turf/simulated/floor/tiled/white,
-/area/medical/chemistry)
+/area/medical/pharmacy)
 "byW" = (
 /obj/structure/cable/green{
 	d1 = 1;
@@ -42472,7 +42472,7 @@
 	dir = 6
 	},
 /turf/simulated/floor/tiled/white,
-/area/medical/chemistry)
+/area/medical/pharmacy)
 "byX" = (
 /obj/machinery/button/remote/airlock{
 	desc = "A remote control switch for the medbay foyer.";
@@ -43442,7 +43442,7 @@
 	dir = 8
 	},
 /turf/simulated/floor/tiled/white,
-/area/medical/chemistry)
+/area/medical/pharmacy)
 "bAD" = (
 /obj/structure/table/standard,
 /obj/item/weapon/storage/firstaid/fire{
@@ -43454,7 +43454,7 @@
 	},
 /obj/random/firstaid,
 /turf/simulated/floor/tiled/white,
-/area/medical/chemistry)
+/area/medical/pharmacy)
 "bAE" = (
 /obj/structure/table/standard,
 /obj/item/weapon/storage/firstaid/o2{
@@ -43466,14 +43466,14 @@
 	},
 /obj/random/firstaid,
 /turf/simulated/floor/tiled/white,
-/area/medical/chemistry)
+/area/medical/pharmacy)
 "bAF" = (
 /obj/structure/disposalpipe/segment,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
 /turf/simulated/floor/tiled/white,
-/area/medical/chemistry)
+/area/medical/pharmacy)
 "bAG" = (
 /obj/structure/cable/green{
 	d1 = 1;
@@ -43485,7 +43485,7 @@
 	},
 /obj/machinery/atmospherics/pipe/manifold/hidden/supply,
 /turf/simulated/floor/tiled/white,
-/area/medical/chemistry)
+/area/medical/pharmacy)
 "bAH" = (
 /obj/machinery/door/firedoor,
 /obj/machinery/door/airlock/glass_medical{
@@ -44620,23 +44620,23 @@
 	dir = 8
 	},
 /turf/simulated/floor/tiled/white,
-/area/medical/chemistry)
+/area/medical/pharmacy)
 "bCr" = (
 /obj/effect/floor_decal/corner/beige{
 	icon_state = "corner_white";
 	dir = 10
 	},
 /turf/simulated/floor/tiled/white,
-/area/medical/chemistry)
+/area/medical/pharmacy)
 "bCs" = (
-/obj/structure/closet/wardrobe/chemistry_white,
+/obj/structure/closet/wardrobe/pharmacy_white,
 /obj/machinery/atmospherics/unary/vent_scrubber/on{
 	dir = 1
 	},
 /obj/effect/floor_decal/corner/beige,
 /obj/machinery/firealarm/east,
 /turf/simulated/floor/tiled/white,
-/area/medical/chemistry)
+/area/medical/pharmacy)
 "bCt" = (
 /obj/machinery/firealarm/west,
 /turf/simulated/floor/tiled/white,
@@ -54039,7 +54039,7 @@
 	pixel_y = -22
 	},
 /obj/effect/landmark/start{
-	name = "Chemist"
+	name = "Pharmacist"
 	},
 /obj/item/weapon/stool/padded,
 /obj/effect/floor_decal/corner/white/diagonal,
@@ -54052,7 +54052,7 @@
 	pixel_y = -30
 	},
 /obj/effect/landmark/start{
-	name = "Chemist"
+	name = "Pharmacist"
 	},
 /obj/item/weapon/stool/padded,
 /obj/effect/floor_decal/corner/white/diagonal,