diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm
index bd22bd34b55..e160de19f61 100644
--- a/code/modules/power/apc.dm
+++ b/code/modules/power/apc.dm
@@ -71,6 +71,9 @@
 /obj/machinery/power/apc/critical
 	is_critical = TRUE
 
+/obj/machinery/power/apc/low
+	cell_type = /obj/item/cell
+
 /obj/machinery/power/apc/high
 	cell_type = /obj/item/cell/high
 
diff --git a/html/changelogs/amunak-security-areas.yml b/html/changelogs/amunak-security-areas.yml
new file mode 100755
index 00000000000..281da5d8755
--- /dev/null
+++ b/html/changelogs/amunak-security-areas.yml
@@ -0,0 +1,10 @@
+author: Amunak
+delete-after: True
+changes:
+  - rscadd: "Added low level APCs (with just a regular battery), to be used in offices and other smaller, less critical areas. This allows long-term power loss to be of some consequence. Mapped into the security areas."
+  - maptweak: "Split upper security (investigations & training) into multiple per-room areas as it should be. Added light switches and APCs for those areas."
+  - maptweak: "The room with stairs to Training is now a part of the Training area, not Brig."
+  - maptweak: "Evidence Storage is now its own area as well."
+  - maptweak: "From security/brig there were two rooms split: the 'control room' and 'processing'. Also added APCs."
+  - tweak: "Added back the option to toggle lights to most Security areas (basically everything but places where prisoners are held)."
+  - tweak: "Added/modified area icons for most of the areas mentioned above for easier mapping."
diff --git a/icons/turf/areas.dmi b/icons/turf/areas.dmi
index 56e460849dd..ed0b351177d 100755
Binary files a/icons/turf/areas.dmi and b/icons/turf/areas.dmi differ
diff --git a/maps/_common/areas/station/security.dm b/maps/_common/areas/station/security.dm
index 0b2765a98f6..fe3c461634f 100644
--- a/maps/_common/areas/station/security.dm
+++ b/maps/_common/areas/station/security.dm
@@ -11,11 +11,6 @@
 	icon_state = "security"
 
 // For mapppers
-/area/security/hallway
-	name = "Security - Hallway"
-	lightswitch = TRUE
-	icon_state = "security"
-
 /area/security/lobby
 	name = "Security - Lobby"
 	icon_state = "security"
@@ -36,6 +31,17 @@
 		temp_timer.releasetime = 1
 	..()
 
+/area/security/brig/control_room
+	name = "Security - Brig Control Room"
+	icon_state = "brig_control"
+	lightswitch = FALSE
+	no_light_control = 0
+
+/area/security/brig/processing
+	name = "Security - Brig Processing"
+	icon_state = "brig_proc"
+	no_light_control = 0
+
 /area/security/prison
 	name = "Security - Prison Wing"
 	lightswitch = TRUE
@@ -54,43 +60,83 @@
 	name = "Security - Warden's Office"
 	icon_state = "Warden"
 	sound_env = SMALL_SOFTFLOOR
+	no_light_control = 0
 
 /area/security/armory
 	name = "Security - Armory"
 	icon_state = "Warden"
 	ambience = AMBIENCE_HIGHSEC
+	no_light_control = 0
+
+/area/security/investigations
+	name = "Security - Investigations Division"
+	icon_state = "investigations"
+	allow_nightmode = 1
+	no_light_control = 0
+
+/area/security/investigations_storage
+	name = "Security - Evidence Storage"
+	icon_state = "evidence"
+	no_light_control = 0
 
 /area/security/forensics_office
 	name = "Security - Forensic Office"
-	icon_state = "detective"
+	icon_state = "investigations_office"
 	sound_env = MEDIUM_SOFTFLOOR
+	no_light_control = 0
+
+/area/security/forensics_laboratory
+	name = "Security - Forensic Laboratory"
+	icon_state = "investigations_office"
+	sound_env = SMALL_ENCLOSED
+	no_light_control = 0
+
+/area/security/forensics_morgue
+	name = "Security - Autopsy Lab"
+	icon_state = "morgue"
+	ambience = AMBIENCE_GHOSTLY
+	no_light_control = 0
 
 /area/security/detectives_office
 	name = "Security - Detective's Office"
 	icon_state = "detective"
 	sound_env = SMALL_SOFTFLOOR
-
-/area/security/investigations
-	name = "Security - Investigations Division"
-	icon_state = "detective"
+	no_light_control = 0
 
 /area/security/training
 	name = "Security - Training Wing"
-	icon_state = "firingrange"
+	icon_state = "training"
+	allow_nightmode = 1
+	no_light_control = 0
+
+/area/security/training_theoretical
+	name = "Security - Theoretical Training"
+	icon_state = "training_office"
+	sound_env = MEDIUM_SOFTFLOOR
+	no_light_control = 0
+
+/area/security/training_crimescene
+	name = "Security - Crime Scene Training"
+	icon_state = "training_office"
+	sound_env = SMALL_ENCLOSED
+	no_light_control = 0
 
 /area/security/range
 	name = "Security - Firing Range"
 	icon_state = "firingrange"
 	flags = FIRING_RANGE
+	no_light_control = 0
 
 /area/security/tactical
 	name = "Security - Tactical Equipment"
 	icon_state = "Tactical"
 	ambience = AMBIENCE_HIGHSEC
+	no_light_control = 0
 
 /area/security/security_office
 	name = "Security - Security Office"
 	icon_state = "security"
+	no_light_control = 0
 
 /*
 	New()
@@ -115,10 +161,12 @@
 	ambience = AMBIENCE_HIGHSEC
 	holomap_color = null
 	flags = HIDE_FROM_HOLOMAP
+	no_light_control = 0
 
 /area/security/checkpoint
 	name = "Security Checkpoint"
 	icon_state = "checkpoint1"
+	no_light_control = 0
 
 /area/security/checkpoint2
 	name = "Security - Arrivals Checkpoint"
@@ -148,9 +196,11 @@
 /area/security/vacantoffice
 	name = "Vacant Office"
 	icon_state = "security"
+	no_light_control = 0
 
 /area/security/vacantoffice2
 	name = "Security - Meeting Room"
+	no_light_control = 0
 
 /area/security/penal_colony
 	name = "\improper Security - Penal Mining Colony"
diff --git a/maps/aurora/aurora-4_mainlevel.dmm b/maps/aurora/aurora-4_mainlevel.dmm
index 8c65ce7141b..55c0cf23002 100644
--- a/maps/aurora/aurora-4_mainlevel.dmm
+++ b/maps/aurora/aurora-4_mainlevel.dmm
@@ -1550,15 +1550,15 @@
 /area/maintenance/vault)
 "acW" = (
 /obj/structure/cable/green,
-/obj/machinery/power/apc{
-	name = "south bump";
-	pixel_y = -24
-	},
 /obj/structure/flora/pottedplant/random,
 /obj/machinery/light{
 	dir = 8;
 	icon_state = "tube1"
 	},
+/obj/machinery/power/apc/low{
+	name = "south bump";
+	pixel_y = -24
+	},
 /turf/simulated/floor/tiled/dark,
 /area/security/vacantoffice2)
 "acX" = (
@@ -2835,7 +2835,7 @@
 /area/security/main)
 "afe" = (
 /turf/simulated/wall/r_wall,
-/area/security/investigations)
+/area/security/investigations_storage)
 "aff" = (
 /obj/machinery/door/airlock/security{
 	name = "Evidence Storage";
@@ -2846,7 +2846,7 @@
 	name = "cooled floor";
 	temperature = 278
 	},
-/area/security/investigations)
+/area/security/investigations_storage)
 "afg" = (
 /obj/machinery/atmospherics/pipe/simple/hidden{
 	dir = 9
@@ -3110,13 +3110,13 @@
 	name = "cooled floor";
 	temperature = 278
 	},
-/area/security/investigations)
+/area/security/investigations_storage)
 "afD" = (
 /turf/simulated/floor/tiled{
 	name = "cooled floor";
 	temperature = 278
 	},
-/area/security/investigations)
+/area/security/investigations_storage)
 "afE" = (
 /obj/structure/table/standard,
 /obj/machinery/firealarm/north,
@@ -3129,7 +3129,7 @@
 	name = "cooled floor";
 	temperature = 278
 	},
-/area/security/investigations)
+/area/security/investigations_storage)
 "afF" = (
 /obj/machinery/r_n_d/server/advanced/core,
 /turf/simulated/floor/bluegrid{
@@ -3298,7 +3298,7 @@
 	name = "cooled floor";
 	temperature = 278
 	},
-/area/security/investigations)
+/area/security/investigations_storage)
 "afX" = (
 /obj/structure/closet{
 	name = "Evidence Closet"
@@ -3311,7 +3311,7 @@
 	name = "cooled floor";
 	temperature = 278
 	},
-/area/security/investigations)
+/area/security/investigations_storage)
 "afY" = (
 /obj/structure/closet{
 	name = "Evidence Closet"
@@ -3325,7 +3325,7 @@
 	name = "cooled floor";
 	temperature = 278
 	},
-/area/security/investigations)
+/area/security/investigations_storage)
 "afZ" = (
 /obj/structure/disposalpipe/segment,
 /obj/structure/cable{
@@ -3529,14 +3529,14 @@
 	name = "cooled floor";
 	temperature = 278
 	},
-/area/security/investigations)
+/area/security/investigations_storage)
 "agv" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /turf/simulated/floor/tiled{
 	name = "cooled floor";
 	temperature = 278
 	},
-/area/security/investigations)
+/area/security/investigations_storage)
 "agw" = (
 /obj/machinery/camera/network/security{
 	c_tag = "Security - Evidence Storage Starboard";
@@ -3546,7 +3546,7 @@
 	name = "cooled floor";
 	temperature = 278
 	},
-/area/security/investigations)
+/area/security/investigations_storage)
 "agx" = (
 /obj/effect/floor_decal/corner_wide/paleblue/full,
 /obj/structure/bed/chair{
@@ -3861,7 +3861,7 @@
 	name = "cooled floor";
 	temperature = 278
 	},
-/area/security/investigations)
+/area/security/investigations_storage)
 "ahb" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 10
@@ -3870,7 +3870,7 @@
 	name = "cooled floor";
 	temperature = 278
 	},
-/area/security/investigations)
+/area/security/investigations_storage)
 "ahc" = (
 /obj/effect/floor_decal/corner_wide/mauve{
 	dir = 8
@@ -4220,7 +4220,7 @@
 	d2 = 8;
 	icon_state = "0-8"
 	},
-/obj/machinery/power/apc{
+/obj/machinery/power/apc/low{
 	dir = 4;
 	name = "east bump";
 	pixel_x = 24
@@ -4267,7 +4267,7 @@
 	name = "cooled floor";
 	temperature = 278
 	},
-/area/security/investigations)
+/area/security/investigations_storage)
 "ahM" = (
 /obj/item/stool/padded{
 	desc = "Apply butt. This particular stool looks tattered and old. Perhaps there have been budget cuts?";
@@ -4277,7 +4277,7 @@
 	name = "cooled floor";
 	temperature = 278
 	},
-/area/security/investigations)
+/area/security/investigations_storage)
 "ahN" = (
 /obj/machinery/alarm/cold{
 	dir = 8;
@@ -4288,7 +4288,7 @@
 	name = "cooled floor";
 	temperature = 278
 	},
-/area/security/investigations)
+/area/security/investigations_storage)
 "ahO" = (
 /obj/machinery/door/firedoor,
 /turf/simulated/floor/plating,
@@ -4634,7 +4634,7 @@
 	name = "cooled floor";
 	temperature = 278
 	},
-/area/security/investigations)
+/area/security/investigations_storage)
 "aiE" = (
 /obj/structure/table/standard,
 /obj/item/folder/sec,
@@ -4642,7 +4642,7 @@
 	name = "cooled floor";
 	temperature = 278
 	},
-/area/security/investigations)
+/area/security/investigations_storage)
 "aiF" = (
 /obj/structure/plasticflaps/airtight,
 /obj/machinery/door/airlock/security{
@@ -4654,7 +4654,7 @@
 	name = "cooled floor";
 	temperature = 278
 	},
-/area/security/investigations)
+/area/security/investigations_storage)
 "aiG" = (
 /obj/effect/floor_decal/corner/blue{
 	dir = 9
@@ -4867,7 +4867,7 @@
 	dir = 6
 	},
 /turf/simulated/floor/tiled,
-/area/security/brig)
+/area/security/training)
 "ajf" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
@@ -5038,7 +5038,7 @@
 	name = "cooled floor";
 	temperature = 278
 	},
-/area/security/investigations)
+/area/security/investigations_storage)
 "aju" = (
 /obj/structure/window/reinforced{
 	dir = 1
@@ -5050,7 +5050,7 @@
 	name = "cooled floor";
 	temperature = 278
 	},
-/area/security/investigations)
+/area/security/investigations_storage)
 "ajv" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 10
@@ -5060,7 +5060,7 @@
 	name = "cooled floor";
 	temperature = 278
 	},
-/area/security/investigations)
+/area/security/investigations_storage)
 "ajw" = (
 /obj/effect/floor_decal/corner/blue{
 	dir = 9
@@ -5404,7 +5404,7 @@
 	name = "cooled floor";
 	temperature = 278
 	},
-/area/security/investigations)
+/area/security/investigations_storage)
 "akb" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -5412,11 +5412,14 @@
 	dir = 4;
 	icon_state = "tube1"
 	},
+/obj/machinery/light_switch{
+	pixel_x = 26
+	},
 /turf/simulated/floor/tiled{
 	name = "cooled floor";
 	temperature = 278
 	},
-/area/security/investigations)
+/area/security/investigations_storage)
 "akc" = (
 /obj/effect/floor_decal/corner/blue{
 	dir = 9
@@ -5425,11 +5428,6 @@
 	dir = 6
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/power/apc{
-	dir = 8;
-	name = "west bump";
-	pixel_x = -24
-	},
 /obj/structure/cable/green{
 	d1 = 2;
 	d2 = 4;
@@ -5443,6 +5441,11 @@
 	d2 = 2;
 	icon_state = "0-2"
 	},
+/obj/machinery/power/apc/low{
+	dir = 8;
+	name = "west bump";
+	pixel_x = -24
+	},
 /turf/simulated/floor/tiled,
 /area/security/investigations)
 "akd" = (
@@ -5934,7 +5937,7 @@
 	name = "cooled floor";
 	temperature = 278
 	},
-/area/security/investigations)
+/area/security/investigations_storage)
 "akX" = (
 /obj/structure/morgue{
 	dir = 1
@@ -5946,15 +5949,24 @@
 	name = "cooled floor";
 	temperature = 278
 	},
-/area/security/investigations)
+/area/security/investigations_storage)
 "akY" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/cable/green{
+	d2 = 2;
+	icon_state = "0-2"
+	},
+/obj/machinery/power/apc/low{
+	dir = 4;
+	name = "east bump";
+	pixel_x = 24
+	},
 /turf/simulated/floor/tiled{
 	name = "cooled floor";
 	temperature = 278
 	},
-/area/security/investigations)
+/area/security/investigations_storage)
 "akZ" = (
 /obj/effect/floor_decal/corner/blue{
 	dir = 9
@@ -6483,11 +6495,16 @@
 /obj/structure/plasticflaps/airtight,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/cable/green{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
 /turf/simulated/floor/tiled{
 	name = "cooled floor";
 	temperature = 278
 	},
-/area/security/investigations)
+/area/security/investigations_storage)
 "alX" = (
 /obj/machinery/door/firedoor,
 /obj/machinery/door/airlock/glass_security{
@@ -7038,22 +7055,27 @@
 "anb" = (
 /obj/structure/stairs/north,
 /turf/simulated/floor/tiled,
-/area/security/brig)
+/area/security/training)
 "anc" = (
 /obj/structure/stairs/north,
 /obj/structure/window/reinforced{
 	dir = 4
 	},
 /turf/simulated/floor/tiled,
-/area/security/brig)
+/area/security/training)
 "and" = (
 /obj/effect/floor_decal/corner/blue{
 	dir = 5
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/cable/green{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
 /turf/simulated/floor/tiled,
-/area/security/brig)
+/area/security/training)
 "ane" = (
 /obj/structure/noticeboard{
 	pixel_y = 32
@@ -7066,7 +7088,7 @@
 	icon_state = "tube1"
 	},
 /turf/simulated/floor/tiled,
-/area/security/brig)
+/area/security/training)
 "anf" = (
 /obj/effect/floor_decal/corner/blue{
 	dir = 5
@@ -7080,7 +7102,7 @@
 	},
 /obj/structure/disposalpipe/segment,
 /turf/simulated/floor/tiled,
-/area/security/brig)
+/area/security/training)
 "ang" = (
 /obj/effect/floor_decal/corner/blue{
 	dir = 5
@@ -7091,7 +7113,7 @@
 	},
 /obj/effect/floor_decal/industrial/outline/grey,
 /turf/simulated/floor/tiled,
-/area/security/brig)
+/area/security/training)
 "anh" = (
 /obj/effect/floor_decal/corner/blue{
 	dir = 5
@@ -7105,7 +7127,7 @@
 	pixel_x = 32
 	},
 /turf/simulated/floor/tiled,
-/area/security/brig)
+/area/security/training)
 "anm" = (
 /obj/effect/floor_decal/corner_wide/mauve/full,
 /turf/simulated/floor/tiled/white,
@@ -7368,12 +7390,13 @@
 	pixel_x = 4;
 	pixel_y = 2
 	},
-/obj/machinery/alarm{
-	dir = 1;
-	pixel_y = -28
+/obj/structure/cable/green,
+/obj/machinery/power/apc/low{
+	name = "south bump";
+	pixel_y = -24
 	},
 /turf/simulated/floor/tiled,
-/area/security/brig)
+/area/security/brig/processing)
 "anV" = (
 /obj/structure/table/rack,
 /obj/structure/window/reinforced{
@@ -7479,7 +7502,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/tiled,
-/area/security/brig)
+/area/security/training)
 "aog" = (
 /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
 	dir = 8
@@ -7500,8 +7523,13 @@
 	c_tag = "Security - Second Floor Access";
 	dir = 4
 	},
+/obj/structure/cable/green{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
 /turf/simulated/floor/tiled,
-/area/security/brig)
+/area/security/training)
 "aoh" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
@@ -7518,7 +7546,7 @@
 	icon_state = "4-8"
 	},
 /turf/simulated/floor/tiled,
-/area/security/brig)
+/area/security/training)
 "aoi" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 9
@@ -7536,7 +7564,7 @@
 	icon_state = "pipe-c"
 	},
 /turf/simulated/floor/tiled,
-/area/security/brig)
+/area/security/training)
 "aoj" = (
 /obj/effect/floor_decal/corner/blue{
 	dir = 10
@@ -7548,7 +7576,7 @@
 /obj/structure/table/standard,
 /obj/item/device/flashlight/lamp,
 /turf/simulated/floor/tiled/dark,
-/area/security/brig)
+/area/security/brig/processing)
 "aok" = (
 /obj/machinery/requests_console{
 	department = "Consular's Office";
@@ -8304,19 +8332,19 @@
 	},
 /obj/structure/disposalpipe/segment,
 /turf/simulated/floor/tiled,
-/area/security/brig)
+/area/security/training)
 "apv" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
 	},
 /turf/simulated/floor/tiled,
-/area/security/brig)
+/area/security/training)
 "apw" = (
 /obj/machinery/atmospherics/unary/vent_scrubber/on{
 	dir = 8
 	},
 /turf/simulated/floor/tiled,
-/area/security/brig)
+/area/security/training)
 "apx" = (
 /obj/structure/extinguisher_cabinet{
 	pixel_x = 30
@@ -8329,7 +8357,7 @@
 	icon_state = "tube1"
 	},
 /turf/simulated/floor/tiled,
-/area/security/brig)
+/area/security/training)
 "apy" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/cobweb2,
@@ -8861,10 +8889,6 @@
 	dir = 1;
 	network = list("Security","Armory")
 	},
-/obj/machinery/power/apc{
-	name = "south bump";
-	pixel_y = -24
-	},
 /obj/structure/cable/green{
 	d2 = 4;
 	icon_state = "0-4"
@@ -8873,6 +8897,10 @@
 	pixel_x = 11;
 	pixel_y = -26
 	},
+/obj/machinery/power/apc/low{
+	name = "south bump";
+	pixel_y = -24
+	},
 /turf/simulated/floor/tiled,
 /area/security/security_office)
 "aqA" = (
@@ -8938,13 +8966,13 @@
 	dir = 4
 	},
 /turf/simulated/floor/tiled,
-/area/security/brig)
+/area/security/training)
 "aqF" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
 /turf/simulated/floor/tiled,
-/area/security/brig)
+/area/security/training)
 "aqG" = (
 /obj/effect/floor_decal/corner/blue,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -8961,7 +8989,7 @@
 	icon_state = "pipe-j2"
 	},
 /turf/simulated/floor/tiled,
-/area/security/brig)
+/area/security/training)
 "aqH" = (
 /obj/effect/floor_decal/corner/blue{
 	dir = 10
@@ -8974,7 +9002,7 @@
 	},
 /obj/machinery/disposal,
 /turf/simulated/floor/tiled,
-/area/security/brig)
+/area/security/training)
 "aqI" = (
 /obj/effect/floor_decal/corner/blue{
 	dir = 10
@@ -8982,7 +9010,7 @@
 /obj/structure/table/standard,
 /obj/item/roller,
 /turf/simulated/floor/tiled,
-/area/security/brig)
+/area/security/training)
 "aqJ" = (
 /obj/effect/floor_decal/corner/blue{
 	dir = 10
@@ -8990,7 +9018,7 @@
 /obj/structure/table/standard,
 /obj/item/bodybag/cryobag,
 /turf/simulated/floor/tiled,
-/area/security/brig)
+/area/security/training)
 "aqK" = (
 /obj/effect/floor_decal/corner/blue{
 	dir = 10
@@ -9006,7 +9034,7 @@
 	},
 /obj/machinery/firealarm/east,
 /turf/simulated/floor/tiled,
-/area/security/brig)
+/area/security/training)
 "aqL" = (
 /obj/machinery/disposal,
 /obj/structure/disposalpipe/trunk{
@@ -9567,7 +9595,7 @@
 /obj/item/paper/sentencing,
 /obj/machinery/firealarm/west,
 /turf/simulated/floor/tiled,
-/area/security/brig)
+/area/security/brig/processing)
 "arJ" = (
 /obj/effect/floor_decal/corner/blue{
 	dir = 6
@@ -9582,7 +9610,7 @@
 	pixel_y = 5
 	},
 /turf/simulated/floor/tiled,
-/area/security/brig)
+/area/security/brig/processing)
 "arK" = (
 /obj/machinery/door/firedoor,
 /obj/structure/grille,
@@ -9596,7 +9624,7 @@
 	dir = 1
 	},
 /turf/simulated/floor/plating,
-/area/security/brig)
+/area/security/brig/processing)
 "arL" = (
 /obj/structure/table/standard,
 /obj/effect/floor_decal/corner/blue{
@@ -9609,7 +9637,7 @@
 	c_tag = "Security - Processing 2"
 	},
 /turf/simulated/floor/tiled/dark,
-/area/security/brig)
+/area/security/brig/processing)
 "arM" = (
 /obj/effect/floor_decal/corner/blue{
 	dir = 5
@@ -9620,7 +9648,7 @@
 /obj/structure/table/standard,
 /obj/item/device/flashlight/lamp,
 /turf/simulated/floor/tiled/dark,
-/area/security/brig)
+/area/security/brig/processing)
 "arN" = (
 /obj/machinery/door/firedoor,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -9691,7 +9719,7 @@
 	req_access = list(63)
 	},
 /turf/simulated/floor/tiled,
-/area/security/brig)
+/area/security/training)
 "arT" = (
 /obj/machinery/door/firedoor,
 /obj/structure/grille,
@@ -9706,7 +9734,7 @@
 	dir = 1
 	},
 /turf/simulated/floor/plating,
-/area/security/brig)
+/area/security/training)
 "arU" = (
 /obj/machinery/door/firedoor,
 /obj/effect/floor_decal/corner/blue{
@@ -9725,7 +9753,7 @@
 	req_access = list(63)
 	},
 /turf/simulated/floor/tiled,
-/area/security/brig)
+/area/security/training)
 "arV" = (
 /obj/machinery/door/firedoor,
 /obj/structure/grille,
@@ -9738,7 +9766,7 @@
 	},
 /obj/effect/floor_decal/spline/plain,
 /turf/simulated/floor/plating,
-/area/security/brig)
+/area/security/training)
 "arW" = (
 /obj/machinery/door/firedoor,
 /obj/structure/grille,
@@ -9747,7 +9775,7 @@
 	},
 /obj/structure/window/reinforced,
 /turf/simulated/floor/plating,
-/area/security/brig)
+/area/security/training)
 "arX" = (
 /obj/machinery/door/firedoor,
 /obj/structure/grille,
@@ -9759,7 +9787,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/plating,
-/area/security/brig)
+/area/security/training)
 "arY" = (
 /obj/structure/disposalpipe/segment,
 /obj/structure/cable{
@@ -10214,7 +10242,7 @@
 	pixel_x = -30
 	},
 /turf/simulated/floor/tiled,
-/area/security/brig)
+/area/security/brig/processing)
 "asT" = (
 /obj/machinery/door/firedoor,
 /obj/structure/grille,
@@ -10226,18 +10254,18 @@
 	},
 /obj/structure/window/reinforced,
 /turf/simulated/floor/plating,
-/area/security/brig)
+/area/security/brig/processing)
 "asU" = (
 /obj/machinery/atmospherics/unary/vent_scrubber/on,
 /turf/simulated/floor/tiled/dark,
-/area/security/brig)
+/area/security/brig/processing)
 "asV" = (
 /obj/effect/floor_decal/industrial/outline/yellow,
 /obj/structure/bed/chair{
 	dir = 8
 	},
 /turf/simulated/floor/tiled/dark,
-/area/security/brig)
+/area/security/brig/processing)
 "asW" = (
 /obj/machinery/door/firedoor,
 /obj/structure/grille,
@@ -10252,7 +10280,7 @@
 	dir = 1
 	},
 /turf/simulated/floor/plating,
-/area/security/brig)
+/area/security/brig/processing)
 "asX" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 6
@@ -11367,7 +11395,7 @@
 	pixel_y = 32
 	},
 /turf/simulated/floor/tiled,
-/area/security/brig)
+/area/security/brig/processing)
 "auC" = (
 /obj/effect/floor_decal/corner/blue{
 	dir = 5
@@ -11392,7 +11420,7 @@
 	icon_state = "2-4"
 	},
 /turf/simulated/floor/tiled,
-/area/security/brig)
+/area/security/brig/processing)
 "auE" = (
 /obj/machinery/door/firedoor,
 /obj/structure/grille,
@@ -11410,11 +11438,11 @@
 	icon_state = "0-8"
 	},
 /turf/simulated/floor/plating,
-/area/security/brig)
+/area/security/brig/processing)
 "auF" = (
 /obj/machinery/atmospherics/unary/vent_pump/on,
 /turf/simulated/floor/tiled,
-/area/security/brig)
+/area/security/brig/processing)
 "auG" = (
 /obj/effect/floor_decal/corner/blue{
 	dir = 6
@@ -11426,7 +11454,7 @@
 	dir = 6
 	},
 /turf/simulated/floor/tiled,
-/area/security/brig)
+/area/security/brig/processing)
 "auH" = (
 /obj/effect/floor_decal/corner/blue{
 	dir = 10
@@ -11442,7 +11470,7 @@
 	req_access = list(2)
 	},
 /turf/simulated/floor/tiled/dark,
-/area/security/brig)
+/area/security/brig/processing)
 "auI" = (
 /obj/effect/floor_decal/corner/blue{
 	dir = 10
@@ -11457,7 +11485,7 @@
 	pixel_y = -28
 	},
 /turf/simulated/floor/tiled/dark,
-/area/security/brig)
+/area/security/brig/processing)
 "auJ" = (
 /obj/effect/floor_decal/corner/blue{
 	dir = 10
@@ -11467,7 +11495,7 @@
 	},
 /obj/machinery/light,
 /turf/simulated/floor/tiled/dark,
-/area/security/brig)
+/area/security/brig/processing)
 "auK" = (
 /obj/effect/floor_decal/corner/blue{
 	dir = 10
@@ -11477,7 +11505,7 @@
 	req_access = list(2)
 	},
 /turf/simulated/floor/tiled/dark,
-/area/security/brig)
+/area/security/brig/processing)
 "auL" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -12245,7 +12273,7 @@
 	dir = 10
 	},
 /turf/simulated/floor/tiled,
-/area/security/brig)
+/area/security/brig/processing)
 "awh" = (
 /obj/effect/floor_decal/corner/blue{
 	dir = 10
@@ -12258,7 +12286,7 @@
 	dir = 10
 	},
 /turf/simulated/floor/tiled,
-/area/security/brig)
+/area/security/brig/processing)
 "awi" = (
 /obj/structure/window/reinforced,
 /obj/effect/floor_decal/corner/blue{
@@ -12275,7 +12303,7 @@
 	icon_state = "2-4"
 	},
 /turf/simulated/floor/tiled,
-/area/security/brig)
+/area/security/brig/processing)
 "awj" = (
 /obj/machinery/door/firedoor,
 /obj/structure/grille,
@@ -12291,11 +12319,11 @@
 	icon_state = "0-8"
 	},
 /turf/simulated/floor/plating,
-/area/security/brig)
+/area/security/brig/processing)
 "awk" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /turf/simulated/floor/tiled,
-/area/security/brig)
+/area/security/brig/processing)
 "awl" = (
 /obj/effect/floor_decal/corner/blue{
 	dir = 6
@@ -12314,7 +12342,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/tiled,
-/area/security/brig)
+/area/security/brig/processing)
 "awm" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -13398,7 +13426,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/tiled,
-/area/security/brig)
+/area/security/brig/processing)
 "axU" = (
 /obj/machinery/atmospherics/pipe/manifold/hidden/supply{
 	dir = 1
@@ -13412,7 +13440,7 @@
 	icon_state = "2-4"
 	},
 /turf/simulated/floor/tiled,
-/area/security/brig)
+/area/security/brig/processing)
 "axV" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
@@ -13430,8 +13458,13 @@
 	d2 = 8;
 	icon_state = "1-8"
 	},
+/obj/structure/cable/green{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
+	},
 /turf/simulated/floor/tiled,
-/area/security/brig)
+/area/security/brig/processing)
 "axW" = (
 /obj/machinery/door/firedoor,
 /obj/machinery/door/airlock/glass_security{
@@ -13444,15 +13477,25 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
+/obj/structure/cable/green{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
+	},
 /turf/simulated/floor/tiled,
-/area/security/brig)
+/area/security/brig/processing)
 "axX" = (
 /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
 	dir = 1
 	},
 /obj/machinery/atmospherics/pipe/manifold/hidden/supply,
+/obj/structure/cable/green{
+	d1 = 2;
+	d2 = 8;
+	icon_state = "2-8"
+	},
 /turf/simulated/floor/tiled,
-/area/security/brig)
+/area/security/brig/processing)
 "axY" = (
 /obj/effect/floor_decal/corner/blue{
 	dir = 6
@@ -13460,7 +13503,7 @@
 /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/manifold/hidden/supply,
 /turf/simulated/floor/tiled,
-/area/security/brig)
+/area/security/brig/processing)
 "axZ" = (
 /obj/effect/floor_decal/corner/blue{
 	dir = 5
@@ -13476,7 +13519,7 @@
 	req_access = list(2)
 	},
 /turf/simulated/floor/tiled/dark,
-/area/security/brig)
+/area/security/brig/processing)
 "aya" = (
 /obj/effect/floor_decal/corner/blue{
 	dir = 5
@@ -13494,7 +13537,7 @@
 	c_tag = "Security - Processing 1"
 	},
 /turf/simulated/floor/tiled/dark,
-/area/security/brig)
+/area/security/brig/processing)
 "ayb" = (
 /obj/effect/floor_decal/corner/blue{
 	dir = 5
@@ -13506,7 +13549,7 @@
 	dir = 1
 	},
 /turf/simulated/floor/tiled/dark,
-/area/security/brig)
+/area/security/brig/processing)
 "ayc" = (
 /obj/effect/floor_decal/corner/blue{
 	dir = 5
@@ -13516,7 +13559,7 @@
 	req_access = list(2)
 	},
 /turf/simulated/floor/tiled/dark,
-/area/security/brig)
+/area/security/brig/processing)
 "ayd" = (
 /obj/structure/window/reinforced{
 	dir = 8
@@ -14322,7 +14365,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/tiled,
-/area/security/brig)
+/area/security/brig/processing)
 "azx" = (
 /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
 	dir = 4
@@ -14334,7 +14377,7 @@
 	icon_state = "1-2"
 	},
 /turf/simulated/floor/tiled,
-/area/security/brig)
+/area/security/brig/processing)
 "azy" = (
 /obj/structure/bed/chair{
 	dir = 8
@@ -14357,26 +14400,31 @@
 	icon_state = "1-4"
 	},
 /turf/simulated/floor/tiled,
-/area/security/brig)
+/area/security/brig/processing)
 "azz" = (
 /obj/machinery/atmospherics/unary/vent_scrubber/on{
 	dir = 1
 	},
+/obj/structure/cable/green{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
 /turf/simulated/floor/tiled,
-/area/security/brig)
+/area/security/brig/processing)
 "azA" = (
 /obj/machinery/atmospherics/unary/vent_scrubber/on{
 	dir = 1
 	},
 /turf/simulated/floor/tiled/dark,
-/area/security/brig)
+/area/security/brig/processing)
 "azB" = (
 /obj/structure/bed/chair{
 	dir = 8
 	},
 /obj/effect/floor_decal/industrial/outline/yellow,
 /turf/simulated/floor/tiled/dark,
-/area/security/brig)
+/area/security/brig/processing)
 "azC" = (
 /obj/structure/cable/green{
 	d1 = 1;
@@ -15193,7 +15241,7 @@
 /obj/effect/floor_decal/industrial/outline/yellow,
 /obj/machinery/light,
 /turf/simulated/floor/tiled,
-/area/security/brig)
+/area/security/brig/processing)
 "aAX" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -15203,7 +15251,7 @@
 	icon_state = "1-2"
 	},
 /turf/simulated/floor/tiled,
-/area/security/brig)
+/area/security/brig/processing)
 "aAY" = (
 /obj/structure/bed/chair{
 	dir = 8
@@ -15218,7 +15266,7 @@
 	icon_state = "1-4"
 	},
 /turf/simulated/floor/tiled,
-/area/security/brig)
+/area/security/brig/processing)
 "aAZ" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
@@ -15242,8 +15290,12 @@
 	dir = 6
 	},
 /obj/item/modular_computer/console/preset/security,
+/obj/machinery/alarm{
+	dir = 1;
+	pixel_y = -28
+	},
 /turf/simulated/floor/tiled,
-/area/security/brig)
+/area/security/brig/processing)
 "aBb" = (
 /obj/structure/table/standard,
 /obj/effect/floor_decal/corner/blue{
@@ -15253,7 +15305,7 @@
 	pixel_y = -32
 	},
 /turf/simulated/floor/tiled/dark,
-/area/security/brig)
+/area/security/brig/processing)
 "aBc" = (
 /obj/effect/floor_decal/corner/blue/full{
 	dir = 4
@@ -15274,7 +15326,7 @@
 	},
 /obj/item/pen,
 /turf/simulated/floor/tiled,
-/area/security/brig)
+/area/security/brig/control_room)
 "aBd" = (
 /obj/structure/cable/green{
 	d1 = 1;
@@ -16083,7 +16135,7 @@
 	icon_state = "0-4"
 	},
 /turf/simulated/floor/plating,
-/area/security/brig)
+/area/security/brig/processing)
 "aCu" = (
 /obj/machinery/door/firedoor,
 /obj/machinery/door/airlock/glass_security{
@@ -16108,7 +16160,7 @@
 	icon_state = "2-4"
 	},
 /turf/simulated/floor/tiled,
-/area/security/brig)
+/area/security/brig/processing)
 "aCv" = (
 /obj/machinery/door/firedoor,
 /obj/structure/grille,
@@ -16127,7 +16179,7 @@
 	icon_state = "0-8"
 	},
 /turf/simulated/floor/plating,
-/area/security/brig)
+/area/security/brig/processing)
 "aCw" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -16156,7 +16208,7 @@
 	d2 = 2;
 	icon_state = "0-2"
 	},
-/obj/machinery/power/apc{
+/obj/machinery/power/apc/low{
 	dir = 8;
 	name = "west bump";
 	pixel_x = -24
@@ -19859,7 +19911,7 @@
 	icon_state = "0-2"
 	},
 /turf/simulated/floor/plating,
-/area/security/brig)
+/area/security/brig/control_room)
 "aIn" = (
 /obj/machinery/door/firedoor,
 /obj/machinery/door/window/brigdoor/northleft{
@@ -19868,7 +19920,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /turf/simulated/floor/tiled,
-/area/security/brig)
+/area/security/brig/control_room)
 "aIo" = (
 /obj/machinery/door/firedoor,
 /obj/machinery/door/window/brigdoor/northright{
@@ -19886,7 +19938,7 @@
 	},
 /obj/structure/disposalpipe/segment,
 /turf/simulated/floor/tiled,
-/area/security/brig)
+/area/security/brig/control_room)
 "aIp" = (
 /obj/machinery/door/firedoor,
 /obj/structure/grille,
@@ -19906,7 +19958,7 @@
 	icon_state = "0-8"
 	},
 /turf/simulated/floor/plating,
-/area/security/brig)
+/area/security/brig/control_room)
 "aIq" = (
 /obj/machinery/door/firedoor,
 /obj/structure/grille,
@@ -19923,7 +19975,7 @@
 	icon_state = "0-8"
 	},
 /turf/simulated/floor/plating,
-/area/security/brig)
+/area/security/brig/control_room)
 "aIr" = (
 /obj/machinery/door/firedoor,
 /obj/structure/grille,
@@ -19939,11 +19991,11 @@
 	icon_state = "0-8"
 	},
 /turf/simulated/floor/plating,
-/area/security/brig)
+/area/security/brig/control_room)
 "aIs" = (
 /obj/structure/sign/nosmoking_2,
 /turf/simulated/wall,
-/area/security/brig)
+/area/security/brig/control_room)
 "aIt" = (
 /obj/machinery/recharger/wallcharger{
 	pixel_x = -32;
@@ -20645,7 +20697,7 @@
 	opacity = 0
 	},
 /turf/simulated/floor/plating,
-/area/security/brig)
+/area/security/brig/control_room)
 "aJF" = (
 /obj/structure/cable/green{
 	d1 = 1;
@@ -20662,7 +20714,7 @@
 	},
 /obj/item/modular_computer/console/preset/security,
 /turf/simulated/floor/tiled,
-/area/security/brig)
+/area/security/brig/control_room)
 "aJG" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 5
@@ -20671,7 +20723,7 @@
 	dir = 8
 	},
 /turf/simulated/floor/tiled,
-/area/security/brig)
+/area/security/brig/control_room)
 "aJH" = (
 /obj/structure/cable/green{
 	d1 = 1;
@@ -20686,7 +20738,7 @@
 	},
 /obj/structure/disposalpipe/segment,
 /turf/simulated/floor/tiled,
-/area/security/brig)
+/area/security/brig/control_room)
 "aJI" = (
 /obj/machinery/atmospherics/pipe/manifold/hidden/supply{
 	dir = 1
@@ -20704,7 +20756,7 @@
 /obj/item/stack/packageWrap,
 /obj/item/hand_labeler,
 /turf/simulated/floor/tiled,
-/area/security/brig)
+/area/security/brig/control_room)
 "aJJ" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
@@ -20713,7 +20765,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/tiled,
-/area/security/brig)
+/area/security/brig/control_room)
 "aJK" = (
 /obj/machinery/door/airlock/glass_security{
 	name = "Warden's Office";
@@ -20727,7 +20779,7 @@
 	},
 /obj/machinery/door/firedoor,
 /turf/simulated/floor/tiled,
-/area/security/brig)
+/area/security/brig/control_room)
 "aJL" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
@@ -20751,6 +20803,10 @@
 /obj/item/device/radio/intercom{
 	pixel_y = -28
 	},
+/obj/machinery/light_switch{
+	pixel_x = 16;
+	pixel_y = -23
+	},
 /turf/simulated/floor/tiled,
 /area/security/warden)
 "aJN" = (
@@ -21642,7 +21698,7 @@
 	opacity = 0
 	},
 /turf/simulated/floor/tiled,
-/area/security/brig)
+/area/security/brig/control_room)
 "aLA" = (
 /obj/structure/bed/chair/office/dark{
 	dir = 8
@@ -21668,7 +21724,7 @@
 	dir = 9
 	},
 /turf/simulated/floor/tiled,
-/area/security/brig)
+/area/security/brig/control_room)
 "aLB" = (
 /obj/structure/cable/green{
 	d1 = 4;
@@ -21679,7 +21735,7 @@
 	dir = 1
 	},
 /turf/simulated/floor/tiled,
-/area/security/brig)
+/area/security/brig/control_room)
 "aLC" = (
 /obj/structure/cable/green{
 	d1 = 1;
@@ -21691,14 +21747,14 @@
 	icon_state = "pipe-c"
 	},
 /turf/simulated/floor/tiled,
-/area/security/brig)
+/area/security/brig/control_room)
 "aLD" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
 /turf/simulated/floor/tiled,
-/area/security/brig)
+/area/security/brig/control_room)
 "aLE" = (
 /obj/effect/floor_decal/corner/blue{
 	dir = 6
@@ -21711,7 +21767,7 @@
 	dir = 8
 	},
 /turf/simulated/floor/tiled,
-/area/security/brig)
+/area/security/brig/control_room)
 "aLF" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -22816,7 +22872,7 @@
 	opacity = 0
 	},
 /turf/simulated/floor/tiled,
-/area/security/brig)
+/area/security/brig/control_room)
 "aNo" = (
 /obj/structure/bed/chair/office/dark{
 	dir = 8
@@ -22836,11 +22892,11 @@
 	dir = 9
 	},
 /turf/simulated/floor/tiled,
-/area/security/brig)
+/area/security/brig/control_room)
 "aNp" = (
 /obj/structure/bed/chair/office/dark,
 /turf/simulated/floor/tiled,
-/area/security/brig)
+/area/security/brig/control_room)
 "aNq" = (
 /obj/effect/floor_decal/corner/blue{
 	dir = 6
@@ -22850,7 +22906,7 @@
 	pixel_x = 32
 	},
 /turf/simulated/floor/tiled,
-/area/security/brig)
+/area/security/brig/control_room)
 "aNr" = (
 /obj/machinery/light/small{
 	dir = 1
@@ -23744,34 +23800,34 @@
 	},
 /obj/structure/sign/nosmoking_2,
 /turf/simulated/floor/plating,
-/area/security/brig)
+/area/security/brig/control_room)
 "aPb" = (
 /obj/structure/cable/green{
 	d1 = 1;
 	d2 = 8;
 	icon_state = "1-8"
 	},
-/obj/machinery/requests_console{
-	department = "Security";
-	departmentType = 5;
-	pixel_y = -32
-	},
 /obj/effect/floor_decal/corner/blue/full,
 /obj/item/modular_computer/console/preset/security,
+/obj/machinery/power/apc/low{
+	name = "south bump";
+	pixel_y = -24
+	},
+/obj/structure/cable/green,
 /turf/simulated/floor/tiled,
-/area/security/brig)
+/area/security/brig/control_room)
 "aPc" = (
 /obj/machinery/firealarm/south,
 /obj/machinery/computer/station_alert/security,
 /turf/simulated/floor/tiled,
-/area/security/brig)
+/area/security/brig/control_room)
 "aPd" = (
 /obj/machinery/papershredder,
 /obj/machinery/light_switch{
 	pixel_y = -23
 	},
 /turf/simulated/floor/tiled,
-/area/security/brig)
+/area/security/brig/control_room)
 "aPe" = (
 /obj/machinery/recharger/wallcharger{
 	pixel_y = -26
@@ -23781,7 +23837,7 @@
 	},
 /obj/machinery/photocopier,
 /turf/simulated/floor/tiled,
-/area/security/brig)
+/area/security/brig/control_room)
 "aPf" = (
 /obj/machinery/recharger/wallcharger{
 	pixel_y = -26
@@ -23793,7 +23849,7 @@
 /obj/item/folder/sec,
 /obj/item/paper_scanner,
 /turf/simulated/floor/tiled,
-/area/security/brig)
+/area/security/brig/control_room)
 "aPg" = (
 /obj/machinery/alarm{
 	dir = 1;
@@ -59423,6 +59479,12 @@
 	},
 /turf/simulated/floor/wood,
 /area/lawoffice)
+"cRg" = (
+/obj/effect/floor_decal/corner/blue{
+	dir = 9
+	},
+/turf/simulated/floor/tiled,
+/area/security/training)
 "cTo" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -61984,6 +62046,12 @@
 /obj/effect/floor_decal/corner/lime/diagonal,
 /turf/simulated/floor/tiled/white,
 /area/medical/medbay2)
+"ixU" = (
+/obj/effect/floor_decal/corner/blue{
+	dir = 5
+	},
+/turf/simulated/floor/tiled,
+/area/security/brig/processing)
 "izh" = (
 /obj/structure/bed/chair/wood{
 	dir = 1
@@ -63853,6 +63921,12 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/tiled/old,
 /area/maintenance/engineering)
+"mUZ" = (
+/obj/effect/floor_decal/corner/blue{
+	dir = 6
+	},
+/turf/simulated/floor/tiled,
+/area/security/brig/processing)
 "mVr" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -63953,6 +64027,10 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/crew_quarters/kitchen)
+"niw" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/turf/simulated/floor/tiled,
+/area/security/brig/control_room)
 "njB" = (
 /obj/random/junk,
 /obj/structure/disposalpipe/segment{
@@ -64073,6 +64151,12 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/assembly/robotics_cyborgification)
+"ntc" = (
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
+/turf/simulated/floor/tiled,
+/area/security/brig/control_room)
 "nug" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/floor_decal/corner/white{
@@ -64183,6 +64267,9 @@
 /obj/structure/bed/chair/office/light,
 /turf/simulated/floor/carpet/blue,
 /area/maintenance/medbay)
+"nLT" = (
+/turf/simulated/wall/r_wall,
+/area/security/brig/control_room)
 "nMW" = (
 /obj/effect/floor_decal/corner_wide/paleblue{
 	dir = 4
@@ -64394,6 +64481,9 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/tiled/old_white,
 /area/maintenance/medbay)
+"omB" = (
+/turf/simulated/wall,
+/area/security/brig/processing)
 "ony" = (
 /obj/structure/cable/green{
 	icon_state = "4-9"
@@ -65089,6 +65179,9 @@
 	},
 /turf/simulated/floor/tiled,
 /area/medical/medbay2)
+"pyu" = (
+/turf/simulated/wall,
+/area/security/brig/control_room)
 "pzj" = (
 /obj/effect/floor_decal/corner/grey/diagonal,
 /obj/structure/table/stone/marble,
@@ -68127,6 +68220,9 @@
 /obj/random/junk,
 /turf/simulated/floor/plating,
 /area/maintenance/library)
+"vmm" = (
+/turf/simulated/floor/tiled,
+/area/security/training)
 "vmC" = (
 /obj/structure/window/reinforced{
 	dir = 1
@@ -68299,6 +68395,9 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/crew_quarters/kitchen)
+"vFG" = (
+/turf/simulated/wall,
+/area/security/training)
 "vGu" = (
 /obj/structure/cable/green{
 	d1 = 1;
@@ -68953,6 +69052,9 @@
 	},
 /turf/simulated/wall,
 /area/medical/surgerywing)
+"wLt" = (
+/turf/simulated/wall/r_wall,
+/area/security/brig/processing)
 "wOo" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/item/ammo_casing/c45/rubber,
@@ -69266,6 +69368,9 @@
 	temperature = 278
 	},
 /area/crew_quarters/kitchen/freezer)
+"xnn" = (
+/turf/simulated/floor/tiled,
+/area/security/brig/control_room)
 "xnZ" = (
 /obj/machinery/door/firedoor,
 /obj/structure/grille,
@@ -69578,7 +69683,7 @@
 "xSa" = (
 /obj/effect/floor_decal/spline/plain,
 /turf/simulated/wall,
-/area/security/brig)
+/area/security/training)
 "xSs" = (
 /obj/structure/table/wood,
 /obj/item/paper_bin,
@@ -97594,7 +97699,7 @@ ajR
 ajR
 ajR
 ajR
-ahC
+wLt
 auB
 awg
 axT
@@ -97851,8 +97956,8 @@ aaa
 aaa
 aaa
 aaa
-aaV
-auC
+omB
+ixU
 awh
 axU
 azx
@@ -98108,7 +98213,7 @@ aaa
 aaa
 aaa
 aaa
-aaV
+omB
 auD
 awi
 axV
@@ -98363,15 +98468,15 @@ aab
 aaa
 aaa
 aaa
-aaV
-aaV
-aaV
+omB
+omB
+omB
 auE
 awj
 axW
 auE
 awj
-aaV
+omB
 aEn
 aGk
 aIi
@@ -98620,7 +98725,7 @@ aaa
 aaa
 aaa
 aaa
-aaV
+omB
 arI
 asS
 auF
@@ -98628,15 +98733,15 @@ awk
 axX
 azz
 anU
-aaV
+omB
 aEo
 aGl
-ahC
+nLT
 aJE
 aLz
 aNn
 aPa
-ahC
+nLT
 aSq
 aTS
 aIi
@@ -98877,15 +98982,15 @@ aaa
 aaa
 aaa
 aaa
-aaV
+omB
 arJ
-abF
+mUZ
 auG
 awl
 axY
-abF
+mUZ
 aBa
-aaV
+omB
 aEp
 aGk
 aIm
@@ -98893,7 +98998,7 @@ aJF
 aLA
 aNo
 aPb
-ahC
+nLT
 aSr
 aTT
 aIi
@@ -99134,23 +99239,23 @@ aad
 amR
 aad
 aad
-aaV
+omB
 arK
 asT
 auH
-aaV
+omB
 axZ
 arK
 asT
-aaV
+omB
 aEq
 aGm
 aIn
 aJG
 aLB
-abE
+xnn
 aPc
-ahC
+nLT
 aSs
 aTU
 aIi
@@ -99391,23 +99496,23 @@ aah
 amS
 anY
 abM
-aaV
+omB
 arL
 asU
 auI
-aaV
+omB
 aya
 azA
 aBb
-aaV
+omB
 aEr
 aGn
 aIo
 aJH
 aLC
-abE
+xnn
 aPd
-ahC
+nLT
 aSt
 aTT
 aIi
@@ -99648,23 +99753,23 @@ aah
 aae
 aah
 abI
-aaV
+omB
 arM
 asV
 auJ
-aaV
+omB
 ayb
 azB
 aoj
-aaV
+omB
 aEm
 aGk
 aIp
 aJI
 aLD
-awk
+niw
 aPe
-ahC
+nLT
 aSu
 aTV
 aIi
@@ -99909,19 +100014,19 @@ aaV
 aaV
 asW
 auK
-aaV
+omB
 ayc
 arK
 asT
-aaV
+omB
 aEm
 aGk
 aIq
 aJJ
-aeD
+ntc
 aNp
 aPf
-ahC
+nLT
 aSv
 aTW
 aQL
@@ -100178,7 +100283,7 @@ aJJ
 aLE
 aNq
 aBc
-ahC
+nLT
 aSw
 aTX
 aQL
@@ -100432,10 +100537,10 @@ aEt
 aGp
 aIs
 aJK
-aaV
-aaV
-aaV
-ahC
+pyu
+pyu
+pyu
+nLT
 aSx
 aTY
 aQL
@@ -104015,8 +104120,8 @@ aka
 akW
 afe
 anb
-abE
-abT
+vmm
+cRg
 aqE
 arS
 ati
@@ -104273,7 +104378,7 @@ akX
 afe
 anc
 aof
-abE
+vmm
 aqF
 arT
 atm
@@ -105300,7 +105405,7 @@ akd
 ala
 alY
 ang
-abE
+vmm
 apw
 aqJ
 arW
@@ -105813,11 +105918,11 @@ aiJ
 aiJ
 aiJ
 aiJ
-aaV
-aaV
-aaV
-aaV
-aaV
+vFG
+vFG
+vFG
+vFG
+vFG
 atq
 abF
 awA
diff --git a/maps/aurora/aurora-5_interstitial.dmm b/maps/aurora/aurora-5_interstitial.dmm
index c16343d4594..afe70580e12 100644
--- a/maps/aurora/aurora-5_interstitial.dmm
+++ b/maps/aurora/aurora-5_interstitial.dmm
@@ -1251,15 +1251,15 @@
 /obj/effect/floor_decal/corner/blue{
 	dir = 5
 	},
-/obj/machinery/power/apc{
-	dir = 1;
-	name = "north bump";
-	pixel_y = 24
-	},
 /obj/structure/cable/green{
 	d2 = 2;
 	icon_state = "0-2"
 	},
+/obj/machinery/power/apc/low{
+	dir = 1;
+	name = "north bump";
+	pixel_y = 24
+	},
 /turf/simulated/floor/tiled,
 /area/security/range)
 "df" = (
@@ -1580,7 +1580,7 @@
 	dir = 1
 	},
 /turf/simulated/floor/plating,
-/area/security/training)
+/area/security/training_crimescene)
 "dC" = (
 /obj/item/device/radio/intercom{
 	pixel_y = 27
@@ -1588,31 +1588,34 @@
 /obj/machinery/disposal,
 /obj/structure/disposalpipe/trunk,
 /turf/simulated/floor/tiled,
-/area/security/training)
+/area/security/training_crimescene)
 "dD" = (
 /obj/effect/floor_decal/industrial/warning{
 	dir = 4
 	},
 /obj/machinery/atmospherics/unary/vent_scrubber/on,
-/obj/machinery/firealarm/north,
+/obj/machinery/light_switch{
+	pixel_y = 28
+	},
 /turf/simulated/floor/tiled,
-/area/security/training)
+/area/security/training_crimescene)
 "dE" = (
 /obj/machinery/light{
 	dir = 1
 	},
+/obj/machinery/firealarm/north,
 /turf/simulated/floor/tiled/white,
-/area/security/training)
+/area/security/training_crimescene)
 "dF" = (
 /obj/effect/decal/cleanable/blood/drip,
 /obj/structure/sign/nosmoking_2{
 	pixel_y = 32
 	},
 /turf/simulated/floor/tiled/white,
-/area/security/training)
+/area/security/training_crimescene)
 "dG" = (
 /turf/simulated/floor/tiled/white,
-/area/security/training)
+/area/security/training_crimescene)
 "dH" = (
 /obj/effect/floor_decal/corner/blue{
 	dir = 9
@@ -1669,7 +1672,7 @@
 	dir = 8
 	},
 /turf/simulated/floor/plating,
-/area/security/training)
+/area/security/training_crimescene)
 "dM" = (
 /turf/simulated/floor/tiled,
 /area/security/training)
@@ -1679,15 +1682,15 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /turf/simulated/floor/tiled,
-/area/security/training)
+/area/security/training_crimescene)
 "dO" = (
 /obj/effect/decal/cleanable/blood/drip,
 /turf/simulated/floor/tiled/white,
-/area/security/training)
+/area/security/training_crimescene)
 "dP" = (
 /obj/structure/closet/body_bag,
 /turf/simulated/floor/tiled/white,
-/area/security/training)
+/area/security/training_crimescene)
 "dQ" = (
 /obj/effect/floor_decal/industrial/loading/yellow,
 /turf/simulated/floor/tiled,
@@ -1720,6 +1723,11 @@
 	dir = 2;
 	icon_state = "pipe-j2"
 	},
+/obj/structure/cable/green{
+	d1 = 2;
+	d2 = 4;
+	icon_state = "2-4"
+	},
 /turf/simulated/floor/tiled,
 /area/security/training)
 "dU" = (
@@ -1737,8 +1745,13 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
+/obj/structure/cable/green{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
+	},
 /turf/simulated/floor/tiled,
-/area/security/training)
+/area/security/training_crimescene)
 "dV" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
@@ -1750,8 +1763,13 @@
 	dir = 8;
 	icon_state = "pipe-c"
 	},
+/obj/structure/cable/green{
+	d1 = 2;
+	d2 = 8;
+	icon_state = "2-8"
+	},
 /turf/simulated/floor/tiled,
-/area/security/training)
+/area/security/training_crimescene)
 "dW" = (
 /obj/effect/floor_decal/industrial/warning{
 	dir = 4
@@ -1760,16 +1778,16 @@
 	dir = 9
 	},
 /turf/simulated/floor/tiled,
-/area/security/training)
+/area/security/training_crimescene)
 "dX" = (
 /obj/effect/floor_decal/industrial/warning,
 /obj/effect/decal/cleanable/blood,
 /turf/simulated/floor/tiled/white,
-/area/security/training)
+/area/security/training_crimescene)
 "dY" = (
 /obj/effect/floor_decal/industrial/warning,
 /turf/simulated/floor/tiled/white,
-/area/security/training)
+/area/security/training_crimescene)
 "dZ" = (
 /obj/effect/floor_decal/industrial/warning,
 /obj/machinery/camera/network/security{
@@ -1777,7 +1795,7 @@
 	dir = 8
 	},
 /turf/simulated/floor/tiled/white,
-/area/security/training)
+/area/security/training_crimescene)
 "ea" = (
 /obj/machinery/door/window/westleft{
 	name = "Firing Range Access";
@@ -1831,32 +1849,42 @@
 	dir = 8
 	},
 /turf/simulated/floor/plating,
-/area/security/training)
+/area/security/training_crimescene)
 "ef" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 5
 	},
+/obj/structure/cable/green{
+	d1 = 1;
+	d2 = 4;
+	icon_state = "1-4"
+	},
 /turf/simulated/floor/tiled,
-/area/security/training)
+/area/security/training_crimescene)
 "eg" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
+/obj/structure/cable/green{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
+	},
 /turf/simulated/floor/tiled,
-/area/security/training)
+/area/security/training_crimescene)
 "eh" = (
 /obj/machinery/atmospherics/unary/vent_pump/on{
 	dir = 8
 	},
 /turf/simulated/floor/tiled,
-/area/security/training)
+/area/security/training_crimescene)
 "ei" = (
 /obj/machinery/alarm{
 	dir = 8;
 	pixel_x = 28
 	},
 /turf/simulated/floor/tiled,
-/area/security/training)
+/area/security/training_crimescene)
 "ej" = (
 /obj/structure/closet/crate,
 /obj/item/target,
@@ -1907,23 +1935,23 @@
 /obj/structure/table/wood,
 /obj/item/gun/projectile/revolver/capgun,
 /turf/simulated/floor/tiled,
-/area/security/training)
+/area/security/training_crimescene)
 "ep" = (
 /obj/structure/table/wood,
 /obj/item/clothing/gloves/black,
 /turf/simulated/floor/tiled,
-/area/security/training)
+/area/security/training_crimescene)
 "eq" = (
 /obj/structure/table/wood,
 /obj/item/storage/box/evidence,
 /obj/item/taperoll/police,
 /turf/simulated/floor/tiled,
-/area/security/training)
+/area/security/training_crimescene)
 "er" = (
 /obj/structure/table/wood,
 /obj/item/reagent_containers/spray/cleaner,
 /turf/simulated/floor/tiled,
-/area/security/training)
+/area/security/training_crimescene)
 "es" = (
 /obj/effect/floor_decal/corner/blue{
 	dir = 6
@@ -2055,6 +2083,9 @@
 /obj/item/modular_computer/console/preset/security/investigations,
 /turf/simulated/floor/lino/grey,
 /area/security/detectives_office)
+"eE" = (
+/turf/simulated/wall,
+/area/security/training_crimescene)
 "eF" = (
 /obj/structure/bed/chair/comfy/beige,
 /obj/structure/window/reinforced{
@@ -2468,27 +2499,27 @@
 	dir = 1
 	},
 /turf/simulated/floor/plating,
-/area/security/training)
+/area/security/training_theoretical)
 "fA" = (
 /obj/structure/banner,
 /turf/simulated/floor/wood,
-/area/security/training)
+/area/security/training_theoretical)
 "fB" = (
 /obj/structure/bed/chair/comfy/brown,
 /turf/simulated/floor/wood,
-/area/security/training)
+/area/security/training_theoretical)
 "fC" = (
 /obj/structure/sign/double/map/left{
 	pixel_y = 32
 	},
 /turf/simulated/floor/wood,
-/area/security/training)
+/area/security/training_theoretical)
 "fD" = (
 /obj/structure/sign/double/map/right{
 	pixel_y = 32
 	},
 /turf/simulated/floor/wood,
-/area/security/training)
+/area/security/training_theoretical)
 "fE" = (
 /obj/machinery/door/firedoor,
 /obj/structure/grille,
@@ -2502,7 +2533,7 @@
 	dir = 8
 	},
 /turf/simulated/floor/plating,
-/area/security/training)
+/area/security/training_theoretical)
 "fF" = (
 /obj/structure/window/reinforced{
 	dir = 1
@@ -2640,7 +2671,7 @@
 	},
 /obj/item/storage/box/fancy/vials,
 /turf/simulated/floor/tiled/white,
-/area/security/forensics_office)
+/area/security/forensics_laboratory)
 "fU" = (
 /obj/effect/floor_decal/corner/beige/diagonal,
 /obj/machinery/dnaforensics{
@@ -2648,7 +2679,7 @@
 	},
 /obj/structure/table/glass,
 /turf/simulated/floor/tiled/white,
-/area/security/forensics_office)
+/area/security/forensics_laboratory)
 "fV" = (
 /obj/machinery/door/firedoor,
 /obj/structure/grille,
@@ -2660,7 +2691,7 @@
 	},
 /obj/structure/window/reinforced,
 /turf/simulated/floor/plating,
-/area/security/training)
+/area/security/training_theoretical)
 "fW" = (
 /obj/structure/table/wood,
 /obj/item/device/flashlight/lamp/green,
@@ -2669,12 +2700,12 @@
 	icon_state = "tube1"
 	},
 /turf/simulated/floor/wood,
-/area/security/training)
+/area/security/training_theoretical)
 "fX" = (
 /obj/structure/table/wood,
 /obj/item/folder/sec,
 /turf/simulated/floor/wood,
-/area/security/training)
+/area/security/training_theoretical)
 "fY" = (
 /obj/structure/table/wood,
 /obj/item/paper_bin,
@@ -2683,10 +2714,10 @@
 	pixel_x = -6
 	},
 /turf/simulated/floor/wood,
-/area/security/training)
+/area/security/training_theoretical)
 "fZ" = (
 /turf/simulated/floor/wood,
-/area/security/training)
+/area/security/training_theoretical)
 "ga" = (
 /obj/machinery/door/firedoor,
 /obj/structure/grille,
@@ -2697,7 +2728,7 @@
 	dir = 8
 	},
 /turf/simulated/floor/plating,
-/area/security/training)
+/area/security/training_theoretical)
 "gb" = (
 /obj/structure/coatrack,
 /turf/simulated/floor/wood,
@@ -2849,8 +2880,13 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
 	},
+/obj/structure/cable/green{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
+	},
 /turf/simulated/floor/tiled/white,
-/area/security/forensics_office)
+/area/security/forensics_laboratory)
 "go" = (
 /obj/machinery/door/firedoor,
 /obj/structure/grille,
@@ -2863,7 +2899,7 @@
 	id = "FT Op"
 	},
 /turf/simulated/floor/plating,
-/area/security/forensics_office)
+/area/security/forensics_laboratory)
 "gp" = (
 /obj/effect/floor_decal/spline/fancy/wood,
 /obj/structure/sign/nosmoking_2{
@@ -2874,21 +2910,21 @@
 	dir = 4
 	},
 /turf/simulated/floor/wood,
-/area/security/training)
+/area/security/training_theoretical)
 "gq" = (
 /obj/effect/floor_decal/spline/fancy/wood,
 /turf/simulated/floor/wood,
-/area/security/training)
+/area/security/training_theoretical)
 "gr" = (
 /obj/effect/floor_decal/spline/fancy/wood,
 /obj/effect/floor_decal/spline/fancy/wood{
 	dir = 4
 	},
 /turf/simulated/floor/wood,
-/area/security/training)
+/area/security/training_theoretical)
 "gs" = (
 /turf/simulated/floor/tiled/ramp/bottom,
-/area/security/training)
+/area/security/training_theoretical)
 "gt" = (
 /obj/effect/floor_decal/corner/blue{
 	dir = 6
@@ -3015,6 +3051,11 @@
 	icon_state = "2-8"
 	},
 /obj/effect/floor_decal/corner/paleblue/diagonal,
+/obj/structure/cable/green{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
+	},
 /turf/simulated/floor/tiled/white,
 /area/security/forensics_office)
 "gA" = (
@@ -3029,6 +3070,16 @@
 	dir = 4
 	},
 /obj/effect/floor_decal/corner/paleblue/diagonal,
+/obj/structure/cable/green{
+	d1 = 2;
+	d2 = 8;
+	icon_state = "2-8"
+	},
+/obj/structure/cable/green{
+	d1 = 1;
+	d2 = 8;
+	icon_state = "1-8"
+	},
 /turf/simulated/floor/tiled/white,
 /area/security/forensics_office)
 "gB" = (
@@ -3058,8 +3109,13 @@
 "gD" = (
 /obj/effect/floor_decal/corner/beige/diagonal,
 /obj/structure/bed/chair/office/light,
+/obj/structure/cable/green{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
 /turf/simulated/floor/tiled/white,
-/area/security/forensics_office)
+/area/security/forensics_laboratory)
 "gE" = (
 /obj/machinery/door/firedoor,
 /obj/structure/grille,
@@ -3074,7 +3130,7 @@
 	dir = 1
 	},
 /turf/simulated/floor/plating,
-/area/security/training)
+/area/security/training_theoretical)
 "gF" = (
 /obj/effect/floor_decal/corner/blue{
 	dir = 9
@@ -3083,20 +3139,20 @@
 	dir = 5
 	},
 /turf/simulated/floor/tiled/dark,
-/area/security/training)
+/area/security/training_theoretical)
 "gG" = (
 /obj/effect/floor_decal/corner/blue{
 	dir = 5
 	},
 /turf/simulated/floor/tiled/dark,
-/area/security/training)
+/area/security/training_theoretical)
 "gH" = (
 /obj/effect/floor_decal/corner/blue{
 	dir = 5
 	},
 /obj/machinery/atmospherics/unary/vent_scrubber/on,
 /turf/simulated/floor/tiled/dark,
-/area/security/training)
+/area/security/training_theoretical)
 "gI" = (
 /obj/effect/floor_decal/corner/blue{
 	dir = 6
@@ -3105,7 +3161,7 @@
 	dir = 5
 	},
 /turf/simulated/floor/tiled/dark,
-/area/security/training)
+/area/security/training_theoretical)
 "gJ" = (
 /obj/effect/floor_decal/corner/blue{
 	dir = 9
@@ -3149,15 +3205,15 @@
 /turf/simulated/floor/tiled,
 /area/security/training)
 "gM" = (
-/obj/machinery/power/apc{
-	dir = 1;
-	name = "north bump";
-	pixel_y = 24
-	},
 /obj/structure/cable/green{
 	d2 = 2;
 	icon_state = "0-2"
 	},
+/obj/machinery/power/apc/low{
+	dir = 1;
+	name = "north bump";
+	pixel_y = 24
+	},
 /turf/simulated/floor/plating,
 /area/maintenance/security_interstitial)
 "gN" = (
@@ -3247,18 +3303,23 @@
 	dir = 4
 	},
 /obj/structure/closet/secure_closet/csi,
-/obj/machinery/power/apc{
+/obj/structure/cable/green,
+/obj/effect/floor_decal/corner/paleblue/diagonal,
+/obj/machinery/power/apc/low{
 	name = "south bump";
 	pixel_y = -24
 	},
-/obj/structure/cable/green,
-/obj/effect/floor_decal/corner/paleblue/diagonal,
 /turf/simulated/floor/tiled/white,
 /area/security/forensics_office)
 "gT" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/effect/floor_decal/corner/paleblue/diagonal,
+/obj/structure/cable/green{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
 /turf/simulated/floor/tiled/white,
 /area/security/forensics_office)
 "gU" = (
@@ -3278,7 +3339,7 @@
 	dir = 8
 	},
 /turf/simulated/floor/plating,
-/area/security/forensics_office)
+/area/security/forensics_laboratory)
 "gW" = (
 /obj/effect/floor_decal/corner/beige/diagonal,
 /obj/structure/table/glass,
@@ -3286,8 +3347,11 @@
 	pixel_x = 5;
 	pixel_y = 3
 	},
+/obj/machinery/light_switch{
+	pixel_y = -26
+	},
 /turf/simulated/floor/tiled/white,
-/area/security/forensics_office)
+/area/security/forensics_laboratory)
 "gX" = (
 /obj/effect/floor_decal/corner/beige/diagonal,
 /obj/structure/table/glass,
@@ -3297,8 +3361,13 @@
 	},
 /obj/machinery/light,
 /obj/item/device/reagent_scanner,
+/obj/structure/cable/green,
+/obj/machinery/power/apc/low{
+	name = "south bump";
+	pixel_y = -24
+	},
 /turf/simulated/floor/tiled/white,
-/area/security/forensics_office)
+/area/security/forensics_laboratory)
 "gY" = (
 /obj/effect/floor_decal/corner/blue{
 	dir = 9
@@ -3311,18 +3380,18 @@
 	pixel_x = -28
 	},
 /turf/simulated/floor/tiled/dark,
-/area/security/training)
+/area/security/training_theoretical)
 "gZ" = (
 /obj/structure/bed/chair{
 	dir = 1
 	},
 /turf/simulated/floor/tiled/dark,
-/area/security/training)
+/area/security/training_theoretical)
 "ha" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/hologram/holopad,
 /turf/simulated/floor/tiled/dark,
-/area/security/training)
+/area/security/training_theoretical)
 "hb" = (
 /obj/effect/floor_decal/corner/blue{
 	dir = 6
@@ -3336,16 +3405,11 @@
 	pixel_x = 24
 	},
 /turf/simulated/floor/tiled/dark,
-/area/security/training)
+/area/security/training_theoretical)
 "hc" = (
 /obj/effect/floor_decal/corner/blue{
 	dir = 9
 	},
-/obj/machinery/power/apc{
-	dir = 8;
-	name = "west bump";
-	pixel_x = -24
-	},
 /obj/structure/cable/green{
 	d2 = 4;
 	icon_state = "0-4"
@@ -3354,6 +3418,11 @@
 	c_tag = "Security - Training Division 1";
 	dir = 4
 	},
+/obj/machinery/power/apc/low{
+	dir = 8;
+	name = "west bump";
+	pixel_x = -24
+	},
 /turf/simulated/floor/tiled,
 /area/security/training)
 "hd" = (
@@ -3534,8 +3603,13 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/cable/green{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
 /turf/simulated/floor/tiled/white,
-/area/security/forensics_office)
+/area/security/forensics_morgue)
 "hp" = (
 /obj/structure/grille,
 /obj/machinery/door/firedoor,
@@ -3550,7 +3624,7 @@
 	},
 /obj/structure/window/reinforced,
 /turf/simulated/floor/plating,
-/area/security/forensics_office)
+/area/security/forensics_laboratory)
 "hq" = (
 /obj/effect/floor_decal/corner/blue{
 	dir = 9
@@ -3563,13 +3637,13 @@
 	icon_state = "tube1"
 	},
 /turf/simulated/floor/tiled/dark,
-/area/security/training)
+/area/security/training_theoretical)
 "hr" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
 /turf/simulated/floor/tiled/dark,
-/area/security/training)
+/area/security/training_theoretical)
 "hs" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 5
@@ -3577,8 +3651,13 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
+/obj/structure/cable/green{
+	d1 = 2;
+	d2 = 4;
+	icon_state = "2-4"
+	},
 /turf/simulated/floor/tiled/dark,
-/area/security/training)
+/area/security/training_theoretical)
 "ht" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
@@ -3586,8 +3665,13 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
+/obj/structure/cable/green{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
+	},
 /turf/simulated/floor/tiled/dark,
-/area/security/training)
+/area/security/training_theoretical)
 "hu" = (
 /obj/effect/floor_decal/corner/blue{
 	dir = 6
@@ -3598,8 +3682,13 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
+/obj/structure/cable/green{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
+	},
 /turf/simulated/floor/tiled/dark,
-/area/security/training)
+/area/security/training_theoretical)
 "hv" = (
 /obj/machinery/door/airlock/glass_security{
 	name = "Theorethical Training";
@@ -3612,8 +3701,13 @@
 	dir = 4
 	},
 /obj/machinery/door/firedoor,
+/obj/structure/cable/green{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
+	},
 /turf/simulated/floor/tiled,
-/area/security/training)
+/area/security/training_theoretical)
 "hw" = (
 /obj/structure/cable/green{
 	d1 = 1;
@@ -3629,6 +3723,11 @@
 	dir = 4;
 	icon_state = "pipe-j2"
 	},
+/obj/structure/cable/green{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
+	},
 /turf/simulated/floor/tiled,
 /area/security/training)
 "hx" = (
@@ -3681,8 +3780,17 @@
 "hC" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/light_switch{
+	pixel_x = -24
+	},
+/obj/structure/cable/green,
+/obj/machinery/power/apc/low{
+	dir = 4;
+	name = "east bump";
+	pixel_x = 24
+	},
 /turf/simulated/floor/tiled/ramp/bottom,
-/area/security/forensics_office)
+/area/security/forensics_morgue)
 "hD" = (
 /obj/effect/shuttle_landmark/skipjack/interstitial,
 /turf/unsimulated/floor/asteroid/ash/rocky,
@@ -3695,7 +3803,7 @@
 	name = "cooled floor";
 	temperature = 278
 	},
-/area/security/forensics_office)
+/area/security/forensics_morgue)
 "hG" = (
 /obj/effect/floor_decal/corner/blue{
 	dir = 9
@@ -3704,19 +3812,24 @@
 	dir = 1
 	},
 /turf/simulated/floor/tiled/dark,
-/area/security/training)
+/area/security/training_theoretical)
 "hH" = (
 /obj/structure/bed/chair{
 	dir = 1
 	},
 /obj/machinery/firealarm/south,
 /turf/simulated/floor/tiled/dark,
-/area/security/training)
+/area/security/training_theoretical)
 "hI" = (
 /obj/structure/table/standard,
 /obj/item/folder/sec,
+/obj/structure/cable/green,
+/obj/machinery/power/apc/low{
+	name = "south bump";
+	pixel_y = -24
+	},
 /turf/simulated/floor/tiled/dark,
-/area/security/training)
+/area/security/training_theoretical)
 "hK" = (
 /obj/effect/floor_decal/corner/blue{
 	dir = 6
@@ -3724,8 +3837,11 @@
 /obj/structure/bed/chair{
 	dir = 1
 	},
+/obj/machinery/light_switch{
+	pixel_y = -26
+	},
 /turf/simulated/floor/tiled/dark,
-/area/security/training)
+/area/security/training_theoretical)
 "hL" = (
 /obj/machinery/door/firedoor,
 /obj/structure/grille,
@@ -3740,7 +3856,7 @@
 	dir = 1
 	},
 /turf/simulated/floor/plating,
-/area/security/training)
+/area/security/training_theoretical)
 "hM" = (
 /obj/effect/floor_decal/corner/blue{
 	dir = 9
@@ -3785,17 +3901,17 @@
 	name = "cooled floor";
 	temperature = 278
 	},
-/area/security/forensics_office)
+/area/security/forensics_morgue)
 "hW" = (
 /obj/effect/floor_decal/corner/beige/diagonal,
 /turf/simulated/floor/tiled/white,
-/area/security/forensics_office)
+/area/security/forensics_laboratory)
 "hX" = (
 /turf/simulated/floor/tiled{
 	name = "cooled floor";
 	temperature = 278
 	},
-/area/security/forensics_office)
+/area/security/forensics_morgue)
 "hZ" = (
 /turf/simulated/wall,
 /area/medical/psych)
@@ -3846,7 +3962,7 @@
 	name = "cooled floor";
 	temperature = 278
 	},
-/area/security/forensics_office)
+/area/security/forensics_morgue)
 "ii" = (
 /turf/simulated/open,
 /area/security/training)
@@ -3864,7 +3980,7 @@
 	name = "cooled floor";
 	temperature = 278
 	},
-/area/security/forensics_office)
+/area/security/forensics_morgue)
 "in" = (
 /obj/machinery/door/firedoor,
 /obj/structure/grille,
@@ -4519,8 +4635,13 @@
 /obj/item/reagent_containers/spray/luminol,
 /obj/machinery/light,
 /obj/item/storage/box/fancy/csi_markers,
+/obj/structure/cable/green,
+/obj/machinery/power/apc/low{
+	name = "south bump";
+	pixel_y = -24
+	},
 /turf/simulated/floor/tiled,
-/area/security/training)
+/area/security/training_crimescene)
 "jA" = (
 /obj/effect/floor_decal/corner_wide/green{
 	dir = 5
@@ -5630,7 +5751,7 @@
 	pixel_y = -32
 	},
 /turf/simulated/floor/tiled/dark,
-/area/security/training)
+/area/security/training_theoretical)
 "mm" = (
 /obj/machinery/power/apc{
 	dir = 8;
@@ -5647,7 +5768,7 @@
 	name = "cooled floor";
 	temperature = 278
 	},
-/area/security/forensics_office)
+/area/security/forensics_morgue)
 "mo" = (
 /turf/simulated/mineral,
 /area/mine/unexplored)
@@ -5801,6 +5922,17 @@
 /obj/structure/lattice,
 /turf/unsimulated/floor/asteroid/ash/rocky,
 /area/maintenance/interstitial_construction_site/zone_2)
+"mZ" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/structure/cable/green{
+	d1 = 2;
+	d2 = 8;
+	icon_state = "2-8"
+	},
+/turf/simulated/floor/tiled,
+/area/security/training_crimescene)
 "na" = (
 /obj/machinery/door/firedoor,
 /obj/structure/window/reinforced{
@@ -6173,6 +6305,21 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/tiled/white,
 /area/maintenance/medbay_virology)
+"pj" = (
+/obj/effect/floor_decal/corner/beige/diagonal,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/obj/structure/cable/green{
+	d1 = 2;
+	d2 = 8;
+	icon_state = "2-8"
+	},
+/turf/simulated/floor/tiled/white,
+/area/security/forensics_laboratory)
 "pk" = (
 /obj/structure/table/standard,
 /obj/effect/floor_decal/corner/paleblue/diagonal,
@@ -6310,6 +6457,18 @@
 "pT" = (
 /turf/simulated/wall,
 /area/medical/upperlevel)
+"pV" = (
+/obj/machinery/door/firedoor,
+/obj/structure/grille,
+/obj/structure/window/reinforced/polarized{
+	dir = 1;
+	id = "FT Op"
+	},
+/obj/structure/window/reinforced/polarized{
+	id = "FT Op"
+	},
+/turf/simulated/floor/plating,
+/area/security/forensics_laboratory)
 "pZ" = (
 /turf/simulated/open/airless,
 /area/mine/unexplored)
@@ -6345,7 +6504,7 @@
 	name = "cooled floor";
 	temperature = 278
 	},
-/area/security/forensics_office)
+/area/security/forensics_morgue)
 "qi" = (
 /turf/simulated/wall,
 /area/hallway/secondary/entry/stairs)
@@ -6470,6 +6629,9 @@
 /obj/structure/closet/crate,
 /turf/simulated/floor/tiled,
 /area/quartermaster/storage)
+"qS" = (
+/turf/simulated/wall,
+/area/security/forensics_laboratory)
 "qT" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
@@ -6554,6 +6716,9 @@
 /obj/structure/lattice/catwalk/indoor,
 /turf/simulated/open,
 /area/quartermaster/storage)
+"rp" = (
+/turf/simulated/wall,
+/area/security/training_theoretical)
 "rr" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -6828,7 +6993,7 @@
 	name = "cooled floor";
 	temperature = 278
 	},
-/area/security/forensics_office)
+/area/security/forensics_morgue)
 "sQ" = (
 /obj/item/stack/material/steel{
 	amount = 20
@@ -7066,7 +7231,7 @@
 	name = "cooled floor";
 	temperature = 278
 	},
-/area/security/forensics_office)
+/area/security/forensics_morgue)
 "up" = (
 /obj/effect/floor_decal/industrial/warning/dust{
 	dir = 6
@@ -7294,7 +7459,7 @@
 	name = "cooled floor";
 	temperature = 278
 	},
-/area/security/forensics_office)
+/area/security/forensics_morgue)
 "vX" = (
 /obj/structure/window/reinforced,
 /obj/structure/window/reinforced{
@@ -7311,7 +7476,7 @@
 	name = "cooled floor";
 	temperature = 278
 	},
-/area/security/forensics_office)
+/area/security/forensics_morgue)
 "wc" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/generic,
@@ -7381,7 +7546,24 @@
 	name = "cooled floor";
 	temperature = 278
 	},
-/area/security/forensics_office)
+/area/security/forensics_morgue)
+"wq" = (
+/obj/machinery/door/firedoor,
+/obj/structure/grille,
+/obj/structure/window/reinforced/polarized{
+	dir = 1;
+	id = "FT Op"
+	},
+/obj/structure/window/reinforced/polarized{
+	dir = 4;
+	id = "FT Op"
+	},
+/obj/structure/window/reinforced/polarized{
+	dir = 8;
+	id = "FT Op"
+	},
+/turf/simulated/floor/plating,
+/area/security/forensics_laboratory)
 "wr" = (
 /obj/effect/floor_decal/corner/brown{
 	dir = 9
@@ -7400,7 +7582,7 @@
 	dir = 8
 	},
 /turf/simulated/floor/tiled/white,
-/area/security/forensics_office)
+/area/security/forensics_laboratory)
 "wy" = (
 /obj/structure/window/reinforced{
 	dir = 8
@@ -7611,7 +7793,7 @@
 	name = "cooled floor";
 	temperature = 278
 	},
-/area/security/forensics_office)
+/area/security/forensics_morgue)
 "yb" = (
 /obj/machinery/atmospherics/pipe/manifold/hidden/supply{
 	dir = 8
@@ -7924,7 +8106,7 @@
 	name = "cooled floor";
 	temperature = 278
 	},
-/area/security/forensics_office)
+/area/security/forensics_morgue)
 "zW" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -7953,8 +8135,13 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
 	},
+/obj/structure/cable/green{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
+	},
 /turf/simulated/floor/tiled/white,
-/area/security/forensics_office)
+/area/security/forensics_laboratory)
 "Ak" = (
 /obj/machinery/power/apc{
 	dir = 4;
@@ -8011,6 +8198,22 @@
 	},
 /turf/simulated/floor/tiled,
 /area/maintenance/interstitial_main)
+"Aw" = (
+/obj/machinery/door/firedoor,
+/obj/structure/grille,
+/obj/structure/window/reinforced/polarized{
+	dir = 4;
+	id = "FT Op"
+	},
+/obj/structure/window/reinforced/polarized{
+	dir = 8;
+	id = "FT Op"
+	},
+/obj/structure/window/reinforced/polarized{
+	id = "FT Op"
+	},
+/turf/simulated/floor/plating,
+/area/security/forensics_laboratory)
 "AB" = (
 /obj/structure/ladder{
 	pixel_y = 16
@@ -8129,7 +8332,7 @@
 /obj/machinery/button/windowtint{
 	id = "FT Op";
 	pixel_x = 28;
-	pixel_y = 12
+	pixel_y = 7
 	},
 /obj/machinery/light{
 	dir = 4
@@ -8251,7 +8454,7 @@
 "Ci" = (
 /obj/structure/disposalpipe/segment,
 /turf/simulated/floor/tiled,
-/area/security/training)
+/area/security/training_crimescene)
 "Cl" = (
 /obj/structure/disposalpipe/segment,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -8677,7 +8880,7 @@
 	dir = 8
 	},
 /turf/simulated/floor/plating,
-/area/security/forensics_office)
+/area/security/forensics_laboratory)
 "EI" = (
 /obj/machinery/atmospherics/pipe/manifold/hidden{
 	dir = 8
@@ -8717,6 +8920,11 @@
 	dir = 4;
 	icon_state = "pipe-c"
 	},
+/obj/structure/cable/green{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
+	},
 /turf/simulated/floor/tiled,
 /area/security/training)
 "EZ" = (
@@ -8746,6 +8954,18 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/maintenance/medbay_virology)
+"Fe" = (
+/obj/machinery/door/firedoor,
+/obj/structure/grille,
+/obj/structure/window/reinforced,
+/obj/structure/window/reinforced{
+	dir = 4
+	},
+/obj/structure/window/reinforced{
+	dir = 8
+	},
+/turf/simulated/floor/plating,
+/area/security/training_theoretical)
 "Ff" = (
 /obj/structure/bed/chair/office/light{
 	dir = 8
@@ -8811,7 +9031,7 @@
 	name = "cooled floor";
 	temperature = 278
 	},
-/area/security/forensics_office)
+/area/security/forensics_morgue)
 "Fs" = (
 /turf/simulated/floor/tiled,
 /area/quartermaster/storage)
@@ -9135,6 +9355,22 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/tiled/white,
 /area/maintenance/medbay_virology)
+"Hw" = (
+/obj/machinery/door/firedoor,
+/obj/structure/grille,
+/obj/structure/window/reinforced/polarized{
+	dir = 1;
+	id = "FT Op"
+	},
+/obj/structure/window/reinforced/polarized{
+	dir = 4;
+	id = "FT Op"
+	},
+/obj/structure/window/reinforced/polarized{
+	id = "FT Op"
+	},
+/turf/simulated/floor/plating,
+/area/security/forensics_laboratory)
 "HC" = (
 /obj/machinery/power/smes/buildable{
 	RCon_tag = "Substation - Construction Level"
@@ -9325,6 +9561,22 @@
 	},
 /turf/simulated/floor/plating,
 /area/maintenance/medbay_interstitial)
+"IB" = (
+/obj/machinery/door/firedoor,
+/obj/structure/grille,
+/obj/structure/window/reinforced/polarized{
+	dir = 1;
+	id = "FT Op"
+	},
+/obj/structure/window/reinforced/polarized{
+	dir = 8;
+	id = "FT Op"
+	},
+/obj/structure/window/reinforced/polarized{
+	id = "FT Op"
+	},
+/turf/simulated/floor/plating,
+/area/security/forensics_laboratory)
 "IC" = (
 /obj/effect/floor_decal/industrial/warning/dust{
 	dir = 1
@@ -10009,7 +10261,7 @@
 /obj/effect/floor_decal/corner/beige/diagonal,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /turf/simulated/floor/tiled/white,
-/area/security/forensics_office)
+/area/security/forensics_laboratory)
 "KC" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/grille/broken,
@@ -10148,7 +10400,7 @@
 	name = "cooled floor";
 	temperature = 278
 	},
-/area/security/forensics_office)
+/area/security/forensics_morgue)
 "Lt" = (
 /obj/structure/cable{
 	d1 = 4;
@@ -10680,7 +10932,7 @@
 	},
 /obj/item/storage/box/fancy/csi_markers,
 /turf/simulated/floor/tiled/white,
-/area/security/forensics_office)
+/area/security/forensics_laboratory)
 "NQ" = (
 /obj/structure/lattice,
 /obj/structure/closet/crate,
@@ -10697,7 +10949,7 @@
 	dir = 6
 	},
 /turf/simulated/floor/tiled/white,
-/area/security/forensics_office)
+/area/security/forensics_laboratory)
 "Om" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/grille,
@@ -10762,7 +11014,7 @@
 /obj/structure/table/glass,
 /obj/item/storage/box/sharps,
 /turf/simulated/floor/tiled/white,
-/area/security/forensics_office)
+/area/security/forensics_laboratory)
 "ON" = (
 /obj/machinery/atmospherics/pipe/manifold/hidden,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -10970,7 +11222,7 @@
 	name = "cooled floor";
 	temperature = 278
 	},
-/area/security/forensics_office)
+/area/security/forensics_morgue)
 "PG" = (
 /obj/machinery/light/small{
 	dir = 4
@@ -10984,7 +11236,7 @@
 	name = "cooled floor";
 	temperature = 278
 	},
-/area/security/forensics_office)
+/area/security/forensics_morgue)
 "PJ" = (
 /obj/structure/cable/green{
 	d1 = 4;
@@ -11089,7 +11341,7 @@
 	dir = 9
 	},
 /turf/simulated/floor/tiled/white,
-/area/security/forensics_office)
+/area/security/forensics_laboratory)
 "Qp" = (
 /obj/machinery/door/firedoor,
 /obj/structure/window/reinforced,
@@ -11207,7 +11459,7 @@
 	name = "cooled floor";
 	temperature = 278
 	},
-/area/security/forensics_office)
+/area/security/forensics_morgue)
 "QJ" = (
 /obj/machinery/atmospherics/binary/pump{
 	dir = 8;
@@ -11335,6 +11587,11 @@
 	dir = 8
 	},
 /obj/effect/floor_decal/corner/paleblue/diagonal,
+/obj/structure/cable/green{
+	d1 = 2;
+	d2 = 4;
+	icon_state = "2-4"
+	},
 /turf/simulated/floor/tiled/white,
 /area/security/forensics_office)
 "Rz" = (
@@ -11344,7 +11601,7 @@
 	name = "cooled floor";
 	temperature = 278
 	},
-/area/security/forensics_office)
+/area/security/forensics_morgue)
 "RH" = (
 /obj/structure/track{
 	icon_state = "track9"
@@ -11460,7 +11717,7 @@
 	dir = 5
 	},
 /turf/simulated/floor/tiled/white,
-/area/security/forensics_office)
+/area/security/forensics_laboratory)
 "RT" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/floor_decal/industrial/warning/dust{
@@ -11714,6 +11971,11 @@
 	dir = 4
 	},
 /obj/effect/floor_decal/corner/paleblue/diagonal,
+/obj/structure/cable/green{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
+	},
 /turf/simulated/floor/tiled/white,
 /area/security/forensics_office)
 "Ts" = (
@@ -11927,7 +12189,7 @@
 	name = "cooled floor";
 	temperature = 278
 	},
-/area/security/forensics_office)
+/area/security/forensics_morgue)
 "Uy" = (
 /obj/structure/closet/crate,
 /obj/effect/floor_decal/corner/brown{
@@ -12542,7 +12804,7 @@
 /turf/simulated/floor/tiled/ramp/bottom{
 	dir = 4
 	},
-/area/security/forensics_office)
+/area/security/forensics_morgue)
 "Yo" = (
 /obj/machinery/power/sensor{
 	long_range = 1;
@@ -12559,15 +12821,6 @@
 	},
 /turf/simulated/floor/plating,
 /area/maintenance/substation/interstitial)
-"Yr" = (
-/obj/effect/floor_decal/corner/blue{
-	dir = 6
-	},
-/obj/machinery/light_switch{
-	pixel_x = 28
-	},
-/turf/simulated/floor/tiled,
-/area/security/training)
 "Ys" = (
 /obj/effect/large_stock_marker,
 /obj/effect/floor_decal/corner/brown{
@@ -12631,7 +12884,7 @@
 	},
 /obj/item/device/mass_spectrometer,
 /turf/simulated/floor/tiled/white,
-/area/security/forensics_office)
+/area/security/forensics_laboratory)
 "YN" = (
 /obj/structure/lattice/catwalk,
 /obj/structure/disposalpipe/down{
@@ -12718,6 +12971,9 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/airless,
 /area/maintenance/interstitial_construction_site)
+"Zt" = (
+/turf/simulated/wall,
+/area/security/forensics_morgue)
 "Zu" = (
 /obj/item/device/radio/intercom{
 	dir = 8;
@@ -45041,15 +45297,15 @@ dc
 dc
 dc
 dc
-dc
+rp
 fz
 fV
-dc
+rp
 gE
-dc
+rp
 fz
 fV
-dc
+rp
 aa
 aa
 aa
@@ -45298,7 +45554,7 @@ ew
 eI
 eU
 dM
-dc
+rp
 fA
 fW
 gp
@@ -45306,7 +45562,7 @@ gF
 gY
 hq
 hG
-dc
+rp
 aa
 aa
 aa
@@ -45555,7 +45811,7 @@ ex
 jB
 eV
 mk
-dc
+rp
 fB
 fX
 gq
@@ -45563,7 +45819,7 @@ gG
 gZ
 hr
 hH
-dc
+rp
 aa
 aa
 aa
@@ -45812,7 +46068,7 @@ ex
 eJ
 eW
 fh
-dc
+rp
 fC
 fY
 gq
@@ -45820,7 +46076,7 @@ gH
 ha
 hs
 hI
-dc
+rp
 aa
 aa
 aa
@@ -46069,7 +46325,7 @@ ey
 eK
 eX
 fi
-dc
+rp
 fD
 fZ
 gr
@@ -46077,7 +46333,7 @@ gG
 gZ
 ht
 ml
-dc
+rp
 aa
 aa
 aa
@@ -46326,7 +46582,7 @@ ez
 eL
 eY
 fj
-dc
+rp
 fA
 fZ
 gs
@@ -46334,7 +46590,7 @@ gI
 hb
 hu
 hK
-dc
+rp
 aa
 aa
 aa
@@ -46583,15 +46839,15 @@ eA
 jC
 jD
 eA
-dc
+rp
 fE
 ga
 ga
-dL
-dc
+Fe
+rp
 hv
 hL
-dc
+rp
 aa
 aa
 aa
@@ -47343,7 +47599,7 @@ aa
 aa
 dc
 dc
-dc
+eE
 dB
 dL
 dU
@@ -47361,7 +47617,7 @@ dc
 gL
 he
 hx
-Yr
+hO
 hO
 ii
 ii
@@ -47600,7 +47856,7 @@ aa
 aa
 aa
 aa
-dc
+eE
 dC
 Ci
 dV
@@ -47857,7 +48113,7 @@ aa
 aa
 aa
 aa
-dc
+eE
 dD
 dN
 dW
@@ -48114,11 +48370,11 @@ aa
 aa
 aa
 aa
-dc
+eE
 dE
 dO
 dX
-eg
+mZ
 jz
 et
 eF
@@ -48371,7 +48627,7 @@ aa
 aa
 aa
 aa
-dc
+eE
 dF
 dP
 dY
@@ -48628,7 +48884,7 @@ aa
 aa
 aa
 aa
-dc
+eE
 dG
 dG
 dZ
@@ -48885,12 +49141,12 @@ aa
 aa
 aa
 aa
-dc
-dc
-dc
-dc
-dc
-dc
+eE
+eE
+eE
+eE
+eE
+eE
 et
 eC
 eO
@@ -49672,10 +49928,10 @@ fN
 gj
 gx
 fw
-fw
-fw
-fw
-fw
+gu
+gu
+gu
+gu
 ab
 ab
 ab
@@ -49929,10 +50185,10 @@ fO
 TH
 gy
 gR
-fw
-fw
-fw
-fw
+Zt
+Zt
+Zt
+Zt
 ab
 ab
 ab
@@ -50186,13 +50442,13 @@ UP
 gl
 gz
 gS
-fw
-fw
-fw
-fw
-fw
-fw
-fw
+Zt
+Zt
+Zt
+Zt
+Zt
+Zt
+Zt
 ab
 ab
 ab
@@ -50449,7 +50705,7 @@ hV
 if
 im
 wo
-fw
+Zt
 ab
 ab
 ab
@@ -50700,14 +50956,14 @@ fR
 Tn
 gB
 gU
-fw
-fw
+Zt
+Zt
 Yk
 hX
 vS
 qf
-fw
-fw
+Zt
+Zt
 ab
 aa
 aa
@@ -50952,19 +51208,19 @@ ab
 fw
 fN
 gj
-fw
+qS
 hp
 Ai
 EC
 gV
-fw
-fw
+qS
+Zt
 uo
 Rz
 Rz
 Ls
 zU
-fw
+Zt
 ab
 aa
 aa
@@ -51209,19 +51465,19 @@ ab
 ab
 ab
 ab
-fx
+IB
 fT
 gm
 hW
 gW
-fw
+qS
 hF
 hX
 mn
 vZ
 Fo
 sN
-fw
+Zt
 ab
 ab
 aa
@@ -51466,19 +51722,19 @@ aa
 ab
 ab
 ab
-in
+pV
 fU
-gm
+pj
 gD
 gX
-fw
+qS
 hF
 hX
 hX
 hX
 hX
 xT
-fw
+Zt
 ab
 aa
 aa
@@ -51723,19 +51979,19 @@ aa
 ab
 ab
 ab
-in
+pV
 NS
 Qk
 KA
 RS
-fw
-fw
+qS
+Zt
 QH
 PG
 Uv
 PF
-fw
-fw
+Zt
+Zt
 mo
 mo
 aa
@@ -51980,18 +52236,18 @@ aa
 ab
 ab
 ab
-fy
+Hw
 wt
 YM
 OM
 NL
-fw
-fw
-fw
-fw
-fw
-fw
-fw
+qS
+Zt
+Zt
+Zt
+Zt
+Zt
+Zt
 mo
 mo
 mo
@@ -52237,12 +52493,12 @@ aa
 ab
 ab
 ab
-fw
-fN
+qS
+wq
 go
 go
-gj
-fw
+Aw
+qS
 mo
 mo
 mo