From d9594e34f6dab52e38ad2a3cb56a88afc0edba80 Mon Sep 17 00:00:00 2001
From: LightFire53 <LightFire53@users.noreply.github.com>
Date: Mon, 16 Aug 2021 09:52:18 -0700
Subject: [PATCH 1/6] Lobbying for Psychology

---
 _maps/map_files/Delta/delta.dmm | 270 +++++++++++++++++++++-----------
 1 file changed, 181 insertions(+), 89 deletions(-)

diff --git a/_maps/map_files/Delta/delta.dmm b/_maps/map_files/Delta/delta.dmm
index e5f0121446b..79aae2f0c2c 100644
--- a/_maps/map_files/Delta/delta.dmm
+++ b/_maps/map_files/Delta/delta.dmm
@@ -16539,9 +16539,10 @@
 	},
 /area/quartermaster/storage)
 "aQo" = (
-/obj/structure/table/wood,
-/obj/machinery/computer/med_data/laptop,
-/turf/simulated/floor/wood,
+/obj/structure/chair/comfy/lime{
+	dir = 4
+	},
+/turf/simulated/floor/carpet,
 /area/medical/psych)
 "aQp" = (
 /obj/machinery/door/firedoor,
@@ -32194,7 +32195,9 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/turf/simulated/floor/plating,
+/turf/simulated/floor/plasteel{
+	icon_state = "white"
+	},
 /area/maintenance/starboard)
 "buG" = (
 /obj/effect/decal/warning_stripes/arrow{
@@ -35997,11 +36000,11 @@
 "bBV" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/segment,
 /obj/machinery/camera{
 	c_tag = "Central Ring Hallway East";
 	dir = 8
 	},
-/obj/structure/disposalpipe/segment,
 /turf/simulated/floor/plasteel{
 	icon_state = "neutralcorner"
 	},
@@ -37201,15 +37204,14 @@
 	},
 /area/hallway/primary/port)
 "bDD" = (
-/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance{
-	lootcount = 3;
-	name = "3maintenance loot spawner"
+/obj/structure/chair,
+/obj/machinery/camera{
+	c_tag = "Psych Foyer"
 	},
-/obj/machinery/light/small{
-	dir = 1
+/turf/simulated/floor/plasteel{
+	dir = 4;
+	icon_state = "whitebluecorner"
 	},
-/turf/simulated/floor/plating,
 /area/maintenance/starboard)
 "bDE" = (
 /obj/item/twohanded/required/kirbyplants,
@@ -37766,12 +37768,11 @@
 	},
 /area/engine/gravitygenerator)
 "bEH" = (
-/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance{
-	lootcount = 3;
-	name = "3maintenance loot spawner"
+/obj/item/twohanded/required/kirbyplants,
+/turf/simulated/floor/plasteel{
+	dir = 4;
+	icon_state = "whitebluecorner"
 	},
-/turf/simulated/floor/plating,
 /area/maintenance/starboard)
 "bEI" = (
 /turf/simulated/floor/plasteel{
@@ -41810,10 +41811,14 @@
 	},
 /area/storage/tech)
 "bMD" = (
-/obj/structure/sign/poster/random{
-	pixel_x = -32
+/obj/structure/table,
+/obj/item/paper_bin{
+	pixel_y = 5
+	},
+/obj/item/pen/multi,
+/turf/simulated/floor/plasteel{
+	icon_state = "white"
 	},
-/turf/simulated/floor/plating,
 /area/maintenance/starboard)
 "bME" = (
 /obj/structure/table/reinforced,
@@ -54541,8 +54546,9 @@
 /turf/simulated/floor/plasteel,
 /area/maintenance/starboard2)
 "cmt" = (
-/obj/structure/closet/wardrobe/grey,
-/turf/simulated/floor/plating,
+/turf/simulated/floor/plasteel{
+	icon_state = "white"
+	},
 /area/maintenance/starboard)
 "cmv" = (
 /obj/structure/disposalpipe/segment,
@@ -63513,8 +63519,14 @@
 	},
 /area/hallway/primary/central)
 "cFd" = (
-/obj/item/rack_parts,
-/turf/simulated/floor/plating,
+/obj/structure/chair,
+/obj/machinery/light{
+	dir = 1
+	},
+/turf/simulated/floor/plasteel{
+	dir = 1;
+	icon_state = "whitebluecorner"
+	},
 /area/maintenance/starboard)
 "cFe" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -64588,11 +64600,13 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
 	},
-/obj/machinery/door/airlock/maintenance,
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/turf/simulated/floor/wood,
+/turf/simulated/floor/plasteel{
+	dir = 1;
+	icon_state = "whitebluecorner"
+	},
 /area/maintenance/starboard)
 "cGI" = (
 /obj/structure/disposalpipe/segment{
@@ -66353,19 +66367,25 @@
 "cKY" = (
 /turf/simulated/wall,
 /area/medical/medbay)
-"cKZ" = (
-/obj/structure/table,
-/obj/item/storage/toolbox/electrical,
-/turf/simulated/floor/plating,
-/area/maintenance/starboard)
 "cLa" = (
-/obj/structure/table,
-/obj/item/storage/toolbox/mechanical,
+/obj/machinery/door/poddoor/shutters{
+	density = 0;
+	dir = 2;
+	icon_state = "open";
+	id_tag = "psychoffice";
+	name = "Privacy Shutters";
+	opacity = 0
+	},
+/obj/effect/spawner/window/reinforced,
 /turf/simulated/floor/plating,
 /area/maintenance/starboard)
 "cLb" = (
-/obj/structure/table_frame,
-/turf/simulated/floor/plating,
+/obj/machinery/door/airlock/medical{
+	id_tag = "psychfoyer";
+	name = "Psych Office";
+	req_access_txt = "64"
+	},
+/turf/simulated/floor/wood,
 /area/maintenance/starboard)
 "cLd" = (
 /obj/structure/cable{
@@ -67792,25 +67812,35 @@
 /turf/space,
 /area/space/nearstation)
 "cOa" = (
-/obj/structure/chair/comfy/lime{
-	dir = 4
-	},
 /obj/machinery/door_control{
 	id = "psychoffice";
 	name = "Privacy Shutters Control";
-	pixel_x = -25
+	pixel_x = -25;
+	pixel_y = 5
 	},
-/turf/simulated/floor/carpet,
+/obj/structure/chair/office/light{
+	dir = 4
+	},
+/obj/effect/landmark/start{
+	name = "Psychiatrist"
+	},
+/obj/machinery/door_control{
+	id = "psychfoyer";
+	layer = 3.3;
+	name = "Psych Foyer Doors";
+	normaldoorcontrol = 1;
+	pixel_x = -25;
+	pixel_y = -6
+	},
+/turf/simulated/floor/wood,
 /area/medical/psych)
 "cOb" = (
-/obj/machinery/light{
-	dir = 1
+/obj/structure/table/wood,
+/obj/item/paper_bin{
+	pixel_y = 5
 	},
-/obj/item/radio/intercom{
-	dir = 1;
-	pixel_y = 25
-	},
-/turf/simulated/floor/carpet,
+/obj/item/pen/multi,
+/turf/simulated/floor/wood,
 /area/medical/psych)
 "cOc" = (
 /obj/machinery/firealarm{
@@ -67821,8 +67851,7 @@
 	pixel_x = 28;
 	pixel_y = 30
 	},
-/obj/structure/bed/psych,
-/turf/simulated/floor/carpet,
+/turf/simulated/floor/wood,
 /area/medical/psych)
 "cOd" = (
 /obj/structure/table,
@@ -68607,14 +68636,13 @@
 /turf/simulated/floor/plating,
 /area/medical/psych)
 "cPQ" = (
-/turf/simulated/floor/carpet,
+/turf/simulated/floor/wood,
 /area/medical/psych)
 "cPR" = (
-/obj/item/twohanded/required/kirbyplants,
 /obj/structure/sign/poster/random{
 	pixel_x = 32
 	},
-/turf/simulated/floor/carpet,
+/turf/simulated/floor/wood,
 /area/medical/psych)
 "cPS" = (
 /obj/effect/spawner/window/reinforced,
@@ -69372,8 +69400,9 @@
 /area/medical/psych)
 "cRr" = (
 /obj/structure/closet/secure_closet/psychiatrist,
-/obj/item/clipboard{
-	pixel_x = -5
+/obj/item/radio/intercom{
+	dir = 1;
+	pixel_x = 28
 	},
 /turf/simulated/floor/wood,
 /area/medical/psych)
@@ -70026,6 +70055,10 @@
 /obj/machinery/ai_status_display{
 	pixel_x = 32
 	},
+/obj/structure/closet/secure_closet/psychiatrist,
+/obj/item/clipboard{
+	pixel_x = -5
+	},
 /turf/simulated/floor/wood,
 /area/medical/psych)
 "cSL" = (
@@ -70782,14 +70815,7 @@
 	network = list("Medical","SS13","Security")
 	},
 /obj/structure/cable,
-/turf/simulated/floor/wood,
-/area/medical/psych)
-"cUh" = (
-/obj/structure/chair/office/light,
-/obj/effect/landmark/start{
-	name = "Psychiatrist"
-	},
-/turf/simulated/floor/wood,
+/turf/simulated/floor/carpet,
 /area/medical/psych)
 "cUi" = (
 /obj/machinery/light{
@@ -70799,7 +70825,7 @@
 	dir = 8;
 	pixel_x = 24
 	},
-/turf/simulated/floor/wood,
+/turf/simulated/floor/carpet,
 /area/medical/psych)
 "cUj" = (
 /obj/machinery/light{
@@ -71676,18 +71702,11 @@
 	},
 /area/medical/medbay)
 "cVQ" = (
-/obj/structure/table/wood,
-/obj/item/paper_bin{
-	pixel_y = 5
-	},
-/obj/item/pen/multi,
-/turf/simulated/floor/wood,
+/turf/simulated/floor/carpet,
 /area/medical/psych)
 "cVR" = (
-/obj/structure/table/wood,
-/obj/item/flashlight/lamp/green,
-/obj/item/storage/briefcase,
-/turf/simulated/floor/wood,
+/obj/structure/bed/psych,
+/turf/simulated/floor/carpet,
 /area/medical/psych)
 "cVS" = (
 /obj/structure/cable{
@@ -97785,6 +97804,12 @@
 /obj/structure/cable,
 /turf/simulated/floor/plating,
 /area/security/permabrig)
+"fcL" = (
+/turf/simulated/floor/plasteel{
+	dir = 1;
+	icon_state = "whitebluecorner"
+	},
+/area/maintenance/starboard)
 "fdI" = (
 /obj/effect/decal/warning_stripes/south,
 /obj/machinery/atmospherics/unary/vent_scrubber/on{
@@ -98446,7 +98471,9 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/turf/simulated/floor/plating,
+/turf/simulated/floor/plasteel{
+	icon_state = "white"
+	},
 /area/maintenance/starboard)
 "hzb" = (
 /obj/machinery/light{
@@ -98722,6 +98749,14 @@
 	icon_state = "whiteblue"
 	},
 /area/medical/surgery2)
+"iJC" = (
+/obj/structure/chair{
+	dir = 1
+	},
+/turf/simulated/floor/plasteel{
+	icon_state = "white"
+	},
+/area/maintenance/starboard)
 "iKj" = (
 /obj/machinery/light_switch{
 	pixel_x = -23;
@@ -98776,6 +98811,15 @@
 /obj/item/twohanded/required/kirbyplants,
 /turf/simulated/floor/plasteel,
 /area/security/permabrig)
+"iUH" = (
+/obj/structure/chair{
+	dir = 1
+	},
+/turf/simulated/floor/plasteel{
+	dir = 1;
+	icon_state = "whitebluecorner"
+	},
+/area/maintenance/starboard)
 "iVO" = (
 /obj/structure/cable{
 	d1 = 1;
@@ -99429,6 +99473,15 @@
 	},
 /turf/simulated/floor/plasteel,
 /area/security/seceqstorage)
+"lGo" = (
+/obj/machinery/light{
+	dir = 8
+	},
+/obj/structure/table/wood,
+/obj/item/flashlight/lamp/green,
+/obj/item/storage/briefcase,
+/turf/simulated/floor/wood,
+/area/medical/psych)
 "lIv" = (
 /obj/machinery/suit_storage_unit/clown,
 /obj/effect/decal/warning_stripes/yellow/hollow,
@@ -100549,6 +100602,13 @@
 	},
 /turf/simulated/floor/plating,
 /area/security/permabrig)
+"qmg" = (
+/obj/structure/chair,
+/turf/simulated/floor/plasteel{
+	dir = 1;
+	icon_state = "whitebluecorner"
+	},
+/area/maintenance/starboard)
 "qmW" = (
 /obj/structure/chair{
 	dir = 4
@@ -100844,6 +100904,32 @@
 /obj/effect/spawner/window/reinforced,
 /turf/simulated/floor/plating,
 /area/security/brig)
+"rLV" = (
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/obj/structure/cable{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8";
+	tag = ""
+	},
+/turf/simulated/floor/plasteel{
+	dir = 4;
+	icon_state = "whitebluecorner"
+	},
+/area/maintenance/starboard)
+"rMH" = (
+/obj/structure/table/wood,
+/obj/machinery/computer/med_data/laptop,
+/turf/simulated/floor/wood,
+/area/medical/psych)
 "rNi" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
@@ -101951,6 +102037,12 @@
 	icon_state = "red"
 	},
 /area/security/warden)
+"vGP" = (
+/turf/simulated/floor/plasteel{
+	dir = 4;
+	icon_state = "whitebluecorner"
+	},
+/area/maintenance/starboard)
 "vJK" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/structure/rack,
@@ -147351,10 +147443,10 @@ cxn
 cxn
 cxn
 cxn
-bng
+qmg
 cGF
-bng
-bng
+fcL
+iUH
 bng
 cYP
 cYP
@@ -147612,8 +147704,8 @@ cFd
 hos
 cmt
 bMD
-cKZ
-cYP
+cLa
+lGo
 cOa
 cPQ
 cRp
@@ -147867,15 +147959,15 @@ cAc
 cxn
 bDD
 buF
-boG
-boG
+cmt
+iJC
 cLa
-cYP
+rMH
 cOb
 cPQ
 cRq
 cSJ
-cUh
+cVQ
 cVQ
 cYP
 cYR
@@ -148123,11 +148215,11 @@ cAc
 cyD
 cxn
 bEH
-cGJ
-boG
-boG
+rLV
+vGP
+vGP
 cLb
-cYP
+cPQ
 cOc
 cPR
 cRr
@@ -148381,8 +148473,8 @@ cxn
 cxn
 bng
 cGI
-cJp
-dfK
+bng
+bng
 bng
 cYP
 cYP

From 3d5433462e09fef1178a5f8e4fed766cef87d98b Mon Sep 17 00:00:00 2001
From: LightFire53 <LightFire53@users.noreply.github.com>
Date: Mon, 16 Aug 2021 10:11:05 -0700
Subject: [PATCH 2/6] But actually makes it the right area

---
 _maps/map_files/Delta/delta.dmm | 192 ++++++++++++++++----------------
 1 file changed, 96 insertions(+), 96 deletions(-)

diff --git a/_maps/map_files/Delta/delta.dmm b/_maps/map_files/Delta/delta.dmm
index 79aae2f0c2c..490afa0caa2 100644
--- a/_maps/map_files/Delta/delta.dmm
+++ b/_maps/map_files/Delta/delta.dmm
@@ -32198,7 +32198,7 @@
 /turf/simulated/floor/plasteel{
 	icon_state = "white"
 	},
-/area/maintenance/starboard)
+/area/medical/psych)
 "buG" = (
 /obj/effect/decal/warning_stripes/arrow{
 	dir = 1
@@ -37212,7 +37212,7 @@
 	dir = 4;
 	icon_state = "whitebluecorner"
 	},
-/area/maintenance/starboard)
+/area/medical/psych)
 "bDE" = (
 /obj/item/twohanded/required/kirbyplants,
 /obj/machinery/status_display{
@@ -37773,7 +37773,7 @@
 	dir = 4;
 	icon_state = "whitebluecorner"
 	},
-/area/maintenance/starboard)
+/area/medical/psych)
 "bEI" = (
 /turf/simulated/floor/plasteel{
 	dir = 8;
@@ -41819,7 +41819,7 @@
 /turf/simulated/floor/plasteel{
 	icon_state = "white"
 	},
-/area/maintenance/starboard)
+/area/medical/psych)
 "bME" = (
 /obj/structure/table/reinforced,
 /obj/machinery/light{
@@ -54549,7 +54549,7 @@
 /turf/simulated/floor/plasteel{
 	icon_state = "white"
 	},
-/area/maintenance/starboard)
+/area/medical/psych)
 "cmv" = (
 /obj/structure/disposalpipe/segment,
 /obj/structure/cable{
@@ -63527,7 +63527,7 @@
 	dir = 1;
 	icon_state = "whitebluecorner"
 	},
-/area/maintenance/starboard)
+/area/medical/psych)
 "cFe" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 10
@@ -64607,7 +64607,7 @@
 	dir = 1;
 	icon_state = "whitebluecorner"
 	},
-/area/maintenance/starboard)
+/area/medical/psych)
 "cGI" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -64626,7 +64626,7 @@
 	},
 /obj/machinery/door/airlock/maintenance,
 /turf/simulated/floor/plating,
-/area/maintenance/starboard)
+/area/medical/psych)
 "cGJ" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -66378,7 +66378,7 @@
 	},
 /obj/effect/spawner/window/reinforced,
 /turf/simulated/floor/plating,
-/area/maintenance/starboard)
+/area/medical/psych)
 "cLb" = (
 /obj/machinery/door/airlock/medical{
 	id_tag = "psychfoyer";
@@ -66386,7 +66386,7 @@
 	req_access_txt = "64"
 	},
 /turf/simulated/floor/wood,
-/area/maintenance/starboard)
+/area/medical/psych)
 "cLd" = (
 /obj/structure/cable{
 	d2 = 4;
@@ -97484,6 +97484,13 @@
 /obj/machinery/blackbox_recorder,
 /turf/simulated/floor/bluegrid,
 /area/tcommsat/chamber)
+"efF" = (
+/obj/structure/chair,
+/turf/simulated/floor/plasteel{
+	dir = 1;
+	icon_state = "whitebluecorner"
+	},
+/area/medical/psych)
 "eha" = (
 /obj/machinery/iv_drip,
 /obj/machinery/light/small{
@@ -97656,6 +97663,12 @@
 	},
 /turf/simulated/floor/grass,
 /area/hallway/secondary/exit)
+"eHx" = (
+/turf/simulated/floor/plasteel{
+	dir = 4;
+	icon_state = "whitebluecorner"
+	},
+/area/medical/psych)
 "eLI" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
@@ -97804,12 +97817,6 @@
 /obj/structure/cable,
 /turf/simulated/floor/plating,
 /area/security/permabrig)
-"fcL" = (
-/turf/simulated/floor/plasteel{
-	dir = 1;
-	icon_state = "whitebluecorner"
-	},
-/area/maintenance/starboard)
 "fdI" = (
 /obj/effect/decal/warning_stripes/south,
 /obj/machinery/atmospherics/unary/vent_scrubber/on{
@@ -98474,7 +98481,7 @@
 /turf/simulated/floor/plasteel{
 	icon_state = "white"
 	},
-/area/maintenance/starboard)
+/area/medical/psych)
 "hzb" = (
 /obj/machinery/light{
 	dir = 4
@@ -98595,6 +98602,27 @@
 	icon_state = "showroomfloor"
 	},
 /area/medical/surgery1)
+"hYJ" = (
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/obj/structure/cable{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8";
+	tag = ""
+	},
+/turf/simulated/floor/plasteel{
+	dir = 4;
+	icon_state = "whitebluecorner"
+	},
+/area/medical/psych)
 "hZF" = (
 /turf/simulated/floor/plasteel{
 	dir = 1;
@@ -98749,14 +98777,6 @@
 	icon_state = "whiteblue"
 	},
 /area/medical/surgery2)
-"iJC" = (
-/obj/structure/chair{
-	dir = 1
-	},
-/turf/simulated/floor/plasteel{
-	icon_state = "white"
-	},
-/area/maintenance/starboard)
 "iKj" = (
 /obj/machinery/light_switch{
 	pixel_x = -23;
@@ -98811,15 +98831,6 @@
 /obj/item/twohanded/required/kirbyplants,
 /turf/simulated/floor/plasteel,
 /area/security/permabrig)
-"iUH" = (
-/obj/structure/chair{
-	dir = 1
-	},
-/turf/simulated/floor/plasteel{
-	dir = 1;
-	icon_state = "whitebluecorner"
-	},
-/area/maintenance/starboard)
 "iVO" = (
 /obj/structure/cable{
 	d1 = 1;
@@ -99473,15 +99484,6 @@
 	},
 /turf/simulated/floor/plasteel,
 /area/security/seceqstorage)
-"lGo" = (
-/obj/machinery/light{
-	dir = 8
-	},
-/obj/structure/table/wood,
-/obj/item/flashlight/lamp/green,
-/obj/item/storage/briefcase,
-/turf/simulated/floor/wood,
-/area/medical/psych)
 "lIv" = (
 /obj/machinery/suit_storage_unit/clown,
 /obj/effect/decal/warning_stripes/yellow/hollow,
@@ -100428,6 +100430,15 @@
 /obj/item/clothing/head/fedora,
 /turf/simulated/floor/plating,
 /area/security/detectives_office)
+"pBB" = (
+/obj/machinery/light{
+	dir = 8
+	},
+/obj/structure/table/wood,
+/obj/item/flashlight/lamp/green,
+/obj/item/storage/briefcase,
+/turf/simulated/floor/wood,
+/area/medical/psych)
 "pGr" = (
 /obj/structure/cable{
 	d1 = 1;
@@ -100602,13 +100613,6 @@
 	},
 /turf/simulated/floor/plating,
 /area/security/permabrig)
-"qmg" = (
-/obj/structure/chair,
-/turf/simulated/floor/plasteel{
-	dir = 1;
-	icon_state = "whitebluecorner"
-	},
-/area/maintenance/starboard)
 "qmW" = (
 /obj/structure/chair{
 	dir = 4
@@ -100866,6 +100870,11 @@
 	icon_state = "darkblue"
 	},
 /area/medical/surgery2)
+"ruN" = (
+/obj/structure/table/wood,
+/obj/machinery/computer/med_data/laptop,
+/turf/simulated/floor/wood,
+/area/medical/psych)
 "rvx" = (
 /obj/machinery/atmospherics/unary/vent_pump/on{
 	dir = 8
@@ -100904,32 +100913,6 @@
 /obj/effect/spawner/window/reinforced,
 /turf/simulated/floor/plating,
 /area/security/brig)
-"rLV" = (
-/obj/structure/disposalpipe/segment{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
-/obj/structure/cable{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8";
-	tag = ""
-	},
-/turf/simulated/floor/plasteel{
-	dir = 4;
-	icon_state = "whitebluecorner"
-	},
-/area/maintenance/starboard)
-"rMH" = (
-/obj/structure/table/wood,
-/obj/machinery/computer/med_data/laptop,
-/turf/simulated/floor/wood,
-/area/medical/psych)
 "rNi" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
@@ -101155,6 +101138,12 @@
 /obj/item/seeds/glowshroom,
 /turf/simulated/floor/plasteel,
 /area/security/permabrig)
+"syb" = (
+/turf/simulated/floor/plasteel{
+	dir = 1;
+	icon_state = "whitebluecorner"
+	},
+/area/medical/psych)
 "sAW" = (
 /obj/structure/closet/secure_closet/medical2,
 /turf/simulated/floor/plasteel{
@@ -102037,12 +102026,6 @@
 	icon_state = "red"
 	},
 /area/security/warden)
-"vGP" = (
-/turf/simulated/floor/plasteel{
-	dir = 4;
-	icon_state = "whitebluecorner"
-	},
-/area/maintenance/starboard)
 "vJK" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/structure/rack,
@@ -102133,6 +102116,14 @@
 	icon_state = "neutralfull"
 	},
 /area/hallway/secondary/exit)
+"wkY" = (
+/obj/structure/chair{
+	dir = 1
+	},
+/turf/simulated/floor/plasteel{
+	icon_state = "white"
+	},
+/area/medical/psych)
 "wmQ" = (
 /obj/item/radio/intercom{
 	pixel_y = 28
@@ -102463,6 +102454,15 @@
 	},
 /turf/simulated/floor/plating,
 /area/maintenance/starboard)
+"xUE" = (
+/obj/structure/chair{
+	dir = 1
+	},
+/turf/simulated/floor/plasteel{
+	dir = 1;
+	icon_state = "whitebluecorner"
+	},
+/area/medical/psych)
 "xUI" = (
 /obj/structure/table/reinforced,
 /obj/item/storage/box/teargas,
@@ -147443,11 +147443,11 @@ cxn
 cxn
 cxn
 cxn
-qmg
+efF
 cGF
-fcL
-iUH
-bng
+syb
+xUE
+cYP
 cYP
 cYP
 cPO
@@ -147705,7 +147705,7 @@ hos
 cmt
 bMD
 cLa
-lGo
+pBB
 cOa
 cPQ
 cRp
@@ -147960,9 +147960,9 @@ cxn
 bDD
 buF
 cmt
-iJC
+wkY
 cLa
-rMH
+ruN
 cOb
 cPQ
 cRq
@@ -148215,9 +148215,9 @@ cAc
 cyD
 cxn
 bEH
-rLV
-vGP
-vGP
+hYJ
+eHx
+eHx
 cLb
 cPQ
 cOc
@@ -148471,11 +148471,11 @@ cAe
 cxn
 cxn
 cxn
-bng
+cYP
 cGI
-bng
-bng
-bng
+cYP
+cYP
+cYP
 cYP
 cYP
 cYP

From d0485d3f35b87a4ca345f54305c27ba492997a61 Mon Sep 17 00:00:00 2001
From: LightFire53 <LightFire53@users.noreply.github.com>
Date: Mon, 16 Aug 2021 10:12:59 -0700
Subject: [PATCH 3/6] Firelocks and intercoms though

---
 _maps/map_files/Delta/delta.dmm | 173 +++++++++++++++++---------------
 1 file changed, 93 insertions(+), 80 deletions(-)

diff --git a/_maps/map_files/Delta/delta.dmm b/_maps/map_files/Delta/delta.dmm
index 490afa0caa2..1ea304d51eb 100644
--- a/_maps/map_files/Delta/delta.dmm
+++ b/_maps/map_files/Delta/delta.dmm
@@ -66377,6 +66377,7 @@
 	opacity = 0
 	},
 /obj/effect/spawner/window/reinforced,
+/obj/machinery/door/firedoor,
 /turf/simulated/floor/plating,
 /area/medical/psych)
 "cLb" = (
@@ -66385,6 +66386,7 @@
 	name = "Psych Office";
 	req_access_txt = "64"
 	},
+/obj/machinery/door/firedoor,
 /turf/simulated/floor/wood,
 /area/medical/psych)
 "cLd" = (
@@ -68633,6 +68635,7 @@
 	name = "Privacy Shutters";
 	opacity = 0
 	},
+/obj/machinery/door/firedoor,
 /turf/simulated/floor/plating,
 /area/medical/psych)
 "cPQ" = (
@@ -97484,13 +97487,6 @@
 /obj/machinery/blackbox_recorder,
 /turf/simulated/floor/bluegrid,
 /area/tcommsat/chamber)
-"efF" = (
-/obj/structure/chair,
-/turf/simulated/floor/plasteel{
-	dir = 1;
-	icon_state = "whitebluecorner"
-	},
-/area/medical/psych)
 "eha" = (
 /obj/machinery/iv_drip,
 /obj/machinery/light/small{
@@ -97553,6 +97549,27 @@
 /obj/item/crowbar/red,
 /turf/simulated/floor/plating,
 /area/maintenance/starboard)
+"erV" = (
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/obj/structure/cable{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8";
+	tag = ""
+	},
+/turf/simulated/floor/plasteel{
+	dir = 4;
+	icon_state = "whitebluecorner"
+	},
+/area/medical/psych)
 "esa" = (
 /obj/structure/cable,
 /obj/machinery/power/apc{
@@ -97663,12 +97680,6 @@
 	},
 /turf/simulated/floor/grass,
 /area/hallway/secondary/exit)
-"eHx" = (
-/turf/simulated/floor/plasteel{
-	dir = 4;
-	icon_state = "whitebluecorner"
-	},
-/area/medical/psych)
 "eLI" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
@@ -98208,6 +98219,14 @@
 	icon_state = "vault"
 	},
 /area/security/securearmoury)
+"gyh" = (
+/obj/structure/chair{
+	dir = 1
+	},
+/turf/simulated/floor/plasteel{
+	icon_state = "white"
+	},
+/area/medical/psych)
 "gyp" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/warning_stripes/north,
@@ -98602,27 +98621,6 @@
 	icon_state = "showroomfloor"
 	},
 /area/medical/surgery1)
-"hYJ" = (
-/obj/structure/disposalpipe/segment{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
-/obj/structure/cable{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8";
-	tag = ""
-	},
-/turf/simulated/floor/plasteel{
-	dir = 4;
-	icon_state = "whitebluecorner"
-	},
-/area/medical/psych)
 "hZF" = (
 /turf/simulated/floor/plasteel{
 	dir = 1;
@@ -98691,6 +98689,12 @@
 /obj/structure/piano,
 /turf/simulated/floor/plating,
 /area/crew_quarters/theatre)
+"ioW" = (
+/turf/simulated/floor/plasteel{
+	dir = 4;
+	icon_state = "whitebluecorner"
+	},
+/area/medical/psych)
 "ipD" = (
 /obj/structure/closet/wardrobe/pjs,
 /turf/simulated/floor/plating,
@@ -98879,6 +98883,15 @@
 	icon_state = "redfull"
 	},
 /area/security/warden)
+"iYm" = (
+/obj/structure/chair{
+	dir = 1
+	},
+/turf/simulated/floor/plasteel{
+	dir = 1;
+	icon_state = "whitebluecorner"
+	},
+/area/medical/psych)
 "jav" = (
 /obj/machinery/door/airlock{
 	name = "Magistrate's Office";
@@ -99293,6 +99306,15 @@
 	icon_state = "solarpanel"
 	},
 /area/maintenance/auxsolarstarboard)
+"kZJ" = (
+/obj/machinery/light{
+	dir = 8
+	},
+/obj/structure/table/wood,
+/obj/item/flashlight/lamp/green,
+/obj/item/storage/briefcase,
+/turf/simulated/floor/wood,
+/area/medical/psych)
 "ljZ" = (
 /obj/machinery/door/poddoor{
 	density = 0;
@@ -100430,15 +100452,6 @@
 /obj/item/clothing/head/fedora,
 /turf/simulated/floor/plating,
 /area/security/detectives_office)
-"pBB" = (
-/obj/machinery/light{
-	dir = 8
-	},
-/obj/structure/table/wood,
-/obj/item/flashlight/lamp/green,
-/obj/item/storage/briefcase,
-/turf/simulated/floor/wood,
-/area/medical/psych)
 "pGr" = (
 /obj/structure/cable{
 	d1 = 1;
@@ -100646,6 +100659,13 @@
 	icon_state = "neutralcorner"
 	},
 /area/bridge/meeting_room)
+"qAN" = (
+/obj/structure/chair,
+/turf/simulated/floor/plasteel{
+	dir = 1;
+	icon_state = "whitebluecorner"
+	},
+/area/medical/psych)
 "qHs" = (
 /obj/machinery/atmospherics/pipe/simple/hidden{
 	dir = 10;
@@ -100679,6 +100699,11 @@
 	},
 /turf/simulated/floor/plating,
 /area/security/permabrig)
+"qQr" = (
+/obj/structure/table/wood,
+/obj/machinery/computer/med_data/laptop,
+/turf/simulated/floor/wood,
+/area/medical/psych)
 "qRT" = (
 /obj/structure/cable{
 	d1 = 4;
@@ -100711,6 +100736,16 @@
 	icon_state = "red"
 	},
 /area/security/warden)
+"qWF" = (
+/obj/item/radio/intercom{
+	dir = 1;
+	pixel_x = 28
+	},
+/turf/simulated/floor/plasteel{
+	dir = 4;
+	icon_state = "whitebluecorner"
+	},
+/area/medical/psych)
 "qXF" = (
 /obj/machinery/alarm{
 	pixel_y = 24
@@ -100870,11 +100905,6 @@
 	icon_state = "darkblue"
 	},
 /area/medical/surgery2)
-"ruN" = (
-/obj/structure/table/wood,
-/obj/machinery/computer/med_data/laptop,
-/turf/simulated/floor/wood,
-/area/medical/psych)
 "rvx" = (
 /obj/machinery/atmospherics/unary/vent_pump/on{
 	dir = 8
@@ -101138,12 +101168,6 @@
 /obj/item/seeds/glowshroom,
 /turf/simulated/floor/plasteel,
 /area/security/permabrig)
-"syb" = (
-/turf/simulated/floor/plasteel{
-	dir = 1;
-	icon_state = "whitebluecorner"
-	},
-/area/medical/psych)
 "sAW" = (
 /obj/structure/closet/secure_closet/medical2,
 /turf/simulated/floor/plasteel{
@@ -101941,6 +101965,12 @@
 	icon_state = "red"
 	},
 /area/security/brig)
+"vyO" = (
+/turf/simulated/floor/plasteel{
+	dir = 1;
+	icon_state = "whitebluecorner"
+	},
+/area/medical/psych)
 "vzz" = (
 /obj/machinery/light{
 	dir = 4
@@ -102116,14 +102146,6 @@
 	icon_state = "neutralfull"
 	},
 /area/hallway/secondary/exit)
-"wkY" = (
-/obj/structure/chair{
-	dir = 1
-	},
-/turf/simulated/floor/plasteel{
-	icon_state = "white"
-	},
-/area/medical/psych)
 "wmQ" = (
 /obj/item/radio/intercom{
 	pixel_y = 28
@@ -102454,15 +102476,6 @@
 	},
 /turf/simulated/floor/plating,
 /area/maintenance/starboard)
-"xUE" = (
-/obj/structure/chair{
-	dir = 1
-	},
-/turf/simulated/floor/plasteel{
-	dir = 1;
-	icon_state = "whitebluecorner"
-	},
-/area/medical/psych)
 "xUI" = (
 /obj/structure/table/reinforced,
 /obj/item/storage/box/teargas,
@@ -147443,10 +147456,10 @@ cxn
 cxn
 cxn
 cxn
-efF
+qAN
 cGF
-syb
-xUE
+vyO
+iYm
 cYP
 cYP
 cYP
@@ -147705,7 +147718,7 @@ hos
 cmt
 bMD
 cLa
-pBB
+kZJ
 cOa
 cPQ
 cRp
@@ -147960,9 +147973,9 @@ cxn
 bDD
 buF
 cmt
-wkY
+gyh
 cLa
-ruN
+qQr
 cOb
 cPQ
 cRq
@@ -148215,9 +148228,9 @@ cAc
 cyD
 cxn
 bEH
-hYJ
-eHx
-eHx
+erV
+qWF
+ioW
 cLb
 cPQ
 cOc

From f3340bd1e08e4f2544c15023d791c79a1593a818 Mon Sep 17 00:00:00 2001
From: LightFire53 <LightFire53@users.noreply.github.com>
Date: Mon, 16 Aug 2021 10:18:04 -0700
Subject: [PATCH 4/6] Double locker trouble

---
 _maps/map_files/Delta/delta.dmm | 178 ++++++++++++++++----------------
 1 file changed, 89 insertions(+), 89 deletions(-)

diff --git a/_maps/map_files/Delta/delta.dmm b/_maps/map_files/Delta/delta.dmm
index 1ea304d51eb..97dde283865 100644
--- a/_maps/map_files/Delta/delta.dmm
+++ b/_maps/map_files/Delta/delta.dmm
@@ -69402,11 +69402,11 @@
 /turf/simulated/floor/wood,
 /area/medical/psych)
 "cRr" = (
-/obj/structure/closet/secure_closet/psychiatrist,
 /obj/item/radio/intercom{
 	dir = 1;
 	pixel_x = 28
 	},
+/obj/item/twohanded/required/kirbyplants,
 /turf/simulated/floor/wood,
 /area/medical/psych)
 "cRt" = (
@@ -97549,27 +97549,6 @@
 /obj/item/crowbar/red,
 /turf/simulated/floor/plating,
 /area/maintenance/starboard)
-"erV" = (
-/obj/structure/disposalpipe/segment{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
-/obj/structure/cable{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8";
-	tag = ""
-	},
-/turf/simulated/floor/plasteel{
-	dir = 4;
-	icon_state = "whitebluecorner"
-	},
-/area/medical/psych)
 "esa" = (
 /obj/structure/cable,
 /obj/machinery/power/apc{
@@ -97724,6 +97703,15 @@
 	icon_state = "barber"
 	},
 /area/security/permabrig)
+"ePN" = (
+/obj/structure/chair{
+	dir = 1
+	},
+/turf/simulated/floor/plasteel{
+	dir = 1;
+	icon_state = "whitebluecorner"
+	},
+/area/medical/psych)
 "ePS" = (
 /obj/structure/lattice,
 /turf/simulated/wall/r_wall,
@@ -98094,6 +98082,12 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /turf/simulated/floor/plating,
 /area/security/brig)
+"fVT" = (
+/turf/simulated/floor/plasteel{
+	dir = 4;
+	icon_state = "whitebluecorner"
+	},
+/area/medical/psych)
 "fVZ" = (
 /obj/structure/disposalpipe/segment{
 	dir = 1;
@@ -98219,14 +98213,6 @@
 	icon_state = "vault"
 	},
 /area/security/securearmoury)
-"gyh" = (
-/obj/structure/chair{
-	dir = 1
-	},
-/turf/simulated/floor/plasteel{
-	icon_state = "white"
-	},
-/area/medical/psych)
 "gyp" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/warning_stripes/north,
@@ -98682,6 +98668,12 @@
 	icon_state = "showroomfloor"
 	},
 /area/medical/surgery2)
+"igs" = (
+/turf/simulated/floor/plasteel{
+	dir = 1;
+	icon_state = "whitebluecorner"
+	},
+/area/medical/psych)
 "iiM" = (
 /obj/structure/window/reinforced{
 	dir = 8
@@ -98689,12 +98681,6 @@
 /obj/structure/piano,
 /turf/simulated/floor/plating,
 /area/crew_quarters/theatre)
-"ioW" = (
-/turf/simulated/floor/plasteel{
-	dir = 4;
-	icon_state = "whitebluecorner"
-	},
-/area/medical/psych)
 "ipD" = (
 /obj/structure/closet/wardrobe/pjs,
 /turf/simulated/floor/plating,
@@ -98883,15 +98869,6 @@
 	icon_state = "redfull"
 	},
 /area/security/warden)
-"iYm" = (
-/obj/structure/chair{
-	dir = 1
-	},
-/turf/simulated/floor/plasteel{
-	dir = 1;
-	icon_state = "whitebluecorner"
-	},
-/area/medical/psych)
 "jav" = (
 /obj/machinery/door/airlock{
 	name = "Magistrate's Office";
@@ -99306,14 +99283,15 @@
 	icon_state = "solarpanel"
 	},
 /area/maintenance/auxsolarstarboard)
-"kZJ" = (
-/obj/machinery/light{
-	dir = 8
+"lbe" = (
+/obj/item/radio/intercom{
+	dir = 1;
+	pixel_x = 28
+	},
+/turf/simulated/floor/plasteel{
+	dir = 4;
+	icon_state = "whitebluecorner"
 	},
-/obj/structure/table/wood,
-/obj/item/flashlight/lamp/green,
-/obj/item/storage/briefcase,
-/turf/simulated/floor/wood,
 /area/medical/psych)
 "ljZ" = (
 /obj/machinery/door/poddoor{
@@ -100334,6 +100312,14 @@
 	},
 /turf/simulated/floor/plasteel,
 /area/maintenance/starboard)
+"oVa" = (
+/obj/structure/chair{
+	dir = 1
+	},
+/turf/simulated/floor/plasteel{
+	icon_state = "white"
+	},
+/area/medical/psych)
 "oVe" = (
 /obj/effect/spawner/window/reinforced,
 /obj/structure/cable,
@@ -100342,6 +100328,27 @@
 	},
 /turf/simulated/floor/plating,
 /area/security/permabrig)
+"oVB" = (
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/obj/structure/cable{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8";
+	tag = ""
+	},
+/turf/simulated/floor/plasteel{
+	dir = 4;
+	icon_state = "whitebluecorner"
+	},
+/area/medical/psych)
 "oXm" = (
 /obj/effect/decal/warning_stripes/yellow,
 /obj/structure/cable{
@@ -100605,6 +100612,11 @@
 	icon_state = "whiteblue"
 	},
 /area/medical/surgery1)
+"qhu" = (
+/obj/structure/table/wood,
+/obj/machinery/computer/med_data/laptop,
+/turf/simulated/floor/wood,
+/area/medical/psych)
 "qli" = (
 /obj/effect/spawner/window/reinforced,
 /obj/structure/cable{
@@ -100659,13 +100671,6 @@
 	icon_state = "neutralcorner"
 	},
 /area/bridge/meeting_room)
-"qAN" = (
-/obj/structure/chair,
-/turf/simulated/floor/plasteel{
-	dir = 1;
-	icon_state = "whitebluecorner"
-	},
-/area/medical/psych)
 "qHs" = (
 /obj/machinery/atmospherics/pipe/simple/hidden{
 	dir = 10;
@@ -100699,11 +100704,6 @@
 	},
 /turf/simulated/floor/plating,
 /area/security/permabrig)
-"qQr" = (
-/obj/structure/table/wood,
-/obj/machinery/computer/med_data/laptop,
-/turf/simulated/floor/wood,
-/area/medical/psych)
 "qRT" = (
 /obj/structure/cable{
 	d1 = 4;
@@ -100736,16 +100736,6 @@
 	icon_state = "red"
 	},
 /area/security/warden)
-"qWF" = (
-/obj/item/radio/intercom{
-	dir = 1;
-	pixel_x = 28
-	},
-/turf/simulated/floor/plasteel{
-	dir = 4;
-	icon_state = "whitebluecorner"
-	},
-/area/medical/psych)
 "qXF" = (
 /obj/machinery/alarm{
 	pixel_y = 24
@@ -101965,12 +101955,6 @@
 	icon_state = "red"
 	},
 /area/security/brig)
-"vyO" = (
-/turf/simulated/floor/plasteel{
-	dir = 1;
-	icon_state = "whitebluecorner"
-	},
-/area/medical/psych)
 "vzz" = (
 /obj/machinery/light{
 	dir = 4
@@ -102176,6 +102160,13 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /turf/simulated/floor/plasteel,
 /area/hallway/secondary/entry)
+"wyJ" = (
+/obj/structure/chair,
+/turf/simulated/floor/plasteel{
+	dir = 1;
+	icon_state = "whitebluecorner"
+	},
+/area/medical/psych)
 "wAE" = (
 /obj/structure/dresser,
 /turf/simulated/floor/plating,
@@ -102377,6 +102368,15 @@
 	icon_state = "showroomfloor"
 	},
 /area/medical/surgery1)
+"xDb" = (
+/obj/machinery/light{
+	dir = 8
+	},
+/obj/structure/table/wood,
+/obj/item/flashlight/lamp/green,
+/obj/item/storage/briefcase,
+/turf/simulated/floor/wood,
+/area/medical/psych)
 "xDn" = (
 /obj/structure/sign/electricshock{
 	pixel_y = 32
@@ -147456,10 +147456,10 @@ cxn
 cxn
 cxn
 cxn
-qAN
+wyJ
 cGF
-vyO
-iYm
+igs
+ePN
 cYP
 cYP
 cYP
@@ -147718,7 +147718,7 @@ hos
 cmt
 bMD
 cLa
-kZJ
+xDb
 cOa
 cPQ
 cRp
@@ -147973,9 +147973,9 @@ cxn
 bDD
 buF
 cmt
-gyh
+oVa
 cLa
-qQr
+qhu
 cOb
 cPQ
 cRq
@@ -148228,9 +148228,9 @@ cAc
 cyD
 cxn
 bEH
-erV
-qWF
-ioW
+oVB
+lbe
+fVT
 cLb
 cPQ
 cOc

From a9924ae9ce1aac9f29a482ccf3ab84e6a741cd95 Mon Sep 17 00:00:00 2001
From: LightFire53 <LightFire53@users.noreply.github.com>
Date: Mon, 16 Aug 2021 10:28:12 -0700
Subject: [PATCH 5/6] Input from FalseIncarnate

---
 _maps/map_files/Delta/delta.dmm | 187 ++++++++++++++++----------------
 1 file changed, 96 insertions(+), 91 deletions(-)

diff --git a/_maps/map_files/Delta/delta.dmm b/_maps/map_files/Delta/delta.dmm
index 97dde283865..5c2d9b5e828 100644
--- a/_maps/map_files/Delta/delta.dmm
+++ b/_maps/map_files/Delta/delta.dmm
@@ -69399,6 +69399,7 @@
 	dir = 10;
 	initialize_directions = 10
 	},
+/obj/machinery/hologram/holopad,
 /turf/simulated/floor/wood,
 /area/medical/psych)
 "cRr" = (
@@ -70045,7 +70046,6 @@
 /turf/simulated/floor/wood,
 /area/medical/psych)
 "cSJ" = (
-/obj/machinery/hologram/holopad,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 5
 	},
@@ -70818,6 +70818,8 @@
 	network = list("Medical","SS13","Security")
 	},
 /obj/structure/cable,
+/obj/structure/table/wood,
+/obj/item/flashlight/lamp/green,
 /turf/simulated/floor/carpet,
 /area/medical/psych)
 "cUi" = (
@@ -97487,6 +97489,13 @@
 /obj/machinery/blackbox_recorder,
 /turf/simulated/floor/bluegrid,
 /area/tcommsat/chamber)
+"ebp" = (
+/obj/structure/chair,
+/turf/simulated/floor/plasteel{
+	dir = 1;
+	icon_state = "whitebluecorner"
+	},
+/area/medical/psych)
 "eha" = (
 /obj/machinery/iv_drip,
 /obj/machinery/light/small{
@@ -97703,15 +97712,6 @@
 	icon_state = "barber"
 	},
 /area/security/permabrig)
-"ePN" = (
-/obj/structure/chair{
-	dir = 1
-	},
-/turf/simulated/floor/plasteel{
-	dir = 1;
-	icon_state = "whitebluecorner"
-	},
-/area/medical/psych)
 "ePS" = (
 /obj/structure/lattice,
 /turf/simulated/wall/r_wall,
@@ -97811,6 +97811,12 @@
 /obj/machinery/door/firedoor,
 /turf/simulated/floor/plasteel,
 /area/security/warden)
+"faU" = (
+/turf/simulated/floor/plasteel{
+	dir = 4;
+	icon_state = "whitebluecorner"
+	},
+/area/medical/psych)
 "fcg" = (
 /obj/effect/spawner/window/reinforced,
 /obj/structure/cable,
@@ -98082,12 +98088,6 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /turf/simulated/floor/plating,
 /area/security/brig)
-"fVT" = (
-/turf/simulated/floor/plasteel{
-	dir = 4;
-	icon_state = "whitebluecorner"
-	},
-/area/medical/psych)
 "fVZ" = (
 /obj/structure/disposalpipe/segment{
 	dir = 1;
@@ -98668,12 +98668,6 @@
 	icon_state = "showroomfloor"
 	},
 /area/medical/surgery2)
-"igs" = (
-/turf/simulated/floor/plasteel{
-	dir = 1;
-	icon_state = "whitebluecorner"
-	},
-/area/medical/psych)
 "iiM" = (
 /obj/structure/window/reinforced{
 	dir = 8
@@ -98920,6 +98914,14 @@
 	icon_state = "showroomfloor"
 	},
 /area/medical/surgery1)
+"jph" = (
+/obj/structure/chair{
+	dir = 1
+	},
+/turf/simulated/floor/plasteel{
+	icon_state = "white"
+	},
+/area/medical/psych)
 "jqB" = (
 /obj/machinery/firealarm{
 	dir = 4;
@@ -99283,16 +99285,6 @@
 	icon_state = "solarpanel"
 	},
 /area/maintenance/auxsolarstarboard)
-"lbe" = (
-/obj/item/radio/intercom{
-	dir = 1;
-	pixel_x = 28
-	},
-/turf/simulated/floor/plasteel{
-	dir = 4;
-	icon_state = "whitebluecorner"
-	},
-/area/medical/psych)
 "ljZ" = (
 /obj/machinery/door/poddoor{
 	density = 0;
@@ -99523,6 +99515,18 @@
 	icon_state = "dark"
 	},
 /area/turret_protected/aisat)
+"lXx" = (
+/obj/machinery/light{
+	dir = 8
+	},
+/obj/structure/table/wood,
+/obj/item/storage/briefcase,
+/obj/machinery/light_switch{
+	pixel_x = -26;
+	pixel_y = -4
+	},
+/turf/simulated/floor/wood,
+/area/medical/psych)
 "lZw" = (
 /obj/machinery/ai_status_display{
 	pixel_x = -32
@@ -99539,6 +99543,16 @@
 	icon_state = "redcorner"
 	},
 /area/security/permasolitary)
+"lZA" = (
+/obj/item/radio/intercom{
+	dir = 1;
+	pixel_x = 28
+	},
+/turf/simulated/floor/plasteel{
+	dir = 4;
+	icon_state = "whitebluecorner"
+	},
+/area/medical/psych)
 "meB" = (
 /obj/structure/cable{
 	d1 = 1;
@@ -100312,14 +100326,6 @@
 	},
 /turf/simulated/floor/plasteel,
 /area/maintenance/starboard)
-"oVa" = (
-/obj/structure/chair{
-	dir = 1
-	},
-/turf/simulated/floor/plasteel{
-	icon_state = "white"
-	},
-/area/medical/psych)
 "oVe" = (
 /obj/effect/spawner/window/reinforced,
 /obj/structure/cable,
@@ -100328,27 +100334,6 @@
 	},
 /turf/simulated/floor/plating,
 /area/security/permabrig)
-"oVB" = (
-/obj/structure/disposalpipe/segment{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
-/obj/structure/cable{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8";
-	tag = ""
-	},
-/turf/simulated/floor/plasteel{
-	dir = 4;
-	icon_state = "whitebluecorner"
-	},
-/area/medical/psych)
 "oXm" = (
 /obj/effect/decal/warning_stripes/yellow,
 /obj/structure/cable{
@@ -100612,11 +100597,6 @@
 	icon_state = "whiteblue"
 	},
 /area/medical/surgery1)
-"qhu" = (
-/obj/structure/table/wood,
-/obj/machinery/computer/med_data/laptop,
-/turf/simulated/floor/wood,
-/area/medical/psych)
 "qli" = (
 /obj/effect/spawner/window/reinforced,
 /obj/structure/cable{
@@ -100933,6 +100913,15 @@
 /obj/effect/spawner/window/reinforced,
 /turf/simulated/floor/plating,
 /area/security/brig)
+"rLZ" = (
+/obj/structure/chair{
+	dir = 1
+	},
+/turf/simulated/floor/plasteel{
+	dir = 1;
+	icon_state = "whitebluecorner"
+	},
+/area/medical/psych)
 "rNi" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
@@ -101555,6 +101544,12 @@
 	},
 /turf/simulated/floor/plating,
 /area/security/range)
+"udF" = (
+/turf/simulated/floor/plasteel{
+	dir = 1;
+	icon_state = "whitebluecorner"
+	},
+/area/medical/psych)
 "uil" = (
 /obj/machinery/atmospherics/unary/portables_connector{
 	dir = 8
@@ -101703,6 +101698,11 @@
 	icon_state = "dark"
 	},
 /area/security/interrogation)
+"uwf" = (
+/obj/structure/table/wood,
+/obj/machinery/computer/med_data/laptop,
+/turf/simulated/floor/wood,
+/area/medical/psych)
 "uAP" = (
 /obj/structure/chair/office/dark{
 	dir = 4
@@ -101873,6 +101873,27 @@
 	},
 /turf/simulated/floor/plasteel,
 /area/security/permabrig)
+"vjk" = (
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/obj/structure/cable{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8";
+	tag = ""
+	},
+/turf/simulated/floor/plasteel{
+	dir = 4;
+	icon_state = "whitebluecorner"
+	},
+/area/medical/psych)
 "vmw" = (
 /obj/structure/fans/tiny,
 /obj/structure/cable{
@@ -102160,13 +102181,6 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /turf/simulated/floor/plasteel,
 /area/hallway/secondary/entry)
-"wyJ" = (
-/obj/structure/chair,
-/turf/simulated/floor/plasteel{
-	dir = 1;
-	icon_state = "whitebluecorner"
-	},
-/area/medical/psych)
 "wAE" = (
 /obj/structure/dresser,
 /turf/simulated/floor/plating,
@@ -102368,15 +102382,6 @@
 	icon_state = "showroomfloor"
 	},
 /area/medical/surgery1)
-"xDb" = (
-/obj/machinery/light{
-	dir = 8
-	},
-/obj/structure/table/wood,
-/obj/item/flashlight/lamp/green,
-/obj/item/storage/briefcase,
-/turf/simulated/floor/wood,
-/area/medical/psych)
 "xDn" = (
 /obj/structure/sign/electricshock{
 	pixel_y = 32
@@ -147456,10 +147461,10 @@ cxn
 cxn
 cxn
 cxn
-wyJ
+ebp
 cGF
-igs
-ePN
+udF
+rLZ
 cYP
 cYP
 cYP
@@ -147718,7 +147723,7 @@ hos
 cmt
 bMD
 cLa
-xDb
+lXx
 cOa
 cPQ
 cRp
@@ -147973,9 +147978,9 @@ cxn
 bDD
 buF
 cmt
-oVa
+jph
 cLa
-qhu
+uwf
 cOb
 cPQ
 cRq
@@ -148228,9 +148233,9 @@ cAc
 cyD
 cxn
 bEH
-oVB
-lbe
-fVT
+vjk
+lZA
+faU
 cLb
 cPQ
 cOc

From bfcfa7c4668d7236106d3c44a462015bb74bff47 Mon Sep 17 00:00:00 2001
From: LightFire53 <LightFire53@users.noreply.github.com>
Date: Mon, 6 Sep 2021 22:39:01 -0700
Subject: [PATCH 6/6] Psychiatric Conflicts

---
 _maps/map_files/Delta/delta.dmm | 360 +++++++++++++++++++++-----------
 1 file changed, 239 insertions(+), 121 deletions(-)

diff --git a/_maps/map_files/Delta/delta.dmm b/_maps/map_files/Delta/delta.dmm
index f8de220a96e..52154089d66 100644
--- a/_maps/map_files/Delta/delta.dmm
+++ b/_maps/map_files/Delta/delta.dmm
@@ -16541,9 +16541,10 @@
 	},
 /area/quartermaster/storage)
 "aQo" = (
-/obj/structure/table/wood,
-/obj/machinery/computer/med_data/laptop,
-/turf/simulated/floor/wood,
+/obj/structure/chair/comfy/lime{
+	dir = 4
+	},
+/turf/simulated/floor/carpet,
 /area/medical/psych)
 "aQp" = (
 /obj/machinery/door/firedoor,
@@ -29108,9 +29109,7 @@
 	},
 /area/security/prisonershuttle)
 "boN" = (
-/obj/machinery/computer/security{
-	network = list("SS13","Mining Outpost")
-	},
+/obj/machinery/computer/security,
 /obj/item/radio/intercom{
 	pixel_y = 28
 	},
@@ -30535,9 +30534,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
 	},
-/obj/machinery/computer/security{
-	network = list("SS13","Mining Outpost")
-	},
+/obj/machinery/computer/security,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
@@ -33696,9 +33693,7 @@
 	icon_state = "1-2";
 	tag = ""
 	},
-/obj/machinery/computer/security{
-	network = list("SS13","Mining Outpost")
-	},
+/obj/machinery/computer/security,
 /turf/simulated/floor/plasteel{
 	dir = 1;
 	icon_state = "darkred"
@@ -37231,16 +37226,15 @@
 	},
 /area/hallway/primary/port)
 "bDD" = (
-/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance{
-	lootcount = 3;
-	name = "3maintenance loot spawner"
+/obj/structure/chair,
+/obj/machinery/camera{
+	c_tag = "Psych Foyer"
 	},
-/obj/machinery/light/small{
-	dir = 1
+/turf/simulated/floor/plasteel{
+	dir = 4;
+	icon_state = "whitebluecorner"
 	},
-/turf/simulated/floor/plating,
-/area/maintenance/starboard)
+/area/medical/psych)
 "bDE" = (
 /obj/item/twohanded/required/kirbyplants,
 /obj/machinery/status_display{
@@ -37806,13 +37800,12 @@
 	},
 /area/engine/gravitygenerator)
 "bEH" = (
-/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance{
-	lootcount = 3;
-	name = "3maintenance loot spawner"
+/obj/item/twohanded/required/kirbyplants,
+/turf/simulated/floor/plasteel{
+	dir = 4;
+	icon_state = "whitebluecorner"
 	},
-/turf/simulated/floor/plating,
-/area/maintenance/starboard)
+/area/medical/psych)
 "bEI" = (
 /turf/simulated/floor/plasteel{
 	dir = 8;
@@ -41844,11 +41837,15 @@
 	},
 /area/storage/tech)
 "bMD" = (
-/obj/structure/sign/poster/random{
-	pixel_x = -32
+/obj/structure/table,
+/obj/item/paper_bin{
+	pixel_y = 5
 	},
-/turf/simulated/floor/plating,
-/area/maintenance/starboard)
+/obj/item/pen/multi,
+/turf/simulated/floor/plasteel{
+	icon_state = "white"
+	},
+/area/medical/psych)
 "bME" = (
 /obj/structure/table/reinforced,
 /obj/machinery/light{
@@ -43207,9 +43204,7 @@
 	},
 /area/security/detectives_office)
 "bPr" = (
-/obj/machinery/computer/security{
-	network = list("SS13","Mining Outpost")
-	},
+/obj/machinery/computer/security,
 /turf/simulated/floor/plasteel{
 	dir = 1;
 	icon_state = "redcorner"
@@ -54508,9 +54503,10 @@
 /turf/simulated/floor/plasteel,
 /area/maintenance/starboard2)
 "cmt" = (
-/obj/structure/closet/wardrobe/grey,
-/turf/simulated/floor/plating,
-/area/maintenance/starboard)
+/turf/simulated/floor/plasteel{
+	icon_state = "white"
+	},
+/area/medical/psych)
 "cmv" = (
 /obj/structure/cable{
 	d1 = 1;
@@ -63444,9 +63440,15 @@
 	},
 /area/hallway/primary/central)
 "cFd" = (
-/obj/item/rack_parts,
-/turf/simulated/floor/plating,
-/area/maintenance/starboard)
+/obj/structure/chair,
+/obj/machinery/light{
+	dir = 1
+	},
+/turf/simulated/floor/plasteel{
+	dir = 1;
+	icon_state = "whitebluecorner"
+	},
+/area/medical/psych)
 "cFe" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 10
@@ -64522,13 +64524,18 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
 	},
-/obj/machinery/door/airlock/maintenance,
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/turf/simulated/floor/wood,
-/area/maintenance/starboard)
+/turf/simulated/floor/plasteel{
+	dir = 1;
+	icon_state = "whitebluecorner"
+	},
+/area/medical/psych)
 "cGI" = (
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
@@ -64542,11 +64549,8 @@
 	tag = ""
 	},
 /obj/machinery/door/airlock/maintenance,
-/obj/structure/disposalpipe/segment{
-	dir = 4
-	},
 /turf/simulated/floor/plating,
-/area/maintenance/starboard)
+/area/medical/psych)
 "cGJ" = (
 /obj/structure/disposalpipe/segment,
 /turf/simulated/floor/plasteel{
@@ -66200,20 +66204,28 @@
 "cKY" = (
 /turf/simulated/wall,
 /area/medical/medbay)
-"cKZ" = (
-/obj/structure/table,
-/obj/item/storage/toolbox/electrical,
-/turf/simulated/floor/plating,
-/area/maintenance/starboard)
 "cLa" = (
-/obj/structure/table,
-/obj/item/storage/toolbox/mechanical,
+/obj/machinery/door/poddoor/shutters{
+	density = 0;
+	dir = 2;
+	icon_state = "open";
+	id_tag = "psychoffice";
+	name = "Privacy Shutters";
+	opacity = 0
+	},
+/obj/effect/spawner/window/reinforced,
+/obj/machinery/door/firedoor,
 /turf/simulated/floor/plating,
-/area/maintenance/starboard)
+/area/medical/psych)
 "cLb" = (
-/obj/structure/table_frame,
-/turf/simulated/floor/plating,
-/area/maintenance/starboard)
+/obj/machinery/door/airlock/medical{
+	id_tag = "psychfoyer";
+	name = "Psych Office";
+	req_access_txt = "64"
+	},
+/obj/machinery/door/firedoor,
+/turf/simulated/floor/wood,
+/area/medical/psych)
 "cLd" = (
 /obj/structure/cable{
 	d2 = 4;
@@ -67650,25 +67662,35 @@
 /turf/space,
 /area/space/nearstation)
 "cOa" = (
-/obj/structure/chair/comfy/lime{
-	dir = 4
-	},
 /obj/machinery/door_control{
 	id = "psychoffice";
 	name = "Privacy Shutters Control";
-	pixel_x = -25
+	pixel_x = -25;
+	pixel_y = 5
 	},
-/turf/simulated/floor/carpet,
+/obj/structure/chair/office/light{
+	dir = 4
+	},
+/obj/effect/landmark/start{
+	name = "Psychiatrist"
+	},
+/obj/machinery/door_control{
+	id = "psychfoyer";
+	layer = 3.3;
+	name = "Psych Foyer Doors";
+	normaldoorcontrol = 1;
+	pixel_x = -25;
+	pixel_y = -6
+	},
+/turf/simulated/floor/wood,
 /area/medical/psych)
 "cOb" = (
-/obj/machinery/light{
-	dir = 1
+/obj/structure/table/wood,
+/obj/item/paper_bin{
+	pixel_y = 5
 	},
-/obj/item/radio/intercom{
-	dir = 1;
-	pixel_y = 25
-	},
-/turf/simulated/floor/carpet,
+/obj/item/pen/multi,
+/turf/simulated/floor/wood,
 /area/medical/psych)
 "cOc" = (
 /obj/machinery/firealarm{
@@ -67679,8 +67701,7 @@
 	pixel_x = 28;
 	pixel_y = 30
 	},
-/obj/structure/bed/psych,
-/turf/simulated/floor/carpet,
+/turf/simulated/floor/wood,
 /area/medical/psych)
 "cOd" = (
 /obj/structure/table,
@@ -68442,17 +68463,17 @@
 	name = "Privacy Shutters";
 	opacity = 0
 	},
+/obj/machinery/door/firedoor,
 /turf/simulated/floor/plating,
 /area/medical/psych)
 "cPQ" = (
-/turf/simulated/floor/carpet,
+/turf/simulated/floor/wood,
 /area/medical/psych)
 "cPR" = (
-/obj/item/twohanded/required/kirbyplants,
 /obj/structure/sign/poster/random{
 	pixel_x = 32
 	},
-/turf/simulated/floor/carpet,
+/turf/simulated/floor/wood,
 /area/medical/psych)
 "cPS" = (
 /obj/effect/spawner/window/reinforced,
@@ -69197,13 +69218,15 @@
 	dir = 10;
 	initialize_directions = 10
 	},
+/obj/machinery/hologram/holopad,
 /turf/simulated/floor/wood,
 /area/medical/psych)
 "cRr" = (
-/obj/structure/closet/secure_closet/psychiatrist,
-/obj/item/clipboard{
-	pixel_x = -5
+/obj/item/radio/intercom{
+	dir = 1;
+	pixel_x = 28
 	},
+/obj/item/twohanded/required/kirbyplants,
 /turf/simulated/floor/wood,
 /area/medical/psych)
 "cRt" = (
@@ -69841,7 +69864,6 @@
 /turf/simulated/floor/wood,
 /area/medical/psych)
 "cSJ" = (
-/obj/machinery/hologram/holopad,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 5
 	},
@@ -69854,6 +69876,10 @@
 /obj/machinery/ai_status_display{
 	pixel_x = 32
 	},
+/obj/structure/closet/secure_closet/psychiatrist,
+/obj/item/clipboard{
+	pixel_x = -5
+	},
 /turf/simulated/floor/wood,
 /area/medical/psych)
 "cSL" = (
@@ -70607,14 +70633,9 @@
 	network = list("Medical","SS13","Security")
 	},
 /obj/structure/cable,
-/turf/simulated/floor/wood,
-/area/medical/psych)
-"cUh" = (
-/obj/structure/chair/office/light,
-/obj/effect/landmark/start{
-	name = "Psychiatrist"
-	},
-/turf/simulated/floor/wood,
+/obj/structure/table/wood,
+/obj/item/flashlight/lamp/green,
+/turf/simulated/floor/carpet,
 /area/medical/psych)
 "cUi" = (
 /obj/machinery/light{
@@ -70624,7 +70645,7 @@
 	dir = 8;
 	pixel_x = 24
 	},
-/turf/simulated/floor/wood,
+/turf/simulated/floor/carpet,
 /area/medical/psych)
 "cUj" = (
 /obj/machinery/light{
@@ -71461,18 +71482,11 @@
 	},
 /area/medical/medbay)
 "cVQ" = (
-/obj/structure/table/wood,
-/obj/item/paper_bin{
-	pixel_y = 5
-	},
-/obj/item/pen/multi,
-/turf/simulated/floor/wood,
+/turf/simulated/floor/carpet,
 /area/medical/psych)
 "cVR" = (
-/obj/structure/table/wood,
-/obj/item/flashlight/lamp/green,
-/obj/item/storage/briefcase,
-/turf/simulated/floor/wood,
+/obj/structure/bed/psych,
+/turf/simulated/floor/carpet,
 /area/medical/psych)
 "cVS" = (
 /obj/structure/cable{
@@ -97526,6 +97540,14 @@
 /obj/item/seeds/chili,
 /turf/simulated/floor/plasteel,
 /area/security/permabrig)
+"ffm" = (
+/obj/structure/chair{
+	dir = 1
+	},
+/turf/simulated/floor/plasteel{
+	icon_state = "white"
+	},
+/area/medical/psych)
 "fhF" = (
 /turf/space,
 /area/shuttle/gamma/station)
@@ -98153,8 +98175,10 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/turf/simulated/floor/plating,
-/area/maintenance/starboard)
+/turf/simulated/floor/plasteel{
+	icon_state = "white"
+	},
+/area/medical/psych)
 "hzb" = (
 /obj/machinery/light{
 	dir = 4
@@ -98429,6 +98453,18 @@
 	icon_state = "whiteblue"
 	},
 /area/medical/surgery2)
+"iIY" = (
+/obj/machinery/light{
+	dir = 8
+	},
+/obj/structure/table/wood,
+/obj/item/storage/briefcase,
+/obj/machinery/light_switch{
+	pixel_x = -26;
+	pixel_y = -4
+	},
+/turf/simulated/floor/wood,
+/area/medical/psych)
 "iKj" = (
 /obj/machinery/light_switch{
 	pixel_x = -23;
@@ -98505,6 +98541,12 @@
 /obj/effect/decal/warning_stripes/south,
 /turf/simulated/floor/plasteel,
 /area/security/securearmoury)
+"iWE" = (
+/turf/simulated/floor/plasteel{
+	dir = 1;
+	icon_state = "whitebluecorner"
+	},
+/area/medical/psych)
 "iXX" = (
 /obj/structure/cable{
 	d1 = 1;
@@ -98595,6 +98637,26 @@
 	icon_state = "redcorner"
 	},
 /area/security/permasolitary)
+"jsi" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/obj/structure/cable{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8";
+	tag = ""
+	},
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
+/turf/simulated/floor/plasteel{
+	icon_state = "white"
+	},
+/area/medical/psych)
 "jsV" = (
 /obj/structure/cable{
 	d1 = 4;
@@ -98673,6 +98735,27 @@
 	},
 /turf/simulated/floor/plasteel,
 /area/security/seceqstorage)
+"jKp" = (
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/obj/structure/cable{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8";
+	tag = ""
+	},
+/turf/simulated/floor/plasteel{
+	dir = 4;
+	icon_state = "whitebluecorner"
+	},
+/area/medical/psych)
 "jLB" = (
 /obj/effect/spawner/window/reinforced,
 /obj/structure/disposalpipe/segment{
@@ -98784,6 +98867,12 @@
 	icon_state = "vault"
 	},
 /area/security/securearmoury)
+"klh" = (
+/turf/simulated/floor/plasteel{
+	dir = 4;
+	icon_state = "whitebluecorner"
+	},
+/area/medical/psych)
 "klk" = (
 /obj/machinery/firealarm{
 	dir = 1;
@@ -99625,9 +99714,7 @@
 	icon_state = "4-8";
 	tag = ""
 	},
-/obj/machinery/computer/security{
-	network = list("SS13","Mining Outpost")
-	},
+/obj/machinery/computer/security,
 /turf/simulated/floor/plasteel{
 	icon_state = "redfull"
 	},
@@ -100065,6 +100152,15 @@
 /obj/item/clothing/head/fedora,
 /turf/simulated/floor/plating,
 /area/security/detectives_office)
+"pDD" = (
+/obj/structure/chair{
+	dir = 1
+	},
+/turf/simulated/floor/plasteel{
+	dir = 1;
+	icon_state = "whitebluecorner"
+	},
+/area/medical/psych)
 "pGr" = (
 /obj/structure/cable{
 	d1 = 1;
@@ -100528,6 +100624,13 @@
 /obj/effect/spawner/window/reinforced,
 /turf/simulated/floor/plating,
 /area/security/brig)
+"rHU" = (
+/obj/structure/chair,
+/turf/simulated/floor/plasteel{
+	dir = 1;
+	icon_state = "whitebluecorner"
+	},
+/area/medical/psych)
 "rNi" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
@@ -100651,6 +100754,11 @@
 	},
 /turf/simulated/floor/plasteel,
 /area/security/permabrig)
+"sak" = (
+/obj/structure/table/wood,
+/obj/machinery/computer/med_data/laptop,
+/turf/simulated/floor/wood,
+/area/medical/psych)
 "scA" = (
 /obj/machinery/firealarm{
 	dir = 8;
@@ -101063,6 +101171,16 @@
 	icon_state = "neutralfull"
 	},
 /area/security/brig)
+"tNq" = (
+/obj/item/radio/intercom{
+	dir = 1;
+	pixel_x = 28
+	},
+/turf/simulated/floor/plasteel{
+	dir = 4;
+	icon_state = "whitebluecorner"
+	},
+/area/medical/psych)
 "tNO" = (
 /obj/structure/cable{
 	d1 = 2;
@@ -147081,11 +147199,11 @@ cxn
 cxn
 cxn
 cxn
-bng
+rHU
 cGF
-bng
-bng
-bng
+iWE
+pDD
+cYP
 cYP
 cYP
 cPO
@@ -147342,8 +147460,8 @@ cFd
 hos
 cmt
 bMD
-cKZ
-cYP
+cLa
+iIY
 cOa
 cPQ
 cRp
@@ -147596,16 +147714,16 @@ cBF
 cAc
 cxn
 bDD
-buF
-boG
-boG
+jsi
+cmt
+ffm
 cLa
-cYP
+sak
 cOb
 cPQ
 cRq
 cSJ
-cUh
+cVQ
 cVQ
 cYP
 cYR
@@ -147853,11 +147971,11 @@ cAc
 cyD
 cxn
 bEH
-buF
-boG
-boG
+jKp
+tNq
+klh
 cLb
-cYP
+cPQ
 cOc
 cPR
 cRr
@@ -148109,11 +148227,11 @@ cAe
 cxn
 cxn
 cxn
-bng
+cYP
 cGI
-cJp
-dfK
-bng
+cYP
+cYP
+cYP
 cYP
 cYP
 cYP