diff --git a/code/__DEFINES/jobs.dm b/code/__DEFINES/jobs.dm index 52642ffe48..d45762ee34 100644 --- a/code/__DEFINES/jobs.dm +++ b/code/__DEFINES/jobs.dm @@ -23,8 +23,7 @@ #define DOCTOR (1<<4) #define GENETICIST (1<<5) #define VIROLOGIST (1<<6) -#define PSYCH (1<<7) -#define PARAMEDIC (1<<8) +#define PARAMEDIC (1<<7) #define CIVILIAN (1<<2) @@ -80,14 +79,13 @@ #define JOB_DISPLAY_ORDER_CHEMIST 21 #define JOB_DISPLAY_ORDER_GENETICIST 22 #define JOB_DISPLAY_ORDER_VIROLOGIST 23 -#define JOB_DISPLAY_ORDER_PSYCH 24 -#define JOB_DISPLAY_ORDER_PARAMEDIC 25 -#define JOB_DISPLAY_ORDER_RESEARCH_DIRECTOR 26 -#define JOB_DISPLAY_ORDER_SCIENTIST 27 -#define JOB_DISPLAY_ORDER_ROBOTICIST 28 -#define JOB_DISPLAY_ORDER_HEAD_OF_SECURITY 29 -#define JOB_DISPLAY_ORDER_WARDEN 30 -#define JOB_DISPLAY_ORDER_DETECTIVE 31 -#define JOB_DISPLAY_ORDER_SECURITY_OFFICER 32 -#define JOB_DISPLAY_ORDER_AI 33 -#define JOB_DISPLAY_ORDER_CYBORG 34 +#define JOB_DISPLAY_ORDER_PARAMEDIC 24 +#define JOB_DISPLAY_ORDER_RESEARCH_DIRECTOR 27 +#define JOB_DISPLAY_ORDER_SCIENTIST 28 +#define JOB_DISPLAY_ORDER_ROBOTICIST 29 +#define JOB_DISPLAY_ORDER_HEAD_OF_SECURITY 30 +#define JOB_DISPLAY_ORDER_WARDEN 31 +#define JOB_DISPLAY_ORDER_DETECTIVE 32 +#define JOB_DISPLAY_ORDER_SECURITY_OFFICER 33 +#define JOB_DISPLAY_ORDER_AI 34 +#define JOB_DISPLAY_ORDER_CYBORG 35 diff --git a/code/modules/events/wizard/departmentrevolt.dm b/code/modules/events/wizard/departmentrevolt.dm index ce6b4802fa..b82cd91323 100644 --- a/code/modules/events/wizard/departmentrevolt.dm +++ b/code/modules/events/wizard/departmentrevolt.dm @@ -19,7 +19,7 @@ jobs_to_revolt = list("Assistant") nation_name = pick("Assa", "Mainte", "Tunnel", "Gris", "Grey", "Liath", "Grigio", "Ass", "Assi") if("white") - jobs_to_revolt = list("Chief Medical Officer", "Medical Doctor", "Chemist", "Geneticist", "Paramedic", "Psychologist", "Virologist") + jobs_to_revolt = list("Chief Medical Officer", "Medical Doctor", "Chemist", "Geneticist", "Paramedic", "Virologist") nation_name = pick("Mede", "Healtha", "Recova", "Chemi", "Geneti", "Viro", "Psych") if("yellow") jobs_to_revolt = list("Chief Engineer", "Station Engineer", "Atmospheric Technician") diff --git a/code/modules/jobs/access.dm b/code/modules/jobs/access.dm index b0467b36ad..9bd5dc1684 100644 --- a/code/modules/jobs/access.dm +++ b/code/modules/jobs/access.dm @@ -357,7 +357,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", "Chemist", "Geneticist", "Virologist", "Psychologist", "Paramedic", + "Atmospheric Technician", "Chief Medical Officer", "Medical Doctor", "Chemist", "Geneticist", "Virologist", "Paramedic", "Research Director", "Scientist", "Roboticist", "Head of Security", "Warden", "Detective", "Security Officer") /proc/get_all_job_icons() //For all existing HUD icons diff --git a/code/modules/jobs/job_types/paramedic.dm b/code/modules/jobs/job_types/paramedic.dm index 5c1b219824..3dd6687b24 100644 --- a/code/modules/jobs/job_types/paramedic.dm +++ b/code/modules/jobs/job_types/paramedic.dm @@ -11,8 +11,8 @@ outfit = /datum/outfit/job/paramedic - access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_GENETICS, ACCESS_CLONING, ACCESS_MECH_MEDICAL, ACCESS_MINERAL_STOREROOM, ACCESS_MAINT_TUNNELS, ACCESS_EVA, ACCESS_ENGINE, ACCESS_CARGO, ACCESS_HYDROPONICS, ACCESS_RESEARCH) - minimal_access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_CLONING, ACCESS_MECH_MEDICAL, ACCESS_MINERAL_STOREROOM, ACCESS_MAINT_TUNNELS, ACCESS_EVA, ACCESS_ENGINE, ACCESS_CARGO, ACCESS_HYDROPONICS, ACCESS_RESEARCH) + access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_GENETICS, ACCESS_CLONING, ACCESS_MINERAL_STOREROOM, ACCESS_MAINT_TUNNELS, ACCESS_EVA, ACCESS_ENGINE, ACCESS_CARGO, ACCESS_HYDROPONICS, ACCESS_RESEARCH) + minimal_access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_CLONING, ACCESS_MINERAL_STOREROOM, ACCESS_MAINT_TUNNELS, ACCESS_EVA, ACCESS_ENGINE, ACCESS_CARGO, ACCESS_HYDROPONICS, ACCESS_RESEARCH) display_order = JOB_DISPLAY_ORDER_PARAMEDIC @@ -34,7 +34,7 @@ r_pocket = /obj/item/pinpointer/crew l_pocket = /obj/item/pda/medical backpack_contents = list(/obj/item/roller=1) - pda_slot = ITEM_SLOT_LPOCKET + pda_slot = ITEM_SLOT_POCKET backpack = /obj/item/storage/backpack/medic satchel = /obj/item/storage/backpack/satchel/med diff --git a/code/modules/jobs/job_types/psychologist.dm b/code/modules/jobs/job_types/psychologist.dm deleted file mode 100644 index da1a290fbd..0000000000 --- a/code/modules/jobs/job_types/psychologist.dm +++ /dev/null @@ -1,36 +0,0 @@ -/datum/job/psych - title = "Psychologist" - flag = PSYCH - department_head = list("Chief Medical Officer") - department_flag = MEDSCI - faction = "Station" - total_positions = 1 - spawn_positions = 1 - supervisors = "the chief medical officer" - selection_color = "#74b5e0" - - outfit = /datum/outfit/job/psych - - access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_CLONING, ACCESS_MINERAL_STOREROOM) - minimal_access = list(ACCESS_MEDICAL, ACCESS_SURGERY, ACCESS_CLONING, ACCESS_MINERAL_STOREROOM) - - display_order = JOB_DISPLAY_ORDER_PSYCH - -/datum/outfit/job/psych - name = "Psychologist" - jobtype = /datum/job/psych - - ears = /obj/item/radio/headset/headset_med - uniform = /obj/item/clothing/under/suit_jacket/green - shoes = /obj/item/clothing/shoes/laceup - l_hand = /obj/item/storage/briefcase/medical - r_hand = /obj/item/clipboard - l_pocket = /obj/item/laser_pointer - r_pocket = /obj/item/pda/medical - pda_slot = ITEM_SLOT_RPOCKET - - backpack = /obj/item/storage/backpack/medic - satchel = /obj/item/storage/backpack/satchel/med - duffelbag = /obj/item/storage/backpack/duffelbag/med - - chameleon_extras = /obj/item/gun/syringe diff --git a/code/modules/jobs/jobs.dm b/code/modules/jobs/jobs.dm index 2d95b4b3c6..78b7dd3964 100644 --- a/code/modules/jobs/jobs.dm +++ b/code/modules/jobs/jobs.dm @@ -18,7 +18,6 @@ GLOBAL_LIST_INIT(medical_positions, list( "Medical Doctor", "Geneticist", "Virologist", - "Psychologist", "Paramedic", "Chemist")) diff --git a/icons/mob/hud.dmi b/icons/mob/hud.dmi index 58209a312b..c21fa47b9c 100644 Binary files a/icons/mob/hud.dmi and b/icons/mob/hud.dmi differ diff --git a/icons/mob/landmarks.dmi b/icons/mob/landmarks.dmi index e8ce4907db..284809da70 100644 Binary files a/icons/mob/landmarks.dmi and b/icons/mob/landmarks.dmi differ diff --git a/strings/ion_laws.json b/strings/ion_laws.json index e85d20b7c0..55913dc3f4 100644 --- a/strings/ion_laws.json +++ b/strings/ion_laws.json @@ -333,7 +333,6 @@ "CHIEF MEDICAL OFFICERS", "MEDICAL DOCTORS", "PARAMEDICS", - "PSYCHOLOGISTS", "CHEMISTS", "GENETICISTS", "VIROLOGISTS",