diff --git a/code/game/machinery/doors/brigdoors.dm b/code/game/machinery/doors/brigdoors.dm
index 0bc4a78bca8..a981ba2f72e 100644
--- a/code/game/machinery/doors/brigdoors.dm
+++ b/code/game/machinery/doors/brigdoors.dm
@@ -465,6 +465,10 @@
 	name = "Cell F"
 	id = "cell_6"
 
+/obj/machinery/door_timer/isolation_cell
+	name = "Isolation Cell"
+	id = "cell_isolation"
+
 #undef FONT_SIZE
 #undef FONT_COLOR
 #undef FONT_STYLE
diff --git a/code/game/machinery/flasher.dm b/code/game/machinery/flasher.dm
index 9380901728e..864870c678e 100644
--- a/code/game/machinery/flasher.dm
+++ b/code/game/machinery/flasher.dm
@@ -1,8 +1,8 @@
 // It is a gizmo that flashes a small area
 
 /obj/machinery/flasher
-	name = "Mounted flash"
-	desc = "A wall-mounted flashbulb device."
+	name = "mounted flash"
+	desc = "A mounted flash. Disorientates anyone caught in its range."
 	icon = 'icons/obj/stationobjs.dmi'
 	icon_state = "mflash1"
 	layer = OBJ_LAYER
diff --git a/code/game/objects/structures/crates_lockers/closets/utility_closets.dm b/code/game/objects/structures/crates_lockers/closets/utility_closets.dm
index ea961811de0..58802ec3844 100644
--- a/code/game/objects/structures/crates_lockers/closets/utility_closets.dm
+++ b/code/game/objects/structures/crates_lockers/closets/utility_closets.dm
@@ -14,7 +14,7 @@
  */
 /obj/structure/closet/emcloset
 	name = "emergency closet"
-	desc = "It's a storage unit for emergency breathmasks and o2 tanks."
+	desc = "It's a storage unit for emergency breathmasks and oxygen tanks."
 	icon_state = "emergency"
 	obj_flags = OBJ_FLAG_MOVES_UNSUPPORTED
 
@@ -94,6 +94,26 @@
 	new /obj/item/storage/pill_bottle/rmt
 	new /obj/item/clothing/mask/offworlder
 
+/obj/structure/closet/emcloset/communal
+	name = "communal emergency closet"
+	anchored = TRUE
+	canbemoved = TRUE
+
+/obj/structure/closet/emcloset/communal/fill()
+	// 2 helmets, 2 masks, 2 suits, 2 oxygen tanks, and 4 oxygen candles.
+	new /obj/item/clothing/head/helmet/space/emergency(src)
+	new /obj/item/clothing/head/helmet/space/emergency(src)
+	new /obj/item/clothing/mask/breath(src)
+	new /obj/item/clothing/mask/breath(src)
+	new /obj/item/clothing/suit/space/emergency(src)
+	new /obj/item/clothing/suit/space/emergency(src)
+	new /obj/item/tank/emergency_oxygen(src)
+	new /obj/item/tank/emergency_oxygen(src)
+	new /obj/item/device/oxycandle(src)
+	new /obj/item/device/oxycandle(src)
+	new /obj/item/device/oxycandle(src)
+	new /obj/item/device/oxycandle(src)
+
 /*
  * Fire Closet
  */
diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm
index 1be757bd021..1a1b9240a9d 100644
--- a/code/game/objects/structures/window.dm
+++ b/code/game/objects/structures/window.dm
@@ -1,6 +1,9 @@
 //
 // Glass
 //
+#define FULL_REINFORCED_WINDOW_DAMAGE_FORCE 8
+#define REINFORCED_WINDOW_DAMAGE_FORCE 8
+
 /obj/structure/window
 	name = "glass pane"
 	desc = "A glass pane."
@@ -11,6 +14,7 @@
 	anchored = TRUE
 	flags = ON_BORDER
 	obj_flags = OBJ_FLAG_ROTATABLE|OBJ_FLAG_MOVES_UNSUPPORTED
+	var/hitsound = 'sound/effects/glass_hit.ogg'
 	var/maxhealth = 14
 	var/maximal_heat = T0C + 100 // Maximal heat before this window begins taking damage from fire
 	var/damage_per_fire_tick = 2 // Amount of damage per fire tick. Regular windows are not fireproof so they might as well break quickly.
@@ -246,9 +250,10 @@
 			grab_smash_attack(G, BRUTE)
 			return
 
-	if(W.flags & NOBLUDGEON) return
+	if(W.flags & NOBLUDGEON)
+		return
 
-	if(W.isscrewdriver())
+	if(W.isscrewdriver() && user.a_intent != I_HURT)
 		if(reinf && state >= 1)
 			state = 3 - state
 			update_nearby_icons()
@@ -267,11 +272,11 @@
 			to_chat(user, (anchored ? SPAN_NOTICE("You have fastened the window to the floor.") : SPAN_NOTICE("You have unfastened the window.")))
 			update_icon()
 			update_nearby_icons()
-	else if(W.iscrowbar() && reinf && state <= 1)
+	else if(W.iscrowbar() && reinf && state <= 1 && user.a_intent != I_HURT)
 		state = 1 - state
 		playsound(loc, W.usesound, 75, 1)
 		to_chat(user, (state ? SPAN_NOTICE("You have pried the window into the frame.") : SPAN_NOTICE("You have pried the window out of the frame.")))
-	else if(W.iswrench() && !anchored && (!state || !reinf))
+	else if(W.iswrench() && !anchored && (!state || !reinf) && user.a_intent != I_HURT)
 		if(!glasstype)
 			to_chat(user, SPAN_NOTICE("You're not sure how to dismantle \the [src] properly."))
 		else
@@ -280,15 +285,24 @@
 	else
 		user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN)
 		if(W.damtype == BRUTE || W.damtype == BURN)
-			user.do_attack_animation(src)
-			hit(W.force)
+			if(reinf)
+				user.do_attack_animation(src)
+				if(W.force >= REINFORCED_WINDOW_DAMAGE_FORCE)
+					user.visible_message(SPAN_DANGER("\The [user] forcefully strikes \the [src] with \the [W]!"))
+					playsound(src, hitsound, W.get_clamped_volume(), 1)
+					hit(W.force)
+				else
+					user.visible_message(SPAN_WARNING("[user] hits \the [src] with \the [W], but it glances off, doing no damage."))
+					playsound(src, hitsound, W.get_clamped_volume(), 1)
+			else
+				user.do_attack_animation(src)
+				hit(W.force)
 			if(health <= 7)
 				anchored = 0
 				update_nearby_icons()
 				step(src, get_dir(user, src))
 		else
-			playsound(loc, 'sound/effects/glass_hit.ogg', 75, 1)
-		..()
+			playsound(src, hitsound, 10, 1)
 	return
 
 /obj/structure/window/proc/grab_smash_attack(obj/item/grab/G, var/damtype = BRUTE)
@@ -317,7 +331,8 @@
 			hit(50)
 
 /obj/structure/window/proc/hit(var/damage, var/sound_effect = 1)
-	if(reinf) damage *= 0.5
+	if(reinf)
+		damage *= 0.5
 	take_damage(damage)
 	return
 
@@ -664,7 +679,7 @@
 	if(W.flags & NOBLUDGEON)
 		return
 
-	if(W.isscrewdriver())
+	if(W.isscrewdriver() && user.a_intent != I_HURT)
 		if(state == 2)
 			if(W.use_tool(src, user, 2 SECONDS, volume = 50))
 				to_chat(user, SPAN_NOTICE("You have unfastened the glass from the window frame."))
@@ -675,7 +690,7 @@
 				to_chat(user, SPAN_NOTICE("You have fastened the glass to the window frame."))
 				state++
 				update_nearby_icons()
-	else if(W.iscrowbar())
+	else if(W.iscrowbar() && user.a_intent != I_HURT)
 		if(state == 1)
 			if(W.use_tool(src, user, 2 SECONDS, volume = 50))
 				to_chat(user, SPAN_NOTICE("You pry the glass out of the window frame."))
@@ -686,19 +701,29 @@
 				to_chat(user, SPAN_NOTICE("You pry the glass into the window frame."))
 				state++
 				update_nearby_icons()
-	else if(W.iswrench())
+	else if(W.iswrench() && user.a_intent != I_HURT)
 		if(state == 0)
-			visible_message(SPAN_WARNING("\The [user] is dismantling \the [src]!"))
+			user.visible_message(SPAN_DANGER("\The [user] is dismantling \the [src]!"))
 			if(W.use_tool(src, user, 2 SECONDS, volume = 50))
 				to_chat(user, SPAN_NOTICE("You undo the safety bolts and remove the glass from \the [src]."))
 				dismantle_window()
 	else
 		user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN)
 		if(W.damtype == BRUTE || W.damtype == BURN)
-			user.do_attack_animation(src)
-			hit(W.force)
+			if(reinf)
+				user.do_attack_animation(src)
+				if(W.force >= FULL_REINFORCED_WINDOW_DAMAGE_FORCE)
+					user.visible_message(SPAN_DANGER("\The [user] forcefully strikes \the [src] with \the [W]!"))
+					playsound(src, hitsound, W.get_clamped_volume(), 1)
+					hit(W.force)
+				else
+					user.visible_message(SPAN_WARNING("[user] hits \the [src] with \the [W], but it glances off, doing no damage."))
+					playsound(src, hitsound, W.get_clamped_volume(), 1)
+			else
+				user.do_attack_animation(src)
+				hit(W.force)
 		else
-			playsound(loc, 'sound/effects/glass_hit.ogg', 75, 1)
+			playsound(src, hitsound, 10, 1)
 	return
 
 /obj/structure/window/full/shatter(var/display_message = 1)
@@ -843,3 +868,6 @@
 	maxhealth = 160 // Two reinforced borosilicate glass panes worth of health, since that's the minimum you need to break through to get to the other side.
 	reinf = TRUE
 	maximal_heat = T0C + 4000
+
+#undef FULL_REINFORCED_WINDOW_DAMAGE_FORCE
+#undef REINFORCED_WINDOW_DAMAGE_FORCE
\ No newline at end of file
diff --git a/code/modules/hydroponics/trays/tray_reagents.dm b/code/modules/hydroponics/trays/tray_reagents.dm
index bf3305791cf..af3f9d1e94f 100644
--- a/code/modules/hydroponics/trays/tray_reagents.dm
+++ b/code/modules/hydroponics/trays/tray_reagents.dm
@@ -59,8 +59,8 @@
 	update_icon()
 	if(reagents.total_volume)
 		var/fraction = reagents.total_volume / volume
-		force = max(10 * fraction, 1)
-		throwforce = max(8 * fraction, 1)
+		force = max(5 * fraction, 1)
+		throwforce = max(5 * fraction, 1)
 		hitsound = 'sound/weapons/jug_filled_impact.ogg'
 		drop_sound = 'sound/weapons/jug_filled_impact.ogg'
 	else
diff --git a/html/changelogs/brig_tweaks.yml b/html/changelogs/brig_tweaks.yml
new file mode 100644
index 00000000000..662265d7180
--- /dev/null
+++ b/html/changelogs/brig_tweaks.yml
@@ -0,0 +1,15 @@
+author: SleepyGemmy
+
+delete-after: True
+
+changes:
+  - maptweak: "Adds a isolation cell to the brig."
+  - maptweak: "Adds brig lockdown blast doors to the windows in the communal area."
+  - maptweak: "Tweaks the communal layout."
+  - maptweak: "Replaces the security areas with relative areas."
+  - tweak: "Makes reinforced windows and window panes need a weapon with 8 or higher force to inflict damage."
+  - tweak: "Tweaks the plastic jug's force to be more believable."
+  - tweak: "Makes tools not attack windows unless on harm intent."
+  - rscadd: "Adds a unique communal emergency closet with the bare necessities."
+  - bugfix: "Removes a duplicate intercom from the warden's office."
+  - spellcheck: "Fixes the mounted flash's name being capitalized."
\ No newline at end of file
diff --git a/maps/sccv_horizon/code/sccv_horizon_areas.dm b/maps/sccv_horizon/code/sccv_horizon_areas.dm
index e21e37238c2..0c9261a80f9 100644
--- a/maps/sccv_horizon/code/sccv_horizon_areas.dm
+++ b/maps/sccv_horizon/code/sccv_horizon_areas.dm
@@ -299,7 +299,7 @@
 	name = "Intrepid Armament"
 
 //
-// Areas for the SCCV Horizon Map
+// SCCV Horizon Areas
 //
 /area/horizon
 	name = "Horizon (PARENT AREA - DON'T USE)"
@@ -636,20 +636,6 @@
 	sound_env = SMALL_ENCLOSED
 	holomap_color = HOLOMAP_AREACOLOR_CIVILIAN
 
-// ZTA
-/area/horizon/zta
-	name = "Horizon - Primary Armament Hold"
-	icon_state = "zta"
-	sound_env = LARGE_ENCLOSED
-	ambience = AMBIENCE_SINGULARITY
-
-// Secure Ammunition Storage
-/area/horizon/secure_ammunition_storage
-	name = "Horizon - Secure Ammunitions Storage"
-	sound_env = SMALL_ENCLOSED
-	ambience = AMBIENCE_FOREBODING
-	holomap_color = HOLOMAP_AREACOLOR_OPERATIONS
-
 // Crew Armoury
 /area/horizon/crew_armoury
 	name = "Horizon - Crew Armoury"
@@ -665,9 +651,121 @@
 	sound_env = SMALL_ENCLOSED
 	ambience = AMBIENCE_FOREBODING
 	holomap_color = HOLOMAP_AREACOLOR_HALLWAYS
+
+// Security (Deck 2)
+/area/horizon/security
+	name = "Horizon - Security (PARENT AREA - DON'T USE)"
+	holomap_color = HOLOMAP_AREACOLOR_SECURITY
+
+/area/horizon/security/lobby
+	name = "Horizon - Security - Lobby"
+	icon_state = "security"
+
+/area/horizon/security/office
+	name = "Horizon - Security - Office"
+	icon_state = "security"
+	sound_env = SMALL_ENCLOSED
+
+/area/horizon/security/hallway
+	name = "Horizon - Security - Main Hallway"
+	icon_state = "security"
+
+/area/horizon/security/equipment
+	name = "Horizon - Security - Equipment Room"
+	icon_state = "security"
+
+/area/horizon/security/washroom
+	name = "Horizon - Security - Washroom"
+	icon_state = "security"
+	sound_env = SMALL_ENCLOSED
+
+/area/horizon/security/brig
+	name = "Horizon - Security - Brig"
+	icon_state = "brig"
+	flags = HIDE_FROM_HOLOMAP | PRISON
+	ambience = AMBIENCE_HIGHSEC
+
+/area/horizon/security/holding_cell_a
+	name = "Horizon - Security - Holding Cell A"
+	icon_state = "brig_proc"
+
+/area/horizon/security/holding_cell_b
+	name = "Horizon - Security - Holding Cell B"
+	icon_state = "brig_proc_two"
+
+/area/horizon/security/head_of_security
+	name = "Horizon - Security - Head of Security's Office"
+	icon_state = "head_quarters"
+	flags = HIDE_FROM_HOLOMAP
+	ambience = AMBIENCE_HIGHSEC
+	sound_env = SMALL_ENCLOSED
+
+/area/horizon/security/warden
+	name = "Horizon - Security - Warden's Office"
+	icon_state = "Warden"
+	flags = HIDE_FROM_HOLOMAP
+	ambience = AMBIENCE_HIGHSEC
+	sound_env = SMALL_ENCLOSED
+
+/area/horizon/security/armoury
+	name = "Horizon - Security - Armoury"
+	icon_state = "Warden"
+	flags = HIDE_FROM_HOLOMAP
+	ambience = AMBIENCE_HIGHSEC
+	sound_env = LARGE_ENCLOSED
+
+// Security (Deck 3)
+/area/horizon/security/investigations_hallway
+	name = "Horizon - Security - Investigations Hallway"
+	icon_state = "security"
+
+/area/horizon/security/meeting_room
+	name = "Horizon - Security - Meeting Room"
+	icon_state = "security"
+
+/area/horizon/security/firing_range
+	name = "Horizon - Security - Firing Range"
+	icon_state = "security"
+	sound_env = LARGE_ENCLOSED
+
+/area/horizon/security/investigators_office
+	name = "Horizon - Security - Investigators' Office"
+	icon_state = "investigations_office"
+	sound_env = MEDIUM_SOFTFLOOR
+
+/area/horizon/security/interrogation
+	name = "Horizon - Security - Interrogation"
+	icon_state = "investigations"
+	ambience = list(AMBIENCE_HIGHSEC, AMBIENCE_FOREBODING)
+	sound_env = SMALL_ENCLOSED
+
+/area/horizon/security/interrogation/monitoring
+	name = "Horizon - Security - Interrogation Monitoring"
+
+/area/horizon/security/forensic_laboratory
+	name = "Horizon - Security - Forensic Laboratory"
+	icon_state = "investigations"
+
+/area/horizon/security/autopsy_laboratory
+	name = "Horizon - Security - Autopsy Laboratory"
+	icon_state = "investigations"
+	ambience = list(AMBIENCE_GHOSTLY, AMBIENCE_FOREBODING)
+
+/area/horizon/security/evidence_storage
+	name = "Horizon - Security - Evidence Storage"
+	icon_state = "evidence"
+	ambience = AMBIENCE_FOREBODING
+	sound_env = SMALL_ENCLOSED
 /********** Unique End **********/
 
 /********** Weapon Systems Start **********/
+// Secure Ammunition Storage
+/area/horizon/secure_ammunition_storage
+	name = "Horizon - Secure Ammunitions Storage"
+	sound_env = SMALL_ENCLOSED
+	ambience = AMBIENCE_FOREBODING
+	holomap_color = HOLOMAP_AREACOLOR_OPERATIONS
+
 // ZTA
 /area/horizon/zta
 	name = "Horizon - ZTA Weapon System"
diff --git a/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm b/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm
index c304e551976..1f0c442486e 100644
--- a/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm
+++ b/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm
@@ -1,16 +1,17 @@
 //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
-"aaa" = (
-/turf/simulated/wall/r_wall,
-/area/security/warden)
-"aac" = (
-/turf/simulated/wall/r_wall,
-/area/security/prison)
 "aae" = (
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
-	dir = 1
+/obj/machinery/flasher{
+	id = "permflash"
 	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/effect/floor_decal/industrial/outline/security,
 /turf/simulated/floor/tiled,
-/area/security/prison)
+/area/horizon/security/brig)
 "aal" = (
 /obj/machinery/light{
 	dir = 8
@@ -106,7 +107,7 @@
 	dir = 5
 	},
 /turf/simulated/floor/tiled,
-/area/security/main)
+/area/horizon/security/equipment)
 "abA" = (
 /obj/effect/floor_decal/industrial/warning/corner{
 	dir = 4
@@ -165,7 +166,7 @@
 	opacity = 0
 	},
 /turf/simulated/floor/tiled/dark/full,
-/area/security/lobby)
+/area/horizon/security/lobby)
 "acA" = (
 /obj/machinery/atmospherics/pipe/manifold/visible{
 	dir = 4
@@ -473,12 +474,13 @@
 /turf/simulated/floor/tiled,
 /area/horizon/hallway/deck_two/fore)
 "amI" = (
-/obj/structure/cable/green{
-	icon_state = "0-2"
+/obj/structure/bed/padded,
+/obj/item/bedsheet/blue,
+/obj/effect/floor_decal/corner/paleblue/full{
+	dir = 8
 	},
-/obj/effect/map_effect/window_spawner/full/reinforced/grille/firedoor,
 /turf/simulated/floor/tiled/dark/full,
-/area/security/prison)
+/area/horizon/security/brig)
 "anJ" = (
 /obj/machinery/atmospherics/pipe/simple/hidden{
 	dir = 10
@@ -494,6 +496,23 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/horizon/zta)
+"anU" = (
+/obj/structure/window/shuttle/scc_space_ship,
+/obj/structure/grille,
+/obj/machinery/door/blast/regular{
+	density = 0;
+	dir = 4;
+	icon_state = "pdoor0";
+	id = "Security Lockdown";
+	name = "Security Blast Door";
+	opacity = 0
+	},
+/obj/machinery/door/firedoor,
+/obj/structure/cable/green{
+	icon_state = "0-8"
+	},
+/turf/simulated/floor/plating,
+/area/horizon/security/hallway)
 "aob" = (
 /obj/structure/railing/mapped{
 	dir = 4
@@ -677,7 +696,7 @@
 /obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/manifold4w/hidden/supply,
 /turf/simulated/floor/tiled,
-/area/security/brig)
+/area/horizon/security/hallway)
 "arb" = (
 /obj/effect/floor_decal/corner_wide/yellow{
 	dir = 10
@@ -1007,6 +1026,23 @@
 /obj/effect/floor_decal/industrial/hatch/yellow,
 /turf/simulated/floor/tiled/dark/full,
 /area/engineering/engine_room/tesla)
+"avW" = (
+/obj/structure/window/shuttle/scc_space_ship,
+/obj/structure/grille,
+/obj/machinery/door/blast/regular{
+	density = 0;
+	dir = 4;
+	icon_state = "pdoor0";
+	id = "Security Lockdown";
+	name = "Security Blast Door";
+	opacity = 0
+	},
+/obj/machinery/door/firedoor,
+/obj/structure/cable/green{
+	icon_state = "0-4"
+	},
+/turf/simulated/floor/plating,
+/area/horizon/security/hallway)
 "aww" = (
 /obj/effect/floor_decal/industrial/warning{
 	dir = 9
@@ -1101,7 +1137,7 @@
 	},
 /obj/effect/floor_decal/industrial/outline/security,
 /turf/simulated/floor/tiled,
-/area/security/prison)
+/area/horizon/security/brig)
 "ayc" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -1276,7 +1312,7 @@
 	},
 /obj/effect/floor_decal/industrial/outline/yellow,
 /turf/simulated/floor/tiled,
-/area/security/investigations)
+/area/horizon/security/investigations_hallway)
 "aAu" = (
 /obj/structure/table/wood,
 /obj/item/flame/candle{
@@ -1522,7 +1558,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/effect/floor_decal/corner/paleblue/full,
 /turf/simulated/floor/tiled,
-/area/security/brig/processing_secondary)
+/area/horizon/security/holding_cell_b)
 "aHk" = (
 /obj/machinery/atmospherics/pipe/simple/hidden{
 	dir = 4
@@ -1591,7 +1627,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/tiled,
-/area/security/main)
+/area/horizon/security/equipment)
 "aIP" = (
 /obj/machinery/atmospherics/portables_connector{
 	dir = 4
@@ -1648,7 +1684,7 @@
 	dir = 1
 	},
 /turf/simulated/floor/tiled,
-/area/security/armory)
+/area/horizon/security/armoury)
 "aKU" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/random/junk,
@@ -1661,12 +1697,12 @@
 /turf/simulated/floor/plating,
 /area/maintenance/wing/starboard)
 "aLq" = (
-/obj/structure/bed/stool/padded/red,
 /obj/structure/cable/green{
 	icon_state = "1-2"
 	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /turf/simulated/floor/tiled,
-/area/security/prison)
+/area/horizon/security/brig)
 "aMa" = (
 /obj/structure/cable/green{
 	icon_state = "4-8"
@@ -1819,7 +1855,7 @@
 /obj/structure/closet/secure_closet/security,
 /obj/effect/floor_decal/industrial/outline/security,
 /turf/simulated/floor/tiled,
-/area/security/main)
+/area/horizon/security/equipment)
 "aOS" = (
 /obj/effect/floor_decal/industrial/loading/yellow{
 	dir = 8
@@ -1895,7 +1931,7 @@
 	dir = 6
 	},
 /turf/simulated/floor/tiled,
-/area/security/main)
+/area/horizon/security/equipment)
 "aRr" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -2087,7 +2123,7 @@
 /obj/effect/floor_decal/corner/paleblue/full,
 /obj/effect/floor_decal/industrial/outline/yellow,
 /turf/simulated/floor/tiled,
-/area/security/prison)
+/area/horizon/security/brig)
 "aTO" = (
 /obj/machinery/honey_extractor{
 	density = 1
@@ -2146,7 +2182,7 @@
 	dir = 6
 	},
 /turf/simulated/floor/tiled,
-/area/security/brig/processing)
+/area/horizon/security/holding_cell_a)
 "aVo" = (
 /obj/machinery/light/small{
 	dir = 8
@@ -2170,7 +2206,7 @@
 	},
 /obj/effect/floor_decal/industrial/outline/security,
 /turf/simulated/floor/tiled,
-/area/security/main)
+/area/horizon/security/equipment)
 "aWi" = (
 /obj/structure/railing/mapped,
 /obj/structure/cable{
@@ -2419,7 +2455,7 @@
 	dir = 8
 	},
 /turf/simulated/floor/tiled,
-/area/security/main)
+/area/horizon/security/equipment)
 "bbI" = (
 /obj/effect/floor_decal/corner/green{
 	dir = 5
@@ -2572,7 +2608,7 @@
 /obj/structure/disposalpipe/segment,
 /obj/effect/floor_decal/industrial/hatch/yellow,
 /turf/simulated/floor/tiled/full,
-/area/security/prison)
+/area/horizon/security/brig)
 "beY" = (
 /obj/structure/grille,
 /turf/simulated/open/airless,
@@ -2679,7 +2715,7 @@
 	icon_state = "2-8"
 	},
 /turf/simulated/floor/tiled,
-/area/security/brig)
+/area/horizon/security/hallway)
 "biE" = (
 /obj/machinery/camera/network/engineering{
 	c_tag = "Engineering - Hallway 2";
@@ -2717,18 +2753,17 @@
 /turf/simulated/floor/tiled/dark,
 /area/rnd/xenobiology)
 "bkn" = (
-/obj/machinery/power/apc/low{
-	dir = 8;
-	name = "west bump";
-	pixel_x = -24
-	},
 /obj/structure/cable/green{
 	icon_state = "0-4"
 	},
 /obj/machinery/firealarm/south,
 /obj/effect/floor_decal/corner/paleblue/full,
+/obj/machinery/power/apc/low{
+	dir = 8;
+	pixel_x = -24
+	},
 /turf/simulated/floor/tiled,
-/area/security/brig/processing)
+/area/horizon/security/holding_cell_a)
 "bkv" = (
 /obj/structure/cable{
 	icon_state = "1-4"
@@ -2764,7 +2799,7 @@
 "blC" = (
 /obj/effect/map_effect/window_spawner/full/reinforced/firedoor,
 /turf/simulated/floor/tiled/dark/full,
-/area/security/warden)
+/area/horizon/security/warden)
 "blJ" = (
 /obj/machinery/door/airlock/external{
 	frequency = 1380;
@@ -2845,6 +2880,13 @@
 	},
 /turf/simulated/floor/wood,
 /area/medical/psych)
+"bmY" = (
+/obj/effect/map_effect/window_spawner/full/reinforced/grille/firedoor,
+/obj/structure/cable/green{
+	icon_state = "0-4"
+	},
+/turf/simulated/floor/tiled/dark/full,
+/area/horizon/security/warden)
 "bnQ" = (
 /obj/effect/floor_decal/corner/green{
 	dir = 9
@@ -2988,9 +3030,9 @@
 /obj/effect/floor_decal/corner/paleblue{
 	dir = 6
 	},
-/obj/effect/floor_decal/industrial/hatch/yellow,
+/obj/effect/floor_decal/industrial/hatch/grey,
 /turf/simulated/floor/tiled,
-/area/security/prison)
+/area/horizon/security/brig)
 "bsj" = (
 /obj/machinery/atmospherics/binary/pump{
 	dir = 4;
@@ -3199,15 +3241,17 @@
 /turf/simulated/open/airless,
 /area/horizon/exterior)
 "bxZ" = (
-/obj/structure/sink{
-	pixel_y = 21
-	},
-/obj/structure/mirror{
-	pixel_y = 32
-	},
 /obj/effect/floor_decal/corner/paleblue/diagonal,
+/obj/machinery/shower{
+	pixel_y = 20
+	},
+/obj/structure/curtain/open/shower,
+/obj/random/soap,
+/obj/structure/bed/handrail{
+	dir = 8
+	},
 /turf/simulated/floor/tiled/white,
-/area/security/prison)
+/area/horizon/security/brig)
 "byh" = (
 /obj/machinery/newscaster{
 	pixel_x = -32
@@ -3506,7 +3550,7 @@
 /area/maintenance/wing/port/far)
 "bDo" = (
 /turf/simulated/wall/r_wall,
-/area/security/lobby)
+/area/horizon/security/brig)
 "bDv" = (
 /obj/machinery/camera/network/research{
 	c_tag = "Research - Corridor Camera 3"
@@ -3566,22 +3610,15 @@
 /turf/simulated/floor/carpet/rubber,
 /area/engineering/engine_monitoring)
 "bFU" = (
-/obj/machinery/door/blast/regular{
-	density = 0;
-	icon_state = "pdoor0";
-	id = "Brig Lockdown";
-	name = "Brig Lockdown Door";
-	opacity = 0
-	},
 /obj/machinery/door/airlock/glass_security{
-	autoclose = 0;
 	id_tag = "cell_2";
 	name = "Cell B";
-	req_access = list(2)
+	req_access = list(2);
+	autoclose = 0
 	},
 /obj/effect/floor_decal/industrial/hatch/yellow,
 /turf/simulated/floor/tiled/full,
-/area/security/prison)
+/area/horizon/security/brig)
 "bGg" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -3653,13 +3690,13 @@
 /turf/simulated/floor/wood,
 /area/chapel/office)
 "bHb" = (
-/obj/machinery/atmospherics/unary/vent_pump/on,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/effect/floor_decal/corner/paleblue{
 	dir = 10
 	},
+/obj/machinery/atmospherics/unary/vent_scrubber/on,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /turf/simulated/floor/tiled,
-/area/security/prison)
+/area/horizon/security/brig)
 "bHe" = (
 /turf/simulated/floor/tiled,
 /area/engineering/locker_room)
@@ -3732,9 +3769,6 @@
 	},
 /turf/simulated/floor/tiled,
 /area/hallway/engineering)
-"bIi" = (
-/turf/simulated/wall/shuttle/scc_space_ship/cardinal,
-/area/security/armory)
 "bIt" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/hologram/holopad,
@@ -3823,6 +3857,12 @@
 /turf/simulated/floor/lino/grey,
 /area/horizon/bar)
 "bLu" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 5
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 5
+	},
 /obj/structure/cable/green{
 	icon_state = "1-2"
 	},
@@ -3830,7 +3870,7 @@
 	icon_state = "1-4"
 	},
 /turf/simulated/floor/tiled,
-/area/security/brig)
+/area/horizon/security/hallway)
 "bLB" = (
 /obj/item/modular_computer/console/preset/engineering{
 	dir = 4
@@ -3867,7 +3907,7 @@
 "bOe" = (
 /obj/effect/floor_decal/corner_wide/paleblue,
 /turf/simulated/floor/tiled/dark/full,
-/area/security/armory)
+/area/horizon/security/armoury)
 "bOr" = (
 /obj/machinery/atmospherics/pipe/simple/hidden{
 	dir = 9
@@ -4014,13 +4054,6 @@
 /obj/effect/floor_decal/industrial/outline/yellow,
 /turf/simulated/floor/tiled/dark,
 /area/engineering/engine_waste)
-"bPH" = (
-/obj/machinery/light,
-/obj/effect/floor_decal/corner/paleblue{
-	dir = 10
-	},
-/turf/simulated/floor/tiled,
-/area/security/lobby)
 "bQd" = (
 /obj/effect/floor_decal/corner/green{
 	dir = 10
@@ -4161,7 +4194,7 @@
 	dir = 1
 	},
 /turf/simulated/floor/tiled,
-/area/security/brig)
+/area/horizon/security/hallway)
 "bTz" = (
 /obj/effect/floor_decal/corner/grey/diagonal,
 /obj/machinery/disposal/small/east,
@@ -4236,13 +4269,7 @@
 	},
 /obj/effect/floor_decal/industrial/outline/security,
 /turf/simulated/floor/tiled,
-/area/security/prison)
-"bUE" = (
-/obj/effect/floor_decal/corner/paleblue{
-	dir = 6
-	},
-/turf/simulated/floor/tiled,
-/area/security/main)
+/area/horizon/security/brig)
 "bUN" = (
 /obj/effect/map_effect/window_spawner/full/reinforced/polarized/firedoor{
 	id = "polarized_deck2_workshop"
@@ -4377,15 +4404,15 @@
 /turf/simulated/floor/plating,
 /area/operations/lobby)
 "bYu" = (
-/obj/structure/bed/stool/chair/office/dark{
-	dir = 1
+/obj/structure/bed/stool/chair/office/light{
+	dir = 4
 	},
 /obj/effect/floor_decal/corner/paleblue/full,
 /obj/structure/cable/green{
-	icon_state = "4-8"
+	icon_state = "1-2"
 	},
 /turf/simulated/floor/tiled,
-/area/security/prison)
+/area/horizon/security/brig)
 "bYB" = (
 /obj/machinery/power/apc{
 	dir = 8;
@@ -4498,7 +4525,7 @@
 	dir = 5
 	},
 /turf/simulated/floor/tiled,
-/area/security/brig)
+/area/horizon/security/hallway)
 "caj" = (
 /obj/effect/floor_decal/industrial/warning{
 	dir = 6
@@ -4815,6 +4842,9 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/rnd/xenobiology/xenoflora)
+"cjC" = (
+/turf/simulated/wall,
+/area/horizon/security/holding_cell_a)
 "cjD" = (
 /turf/simulated/wall/r_wall,
 /area/rnd/xenobiology/xenoflora_hazard)
@@ -5128,7 +5158,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/tiled,
-/area/security/brig)
+/area/horizon/security/hallway)
 "cww" = (
 /obj/effect/map_effect/airlock/s_to_n/long/square/wide{
 	name = "Deck 2 Starboard Aft Maintenance Airlock (2001)";
@@ -5154,7 +5184,7 @@
 	dir = 9
 	},
 /turf/simulated/floor/tiled,
-/area/security/main)
+/area/horizon/security/equipment)
 "cwO" = (
 /obj/machinery/door/firedoor,
 /obj/structure/window/shuttle/scc_space_ship,
@@ -5196,11 +5226,7 @@
 	dir = 10
 	},
 /turf/simulated/floor/tiled,
-/area/security/brig)
-"cxO" = (
-/obj/effect/map_effect/window_spawner/full/reinforced/firedoor,
-/turf/simulated/floor/tiled/dark/full,
-/area/security/main)
+/area/horizon/security/hallway)
 "cyG" = (
 /obj/machinery/door/blast/regular/open{
 	dir = 4;
@@ -5241,8 +5267,25 @@
 /turf/simulated/floor/plating,
 /area/maintenance/wing/starboard/far)
 "czL" = (
-/turf/simulated/wall/shuttle/scc_space_ship/cardinal,
-/area/security/brig)
+/obj/effect/map_effect/window_spawner/full/reinforced/grille/firedoor,
+/obj/structure/cable/green{
+	icon_state = "0-8"
+	},
+/obj/machinery/door/blast/shutters/open{
+	id = "shutters_deck1_security_cell_isolation";
+	dir = 4;
+	name = "Isolation Cell Window Shutter"
+	},
+/obj/machinery/door/blast/regular{
+	density = 0;
+	icon_state = "pdoor0";
+	id = "Brig Lockdown";
+	name = "Brig Lockdown Blast Door";
+	opacity = 0;
+	dir = 2
+	},
+/turf/simulated/floor/tiled/dark/full,
+/area/horizon/security/brig)
 "czP" = (
 /obj/machinery/light/small,
 /obj/machinery/computer/ship/navigation{
@@ -5258,7 +5301,7 @@
 	dir = 10
 	},
 /turf/simulated/floor/tiled,
-/area/security/brig)
+/area/horizon/security/hallway)
 "cAb" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -5337,7 +5380,7 @@
 	},
 /obj/effect/floor_decal/corner/paleblue/full,
 /turf/simulated/floor/tiled,
-/area/security/security_office)
+/area/horizon/security/office)
 "cBY" = (
 /obj/machinery/botany/extractor,
 /obj/effect/floor_decal/corner/mauve{
@@ -5460,6 +5503,12 @@
 	},
 /turf/simulated/floor/tiled,
 /area/hallway/primary/central_one)
+"cIx" = (
+/obj/structure/cable/green{
+	icon_state = "1-2"
+	},
+/turf/simulated/floor/tiled,
+/area/horizon/security/brig)
 "cIz" = (
 /obj/effect/floor_decal/corner_wide/green{
 	dir = 10
@@ -5704,7 +5753,7 @@
 	dir = 10
 	},
 /turf/simulated/floor/tiled,
-/area/security/main)
+/area/horizon/security/equipment)
 "cOk" = (
 /obj/effect/floor_decal/corner/green{
 	dir = 9
@@ -5742,7 +5791,7 @@
 	dir = 5
 	},
 /turf/simulated/floor/tiled,
-/area/security/main)
+/area/horizon/security/equipment)
 "cOC" = (
 /obj/structure/bed/stool/chair{
 	dir = 4
@@ -5790,12 +5839,9 @@
 /obj/effect/floor_decal/corner/paleblue/full{
 	dir = 8
 	},
+/obj/effect/floor_decal/industrial/hatch/grey,
 /turf/simulated/floor/tiled,
-/area/security/prison)
-"cQu" = (
-/obj/machinery/atmospherics/unary/vent_scrubber/on,
-/turf/simulated/floor/tiled,
-/area/security/brig/processing_secondary)
+/area/horizon/security/brig)
 "cQw" = (
 /turf/simulated/wall/r_wall,
 /area/maintenance/research_port)
@@ -6098,14 +6144,10 @@
 /turf/simulated/floor/tiled/dark/full,
 /area/engineering/engine_room/tesla)
 "cZa" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 9
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 9
-	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /turf/simulated/floor/tiled,
-/area/security/prison)
+/area/horizon/security/brig)
 "cZc" = (
 /obj/machinery/atmospherics/unary/freezer{
 	dir = 8;
@@ -6198,21 +6240,16 @@
 /turf/simulated/floor/tiled,
 /area/rnd/hallway)
 "dbd" = (
-/obj/structure/cryofeed,
-/obj/structure/railing/mapped{
-	dir = 8
+/obj/effect/floor_decal/corner/paleblue/full{
+	dir = 4
 	},
-/obj/structure/railing/mapped{
-	dir = 1
-	},
-/obj/effect/floor_decal/industrial/warning/full,
-/obj/structure/lattice/catwalk/indoor/grate,
-/turf/simulated/floor/plating,
-/area/security/prison)
+/obj/machinery/cryopod,
+/turf/simulated/floor/tiled,
+/area/horizon/security/brig)
 "dbA" = (
 /obj/effect/floor_decal/corner/paleblue/diagonal,
 /turf/simulated/floor/tiled/white,
-/area/security/main)
+/area/horizon/security/washroom)
 "dcF" = (
 /obj/machinery/light{
 	dir = 4
@@ -6269,17 +6306,23 @@
 /turf/simulated/floor/plating,
 /area/engineering/engine_room/tesla)
 "ddH" = (
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
 	},
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/unary/vent_pump/on{
+	dir = 8
+	},
 /obj/effect/floor_decal/corner/paleblue{
 	dir = 9
 	},
 /obj/structure/cable/green{
-	icon_state = "4-8"
+	icon_state = "2-8"
 	},
 /turf/simulated/floor/tiled,
-/area/security/prison)
+/area/horizon/security/brig)
 "ddX" = (
 /obj/structure/reagent_dispensers/cookingoil,
 /turf/simulated/floor/tiled/freezer{
@@ -6375,7 +6418,7 @@
 /obj/item/folder/sec,
 /obj/item/stamp/warden,
 /turf/simulated/floor/tiled/dark,
-/area/security/warden)
+/area/horizon/security/warden)
 "dht" = (
 /obj/effect/floor_decal/corner_wide/green,
 /obj/machinery/atmospherics/unary/vent_pump/on{
@@ -6398,7 +6441,7 @@
 	},
 /obj/effect/floor_decal/industrial/warning,
 /turf/simulated/floor/tiled,
-/area/security/main)
+/area/horizon/security/hallway)
 "dim" = (
 /obj/structure/bed/stool/bar/padded/red,
 /obj/effect/floor_decal/spline/plain/cee{
@@ -6511,7 +6554,7 @@
 	name = "Security Office"
 	},
 /turf/simulated/floor/tiled/dark/full,
-/area/security/security_office)
+/area/horizon/security/office)
 "dkq" = (
 /obj/machinery/atmospherics/unary/vent_pump/on,
 /obj/machinery/alarm{
@@ -6612,7 +6655,7 @@
 	},
 /obj/effect/floor_decal/industrial/outline/yellow,
 /turf/simulated/floor/tiled,
-/area/security/prison)
+/area/horizon/security/brig)
 "dlT" = (
 /obj/structure/table/standard,
 /obj/item/device/flash/synthetic{
@@ -6823,7 +6866,7 @@
 	pixel_y = 6
 	},
 /turf/simulated/floor/tiled,
-/area/security/armory)
+/area/horizon/security/armoury)
 "drk" = (
 /obj/structure/bed/stool/chair/office/dark{
 	dir = 8
@@ -6837,7 +6880,7 @@
 	pixel_y = -24
 	},
 /turf/simulated/floor/tiled,
-/area/security/security_office)
+/area/horizon/security/office)
 "drw" = (
 /obj/machinery/conveyor{
 	dir = 1;
@@ -7045,7 +7088,7 @@
 /obj/machinery/door/firedoor,
 /obj/effect/floor_decal/industrial/hatch/yellow,
 /turf/simulated/floor/tiled,
-/area/security/brig)
+/area/horizon/security/hallway)
 "dwP" = (
 /obj/effect/floor_decal/corner_wide/grey/diagonal,
 /obj/structure/table/standard,
@@ -7283,23 +7326,20 @@
 /turf/simulated/floor/tiled,
 /area/rnd/hallway)
 "dDo" = (
-/obj/structure/table/steel,
+/obj/structure/table/reinforced,
 /obj/item/paper_bin{
-	pixel_x = -8;
-	pixel_y = 7
+	pixel_x = 8;
+	pixel_y = 2
 	},
 /obj/item/pen{
-	pixel_x = -9;
-	pixel_y = 8
+	pixel_x = 8;
+	pixel_y = 3
 	},
 /obj/effect/floor_decal/corner/paleblue/full{
 	dir = 4
 	},
-/obj/structure/cable/green{
-	icon_state = "4-8"
-	},
 /turf/simulated/floor/tiled,
-/area/security/prison)
+/area/horizon/security/brig)
 "dDp" = (
 /obj/structure/table/reinforced,
 /obj/machinery/door/firedoor,
@@ -7548,13 +7588,13 @@
 	},
 /obj/effect/floor_decal/industrial/hatch/yellow,
 /turf/simulated/floor/tiled,
-/area/security/brig)
+/area/horizon/security/hallway)
 "dKi" = (
 /obj/effect/floor_decal/corner/paleblue{
 	dir = 9
 	},
 /turf/simulated/floor/tiled,
-/area/security/prison)
+/area/horizon/security/hallway)
 "dKA" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -7607,7 +7647,7 @@
 	dir = 8
 	},
 /turf/simulated/floor/tiled,
-/area/security/brig/processing)
+/area/horizon/security/holding_cell_a)
 "dLn" = (
 /obj/machinery/light{
 	dir = 1
@@ -7650,7 +7690,7 @@
 	dir = 8
 	},
 /turf/simulated/floor/tiled,
-/area/security/lobby)
+/area/horizon/security/lobby)
 "dLD" = (
 /obj/effect/map_effect/window_spawner/full/reinforced/firedoor,
 /turf/simulated/floor/tiled/dark/full,
@@ -7813,7 +7853,7 @@
 	},
 /obj/effect/floor_decal/industrial/outline/security,
 /turf/simulated/floor/tiled,
-/area/security/brig/processing)
+/area/horizon/security/holding_cell_a)
 "dQZ" = (
 /obj/machinery/ai_status_display,
 /turf/simulated/wall,
@@ -7910,13 +7950,13 @@
 	dir = 4
 	},
 /obj/item/device/radio/intercom{
-	pixel_y = 25
+	pixel_y = 24
 	},
 /obj/effect/floor_decal/corner/paleblue{
 	dir = 5
 	},
 /turf/simulated/floor/tiled,
-/area/security/prison)
+/area/horizon/security/brig)
 "dVt" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
@@ -8082,26 +8122,11 @@
 /turf/template_noop,
 /area/template_noop)
 "dXF" = (
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
-	dir = 1
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
 /obj/effect/floor_decal/corner/paleblue{
 	dir = 1
 	},
 /turf/simulated/floor/tiled,
-/area/security/prison)
-"dYb" = (
-/obj/effect/floor_decal/corner/paleblue{
-	dir = 10
-	},
-/obj/structure/cable/green{
-	icon_state = "1-4"
-	},
-/turf/simulated/floor/tiled,
-/area/security/brig)
+/area/horizon/security/brig)
 "dYe" = (
 /obj/effect/floor_decal/corner/black{
 	dir = 10
@@ -8167,7 +8192,7 @@
 	dir = 1
 	},
 /turf/simulated/floor/tiled/white,
-/area/security/main)
+/area/horizon/security/washroom)
 "dZG" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
@@ -8275,7 +8300,7 @@
 /obj/effect/floor_decal/corner/paleblue/full,
 /obj/effect/floor_decal/industrial/hatch/yellow,
 /turf/simulated/floor/tiled,
-/area/security/main)
+/area/horizon/security/equipment)
 "ebY" = (
 /obj/structure/railing/mapped{
 	dir = 8
@@ -8341,14 +8366,21 @@
 /obj/effect/floor_decal/corner_wide/paleblue/full{
 	dir = 8
 	},
+/obj/machinery/button/remote/blast_door{
+	id = "armory";
+	name = "Armoury Shutters";
+	req_access = list(58);
+	pixel_x = -25;
+	dir = 4
+	},
 /obj/effect/floor_decal/industrial/warning{
 	dir = 1
 	},
 /turf/simulated/floor/tiled/dark/full,
-/area/security/armory)
+/area/horizon/security/armoury)
 "efA" = (
 /turf/simulated/wall/r_wall,
-/area/crew_quarters/heads/hos)
+/area/horizon/security/head_of_security)
 "egf" = (
 /obj/structure/ladder/up{
 	pixel_y = 13
@@ -8442,12 +8474,6 @@
 /obj/effect/floor_decal/industrial/warning/full,
 /turf/simulated/floor/reinforced,
 /area/rnd/telesci)
-"ejO" = (
-/obj/effect/floor_decal/corner/paleblue{
-	dir = 6
-	},
-/turf/simulated/floor/tiled,
-/area/security/lobby)
 "ejU" = (
 /obj/effect/floor_decal/corner/green{
 	dir = 6
@@ -8504,7 +8530,7 @@
 "elh" = (
 /obj/structure/stairs/north,
 /turf/simulated/floor/tiled/ramp,
-/area/security/investigations)
+/area/horizon/security/investigations_hallway)
 "elm" = (
 /obj/structure/cable/green{
 	icon_state = "1-2"
@@ -8532,7 +8558,7 @@
 	},
 /obj/effect/floor_decal/industrial/outline/security,
 /turf/simulated/floor/tiled,
-/area/security/main)
+/area/horizon/security/equipment)
 "ema" = (
 /obj/structure/shuttle_part/scc_space_ship{
 	icon_state = "d3-6"
@@ -8632,14 +8658,6 @@
 	},
 /turf/simulated/floor/tiled,
 /area/operations/lobby)
-"eoR" = (
-/obj/effect/floor_decal/industrial/hatch/yellow,
-/obj/machinery/door/airlock/highsecurity{
-	name = "Armoury";
-	req_access = list(3)
-	},
-/turf/simulated/floor/tiled/full,
-/area/security/armory)
 "epe" = (
 /obj/machinery/light/small/emergency{
 	dir = 1
@@ -8788,7 +8806,7 @@
 "erH" = (
 /obj/machinery/atmospherics/unary/vent_scrubber/on,
 /turf/simulated/floor/tiled,
-/area/security/brig/processing)
+/area/horizon/security/holding_cell_a)
 "erY" = (
 /turf/simulated/floor/tiled,
 /area/maintenance/wing/port)
@@ -9159,7 +9177,7 @@
 /obj/item/device/megaphone/sec,
 /obj/item/device/suit_cooling_unit,
 /turf/simulated/floor/wood,
-/area/crew_quarters/heads/hos)
+/area/horizon/security/head_of_security)
 "eDf" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -9237,7 +9255,7 @@
 	},
 /mob/living/simple_animal/hostile/commanded/dog/columbo,
 /turf/simulated/floor/carpet,
-/area/crew_quarters/heads/hos)
+/area/horizon/security/head_of_security)
 "eEx" = (
 /obj/machinery/light/small,
 /obj/effect/floor_decal/spline/fancy/wood/cee,
@@ -9302,7 +9320,7 @@
 	dir = 5
 	},
 /turf/simulated/floor/tiled,
-/area/security/main)
+/area/horizon/security/equipment)
 "eGl" = (
 /obj/structure/railing/mapped,
 /obj/structure/lattice,
@@ -9376,7 +9394,7 @@
 	dir = 5
 	},
 /turf/simulated/floor/tiled,
-/area/security/brig)
+/area/horizon/security/hallway)
 "eIE" = (
 /obj/machinery/door/airlock{
 	id_tag = "cargobreak_t2";
@@ -9427,7 +9445,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/tiled,
-/area/security/brig)
+/area/horizon/security/hallway)
 "eKP" = (
 /obj/effect/floor_decal/industrial/warning{
 	dir = 1
@@ -9490,7 +9508,7 @@
 	},
 /obj/effect/map_effect/window_spawner/full/reinforced/grille/firedoor,
 /turf/simulated/floor/tiled/dark/full,
-/area/security/brig/processing)
+/area/horizon/security/holding_cell_b)
 "eOl" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/effect/floor_decal/corner/grey/diagonal,
@@ -9517,7 +9535,7 @@
 	dir = 5
 	},
 /turf/simulated/floor/tiled,
-/area/security/prison)
+/area/horizon/security/brig)
 "ePc" = (
 /obj/effect/floor_decal/corner/yellow{
 	dir = 5
@@ -9608,21 +9626,13 @@
 	},
 /turf/simulated/floor/plating,
 /area/horizon/zta)
-"eQY" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
+"eQD" = (
+/obj/machinery/door/airlock{
+	name = "Brig Showers"
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/obj/machinery/door/blast/regular{
-	id = "shutters_deck1_security_cell_4";
-	name = "Cell Door"
-	},
-/obj/machinery/door/firedoor,
 /obj/effect/floor_decal/industrial/hatch/yellow,
 /turf/simulated/floor/tiled/full,
-/area/security/prison)
+/area/horizon/security/brig)
 "eRC" = (
 /obj/effect/floor_decal/corner/black/diagonal,
 /obj/machinery/atmospherics/pipe/manifold/hidden{
@@ -9702,12 +9712,11 @@
 /area/horizon/zta)
 "eUB" = (
 /obj/machinery/flasher{
-	id = "permflash";
-	name = "Floor mounted flash"
+	id = "permflash"
 	},
-/obj/effect/floor_decal/industrial/outline/yellow,
+/obj/effect/floor_decal/industrial/outline/security,
 /turf/simulated/floor/tiled,
-/area/security/prison)
+/area/horizon/security/brig)
 "eUT" = (
 /obj/structure/bed/stool/chair/padded/black{
 	dir = 4
@@ -9841,11 +9850,11 @@
 	dir = 9
 	},
 /turf/simulated/floor/tiled,
-/area/security/armory)
+/area/horizon/security/armoury)
 "eXU" = (
 /obj/machinery/hologram/holopad,
 /turf/simulated/floor/tiled,
-/area/security/armory)
+/area/horizon/security/armoury)
 "eYp" = (
 /obj/machinery/power/smes/buildable{
 	RCon_tag = "Substation - Port Wing"
@@ -9866,7 +9875,7 @@
 	pixel_x = -32
 	},
 /turf/simulated/floor/carpet,
-/area/crew_quarters/heads/hos)
+/area/horizon/security/head_of_security)
 "eYD" = (
 /obj/machinery/atmospherics/portables_connector{
 	dir = 4
@@ -9982,12 +9991,11 @@
 /turf/simulated/floor/tiled,
 /area/operations/lobby)
 "eZZ" = (
-/obj/machinery/cryopod,
 /obj/effect/floor_decal/corner/paleblue{
 	dir = 10
 	},
 /turf/simulated/floor/tiled,
-/area/security/prison)
+/area/horizon/security/brig)
 "fai" = (
 /obj/structure/bed/handrail{
 	dir = 8;
@@ -10084,7 +10092,7 @@
 	dir = 8
 	},
 /turf/simulated/floor/tiled,
-/area/security/security_office)
+/area/horizon/security/office)
 "fdh" = (
 /obj/structure/table/stone/marble,
 /obj/effect/floor_decal/corner/grey/diagonal,
@@ -10271,7 +10279,7 @@
 	dir = 1
 	},
 /turf/simulated/floor/tiled,
-/area/security/brig)
+/area/horizon/security/hallway)
 "ffe" = (
 /obj/structure/bed/stool/chair{
 	dir = 1
@@ -10478,7 +10486,7 @@
 	icon_state = "2-4"
 	},
 /turf/simulated/floor/tiled/dark/full,
-/area/security/security_office)
+/area/horizon/security/office)
 "fli" = (
 /obj/structure/cable/green{
 	icon_state = "4-8"
@@ -10591,13 +10599,13 @@
 	},
 /obj/effect/floor_decal/industrial/outline/security,
 /turf/simulated/floor/tiled,
-/area/security/brig/processing_secondary)
+/area/horizon/security/holding_cell_b)
 "fpQ" = (
 /obj/structure/cable/green{
 	icon_state = "4-8"
 	},
 /turf/simulated/floor/tiled,
-/area/security/security_office)
+/area/horizon/security/office)
 "fqg" = (
 /obj/effect/floor_decal/corner/black/diagonal,
 /obj/effect/decal/cleanable/dirt,
@@ -10655,7 +10663,7 @@
 	c_tag = "Security - Armoury Foyer"
 	},
 /turf/simulated/floor/tiled,
-/area/security/main)
+/area/horizon/security/equipment)
 "frL" = (
 /obj/effect/floor_decal/corner/blue/full{
 	dir = 1
@@ -10761,7 +10769,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /turf/simulated/floor/tiled/full,
-/area/security/armory)
+/area/horizon/security/armoury)
 "ftB" = (
 /obj/structure/curtain/black{
 	icon_state = "open";
@@ -10790,7 +10798,7 @@
 	dir = 5
 	},
 /turf/simulated/floor/tiled,
-/area/security/prison)
+/area/horizon/security/brig)
 "fuu" = (
 /turf/simulated/wall,
 /area/maintenance/wing/port/far)
@@ -10804,7 +10812,7 @@
 	},
 /obj/effect/floor_decal/industrial/hatch/red,
 /turf/simulated/floor/tiled/dark/full,
-/area/security/armory)
+/area/horizon/security/armoury)
 "fuX" = (
 /obj/effect/floor_decal/spline/fancy/wood/cee{
 	dir = 1
@@ -10996,7 +11004,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/tiled,
-/area/security/security_office)
+/area/horizon/security/office)
 "fAE" = (
 /obj/structure/table/rack,
 /obj/item/storage/toolbox/electrical,
@@ -11038,7 +11046,7 @@
 	},
 /obj/effect/floor_decal/industrial/outline/security,
 /turf/simulated/floor/tiled/dark/full,
-/area/security/armory)
+/area/horizon/security/armoury)
 "fCd" = (
 /obj/structure/cable/green{
 	icon_state = "4-8"
@@ -11198,8 +11206,12 @@
 	dir = 4
 	},
 /obj/effect/floor_decal/corner/paleblue/diagonal,
+/obj/structure/cable/green{
+	icon_state = "2-8"
+	},
+/obj/machinery/firealarm/east,
 /turf/simulated/floor/tiled/white,
-/area/security/main)
+/area/horizon/security/washroom)
 "fGD" = (
 /obj/effect/floor_decal/corner_wide/yellow{
 	dir = 10
@@ -11332,7 +11344,7 @@
 	dir = 5
 	},
 /turf/simulated/floor/tiled,
-/area/security/brig)
+/area/horizon/security/hallway)
 "fJv" = (
 /turf/simulated/wall/shuttle/scc_space_ship/cardinal,
 /area/engineering/engine_room/tesla)
@@ -11498,7 +11510,7 @@
 	dir = 5
 	},
 /turf/simulated/floor/tiled,
-/area/security/brig)
+/area/horizon/security/hallway)
 "fLU" = (
 /obj/machinery/power/smes/buildable{
 	RCon_tag = "Substation - Research"
@@ -11576,7 +11588,7 @@
 	},
 /obj/effect/floor_decal/industrial/hatch/yellow,
 /turf/simulated/floor/tiled,
-/area/security/brig)
+/area/horizon/security/hallway)
 "fOp" = (
 /obj/effect/floor_decal/corner_wide/lime/diagonal,
 /turf/simulated/floor/tiled/white,
@@ -11623,12 +11635,6 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/operations/break_room)
-"fPP" = (
-/obj/effect/floor_decal/corner/paleblue{
-	dir = 9
-	},
-/turf/simulated/floor/tiled,
-/area/security/brig)
 "fQa" = (
 /obj/machinery/atmospherics/pipe/manifold/visible/cyan{
 	dir = 8
@@ -11997,7 +12003,7 @@
 	},
 /obj/effect/floor_decal/industrial/outline/security,
 /turf/simulated/floor/tiled/dark/full,
-/area/security/armory)
+/area/horizon/security/armoury)
 "fZk" = (
 /obj/effect/floor_decal/corner/mauve/diagonal,
 /obj/structure/cable/green{
@@ -12118,7 +12124,7 @@
 	},
 /obj/effect/floor_decal/industrial/outline/security,
 /turf/simulated/floor/tiled/dark/full,
-/area/security/armory)
+/area/horizon/security/armoury)
 "gbk" = (
 /obj/machinery/atm{
 	pixel_y = 28
@@ -12142,7 +12148,7 @@
 	dir = 10
 	},
 /turf/simulated/floor/tiled,
-/area/security/lobby)
+/area/horizon/security/lobby)
 "gbT" = (
 /turf/simulated/floor/tiled,
 /area/engineering/lobby)
@@ -12246,7 +12252,7 @@
 	dir = 5
 	},
 /turf/simulated/floor/tiled,
-/area/security/armory)
+/area/horizon/security/armoury)
 "gei" = (
 /obj/structure/table/standard,
 /obj/effect/floor_decal/corner_wide/green/full{
@@ -12275,7 +12281,7 @@
 	},
 /obj/machinery/atmospherics/pipe/manifold/hidden/supply,
 /turf/simulated/floor/tiled,
-/area/security/main)
+/area/horizon/security/equipment)
 "gfj" = (
 /obj/effect/floor_decal/corner/grey/diagonal,
 /turf/simulated/floor/tiled/white,
@@ -12383,18 +12389,16 @@
 /turf/simulated/floor/tiled/dark/full,
 /area/horizon/secure_ammunition_storage)
 "ggA" = (
-/obj/structure/toilet{
-	dir = 4
-	},
 /obj/effect/floor_decal/corner/paleblue/diagonal,
-/obj/structure/bed/handrail{
-	dir = 1
+/obj/machinery/flasher{
+	id = "permflash";
+	pixel_x = -32
 	},
 /obj/machinery/light/small{
-	dir = 1
+	dir = 8
 	},
 /turf/simulated/floor/tiled/white,
-/area/security/prison)
+/area/horizon/security/brig)
 "ggC" = (
 /obj/structure/cable/green{
 	icon_state = "4-8"
@@ -12412,7 +12416,7 @@
 /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/manifold/hidden/supply,
 /turf/simulated/floor/tiled,
-/area/security/brig)
+/area/horizon/security/hallway)
 "gho" = (
 /obj/structure/window/reinforced{
 	dir = 4
@@ -12478,15 +12482,22 @@
 /turf/simulated/floor/tiled,
 /area/hallway/primary/central_one)
 "gis" = (
-/obj/structure/table/standard,
-/obj/item/material/minihoe,
-/obj/item/device/analyzer/plant_analyzer,
-/obj/item/clothing/head/bandana/hydro,
 /obj/effect/floor_decal/corner/paleblue{
 	dir = 10
 	},
+/obj/structure/table/rack,
+/obj/item/storage/box/snack{
+	desc = "A box full of snack foods. A label is attached that reads, 'Sorry about the microwaves.'";
+	name = "corporate care package";
+	pixel_y = 4
+	},
+/obj/item/storage/box/snack{
+	desc = "A box full of snack foods. A label is attached that reads, 'Sorry about the microwaves.'";
+	name = "corporate care package"
+	},
+/obj/effect/floor_decal/industrial/outline/grey,
 /turf/simulated/floor/tiled,
-/area/security/prison)
+/area/horizon/security/brig)
 "giw" = (
 /obj/effect/floor_decal/corner/green{
 	dir = 5
@@ -12544,7 +12555,7 @@
 	dir = 10
 	},
 /turf/simulated/floor/tiled,
-/area/security/brig)
+/area/horizon/security/hallway)
 "gkh" = (
 /obj/machinery/door/blast/shutters{
 	dir = 8;
@@ -12589,6 +12600,28 @@
 /obj/structure/window_frame/empty,
 /turf/simulated/floor/plating,
 /area/maintenance/wing/starboard/far)
+"glv" = (
+/obj/machinery/light{
+	dir = 8
+	},
+/obj/structure/cable/green{
+	icon_state = "1-2"
+	},
+/obj/structure/cable/green{
+	icon_state = "1-8"
+	},
+/obj/item/paper_bin{
+	pixel_x = -8;
+	pixel_y = 2
+	},
+/obj/item/pen{
+	pixel_x = -8;
+	pixel_y = 3
+	},
+/obj/effect/floor_decal/corner/paleblue/full,
+/obj/structure/table/reinforced,
+/turf/simulated/floor/tiled,
+/area/horizon/security/brig)
 "glx" = (
 /obj/machinery/atmospherics/pipe/simple/visible/black{
 	dir = 10
@@ -12717,7 +12750,7 @@
 	name = "Safety Shutter"
 	},
 /turf/simulated/floor/tiled/dark/full,
-/area/security/security_office)
+/area/horizon/security/office)
 "gnA" = (
 /obj/machinery/light{
 	dir = 1
@@ -12776,11 +12809,13 @@
 /obj/machinery/light{
 	dir = 4
 	},
-/obj/effect/floor_decal/corner/paleblue{
-	dir = 6
-	},
-/turf/simulated/floor/tiled,
-/area/security/prison)
+/obj/structure/table/standard,
+/obj/structure/bedsheetbin,
+/obj/item/toy/figure/hos,
+/obj/effect/floor_decal/corner/green/diagonal,
+/obj/effect/floor_decal/spline/plain/cee,
+/turf/simulated/floor/tiled/white,
+/area/horizon/security/brig)
 "gos" = (
 /obj/effect/floor_decal/corner/green/full{
 	dir = 4
@@ -12883,7 +12918,7 @@
 	icon_state = "pipe-c"
 	},
 /turf/simulated/floor/tiled,
-/area/security/brig)
+/area/horizon/security/hallway)
 "gqz" = (
 /obj/effect/floor_decal/corner/white{
 	dir = 4
@@ -12945,18 +12980,18 @@
 /obj/structure/cable/green{
 	icon_state = "1-8"
 	},
-/obj/structure/table/steel,
+/obj/effect/floor_decal/corner/paleblue/full,
+/obj/structure/table/reinforced,
 /obj/item/paper_bin{
 	pixel_x = -8;
-	pixel_y = 7
+	pixel_y = 2
 	},
 /obj/item/pen{
-	pixel_x = -9;
-	pixel_y = 8
+	pixel_x = -8;
+	pixel_y = 3
 	},
-/obj/effect/floor_decal/corner/paleblue/full,
 /turf/simulated/floor/tiled,
-/area/security/prison)
+/area/horizon/security/brig)
 "grQ" = (
 /obj/machinery/atmospherics/pipe/simple/visible{
 	dir = 10
@@ -13028,12 +13063,6 @@
 /obj/effect/floor_decal/corner/yellow/full,
 /turf/simulated/floor/tiled,
 /area/engineering/storage_eva)
-"gtn" = (
-/obj/effect/floor_decal/corner/paleblue{
-	dir = 10
-	},
-/turf/simulated/floor/tiled,
-/area/security/main)
 "gtw" = (
 /obj/structure/cable/green{
 	icon_state = "4-8"
@@ -13073,7 +13102,7 @@
 	},
 /obj/effect/floor_decal/industrial/outline/yellow,
 /turf/simulated/floor/tiled,
-/area/security/armory)
+/area/horizon/security/armoury)
 "guj" = (
 /obj/machinery/atmospherics/pipe/simple/visible/cyan{
 	dir = 5
@@ -13349,7 +13378,7 @@
 	dir = 10
 	},
 /turf/simulated/floor/tiled,
-/area/security/brig)
+/area/horizon/security/hallway)
 "gAP" = (
 /obj/machinery/camera/network/service{
 	c_tag = "Service - Deck 2 - Bar Hallway";
@@ -13421,7 +13450,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/tiled/dark/full,
-/area/security/armory)
+/area/horizon/security/armoury)
 "gBK" = (
 /obj/structure/bed/stool/chair/sofa/right/brown{
 	dir = 4
@@ -13564,18 +13593,17 @@
 	dir = 8
 	},
 /turf/simulated/floor/tiled,
-/area/security/brig)
+/area/horizon/security/hallway)
 "gEa" = (
-/obj/structure/reagent_dispensers/watertank,
-/obj/item/reagent_containers/glass/bucket,
 /obj/structure/cable/green{
 	icon_state = "4-8"
 	},
 /obj/effect/floor_decal/corner/paleblue{
 	dir = 10
 	},
+/obj/machinery/portable_atmospherics/hydroponics,
 /turf/simulated/floor/tiled,
-/area/security/prison)
+/area/horizon/security/brig)
 "gEf" = (
 /obj/machinery/portable_atmospherics/hydroponics,
 /obj/effect/floor_decal/industrial/outline/yellow,
@@ -13846,7 +13874,7 @@
 	opacity = 0
 	},
 /turf/simulated/floor/tiled/full,
-/area/security/brig)
+/area/horizon/security/hallway)
 "gKC" = (
 /obj/effect/floor_decal/corner/green/full{
 	dir = 1
@@ -13913,18 +13941,11 @@
 	dir = 5
 	},
 /turf/simulated/floor/tiled,
-/area/security/brig)
-"gMD" = (
-/obj/effect/map_effect/window_spawner/full/reinforced/grille/firedoor,
-/obj/structure/cable/green{
-	icon_state = "0-4"
-	},
-/turf/simulated/floor/tiled/dark/full,
-/area/security/security_office)
+/area/horizon/security/hallway)
 "gMP" = (
 /obj/effect/floor_decal/corner/paleblue,
 /turf/simulated/floor/tiled,
-/area/security/prison)
+/area/horizon/security/armoury)
 "gNk" = (
 /obj/structure/table/rack,
 /obj/machinery/door/window/brigdoor/eastleft{
@@ -13945,7 +13966,7 @@
 	},
 /obj/effect/floor_decal/industrial/outline/security,
 /turf/simulated/floor/tiled/dark/full,
-/area/security/armory)
+/area/horizon/security/armoury)
 "gNm" = (
 /obj/effect/floor_decal/industrial/warning{
 	dir = 10
@@ -13981,7 +14002,7 @@
 	dir = 5
 	},
 /turf/simulated/floor/tiled,
-/area/security/brig)
+/area/horizon/security/hallway)
 "gNQ" = (
 /obj/effect/floor_decal/corner/yellow{
 	dir = 6
@@ -14345,9 +14366,6 @@
 /obj/effect/floor_decal/industrial/outline/yellow,
 /turf/simulated/floor/tiled/dark,
 /area/engineering/engine_waste)
-"gXM" = (
-/turf/simulated/floor/tiled,
-/area/security/armory)
 "gYc" = (
 /obj/effect/floor_decal/corner/brown{
 	dir = 9
@@ -14444,7 +14462,7 @@
 	dir = 9
 	},
 /turf/simulated/floor/tiled,
-/area/security/brig)
+/area/horizon/security/hallway)
 "haK" = (
 /obj/structure/closet/walllocker/medical{
 	pixel_y = 32
@@ -14467,6 +14485,9 @@
 /obj/machinery/atmospherics/unary/vent_pump/on,
 /turf/simulated/floor/tiled,
 /area/hallway/engineering/tesla)
+"hcv" = (
+/turf/simulated/floor/tiled,
+/area/horizon/security/office)
 "hcF" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
@@ -14677,7 +14698,6 @@
 /turf/simulated/floor/tiled/freezer,
 /area/operations/break_room)
 "hgO" = (
-/obj/machinery/portable_atmospherics/hydroponics,
 /obj/machinery/light,
 /obj/structure/cable/green{
 	icon_state = "4-8"
@@ -14685,8 +14705,11 @@
 /obj/effect/floor_decal/corner/paleblue{
 	dir = 10
 	},
+/obj/structure/reagent_dispensers/watertank,
+/obj/item/reagent_containers/glass/bucket,
+/obj/effect/floor_decal/industrial/outline/grey,
 /turf/simulated/floor/tiled,
-/area/security/prison)
+/area/horizon/security/brig)
 "hhx" = (
 /obj/structure/cable/green{
 	icon_state = "0-2"
@@ -14787,7 +14810,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/tiled,
-/area/security/armory)
+/area/horizon/security/armoury)
 "hjG" = (
 /obj/structure/lattice/catwalk/indoor/grate,
 /turf/simulated/floor/bluegrid,
@@ -14926,12 +14949,15 @@
 /obj/effect/floor_decal/corner/paleblue/full{
 	dir = 1
 	},
-/obj/machinery/power/apc{
+/obj/machinery/power/apc/critical{
 	dir = 4;
 	pixel_x = 24
 	},
 /turf/simulated/floor/tiled,
-/area/security/prison)
+/area/horizon/security/brig)
+"hnD" = (
+/turf/simulated/wall/r_wall,
+/area/horizon/security/office)
 "hnE" = (
 /obj/machinery/light/small/emergency,
 /obj/structure/lattice/catwalk/indoor/grate,
@@ -15033,7 +15059,7 @@
 /area/security/checkpoint2)
 "hps" = (
 /turf/simulated/wall/r_wall,
-/area/security/investigations)
+/area/horizon/security/investigations_hallway)
 "hpw" = (
 /obj/machinery/camera/network/reactor{
 	c_tag = "Engineering - SMES Room 1";
@@ -15058,11 +15084,13 @@
 	c_tag = "Security - Communal Cell";
 	dir = 8
 	},
-/obj/effect/floor_decal/corner/paleblue{
-	dir = 6
+/obj/machinery/washing_machine,
+/obj/effect/floor_decal/corner/green/diagonal,
+/obj/effect/floor_decal/spline/plain/cee{
+	dir = 1
 	},
-/turf/simulated/floor/tiled,
-/area/security/prison)
+/turf/simulated/floor/tiled/white,
+/area/horizon/security/brig)
 "hpG" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -15107,7 +15135,7 @@
 	icon_state = "d2-2-f"
 	},
 /turf/simulated/wall/r_wall,
-/area/security/armory)
+/area/horizon/security/armoury)
 "hqi" = (
 /obj/machinery/door/airlock/maintenance{
 	name = "Aft Research Hallway Maintenance";
@@ -15164,7 +15192,7 @@
 	pixel_y = 6
 	},
 /turf/simulated/floor/tiled,
-/area/security/brig/processing)
+/area/horizon/security/holding_cell_a)
 "hrN" = (
 /obj/effect/floor_decal/industrial/warning{
 	dir = 10
@@ -15177,7 +15205,7 @@
 	dir = 6
 	},
 /turf/simulated/floor/tiled,
-/area/security/prison)
+/area/horizon/security/brig)
 "hrU" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -15207,7 +15235,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/effect/floor_decal/corner/paleblue/diagonal,
 /turf/simulated/floor/tiled,
-/area/security/brig)
+/area/horizon/security/hallway)
 "hsA" = (
 /obj/effect/floor_decal/spline/fancy/wood{
 	dir = 5
@@ -15248,6 +15276,9 @@
 /obj/structure/disposalpipe/segment,
 /turf/simulated/floor/wood,
 /area/medical/psych)
+"huP" = (
+/turf/simulated/floor/tiled,
+/area/horizon/security/brig)
 "hva" = (
 /obj/effect/floor_decal/corner/mauve/diagonal,
 /obj/structure/window/reinforced{
@@ -15419,7 +15450,7 @@
 	dir = 5
 	},
 /turf/simulated/floor/wood,
-/area/crew_quarters/heads/hos)
+/area/horizon/security/head_of_security)
 "hzU" = (
 /obj/structure/table/standard,
 /obj/machinery/photocopier/faxmachine{
@@ -15870,6 +15901,10 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/hallway/medical)
+"hHJ" = (
+/obj/effect/floor_decal/corner/paleblue/diagonal,
+/turf/simulated/floor/tiled/white,
+/area/horizon/security/brig)
 "hHM" = (
 /obj/structure/ladder{
 	pixel_y = 4
@@ -15917,18 +15952,18 @@
 /turf/simulated/open,
 /area/operations/office)
 "hKM" = (
-/obj/machinery/washing_machine,
-/obj/effect/floor_decal/corner/green/diagonal,
-/obj/machinery/flasher{
-	id = "permflash";
-	name = "Floor mounted flash";
-	pixel_x = 32
+/obj/structure/railing/mapped,
+/obj/structure/bed/stool/chair/plastic{
+	dir = 4
 	},
-/obj/effect/floor_decal/spline/plain/cee{
-	dir = 1
+/turf/simulated/floor/tiled,
+/area/horizon/security/brig)
+"hLh" = (
+/obj/effect/floor_decal/corner/paleblue{
+	dir = 9
 	},
-/turf/simulated/floor/tiled/white,
-/area/security/prison)
+/turf/simulated/floor/tiled,
+/area/horizon/security/brig)
 "hLJ" = (
 /obj/effect/floor_decal/corner/grey/diagonal,
 /obj/structure/sink/kitchen{
@@ -15955,10 +15990,6 @@
 	},
 /turf/simulated/floor/tiled,
 /area/operations/break_room)
-"hLT" = (
-/obj/effect/floor_decal/corner/paleblue,
-/turf/simulated/floor/tiled,
-/area/security/armory)
 "hMt" = (
 /turf/simulated/floor/plating,
 /area/engineering/engine_room/tesla)
@@ -16011,7 +16042,13 @@
 	dir = 5
 	},
 /turf/simulated/floor/tiled,
-/area/security/prison)
+/area/horizon/security/brig)
+"hPx" = (
+/obj/effect/floor_decal/corner/paleblue{
+	dir = 6
+	},
+/turf/simulated/floor/tiled,
+/area/horizon/security/equipment)
 "hPC" = (
 /obj/machinery/door/window{
 	dir = 1
@@ -16267,7 +16304,7 @@
 	icon_state = "4-8"
 	},
 /turf/simulated/floor/tiled,
-/area/security/security_office)
+/area/horizon/security/office)
 "hWE" = (
 /obj/machinery/light,
 /obj/effect/floor_decal/corner/green{
@@ -16401,9 +16438,6 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /turf/simulated/floor/tiled,
 /area/storage/primary)
-"ibU" = (
-/turf/simulated/wall/r_wall,
-/area/security/brig/processing)
 "ica" = (
 /obj/structure/bookcase/libraryspawn/fiction,
 /turf/simulated/floor/wood,
@@ -16538,6 +16572,15 @@
 	},
 /turf/simulated/floor/tiled/dark/full,
 /area/turbolift/scc_ship/morgue_lift)
+"ifO" = (
+/obj/effect/floor_decal/corner/paleblue{
+	dir = 10
+	},
+/obj/structure/cable/green{
+	icon_state = "1-2"
+	},
+/turf/simulated/floor/tiled,
+/area/horizon/security/hallway)
 "ifP" = (
 /obj/effect/floor_decal/corner/green{
 	dir = 8
@@ -16548,16 +16591,13 @@
 	},
 /turf/simulated/floor/tiled,
 /area/hallway/primary/central_one)
-"ifU" = (
-/turf/simulated/wall,
-/area/security/main)
 "igT" = (
 /obj/machinery/door/airlock{
 	id_tag = "sec_unit_2";
 	name = "Unit 2"
 	},
 /turf/simulated/floor/tiled/full,
-/area/security/main)
+/area/horizon/security/washroom)
 "ihe" = (
 /obj/effect/floor_decal/spline/plain{
 	dir = 1
@@ -16576,19 +16616,18 @@
 /obj/structure/cable/green{
 	icon_state = "0-2"
 	},
-/obj/machinery/power/apc/low{
-	dir = 4;
-	name = "east bump";
-	pixel_x = 24
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 10
 	},
 /obj/effect/floor_decal/corner/paleblue{
 	dir = 6
 	},
+/obj/machinery/power/apc/low{
+	dir = 4;
+	pixel_x = 24
+	},
 /turf/simulated/floor/tiled,
-/area/security/security_office)
+/area/horizon/security/office)
 "ihh" = (
 /obj/effect/map_effect/window_spawner/full/borosilicate/reinforced/firedoor,
 /obj/machinery/door/blast/shutters{
@@ -16632,7 +16671,7 @@
 "iiy" = (
 /obj/machinery/hologram/holopad,
 /turf/simulated/floor/tiled/dark/full,
-/area/security/armory)
+/area/horizon/security/armoury)
 "ijb" = (
 /obj/effect/floor_decal/industrial/warning/corner{
 	dir = 4
@@ -16675,7 +16714,7 @@
 	},
 /obj/effect/floor_decal/industrial/outline/security,
 /turf/simulated/floor/tiled,
-/area/security/main)
+/area/horizon/security/equipment)
 "ijD" = (
 /obj/machinery/button/remote/blast_door{
 	id = "seconddeckdockint";
@@ -16833,7 +16872,7 @@
 "imD" = (
 /obj/machinery/hologram/holopad,
 /turf/simulated/floor/carpet,
-/area/crew_quarters/heads/hos)
+/area/horizon/security/head_of_security)
 "inc" = (
 /obj/machinery/atmospherics/pipe/simple/hidden{
 	dir = 10
@@ -16858,7 +16897,13 @@
 	dir = 6
 	},
 /turf/simulated/floor/tiled,
-/area/security/brig)
+/area/horizon/security/hallway)
+"ini" = (
+/obj/effect/floor_decal/corner/paleblue{
+	dir = 6
+	},
+/turf/simulated/floor/tiled,
+/area/horizon/security/lobby)
 "ins" = (
 /obj/effect/floor_decal/corner/yellow{
 	dir = 9
@@ -16921,7 +16966,7 @@
 	icon_state = "1-2"
 	},
 /turf/simulated/floor/tiled,
-/area/security/prison)
+/area/horizon/security/equipment)
 "ioX" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -16990,17 +17035,15 @@
 /turf/simulated/floor/tiled,
 /area/operations/office)
 "iqu" = (
-/obj/machinery/power/apc{
-	is_critical = 1;
-	name = "south bump";
-	pixel_y = -24
-	},
 /obj/structure/cable/green,
 /obj/effect/floor_decal/corner/paleblue{
 	dir = 10
 	},
+/obj/machinery/power/apc{
+	pixel_y = -24
+	},
 /turf/simulated/floor/tiled,
-/area/security/brig)
+/area/horizon/security/hallway)
 "irt" = (
 /obj/machinery/atmospherics/unary/vent_pump/on{
 	dir = 8
@@ -17059,7 +17102,7 @@
 	icon_state = "d2-1-f"
 	},
 /turf/simulated/floor/plating,
-/area/security/armory)
+/area/horizon/security/armoury)
 "itS" = (
 /obj/machinery/porta_turret/sniper,
 /obj/effect/floor_decal/industrial/warning/full,
@@ -17201,12 +17244,6 @@
 	},
 /turf/simulated/floor/tiled/full,
 /area/engineering/engine_airlock)
-"iye" = (
-/obj/effect/floor_decal/corner/paleblue{
-	dir = 10
-	},
-/turf/simulated/floor/tiled,
-/area/security/brig)
 "iyh" = (
 /obj/effect/floor_decal/industrial/hatch/red,
 /obj/effect/floor_decal/industrial/warning{
@@ -17387,7 +17424,7 @@
 	},
 /obj/effect/floor_decal/industrial/warning/corner,
 /turf/simulated/floor/tiled,
-/area/security/brig)
+/area/horizon/security/hallway)
 "iDB" = (
 /obj/effect/floor_decal/corner/green/full,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -17614,7 +17651,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/tiled,
-/area/security/brig)
+/area/horizon/security/hallway)
 "iIX" = (
 /obj/machinery/light{
 	dir = 4
@@ -17624,7 +17661,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/tiled,
-/area/security/investigations)
+/area/horizon/security/investigations_hallway)
 "iJq" = (
 /obj/machinery/door/firedoor,
 /obj/effect/floor_decal/industrial/hatch/yellow,
@@ -17666,7 +17703,7 @@
 	},
 /obj/effect/floor_decal/industrial/hatch/yellow,
 /turf/simulated/floor/tiled/full,
-/area/security/prison)
+/area/horizon/security/brig)
 "iJH" = (
 /obj/structure/railing/mapped{
 	dir = 4
@@ -17842,11 +17879,6 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /turf/simulated/floor/tiled,
 /area/engineering/storage_eva)
-"iNf" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/turf/simulated/floor/tiled,
-/area/security/prison)
 "iNl" = (
 /obj/structure/reagent_dispensers/watertank,
 /obj/effect/floor_decal/industrial/warning{
@@ -17953,7 +17985,7 @@
 	dir = 5
 	},
 /turf/simulated/floor/tiled,
-/area/security/prison)
+/area/horizon/security/brig)
 "iRb" = (
 /obj/effect/floor_decal/industrial/warning,
 /turf/simulated/floor/plating,
@@ -18045,11 +18077,14 @@
 /obj/machinery/atmospherics/pipe/manifold/hidden/supply{
 	dir = 1
 	},
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
 /obj/structure/cable/green{
 	icon_state = "2-8"
 	},
 /turf/simulated/floor/tiled,
-/area/security/main)
+/area/horizon/security/equipment)
 "iUg" = (
 /obj/structure/table/standard,
 /obj/item/stamp/rd{
@@ -18149,7 +18184,7 @@
 /obj/structure/cable/green,
 /obj/effect/map_effect/window_spawner/full/reinforced/grille/firedoor,
 /turf/simulated/floor/tiled/dark/full,
-/area/security/prison)
+/area/horizon/security/brig)
 "iWp" = (
 /obj/effect/floor_decal/corner_wide/lime/diagonal,
 /obj/machinery/door/blast/shutters{
@@ -18365,7 +18400,7 @@
 	},
 /obj/effect/floor_decal/industrial/outline/security,
 /turf/simulated/floor/tiled,
-/area/security/prison)
+/area/horizon/security/brig)
 "jbB" = (
 /obj/structure/disposalpipe/segment{
 	dir = 2;
@@ -18404,6 +18439,9 @@
 /obj/machinery/vending/cola,
 /turf/simulated/floor/tiled/white,
 /area/operations/break_room)
+"jcz" = (
+/turf/simulated/wall,
+/area/horizon/security/office)
 "jcL" = (
 /obj/structure/sink{
 	dir = 8;
@@ -18415,7 +18453,7 @@
 	},
 /obj/effect/floor_decal/corner/paleblue/diagonal,
 /turf/simulated/floor/tiled/white,
-/area/security/main)
+/area/horizon/security/washroom)
 "jdo" = (
 /obj/structure/railing/mapped{
 	dir = 8
@@ -18478,7 +18516,7 @@
 	req_access = list(3)
 	},
 /turf/simulated/floor/tiled/dark/full,
-/area/security/armory)
+/area/horizon/security/armoury)
 "jeo" = (
 /obj/structure/lattice/catwalk/indoor/grate,
 /obj/machinery/light/small/emergency{
@@ -18526,8 +18564,16 @@
 /obj/structure/cable/green{
 	icon_state = "0-8"
 	},
+/obj/machinery/door/blast/regular{
+	density = 0;
+	icon_state = "pdoor0";
+	id = "Brig Lockdown";
+	name = "Brig Lockdown Blast Door";
+	opacity = 0;
+	dir = 2
+	},
 /turf/simulated/floor/tiled/dark/full,
-/area/security/prison)
+/area/horizon/security/brig)
 "jfH" = (
 /obj/machinery/light{
 	dir = 8
@@ -18535,8 +18581,12 @@
 /obj/effect/floor_decal/corner/paleblue{
 	dir = 9
 	},
+/obj/item/device/radio/intercom{
+	pixel_x = -24;
+	dir = 4
+	},
 /turf/simulated/floor/tiled,
-/area/security/prison)
+/area/horizon/security/brig)
 "jgj" = (
 /obj/effect/floor_decal/industrial/hatch/red,
 /obj/structure/window/reinforced{
@@ -18573,16 +18623,6 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/engineering/engine_waste)
-"jhw" = (
-/obj/machinery/alarm{
-	dir = 1;
-	pixel_y = -28
-	},
-/obj/effect/floor_decal/corner/paleblue{
-	dir = 10
-	},
-/turf/simulated/floor/tiled,
-/area/security/prison)
 "jhL" = (
 /obj/machinery/sleeper,
 /obj/machinery/camera/network/medbay{
@@ -18627,7 +18667,7 @@
 	dir = 9
 	},
 /turf/simulated/floor/tiled,
-/area/security/main)
+/area/horizon/security/equipment)
 "jjl" = (
 /obj/structure/bed/stool/chair/office/light,
 /obj/effect/floor_decal/spline/fancy/wood{
@@ -18825,9 +18865,9 @@
 /area/horizon/exterior)
 "jmp" = (
 /obj/structure/reagent_dispensers/water_cooler,
-/obj/effect/floor_decal/industrial/outline/yellow,
+/obj/effect/floor_decal/industrial/outline/grey,
 /turf/simulated/floor/tiled,
-/area/security/prison)
+/area/horizon/security/brig)
 "jmE" = (
 /obj/structure/cable/green{
 	icon_state = "4-8"
@@ -18859,7 +18899,7 @@
 	dir = 9
 	},
 /turf/simulated/floor/tiled,
-/area/security/brig)
+/area/horizon/security/hallway)
 "jmW" = (
 /obj/machinery/door/window/westleft{
 	name = "Engineering Front Desk Internal";
@@ -18888,7 +18928,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/tiled,
-/area/security/brig/processing)
+/area/horizon/security/holding_cell_a)
 "jnF" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -18963,8 +19003,16 @@
 	icon_state = "0-4"
 	},
 /obj/effect/map_effect/window_spawner/full/reinforced/grille/firedoor,
+/obj/machinery/door/blast/regular{
+	density = 0;
+	icon_state = "pdoor0";
+	id = "Brig Lockdown";
+	name = "Brig Lockdown Blast Door";
+	opacity = 0;
+	dir = 2
+	},
 /turf/simulated/floor/tiled/dark/full,
-/area/security/prison)
+/area/horizon/security/brig)
 "joM" = (
 /obj/effect/landmark{
 	name = "Revenant"
@@ -19022,7 +19070,7 @@
 	},
 /obj/effect/floor_decal/industrial/outline/security,
 /turf/simulated/floor/tiled,
-/area/security/armory)
+/area/horizon/security/armoury)
 "jpO" = (
 /mob/living/carbon/slime,
 /turf/simulated/floor/reinforced,
@@ -19032,7 +19080,7 @@
 	dir = 8
 	},
 /turf/simulated/floor/carpet,
-/area/crew_quarters/heads/hos)
+/area/horizon/security/head_of_security)
 "jqw" = (
 /obj/structure/disposalpipe/trunk{
 	dir = 4
@@ -19127,7 +19175,7 @@
 	},
 /obj/effect/floor_decal/corner/paleblue/full,
 /turf/simulated/floor/tiled,
-/area/security/investigations)
+/area/horizon/security/investigations_hallway)
 "jrH" = (
 /obj/effect/floor_decal/corner_wide/lime/diagonal,
 /obj/machinery/door/blast/shutters{
@@ -19258,7 +19306,7 @@
 	},
 /obj/effect/floor_decal/industrial/outline/security,
 /turf/simulated/floor/tiled/dark/full,
-/area/security/armory)
+/area/horizon/security/armoury)
 "jvu" = (
 /obj/structure/window/shuttle/scc_space_ship,
 /obj/machinery/door/firedoor,
@@ -19296,11 +19344,14 @@
 /turf/simulated/wall,
 /area/engineering/storage_eva)
 "jvW" = (
-/obj/machinery/atmospherics/unary/vent_pump/on{
-	dir = 1
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
 	},
 /turf/simulated/floor/tiled,
-/area/security/prison)
+/area/horizon/security/brig)
 "jwa" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 9
@@ -19374,15 +19425,44 @@
 /obj/item/storage/box/fancy/crayons/chalkbox,
 /turf/simulated/floor/tiled,
 /area/engineering/lobby)
+"jzv" = (
+/obj/machinery/door/firedoor,
+/obj/structure/grille,
+/obj/structure/window/shuttle/scc_space_ship,
+/obj/machinery/door/blast/regular{
+	density = 0;
+	icon_state = "pdoor0";
+	id = "Brig Lockdown";
+	name = "Brig Lockdown Blast Door";
+	opacity = 0;
+	dir = 4
+	},
+/obj/machinery/door/blast/regular{
+	density = 0;
+	dir = 4;
+	icon_state = "pdoor0";
+	id = "Security Lockdown";
+	name = "Security Blast Door";
+	opacity = 0
+	},
+/obj/machinery/door/blast/shutters/open{
+	id = "shutters_deck1_security_cell_isolation";
+	dir = 2;
+	name = "Isolation Cell Window Shutter"
+	},
+/obj/structure/cable/green{
+	icon_state = "1-4"
+	},
+/obj/structure/cable/green,
+/turf/simulated/floor/tiled/dark/full,
+/area/horizon/security/brig)
 "jzV" = (
 /obj/structure/cable/green{
 	icon_state = "2-8"
 	},
-/obj/effect/floor_decal/corner/paleblue/full{
-	dir = 4
-	},
+/obj/machinery/portable_atmospherics/hydroponics,
 /turf/simulated/floor/tiled,
-/area/security/prison)
+/area/horizon/security/brig)
 "jAo" = (
 /obj/machinery/light/small/red{
 	dir = 8
@@ -19390,23 +19470,15 @@
 /turf/simulated/floor/tiled/dark,
 /area/maintenance/wing/port/far)
 "jAp" = (
-/obj/machinery/door/blast/regular{
-	density = 0;
-	dir = 4;
-	icon_state = "pdoor0";
-	id = "Brig Lockdown";
-	name = "Brig Lockdown Door";
-	opacity = 0
-	},
 /obj/effect/floor_decal/industrial/hatch/yellow,
 /obj/machinery/door/airlock/glass_security{
-	autoclose = 0;
 	id_tag = "cell_3";
 	name = "Cell C";
-	req_access = list(2)
+	req_access = list(2);
+	autoclose = 0
 	},
 /turf/simulated/floor/tiled/full,
-/area/security/prison)
+/area/horizon/security/brig)
 "jAS" = (
 /obj/structure/railing/mapped{
 	dir = 8
@@ -19534,7 +19606,7 @@
 	dir = 9
 	},
 /turf/simulated/floor/tiled,
-/area/security/armory)
+/area/horizon/security/armoury)
 "jDU" = (
 /obj/machinery/atmospherics/unary/vent_scrubber/on{
 	dir = 1
@@ -19760,6 +19832,12 @@
 /obj/structure/lattice/catwalk/indoor/grate,
 /turf/simulated/floor/plating,
 /area/maintenance/wing/port/far)
+"jJa" = (
+/obj/effect/floor_decal/corner/paleblue{
+	dir = 10
+	},
+/turf/simulated/floor/tiled,
+/area/horizon/security/equipment)
 "jJw" = (
 /obj/structure/cable/yellow{
 	icon_state = "1-8"
@@ -19785,15 +19863,14 @@
 /obj/effect/floor_decal/corner/paleblue{
 	dir = 10
 	},
-/obj/item/device/radio/intercom{
-	dir = 1;
-	pixel_y = -24
-	},
 /obj/structure/cable/green{
 	icon_state = "1-2"
 	},
+/obj/structure/coatrack{
+	pixel_x = 18
+	},
 /turf/simulated/floor/tiled/dark,
-/area/security/warden)
+/area/horizon/security/warden)
 "jKd" = (
 /obj/structure/bed/stool/chair/sofa/corner/brown{
 	dir = 1
@@ -19886,7 +19963,7 @@
 /obj/effect/floor_decal/corner/paleblue/full,
 /obj/effect/floor_decal/industrial/outline/firefighting_closet,
 /turf/simulated/floor/tiled,
-/area/security/main)
+/area/horizon/security/equipment)
 "jMO" = (
 /obj/machinery/door/airlock/glass_security{
 	desc = "It opens and closes. Hazardous lifeforms ahead. Caution advised!";
@@ -19902,7 +19979,7 @@
 	opacity = 0
 	},
 /turf/simulated/floor/tiled/full,
-/area/security/lobby)
+/area/horizon/security/lobby)
 "jNd" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
@@ -19941,13 +20018,13 @@
 	dir = 1
 	},
 /turf/simulated/floor/tiled/dark/full,
-/area/security/armory)
+/area/horizon/security/armoury)
 "jOv" = (
 /obj/effect/floor_decal/corner/paleblue/full{
 	dir = 8
 	},
 /turf/simulated/floor/tiled,
-/area/security/brig)
+/area/horizon/security/hallway)
 "jOK" = (
 /obj/structure/railing/mapped{
 	dir = 4
@@ -20137,7 +20214,7 @@
 	dir = 1
 	},
 /turf/simulated/floor/tiled/full,
-/area/security/brig)
+/area/horizon/security/hallway)
 "jUs" = (
 /obj/machinery/atmospherics/unary/freezer{
 	icon_state = "freezer"
@@ -20149,6 +20226,15 @@
 /obj/structure/window/shuttle/scc_space_ship,
 /obj/structure/grille,
 /obj/machinery/door/firedoor,
+/obj/structure/cable/green,
+/obj/machinery/door/blast/regular{
+	density = 0;
+	icon_state = "pdoor0";
+	id = "Brig Lockdown";
+	name = "Brig Lockdown Blast Door";
+	opacity = 0;
+	dir = 4
+	},
 /obj/machinery/door/blast/regular{
 	density = 0;
 	dir = 4;
@@ -20157,9 +20243,8 @@
 	name = "Security Blast Door";
 	opacity = 0
 	},
-/obj/structure/cable/green,
 /turf/simulated/floor/plating,
-/area/security/prison)
+/area/horizon/security/brig)
 "jUB" = (
 /obj/item/device/radio/intercom{
 	dir = 8;
@@ -20328,11 +20413,11 @@
 /obj/effect/floor_decal/corner/paleblue{
 	dir = 9
 	},
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
+/obj/machinery/atmospherics/unary/vent_pump/on{
 	dir = 4
 	},
 /turf/simulated/floor/tiled,
-/area/security/prison)
+/area/horizon/security/brig)
 "jZB" = (
 /obj/machinery/light,
 /obj/effect/floor_decal/corner/green{
@@ -20376,7 +20461,7 @@
 	icon_state = "1-8"
 	},
 /turf/simulated/floor/tiled,
-/area/security/brig)
+/area/horizon/security/hallway)
 "kaz" = (
 /obj/effect/floor_decal/industrial/warning{
 	dir = 1
@@ -20432,9 +20517,6 @@
 	},
 /turf/simulated/floor/tiled,
 /area/operations/lobby)
-"kbn" = (
-/turf/simulated/floor/tiled,
-/area/security/main)
 "kbz" = (
 /obj/machinery/door/window/northleft,
 /obj/structure/window/reinforced{
@@ -20487,7 +20569,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/tiled,
-/area/security/brig)
+/area/horizon/security/hallway)
 "kca" = (
 /obj/machinery/media/jukebox/audioconsole/wall,
 /turf/simulated/wall,
@@ -20499,12 +20581,12 @@
 /turf/simulated/floor/carpet,
 /area/hallway/primary/central_two)
 "kcO" = (
-/obj/machinery/atmospherics/unary/vent_scrubber/on,
 /obj/effect/floor_decal/corner/paleblue{
 	dir = 5
 	},
+/obj/machinery/atmospherics/unary/vent_pump/on,
 /turf/simulated/floor/tiled,
-/area/security/prison)
+/area/horizon/security/brig)
 "kdr" = (
 /obj/machinery/atmospherics/pipe/manifold/visible/green,
 /turf/simulated/floor/plating,
@@ -20555,7 +20637,7 @@
 	pixel_y = 6
 	},
 /turf/simulated/floor/tiled,
-/area/security/brig/processing_secondary)
+/area/horizon/security/holding_cell_b)
 "keG" = (
 /obj/structure/window/shuttle/scc_space_ship,
 /obj/machinery/door/firedoor,
@@ -20564,9 +20646,6 @@
 	},
 /turf/simulated/floor/reinforced,
 /area/horizon/crew_quarters/lounge/bar)
-"keZ" = (
-/turf/simulated/wall,
-/area/security/brig)
 "kfE" = (
 /obj/effect/floor_decal/corner/mauve/diagonal,
 /turf/simulated/floor/tiled/white,
@@ -20625,7 +20704,7 @@
 	id = "HoS Windows"
 	},
 /turf/simulated/floor/tiled/dark/full,
-/area/crew_quarters/heads/hos)
+/area/horizon/security/head_of_security)
 "kgp" = (
 /turf/simulated/floor/reinforced/airless,
 /area/template_noop)
@@ -20684,7 +20763,7 @@
 	},
 /obj/effect/floor_decal/industrial/outline/security,
 /turf/simulated/floor/tiled,
-/area/security/main)
+/area/horizon/security/equipment)
 "khK" = (
 /obj/effect/floor_decal/corner/green{
 	dir = 10
@@ -20760,20 +20839,10 @@
 /turf/simulated/floor/lino/grey,
 /area/horizon/bar)
 "kjs" = (
-/obj/item/storage/box/snack{
-	desc = "A box full of snack foods. A label is attached that reads, 'Sorry about the microwaves.'";
-	name = "corporate care package";
-	pixel_x = 4;
-	pixel_y = 4
-	},
-/obj/item/storage/box/snack{
-	desc = "A box full of snack foods. A label is attached that reads, 'Sorry about the microwaves.'";
-	name = "corporate care package"
-	},
-/obj/structure/table/rack,
-/obj/effect/floor_decal/industrial/outline/yellow,
+/obj/machinery/vending/hydronutrients,
+/obj/effect/floor_decal/industrial/hatch/yellow,
 /turf/simulated/floor/tiled,
-/area/security/prison)
+/area/horizon/security/brig)
 "kjO" = (
 /obj/effect/floor_decal/industrial/warning{
 	dir = 1
@@ -20814,7 +20883,7 @@
 	pixel_y = 1
 	},
 /turf/simulated/floor/tiled/dark,
-/area/security/warden)
+/area/horizon/security/warden)
 "kmc" = (
 /turf/simulated/wall,
 /area/operations/qm)
@@ -20888,7 +20957,7 @@
 	dir = 5
 	},
 /turf/simulated/floor/tiled,
-/area/security/lobby)
+/area/horizon/security/lobby)
 "kra" = (
 /obj/effect/floor_decal/corner/green{
 	dir = 5
@@ -21043,7 +21112,7 @@
 	pixel_y = 24
 	},
 /turf/simulated/floor/tiled/freezer,
-/area/security/main)
+/area/horizon/security/washroom)
 "kvc" = (
 /obj/structure/grille,
 /obj/structure/window/shuttle/scc_space_ship,
@@ -21065,6 +21134,9 @@
 	},
 /turf/simulated/floor/wood,
 /area/chapel/main)
+"kvE" = (
+/turf/simulated/floor/tiled,
+/area/horizon/security/armoury)
 "kvG" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -21081,9 +21153,15 @@
 /turf/simulated/floor/tiled,
 /area/engineering/lobby)
 "kvL" = (
-/obj/structure/table/standard,
+/obj/structure/table/reinforced,
+/obj/item/book/manual/wiki/security_space_law{
+	pixel_y = -16
+	},
+/obj/item/book/manual/wiki/security_space_law{
+	pixel_y = -16
+	},
 /turf/simulated/floor/tiled,
-/area/security/prison)
+/area/horizon/security/brig)
 "kvZ" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -21287,7 +21365,7 @@
 	},
 /obj/item/gun/projectile/peac,
 /turf/simulated/floor/tiled/dark/full,
-/area/security/armory)
+/area/horizon/security/armoury)
 "kCV" = (
 /obj/machinery/atmospherics/unary/vent_pump/on,
 /turf/simulated/floor/tiled,
@@ -21360,7 +21438,7 @@
 	dir = 1
 	},
 /turf/simulated/floor/wood,
-/area/crew_quarters/heads/hos)
+/area/horizon/security/head_of_security)
 "kFe" = (
 /obj/effect/floor_decal/corner_wide/yellow{
 	dir = 1
@@ -21404,7 +21482,7 @@
 	},
 /obj/effect/floor_decal/industrial/hatch/yellow,
 /turf/simulated/floor/tiled/full,
-/area/security/armory)
+/area/horizon/security/armoury)
 "kHg" = (
 /obj/structure/lattice/catwalk,
 /obj/structure/sign/drop{
@@ -21637,7 +21715,7 @@
 /obj/effect/floor_decal/industrial/loading/yellow,
 /obj/effect/floor_decal/industrial/outline/yellow,
 /turf/simulated/floor/tiled,
-/area/security/investigations)
+/area/horizon/security/investigations_hallway)
 "kOE" = (
 /obj/structure/disposalpipe/sortjunction/flipped{
 	dir = 1;
@@ -21718,9 +21796,6 @@
 	},
 /turf/simulated/floor/tiled/dark/full,
 /area/engineering/engine_room)
-"kQA" = (
-/turf/simulated/wall,
-/area/security/brig/processing)
 "kQS" = (
 /obj/structure/window/shuttle/scc_space_ship,
 /obj/structure/grille,
@@ -21749,8 +21824,9 @@
 	name = "Brig Showers"
 	},
 /obj/machinery/door/firedoor,
+/obj/effect/floor_decal/industrial/hatch/yellow,
 /turf/simulated/floor/tiled/full,
-/area/security/prison)
+/area/horizon/security/brig)
 "kRz" = (
 /obj/machinery/door/firedoor,
 /obj/effect/floor_decal/industrial/hatch/yellow,
@@ -21847,8 +21923,16 @@
 /obj/structure/disposalpipe/segment,
 /obj/structure/cable/green,
 /obj/effect/map_effect/window_spawner/full/reinforced/grille/firedoor,
+/obj/machinery/door/blast/regular{
+	density = 0;
+	icon_state = "pdoor0";
+	id = "Brig Lockdown";
+	name = "Brig Lockdown Blast Door";
+	opacity = 0;
+	dir = 4
+	},
 /turf/simulated/floor/tiled/dark/full,
-/area/security/prison)
+/area/horizon/security/brig)
 "kRY" = (
 /obj/effect/floor_decal/industrial/hatch/yellow,
 /obj/effect/floor_decal/industrial/warning{
@@ -21867,8 +21951,12 @@
 	dir = 1
 	},
 /obj/effect/floor_decal/corner/paleblue/diagonal,
+/obj/machinery/power/apc/low{
+	pixel_y = -24
+	},
+/obj/structure/cable/green,
 /turf/simulated/floor/tiled/white,
-/area/security/main)
+/area/horizon/security/washroom)
 "kUc" = (
 /obj/structure/railing/mapped,
 /obj/structure/table/standard,
@@ -21920,7 +22008,7 @@
 	opacity = 0
 	},
 /turf/simulated/floor/tiled/full,
-/area/security/brig)
+/area/horizon/security/hallway)
 "kUz" = (
 /obj/machinery/atmospherics/pipe/manifold/visible/black{
 	dir = 8
@@ -22003,13 +22091,14 @@
 /turf/simulated/floor/plating,
 /area/maintenance/wing/port)
 "kXs" = (
-/obj/structure/bed/stool/padded/red,
 /obj/structure/cable/green{
 	icon_state = "1-2"
 	},
-/obj/structure/railing/mapped,
+/obj/machinery/atmospherics/unary/vent_pump/on{
+	dir = 1
+	},
 /turf/simulated/floor/tiled,
-/area/security/prison)
+/area/horizon/security/brig)
 "kXO" = (
 /obj/structure/railing/mapped,
 /obj/effect/floor_decal/corner/mauve{
@@ -22448,14 +22537,20 @@
 /obj/effect/floor_decal/corner/paleblue{
 	dir = 6
 	},
-/obj/structure/cable/green{
-	icon_state = "4-8"
-	},
 /obj/effect/floor_decal/industrial/warning{
 	dir = 4
 	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
 /turf/simulated/floor/tiled,
-/area/security/brig)
+/area/horizon/security/hallway)
 "lhN" = (
 /obj/machinery/bodyscanner{
 	dir = 4
@@ -22498,7 +22593,7 @@
 	},
 /obj/machinery/door/firedoor,
 /turf/simulated/floor/tiled,
-/area/security/brig/processing)
+/area/horizon/security/holding_cell_a)
 "ljk" = (
 /obj/machinery/light{
 	dir = 1
@@ -22525,7 +22620,7 @@
 /obj/structure/closet/secure_closet/brig,
 /obj/effect/floor_decal/industrial/outline/security,
 /turf/simulated/floor/tiled,
-/area/security/brig/processing)
+/area/horizon/security/holding_cell_a)
 "ljp" = (
 /obj/machinery/r_n_d/circuit_imprinter,
 /obj/effect/floor_decal/industrial/hatch/yellow,
@@ -22543,6 +22638,9 @@
 	},
 /turf/simulated/floor/tiled/full,
 /area/hallway/primary/central_one)
+"ljx" = (
+/turf/simulated/wall,
+/area/horizon/security/washroom)
 "ljF" = (
 /obj/effect/floor_decal/corner/green{
 	dir = 10
@@ -22571,7 +22669,7 @@
 	dir = 1
 	},
 /turf/simulated/floor/tiled,
-/area/security/security_office)
+/area/horizon/security/office)
 "lkO" = (
 /obj/structure/closet/radiation,
 /obj/effect/floor_decal/industrial/outline/yellow,
@@ -22813,14 +22911,15 @@
 /turf/simulated/floor/tiled/dark/full,
 /area/engineering/engine_room/tesla)
 "lrQ" = (
-/obj/machinery/flasher{
-	id = "permflash";
-	name = "Floor mounted flash"
-	},
 /obj/effect/floor_decal/corner/paleblue/diagonal,
-/obj/effect/floor_decal/industrial/outline/yellow,
+/obj/structure/toilet{
+	dir = 8
+	},
+/obj/structure/bed/handrail{
+	dir = 1
+	},
 /turf/simulated/floor/tiled/white,
-/area/security/prison)
+/area/horizon/security/brig)
 "lrS" = (
 /obj/effect/floor_decal/corner/lime{
 	dir = 10
@@ -22972,7 +23071,7 @@
 /area/hallway/primary/central_one)
 "lwD" = (
 /turf/simulated/floor/carpet,
-/area/crew_quarters/heads/hos)
+/area/horizon/security/head_of_security)
 "lyv" = (
 /obj/structure/shuttle_part/scc_space_ship{
 	icon_state = "d2-1-f"
@@ -23044,7 +23143,7 @@
 	req_access = list(3)
 	},
 /turf/simulated/floor/tiled/full,
-/area/security/armory)
+/area/horizon/security/armoury)
 "lAx" = (
 /obj/structure/railing/mapped{
 	dir = 8
@@ -23149,7 +23248,7 @@
 	dir = 5
 	},
 /turf/simulated/floor/tiled,
-/area/security/brig)
+/area/horizon/security/hallway)
 "lCF" = (
 /obj/structure/grille,
 /obj/structure/window/shuttle/scc_space_ship,
@@ -23267,7 +23366,7 @@
 /obj/structure/bed/stool/chair,
 /obj/effect/floor_decal/industrial/outline/security,
 /turf/simulated/floor/tiled,
-/area/security/brig)
+/area/horizon/security/hallway)
 "lFU" = (
 /obj/structure/cable{
 	icon_state = "2-8"
@@ -23340,7 +23439,7 @@
 	dir = 6
 	},
 /turf/simulated/floor/tiled,
-/area/security/brig)
+/area/horizon/security/hallway)
 "lHi" = (
 /obj/effect/decal/cleanable/cobweb,
 /turf/simulated/floor/tiled/dark,
@@ -23500,7 +23599,7 @@
 	dir = 5
 	},
 /turf/simulated/floor/tiled,
-/area/security/brig)
+/area/horizon/security/hallway)
 "lKI" = (
 /obj/structure/flora/pottedplant{
 	icon_state = "plant-33"
@@ -23511,26 +23610,24 @@
 /turf/simulated/floor/tiled,
 /area/rnd/hallway)
 "lKN" = (
-/obj/machinery/door/blast/regular{
-	density = 0;
-	dir = 4;
-	icon_state = "pdoor0";
-	id = "Brig Lockdown";
-	name = "Brig Lockdown Door";
-	opacity = 0
+/obj/effect/floor_decal/industrial/hatch/yellow,
+/obj/machinery/door/airlock/glass_security{
+	name = "Isolation Cell";
+	req_access = list(2);
+	id_tag = "cell_isolation";
+	autoclose = 0
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
 	},
 /obj/structure/cable/green{
 	icon_state = "4-8"
 	},
-/obj/effect/floor_decal/industrial/hatch/yellow,
-/obj/machinery/door/airlock/glass_security{
-	autoclose = 0;
-	id_tag = "cell_4";
-	name = "Cell D";
-	req_access = list(2)
-	},
 /turf/simulated/floor/tiled/full,
-/area/security/prison)
+/area/horizon/security/brig)
 "lLj" = (
 /obj/machinery/alarm{
 	pixel_y = 28
@@ -23545,7 +23642,7 @@
 /obj/structure/closet/secure_closet/brig,
 /obj/effect/floor_decal/industrial/outline/security,
 /turf/simulated/floor/tiled,
-/area/security/brig/processing_secondary)
+/area/horizon/security/holding_cell_b)
 "lLn" = (
 /obj/structure/table/standard,
 /obj/effect/floor_decal/spline/fancy/wood{
@@ -23644,8 +23741,11 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
 	},
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
 /turf/simulated/floor/tiled,
-/area/security/main)
+/area/horizon/security/equipment)
 "lMQ" = (
 /obj/effect/floor_decal/industrial/warning{
 	dir = 1
@@ -23669,7 +23769,7 @@
 	dir = 1
 	},
 /turf/simulated/floor/tiled/full,
-/area/security/brig)
+/area/horizon/security/hallway)
 "lNb" = (
 /obj/effect/floor_decal/corner/green{
 	dir = 1
@@ -23797,6 +23897,10 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/medical/gen_treatment)
+"lRO" = (
+/obj/effect/map_effect/window_spawner/full/reinforced/firedoor,
+/turf/simulated/floor/tiled/dark/full,
+/area/horizon/security/equipment)
 "lRR" = (
 /obj/structure/table/standard,
 /obj/item/circuitboard/aicore{
@@ -23935,7 +24039,14 @@
 	dir = 10
 	},
 /turf/simulated/floor/tiled,
-/area/security/armory)
+/area/horizon/security/lobby)
+"lUi" = (
+/obj/structure/cable/green{
+	icon_state = "0-2"
+	},
+/obj/effect/map_effect/window_spawner/full/reinforced/grille/firedoor,
+/turf/simulated/floor/tiled/dark/full,
+/area/horizon/security/holding_cell_a)
 "lUA" = (
 /obj/structure/shuttle_part/scc_space_ship{
 	icon_state = "d3-4"
@@ -23979,11 +24090,14 @@
 /turf/simulated/floor/tiled/dark,
 /area/maintenance/wing/port/far)
 "lVZ" = (
-/obj/machinery/door/airlock{
-	name = "Brig Showers"
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+	dir = 4
 	},
-/turf/simulated/floor/tiled/full,
-/area/security/prison)
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 9
+	},
+/turf/simulated/floor/tiled,
+/area/horizon/security/brig)
 "lWf" = (
 /obj/structure/cable/green{
 	icon_state = "4-8"
@@ -24113,7 +24227,7 @@
 	dir = 1
 	},
 /turf/simulated/floor/tiled/white,
-/area/security/main)
+/area/horizon/security/washroom)
 "lZu" = (
 /obj/structure/sign/nosmoking_2{
 	pixel_x = -32;
@@ -24125,7 +24239,7 @@
 /obj/machinery/firealarm/west,
 /obj/effect/floor_decal/corner/paleblue/full,
 /turf/simulated/floor/tiled,
-/area/security/lobby)
+/area/horizon/security/lobby)
 "lZD" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -24137,7 +24251,7 @@
 /obj/machinery/door/firedoor,
 /obj/effect/floor_decal/industrial/hatch/yellow,
 /turf/simulated/floor/tiled/full,
-/area/security/prison)
+/area/horizon/security/brig)
 "lZP" = (
 /obj/effect/floor_decal/corner_wide/yellow/full{
 	dir = 8
@@ -24207,7 +24321,7 @@
 	eftpos_name = "Brig EFTPOS scanner"
 	},
 /turf/simulated/floor/tiled/dark,
-/area/security/warden)
+/area/horizon/security/warden)
 "mbs" = (
 /obj/machinery/atmospherics/pipe/simple/visible{
 	dir = 9
@@ -24254,7 +24368,7 @@
 /obj/machinery/door/firedoor,
 /obj/structure/disposalpipe/segment,
 /turf/simulated/floor/tiled/full,
-/area/security/brig)
+/area/horizon/security/lobby)
 "mdn" = (
 /obj/structure/cable/green{
 	icon_state = "4-8"
@@ -24291,7 +24405,7 @@
 /obj/machinery/atmospherics/unary/vent_pump/on,
 /obj/machinery/recharger/wallcharger{
 	pixel_x = 4;
-	pixel_y = 34
+	pixel_y = 23
 	},
 /obj/machinery/camera/network/security{
 	c_tag = "Security - Armoury";
@@ -24303,14 +24417,12 @@
 /obj/effect/floor_decal/industrial/warning/corner{
 	dir = 1
 	},
-/obj/machinery/button/remote/blast_door{
-	id = "armory";
-	name = "Armory Blast Doors";
-	pixel_y = 26;
-	req_access = list(3)
+/obj/machinery/recharger/wallcharger{
+	pixel_x = 4;
+	pixel_y = 34
 	},
 /turf/simulated/floor/tiled/dark/full,
-/area/security/armory)
+/area/horizon/security/armoury)
 "mdR" = (
 /obj/machinery/door/airlock{
 	name = "Emergency Supplies Closet"
@@ -24384,15 +24496,22 @@
 	opacity = 0
 	},
 /obj/machinery/door/firedoor,
+/obj/structure/cable/green{
+	icon_state = "1-8"
+	},
+/obj/structure/cable/green{
+	icon_state = "1-4"
+	},
+/obj/structure/cable/green,
 /turf/simulated/floor/plating,
-/area/security/brig)
+/area/horizon/security/hallway)
 "mfX" = (
 /obj/structure/cable/green,
 /obj/effect/map_effect/window_spawner/full/reinforced/polarized/grille/firedoor{
 	id = "HoS Windows"
 	},
 /turf/simulated/floor/tiled/dark/full,
-/area/crew_quarters/heads/hos)
+/area/horizon/security/head_of_security)
 "mgg" = (
 /obj/structure/disposalpipe/segment,
 /obj/machinery/door/firedoor,
@@ -24801,10 +24920,6 @@
 /obj/effect/floor_decal/industrial/warning,
 /turf/simulated/floor/plating,
 /area/engineering/engine_room)
-"mrK" = (
-/obj/machinery/hologram/holopad,
-/turf/simulated/floor/tiled,
-/area/security/lobby)
 "mso" = (
 /obj/effect/floor_decal/corner/mauve/diagonal,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -24857,7 +24972,7 @@
 	pixel_y = 23
 	},
 /turf/simulated/floor/tiled,
-/area/security/security_office)
+/area/horizon/security/office)
 "msP" = (
 /obj/structure/railing/mapped,
 /obj/effect/floor_decal/industrial/warning,
@@ -24992,7 +25107,7 @@
 	dir = 5
 	},
 /turf/simulated/floor/tiled,
-/area/security/brig)
+/area/horizon/security/hallway)
 "mvZ" = (
 /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
 	dir = 4
@@ -25433,7 +25548,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/tiled/dark,
-/area/security/warden)
+/area/horizon/security/warden)
 "mGY" = (
 /obj/machinery/atmospherics/binary/pump/high_power{
 	dir = 1;
@@ -25560,7 +25675,7 @@
 /area/horizon/stairwell/central)
 "mJJ" = (
 /turf/simulated/wall/r_wall,
-/area/horizon/maintenance/deck_two/fore/port)
+/area/horizon/security/washroom)
 "mKw" = (
 /obj/structure/cable/green{
 	icon_state = "2-4"
@@ -25669,7 +25784,7 @@
 	name = "Safety Shutter"
 	},
 /turf/simulated/floor/tiled/dark/full,
-/area/security/security_office)
+/area/horizon/security/office)
 "mLU" = (
 /obj/effect/floor_decal/industrial/warning{
 	dir = 8
@@ -25779,7 +25894,7 @@
 	dir = 10
 	},
 /turf/simulated/floor/tiled,
-/area/security/brig)
+/area/horizon/security/hallway)
 "mOu" = (
 /obj/structure/cable/green{
 	icon_state = "1-2"
@@ -25788,7 +25903,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/structure/disposalpipe/segment,
 /turf/simulated/floor/tiled,
-/area/security/brig)
+/area/horizon/security/hallway)
 "mOy" = (
 /obj/structure/bed/stool/chair/padded/red{
 	dir = 1
@@ -25848,7 +25963,7 @@
 	secured_wires = 1
 	},
 /turf/simulated/floor/tiled,
-/area/crew_quarters/heads/hos)
+/area/horizon/security/head_of_security)
 "mPh" = (
 /obj/structure/cable/yellow{
 	icon_state = "1-2"
@@ -26073,7 +26188,7 @@
 	name = "Unit 1"
 	},
 /turf/simulated/floor/tiled/full,
-/area/security/main)
+/area/horizon/security/washroom)
 "mVw" = (
 /obj/structure/table/standard,
 /obj/item/stamp/ce,
@@ -26092,8 +26207,11 @@
 	req_access = list(1)
 	},
 /obj/machinery/door/firedoor,
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
 /turf/simulated/floor/tiled/full,
-/area/security/main)
+/area/horizon/security/equipment)
 "mVO" = (
 /obj/machinery/light{
 	dir = 1
@@ -26177,7 +26295,7 @@
 	dir = 6
 	},
 /turf/simulated/floor/tiled,
-/area/security/brig)
+/area/horizon/security/hallway)
 "mXJ" = (
 /obj/machinery/light{
 	dir = 4
@@ -26406,6 +26524,9 @@
 	},
 /turf/simulated/floor/tiled,
 /area/horizon/hallway/deck_two/fore)
+"ncR" = (
+/turf/simulated/wall/r_wall,
+/area/horizon/security/lobby)
 "ndn" = (
 /obj/machinery/atmospherics/pipe/manifold/hidden/supply,
 /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
@@ -26605,11 +26726,6 @@
 /turf/simulated/floor/tiled,
 /area/operations/office)
 "ngB" = (
-/obj/machinery/power/apc{
-	is_critical = 1;
-	name = "south bump";
-	pixel_y = -24
-	},
 /obj/structure/cable/green,
 /obj/item/storage/box/fancy/donut{
 	pixel_y = 7
@@ -26618,8 +26734,11 @@
 /obj/effect/floor_decal/corner/paleblue{
 	dir = 10
 	},
+/obj/machinery/power/apc{
+	pixel_y = -24
+	},
 /turf/simulated/floor/tiled,
-/area/security/main)
+/area/horizon/security/equipment)
 "ngC" = (
 /obj/machinery/atmospherics/portables_connector{
 	dir = 4
@@ -27009,12 +27128,8 @@
 /obj/effect/floor_decal/corner/paleblue{
 	dir = 5
 	},
-/obj/machinery/light_switch{
-	pixel_x = 9;
-	pixel_y = 24
-	},
 /turf/simulated/floor/tiled,
-/area/security/armory)
+/area/horizon/security/armoury)
 "npD" = (
 /obj/machinery/atmospherics/unary/vent_scrubber/on{
 	dir = 8
@@ -27050,10 +27165,10 @@
 /turf/simulated/floor/plating,
 /area/maintenance/wing/starboard)
 "nqE" = (
-/obj/structure/table/standard,
 /obj/structure/railing/mapped,
+/obj/structure/table/reinforced,
 /turf/simulated/floor/tiled,
-/area/security/prison)
+/area/horizon/security/brig)
 "nrr" = (
 /obj/effect/floor_decal/corner/paleblue{
 	dir = 10
@@ -27065,7 +27180,7 @@
 	pixel_y = -32
 	},
 /turf/simulated/floor/tiled,
-/area/security/brig)
+/area/horizon/security/hallway)
 "nru" = (
 /obj/structure/table/rack,
 /obj/machinery/door/window/brigdoor/eastleft{
@@ -27086,7 +27201,7 @@
 	},
 /obj/effect/floor_decal/industrial/outline/security,
 /turf/simulated/floor/tiled/dark/full,
-/area/security/armory)
+/area/horizon/security/armoury)
 "nry" = (
 /obj/effect/floor_decal/spline/fancy/wood,
 /turf/simulated/floor/wood,
@@ -27220,9 +27335,6 @@
 /obj/machinery/biogenerator/small/west,
 /turf/simulated/floor/wood,
 /area/horizon/hydroponics/garden)
-"nxz" = (
-/turf/simulated/wall/r_wall,
-/area/security/security_office)
 "nxI" = (
 /turf/simulated/wall,
 /area/horizon/bar)
@@ -27310,7 +27422,7 @@
 	pixel_y = -32
 	},
 /turf/simulated/floor/tiled,
-/area/security/brig)
+/area/horizon/security/hallway)
 "nAq" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -27414,7 +27526,7 @@
 	dir = 1
 	},
 /turf/simulated/floor/tiled,
-/area/security/main)
+/area/horizon/security/equipment)
 "nCo" = (
 /obj/structure/bed/stool/chair/office/dark{
 	dir = 4
@@ -27490,7 +27602,7 @@
 	dir = 5
 	},
 /turf/simulated/floor/tiled,
-/area/security/armory)
+/area/horizon/security/armoury)
 "nDx" = (
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/wood,
@@ -27542,9 +27654,6 @@
 	},
 /turf/simulated/open,
 /area/operations/office)
-"nFf" = (
-/turf/simulated/wall,
-/area/security/prison)
 "nFm" = (
 /obj/effect/floor_decal/corner/mauve/full{
 	dir = 8
@@ -27559,7 +27668,7 @@
 	name = "fore, security"
 	},
 /turf/simulated/wall/shuttle/scc_space_ship/cardinal,
-/area/security/prison)
+/area/horizon/security/brig)
 "nFO" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
@@ -27952,7 +28061,7 @@
 	dir = 9
 	},
 /turf/simulated/floor/tiled,
-/area/security/prison)
+/area/horizon/security/brig)
 "nSO" = (
 /obj/effect/floor_decal/corner/lime{
 	dir = 4
@@ -28101,7 +28210,7 @@
 	icon_state = "0-4"
 	},
 /turf/simulated/floor/tiled/dark/full,
-/area/security/warden)
+/area/horizon/security/office)
 "nXD" = (
 /obj/structure/cable/green{
 	icon_state = "4-8"
@@ -28435,14 +28544,14 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
-	dir = 1
-	},
 /obj/effect/floor_decal/corner/paleblue{
 	dir = 9
 	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
 /turf/simulated/floor/tiled,
-/area/security/brig)
+/area/horizon/security/hallway)
 "ogV" = (
 /obj/effect/floor_decal/corner/green{
 	dir = 6
@@ -28557,7 +28666,7 @@
 	},
 /obj/machinery/firealarm/west,
 /turf/simulated/floor/tiled/dark/full,
-/area/security/armory)
+/area/horizon/security/armoury)
 "oiJ" = (
 /obj/effect/floor_decal/industrial/outline/engineering,
 /obj/machinery/power/breakerbox/activated{
@@ -28855,7 +28964,7 @@
 /area/horizon/library)
 "oqW" = (
 /turf/simulated/floor/tiled/full,
-/area/security/investigations)
+/area/horizon/security/investigations_hallway)
 "ord" = (
 /obj/structure/cable/green{
 	icon_state = "1-4"
@@ -28962,7 +29071,7 @@
 	dir = 10
 	},
 /turf/simulated/floor/tiled,
-/area/security/brig)
+/area/horizon/security/hallway)
 "ouk" = (
 /obj/structure/bed/stool/chair/office/light,
 /obj/effect/floor_decal/spline/fancy/wood{
@@ -28975,7 +29084,7 @@
 /area/rnd/conference)
 "ouo" = (
 /turf/simulated/wall,
-/area/security/armory)
+/area/horizon/security/equipment)
 "ouK" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -29192,21 +29301,7 @@
 	dir = 5
 	},
 /turf/simulated/floor/tiled,
-/area/security/brig)
-"oAb" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 9
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 9
-	},
-/obj/machinery/flasher{
-	id = "permflash";
-	name = "Floor mounted flash"
-	},
-/obj/effect/floor_decal/industrial/outline/yellow,
-/turf/simulated/floor/tiled,
-/area/security/prison)
+/area/horizon/security/hallway)
 "oAc" = (
 /obj/effect/floor_decal/corner/brown{
 	dir = 10
@@ -29228,7 +29323,7 @@
 	},
 /obj/machinery/firealarm/north,
 /turf/simulated/floor/tiled/dark/full,
-/area/security/armory)
+/area/horizon/security/armoury)
 "oAw" = (
 /obj/structure/table/stone/marble,
 /obj/machinery/door/blast/shutters{
@@ -29439,7 +29534,7 @@
 	icon_state = "d2-2-f"
 	},
 /turf/simulated/floor/plating,
-/area/security/armory)
+/area/horizon/security/armoury)
 "oDl" = (
 /obj/effect/floor_decal/corner/brown{
 	dir = 6
@@ -29600,7 +29695,7 @@
 	},
 /obj/effect/floor_decal/industrial/outline/security,
 /turf/simulated/floor/tiled,
-/area/security/main)
+/area/horizon/security/equipment)
 "oJL" = (
 /obj/structure/plasticflaps/airtight,
 /obj/machinery/door/firedoor,
@@ -29854,17 +29949,19 @@
 /turf/simulated/floor/plating,
 /area/maintenance/wing/starboard)
 "oQZ" = (
-/obj/machinery/flasher{
-	id = "permflash";
-	name = "Floor mounted flash"
-	},
 /obj/effect/floor_decal/corner/paleblue/diagonal,
-/obj/effect/floor_decal/industrial/outline/yellow,
 /obj/machinery/light/small{
 	dir = 4
 	},
+/obj/structure/bed/handrail{
+	dir = 1
+	},
+/obj/machinery/flasher{
+	id = "permflash";
+	pixel_y = -32
+	},
 /turf/simulated/floor/tiled/white,
-/area/security/prison)
+/area/horizon/security/brig)
 "oRc" = (
 /obj/machinery/atmospherics/pipe/simple/visible/cyan{
 	dir = 9
@@ -29898,6 +29995,13 @@
 	},
 /turf/simulated/floor/lino/grey,
 /area/horizon/kitchen/hallway)
+"oRT" = (
+/obj/effect/floor_decal/corner/paleblue{
+	dir = 10
+	},
+/obj/effect/floor_decal/industrial/warning,
+/turf/simulated/floor/tiled,
+/area/horizon/security/equipment)
 "oSj" = (
 /obj/structure/table/standard,
 /obj/effect/floor_decal/corner/grey/diagonal,
@@ -29956,7 +30060,7 @@
 "oTr" = (
 /obj/machinery/atmospherics/unary/vent_pump/on,
 /turf/simulated/floor/tiled,
-/area/security/main)
+/area/horizon/security/equipment)
 "oTE" = (
 /obj/machinery/light{
 	dir = 4
@@ -29992,17 +30096,13 @@
 /turf/simulated/floor/tiled/dark,
 /area/horizon/hydroponics)
 "oUb" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 9
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 9
-	},
 /obj/structure/cable/green{
 	icon_state = "1-2"
 	},
+/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply,
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
 /turf/simulated/floor/tiled,
-/area/security/prison)
+/area/horizon/security/brig)
 "oUt" = (
 /turf/simulated/wall,
 /area/medical/first_responder)
@@ -30106,7 +30206,7 @@
 "oWW" = (
 /obj/structure/foamedmetal,
 /turf/simulated/floor/plating,
-/area/security/armory)
+/area/horizon/security/armoury)
 "oXd" = (
 /obj/structure/window/shuttle/scc_space_ship,
 /obj/structure/grille,
@@ -30139,7 +30239,7 @@
 	dir = 10
 	},
 /turf/simulated/floor/tiled,
-/area/security/prison)
+/area/horizon/security/brig)
 "oXu" = (
 /obj/structure/window/shuttle/scc_space_ship,
 /obj/structure/grille,
@@ -30182,7 +30282,7 @@
 	dir = 9
 	},
 /turf/simulated/floor/tiled/dark/full,
-/area/security/armory)
+/area/horizon/security/armoury)
 "oYp" = (
 /obj/structure/closet/crate/solar,
 /obj/item/stack/material/graphite/full,
@@ -30190,35 +30290,16 @@
 /turf/simulated/floor/tiled/dark/full,
 /area/engineering/storage_hard)
 "oYH" = (
-/obj/structure/closet/crate/trashcart,
-/obj/item/toy/figure/secofficer{
-	pixel_x = -3;
-	pixel_y = -1
-	},
-/obj/item/storage/bag/trash{
-	pixel_x = 4
-	},
-/obj/item/storage/bag/trash{
-	pixel_x = 8
-	},
-/obj/item/storage/bag/trash{
-	pixel_x = 12
-	},
-/obj/item/storage/bag/trash,
-/obj/item/storage/bag/trash{
-	pixel_x = -4;
-	pixel_y = -2
-	},
-/obj/item/storage/bag/trash{
-	pixel_x = -9;
-	pixel_y = 2
-	},
 /obj/machinery/light{
 	dir = 8
 	},
 /obj/effect/floor_decal/corner/paleblue/full,
+/obj/structure/table/reinforced,
+/obj/item/material/minihoe,
+/obj/item/device/analyzer/plant_analyzer,
+/obj/item/clothing/head/bandana/hydro,
 /turf/simulated/floor/tiled,
-/area/security/prison)
+/area/horizon/security/brig)
 "oYM" = (
 /obj/machinery/computer/arcade/battle,
 /obj/effect/floor_decal/spline/plain{
@@ -30264,7 +30345,7 @@
 	dir = 10
 	},
 /turf/simulated/floor/tiled,
-/area/security/brig/processing)
+/area/horizon/security/holding_cell_a)
 "oZI" = (
 /obj/structure/cable/green{
 	icon_state = "1-2"
@@ -30461,7 +30542,7 @@
 	},
 /obj/effect/floor_decal/industrial/outline/security,
 /turf/simulated/floor/tiled/dark/full,
-/area/security/armory)
+/area/horizon/security/armoury)
 "pdv" = (
 /obj/effect/floor_decal/corner/green{
 	dir = 10
@@ -30477,7 +30558,7 @@
 	dir = 9
 	},
 /turf/simulated/floor/tiled,
-/area/security/brig)
+/area/horizon/security/hallway)
 "pdF" = (
 /obj/effect/floor_decal/industrial/hatch/yellow,
 /obj/effect/floor_decal/industrial/warning{
@@ -30712,7 +30793,7 @@
 	pixel_y = -30
 	},
 /turf/simulated/floor/carpet,
-/area/crew_quarters/heads/hos)
+/area/horizon/security/head_of_security)
 "pjL" = (
 /obj/structure/bed/stool/chair/office/dark{
 	dir = 4
@@ -30778,7 +30859,7 @@
 	dir = 5
 	},
 /turf/simulated/floor/tiled/dark,
-/area/security/warden)
+/area/horizon/security/warden)
 "plc" = (
 /obj/effect/floor_decal/corner/yellow{
 	dir = 5
@@ -30829,8 +30910,16 @@
 "plL" = (
 /obj/effect/map_effect/window_spawner/full/reinforced/grille/firedoor,
 /obj/structure/cable/green,
+/obj/machinery/door/blast/regular{
+	density = 0;
+	icon_state = "pdoor0";
+	id = "Brig Lockdown";
+	name = "Brig Lockdown Blast Door";
+	opacity = 0;
+	dir = 4
+	},
 /turf/simulated/floor/tiled/dark/full,
-/area/security/warden)
+/area/horizon/security/warden)
 "pmb" = (
 /obj/machinery/button/remote/blast_door{
 	desc = "A remote control-switch for shutters.";
@@ -30866,6 +30955,9 @@
 /obj/effect/floor_decal/industrial/outline/yellow,
 /turf/simulated/floor/tiled/dark/full,
 /area/engineering/storage_hard)
+"png" = (
+/turf/simulated/wall,
+/area/horizon/security/armoury)
 "pnj" = (
 /obj/effect/map_effect/window_spawner/full/reinforced/firedoor,
 /obj/machinery/door/blast/regular{
@@ -30998,7 +31090,7 @@
 	icon_state = "2-4"
 	},
 /turf/simulated/floor/tiled/dark,
-/area/security/warden)
+/area/horizon/security/warden)
 "psH" = (
 /obj/effect/floor_decal/corner/brown/full{
 	dir = 4
@@ -31090,7 +31182,7 @@
 	dir = 6
 	},
 /turf/simulated/floor/tiled,
-/area/security/lobby)
+/area/horizon/security/lobby)
 "pvx" = (
 /turf/simulated/floor/plating,
 /area/maintenance/substation/wing_port)
@@ -31098,12 +31190,12 @@
 /obj/structure/cable/green{
 	icon_state = "4-8"
 	},
-/obj/structure/bed/stool/chair/office/dark{
-	dir = 1
-	},
 /obj/effect/floor_decal/corner/paleblue/full,
+/obj/structure/bed/stool/chair/office/light{
+	dir = 4
+	},
 /turf/simulated/floor/tiled,
-/area/security/prison)
+/area/horizon/security/brig)
 "pwq" = (
 /obj/effect/floor_decal/spline/fancy/wood,
 /obj/structure/bed/stool/chair/padded/beige{
@@ -31111,13 +31203,6 @@
 	},
 /turf/simulated/floor/wood,
 /area/hallway/primary/central_two)
-"pwy" = (
-/obj/effect/floor_decal/corner/paleblue{
-	dir = 10
-	},
-/obj/effect/floor_decal/industrial/warning,
-/turf/simulated/floor/tiled,
-/area/security/brig)
 "pwB" = (
 /obj/machinery/atmospherics/pipe/simple/hidden{
 	dir = 5
@@ -31180,6 +31265,13 @@
 	},
 /turf/simulated/open,
 /area/hallway/primary/central_one)
+"pyA" = (
+/obj/machinery/light,
+/obj/effect/floor_decal/corner/paleblue{
+	dir = 10
+	},
+/turf/simulated/floor/tiled,
+/area/horizon/security/armoury)
 "pyJ" = (
 /obj/machinery/shower{
 	dir = 1
@@ -31252,9 +31344,12 @@
 /turf/simulated/floor/tiled,
 /area/rnd/hallway)
 "pBA" = (
-/obj/structure/bed/stool/padded/red,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/bed/stool/chair/plastic{
+	dir = 8
+	},
 /turf/simulated/floor/tiled,
-/area/security/prison)
+/area/horizon/security/brig)
 "pCf" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -31287,7 +31382,7 @@
 	},
 /obj/machinery/door/firedoor,
 /turf/simulated/floor/tiled/full,
-/area/security/main)
+/area/horizon/security/equipment)
 "pDn" = (
 /obj/machinery/atmospherics/pipe/simple/visible{
 	dir = 5
@@ -31520,6 +31615,12 @@
 	},
 /turf/simulated/floor/plating,
 /area/maintenance/substation/research)
+"pIn" = (
+/obj/effect/floor_decal/corner/paleblue{
+	dir = 10
+	},
+/turf/simulated/floor/tiled,
+/area/horizon/security/hallway)
 "pIs" = (
 /obj/structure/disposalpipe/segment,
 /obj/effect/floor_decal/corner/grey{
@@ -31560,7 +31661,7 @@
 /area/rnd/conference)
 "pJE" = (
 /turf/simulated/floor/tiled,
-/area/security/prison)
+/area/horizon/security/equipment)
 "pJK" = (
 /obj/machinery/atmospherics/pipe/manifold/hidden/supply,
 /turf/simulated/floor/tiled,
@@ -31651,11 +31752,17 @@
 /obj/structure/lattice/catwalk/indoor/grate/damaged,
 /turf/simulated/floor/plating,
 /area/maintenance/wing/port/far)
+"pMf" = (
+/turf/simulated/wall/r_wall,
+/area/horizon/security/armoury)
 "pMq" = (
 /obj/machinery/portable_atmospherics/hydroponics,
 /obj/machinery/atmospherics/portables_connector,
 /turf/simulated/floor/tiled/dark,
 /area/rnd/xenobiology/xenoflora_hazard)
+"pMz" = (
+/turf/simulated/wall,
+/area/horizon/security/brig)
 "pMB" = (
 /obj/effect/floor_decal/corner_wide/lime/diagonal,
 /obj/structure/cable/green{
@@ -31763,17 +31870,17 @@
 /turf/simulated/floor/lino/grey,
 /area/horizon/kitchen/hallway)
 "pNG" = (
-/obj/machinery/atmospherics/unary/vent_pump/on{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
 /obj/effect/floor_decal/corner/paleblue{
 	dir = 6
 	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+	dir = 4
+	},
 /turf/simulated/floor/tiled,
-/area/security/prison)
+/area/horizon/security/brig)
 "pNX" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -31923,7 +32030,7 @@
 /area/engineering/atmos/storage)
 "pSv" = (
 /turf/simulated/wall/shuttle/scc_space_ship/cardinal,
-/area/security/prison)
+/area/horizon/security/armoury)
 "pSI" = (
 /obj/machinery/door/firedoor,
 /obj/effect/floor_decal/industrial/hatch/yellow,
@@ -31965,19 +32072,18 @@
 /obj/structure/bed/stool/chair{
 	dir = 4
 	},
-/obj/machinery/power/apc/low{
-	dir = 8;
-	name = "west bump";
-	pixel_x = -24
-	},
 /obj/structure/cable/green{
 	icon_state = "0-4"
 	},
 /obj/effect/floor_decal/corner/paleblue{
 	dir = 9
 	},
+/obj/machinery/power/apc/low{
+	dir = 8;
+	pixel_x = -24
+	},
 /turf/simulated/floor/tiled,
-/area/security/lobby)
+/area/horizon/security/lobby)
 "pTY" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/reagent_dispensers/fueltank,
@@ -31987,19 +32093,18 @@
 /turf/simulated/floor/tiled/dark,
 /area/maintenance/wing/starboard/far)
 "pUn" = (
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
-	dir = 8
-	},
 /obj/structure/extinguisher_cabinet{
 	layer = 3.3;
-	pixel_x = 27;
-	pixel_y = 1
+	pixel_x = 32
 	},
 /obj/effect/floor_decal/corner/paleblue{
 	dir = 6
 	},
+/obj/machinery/atmospherics/unary/vent_pump/on{
+	dir = 8
+	},
 /turf/simulated/floor/tiled,
-/area/security/brig)
+/area/horizon/security/hallway)
 "pUI" = (
 /obj/structure/cable/green{
 	icon_state = "4-8"
@@ -32099,7 +32204,7 @@
 	dir = 6
 	},
 /turf/simulated/floor/tiled,
-/area/security/brig)
+/area/horizon/security/hallway)
 "pWx" = (
 /turf/simulated/wall,
 /area/horizon/library)
@@ -32198,7 +32303,7 @@
 	},
 /obj/effect/floor_decal/industrial/warning/corner,
 /turf/simulated/floor/tiled,
-/area/security/main)
+/area/horizon/security/equipment)
 "pZX" = (
 /obj/structure/curtain/black{
 	icon_state = "open";
@@ -32259,7 +32364,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/tiled/full,
-/area/security/warden)
+/area/horizon/security/warden)
 "qaI" = (
 /obj/structure/railing/mapped,
 /obj/effect/floor_decal/industrial/warning{
@@ -32450,11 +32555,11 @@
 /turf/simulated/floor/tiled,
 /area/operations/lower/machinist)
 "qfR" = (
-/obj/effect/floor_decal/corner/paleblue/full{
-	dir = 4
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+	dir = 8
 	},
 /turf/simulated/floor/tiled,
-/area/security/prison)
+/area/horizon/security/brig)
 "qgf" = (
 /obj/structure/closet/crate/freezer{
 	name = "Fridge"
@@ -32576,7 +32681,7 @@
 	dir = 10
 	},
 /turf/simulated/floor/tiled,
-/area/security/brig/processing_secondary)
+/area/horizon/security/holding_cell_b)
 "qjl" = (
 /obj/structure/cable/green{
 	icon_state = "1-2"
@@ -32659,20 +32764,20 @@
 /obj/structure/cable/green{
 	icon_state = "4-8"
 	},
-/obj/structure/table/steel,
-/obj/item/paper_bin{
-	pixel_x = -8;
-	pixel_y = 7
-	},
 /obj/item/pen{
-	pixel_x = -9;
-	pixel_y = 8
+	pixel_x = 8;
+	pixel_y = 3
 	},
 /obj/effect/floor_decal/corner/paleblue/full{
 	dir = 4
 	},
+/obj/structure/table/reinforced,
+/obj/item/paper_bin{
+	pixel_x = 8;
+	pixel_y = 2
+	},
 /turf/simulated/floor/tiled,
-/area/security/prison)
+/area/horizon/security/brig)
 "qlV" = (
 /obj/machinery/door/airlock/glass_security{
 	name = "Security Desk";
@@ -32686,7 +32791,7 @@
 /obj/machinery/door/firedoor,
 /obj/structure/disposalpipe/segment,
 /turf/simulated/floor/tiled/full,
-/area/security/security_office)
+/area/horizon/security/office)
 "qlX" = (
 /obj/effect/floor_decal/corner/green/diagonal,
 /obj/structure/toilet{
@@ -32733,8 +32838,11 @@
 /obj/effect/floor_decal/corner/paleblue{
 	dir = 9
 	},
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+	dir = 4
+	},
 /turf/simulated/floor/tiled,
-/area/security/brig)
+/area/horizon/security/hallway)
 "qnl" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -32914,7 +33022,7 @@
 "qtN" = (
 /obj/effect/map_effect/window_spawner/full/reinforced/grille/firedoor,
 /turf/simulated/floor/tiled/dark/full,
-/area/security/armory)
+/area/horizon/security/armoury)
 "qtR" = (
 /obj/effect/floor_decal/corner/green{
 	dir = 10
@@ -32969,7 +33077,7 @@
 /obj/effect/floor_decal/industrial/hatch/yellow,
 /obj/machinery/seed_storage,
 /turf/simulated/floor/tiled,
-/area/security/prison)
+/area/horizon/security/brig)
 "quT" = (
 /obj/effect/floor_decal/corner/blue/full{
 	dir = 1
@@ -33058,7 +33166,7 @@
 	pixel_y = 2
 	},
 /turf/simulated/floor/tiled,
-/area/security/armory)
+/area/horizon/security/armoury)
 "qvZ" = (
 /obj/structure/railing/mapped,
 /obj/machinery/light{
@@ -33145,7 +33253,7 @@
 	dir = 9
 	},
 /turf/simulated/floor/tiled,
-/area/security/prison)
+/area/horizon/security/brig)
 "qxy" = (
 /obj/effect/floor_decal/corner/blue{
 	dir = 9
@@ -33348,6 +33456,9 @@
 	},
 /turf/simulated/floor/tiled/full,
 /area/hallway/primary/central_two)
+"qDh" = (
+/turf/simulated/wall/r_wall,
+/area/horizon/security/equipment)
 "qDU" = (
 /obj/machinery/light{
 	dir = 1
@@ -33703,6 +33814,16 @@
 /obj/effect/floor_decal/sign/p,
 /turf/simulated/floor/tiled/white,
 /area/hallway/medical)
+"qLd" = (
+/obj/machinery/alarm{
+	dir = 1;
+	pixel_y = -28
+	},
+/obj/effect/floor_decal/corner/paleblue{
+	dir = 10
+	},
+/turf/simulated/floor/tiled,
+/area/horizon/security/brig)
 "qLj" = (
 /obj/effect/floor_decal/spline/fancy/wood{
 	dir = 6
@@ -33833,7 +33954,7 @@
 /area/horizon/library)
 "qPI" = (
 /turf/simulated/floor/tiled/ramp,
-/area/security/investigations)
+/area/horizon/security/investigations_hallway)
 "qPJ" = (
 /obj/machinery/atmospherics/pipe/manifold/hidden{
 	dir = 4
@@ -33872,8 +33993,11 @@
 /obj/effect/floor_decal/corner/paleblue{
 	dir = 6
 	},
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
 /turf/simulated/floor/tiled,
-/area/security/main)
+/area/horizon/security/equipment)
 "qQu" = (
 /obj/effect/floor_decal/spline/plain{
 	dir = 8
@@ -34020,7 +34144,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/tiled,
-/area/security/brig)
+/area/horizon/security/hallway)
 "qTB" = (
 /obj/effect/floor_decal/industrial/loading/yellow{
 	dir = 1
@@ -34058,7 +34182,7 @@
 "qUt" = (
 /obj/machinery/door/airlock/multi_tile/glass,
 /turf/simulated/floor/tiled/full,
-/area/security/investigations)
+/area/horizon/security/investigations_hallway)
 "qUz" = (
 /obj/effect/floor_decal/corner/mauve{
 	dir = 10
@@ -34094,19 +34218,18 @@
 /turf/simulated/floor/tiled,
 /area/horizon/stairwell/central)
 "qVk" = (
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
-	dir = 1
-	},
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
-	dir = 1
-	},
 /obj/machinery/flasher{
-	id = "permflash";
-	name = "Floor mounted flash"
+	id = "permflash"
 	},
-/obj/effect/floor_decal/industrial/outline/yellow,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/obj/effect/floor_decal/industrial/outline/security,
 /turf/simulated/floor/tiled,
-/area/security/prison)
+/area/horizon/security/brig)
 "qVu" = (
 /obj/effect/floor_decal/spline/plain{
 	dir = 8
@@ -34276,7 +34399,7 @@
 	pixel_x = 32
 	},
 /turf/simulated/floor/tiled,
-/area/security/brig)
+/area/horizon/security/hallway)
 "qZM" = (
 /obj/effect/floor_decal/corner/white/diagonal,
 /obj/effect/floor_decal/industrial/warning/corner{
@@ -34434,7 +34557,7 @@
 	},
 /obj/effect/floor_decal/industrial/outline/security,
 /turf/simulated/floor/tiled,
-/area/security/brig)
+/area/horizon/security/hallway)
 "reo" = (
 /obj/structure/cable/orange{
 	icon_state = "1-2"
@@ -34502,14 +34625,13 @@
 /obj/machinery/light{
 	dir = 8
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/structure/closet/emcloset,
 /obj/effect/floor_decal/corner/paleblue{
 	dir = 9
 	},
 /obj/effect/floor_decal/industrial/outline/emergency_closet,
 /turf/simulated/floor/tiled,
-/area/security/brig)
+/area/horizon/security/hallway)
 "rfG" = (
 /obj/effect/floor_decal/corner/mauve/full,
 /obj/structure/cable/green{
@@ -34552,7 +34674,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /turf/simulated/floor/tiled,
-/area/security/lobby)
+/area/horizon/security/lobby)
 "rgI" = (
 /obj/machinery/atmospherics/pipe/simple/visible/black{
 	dir = 9
@@ -34581,7 +34703,7 @@
 /obj/machinery/door/firedoor,
 /obj/effect/floor_decal/industrial/hatch/yellow,
 /turf/simulated/floor/tiled,
-/area/security/brig)
+/area/horizon/security/hallway)
 "rhC" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
@@ -34999,7 +35121,7 @@
 /obj/effect/floor_decal/corner_wide/paleblue/full,
 /obj/effect/floor_decal/industrial/outline/security,
 /turf/simulated/floor/tiled/dark/full,
-/area/security/armory)
+/area/horizon/security/armoury)
 "rrq" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
@@ -35107,17 +35229,15 @@
 /turf/simulated/floor/tiled/full,
 /area/hallway/engineering/tesla)
 "rup" = (
-/obj/machinery/shower{
-	pixel_y = 20
-	},
-/obj/structure/curtain/open/shower,
-/obj/random/soap,
 /obj/effect/floor_decal/corner/paleblue/diagonal,
-/obj/structure/bed/handrail{
-	dir = 4
+/obj/structure/sink{
+	pixel_y = 21
+	},
+/obj/structure/mirror{
+	pixel_y = 32
 	},
 /turf/simulated/floor/tiled/white,
-/area/security/prison)
+/area/horizon/security/brig)
 "ruv" = (
 /obj/structure/table/standard,
 /obj/machinery/librarycomp{
@@ -35198,12 +35318,6 @@
 /obj/structure/disposalpipe/segment,
 /turf/simulated/floor/tiled/dark,
 /area/rnd/xenobiology/xenoflora)
-"rvM" = (
-/obj/structure/cable/green{
-	icon_state = "1-2"
-	},
-/turf/simulated/floor/tiled,
-/area/security/main)
 "rvT" = (
 /obj/structure/railing/mapped{
 	dir = 4
@@ -35260,20 +35374,16 @@
 	dir = 8;
 	icon_state = "pipe-c"
 	},
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
-	dir = 8
-	},
 /obj/structure/cable/green{
 	icon_state = "1-2"
 	},
 /obj/effect/floor_decal/corner/paleblue{
 	dir = 5
 	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /turf/simulated/floor/tiled,
-/area/security/prison)
+/area/horizon/security/brig)
 "rxC" = (
 /obj/effect/landmark/start{
 	name = "Chef"
@@ -35358,7 +35468,7 @@
 	dir = 6
 	},
 /turf/simulated/floor/tiled,
-/area/security/lobby)
+/area/horizon/security/lobby)
 "rzC" = (
 /obj/structure/closet/crate,
 /obj/random/loot,
@@ -35446,7 +35556,7 @@
 	dir = 10
 	},
 /turf/simulated/floor/tiled,
-/area/security/brig)
+/area/horizon/security/hallway)
 "rCd" = (
 /obj/machinery/light{
 	dir = 8
@@ -35520,6 +35630,9 @@
 	},
 /turf/simulated/floor/wood,
 /area/horizon/crew_quarters/lounge/bar)
+"rDK" = (
+/turf/simulated/wall,
+/area/horizon/security/lobby)
 "rEk" = (
 /obj/effect/floor_decal/corner_wide/yellow{
 	dir = 9
@@ -35593,16 +35706,35 @@
 /turf/simulated/floor/tiled/dark,
 /area/horizon/kitchen)
 "rGx" = (
-/obj/structure/table/standard,
-/obj/structure/bedsheetbin,
-/obj/item/toy/figure/hos,
 /obj/machinery/light{
 	dir = 4
 	},
-/obj/effect/floor_decal/corner/green/diagonal,
-/obj/effect/floor_decal/spline/plain/cee,
-/turf/simulated/floor/tiled/white,
-/area/security/prison)
+/obj/effect/floor_decal/corner/paleblue/full{
+	dir = 4
+	},
+/obj/effect/floor_decal/industrial/outline/grey,
+/obj/structure/closet/crate/trashcart,
+/obj/item/storage/bag/trash{
+	pixel_x = 12
+	},
+/obj/item/storage/bag/trash{
+	pixel_x = 8
+	},
+/obj/item/storage/bag/trash{
+	pixel_x = 4
+	},
+/obj/item/storage/bag/trash,
+/obj/item/storage/bag/trash{
+	pixel_x = -4;
+	pixel_y = -2
+	},
+/obj/item/storage/bag/trash{
+	pixel_x = -9;
+	pixel_y = 2
+	},
+/obj/item/toy/figure/secofficer,
+/turf/simulated/floor/tiled,
+/area/horizon/security/brig)
 "rGU" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -35683,7 +35815,7 @@
 	dir = 1
 	},
 /turf/simulated/floor/tiled,
-/area/security/lobby)
+/area/horizon/security/lobby)
 "rIN" = (
 /obj/effect/floor_decal/industrial/hatch/yellow,
 /obj/structure/window/reinforced{
@@ -35767,7 +35899,7 @@
 /obj/effect/floor_decal/industrial/outline/security,
 /obj/structure/closet/secure_closet/contraband,
 /turf/simulated/floor/tiled/dark/full,
-/area/security/armory)
+/area/horizon/security/armoury)
 "rKy" = (
 /obj/effect/floor_decal/industrial/warning{
 	dir = 4
@@ -35775,13 +35907,6 @@
 /obj/structure/ship_weapon_dummy,
 /turf/simulated/floor/plating,
 /area/horizon/zta)
-"rKJ" = (
-/obj/effect/floor_decal/corner/paleblue/diagonal,
-/obj/structure/bed/handrail{
-	dir = 1
-	},
-/turf/simulated/floor/tiled/white,
-/area/security/prison)
 "rLm" = (
 /obj/effect/floor_decal/industrial/warning/corner{
 	dir = 1
@@ -35803,13 +35928,18 @@
 /turf/simulated/floor/tiled/dark,
 /area/engineering/aft_airlock)
 "rLu" = (
-/obj/structure/cable/green{
-	icon_state = "1-2"
+/obj/structure/cable/green,
+/obj/effect/map_effect/window_spawner/full/reinforced/grille/firedoor,
+/obj/machinery/door/blast/regular{
+	density = 0;
+	icon_state = "pdoor0";
+	id = "Brig Lockdown";
+	name = "Brig Lockdown Blast Door";
+	opacity = 0;
+	dir = 4
 	},
-/obj/machinery/vending/hydronutrients,
-/obj/effect/floor_decal/industrial/hatch/yellow,
-/turf/simulated/floor/tiled,
-/area/security/prison)
+/turf/simulated/floor/tiled/dark/full,
+/area/horizon/security/brig)
 "rLw" = (
 /obj/effect/map_effect/window_spawner/full/reinforced/firedoor,
 /turf/simulated/floor/tiled/dark/full,
@@ -35937,7 +36067,7 @@
 	},
 /obj/effect/floor_decal/industrial/warning,
 /turf/simulated/floor/tiled,
-/area/security/main)
+/area/horizon/security/equipment)
 "rOw" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -36044,7 +36174,7 @@
 	},
 /obj/item/paper_bin,
 /turf/simulated/floor/carpet,
-/area/crew_quarters/heads/hos)
+/area/horizon/security/head_of_security)
 "rQO" = (
 /obj/structure/bed/stool/chair/padded/red{
 	dir = 4
@@ -36077,7 +36207,7 @@
 	name = "fore, security maintenance"
 	},
 /turf/simulated/wall/shuttle/scc_space_ship/cardinal,
-/area/security/brig)
+/area/horizon/security/hallway)
 "rSv" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -36121,7 +36251,7 @@
 	dir = 1
 	},
 /turf/simulated/floor/tiled,
-/area/security/main)
+/area/horizon/security/equipment)
 "rSG" = (
 /turf/simulated/open,
 /area/operations/office)
@@ -36305,7 +36435,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/tiled,
-/area/security/brig)
+/area/horizon/security/hallway)
 "rXh" = (
 /obj/machinery/door/window/southleft,
 /obj/machinery/shower{
@@ -36316,7 +36446,7 @@
 	},
 /obj/structure/curtain/open/shower,
 /turf/simulated/floor/tiled/freezer,
-/area/security/main)
+/area/horizon/security/washroom)
 "rXm" = (
 /obj/effect/floor_decal/industrial/warning/full,
 /obj/machinery/mech_recharger,
@@ -36615,7 +36745,7 @@
 	},
 /obj/machinery/door/firedoor,
 /turf/simulated/floor/tiled,
-/area/security/brig/processing_secondary)
+/area/horizon/security/holding_cell_b)
 "sgQ" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -36648,7 +36778,7 @@
 	dir = 1
 	},
 /turf/simulated/floor/tiled,
-/area/security/main)
+/area/horizon/security/equipment)
 "shR" = (
 /obj/machinery/camera/network/reactor{
 	c_tag = "Engineering - Tesla Room 2"
@@ -36665,13 +36795,15 @@
 /obj/structure/cable/green{
 	icon_state = "1-2"
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/structure/disposalpipe/segment,
 /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
 	dir = 8
 	},
 /turf/simulated/floor/tiled,
-/area/security/brig)
+/area/horizon/security/hallway)
 "siL" = (
 /obj/structure/railing/mapped,
 /obj/structure/lattice,
@@ -36984,7 +37116,7 @@
 	dir = 6
 	},
 /turf/simulated/floor/tiled,
-/area/security/brig)
+/area/horizon/security/hallway)
 "sqE" = (
 /obj/machinery/light_switch{
 	dir = 8;
@@ -37003,7 +37135,7 @@
 	},
 /obj/effect/floor_decal/industrial/outline/security,
 /turf/simulated/floor/tiled,
-/area/security/main)
+/area/horizon/security/equipment)
 "srn" = (
 /obj/effect/map_effect/window_spawner/full/borosilicate/reinforced,
 /obj/machinery/door/blast/regular{
@@ -37117,7 +37249,7 @@
 	dir = 10
 	},
 /turf/simulated/floor/tiled,
-/area/security/security_office)
+/area/horizon/security/office)
 "sui" = (
 /obj/structure/window/shuttle/scc_space_ship,
 /obj/structure/grille,
@@ -37268,7 +37400,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/wood,
-/area/crew_quarters/heads/hos)
+/area/horizon/security/head_of_security)
 "sBt" = (
 /obj/structure/shuttle_part/scc_space_ship{
 	icon_state = "d3-5-f"
@@ -37298,8 +37430,11 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 10
 	},
+/obj/structure/cable/green{
+	icon_state = "2-8"
+	},
 /turf/simulated/floor/tiled,
-/area/security/main)
+/area/horizon/security/equipment)
 "sCe" = (
 /obj/structure/railing/mapped{
 	dir = 8
@@ -37383,10 +37518,7 @@
 /obj/machinery/door/firedoor,
 /obj/effect/floor_decal/industrial/hatch/yellow,
 /turf/simulated/floor/tiled,
-/area/security/brig)
-"sEk" = (
-/turf/simulated/wall,
-/area/security/brig/processing_secondary)
+/area/horizon/security/hallway)
 "sEu" = (
 /obj/structure/lattice/catwalk/indoor/grate,
 /obj/random/junk,
@@ -37437,7 +37569,7 @@
 /area/crew_quarters/heads/hor)
 "sGm" = (
 /turf/simulated/wall,
-/area/security/investigations)
+/area/horizon/security/investigations_hallway)
 "sGn" = (
 /turf/simulated/open,
 /area/horizon/stairwell/bridge)
@@ -37494,7 +37626,7 @@
 	},
 /obj/machinery/atmospherics/unary/vent_scrubber/on,
 /turf/simulated/floor/wood,
-/area/crew_quarters/heads/hos)
+/area/horizon/security/head_of_security)
 "sHR" = (
 /obj/structure/railing/mapped,
 /obj/effect/floor_decal/corner/mauve/diagonal,
@@ -37550,7 +37682,7 @@
 	dir = 10
 	},
 /turf/simulated/floor/tiled,
-/area/security/brig)
+/area/horizon/security/hallway)
 "sJi" = (
 /obj/structure/table/standard,
 /obj/machinery/recharger,
@@ -37591,14 +37723,27 @@
 /obj/effect/floor_decal/corner/paleblue/full{
 	dir = 4
 	},
-/obj/structure/cable/green{
-	icon_state = "4-8"
-	},
 /obj/effect/floor_decal/industrial/warning/corner{
 	dir = 4
 	},
+/obj/machinery/button/remote/airlock{
+	dir = 8;
+	id = "cell_isolation";
+	name = "Isolation Cell Bolts";
+	req_access = list(19);
+	specialfunctions = 4;
+	pixel_x = 25;
+	pixel_y = 7
+	},
+/obj/machinery/button/remote/blast_door{
+	id = "shutters_deck1_security_cell_isolation";
+	name = "Isolation Cell Window Shutters";
+	dir = 8;
+	pixel_x = 35;
+	pixel_y = 7
+	},
 /turf/simulated/floor/tiled,
-/area/security/brig)
+/area/horizon/security/hallway)
 "sKJ" = (
 /turf/simulated/wall,
 /area/horizon/crew_quarters/lounge/bar)
@@ -37686,7 +37831,7 @@
 /area/maintenance/wing/port/far)
 "sNx" = (
 /turf/simulated/floor/tiled/dark/full,
-/area/security/armory)
+/area/horizon/security/armoury)
 "sNJ" = (
 /obj/structure/cable/green{
 	icon_state = "1-2"
@@ -37733,9 +37878,6 @@
 /obj/effect/floor_decal/spline/plain,
 /turf/simulated/floor/carpet/rubber,
 /area/engineering/engine_monitoring)
-"sOd" = (
-/turf/simulated/wall/r_wall,
-/area/security/main)
 "sOe" = (
 /obj/structure/disposalpipe/segment{
 	dir = 2;
@@ -37831,11 +37973,11 @@
 	dir = 6
 	},
 /obj/effect/floor_decal/industrial/warning/corner,
-/obj/machinery/door_timer/cell_4{
+/obj/machinery/door_timer/isolation_cell{
 	pixel_x = 32
 	},
 /turf/simulated/floor/tiled,
-/area/security/brig)
+/area/horizon/security/hallway)
 "sRC" = (
 /obj/effect/floor_decal/spline/plain,
 /obj/machinery/button/switch/windowtint{
@@ -38111,13 +38253,13 @@
 /turf/simulated/floor/tiled/dark,
 /area/horizon/zta)
 "sYY" = (
-/obj/structure/closet/emcloset,
 /obj/effect/floor_decal/corner/paleblue/full{
 	dir = 1
 	},
 /obj/effect/floor_decal/industrial/outline/emergency_closet,
+/obj/structure/closet/emcloset/communal,
 /turf/simulated/floor/tiled,
-/area/security/prison)
+/area/horizon/security/brig)
 "sZj" = (
 /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
 	dir = 8
@@ -38310,11 +38452,6 @@
 /turf/simulated/floor/tiled,
 /area/rnd/hallway)
 "tdv" = (
-/obj/machinery/power/apc/low{
-	dir = 4;
-	name = "east bump";
-	pixel_x = 24
-	},
 /obj/structure/cable/green{
 	icon_state = "0-8"
 	},
@@ -38322,8 +38459,12 @@
 /obj/effect/floor_decal/corner/paleblue/full{
 	dir = 4
 	},
+/obj/machinery/power/apc/low{
+	dir = 4;
+	pixel_x = 24
+	},
 /turf/simulated/floor/tiled,
-/area/security/brig/processing_secondary)
+/area/horizon/security/holding_cell_b)
 "tdO" = (
 /obj/effect/floor_decal/corner/grey/diagonal,
 /obj/structure/disposalpipe/segment{
@@ -38405,11 +38546,6 @@
 /turf/simulated/floor/tiled/white,
 /area/medical/pharmacy)
 "tfL" = (
-/obj/machinery/power/apc{
-	dir = 8;
-	name = "west bump";
-	pixel_x = -24
-	},
 /obj/structure/cable/green{
 	icon_state = "0-4"
 	},
@@ -38417,8 +38553,12 @@
 	dir = 4;
 	icon_state = "pipe-c"
 	},
+/obj/machinery/power/apc{
+	dir = 8;
+	pixel_x = -24
+	},
 /turf/simulated/floor/wood,
-/area/crew_quarters/heads/hos)
+/area/horizon/security/head_of_security)
 "tgp" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -38680,7 +38820,7 @@
 	pixel_y = -32
 	},
 /turf/simulated/floor/tiled/dark/full,
-/area/security/armory)
+/area/horizon/security/armoury)
 "tmG" = (
 /obj/effect/floor_decal/industrial/warning{
 	dir = 8
@@ -38819,7 +38959,7 @@
 	},
 /obj/effect/floor_decal/industrial/outline/security,
 /turf/simulated/floor/tiled/dark/full,
-/area/security/armory)
+/area/horizon/security/armoury)
 "trC" = (
 /obj/machinery/light,
 /obj/effect/floor_decal/corner/brown{
@@ -38853,7 +38993,7 @@
 /obj/structure/bed/padded,
 /obj/item/bedsheet/blue,
 /turf/simulated/floor/tiled,
-/area/security/prison)
+/area/horizon/security/brig)
 "tsA" = (
 /obj/structure/cable/green{
 	icon_state = "4-8"
@@ -38879,20 +39019,13 @@
 	},
 /turf/simulated/floor/tiled,
 /area/engineering/atmos/storage)
-"tue" = (
-/obj/machinery/light,
-/obj/effect/floor_decal/corner/paleblue{
-	dir = 10
-	},
-/turf/simulated/floor/tiled,
-/area/security/brig)
 "tun" = (
 /obj/machinery/suit_cycler/hos,
 /obj/machinery/firealarm/north,
 /obj/effect/floor_decal/industrial/hatch/yellow,
 /obj/effect/floor_decal/spline/plain/full,
 /turf/simulated/floor/tiled/dark/full,
-/area/crew_quarters/heads/hos)
+/area/horizon/security/head_of_security)
 "tux" = (
 /obj/structure/bed/stool/chair/padded/red{
 	dir = 8
@@ -38910,8 +39043,11 @@
 /obj/effect/floor_decal/corner/paleblue{
 	dir = 5
 	},
+/obj/machinery/light{
+	dir = 1
+	},
 /turf/simulated/floor/tiled,
-/area/security/brig)
+/area/horizon/security/hallway)
 "tuH" = (
 /obj/structure/cable/green{
 	icon_state = "1-2"
@@ -38919,11 +39055,9 @@
 /obj/effect/floor_decal/corner/paleblue/full{
 	dir = 8
 	},
-/obj/structure/bed/stool/chair/office/dark{
-	dir = 4
-	},
+/obj/structure/bed/stool/chair/office/light,
 /turf/simulated/floor/tiled,
-/area/security/prison)
+/area/horizon/security/brig)
 "tvc" = (
 /obj/structure/sink{
 	dir = 8;
@@ -38940,7 +39074,7 @@
 /obj/machinery/light/small,
 /obj/effect/floor_decal/corner/paleblue/diagonal,
 /turf/simulated/floor/tiled/white,
-/area/security/main)
+/area/horizon/security/washroom)
 "tvk" = (
 /obj/machinery/atmospherics/unary/vent_pump/on{
 	dir = 1
@@ -39045,7 +39179,7 @@
 	dir = 9
 	},
 /turf/simulated/floor/tiled,
-/area/security/lobby)
+/area/horizon/security/lobby)
 "tyd" = (
 /obj/machinery/atmospherics/unary/vent_scrubber/on{
 	dir = 1
@@ -39097,7 +39231,7 @@
 	dir = 5
 	},
 /turf/simulated/floor/tiled,
-/area/security/brig)
+/area/horizon/security/hallway)
 "tzw" = (
 /obj/effect/floor_decal/industrial/warning,
 /obj/machinery/light/spot/weak,
@@ -39421,7 +39555,7 @@
 	name = "Safety Shutter"
 	},
 /turf/simulated/floor/tiled/dark/full,
-/area/security/brig)
+/area/horizon/security/lobby)
 "tHd" = (
 /obj/effect/floor_decal/industrial/warning{
 	dir = 5
@@ -39544,7 +39678,7 @@
 	},
 /obj/structure/reagent_dispensers/water_cooler,
 /turf/simulated/floor/tiled,
-/area/security/lobby)
+/area/horizon/security/lobby)
 "tJa" = (
 /obj/structure/cable/green{
 	icon_state = "1-2"
@@ -39610,7 +39744,7 @@
 	dir = 10
 	},
 /turf/simulated/floor/tiled,
-/area/security/brig)
+/area/horizon/security/hallway)
 "tKC" = (
 /obj/machinery/light{
 	dir = 1
@@ -39864,8 +39998,16 @@
 	icon_state = "1-2"
 	},
 /obj/structure/cable/green,
+/obj/machinery/door/blast/regular{
+	density = 0;
+	icon_state = "pdoor0";
+	id = "Brig Lockdown";
+	name = "Brig Lockdown Blast Door";
+	opacity = 0;
+	dir = 4
+	},
 /turf/simulated/floor/tiled/dark/full,
-/area/security/prison)
+/area/horizon/security/brig)
 "tQB" = (
 /obj/machinery/door/airlock/hatch{
 	id_tag = "bolts_cannon_external";
@@ -40041,7 +40183,7 @@
 	name = "Security Office"
 	},
 /turf/simulated/floor/tiled/dark/full,
-/area/security/security_office)
+/area/horizon/security/office)
 "tWF" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -40062,17 +40204,7 @@
 /area/chapel/office)
 "tWH" = (
 /turf/simulated/floor/wood,
-/area/crew_quarters/heads/hos)
-"tWI" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/flasher{
-	id = "permflash";
-	name = "Floor mounted flash"
-	},
-/obj/effect/floor_decal/industrial/outline/yellow,
-/turf/simulated/floor/tiled,
-/area/security/prison)
+/area/horizon/security/head_of_security)
 "tXc" = (
 /obj/structure/cable/green{
 	icon_state = "4-8"
@@ -40153,14 +40285,7 @@
 	dir = 1
 	},
 /turf/simulated/floor/tiled,
-/area/security/main)
-"tYK" = (
-/obj/structure/cable/green{
-	icon_state = "0-2"
-	},
-/obj/effect/map_effect/window_spawner/full/reinforced/grille/firedoor,
-/turf/simulated/floor/tiled/dark/full,
-/area/security/brig/processing_secondary)
+/area/horizon/security/equipment)
 "tZr" = (
 /obj/structure/cable/orange{
 	icon_state = "1-4"
@@ -40214,6 +40339,9 @@
 	},
 /turf/simulated/floor/tiled,
 /area/hallway/primary/central_one)
+"uan" = (
+/turf/simulated/wall/shuttle/scc_space_ship/cardinal,
+/area/horizon/security/brig)
 "uaC" = (
 /obj/machinery/firealarm/west,
 /turf/simulated/floor/tiled/dark,
@@ -40233,6 +40361,9 @@
 /obj/structure/window/reinforced,
 /turf/simulated/floor/tiled/dark,
 /area/horizon/zta)
+"ubq" = (
+/turf/simulated/wall/r_wall,
+/area/horizon/security/hallway)
 "ubt" = (
 /turf/simulated/floor/tiled,
 /area/maintenance/wing/starboard/far)
@@ -40307,7 +40438,7 @@
 	req_access = list(1)
 	},
 /turf/simulated/floor/tiled/full,
-/area/security/main)
+/area/horizon/security/equipment)
 "ucI" = (
 /obj/effect/floor_decal/corner_wide/paleblue/full{
 	dir = 8
@@ -40346,7 +40477,7 @@
 	},
 /obj/effect/floor_decal/corner/paleblue,
 /turf/simulated/floor/tiled,
-/area/security/brig)
+/area/horizon/security/hallway)
 "udR" = (
 /obj/structure/grille,
 /obj/machinery/door/firedoor,
@@ -40365,6 +40496,10 @@
 	},
 /turf/simulated/floor/tiled,
 /area/hallway/primary/central_two)
+"ueC" = (
+/obj/effect/floor_decal/corner/paleblue,
+/turf/simulated/floor/tiled,
+/area/horizon/security/brig)
 "ueF" = (
 /obj/structure/cable/green{
 	icon_state = "1-2"
@@ -40411,7 +40546,7 @@
 	dir = 1
 	},
 /turf/simulated/floor/tiled/dark/full,
-/area/security/armory)
+/area/horizon/security/armoury)
 "ugc" = (
 /obj/machinery/atmospherics/unary/vent_scrubber/on{
 	dir = 8
@@ -40523,7 +40658,7 @@
 	},
 /obj/effect/floor_decal/corner/paleblue/full,
 /turf/simulated/floor/tiled,
-/area/security/armory)
+/area/horizon/security/armoury)
 "uhP" = (
 /obj/effect/floor_decal/industrial/warning{
 	dir = 6
@@ -40555,13 +40690,13 @@
 	pixel_y = 35
 	},
 /turf/simulated/floor/tiled,
-/area/security/security_office)
+/area/horizon/security/office)
 "uiH" = (
 /obj/structure/shuttle_part/scc_space_ship{
 	icon_state = "d2-1-f"
 	},
 /turf/simulated/wall/r_wall,
-/area/security/armory)
+/area/horizon/security/armoury)
 "uiL" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 10
@@ -40682,7 +40817,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/tiled,
-/area/security/lobby)
+/area/horizon/security/lobby)
 "ulg" = (
 /obj/structure/cable/green{
 	icon_state = "4-8"
@@ -40862,7 +40997,7 @@
 	dir = 9
 	},
 /turf/simulated/floor/tiled,
-/area/security/brig/processing_secondary)
+/area/horizon/security/holding_cell_b)
 "uoj" = (
 /obj/effect/floor_decal/industrial/warning{
 	dir = 10
@@ -41015,7 +41150,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/tiled,
-/area/security/security_office)
+/area/horizon/security/office)
 "upO" = (
 /obj/structure/sink/kitchen{
 	dir = 4;
@@ -41778,7 +41913,7 @@
 	icon_state = "pipe-j2"
 	},
 /turf/simulated/floor/tiled,
-/area/security/brig)
+/area/horizon/security/hallway)
 "uJk" = (
 /obj/structure/lattice/catwalk/indoor/grate/damaged,
 /turf/simulated/floor/plating,
@@ -41959,6 +42094,10 @@
 	temperature = 253.15
 	},
 /area/horizon/kitchen/freezer)
+"uNL" = (
+/obj/item/hullbeacon/red,
+/turf/simulated/floor/reinforced/airless,
+/area/template_noop)
 "uOb" = (
 /obj/structure/table/standard,
 /obj/item/cell/high,
@@ -41980,6 +42119,9 @@
 	},
 /turf/simulated/floor/plating,
 /area/maintenance/wing/starboard)
+"uOB" = (
+/turf/simulated/wall/r_wall,
+/area/horizon/security/warden)
 "uOD" = (
 /obj/effect/floor_decal/corner/grey{
 	dir = 9
@@ -42114,7 +42256,7 @@
 	name = "fore, armoury"
 	},
 /turf/simulated/wall/r_wall,
-/area/security/armory)
+/area/horizon/security/armoury)
 "uRz" = (
 /obj/machinery/bodyscanner{
 	dir = 8
@@ -42177,12 +42319,13 @@
 	},
 /obj/machinery/door/blast/regular{
 	id = "shutters_deck1_security_cell_3";
-	name = "Cell Door"
+	name = "Cell Door";
+	dir = 2
 	},
 /obj/machinery/door/firedoor,
 /obj/effect/floor_decal/industrial/hatch/yellow,
 /turf/simulated/floor/tiled/full,
-/area/security/prison)
+/area/horizon/security/brig)
 "uTr" = (
 /turf/simulated/wall,
 /area/operations/lower/machinist)
@@ -42411,17 +42554,11 @@
 /obj/machinery/newscaster{
 	pixel_y = 32
 	},
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
-	dir = 1
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
 /obj/effect/floor_decal/corner/paleblue{
 	dir = 5
 	},
 /turf/simulated/floor/tiled,
-/area/security/prison)
+/area/horizon/security/brig)
 "uZH" = (
 /obj/machinery/light/small{
 	dir = 8
@@ -42441,15 +42578,16 @@
 	dir = 9
 	},
 /turf/simulated/floor/tiled/dark/full,
-/area/security/armory)
+/area/horizon/security/armoury)
 "vaL" = (
 /turf/simulated/floor/plating,
 /area/maintenance/wing/starboard/far)
 "vaR" = (
-/obj/structure/table/standard,
-/obj/item/book/manual/wiki/security_space_law,
+/obj/structure/bed/stool/chair/plastic{
+	dir = 4
+	},
 /turf/simulated/floor/tiled,
-/area/security/prison)
+/area/horizon/security/brig)
 "vbc" = (
 /obj/machinery/atmospherics/pipe/simple/heat_exchanging{
 	dir = 4
@@ -42513,7 +42651,7 @@
 	id = "HoS Windows"
 	},
 /turf/simulated/floor/tiled/dark/full,
-/area/crew_quarters/heads/hos)
+/area/horizon/security/head_of_security)
 "vdQ" = (
 /obj/structure/table/standard,
 /obj/item/storage/box/fancy/vials{
@@ -42615,7 +42753,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/tiled,
-/area/security/brig)
+/area/horizon/security/hallway)
 "vgh" = (
 /obj/structure/window/shuttle/scc_space_ship,
 /obj/structure/grille,
@@ -42642,6 +42780,9 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/horizon/custodial/disposals)
+"vgu" = (
+/turf/simulated/wall/r_wall,
+/area/horizon/security/holding_cell_b)
 "vgz" = (
 /obj/structure/table/rack,
 /obj/effect/floor_decal/corner/paleblue{
@@ -42696,7 +42837,7 @@
 	pixel_y = -6
 	},
 /turf/simulated/floor/tiled,
-/area/security/armory)
+/area/horizon/security/armoury)
 "vgZ" = (
 /obj/structure/cable/yellow{
 	d1 = 1;
@@ -42805,7 +42946,7 @@
 	pixel_y = -30
 	},
 /turf/simulated/floor/carpet,
-/area/crew_quarters/heads/hos)
+/area/horizon/security/head_of_security)
 "vkw" = (
 /obj/effect/floor_decal/corner/grey/diagonal,
 /obj/structure/disposalpipe/segment,
@@ -42822,7 +42963,7 @@
 	icon_state = "1-4"
 	},
 /turf/simulated/floor/tiled,
-/area/security/brig)
+/area/horizon/security/hallway)
 "vlO" = (
 /obj/structure/cable/green{
 	icon_state = "4-8"
@@ -42883,7 +43024,7 @@
 	},
 /obj/effect/floor_decal/industrial/outline/security,
 /turf/simulated/floor/tiled,
-/area/security/main)
+/area/horizon/security/equipment)
 "voz" = (
 /turf/simulated/wall/r_wall,
 /area/crew_quarters/heads/chief)
@@ -43037,9 +43178,6 @@
 /obj/effect/floor_decal/industrial/outline/yellow,
 /turf/simulated/floor/tiled/dark/full,
 /area/engineering/engine_room)
-"vsS" = (
-/turf/simulated/wall/r_wall,
-/area/security/brig)
 "vte" = (
 /turf/simulated/floor/tiled,
 /area/operations/lobby)
@@ -43058,7 +43196,7 @@
 	icon_state = "2-8"
 	},
 /turf/simulated/floor/tiled,
-/area/security/brig)
+/area/horizon/security/hallway)
 "vtX" = (
 /obj/structure/window/shuttle/scc_space_ship,
 /obj/structure/grille,
@@ -43091,7 +43229,7 @@
 	pixel_y = -7
 	},
 /turf/simulated/floor/carpet,
-/area/crew_quarters/heads/hos)
+/area/horizon/security/head_of_security)
 "vuI" = (
 /obj/effect/floor_decal/industrial/warning{
 	dir = 4
@@ -43402,10 +43540,11 @@
 	req_access = list(3)
 	},
 /obj/machinery/door/window/brigdoor/northleft{
-	name = "Warden's Desk"
+	name = "Warden's Desk";
+	req_access = null
 	},
 /turf/simulated/floor/tiled/dark/full,
-/area/security/warden)
+/area/horizon/security/warden)
 "vCM" = (
 /obj/structure/cable/green{
 	icon_state = "1-2"
@@ -43419,7 +43558,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /turf/simulated/floor/tiled/full,
-/area/maintenance/security_starboard)
+/area/horizon/security/hallway)
 "vCQ" = (
 /obj/effect/floor_decal/corner/yellow{
 	dir = 1
@@ -43701,7 +43840,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/wood,
-/area/crew_quarters/heads/hos)
+/area/horizon/security/head_of_security)
 "vJR" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
@@ -43795,7 +43934,7 @@
 	dir = 9
 	},
 /turf/simulated/floor/tiled,
-/area/security/brig)
+/area/horizon/security/hallway)
 "vNF" = (
 /obj/structure/disposalpipe/segment,
 /obj/structure/cable/green{
@@ -43808,9 +43947,6 @@
 	},
 /turf/simulated/floor/lino/grey,
 /area/horizon/kitchen/hallway)
-"vNG" = (
-/turf/simulated/wall/r_wall,
-/area/security/brig/processing_secondary)
 "vNI" = (
 /obj/effect/floor_decal/corner/black/diagonal,
 /obj/effect/decal/cleanable/dirt,
@@ -43862,7 +43998,7 @@
 	icon_state = "0-8"
 	},
 /turf/simulated/floor/tiled/dark/full,
-/area/security/security_office)
+/area/horizon/security/office)
 "vOr" = (
 /obj/machinery/atmospherics/binary/pump/high_power{
 	dir = 1;
@@ -43894,14 +44030,11 @@
 /turf/simulated/floor/plating,
 /area/maintenance/wing/starboard/far)
 "vOL" = (
-/obj/machinery/atmospherics/unary/vent_pump/on{
-	dir = 1
-	},
 /obj/structure/closet/emcloset,
 /obj/effect/floor_decal/corner/paleblue/full,
 /obj/effect/floor_decal/industrial/outline/emergency_closet,
 /turf/simulated/floor/tiled,
-/area/security/brig)
+/area/horizon/security/hallway)
 "vOS" = (
 /obj/structure/cable/orange{
 	icon_state = "1-2"
@@ -43973,8 +44106,8 @@
 /turf/simulated/floor/tiled,
 /area/operations/lower/machinist)
 "vPj" = (
-/turf/simulated/wall/r_wall,
-/area/security/armory)
+/turf/simulated/floor/tiled,
+/area/horizon/security/lobby)
 "vPk" = (
 /obj/effect/map_effect/window_spawner/full/borosilicate/reinforced/firedoor,
 /turf/simulated/floor/tiled/dark/full,
@@ -44002,7 +44135,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/tiled/dark/full,
-/area/security/armory)
+/area/horizon/security/armoury)
 "vQd" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 6
@@ -44069,7 +44202,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/wood,
-/area/crew_quarters/heads/hos)
+/area/horizon/security/head_of_security)
 "vQQ" = (
 /obj/machinery/vending/tool,
 /obj/effect/floor_decal/corner/green{
@@ -44095,9 +44228,6 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/medical/or1)
-"vRt" = (
-/turf/simulated/wall,
-/area/security/security_office)
 "vRT" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /turf/simulated/floor/wood,
@@ -44308,16 +44438,16 @@
 /turf/simulated/floor/tiled,
 /area/hallway/primary/central_two)
 "vXy" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 9
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 9
-	},
 /obj/structure/disposalpipe/segment{
 	dir = 8;
 	icon_state = "pipe-c"
 	},
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+	dir = 4
+	},
 /obj/structure/cable/green{
 	icon_state = "1-2"
 	},
@@ -44325,7 +44455,7 @@
 	icon_state = "1-8"
 	},
 /turf/simulated/floor/tiled,
-/area/security/brig)
+/area/horizon/security/hallway)
 "vXB" = (
 /obj/item/trap/animal{
 	pixel_x = 2;
@@ -44376,7 +44506,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /turf/simulated/floor/tiled,
-/area/security/brig)
+/area/horizon/security/hallway)
 "vYy" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -44456,13 +44586,12 @@
 	dir = 4
 	},
 /obj/effect/floor_decal/industrial/outline/security,
-/obj/machinery/power/apc/low{
-	name = "south bump";
+/obj/structure/cable/green,
+/obj/machinery/power/apc{
 	pixel_y = -24
 	},
-/obj/structure/cable/green,
 /turf/simulated/floor/tiled/dark,
-/area/security/warden)
+/area/horizon/security/warden)
 "vZr" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -44517,22 +44646,19 @@
 	c_tag = "Security - Brig Cell 1";
 	dir = 8
 	},
+/obj/machinery/flasher{
+	id = "cell_isolation";
+	pixel_x = 32
+	},
+/obj/structure/closet/secure_closet/brig{
+	id = "cell_isolation"
+	},
 /obj/effect/floor_decal/corner/paleblue/full{
 	dir = 1
 	},
-/obj/machinery/flasher{
-	id = "cell_4";
-	pixel_x = 32
-	},
-/obj/structure/cable/green{
-	icon_state = "1-2"
-	},
 /obj/effect/floor_decal/industrial/outline/security,
-/obj/structure/closet/secure_closet/brig{
-	id = "cell_4"
-	},
 /turf/simulated/floor/tiled,
-/area/security/prison)
+/area/horizon/security/brig)
 "way" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -44635,8 +44761,11 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 5
 	},
+/obj/structure/cable/green{
+	icon_state = "1-4"
+	},
 /turf/simulated/floor/tiled,
-/area/security/main)
+/area/horizon/security/equipment)
 "wcK" = (
 /obj/machinery/door/firedoor,
 /obj/structure/cable/green{
@@ -44689,7 +44818,7 @@
 	pixel_y = -28
 	},
 /turf/simulated/floor/carpet,
-/area/crew_quarters/heads/hos)
+/area/horizon/security/head_of_security)
 "wdk" = (
 /obj/structure/railing/mapped{
 	dir = 4
@@ -44722,7 +44851,7 @@
 /obj/structure/bed/padded,
 /obj/item/bedsheet/blue,
 /turf/simulated/floor/tiled,
-/area/security/prison)
+/area/horizon/security/brig)
 "wdY" = (
 /obj/structure/bed/stool/chair,
 /obj/structure/cable/green{
@@ -44733,7 +44862,7 @@
 	},
 /obj/effect/floor_decal/industrial/outline/security,
 /turf/simulated/floor/tiled,
-/area/security/brig)
+/area/horizon/security/hallway)
 "weh" = (
 /obj/structure/railing/mapped{
 	dir = 1
@@ -44955,7 +45084,7 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /turf/simulated/floor/tiled,
-/area/security/prison)
+/area/horizon/security/brig)
 "wiD" = (
 /obj/effect/floor_decal/corner_wide/grey/diagonal,
 /obj/effect/floor_decal/industrial/warning{
@@ -44963,6 +45092,10 @@
 	},
 /turf/simulated/floor/tiled,
 /area/maintenance/wing/starboard)
+"wjU" = (
+/obj/machinery/atmospherics/unary/vent_scrubber/on,
+/turf/simulated/floor/tiled,
+/area/horizon/security/holding_cell_b)
 "wjZ" = (
 /obj/structure/table/stone/marble,
 /obj/effect/floor_decal/spline/fancy/wood{
@@ -45006,8 +45139,16 @@
 /obj/structure/cable/green{
 	icon_state = "0-8"
 	},
+/obj/machinery/door/blast/regular{
+	density = 0;
+	icon_state = "pdoor0";
+	id = "Brig Lockdown";
+	name = "Brig Lockdown Blast Door";
+	opacity = 0;
+	dir = 2
+	},
 /turf/simulated/floor/tiled/dark/full,
-/area/security/prison)
+/area/horizon/security/brig)
 "wlg" = (
 /obj/structure/railing/mapped,
 /obj/structure/railing/mapped{
@@ -45264,7 +45405,7 @@
 	dir = 6
 	},
 /turf/simulated/floor/tiled,
-/area/security/prison)
+/area/horizon/security/brig)
 "wpz" = (
 /obj/effect/floor_decal/industrial/warning/full,
 /obj/machinery/porta_turret,
@@ -45456,7 +45597,7 @@
 /obj/effect/floor_decal/corner/paleblue/full,
 /obj/machinery/disposal,
 /turf/simulated/floor/tiled,
-/area/security/brig)
+/area/horizon/security/hallway)
 "wvK" = (
 /obj/machinery/light{
 	dir = 1
@@ -45478,7 +45619,7 @@
 	pixel_y = -30
 	},
 /turf/simulated/floor/carpet,
-/area/crew_quarters/heads/hos)
+/area/horizon/security/head_of_security)
 "wwR" = (
 /obj/structure/reagent_dispensers/extinguisher,
 /obj/effect/floor_decal/industrial/warning{
@@ -45717,33 +45858,26 @@
 	dir = 5
 	},
 /turf/simulated/floor/tiled,
-/area/security/brig)
+/area/horizon/security/hallway)
 "wDa" = (
 /obj/machinery/button/remote/blast_door{
 	id = "shutters_deck1_security_cell_1";
 	name = "Cell A Blast Door";
-	pixel_x = -4;
+	pixel_x = -6;
 	pixel_y = 35;
 	req_access = list(3)
 	},
 /obj/machinery/button/remote/blast_door{
 	id = "shutters_deck1_security_cell_2";
 	name = "Cell B Blast Door";
-	pixel_x = 7;
+	pixel_x = 6;
 	pixel_y = 35;
 	req_access = list(3)
 	},
 /obj/machinery/button/remote/blast_door{
 	id = "shutters_deck1_security_cell_3";
 	name = "Cell C Blast Door";
-	pixel_x = -4;
-	pixel_y = 25;
-	req_access = list(3)
-	},
-/obj/machinery/button/remote/blast_door{
-	id = "shutters_deck1_security_cell_4";
-	name = "Cell D Blast Door";
-	pixel_x = 7;
+	pixel_x = -6;
 	pixel_y = 25;
 	req_access = list(3)
 	},
@@ -45756,13 +45890,13 @@
 /obj/structure/table/standard,
 /obj/machinery/button/remote/blast_door{
 	id = "Brig Lockdown";
-	name = "Brig Lockdown";
+	name = "Brig Lockdown Blast Doors";
 	pixel_x = 6;
-	pixel_y = 7;
+	pixel_y = 25;
 	req_access = list(3)
 	},
 /turf/simulated/floor/tiled/dark,
-/area/security/warden)
+/area/horizon/security/warden)
 "wDk" = (
 /obj/structure/bed/stool/padded/red,
 /obj/effect/floor_decal/corner/grey/full{
@@ -45878,12 +46012,12 @@
 /obj/machinery/door/blast/regular{
 	dir = 4;
 	id = "shutters_deck1_security_cell_2";
-	name = "Cell Door"
+	name = "Cell B Blast Door"
 	},
 /obj/machinery/door/firedoor,
 /obj/effect/floor_decal/industrial/hatch/yellow,
 /turf/simulated/floor/tiled/full,
-/area/security/prison)
+/area/horizon/security/brig)
 "wFh" = (
 /turf/simulated/wall,
 /area/maintenance/aft)
@@ -46000,7 +46134,7 @@
 	dir = 1
 	},
 /turf/simulated/floor/tiled/dark,
-/area/security/warden)
+/area/horizon/security/warden)
 "wKa" = (
 /obj/machinery/light{
 	dir = 8
@@ -46143,7 +46277,7 @@
 	},
 /obj/effect/floor_decal/industrial/outline/security,
 /turf/simulated/floor/tiled/dark/full,
-/area/security/armory)
+/area/horizon/security/armoury)
 "wLz" = (
 /obj/item/device/radio/intercom{
 	listening = 0;
@@ -46245,7 +46379,7 @@
 	dir = 9
 	},
 /turf/simulated/floor/tiled,
-/area/security/security_office)
+/area/horizon/security/office)
 "wMg" = (
 /obj/structure/curtain/black{
 	icon_state = "open";
@@ -46408,7 +46542,7 @@
 	dir = 6
 	},
 /turf/simulated/floor/tiled,
-/area/security/security_office)
+/area/horizon/security/office)
 "wQS" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
@@ -46442,7 +46576,7 @@
 	req_access = list(2)
 	},
 /turf/simulated/floor/tiled/dark,
-/area/security/warden)
+/area/horizon/security/warden)
 "wRk" = (
 /obj/machinery/light/small{
 	dir = 1
@@ -46453,7 +46587,6 @@
 /turf/simulated/floor/lino/grey,
 /area/horizon/crew_quarters/lounge/bar)
 "wRm" = (
-/obj/machinery/portable_atmospherics/hydroponics,
 /obj/structure/cable/green{
 	icon_state = "1-2"
 	},
@@ -46463,8 +46596,9 @@
 /obj/effect/floor_decal/corner/paleblue{
 	dir = 10
 	},
+/obj/machinery/portable_atmospherics/hydroponics,
 /turf/simulated/floor/tiled,
-/area/security/prison)
+/area/horizon/security/brig)
 "wRu" = (
 /turf/simulated/wall/r_wall,
 /area/horizon/secure_ammunition_storage)
@@ -46624,25 +46758,27 @@
 /turf/simulated/floor/plating,
 /area/maintenance/wing/starboard)
 "wWS" = (
-/obj/machinery/atmospherics/unary/vent_pump/on{
-	dir = 4
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+	dir = 8
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
+/obj/structure/cable/green{
+	icon_state = "4-8"
 	},
 /obj/effect/floor_decal/corner/paleblue{
 	dir = 6
 	},
-/obj/structure/cable/green{
-	icon_state = "1-8"
+/turf/simulated/floor/tiled,
+/area/horizon/security/brig)
+"wXg" = (
+/obj/structure/railing/mapped,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 5
+	},
+/obj/structure/bed/stool/chair/plastic{
+	dir = 8
 	},
 /turf/simulated/floor/tiled,
-/area/security/prison)
-"wXg" = (
-/obj/structure/bed/stool/padded/red,
-/obj/structure/railing/mapped,
-/turf/simulated/floor/tiled,
-/area/security/prison)
+/area/horizon/security/brig)
 "wXp" = (
 /obj/effect/floor_decal/corner/mauve/diagonal,
 /obj/structure/sink{
@@ -46673,7 +46809,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/tiled,
-/area/security/lobby)
+/area/horizon/security/lobby)
 "wYk" = (
 /obj/machinery/light_switch{
 	pixel_x = -26
@@ -46767,7 +46903,7 @@
 	req_access = list(58)
 	},
 /turf/simulated/floor/carpet,
-/area/crew_quarters/heads/hos)
+/area/horizon/security/head_of_security)
 "wZw" = (
 /obj/structure/table/rack,
 /obj/item/stack/material/plasteel{
@@ -46945,7 +47081,7 @@
 	dir = 9
 	},
 /turf/simulated/floor/tiled,
-/area/security/security_office)
+/area/horizon/security/office)
 "xcO" = (
 /obj/structure/cable/green{
 	icon_state = "4-8"
@@ -47564,7 +47700,7 @@
 	dir = 9
 	},
 /turf/simulated/floor/tiled,
-/area/security/main)
+/area/horizon/security/equipment)
 "xuj" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -47668,24 +47804,17 @@
 /obj/item/ammo_casing/peac,
 /obj/item/ammo_casing/peac,
 /turf/simulated/floor/tiled/dark/full,
-/area/security/armory)
+/area/horizon/security/armoury)
 "xxc" = (
-/obj/machinery/door/blast/regular{
-	density = 0;
-	icon_state = "pdoor0";
-	id = "Brig Lockdown";
-	name = "Brig Lockdown Door";
-	opacity = 0
-	},
 /obj/effect/floor_decal/industrial/hatch/yellow,
 /obj/machinery/door/airlock/glass_security{
-	autoclose = 0;
 	id_tag = "cell_1";
 	name = "Cell A";
-	req_access = list(2)
+	req_access = list(2);
+	autoclose = 0
 	},
 /turf/simulated/floor/tiled/full,
-/area/security/prison)
+/area/horizon/security/brig)
 "xxm" = (
 /obj/structure/cable/green{
 	icon_state = "1-2"
@@ -47787,7 +47916,7 @@
 	dir = 9
 	},
 /turf/simulated/floor/tiled/dark/full,
-/area/security/armory)
+/area/horizon/security/armoury)
 "xBv" = (
 /obj/machinery/door/airlock/multi_tile/glass{
 	dir = 2;
@@ -47805,9 +47934,6 @@
 /obj/structure/closet/secure_closet/medical_fr,
 /turf/simulated/floor/tiled,
 /area/medical/first_responder)
-"xBX" = (
-/turf/simulated/floor/tiled,
-/area/security/security_office)
 "xCr" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -47966,7 +48092,7 @@
 	dir = 9
 	},
 /turf/simulated/floor/tiled/dark/full,
-/area/security/armory)
+/area/horizon/security/armoury)
 "xGc" = (
 /obj/structure/table/stone/marble,
 /obj/effect/floor_decal/spline/fancy/wood{
@@ -48053,7 +48179,7 @@
 	icon_state = "pipe-c"
 	},
 /turf/simulated/floor/tiled/dark,
-/area/security/warden)
+/area/horizon/security/warden)
 "xHX" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 6
@@ -48111,7 +48237,7 @@
 	},
 /obj/effect/floor_decal/industrial/outline/security,
 /turf/simulated/floor/tiled,
-/area/security/main)
+/area/horizon/security/equipment)
 "xIJ" = (
 /obj/machinery/atmospherics/binary/circulator{
 	anchored = 1
@@ -48192,6 +48318,9 @@
 	},
 /turf/simulated/floor/plating,
 /area/maintenance/substation/medical)
+"xKY" = (
+/turf/simulated/wall/r_wall,
+/area/horizon/security/holding_cell_a)
 "xLu" = (
 /obj/effect/floor_decal/corner/mauve{
 	dir = 6
@@ -48214,7 +48343,7 @@
 	},
 /obj/machinery/door/firedoor,
 /turf/simulated/floor/tiled/dark/full,
-/area/security/armory)
+/area/horizon/security/armoury)
 "xLG" = (
 /obj/effect/floor_decal/corner_wide/green{
 	dir = 10
@@ -48253,7 +48382,7 @@
 	icon_state = "1-2"
 	},
 /turf/simulated/floor/tiled,
-/area/security/main)
+/area/horizon/security/equipment)
 "xMm" = (
 /obj/structure/cable/green{
 	icon_state = "1-8"
@@ -48294,7 +48423,7 @@
 	dir = 1
 	},
 /turf/simulated/floor/tiled,
-/area/security/brig/processing_secondary)
+/area/horizon/security/holding_cell_b)
 "xNn" = (
 /obj/machinery/computer/shuttle_control/lift{
 	pixel_y = -1;
@@ -48478,7 +48607,7 @@
 	dir = 8
 	},
 /turf/simulated/floor/tiled,
-/area/security/armory)
+/area/horizon/security/armoury)
 "xQB" = (
 /obj/machinery/iv_drip,
 /obj/effect/floor_decal/industrial/outline/red,
@@ -48558,7 +48687,7 @@
 	},
 /obj/effect/floor_decal/industrial/warning,
 /turf/simulated/floor/tiled,
-/area/security/main)
+/area/horizon/security/equipment)
 "xSP" = (
 /obj/structure/railing/mapped{
 	dir = 8
@@ -48603,7 +48732,7 @@
 	},
 /obj/machinery/firealarm/west,
 /turf/simulated/floor/tiled,
-/area/security/brig)
+/area/horizon/security/hallway)
 "xVf" = (
 /obj/machinery/power/tesla_coil,
 /obj/structure/cable/yellow{
@@ -48615,6 +48744,39 @@
 	},
 /turf/simulated/floor/plating,
 /area/engineering/engine_room/tesla)
+"xVl" = (
+/turf/simulated/wall,
+/area/horizon/security/holding_cell_b)
+"xVp" = (
+/obj/machinery/door/firedoor,
+/obj/structure/grille,
+/obj/structure/window/shuttle/scc_space_ship,
+/obj/machinery/door/blast/regular{
+	density = 0;
+	icon_state = "pdoor0";
+	id = "Brig Lockdown";
+	name = "Brig Lockdown Blast Door";
+	opacity = 0;
+	dir = 4
+	},
+/obj/machinery/door/blast/regular{
+	density = 0;
+	dir = 4;
+	icon_state = "pdoor0";
+	id = "Security Lockdown";
+	name = "Security Blast Door";
+	opacity = 0
+	},
+/obj/machinery/door/blast/shutters/open{
+	id = "shutters_deck1_security_cell_isolation";
+	dir = 2;
+	name = "Isolation Cell Window Shutter"
+	},
+/obj/structure/cable/green{
+	icon_state = "0-8"
+	},
+/turf/simulated/floor/tiled/dark/full,
+/area/horizon/security/brig)
 "xVu" = (
 /obj/effect/floor_decal/industrial/warning,
 /turf/simulated/floor/reinforced/airless,
@@ -48692,7 +48854,7 @@
 "xWA" = (
 /obj/structure/table/wood,
 /turf/simulated/floor/carpet,
-/area/crew_quarters/heads/hos)
+/area/horizon/security/head_of_security)
 "xWL" = (
 /turf/simulated/floor/tiled,
 /area/engineering/atmos/storage)
@@ -48797,7 +48959,7 @@
 	req_access = list(2)
 	},
 /turf/simulated/floor/tiled,
-/area/security/prison)
+/area/horizon/security/brig)
 "xZw" = (
 /obj/machinery/vending/cigarette,
 /obj/effect/floor_decal/industrial/hatch/yellow,
@@ -48887,6 +49049,13 @@
 /obj/effect/floor_decal/industrial/warning/cee,
 /turf/simulated/floor/tiled/dark/full,
 /area/engineering/engine_monitoring/tesla)
+"ybf" = (
+/obj/machinery/light,
+/obj/effect/floor_decal/corner/paleblue{
+	dir = 10
+	},
+/turf/simulated/floor/tiled,
+/area/horizon/security/hallway)
 "ybh" = (
 /obj/structure/lattice/catwalk/indoor/grate,
 /obj/structure/window/reinforced,
@@ -48961,7 +49130,7 @@
 	dir = 5
 	},
 /turf/simulated/floor/tiled,
-/area/security/brig)
+/area/horizon/security/hallway)
 "yct" = (
 /obj/structure/flora/pottedplant/random,
 /obj/machinery/light{
@@ -49088,8 +49257,11 @@
 	dir = 4
 	},
 /obj/effect/floor_decal/corner/paleblue/diagonal,
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
 /turf/simulated/floor/tiled/white,
-/area/security/main)
+/area/horizon/security/washroom)
 "yej" = (
 /obj/effect/floor_decal/corner_wide/lime{
 	dir = 6
@@ -49126,7 +49298,7 @@
 	},
 /obj/effect/floor_decal/industrial/outline/emergency_closet,
 /turf/simulated/floor/tiled,
-/area/security/main)
+/area/horizon/security/equipment)
 "yeY" = (
 /obj/machinery/atmospherics/binary/pump{
 	dir = 8;
@@ -71957,15 +72129,15 @@ tOW
 uXq
 eNj
 gDR
-bDo
-bDo
-bDo
-bDo
-bDo
-vsS
+ncR
+ncR
+ncR
+ncR
+ncR
+ncR
 gKt
-vsS
-vsS
+ubq
+ubq
 asO
 buh
 tSa
@@ -72159,12 +72331,12 @@ ayF
 uXq
 eNj
 bOR
-bDo
+ncR
 dLu
 pTQ
 txW
 lZu
-keZ
+rDK
 jOv
 wvn
 efA
@@ -72174,7 +72346,7 @@ efA
 efA
 efA
 efA
-mJJ
+efA
 urP
 fkr
 fGT
@@ -72364,8 +72536,8 @@ bOR
 acz
 tIQ
 ukV
-mrK
-bPH
+vPj
+lTQ
 tGX
 gMA
 sIR
@@ -72376,7 +72548,7 @@ kFa
 vuo
 eYv
 wdj
-mJJ
+efA
 cKJ
 dKA
 nAM
@@ -72578,7 +72750,7 @@ tWH
 imD
 wZq
 wwd
-mJJ
+efA
 vTN
 qnl
 nAM
@@ -72768,7 +72940,7 @@ mFQ
 acz
 rIK
 pvt
-ejO
+ini
 wYe
 tGX
 gNq
@@ -72780,7 +72952,7 @@ tWH
 xWA
 rQH
 vkq
-mJJ
+efA
 hmX
 cNz
 emA
@@ -72967,12 +73139,12 @@ qGp
 ayF
 ayF
 ayF
-nxz
+hnD
 gny
 dkp
 tWx
 mLN
-vRt
+jcz
 fLB
 rBL
 efA
@@ -72982,13 +73154,13 @@ vJK
 lwD
 jpR
 pjK
-mJJ
+efA
 cLD
 xjN
 qOM
 xwU
 qOM
-kgp
+uNL
 kgp
 kgp
 kgp
@@ -73169,12 +73341,12 @@ aNp
 mbE
 dyZ
 mye
-nxz
+hnD
 fcQ
 wLT
 xcK
 cBX
-gMD
+nWZ
 fJn
 tKw
 efA
@@ -73184,11 +73356,11 @@ vdy
 vdy
 vdy
 mfX
-vsS
-vsS
+efA
+ubq
 kUp
-vsS
-vsS
+ubq
+ubq
 rRX
 wzs
 rVv
@@ -73371,27 +73543,27 @@ gGI
 mNn
 dyZ
 mye
-nxz
+hnD
 uiq
-xBX
+hcv
 hWo
 suc
 flb
 lKH
 gDT
 fOn
-fPP
+dKi
 vMF
 jmH
 pdz
 haI
-fPP
+dKi
 xUW
 qni
 ogR
 rfi
 vOL
-mfV
+avW
 xer
 uGh
 gTy
@@ -73573,7 +73745,7 @@ mzL
 ayF
 ayF
 ayF
-nxz
+hnD
 msO
 upE
 fpQ
@@ -73592,8 +73764,8 @@ vlr
 siD
 vXy
 bLu
-dYb
-czL
+ifO
+mfV
 xer
 kUf
 ryR
@@ -73775,7 +73947,7 @@ bhJ
 xZy
 aww
 gai
-nxz
+hnD
 lkt
 ihg
 wQi
@@ -73783,11 +73955,11 @@ fAC
 qlV
 wCZ
 czU
-aaa
+uOB
 blC
 blC
 blC
-aaa
+uOB
 qZI
 vgg
 qSY
@@ -73795,7 +73967,7 @@ pUn
 sRw
 lhL
 sKE
-mfV
+anU
 xer
 nIX
 cPB
@@ -73977,27 +74149,27 @@ ylk
 nfs
 uoU
 cHM
-ibU
-kQA
-kQA
-kQA
-kQA
-keZ
+hnD
+jcz
+jcz
+jcz
+jcz
+jcz
 eIt
-iye
+pIn
 blC
 mbi
 dgw
 kkW
-aaa
-aac
+uOB
+bDo
 jAp
 wle
-aac
-aac
+bDo
+bDo
 lKN
-wle
-pSv
+bDo
+uan
 xer
 qgN
 qgN
@@ -74179,27 +74351,27 @@ ykd
 ayF
 ayF
 ayF
-ibU
+xKY
 dLe
 dQR
 bkn
-kQA
+cjC
 lFP
 feO
-tue
-aaa
+ybf
+uOB
 wDa
 xHB
 wJh
-aaa
+uOB
 wdF
 jYJ
 pvS
-aac
-wdF
+bDo
+amI
 ddH
 bYu
-pSv
+jzv
 xer
 qgN
 qgN
@@ -74381,14 +74553,14 @@ dev
 kaT
 cNU
 sgl
-ibU
+xKY
 hrC
 erH
 oZB
-eNZ
+lUi
 wdY
 kat
-iye
+pIn
 vCs
 plb
 psg
@@ -74397,11 +74569,11 @@ plL
 aya
 pNG
 qlU
-amI
+bDo
 vZY
 wWS
 dDo
-pSv
+xVp
 xer
 qgN
 qgN
@@ -74583,7 +74755,7 @@ uTr
 uTr
 emN
 sgl
-ibU
+xKY
 ljm
 aVf
 jno
@@ -74595,15 +74767,15 @@ blC
 wRd
 mGr
 vYW
-aaa
-aac
+uOB
+bDo
 uTn
 jfu
-aac
-aac
-eQY
-jfu
-pSv
+bDo
+bDo
+czL
+bDo
+uan
 xer
 qgN
 qgN
@@ -74785,27 +74957,27 @@ bAZ
 uTr
 kaT
 dTj
-vNG
-sEk
-sEk
-sEk
-sEk
+xKY
+cjC
+cjC
+cjC
+cjC
 rhz
 sEc
 dwK
-aaa
-aaa
+uOB
+uOB
 qaw
-nWZ
-aaa
+bmY
+uOB
 dlR
 nRF
-dKi
+hLh
 jfH
-dKi
-nRF
+hLh
+hLh
 oYH
-pSv
+uan
 jki
 nJQ
 mnU
@@ -74987,7 +75159,7 @@ dYe
 uTr
 kaT
 qPP
-vNG
+vgu
 lLj
 unV
 aHj
@@ -75002,12 +75174,12 @@ aTI
 kRO
 iQK
 qVk
-iNf
-tWI
-iNf
-oAb
+huP
+eUB
+huP
+eUB
 gis
-pSv
+uan
 jPc
 kuh
 fdj
@@ -75189,11 +75361,11 @@ dYe
 uTr
 tCY
 kjO
-vNG
+vgu
 kep
-cQu
+wjU
 qjh
-tYK
+eNZ
 wdY
 biD
 gAN
@@ -75206,8 +75378,8 @@ rxk
 oUb
 aLq
 kXs
-rLu
-ioW
+cIx
+cIx
 wRm
 jUx
 jPc
@@ -75391,25 +75563,25 @@ oGK
 uTr
 veG
 kjO
-vNG
+vgu
 xMV
 fpj
 tdv
-sEk
+xVl
 rec
 iIM
 iqu
-aac
-aac
+bDo
+bDo
 jfu
-aac
-aac
+bDo
+bDo
 uZD
 jvW
 vaR
-nqE
+hKM
 quJ
-pJE
+huP
 oXo
 nFs
 jPc
@@ -75593,18 +75765,18 @@ tYa
 uTr
 kaT
 hps
-vNG
-sEk
-sEk
-sEk
-sEk
+vgu
+xVl
+xVl
+xVl
+xVl
 yci
 vtf
 iDy
 tQA
 tuH
-grL
-iWm
+glv
+rLu
 cQd
 dXF
 aae
@@ -75613,7 +75785,7 @@ nqE
 kjs
 eUB
 hgO
-pSv
+uan
 dVE
 kuh
 fdj
@@ -75802,20 +75974,20 @@ jrz
 qUt
 lCC
 kbZ
-pwy
+dhZ
 bFU
 kcO
 bHb
 wFe
 ePb
 cZa
-pJE
+lVZ
 pBA
 wXg
 jmp
-pJE
+huP
 gEa
-pSv
+uan
 jPc
 kuh
 fdj
@@ -76005,17 +76177,17 @@ oqW
 lCC
 eJW
 nrr
-aac
+bDo
 tsy
 bUm
-aac
+bDo
 fum
 eUB
-pJE
-pJE
+huP
+eUB
+qfR
+huP
 eUB
-gMP
-hrP
 jzV
 jUx
 jPc
@@ -76207,19 +76379,19 @@ sGm
 tuD
 rXd
 gjU
-aac
-aac
+bDo
+bDo
 joH
-aac
+bDo
 dVc
-pJE
-gMP
+huP
+ueC
 hpC
 gof
-qfR
-hKM
+hrP
+hrP
 rGx
-pSv
+uan
 jPc
 kuh
 fdj
@@ -76412,16 +76584,16 @@ iDy
 tQA
 tuH
 grL
-iWm
+rLu
 fum
-pJE
-jhw
-nFf
-nFf
+huP
+qLd
+pMz
+pMz
 kRr
-nFf
-nFf
-pSv
+pMz
+pMz
+uan
 pGJ
 nJQ
 hod
@@ -76606,11 +76778,11 @@ wAm
 wAm
 wAm
 ijc
-vsS
+ubq
 jUq
 mvM
 gqy
-pwy
+dhZ
 xxc
 kcO
 bHb
@@ -76618,12 +76790,12 @@ lZD
 hPb
 eUB
 eZZ
-nFf
+pMz
 rup
-rKJ
-nFf
+hHJ
+eQD
 ggA
-pSv
+uan
 xer
 qgN
 qgN
@@ -76808,24 +76980,24 @@ cAx
 kaT
 kaT
 uUz
-vsS
+ubq
 lMT
 bTy
 lGQ
 nzv
-aac
+bDo
 tsy
 jbo
-aac
+bDo
 sYY
 brZ
 dbd
-nFf
+pMz
 bxZ
 oQZ
-lVZ
+pMz
 lrQ
-pSv
+uan
 xer
 qgN
 qgN
@@ -77010,24 +77182,24 @@ wsW
 mEc
 dSI
 nTF
-sOd
-ifU
-cxO
+qDh
+ouo
+lRO
 ucq
-cxO
-sOd
-sOd
-sOd
-sOd
-vPj
-vPj
-vPj
-vPj
-vPj
-vPj
-vPj
-vPj
-bIi
+lRO
+bDo
+bDo
+bDo
+bDo
+bDo
+bDo
+bDo
+bDo
+bDo
+bDo
+bDo
+bDo
+uan
 xer
 qgN
 qgN
@@ -77212,13 +77384,13 @@ wsW
 hSG
 dSI
 nTF
-sOd
+qDh
 vnC
 jih
 cwL
 xtR
 ebT
-ifU
+ouo
 yeT
 jMB
 qtN
@@ -77228,8 +77400,8 @@ jek
 jpB
 vgz
 uhE
-vPj
-bIi
+pMf
+pSv
 xer
 qgN
 qgN
@@ -77414,24 +77586,24 @@ wsW
 kaT
 oVe
 uXV
-sOd
+qDh
 khi
 oTr
 gem
 nCg
 ijp
-ifU
+ouo
 shI
-gtn
+jJa
 xLE
 gdW
-gXM
-gXM
-gXM
-gXM
-lTQ
-vPj
-bIi
+kvE
+kvE
+kvE
+kvE
+pyA
+pMf
+pSv
 nKA
 qgN
 qgN
@@ -77616,24 +77788,24 @@ wsW
 xed
 xuX
 uXV
-sOd
+qDh
 aOz
-kbn
+pJE
 aIH
-rvM
+ioW
 ngB
-ifU
+ouo
 eGh
 pZV
 qtN
 noZ
 eXU
 hjo
-hLT
+gMP
 qvO
 dqy
-vPj
-bIi
+pMf
+pSv
 arV
 qgN
 qgN
@@ -77818,9 +77990,9 @@ sYc
 sYc
 sYc
 qsg
-sOd
+qDh
 khi
-kbn
+pJE
 iTL
 xLY
 cOj
@@ -77832,8 +78004,8 @@ aKO
 nDd
 jDA
 gud
-vPj
-vPj
+pMf
+pMf
 hqd
 mfN
 qgN
@@ -78020,21 +78192,21 @@ uoz
 lRx
 ahu
 fVL
-sOd
+qDh
 abz
-kbn
+pJE
 sBR
 wcv
 oJm
-ifU
+ouo
 fqS
 baJ
-vPj
-eoR
+pMf
+pMf
 lAv
-vPj
-vPj
-vPj
+pMf
+pMf
+pMf
 oWW
 isO
 kmx
@@ -78222,21 +78394,21 @@ fLU
 crw
 sYc
 gEB
-sOd
+qDh
 elL
-kbn
-kbn
+pJE
+pJE
 lMO
 xIH
-ifU
+ouo
 tYB
-dhZ
+oRT
 kHb
 efz
 gBH
 oiD
 rqZ
-vPj
+pMf
 oDg
 mfN
 qgN
@@ -78424,13 +78596,13 @@ pIi
 mGZ
 sYc
 gEB
-sOd
+qDh
 aVX
-bUE
+hPx
 aQR
 qQt
 sqE
-ifU
+ouo
 rSE
 rOt
 kHb
@@ -78438,7 +78610,7 @@ ufU
 vPH
 bOe
 wLk
-vPj
+pMf
 isO
 kmx
 qgN
@@ -78626,20 +78798,20 @@ pzJ
 sYc
 sYc
 wLJ
-sOd
-sOd
-ifU
-ifU
+qDh
+qDh
+ouo
+ouo
 mVF
-ifU
-vPj
-vPj
-vPj
-vPj
+ouo
+pMf
+pMf
+pMf
+pMf
 mdB
 oYc
 gaA
-vPj
+pMf
 hqd
 mfN
 qgN
@@ -78829,19 +79001,19 @@ gyC
 xsY
 xiu
 jqD
-sOd
+mJJ
 rXh
 jcL
 yef
 tvc
-vPj
+pMf
 fuJ
 xFZ
 vaj
 jNY
 xzV
 trn
-vPj
+pMf
 isO
 kmx
 qgN
@@ -79031,12 +79203,12 @@ iwo
 iwo
 iwo
 ryu
-sOd
+mJJ
 kuS
 dbA
 fGs
 kSM
-vPj
+pMf
 rKv
 sNx
 sNx
@@ -79233,18 +79405,18 @@ wbL
 egq
 iwo
 ryu
-sOd
-sOd
+mJJ
+mJJ
 mVb
-ifU
+ljx
 igT
-vPj
+pMf
 kCr
 sNx
 iiy
 sNx
 jvp
-vPj
+pMf
 uiH
 kmx
 qgN
@@ -79436,11 +79608,11 @@ vIz
 iwo
 hBQ
 fDV
-sOd
+mJJ
 lZp
-ifU
+ljx
 dYR
-vPj
+pMf
 xxa
 sNx
 sNx
@@ -79638,16 +79810,16 @@ vIz
 iwo
 uPP
 gBa
-sOd
-sOd
-sOd
-sOd
-vPj
+mJJ
+mJJ
+mJJ
+mJJ
+pMf
 oAs
 sNx
 sNx
 tmb
-vPj
+pMf
 uiH
 kmx
 qgN
@@ -79843,8 +80015,8 @@ ryu
 mia
 tXR
 aru
-ouo
-vPj
+png
+pMf
 fYW
 fYW
 gNk
@@ -80045,12 +80217,12 @@ lvq
 xki
 oyi
 rzC
-ouo
-vPj
-vPj
-vPj
-vPj
-vPj
+png
+pMf
+pMf
+pMf
+pMf
+pMf
 uiH
 kmx
 qgN
@@ -80247,11 +80419,11 @@ ryu
 mia
 oyi
 lrW
-ouo
-ouo
-ouo
-ouo
-ouo
+png
+png
+png
+png
+png
 oDg
 mfN
 qgN
diff --git a/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm b/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm
index 3b324c19166..5568c83e974 100644
--- a/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm
+++ b/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm
@@ -238,6 +238,9 @@
 /obj/machinery/light,
 /turf/simulated/floor/wood,
 /area/crew_quarters/lounge)
+"ahB" = (
+/turf/simulated/wall/r_wall,
+/area/horizon/security/investigators_office)
 "ahZ" = (
 /obj/effect/floor_decal/spline/fancy/wood/corner{
 	dir = 4
@@ -451,7 +454,7 @@
 	opacity = 0
 	},
 /turf/simulated/floor/tiled/full,
-/area/security/investigations)
+/area/horizon/security/investigations_hallway)
 "aoA" = (
 /turf/simulated/floor,
 /area/maintenance/bridge)
@@ -849,7 +852,7 @@
 	dir = 6
 	},
 /turf/simulated/floor/tiled,
-/area/security/investigations)
+/area/horizon/security/investigations_hallway)
 "aGp" = (
 /obj/structure/cable/green{
 	icon_state = "4-8"
@@ -872,8 +875,11 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
 /turf/simulated/floor/tiled/white,
-/area/security/forensics_morgue)
+/area/horizon/security/forensic_laboratory)
 "aId" = (
 /obj/effect/map_effect/window_spawner/full/reinforced/polarized/firedoor{
 	id = "bridgeconf"
@@ -1072,8 +1078,14 @@
 	},
 /obj/machinery/disposal/small/east,
 /obj/structure/disposalpipe/trunk,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 6
+	},
+/obj/structure/cable/green{
+	icon_state = "1-2"
+	},
 /turf/simulated/floor/tiled/dark,
-/area/security/investigations)
+/area/horizon/security/firing_range)
 "aOF" = (
 /obj/structure/coatrack{
 	pixel_x = 10;
@@ -1099,19 +1111,6 @@
 	dir = 4
 	},
 /area/bridge)
-"aPJ" = (
-/obj/structure/grille,
-/obj/machinery/door/blast/regular{
-	density = 0;
-	icon_state = "pdoor0";
-	id = "Security Lockdown";
-	name = "Security Blast Door";
-	opacity = 0
-	},
-/obj/machinery/door/firedoor,
-/obj/structure/window/shuttle/scc_space_ship/cardinal,
-/turf/simulated/floor/plating,
-/area/security/forensics_morgue)
 "aQk" = (
 /obj/machinery/door/firedoor,
 /obj/machinery/door/airlock/glass_security{
@@ -1137,7 +1136,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/tiled/full,
-/area/security/vacantoffice2)
+/area/horizon/security/meeting_room)
 "aRw" = (
 /obj/structure/closet/secure_closet/guncabinet{
 	name = "Weaponry (.45 Pistol and Holsters)";
@@ -1188,7 +1187,7 @@
 	},
 /obj/effect/floor_decal/industrial/outline/emergency_closet,
 /turf/simulated/floor/tiled,
-/area/security/investigations)
+/area/horizon/security/investigations_hallway)
 "aTd" = (
 /obj/effect/floor_decal/industrial/warning/corner{
 	dir = 1
@@ -1344,13 +1343,19 @@
 	dir = 8
 	},
 /turf/simulated/floor/tiled/white,
-/area/security/forensics_morgue)
+/area/horizon/security/forensic_laboratory)
 "aYQ" = (
 /obj/effect/floor_decal/corner/red{
 	dir = 10
 	},
+/obj/machinery/power/apc/low{
+	pixel_y = -24
+	},
+/obj/structure/cable/green{
+	icon_state = "0-4"
+	},
 /turf/simulated/floor/tiled/dark,
-/area/security/investigations)
+/area/horizon/security/interrogation)
 "aZl" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
@@ -1611,7 +1616,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/tiled,
-/area/security/investigations)
+/area/horizon/security/investigations_hallway)
 "biw" = (
 /obj/machinery/vending/zora,
 /obj/machinery/status_display{
@@ -1689,9 +1694,7 @@
 	icon_state = "pipe-c"
 	},
 /turf/simulated/floor/lino/grey,
-/area/security/forensics_office{
-	name = "Security - Investigations Office"
-	})
+/area/horizon/security/investigators_office)
 "bmk" = (
 /obj/effect/floor_decal/corner/red/diagonal{
 	dir = 8
@@ -1785,8 +1788,11 @@
 	dir = 4
 	},
 /obj/structure/disposalpipe/segment,
+/obj/structure/cable/green{
+	icon_state = "2-8"
+	},
 /turf/simulated/floor/tiled,
-/area/security/investigations)
+/area/horizon/security/investigations_hallway)
 "bqS" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
@@ -1818,17 +1824,15 @@
 	pixel_y = 32
 	},
 /turf/simulated/floor/wood,
-/area/security/vacantoffice2)
+/area/horizon/security/meeting_room)
 "bsd" = (
+/obj/machinery/door/firedoor,
 /obj/machinery/door/airlock/security{
-	name = "Investigations Office";
+	name = "Investigators' Office";
 	req_access = list(4)
 	},
-/obj/machinery/door/firedoor,
 /turf/simulated/floor/tiled/full,
-/area/security/forensics_office{
-	name = "Security - Investigations Office"
-	})
+/area/horizon/security/investigators_office)
 "bsg" = (
 /obj/effect/floor_decal/corner/blue{
 	dir = 6
@@ -1910,7 +1914,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/tiled,
-/area/security/investigations)
+/area/horizon/security/investigations_hallway)
 "bvE" = (
 /obj/machinery/light{
 	dir = 4
@@ -2046,7 +2050,7 @@
 	id = "Interro"
 	},
 /turf/simulated/floor/tiled/dark/full,
-/area/security/investigations)
+/area/horizon/security/interrogation/monitoring)
 "bHB" = (
 /obj/effect/floor_decal/corner/yellow/full{
 	dir = 4
@@ -2130,7 +2134,7 @@
 	dir = 1
 	},
 /turf/simulated/floor/tiled/white,
-/area/security/forensics_morgue)
+/area/horizon/security/forensic_laboratory)
 "bMa" = (
 /obj/effect/floor_decal/spline/fancy/wood{
 	dir = 6
@@ -2226,7 +2230,7 @@
 	},
 /obj/structure/window/shuttle/scc_space_ship/cardinal,
 /turf/simulated/floor/plating,
-/area/security/forensics_morgue)
+/area/horizon/security/autopsy_laboratory)
 "bOL" = (
 /obj/machinery/door/firedoor,
 /obj/structure/grille,
@@ -2266,7 +2270,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/tiled/white,
-/area/security/forensics_morgue)
+/area/horizon/security/autopsy_laboratory)
 "bRc" = (
 /obj/effect/floor_decal/spline/fancy/wood/cee{
 	dir = 1
@@ -2336,9 +2340,7 @@
 	opacity = 0
 	},
 /turf/simulated/floor/tiled/dark/full,
-/area/security/forensics_office{
-	name = "Security - Investigations Office"
-	})
+/area/horizon/security/investigators_office)
 "bVk" = (
 /obj/effect/floor_decal/corner_wide/blue{
 	dir = 10
@@ -2375,7 +2377,7 @@
 	icon_state = "4-8"
 	},
 /turf/simulated/floor/tiled/white,
-/area/security/forensics_morgue)
+/area/horizon/security/forensic_laboratory)
 "bWh" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -2414,11 +2416,6 @@
 /obj/structure/lattice/catwalk/indoor/grate,
 /turf/simulated/floor,
 /area/maintenance/security_starboard)
-"bYd" = (
-/turf/simulated/wall/r_wall,
-/area/security/forensics_office{
-	name = "Security - Investigations Office"
-	})
 "bZV" = (
 /obj/effect/floor_decal/corner/paleblue{
 	dir = 10
@@ -2441,7 +2438,7 @@
 /area/horizon/hallway/deck_three/primary/central)
 "caP" = (
 /turf/simulated/open,
-/area/security/investigations)
+/area/horizon/security/investigations_hallway)
 "caX" = (
 /obj/effect/floor_decal/corner/blue{
 	dir = 5
@@ -2505,7 +2502,7 @@
 /obj/machinery/door/firedoor,
 /obj/structure/window/shuttle/scc_space_ship/cardinal,
 /turf/simulated/floor/plating,
-/area/security/vacantoffice2)
+/area/horizon/security/autopsy_laboratory)
 "cdm" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 5
@@ -2625,13 +2622,13 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /turf/simulated/floor/tiled,
-/area/security/investigations)
+/area/horizon/security/investigations_hallway)
 "ciK" = (
 /obj/machinery/microscope,
 /obj/structure/table/glass,
 /obj/effect/floor_decal/corner/beige/diagonal,
 /turf/simulated/floor/tiled/white,
-/area/security/forensics_morgue)
+/area/horizon/security/forensic_laboratory)
 "ciO" = (
 /obj/structure/table/reinforced,
 /obj/effect/floor_decal/spline/fancy{
@@ -2657,15 +2654,11 @@
 /obj/structure/table/wood,
 /obj/item/device/flashlight/lamp/green,
 /turf/simulated/floor/carpet,
-/area/security/forensics_office{
-	name = "Security - Investigations Office"
-	})
+/area/horizon/security/investigators_office)
 "clM" = (
 /obj/machinery/hologram/holopad,
 /turf/simulated/floor/carpet,
-/area/security/forensics_office{
-	name = "Security - Investigations Office"
-	})
+/area/horizon/security/investigators_office)
 "clU" = (
 /obj/effect/floor_decal/corner_wide/blue{
 	dir = 4
@@ -2715,7 +2708,13 @@
 /obj/effect/floor_decal/industrial/loading/yellow,
 /obj/effect/floor_decal/industrial/outline/yellow,
 /turf/simulated/floor/tiled,
-/area/security/investigations)
+/area/horizon/security/investigations_hallway)
+"csh" = (
+/obj/effect/map_effect/window_spawner/full/reinforced/polarized/firedoor{
+	id = "Interro"
+	},
+/turf/simulated/floor/tiled/dark/full,
+/area/horizon/security/interrogation)
 "csI" = (
 /obj/effect/shuttle_landmark/horizon/dock3,
 /obj/machinery/door/airlock/external{
@@ -2777,9 +2776,7 @@
 	pixel_y = 5
 	},
 /turf/simulated/floor/carpet,
-/area/security/forensics_office{
-	name = "Security - Investigations Office"
-	})
+/area/horizon/security/investigators_office)
 "cvj" = (
 /obj/effect/floor_decal/corner/blue{
 	dir = 5
@@ -2867,18 +2864,21 @@
 /obj/effect/floor_decal/corner/blue{
 	dir = 9
 	},
-/obj/machinery/atmospherics/unary/vent_pump/on{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
 /obj/structure/disposalpipe/segment{
 	dir = 8;
 	icon_state = "pipe-c"
 	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 9
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/structure/cable/green{
+	icon_state = "1-8"
+	},
 /turf/simulated/floor/tiled/dark,
-/area/security/investigations)
+/area/horizon/security/firing_range)
 "cAK" = (
 /obj/structure/cable/green{
 	icon_state = "1-2"
@@ -2986,7 +2986,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/tiled,
-/area/security/investigations)
+/area/horizon/security/investigations_hallway)
 "cGu" = (
 /obj/machinery/light{
 	dir = 1
@@ -3074,7 +3074,7 @@
 	dir = 5
 	},
 /turf/simulated/floor/tiled/dark,
-/area/security/investigations)
+/area/horizon/security/interrogation)
 "cJJ" = (
 /obj/effect/floor_decal/corner/blue/diagonal,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -3137,9 +3137,7 @@
 	id = "investigator_office"
 	},
 /turf/simulated/floor/tiled/dark/full,
-/area/security/forensics_office{
-	name = "Security - Investigations Office"
-	})
+/area/horizon/security/investigators_office)
 "cMt" = (
 /obj/structure/table/rack,
 /obj/item/storage/firstaid,
@@ -3311,7 +3309,7 @@
 	},
 /obj/effect/floor_decal/industrial/outline/grey,
 /turf/simulated/floor/tiled/dark,
-/area/security/investigations_storage)
+/area/horizon/security/evidence_storage)
 "cSJ" = (
 /obj/structure/table/wood,
 /obj/effect/floor_decal/spline/fancy/wood{
@@ -3429,7 +3427,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/structure/disposalpipe/junction,
 /turf/simulated/floor/tiled,
-/area/security/investigations)
+/area/horizon/security/investigations_hallway)
 "dax" = (
 /turf/simulated/floor/beach/water/pool,
 /area/horizon/crew_quarters/fitness/pool)
@@ -3536,7 +3534,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/tiled/white,
-/area/security/forensics_morgue)
+/area/horizon/security/forensic_laboratory)
 "dfk" = (
 /obj/structure/toilet{
 	dir = 4
@@ -3671,7 +3669,7 @@
 	icon_state = "4-8"
 	},
 /turf/simulated/floor/tiled/dark,
-/area/security/investigations_storage)
+/area/horizon/security/evidence_storage)
 "djG" = (
 /obj/machinery/light{
 	dir = 8
@@ -3719,7 +3717,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/tiled,
-/area/security/investigations)
+/area/horizon/security/investigations_hallway)
 "dlV" = (
 /obj/effect/floor_decal/corner/green/diagonal,
 /obj/structure/cable/green{
@@ -3778,7 +3776,7 @@
 	dir = 8
 	},
 /turf/simulated/floor/tiled/dark,
-/area/security/investigations_storage)
+/area/horizon/security/evidence_storage)
 "dnH" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -3831,7 +3829,7 @@
 	dir = 9
 	},
 /turf/simulated/floor/tiled/dark,
-/area/security/vacantoffice2)
+/area/horizon/security/meeting_room)
 "dre" = (
 /obj/effect/floor_decal/spline/fancy/wood{
 	dir = 1
@@ -3880,7 +3878,7 @@
 	dir = 8
 	},
 /turf/simulated/floor/tiled/dark,
-/area/security/vacantoffice2)
+/area/horizon/security/meeting_room)
 "dtx" = (
 /obj/effect/floor_decal/corner/blue/full{
 	dir = 4
@@ -3987,7 +3985,7 @@
 	name = "Security Officer"
 	},
 /turf/simulated/floor/tiled/dark,
-/area/security/vacantoffice2)
+/area/horizon/security/meeting_room)
 "dCe" = (
 /obj/structure/disposalpipe/segment,
 /obj/structure/railing/mapped{
@@ -4016,7 +4014,7 @@
 /obj/item/clothing/ears/earmuffs,
 /obj/item/clothing/glasses/safety/goggles,
 /turf/simulated/floor/tiled/dark/full,
-/area/security/investigations)
+/area/horizon/security/firing_range)
 "dDU" = (
 /obj/structure/cable/green{
 	icon_state = "2-4"
@@ -4224,7 +4222,7 @@
 /obj/structure/closet/crate/freezer,
 /obj/effect/floor_decal/industrial/outline/security,
 /turf/simulated/floor/tiled/white,
-/area/security/forensics_morgue)
+/area/horizon/security/autopsy_laboratory)
 "dLt" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
@@ -4240,7 +4238,7 @@
 	icon_state = "4-8"
 	},
 /turf/simulated/floor/tiled/white,
-/area/security/forensics_morgue)
+/area/horizon/security/forensic_laboratory)
 "dMl" = (
 /obj/effect/floor_decal/spline/plain/cee{
 	dir = 1
@@ -4261,6 +4259,9 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/horizon/crew_quarters/fitness/pool)
+"dNi" = (
+/turf/simulated/wall,
+/area/horizon/security/investigators_office)
 "dNr" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -4317,7 +4318,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/tiled,
-/area/security/investigations)
+/area/horizon/security/investigations_hallway)
 "dOU" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -4343,7 +4344,7 @@
 	},
 /obj/effect/floor_decal/corner/blue/diagonal,
 /turf/simulated/floor/tiled/white,
-/area/security/forensics_morgue)
+/area/horizon/security/autopsy_laboratory)
 "dQu" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -4443,8 +4444,11 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
 /turf/simulated/floor/tiled/full,
-/area/security/investigations)
+/area/horizon/security/firing_range)
 "dVW" = (
 /turf/simulated/open,
 /area/hallway/medical/upper)
@@ -4561,6 +4565,10 @@
 "ebZ" = (
 /turf/simulated/wall/shuttle/scc_space_ship/cardinal,
 /area/horizon/hallway/deck_three/primary/starboard/docks)
+"ecg" = (
+/obj/effect/map_effect/window_spawner/full/reinforced/firedoor,
+/turf/simulated/floor/tiled/dark/full,
+/area/horizon/security/firing_range)
 "ecr" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/manifold/hidden/supply{
@@ -4657,9 +4665,6 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/horizon/crew_quarters/cryo/washroom)
-"eev" = (
-/turf/simulated/wall,
-/area/security/forensics_morgue)
 "eeU" = (
 /obj/effect/floor_decal/spline/plain{
 	dir = 8
@@ -4741,9 +4746,7 @@
 	opacity = 0
 	},
 /turf/simulated/floor/tiled/dark/full,
-/area/security/forensics_office{
-	name = "Security - Investigations Office"
-	})
+/area/horizon/security/investigators_office)
 "eho" = (
 /obj/structure/table/reinforced/wood,
 /obj/machinery/computer/guestpass{
@@ -4890,8 +4893,11 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
 /turf/simulated/floor/tiled,
-/area/security/investigations)
+/area/horizon/security/investigations_hallway)
 "emK" = (
 /obj/item/device/radio/intercom{
 	pixel_y = 24
@@ -5047,7 +5053,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/tiled,
-/area/security/investigations)
+/area/horizon/security/investigations_hallway)
 "etr" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
@@ -5057,7 +5063,7 @@
 	dir = 10
 	},
 /turf/simulated/floor/tiled/white,
-/area/security/forensics_morgue)
+/area/horizon/security/autopsy_laboratory)
 "etA" = (
 /obj/structure/bed/stool/chair/office/bridge/generic{
 	dir = 8
@@ -5328,7 +5334,7 @@
 	pixel_y = -2
 	},
 /turf/simulated/floor/tiled/white,
-/area/security/forensics_morgue)
+/area/horizon/security/forensic_laboratory)
 "eFw" = (
 /obj/effect/floor_decal/corner_wide/green/full{
 	dir = 1
@@ -5424,7 +5430,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/tiled/dark,
-/area/security/investigations)
+/area/horizon/security/firing_range)
 "eIo" = (
 /obj/structure/railing/mapped{
 	dir = 4
@@ -5491,9 +5497,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/lino/grey,
-/area/security/forensics_office{
-	name = "Security - Investigations Office"
-	})
+/area/horizon/security/investigators_office)
 "eLw" = (
 /obj/structure/cable/green{
 	icon_state = "1-2"
@@ -5549,12 +5553,6 @@
 	},
 /turf/simulated/floor/tiled,
 /area/horizon/hallway/deck_three/primary/starboard/docks)
-"ePK" = (
-/obj/effect/floor_decal/corner/blue{
-	dir = 5
-	},
-/turf/simulated/floor/tiled/dark,
-/area/security/investigations_storage)
 "eQq" = (
 /obj/effect/floor_decal/corner_wide/green{
 	dir = 9
@@ -5587,7 +5585,7 @@
 	pixel_y = -40
 	},
 /turf/simulated/floor/tiled/dark,
-/area/security/investigations)
+/area/horizon/security/firing_range)
 "eQY" = (
 /obj/effect/floor_decal/spline/fancy/wood{
 	dir = 1
@@ -5712,7 +5710,7 @@
 	icon_state = "4-8"
 	},
 /turf/simulated/floor/tiled/white,
-/area/security/forensics_morgue)
+/area/horizon/security/forensic_laboratory)
 "eWn" = (
 /obj/structure/bed/stool/chair/sofa/right/brown{
 	dir = 4
@@ -5863,7 +5861,7 @@
 	},
 /obj/structure/table/steel,
 /turf/simulated/floor/tiled/dark,
-/area/security/investigations)
+/area/horizon/security/interrogation)
 "fbz" = (
 /obj/effect/floor_decal/spline/fancy/wood{
 	dir = 4
@@ -6362,7 +6360,7 @@
 	name = "Security Cadet"
 	},
 /turf/simulated/floor/tiled/dark,
-/area/security/vacantoffice2)
+/area/horizon/security/meeting_room)
 "frN" = (
 /obj/effect/floor_decal/corner/blue{
 	dir = 10
@@ -6642,7 +6640,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/tiled/dark,
-/area/security/vacantoffice2)
+/area/horizon/security/meeting_room)
 "fzf" = (
 /obj/structure/grille,
 /obj/machinery/door/firedoor,
@@ -6656,7 +6654,7 @@
 	},
 /obj/structure/window/shuttle/scc_space_ship/cardinal,
 /turf/simulated/floor/plating,
-/area/security/forensics_morgue)
+/area/horizon/security/forensic_laboratory)
 "fzk" = (
 /obj/effect/floor_decal/corner/blue{
 	dir = 6
@@ -6765,7 +6763,7 @@
 	name = "port, security firing range"
 	},
 /turf/simulated/wall/shuttle/scc_space_ship/cardinal,
-/area/security/investigations)
+/area/horizon/security/firing_range)
 "fFg" = (
 /obj/structure/lattice,
 /obj/structure/railing/mapped,
@@ -6785,14 +6783,16 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 9
 	},
-/obj/machinery/alarm{
-	dir = 1;
-	pixel_y = -28
-	},
 /obj/machinery/light,
 /obj/effect/floor_decal/corner/blue/full,
+/obj/machinery/power/apc{
+	pixel_y = -24
+	},
+/obj/structure/cable/green{
+	icon_state = "0-8"
+	},
 /turf/simulated/floor/tiled/white,
-/area/security/forensics_morgue)
+/area/horizon/security/autopsy_laboratory)
 "fGN" = (
 /obj/effect/floor_decal/corner/paleblue{
 	dir = 5
@@ -7059,9 +7059,6 @@
 /obj/structure/flora/ausbushes/grassybush,
 /turf/simulated/floor/grass/alt,
 /area/horizon/hallway/deck_three/primary/central)
-"fQJ" = (
-/turf/simulated/wall/shuttle/scc_space_ship/cardinal,
-/area/security/investigations)
 "fRO" = (
 /obj/machinery/door/firedoor,
 /obj/machinery/door/airlock/security{
@@ -7074,8 +7071,11 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
 /turf/simulated/floor/tiled/full,
-/area/security/investigations)
+/area/horizon/security/interrogation/monitoring)
 "fSa" = (
 /obj/structure/window/shuttle/scc_space_ship,
 /obj/structure/grille,
@@ -7162,9 +7162,6 @@
 	},
 /turf/simulated/floor/carpet,
 /area/crew_quarters/heads/hop/xo)
-"fUR" = (
-/turf/simulated/wall,
-/area/security/vacantoffice2)
 "fUV" = (
 /obj/effect/floor_decal/corner/red{
 	dir = 6
@@ -7213,7 +7210,7 @@
 "fWH" = (
 /obj/effect/floor_decal/corner/blue,
 /turf/simulated/floor/tiled/dark,
-/area/security/vacantoffice2)
+/area/horizon/security/meeting_room)
 "fWT" = (
 /obj/effect/floor_decal/corner/green{
 	dir = 9
@@ -7291,9 +7288,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/carpet,
-/area/security/forensics_office{
-	name = "Security - Investigations Office"
-	})
+/area/horizon/security/investigators_office)
 "gar" = (
 /obj/structure/railing/mapped{
 	dir = 8
@@ -7320,7 +7315,7 @@
 /obj/structure/filingcabinet/chestdrawer,
 /obj/effect/floor_decal/industrial/outline/security,
 /turf/simulated/floor/tiled/white,
-/area/security/forensics_morgue)
+/area/horizon/security/forensic_laboratory)
 "gaP" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /turf/simulated/floor/carpet/art,
@@ -7389,9 +7384,6 @@
 /obj/effect/map_effect/window_spawner/full/reinforced/firedoor,
 /turf/simulated/floor/tiled/dark/full,
 /area/security/vacantoffice)
-"gdW" = (
-/turf/simulated/wall,
-/area/security/investigations_storage)
 "geC" = (
 /obj/machinery/computer/guestpass{
 	pixel_y = 32
@@ -7715,7 +7707,7 @@
 /obj/structure/filingcabinet/chestdrawer,
 /obj/effect/floor_decal/industrial/outline/security,
 /turf/simulated/floor/tiled/white,
-/area/security/forensics_morgue)
+/area/horizon/security/forensic_laboratory)
 "guk" = (
 /obj/machinery/telecomms/server/presets/common,
 /turf/simulated/floor/bluegrid,
@@ -7896,7 +7888,7 @@
 	dir = 5
 	},
 /turf/simulated/floor/tiled/white,
-/area/security/forensics_morgue)
+/area/horizon/security/forensic_laboratory)
 "gzb" = (
 /obj/effect/floor_decal/industrial/warning/corner{
 	dir = 1
@@ -8011,7 +8003,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /turf/simulated/floor/tiled,
-/area/security/investigations)
+/area/horizon/security/investigations_hallway)
 "gFS" = (
 /obj/structure/railing/mapped{
 	dir = 8
@@ -8039,7 +8031,7 @@
 	name = "evidence storage locker C"
 	},
 /turf/simulated/floor/tiled/dark,
-/area/security/investigations_storage)
+/area/horizon/security/evidence_storage)
 "gHo" = (
 /obj/machinery/atmospherics/unary/vent_pump/on{
 	dir = 4
@@ -8096,7 +8088,7 @@
 	icon_state = "4-8"
 	},
 /turf/simulated/floor/tiled/white,
-/area/security/forensics_morgue)
+/area/horizon/security/forensic_laboratory)
 "gIK" = (
 /obj/structure/railing/mapped{
 	dir = 4
@@ -8223,7 +8215,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/structure/disposalpipe/segment,
 /turf/simulated/floor/tiled,
-/area/security/investigations)
+/area/horizon/security/investigations_hallway)
 "gPb" = (
 /obj/machinery/alarm{
 	dir = 8;
@@ -8303,7 +8295,7 @@
 	pixel_y = 32
 	},
 /turf/simulated/floor/tiled/dark,
-/area/security/investigations)
+/area/horizon/security/firing_range)
 "gSA" = (
 /obj/effect/floor_decal/corner/blue/full,
 /obj/structure/table/reinforced,
@@ -8320,7 +8312,7 @@
 /obj/item/target,
 /obj/item/target,
 /turf/simulated/floor/tiled/dark,
-/area/security/investigations)
+/area/horizon/security/firing_range)
 "gSN" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -8337,7 +8329,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/structure/disposalpipe/segment,
 /turf/simulated/floor/tiled/full,
-/area/security/forensics_morgue)
+/area/horizon/security/forensic_laboratory)
 "gTu" = (
 /obj/structure/disposalpipe/segment,
 /obj/effect/floor_decal/corner/blue{
@@ -8345,10 +8337,13 @@
 	},
 /turf/simulated/floor/tiled,
 /area/horizon/hallway/deck_three/primary/port)
+"gTG" = (
+/turf/simulated/wall/shuttle/scc_space_ship/cardinal,
+/area/horizon/security/autopsy_laboratory)
 "gTO" = (
 /obj/machinery/hologram/holopad,
 /turf/simulated/floor/tiled/dark,
-/area/security/vacantoffice2)
+/area/horizon/security/meeting_room)
 "gTR" = (
 /obj/machinery/door/airlock{
 	name = "Public Office"
@@ -8461,7 +8456,7 @@
 	},
 /obj/effect/floor_decal/industrial/outline/security,
 /turf/simulated/floor/tiled/white,
-/area/security/forensics_morgue)
+/area/horizon/security/autopsy_laboratory)
 "gZO" = (
 /obj/machinery/vending/coffee,
 /obj/machinery/light{
@@ -8533,7 +8528,7 @@
 "hco" = (
 /obj/effect/floor_decal/corner/beige/diagonal,
 /turf/simulated/floor/tiled/white,
-/area/security/forensics_morgue)
+/area/horizon/security/forensic_laboratory)
 "hcw" = (
 /obj/effect/floor_decal/spline/fancy/wood,
 /turf/simulated/floor/carpet,
@@ -8820,7 +8815,7 @@
 	},
 /obj/structure/flora/pottedplant/random,
 /turf/simulated/floor/tiled,
-/area/security/investigations)
+/area/horizon/security/investigations_hallway)
 "hja" = (
 /obj/structure/bed/stool/chair/padded/brown{
 	dir = 1
@@ -8941,8 +8936,9 @@
 "hmC" = (
 /obj/structure/reagent_dispensers/water_cooler,
 /obj/effect/floor_decal/corner/red/full,
+/obj/effect/floor_decal/industrial/outline/grey,
 /turf/simulated/floor/tiled/dark,
-/area/security/investigations)
+/area/horizon/security/interrogation)
 "hmP" = (
 /obj/effect/floor_decal/corner/green/diagonal{
 	dir = 8
@@ -9121,7 +9117,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/tiled/white,
-/area/security/forensics_morgue)
+/area/horizon/security/autopsy_laboratory)
 "htr" = (
 /obj/machinery/papershredder,
 /obj/effect/floor_decal/corner/blue{
@@ -9245,7 +9241,7 @@
 	},
 /obj/machinery/door/firedoor,
 /turf/simulated/floor/tiled/full,
-/area/security/investigations_storage)
+/area/horizon/security/evidence_storage)
 "hxT" = (
 /obj/machinery/light,
 /obj/structure/sign/directions/dock{
@@ -9606,7 +9602,7 @@
 	name = "Security Officer"
 	},
 /turf/simulated/floor/tiled/dark,
-/area/security/vacantoffice2)
+/area/horizon/security/meeting_room)
 "hOw" = (
 /obj/structure/cable/green{
 	icon_state = "4-8"
@@ -9669,7 +9665,7 @@
 /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/manifold/hidden/supply,
 /turf/simulated/floor/tiled,
-/area/security/investigations)
+/area/horizon/security/investigations_hallway)
 "hQm" = (
 /obj/effect/floor_decal/corner/green/full{
 	dir = 8
@@ -9723,9 +9719,20 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/horizon/crew_quarters/fitness/hallway)
-"hSz" = (
-/turf/simulated/wall/r_wall,
-/area/security/investigations_storage)
+"hTq" = (
+/obj/structure/grille,
+/obj/machinery/door/firedoor,
+/obj/machinery/door/blast/regular{
+	density = 0;
+	icon_state = "pdoor0";
+	id = "Security Lockdown";
+	name = "Security Blast Door";
+	opacity = 0;
+	dir = 4
+	},
+/obj/structure/window/shuttle/scc_space_ship/cardinal,
+/turf/simulated/floor/plating,
+/area/horizon/security/autopsy_laboratory)
 "hTw" = (
 /obj/machinery/door/firedoor,
 /obj/structure/grille,
@@ -10001,8 +10008,11 @@
 /obj/effect/floor_decal/corner/blue{
 	dir = 10
 	},
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+	dir = 4
+	},
 /turf/simulated/floor/tiled/dark,
-/area/security/investigations)
+/area/horizon/security/interrogation/monitoring)
 "ils" = (
 /obj/effect/map_effect/window_spawner/full/reinforced/firedoor,
 /obj/machinery/door/blast/regular{
@@ -10109,7 +10119,7 @@
 /area/crew_quarters/captain)
 "ioQ" = (
 /turf/simulated/wall,
-/area/security/investigations)
+/area/horizon/security/autopsy_laboratory)
 "ipk" = (
 /obj/machinery/light/small{
 	dir = 1
@@ -10123,8 +10133,11 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
 	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
 /turf/simulated/floor/tiled/dark,
-/area/security/investigations)
+/area/horizon/security/interrogation/monitoring)
 "ipX" = (
 /obj/structure/bed/stool/chair/padded/beige{
 	dir = 4
@@ -10262,7 +10275,7 @@
 	pixel_y = -24
 	},
 /turf/simulated/floor/tiled/white,
-/area/security/forensics_morgue)
+/area/horizon/security/autopsy_laboratory)
 "iwi" = (
 /obj/structure/cable/green{
 	icon_state = "2-8"
@@ -10278,6 +10291,12 @@
 	},
 /turf/simulated/floor/tiled,
 /area/horizon/hallway/deck_three/primary/central)
+"iwr" = (
+/obj/effect/floor_decal/corner/blue{
+	dir = 5
+	},
+/turf/simulated/floor/tiled/dark,
+/area/horizon/security/evidence_storage)
 "iwx" = (
 /obj/effect/floor_decal/corner/paleblue{
 	dir = 5
@@ -10357,7 +10376,7 @@
 /obj/item/folder/sec,
 /obj/effect/floor_decal/corner/beige/diagonal,
 /turf/simulated/floor/tiled/white,
-/area/security/forensics_morgue)
+/area/horizon/security/forensic_laboratory)
 "izW" = (
 /obj/machinery/alarm{
 	dir = 4;
@@ -10373,9 +10392,7 @@
 /area/journalistoffice)
 "iAY" = (
 /turf/simulated/floor/lino/grey,
-/area/security/forensics_office{
-	name = "Security - Investigations Office"
-	})
+/area/horizon/security/investigators_office)
 "iBF" = (
 /turf/simulated/floor/tiled/white,
 /area/hallway/medical/upper)
@@ -10479,8 +10496,15 @@
 	pixel_x = 7;
 	pixel_y = 9
 	},
+/obj/machinery/power/apc{
+	dir = 1;
+	pixel_y = 24
+	},
+/obj/structure/cable/green{
+	icon_state = "0-2"
+	},
 /turf/simulated/floor/tiled/dark,
-/area/security/investigations)
+/area/horizon/security/firing_range)
 "iEo" = (
 /obj/effect/floor_decal/corner/green{
 	dir = 9
@@ -10553,7 +10577,7 @@
 /obj/structure/bed/stool/chair/office/dark,
 /obj/effect/floor_decal/corner/beige/diagonal,
 /turf/simulated/floor/tiled/white,
-/area/security/forensics_morgue)
+/area/horizon/security/forensic_laboratory)
 "iHq" = (
 /obj/machinery/light{
 	dir = 1
@@ -10629,9 +10653,6 @@
 	},
 /turf/simulated/floor/reinforced,
 /area/bridge/selfdestruct)
-"iKp" = (
-/turf/simulated/wall/shuttle/scc_space_ship/cardinal,
-/area/security/forensics_morgue)
 "iKX" = (
 /obj/structure/railing/mapped{
 	dir = 8
@@ -10952,7 +10973,7 @@
 /obj/effect/floor_decal/spline/fancy/wood,
 /obj/item/storage/slide_projector,
 /turf/simulated/floor/wood,
-/area/security/vacantoffice2)
+/area/horizon/security/meeting_room)
 "iWh" = (
 /obj/structure/flora/ausbushes/sparsegrass,
 /obj/effect/floor_decal/spline/plain{
@@ -11010,7 +11031,7 @@
 "jaj" = (
 /obj/effect/floor_decal/industrial/warning,
 /turf/simulated/floor/tiled/dark,
-/area/security/investigations)
+/area/horizon/security/firing_range)
 "jav" = (
 /obj/structure/cable/green{
 	icon_state = "1-8"
@@ -11260,12 +11281,6 @@
 	},
 /turf/simulated/floor/tiled/dark/full,
 /area/horizon/hallway/deck_three/primary/starboard/docks)
-"jlq" = (
-/obj/effect/floor_decal/corner/blue{
-	dir = 6
-	},
-/turf/simulated/floor/tiled/dark,
-/area/security/vacantoffice2)
 "jlB" = (
 /obj/item/modular_computer/console/preset/security/investigations,
 /obj/machinery/light{
@@ -11276,7 +11291,7 @@
 	},
 /obj/effect/floor_decal/industrial/outline/security,
 /turf/simulated/floor/tiled/white,
-/area/security/forensics_morgue)
+/area/horizon/security/forensic_laboratory)
 "jlN" = (
 /obj/effect/floor_decal/corner/blue{
 	dir = 4
@@ -11312,7 +11327,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/tiled/dark,
-/area/security/investigations_storage)
+/area/horizon/security/evidence_storage)
 "jmN" = (
 /obj/effect/floor_decal/corner/blue{
 	dir = 10
@@ -11415,7 +11430,7 @@
 	dir = 9
 	},
 /turf/simulated/floor/tiled,
-/area/security/investigations)
+/area/horizon/security/investigations_hallway)
 "jvq" = (
 /obj/effect/floor_decal/corner/green/diagonal{
 	dir = 8
@@ -11500,7 +11515,7 @@
 /obj/effect/floor_decal/corner/blue/diagonal,
 /obj/structure/disposalpipe/segment,
 /turf/simulated/floor/tiled,
-/area/security/investigations)
+/area/horizon/security/investigations_hallway)
 "jws" = (
 /obj/machinery/alarm{
 	pixel_y = 28
@@ -11573,7 +11588,7 @@
 	req_one_access = list(24,11,55)
 	},
 /turf/simulated/floor/wood,
-/area/security/vacantoffice2)
+/area/horizon/security/meeting_room)
 "jzc" = (
 /obj/structure/sign/electricshock,
 /turf/simulated/wall/r_wall,
@@ -11600,7 +11615,7 @@
 	dir = 5
 	},
 /turf/simulated/floor/tiled/white,
-/area/security/forensics_morgue)
+/area/horizon/security/autopsy_laboratory)
 "jBa" = (
 /obj/machinery/light,
 /obj/structure/closet/athletic_mixed,
@@ -11712,7 +11727,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/tiled/dark,
-/area/security/investigations)
+/area/horizon/security/interrogation)
 "jEX" = (
 /turf/simulated/floor/wood,
 /area/lawoffice/consular)
@@ -11794,7 +11809,7 @@
 	pixel_y = 32
 	},
 /turf/simulated/floor/tiled/dark,
-/area/security/investigations)
+/area/horizon/security/firing_range)
 "jJq" = (
 /obj/effect/landmark{
 	name = "carpspawn"
@@ -11817,7 +11832,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/tiled/full,
-/area/security/investigations)
+/area/horizon/security/investigations_hallway)
 "jJH" = (
 /obj/structure/table/wood,
 /obj/machinery/photocopier/faxmachine{
@@ -12012,7 +12027,7 @@
 	dir = 8
 	},
 /turf/simulated/floor/tiled/dark/full,
-/area/security/investigations)
+/area/horizon/security/firing_range)
 "jRJ" = (
 /obj/effect/floor_decal/spline/fancy/wood{
 	dir = 5
@@ -12129,8 +12144,12 @@
 /obj/effect/floor_decal/corner/blue{
 	dir = 10
 	},
+/obj/machinery/alarm{
+	dir = 1;
+	pixel_y = -28
+	},
 /turf/simulated/floor/tiled/white,
-/area/security/forensics_morgue)
+/area/horizon/security/autopsy_laboratory)
 "jYu" = (
 /obj/effect/floor_decal/industrial/hatch/yellow,
 /obj/effect/floor_decal/industrial/warning{
@@ -12179,9 +12198,7 @@
 /obj/item/folder/sec,
 /obj/item/pen,
 /turf/simulated/floor/carpet,
-/area/security/forensics_office{
-	name = "Security - Investigations Office"
-	})
+/area/horizon/security/investigators_office)
 "jZm" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
@@ -12253,11 +12270,17 @@
 /obj/effect/floor_decal/corner/blue{
 	dir = 5
 	},
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
+/obj/machinery/alarm{
+	pixel_y = 28
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 6
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
 /turf/simulated/floor/tiled/dark,
-/area/security/investigations)
+/area/horizon/security/interrogation/monitoring)
 "kdj" = (
 /obj/effect/floor_decal/corner/green/diagonal{
 	dir = 8
@@ -12336,7 +12359,7 @@
 	icon_state = "4-8"
 	},
 /turf/simulated/floor/tiled,
-/area/security/investigations)
+/area/horizon/security/investigations_hallway)
 "kgW" = (
 /obj/effect/floor_decal/spline/plain{
 	dir = 10
@@ -12452,7 +12475,7 @@
 	dir = 9
 	},
 /turf/simulated/floor/tiled,
-/area/security/investigations)
+/area/horizon/security/investigations_hallway)
 "kkj" = (
 /turf/simulated/wall/shuttle/scc_space_ship/cardinal,
 /area/horizon/crew_quarters/fitness/gym)
@@ -12488,19 +12511,8 @@
 /turf/simulated/floor/tiled,
 /area/horizon/crew_quarters/fitness/hallway)
 "klQ" = (
-/obj/structure/grille,
-/obj/machinery/door/firedoor,
-/obj/machinery/door/blast/regular{
-	density = 0;
-	dir = 4;
-	icon_state = "pdoor0";
-	id = "Security Lockdown";
-	name = "Security Blast Door";
-	opacity = 0
-	},
-/obj/structure/window/shuttle/scc_space_ship/cardinal,
-/turf/simulated/floor/plating,
-/area/security/investigations)
+/turf/simulated/wall,
+/area/horizon/security/interrogation/monitoring)
 "kms" = (
 /obj/structure/flora/ausbushes/sparsegrass,
 /turf/simulated/floor/grass/alt,
@@ -12728,7 +12740,7 @@
 	pixel_y = 28
 	},
 /turf/simulated/floor/tiled/dark,
-/area/security/investigations)
+/area/horizon/security/interrogation)
 "kso" = (
 /obj/machinery/light_switch{
 	dir = 1;
@@ -12741,7 +12753,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/tiled/white,
-/area/security/forensics_morgue)
+/area/horizon/security/forensic_laboratory)
 "ksw" = (
 /obj/effect/floor_decal/corner_wide/green{
 	dir = 10
@@ -12810,9 +12822,7 @@
 	pixel_x = 32
 	},
 /turf/simulated/floor/lino/grey,
-/area/security/forensics_office{
-	name = "Security - Investigations Office"
-	})
+/area/horizon/security/investigators_office)
 "ktP" = (
 /obj/effect/floor_decal/spline/fancy/wood{
 	dir = 8
@@ -12954,6 +12964,9 @@
 /obj/machinery/telecomms/bus/preset_one,
 /turf/simulated/floor/bluegrid,
 /area/tcommsat/chamber)
+"kxs" = (
+/turf/simulated/floor/tiled/dark,
+/area/horizon/security/meeting_room)
 "kyd" = (
 /obj/effect/floor_decal/corner/green{
 	dir = 6
@@ -13188,7 +13201,7 @@
 	icon_state = "4-8"
 	},
 /turf/simulated/floor/tiled/dark,
-/area/security/investigations_storage)
+/area/horizon/security/evidence_storage)
 "kKg" = (
 /obj/structure/ship_weapon_dummy,
 /turf/simulated/open/airless,
@@ -13244,13 +13257,16 @@
 	pixel_y = 32
 	},
 /turf/simulated/floor/wood,
-/area/security/vacantoffice2)
+/area/horizon/security/meeting_room)
 "kMe" = (
 /obj/effect/floor_decal/industrial/warning{
 	dir = 6
 	},
 /turf/simulated/floor/reinforced/airless,
 /area/template_noop)
+"kNc" = (
+/turf/simulated/wall,
+/area/horizon/security/evidence_storage)
 "kOC" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
@@ -13396,7 +13412,7 @@
 	dir = 6
 	},
 /turf/simulated/floor/tiled,
-/area/security/investigations)
+/area/horizon/security/investigations_hallway)
 "kUf" = (
 /obj/effect/floor_decal/corner/green{
 	dir = 5
@@ -13897,6 +13913,9 @@
 	},
 /turf/simulated/floor/tiled,
 /area/engineering/break_room)
+"lnI" = (
+/turf/simulated/wall,
+/area/horizon/security/meeting_room)
 "lnX" = (
 /obj/structure/flora/pottedplant/random,
 /obj/effect/floor_decal/corner/green/full{
@@ -13939,6 +13958,9 @@
 	},
 /turf/simulated/open,
 /area/horizon/hallway/deck_three/primary/central)
+"lsm" = (
+/turf/simulated/floor/tiled/dark,
+/area/horizon/security/evidence_storage)
 "lsB" = (
 /obj/structure/bed/stool/chair{
 	dir = 8
@@ -13947,7 +13969,7 @@
 	dir = 6
 	},
 /turf/simulated/floor/tiled,
-/area/security/investigations)
+/area/horizon/security/investigations_hallway)
 "lsV" = (
 /obj/effect/map_effect/window_spawner/full/reinforced/grille/firedoor,
 /obj/structure/cable/green{
@@ -14407,7 +14429,7 @@
 	dir = 10
 	},
 /turf/simulated/floor/tiled/dark,
-/area/security/investigations)
+/area/horizon/security/interrogation)
 "lIT" = (
 /obj/structure/bed/stool/chair/padded/brown{
 	dir = 4
@@ -14518,7 +14540,7 @@
 	pixel_x = -28
 	},
 /turf/simulated/floor/tiled/dark,
-/area/security/investigations_storage)
+/area/horizon/security/evidence_storage)
 "lOz" = (
 /obj/effect/floor_decal/corner/blue/diagonal,
 /obj/structure/cable/green{
@@ -14571,7 +14593,7 @@
 /obj/item/folder/sec,
 /obj/item/folder/sec,
 /turf/simulated/floor/tiled/white,
-/area/security/forensics_morgue)
+/area/horizon/security/forensic_laboratory)
 "lPM" = (
 /obj/machinery/door/airlock/external{
 	frequency = 1337;
@@ -14719,7 +14741,7 @@
 	dir = 5
 	},
 /turf/simulated/floor/tiled/white,
-/area/security/forensics_morgue)
+/area/horizon/security/forensic_laboratory)
 "lWU" = (
 /obj/machinery/door/airlock{
 	name = "Washroom"
@@ -14831,7 +14853,7 @@
 	icon_state = "0-4"
 	},
 /turf/simulated/floor/tiled/white,
-/area/security/forensics_morgue)
+/area/horizon/security/forensic_laboratory)
 "mbb" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
@@ -14853,7 +14875,7 @@
 	},
 /obj/structure/disposalpipe/junction/yjunction,
 /turf/simulated/floor/tiled,
-/area/security/investigations)
+/area/horizon/security/investigations_hallway)
 "mbF" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /turf/simulated/floor/tiled/dark,
@@ -14878,7 +14900,7 @@
 	},
 /obj/effect/floor_decal/industrial/outline/grey,
 /turf/simulated/floor/tiled/dark,
-/area/security/investigations_storage)
+/area/horizon/security/evidence_storage)
 "mbR" = (
 /obj/item/stock_parts/subspace/transmitter,
 /obj/item/stock_parts/subspace/transmitter,
@@ -14931,7 +14953,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/structure/disposalpipe/segment,
 /turf/simulated/floor/tiled,
-/area/security/investigations)
+/area/horizon/security/investigations_hallway)
 "mcT" = (
 /obj/structure/cable/green{
 	icon_state = "1-8"
@@ -14954,7 +14976,7 @@
 /obj/item/clothing/ears/earmuffs,
 /obj/item/clothing/glasses/safety/goggles,
 /turf/simulated/floor/tiled/dark/full,
-/area/security/investigations)
+/area/horizon/security/firing_range)
 "mdU" = (
 /obj/structure/table/wood,
 /obj/item/paper_bin,
@@ -15037,8 +15059,11 @@
 /obj/structure/cable/green{
 	icon_state = "2-4"
 	},
+/obj/structure/cable/green{
+	icon_state = "2-8"
+	},
 /turf/simulated/floor/tiled,
-/area/security/investigations)
+/area/horizon/security/investigations_hallway)
 "mhs" = (
 /obj/effect/floor_decal/spline/fancy/wood{
 	dir = 8
@@ -15228,9 +15253,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/lino/grey,
-/area/security/forensics_office{
-	name = "Security - Investigations Office"
-	})
+/area/horizon/security/investigators_office)
 "moN" = (
 /turf/simulated/wall/shuttle/scc_space_ship/cardinal,
 /area/lawoffice/representative)
@@ -15238,7 +15261,7 @@
 /obj/effect/floor_decal/corner/blue/diagonal,
 /obj/structure/disposalpipe/segment,
 /turf/simulated/floor/tiled,
-/area/security/investigations)
+/area/horizon/security/investigations_hallway)
 "mpk" = (
 /obj/structure/table/glass,
 /obj/item/paper_scanner{
@@ -15252,7 +15275,7 @@
 	dir = 6
 	},
 /turf/simulated/floor/tiled/white,
-/area/security/forensics_morgue)
+/area/horizon/security/forensic_laboratory)
 "mpt" = (
 /obj/structure/bed/stool/chair/wood{
 	dir = 4
@@ -15279,8 +15302,11 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
 	},
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
 /turf/simulated/floor/tiled,
-/area/security/investigations)
+/area/horizon/security/investigations_hallway)
 "mqJ" = (
 /obj/effect/floor_decal/corner/green{
 	dir = 10
@@ -15382,11 +15408,11 @@
 	},
 /obj/structure/banner/scc,
 /turf/simulated/floor/wood,
-/area/security/vacantoffice2)
+/area/horizon/security/meeting_room)
 "mvx" = (
 /obj/effect/floor_decal/industrial/outline/security,
 /turf/simulated/floor/tiled/dark/full,
-/area/security/investigations)
+/area/horizon/security/firing_range)
 "mwz" = (
 /obj/machinery/camera/network/security{
 	c_tag = "Security - Investigations Office";
@@ -15399,9 +15425,7 @@
 	pixel_x = 32
 	},
 /turf/simulated/floor/lino/grey,
-/area/security/forensics_office{
-	name = "Security - Investigations Office"
-	})
+/area/horizon/security/investigators_office)
 "mwL" = (
 /obj/structure/lattice/catwalk,
 /obj/structure/railing/mapped,
@@ -15500,7 +15524,7 @@
 	dir = 8
 	},
 /turf/simulated/floor/tiled/dark,
-/area/security/investigations)
+/area/horizon/security/interrogation)
 "mFR" = (
 /obj/effect/floor_decal/corner/green/diagonal,
 /obj/effect/floor_decal/spline/plain{
@@ -15522,12 +15546,10 @@
 	icon_state = "1-2"
 	},
 /turf/simulated/floor/tiled/ramp,
-/area/security/vacantoffice2)
+/area/horizon/security/meeting_room)
 "mHV" = (
 /turf/simulated/floor/carpet,
-/area/security/forensics_office{
-	name = "Security - Investigations Office"
-	})
+/area/horizon/security/investigators_office)
 "mIc" = (
 /obj/machinery/power/apc/super{
 	dir = 4;
@@ -15627,6 +15649,16 @@
 /obj/effect/floor_decal/industrial/outline/grey,
 /turf/simulated/floor/tiled,
 /area/horizon/hallway/deck_three/primary/central)
+"mLe" = (
+/obj/structure/bed/stool/chair,
+/obj/effect/floor_decal/corner/blue{
+	dir = 10
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 9
+	},
+/turf/simulated/floor/tiled/dark,
+/area/horizon/security/interrogation/monitoring)
 "mMR" = (
 /obj/structure/cable/green{
 	icon_state = "0-2"
@@ -15852,7 +15884,7 @@
 	pixel_y = 32
 	},
 /turf/simulated/floor/wood,
-/area/security/vacantoffice2)
+/area/horizon/security/meeting_room)
 "mVT" = (
 /obj/effect/floor_decal/spline/fancy/wood{
 	dir = 1
@@ -15914,7 +15946,7 @@
 	},
 /obj/structure/disposalpipe/segment,
 /turf/simulated/floor/tiled,
-/area/security/investigations)
+/area/horizon/security/investigations_hallway)
 "mXh" = (
 /obj/structure/table/standard,
 /obj/item/device/binoculars,
@@ -16070,9 +16102,6 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/hallway/medical/upper)
-"nbR" = (
-/turf/simulated/floor/tiled/dark,
-/area/security/vacantoffice2)
 "nei" = (
 /obj/structure/cable/green{
 	icon_state = "4-8"
@@ -16121,9 +16150,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/lino/grey,
-/area/security/forensics_office{
-	name = "Security - Investigations Office"
-	})
+/area/horizon/security/investigators_office)
 "nfx" = (
 /obj/effect/floor_decal/corner/blue/full{
 	dir = 4
@@ -16137,6 +16164,12 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/bridge/meeting_room)
+"ngK" = (
+/obj/effect/floor_decal/corner/red{
+	dir = 10
+	},
+/turf/simulated/floor/tiled/dark,
+/area/horizon/security/interrogation)
 "ngT" = (
 /obj/effect/floor_decal/corner_wide/green{
 	dir = 5
@@ -16172,7 +16205,7 @@
 	},
 /obj/effect/floor_decal/industrial/outline/emergency_closet,
 /turf/simulated/floor/tiled,
-/area/security/investigations)
+/area/horizon/security/investigations_hallway)
 "nhL" = (
 /obj/machinery/button/remote/blast_door{
 	dir = 1;
@@ -16201,7 +16234,7 @@
 	dir = 6
 	},
 /turf/simulated/floor/tiled/dark,
-/area/security/investigations)
+/area/horizon/security/firing_range)
 "nji" = (
 /obj/structure/table/rack,
 /obj/random/loot,
@@ -16246,7 +16279,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/tiled/full,
-/area/maintenance/security_starboard)
+/area/horizon/security/investigations_hallway)
 "nkG" = (
 /obj/machinery/door/airlock{
 	id_tag = "cryo_toilet_2";
@@ -16258,7 +16291,7 @@
 /obj/effect/floor_decal/industrial/outline/security,
 /obj/structure/target_stake,
 /turf/simulated/floor/tiled/dark/full,
-/area/security/investigations)
+/area/horizon/security/firing_range)
 "nlw" = (
 /obj/effect/floor_decal/spline/plain/corner,
 /obj/effect/floor_decal/corner/blue{
@@ -16333,7 +16366,7 @@
 	},
 /obj/structure/flora/pottedplant/random,
 /turf/simulated/floor/tiled/dark,
-/area/security/investigations)
+/area/horizon/security/interrogation/monitoring)
 "noc" = (
 /obj/machinery/portable_atmospherics/canister/air/airlock,
 /obj/machinery/atmospherics/portables_connector{
@@ -16464,7 +16497,7 @@
 	pixel_y = 4
 	},
 /turf/simulated/floor/tiled/white,
-/area/security/forensics_morgue)
+/area/horizon/security/autopsy_laboratory)
 "nvV" = (
 /obj/machinery/vending/cigarette,
 /obj/machinery/power/apc/low{
@@ -16708,7 +16741,7 @@
 	pixel_y = -32
 	},
 /turf/simulated/floor/tiled/white,
-/area/security/forensics_morgue)
+/area/horizon/security/autopsy_laboratory)
 "nFg" = (
 /obj/machinery/atmospherics/unary/vent_scrubber/on{
 	dir = 4
@@ -16812,9 +16845,7 @@
 	dir = 8
 	},
 /turf/simulated/floor/lino/grey,
-/area/security/forensics_office{
-	name = "Security - Investigations Office"
-	})
+/area/horizon/security/investigators_office)
 "nIW" = (
 /obj/structure/bed/stool/chair{
 	dir = 1
@@ -17008,9 +17039,7 @@
 	},
 /obj/item/device/camera_film,
 /turf/simulated/floor/carpet,
-/area/security/forensics_office{
-	name = "Security - Investigations Office"
-	})
+/area/horizon/security/investigators_office)
 "nQR" = (
 /obj/effect/floor_decal/spline/plain{
 	dir = 4
@@ -17062,6 +17091,9 @@
 	},
 /turf/simulated/floor/reinforced/airless,
 /area/horizon/exterior)
+"nSp" = (
+/turf/simulated/wall/r_wall,
+/area/horizon/security/investigations_hallway)
 "nSJ" = (
 /obj/effect/floor_decal/corner/green/diagonal,
 /obj/item/device/radio/intercom{
@@ -17146,7 +17178,7 @@
 	name = "evidence storage locker B"
 	},
 /turf/simulated/floor/tiled/dark,
-/area/security/investigations_storage)
+/area/horizon/security/evidence_storage)
 "nXf" = (
 /obj/structure/cable/green{
 	icon_state = "4-8"
@@ -17172,6 +17204,12 @@
 /obj/machinery/vending/zora,
 /turf/simulated/floor/tiled/dark/full,
 /area/horizon/cafeteria)
+"nYQ" = (
+/obj/effect/floor_decal/corner/blue{
+	dir = 6
+	},
+/turf/simulated/floor/tiled/dark,
+/area/horizon/security/meeting_room)
 "nZd" = (
 /obj/machinery/atmospherics/unary/vent_pump/on{
 	dir = 4
@@ -17296,8 +17334,11 @@
 	dir = 2;
 	icon_state = "pipe-j2"
 	},
+/obj/structure/cable/green{
+	icon_state = "2-4"
+	},
 /turf/simulated/floor/tiled,
-/area/security/investigations)
+/area/horizon/security/investigations_hallway)
 "oez" = (
 /obj/structure/cable/green{
 	icon_state = "1-2"
@@ -17308,10 +17349,10 @@
 /obj/effect/floor_decal/corner/blue/full,
 /obj/structure/disposalpipe/segment,
 /turf/simulated/floor/tiled,
-/area/security/investigations)
+/area/horizon/security/investigations_hallway)
 "ofl" = (
 /turf/simulated/wall/r_wall,
-/area/security/investigations)
+/area/horizon/security/interrogation)
 "ofx" = (
 /obj/machinery/door/firedoor,
 /obj/machinery/door/blast/shutters/open{
@@ -17495,8 +17536,11 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
 /turf/simulated/floor/tiled/dark,
-/area/security/investigations)
+/area/horizon/security/interrogation/monitoring)
 "okz" = (
 /obj/effect/floor_decal/corner/green/diagonal,
 /obj/structure/table/standard,
@@ -17552,6 +17596,9 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/bridge/controlroom)
+"onk" = (
+/turf/simulated/wall,
+/area/horizon/security/forensic_laboratory)
 "onR" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
@@ -17590,6 +17637,20 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/horizon/crew_quarters/fitness/hallway)
+"ooy" = (
+/obj/structure/grille,
+/obj/machinery/door/firedoor,
+/obj/machinery/door/blast/regular{
+	density = 0;
+	icon_state = "pdoor0";
+	id = "Security Lockdown";
+	name = "Security Blast Door";
+	opacity = 0;
+	dir = 4
+	},
+/obj/structure/window/shuttle/scc_space_ship/cardinal,
+/turf/simulated/floor/plating,
+/area/horizon/security/firing_range)
 "ooA" = (
 /obj/structure/cable/green{
 	icon_state = "0-4"
@@ -17723,7 +17784,7 @@
 	},
 /obj/effect/floor_decal/industrial/outline/security,
 /turf/simulated/floor/tiled/white,
-/area/security/forensics_morgue)
+/area/horizon/security/forensic_laboratory)
 "otI" = (
 /obj/effect/floor_decal/industrial/warning{
 	dir = 8
@@ -18123,6 +18184,9 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /turf/simulated/floor/tiled/white,
 /area/medical/washroom)
+"oIR" = (
+/turf/simulated/wall/shuttle/scc_space_ship/cardinal,
+/area/horizon/security/meeting_room)
 "oIT" = (
 /obj/machinery/door/window/eastright{
 	dir = 1
@@ -18189,7 +18253,7 @@
 	dir = 6
 	},
 /turf/simulated/floor/tiled,
-/area/security/investigations)
+/area/horizon/security/investigations_hallway)
 "oLk" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -18236,7 +18300,7 @@
 	},
 /obj/structure/flora/pottedplant/random,
 /turf/simulated/floor/tiled,
-/area/security/investigations)
+/area/horizon/security/investigations_hallway)
 "oMk" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -18448,8 +18512,11 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
 /turf/simulated/floor/tiled,
-/area/security/investigations)
+/area/horizon/security/investigations_hallway)
 "oUF" = (
 /obj/effect/floor_decal/corner/green{
 	dir = 6
@@ -18528,7 +18595,7 @@
 	dir = 8
 	},
 /turf/simulated/floor/tiled/white,
-/area/security/forensics_morgue)
+/area/horizon/security/autopsy_laboratory)
 "oWU" = (
 /obj/machinery/door/window/westright{
 	name = "Firing Range Access"
@@ -18542,7 +18609,7 @@
 	},
 /obj/structure/railing/mapped,
 /turf/simulated/floor/tiled/dark,
-/area/security/investigations)
+/area/horizon/security/firing_range)
 "oWZ" = (
 /obj/machinery/camera/network/third_deck{
 	c_tag = "Third Deck - Investigator Entrance";
@@ -18636,7 +18703,7 @@
 /area/journalistoffice)
 "pbx" = (
 /turf/simulated/wall/shuttle/scc_space_ship/cardinal,
-/area/security/vacantoffice2)
+/area/horizon/security/firing_range)
 "pbJ" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -18710,7 +18777,7 @@
 /obj/effect/floor_decal/corner/beige/diagonal,
 /obj/machinery/atmospherics/unary/vent_scrubber/on,
 /turf/simulated/floor/tiled/white,
-/area/security/forensics_morgue)
+/area/horizon/security/forensic_laboratory)
 "pfL" = (
 /obj/machinery/door/window{
 	dir = 1
@@ -18825,7 +18892,7 @@
 /obj/structure/table/wood,
 /obj/effect/floor_decal/spline/fancy/wood,
 /turf/simulated/floor/wood,
-/area/security/vacantoffice2)
+/area/horizon/security/meeting_room)
 "pmx" = (
 /obj/effect/floor_decal/industrial/warning/corner{
 	dir = 4
@@ -18860,7 +18927,7 @@
 	pixel_y = 18
 	},
 /turf/simulated/floor/tiled/dark,
-/area/security/investigations_storage)
+/area/horizon/security/evidence_storage)
 "pnL" = (
 /obj/structure/window/shuttle/scc_space_ship,
 /obj/structure/grille,
@@ -18915,6 +18982,9 @@
 /obj/machinery/door/firedoor,
 /turf/simulated/floor/tiled/full,
 /area/maintenance/security_starboard)
+"poL" = (
+/turf/simulated/wall/r_wall,
+/area/horizon/security/forensic_laboratory)
 "poW" = (
 /obj/structure/grille,
 /obj/structure/window/shuttle/scc_space_ship,
@@ -18962,9 +19032,12 @@
 	dir = 6
 	},
 /obj/machinery/papershredder,
-/obj/effect/floor_decal/industrial/outline/yellow,
+/obj/effect/floor_decal/industrial/outline/grey,
 /turf/simulated/floor/tiled,
-/area/security/investigations)
+/area/horizon/security/investigations_hallway)
+"psg" = (
+/turf/simulated/wall/r_wall,
+/area/horizon/security/firing_range)
 "ptB" = (
 /obj/structure/railing/mapped{
 	dir = 4
@@ -18994,9 +19067,6 @@
 	},
 /turf/simulated/floor/grass/alt,
 /area/horizon/hallway/deck_three/primary/central)
-"ptT" = (
-/turf/simulated/floor/tiled/dark,
-/area/security/investigations_storage)
 "pvq" = (
 /obj/structure/railing/mapped{
 	dir = 8
@@ -19061,7 +19131,7 @@
 	pixel_y = -9
 	},
 /turf/simulated/floor/tiled/dark,
-/area/security/investigations_storage)
+/area/horizon/security/evidence_storage)
 "pyE" = (
 /obj/machinery/newscaster{
 	pixel_y = 32
@@ -19353,7 +19423,7 @@
 	pixel_y = -32
 	},
 /turf/simulated/floor/tiled/dark/full,
-/area/security/investigations)
+/area/horizon/security/firing_range)
 "pRV" = (
 /turf/simulated/floor/tiled/full,
 /area/horizon/hallway/deck_three/primary/port)
@@ -19445,7 +19515,7 @@
 	opacity = 0
 	},
 /turf/simulated/floor/tiled/dark/full,
-/area/security/investigations)
+/area/horizon/security/investigations_hallway)
 "pTP" = (
 /obj/effect/floor_decal/corner/paleblue{
 	dir = 5
@@ -19467,7 +19537,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/tiled,
-/area/security/investigations)
+/area/horizon/security/investigations_hallway)
 "pUC" = (
 /obj/machinery/telecomms/processor/preset_two,
 /turf/simulated/floor/bluegrid,
@@ -19500,7 +19570,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/tiled,
-/area/security/investigations)
+/area/horizon/security/investigations_hallway)
 "pWW" = (
 /obj/effect/floor_decal/corner/blue{
 	dir = 5
@@ -19515,7 +19585,7 @@
 	pixel_y = 2
 	},
 /turf/simulated/floor/tiled/white,
-/area/security/forensics_morgue)
+/area/horizon/security/autopsy_laboratory)
 "pXu" = (
 /turf/simulated/floor/tiled/dark,
 /area/horizon/crew_quarters/fitness/hallway)
@@ -19674,7 +19744,7 @@
 	icon_state = "1-2"
 	},
 /turf/simulated/floor/tiled/white,
-/area/security/forensics_morgue)
+/area/horizon/security/forensic_laboratory)
 "qdg" = (
 /obj/structure/table/wood,
 /obj/item/folder/blue,
@@ -19692,7 +19762,7 @@
 	name = "Investigator"
 	},
 /turf/simulated/floor/tiled/dark,
-/area/security/vacantoffice2)
+/area/horizon/security/meeting_room)
 "qeu" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
@@ -19802,7 +19872,7 @@
 	dir = 5
 	},
 /turf/simulated/floor/tiled/white,
-/area/security/forensics_morgue)
+/area/horizon/security/forensic_laboratory)
 "qjr" = (
 /obj/structure/table/wood,
 /obj/machinery/button/switch/windowtint{
@@ -19979,9 +20049,7 @@
 	dir = 8
 	},
 /turf/simulated/floor/carpet,
-/area/security/forensics_office{
-	name = "Security - Investigations Office"
-	})
+/area/horizon/security/investigators_office)
 "qom" = (
 /obj/machinery/door/firedoor,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -20141,11 +20209,11 @@
 /turf/simulated/open,
 /area/hallway/medical/upper)
 "qvo" = (
+/obj/machinery/door/firedoor,
 /obj/machinery/door/airlock/security{
-	name = "Investigations Office";
+	name = "Investigators' Office";
 	req_access = list(4)
 	},
-/obj/machinery/door/firedoor,
 /obj/machinery/door/blast/regular{
 	density = 0;
 	dir = 8;
@@ -20155,9 +20223,7 @@
 	opacity = 0
 	},
 /turf/simulated/floor/tiled/full,
-/area/security/forensics_office{
-	name = "Security - Investigations Office"
-	})
+/area/horizon/security/investigators_office)
 "qvX" = (
 /obj/structure/disposalpipe/segment,
 /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
@@ -20264,7 +20330,7 @@
 	pixel_y = 4
 	},
 /turf/simulated/floor/tiled/dark,
-/area/security/investigations)
+/area/horizon/security/firing_range)
 "qzn" = (
 /obj/machinery/disposal/small/north{
 	pixel_y = -17
@@ -20293,6 +20359,9 @@
 	},
 /turf/simulated/floor/plating,
 /area/maintenance/security_starboard)
+"qAq" = (
+/turf/simulated/wall/shuttle/scc_space_ship/cardinal,
+/area/horizon/security/forensic_laboratory)
 "qBz" = (
 /obj/effect/floor_decal/corner/green{
 	dir = 9
@@ -20309,7 +20378,7 @@
 /obj/effect/floor_decal/corner/beige/diagonal,
 /obj/structure/bed/stool/chair/office/dark,
 /turf/simulated/floor/tiled/white,
-/area/security/forensics_morgue)
+/area/horizon/security/forensic_laboratory)
 "qBS" = (
 /turf/simulated/wall/shuttle/scc_space_ship/cardinal,
 /area/crew_quarters/captain)
@@ -20422,7 +20491,7 @@
 	},
 /obj/effect/floor_decal/industrial/outline/grey,
 /turf/simulated/floor/tiled/dark,
-/area/security/investigations_storage)
+/area/horizon/security/evidence_storage)
 "qIw" = (
 /obj/effect/floor_decal/spline/plain{
 	dir = 8
@@ -20461,7 +20530,7 @@
 	pixel_x = -20
 	},
 /turf/simulated/floor/tiled/white,
-/area/security/forensics_morgue)
+/area/horizon/security/autopsy_laboratory)
 "qJd" = (
 /obj/structure/railing/mapped{
 	dir = 1
@@ -20573,7 +20642,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/tiled/dark/full,
-/area/security/investigations)
+/area/horizon/security/firing_range)
 "qNr" = (
 /obj/structure/table/wood,
 /obj/item/material/ashtray/bronze{
@@ -20696,9 +20765,7 @@
 /obj/machinery/firealarm/north,
 /obj/machinery/atmospherics/unary/vent_pump/on,
 /turf/simulated/floor/lino/grey,
-/area/security/forensics_office{
-	name = "Security - Investigations Office"
-	})
+/area/horizon/security/investigators_office)
 "qUP" = (
 /obj/effect/floor_decal/corner/green/diagonal{
 	dir = 8
@@ -20850,7 +20917,7 @@
 	},
 /obj/structure/window/shuttle/scc_space_ship/cardinal,
 /turf/simulated/floor/plating,
-/area/security/vacantoffice2)
+/area/horizon/security/meeting_room)
 "rdz" = (
 /obj/machinery/door/airlock/maintenance{
 	req_access = null;
@@ -20909,7 +20976,7 @@
 	},
 /obj/structure/flora/pottedplant/random,
 /turf/simulated/floor/tiled,
-/area/security/investigations)
+/area/horizon/security/investigations_hallway)
 "rgZ" = (
 /obj/structure/foamedmetal,
 /turf/simulated/floor,
@@ -20938,7 +21005,7 @@
 	pixel_y = 2
 	},
 /turf/simulated/floor/wood,
-/area/security/vacantoffice2)
+/area/horizon/security/meeting_room)
 "riW" = (
 /turf/simulated/wall/shuttle/scc_space_ship/cardinal,
 /area/turret_protected/ai)
@@ -21672,7 +21739,7 @@
 	pixel_x = -32
 	},
 /turf/simulated/floor/tiled,
-/area/security/investigations)
+/area/horizon/security/investigations_hallway)
 "rLM" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
@@ -21705,8 +21772,11 @@
 /turf/simulated/floor/tiled,
 /area/bridge/bridge_crew)
 "rLV" = (
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+	dir = 8
+	},
 /turf/simulated/floor/tiled/dark,
-/area/security/investigations)
+/area/horizon/security/firing_range)
 "rMS" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 9
@@ -21826,6 +21896,9 @@
 	},
 /turf/simulated/open,
 /area/maintenance/engineering_ladder)
+"rQb" = (
+/turf/simulated/wall/r_wall,
+/area/horizon/security/interrogation/monitoring)
 "rQz" = (
 /obj/structure/bed/stool/chair/padded/brown{
 	dir = 4
@@ -22000,7 +22073,10 @@
 	},
 /obj/effect/floor_decal/industrial/outline/security,
 /turf/simulated/floor/tiled/white,
-/area/security/forensics_morgue)
+/area/horizon/security/autopsy_laboratory)
+"rXu" = (
+/turf/simulated/wall/r_wall,
+/area/horizon/security/evidence_storage)
 "rXN" = (
 /obj/effect/floor_decal/corner/blue{
 	dir = 5
@@ -22152,7 +22228,7 @@
 	name = "evidence storage locker A"
 	},
 /turf/simulated/floor/tiled/dark,
-/area/security/investigations_storage)
+/area/horizon/security/evidence_storage)
 "sdc" = (
 /obj/machinery/telecomms/hub/preset,
 /turf/simulated/floor/bluegrid,
@@ -22226,7 +22302,7 @@
 	id = "sec_autopsy"
 	},
 /turf/simulated/floor/tiled/dark/full,
-/area/security/forensics_morgue)
+/area/horizon/security/forensic_laboratory)
 "sfS" = (
 /obj/machinery/power/breakerbox/activated{
 	RCon_tag = "Deck 3 Command Substation"
@@ -22631,9 +22707,7 @@
 "ssl" = (
 /obj/item/modular_computer/console/preset/security/investigations,
 /turf/simulated/floor/carpet,
-/area/security/forensics_office{
-	name = "Security - Investigations Office"
-	})
+/area/horizon/security/investigators_office)
 "sso" = (
 /obj/machinery/light{
 	dir = 8
@@ -22821,7 +22895,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/tiled,
-/area/security/investigations)
+/area/horizon/security/investigations_hallway)
 "syd" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -22978,7 +23052,7 @@
 	pixel_y = 4
 	},
 /turf/simulated/floor/tiled,
-/area/security/investigations)
+/area/horizon/security/investigations_hallway)
 "sGQ" = (
 /obj/effect/floor_decal/corner/blue/full,
 /obj/structure/table/standard,
@@ -23009,7 +23083,7 @@
 	pixel_y = 8
 	},
 /turf/simulated/floor/tiled/dark,
-/area/security/vacantoffice2)
+/area/horizon/security/meeting_room)
 "sHy" = (
 /obj/effect/floor_decal/corner/green/full{
 	dir = 4
@@ -23069,9 +23143,7 @@
 	},
 /obj/effect/floor_decal/industrial/outline/security,
 /turf/simulated/floor/lino/grey,
-/area/security/forensics_office{
-	name = "Security - Investigations Office"
-	})
+/area/horizon/security/investigators_office)
 "sHU" = (
 /obj/machinery/firealarm/south,
 /obj/machinery/door/firedoor,
@@ -23147,7 +23219,7 @@
 	},
 /obj/structure/banner/scc,
 /turf/simulated/floor/wood,
-/area/security/vacantoffice2)
+/area/horizon/security/meeting_room)
 "sLD" = (
 /obj/structure/bed/stool/chair/padded/brown{
 	dir = 4
@@ -23208,7 +23280,7 @@
 	name = "Investigator"
 	},
 /turf/simulated/floor/tiled/dark,
-/area/security/vacantoffice2)
+/area/horizon/security/meeting_room)
 "sNZ" = (
 /obj/effect/floor_decal/corner/paleblue{
 	dir = 5
@@ -23480,9 +23552,7 @@
 /obj/machinery/atmospherics/unary/vent_scrubber/on,
 /obj/structure/disposalpipe/trunk,
 /turf/simulated/floor/lino/grey,
-/area/security/forensics_office{
-	name = "Security - Investigations Office"
-	})
+/area/horizon/security/investigators_office)
 "taR" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -23505,7 +23575,7 @@
 	icon_state = "4-8"
 	},
 /turf/simulated/floor/tiled/dark,
-/area/security/investigations_storage)
+/area/horizon/security/evidence_storage)
 "tcA" = (
 /obj/structure/table/wood,
 /obj/effect/floor_decal/spline/fancy/wood,
@@ -23778,7 +23848,7 @@
 	pixel_x = 24
 	},
 /turf/simulated/floor/tiled/dark,
-/area/security/investigations_storage)
+/area/horizon/security/evidence_storage)
 "tni" = (
 /obj/effect/floor_decal/corner/blue/full{
 	dir = 4
@@ -23791,7 +23861,7 @@
 	pixel_y = 11
 	},
 /turf/simulated/floor/tiled/dark,
-/area/security/vacantoffice2)
+/area/horizon/security/meeting_room)
 "tnA" = (
 /obj/machinery/power/apc/low{
 	dir = 1;
@@ -24009,8 +24079,11 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
 /turf/simulated/floor/tiled/full,
-/area/security/forensics_morgue)
+/area/horizon/security/forensic_laboratory)
 "tuB" = (
 /turf/simulated/floor/wood,
 /area/crew_quarters/lounge/secondary)
@@ -24071,12 +24144,12 @@
 	dir = 4
 	},
 /turf/simulated/floor/tiled,
-/area/security/investigations)
+/area/horizon/security/investigations_hallway)
 "twp" = (
 /obj/effect/floor_decal/corner/beige/diagonal,
 /obj/machinery/atmospherics/unary/vent_pump/on,
 /turf/simulated/floor/tiled/white,
-/area/security/forensics_morgue)
+/area/horizon/security/forensic_laboratory)
 "twu" = (
 /obj/machinery/power/apc{
 	dir = 1;
@@ -24088,9 +24161,7 @@
 	},
 /obj/effect/floor_decal/industrial/outline/security,
 /turf/simulated/floor/lino/grey,
-/area/security/forensics_office{
-	name = "Security - Investigations Office"
-	})
+/area/horizon/security/investigators_office)
 "txh" = (
 /obj/structure/disposalpipe/segment{
 	dir = 8;
@@ -24172,8 +24243,11 @@
 /obj/effect/floor_decal/corner/blue{
 	dir = 5
 	},
+/obj/machinery/atmospherics/unary/vent_pump/on{
+	dir = 4
+	},
 /turf/simulated/floor/tiled/dark,
-/area/security/investigations)
+/area/horizon/security/interrogation/monitoring)
 "tBj" = (
 /obj/structure/cable/green{
 	icon_state = "1-2"
@@ -24393,7 +24467,7 @@
 	pixel_y = 14
 	},
 /turf/simulated/floor/tiled/white,
-/area/security/forensics_morgue)
+/area/horizon/security/autopsy_laboratory)
 "tIR" = (
 /obj/structure/cable/green{
 	icon_state = "4-8"
@@ -24691,7 +24765,7 @@
 	pixel_y = -2
 	},
 /turf/simulated/floor/tiled/white,
-/area/security/forensics_morgue)
+/area/horizon/security/forensic_laboratory)
 "tVB" = (
 /obj/structure/bed/stool/chair/padded/brown{
 	dir = 8
@@ -24875,7 +24949,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/tiled/dark,
-/area/security/vacantoffice2)
+/area/horizon/security/meeting_room)
 "tZR" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
@@ -24887,7 +24961,7 @@
 	icon_state = "4-8"
 	},
 /turf/simulated/floor/tiled/white,
-/area/security/forensics_morgue)
+/area/horizon/security/forensic_laboratory)
 "tZY" = (
 /obj/effect/floor_decal/corner/blue/diagonal,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -24962,6 +25036,19 @@
 /obj/item/storage/firstaid/regular,
 /turf/simulated/floor/tiled/dark,
 /area/bridge/aibunker)
+"udU" = (
+/obj/structure/grille,
+/obj/machinery/door/blast/regular{
+	density = 0;
+	icon_state = "pdoor0";
+	id = "Security Lockdown";
+	name = "Security Blast Door";
+	opacity = 0
+	},
+/obj/machinery/door/firedoor,
+/obj/structure/window/shuttle/scc_space_ship/cardinal,
+/turf/simulated/floor/plating,
+/area/horizon/security/meeting_room)
 "udZ" = (
 /obj/structure/table/wood,
 /obj/effect/floor_decal/spline/fancy/wood{
@@ -24991,7 +25078,7 @@
 	},
 /obj/item/device/hand_labeler,
 /turf/simulated/floor/tiled/white,
-/area/security/forensics_morgue)
+/area/horizon/security/forensic_laboratory)
 "uei" = (
 /obj/effect/floor_decal/corner/red{
 	dir = 6
@@ -25181,8 +25268,11 @@
 	dir = 5
 	},
 /obj/machinery/firealarm/south,
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
 /turf/simulated/floor/tiled/dark,
-/area/security/investigations)
+/area/horizon/security/interrogation)
 "uow" = (
 /obj/effect/floor_decal/spline/plain/cee,
 /turf/simulated/floor/carpet/rubber,
@@ -25260,7 +25350,7 @@
 	dir = 5
 	},
 /turf/simulated/floor/tiled/white,
-/area/security/forensics_morgue)
+/area/horizon/security/forensic_laboratory)
 "uri" = (
 /obj/machinery/door/airlock/multi_tile/glass{
 	name = "Deck 3 Central Stairwell"
@@ -25474,7 +25564,7 @@
 	icon_state = "0-4"
 	},
 /turf/simulated/floor/tiled/dark,
-/area/security/investigations_storage)
+/area/horizon/security/evidence_storage)
 "uBQ" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -25549,7 +25639,7 @@
 	icon_state = "1-8"
 	},
 /turf/simulated/floor/tiled/dark,
-/area/security/vacantoffice2)
+/area/horizon/security/meeting_room)
 "uCC" = (
 /obj/structure/table/steel,
 /obj/item/stock_parts/subspace/ansible,
@@ -25652,7 +25742,7 @@
 	icon_state = "4-8"
 	},
 /turf/simulated/floor/tiled/dark,
-/area/security/investigations_storage)
+/area/horizon/security/evidence_storage)
 "uIm" = (
 /turf/simulated/floor/marble/dark,
 /area/bridge/minibar)
@@ -25759,7 +25849,7 @@
 	},
 /obj/effect/floor_decal/industrial/outline/yellow,
 /turf/simulated/floor/tiled,
-/area/security/investigations)
+/area/horizon/security/investigations_hallway)
 "uMv" = (
 /obj/structure/bed/stool/chair/padded/brown{
 	dir = 8
@@ -25777,9 +25867,9 @@
 	dir = 6
 	},
 /obj/machinery/photocopier,
-/obj/effect/floor_decal/industrial/outline/yellow,
+/obj/effect/floor_decal/industrial/outline/grey,
 /turf/simulated/floor/tiled,
-/area/security/investigations)
+/area/horizon/security/investigations_hallway)
 "uMW" = (
 /obj/structure/bed/stool/chair/office/dark{
 	dir = 1
@@ -26232,7 +26322,7 @@
 /area/bridge/controlroom)
 "vcX" = (
 /obj/machinery/door/airlock/security{
-	name = "Investigations Office";
+	name = "Investigators' Office";
 	req_access = list(4)
 	},
 /obj/machinery/door/firedoor,
@@ -26249,9 +26339,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/tiled/full,
-/area/security/forensics_office{
-	name = "Security - Investigations Office"
-	})
+/area/horizon/security/investigators_office)
 "vdC" = (
 /obj/machinery/door/airlock/hatch{
 	name = "Telecommunications - Control Room";
@@ -26291,9 +26379,6 @@
 	},
 /turf/simulated/floor/wood,
 /area/crew_quarters/lounge/secondary)
-"vel" = (
-/turf/simulated/wall/r_wall,
-/area/security/forensics_morgue)
 "vfg" = (
 /obj/structure/flora/pottedplant{
 	icon_state = "plant-33"
@@ -26590,9 +26675,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/lino/grey,
-/area/security/forensics_office{
-	name = "Security - Investigations Office"
-	})
+/area/horizon/security/investigators_office)
 "vrL" = (
 /obj/structure/flora/ausbushes/pointybush,
 /turf/simulated/floor/grass/alt,
@@ -26869,11 +26952,11 @@
 /turf/simulated/floor,
 /area/crew_quarters/captain)
 "vzX" = (
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
+/obj/machinery/atmospherics/unary/vent_pump/on{
 	dir = 8
 	},
 /turf/simulated/floor/tiled/dark,
-/area/security/investigations)
+/area/horizon/security/firing_range)
 "vBl" = (
 /obj/machinery/atmospherics/unary/vent_pump/on{
 	dir = 4
@@ -26953,7 +27036,7 @@
 	name = "Security Officer"
 	},
 /turf/simulated/floor/tiled/dark,
-/area/security/vacantoffice2)
+/area/horizon/security/meeting_room)
 "vEP" = (
 /obj/effect/floor_decal/sign/c{
 	pixel_x = -10;
@@ -27368,7 +27451,7 @@
 	},
 /obj/structure/bed/stool/chair/office/bridge/generic,
 /turf/simulated/floor/wood,
-/area/security/vacantoffice2)
+/area/horizon/security/meeting_room)
 "vTJ" = (
 /obj/effect/floor_decal/spline/fancy/wood{
 	dir = 6
@@ -27533,10 +27616,6 @@
 /obj/structure/window/shuttle/scc_space_ship/cardinal,
 /turf/simulated/floor/plating,
 /area/bridge/minibar)
-"wbi" = (
-/obj/effect/map_effect/window_spawner/full/reinforced/firedoor,
-/turf/simulated/floor/tiled/dark/full,
-/area/security/vacantoffice2)
 "wbp" = (
 /obj/machinery/light{
 	dir = 1
@@ -27552,7 +27631,7 @@
 	dir = 8
 	},
 /turf/simulated/floor/wood,
-/area/security/vacantoffice2)
+/area/horizon/security/meeting_room)
 "wbQ" = (
 /obj/structure/sink{
 	dir = 4;
@@ -27695,11 +27774,6 @@
 	},
 /turf/simulated/floor/tiled,
 /area/bridge/controlroom)
-"whK" = (
-/turf/simulated/wall,
-/area/security/forensics_office{
-	name = "Security - Investigations Office"
-	})
 "wim" = (
 /obj/machinery/firealarm/south,
 /obj/effect/floor_decal/corner/lime/diagonal,
@@ -27846,7 +27920,7 @@
 "woR" = (
 /obj/effect/floor_decal/corner/blue/diagonal,
 /turf/simulated/floor/tiled/white,
-/area/security/forensics_morgue)
+/area/horizon/security/autopsy_laboratory)
 "woS" = (
 /obj/item/modular_computer/console/preset/command/account,
 /obj/machinery/requests_console{
@@ -27986,7 +28060,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/tiled/full,
-/area/security/investigations_storage)
+/area/horizon/security/evidence_storage)
 "wtU" = (
 /obj/effect/floor_decal/corner/blue{
 	dir = 9
@@ -28255,7 +28329,7 @@
 	icon_state = "4-8"
 	},
 /turf/simulated/floor/tiled/white,
-/area/security/forensics_morgue)
+/area/horizon/security/forensic_laboratory)
 "wJm" = (
 /obj/machinery/door/firedoor/multi_tile{
 	dir = 2
@@ -28525,7 +28599,7 @@
 	},
 /obj/effect/floor_decal/industrial/outline/security,
 /turf/simulated/floor/tiled/white,
-/area/security/forensics_morgue)
+/area/horizon/security/autopsy_laboratory)
 "wTy" = (
 /obj/effect/floor_decal/corner/blue{
 	dir = 6
@@ -28701,8 +28775,11 @@
 /obj/structure/cable/green{
 	icon_state = "2-8"
 	},
+/obj/structure/cable/green{
+	icon_state = "2-4"
+	},
 /turf/simulated/floor/tiled/white,
-/area/security/forensics_morgue)
+/area/horizon/security/forensic_laboratory)
 "wWX" = (
 /obj/structure/railing/mapped{
 	dir = 8
@@ -28745,7 +28822,7 @@
 	dir = 8
 	},
 /turf/simulated/floor/tiled/dark,
-/area/security/investigations)
+/area/horizon/security/interrogation/monitoring)
 "wYX" = (
 /obj/machinery/newscaster{
 	pixel_y = -32
@@ -28912,7 +28989,7 @@
 	pixel_y = 24
 	},
 /turf/simulated/floor/tiled/dark,
-/area/security/investigations)
+/area/horizon/security/firing_range)
 "xii" = (
 /obj/structure/filingcabinet/filingcabinet{
 	pixel_x = -9;
@@ -28999,22 +29076,26 @@
 /obj/item/storage/box/fancy/tray/autopsy,
 /obj/structure/table/glass,
 /turf/simulated/floor/tiled/white,
-/area/security/forensics_morgue)
+/area/horizon/security/autopsy_laboratory)
 "xkD" = (
-/obj/machinery/alarm{
-	pixel_y = 28
-	},
 /obj/effect/floor_decal/corner/blue{
 	dir = 5
 	},
-/obj/machinery/atmospherics/unary/vent_pump/on{
-	dir = 4
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
 	},
+/obj/machinery/power/apc{
+	dir = 1;
+	pixel_y = 24
+	},
+/obj/structure/cable/green{
+	icon_state = "0-4"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
 /turf/simulated/floor/tiled/dark,
-/area/security/investigations)
+/area/horizon/security/interrogation/monitoring)
 "xkL" = (
 /obj/structure/table/standard,
 /obj/effect/floor_decal/corner/beige{
@@ -29169,7 +29250,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/tiled/dark/full,
-/area/security/investigations)
+/area/horizon/security/firing_range)
 "xrV" = (
 /obj/structure/flora/pottedplant/random,
 /obj/effect/floor_decal/corner/green/full{
@@ -29241,7 +29322,7 @@
 	dir = 10
 	},
 /turf/simulated/floor/tiled/dark,
-/area/security/investigations)
+/area/horizon/security/interrogation/monitoring)
 "xuB" = (
 /obj/machinery/vending/coffee,
 /obj/effect/floor_decal/corner/green{
@@ -29297,7 +29378,7 @@
 	dir = 8
 	},
 /turf/simulated/open,
-/area/security/investigations)
+/area/horizon/security/investigations_hallway)
 "xwA" = (
 /obj/structure/table/wood,
 /obj/effect/floor_decal/spline/fancy/wood{
@@ -29421,7 +29502,7 @@
 /obj/machinery/microscope,
 /obj/effect/floor_decal/corner/beige/diagonal,
 /turf/simulated/floor/tiled/white,
-/area/security/forensics_morgue)
+/area/horizon/security/forensic_laboratory)
 "xDg" = (
 /obj/machinery/door/airlock/security{
 	name = "Interrogation";
@@ -29433,8 +29514,11 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
+/obj/structure/cable/green{
+	icon_state = "4-8"
+	},
 /turf/simulated/floor/tiled/full,
-/area/security/investigations)
+/area/horizon/security/interrogation)
 "xDz" = (
 /obj/structure/cable/green{
 	icon_state = "4-8"
@@ -29480,7 +29564,7 @@
 	},
 /obj/effect/floor_decal/corner/blue/full,
 /turf/simulated/floor/tiled/dark,
-/area/security/investigations)
+/area/horizon/security/interrogation/monitoring)
 "xEZ" = (
 /obj/machinery/status_display{
 	pixel_y = -32
@@ -29526,7 +29610,7 @@
 "xGF" = (
 /obj/effect/map_effect/window_spawner/full/reinforced/firedoor,
 /turf/simulated/floor/tiled/dark/full,
-/area/security/investigations)
+/area/horizon/security/meeting_room)
 "xHL" = (
 /obj/structure/bed/stool/chair/office/dark{
 	dir = 1
@@ -29581,7 +29665,7 @@
 	pixel_y = -32
 	},
 /turf/simulated/floor/tiled/dark,
-/area/security/vacantoffice2)
+/area/horizon/security/meeting_room)
 "xJx" = (
 /turf/simulated/wall/r_wall,
 /area/engineering/break_room)
@@ -29601,7 +29685,7 @@
 	dir = 10
 	},
 /turf/simulated/floor/tiled/dark,
-/area/security/investigations)
+/area/horizon/security/interrogation/monitoring)
 "xJU" = (
 /obj/machinery/atmospherics/pipe/manifold/hidden/supply{
 	dir = 1
@@ -29664,7 +29748,7 @@
 	dir = 5
 	},
 /turf/simulated/floor/tiled/white,
-/area/security/forensics_morgue)
+/area/horizon/security/forensic_laboratory)
 "xMZ" = (
 /obj/machinery/embedded_controller/radio/airlock/docking_port{
 	frequency = 1337;
@@ -29740,7 +29824,7 @@
 	dir = 8
 	},
 /turf/simulated/floor/tiled/dark,
-/area/security/vacantoffice2)
+/area/horizon/security/meeting_room)
 "xPy" = (
 /obj/machinery/alarm{
 	dir = 1;
@@ -29837,7 +29921,7 @@
 	dir = 6
 	},
 /turf/simulated/floor/tiled/dark,
-/area/security/vacantoffice2)
+/area/horizon/security/meeting_room)
 "xVe" = (
 /obj/machinery/atmospherics/unary/vent_scrubber/on,
 /turf/simulated/floor/tiled/white,
@@ -54724,10 +54808,10 @@ apJ
 mbV
 qgA
 bXZ
-ofl
-ofl
-ofl
-ofl
+rQb
+rQb
+rQb
+rQb
 uxr
 eDu
 qzF
@@ -54917,28 +55001,28 @@ ejB
 ejB
 ejB
 ejB
-vel
-vel
-hSz
-hSz
-hSz
-hSz
-hSz
-hSz
+poL
+poL
+rXu
+rXu
+rXu
+rXu
+rXu
+rXu
 mSp
-ofl
+rQb
 wYq
 xEn
+rQb
 ofl
 ofl
-ofl
-bYd
-bYd
+ahB
+ahB
 bUo
 qvo
 bUo
 bUo
-bYd
+ahB
 uly
 pAs
 sgG
@@ -55116,31 +55200,31 @@ wpA
 wpA
 wpA
 wpA
-iKp
+qAq
 aYc
 tVk
 gsW
 mba
-gdW
+kNc
 dnw
 lNA
 uBO
 gGN
-hSz
+rXu
 bXZ
-ofl
+rQb
 tAY
 iji
-ioQ
+klQ
 mEf
 hmC
-whK
+dNi
 taN
 blU
 iAY
 iAY
 nIt
-bYd
+ahB
 jEj
 dQu
 oWu
@@ -55323,19 +55407,19 @@ otG
 qBM
 pem
 gId
-gdW
+kNc
 qIl
-ptT
+lsm
 tbQ
 nWA
-hSz
+rXu
 bXZ
-ofl
+rQb
 kcr
-xJP
+mLe
 bFG
 cJn
-aYQ
+ngK
 bsd
 iAY
 eJV
@@ -55526,19 +55610,19 @@ lPI
 ciK
 eVT
 hxQ
-ePK
-ptT
+iwr
+lsm
 kJE
 scO
-hSz
+rXu
 gJb
-ofl
+rQb
 ipk
 xus
 bFG
 faY
 lIN
-whK
+dNi
 qUG
 moB
 cuP
@@ -55727,20 +55811,20 @@ qjb
 izu
 xBf
 wIM
-gdW
+kNc
 pna
 jmE
 djr
 cSh
-hSz
+rXu
 bXZ
-ofl
+rQb
 xkD
 xJP
 bFG
 jES
 aYQ
-whK
+dNi
 twu
 vrD
 nQz
@@ -55924,31 +56008,31 @@ riW
 riW
 cPq
 cPq
-iKp
+qAq
 jlB
 iHg
 hco
 dLt
-gdW
+kNc
 tmU
 pxn
 uHS
 mbJ
-hSz
+rXu
 bXZ
-ofl
+rQb
 ojX
 nne
-ioQ
+klQ
 ksm
 uoc
-whK
+dNi
 sHO
 nfn
 iAY
 mwz
 ktq
-bYd
+ahB
 hDq
 dQu
 oWu
@@ -56131,26 +56215,26 @@ xMj
 eFn
 gaw
 bVX
-gdW
-gdW
-gdW
+kNc
+kNc
+kNc
 wtM
-gdW
-hSz
+kNc
+rXu
 nkF
-ofl
+rQb
 fRO
 bFG
-ioQ
-bFG
+klQ
+csh
 xDg
-whK
-whK
+dNi
+dNi
 vcX
 cMn
-whK
-whK
-bYd
+dNi
+dNi
+ahB
 kUf
 dQu
 fFv
@@ -56334,7 +56418,7 @@ hco
 hco
 tZR
 kso
-eev
+onk
 rgp
 bia
 dlM
@@ -56732,13 +56816,13 @@ riW
 riW
 cPq
 cPq
-iKp
+qAq
 bLO
 uea
 mpk
 aGG
 dfc
-eev
+onk
 aRS
 emE
 kTT
@@ -56934,31 +57018,31 @@ riW
 riW
 cPq
 cPq
-iKp
+qAq
 sfq
 sfq
-eev
+onk
 tty
-ioQ
-ioQ
-xGF
+onk
+onk
+ecg
 dUp
+ecg
+lnI
+xGF
 xGF
-ioQ
-wbi
-wbi
 aQk
-fUR
-wbi
-wbi
-fUR
-ofl
-ofl
+lnI
+xGF
+xGF
+lnI
+nSp
+nSp
 jJs
-ofl
-ofl
-ofl
-ofl
+nSp
+nSp
+nSp
+nSp
 bRc
 aXo
 fNC
@@ -57136,7 +57220,7 @@ riW
 riW
 cPq
 cPq
-iKp
+gTG
 tIL
 dLi
 qIy
@@ -57146,7 +57230,7 @@ iEk
 aOA
 cAG
 gSA
-ioQ
+lnI
 wbp
 mHh
 uCm
@@ -57338,7 +57422,7 @@ riW
 cPq
 cPq
 cPq
-fzf
+hTq
 pWW
 hsD
 woR
@@ -57348,12 +57432,12 @@ qyB
 rLV
 vzX
 eHI
-ioQ
+lnI
 jzb
 sLg
 tZE
-nbR
-nbR
+kxs
+kxs
 fWH
 tni
 muG
@@ -57540,7 +57624,7 @@ cPq
 cPq
 cPq
 cPq
-fzf
+hTq
 xkk
 oWK
 rXr
@@ -57550,14 +57634,14 @@ xhV
 niX
 niX
 eQF
-ioQ
+lnI
 bqY
 iVD
 fyZ
 gTO
-nbR
+kxs
 dAI
-pbx
+oIR
 fll
 fll
 fll
@@ -57742,7 +57826,7 @@ cPq
 cPq
 cPq
 cPq
-fzf
+hTq
 jzy
 woR
 woR
@@ -57752,14 +57836,14 @@ oWU
 mdb
 dDJ
 pRD
-ioQ
+lnI
 vTI
 pms
 fyZ
 frA
-nbR
+kxs
 xJq
-pbx
+oIR
 wGH
 wGH
 wGH
@@ -57944,7 +58028,7 @@ cPq
 cPq
 cPq
 cPq
-fzf
+hTq
 jzy
 dQq
 woR
@@ -57954,14 +58038,14 @@ jaj
 jQY
 jQY
 jQY
-ioQ
+lnI
 mVs
 rhT
 dsV
 frA
-nbR
+kxs
 vEh
-pbx
+oIR
 bEW
 leE
 wGH
@@ -58146,7 +58230,7 @@ cPq
 cPq
 cPq
 cPq
-iKp
+gTG
 gZD
 wTo
 nvq
@@ -58156,14 +58240,14 @@ gSv
 mvx
 mvx
 mvx
-ioQ
+lnI
 kMa
 muO
 xPv
 xSX
-jlq
+nYQ
 hOi
-pbx
+oIR
 vkb
 wGH
 wGH
@@ -58348,24 +58432,24 @@ pmx
 cPq
 cPq
 cPq
-iKp
-aPJ
+gTG
+cdh
 bOa
-aPJ
-aPJ
-fQJ
+cdh
+cdh
+gTG
 jaj
 mvx
 mvx
 mvx
-fQJ
-pbx
-cdh
+oIR
+oIR
+udU
 rdm
-cdh
-cdh
-pbx
-pbx
+udU
+udU
+oIR
+oIR
 wGH
 wGH
 wGH
@@ -58546,21 +58630,21 @@ dSF
 dSF
 dSF
 dSF
-dHX
-wGH
-wGH
-wGH
-wGH
-wGH
-wGH
-wGH
-wGH
-klQ
+hBq
+cPq
+cPq
+cPq
+cPq
+cPq
+cPq
+cPq
+cPq
+ooy
 jaj
 nlv
 nlv
 nlv
-klQ
+ooy
 wGH
 wGH
 wGH
@@ -58748,21 +58832,21 @@ dSF
 dSF
 dSF
 dSF
-dHX
-wGH
-wGH
-wGH
-wGH
-wGH
-wGH
-wGH
-wGH
-klQ
+hBq
+cPq
+cPq
+cPq
+cPq
+cPq
+cPq
+cPq
+cPq
+ooy
 jaj
 mvx
 mvx
 mvx
-klQ
+ooy
 wGH
 wGH
 wGH
@@ -58950,21 +59034,21 @@ dSF
 dSF
 dSF
 dSF
-uLF
-oCi
-wGH
-wGH
-wGH
-wGH
-wGH
-wGH
-wGH
-klQ
+hAW
+pmx
+cPq
+cPq
+cPq
+cPq
+cPq
+cPq
+cPq
+ooy
 jaj
 mvx
 mvx
 mvx
-klQ
+ooy
 wGH
 wGH
 wGH
@@ -59153,20 +59237,20 @@ dSF
 dSF
 dSF
 dSF
-dHX
-wGH
-wGH
-wGH
-wGH
-wGH
-wGH
-wGH
-fQJ
+hBq
+cPq
+cPq
+cPq
+cPq
+cPq
+cPq
+cPq
+pbx
 jJh
 qNg
 qNg
 xre
-fQJ
+pbx
 wGH
 wGH
 wGH
@@ -59355,20 +59439,20 @@ dSF
 dSF
 dSF
 dSF
-dHX
-wGH
-wGH
-wGH
-wGH
-wGH
-wGH
-wGH
-fQJ
-ofl
-ofl
-ofl
-ofl
-fQJ
+hBq
+cPq
+cPq
+cPq
+cPq
+cPq
+cPq
+cPq
+pbx
+psg
+psg
+psg
+psg
+pbx
 wGH
 wGH
 wGH
@@ -59557,20 +59641,20 @@ dSF
 dSF
 dSF
 dSF
-uLF
-oCi
-wGH
-wGH
-wGH
-wGH
-wGH
-wGH
-fQJ
-fQJ
+hAW
+pmx
+cPq
+cPq
+cPq
+cPq
+cPq
+cPq
+pbx
+pbx
 fEn
-fQJ
-fQJ
-fQJ
+pbx
+pbx
+pbx
 wGH
 wGH
 wGH