diff --git a/_maps/map_files/Pahrump/Pahrump-Underground-1.dmm b/_maps/map_files/Pahrump/Pahrump-Underground-1.dmm
index 0d0e8c64dd..de627951ac 100644
--- a/_maps/map_files/Pahrump/Pahrump-Underground-1.dmm
+++ b/_maps/map_files/Pahrump/Pahrump-Underground-1.dmm
@@ -35,10 +35,6 @@
 	icon_state = "housewood2"
 	},
 /area/f13/tunnel)
-"ag" = (
-/obj/structure/closet/boxinggloves,
-/turf/open/floor/plasteel/vault,
-/area/f13/brotherhood)
 "ah" = (
 /turf/open/indestructible/ground/inside/dirt,
 /area/f13/tunnel)
@@ -158,6 +154,16 @@
 	},
 /turf/open/indestructible/ground/inside/mountain,
 /area/f13/tunnel)
+"aC" = (
+/obj/structure/chair/booth{
+	dir = 4
+	},
+/obj/structure/window/reinforced{
+	dir = 8
+	},
+/obj/machinery/light,
+/turf/open/floor/plasteel/darkblue/side,
+/area/f13/brotherhood)
 "aD" = (
 /mob/living/simple_animal/hostile/handy/protectron,
 /turf/open/floor/f13{
@@ -195,11 +201,10 @@
 	},
 /area/f13/tunnel)
 "aJ" = (
-/obj/machinery/door/firedoor/heavy,
-/obj/machinery/door/airlock/hatch{
-	req_access_txt = "120"
+/obj/machinery/hydroponics/constructable,
+/turf/open/floor/plasteel/darkgreen/side{
+	dir = 1
 	},
-/turf/open/floor/plasteel/dark,
 /area/f13/brotherhood)
 "aK" = (
 /obj/effect/decal/cleanable/dirt,
@@ -428,6 +433,15 @@
 	icon_state = "greenrustyfull"
 	},
 /area/f13/tunnel)
+"bt" = (
+/obj/machinery/light{
+	dir = 8
+	},
+/obj/structure/closet/crate/bin,
+/turf/open/floor/plasteel/f13{
+	icon_state = "whitebluechess"
+	},
+/area/f13/brotherhood)
 "bu" = (
 /obj/structure/handrail/g_central{
 	dir = 1;
@@ -501,6 +515,10 @@
 /obj/structure/sign/warning/biohazard,
 /turf/closed/wall/f13/ruins,
 /area/f13/tunnel)
+"bI" = (
+/obj/structure/table,
+/turf/open/floor/plasteel/darkblue/side,
+/area/f13/brotherhood)
 "bJ" = (
 /obj/structure/dresser,
 /turf/open/floor/f13/wood{
@@ -548,10 +566,14 @@
 	},
 /area/f13/followers)
 "bS" = (
-/obj/machinery/door/airlock/hatch{
-	req_access_txt = "120"
+/obj/machinery/hydroponics/constructable,
+/obj/machinery/light{
+	dir = 1;
+	light_color = "#706891"
+	},
+/turf/open/floor/plasteel/darkgreen/side{
+	dir = 1
 	},
-/turf/open/floor/plating,
 /area/f13/brotherhood)
 "bT" = (
 /obj/machinery/door/airlock/medical{
@@ -769,41 +791,15 @@
 	},
 /area/f13/followers)
 "cC" = (
-/obj/item/clothing/under/f13/recon,
-/obj/item/clothing/under/f13/recon,
-/obj/item/clothing/under/f13/recon,
-/obj/item/clothing/shoes/jackboots,
-/obj/item/clothing/shoes/jackboots,
-/obj/item/clothing/shoes/jackboots,
-/obj/item/clothing/under/f13/recon,
-/obj/item/clothing/under/f13/recon,
-/obj/item/clothing/under/f13/recon,
-/obj/item/clothing/under/f13/recon,
-/obj/item/clothing/under/f13/recon,
-/obj/item/storage/belt/military/army,
-/obj/item/storage/belt/military/army,
-/obj/item/storage/belt/military/army,
-/obj/item/storage/belt/military/army,
-/obj/item/storage/belt/military/army,
-/obj/item/clothing/mask/gas/sechailer,
-/obj/item/clothing/mask/gas/sechailer,
-/obj/item/clothing/mask/gas/sechailer,
-/obj/item/clothing/under/syndicate/brotherhood,
-/obj/item/clothing/under/syndicate/brotherhood,
-/obj/item/clothing/under/syndicate/brotherhood,
-/obj/item/clothing/under/syndicate/brotherhood,
-/obj/item/clothing/under/syndicate/brotherhood,
-/obj/structure/closet{
-	anchored = 1;
-	name = "formal attire closet"
+/obj/structure/rack,
+/obj/effect/spawner/lootdrop/f13/weapon/gun/tier3,
+/obj/effect/spawner/lootdrop/f13/weapon/gun/tier1,
+/obj/effect/spawner/lootdrop/f13/weapon/gun/tier1,
+/obj/effect/spawner/lootdrop/f13/weapon/gun/tier2,
+/obj/effect/spawner/lootdrop/f13/weapon/gun/tier2,
+/turf/open/floor/plasteel/darkred/side{
+	dir = 4
 	},
-/obj/effect/turf_decal/bot_red,
-/obj/item/clothing/under/syndicate/brotherhood,
-/obj/item/clothing/under/syndicate/brotherhood,
-/obj/item/clothing/under/syndicate/brotherhood,
-/obj/item/clothing/under/syndicate/brotherhood,
-/obj/item/clothing/under/syndicate/brotherhood,
-/turf/open/floor/plasteel/dark,
 /area/f13/brotherhood)
 "cD" = (
 /obj/machinery/light/small,
@@ -868,12 +864,14 @@
 	},
 /area/f13/clinic)
 "cO" = (
-/obj/machinery/workbench,
-/turf/open/floor/plasteel/dark,
+/obj/structure/fermenting_barrel,
+/turf/open/floor/plasteel/darkgreen/side{
+	dir = 1
+	},
 /area/f13/brotherhood)
 "cP" = (
-/obj/structure/chair/office/light{
-	dir = 8
+/obj/structure/chalkboard{
+	pixel_x = 16
 	},
 /turf/open/floor/plasteel/dark,
 /area/f13/brotherhood)
@@ -1044,12 +1042,9 @@
 /turf/closed/wall/r_wall/f13/vault,
 /area/f13/bunker)
 "ds" = (
-/obj/machinery/light{
-	dir = 1;
-	light_color = "#706891"
-	},
+/obj/machinery/hydroponics/constructable,
 /turf/open/floor/plasteel/darkgreen/side{
-	dir = 1
+	dir = 5
 	},
 /area/f13/brotherhood)
 "dt" = (
@@ -1083,12 +1078,6 @@
 /obj/structure/flora/grass/wasteland,
 /turf/open/indestructible/ground/inside/mountain,
 /area/f13/caves)
-"dz" = (
-/obj/machinery/light{
-	dir = 1
-	},
-/turf/open/floor/f13,
-/area/f13/brotherhood)
 "dA" = (
 /obj/structure/table/wood,
 /obj/effect/spawner/lootdrop/f13/alcoholspawner,
@@ -1156,14 +1145,8 @@
 /turf/open/floor/f13/wood,
 /area/f13/tunnel)
 "dL" = (
-/obj/machinery/mineral/ore_redemption,
-/obj/structure/window/reinforced/tinted{
-	dir = 4
-	},
-/obj/structure/window/reinforced/tinted{
-	dir = 8
-	},
-/turf/open/floor/pod/light,
+/obj/machinery/hydroponics/constructable,
+/turf/open/floor/plasteel/dark,
 /area/f13/brotherhood)
 "dM" = (
 /obj/structure/chair/wood{
@@ -1313,6 +1296,15 @@
 /obj/item/surgical_drapes,
 /turf/open/floor/plasteel/freezer,
 /area/f13/brotherhood)
+"ej" = (
+/obj/structure/closet{
+	anchored = 1;
+	pixel_x = 7
+	},
+/turf/open/floor/plasteel/f13{
+	icon_state = "whitebluechess"
+	},
+/area/f13/brotherhood)
 "ek" = (
 /obj/structure/showcase/horrific_experiment{
 	icon_state = "pod_0"
@@ -1330,6 +1322,14 @@
 /obj/structure/barricade/wooden,
 /turf/open/indestructible/ground/inside/mountain,
 /area/f13/tunnel)
+"ep" = (
+/obj/machinery/light{
+	dir = 1
+	},
+/turf/open/floor/plasteel/f13{
+	icon_state = "whitebluechess"
+	},
+/area/f13/brotherhood)
 "eq" = (
 /obj/structure/table,
 /obj/item/radio,
@@ -1411,11 +1411,8 @@
 /turf/open/floor/plasteel/f13/vault_floor/yellow,
 /area/f13/tunnel)
 "eC" = (
-/obj/machinery/light{
-	dir = 8;
-	light_color = "#e8eaff"
-	},
-/turf/open/floor/f13,
+/obj/structure/frame/machine,
+/turf/open/floor/plasteel/dark,
 /area/f13/brotherhood)
 "eD" = (
 /obj/structure/filingcabinet,
@@ -1565,12 +1562,12 @@
 /obj/structure/timeddoor,
 /turf/open/indestructible/ground/inside/subway,
 /area/f13/tunnel)
-"fe" = (
-/obj/structure/closet/crate/bin,
-/turf/open/floor/f13,
-/area/f13/brotherhood)
 "fg" = (
-/turf/open/floor/plasteel/darkred,
+/obj/structure/table/reinforced,
+/obj/machinery/cell_charger,
+/turf/open/floor/plasteel/darkred/side{
+	dir = 5
+	},
 /area/f13/brotherhood)
 "fi" = (
 /obj/effect/decal/cleanable/dirt,
@@ -1589,14 +1586,6 @@
 	icon_state = "darkrusty"
 	},
 /area/f13/tunnel)
-"fl" = (
-/obj/machinery/light{
-	dir = 1
-	},
-/turf/open/floor/plasteel/darkred/corner{
-	dir = 4
-	},
-/area/f13/brotherhood)
 "fm" = (
 /obj/structure/handrail/g_central{
 	pixel_y = -16
@@ -1610,12 +1599,7 @@
 /turf/open/water,
 /area/f13/caves)
 "fo" = (
-/obj/structure/rack,
-/obj/effect/spawner/lootdrop/f13/weapon/gun/tier3,
-/obj/effect/spawner/lootdrop/f13/weapon/gun/tier1,
-/obj/effect/spawner/lootdrop/f13/weapon/gun/tier1,
-/obj/effect/spawner/lootdrop/f13/weapon/gun/tier2,
-/obj/effect/spawner/lootdrop/f13/weapon/gun/tier2,
+/obj/machinery/seed_extractor,
 /turf/open/floor/plasteel/dark,
 /area/f13/brotherhood)
 "fp" = (
@@ -1668,9 +1652,12 @@
 	},
 /area/f13/tunnel)
 "fw" = (
-/obj/structure/closet/crate/bin,
-/turf/open/floor/plasteel/darkblue/side{
-	dir = 5
+/obj/structure/reagent_dispensers/watertank/high,
+/obj/machinery/light{
+	dir = 8
+	},
+/turf/open/floor/plasteel/darkgreen/side{
+	dir = 8
 	},
 /area/f13/brotherhood)
 "fx" = (
@@ -1708,7 +1695,9 @@
 	},
 /area/f13/tunnel)
 "fC" = (
-/obj/structure/chair/office/light,
+/obj/structure/chair/office/light{
+	dir = 1
+	},
 /turf/open/floor/plasteel/dark,
 /area/f13/brotherhood)
 "fE" = (
@@ -1823,16 +1812,15 @@
 	},
 /area/f13/followers)
 "fX" = (
-/obj/effect/spawner/structure/window/hollow/reinforced/middle{
-	dir = 8
-	},
-/turf/closed/wall/r_wall/f13/vault,
+/obj/item/reagent_containers/glass/bucket,
+/obj/item/cultivator,
+/obj/item/shovel/spade,
+/turf/open/floor/plasteel/dark,
 /area/f13/brotherhood)
 "fY" = (
-/obj/structure/chair/office/light{
+/turf/open/floor/plasteel/darkgreen/corner{
 	dir = 4
 	},
-/turf/open/floor/plasteel/dark,
 /area/f13/brotherhood)
 "fZ" = (
 /obj/effect/decal/cleanable/dirt,
@@ -1854,7 +1842,10 @@
 	},
 /area/f13/followers)
 "gb" = (
-/obj/structure/chalkboard,
+/obj/machinery/light{
+	dir = 1
+	},
+/obj/structure/chair/office/light,
 /turf/open/floor/plasteel/darkpurple/side{
 	dir = 1
 	},
@@ -1924,20 +1915,52 @@
 /turf/open/indestructible/ground/inside/mountain,
 /area/f13/tunnel)
 "gn" = (
-/obj/structure/closet/crate/secure/weapon{
-	anchored = 1
+/obj/item/clothing/suit/poncho,
+/obj/item/clothing/suit/poncho,
+/obj/item/clothing/suit/poncho,
+/obj/item/clothing/suit/hooded/cloak/goliath{
+	armor = list("melee" = 10, "bullet" = 10, "laser" = 25, "energy" = 10, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 15, "acid" = 15);
+	name = "red cloak"
+	},
+/obj/item/clothing/suit/hooded/cloak/goliath{
+	armor = list("melee" = 10, "bullet" = 10, "laser" = 25, "energy" = 10, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 15, "acid" = 15);
+	name = "red cloak"
+	},
+/obj/item/clothing/suit/hooded/cloak/goliath{
+	armor = list("melee" = 10, "bullet" = 10, "laser" = 25, "energy" = 10, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 15, "acid" = 15);
+	name = "red cloak"
+	},
+/obj/item/clothing/suit/hooded/cloak/goliath{
+	armor = list("melee" = 10, "bullet" = 10, "laser" = 25, "energy" = 10, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 15, "acid" = 15);
+	name = "red cloak"
+	},
+/obj/item/clothing/under/f13/roving,
+/obj/item/clothing/under/f13/roving,
+/obj/item/clothing/under/f13/roving,
+/obj/item/clothing/mask/gas/explorer,
+/obj/item/clothing/mask/gas/explorer,
+/obj/item/clothing/mask/gas/explorer,
+/obj/item/clothing/mask/gas/explorer,
+/obj/item/clothing/mask/gas/explorer,
+/obj/item/clothing/under/syndicate/brotherhood,
+/obj/item/clothing/under/syndicate/brotherhood,
+/obj/item/clothing/under/syndicate/brotherhood,
+/obj/item/clothing/under/syndicate/brotherhood,
+/obj/item/clothing/under/syndicate/brotherhood,
+/obj/structure/closet{
+	anchored = 1;
+	name = "Disguise Closet"
 	},
-/obj/item/stock_parts/cell/ammo/mfc,
-/obj/item/stock_parts/cell/ammo/mfc,
-/obj/item/stock_parts/cell/ammo/mfc,
-/obj/item/stock_parts/cell/ammo/mfc,
-/obj/item/stock_parts/cell/ammo/mfc,
-/obj/item/stock_parts/cell/ammo/mfc,
-/obj/item/stock_parts/cell/ammo/mfc,
-/obj/item/stock_parts/cell/ammo/mfc,
-/obj/item/stock_parts/cell/ammo/mfc,
 /obj/effect/turf_decal/bot_red,
-/turf/open/floor/plasteel/dark,
+/obj/effect/spawner/lootdrop/f13/armor/tier2,
+/obj/effect/spawner/lootdrop/f13/armor/tier2,
+/obj/effect/spawner/lootdrop/f13/armor/tier2,
+/obj/structure/window/reinforced{
+	dir = 4
+	},
+/turf/open/floor/plasteel/darkred/side{
+	dir = 1
+	},
 /area/f13/brotherhood)
 "go" = (
 /obj/effect/decal/cleanable/blood/gibs/down{
@@ -1995,7 +2018,11 @@
 /turf/open/indestructible/ground/inside/mountain,
 /area/f13/tunnel)
 "gv" = (
-/obj/structure/closet/crate/bin,
+/obj/structure/table/reinforced,
+/obj/item/storage/box/handcuffs{
+	pixel_x = 3;
+	pixel_y = 8
+	},
 /turf/open/floor/plasteel/darkred/side{
 	dir = 6
 	},
@@ -2047,15 +2074,13 @@
 	},
 /area/f13/tunnel)
 "gD" = (
-/obj/structure/window/reinforced/spawner/north{
-	dir = 2
+/obj/machinery/door/airlock{
+	name = "Hydroponics";
+	req_access_txt = "120"
 	},
-/obj/structure/table/glass,
-/obj/machinery/recharger,
-/obj/structure/window/reinforced/spawner/north{
-	dir = 8
+/turf/open/floor/plasteel/darkgreen/side{
+	dir = 5
 	},
-/turf/open/floor/plasteel/dark,
 /area/f13/brotherhood)
 "gE" = (
 /obj/structure/bed,
@@ -2123,9 +2148,14 @@
 /area/f13/tunnel)
 "gP" = (
 /obj/structure/rack,
-/turf/open/floor/plasteel/darkred/side{
-	dir = 6
-	},
+/obj/effect/spawner/lootdrop/f13/advcrafting,
+/obj/effect/spawner/lootdrop/f13/advcrafting,
+/obj/effect/spawner/lootdrop/f13/advcrafting,
+/obj/effect/spawner/lootdrop/f13/advcrafting,
+/obj/effect/spawner/lootdrop/f13/advcrafting,
+/obj/effect/spawner/lootdrop/f13/advcrafting,
+/obj/item/stack/sheet/prewar/five,
+/turf/open/floor/plasteel/dark,
 /area/f13/brotherhood)
 "gQ" = (
 /obj/effect/decal/cleanable/blood/old{
@@ -2153,23 +2183,17 @@
 /area/f13/tunnel)
 "gU" = (
 /obj/structure/rack,
-/obj/item/gun/energy/laser/practice,
-/obj/item/gun/energy/laser/practice,
-/obj/item/gun/energy/laser/practice,
-/obj/item/gun/energy/laser/practice,
-/obj/item/gun/energy/laser/practice,
-/turf/open/floor/plasteel/dark,
+/obj/item/clothing/head/bomb_hood/security,
+/obj/item/clothing/suit/bomb_suit/security,
+/turf/open/floor/plasteel/darkred/side{
+	dir = 1
+	},
 /area/f13/brotherhood)
 "gV" = (
-/obj/structure/table/glass,
-/obj/structure/window/reinforced/spawner/north{
+/obj/machinery/vending/hydroseeds,
+/turf/open/floor/plasteel/darkgreen/side{
 	dir = 8
 	},
-/obj/structure/window/reinforced/spawner/north{
-	dir = 2
-	},
-/obj/item/integrated_circuit_printer,
-/turf/open/floor/plasteel/dark,
 /area/f13/brotherhood)
 "gW" = (
 /obj/item/radio/intercom{
@@ -2261,10 +2285,7 @@
 	},
 /area/f13/tunnel)
 "hi" = (
-/obj/structure/cable{
-	icon_state = "2-8"
-	},
-/turf/open/floor/plating,
+/turf/open/floor/plasteel/darkgreen/corner,
 /area/f13/brotherhood)
 "hj" = (
 /obj/effect/decal/cleanable/blood/splatter,
@@ -2439,6 +2460,13 @@
 /obj/structure/reagent_dispensers/fueltank,
 /turf/open/floor/plasteel/f13/vault_floor/yellow,
 /area/f13/tunnel)
+"hJ" = (
+/obj/machinery/light{
+	dir = 8;
+	light_color = "#e8eaff"
+	},
+/turf/open/floor/carpet/black,
+/area/f13/brotherhood)
 "hK" = (
 /obj/structure/bodycontainer/morgue{
 	dir = 8
@@ -2632,14 +2660,15 @@
 	},
 /area/f13/tunnel)
 "ir" = (
-/obj/machinery/door/window/westleft{
-	dir = 1;
-	req_one_access_txt = "120"
-	},
-/obj/machinery/door/firedoor/border_only{
+/obj/structure/window/reinforced/tinted{
 	dir = 1
 	},
-/turf/open/floor/mineral/plastitanium,
+/obj/structure/closet/secure_closet/personal{
+	anchored = 1
+	},
+/turf/open/floor/plasteel/darkred/side{
+	dir = 9
+	},
 /area/f13/brotherhood)
 "is" = (
 /obj/structure/barricade/bars,
@@ -2673,6 +2702,18 @@
 	icon_state = "greenrustyfull"
 	},
 /area/f13/clinic)
+"iw" = (
+/obj/machinery/light{
+	dir = 1
+	},
+/obj/structure/closet{
+	anchored = 1;
+	pixel_x = 7
+	},
+/turf/open/floor/plasteel/f13{
+	icon_state = "whitebluechess"
+	},
+/area/f13/brotherhood)
 "ix" = (
 /obj/structure/closet,
 /obj/effect/spawner/lootdrop/f13/weapon/gun/tier3,
@@ -2680,6 +2721,14 @@
 	icon_state = "greenrustyfull"
 	},
 /area/f13/clinic)
+"iy" = (
+/obj/structure/chair/booth{
+	dir = 8
+	},
+/turf/open/floor/plasteel/darkblue/side{
+	dir = 6
+	},
+/area/f13/brotherhood)
 "iz" = (
 /obj/structure/closet/cabinet,
 /obj/item/taperecorder,
@@ -2744,9 +2793,12 @@
 	},
 /area/f13/tunnel)
 "iG" = (
-/obj/machinery/light,
-/turf/open/floor/f13{
-	icon_state = "grass2"
+/obj/machinery/door/airlock{
+	name = "Hydroponics";
+	req_access_txt = "120"
+	},
+/turf/open/floor/plasteel/darkgreen/side{
+	dir = 6
 	},
 /area/f13/brotherhood)
 "iH" = (
@@ -2767,6 +2819,10 @@
 	icon_state = "darkrustysolid"
 	},
 /area/f13/tunnel)
+"iI" = (
+/obj/structure/mirror,
+/turf/closed/wall/r_wall/f13/vault,
+/area/f13/brotherhood)
 "iJ" = (
 /obj/effect/decal/cleanable/dirt,
 /mob/living/simple_animal/hostile/ghoul/glowing,
@@ -2786,15 +2842,6 @@
 /obj/item/stack/sheet/cardboard/fifty,
 /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust,
 /area/f13/tunnel)
-"iM" = (
-/obj/structure/table/abductor{
-	desc = "After YEARS of research, prototyping, and testing, the brotherhood created the sequel to the table. Advanced flat surface technology at work!";
-	name = "advanced table"
-	},
-/obj/item/paper_bin,
-/obj/item/pen/fourcolor,
-/turf/open/floor/carpet/black,
-/area/f13/brotherhood)
 "iN" = (
 /obj/structure/table/reinforced,
 /obj/effect/spawner/lootdrop/f13/cash_random_high,
@@ -2898,7 +2945,8 @@
 "jh" = (
 /obj/effect/spawner/structure/window/reinforced,
 /obj/structure/grille,
-/turf/open/floor/plasteel/f13/vault_floor/dark,
+/obj/structure/curtain,
+/turf/open/floor/plasteel/dark,
 /area/f13/brotherhood)
 "ji" = (
 /obj/structure/reagent_dispensers/barrel/four,
@@ -2959,8 +3007,8 @@
 	},
 /area/f13/bunker)
 "ju" = (
-/obj/machinery/light,
-/turf/open/floor/plating,
+/obj/structure/table/wood,
+/turf/open/floor/plasteel/darkgreen/side,
 /area/f13/brotherhood)
 "jv" = (
 /obj/effect/decal/waste{
@@ -2993,10 +3041,11 @@
 	},
 /area/f13/sewer)
 "jA" = (
-/obj/structure/dresser,
-/turf/open/floor/plasteel/f13{
-	icon_state = "whitebluechess"
+/obj/machinery/door/airlock{
+	name = "Hydroponics";
+	req_access_txt = "120"
 	},
+/turf/open/floor/plasteel/f13/vault_floor/dark,
 /area/f13/brotherhood)
 "jC" = (
 /obj/effect/decal/cleanable/blood/old{
@@ -3075,8 +3124,15 @@
 /turf/open/floor/plating/f13,
 /area/f13/followers)
 "jN" = (
-/obj/machinery/vending/dinnerware,
-/turf/open/floor/plasteel/f13/vault_floor/dark,
+/obj/structure/table,
+/obj/machinery/chem_dispenser/drinks,
+/obj/machinery/light{
+	dir = 1;
+	light_color = "#706891"
+	},
+/turf/open/floor/plasteel/darkblue/side{
+	dir = 9
+	},
 /area/f13/brotherhood)
 "jO" = (
 /obj/machinery/portable_atmospherics/scrubber,
@@ -3245,12 +3301,7 @@
 /turf/open/indestructible/ground/inside/subway,
 /area/f13/tunnel)
 "ks" = (
-/obj/structure/closet/fridge,
-/obj/effect/spawner/lootdrop/f13/foodspawner,
-/obj/effect/spawner/lootdrop/f13/foodspawner,
-/obj/machinery/light{
-	dir = 8
-	},
+/obj/structure/closet/secure_closet/freezer/meat,
 /turf/open/floor/plasteel/darkblue/side{
 	dir = 8
 	},
@@ -3338,17 +3389,6 @@
 	icon_state = "dark"
 	},
 /area/f13/bunker)
-"kG" = (
-/obj/structure/table/abductor{
-	desc = "After YEARS of research, prototyping, and testing, the brotherhood created the sequel to the table. Advanced flat surface technology at work!";
-	name = "advanced table"
-	},
-/obj/item/paper_bin,
-/obj/item/pen/fountain/captain{
-	name = "elder's fountain pen"
-	},
-/turf/open/floor/carpet/black,
-/area/f13/brotherhood)
 "kH" = (
 /obj/structure/closet/secure_closet/personal,
 /turf/open/floor/f13{
@@ -3439,15 +3479,11 @@
 /turf/open/floor/plasteel/f13/vault_floor/yellow,
 /area/f13/tunnel)
 "kW" = (
-/obj/structure/rack,
-/obj/item/pda,
-/obj/item/pda,
-/obj/item/pda,
-/obj/item/pda,
-/obj/item/pda,
-/obj/item/pda,
-/obj/item/pda,
-/turf/open/floor/plasteel/dark,
+/obj/structure/table,
+/obj/machinery/chem_dispenser/drinks/beer,
+/turf/open/floor/plasteel/darkblue/side{
+	dir = 1
+	},
 /area/f13/brotherhood)
 "kX" = (
 /obj/item/instrument/piano_synth,
@@ -3594,17 +3630,10 @@
 /turf/open/indestructible/ground/inside/mountain,
 /area/f13/tunnel)
 "lv" = (
-/obj/structure/rack,
-/obj/effect/spawner/lootdrop/f13/advcrafting,
-/obj/effect/spawner/lootdrop/f13/advcrafting,
-/obj/effect/spawner/lootdrop/f13/advcrafting,
-/obj/effect/spawner/lootdrop/f13/advcrafting,
-/obj/effect/spawner/lootdrop/f13/advcrafting,
-/obj/effect/spawner/lootdrop/f13/advcrafting,
-/obj/item/stack/sheet/prewar/five,
-/turf/open/floor/plasteel/darkred/side{
-	dir = 4
+/obj/structure/chair/office/dark{
+	dir = 8
 	},
+/turf/open/floor/plasteel/dark,
 /area/f13/brotherhood)
 "lw" = (
 /obj/machinery/vending/wardrobe/science_wardrobe,
@@ -3617,7 +3646,13 @@
 /turf/open/floor/wood,
 /area/f13/brotherhood)
 "lz" = (
-/obj/machinery/washing_machine,
+/obj/machinery/light{
+	dir = 1
+	},
+/obj/structure/closet{
+	anchored = 1;
+	pixel_x = -8
+	},
 /turf/open/floor/plasteel/f13{
 	icon_state = "whitebluechess"
 	},
@@ -3717,10 +3752,16 @@
 /area/f13/tunnel)
 "lQ" = (
 /obj/structure/table,
-/obj/machinery/chem_dispenser/drinks/beer{
-	dir = 1
+/obj/machinery/dish_drive{
+	pixel_y = 18
+	},
+/obj/item/storage/box/drinkingglasses{
+	pixel_x = 10;
+	pixel_y = 2
+	},
+/turf/open/floor/plasteel/darkblue/side{
+	dir = 5
 	},
-/turf/open/floor/plasteel/darkblue/side,
 /area/f13/brotherhood)
 "lR" = (
 /mob/living/simple_animal/hostile/ghoul/reaver,
@@ -3750,10 +3791,7 @@
 /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust,
 /area/f13/tunnel)
 "lV" = (
-/obj/machinery/rnd/server/bos,
-/obj/structure/window/reinforced/tinted{
-	dir = 8
-	},
+/obj/machinery/autolathe/constructionlathe,
 /turf/open/floor/plasteel/darkpurple/side,
 /area/f13/brotherhood)
 "lW" = (
@@ -3789,47 +3827,12 @@
 /turf/open/floor/plasteel/grimy,
 /area/f13/tunnel)
 "mb" = (
-/obj/item/clothing/suit/poncho,
-/obj/item/clothing/suit/poncho,
-/obj/item/clothing/suit/poncho,
-/obj/item/clothing/suit/hooded/cloak/goliath{
-	armor = list("melee" = 10, "bullet" = 10, "laser" = 25, "energy" = 10, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 15, "acid" = 15);
-	name = "red cloak"
-	},
-/obj/item/clothing/suit/hooded/cloak/goliath{
-	armor = list("melee" = 10, "bullet" = 10, "laser" = 25, "energy" = 10, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 15, "acid" = 15);
-	name = "red cloak"
-	},
-/obj/item/clothing/suit/hooded/cloak/goliath{
-	armor = list("melee" = 10, "bullet" = 10, "laser" = 25, "energy" = 10, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 15, "acid" = 15);
-	name = "red cloak"
-	},
-/obj/item/clothing/suit/hooded/cloak/goliath{
-	armor = list("melee" = 10, "bullet" = 10, "laser" = 25, "energy" = 10, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 15, "acid" = 15);
-	name = "red cloak"
-	},
-/obj/item/clothing/under/f13/roving,
-/obj/item/clothing/under/f13/roving,
-/obj/item/clothing/under/f13/roving,
-/obj/item/clothing/mask/gas/explorer,
-/obj/item/clothing/mask/gas/explorer,
-/obj/item/clothing/mask/gas/explorer,
-/obj/item/clothing/mask/gas/explorer,
-/obj/item/clothing/mask/gas/explorer,
-/obj/item/clothing/under/syndicate/brotherhood,
-/obj/item/clothing/under/syndicate/brotherhood,
-/obj/item/clothing/under/syndicate/brotherhood,
-/obj/item/clothing/under/syndicate/brotherhood,
-/obj/item/clothing/under/syndicate/brotherhood,
-/obj/structure/closet{
-	anchored = 1;
-	name = "Disguise Closet"
+/obj/structure/rack,
+/obj/item/gun/energy/laser/pistol,
+/obj/item/gun/energy/laser/pistol,
+/turf/open/floor/plasteel/darkred/side{
+	dir = 5
 	},
-/obj/effect/turf_decal/bot_red,
-/obj/effect/spawner/lootdrop/f13/armor/tier2,
-/obj/effect/spawner/lootdrop/f13/armor/tier2,
-/obj/effect/spawner/lootdrop/f13/armor/tier2,
-/turf/open/floor/plasteel/dark,
 /area/f13/brotherhood)
 "mc" = (
 /obj/effect/landmark/start/f13/followersdoctor,
@@ -3899,12 +3902,14 @@
 /area/f13/followers)
 "mn" = (
 /obj/structure/table/reinforced,
-/obj/item/storage/box/handcuffs{
-	pixel_x = 3;
-	pixel_y = 8
+/obj/item/toy/plush/nukeplushie{
+	desc = "A stuffed toy that resembles a Chinese spy/ The tag claims operatives to be purely fictitious and not stealing your armory.";
+	name = "Knight-Captain Aryom";
+	pixel_x = 7;
+	pixel_y = 12
 	},
 /turf/open/floor/plasteel/darkred/side{
-	dir = 4
+	dir = 5
 	},
 /area/f13/brotherhood)
 "mo" = (
@@ -3929,7 +3934,6 @@
 /turf/open/indestructible/ground/inside/mountain,
 /area/f13/caves)
 "mr" = (
-/obj/structure/fermenting_barrel,
 /obj/machinery/light,
 /turf/open/floor/plasteel/darkgreen/side,
 /area/f13/brotherhood)
@@ -3970,6 +3974,7 @@
 /area/f13/tunnel)
 "mw" = (
 /obj/machinery/light,
+/obj/structure/chair/stool,
 /turf/open/floor/plasteel/darkgreen/side,
 /area/f13/brotherhood)
 "mx" = (
@@ -4111,10 +4116,9 @@
 	},
 /area/f13/bunker)
 "mU" = (
-/obj/structure/table/reinforced,
-/turf/open/floor/plasteel/darkred/side{
-	dir = 6
-	},
+/obj/structure/rack,
+/obj/item/storage/bag/bio,
+/turf/open/floor/plasteel/dark,
 /area/f13/brotherhood)
 "mV" = (
 /obj/structure/closet/crate/miningcar,
@@ -4276,10 +4280,8 @@
 /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust,
 /area/f13/ncr)
 "nt" = (
-/obj/structure/table/reinforced,
-/turf/open/floor/plasteel/darkred/side{
-	dir = 4
-	},
+/obj/structure/chair/stool,
+/turf/open/floor/plasteel/dark,
 /area/f13/brotherhood)
 "nu" = (
 /turf/open/floor/f13{
@@ -4315,17 +4317,17 @@
 /turf/open/floor/f13/wood,
 /area/f13/building)
 "nA" = (
-/obj/structure/table/reinforced,
-/obj/machinery/cell_charger,
-/obj/item/toy/plush/nukeplushie{
-	desc = "A stuffed toy that resembles a Chinese spy/ The tag claims operatives to be purely fictitious and not stealing your armory.";
-	name = "chinese operative plushie";
-	pixel_x = 7;
-	pixel_y = 12
-	},
-/turf/open/floor/plasteel/darkred/side{
-	dir = 5
+/obj/structure/closet/crate/secure/weapon{
+	anchored = 1
 	},
+/obj/item/grenade/barrier,
+/obj/item/grenade/barrier,
+/obj/item/grenade/barrier,
+/obj/item/grenade/flashbang,
+/obj/item/grenade/flashbang,
+/obj/item/grenade/chem_grenade/teargas,
+/obj/effect/turf_decal/bot_red,
+/turf/open/floor/plasteel/darkred/side,
 /area/f13/brotherhood)
 "nB" = (
 /obj/effect/spawner/lootdrop/f13/foodspawner,
@@ -4430,11 +4432,8 @@
 /turf/open/indestructible/ground/inside/mountain,
 /area/f13/tunnel)
 "nY" = (
-/obj/structure/sink{
-	dir = 8;
-	pixel_x = -12;
-	pixel_y = 2
-	},
+/obj/machinery/light,
+/obj/structure/chair/bench,
 /turf/open/floor/plasteel/f13{
 	icon_state = "whitebluechess"
 	},
@@ -4526,9 +4525,13 @@
 /turf/open/floor/plating/tunnel,
 /area/f13/tunnel)
 "om" = (
-/obj/effect/turf_decal/arrows,
-/turf/open/floor/plasteel/vault/side{
-	dir = 1
+/obj/machinery/door/airlock/hatch{
+	name = "armory";
+	req_access_txt = "120"
+	},
+/obj/machinery/door/firedoor/heavy,
+/turf/open/floor/plasteel/darkred/side{
+	dir = 5
 	},
 /area/f13/brotherhood)
 "on" = (
@@ -4548,14 +4551,6 @@
 /obj/effect/decal/waste,
 /turf/open/floor/plating/tunnel,
 /area/f13/tunnel)
-"op" = (
-/obj/structure/table/abductor{
-	desc = "After YEARS of research, prototyping, and testing, the brotherhood created the sequel to the table. Advanced flat surface technology at work!";
-	name = "advanced table"
-	},
-/obj/machinery/recharger,
-/turf/open/floor/carpet/black,
-/area/f13/brotherhood)
 "oq" = (
 /obj/effect/spawner/lootdrop/trash,
 /turf/open/floor/f13{
@@ -4563,9 +4558,15 @@
 	},
 /area/f13/clinic)
 "or" = (
-/turf/open/floor/plasteel/darkred/corner{
+/obj/structure/table/glass,
+/obj/structure/window/reinforced/spawner/north{
 	dir = 8
 	},
+/obj/structure/window/reinforced/spawner/north{
+	dir = 2
+	},
+/obj/item/integrated_circuit_printer,
+/turf/open/floor/plasteel/dark,
 /area/f13/brotherhood)
 "os" = (
 /obj/structure/chair/wood{
@@ -4660,9 +4661,18 @@
 	},
 /area/f13/followers)
 "oH" = (
-/obj/structure/table/reinforced,
-/obj/machinery/reagentgrinder,
-/turf/open/floor/plasteel/f13/vault_floor/dark,
+/obj/structure/table/glass,
+/obj/item/integrated_electronics/analyzer,
+/obj/item/integrated_electronics/debugger,
+/obj/item/integrated_electronics/detailer,
+/obj/item/integrated_electronics/wirer,
+/obj/structure/window/reinforced/spawner/north{
+	dir = 2
+	},
+/obj/structure/window/reinforced/spawner/north{
+	dir = 4
+	},
+/turf/open/floor/plasteel/dark,
 /area/f13/brotherhood)
 "oI" = (
 /obj/machinery/light/small,
@@ -4677,9 +4687,15 @@
 /turf/open/floor/plasteel/vault,
 /area/f13/brotherhood)
 "oM" = (
-/obj/structure/table,
-/obj/item/storage/box/drinkingglasses,
-/turf/open/floor/plasteel/darkblue/side,
+/obj/structure/table/glass,
+/obj/structure/window/reinforced/spawner/north{
+	dir = 8
+	},
+/obj/structure/window/reinforced/spawner/north{
+	dir = 2
+	},
+/obj/item/flashlight/lamp,
+/turf/open/floor/plasteel/dark,
 /area/f13/brotherhood)
 "oN" = (
 /obj/structure/closet,
@@ -4700,6 +4716,14 @@
 	icon_state = "yellowdirtyfull"
 	},
 /area/f13/followers)
+"oR" = (
+/obj/structure/chair/comfy/shuttle{
+	desc = "A comfortable, secure seat. It has a very futuristic vouge feel.";
+	dir = 4;
+	name = "prewar lounge chair"
+	},
+/turf/open/floor/carpet/black,
+/area/f13/brotherhood)
 "oS" = (
 /obj/structure/simple_door/bunker,
 /turf/open/floor/f13{
@@ -4741,13 +4765,16 @@
 /turf/open/water,
 /area/f13/tunnel)
 "oX" = (
-/obj/machinery/door/window/westleft{
-	dir = 1;
-	req_one_access_txt = "120"
+/obj/structure/table/glass,
+/obj/structure/window/reinforced/spawner/north{
+	dir = 4
 	},
-/turf/open/floor/f13{
-	icon_state = "grass2"
+/obj/item/paper_bin,
+/obj/item/pen,
+/obj/structure/window/reinforced/spawner/north{
+	dir = 2
 	},
+/turf/open/floor/plasteel/dark,
 /area/f13/brotherhood)
 "oY" = (
 /obj/effect/decal/fakelattice{
@@ -4787,9 +4814,16 @@
 /area/f13/tunnel)
 "pd" = (
 /obj/structure/rack,
-/obj/item/gun/energy/laser/pistol,
-/obj/item/gun/energy/laser/pistol,
-/turf/open/floor/plasteel/dark,
+/obj/item/pda,
+/obj/item/pda,
+/obj/item/pda,
+/obj/item/pda,
+/obj/item/pda,
+/obj/item/pda,
+/obj/item/pda,
+/turf/open/floor/plasteel/darkred/side{
+	dir = 1
+	},
 /area/f13/brotherhood)
 "pe" = (
 /turf/open/floor/plasteel/darkpurple/side{
@@ -4797,10 +4831,9 @@
 	},
 /area/f13/brotherhood)
 "pf" = (
-/obj/machinery/vending/hydroseeds,
-/turf/open/floor/plasteel/darkgreen/side{
-	dir = 4
-	},
+/obj/machinery/microwave,
+/obj/structure/table/reinforced,
+/turf/open/floor/plasteel/f13/vault_floor/dark,
 /area/f13/brotherhood)
 "pg" = (
 /obj/machinery/light/small{
@@ -4931,6 +4964,20 @@
 	icon_state = "housewood4-broken"
 	},
 /area/f13/sewer)
+"pF" = (
+/obj/structure/curtain,
+/obj/structure/decoration/vent,
+/obj/machinery/shower{
+	dir = 4
+	},
+/obj/structure/window/reinforced/tinted{
+	dir = 8
+	},
+/obj/structure/window/reinforced/tinted,
+/turf/open/floor/plasteel/f13{
+	icon_state = "whitebluechess"
+	},
+/area/f13/brotherhood)
 "pG" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/generic,
@@ -4957,8 +5004,8 @@
 /turf/open/indestructible/ground/inside/mountain,
 /area/f13/tunnel)
 "pL" = (
-/obj/machinery/light{
-	dir = 4
+/obj/machinery/door/airlock/hatch{
+	req_access_txt = "120"
 	},
 /turf/open/floor/plasteel/f13{
 	icon_state = "whitebluechess"
@@ -5034,9 +5081,11 @@
 /turf/open/indestructible/ground/inside/mountain,
 /area/f13/tunnel)
 "pZ" = (
-/obj/structure/filingcabinet,
-/turf/open/floor/plasteel/darkred/side{
-	dir = 10
+/obj/machinery/light{
+	dir = 4
+	},
+/turf/open/floor/plasteel/darkblue/side{
+	dir = 4
 	},
 /area/f13/brotherhood)
 "qa" = (
@@ -5066,10 +5115,6 @@
 /obj/structure/rack,
 /turf/open/floor/f13/wood,
 /area/f13/building)
-"qe" = (
-/obj/structure/frame/computer,
-/turf/open/floor/carpet/black,
-/area/f13/brotherhood)
 "qf" = (
 /obj/machinery/autolathe/ammo,
 /turf/open/floor/plasteel/f13/vault_floor/yellow,
@@ -5109,10 +5154,9 @@
 /turf/closed/wall/f13/tunnel,
 /area/f13/sewer)
 "qm" = (
-/obj/machinery/biogenerator,
-/turf/open/floor/plasteel/darkgreen/side{
-	dir = 8
-	},
+/obj/effect/spawner/structure/window/hollow,
+/obj/structure/grille,
+/turf/open/floor/plasteel/dark,
 /area/f13/brotherhood)
 "qo" = (
 /obj/structure/bed/mattress{
@@ -5176,6 +5220,13 @@
 /obj/effect/decal/remains/human,
 /turf/open/indestructible/ground/inside/mountain,
 /area/f13/tunnel)
+"qy" = (
+/obj/machinery/light{
+	dir = 1;
+	light_color = "#706891"
+	},
+/turf/open/floor/plasteel/vault,
+/area/f13/brotherhood)
 "qz" = (
 /obj/structure/chalkboard,
 /turf/open/floor/plasteel/f13/vault_floor/yellow,
@@ -5236,6 +5287,10 @@
 /obj/machinery/light,
 /turf/open/floor/circuit/telecomms/mainframe,
 /area/f13/tcoms)
+"qK" = (
+/obj/structure/stacklifter,
+/turf/open/floor/plasteel/vault,
+/area/f13/brotherhood)
 "qL" = (
 /obj/machinery/door/unpowered/wooddoor{
 	autoclose = 1;
@@ -5313,9 +5368,8 @@
 /area/f13/tunnel)
 "ra" = (
 /obj/machinery/workbench/forge,
-/turf/open/floor/plasteel/darkred/side{
-	dir = 10
-	},
+/obj/machinery/light,
+/turf/open/floor/plasteel/dark,
 /area/f13/brotherhood)
 "rb" = (
 /obj/machinery/light/small{
@@ -5361,8 +5415,13 @@
 /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust,
 /area/f13/tunnel)
 "rl" = (
-/obj/structure/mirror,
-/turf/closed/wall/r_wall/f13/vault,
+/obj/structure/closet{
+	anchored = 1;
+	pixel_x = -8
+	},
+/turf/open/floor/plasteel/f13{
+	icon_state = "whitebluechess"
+	},
 /area/f13/brotherhood)
 "rm" = (
 /obj/structure/girder/reinforced,
@@ -5373,14 +5432,10 @@
 /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust,
 /area/f13/tunnel)
 "rp" = (
-/obj/structure/table/glass,
-/obj/structure/window/reinforced/spawner/north{
+/obj/item/twohanded/required/kirbyplants/random,
+/turf/open/floor/plasteel/darkred/side{
 	dir = 8
 	},
-/obj/structure/window/reinforced/spawner/north,
-/obj/item/paper_bin,
-/obj/item/pen,
-/turf/open/floor/plasteel/dark,
 /area/f13/brotherhood)
 "rq" = (
 /obj/machinery/door/airlock/hatch{
@@ -5449,19 +5504,24 @@
 /turf/open/floor/wood,
 /area/f13/tunnel)
 "rB" = (
-/obj/structure/urinal,
-/turf/closed/wall/r_wall/f13/vault,
+/obj/structure/toilet{
+	dir = 1
+	},
+/obj/machinery/light/small{
+	pixel_x = 10
+	},
+/turf/open/floor/plasteel/f13{
+	icon_state = "whitebluechess"
+	},
 /area/f13/brotherhood)
 "rD" = (
 /obj/effect/decal/cleanable/oil/slippery,
 /turf/closed/wall/r_wall/rust,
 /area/f13/bunker)
 "rE" = (
-/obj/machinery/door/airlock/hatch{
-	name = "armory";
-	req_access_txt = "120"
+/turf/open/floor/plasteel/darkred/corner{
+	dir = 4
 	},
-/turf/open/floor/plasteel/dark,
 /area/f13/brotherhood)
 "rF" = (
 /obj/structure/flora/grass/wasteland{
@@ -5576,7 +5636,7 @@
 /obj/machinery/light{
 	dir = 4
 	},
-/turf/open/floor/f13,
+/turf/open/floor/f13/wood,
 /area/f13/brotherhood)
 "rW" = (
 /obj/structure/rack,
@@ -5670,9 +5730,8 @@
 	},
 /area/f13/clinic)
 "sk" = (
-/obj/structure/reagent_dispensers/watertank/high,
 /turf/open/floor/plasteel/darkgreen/side{
-	dir = 9
+	dir = 8
 	},
 /area/f13/brotherhood)
 "sm" = (
@@ -5762,6 +5821,10 @@
 	},
 /turf/open/floor/wood,
 /area/f13/brotherhood)
+"sC" = (
+/obj/structure/weightlifter,
+/turf/open/floor/plasteel/vault,
+/area/f13/brotherhood)
 "sD" = (
 /obj/machinery/vending/boozeomat,
 /turf/open/floor/f13/wood,
@@ -5779,14 +5842,13 @@
 /turf/open/floor/wood,
 /area/f13/brotherhood)
 "sH" = (
-/obj/machinery/door/window/brigdoor{
-	dir = 8
+/obj/structure/table/reinforced,
+/obj/machinery/computer/terminal{
+	termtag = "Public"
 	},
-/obj/machinery/door/firedoor/border_only{
-	dir = 8
+/turf/open/floor/plasteel/darkred/side{
+	dir = 9
 	},
-/obj/structure/table/reinforced,
-/turf/open/floor/plasteel/dark,
 /area/f13/brotherhood)
 "sI" = (
 /obj/effect/decal/cleanable/dirt,
@@ -5841,6 +5903,12 @@
 	icon_state = "purplefull"
 	},
 /area/f13/followers)
+"sR" = (
+/obj/machinery/jukebox,
+/turf/open/floor/plasteel/darkblue/side{
+	dir = 10
+	},
+/area/f13/brotherhood)
 "sS" = (
 /turf/closed/mineral/random/high_chance,
 /area/f13/caves)
@@ -5854,8 +5922,14 @@
 /turf/open/indestructible/ground/inside/mountain,
 /area/f13/tunnel)
 "sU" = (
-/obj/structure/table,
-/obj/item/reagent_containers/food/drinks/coffee,
+/obj/structure/table/reinforced,
+/obj/structure/window/reinforced{
+	dir = 8
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 8
+	},
+/obj/item/storage/fancy/donut_box,
 /turf/open/floor/plasteel/dark,
 /area/f13/brotherhood)
 "sV" = (
@@ -5989,6 +6063,10 @@
 /obj/effect/spawner/lootdrop/trash,
 /turf/open/indestructible/ground/inside/mountain,
 /area/f13/tunnel)
+"tr" = (
+/obj/machinery/light,
+/turf/open/floor/plasteel/freezer,
+/area/f13/brotherhood)
 "ts" = (
 /obj/structure/table/booth,
 /obj/item/flashlight,
@@ -6215,7 +6293,7 @@
 	req_access_txt = "120"
 	},
 /obj/machinery/door/firedoor/heavy,
-/turf/open/floor/f13,
+/turf/open/floor/f13/wood,
 /area/f13/brotherhood)
 "uj" = (
 /obj/effect/decal/fakelattice{
@@ -6224,12 +6302,6 @@
 	},
 /turf/open/indestructible/ground/inside/mountain,
 /area/f13/caves)
-"uk" = (
-/obj/machinery/light{
-	dir = 1
-	},
-/turf/open/floor/plasteel/darkred/corner,
-/area/f13/brotherhood)
 "ul" = (
 /obj/structure/ladder/unbreakable{
 	height = 2;
@@ -6249,11 +6321,8 @@
 /turf/open/floor/plasteel/vault,
 /area/f13/brotherhood)
 "up" = (
-/obj/machinery/door/airlock/hatch{
-	name = "armory";
-	req_access_txt = "120"
-	},
-/obj/machinery/door/firedoor/heavy,
+/obj/structure/grille,
+/obj/effect/spawner/structure/window/reinforced,
 /turf/open/floor/plasteel/dark,
 /area/f13/brotherhood)
 "uq" = (
@@ -6423,6 +6492,10 @@
 	icon_state = "darkrusty"
 	},
 /area/f13/tunnel)
+"uR" = (
+/obj/structure/kitchenspike,
+/turf/open/floor/plasteel/freezer,
+/area/f13/brotherhood)
 "uS" = (
 /obj/structure/barricade/wooden,
 /turf/closed/mineral/random/high_chance,
@@ -6498,12 +6571,8 @@
 	},
 /area/f13/followers)
 "vc" = (
-/obj/machinery/light{
-	dir = 8
-	},
-/turf/open/floor/plasteel/vault/side{
-	dir = 1
-	},
+/obj/machinery/flasher/portable,
+/turf/open/floor/plasteel/dark,
 /area/f13/brotherhood)
 "vd" = (
 /obj/structure/closet/cabinet,
@@ -6532,10 +6601,6 @@
 /turf/open/floor/plating/tunnel,
 /area/f13/tunnel)
 "vi" = (
-/obj/machinery/light{
-	dir = 1;
-	light_color = "#706891"
-	},
 /turf/open/floor/plasteel/darkpurple/side{
 	dir = 1
 	},
@@ -6560,10 +6625,11 @@
 /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust,
 /area/f13/tunnel)
 "vn" = (
-/obj/machinery/door/airlock/hatch{
+/obj/machinery/door/airlock/security/glass{
+	name = "brig";
 	req_access_txt = "120"
 	},
-/turf/open/floor/plasteel/darkblue,
+/turf/open/floor/plasteel/dark,
 /area/f13/brotherhood)
 "vo" = (
 /obj/effect/decal/cleanable/blood/old{
@@ -6891,6 +6957,7 @@
 /obj/structure/chair{
 	dir = 4
 	},
+/obj/effect/landmark/start/f13/offduty,
 /turf/open/floor/plasteel/dark,
 /area/f13/brotherhood)
 "wk" = (
@@ -6928,12 +6995,13 @@
 /turf/open/indestructible/ground/inside/subway,
 /area/f13/tunnel)
 "ws" = (
-/obj/structure/table,
-/obj/machinery/chem_dispenser/drinks{
-	dir = 1
+/obj/structure/chair/booth{
+	dir = 4
 	},
-/obj/machinery/light,
-/turf/open/floor/plasteel/darkblue/side,
+/obj/structure/window/reinforced{
+	dir = 8
+	},
+/turf/open/floor/plasteel/dark,
 /area/f13/brotherhood)
 "wt" = (
 /obj/machinery/light{
@@ -6976,17 +7044,13 @@
 	},
 /area/f13/tunnel)
 "wz" = (
-/obj/structure/table/glass,
-/obj/item/integrated_electronics/analyzer,
-/obj/item/integrated_electronics/debugger,
-/obj/item/integrated_electronics/detailer,
-/obj/item/integrated_electronics/wirer,
-/obj/structure/window/reinforced/spawner/north{
-	dir = 2
+/obj/machinery/door/window/brigdoor{
+	dir = 8
 	},
-/obj/structure/window/reinforced/spawner/north{
-	dir = 4
+/obj/machinery/door/firedoor/border_only{
+	dir = 8
 	},
+/obj/structure/table/reinforced,
 /turf/open/floor/plasteel/dark,
 /area/f13/brotherhood)
 "wA" = (
@@ -6997,16 +7061,20 @@
 	icon_state = "greenrustyfull"
 	},
 /area/f13/clinic)
+"wB" = (
+/obj/structure/grille,
+/obj/effect/spawner/structure/window/reinforced,
+/obj/structure/curtain,
+/turf/open/floor/plasteel/dark,
+/area/f13/brotherhood)
 "wC" = (
 /mob/living/simple_animal/hostile/molerat,
 /turf/open/indestructible/ground/inside/mountain,
 /area/f13/tunnel)
 "wD" = (
-/obj/structure/chair{
-	dir = 8
-	},
-/obj/machinery/light{
-	dir = 4
+/obj/structure/curtain{
+	color = "#845f58";
+	pixel_x = 31
 	},
 /turf/open/floor/plasteel/darkred/side{
 	dir = 4
@@ -7092,17 +7160,16 @@
 /turf/open/floor/f13/wood,
 /area/f13/tunnel)
 "wT" = (
-/obj/structure/table/glass,
-/obj/structure/window/reinforced/spawner/north{
+/obj/machinery/light{
+	dir = 4
+	},
+/turf/open/floor/plasteel/darkpurple/side{
 	dir = 4
 	},
-/obj/item/stack/sheet/glass/fifty,
-/obj/item/stack/sheet/glass/fifty,
-/turf/open/floor/plasteel/dark,
 /area/f13/brotherhood)
 "wV" = (
 /obj/item/flag/bos,
-/turf/open/floor/f13,
+/turf/open/floor/carpet/black,
 /area/f13/brotherhood)
 "wW" = (
 /obj/item/clothing/head/f13/boscap,
@@ -7216,14 +7283,11 @@
 /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust,
 /area/f13/caves)
 "xq" = (
+/obj/machinery/autolathe/constructionlathe,
 /obj/structure/window/reinforced{
-	dir = 1
-	},
-/obj/machinery/workbench/advanced,
-/obj/item/book/granter/crafting_recipe/gunsmith_three,
-/turf/open/floor/plasteel/darkred/side{
-	dir = 1
+	dir = 4
 	},
+/turf/open/floor/plasteel/dark,
 /area/f13/brotherhood)
 "xr" = (
 /obj/structure/table/reinforced,
@@ -7351,6 +7415,17 @@
 	icon_state = "yellowdirtyfull"
 	},
 /area/f13/tunnel)
+"xL" = (
+/obj/effect/turf_decal/arrows{
+	dir = 1;
+	pixel_x = 8
+	},
+/obj/effect/turf_decal/arrows{
+	dir = 1;
+	pixel_x = -8
+	},
+/turf/open/floor/plasteel/vault/side,
+/area/f13/brotherhood)
 "xM" = (
 /obj/structure/toilet{
 	dir = 4
@@ -7410,6 +7485,13 @@
 	icon_state = "darkrustysolid"
 	},
 /area/f13/tunnel)
+"xU" = (
+/obj/machinery/light{
+	dir = 8;
+	light_color = "#e8eaff"
+	},
+/turf/open/floor/plasteel/vault,
+/area/f13/brotherhood)
 "xV" = (
 /obj/effect/decal/cleanable/blood/tracks,
 /turf/open/indestructible/ground/inside/mountain,
@@ -7429,12 +7511,15 @@
 /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust,
 /area/f13/tunnel)
 "xY" = (
-/obj/structure/window/reinforced/spawner/north,
-/obj/structure/toilet,
-/obj/machinery/door/firedoor/border_only{
+/obj/structure/window/reinforced/tinted{
+	dir = 1
+	},
+/obj/structure/closet/secure_closet/personal{
+	anchored = 1
+	},
+/turf/open/floor/plasteel/darkred/side{
 	dir = 1
 	},
-/turf/open/floor/mineral/plastitanium,
 /area/f13/brotherhood)
 "xZ" = (
 /obj/machinery/chem_master/advanced,
@@ -7504,6 +7589,12 @@
 /obj/structure/sign/departments/chemistry,
 /turf/closed/wall/r_wall/f13/vault,
 /area/f13/brotherhood)
+"yj" = (
+/obj/structure/chair/bench,
+/turf/open/floor/plasteel/f13{
+	icon_state = "whitebluechess"
+	},
+/area/f13/brotherhood)
 "yk" = (
 /obj/effect/spawner/lootdrop/f13/armor/random_high,
 /obj/structure/closet,
@@ -7534,6 +7625,10 @@
 	},
 /turf/open/indestructible/ground/inside/mountain,
 /area/f13/tunnel)
+"yn" = (
+/obj/structure/closet/boxinggloves,
+/turf/open/floor/plasteel/vault,
+/area/f13/brotherhood)
 "yo" = (
 /obj/structure/decoration/vent,
 /obj/machinery/shower{
@@ -7704,9 +7799,8 @@
 	},
 /area/f13/followers)
 "yQ" = (
-/obj/structure/reagent_dispensers/watertank/high,
 /turf/open/floor/plasteel/darkgreen/side{
-	dir = 5
+	dir = 4
 	},
 /area/f13/brotherhood)
 "yR" = (
@@ -7807,10 +7901,7 @@
 /turf/closed/wall/f13/ruins,
 /area/f13/tunnel)
 "zh" = (
-/obj/machinery/rnd/destructive_analyzer,
-/obj/structure/window/reinforced/tinted{
-	dir = 4
-	},
+/obj/structure/closet/crate/bin,
 /turf/open/floor/plasteel/darkpurple/side,
 /area/f13/brotherhood)
 "zi" = (
@@ -7834,6 +7925,10 @@
 	icon_state = "darkdirtysolid"
 	},
 /area/f13/tunnel)
+"zn" = (
+/obj/structure/target_stake,
+/turf/open/floor/plasteel/vault,
+/area/f13/brotherhood)
 "zo" = (
 /obj/effect/spawner/lootdrop/f13/armor/random_high,
 /obj/structure/closet,
@@ -7842,9 +7937,9 @@
 	},
 /area/f13/bunker)
 "zp" = (
-/obj/machinery/hydroponics/constructable,
-/turf/open/floor/plasteel/darkgreen/side{
-	dir = 1
+/obj/machinery/photocopier,
+/turf/open/floor/plasteel/darkred/side{
+	dir = 10
 	},
 /area/f13/brotherhood)
 "zq" = (
@@ -7905,9 +8000,10 @@
 /turf/open/floor/plasteel/f13/vault_floor/yellow,
 /area/f13/tunnel)
 "zz" = (
+/obj/structure/weightlifter,
 /obj/machinery/light{
-	dir = 4;
-	light_color = "#c1caff"
+	dir = 1;
+	light_color = "#706891"
 	},
 /turf/open/floor/plasteel/vault,
 /area/f13/brotherhood)
@@ -8064,17 +8160,8 @@
 /turf/open/indestructible/ground/inside/mountain,
 /area/f13/tunnel)
 "Ac" = (
-/obj/structure/window/reinforced/tinted{
-	dir = 4
-	},
-/obj/structure/window/reinforced/tinted{
-	dir = 1
-	},
-/obj/item/storage/bag/ore,
-/obj/item/pickaxe/drill,
-/obj/item/t_scanner/adv_mining_scanner/lesser,
-/obj/item/clothing/glasses/meson,
-/obj/structure/closet,
+/obj/item/stack/sheet/glass/fifty,
+/obj/item/stack/sheet/glass/fifty,
 /turf/open/floor/plasteel/dark,
 /area/f13/brotherhood)
 "Ad" = (
@@ -8166,7 +8253,9 @@
 /obj/item/circuitboard/machine/emitter/siege,
 /obj/structure/closet/crate/secure/weapon,
 /obj/effect/turf_decal/bot_red,
-/turf/open/floor/plasteel/dark,
+/turf/open/floor/plasteel/darkred/side{
+	dir = 4
+	},
 /area/f13/brotherhood)
 "At" = (
 /obj/machinery/door/firedoor/border_only{
@@ -8417,7 +8506,11 @@
 	},
 /area/f13/brotherhood)
 "Bm" = (
-/turf/open/floor/plasteel/darkred/corner,
+/obj/machinery/autolathe/ammo,
+/obj/structure/window/reinforced{
+	dir = 1
+	},
+/turf/open/floor/plasteel/dark,
 /area/f13/brotherhood)
 "Bn" = (
 /obj/item/pickaxe/drill,
@@ -8493,10 +8586,8 @@
 	},
 /area/f13/tunnel)
 "BA" = (
-/obj/machinery/light,
-/turf/open/floor/plasteel/darkred/corner{
-	dir = 1
-	},
+/obj/item/twohanded/required/kirbyplants/random,
+/turf/open/floor/plasteel/dark,
 /area/f13/brotherhood)
 "BB" = (
 /obj/effect/decal/cleanable/dirt,
@@ -8607,12 +8698,9 @@
 	},
 /area/f13/tunnel)
 "BT" = (
-/obj/item/stack/sheet/mineral/uranium{
-	amount = 25
-	},
-/obj/structure/rack,
-/obj/item/wrench,
-/turf/open/floor/plating,
+/obj/structure/table/glass,
+/obj/machinery/cell_charger,
+/turf/open/floor/plasteel/dark,
 /area/f13/brotherhood)
 "BU" = (
 /turf/closed/wall/rust,
@@ -8641,6 +8729,10 @@
 	dir = 1
 	},
 /area/f13/tunnel)
+"BZ" = (
+/obj/machinery/light,
+/turf/open/floor/f13/wood,
+/area/f13/brotherhood)
 "Ca" = (
 /obj/item/reagent_containers/pill/patch/healingpowder,
 /turf/open/floor/f13/wood{
@@ -8743,13 +8835,19 @@
 /turf/open/floor/plasteel,
 /area/f13/tcoms)
 "Co" = (
-/obj/structure/closet/crate/bin,
-/turf/open/floor/plasteel/darkpurple/side{
-	dir = 1
+/obj/structure/table/glass,
+/obj/structure/window/reinforced/spawner/north{
+	dir = 8
 	},
+/obj/item/paper_bin,
+/obj/item/pen,
+/turf/open/floor/plasteel/dark,
 /area/f13/brotherhood)
 "Cp" = (
-/obj/machinery/seed_extractor,
+/obj/machinery/hydroponics/constructable,
+/obj/machinery/light{
+	dir = 8
+	},
 /turf/open/floor/plasteel/darkgreen/side{
 	dir = 8
 	},
@@ -8852,6 +8950,10 @@
 	},
 /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust,
 /area/f13/tunnel)
+"CG" = (
+/obj/structure/sign/warning/electricshock,
+/turf/closed/wall/r_wall/f13/vault,
+/area/f13/brotherhood)
 "CH" = (
 /obj/structure/rack,
 /obj/effect/decal/cleanable/dirt,
@@ -8949,13 +9051,8 @@
 	},
 /area/f13/clinic)
 "CR" = (
-/obj/structure/window/reinforced/tinted{
-	dir = 8
-	},
-/obj/structure/window/reinforced/tinted{
-	dir = 1
-	},
-/obj/machinery/autolathe/constructionlathe,
+/obj/item/stack/sheet/metal/fifty,
+/obj/item/stack/sheet/metal/fifty,
 /turf/open/floor/plasteel/dark,
 /area/f13/brotherhood)
 "CS" = (
@@ -9002,15 +9099,22 @@
 /turf/open/floor/circuit/telecomms/mainframe,
 /area/f13/tcoms)
 "Db" = (
-/obj/structure/table/reinforced,
-/obj/structure/window/reinforced{
-	dir = 8
+/obj/structure/closet/crate/secure/weapon{
+	anchored = 1
 	},
-/obj/machinery/door/firedoor/border_only{
-	dir = 8
+/obj/item/stock_parts/cell/ammo/mfc,
+/obj/item/stock_parts/cell/ammo/mfc,
+/obj/item/stock_parts/cell/ammo/mfc,
+/obj/item/stock_parts/cell/ammo/mfc,
+/obj/item/stock_parts/cell/ammo/mfc,
+/obj/item/stock_parts/cell/ammo/mfc,
+/obj/item/stock_parts/cell/ammo/mfc,
+/obj/item/stock_parts/cell/ammo/mfc,
+/obj/item/stock_parts/cell/ammo/mfc,
+/obj/effect/turf_decal/bot_red,
+/turf/open/floor/plasteel/darkred/side{
+	dir = 10
 	},
-/obj/item/storage/fancy/donut_box,
-/turf/open/floor/plasteel/dark,
 /area/f13/brotherhood)
 "Dd" = (
 /obj/machinery/hydroponics/constructable,
@@ -9039,8 +9143,10 @@
 	},
 /area/f13/tunnel)
 "Dh" = (
-/obj/machinery/light{
-	dir = 8
+/obj/structure/sink{
+	dir = 8;
+	pixel_x = -12;
+	pixel_y = 2
 	},
 /turf/open/floor/plasteel/f13{
 	icon_state = "whitebluechess"
@@ -9074,7 +9180,10 @@
 /turf/open/floor/plasteel/freezer,
 /area/f13/brotherhood)
 "Dm" = (
-/obj/structure/stacklifter,
+/obj/structure/closet{
+	anchored = 1;
+	pixel_x = -8
+	},
 /turf/open/floor/plasteel/vault,
 /area/f13/brotherhood)
 "Dn" = (
@@ -9122,13 +9231,10 @@
 	},
 /area/f13/followers)
 "Ds" = (
-/obj/structure/window/reinforced/spawner/north,
-/obj/structure/table/glass,
-/obj/structure/window/reinforced/spawner/north{
-	dir = 4
-	},
-/obj/item/flashlight/lamp,
-/turf/open/floor/plasteel/dark,
+/obj/structure/table/reinforced,
+/obj/item/kitchen/rollingpin,
+/obj/item/kitchen/knife/butcher,
+/turf/open/floor/plasteel/f13/vault_floor/dark,
 /area/f13/brotherhood)
 "Dt" = (
 /obj/effect/decal/cleanable/dirt,
@@ -9215,8 +9321,8 @@
 /turf/open/water,
 /area/f13/tunnel)
 "DJ" = (
-/obj/structure/fence,
-/turf/open/floor/plasteel/vault,
+/obj/machinery/vending/dinnerware,
+/turf/open/floor/plasteel/f13/vault_floor/dark,
 /area/f13/brotherhood)
 "DK" = (
 /obj/structure/sink/puddle,
@@ -9231,9 +9337,14 @@
 /turf/open/floor/carpet/black,
 /area/f13/brotherhood)
 "DN" = (
-/obj/machinery/microwave,
-/obj/structure/table/reinforced,
-/turf/open/floor/plasteel/f13/vault_floor/dark,
+/obj/machinery/door/window/westleft{
+	dir = 1;
+	req_one_access_txt = "120"
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 1
+	},
+/turf/open/floor/mineral/plastitanium,
 /area/f13/brotherhood)
 "DO" = (
 /obj/structure/chair/office/dark,
@@ -9282,6 +9393,10 @@
 	icon_state = "redrustyfull"
 	},
 /area/f13/bunker)
+"DV" = (
+/obj/machinery/mineral/equipment_vendor,
+/turf/open/floor/plasteel/vault/side,
+/area/f13/brotherhood)
 "DW" = (
 /turf/closed/wall/f13/ruins,
 /area/f13/tunnel)
@@ -9354,23 +9469,16 @@
 /area/f13/tunnel)
 "Ei" = (
 /obj/structure/window/reinforced/spawner/north,
-/obj/structure/table/glass,
-/obj/structure/window/reinforced/spawner/north{
-	dir = 8
-	},
-/obj/item/flashlight/lamp,
-/turf/open/floor/plasteel/dark,
-/area/f13/brotherhood)
-"Ej" = (
-/obj/machinery/light{
+/obj/structure/toilet,
+/obj/machinery/door/firedoor/border_only{
 	dir = 1
 	},
-/turf/open/floor/plasteel/darkred/corner{
-	dir = 8
-	},
+/turf/open/floor/mineral/plastitanium,
 /area/f13/brotherhood)
 "Ek" = (
-/turf/open/floor/plasteel/vault/corner,
+/turf/open/floor/plasteel/darkred/corner{
+	dir = 1
+	},
 /area/f13/brotherhood)
 "El" = (
 /obj/structure/chair/comfy/black{
@@ -9428,14 +9536,6 @@
 	icon_state = "greenrustyfull"
 	},
 /area/f13/tunnel)
-"Eu" = (
-/obj/structure/chair/comfy/shuttle{
-	desc = "A comfortable, secure seat. It has a very futuristic vouge feel.";
-	dir = 4;
-	name = "prewar lounge chair"
-	},
-/turf/open/floor/carpet/black,
-/area/f13/brotherhood)
 "Ev" = (
 /obj/machinery/light/fo13colored/Aqua{
 	dir = 1;
@@ -9444,12 +9544,6 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/f13/wood,
 /area/f13/tunnel)
-"Ew" = (
-/obj/machinery/light,
-/obj/structure/closet/crate/medical,
-/obj/effect/turf_decal/bot_red,
-/turf/open/floor/plasteel/dark,
-/area/f13/brotherhood)
 "Ex" = (
 /turf/open/floor/plasteel/darkred/side,
 /area/f13/brotherhood)
@@ -9461,10 +9555,15 @@
 /turf/open/floor/f13/wood,
 /area/f13/tunnel)
 "Ez" = (
-/obj/structure/frame/machine,
-/turf/open/floor/plasteel/darkgreen/side{
-	dir = 1
+/obj/structure/closet/crate/medical,
+/obj/effect/turf_decal/bot_red,
+/obj/structure/window/reinforced{
+	dir = 4
 	},
+/obj/structure/window/reinforced{
+	dir = 8
+	},
+/turf/open/floor/plasteel/dark,
 /area/f13/brotherhood)
 "EA" = (
 /turf/open/floor/f13/wood{
@@ -9524,16 +9623,12 @@
 /turf/open/indestructible/ground/inside/mountain,
 /area/f13/caves)
 "EM" = (
-/obj/structure/table/reinforced,
-/obj/structure/window/reinforced{
+/obj/structure/chair/office/light{
 	dir = 8
 	},
-/obj/machinery/door/firedoor/border_only{
+/turf/open/floor/plasteel/darkred/side{
 	dir = 8
 	},
-/obj/item/paper_bin,
-/obj/item/pen,
-/turf/open/floor/plasteel/dark,
 /area/f13/brotherhood)
 "EN" = (
 /obj/structure/closet/crate,
@@ -9567,6 +9662,12 @@
 "ES" = (
 /turf/open/floor/mineral/plastitanium,
 /area/f13/brotherhood)
+"ET" = (
+/obj/machinery/light{
+	dir = 1
+	},
+/turf/open/floor/f13/wood,
+/area/f13/brotherhood)
 "EU" = (
 /obj/effect/spawner/lootdrop/trash,
 /turf/open/floor/f13{
@@ -9626,14 +9727,13 @@
 	},
 /area/f13/tunnel)
 "Fc" = (
-/obj/structure/table/glass,
-/obj/structure/window/reinforced/spawner/north{
+/obj/machinery/autolathe/constructionlathe,
+/obj/structure/window/reinforced{
 	dir = 4
 	},
-/obj/structure/window/reinforced/spawner/north{
-	dir = 2
+/obj/structure/window/reinforced{
+	dir = 8
 	},
-/obj/machinery/cell_charger,
 /turf/open/floor/plasteel/dark,
 /area/f13/brotherhood)
 "Fe" = (
@@ -9815,23 +9915,21 @@
 /turf/open/floor/f13/wood,
 /area/f13/building)
 "FK" = (
-/obj/structure/table/abductor{
-	desc = "After YEARS of research, prototyping, and testing, the brotherhood created the sequel to the table. Advanced flat surface technology at work!";
-	name = "advanced table"
+/obj/structure/chair/office/dark{
+	dir = 4
 	},
-/obj/item/phone,
-/turf/open/floor/carpet/black,
+/turf/open/floor/plasteel/dark,
 /area/f13/brotherhood)
 "FL" = (
-/obj/machinery/computer/rdconsole/core/bos{
-	dir = 1
-	},
-/obj/machinery/light,
 /turf/open/floor/plasteel/darkpurple/side,
 /area/f13/brotherhood)
 "FM" = (
-/obj/machinery/flasher/portable,
-/turf/open/floor/plasteel/darkred/corner,
+/obj/machinery/rnd/server/bos,
+/obj/structure/window/reinforced/spawner/north{
+	dir = 8
+	},
+/obj/structure/window/reinforced/spawner/north,
+/turf/open/floor/plasteel/darkpurple/side,
 /area/f13/brotherhood)
 "FN" = (
 /obj/item/chair/stool/retro/black,
@@ -9909,7 +10007,7 @@
 /turf/open/floor/plasteel/dark,
 /area/f13/brotherhood)
 "FZ" = (
-/obj/machinery/hydroponics/constructable,
+/obj/machinery/smartfridge/bottlerack/gardentool,
 /turf/open/floor/plasteel/darkgreen/side{
 	dir = 6
 	},
@@ -10048,9 +10146,9 @@
 /area/f13/clinic)
 "Gz" = (
 /obj/structure/rack,
-/obj/item/clothing/head/bomb_hood/security,
-/obj/item/clothing/suit/bomb_suit/security,
-/turf/open/floor/plasteel/dark,
+/turf/open/floor/plasteel/darkred/side{
+	dir = 1
+	},
 /area/f13/brotherhood)
 "GA" = (
 /obj/effect/spawner/lootdrop/f13/cash_random_low,
@@ -10069,13 +10167,9 @@
 	},
 /area/f13/bunker)
 "GC" = (
-/obj/structure/table/glass,
-/obj/structure/window/reinforced/spawner/north{
-	dir = 8
-	},
-/obj/item/stack/sheet/metal/fifty,
-/obj/item/stack/sheet/metal/fifty,
-/turf/open/floor/plasteel/dark,
+/obj/machinery/rnd/production/protolathe,
+/obj/structure/window/reinforced/spawner/north,
+/turf/open/floor/plasteel/darkpurple/side,
 /area/f13/brotherhood)
 "GD" = (
 /mob/living/simple_animal/hostile/deathclaw,
@@ -10089,6 +10183,10 @@
 /area/f13/tunnel)
 "GF" = (
 /obj/item/twohanded/required/kirbyplants/random,
+/obj/structure/curtain{
+	color = "#845f58";
+	pixel_x = 31
+	},
 /turf/open/floor/plasteel/darkred/side{
 	dir = 6
 	},
@@ -10125,6 +10223,17 @@
 	icon_state = "yellowrustyfull"
 	},
 /area/f13/tunnel)
+"GM" = (
+/obj/structure/closet/crate/bin,
+/turf/open/floor/plasteel/darkblue/side,
+/area/f13/brotherhood)
+"GN" = (
+/obj/machinery/door/airlock/hatch{
+	req_access_txt = "120"
+	},
+/obj/machinery/door/firedoor/heavy,
+/turf/open/floor/carpet/black,
+/area/f13/brotherhood)
 "GO" = (
 /turf/open/floor/plasteel/neutral,
 /area/f13/tunnel)
@@ -10193,7 +10302,9 @@
 /turf/open/indestructible/ground/inside/subway,
 /area/f13/sewer)
 "Ha" = (
-/obj/structure/closet/crate/bin,
+/obj/machinery/light{
+	dir = 8
+	},
 /turf/open/floor/plasteel/f13{
 	icon_state = "whitebluechess"
 	},
@@ -10238,7 +10349,9 @@
 	},
 /area/f13/tunnel)
 "Hi" = (
-/obj/machinery/gibber,
+/obj/structure/closet/fridge,
+/obj/effect/spawner/lootdrop/f13/foodspawner,
+/obj/effect/spawner/lootdrop/f13/foodspawner,
 /turf/open/floor/plasteel/darkblue/side{
 	dir = 8
 	},
@@ -10292,10 +10405,9 @@
 /turf/closed/wall/f13/wood/house,
 /area/f13/caves)
 "Ht" = (
-/obj/machinery/jukebox,
-/turf/open/floor/plasteel/darkblue/side{
-	dir = 10
-	},
+/obj/machinery/computer/rdconsole/core/bos,
+/obj/structure/window/reinforced/spawner/north,
+/turf/open/floor/plasteel/darkpurple/side,
 /area/f13/brotherhood)
 "Hu" = (
 /obj/effect/spawner/lootdrop/f13/cash_random_low,
@@ -10416,10 +10528,16 @@
 	},
 /area/f13/clinic)
 "HR" = (
-/obj/item/twohanded/required/kirbyplants/random,
-/turf/open/floor/plasteel/darkred/side{
-	dir = 4
+/obj/structure/table/reinforced,
+/obj/structure/window/reinforced{
+	dir = 8
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 8
 	},
+/obj/item/paper_bin,
+/obj/item/pen,
+/turf/open/floor/plasteel/dark,
 /area/f13/brotherhood)
 "HS" = (
 /obj/machinery/door/unpowered/wooddoor{
@@ -10485,7 +10603,10 @@
 /turf/open/floor/circuit/telecomms/mainframe,
 /area/f13/tcoms)
 "Id" = (
-/obj/machinery/processor,
+/obj/machinery/deepfryer,
+/obj/machinery/light{
+	dir = 8
+	},
 /turf/open/floor/plasteel/darkblue/side{
 	dir = 8
 	},
@@ -10503,12 +10624,18 @@
 	},
 /area/f13/bunker)
 "Ig" = (
-/obj/structure/cable,
-/obj/machinery/power/port_gen/pacman/super,
+/obj/structure/rack,
+/obj/item/wrench,
+/obj/item/stack/sheet/mineral/uranium{
+	amount = 25
+	},
 /turf/open/floor/plating,
 /area/f13/brotherhood)
 "Ih" = (
-/obj/structure/closet/secure_closet/freezer/meat,
+/obj/machinery/light{
+	dir = 8
+	},
+/obj/structure/campfire/stove,
 /turf/open/floor/plasteel/darkblue/side{
 	dir = 8
 	},
@@ -10694,6 +10821,10 @@
 /obj/effect/spawner/lootdrop/f13/weapon/melee/random,
 /turf/open/indestructible/ground/inside/mountain,
 /area/f13/tunnel)
+"IO" = (
+/obj/machinery/gibber,
+/turf/open/floor/plasteel/freezer,
+/area/f13/brotherhood)
 "IP" = (
 /obj/structure/chair{
 	dir = 4
@@ -10743,10 +10874,21 @@
 	},
 /area/f13/brotherhood)
 "IW" = (
-/obj/structure/table/reinforced,
-/turf/open/floor/plasteel/darkred/side{
-	dir = 1
+/obj/effect/turf_decal/bot_red,
+/obj/structure/closet/crate/secure/weapon{
+	anchored = 1
 	},
+/obj/item/stock_parts/cell/ammo/ecp,
+/obj/item/stock_parts/cell/ammo/ecp,
+/obj/item/stock_parts/cell/ammo/ecp,
+/obj/item/stock_parts/cell/ammo/ecp,
+/obj/item/stock_parts/cell/ammo/ecp,
+/obj/item/stock_parts/cell/ammo/ecp,
+/obj/item/stock_parts/cell/ammo/ecp,
+/obj/item/stock_parts/cell/ammo/ecp,
+/obj/item/stock_parts/cell/ammo/ecp,
+/obj/item/stock_parts/cell/ammo/ecp,
+/turf/open/floor/plasteel/darkred/side,
 /area/f13/brotherhood)
 "IX" = (
 /obj/effect/decal/cleanable/generic,
@@ -10754,11 +10896,13 @@
 /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust,
 /area/f13/tunnel)
 "IY" = (
-/obj/machinery/shower{
-	pixel_y = 27
+/obj/structure/toilet{
+	pixel_y = 10
+	},
+/obj/machinery/light/small{
+	dir = 1;
+	pixel_x = -10
 	},
-/obj/structure/curtain,
-/obj/structure/decoration/vent,
 /turf/open/floor/plasteel/f13{
 	icon_state = "whitebluechess"
 	},
@@ -10865,32 +11009,10 @@
 /turf/open/indestructible/ground/inside/mountain,
 /area/f13/tunnel)
 "Js" = (
-/obj/item/clothing/suit/armor/f13/combat/brotherhood,
-/obj/item/clothing/suit/armor/f13/combat/brotherhood,
-/obj/item/clothing/suit/armor/f13/combat/brotherhood,
-/obj/item/clothing/suit/armor/f13/combat/brotherhood,
-/obj/item/clothing/mask/gas/sechailer/swat,
-/obj/item/clothing/mask/gas/sechailer/swat,
-/obj/item/clothing/head/helmet/f13/combat/brotherhood,
-/obj/item/clothing/head/helmet/f13/combat/brotherhood,
-/obj/item/clothing/head/helmet/f13/combat/brotherhood,
-/obj/item/clothing/head/helmet/f13/combat/brotherhood,
-/obj/item/clothing/mask/gas/sechailer/swat,
-/obj/item/clothing/mask/gas/sechailer/swat,
-/obj/item/storage/belt/military,
-/obj/item/storage/belt/military,
-/obj/item/storage/belt/military,
-/obj/item/storage/belt/military,
-/obj/item/storage/belt/military,
-/obj/structure/closet{
-	anchored = 1;
-	name = "formal attire closet"
-	},
-/obj/machinery/light{
+/obj/structure/rack,
+/turf/open/floor/plasteel/darkred/side{
 	dir = 4
 	},
-/obj/effect/turf_decal/bot_red,
-/turf/open/floor/plasteel/dark,
 /area/f13/brotherhood)
 "Jt" = (
 /obj/structure/table/reinforced,
@@ -10972,9 +11094,8 @@
 	},
 /area/f13/tunnel)
 "JH" = (
-/turf/open/floor/plasteel/darkred/corner{
-	dir = 4
-	},
+/obj/machinery/light,
+/turf/open/floor/plasteel/darkred/side,
 /area/f13/brotherhood)
 "JJ" = (
 /obj/structure/table,
@@ -11007,12 +11128,9 @@
 /turf/closed/wall/r_wall,
 /area/f13/tunnel)
 "JS" = (
-/obj/machinery/light{
-	dir = 4
-	},
-/turf/open/floor/plasteel/darkblue/side{
-	dir = 4
-	},
+/obj/machinery/rnd/production/circuit_imprinter,
+/obj/structure/window/reinforced/spawner/north,
+/turf/open/floor/plasteel/darkpurple/side,
 /area/f13/brotherhood)
 "JT" = (
 /obj/docking_port/stationary/bosaway/three,
@@ -11142,14 +11260,22 @@
 "Kn" = (
 /turf/closed/wall/f13/tunnel,
 /area/f13/tunnel)
+"Ko" = (
+/obj/machinery/light,
+/turf/open/floor/carpet/black,
+/area/f13/brotherhood)
 "Kp" = (
 /obj/structure/rack,
 /obj/item/storage/toolbox/mechanical,
 /turf/open/floor/plasteel/f13/vault_floor/yellow,
 /area/f13/tunnel)
 "Kq" = (
-/obj/machinery/chem_master/condimaster,
-/turf/open/floor/plasteel/f13/vault_floor/dark,
+/obj/machinery/rnd/destructive_analyzer,
+/obj/structure/window/reinforced/spawner/north{
+	dir = 4
+	},
+/obj/structure/window/reinforced/spawner/north,
+/turf/open/floor/plasteel/darkpurple/side,
 /area/f13/brotherhood)
 "Kr" = (
 /obj/structure/chair/wood{
@@ -11234,7 +11360,7 @@
 /area/f13/sewer)
 "KE" = (
 /obj/item/twohanded/required/kirbyplants/random,
-/turf/open/floor/f13,
+/turf/open/floor/f13/wood,
 /area/f13/brotherhood)
 "KF" = (
 /mob/living/simple_animal/hostile/supermutant/rangedmutant,
@@ -11250,14 +11376,21 @@
 	},
 /area/f13/tunnel)
 "KH" = (
-/obj/structure/sign/warning/electricshock,
-/turf/closed/wall/r_wall/f13/vault,
+/obj/item/storage/bag/ore,
+/obj/item/pickaxe/drill,
+/obj/item/t_scanner/adv_mining_scanner/lesser,
+/obj/item/clothing/glasses/meson,
+/obj/structure/rack,
+/obj/item/pickaxe/drill,
+/obj/item/t_scanner/adv_mining_scanner/lesser,
+/obj/item/storage/bag/ore,
+/obj/item/clothing/glasses/meson,
+/turf/open/floor/plasteel/vault/side,
 /area/f13/brotherhood)
 "KI" = (
 /obj/structure/chair{
 	dir = 4
 	},
-/obj/effect/landmark/start/f13/offduty,
 /turf/open/floor/plasteel/dark,
 /area/f13/brotherhood)
 "KJ" = (
@@ -11372,12 +11505,11 @@
 /turf/open/floor/plasteel/dark,
 /area/f13/brotherhood)
 "Lc" = (
-/obj/machinery/light/small{
-	dir = 4
-	},
-/obj/structure/toilet{
+/obj/structure/curtain,
+/obj/machinery/shower{
 	dir = 8
 	},
+/obj/structure/decoration/vent,
 /turf/open/floor/plasteel/f13{
 	icon_state = "whitebluechess"
 	},
@@ -11416,14 +11548,15 @@
 	},
 /area/f13/building)
 "Lk" = (
-/obj/structure/closet/secure_closet/contraband/armory{
-	name = "Knight-Captain's Locker";
-	req_access_txt = "120"
+/obj/machinery/light{
+	dir = 8
+	},
+/obj/structure/chair/bench{
+	pixel_x = 8
+	},
+/turf/open/floor/plasteel/darkred/side{
+	dir = 8
 	},
-/obj/item/pda/warden,
-/obj/item/clothing/suit/armor/f13/power_armor/t45d/knightcaptain,
-/obj/effect/turf_decal/bot_red,
-/turf/open/floor/plasteel/dark,
 /area/f13/brotherhood)
 "Ll" = (
 /obj/effect/decal/cleanable/dirt,
@@ -11439,9 +11572,11 @@
 /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust,
 /area/f13/tunnel)
 "Lm" = (
-/obj/structure/table,
+/obj/structure/chair/booth{
+	dir = 8
+	},
 /turf/open/floor/plasteel/darkblue/side{
-	dir = 6
+	dir = 4
 	},
 /area/f13/brotherhood)
 "Ln" = (
@@ -11487,12 +11622,6 @@
 	icon_state = "rubblepillar"
 	},
 /area/f13/tunnel)
-"Lw" = (
-/obj/structure/frame/computer{
-	dir = 1
-	},
-/turf/open/floor/carpet/black,
-/area/f13/brotherhood)
 "Lx" = (
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust,
@@ -11566,6 +11695,10 @@
 /area/f13/tunnel)
 "LI" = (
 /obj/item/twohanded/required/kirbyplants/random,
+/obj/structure/curtain{
+	color = "#845f58";
+	pixel_x = 31
+	},
 /turf/open/floor/plasteel/darkred/side{
 	dir = 5
 	},
@@ -11634,7 +11767,7 @@
 /obj/machinery/light{
 	dir = 1
 	},
-/turf/open/floor/plasteel/darkred/corner{
+/turf/open/floor/plasteel/darkred/side{
 	dir = 1
 	},
 /area/f13/brotherhood)
@@ -11747,6 +11880,13 @@
 	icon_state = "dark"
 	},
 /area/f13/building)
+"Ml" = (
+/obj/structure/rack,
+/obj/item/storage/belt/utility/full,
+/obj/item/storage/belt/utility/full,
+/obj/item/storage/belt/utility/full,
+/turf/open/floor/plasteel/dark,
+/area/f13/brotherhood)
 "Mm" = (
 /turf/open/floor/plasteel/grimy,
 /area/f13/tunnel)
@@ -11826,9 +11966,7 @@
 /turf/open/floor/f13/wood,
 /area/f13/building)
 "Mz" = (
-/turf/open/floor/plasteel/darkred/corner{
-	dir = 1
-	},
+/turf/open/floor/plasteel/darkred/corner,
 /area/f13/brotherhood)
 "MA" = (
 /turf/closed/indestructible/rock,
@@ -11908,16 +12046,9 @@
 	},
 /area/f13/tunnel)
 "MO" = (
-/obj/machinery/door/window/westleft{
-	dir = 1;
-	req_one_access_txt = "120"
-	},
-/obj/machinery/door/firedoor/border_only{
-	dir = 1
-	},
-/turf/open/floor/plasteel/darkred/side{
-	dir = 9
-	},
+/obj/machinery/workbench/advanced,
+/obj/item/book/granter/crafting_recipe/gunsmith_three,
+/turf/open/floor/plasteel/dark,
 /area/f13/brotherhood)
 "MP" = (
 /obj/machinery/light/small{
@@ -11986,17 +12117,10 @@
 /turf/open/floor/wood,
 /area/f13/brotherhood)
 "Na" = (
-/obj/item/target,
-/obj/item/target,
-/obj/item/target,
-/obj/item/target,
-/obj/item/target,
-/obj/item/target,
-/obj/item/target,
-/obj/structure/closet/crate,
-/turf/open/floor/plasteel/darkred/corner{
-	dir = 4
+/obj/structure/chair/bench{
+	pixel_x = -8
 	},
+/turf/open/floor/plasteel/dark,
 /area/f13/brotherhood)
 "Nb" = (
 /obj/machinery/light,
@@ -12011,9 +12135,7 @@
 	},
 /area/f13/tunnel)
 "Nd" = (
-/obj/item/reagent_containers/glass/bucket,
-/obj/item/cultivator,
-/obj/item/shovel/spade,
+/obj/machinery/biogenerator,
 /turf/open/floor/plasteel/dark,
 /area/f13/brotherhood)
 "Ne" = (
@@ -12303,8 +12425,8 @@
 	},
 /area/f13/clinic)
 "NR" = (
-/obj/machinery/photocopier,
-/turf/open/floor/plasteel/darkred/side,
+/obj/machinery/door/window/westleft,
+/turf/open/floor/f13,
 /area/f13/brotherhood)
 "NS" = (
 /obj/machinery/light/small{
@@ -12322,6 +12444,12 @@
 	},
 /turf/closed/wall/r_wall,
 /area/f13/tunnel)
+"NV" = (
+/obj/machinery/light{
+	dir = 4
+	},
+/turf/open/floor/plasteel/vault,
+/area/f13/brotherhood)
 "NW" = (
 /obj/structure/wreck/trash/two_barrels,
 /turf/open/floor/plasteel/f13/vault_floor/yellow{
@@ -12398,6 +12526,15 @@
 	icon_state = "housewood2"
 	},
 /area/f13/tunnel)
+"Og" = (
+/obj/structure/rack,
+/obj/item/gun/energy/laser/practice,
+/obj/item/gun/energy/laser/practice,
+/obj/item/gun/energy/laser/practice,
+/obj/item/gun/energy/laser/practice,
+/obj/item/gun/energy/laser/practice,
+/turf/open/floor/plasteel/vault,
+/area/f13/brotherhood)
 "Oh" = (
 /obj/machinery/door/unpowered/wooddoor{
 	autoclose = 1;
@@ -12414,18 +12551,16 @@
 /turf/open/floor/plating/f13,
 /area/f13/followers)
 "Oj" = (
-/obj/machinery/hydroponics/constructable,
+/obj/machinery/vending/hydronutrients,
 /turf/open/floor/plasteel/darkgreen/side{
 	dir = 10
 	},
 /area/f13/brotherhood)
 "Ok" = (
-/obj/machinery/light{
-	dir = 4
-	},
-/turf/open/floor/plasteel/darkpurple/side{
-	dir = 4
+/obj/machinery/door/airlock/freezer{
+	req_access_txt = "120"
 	},
+/turf/open/floor/plasteel/freezer,
 /area/f13/brotherhood)
 "Ol" = (
 /obj/machinery/chem_dispenser/drinks,
@@ -12484,6 +12619,19 @@
 	},
 /turf/open/indestructible/ground/inside/mountain,
 /area/f13/tunnel)
+"Ov" = (
+/obj/structure/curtain,
+/obj/structure/decoration/vent,
+/obj/machinery/shower{
+	dir = 4
+	},
+/obj/structure/window/reinforced/tinted{
+	dir = 8
+	},
+/turf/open/floor/plasteel/f13{
+	icon_state = "whitebluechess"
+	},
+/area/f13/brotherhood)
 "Ow" = (
 /obj/machinery/light{
 	dir = 4
@@ -12869,11 +13017,9 @@
 	},
 /area/f13/tunnel)
 "PE" = (
-/obj/machinery/shower{
-	dir = 1
+/obj/machinery/light{
+	dir = 4
 	},
-/obj/structure/curtain,
-/obj/structure/decoration/vent,
 /turf/open/floor/plasteel/f13{
 	icon_state = "whitebluechess"
 	},
@@ -12929,6 +13075,17 @@
 	icon_state = "reddirtyfull"
 	},
 /area/f13/bunker)
+"PP" = (
+/obj/structure/curtain,
+/obj/machinery/shower{
+	dir = 8
+	},
+/obj/structure/window/reinforced/tinted,
+/obj/structure/decoration/vent,
+/turf/open/floor/plasteel/f13{
+	icon_state = "whitebluechess"
+	},
+/area/f13/brotherhood)
 "PQ" = (
 /obj/structure/decoration/warning{
 	pixel_y = -2
@@ -12948,22 +13105,43 @@
 /turf/open/floor/plasteel/f13/vault_floor/yellow,
 /area/f13/tunnel)
 "PT" = (
-/obj/structure/closet/crate/secure/weapon{
-	anchored = 1
+/obj/item/clothing/under/f13/recon,
+/obj/item/clothing/under/f13/recon,
+/obj/item/clothing/under/f13/recon,
+/obj/item/clothing/shoes/jackboots,
+/obj/item/clothing/shoes/jackboots,
+/obj/item/clothing/shoes/jackboots,
+/obj/item/clothing/under/f13/recon,
+/obj/item/clothing/under/f13/recon,
+/obj/item/clothing/under/f13/recon,
+/obj/item/clothing/under/f13/recon,
+/obj/item/clothing/under/f13/recon,
+/obj/item/storage/belt/military/army,
+/obj/item/storage/belt/military/army,
+/obj/item/storage/belt/military/army,
+/obj/item/storage/belt/military/army,
+/obj/item/storage/belt/military/army,
+/obj/item/clothing/mask/gas/sechailer,
+/obj/item/clothing/mask/gas/sechailer,
+/obj/item/clothing/mask/gas/sechailer,
+/obj/item/clothing/under/syndicate/brotherhood,
+/obj/item/clothing/under/syndicate/brotherhood,
+/obj/item/clothing/under/syndicate/brotherhood,
+/obj/item/clothing/under/syndicate/brotherhood,
+/obj/item/clothing/under/syndicate/brotherhood,
+/obj/structure/closet{
+	anchored = 1;
+	name = "formal attire closet"
 	},
-/obj/item/stock_parts/cell/ammo/ec,
-/obj/item/stock_parts/cell/ammo/ec,
-/obj/item/stock_parts/cell/ammo/ec,
-/obj/item/stock_parts/cell/ammo/ec,
-/obj/item/stock_parts/cell/ammo/ec,
-/obj/item/stock_parts/cell/ammo/ec,
-/obj/item/stock_parts/cell/ammo/ec,
-/obj/item/stock_parts/cell/ammo/ec,
-/obj/item/stock_parts/cell/ammo/ec,
-/obj/item/stock_parts/cell/ammo/ec,
-/obj/item/stock_parts/cell/ammo/ec,
-/obj/item/stock_parts/cell/ammo/ec,
 /obj/effect/turf_decal/bot_red,
+/obj/item/clothing/under/syndicate/brotherhood,
+/obj/item/clothing/under/syndicate/brotherhood,
+/obj/item/clothing/under/syndicate/brotherhood,
+/obj/item/clothing/under/syndicate/brotherhood,
+/obj/item/clothing/under/syndicate/brotherhood,
+/obj/structure/window/reinforced{
+	dir = 4
+	},
 /turf/open/floor/plasteel/dark,
 /area/f13/brotherhood)
 "PU" = (
@@ -12982,7 +13160,12 @@
 /turf/open/indestructible/ground/inside/mountain,
 /area/f13/tunnel)
 "PW" = (
-/obj/effect/turf_decal/arrows,
+/obj/machinery/light{
+	dir = 1
+	},
+/obj/structure/chair/office/light{
+	dir = 4
+	},
 /turf/open/floor/plasteel/darkpurple/side{
 	dir = 1
 	},
@@ -12992,27 +13175,40 @@
 /turf/closed/wall/rust,
 /area/f13/tunnel)
 "PY" = (
-/obj/structure/closet/crate/secure/weapon{
-	anchored = 1
+/obj/item/clothing/suit/armor/f13/combat/brotherhood,
+/obj/item/clothing/suit/armor/f13/combat/brotherhood,
+/obj/item/clothing/suit/armor/f13/combat/brotherhood,
+/obj/item/clothing/suit/armor/f13/combat/brotherhood,
+/obj/item/clothing/mask/gas/sechailer/swat,
+/obj/item/clothing/mask/gas/sechailer/swat,
+/obj/item/clothing/head/helmet/f13/combat/brotherhood,
+/obj/item/clothing/head/helmet/f13/combat/brotherhood,
+/obj/item/clothing/head/helmet/f13/combat/brotherhood,
+/obj/item/clothing/head/helmet/f13/combat/brotherhood,
+/obj/item/clothing/mask/gas/sechailer/swat,
+/obj/item/clothing/mask/gas/sechailer/swat,
+/obj/item/storage/belt/military,
+/obj/item/storage/belt/military,
+/obj/item/storage/belt/military,
+/obj/item/storage/belt/military,
+/obj/item/storage/belt/military,
+/obj/structure/closet{
+	anchored = 1;
+	name = "formal attire closet"
 	},
-/obj/item/grenade/barrier,
-/obj/item/grenade/barrier,
-/obj/item/grenade/barrier,
-/obj/item/grenade/flashbang,
-/obj/item/grenade/flashbang,
-/obj/item/grenade/chem_grenade/teargas,
 /obj/effect/turf_decal/bot_red,
+/obj/structure/window/reinforced{
+	dir = 4
+	},
 /turf/open/floor/plasteel/dark,
 /area/f13/brotherhood)
 "PZ" = (
-/obj/structure/table/glass,
-/obj/structure/window/reinforced/spawner/north{
-	dir = 4
+/obj/structure/closet/secure_closet/personal{
+	anchored = 1
+	},
+/turf/open/floor/plasteel/darkred/side{
+	dir = 10
 	},
-/obj/structure/window/reinforced/spawner/north,
-/obj/item/paper_bin,
-/obj/item/pen,
-/turf/open/floor/plasteel/dark,
 /area/f13/brotherhood)
 "Qb" = (
 /obj/effect/decal/cleanable/dirt,
@@ -13030,7 +13226,7 @@
 	},
 /area/f13/building)
 "Qe" = (
-/obj/machinery/vending/wardrobe/chef_wardrobe,
+/obj/machinery/processor,
 /turf/open/floor/plasteel/darkblue/side{
 	dir = 10
 	},
@@ -13046,7 +13242,7 @@
 /area/f13/tunnel)
 "Qh" = (
 /obj/machinery/light,
-/turf/open/floor/f13,
+/turf/open/floor/plasteel/dark,
 /area/f13/brotherhood)
 "Qi" = (
 /turf/open/floor/plasteel/f13/vault_floor/yellow{
@@ -13095,14 +13291,10 @@
 	},
 /area/f13/tunnel)
 "Qs" = (
-/obj/structure/curtain,
-/obj/structure/decoration/vent,
-/obj/machinery/shower{
-	dir = 1
-	},
-/turf/open/floor/plasteel/f13{
-	icon_state = "whitebluechess"
+/obj/structure/closet/secure_closet/personal{
+	anchored = 1
 	},
+/turf/open/floor/plasteel/darkred/side,
 /area/f13/brotherhood)
 "Qt" = (
 /obj/effect/decal/cleanable/dirt,
@@ -13116,11 +13308,9 @@
 /turf/open/indestructible/ground/inside/mountain,
 /area/f13/tunnel)
 "Qw" = (
-/obj/structure/chair/office/light{
-	dir = 8
-	},
+/obj/structure/table/reinforced,
 /turf/open/floor/plasteel/darkred/side{
-	dir = 8
+	dir = 1
 	},
 /area/f13/brotherhood)
 "Qx" = (
@@ -13183,8 +13373,9 @@
 /turf/open/indestructible/ground/outside/ruins,
 /area/f13/tunnel)
 "QH" = (
-/obj/machinery/vending/tool,
-/turf/open/floor/plasteel/dark,
+/turf/open/floor/plasteel/darkred/corner{
+	dir = 8
+	},
 /area/f13/brotherhood)
 "QI" = (
 /obj/structure/mirror{
@@ -13194,6 +13385,12 @@
 	icon_state = "floordirtysolid"
 	},
 /area/f13/tunnel)
+"QJ" = (
+/obj/structure/dresser,
+/turf/open/floor/plasteel/f13{
+	icon_state = "whitebluechess"
+	},
+/area/f13/brotherhood)
 "QK" = (
 /obj/machinery/light{
 	dir = 4
@@ -13217,7 +13414,10 @@
 /turf/open/floor/plating/tunnel,
 /area/f13/tunnel)
 "QR" = (
-/obj/machinery/mineral/equipment_vendor,
+/obj/structure/table/glass,
+/obj/structure/window/reinforced/spawner/north{
+	dir = 4
+	},
 /turf/open/floor/plasteel/darkpurple/side{
 	dir = 1
 	},
@@ -13278,10 +13478,7 @@
 /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust,
 /area/f13/tunnel)
 "QZ" = (
-/obj/machinery/light{
-	dir = 1
-	},
-/turf/open/floor/plasteel/darkblue/side{
+/turf/open/floor/plasteel/darkblue/corner{
 	dir = 1
 	},
 /area/f13/brotherhood)
@@ -13331,10 +13528,6 @@
 	},
 /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust,
 /area/f13/tunnel)
-"Ri" = (
-/obj/machinery/rnd/production/circuit_imprinter,
-/turf/open/floor/plasteel/darkpurple/side,
-/area/f13/brotherhood)
 "Rj" = (
 /obj/structure/car,
 /turf/open/floor/plasteel/f13/vault_floor/yellow,
@@ -13362,9 +13555,8 @@
 	},
 /area/f13/tunnel)
 "Rn" = (
-/obj/item/storage/backpack/satchel/flat/secret{
-	layer = 1
-	},
+/obj/structure/table/glass,
+/obj/machinery/recharger,
 /turf/open/floor/plasteel/dark,
 /area/f13/brotherhood)
 "Rp" = (
@@ -13514,20 +13706,9 @@
 	},
 /area/f13/tunnel)
 "RN" = (
-/obj/structure/punching_bag,
+/obj/structure/table/reinforced,
 /turf/open/floor/plasteel/vault,
 /area/f13/brotherhood)
-"RO" = (
-/obj/structure/table/abductor{
-	desc = "After YEARS of research, prototyping, and testing, the brotherhood created the sequel to the table. Advanced flat surface technology at work!";
-	name = "advanced table"
-	},
-/obj/machinery/computer/terminal{
-	pixel_y = 3;
-	termtag = "Security"
-	},
-/turf/open/floor/carpet/black,
-/area/f13/brotherhood)
 "RP" = (
 /mob/living/simple_animal/hostile/deathclaw,
 /turf/open/floor/f13{
@@ -13559,8 +13740,12 @@
 /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust,
 /area/f13/caves)
 "RT" = (
-/obj/machinery/vending/clothing/bos,
-/turf/open/floor/plasteel/dark,
+/obj/machinery/light{
+	dir = 4
+	},
+/turf/open/floor/plasteel/darkred/side{
+	dir = 4
+	},
 /area/f13/brotherhood)
 "RU" = (
 /obj/machinery/power/smes/engineering,
@@ -13635,12 +13820,7 @@
 	},
 /area/f13/tunnel)
 "Sg" = (
-/obj/structure/table/abductor{
-	desc = "After YEARS of research, prototyping, and testing, the brotherhood created the sequel to the table. Advanced flat surface technology at work!";
-	name = "advanced table"
-	},
-/obj/machinery/cell_charger,
-/turf/open/floor/carpet/black,
+/turf/open/floor/f13/wood,
 /area/f13/brotherhood)
 "Si" = (
 /obj/structure/handrail/g_central{
@@ -13711,7 +13891,10 @@
 /turf/open/floor/plating,
 /area/f13/brotherhood)
 "Ss" = (
-/turf/open/floor/f13,
+/obj/machinery/door/airlock/medical/glass{
+	req_access_txt = "120"
+	},
+/turf/open/floor/plasteel/dark,
 /area/f13/brotherhood)
 "St" = (
 /obj/item/circular_saw,
@@ -13807,12 +13990,8 @@
 	},
 /area/f13/followers)
 "SJ" = (
-/obj/machinery/light{
-	dir = 8
-	},
-/turf/open/floor/plasteel/darkred/side{
-	dir = 8
-	},
+/obj/machinery/workbench,
+/turf/open/floor/plasteel/dark,
 /area/f13/brotherhood)
 "SK" = (
 /obj/structure/table,
@@ -13823,6 +14002,10 @@
 	icon_state = "yellowdirtyfull"
 	},
 /area/f13/clinic)
+"SL" = (
+/obj/structure/fence,
+/turf/open/floor/plasteel/vault,
+/area/f13/brotherhood)
 "SM" = (
 /obj/effect/decal/cleanable/blood/old{
 	icon_state = "gib5-old"
@@ -13832,9 +14015,9 @@
 	},
 /area/f13/tunnel)
 "SO" = (
-/obj/machinery/vending/hydronutrients,
-/turf/open/floor/plasteel/darkgreen/side{
-	dir = 4
+/obj/structure/closet/crate/bin,
+/turf/open/floor/plasteel/darkred/side{
+	dir = 10
 	},
 /area/f13/brotherhood)
 "SP" = (
@@ -13846,6 +14029,12 @@
 /obj/effect/landmark/start/f13/seniorscribe,
 /turf/open/floor/carpet/black,
 /area/f13/brotherhood)
+"SR" = (
+/obj/machinery/power/port_gen/pacman/super,
+/obj/structure/cable,
+/obj/machinery/light,
+/turf/open/floor/plating,
+/area/f13/brotherhood)
 "SS" = (
 /obj/machinery/icecream_vat,
 /turf/open/floor/plasteel/darkblue/side{
@@ -13877,9 +14066,7 @@
 /area/f13/brotherhood)
 "SY" = (
 /mob/living/simple_animal/cow/brahmin,
-/turf/open/floor/f13{
-	icon_state = "grass2"
-	},
+/turf/open/floor/plasteel/freezer,
 /area/f13/brotherhood)
 "SZ" = (
 /obj/structure/table,
@@ -14136,7 +14323,7 @@
 /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust,
 /area/f13/tunnel)
 "TJ" = (
-/obj/machinery/rnd/production/protolathe,
+/obj/machinery/light,
 /turf/open/floor/plasteel/darkpurple/side,
 /area/f13/brotherhood)
 "TK" = (
@@ -14221,11 +14408,16 @@
 	},
 /area/f13/tunnel)
 "TV" = (
-/obj/structure/chair/office/dark{
-	dir = 1
+/obj/structure/closet/secure_closet/contraband/armory{
+	name = "Knight-Captain's Locker";
+	req_access_txt = "120"
 	},
+/obj/item/pda/warden,
+/obj/item/clothing/suit/armor/f13/power_armor/t45d/knightcaptain,
+/obj/effect/turf_decal/bot_red,
+/obj/item/clothing/head/helmet/f13/power_armor/t45d,
 /turf/open/floor/plasteel/darkred/side{
-	dir = 4
+	dir = 6
 	},
 /area/f13/brotherhood)
 "TW" = (
@@ -14457,7 +14649,7 @@
 /turf/open/floor/f13/wood,
 /area/f13/tunnel)
 "UJ" = (
-/obj/structure/weightlifter,
+/obj/structure/punching_bag,
 /turf/open/floor/plasteel/vault,
 /area/f13/brotherhood)
 "UK" = (
@@ -14861,10 +15053,8 @@
 /turf/open/indestructible/ground/inside/mountain,
 /area/f13/radiation)
 "VT" = (
-/obj/structure/table/reinforced,
-/obj/item/kitchen/rollingpin,
-/obj/item/kitchen/knife/butcher,
-/turf/open/floor/plasteel/f13/vault_floor/dark,
+/obj/machinery/vending/wardrobe/chef_wardrobe,
+/turf/open/floor/plasteel/freezer,
 /area/f13/brotherhood)
 "VU" = (
 /obj/item/pickaxe,
@@ -15001,9 +15191,7 @@
 /area/f13/brotherhood)
 "Ws" = (
 /mob/living/simple_animal/chick,
-/turf/open/floor/f13{
-	icon_state = "grass2"
-	},
+/turf/open/floor/plasteel/freezer,
 /area/f13/brotherhood)
 "Wt" = (
 /mob/living/simple_animal/hostile/poison/giant_spider,
@@ -15070,6 +15258,7 @@
 /obj/structure/chair{
 	dir = 8
 	},
+/obj/effect/landmark/start/f13/offduty,
 /turf/open/floor/plasteel/dark,
 /area/f13/brotherhood)
 "WE" = (
@@ -15169,7 +15358,8 @@
 	},
 /area/f13/tunnel)
 "WR" = (
-/obj/machinery/deepfryer,
+/obj/structure/table/reinforced,
+/obj/machinery/reagentgrinder,
 /turf/open/floor/plasteel/f13/vault_floor/dark,
 /area/f13/brotherhood)
 "WS" = (
@@ -15205,7 +15395,6 @@
 /obj/structure/chair{
 	dir = 8
 	},
-/obj/effect/landmark/start/f13/offduty,
 /turf/open/floor/plasteel/dark,
 /area/f13/brotherhood)
 "WZ" = (
@@ -15260,9 +15449,7 @@
 	},
 /area/f13/tunnel)
 "Xh" = (
-/obj/machinery/door/airlock/hatch{
-	req_access_txt = "120"
-	},
+/obj/machinery/light,
 /turf/open/floor/plasteel/f13{
 	icon_state = "whitebluechess"
 	},
@@ -15302,20 +15489,27 @@
 	},
 /area/f13/followers)
 "Xo" = (
-/obj/structure/table/reinforced,
-/obj/machinery/computer/terminal{
-	termtag = "Public"
-	},
-/turf/open/floor/plasteel/darkred/side{
-	dir = 9
+/obj/structure/closet/crate/secure/weapon{
+	anchored = 1
 	},
+/obj/item/stock_parts/cell/ammo/ec,
+/obj/item/stock_parts/cell/ammo/ec,
+/obj/item/stock_parts/cell/ammo/ec,
+/obj/item/stock_parts/cell/ammo/ec,
+/obj/item/stock_parts/cell/ammo/ec,
+/obj/item/stock_parts/cell/ammo/ec,
+/obj/item/stock_parts/cell/ammo/ec,
+/obj/item/stock_parts/cell/ammo/ec,
+/obj/item/stock_parts/cell/ammo/ec,
+/obj/item/stock_parts/cell/ammo/ec,
+/obj/item/stock_parts/cell/ammo/ec,
+/obj/item/stock_parts/cell/ammo/ec,
+/obj/effect/turf_decal/bot_red,
+/turf/open/floor/plasteel/darkred/side,
 /area/f13/brotherhood)
 "Xp" = (
-/obj/structure/target_stake,
-/obj/structure/window/reinforced/spawner/north{
-	dir = 4
-	},
-/obj/item/target,
+/obj/structure/grille,
+/obj/effect/spawner/structure/window/reinforced,
 /turf/open/floor/f13,
 /area/f13/brotherhood)
 "Xq" = (
@@ -15445,12 +15639,14 @@
 /turf/open/floor/plating/tunnel,
 /area/f13/tunnel)
 "XM" = (
-/obj/structure/table,
-/obj/item/reagent_containers/food/drinks/beer,
-/obj/item/reagent_containers/food/drinks/beer,
-/turf/open/floor/plasteel/darkblue/side{
+/obj/machinery/mineral/ore_redemption,
+/obj/structure/window/reinforced/tinted{
 	dir = 4
 	},
+/obj/structure/window/reinforced/tinted{
+	dir = 8
+	},
+/turf/open/floor/pod/light,
 /area/f13/brotherhood)
 "XO" = (
 /obj/structure/decoration/vent{
@@ -15563,6 +15759,12 @@
 	},
 /turf/open/floor/plasteel/freezer,
 /area/f13/brotherhood)
+"Yf" = (
+/obj/machinery/washing_machine,
+/turf/open/floor/plasteel/f13{
+	icon_state = "whitebluechess"
+	},
+/area/f13/brotherhood)
 "Yg" = (
 /obj/structure/table/reinforced,
 /obj/item/flashlight/lamp,
@@ -15601,6 +15803,21 @@
 	icon_state = "housewood2-broken"
 	},
 /area/f13/tunnel)
+"Ym" = (
+/obj/item/target,
+/obj/item/target,
+/obj/item/target,
+/obj/item/target,
+/obj/item/target,
+/obj/item/target,
+/obj/item/target,
+/obj/structure/closet/crate{
+	anchored = 1
+	},
+/obj/item/target,
+/obj/item/target,
+/turf/open/floor/plasteel/vault,
+/area/f13/brotherhood)
 "Yn" = (
 /obj/item/ammo_casing/c10mm,
 /turf/open/floor/plasteel/f13/vault_floor/yellow,
@@ -15612,6 +15829,10 @@
 	icon_state = "housewood2"
 	},
 /area/f13/tunnel)
+"Yp" = (
+/obj/structure/urinal,
+/turf/closed/wall/r_wall/f13/vault,
+/area/f13/brotherhood)
 "Yq" = (
 /turf/open/floor/f13/wood,
 /area/f13/ncr)
@@ -15772,6 +15993,12 @@
 	dir = 1
 	},
 /area/f13/brotherhood)
+"YS" = (
+/obj/structure/simple_door/metal/fence{
+	dir = 8
+	},
+/turf/open/floor/plasteel/vault,
+/area/f13/brotherhood)
 "YT" = (
 /obj/structure/filingcabinet,
 /turf/open/floor/f13{
@@ -15841,13 +16068,11 @@
 /turf/open/floor/carpet/black,
 /area/f13/brotherhood)
 "Zg" = (
-/obj/structure/window/reinforced{
-	dir = 1
-	},
-/obj/machinery/autolathe/ammo,
-/turf/open/floor/plasteel/darkred/side{
-	dir = 5
+/obj/machinery/door/window/westleft{
+	dir = 1;
+	req_one_access_txt = "120"
 	},
+/turf/open/floor/plasteel/dark,
 /area/f13/brotherhood)
 "Zi" = (
 /obj/structure/rack,
@@ -15858,10 +16083,8 @@
 	},
 /area/f13/tunnel)
 "Zj" = (
-/obj/structure/simple_door/metal/fence{
-	dir = 8
-	},
-/turf/open/floor/plasteel/vault,
+/obj/machinery/chem_master/condimaster,
+/turf/open/floor/plasteel/freezer,
 /area/f13/brotherhood)
 "Zk" = (
 /obj/structure/reagent_dispensers/barrel/dangerous,
@@ -15890,15 +16113,31 @@
 /turf/open/indestructible/ground/inside/mountain,
 /area/f13/caves)
 "Zq" = (
-/obj/machinery/portable_atmospherics/scrubber,
-/obj/machinery/light,
-/turf/open/floor/plating,
+/mob/living/simple_animal/cow/brahmin,
+/obj/machinery/light{
+	dir = 8
+	},
+/turf/open/floor/f13{
+	icon_state = "grass2"
+	},
 /area/f13/brotherhood)
 "Zs" = (
 /obj/structure/barricade/bars,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust,
 /area/f13/tunnel)
+"Zt" = (
+/obj/machinery/power/terminal{
+	dir = 1
+	},
+/obj/structure/cable{
+	icon_state = "0-8"
+	},
+/obj/structure/cable{
+	icon_state = "0-2"
+	},
+/turf/open/floor/plating,
+/area/f13/brotherhood)
 "Zu" = (
 /obj/structure/table/reinforced,
 /obj/structure/barricade/bars,
@@ -16019,8 +16258,10 @@
 /turf/open/floor/plasteel,
 /area/f13/tcoms)
 "ZI" = (
-/obj/machinery/autolathe/constructionlathe,
-/turf/open/floor/plasteel/dark,
+/mob/living/simple_animal/cow/brahmin,
+/turf/open/floor/f13{
+	icon_state = "grass2"
+	},
 /area/f13/brotherhood)
 "ZJ" = (
 /obj/effect/spawner/lootdrop/f13/blueprintMid,
@@ -65207,7 +65448,6 @@ Fz
 Fz
 Fz
 Fz
-Fz
 NT
 NT
 NT
@@ -65231,7 +65471,8 @@ NT
 NT
 NT
 NT
-Fz
+NT
+NT
 Fz
 Fz
 Fz
@@ -65464,7 +65705,6 @@ Fz
 Fz
 Fz
 Fz
-Fz
 NT
 NT
 NT
@@ -65488,7 +65728,8 @@ NT
 NT
 NT
 NT
-Fz
+NT
+NT
 Fz
 Fz
 Fz
@@ -65721,15 +65962,15 @@ Fz
 Fz
 Fz
 Fz
-Fz
 NT
 NT
+aJ
 sk
 Cp
-qm
-Dd
 Dd
 Dd
+fw
+gV
 Oj
 NT
 Zl
@@ -65739,10 +65980,11 @@ Hi
 ks
 Ih
 Qe
-kt
-JB
-JB
-JB
+NT
+VT
+Zj
+uR
+IO
 NT
 NT
 Fz
@@ -65750,7 +65992,6 @@ Fz
 Fz
 Fz
 Fz
-Fz
 sS
 Fz
 Fz
@@ -65978,10 +66219,10 @@ Fz
 Fz
 Fz
 Fz
-Fz
 NT
 NT
-ds
+aJ
+mP
 mP
 mP
 mP
@@ -65996,10 +66237,11 @@ Tr
 Tr
 Tr
 QU
-kt
+Ok
 Ws
 SY
-JB
+OV
+tr
 NT
 NT
 Fz
@@ -66022,7 +66264,6 @@ Fz
 Fz
 Fz
 Fz
-Fz
 sS
 sS
 Fz
@@ -66235,31 +66476,31 @@ Fz
 Fz
 Fz
 Fz
-Fz
 NT
 NT
-zp
+bS
 mP
+dL
 mP
 Nd
-mP
+fX
 mP
 mr
 NT
 YR
-oH
-HX
 Tr
-HX
+pf
+Tr
+Tr
 HX
 QU
-oX
-JB
-JB
-iG
+NT
+qX
+NT
+NT
+NT
 NT
 NT
-Fz
 Fz
 Fz
 Fz
@@ -66492,27 +66733,28 @@ Fz
 Fz
 Fz
 sS
-sS
 NT
 NT
-Ez
+cO
 mP
 mP
 mP
+eC
 mP
 mP
 Ni
-nO
+jA
 Nr
-VT
+Tr
 WR
-DN
-Kq
 HX
+HX
+Ds
 QU
 kt
 Xj
-SY
+Zq
+JB
 JB
 NT
 NT
@@ -66533,7 +66775,6 @@ Fz
 Fz
 Fz
 Fz
-Fz
 sS
 Fz
 Fz
@@ -66749,14 +66990,14 @@ Fz
 Fz
 Fz
 Fz
-Fz
 NT
 NT
-zp
-mP
+bS
 mP
-Nd
+dL
 mP
+fo
+fX
 mP
 mw
 eb
@@ -66768,12 +67009,12 @@ Bl
 Bl
 pM
 kt
-JB
+Xj
+ZI
 JB
 JB
 NT
 NT
-sS
 Fz
 sS
 sS
@@ -67006,31 +67247,31 @@ Fz
 Fz
 Fz
 Fz
-Fz
 NT
 NT
-ds
+aJ
 mP
 mP
 mP
 mP
 mP
-Ni
+mP
+ju
 NT
 nO
 NT
-jN
-HX
 HX
 HX
 HX
+DJ
+NT
 XB
-nO
+NT
 jh
 jh
+wB
 NT
 NT
-sS
 Fz
 Fz
 sS
@@ -67263,15 +67504,15 @@ Fz
 Fz
 Fz
 Fz
-Fz
 NT
 NT
+ds
 yQ
-SO
-pf
 fr
 fr
 fr
+fY
+hi
 FZ
 NT
 Dw
@@ -67284,10 +67525,10 @@ Mv
 Mv
 Mv
 Mv
-Ht
+Mv
+sR
 NT
 NT
-sS
 Fz
 Fz
 Fz
@@ -67520,8 +67761,6 @@ Fz
 Fz
 Fz
 Fz
-Fz
-NT
 NT
 NT
 NT
@@ -67529,22 +67768,24 @@ NT
 NT
 NT
 NT
+gD
+iG
 NT
 NT
 Nr
-KI
+mP
 wj
 KI
 wj
 KI
 wj
 KI
+wj
 mP
-sU
-oM
+mP
+GM
 NT
 NT
-sS
 Fz
 Fz
 Fz
@@ -67777,7 +68018,7 @@ Fz
 Fz
 Fz
 Fz
-sS
+NT
 NT
 NT
 MZ
@@ -67785,23 +68026,23 @@ jl
 jl
 hE
 Fr
-vc
-NT
+eW
 NT
+jN
 QZ
-vC
+mP
 Ip
 Ip
 vC
 Ip
 vC
 vC
-mP
+vC
 mP
 ws
+aC
 NT
 NT
-Fz
 sS
 Fz
 Fz
@@ -68044,21 +68285,21 @@ Ax
 LA
 eW
 NT
-NT
-Nr
-WY
+kW
+mP
+mP
 WD
 WY
 WD
 WY
 WD
 WY
+WD
 mP
-mP
-lQ
+vC
+bI
 NT
 NT
-sS
 Fz
 Fz
 Fz
@@ -68301,19 +68542,19 @@ Ax
 LA
 eW
 NT
-NT
-fw
+lQ
 Bl
 Bl
+pZ
 Bl
-JS
 Bl
 Bl
 Bl
 Bl
-XM
+pZ
+Bl
 Lm
-NT
+iy
 NT
 NT
 NT
@@ -69338,7 +69579,7 @@ NT
 NT
 NT
 NT
-oC
+NT
 hp
 Wc
 NT
@@ -69591,11 +69832,11 @@ Sk
 EG
 qF
 Rf
-Gj
-Gj
-Gj
 IV
-aJ
+DN
+Sk
+ES
+NT
 Fr
 eW
 NT
@@ -69848,11 +70089,11 @@ Qy
 Nm
 jo
 mP
-Bm
-mi
-mi
-te
-XB
+Ex
+Ei
+Qy
+bd
+NT
 LA
 eW
 NT
@@ -70104,12 +70345,12 @@ NT
 NT
 NT
 aj
-mP
+vc
 wE
 NT
 NT
 NT
-oC
+NT
 LA
 Fr
 zF
@@ -70364,8 +70605,8 @@ jo
 mP
 Ex
 ir
-Sk
-ES
+Lk
+PZ
 NT
 YC
 Nb
@@ -70621,8 +70862,8 @@ LI
 wD
 GF
 xY
-Qy
-bd
+mP
+Qs
 NT
 LA
 Fr
@@ -70874,12 +71115,12 @@ oC
 NT
 NT
 NT
-NT
-NT
-NT
-NT
-NT
-NT
+qm
+vn
+qm
+xY
+Na
+Qs
 oC
 LA
 eW
@@ -71129,15 +71370,15 @@ LA
 Fr
 oL
 qF
-SJ
-Gj
 Gj
-SJ
 Gj
+rp
 Gj
-SJ
-IV
-TX
+rp
+Ek
+mP
+Ex
+oL
 Fr
 eW
 NT
@@ -71385,7 +71626,7 @@ oL
 LA
 eW
 XB
-jo
+LS
 mP
 mP
 mP
@@ -71393,7 +71634,7 @@ mP
 mP
 mP
 mP
-Ex
+JH
 NT
 YC
 Nb
@@ -71642,16 +71883,16 @@ NT
 LA
 Fr
 oL
-jo
-mP
-mP
-mP
-mP
-mP
-mP
+xR
+mi
+mi
+rE
 mP
-Ex
-TX
+Mz
+mi
+mi
+te
+oL
 Fr
 eW
 NT
@@ -71899,15 +72140,15 @@ NT
 SE
 Nb
 oC
-xR
-HR
-mi
-mi
-mi
+om
+NT
+XB
+sU
+wz
 HR
-Na
-mP
-Ex
+NT
+NT
+NT
 oC
 LA
 eW
@@ -72156,13 +72397,13 @@ KL
 LA
 eW
 NT
-rE
-XB
+qF
+Gj
 Db
 sH
 EM
-NT
-NT
+zp
+up
 nt
 mU
 NT
@@ -72413,15 +72654,15 @@ NT
 LA
 eW
 NT
-mP
+jo
 mP
 Xo
 Qw
-Qw
-pZ
-Mx
-Ss
-Ss
+mP
+Ex
+Ez
+mP
+SJ
 NT
 LA
 eW
@@ -72670,14 +72911,14 @@ NT
 LA
 eW
 NT
-uk
-JH
+LS
+mP
 IW
 fg
-fg
-NR
-Mx
-Ss
+mP
+Ex
+Fc
+mP
 Qh
 NT
 LA
@@ -72927,15 +73168,15 @@ NT
 hp
 Wc
 NT
-or
-Mz
+jo
+mP
 nA
 mn
 mi
 gv
 Mx
 Ss
-Ss
+up
 NT
 LA
 eW
@@ -73184,15 +73425,15 @@ NT
 Fr
 eW
 NT
-Bm
-JH
-mi
-Bm
-JH
+jo
+mP
+mP
+mP
+mP
 QH
-Mx
-Ss
-Ss
+Gj
+Gj
+SO
 NT
 LA
 eW
@@ -73441,15 +73682,15 @@ NT
 LA
 eW
 NT
-Ej
-Mz
-Gj
-or
+LS
+mP
+mP
+mP
 Mz
 RT
-NT
-Xp
-Qh
+mi
+mi
+TV
 NT
 YC
 Nb
@@ -73701,11 +73942,11 @@ NT
 gn
 PT
 PY
-Bm
-JH
 mP
+JH
+XB
 up
-Ss
+NR
 Xp
 NT
 LA
@@ -73958,12 +74199,12 @@ NT
 gU
 HY
 yw
-or
-BA
-NT
-XB
-fX
-fX
+mP
+Ex
+Bm
+FK
+mP
+HY
 NT
 LA
 eW
@@ -74216,10 +74457,10 @@ LS
 mP
 mP
 mP
-mP
+Ex
 MO
-Gj
-Gj
+mP
+mP
 ra
 NT
 LA
@@ -74235,7 +74476,7 @@ jl
 NT
 RU
 Sr
-Zq
+rT
 NT
 NT
 Fz
@@ -74470,14 +74711,14 @@ LA
 eW
 NT
 pd
-fo
-FM
-JH
-ZI
-xq
-Mz
-Bm
+Ml
+HY
+mP
 Ex
+xq
+mP
+mP
+mP
 NT
 LA
 eW
@@ -74491,8 +74732,8 @@ jl
 jl
 NT
 RU
-Sr
-EJ
+Zt
+SR
 NT
 NT
 Fz
@@ -74727,12 +74968,12 @@ LA
 eW
 NT
 Gz
-kW
-or
-Mz
-cO
+HY
+HY
+mP
+Ex
 Zg
-TV
+mP
 lv
 gP
 NT
@@ -74748,7 +74989,7 @@ jl
 jl
 NT
 Ly
-hi
+EJ
 Ig
 NT
 NT
@@ -74983,11 +75224,11 @@ NT
 LA
 eW
 NT
-fl
+LS
 mP
 mP
 mP
-Ew
+JH
 NT
 NT
 eu
@@ -75243,7 +75484,7 @@ NT
 mb
 cC
 Js
-Lk
+mi
 As
 NT
 RW
@@ -75261,9 +75502,9 @@ NT
 Km
 mZ
 NT
-EJ
-EJ
-ju
+CG
+TX
+NT
 NT
 NT
 NT
@@ -75512,22 +75753,22 @@ eW
 NT
 Fr
 Fr
-Fr
-rO
+mZ
+Ko
 NT
 wI
 WO
 NT
-EJ
-EJ
-BT
-NT
-NT
-NT
+DV
+Fr
+eW
 NT
 NT
 NT
-Fz
+YK
+ni
+eu
+NS
 Fz
 Fz
 Fz
@@ -75770,22 +76011,22 @@ NT
 NT
 NT
 XB
-oL
+GN
 NT
 NT
 NT
 NT
 KH
-bS
-NT
-NT
-NT
-NT
-YK
-ni
-eu
-NS
-Fz
+Fr
+BH
+Dy
+Jl
+Ue
+mP
+mP
+eM
+Lr
+mP
 Fz
 Fz
 Fz
@@ -76025,18 +76266,18 @@ LA
 eW
 NT
 wV
-eC
-Ss
-Ss
-Ss
-eC
-KE
+mZ
+hJ
+mZ
+hJ
+mZ
+wV
 NT
-Ek
+LA
 Fr
-mA
-Dy
-Jl
+Az
+bj
+RX
 Ue
 mP
 mP
@@ -76281,25 +76522,25 @@ NT
 LA
 eW
 NT
-Ss
-Ss
-Ss
-Ss
-Ss
-Ss
-Ss
+Sg
+Sg
+mZ
+oR
+mZ
+Sg
+Sg
 NT
 LA
-Kh
-Az
-bj
-RX
-Ue
-mP
-mP
-eM
-Lr
-mP
+eW
+XB
+NT
+NT
+NT
+YK
+Lb
+eu
+NS
+Fz
 Fz
 Fz
 sS
@@ -76538,28 +76779,28 @@ NT
 LA
 eW
 NT
-Ss
 Sg
-FK
-mZ
+Sg
 fu
 fu
-Ss
+fu
+Sg
+Sg
 NT
 LA
 eW
 NT
+Og
+Ym
+NT
+NT
+NT
+NT
+NT
+NT
 NT
 NT
 NT
-YK
-Lb
-eu
-NS
-Fz
-Fz
-Fz
-Fz
 sS
 Fz
 Fz
@@ -76785,8 +77026,8 @@ oL
 Cx
 mP
 hf
-yJ
 hf
+yJ
 hf
 hf
 hf
@@ -76795,28 +77036,28 @@ mj
 Fr
 eW
 NT
-Ss
-op
-qe
-mZ
-Lw
-fu
-Ss
+ET
+Sg
+Sg
+Sg
+Sg
+Sg
+BZ
 NT
 LA
 eW
 NT
+qy
+Fr
+RN
+Fr
+Fr
+xU
+Fr
+Fr
+zn
 NT
 NT
-NT
-NT
-NT
-NT
-Fz
-Fz
-Fz
-Fz
-Fz
 Fz
 Fz
 Fz
@@ -77036,44 +77277,44 @@ my
 NT
 ZF
 NT
-LA
-eW
+YC
+Nb
 NT
 Co
+or
 mP
-rp
-GC
-gV
 mP
 mP
+BA
+FM
 CR
 lV
 NT
 LA
 eW
 NT
-dz
-RO
-mZ
-mZ
-mZ
-fu
-Qh
+Sg
+Sg
+Sg
+Sg
+Sg
+Sg
+Sg
 NT
 SE
-Nb
-NT
-RN
-RN
+Fr
+TX
+Fr
+Fr
 RN
 Fr
-ag
+Fr
+NV
+zn
+Fr
+Fr
+NT
 NT
-Fz
-Fz
-Fz
-Fz
-Fz
 Fz
 Fz
 Fz
@@ -77293,44 +77534,44 @@ NT
 NT
 NT
 NT
-YC
-Nb
+LA
+eW
 NT
 gb
+oH
 mP
-Ds
 cP
-wz
-mP
 mP
+BT
+GC
 mP
 TJ
 NT
 YC
 Nb
 NT
-Ss
-iM
-kG
-Eu
-fu
-fu
-Ss
+Sg
+Sg
+Sg
+Sg
+Sg
+Sg
+Sg
 NT
 LA
 eW
 NT
-Fr
-Fr
-Fr
-Fr
-ag
 NT
-Fz
-Fz
-Fz
-Fz
-Fz
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
+NT
 Fz
 Fz
 Fz
@@ -77552,36 +77793,36 @@ hA
 NT
 LA
 eW
-NT
+XB
 vi
 mP
 mP
 mP
 mP
 Rn
-mP
+Ht
 fC
 FL
-NT
-LA
+XM
+xL
 eW
 NT
-Ss
-Ss
-fu
-fu
-fu
-Ss
-Ss
+ET
+Sg
+Sg
+Sg
+Sg
+Sg
+BZ
 NT
 LA
 eW
 NT
-Fr
+Dm
 Dm
 UJ
-Fr
-ag
+UJ
+UJ
 NT
 Fz
 Fz
@@ -77808,28 +78049,28 @@ jl
 jl
 uo
 Fr
-om
-dL
+eW
+NT
 PW
+oM
 mP
-Ei
-fY
-gD
 mP
 mP
+BT
+JS
 mP
-Ri
+TJ
 NT
-LA
-eW
+YC
+Nb
 NT
-Ss
-Ss
-Ss
-Ss
-Ss
-Ss
-Ss
+Sg
+Sg
+Sg
+Sg
+Sg
+Sg
+Sg
 NT
 LA
 Fr
@@ -78068,32 +78309,32 @@ LA
 eW
 NT
 QR
+oX
 mP
-PZ
-wT
-Fc
 mP
 mP
+BA
+Kq
 Ac
 zh
 NT
 LA
 eW
 NT
-wV
-Ss
-Ss
-Ss
-Ss
-Ss
-fe
+Sg
+Sg
+Sg
+Sg
+Sg
+Sg
+Sg
 NT
 LA
 eW
 NT
+sC
 Fr
-Dm
-UJ
+qK
 Fr
 Fr
 NT
@@ -78327,8 +78568,8 @@ oL
 dG
 AZ
 AZ
-Ok
 AZ
+wT
 AZ
 AZ
 AZ
@@ -78337,20 +78578,20 @@ mj
 Fr
 eW
 NT
-NT
+Sg
 KE
 rV
-Ss
+Sg
 rV
 KE
-NT
+Sg
 NT
 SE
 vW
 NT
 zz
 Fr
-Fr
+qK
 Fr
 Fr
 NT
@@ -78606,12 +78847,12 @@ LA
 wY
 NT
 NT
+yn
+Fr
+Fr
+rO
 NT
-DJ
-Zj
-DJ
-NT
-NT
+sS
 sS
 sS
 Fz
@@ -78863,12 +79104,12 @@ Jl
 Wf
 Ny
 NT
-NT
-Fr
+yn
 Fr
 Fr
 Fr
 NT
+sS
 Fz
 Fz
 Fz
@@ -79120,12 +79361,12 @@ Az
 AR
 Ny
 NT
+SL
+SL
+SL
+YS
 NT
-di
-Fr
-Fr
-rO
-NT
+sS
 Fz
 Fz
 Fz
@@ -79365,10 +79606,9 @@ rR
 Fr
 XB
 NT
-NT
-NT
-NT
-NT
+iI
+iI
+iI
 NT
 NT
 NT
@@ -79383,6 +79623,7 @@ Fr
 Fr
 Fr
 NT
+sS
 Fz
 Fz
 Fz
@@ -79620,26 +79861,26 @@ oL
 NT
 OQ
 Fr
-NT
+Yp
 Ha
 Dh
-gr
-NT
+Dh
+Dh
+bt
 XB
-jA
 lz
-lz
-NT
 rl
 rl
 rl
+gr
+yj
 NT
-NT
-Fr
-Fr
+di
 Fr
 Fr
+rO
 NT
+sS
 Fz
 Fz
 Fz
@@ -79881,22 +80122,22 @@ Ue
 gr
 gr
 gr
-vn
+gr
+gr
+pL
+gr
 gr
 gr
 gr
 gr
-Dh
-nY
-nY
 nY
 NT
+Fr
+Fr
+Fr
+Fr
 NT
-NT
-NT
-NT
-NT
-NT
+sS
 Fz
 Fz
 Fz
@@ -80135,24 +80376,24 @@ NT
 NT
 Ue
 NT
-IY
-gr
-PE
 NT
-rB
-gr
-gr
-gr
-gr
-gr
+NT
 gr
+NT
+NT
+NT
+iw
+ej
+ej
+ej
 gr
+yj
+NT
+Fr
+Fr
+Fr
+Fr
 NT
-sS
-sS
-sS
-sS
-sS
 sS
 Fz
 Fz
@@ -80393,23 +80634,23 @@ ow
 mP
 NT
 IY
+pL
 gr
-Qs
-NT
+pL
 rB
+NT
+Ov
+Ov
+Ov
+pF
 gr
-gr
-gr
-Ha
-gr
-gr
-gr
+QJ
+NT
+NT
+NT
+NT
+NT
 NT
-sS
-sS
-Fz
-Fz
-Fz
 Fz
 sS
 Fz
@@ -80649,20 +80890,20 @@ NT
 cb
 oI
 NT
-IY
-gr
-PE
 NT
 NT
-Xh
+gr
 NT
-Xh
 NT
-Xh
 NT
+ep
+gr
+gr
+gr
+gr
 Xh
 NT
-sS
+NT
 sS
 Fz
 Fz
@@ -80909,15 +81150,16 @@ NT
 IY
 pL
 PE
-NT
+pL
+rB
 NT
 Lc
-NT
 Lc
-NT
 Lc
+PP
+Yf
+Yf
 NT
-Lc
 NT
 sS
 sS
@@ -80931,7 +81173,6 @@ sS
 sS
 sS
 sS
-sS
 Fz
 Fz
 Fz
@@ -81176,7 +81417,7 @@ NT
 NT
 NT
 NT
-sS
+NT
 sS
 sS
 sS
diff --git a/_maps/shuttles/Brotherhood_of_Steel_base.dmm b/_maps/shuttles/Brotherhood_of_Steel_base.dmm
index 1a4430d19a..9d6270b6d2 100644
--- a/_maps/shuttles/Brotherhood_of_Steel_base.dmm
+++ b/_maps/shuttles/Brotherhood_of_Steel_base.dmm
@@ -6,11 +6,7 @@
 /turf/open/floor/plasteel/dark,
 /area/shuttle/bos_foyer)
 "e" = (
-/obj/structure/ladder/unbreakable{
-	height = 2;
-	id = "SE";
-	move_me = 1
-	},
+/obj/machinery/computer/shuttle/bos,
 /turf/open/floor/plasteel/dark,
 /area/shuttle/bos_foyer)
 "f" = (
@@ -56,7 +52,11 @@
 /turf/open/floor/plasteel/dark,
 /area/shuttle/bos_foyer)
 "D" = (
-/obj/machinery/computer/shuttle/bos,
+/obj/structure/ladder/unbreakable{
+	height = 2;
+	id = "SE";
+	move_me = 1
+	},
 /turf/open/floor/plasteel/dark,
 /area/shuttle/bos_foyer)
 
@@ -87,8 +87,8 @@ a
 (4,1,1) = {"
 a
 c
-u
 c
+u
 f
 a
 "}
@@ -102,10 +102,10 @@ a
 "}
 (6,1,1) = {"
 a
-D
-c
 c
 c
+w
+D
 a
 "}
 (7,1,1) = {"
@@ -119,7 +119,7 @@ a
 (8,1,1) = {"
 a
 i
-w
+c
 c
 e
 a
diff --git a/_maps/shuttles/bos_elevator.dmm b/_maps/shuttles/bos_elevator.dmm
index 949ce3bf3b..09b399f531 100644
--- a/_maps/shuttles/bos_elevator.dmm
+++ b/_maps/shuttles/bos_elevator.dmm
@@ -1,8 +1,8 @@
 //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
 "a" = (
 /obj/machinery/light/small{
-	icon_state = "bulb";
-	dir = 8
+	dir = 8;
+	icon_state = "bulb"
 	},
 /turf/open/floor/engine,
 /area/shuttle/bos_elevator)