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