Merge pull request #1046 from lyricalpaws/master

Adds psychologist role, changes Box med a bit

_maps/map_files/BoxStation/BoxStation.dmm

@@ -32509,7 +32509,7 @@
 	name = "drain"
 	},
 /mob/living/simple_animal/bot/cleanbot{
-	name = "C.L.E.A.N."
+	name = "Scrubs, MD"
 	},
 /turf/open/floor/plasteel/white,
 /area/medical/medbay/central)
@@ -33113,31 +33113,34 @@
 /turf/open/floor/plasteel/white,
 /area/medical/medbay/central)
 "buj" = (
-/obj/effect/spawner/structure/window/reinforced,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
+/obj/structure/plasticflaps/opaque,
 /obj/machinery/door/poddoor/preopen{
 	id = "medshut1";
 	name = "shutters"
 	},
-/turf/open/floor/plating,
+/obj/effect/turf_decal/bot,
+/obj/machinery/navbeacon{
+	codes_txt = "delivery;dir=4";
+	dir = 4;
+	freq = 1400;
+	location = "Medbay"
+	},
+/turf/open/floor/plasteel,
 /area/medical/medbay/central)
 "buk" = (
-/obj/structure/table,
-/obj/item/crowbar,
-/obj/item/clothing/neck/stethoscope,
-/obj/item/reagent_containers/spray/cleaner,
-/obj/structure/sign/warning/nosmoking{
-	pixel_y = 30
-	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/obj/effect/turf_decal/tile/yellow{
-	dir = 4
+/obj/effect/turf_decal/delivery,
+/obj/machinery/door/window/eastleft{
+	name = "Medical Delivery";
+	req_access_txt = "5"
 	},
-/turf/open/floor/plasteel/white,
+/obj/structure/window/reinforced,
+/turf/open/floor/plasteel,
 /area/medical/medbay/central)
 "bul" = (
 /obj/structure/cable{
@@ -33167,6 +33170,9 @@
 /obj/effect/turf_decal/tile/yellow{
 	dir = 4
 	},
+/obj/structure/cable{
+	icon_state = "2-4"
+	},
 /turf/open/floor/plasteel/white,
 /area/medical/medbay/central)
 "bun" = (
@@ -33194,15 +33200,15 @@
 /obj/effect/turf_decal/tile/yellow{
 	dir = 1
 	},
+/obj/structure/sign/warning/nosmoking{
+	pixel_y = 30
+	},
 /turf/open/floor/plasteel/white,
 /area/medical/medbay/central)
 "bup" = (
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/obj/structure/noticeboard{
-	pixel_y = 32
-	},
 /obj/machinery/camera{
 	c_tag = "Medbay West";
 	network = list("ss13","medbay")
@@ -33210,6 +33216,9 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
+/obj/structure/noticeboard{
+	pixel_y = 32
+	},
 /turf/open/floor/plasteel/white,
 /area/medical/medbay/central)
 "buq" = (
@@ -33826,30 +33835,26 @@
 /turf/open/floor/plasteel,
 /area/hallway/primary/central)
 "bvH" = (
-/obj/effect/spawner/structure/window/reinforced,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
 	},
-/obj/machinery/door/poddoor/preopen{
-	id = "medshut1";
-	name = "shutters"
-	},
-/turf/open/floor/plating,
+/turf/closed/wall,
 /area/medical/medbay/central)
 "bvI" = (
-/obj/structure/table,
-/obj/item/storage/box/masks,
-/obj/item/storage/box/gloves{
-	pixel_x = 3;
-	pixel_y = 4
-	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
 	},
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
 /turf/open/floor/plasteel/white,
 /area/medical/medbay/central)
 "bvJ" = (
 /obj/machinery/atmospherics/pipe/manifold4w/scrubbers,
+/obj/machinery/airalarm{
+	dir = 1;
+	pixel_y = -22
+	},
 /turf/open/floor/plasteel/white,
 /area/medical/medbay/central)
 "bvK" = (
@@ -33858,15 +33863,25 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
 	},
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
 /turf/open/floor/plasteel/white,
 /area/medical/medbay/central)
 "bvL" = (
 /obj/structure/disposalpipe/segment{
-	dir = 6
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
 	},
+/obj/effect/turf_decal/loading_area{
+	icon_state = "drain";
+	name = "drain"
+	},
+/obj/structure/table,
+/obj/item/storage/box/gloves{
+	pixel_x = 3;
+	pixel_y = 4
+	},
+/obj/item/storage/box/masks,
 /turf/open/floor/plasteel/white,
 /area/medical/medbay/central)
 "bvM" = (
@@ -33879,9 +33894,6 @@
 /turf/open/floor/plasteel/white,
 /area/medical/medbay/central)
 "bvN" = (
-/obj/structure/disposalpipe/segment{
-	dir = 4
-	},
 /obj/item/radio/intercom{
 	frequency = 1485;
 	name = "Station Intercom (Medbay)";
@@ -33891,6 +33903,10 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
 	},
+/obj/machinery/disposal/bin,
+/obj/structure/disposalpipe/trunk{
+	dir = 4
+	},
 /turf/open/floor/plasteel/white,
 /area/medical/medbay/central)
 "bvO" = (
@@ -33946,6 +33962,7 @@
 	icon_state = "drain";
 	name = "drain"
 	},
+/obj/structure/table,
 /turf/open/floor/plasteel/white,
 /area/medical/medbay/central)
 "bvT" = (
@@ -34442,15 +34459,9 @@
 /turf/open/floor/plasteel/dark,
 /area/quartermaster/storage)
 "bwX" = (
-/obj/machinery/requests_console{
-	department = "Medbay";
-	departmentType = 1;
-	name = "Medbay RC";
-	pixel_x = -30
-	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel/white,
-/area/medical/medbay/central)
+/turf/closed/wall,
+/area/medical/psych)
 "bwY" = (
 /obj/structure/disposalpipe/segment,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
@@ -35047,52 +35058,42 @@
 /turf/open/floor/plasteel,
 /area/hallway/primary/central)
 "byo" = (
-/obj/machinery/navbeacon{
-	codes_txt = "delivery;dir=4";
-	dir = 4;
-	freq = 1400;
-	location = "Medbay"
-	},
-/obj/structure/plasticflaps/opaque,
-/obj/effect/turf_decal/bot,
-/obj/machinery/door/poddoor/preopen{
-	id = "medshut1";
-	name = "shutters"
-	},
-/turf/open/floor/plasteel,
-/area/medical/medbay/central)
+/turf/closed/wall,
+/area/medical/psych)
 "byp" = (
-/obj/machinery/door/window/eastleft{
-	name = "Medical Delivery";
-	req_access_txt = "5"
+/obj/structure/medkit_cabinet{
+	pixel_y = 27
 	},
-/obj/effect/turf_decal/delivery,
-/turf/open/floor/plasteel,
-/area/medical/medbay/central)
-"byq" = (
-/obj/machinery/airalarm{
-	dir = 1;
-	pixel_y = -22
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/effect/turf_decal/loading_area{
-	dir = 4
-	},
-/turf/open/floor/plasteel/white,
-/area/medical/medbay/central)
-"byr" = (
-/obj/structure/disposalpipe/segment{
-	dir = 5
-	},
-/turf/open/floor/plasteel/white,
-/area/medical/medbay/central)
-"bys" = (
-/obj/machinery/disposal/bin,
-/obj/structure/disposalpipe/trunk{
+/obj/structure/closet/secure_closet/psychology,
+/obj/machinery/light{
 	dir = 8
 	},
-/turf/open/floor/plasteel/white,
-/area/medical/medbay/central)
+/turf/open/floor/plasteel/white/corner,
+/area/medical/psych)
+"byq" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/structure/reagent_dispensers/water_cooler,
+/turf/open/floor/plasteel/white/side,
+/area/medical/psych)
+"byr" = (
+/obj/machinery/airalarm{
+	pixel_y = 23
+	},
+/obj/structure/chair/comfy/brown,
+/turf/open/floor/carpet/green,
+/area/medical/psych)
+"bys" = (
+/obj/structure/table/wood,
+/obj/item/flashlight/lamp/green{
+	pixel_x = -4;
+	pixel_y = 14
+	},
+/obj/item/storage/box/cups{
+	pixel_x = 5;
+	pixel_y = 4
+	},
+/turf/open/floor/carpet/green,
+/area/medical/psych)
 "byt" = (
 /obj/structure/table,
 /obj/item/paper/fluff/holodeck/disclaimer,
@@ -35739,16 +35740,8 @@
 /area/maintenance/port)
 "bzH" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/closed/wall,
-/area/medical/sleeper)
-"bzI" = (
-/obj/machinery/door/airlock/medical/glass{
-	name = "Surgery Observation"
-	},
-/obj/structure/disposalpipe/segment,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel/dark,
-/area/medical/sleeper)
+/turf/open/floor/plasteel/white,
+/area/medical/psych)
 "bzJ" = (
 /obj/structure/sink{
 	dir = 8;
@@ -36330,42 +36323,50 @@
 /turf/open/floor/plasteel,
 /area/hallway/primary/central)
 "bAX" = (
-/obj/structure/chair,
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on{
 	dir = 4
 	},
-/turf/open/floor/plasteel/dark,
-/area/medical/sleeper)
-"bAY" = (
-/obj/structure/chair,
-/obj/machinery/camera{
-	c_tag = "Surgery Observation";
-	network = list("ss13","medbay")
+/obj/structure/chair/office/light,
+/obj/effect/landmark/start/psychologist,
+/turf/open/floor/plasteel/white/side{
+	dir = 4
 	},
+/area/medical/psych)
+"bAY" = (
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
 	dir = 4
 	},
-/turf/open/floor/plasteel/dark,
-/area/medical/sleeper)
+/turf/open/floor/plasteel/white,
+/area/medical/psych)
 "bAZ" = (
 /obj/structure/disposalpipe/segment,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel/dark,
-/area/medical/sleeper)
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/turf/open/floor/plasteel/white/side{
+	dir = 8
+	},
+/area/medical/psych)
 "bBa" = (
-/obj/structure/chair,
-/obj/machinery/airalarm{
-	pixel_y = 23
-	},
-/turf/open/floor/plasteel/dark,
-/area/medical/sleeper)
+/turf/open/floor/carpet/green,
+/area/medical/psych)
 "bBb" = (
-/obj/structure/chair,
-/obj/structure/medkit_cabinet{
-	pixel_y = 27
+/obj/structure/chair/sofa/left{
+	desc = "More inviting than the average couch.";
+	dir = 8;
+	name = "comfy couch"
 	},
-/turf/open/floor/plasteel/dark,
-/area/medical/sleeper)
+/obj/item/toy/plush/mothplushie/moffplush{
+	name = "Mender Moff";
+	pixel_x = -3;
+	pixel_y = 5
+	},
+/obj/structure/cable{
+	icon_state = "2-8"
+	},
+/turf/open/floor/carpet/green,
+/area/medical/psych)
 "bBc" = (
 /obj/machinery/airalarm{
 	dir = 4;
@@ -36907,36 +36908,65 @@
 /turf/open/floor/plasteel,
 /area/hallway/primary/central)
 "bCk" = (
-/obj/structure/chair,
 /obj/structure/sign/warning/nosmoking{
 	pixel_x = -28
 	},
-/turf/open/floor/plasteel/dark,
-/area/medical/sleeper)
+/obj/structure/table/wood,
+/obj/machinery/computer/med_data/laptop{
+	dir = 1;
+	pixel_x = -2;
+	pixel_y = 4
+	},
+/obj/structure/sign/poster/official/help_others{
+	pixel_y = -30
+	},
+/turf/open/floor/plasteel/white/corner{
+	dir = 4
+	},
+/area/medical/psych)
 "bCl" = (
-/obj/structure/chair,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plasteel/dark,
-/area/medical/sleeper)
+/obj/structure/table/wood,
+/obj/item/paper_bin{
+	pixel_x = 5;
+	pixel_y = 4
+	},
+/obj/item/folder/white{
+	pixel_x = -12;
+	pixel_y = -1
+	},
+/turf/open/floor/plasteel/white/side{
+	dir = 1
+	},
+/area/medical/psych)
 "bCm" = (
-/obj/machinery/holopad,
 /obj/structure/disposalpipe/segment,
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden{
 	dir = 8
 	},
-/turf/open/floor/plasteel/dark,
-/area/medical/sleeper)
+/obj/machinery/light{
+	light_color = "#cee5d2"
+	},
+/turf/open/floor/plasteel/white/corner{
+	dir = 1
+	},
+/area/medical/psych)
 "bCn" = (
-/obj/structure/chair,
 /obj/machinery/atmospherics/components/unary/vent_pump/on{
 	dir = 8
 	},
-/turf/open/floor/plasteel/dark,
-/area/medical/sleeper)
+/obj/machinery/firealarm{
+	dir = 1;
+	pixel_y = -24
+	},
+/turf/open/floor/carpet/green,
+/area/medical/psych)
 "bCo" = (
-/obj/structure/chair,
-/turf/open/floor/plasteel/dark,
-/area/medical/sleeper)
+/obj/structure/table/wood,
+/obj/structure/cable,
+/obj/machinery/power/apc/auto_name/south,
+/turf/open/floor/carpet/green,
+/area/medical/psych)
 "bCp" = (
 /obj/structure/closet/secure_closet/medical1,
 /obj/machinery/light{
@@ -37703,25 +37733,22 @@
 /obj/structure/disposalpipe/segment{
 	dir = 6
 	},
-/obj/effect/spawner/structure/window,
-/turf/open/floor/plating,
-/area/medical/sleeper)
+/turf/closed/wall,
+/area/medical/psych)
 "bDK" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/obj/effect/spawner/structure/window,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plating,
-/area/medical/sleeper)
+/turf/closed/wall,
+/area/medical/psych)
 "bDL" = (
 /obj/structure/disposalpipe/segment{
 	dir = 9
 	},
-/obj/effect/spawner/structure/window,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plating,
-/area/medical/sleeper)
+/turf/closed/wall,
+/area/medical/psych)
 "bDM" = (
 /obj/machinery/door/airlock/medical/glass{
 	name = "Recovery Room"
@@ -38171,35 +38198,42 @@
 /area/hallway/primary/central)
 "bEH" = (
 /obj/structure/disposalpipe/segment,
-/obj/structure/table,
-/obj/item/surgicaldrill,
+/obj/machinery/computer/operating,
 /turf/open/floor/plasteel,
 /area/medical/sleeper)
 "bEI" = (
-/obj/structure/table,
-/obj/item/hemostat,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/structure/table/optable,
+/obj/machinery/light{
+	dir = 1;
+	pixel_y = 16
+	},
 /turf/open/floor/plasteel/white/side,
 /area/medical/sleeper)
 "bEJ" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /obj/structure/table,
-/obj/item/scalpel{
+/obj/item/clothing/suit/apron/surgical,
+/obj/item/clothing/suit/apron/surgical,
+/obj/item/storage/box/gloves{
+	pixel_x = 5;
+	pixel_y = 11
+	},
+/obj/item/storage/box/masks{
 	pixel_y = 12
 	},
-/obj/item/circular_saw,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /turf/open/floor/plasteel/white,
 /area/medical/sleeper)
 "bEK" = (
-/obj/structure/table,
-/obj/item/retractor,
+/obj/structure/table/optable,
+/obj/machinery/light{
+	dir = 1;
+	pixel_y = 16
+	},
 /turf/open/floor/plasteel/white/side,
 /area/medical/sleeper)
 "bEL" = (
-/obj/structure/table,
-/obj/item/cautery{
-	pixel_x = 4
-	},
+/obj/machinery/computer/operating,
 /turf/open/floor/plasteel,
 /area/medical/sleeper)
 "bEM" = (
@@ -38646,13 +38680,17 @@
 /area/maintenance/aft)
 "bFO" = (
 /obj/structure/disposalpipe/segment,
-/obj/structure/table,
-/obj/item/clothing/gloves/color/latex,
-/obj/item/clothing/mask/surgical,
-/obj/item/clothing/suit/apron/surgical,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 6
 	},
+/obj/structure/sink{
+	dir = 8;
+	pixel_x = -12;
+	pixel_y = 2
+	},
+/obj/structure/sign/poster/official/cleanliness{
+	pixel_x = -28
+	},
 /turf/open/floor/plasteel/white/side{
 	dir = 4
 	},
@@ -38662,11 +38700,15 @@
 /turf/open/floor/plasteel/white,
 /area/medical/sleeper)
 "bFQ" = (
-/obj/effect/landmark/start/medical_doctor,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
 	},
+/obj/structure/table,
+/obj/item/storage/backpack/duffelbag/med/surgery{
+	pixel_y = 12
+	},
+/obj/item/storage/backpack/duffelbag/med/surgery,
 /turf/open/floor/plasteel/white,
 /area/medical/sleeper)
 "bFR" = (
@@ -38676,12 +38718,13 @@
 /turf/open/floor/plasteel/white,
 /area/medical/sleeper)
 "bFS" = (
-/obj/structure/table,
-/obj/item/surgical_drapes,
-/obj/item/razor,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
 	},
+/obj/structure/sink{
+	dir = 4;
+	pixel_x = 11
+	},
 /turf/open/floor/plasteel/white/side{
 	dir = 8
 	},
@@ -39392,12 +39435,12 @@
 /turf/open/floor/plating,
 /area/maintenance/aft)
 "bHr" = (
-/obj/structure/disposalpipe/segment{
-	dir = 9
-	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 9
 	},
+/obj/structure/disposalpipe/junction/yjunction{
+	dir = 8
+	},
 /turf/open/floor/plasteel/white,
 /area/medical/sleeper)
 "bHs" = (
@@ -39407,7 +39450,6 @@
 /turf/open/floor/plasteel/white,
 /area/medical/sleeper)
 "bHt" = (
-/obj/structure/table/optable,
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden,
 /turf/open/floor/plasteel/white,
 /area/medical/sleeper)
@@ -39923,6 +39965,10 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
+/obj/structure/disposalpipe/trunk{
+	dir = 1
+	},
+/obj/machinery/disposal/bin,
 /turf/open/floor/plasteel/white/side{
 	dir = 4
 	},
@@ -39934,11 +39980,19 @@
 /turf/open/floor/plasteel/white,
 /area/medical/sleeper)
 "bIJ" = (
-/obj/machinery/computer/operating{
-	dir = 1
+/obj/structure/disposalpipe/segment{
+	dir = 4
 	},
+/obj/effect/turf_decal/loading_area{
+	icon_state = "drain";
+	name = "drain"
+	},
+/obj/structure/table,
+/obj/item/reagent_containers/spray/cleaner,
+/obj/item/crowbar,
+/obj/item/clothing/neck/stethoscope,
 /turf/open/floor/plasteel/white,
-/area/medical/sleeper)
+/area/medical/medbay/central)
 "bIK" = (
 /obj/structure/closet/crate/freezer/surplus_limbs,
 /obj/item/reagent_containers/glass/beaker/synthflesh,
@@ -40624,6 +40678,10 @@
 /obj/item/storage/belt/medical{
 	pixel_y = 2
 	},
+/obj/item/storage/backpack/duffelbag/med/surgery,
+/obj/item/storage/backpack/duffelbag/med/surgery{
+	pixel_y = 12
+	},
 /turf/open/floor/plasteel/white,
 /area/medical/sleeper)
 "bKm" = (
@@ -47386,7 +47444,7 @@
 "bZH" = (
 /obj/machinery/door/airlock/research/glass{
 	dir = 4;
-	name = "Circuitry Lab";
+	name = "Experimentation Lab";
 	req_access_txt = "47"
 	},
 /obj/machinery/door/firedoor,
@@ -62532,6 +62590,14 @@
 /obj/item/ashtray,
 /turf/open/floor/carpet/black,
 /area/crew_quarters/bar)
+"hfQ" = (
+/obj/structure/chair/sofa/right{
+	desc = "More inviting than the average couch.";
+	dir = 8;
+	name = "comfy couch"
+	},
+/turf/open/floor/carpet/green,
+/area/medical/psych)
 "hhu" = (
 /obj/structure/closet/secure_closet/miner,
 /obj/effect/turf_decal/tile/brown{
@@ -62701,6 +62767,12 @@
 	},
 /turf/open/floor/carpet,
 /area/quartermaster/miningdock)
+"jOu" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/turf/open/floor/carpet/green,
+/area/medical/psych)
 "jSq" = (
 /obj/effect/turf_decal/tile/brown,
 /obj/effect/turf_decal/tile/brown{
@@ -62916,6 +62988,19 @@
 	},
 /turf/open/floor/plasteel,
 /area/hallway/primary/starboard)
+"nkD" = (
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/machinery/door/airlock/medical{
+	name = "Psychology Office";
+	req_access_txt = "71"
+	},
+/obj/machinery/door/firedoor,
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/turf/open/floor/plasteel/white,
+/area/medical/psych)
 "nni" = (
 /obj/structure/table/plasmaglass,
 /obj/item/ashtray,
@@ -63201,6 +63286,16 @@
 /obj/machinery/door/firedoor/border_only,
 /turf/open/floor/plasteel,
 /area/hallway/primary/central)
+"qhI" = (
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/structure/cable{
+	icon_state = "1-4"
+	},
+/turf/open/floor/plasteel/white/side{
+	dir = 8
+	},
+/area/medical/psych)
 "qhL" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -63304,6 +63399,16 @@
 /obj/item/twohanded/required/kirbyplants/random,
 /turf/open/floor/plasteel/white,
 /area/medical/virology)
+"rgX" = (
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/turf/open/floor/plasteel/white/corner{
+	dir = 8
+	},
+/area/medical/psych)
 "rja" = (
 /obj/effect/spawner/structure/window/reinforced,
 /obj/machinery/door/poddoor/shutters/preopen{
@@ -63451,6 +63556,14 @@
 /obj/item/twohanded/required/kirbyplants/random,
 /turf/open/floor/wood,
 /area/security/vacantoffice)
+"tNb" = (
+/obj/machinery/light_switch{
+	pixel_x = -28
+	},
+/turf/open/floor/plasteel/white/side{
+	dir = 4
+	},
+/area/medical/psych)
 "ugb" = (
 /obj/machinery/pool/drain,
 /turf/open/pool,
@@ -63753,6 +63866,15 @@
 /obj/effect/landmark/barthpot,
 /turf/open/floor/carpet,
 /area/library)
+"xRN" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+	dir = 4
+	},
+/obj/machinery/vending/medical{
+	pixel_x = -2
+	},
+/turf/open/floor/plasteel/white,
+/area/medical/medbay/central)
 "xYc" = (
 /obj/item/crowbar,
 /obj/item/wrench,
@@ -91650,7 +91772,7 @@ aSh
 aTG
 aUY
 aWm
-bfk
+aXX
 aXZ
 baO
 bbK
@@ -91907,7 +92029,7 @@ aTH
 aTH
 aUX
 aWn
-bfk
+aXY
 aZz
 aZA
 aZA
@@ -92164,7 +92286,7 @@ aSj
 aTI
 aUZ
 aWo
-bfk
+aXY
 aZA
 aZA
 aZA
@@ -92421,7 +92543,7 @@ aSk
 aTJ
 aVa
 aWp
-bfk
+aXZ
 aZA
 baP
 baP
@@ -97321,12 +97443,12 @@ bfv
 bfv
 buj
 bvH
-bjE
 byo
-bxa
-bxa
-bxa
-bxa
+byo
+byo
+byo
+byo
+byo
 bxa
 bxa
 bHq
@@ -97577,10 +97699,10 @@ bpS
 brj
 bfv
 buk
-bvI
-bjE
+xRN
+byo
 byp
-bxa
+tNb
 bAX
 bCk
 bDJ
@@ -98092,16 +98214,16 @@ brk
 bsO
 bum
 bvK
-bwY
-bwY
-bzI
+nkD
+rgX
 bAZ
+qhI
 bCm
 bDL
 bEJ
 bFQ
 bHt
-bIJ
+bBd
 bKf
 bFT
 bMP
@@ -98348,13 +98470,13 @@ bit
 brl
 bsP
 bun
-bvL
-bsW
+bKs
+byo
 byr
-bxa
 bBa
+jOu
 bCn
-bxb
+byo
 bEK
 bFR
 bHu
@@ -98605,13 +98727,13 @@ bpU
 brm
 bfv
 buo
-bvM
-bwZ
+bKs
+byo
 bys
-bxa
+hfQ
 bBb
 bCo
-bxb
+byo
 bEL
 bFS
 bHv
@@ -98863,12 +98985,12 @@ bfv
 bfv
 bup
 bvN
-bxa
-bxa
-bxa
-bxa
-bxa
-bxa
+byo
+byo
+byo
+byo
+byo
+byo
 bxa
 bFT
 bHw
@@ -99119,7 +99241,7 @@ bjE
 brn
 bhc
 buq
-bvM
+bvI
 bxb
 byu
 bzJ
@@ -100661,7 +100783,7 @@ bpZ
 bjE
 bsU
 but
-bvR
+bvL
 bxa
 byz
 bzN
@@ -100918,7 +101040,7 @@ bpX
 bpX
 bsS
 but
-bvR
+bIJ
 bxb
 byA
 bzO

code/__DEFINES/access.dm

@@ -66,6 +66,7 @@
 #define ACCESS_CLONING 68 //Cloning room and clone pod ejection
 #define ACCESS_ENTER_GENPOP 69
 #define ACCESS_LEAVE_GENPOP 70
+#define ACCESS_PSYCH 71
 
 	//BEGIN CENTCOM ACCESS
 	/*Should leave plenty of room if we need to add more access levels.

code/__DEFINES/jobs.dm

@@ -27,6 +27,7 @@
 #define VIROLOGIST		(1<<6)
 #define JR_DOCTOR       (1<<7)
 #define JR_SCIENTIST    (1<<9)
+#define MED_PSYCH       (1<<14)
 
 
 #define CIVILIAN		(1<<2)

code/game/area/Space_Station_13_areas.dm

@@ -831,6 +831,10 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 	name = "Chemistry"
 	icon_state = "chem"
 
+/area/medical/psych
+	name = "Psychology Office"
+	icon_state = "medbay"
+
 /area/medical/surgery
 	name = "Surgery"
 	icon_state = "surgery"

code/game/objects/effects/landmarks.dm

@@ -171,6 +171,10 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark)
 	name = "Geneticist"
 	icon_state = "Geneticist"
 
+/obj/effect/landmark/start/psychologist
+	name = "Psychologist"
+	icon_state = "Medical Doctor"
+
 /obj/effect/landmark/start/chief_medical_officer
 	name = "Chief Medical Officer"
 	icon_state = "Chief Medical Officer"

code/game/objects/items/storage/firstaid.dm

@@ -389,3 +389,28 @@
 	/obj/item/organ_storage
 	))
 
+//Psych Pillbottles
+
+/obj/item/storage/pill_bottle/happinesspsych
+	name = "happiness pill bottle"
+	desc = "Contains pills used as a last resort means to temporarily stabilize depression and anxiety. WARNING: side effects may include slurred speech, drooling, and severe addiction."
+
+/obj/item/storage/pill_bottle/happinesspsych/PopulateContents()
+	for(var/i in 1 to 5)
+		new /obj/item/reagent_containers/pill/happinesspsych(src)
+
+/obj/item/storage/pill_bottle/lsdpsych
+	name = "mindbreaker toxin pill bottle"
+	desc = "!FOR THERAPEUTIC USE ONLY! Contains pills used to alleviate the symptoms of Reality Dissociation Syndrome."
+
+/obj/item/storage/pill_bottle/lsdpsych/PopulateContents()
+	for(var/i in 1 to 5)
+		new /obj/item/reagent_containers/pill/lsdpsych(src)
+
+/obj/item/storage/pill_bottle/paxpsych
+	name = "pacification pill"
+	desc = "Contains pills used to temporarily pacify patients that are deemed a harm to themselves or others."
+
+/obj/item/storage/pill_bottle/paxpsych/PopulateContents()
+	for(var/i in 1 to 5)
+		new /obj/item/reagent_containers/pill/paxpsych(src)

code/game/objects/structures/crates_lockers/closets/secure/psychology.dm

@@ -0,0 +1,17 @@
+/obj/structure/closet/secure_closet/psychology
+    name = "psychology locker"
+    req_access = list(ACCESS_PSYCH)
+    icon_state = "cabinet"
+
+/obj/structure/closet/secure_closet/psychology/PopulateContents()
+    ..()
+    new /obj/item/clothing/under/lawyer/blacksuit(src)
+    new /obj/item/clothing/under/lawyer/blacksuit/skirt(src)
+    new /obj/item/clothing/shoes/laceup(src)
+    new /obj/item/storage/backpack/medic(src)
+    new /obj/item/radio/headset/headset_med(src)
+    new /obj/item/clipboard(src)
+    new /obj/item/clothing/suit/straight_jacket(src)
+    new /obj/item/clothing/ears/earmuffs(src)
+    new /obj/item/clothing/mask/muzzle(src)
+    new /obj/item/clothing/glasses/sunglasses/blindfold(src)

code/modules/jobs/access.dm

@@ -137,7 +137,7 @@
 	            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_VAULT, ACCESS_MINING_STATION, ACCESS_XENOBIOLOGY, ACCESS_CE, ACCESS_HOP, ACCESS_HOS, ACCESS_RC_ANNOUNCE,
-	            ACCESS_KEYCARD_AUTH, ACCESS_TCOMSAT, ACCESS_GATEWAY, ACCESS_MINERAL_STOREROOM, ACCESS_MINISAT, ACCESS_NETWORK, ACCESS_CLONING)
+	            ACCESS_KEYCARD_AUTH, ACCESS_TCOMSAT, ACCESS_GATEWAY, ACCESS_MINERAL_STOREROOM, ACCESS_MINISAT, ACCESS_NETWORK, ACCESS_CLONING, ACCESS_PSYCH)
 
 /proc/get_all_centcom_access()
 	return list(ACCESS_CENT_GENERAL, ACCESS_CENT_THUNDER, ACCESS_CENT_SPECOPS, ACCESS_CENT_MEDICAL, ACCESS_CENT_LIVING, ACCESS_CENT_STORAGE, ACCESS_CENT_TELEPORTER, ACCESS_CENT_CAPTAIN)
@@ -165,7 +165,7 @@
 		if(2) //security
 			return list(ACCESS_SEC_DOORS, ACCESS_WEAPONS, ACCESS_SECURITY, ACCESS_BRIG, ACCESS_ARMORY, ACCESS_FORENSICS_LOCKERS, ACCESS_COURT, ACCESS_HOS, ACCESS_ENTER_GENPOP, ACCESS_LEAVE_GENPOP)
 		if(3) //medbay
-			return list(ACCESS_MEDICAL, ACCESS_GENETICS, ACCESS_CLONING, ACCESS_MORGUE, ACCESS_CHEMISTRY, ACCESS_VIROLOGY, ACCESS_SURGERY, ACCESS_CMO)
+			return list(ACCESS_MEDICAL, ACCESS_GENETICS, ACCESS_CLONING, ACCESS_MORGUE, ACCESS_CHEMISTRY, ACCESS_VIROLOGY, ACCESS_SURGERY, ACCESS_CMO, ACCESS_PSYCH)
 		if(4) //research
 			return list(ACCESS_RESEARCH, ACCESS_TOX, ACCESS_TOX_STORAGE, ACCESS_GENETICS, ACCESS_ROBOTICS, ACCESS_XENOBIOLOGY, ACCESS_MINISAT, ACCESS_RD, ACCESS_NETWORK)
 		if(5) //engineering and maintenance
@@ -332,6 +332,8 @@
 			return "Network Access"
 		if(ACCESS_CLONING)
 			return "Cloning Room"
+		if(ACCESS_PSYCH)
+			return "Psychology Office"
 
 /proc/get_centcom_access_desc(A)
 	switch(A)
@@ -357,7 +359,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", "Engineering Intern",
-				"Atmospheric Technician", "Chief Medical Officer", "Medical Doctor", "Chemist", "Geneticist", "Virologist", "Medical Resident",
+				"Atmospheric Technician", "Chief Medical Officer", "Medical Doctor", "Chemist", "Geneticist", "Virologist", "Psychologist", "Medical Resident",
 				"Research Director", "Scientist", "Roboticist", "Research Student", "Head of Security", "Warden", "Detective", "Security Officer", "Rookie")
 
 /proc/get_all_job_icons() //For all existing HUD icons

code/modules/jobs/job_types/captain.dm

@@ -95,13 +95,13 @@ Head of Personnel
 			            ACCESS_ALL_PERSONAL_LOCKERS, ACCESS_MAINT_TUNNELS, ACCESS_BAR, ACCESS_JANITOR, ACCESS_CONSTRUCTION, ACCESS_MORGUE,
 			            ACCESS_CREMATORIUM, ACCESS_KITCHEN, ACCESS_CARGO, ACCESS_CARGO_BOT, ACCESS_MAILSORTING, ACCESS_QM, ACCESS_HYDROPONICS, ACCESS_LAWYER,
 			            ACCESS_THEATRE, ACCESS_CHAPEL_OFFICE, ACCESS_LIBRARY, ACCESS_RESEARCH, ACCESS_MINING, ACCESS_VAULT, ACCESS_MINING_STATION,
-			            ACCESS_HOP, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_GATEWAY, ACCESS_MINERAL_STOREROOM)
+			            ACCESS_HOP, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_GATEWAY, ACCESS_MINERAL_STOREROOM, ACCESS_PSYCH)
 	minimal_access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_COURT, ACCESS_WEAPONS,
 			            ACCESS_MEDICAL, ACCESS_ENGINE, ACCESS_CHANGE_IDS, ACCESS_AI_UPLOAD, ACCESS_EVA, ACCESS_HEADS,
 			            ACCESS_ALL_PERSONAL_LOCKERS, ACCESS_MAINT_TUNNELS, ACCESS_BAR, ACCESS_JANITOR, ACCESS_CONSTRUCTION, ACCESS_MORGUE,
 			            ACCESS_CREMATORIUM, ACCESS_KITCHEN, ACCESS_CARGO, ACCESS_CARGO_BOT, ACCESS_MAILSORTING, ACCESS_QM, ACCESS_HYDROPONICS, ACCESS_LAWYER,
 			            ACCESS_THEATRE, ACCESS_CHAPEL_OFFICE, ACCESS_LIBRARY, ACCESS_RESEARCH, ACCESS_MINING, ACCESS_VAULT, ACCESS_MINING_STATION,
-			            ACCESS_HOP, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_GATEWAY, ACCESS_MINERAL_STOREROOM)
+			            ACCESS_HOP, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_GATEWAY, ACCESS_MINERAL_STOREROOM, ACCESS_PSYCH)
 
 	blacklisted_quirks = list(/datum/quirk/mute, /datum/quirk/brainproblems, /datum/quirk/prosopagnosia, /datum/quirk/insanity)
 

code/modules/jobs/job_types/job_alt_titles.dm

@@ -71,6 +71,9 @@
 /datum/job/geneticist
 	alt_titles = list("Gene Therapist")
 
+/datum/job/psychologist
+	alt_titles = list("Therapist", "Psychiatrist")
+
 /datum/job/junior_doctor
 
 //Security

code/modules/jobs/job_types/medical.dm

@@ -22,10 +22,10 @@ Chief Medical Officer
 
 	access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_GENETICS, ACCESS_CLONING, ACCESS_HEADS, ACCESS_MINERAL_STOREROOM,
 			ACCESS_CHEMISTRY, ACCESS_VIROLOGY, ACCESS_CMO, ACCESS_SURGERY, ACCESS_RC_ANNOUNCE,
-			ACCESS_KEYCARD_AUTH, ACCESS_SEC_DOORS, ACCESS_MAINT_TUNNELS)
+			ACCESS_KEYCARD_AUTH, ACCESS_SEC_DOORS, ACCESS_MAINT_TUNNELS, ACCESS_PSYCH)
 	minimal_access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_GENETICS, ACCESS_CLONING, ACCESS_HEADS, ACCESS_MINERAL_STOREROOM,
 			ACCESS_CHEMISTRY, ACCESS_VIROLOGY, ACCESS_CMO, ACCESS_SURGERY, ACCESS_RC_ANNOUNCE,
-			ACCESS_KEYCARD_AUTH, ACCESS_SEC_DOORS, ACCESS_MAINT_TUNNELS)
+			ACCESS_KEYCARD_AUTH, ACCESS_SEC_DOORS, ACCESS_MAINT_TUNNELS, ACCESS_PSYCH)
 
 	blacklisted_quirks = list(/datum/quirk/mute, /datum/quirk/brainproblems, /datum/quirk/insanity)
 
@@ -221,7 +221,6 @@ Virologist
 	satchel = /obj/item/storage/backpack/satchel/vir
 	duffelbag = /obj/item/storage/backpack/duffelbag/med
 
-
 /*
 Junior Doctor
 */
@@ -262,3 +261,41 @@ Junior Doctor
 	duffelbag = /obj/item/storage/backpack/duffelbag/med
 
 	chameleon_extras = /obj/item/gun/syringe
+
+/*
+Psychologist
+*/
+/datum/job/psychologist
+	title = "Psychologist"
+	flag = MED_PSYCH
+	department_head = list("Chief Medical Officer", "Head of Personnel")
+	department_flag = MEDSCI
+	faction = "Station"
+	total_positions = 1
+	spawn_positions = 1
+	minimal_player_age = 1
+	supervisors = "the chief medical officer, and head of personnel"
+	selection_color = "#ffeef0"
+	exp_requirements = 240
+	exp_type = EXP_TYPE_CREW
+
+	outfit = /datum/outfit/job/doctor/psychologist
+
+	access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_CLONING, ACCESS_MINERAL_STOREROOM, ACCESS_PSYCH)
+	minimal_access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_CLONING, ACCESS_MINERAL_STOREROOM, ACCESS_PSYCH)
+
+/datum/outfit/job/doctor/psychologist
+	name = "Psychologist"
+	jobtype = /datum/job/psychologist
+
+	belt = /obj/item/pda/medical
+	ears = /obj/item/radio/headset/headset_med
+	uniform = /obj/item/clothing/under/lawyer/blacksuit
+	shoes = /obj/item/clothing/shoes/laceup
+	l_hand = /obj/item/clipboard
+
+	backpack_contents = list(/obj/item/storage/pill_bottle/mannitol, /obj/item/storage/pill_bottle/psicodine, /obj/item/storage/pill_bottle/paxpsych, /obj/item/storage/pill_bottle/happinesspsych, /obj/item/storage/pill_bottle/lsdpsych)
+
+	backpack = /obj/item/storage/backpack/medic
+	satchel = /obj/item/storage/backpack/satchel/med
+	duffelbag = /obj/item/storage/backpack/duffelbag/med

code/modules/jobs/jobs.dm

@@ -20,6 +20,7 @@ GLOBAL_LIST_INIT(medical_positions, list(
 	"Geneticist",
 	"Virologist",
 	"Chemist",
+	"Psychologist",
 	"Medical Resident"))
 
 

code/modules/reagents/chemistry/reagents/other_reagents.dm

@@ -2065,7 +2065,7 @@
 	color = "#AAAAAA55"
 	taste_description = "water"
 	metabolization_rate = 0.25 * REAGENTS_METABOLISM
-	pH = 15
+	pH = 9.75
 
 /datum/reagent/pax/on_mob_metabolize(mob/living/L)
 	..()

code/modules/reagents/reagent_containers/pill.dm

@@ -204,7 +204,25 @@
 	icon_state = "pill9"
 	color = "#454545"
 	list_reagents = list(/datum/reagent/mutationtoxin/shadow = 1)
-//////////////////////////////////////// drugs
+//////////////////////////////////////// drugs#
+/obj/item/reagent_containers/pill/lsdpsych
+	name = "antipsychotic pill"
+	desc = "Talk to your healthcare provider immediately if hallucinations worsen or new hallucinations emerge."
+	icon_state = "pill14"
+	list_reagents = list(/datum/reagent/toxin/mindbreaker = 5)
+
+/obj/item/reagent_containers/pill/happinesspsych
+	name = "mood stabilizer pill"
+	desc = "Used to temporarily alleviate anxiety and depression, take only as prescribed."
+	icon_state = "pill_happy"
+	list_reagents = list(/datum/reagent/drug/happiness = 5)
+
+/obj/item/reagent_containers/pill/paxpsych
+	name = "pacification pill"
+	desc = "Used to temporarily suppress violent, homicidal, or suicidal behavior in patients."
+	list_reagents = list(/datum/reagent/pax = 5)
+	icon_state = "pill12"
+
 /obj/item/reagent_containers/pill/zoom
 	name = "zoom pill"
 	list_reagents = list(/datum/reagent/medicine/synaptizine = 10, /datum/reagent/drug/nicotine = 10, /datum/reagent/drug/methamphetamine = 1)
@@ -257,3 +275,4 @@
 	name = "breast enlargement pill"
 	list_reagents = list(/datum/reagent/fermi/breast_enlarger = 10)
 	price = 4
+

config/jobs.txt

@@ -34,6 +34,7 @@ Medical Doctor=5,3
 Chemist=2,2
 Geneticist=2,2
 Virologist=1,1
+Psychologist=1,1
 
 Scientist=5,3
 Roboticist=2,2

tgstation.dme

@@ -1098,6 +1098,7 @@
 #include "code\game\objects\structures\crates_lockers\closets\secure\medical.dm"
 #include "code\game\objects\structures\crates_lockers\closets\secure\misc.dm"
 #include "code\game\objects\structures\crates_lockers\closets\secure\personal.dm"
+#include "code\game\objects\structures\crates_lockers\closets\secure\psychology.dm"
 #include "code\game\objects\structures\crates_lockers\closets\secure\scientist.dm"
 #include "code\game\objects\structures\crates_lockers\closets\secure\secure_closets.dm"
 #include "code\game\objects\structures\crates_lockers\closets\secure\security.dm"