diff --git a/code/game/jobs/access.dm b/code/game/jobs/access.dm index b7abbce7e7..e29dd1852d 100644 --- a/code/game/jobs/access.dm +++ b/code/game/jobs/access.dm @@ -63,6 +63,7 @@ /var/const/access_tcomsat = 61 // has access to the entire telecomms satellite / machinery /var/const/access_gateway = 62 /var/const/access_sec_doors = 63 // Security front doors +/var/const/access_psychiatrist = 64 // Psychiatrist's office //BEGIN CENTCOM ACCESS /*Should leave plenty of room if we need to add more access levels. @@ -205,7 +206,7 @@ access_teleporter, access_eva, access_heads, access_captain, access_all_personal_lockers, access_tech_storage, access_chapel_office, access_atmospherics, access_kitchen, access_bar, access_janitor, access_crematorium, access_robotics, access_cargo, access_construction, - access_hydroponics, access_library, access_lawyer, access_virology, access_cmo, access_qm, access_clown, access_mime, access_surgery, + access_hydroponics, access_library, access_lawyer, access_virology, access_psychiatrist, access_cmo, access_qm, access_clown, access_mime, access_surgery, access_theatre, access_research, access_mining, access_mailsorting, access_heads_vault, access_mining_station, access_xenobiology, access_ce, access_hop, access_hos, access_RC_announce, access_keycard_auth, access_tcomsat, access_gateway) @@ -223,7 +224,7 @@ if(1) //security return list(access_sec_doors, access_security, access_brig, access_armory, access_forensics_lockers, access_court, access_hos) if(2) //medbay - return list(access_medical, access_genetics, access_morgue, access_chemistry, access_virology, access_surgery, access_cmo) + return list(access_medical, access_genetics, access_morgue, access_chemistry, access_psychiatrist, access_virology, access_surgery, access_cmo) if(3) //research return list(access_research, access_tox, access_tox_storage, access_robotics, access_xenobiology, access_rd) if(4) //engineering and maintenance @@ -335,6 +336,8 @@ return "Robotics" if(access_virology) return "Virology" + if(access_psychiatrist) + return "Psychiatrist's Office" if(access_cmo) return "Chief Medical Officer" if(access_qm) diff --git a/code/game/jobs/job/medical.dm b/code/game/jobs/job/medical.dm index 079b1ab7eb..8cbbe04241 100644 --- a/code/game/jobs/job/medical.dm +++ b/code/game/jobs/job/medical.dm @@ -11,10 +11,10 @@ req_admin_notify = 1 access = list(access_medical, access_morgue, access_genetics, access_heads, access_chemistry, access_virology, access_cmo, access_surgery, access_RC_announce, - access_keycard_auth, access_sec_doors) + access_keycard_auth, access_sec_doors, access_psychiatrist) minimal_access = list(access_medical, access_morgue, access_genetics, access_heads, access_chemistry, access_virology, access_cmo, access_surgery, access_RC_announce, - access_keycard_auth, access_sec_doors) + access_keycard_auth, access_sec_doors, access_psychiatrist) minimal_player_age = 7 equip(var/mob/living/carbon/human/H) @@ -184,3 +184,35 @@ else H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack) return 1*/ + +/datum/job/psychiatrist + title = "Psychiatrist" + flag = PSYCHIATRIST + department_flag = MEDSCI + faction = "Station" + total_positions = 1 + spawn_positions = 1 + supervisors = "the chief medical officer" + selection_color = "#ffeef0" + access = list(access_medical, access_morgue, access_surgery, access_chemistry, access_virology, access_genetics, access_psychiatrist) + minimal_access = list(access_medical, access_psychiatrist) + alt_titles = list("Psychologist") + + + equip(var/mob/living/carbon/human/H) + if(!H) return 0 + H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_med(H), slot_ears) + switch(H.backbag) + if(2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/medic(H), slot_back) + if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel_med(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/clothing/under/rank/medical(H), slot_w_uniform) + H.equip_to_slot_or_del(new /obj/item/device/pda/medical(H), slot_belt) + H.equip_to_slot_or_del(new /obj/item/clothing/shoes/white(H), slot_shoes) + H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/labcoat(H), slot_wear_suit) + H.equip_to_slot_or_del(new /obj/item/device/flashlight/pen(H), slot_s_store) + 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 \ No newline at end of file diff --git a/code/game/jobs/jobs.dm b/code/game/jobs/jobs.dm index 892c2c2030..6043b2875e 100644 --- a/code/game/jobs/jobs.dm +++ b/code/game/jobs/jobs.dm @@ -23,6 +23,7 @@ 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/CIVILIAN =(1<<2) @@ -75,7 +76,7 @@ var/list/medical_positions = list( "Chief Medical Officer", "Medical Doctor", "Geneticist", - "Virologist", + "Psychiatrist", "Chemist" ) diff --git a/code/modules/reagents/reagent_containers/pill.dm b/code/modules/reagents/reagent_containers/pill.dm index 0e8e6f0ace..0f89ad7348 100644 --- a/code/modules/reagents/reagent_containers/pill.dm +++ b/code/modules/reagents/reagent_containers/pill.dm @@ -134,6 +134,24 @@ ..() reagents.add_reagent("tramadol", 15) + +/obj/item/weapon/reagent_containers/pill/methylphenidate + name = "Methylphenidate pill" + desc = "Improves the ability to concentrate." + icon_state = "pill8" + New() + ..() + reagents.add_reagent("methylphenidate", 15) + +/obj/item/weapon/reagent_containers/pill/citalopram + name = "Citalopram pill" + desc = "Mild anti-depressant." + icon_state = "pill8" + New() + ..() + reagents.add_reagent("citalopram", 15) + + /obj/item/weapon/reagent_containers/pill/inaprovaline name = "Inaprovaline pill" desc = "Used to stabilize patients."