From 32b0ad2dfa56834c3cc394c99d96989cf3f4c82c Mon Sep 17 00:00:00 2001 From: Kilakk Date: Mon, 10 Jun 2013 21:45:07 -0400 Subject: [PATCH] Adds "Xenobiologist" as its own separate job --- code/game/jobs/job/science.dm | 30 ++++++++++++++++++++++++++++-- code/game/jobs/jobs.dm | 10 ++++++---- 2 files changed, 34 insertions(+), 6 deletions(-) diff --git a/code/game/jobs/job/science.dm b/code/game/jobs/job/science.dm index 7ebb958112..1b6179bbac 100644 --- a/code/game/jobs/job/science.dm +++ b/code/game/jobs/job/science.dm @@ -45,8 +45,8 @@ supervisors = "the research director" selection_color = "#ffeeff" access = list(access_robotics, access_tox, access_tox_storage, access_research, access_xenobiology) - minimal_access = list(access_tox, access_tox_storage, access_research, access_xenobiology) - alt_titles = list("Xenoarcheologist", "Anomalist", "Plasma Researcher", "Xenobiologist") + minimal_access = list(access_tox, access_tox_storage, access_research) + alt_titles = list("Xenoarcheologist", "Anomalist", "Plasma Researcher") equip(var/mob/living/carbon/human/H) if(!H) return 0 @@ -63,6 +63,32 @@ +/datum/job/xenobiologist + title = "Xenobiologist" + flag = XENOBIOLOGIST + department_flag = MEDSCI + faction = "Station" + 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) + + 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_ears) + 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_belt) + H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/labcoat/science(H), slot_wear_suit) + if(H.backbag == 1) + H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H), slot_r_hand) + else + 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 diff --git a/code/game/jobs/jobs.dm b/code/game/jobs/jobs.dm index 4ba993f64e..1ba02a87b4 100644 --- a/code/game/jobs/jobs.dm +++ b/code/game/jobs/jobs.dm @@ -9,9 +9,8 @@ var/const/OFFICER =(1<<4) var/const/CHIEF =(1<<5) var/const/ENGINEER =(1<<6) var/const/ATMOSTECH =(1<<7) -var/const/ROBOTICIST =(1<<8) -var/const/AI =(1<<9) -var/const/CYBORG =(1<<10) +var/const/AI =(1<<8) +var/const/CYBORG =(1<<9) var/const/MEDSCI =(1<<1) @@ -24,6 +23,8 @@ 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/CIVILIAN =(1<<2) @@ -78,7 +79,8 @@ var/list/science_positions = list( "Research Director", "Scientist", "Geneticist", //Part of both medical and science - "Roboticist" + "Roboticist", + "Xenobiologist" ) //BS12 EDIT