Science Job Homogenization

code/game/gamemodes/steal_items.dm

@@ -92,7 +92,7 @@ datum/theft_objective/ai/check_special_completion(var/obj/item/device/aicard/C)
 /datum/theft_objective/slime_extract
 	name = "a sample of unused slime extract"
 	typepath = /obj/item/slime_extract
-	protected_jobs = list("Research Director","Xenobiologist")
+	protected_jobs = list("Research Director","Scientist")
 
 /datum/theft_objective/slime_extract/check_special_completion(var/obj/item/slime_extract/E)
 	if(..())

code/game/jobs/job/science.dm

@@ -46,13 +46,13 @@
 	title = "Scientist"
 	flag = SCIENTIST
 	department_flag = MEDSCI
-	total_positions = 5
-	spawn_positions = 3
+	total_positions = 6
+	spawn_positions = 6
 	supervisors = "the research director"
 	selection_color = "#ffeeff"
 	access = list(access_robotics, access_tox, access_tox_storage, access_research, access_xenobiology, access_xenoarch)
-	minimal_access = list(access_tox, access_tox_storage, access_research, access_xenoarch, access_maint_tunnels)
-	alt_titles = list("Xenoarcheologist", "Anomalist", "Plasma Researcher", "Xenobotanist")
+	minimal_access = list(access_tox, access_tox_storage, access_research, access_xenobiology, access_xenoarch, access_maint_tunnels)
+	alt_titles = list("Xenoarcheologist", "Anomalist", "Plasma Researcher", "Xenobiologist", "Xenobotanist")
 	minimal_player_age = 3
 
 	// All science-y guys get bonuses for maxing out their tech.
@@ -77,40 +77,6 @@
 
 
 
-/datum/job/xenobiologist
-	title = "Xenobiologist"
-	flag = XENOBIOLOGIST
-	department_flag = MEDSCI
-	total_positions = 2
-	spawn_positions = 2
-	supervisors = "the research director"
-	selection_color = "#ffeeff"
-	access = list(access_robotics, access_tox, access_tox_storage, access_research, access_xenobiology)
-	minimal_access = list(access_research, access_xenobiology, access_maint_tunnels)
-	minimal_player_age = 7
-
-	// All science-y guys get bonuses for maxing out their tech.
-	required_objectives=list(
-		/datum/job_objective/maximize_research
-	)
-
-
-	equip(var/mob/living/carbon/human/H)
-		if(!H) return 0
-		H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_sci(H), slot_l_ear)
-		H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/scientist(H), slot_w_uniform)
-		H.equip_to_slot_or_del(new /obj/item/clothing/shoes/white(H), slot_shoes)
-		H.equip_to_slot_or_del(new /obj/item/device/pda/toxins(H), slot_wear_pda)
-		H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/labcoat/science(H), slot_wear_suit)
-		switch(H.backbag)
-			if(1) H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H), slot_r_hand)
-			if(2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack(H), slot_back)
-			if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel_tox(H), slot_back)
-			if(4) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(H), slot_back)
-		H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack)
-		return 1
-
-
 /datum/job/roboticist
 	title = "Roboticist"
 	flag = ROBOTICIST

code/game/jobs/jobs.dm

@@ -24,8 +24,7 @@ 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/PARAMEDIC			=(1<<9)
 
 
 var/const/SUPPORT			=(1<<2)
@@ -94,7 +93,6 @@ var/list/science_positions = list(
 	"Scientist",
 	"Geneticist",	//Part of both medical and science
 	"Roboticist",
-	"Xenobiologist"
 )
 
 //BS12 EDIT