From 1b6d9f673e4b2f2eb7a3ca4b545667f87793ef5b Mon Sep 17 00:00:00 2001
From: DogeDogIs <62888630+DogeDogIs@users.noreply.github.com>
Date: Wed, 27 Jul 2022 16:22:33 -0300
Subject: [PATCH] BoxStation: Armory Remaped (#18440)

* Secure Armory was re-mapped and the non-secure armory was removed and Gamma Shuttle now docks with the Secure Armory.

The Secure Armory now have all items from non-secure Armory, and Gamma shuttles now docks directly with the Secure Armory. The non-secure armory was removed to make place for Gamma Shuttle.

* Updated the Armory for the standard items

* Updated the Armory

New locations added and some changes to the benefit of the Warden

* Moved the shooting targets to another location

* Updated the areas

* Update cyberiad.dmm

* Updated files

* Updated files again

* updated file

* Removed some decals

* nades position in the rack updated
---
 _maps/map_files/cyberiad/cyberiad.dmm | 1166 +++++++++++--------------
 1 file changed, 516 insertions(+), 650 deletions(-)

diff --git a/_maps/map_files/cyberiad/cyberiad.dmm b/_maps/map_files/cyberiad/cyberiad.dmm
index 895057af251..25ed55b64c0 100644
--- a/_maps/map_files/cyberiad/cyberiad.dmm
+++ b/_maps/map_files/cyberiad/cyberiad.dmm
@@ -106,32 +106,35 @@
 /turf/simulated/wall/r_wall,
 /area/security/permabrig)
 "abO" = (
-/obj/machinery/camera{
-	c_tag = "Brig Secure Armory Exterior East";
+/obj/effect/decal/warning_stripes/north,
+/obj/machinery/light{
 	dir = 1
 	},
-/turf/space,
+/obj/item/radio/intercom/department/security{
+	pixel_y = 25
+	},
+/turf/simulated/floor/plasteel{
+	icon_state = "dark"
+	},
 /area/security/securearmoury)
 "abP" = (
-/obj/structure/window/reinforced{
-	dir = 8
-	},
+/obj/machinery/suit_storage_unit/security,
 /obj/structure/window/reinforced{
 	dir = 1;
 	layer = 2.9
 	},
-/obj/machinery/suit_storage_unit/security,
+/obj/structure/window/reinforced{
+	dir = 8
+	},
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
 	},
 /area/security/securearmoury)
 "abY" = (
-/obj/machinery/camera/motion{
-	c_tag = "Armory Exterior";
-	dir = 1
-	},
-/turf/space,
-/area/security/securearmoury)
+/obj/structure/marker_beacon/dock_marker/collision,
+/obj/effect/decal/warning_stripes/red,
+/turf/simulated/floor/plating/airless,
+/area/space/nearstation)
 "aca" = (
 /obj/effect/decal/warning_stripes/northwest,
 /turf/simulated/floor/plasteel{
@@ -173,15 +176,7 @@
 /turf/simulated/floor/plating,
 /area/security/main)
 "acj" = (
-/obj/machinery/navbeacon{
-	codes_txt = "patrol;next_patrol=Armory_South";
-	location = "Armory_North"
-	},
-/obj/effect/decal/warning_stripes/north,
 /obj/effect/decal/warning_stripes/south,
-/mob/living/simple_animal/bot/secbot/armsky{
-	auto_patrol = 1
-	},
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
 	},
@@ -194,13 +189,6 @@
 	icon_state = "redcorner"
 	},
 /area/security/range)
-"acp" = (
-/obj/structure/rack,
-/obj/item/target/syndicate,
-/obj/item/target/syndicate,
-/obj/item/target/syndicate,
-/turf/simulated/floor/plasteel,
-/area/security/range)
 "act" = (
 /obj/effect/decal/warning_stripes/southeast,
 /turf/simulated/floor/plasteel{
@@ -280,21 +268,29 @@
 	},
 /area/security/main)
 "acH" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/plasteel,
-/area/security/armoury)
+/obj/structure/rack,
+/obj/effect/decal/warning_stripes/red/hollow,
+/obj/structure/window/reinforced,
+/obj/item/grenade/barrier{
+	pixel_y = 5;
+	pixel_x = 5
+	},
+/obj/item/grenade/barrier{
+	pixel_y = 3;
+	pixel_x = 3
+	},
+/obj/item/grenade/barrier,
+/obj/item/grenade/barrier{
+	pixel_y = -3;
+	pixel_x = -3
+	},
+/turf/simulated/floor/plasteel{
+	icon_state = "dark"
+	},
+/area/security/securearmoury)
 "acK" = (
-/obj/machinery/alarm{
-	dir = 4;
-	name = "west bump";
-	pixel_x = -24
-	},
-/obj/structure/cable{
-	d1 = 1;
-	d2 = 2;
-	icon_state = "1-2"
-	},
 /obj/effect/decal/warning_stripes/east,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/effect/decal/warning_stripes/west,
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
@@ -362,46 +358,44 @@
 /turf/simulated/floor/plating,
 /area/security/main)
 "adb" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 10
+/obj/structure/rack,
+/obj/item/storage/lockbox/mindshield,
+/obj/item/storage/box/trackimp,
+/obj/item/storage/box/chemimp{
+	pixel_x = 4;
+	pixel_y = 3
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 6
+/obj/item/storage/toolbox/mechanical,
+/obj/effect/decal/warning_stripes/red/hollow,
+/obj/structure/window/reinforced,
+/obj/structure/window/reinforced{
+	dir = 8
 	},
-/obj/structure/cable{
-	d1 = 2;
-	d2 = 8;
-	icon_state = "2-8"
+/turf/simulated/floor/plasteel{
+	icon_state = "dark"
 	},
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/plasteel,
-/area/security/armoury)
+/area/security/securearmoury)
 "adg" = (
+/obj/structure/dispenser/oxygen,
 /obj/structure/window/reinforced{
 	dir = 1;
 	layer = 2.9
 	},
-/obj/structure/dispenser/oxygen,
 /turf/simulated/floor/plasteel{
-	dir = 8;
-	icon_state = "vault"
+	icon_state = "dark"
 	},
 /area/security/securearmoury)
 "adh" = (
+/obj/machinery/suit_storage_unit/security,
 /obj/structure/window/reinforced{
 	dir = 1;
 	layer = 2.9
 	},
-/obj/machinery/camera{
-	c_tag = "Brig Secure Armory"
-	},
 /obj/structure/window/reinforced{
 	dir = 4
 	},
-/obj/machinery/suit_storage_unit/security,
 /turf/simulated/floor/plasteel{
-	dir = 8;
-	icon_state = "vault"
+	icon_state = "dark"
 	},
 /area/security/securearmoury)
 "adi" = (
@@ -475,24 +469,14 @@
 	},
 /turf/simulated/floor/plating,
 /area/security/hos)
-"adv" = (
-/obj/structure/cable{
-	d1 = 1;
-	d2 = 2;
-	icon_state = "1-2"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/hologram/holopad,
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/plasteel,
-/area/security/armoury)
 "adw" = (
-/obj/machinery/navbeacon{
-	codes_txt = "patrol;next_patrol=Armory_North";
-	location = "Armory_South"
-	},
 /obj/effect/decal/warning_stripes/north,
+/obj/structure/cable{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
+	},
+/obj/machinery/hologram/holopad,
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
 	},
@@ -577,16 +561,43 @@
 /turf/simulated/floor/plasteel,
 /area/security/permabrig)
 "adP" = (
-/obj/structure/cable{
-	d1 = 1;
-	d2 = 2;
-	icon_state = "1-2"
+/obj/structure/rack,
+/obj/item/storage/box/rubbershot{
+	pixel_x = -3;
+	pixel_y = -3
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/plasteel,
-/area/security/armoury)
+/obj/item/storage/box/rubbershot{
+	pixel_x = -3;
+	pixel_y = -3
+	},
+/obj/item/storage/box/rubbershot{
+	pixel_x = -3;
+	pixel_y = -3
+	},
+/obj/item/storage/box/beanbag{
+	pixel_x = -3;
+	pixel_y = 3
+	},
+/obj/item/storage/box/beanbag{
+	pixel_x = -3;
+	pixel_y = 3
+	},
+/obj/item/storage/box/beanbag{
+	pixel_x = -3;
+	pixel_y = 3
+	},
+/obj/structure/window/reinforced{
+	dir = 1;
+	layer = 2.9
+	},
+/obj/structure/window/reinforced{
+	dir = 4
+	},
+/turf/simulated/floor/plasteel{
+	dir = 8;
+	icon_state = "vault"
+	},
+/area/security/securearmoury)
 "adQ" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/door/firedoor,
@@ -665,32 +676,18 @@
 /turf/simulated/floor/plating,
 /area/security/prisonlockers)
 "aei" = (
-/obj/structure/cable{
-	d1 = 1;
-	d2 = 2;
-	icon_state = "1-2"
-	},
 /obj/structure/cable{
 	d1 = 2;
 	d2 = 4;
 	icon_state = "2-4"
 	},
 /obj/structure/cable{
-	d1 = 2;
-	d2 = 8;
-	icon_state = "2-8"
+	d2 = 2;
+	icon_state = "0-2"
 	},
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/security/glass{
-	name = "Warden's Office";
-	req_access_txt = "3"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/turf/simulated/floor/plasteel{
-	icon_state = "dark"
-	},
-/area/security/armoury)
+/obj/effect/spawner/window/reinforced,
+/turf/simulated/floor/plating,
+/area/security/warden)
 "aej" = (
 /obj/structure/window/reinforced{
 	dir = 8
@@ -760,18 +757,6 @@
 	icon_state = "red"
 	},
 /area/security/range)
-"aew" = (
-/obj/structure/cable{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/unary/vent_pump/on{
-	dir = 4
-	},
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/plasteel,
-/area/security/armoury)
 "aey" = (
 /obj/machinery/computer/brigcells{
 	dir = 4
@@ -884,21 +869,25 @@
 	},
 /area/security/brig)
 "aeR" = (
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
-	dir = 8
+/obj/effect/decal/warning_stripes/north,
+/obj/machinery/flasher/portable,
+/obj/effect/decal/warning_stripes/red/hollow,
+/obj/machinery/camera{
+	c_tag = "Brig Secure Armory North"
 	},
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/plasteel,
-/area/security/armoury)
+/turf/simulated/floor/plasteel{
+	icon_state = "dark"
+	},
+/area/security/securearmoury)
 "aeS" = (
-/obj/structure/cable{
-	d1 = 1;
-	d2 = 2;
-	icon_state = "1-2"
-	},
-/obj/machinery/atmospherics/unary/vent_pump/on,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/effect/decal/warning_stripes/northwestcorner,
 /obj/effect/decal/warning_stripes/northeastcorner,
+/obj/structure/cable{
+	d1 = 2;
+	d2 = 4;
+	icon_state = "2-4"
+	},
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
 	},
@@ -996,8 +985,16 @@
 /turf/simulated/floor/plasteel,
 /area/security/brig)
 "afe" = (
-/obj/machinery/atmospherics/unary/vent_scrubber/on,
 /obj/effect/decal/warning_stripes/north,
+/obj/structure/cable{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
+	},
+/obj/machinery/navbeacon{
+	codes_txt = "patrol;next_patrol=Armory_South";
+	location = "Armory_North"
+	},
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
 	},
@@ -1228,19 +1225,24 @@
 	},
 /area/security/brig)
 "agt" = (
-/turf/simulated/wall/r_wall,
-/area/security/armoury)
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/hatch/gamma{
+	locked = 1;
+	req_access_txt = "1";
+	use_power = 0
+	},
+/turf/simulated/floor/plasteel{
+	icon_state = "dark"
+	},
+/area/security/securearmoury)
 "agD" = (
 /obj/structure/cable{
 	d1 = 1;
 	d2 = 2;
 	icon_state = "1-2"
 	},
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 5
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 6
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
@@ -1322,64 +1324,11 @@
 	icon_state = "darkredcorners"
 	},
 /area/security/brig)
-"agR" = (
-/obj/structure/window/reinforced{
-	dir = 1
-	},
-/obj/structure/rack,
-/obj/structure/window/reinforced{
-	dir = 4
-	},
-/obj/item/storage/box/rubbershot{
-	pixel_x = -3;
-	pixel_y = -3
-	},
-/obj/item/storage/box/rubbershot{
-	pixel_x = -3;
-	pixel_y = -3
-	},
-/obj/item/storage/box/rubbershot{
-	pixel_x = -3;
-	pixel_y = -3
-	},
-/obj/item/storage/box/beanbag{
-	pixel_x = -3;
-	pixel_y = 3
-	},
-/obj/item/storage/box/beanbag{
-	pixel_x = -3;
-	pixel_y = 3
-	},
-/obj/item/storage/box/beanbag{
-	pixel_x = -3;
-	pixel_y = 3
-	},
-/turf/simulated/floor/plasteel{
-	dir = 8;
-	icon_state = "vault"
-	},
-/area/security/securearmoury)
 "agS" = (
-/obj/structure/rack,
-/obj/item/gun/projectile/shotgun/riot{
-	pixel_x = 3;
-	pixel_y = 3
-	},
-/obj/item/gun/projectile/shotgun/riot,
-/obj/item/gun/projectile/shotgun/riot{
-	pixel_x = -3;
-	pixel_y = -3
-	},
-/obj/structure/window/reinforced{
-	dir = 8
-	},
-/obj/structure/window/reinforced{
-	dir = 1;
-	layer = 2.9
-	},
+/obj/machinery/flasher/portable,
+/obj/effect/decal/warning_stripes/red/hollow,
 /turf/simulated/floor/plasteel{
-	dir = 8;
-	icon_state = "vault"
+	icon_state = "dark"
 	},
 /area/security/securearmoury)
 "agT" = (
@@ -1545,37 +1494,28 @@
 /turf/space,
 /area/shuttle/gamma/station)
 "ahG" = (
-/obj/structure/table,
-/obj/item/storage/toolbox/mechanical,
-/obj/machinery/light{
-	dir = 1
+/obj/structure/rack,
+/obj/item/gun/projectile/shotgun/riot{
+	pixel_x = -3;
+	pixel_y = -3
 	},
-/obj/item/radio/intercom{
-	name = "north bump";
-	pixel_y = 28
-	},
-/obj/item/storage/box/chemimp{
-	pixel_x = 4;
+/obj/item/gun/projectile/shotgun/riot{
+	pixel_x = 3;
 	pixel_y = 3
 	},
-/obj/item/storage/box/trackimp,
-/obj/item/storage/lockbox/mindshield,
-/obj/effect/decal/warning_stripes/red/hollow,
-/turf/simulated/floor/plasteel,
-/area/security/armoury)
-"ahH" = (
-/obj/item/grenade/barrier,
+/obj/item/gun/projectile/shotgun/riot,
 /obj/structure/window/reinforced{
 	dir = 8
 	},
 /obj/structure/window/reinforced{
-	dir = 1
+	dir = 1;
+	layer = 2.9
 	},
 /turf/simulated/floor/plasteel{
-	dir = 9;
-	icon_state = "red"
+	dir = 8;
+	icon_state = "vault"
 	},
-/area/security/armoury)
+/area/security/securearmoury)
 "ahQ" = (
 /obj/machinery/alarm{
 	name = "north bump";
@@ -1591,74 +1531,53 @@
 	},
 /area/security/brig)
 "ahR" = (
-/obj/item/grenade/barrier,
-/obj/structure/window/reinforced{
-	dir = 4
-	},
-/obj/structure/window/reinforced{
-	dir = 1
-	},
+/obj/effect/decal/warning_stripes/southeast,
+/obj/structure/closet/l3closet/security,
+/obj/effect/decal/warning_stripes/red/hollow,
 /turf/simulated/floor/plasteel{
-	dir = 5;
-	icon_state = "red"
+	icon_state = "dark"
 	},
-/area/security/armoury)
-"ahS" = (
-/obj/machinery/flasher/portable,
-/obj/structure/window/reinforced{
-	dir = 4
-	},
-/obj/structure/window/reinforced{
-	dir = 1
-	},
-/turf/simulated/floor/plasteel{
-	dir = 5;
-	icon_state = "red"
-	},
-/area/security/armoury)
+/area/security/securearmoury)
 "ahT" = (
-/obj/machinery/flasher/portable,
-/obj/structure/window/reinforced{
-	dir = 8
-	},
-/obj/structure/window/reinforced{
-	dir = 1
-	},
-/turf/simulated/floor/plasteel{
-	dir = 9;
-	icon_state = "red"
-	},
-/area/security/armoury)
-"ahU" = (
-/obj/item/radio/intercom{
-	name = "west bump";
-	pixel_x = -28
-	},
-/obj/machinery/status_display{
-	layer = 4;
-	pixel_y = 32
+/obj/structure/reagent_dispensers/peppertank{
+	pixel_y = 30
 	},
 /obj/effect/decal/warning_stripes/northwest,
+/turf/simulated/floor/plasteel{
+	icon_state = "dark"
+	},
+/area/security/securearmoury)
+"ahU" = (
 /obj/effect/decal/warning_stripes/southeastcorner,
+/obj/effect/decal/warning_stripes/northwestcorner,
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
 	},
 /area/security/securearmoury)
 "ahV" = (
-/obj/effect/decal/warning_stripes/north,
 /obj/effect/decal/warning_stripes/south,
+/obj/machinery/navbeacon{
+	codes_txt = "patrol;next_patrol=Armory_North";
+	location = "Armory_South"
+	},
+/mob/living/simple_animal/bot/secbot/armsky{
+	auto_patrol = 1
+	},
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
 	},
 /area/security/securearmoury)
 "ahW" = (
-/obj/machinery/ai_status_display{
-	pixel_y = 32
-	},
-/obj/effect/decal/warning_stripes/northeast,
+/obj/effect/decal/warning_stripes/east,
 /obj/effect/decal/warning_stripes/southwestcorner,
-/obj/item/storage/secure/safe{
-	pixel_x = 32
+/obj/machinery/power/apc{
+	dir = 4;
+	name = "east bump Important Area";
+	pixel_x = 24
+	},
+/obj/structure/cable{
+	d2 = 2;
+	icon_state = "0-2"
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
@@ -1745,19 +1664,30 @@
 	},
 /area/security/brig)
 "aif" = (
-/obj/item/grenade/barrier,
-/obj/structure/window/reinforced{
-	dir = 8
+/obj/structure/rack,
+/obj/item/storage/box/teargas{
+	pixel_x = -3;
+	pixel_y = -3
 	},
-/obj/machinery/status_display{
-	layer = 4;
-	pixel_x = -32
+/obj/item/storage/box/handcuffs,
+/obj/item/storage/box/flashbangs{
+	pixel_x = -2;
+	pixel_y = -2
+	},
+/obj/item/storage/box/handcuffs,
+/obj/item/storage/box/seccarts{
+	pixel_x = 3;
+	pixel_y = 2
+	},
+/obj/effect/decal/warning_stripes/red/hollow,
+/obj/structure/window/reinforced,
+/obj/structure/window/reinforced{
+	dir = 4
 	},
 /turf/simulated/floor/plasteel{
-	dir = 10;
-	icon_state = "red"
+	icon_state = "dark"
 	},
-/area/security/armoury)
+/area/security/securearmoury)
 "aig" = (
 /obj/effect/decal/warning_stripes/yellow/hollow,
 /obj/machinery/atmospherics/pipe/manifold/hidden/supply{
@@ -1777,51 +1707,17 @@
 /turf/simulated/wall/r_wall,
 /area/security/hos)
 "aij" = (
-/obj/item/grenade/barrier,
-/obj/structure/window/reinforced{
-	dir = 4
-	},
-/turf/simulated/floor/plasteel{
-	dir = 6;
-	icon_state = "red"
-	},
-/area/security/armoury)
-"aik" = (
-/obj/machinery/flasher/portable,
-/obj/structure/window/reinforced{
-	dir = 4
-	},
-/turf/simulated/floor/plasteel{
-	dir = 6;
-	icon_state = "red"
-	},
-/area/security/armoury)
-"ain" = (
-/obj/machinery/flasher/portable,
-/obj/structure/window/reinforced{
-	dir = 8
-	},
-/turf/simulated/floor/plasteel{
-	dir = 10;
-	icon_state = "red"
-	},
-/area/security/armoury)
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/rack,
+/obj/item/target/syndicate,
+/obj/item/target/syndicate,
+/obj/item/target/syndicate,
+/turf/simulated/floor/plasteel,
+/area/security/range)
 "aio" = (
-/obj/machinery/light{
-	dir = 8
-	},
-/obj/structure/cable{
-	d2 = 2;
-	icon_state = "0-2"
-	},
-/obj/machinery/power/apc{
-	cell_type = 5000;
-	dir = 8;
-	name = "west bump Important Area";
-	pixel_x = -24
-	},
 /obj/effect/decal/warning_stripes/east,
-/obj/effect/decal/warning_stripes/west,
+/obj/effect/decal/warning_stripes/southwestcorner,
+/obj/machinery/atmospherics/unary/vent_pump/on,
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
 	},
@@ -1866,11 +1762,20 @@
 	},
 /area/security/securearmoury)
 "air" = (
+/obj/effect/decal/warning_stripes/east,
 /obj/machinery/light{
 	dir = 4
 	},
 /obj/effect/decal/warning_stripes/west,
-/obj/effect/decal/warning_stripes/east,
+/obj/machinery/atmospherics/unary/vent_scrubber/on,
+/obj/item/storage/secure/safe{
+	pixel_x = 32
+	},
+/obj/structure/cable{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
 	},
@@ -1900,25 +1805,13 @@
 /turf/simulated/wall/r_wall,
 /area/security/securearmoury)
 "aiw" = (
-/obj/machinery/power/apc{
-	cell_type = 5000;
-	dir = 8;
-	name = "west bump Important Area";
-	pixel_x = -24
+/obj/structure/lattice,
+/obj/machinery/camera/motion{
+	c_tag = "Armory Exterior";
+	dir = 1
 	},
-/obj/structure/cable{
-	d2 = 4;
-	icon_state = "0-4"
-	},
-/obj/machinery/camera{
-	c_tag = "Brig Armory";
-	dir = 4
-	},
-/turf/simulated/floor/plasteel{
-	dir = 1;
-	icon_state = "redcorner"
-	},
-/area/security/armoury)
+/turf/space,
+/area/security/securearmoury)
 "aix" = (
 /turf/simulated/floor/plasteel{
 	icon_state = "red"
@@ -1927,15 +1820,16 @@
 /area/security/brig)
 "aiz" = (
 /obj/machinery/alarm{
-	dir = 8;
-	name = "east bump";
-	pixel_x = 24
-	},
-/turf/simulated/floor/plasteel{
 	dir = 4;
-	icon_state = "redcorner"
+	name = "west bump";
+	pixel_x = -24
 	},
-/area/security/armoury)
+/obj/effect/decal/warning_stripes/north,
+/obj/effect/decal/warning_stripes/north,
+/turf/simulated/floor/plasteel{
+	icon_state = "dark"
+	},
+/area/security/securearmoury)
 "aiA" = (
 /obj/structure/cable{
 	d1 = 1;
@@ -2007,8 +1901,18 @@
 	name = "east bump";
 	pixel_x = 24
 	},
-/obj/effect/decal/warning_stripes/west,
 /obj/effect/decal/warning_stripes/east,
+/obj/machinery/camera{
+	c_tag = "Brig Secure Armory East";
+	dir = 8
+	},
+/obj/effect/decal/warning_stripes/west,
+/obj/structure/cable{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
 	},
@@ -2229,14 +2133,6 @@
 	icon_state = "dark"
 	},
 /area/security/securearmoury)
-"ajk" = (
-/obj/vehicle/secway,
-/obj/item/key/security,
-/turf/simulated/floor/plasteel{
-	dir = 4;
-	icon_state = "redcorner"
-	},
-/area/security/armoury)
 "ajm" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -2248,17 +2144,15 @@
 	},
 /area/security/brig)
 "ajn" = (
-/obj/structure/sign/securearea,
-/turf/simulated/wall/r_wall,
-/area/security/armoury)
-"ajo" = (
-/obj/structure/cable{
-	d1 = 1;
-	d2 = 2;
-	icon_state = "1-2"
+/obj/effect/decal/warning_stripes/southeastcorner,
+/turf/simulated/floor/plasteel{
+	icon_state = "dark"
 	},
-/obj/effect/decal/warning_stripes/east,
+/area/security/securearmoury)
+"ajo" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/effect/decal/warning_stripes/west,
+/obj/effect/decal/warning_stripes/east,
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
 	},
@@ -2356,8 +2250,14 @@
 	},
 /area/security/securearmoury)
 "ajL" = (
-/obj/effect/decal/warning_stripes/west,
 /obj/effect/decal/warning_stripes/east,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/effect/decal/warning_stripes/west,
+/obj/structure/cable{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
 	},
@@ -2521,6 +2421,9 @@
 /area/security/brig)
 "akf" = (
 /obj/effect/decal/warning_stripes/east,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 9
+	},
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
 	},
@@ -2615,14 +2518,13 @@
 	},
 /area/security/brig)
 "akl" = (
-/obj/machinery/door/airlock/security{
-	name = "Warden's office";
-	req_access_txt = "3"
-	},
+/obj/effect/decal/warning_stripes/north,
+/obj/machinery/flasher/portable,
+/obj/effect/decal/warning_stripes/red/hollow,
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
 	},
-/area/security/armoury)
+/area/security/securearmoury)
 "akm" = (
 /obj/machinery/light{
 	dir = 1
@@ -2711,7 +2613,13 @@
 /area/security/main)
 "akw" = (
 /obj/effect/decal/warning_stripes/east,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/effect/decal/warning_stripes/northwestcorner,
+/obj/structure/cable{
+	d1 = 1;
+	d2 = 8;
+	icon_state = "1-8"
+	},
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
 	},
@@ -2970,53 +2878,22 @@
 	},
 /area/lawoffice)
 "ale" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/hatch/gamma{
-	locked = 1;
-	req_access_txt = "1";
-	use_power = 0
+/obj/machinery/light{
+	dir = 8
 	},
+/obj/machinery/vending/security,
+/obj/effect/decal/warning_stripes/northwest,
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
 	},
-/area/security/armoury)
+/area/security/securearmoury)
 "alf" = (
-/obj/machinery/vending/security,
-/obj/machinery/firealarm{
-	dir = 1;
-	name = "south bump";
-	pixel_y = -24
-	},
-/obj/item/radio/intercom/department/security{
-	pixel_x = -28
-	},
+/obj/effect/decal/warning_stripes/northwestcorner,
+/obj/effect/decal/warning_stripes/west,
 /turf/simulated/floor/plasteel{
-	dir = 1;
-	icon_state = "redcorner"
+	icon_state = "dark"
 	},
-/area/security/armoury)
-"alg" = (
-/turf/simulated/floor/plasteel{
-	dir = 1;
-	icon_state = "redcorner"
-	},
-/area/security/armoury)
-"alh" = (
-/obj/structure/closet/l3closet/security,
-/obj/effect/decal/warning_stripes/red/hollow,
-/turf/simulated/floor/plasteel{
-	dir = 4;
-	icon_state = "redcorner"
-	},
-/area/security/armoury)
-"ali" = (
-/obj/structure/closet/bombclosetsecurity,
-/obj/effect/decal/warning_stripes/red/hollow,
-/turf/simulated/floor/plasteel{
-	dir = 4;
-	icon_state = "redcorner"
-	},
-/area/security/armoury)
+/area/security/securearmoury)
 "alj" = (
 /obj/structure/cable{
 	d1 = 2;
@@ -3072,20 +2949,22 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 10
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 6
+	},
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
 	},
 /area/security/securearmoury)
 "aln" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
 /obj/structure/cable{
 	d1 = 2;
 	d2 = 8;
 	icon_state = "2-8"
 	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
 	},
@@ -4005,8 +3884,8 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 10
 	},
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
-	dir = 1
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 6
 	},
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
@@ -4016,9 +3895,6 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
 	},
@@ -4248,8 +4124,11 @@
 /turf/simulated/floor/plasteel,
 /area/security/main)
 "anW" = (
-/turf/simulated/floor/plasteel,
-/area/security/armoury)
+/obj/effect/decal/warning_stripes/southwest,
+/turf/simulated/floor/plasteel{
+	icon_state = "dark"
+	},
+/area/security/securearmoury)
 "anX" = (
 /obj/machinery/atmospherics/unary/vent_pump/on{
 	dir = 4
@@ -4390,11 +4269,12 @@
 /turf/simulated/floor/plating,
 /area/security/prison/cell_block/A)
 "aor" = (
-/obj/structure/sign/securearea{
-	pixel_y = -32
+/obj/effect/decal/warning_stripes/northwestcorner,
+/obj/effect/decal/warning_stripes/north,
+/turf/simulated/floor/plasteel{
+	icon_state = "dark"
 	},
-/turf/space,
-/area/space)
+/area/security/securearmoury)
 "aos" = (
 /obj/structure/chair/office/dark,
 /obj/structure/cable{
@@ -5490,11 +5370,13 @@
 	},
 /area/security/permabrig)
 "aqR" = (
+/obj/effect/decal/warning_stripes/northeast,
+/obj/structure/closet/bombclosetsecurity,
+/obj/effect/decal/warning_stripes/red/hollow,
 /turf/simulated/floor/plasteel{
-	dir = 4;
-	icon_state = "redcorner"
+	icon_state = "dark"
 	},
-/area/security/armoury)
+/area/security/securearmoury)
 "aqS" = (
 /obj/machinery/computer/security{
 	network = list("Prison");
@@ -19731,35 +19613,10 @@
 	},
 /area/medical/morgue)
 "aYm" = (
-/obj/structure/rack,
-/obj/item/storage/box/seccarts{
-	pixel_x = 3;
-	pixel_y = 2
-	},
-/obj/item/storage/box/handcuffs,
-/obj/item/storage/box/flashbangs{
-	pixel_x = -2;
-	pixel_y = -2
-	},
-/obj/item/storage/box/handcuffs,
-/obj/item/storage/box/teargas{
-	pixel_x = -3;
-	pixel_y = -3
-	},
-/obj/machinery/light{
-	dir = 8
-	},
-/obj/machinery/light_switch{
-	dir = 4;
-	name = "west bump";
-	pixel_x = -24
-	},
-/obj/effect/decal/warning_stripes/red/hollow,
-/turf/simulated/floor/plasteel{
-	dir = 1;
-	icon_state = "redcorner"
-	},
-/area/security/armoury)
+/obj/structure/lattice,
+/obj/structure/grille,
+/turf/simulated/floor/plating/airless,
+/area/space/nearstation)
 "aYn" = (
 /obj/machinery/atmospherics/unary/vent_scrubber/on,
 /obj/effect/decal/cleanable/dirt,
@@ -79161,6 +79018,8 @@
 /turf/simulated/floor/engine,
 /area/engine/supermatter)
 "jVf" = (
+/obj/vehicle/secway,
+/obj/item/key/security,
 /obj/machinery/newscaster/security_unit{
 	pixel_y = 32;
 	name = "north bump"
@@ -80595,6 +80454,13 @@
 	},
 /turf/simulated/floor/wood,
 /area/security/permabrig)
+"ois" = (
+/obj/machinery/newscaster/security_unit{
+	pixel_y = 32;
+	name = "north bump"
+	},
+/turf/simulated/floor/plasteel,
+/area/security/main)
 "omz" = (
 /turf/simulated/wall/r_wall,
 /area/engine/supermatter)
@@ -81531,12 +81397,12 @@
 /turf/simulated/floor/engine,
 /area/engine/engineering)
 "qTO" = (
-/obj/machinery/newscaster/security_unit{
-	pixel_y = 32;
-	name = "north bump"
+/obj/structure/sign/securearea{
+	desc = "A warning sign which reads 'KEEP CLEAR OF DOCKING AREA'.";
+	name = "KEEP CLEAR: DOCKING AREA"
 	},
-/turf/simulated/floor/plasteel,
-/area/security/main)
+/turf/simulated/wall,
+/area/space/nearstation)
 "qUv" = (
 /obj/machinery/atmospherics/pipe/simple/heat_exchanging,
 /turf/space,
@@ -109012,9 +108878,9 @@ aaa
 aaa
 aaa
 aaa
-aab
-dOd
-aab
+aaa
+aaa
+aaa
 aMr
 aMr
 aMr
@@ -109269,14 +109135,14 @@ aaa
 aaa
 aaa
 aaa
-dOd
-ahF
-ahF
-ahF
-ahF
-ahF
-ahF
-ahF
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 akZ
 ufw
 hEu
@@ -109526,14 +109392,14 @@ aaa
 aaa
 aaa
 aaa
-aab
-ahF
-ahF
-ahF
-ahF
-ahF
-ahF
-ahF
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 akZ
 xVM
 ncT
@@ -109783,14 +109649,14 @@ aaa
 aaa
 aaa
 aaa
-aab
-ahF
-ahF
-ahF
-ahF
-ahF
-ahF
-ahF
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 xed
 lgS
 iTq
@@ -110040,14 +109906,14 @@ aaa
 aaa
 aaa
 aaa
-aab
-ahF
-ahF
-ahF
-ahF
-ahF
-ahF
-ahF
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 uZb
 gZy
 utu
@@ -110297,14 +110163,14 @@ aaa
 aaa
 aaa
 aaa
-afO
-ahF
-ahF
-ahF
-ahF
-ahF
-ahF
-ahF
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
+aaa
 xSD
 lgS
 kdy
@@ -110553,15 +110419,15 @@ aaa
 aaa
 aaa
 aaa
+abY
 afO
-afX
-ahF
-ahF
-ahF
-ahF
-ahF
-ahF
-ahF
+aab
+afO
+qTO
+aMr
+aab
+aab
+abY
 akZ
 wxp
 twe
@@ -110810,16 +110676,16 @@ aaa
 aaa
 aaa
 afO
-afX
-anv
-agt
-agt
-agt
-ale
-agt
-agt
-agt
-agt
+aab
+ahF
+ahF
+ahF
+ahF
+ahF
+ahF
+ahF
+aaa
+akZ
 vDY
 tCY
 egq
@@ -111064,19 +110930,19 @@ aaa
 aaa
 aaa
 aaa
-aaa
 afO
-afX
-afX
+afO
+afO
+dhc
+ahF
+ahF
+ahF
+ahF
+ahF
+ahF
+ahF
 aaa
-agt
-ahH
-aif
-alg
-aiw
-aYm
-alf
-agt
+afm
 aqv
 aqv
 aqv
@@ -111322,18 +111188,18 @@ aaa
 aaa
 aaa
 afO
-afX
-afX
 afO
+afO
+aab
+ahF
+ahF
+ahF
+ahF
+ahF
+ahF
+ahF
 aaa
-agt
-ahR
-aij
-acH
-aew
-anW
-alg
-alU
+afm
 aey
 aeU
 afk
@@ -111580,18 +111446,18 @@ aaa
 afO
 afX
 afX
-afO
 aaa
+abY
+ahF
+ahF
+ahF
+ahF
+ahF
+ahF
+ahF
 aaa
-agt
-agt
-ahG
-anW
-adb
-adv
-adP
 aei
-amy
+amB
 agD
 aos
 apg
@@ -111836,17 +111702,17 @@ aaa
 aaa
 afX
 afX
-afO
+afX
+afX
+aYm
+ahF
+ahF
+ahF
+ahF
+ahF
+ahF
+ahF
 aaa
-aaa
-aaa
-agt
-ahT
-ain
-acH
-aeR
-acH
-ali
 apP
 amz
 anz
@@ -112089,22 +111955,22 @@ aaa
 aaa
 aaa
 aaa
-aaa
-aaa
+afO
 afX
 afX
 afX
-aab
+afO
+afX
+afX
+ahF
+ahF
+ahF
+ahF
+ahF
+ahF
+ahF
 aaa
-aaa
-agt
-ahS
-aik
-aiz
-ajk
-aqR
-alh
-agt
+afm
 jVf
 anz
 aou
@@ -112346,22 +112212,22 @@ aaa
 aaa
 aaa
 aaa
-aaa
-aaa
 afX
 afX
 afX
-aab
+afO
 aaa
 aaa
+afO
+afX
+aiv
+aiv
 agt
-agt
-agt
-agt
-ajn
-akl
-ajn
-agt
+aiv
+aiv
+aiv
+aiv
+afm
 amA
 any
 aot
@@ -112602,21 +112468,21 @@ aaa
 aaa
 aaa
 aaa
-aaa
-aaa
-aaa
+afO
 afX
 afX
 afX
-aab
-aaa
-aaa
+afO
 aaa
 aab
 aaa
 aiv
+aiv
+ale
+anW
+adb
 abP
-ajj
+aiz
 xWL
 afm
 amC
@@ -112859,19 +112725,19 @@ aaa
 aaa
 aaa
 aaa
-aaa
-aaa
-aab
+afO
 afX
 afX
 afX
-aab
-aaa
-aaa
+afO
 aaa
 aab
 aaa
 aiv
+ahG
+aor
+acj
+acH
 adg
 ajj
 alj
@@ -113116,19 +112982,19 @@ aaa
 aaa
 aaa
 aaa
-aaa
-aaa
-aaa
+afO
 afX
 afX
 afX
+afO
+aaa
 aab
-aaa
-aor
-aiv
-aiv
 aiv
 aiv
+adP
+ajj
+acj
+aif
 adh
 ajj
 all
@@ -113373,16 +113239,16 @@ aaa
 aaa
 aaa
 aaa
+afX
+afX
+afX
+afO
 aaa
-aaa
+afO
 aab
-afX
-afX
-afX
-aab
-abY
-aiv
 aiv
+ahT
+alf
 ahU
 aio
 acK
@@ -113629,16 +113495,16 @@ aaa
 aaa
 aaa
 aaa
-aaa
-aaa
-aaa
-aaa
+afO
 afX
 afX
 afX
+afO
 aab
 aab
+aiw
 aiv
+akl
 agS
 ahV
 aiq
@@ -113886,17 +113752,17 @@ aaa
 aaa
 aaa
 aaa
-aaa
-aaa
-aaa
-aab
+afO
 afX
 afX
 afX
-aab
+afO
+aaa
+aaa
 aaa
 aiv
-agR
+aeR
+agS
 acj
 aip
 aiB
@@ -114144,16 +114010,16 @@ aaa
 aaa
 aaa
 aaa
+afX
+afX
+afX
+afX
+afO
 aaa
 aaa
-aab
-afX
-afX
-afX
-aab
-aaa
-aiv
 aiv
+abO
+ajn
 ahW
 air
 aiO
@@ -114401,16 +114267,16 @@ aaa
 aaa
 aaa
 aaa
-aaa
-aaa
-aaa
+afO
+afX
 afX
 afX
 afX
 aab
 aaa
-aab
 aiv
+aqR
+ahR
 aiv
 aiv
 aiv
@@ -114658,17 +114524,17 @@ aaa
 aaa
 aaa
 aaa
-aaa
-aaa
-aaa
+afO
 afX
 afX
 afX
-abO
+afX
+afX
+aaa
+aiv
+aiv
+aiv
 akB
-akB
-akB
-acp
 acC
 aiv
 aiv
@@ -114915,13 +114781,13 @@ aaa
 aaa
 aaa
 aaa
-aaa
-aaa
-aaa
+afO
 afX
 afX
 afX
 aab
+aab
+aab
 akB
 aca
 aqd
@@ -115173,8 +115039,8 @@ aaa
 aaa
 aaa
 aaa
-aaa
-aaa
+afO
+afX
 afX
 afX
 afO
@@ -115430,11 +115296,11 @@ aaa
 aaa
 aaa
 aaa
-aaa
-aaa
 afO
 afX
-afO
+afX
+afX
+afX
 afO
 akB
 acb
@@ -115688,11 +115554,11 @@ aaa
 aaa
 aaa
 aaa
-aaa
 afO
 afX
 afX
-afO
+afX
+afX
 akB
 akW
 akW
@@ -115945,7 +115811,7 @@ aaa
 aaa
 aaa
 aaa
-aaa
+afO
 afO
 afO
 afX
@@ -116200,11 +116066,11 @@ aaa
 aaa
 aaa
 aaa
-abp
 aaa
 aaa
 aaa
 afO
+aaa
 afO
 anv
 akB
@@ -116457,13 +116323,13 @@ aaa
 aaa
 aaa
 aaa
+abp
 aaa
 aaa
 aaa
 aaa
 aaa
 afO
-afO
 akB
 acb
 alB
@@ -116471,7 +116337,7 @@ acv
 aqd
 acP
 adm
-aqd
+aij
 anA
 ael
 aeB
@@ -117499,7 +117365,7 @@ acx
 acE
 acE
 anA
-qTO
+ois
 alq
 afK
 amr