diff --git a/code/game/jobs/job/science.dm b/code/game/jobs/job/science.dm index eaa1c4b7936..1f69a5ee14d 100644 --- a/code/game/jobs/job/science.dm +++ b/code/game/jobs/job/science.dm @@ -133,33 +133,3 @@ H.equip_to_slot_or_del(new /obj/item/weapon/storage/belt/utility/full(H), slot_belt) H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/toggle/labcoat(H), slot_wear_suit) return TRUE - -/datum/job/geneticist - title = "Geneticist" - flag = GENETICIST - department = "Science" - department_flag = MEDSCI - faction = "Station" - total_positions = 0 - spawn_positions = 0 - supervisors = "the research director" - selection_color = "#ffeeff" - economic_modifier = 7 - access = list(access_genetics, access_tox, access_tox_storage, access_morgue, access_research) - minimal_access = list(access_morgue, access_genetics, access_research) - - bag_type = /obj/item/weapon/storage/backpack/genetics - satchel_type = /obj/item/weapon/storage/backpack/satchel_gen - duffel_type = /obj/item/weapon/storage/backpack/duffel/gen - messenger_bag_type = /obj/item/weapon/storage/backpack/messenger/gen - - equip(var/mob/living/carbon/human/H) - if(!H) - return FALSE - 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/geneticist(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/geneticist(H), slot_belt) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/toggle/labcoat/genetics(H), slot_wear_suit) - H.equip_to_slot_or_del(new /obj/item/device/flashlight/pen(H), slot_s_store) - return TRUE diff --git a/code/game/jobs/jobs.dm b/code/game/jobs/jobs.dm index 8736fa16874..c7c84264c75 100644 --- a/code/game/jobs/jobs.dm +++ b/code/game/jobs/jobs.dm @@ -23,14 +23,13 @@ var/const/SCIENTIST =(1<<1) var/const/CHEMIST =(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/VIROLOGIST =(1<<5) +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) @@ -85,7 +84,6 @@ var/list/medical_positions = list( var/list/science_positions = list( "Research Director", "Scientist", - "Geneticist", //Part of both medical and science "Roboticist", "Xenobiologist", "Lab Assistant" diff --git a/code/modules/research/designs/circuit_designs.dm b/code/modules/research/designs/circuit_designs.dm index 0a76c264fe4..b898445ba99 100644 --- a/code/modules/research/designs/circuit_designs.dm +++ b/code/modules/research/designs/circuit_designs.dm @@ -79,12 +79,6 @@ build_path = /obj/item/weapon/circuitboard/pandemic sort_string = "FAEAA" -/datum/design/circuit/scan_console - name = "DNA machine" - id = "scan_console" - build_path = /obj/item/weapon/circuitboard/scan_consolenew - sort_string = "FAGAA" - /datum/design/circuit/clonecontrol name = "cloning control console" id = "clonecontrol" diff --git a/maps/aurora/aurora-4_mainlevel.dmm b/maps/aurora/aurora-4_mainlevel.dmm index f7a757137de..e2a22d61e2c 100644 --- a/maps/aurora/aurora-4_mainlevel.dmm +++ b/maps/aurora/aurora-4_mainlevel.dmm @@ -7241,22 +7241,6 @@ dir = 1 }, /obj/effect/floor_decal/industrial/outline/yellow, -/obj/machinery/door/window/southleft{ - dir = 4; - icon_state = "left"; - name = "Atmospheric Hardsuits"; - req_access = list(24) - }, -/obj/structure/table/rack, -/obj/item/clothing/suit/space/void/atmos, -/obj/item/clothing/head/helmet/space/void/atmos, -/obj/item/clothing/shoes/magboots, -/obj/item/clothing/mask/breath, -/obj/structure/window/reinforced{ - icon_state = "rwindow"; - dir = 1 - }, -/obj/effect/floor_decal/industrial/outline/yellow, /obj/machinery/door/window/southleft{ dir = 4; icon_state = "left"; @@ -7834,11 +7818,9 @@ /turf/simulated/floor/plating, /area/engineering/storage) "aqH" = ( -/obj/structure/table/rack, /obj/item/clothing/suit/space/void/atmos, /obj/item/clothing/head/helmet/space/void/atmos, /obj/item/clothing/shoes/magboots, -/obj/item/clothing/mask/breath, /obj/effect/floor_decal/industrial/outline/yellow, /obj/machinery/door/window/southleft{ dir = 4; @@ -7847,17 +7829,7 @@ req_access = list(24) }, /obj/structure/table/rack, -/obj/item/clothing/suit/space/void/atmos, -/obj/item/clothing/head/helmet/space/void/atmos, -/obj/item/clothing/shoes/magboots, /obj/item/clothing/mask/breath, -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/machinery/door/window/southleft{ - dir = 4; - icon_state = "left"; - name = "Atmospheric Hardsuits"; - req_access = list(24) - }, /turf/simulated/floor/tiled, /area/engineering/atmos/storage) "aqI" = ( @@ -32802,7 +32774,6 @@ }, /obj/item/weapon/circuitboard/clonescanner, /obj/item/weapon/circuitboard/clonepod, -/obj/item/weapon/circuitboard/scan_consolenew, /obj/item/weapon/circuitboard/med_data{ pixel_x = 3; pixel_y = -3