diff --git a/code/__DEFINES/jobs.dm b/code/__DEFINES/jobs.dm index d5c47bbecce484..da148790309fb3 100644 --- a/code/__DEFINES/jobs.dm +++ b/code/__DEFINES/jobs.dm @@ -155,6 +155,7 @@ #define JOB_DISPLAY_ORDER_CURATOR 11 #define JOB_DISPLAY_ORDER_LAWYER 12 #define JOB_DISPLAY_ORDER_CHAPLAIN 13 +/* DOPPLER SHIFT EDIT ORIGINAL: #define JOB_DISPLAY_ORDER_PSYCHOLOGIST 14 #define JOB_DISPLAY_ORDER_PUN_PUN 15 #define JOB_DISPLAY_ORDER_AI 16 @@ -172,6 +173,25 @@ #define JOB_DISPLAY_ORDER_PARAMEDIC 28 #define JOB_DISPLAY_ORDER_CHEMIST 29 #define JOB_DISPLAY_ORDER_CORONER 30 +*/ // DOPPLER SHIFT EDIT CHANGE: Making Psychologist Medical +#define JOB_DISPLAY_ORDER_PUN_PUN 14 +#define JOB_DISPLAY_ORDER_AI 15 +#define JOB_DISPLAY_ORDER_CYBORG 16 +#define JOB_DISPLAY_ORDER_CHIEF_ENGINEER 17 +#define JOB_DISPLAY_ORDER_STATION_ENGINEER 18 +#define JOB_DISPLAY_ORDER_ATMOSPHERIC_TECHNICIAN 19 +#define JOB_DISPLAY_ORDER_QUARTERMASTER 20 +#define JOB_DISPLAY_ORDER_CARGO_TECHNICIAN 21 +#define JOB_DISPLAY_ORDER_SHAFT_MINER 22 +#define JOB_DISPLAY_ORDER_BITRUNNER 23 +#define JOB_DISPLAY_ORDER_CARGO_GORILLA 24 +#define JOB_DISPLAY_ORDER_CHIEF_MEDICAL_OFFICER 25 +#define JOB_DISPLAY_ORDER_MEDICAL_DOCTOR 26 +#define JOB_DISPLAY_ORDER_PARAMEDIC 27 +#define JOB_DISPLAY_ORDER_CHEMIST 28 +#define JOB_DISPLAY_ORDER_CORONER 29 +#define JOB_DISPLAY_ORDER_PSYCHOLOGIST 30 +// DOPPLER SHIFT EDIT END #define JOB_DISPLAY_ORDER_RESEARCH_DIRECTOR 31 #define JOB_DISPLAY_ORDER_SCIENTIST 32 #define JOB_DISPLAY_ORDER_ROBOTICIST 33 @@ -182,7 +202,7 @@ #define JOB_DISPLAY_ORDER_DETECTIVE 38 #define JOB_DISPLAY_ORDER_SECURITY_OFFICER 39 #define JOB_DISPLAY_ORDER_PRISONER 40 -#define JOB_DISPLAY_ORDER_COMMAND_BODYGUARD 401 //DOPPLER EDIT ADDITON +#define JOB_DISPLAY_ORDER_COMMAND_BODYGUARD 401 //DOPPLER EDIT ADDITION #define DEPARTMENT_UNASSIGNED "No Department" diff --git a/code/game/machinery/computer/crew.dm b/code/game/machinery/computer/crew.dm index 4c3a10bad72ca4..1d37b61bb16d35 100644 --- a/code/game/machinery/computer/crew.dm +++ b/code/game/machinery/computer/crew.dm @@ -123,6 +123,7 @@ GLOBAL_DATUM_INIT(crewmonitor, /datum/crewmonitor, new) JOB_MEDICAL_DOCTOR = 22, JOB_PARAMEDIC = 23, JOB_CORONER = 24, + JOB_PSYCHOLOGIST = 25, // DOPPLER EDIT ADDITION - Making Psychologist Medical // 30-39: Science JOB_RESEARCH_DIRECTOR = 30, JOB_SCIENTIST = 31, @@ -150,7 +151,7 @@ GLOBAL_DATUM_INIT(crewmonitor, /datum/crewmonitor, new) JOB_JANITOR = 69, JOB_LAWYER = 71, JOB_SOPHONT_RESOURCES_AGENT = 71, // DOPPLER EDIT ADDITION - Security Lore Rework - JOB_PSYCHOLOGIST = 72, +// JOB_PSYCHOLOGIST = 72, // DOPPLER EDIT REMOVAL - Making Psychologist Medical // 200-229: Centcom JOB_CENTCOM_ADMIRAL = 200, JOB_CENTCOM = 201, diff --git a/modular_doppler/modular_jobs/code/alt_job_titles/departments/medical.dm b/modular_doppler/modular_jobs/code/alt_job_titles/departments/medical.dm index 2cd22095b84ae3..e4652674f4bf16 100644 --- a/modular_doppler/modular_jobs/code/alt_job_titles/departments/medical.dm +++ b/modular_doppler/modular_jobs/code/alt_job_titles/departments/medical.dm @@ -44,4 +44,10 @@ "Trauma Team Responder", ) - +/datum/job/psychologist + alt_titles = list( + JOB_PSYCHOLOGIST, + "Counsellor", + "Psychiatrist", + "Therapist", + ) diff --git a/modular_doppler/modular_jobs/code/alt_job_titles/departments/service.dm b/modular_doppler/modular_jobs/code/alt_job_titles/departments/service.dm index 9977cf551cfa3d..d316a7cb30e1b2 100644 --- a/modular_doppler/modular_jobs/code/alt_job_titles/departments/service.dm +++ b/modular_doppler/modular_jobs/code/alt_job_titles/departments/service.dm @@ -99,13 +99,3 @@ "Mummer", "Pantomimist", ) - -/datum/job/psychologist - alt_titles = list( - JOB_PSYCHOLOGIST, - "Counsellor", - "Psychiatrist", - "Therapist", - ) - - diff --git a/modular_doppler/modular_jobs/code/job_overrides/job_flavor.dm b/modular_doppler/modular_jobs/code/job_overrides/job_flavor.dm index ed89d10645836c..87a26c2f0db06d 100644 --- a/modular_doppler/modular_jobs/code/job_overrides/job_flavor.dm +++ b/modular_doppler/modular_jobs/code/job_overrides/job_flavor.dm @@ -5,6 +5,24 @@ */ +/** + * MEDICAL + * Psychologist's primary department is now medical. + * Its description also demeaned its purpose in roleplay. + */ + +/datum/job/psychologist + description = "Help keep people of the frontier together as \ + everything around them falls apart. Give your \ + patients someone they can trust. Probably." + department_head = list(JOB_CHIEF_MEDICAL_OFFICER) + paycheck_department = ACCOUNT_MED + supervisors = "the Chief Medical Officer and the Head of Personnel" + departments_list = list( + /datum/job_department/medical, + ) + + /** * SECURITY * There is no Space Law, there is no SOP. diff --git a/modular_doppler/modular_jobs/code/job_overrides/trim_overrides.dm b/modular_doppler/modular_jobs/code/job_overrides/trim_overrides.dm index cf29e1f963f5d4..7086c3e1370dc6 100644 --- a/modular_doppler/modular_jobs/code/job_overrides/trim_overrides.dm +++ b/modular_doppler/modular_jobs/code/job_overrides/trim_overrides.dm @@ -1,3 +1,6 @@ +/datum/id_trim/job/psychologist + department_color = COLOR_MEDICAL_BLUE + subdepartment_color = COLOR_SERVICE_LIME /datum/id_trim/job/head_of_security assignment = JOB_CHIEF_GUARD diff --git a/modular_doppler/overwrites/huds/hud.dmi b/modular_doppler/overwrites/huds/hud.dmi index 11c240818cf095..49f49e7bd0cd6d 100644 Binary files a/modular_doppler/overwrites/huds/hud.dmi and b/modular_doppler/overwrites/huds/hud.dmi differ diff --git a/tgui/packages/tgui/interfaces/Orbit/constants.ts b/tgui/packages/tgui/interfaces/Orbit/constants.ts index d683561f3825b1..3ef18917af7c69 100644 --- a/tgui/packages/tgui/interfaces/Orbit/constants.ts +++ b/tgui/packages/tgui/interfaces/Orbit/constants.ts @@ -39,6 +39,7 @@ export const DEPARTMENT2COLOR: Record = { 'Coroner', 'Medical Doctor', 'Paramedic', + 'Psychologist', // DOPPLER EDIT ADDITION - Making Psychologist Medical ], }, science: { @@ -62,7 +63,7 @@ export const DEPARTMENT2COLOR: Record = { 'Janitor', 'Lawyer', 'Mime', - 'Psychologist', +// 'Psychologist', // DOPPLER EDIT REMOVAL - Making Psychologist Medical ], }, };