diff --git a/code/controllers/subsystem/SSjobs.dm b/code/controllers/subsystem/SSjobs.dm index bc76652162a..69024273528 100644 --- a/code/controllers/subsystem/SSjobs.dm +++ b/code/controllers/subsystem/SSjobs.dm @@ -121,7 +121,7 @@ SUBSYSTEM_DEF(jobs) L.Add("As a member of Engineering, make sure to read up on your [wiki_link("Standard_Operating_Procedure_(Engineering)", "Department SOP")].") if(job.job_department_flags & DEP_FLAG_MEDICAL) L.Add("As a member of Medbay, make sure to read up on your [wiki_link("Standard_Operating_Procedure_(Medical)", "Department SOP")].") - if(job.job_department_flags & DEP_FLAG_SCIENCE) // geneticist gets both, yeah sure why not + if(job.job_department_flags & DEP_FLAG_SCIENCE) L.Add("As a member of Science, make sure to read up on your [wiki_link("Standard_Operating_Procedure_(Science)", "Department SOP")].") if(job.job_department_flags & DEP_FLAG_SECURITY) L.Add("As a member of Security, you are to know [wiki_link("Space Law", "Space Law")] and [wiki_link("Legal_Standard_Operating_Procedure", "Legal Standard Operating Procedure")], as well as your [wiki_link("Standard_Operating_Procedure_(Security)", "Department SOP")].") diff --git a/code/game/jobs/access.dm b/code/game/jobs/access.dm index 1b6d3381b41..c677db1bf74 100644 --- a/code/game/jobs/access.dm +++ b/code/game/jobs/access.dm @@ -130,7 +130,7 @@ if(REGION_SECURITY) //security return list(ACCESS_SEC_DOORS, ACCESS_WEAPONS, ACCESS_SECURITY, ACCESS_BRIG, ACCESS_ARMORY, ACCESS_FORENSICS_LOCKERS, ACCESS_EVIDENCE, ACCESS_COURT, ACCESS_HOS) if(REGION_MEDBAY) //medbay - return list(ACCESS_MEDICAL, ACCESS_GENETICS, ACCESS_MORGUE, ACCESS_CHEMISTRY, ACCESS_PSYCHIATRIST, ACCESS_VIROLOGY, ACCESS_SURGERY, ACCESS_CMO, ACCESS_PARAMEDIC) + return list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_CHEMISTRY, ACCESS_PSYCHIATRIST, ACCESS_VIROLOGY, ACCESS_SURGERY, ACCESS_CMO, ACCESS_PARAMEDIC) if(REGION_RESEARCH) //research return list(ACCESS_AI_UPLOAD, ACCESS_RESEARCH, ACCESS_TOX, ACCESS_TOX_STORAGE, ACCESS_GENETICS, ACCESS_ROBOTICS, ACCESS_XENOBIOLOGY, ACCESS_MINISAT, ACCESS_RD) if(REGION_ENGINEERING) //engineering and maintenance diff --git a/code/game/jobs/departments.dm b/code/game/jobs/departments.dm index 605d3fd7dc6..7d1d8a3f189 100644 --- a/code/game/jobs/departments.dm +++ b/code/game/jobs/departments.dm @@ -104,7 +104,7 @@ "Anomalist", "Plasma Researcher", "Chemical Researcher", - "Geneticist", //Part of both medical and science + "Geneticist", "Roboticist", ) head_of_staff = "Research Director" @@ -175,7 +175,6 @@ "Medical Doctor", "Surgeon", "Nurse", - "Geneticist", "Psychiatrist", "Chemist", "Virologist", diff --git a/code/game/jobs/job/medical_jobs.dm b/code/game/jobs/job/medical_jobs.dm index 20262fffffc..1841c9f4ef5 100644 --- a/code/game/jobs/job/medical_jobs.dm +++ b/code/game/jobs/job/medical_jobs.dm @@ -14,7 +14,6 @@ ACCESS_CHEMISTRY, ACCESS_CMO, ACCESS_EVA, - ACCESS_GENETICS, ACCESS_HEADS, ACCESS_KEYCARD_AUTH, ACCESS_MAINT_TUNNELS, @@ -214,48 +213,6 @@ . = ..() ADD_TRAIT(H.mind, TRAIT_QUICK_HEATER, JOB_TRAIT) -/datum/job/geneticist - title = "Geneticist" - flag = JOB_GENETICIST - department_flag = JOBCAT_MEDSCI - total_positions = 2 - spawn_positions = 2 - job_department_flags = DEP_FLAG_MEDICAL | DEP_FLAG_SCIENCE - supervisors = "the chief medical officer and the research director" - department_head = list("Chief Medical Officer", "Research Director") - selection_color = "#ffeef0" - access = list( - ACCESS_GENETICS, - ACCESS_MAINT_TUNNELS, - ACCESS_MEDICAL, - ACCESS_MORGUE, - ACCESS_RESEARCH - ) - minimal_player_age = 3 - exp_map = list(EXP_TYPE_CREW = 180) - outfit = /datum/outfit/job/geneticist - standard_paycheck = CREW_PAY_MEDIUM - -/datum/outfit/job/geneticist - name = "Geneticist" - jobtype = /datum/job/geneticist - - uniform = /obj/item/clothing/under/rank/rnd/geneticist - suit = /obj/item/clothing/suit/storage/labcoat/genetics - shoes = /obj/item/clothing/shoes/white - l_ear = /obj/item/radio/headset/headset_medsci - id = /obj/item/card/id/geneticist - suit_store = /obj/item/flashlight/pen - pda = /obj/item/pda/geneticist - - backpack = /obj/item/storage/backpack/genetics - satchel = /obj/item/storage/backpack/satchel_gen - dufflebag = /obj/item/storage/backpack/duffel/genetics - -/datum/outfit/job/geneticist/on_mind_initialize(mob/living/carbon/human/H) - . = ..() - ADD_TRAIT(H.mind, TRAIT_GENETIC_BUDGET, JOB_TRAIT) - /datum/job/virologist title = "Virologist" flag = JOB_VIROLOGIST diff --git a/code/game/jobs/job/science_jobs.dm b/code/game/jobs/job/science_jobs.dm index 17631ce2457..3ddeefeec2e 100644 --- a/code/game/jobs/job/science_jobs.dm +++ b/code/game/jobs/job/science_jobs.dm @@ -220,3 +220,43 @@ /datum/outfit/job/roboticist/on_mind_initialize(mob/living/carbon/human/H) . = ..() ADD_TRAIT(H.mind, TRAIT_CYBORG_SPECIALIST, JOB_TRAIT) + +/datum/job/geneticist + title = "Geneticist" + flag = JOB_GENETICIST + department_flag = JOBCAT_MEDSCI + total_positions = 2 + spawn_positions = 2 + job_department_flags = DEP_FLAG_SCIENCE + supervisors = "the research director" + department_head = list("Research Director") + selection_color = "#ffeeff" + access = list( + ACCESS_GENETICS, + ACCESS_MAINT_TUNNELS, + ACCESS_RESEARCH + ) + minimal_player_age = 3 + exp_map = list(EXP_TYPE_CREW = 180) + outfit = /datum/outfit/job/geneticist + standard_paycheck = CREW_PAY_MEDIUM + +/datum/outfit/job/geneticist + name = "Geneticist" + jobtype = /datum/job/geneticist + + uniform = /obj/item/clothing/under/rank/rnd/geneticist + suit = /obj/item/clothing/suit/storage/labcoat/genetics + shoes = /obj/item/clothing/shoes/white + l_ear = /obj/item/radio/headset/headset_sci + id = /obj/item/card/id/geneticist + suit_store = /obj/item/flashlight/pen + pda = /obj/item/pda/geneticist + + backpack = /obj/item/storage/backpack/genetics + satchel = /obj/item/storage/backpack/satchel_gen + dufflebag = /obj/item/storage/backpack/duffel/genetics + +/datum/outfit/job/geneticist/on_mind_initialize(mob/living/carbon/human/H) + . = ..() + ADD_TRAIT(H.mind, TRAIT_GENETIC_BUDGET, JOB_TRAIT) diff --git a/code/game/jobs/job_globals.dm b/code/game/jobs/job_globals.dm index 95577ed3512..d9d1f77e289 100644 --- a/code/game/jobs/job_globals.dm +++ b/code/game/jobs/job_globals.dm @@ -40,7 +40,6 @@ GLOBAL_LIST_INIT(engineering_positions, list( GLOBAL_LIST_INIT(medical_positions, list( "Chief Medical Officer", "Medical Doctor", - "Geneticist", "Psychiatrist", "Chemist", "Virologist", @@ -52,7 +51,7 @@ GLOBAL_LIST_INIT(medical_positions, list( GLOBAL_LIST_INIT(science_positions, list( "Research Director", "Scientist", - "Geneticist", //Part of both medical and science + "Geneticist", "Xenobiologist", "Roboticist", )) diff --git a/code/game/objects/items/cards_ids.dm b/code/game/objects/items/cards_ids.dm index 726a3116699..456fb02cca6 100644 --- a/code/game/objects/items/cards_ids.dm +++ b/code/game/objects/items/cards_ids.dm @@ -545,7 +545,7 @@ name = "Geneticist ID" registered_name = "Geneticist" icon_state = "geneticist" - access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_CHEMISTRY, ACCESS_VIROLOGY, ACCESS_GENETICS, ACCESS_RESEARCH, ACCESS_MINERAL_STOREROOM) + access = list(ACCESS_MAINT_TUNNELS, ACCESS_GENETICS, ACCESS_RESEARCH) /obj/item/card/id/research name = "Research ID" diff --git a/code/modules/client/preference/loadout/loadout_accessories.dm b/code/modules/client/preference/loadout/loadout_accessories.dm index f63e945c3af..b3c67059758 100644 --- a/code/modules/client/preference/loadout/loadout_accessories.dm +++ b/code/modules/client/preference/loadout/loadout_accessories.dm @@ -111,7 +111,7 @@ /datum/gear/accessory/armband_job/medical display_name = "Armband, medical" path = /obj/item/clothing/accessory/armband/med - allowed_roles = list("Chief Medical Officer", "Medical Doctor", "Coroner", "Virologist", "Geneticist", "Paramedic") + allowed_roles = list("Chief Medical Officer", "Medical Doctor", "Coroner", "Virologist", "Paramedic") /datum/gear/accessory/armband_job/emt display_name = "Armband, EMT" diff --git a/code/modules/client/preference/loadout/loadout_glasses.dm b/code/modules/client/preference/loadout/loadout_glasses.dm index b2535f98dbe..fb2208c96e3 100644 --- a/code/modules/client/preference/loadout/loadout_glasses.dm +++ b/code/modules/client/preference/loadout/loadout_glasses.dm @@ -57,7 +57,7 @@ /datum/gear/glasses/goggles_job/medhudgoggles display_name = "Health HUD goggles" path = /obj/item/clothing/glasses/hud/health/goggles - allowed_roles = list("Chief Medical Officer", "Medical Doctor", "Coroner", "Chemist", "Geneticist", "Virologist", "Psychiatrist", "Paramedic") + allowed_roles = list("Chief Medical Officer", "Medical Doctor", "Coroner", "Chemist", "Virologist", "Psychiatrist", "Paramedic") /datum/gear/glasses/goggles_job/diaghudgoggles display_name = "Diagnostic HUD goggles" diff --git a/code/modules/client/preference/loadout/loadout_hat.dm b/code/modules/client/preference/loadout/loadout_hat.dm index 00a33aeab4c..1b85d9a3c16 100644 --- a/code/modules/client/preference/loadout/loadout_hat.dm +++ b/code/modules/client/preference/loadout/loadout_hat.dm @@ -270,7 +270,7 @@ /datum/gear/hat/beret_job/med display_name = "Beret, medical" path = /obj/item/clothing/head/beret/med - allowed_roles = list("Chief Medical Officer", "Medical Doctor" , "Virologist", "Geneticist", "Coroner", "Paramedic") + allowed_roles = list("Chief Medical Officer", "Medical Doctor" , "Virologist", "Coroner", "Paramedic") /datum/gear/hat/beret_job/para display_name = "Beret, EMT" diff --git a/code/modules/client/preference/loadout/loadout_suit.dm b/code/modules/client/preference/loadout/loadout_suit.dm index b103f4192a7..5576a5affd3 100644 --- a/code/modules/client/preference/loadout/loadout_suit.dm +++ b/code/modules/client/preference/loadout/loadout_suit.dm @@ -41,7 +41,7 @@ /datum/gear/suit/coat/job/med display_name = "Winter coat, medical" path = /obj/item/clothing/suit/hooded/wintercoat/medical - allowed_roles = list("Chief Medical Officer", "Medical Doctor", "Chemist", "Psychiatrist", "Paramedic", "Virologist", "Coroner", "Geneticist") + allowed_roles = list("Chief Medical Officer", "Medical Doctor", "Chemist", "Psychiatrist", "Paramedic", "Virologist", "Coroner") /datum/gear/suit/coat/job/sci display_name = "Winter coat, science" @@ -134,7 +134,7 @@ /datum/gear/suit/bomber/job/medical display_name = "Bomber jacket, medical" path = /obj/item/clothing/suit/jacket/bomber/med - allowed_roles = list("Chief Medical Officer", "Medical Doctor", "Chemist", "Psychiatrist", "Paramedic", "Virologist", "Coroner", "Geneticist") + allowed_roles = list("Chief Medical Officer", "Medical Doctor", "Chemist", "Psychiatrist", "Paramedic", "Virologist", "Coroner") /datum/gear/suit/bomber/job/chemist display_name = "Bomber jacket, chemist" diff --git a/icons/mob/clothing/species/drask/under/rnd.dmi b/icons/mob/clothing/species/drask/under/rnd.dmi index d1e17388931..9250b2da4ba 100644 Binary files a/icons/mob/clothing/species/drask/under/rnd.dmi and b/icons/mob/clothing/species/drask/under/rnd.dmi differ diff --git a/icons/mob/clothing/species/grey/under/rnd.dmi b/icons/mob/clothing/species/grey/under/rnd.dmi index 873b61b2c4f..ba14537b122 100644 Binary files a/icons/mob/clothing/species/grey/under/rnd.dmi and b/icons/mob/clothing/species/grey/under/rnd.dmi differ diff --git a/icons/mob/clothing/species/kidan/under/rnd.dmi b/icons/mob/clothing/species/kidan/under/rnd.dmi index fbe5282d6d2..d714fcedc4e 100644 Binary files a/icons/mob/clothing/species/kidan/under/rnd.dmi and b/icons/mob/clothing/species/kidan/under/rnd.dmi differ diff --git a/icons/mob/clothing/species/plasmaman/helmet.dmi b/icons/mob/clothing/species/plasmaman/helmet.dmi index afc1895d6f0..3f37af0b2a0 100644 Binary files a/icons/mob/clothing/species/plasmaman/helmet.dmi and b/icons/mob/clothing/species/plasmaman/helmet.dmi differ diff --git a/icons/mob/clothing/species/plasmaman/uniform.dmi b/icons/mob/clothing/species/plasmaman/uniform.dmi index 253e63eeb07..b7ef6bf1627 100644 Binary files a/icons/mob/clothing/species/plasmaman/uniform.dmi and b/icons/mob/clothing/species/plasmaman/uniform.dmi differ diff --git a/icons/mob/clothing/species/vox/under/rnd.dmi b/icons/mob/clothing/species/vox/under/rnd.dmi index d9a65854a1e..2b29edea69c 100644 Binary files a/icons/mob/clothing/species/vox/under/rnd.dmi and b/icons/mob/clothing/species/vox/under/rnd.dmi differ diff --git a/icons/mob/clothing/under/rnd.dmi b/icons/mob/clothing/under/rnd.dmi index 913f2038885..b8514d94cb1 100644 Binary files a/icons/mob/clothing/under/rnd.dmi and b/icons/mob/clothing/under/rnd.dmi differ diff --git a/icons/mob/hud/sechud.dmi b/icons/mob/hud/sechud.dmi index 577f4d49391..c1dadbd3838 100644 Binary files a/icons/mob/hud/sechud.dmi and b/icons/mob/hud/sechud.dmi differ diff --git a/icons/obj/card.dmi b/icons/obj/card.dmi index 4a4eecc406e..83146f701ba 100644 Binary files a/icons/obj/card.dmi and b/icons/obj/card.dmi differ diff --git a/icons/obj/closet.dmi b/icons/obj/closet.dmi index 776e07b6173..f63da411168 100644 Binary files a/icons/obj/closet.dmi and b/icons/obj/closet.dmi differ diff --git a/icons/obj/clothing/species/plasmaman/hats.dmi b/icons/obj/clothing/species/plasmaman/hats.dmi index 3e451c8f9f5..51d946d6028 100644 Binary files a/icons/obj/clothing/species/plasmaman/hats.dmi and b/icons/obj/clothing/species/plasmaman/hats.dmi differ diff --git a/icons/obj/clothing/species/plasmaman/uniform.dmi b/icons/obj/clothing/species/plasmaman/uniform.dmi index 612fa8c3546..8e5d91f8f83 100644 Binary files a/icons/obj/clothing/species/plasmaman/uniform.dmi and b/icons/obj/clothing/species/plasmaman/uniform.dmi differ diff --git a/icons/obj/clothing/under/rnd.dmi b/icons/obj/clothing/under/rnd.dmi index 77afa75c3f4..c6e5c1728eb 100644 Binary files a/icons/obj/clothing/under/rnd.dmi and b/icons/obj/clothing/under/rnd.dmi differ diff --git a/icons/obj/pda.dmi b/icons/obj/pda.dmi index 3ef10727c4d..289eb7f7f51 100644 Binary files a/icons/obj/pda.dmi and b/icons/obj/pda.dmi differ diff --git a/icons/obj/vending.dmi b/icons/obj/vending.dmi index b55a0f16f0a..f4cd6d35322 100755 Binary files a/icons/obj/vending.dmi and b/icons/obj/vending.dmi differ