From f40f99dc6449a1768b2e45a00c72f0d249cc452f Mon Sep 17 00:00:00 2001 From: uomo Date: Fri, 13 Mar 2020 23:11:20 -0500 Subject: [PATCH] Basic job code, access, spawn point landmark, area, department sign. --- code/__DEFINES/access.dm | 1 + code/__DEFINES/jobs.dm | 2 + code/game/area/Space_Station_13_areas.dm | 3 ++ code/game/objects/effects/landmarks.dm | 4 ++ .../structures/signs/signs_departments.dm | 4 ++ code/modules/jobs/access.dm | 8 ++-- code/modules/jobs/job_types/psychologist.dm | 43 +++++++++++++++++++ 7 files changed, 62 insertions(+), 3 deletions(-) create mode 100644 code/modules/jobs/job_types/psychologist.dm diff --git a/code/__DEFINES/access.dm b/code/__DEFINES/access.dm index 4d73369a318..7a087a9e70b 100644 --- a/code/__DEFINES/access.dm +++ b/code/__DEFINES/access.dm @@ -79,6 +79,7 @@ #define ACCESS_NETWORK 67 /// Pharmacy access (Chemistry room in Medbay) #define ACCESS_PHARMACY 69 ///Nice. +#define ACCESS_PSYCHOLOGY 70 //BEGIN CENTCOM ACCESS /*Should leave plenty of room if we need to add more access levels. diff --git a/code/__DEFINES/jobs.dm b/code/__DEFINES/jobs.dm index 55a3da0bc35..0b5ab33a0b6 100644 --- a/code/__DEFINES/jobs.dm +++ b/code/__DEFINES/jobs.dm @@ -43,6 +43,7 @@ #define MIME (1<<12) #define ASSISTANT (1<<13) #define PRISONER (1<<14) +#define PSYCHOLOGIST (1<<15) #define JOB_AVAILABLE 0 #define JOB_UNAVAILABLE_GENERIC 1 @@ -90,3 +91,4 @@ #define JOB_DISPLAY_ORDER_DETECTIVE 32 #define JOB_DISPLAY_ORDER_SECURITY_OFFICER 33 #define JOB_DISPLAY_ORDER_PRISONER 34 +#define JOB_DISPLAY_ORDER_PSYCHOLOGIST 35 \ No newline at end of file diff --git a/code/game/area/Space_Station_13_areas.dm b/code/game/area/Space_Station_13_areas.dm index 528edb358b0..ccf84804fb0 100644 --- a/code/game/area/Space_Station_13_areas.dm +++ b/code/game/area/Space_Station_13_areas.dm @@ -784,6 +784,9 @@ NOTE: there are two lists of areas in the end of this file: centcom and station name = "Medbay Treatment Center" icon_state = "exam_room" +/area/medical/psychology + name = "Psychology Office" + icon_state = "psychology" //Security diff --git a/code/game/objects/effects/landmarks.dm b/code/game/objects/effects/landmarks.dm index f76b35664e0..41ed44a848a 100644 --- a/code/game/objects/effects/landmarks.dm +++ b/code/game/objects/effects/landmarks.dm @@ -187,6 +187,10 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark) name = "Virologist" icon_state = "Virologist" +/obj/effect/landmark/start/psychologist + name = "Psychologist" + icon_state = "Psychologist" + /obj/effect/landmark/start/chaplain name = "Chaplain" icon_state = "Chaplain" diff --git a/code/game/objects/structures/signs/signs_departments.dm b/code/game/objects/structures/signs/signs_departments.dm index 4625eaca77a..907ad30fe3f 100644 --- a/code/game/objects/structures/signs/signs_departments.dm +++ b/code/game/objects/structures/signs/signs_departments.dm @@ -90,3 +90,7 @@ name = "\improper NANITE LAB" desc = "A sign labelling an area where testing and development of nanites is performed." icon_state = "nanites" +/obj/structure/sign/departments/psychology + name = "\improper PSYCHOLOGY" + desc = "A sign labelling where the Psychologist works, they can probably help you get your head straight." + icon_state = "psychology" diff --git a/code/modules/jobs/access.dm b/code/modules/jobs/access.dm index f4ca688db6f..b905884b335 100644 --- a/code/modules/jobs/access.dm +++ b/code/modules/jobs/access.dm @@ -140,7 +140,7 @@ 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_SURGERY, ACCESS_THEATRE, ACCESS_RESEARCH, ACCESS_MINING, ACCESS_MAILSORTING, ACCESS_WEAPONS, - ACCESS_MECH_MINING, ACCESS_MECH_ENGINE, ACCESS_MECH_SCIENCE, ACCESS_MECH_SECURITY, ACCESS_MECH_MEDICAL, + ACCESS_MECH_MINING, ACCESS_MECH_ENGINE, ACCESS_MECH_SCIENCE, ACCESS_MECH_SECURITY, ACCESS_MECH_MEDICAL, ACCESS_PSYCHOLOGY, ACCESS_VAULT, ACCESS_MINING_STATION, ACCESS_XENOBIOLOGY, ACCESS_CE, ACCESS_HOP, ACCESS_HOS, ACCESS_PHARMACY, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_TCOMSAT, ACCESS_GATEWAY, ACCESS_MINERAL_STOREROOM, ACCESS_MINISAT, ACCESS_NETWORK) @@ -170,7 +170,7 @@ if(2) //security return list(ACCESS_SEC_DOORS, ACCESS_WEAPONS, ACCESS_SECURITY, ACCESS_BRIG, ACCESS_ARMORY, ACCESS_FORENSICS_LOCKERS, ACCESS_COURT, ACCESS_MECH_SECURITY, ACCESS_HOS) if(3) //medbay - return list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_CHEMISTRY, ACCESS_VIROLOGY, ACCESS_SURGERY, ACCESS_MECH_MEDICAL, ACCESS_CMO, ACCESS_PHARMACY) + return list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_CHEMISTRY, ACCESS_VIROLOGY, ACCESS_SURGERY, ACCESS_MECH_MEDICAL, ACCESS_CMO, ACCESS_PHARMACY, ACCESS_PSYCHOLOGY) if(4) //research return list(ACCESS_RESEARCH, ACCESS_TOX, ACCESS_TOX_STORAGE, ACCESS_GENETICS, ACCESS_ROBOTICS, ACCESS_XENOBIOLOGY, ACCESS_MECH_SCIENCE, ACCESS_MINISAT, ACCESS_RD, ACCESS_NETWORK) if(5) //engineering and maintenance @@ -275,6 +275,8 @@ return "Robotics" if(ACCESS_VIROLOGY) return "Virology" + if(ACCESS_PSYCHOLOGY) + return "Psychology" if(ACCESS_CMO) return "CMO Office" if(ACCESS_QM) @@ -356,7 +358,7 @@ /proc/get_all_jobs() return list("Assistant", "Captain", "Head of Personnel", "Bartender", "Cook", "Botanist", "Quartermaster", "Cargo Technician", "Shaft Miner", "Clown", "Mime", "Janitor", "Curator", "Lawyer", "Chaplain", "Chief Engineer", "Station Engineer", - "Atmospheric Technician", "Chief Medical Officer", "Medical Doctor", "Paramedic", "Chemist", "Geneticist", "Virologist", + "Atmospheric Technician", "Chief Medical Officer", "Medical Doctor", "Paramedic", "Chemist", "Geneticist", "Virologist", "Psychologist", "Research Director", "Scientist", "Roboticist", "Head of Security", "Warden", "Detective", "Security Officer", "Prisoner") /proc/get_all_job_icons() //For all existing HUD icons diff --git a/code/modules/jobs/job_types/psychologist.dm b/code/modules/jobs/job_types/psychologist.dm new file mode 100644 index 00000000000..e4f3cee055e --- /dev/null +++ b/code/modules/jobs/job_types/psychologist.dm @@ -0,0 +1,43 @@ +/datum/job/psychologist + title = "Psychologist" + flag = PSYCHOLOGIST + department_head = list("Chief Medical Officer", "Head of Personnel") + department_flag = CIVILIAN + faction = "Station" + total_positions = 1 + spawn_positions = 1 + supervisors = "the chief medical officer and the head of personnel" + selection_color = "#dddddd" + + outfit = /datum/outfit/job/psychologist + + access = list(ACCESS_MEDICAL, ACCESS_PSYCHOLOGY) + minimal_access = list(ACCESS_MEDICAL, ACCESS_PSYCHOLOGY) + paycheck = PAYCHECK_MEDIUM + paycheck_department = ACCOUNT_SRV + + display_order = JOB_DISPLAY_ORDER_PSYCHOLOGIST + +/datum/outfit/job/psychologist + name = "Psychologist" + jobtype = /datum/job/psychologist + +// ears = /obj/item/radio/headset/headset_psych + uniform = /obj/item/clothing/under/suit/black +// head = + shoes = /obj/item/clothing/shoes/laceup +// suit = +// gloves = +// belt = + id = /obj/item/card/id +// l_pocket = +// suit_store = +// backpack_contents = list() + pda_slot = /obj/item/pda/medical + l_hand = /obj/item/clipboard + +// backpack = /obj/item/storage/backpack/medic +// satchel = /obj/item/storage/backpack/satchel/med +// duffelbag = /obj/item/storage/backpack/duffelbag/med + +// chameleon_extras =