diff --git a/code/game/machinery/requests_console.dm b/code/game/machinery/requests_console.dm
index 3caf2d1ed00..28985071860 100644
--- a/code/game/machinery/requests_console.dm
+++ b/code/game/machinery/requests_console.dm
@@ -68,7 +68,7 @@ var/list/obj/machinery/requests_console/allConsoles = list()
 /obj/machinery/requests_console/New()
 	..()
 
-	announcement.title = "[department] announcement"
+	announcement.title = "[department] Announcement"
 	announcement.newscast = 1
 
 	name = "[department] Requests Console"
@@ -234,3 +234,58 @@ var/list/obj/machinery/requests_console/allConsoles = list()
 	announcement.announcer = ""
 	if(mainmenu)
 		screen = RCS_MAINMENU
+
+/obj/machinery/requests_console/preset
+	name = ""
+	department = ""
+	departmentType = ""
+	announcementConsole = 0
+//Todo: presets and mapping for more non-command RCs
+
+/obj/machinery/requests_console/preset/steward
+	name = "Steward Request Console"
+	department = "Steward's Office"
+	departmentType = RC_INFO
+
+/obj/machinery/requests_console/preset/command //General type for command RCs, used in Bridge
+	name = "Control Room Request Console"
+	department = "Control Room"
+	announcementConsole = 1 //Heads can make announcements
+	departmentType = RC_ASSIST|RC_INFO
+
+/obj/machinery/requests_console/preset/command/premier
+	name = "Premier Request Console"
+	department = "Premier's Desk"
+
+/obj/machinery/requests_console/preset/command/ceo
+	name = "CEO Request Console"
+	department = "Chief Executive Officer's Desk"
+	departmentType = RC_ASSIST|RC_SUPPLY|RC_INFO //CEO should be able to get supply requests
+
+/obj/machinery/requests_console/preset/command/cbo
+	name = "CBO Request Console"
+	department = "Chief Biological Overseer's Desk"
+
+/obj/machinery/requests_console/preset/command/cro
+	name = "CRO Request Console"
+	department = "Chief Research Overseer's Desk"
+
+/obj/machinery/requests_console/preset/command/bc
+	name = "Commander Request Console"
+	department = "Blackshield Commander's Desk"
+
+/obj/machinery/requests_console/preset/command/wo
+	name = "WO Request Console"
+	department = "Warrant Officer's Desk"
+
+/obj/machinery/requests_console/preset/command/prime
+	name = "Prime Request Console"
+	department = "Prime's Desk"
+
+/obj/machinery/requests_console/preset/command/gm
+	name = "GM Request Console"
+	department = "Guild Master's Desk"
+
+/obj/machinery/requests_console/preset/command/foreman
+	name = "Foreman Request Console"
+	department = "Foreman's Desk"
diff --git a/code/modules/modular_computers/computers/subtypes/preset_console.dm b/code/modules/modular_computers/computers/subtypes/preset_console.dm
index 0ac6d2ac3dd..4a4e0f38343 100644
--- a/code/modules/modular_computers/computers/subtypes/preset_console.dm
+++ b/code/modules/modular_computers/computers/subtypes/preset_console.dm
@@ -115,6 +115,10 @@
 // Command
 /obj/item/modular_computer/console/preset/command/install_default_hardware()
 	..()
+	processor_unit = new/obj/item/computer_hardware/processor_unit/adv(src)
+	tesla_link = new/obj/item/computer_hardware/tesla_link(src)
+	hard_drive = new/obj/item/computer_hardware/hard_drive/advanced(src)
+	scanner = new /obj/item/computer_hardware/scanner/paper(src)
 	printer = new/obj/item/computer_hardware/printer(src)
 	card_slot = new/obj/item/computer_hardware/card_slot(src)
 
@@ -129,6 +133,7 @@
 	hard_drive.store_file(new/datum/computer_file/program/reports())
 	hard_drive.store_file(new/datum/computer_file/program/comm())
 	hard_drive.store_file(new/datum/computer_file/program/card_mod())
+	hard_drive.store_file(new/datum/computer_file/program/tax())
 
 //First Officer
 /obj/item/modular_computer/console/preset/command/access/install_default_programs()
diff --git a/code/modules/modular_computers/computers/subtypes/preset_tablet.dm b/code/modules/modular_computers/computers/subtypes/preset_tablet.dm
index 89b1b4b8a17..b9ce47c28e6 100644
--- a/code/modules/modular_computers/computers/subtypes/preset_tablet.dm
+++ b/code/modules/modular_computers/computers/subtypes/preset_tablet.dm
@@ -10,7 +10,7 @@
 	..()
 	processor_unit = new/obj/item/computer_hardware/processor_unit/small(src)
 	tesla_link = new/obj/item/computer_hardware/tesla_link(src)
-	hard_drive = new/obj/item/computer_hardware/hard_drive/small(src)
+	hard_drive = new/obj/item/computer_hardware/hard_drive/small/adv(src)
 	network_card = new/obj/item/computer_hardware/network_card/advanced(src)
 	printer = new/obj/item/computer_hardware/printer(src)
 	card_slot = new/obj/item/computer_hardware/card_slot(src)
@@ -31,9 +31,9 @@
 
 /obj/item/modular_computer/tablet/lease/preset/command/install_default_hardware()
 	..()
-	processor_unit = new/obj/item/computer_hardware/processor_unit/small(src)
+	processor_unit = new/obj/item/computer_hardware/processor_unit/adv/small(src)
 	tesla_link = new/obj/item/computer_hardware/tesla_link(src)
-	hard_drive = new/obj/item/computer_hardware/hard_drive(src)
+	hard_drive = new/obj/item/computer_hardware/hard_drive/small/adv(src)
 	network_card = new/obj/item/computer_hardware/network_card/advanced(src)
 	printer = new/obj/item/computer_hardware/printer(src)
 	card_slot = new/obj/item/computer_hardware/card_slot(src)
@@ -48,6 +48,7 @@
 	hard_drive.store_file(new/datum/computer_file/program/newsbrowser())
 	hard_drive.store_file(new/datum/computer_file/program/camera_monitor())
 	hard_drive.store_file(new/datum/computer_file/program/records())
+	hard_drive.store_file(new/datum/computer_file/program/tax())
 
 /obj/item/modular_computer/tablet/lease/preset/medical/install_default_hardware()
 	..()
@@ -108,4 +109,4 @@
 /obj/item/modular_computer/tablet/moebius/preset/install_default_programs()
 	..()
 	hard_drive.store_file(new/datum/computer_file/program/suit_sensors())
-	hard_drive.store_file(new/datum/computer_file/program/chem_catalog())
\ No newline at end of file
+	hard_drive.store_file(new/datum/computer_file/program/chem_catalog())
diff --git a/maps/__Nadezhda/area/_Nadezhda_areas.dm b/maps/__Nadezhda/area/_Nadezhda_areas.dm
index ce083f69925..b958d9e2f80 100644
--- a/maps/__Nadezhda/area/_Nadezhda_areas.dm
+++ b/maps/__Nadezhda/area/_Nadezhda_areas.dm
@@ -536,6 +536,10 @@
 	name = "\improper Control Room"
 	icon_state = "bridge"
 
+/area/nadezhda/command/hallway
+	name = "\improper Command Hallway"
+	icon_state = "bridge"
+
 /area/nadezhda/command/meeting_room
 	name = "\improper Heads of Staff Meeting Room"
 	icon_state = "bridge"
diff --git a/maps/__Nadezhda/map/_Nadezhda_Colony_New.dmm b/maps/__Nadezhda/map/_Nadezhda_Colony_New.dmm
index ab528b3d0a4..b51ec9473f7 100644
--- a/maps/__Nadezhda/map/_Nadezhda_Colony_New.dmm
+++ b/maps/__Nadezhda/map/_Nadezhda_Colony_New.dmm
@@ -16,7 +16,8 @@
 "aae" = (
 /obj/machinery/door/airlock/mining{
 	name = "Foreman Quarters";
-	req_access = list(79)
+	req_access = list(79);
+	id_tag = "foremandoor"
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
@@ -35,7 +36,7 @@
 /area/nadezhda/pros/foreman)
 "aak" = (
 /obj/machinery/door/airlock/maintenance_command{
-	req_one_access = list(19, 1)
+	req_one_access = list(19,1)
 	},
 /obj/machinery/door/firedoor,
 /turf/simulated/floor/tiled/dark/gray_platform,
@@ -789,6 +790,10 @@
 	dir = 8;
 	icon_state = "sofaend_left"
 	},
+/obj/machinery/requests_console/preset/command/foreman{
+	dir = 1;
+	pixel_y = -35
+	},
 /turf/simulated/floor/wood/wild3,
 /area/nadezhda/pros/foreman)
 "ajj" = (
@@ -995,9 +1000,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/tiled/dark/danger,
-/area/nadezhda/security{
-	name = "Security Training"
-	})
+/area/nadezhda/security/range)
 "alB" = (
 /obj/structure/bed/padded,
 /obj/item/bedsheet/rd,
@@ -1752,7 +1755,7 @@
 	},
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/tiled/dark,
-/area/nadezhda/command/meeting_room)
+/area/nadezhda/command/bridge)
 "auF" = (
 /obj/effect/floor_decal/industrial/warningwhite,
 /obj/effect/floor_decal/industrial/stand_clear/white{
@@ -1781,15 +1784,11 @@
 /turf/simulated/floor/tiled/techmaint,
 /area/nadezhda/maintenance/undergroundfloor1south)
 "auP" = (
-/obj/structure/table/steel_reinforced,
-/obj/machinery/photocopier/faxmachine{
-	department = "Warrent Officer's Office"
-	},
-/obj/effect/floor_decal/steeldecal/steel_decals10,
-/obj/effect/floor_decal/spline/fancy{
-	dir = 1
+/obj/structure/disposalpipe/segment{
+	dir = 8;
+	icon_state = "pipe-c"
 	},
-/turf/simulated/floor/tiled/dark/gray_perforated,
+/turf/simulated/floor/wood,
 /area/nadezhda/command/swo/quarters)
 "ava" = (
 /obj/effect/decal/cleanable/dirt,
@@ -2211,7 +2210,7 @@
 /turf/unsimulated/mineral,
 /area/nadezhda/outside/inside_colony)
 "azd" = (
-/obj/item/modular_computer/console/preset/command{
+/obj/item/modular_computer/console/preset/medical/monitor{
 	dir = 8
 	},
 /turf/simulated/floor/tiled/steel/techfloor_grid,
@@ -2258,11 +2257,11 @@
 /turf/simulated/floor/tiled/steel/gray_perforated,
 /area/nadezhda/maintenance/undergroundfloor1east)
 "azp" = (
-/obj/machinery/computer/aifixer,
 /obj/structure/sign/warning/nosmoking/small{
 	pixel_x = -32;
 	pixel_y = 32
 	},
+/obj/structure/filingcabinet,
 /turf/simulated/floor/carpet/purcarpet,
 /area/nadezhda/command/cro)
 "azs" = (
@@ -2416,12 +2415,16 @@
 /turf/simulated/floor/tiled/steel/gray_perforated,
 /area/nadezhda/security/tactical_blackshield)
 "aBe" = (
-/obj/machinery/camera/network/security{
-	dir = 8
+/obj/structure/bed/chair/office/light{
+	dir = 4
 	},
 /obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/tiled/dark/bluecorner,
-/area/nadezhda/security/sechall)
+/obj/machinery/requests_console/preset/command{
+	dir = 1;
+	pixel_y = -35
+	},
+/turf/simulated/floor/tiled/white/gray_perforated,
+/area/nadezhda/command/bridge)
 "aBf" = (
 /obj/machinery/light{
 	dir = 8
@@ -2553,7 +2556,7 @@
 /obj/structure/disposalpipe/segment,
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/tiled/dark,
-/area/nadezhda/command/bridge)
+/area/nadezhda/command/hallway)
 "aCe" = (
 /obj/item/spider_shadow_trap,
 /obj/effect/spider/stickyweb,
@@ -2777,15 +2780,16 @@
 /turf/simulated/floor/tiled/dark/cargo,
 /area/nadezhda/security/maingate)
 "aEw" = (
-/obj/effect/floor_decal/spline/wood,
-/obj/structure/disposalpipe/segment{
-	dir = 8;
-	icon_state = "pipe-c"
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/cable/green{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
 	},
-/obj/structure/dogbed,
-/mob/living/simple_animal/corgi/fluff/Lisa,
-/turf/simulated/floor/wood,
-/area/nadezhda/command/swo/quarters)
+/turf/simulated/floor/tiled/dark/bluecorner,
+/area/nadezhda/security/sechall)
 "aEz" = (
 /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/manifold4w/hidden/supply,
@@ -3425,12 +3429,19 @@
 /turf/simulated/floor/asteroid/dirt,
 /area/nadezhda/outside/dcave)
 "aMz" = (
-/obj/structure/bookcase,
-/obj/item/book/manual/fiction/warandpeace,
-/obj/item/book/manual/fiction/theinvisibleman,
-/obj/item/book/manual/fiction/waroftheworlds,
-/obj/item/book/manual/nonfiction/suntzu,
-/obj/item/book/manual/nonfiction/politics,
+/obj/machinery/papershredder,
+/obj/machinery/camera/network/security{
+	dir = 4
+	},
+/obj/structure/cable/green{
+	d2 = 4;
+	icon_state = "0-4"
+	},
+/obj/machinery/power/apc{
+	dir = 8;
+	name = "West APC";
+	pixel_x = -28
+	},
 /turf/simulated/floor/wood,
 /area/nadezhda/command/swo/quarters)
 "aME" = (
@@ -3872,7 +3883,7 @@
 /obj/structure/table/woodentable,
 /obj/item/storage/box/drinkingglasses,
 /turf/simulated/floor/tiled/dark/monofloor,
-/area/nadezhda/command/meeting_room)
+/area/nadezhda/command/bridge)
 "aSP" = (
 /obj/machinery/space_heater,
 /obj/machinery/firealarm{
@@ -3929,9 +3940,7 @@
 	icon_state = "pipe-c"
 	},
 /turf/simulated/floor/tiled/dark/bluecorner,
-/area/nadezhda/security{
-	name = "Security Training"
-	})
+/area/nadezhda/security/range)
 "aTA" = (
 /obj/structure/cable/green{
 	d1 = 4;
@@ -4162,16 +4171,10 @@
 /turf/simulated/floor/tiled/dark/golden,
 /area/nadezhda/absolutism/chapel)
 "aWJ" = (
-/obj/effect/window_lwall_spawn/reinforced,
-/obj/machinery/door/blast/shutters{
-	density = 0;
-	dir = 2;
-	icon_state = "shutter0";
-	id = "mcshutters";
-	name = "Commanders Office Shutters";
-	opacity = 0
-	},
 /obj/machinery/door/firedoor,
+/obj/effect/window_lwall_spawn/reinforced/polarized{
+	id = "BC"
+	},
 /turf/simulated/floor/plating,
 /area/nadezhda/command/smc/quarters)
 "aWK" = (
@@ -5417,32 +5420,11 @@
 /turf/simulated/floor/asteroid/grass,
 /area/nadezhda/crew_quarters/techshop)
 "bjj" = (
-/obj/effect/floor_decal/industrial/warningred{
-	dir = 8
-	},
-/obj/effect/floor_decal/industrial/box/red/corners,
-/obj/effect/floor_decal/industrial/box/red/corners{
-	dir = 8
-	},
-/obj/structure/disposalpipe/segment{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
-/obj/structure/cable/green{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
+/obj/effect/floor_decal/spline/wood{
+	dir = 1
 	},
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/tiled/steel/orangecorner,
-/area/nadezhda/rnd/circuitlab{
-	name = "Science Expedition prep"
-	})
+/turf/simulated/floor/wood,
+/area/nadezhda/command/smc/quarters)
 "bjl" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
@@ -5621,22 +5603,17 @@
 /turf/simulated/floor/tiled/white/brown_perforated,
 /area/nadezhda/maintenance/undergroundfloor1north)
 "bls" = (
-/obj/machinery/door/airlock/command{
-	id_tag = "wobolt1";
-	name = "Warrant Officer";
-	req_access = list(58,61)
-	},
+/obj/effect/decal/cleanable/dirt,
 /obj/structure/disposalpipe/segment,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/structure/cable/green{
 	d1 = 1;
 	d2 = 2;
 	icon_state = "1-2"
 	},
-/obj/machinery/door/firedoor,
-/turf/simulated/floor/tiled/dark/gray_perforated,
-/area/nadezhda/command/swo/quarters)
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/turf/simulated/floor/tiled/dark/bluecorner,
+/area/nadezhda/security/sechall)
 "blv" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
@@ -5776,9 +5753,6 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/tiled/techmaint,
 /area/nadezhda/dungeon/outside/burned_outpost)
-"bns" = (
-/turf/simulated/wall/r_wall,
-/area/nadezhda/command/meeting_room)
 "bnt" = (
 /obj/structure/flora/small/trailrockb2,
 /turf/simulated/floor/beach/water/jungle,
@@ -6003,7 +5977,7 @@
 	dir = 5
 	},
 /turf/simulated/floor/plating/under,
-/area/nadezhda/command/bridge)
+/area/nadezhda/command/hallway)
 "bpx" = (
 /obj/structure/table/woodentable,
 /obj/machinery/holoposter{
@@ -6104,6 +6078,7 @@
 	pixel_x = 28
 	},
 /obj/structure/cable/green,
+/obj/structure/closet/secure_closet/reinforced/quartermaster,
 /turf/simulated/floor/tiled/steel/techfloor_grid,
 /area/nadezhda/command/merchant)
 "brn" = (
@@ -6149,18 +6124,17 @@
 /turf/simulated/floor/tiled/techmaint,
 /area/nadezhda/maintenance/undergroundfloor1west)
 "brC" = (
-/obj/structure/catwalk,
-/obj/structure/invislight,
-/obj/machinery/light{
+/obj/structure/table/woodentable,
+/obj/machinery/recharger,
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/unary/vent_pump{
 	dir = 4
 	},
-/obj/machinery/door/blast/regular/open{
-	id = "Colony Lockdown"
+/obj/machinery/light{
+	dir = 8
 	},
-/turf/simulated/floor/plating/under,
-/area/nadezhda/rnd/circuitlab{
-	name = "Science Expedition prep"
-	})
+/turf/simulated/floor/wood,
+/area/nadezhda/command/swo/quarters)
 "brE" = (
 /obj/structure/cable/cyan{
 	d1 = 4;
@@ -6565,15 +6539,35 @@
 /turf/simulated/floor/tiled/techmaint,
 /area/nadezhda/maintenance/undergroundfloor1west)
 "bvC" = (
+/obj/machinery/atmospherics/unary/vent_pump{
+	dir = 4
+	},
+/obj/item/contraband/poster/placed/generic/no_erp{
+	desc = "This poster reminds the crew that Eroticism, unsanctioned Rituals and Pornography are bad and shouldnt be film or done.";
+	pixel_x = -32
+	},
+/obj/structure/table/woodentable,
+/obj/item/stamp/hos,
+/obj/machinery/button/remote/airlock{
+	id = "wobolt1";
+	name = "WO Door Open Control";
+	pixel_x = 6;
+	pixel_y = 5;
+	req_access = list(58)
+	},
+/obj/machinery/button/remote/airlock{
+	id = "wobolt1";
+	name = "WO Door Bolt Control";
+	pixel_x = -6;
+	pixel_y = 5;
+	req_access = list(58);
+	specialfunctions = 4
+	},
 /obj/machinery/light{
-	dir = 1
+	dir = 8
 	},
-/obj/structure/table/rack,
-/obj/random/scrap/dense_weighted/low_chance,
-/turf/simulated/floor/tiled/steel/orangecorner,
-/area/nadezhda/rnd/circuitlab{
-	name = "Science Expedition prep"
-	})
+/turf/simulated/floor/carpet/blucarpet,
+/area/nadezhda/command/swo/quarters)
 "bvN" = (
 /obj/machinery/nanite_reconstitution_apparatus/loaded,
 /obj/item/reagent_containers/glass/beaker/vial/uncapnanites,
@@ -6668,6 +6662,21 @@
 	name = "Medbay Total Lockdown Control";
 	pixel_y = 25
 	},
+/obj/machinery/button/remote/airlock{
+	id = "cbodoor";
+	name = "CBO Door Bolt Control";
+	pixel_x = -6;
+	pixel_y = 5;
+	req_access = list(40);
+	specialfunctions = 4
+	},
+/obj/machinery/button/remote/airlock{
+	id = "cbodoor";
+	name = "CBO Door Open Control";
+	pixel_x = 6;
+	pixel_y = 5;
+	req_access = list(40)
+	},
 /turf/simulated/floor/carpet/sblucarpet,
 /area/nadezhda/command/cbo)
 "bwY" = (
@@ -6766,11 +6775,6 @@
 /area/nadezhda/maintenance{
 	name = "Residential District Maintenance"
 	})
-"byg" = (
-/obj/structure/flora/ausbushes/sparsegrass,
-/obj/structure/boulder,
-/turf/simulated/floor/rock,
-/area/nadezhda/outside/inside_colony)
 "byk" = (
 /turf/simulated/shuttle/wall/mining{
 	icon_state = "16,20"
@@ -7140,7 +7144,7 @@
 "bCL" = (
 /obj/machinery/atmospherics/pipe/simple/visible/universal,
 /turf/simulated/floor/tiled/techmaint,
-/area/nadezhda/command/bridge)
+/area/nadezhda/command/hallway)
 "bCN" = (
 /turf/simulated/wall/r_wall,
 /area/nadezhda/crew_quarters/kitchen)
@@ -7744,9 +7748,7 @@
 	icon_state = "1-2"
 	},
 /turf/simulated/floor/tiled/dark/danger,
-/area/nadezhda/security{
-	name = "Security Training"
-	})
+/area/nadezhda/security/range)
 "bJr" = (
 /obj/machinery/door/airlock/glass{
 	name = "Residential Area"
@@ -7905,7 +7907,7 @@
 	},
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/tiled/dark,
-/area/nadezhda/command/meeting_room)
+/area/nadezhda/command/bridge)
 "bKz" = (
 /obj/effect/decal/cleanable/rubble,
 /obj/random/junk/low_chance,
@@ -8887,8 +8889,10 @@
 /turf/simulated/floor/tiled/white/cyancorner,
 /area/nadezhda/security/triage_blackshield)
 "bWq" = (
-/obj/item/device/lighting/toggleable/lamp,
-/obj/structure/table/woodentable,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/bed/chair/custom/onestar,
+/obj/structure/disposalpipe/segment,
 /turf/simulated/floor/carpet/blucarpet,
 /area/nadezhda/command/swo/quarters)
 "bWx" = (
@@ -9260,9 +9264,7 @@
 	icon_state = "1-4"
 	},
 /turf/simulated/floor/tiled/dark/bluecorner,
-/area/nadezhda/security{
-	name = "Security Training"
-	})
+/area/nadezhda/security/range)
 "caX" = (
 /obj/item/reagent_containers/blood/AMinus,
 /obj/item/reagent_containers/blood/APlus,
@@ -9390,13 +9392,14 @@
 /turf/simulated/floor/tiled/dark/cargo,
 /area/nadezhda/maintenance/undergroundfloor1east)
 "cce" = (
-/turf/simulated/shuttle/wall/mining{
-	icon_state = "15,6";
-	opacity = 0
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 10
 	},
-/area/nadezhda/rnd/circuitlab{
-	name = "Science Expedition prep"
-	})
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 10
+	},
+/turf/simulated/floor/wood,
+/area/nadezhda/command/swo/quarters)
 "ccn" = (
 /obj/structure/flora/ausbushes/palebush,
 /turf/simulated/floor/asteroid/grass,
@@ -9665,8 +9668,6 @@
 	},
 /obj/item/clothing/glasses/welding/superior,
 /obj/structure/table/woodentable,
-/obj/structure/table/woodentable,
-/obj/structure/table/woodentable,
 /obj/item/device/von_krabin,
 /obj/machinery/atmospherics/unary/vent_pump{
 	dir = 8
@@ -9733,11 +9734,12 @@
 /turf/simulated/floor/tiled/steel,
 /area/nadezhda/maintenance/undergroundfloor1east)
 "cgG" = (
-/obj/structure/bed/chair{
-	dir = 4
+/obj/machinery/firealarm{
+	dir = 1;
+	pixel_y = -32
 	},
-/turf/simulated/floor/tiled/dark/bluecorner,
-/area/nadezhda/security/sechall)
+/turf/simulated/floor/wood,
+/area/nadezhda/command/swo/quarters)
 "cgJ" = (
 /obj/machinery/optable,
 /obj/effect/decal/cleanable/blood,
@@ -10078,18 +10080,13 @@
 /turf/simulated/floor/plating/under,
 /area/nadezhda/security/triage_blackshield)
 "ckE" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 5
-	},
+/obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 6
+	dir = 10
 	},
-/obj/structure/cable/green{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 9
 	},
-/obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/tiled/steel/violetcorener,
 /area/nadezhda/rnd/circuitlab{
 	name = "Science Expedition prep"
@@ -10478,6 +10475,27 @@
 "cpg" = (
 /turf/simulated/floor/wood/wild1,
 /area/nadezhda/maintenance/undergroundfloor1north)
+"cph" = (
+/obj/structure/table/woodentable,
+/obj/machinery/button/remote/airlock{
+	pixel_x = -2;
+	pixel_y = 7;
+	id = "premierdoor";
+	name = "Premier Door Open Control";
+	dir = 4;
+	req_access = list(20)
+	},
+/obj/machinery/button/remote/airlock{
+	pixel_x = -2;
+	pixel_y = -6;
+	id = "premierdoor";
+	name = "Premier Door Bolt Control";
+	dir = 4;
+	specialfunctions = 4;
+	req_access = list(20)
+	},
+/turf/simulated/floor/carpet/turcarpet,
+/area/nadezhda/command/captain/quarters)
 "cpl" = (
 /obj/item/device/radio/intercom{
 	dir = 1;
@@ -11286,7 +11304,7 @@
 /obj/structure/disposalpipe/segment,
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/tiled/dark,
-/area/nadezhda/command/bridge)
+/area/nadezhda/command/hallway)
 "czf" = (
 /obj/item/stack/ore/slag,
 /obj/effect/damagedfloor/fire,
@@ -11595,7 +11613,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/plating/under,
-/area/nadezhda/command/bridge)
+/area/nadezhda/command/hallway)
 "cCq" = (
 /obj/machinery/door/airlock/multi_tile/glass,
 /turf/simulated/floor/tiled/techmaint,
@@ -11613,40 +11631,19 @@
 /turf/simulated/floor/plating/under,
 /area/nadezhda/crew_quarters/techshop)
 "cCD" = (
-/obj/machinery/requests_console{
-	announcementConsole = 1;
-	department = "Head of Security's Desk";
-	departmentType = 5;
+/obj/machinery/atmospherics/unary/vent_scrubber,
+/obj/machinery/requests_console/preset/command/bc{
 	dir = 4;
-	name = "Militia Commander RC";
-	pixel_x = 30
+	pixel_x = 35
 	},
-/obj/machinery/atmospherics/unary/vent_scrubber,
 /turf/simulated/floor/wood,
 /area/nadezhda/command/smc/quarters)
 "cCF" = (
-/obj/machinery/door/airlock/glass_research{
-	name = "Expedition prep";
-	req_access = list(5)
-	},
-/obj/structure/disposalpipe/segment,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 1
-	},
-/obj/structure/cable/green{
-	d1 = 1;
-	d2 = 2;
-	icon_state = "1-2"
-	},
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/door/blast/regular/open{
-	id = "Colony Lockdown"
-	},
-/turf/simulated/floor/tiled/steel/gray_perforated,
-/area/nadezhda/rnd/circuitlab{
-	name = "Science Expedition prep"
-	})
+/obj/structure/table/steel,
+/obj/item/paper_bin,
+/obj/item/pen/multi,
+/turf/simulated/floor/wood,
+/area/nadezhda/command/swo/quarters)
 "cCH" = (
 /obj/structure/flora/ausbushes/grassybush,
 /turf/unsimulated/wall/jungle,
@@ -11687,7 +11684,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/plating/under,
-/area/nadezhda/command/bridge)
+/area/nadezhda/command/hallway)
 "cDg" = (
 /obj/structure/catwalk,
 /turf/simulated/open,
@@ -11783,9 +11780,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/tiled/dark/danger,
-/area/nadezhda/security{
-	name = "Security Training"
-	})
+/area/nadezhda/security/range)
 "cEP" = (
 /obj/machinery/camera/network/colony_underground{
 	dir = 8
@@ -12645,10 +12640,11 @@
 /turf/simulated/floor/reinforced,
 /area/nadezhda/security/nuke_storage)
 "cNA" = (
-/obj/landmark/join/start/premier,
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/carpet/turcarpet,
-/area/nadezhda/command/captain/quarters)
+/obj/structure/catwalk,
+/turf/simulated/floor/plating/under,
+/area/nadezhda/rnd/circuitlab{
+	name = "Science Expedition prep"
+	})
 "cNG" = (
 /obj/structure/flora/ausbushes/stalkybush,
 /turf/simulated/floor/asteroid/dirt,
@@ -13914,6 +13910,7 @@
 	dir = 8
 	},
 /obj/effect/decal/cleanable/dirt,
+/obj/landmark/join/start/pg,
 /turf/simulated/floor/wood,
 /area/nadezhda/command/fo)
 "cZO" = (
@@ -14023,6 +14020,12 @@
 /obj/machinery/gibber,
 /turf/simulated/floor/tiled/white/techfloor,
 /area/nadezhda/medical/genetics)
+"dbU" = (
+/obj/machinery/light{
+	dir = 4
+	},
+/turf/simulated/floor/wood,
+/area/nadezhda/command/swo/quarters)
 "dce" = (
 /obj/structure/flora/small/rock3,
 /obj/random/flora/jungle_tree,
@@ -14572,9 +14575,14 @@
 /turf/simulated/floor/tiled/steel/techfloor_grid,
 /area/nadezhda/rnd/xenobiology/xenoflora)
 "dic" = (
-/turf/simulated/shuttle/wall/mining{
-	icon_state = "10,15"
+/obj/structure/cable/green{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
 	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/turf/simulated/floor/tiled/steel/violetcorener,
 /area/nadezhda/rnd/circuitlab{
 	name = "Science Expedition prep"
 	})
@@ -14987,7 +14995,7 @@
 /obj/structure/table/woodentable,
 /obj/item/folder/blue,
 /turf/simulated/floor/tiled/dark/monofloor,
-/area/nadezhda/command/meeting_room)
+/area/nadezhda/command/bridge)
 "dmR" = (
 /obj/structure/showcase{
 	desc = "Ancient robotic frame, that is long deactivated and rusted solid. However, it still strikes am awesome pose, that somehow makes you think of justice and righteousness.";
@@ -15461,9 +15469,12 @@
 /turf/simulated/floor/plating/under,
 /area/nadezhda/maintenance/undergroundfloor1south)
 "dsW" = (
-/obj/effect/floor_decal/spline/wood{
-	dir = 4
+/obj/machinery/door/airlock/command{
+	id_tag = "wobolt1";
+	name = "Warrant Officer";
+	req_access = list(58,61)
 	},
+/obj/structure/disposalpipe/segment,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/structure/cable/green{
@@ -15471,7 +15482,16 @@
 	d2 = 2;
 	icon_state = "1-2"
 	},
-/turf/simulated/floor/wood,
+/obj/machinery/door/firedoor,
+/obj/structure/disposalpipe/segment,
+/obj/structure/cable/green{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/turf/simulated/floor/tiled/dark/gray_perforated,
 /area/nadezhda/command/swo/quarters)
 "dsZ" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -15806,6 +15826,7 @@
 /turf/simulated/floor/tiled/white/techfloor,
 /area/nadezhda/maintenance/undergroundfloor1west)
 "dwu" = (
+/obj/structure/filingcabinet,
 /turf/simulated/floor/wood,
 /area/nadezhda/command/smc/quarters)
 "dwv" = (
@@ -16253,7 +16274,7 @@
 /obj/machinery/door/firedoor,
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/tiled/dark,
-/area/nadezhda/command/bridge)
+/area/nadezhda/command/hallway)
 "dAE" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 10
@@ -16410,6 +16431,9 @@
 /obj/machinery/atmospherics/unary/vent_pump{
 	dir = 1
 	},
+/obj/effect/floor_decal/spline/wood{
+	dir = 1
+	},
 /turf/simulated/floor/wood,
 /area/nadezhda/command/smc/quarters)
 "dCp" = (
@@ -16531,14 +16555,10 @@
 /turf/simulated/floor/reinforced/n20,
 /area/nadezhda/engineering/atmos)
 "dDS" = (
-/obj/structure/cable/green{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
-	},
+/obj/structure/disposalpipe/segment,
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/tiled/dark,
-/area/nadezhda/command/meeting_room)
+/area/nadezhda/command/hallway)
 "dDT" = (
 /obj/structure/shuttle_part/mining{
 	icon_state = "14,23"
@@ -16641,6 +16661,7 @@
 /area/nadezhda/medical/morgue)
 "dEO" = (
 /obj/structure/table/woodentable,
+/obj/item/modular_computer/tablet/lease/preset/command,
 /turf/simulated/floor/carpet/bcarpet,
 /area/nadezhda/command/fo)
 "dEZ" = (
@@ -17230,9 +17251,7 @@
 "dLd" = (
 /obj/machinery/light,
 /turf/simulated/floor/tiled/dark/bluecorner,
-/area/nadezhda/security{
-	name = "Security Training"
-	})
+/area/nadezhda/security/range)
 "dLe" = (
 /obj/machinery/vending/wallmed{
 	name = "Emergency NanoMed";
@@ -18006,8 +18025,6 @@
 /obj/effect/floor_decal/industrial/box/red/corners{
 	dir = 4
 	},
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/tiled/steel,
 /area/nadezhda/security/sechall)
 "dTC" = (
@@ -18813,27 +18830,12 @@
 /turf/simulated/floor/tiled/dark/brown_perforated,
 /area/nadezhda/storage/primary)
 "ebR" = (
-/obj/structure/disposalpipe/segment{
-	dir = 2;
-	icon_state = "pipe-c"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 10
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 10
-	},
-/obj/structure/cable/green{
-	d1 = 2;
-	d2 = 8;
-	icon_state = "2-8"
+/obj/item/modular_computer/console/preset/security/records{
+	dir = 4;
+	pixel_x = -5
 	},
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/tiled/steel/orangecorner,
-/area/nadezhda/rnd/circuitlab{
-	name = "Science Expedition prep"
-	})
+/turf/simulated/floor/carpet/blucarpet,
+/area/nadezhda/command/swo/quarters)
 "ebT" = (
 /obj/structure/multiz/stairs/enter/bottom,
 /obj/structure/invislight,
@@ -18877,6 +18879,12 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/tiled/steel/techfloor,
 /area/nadezhda/engineering/engine_room)
+"ecu" = (
+/obj/machinery/requests_console/preset/command/wo{
+	pixel_y = 35
+	},
+/turf/simulated/floor/wood,
+/area/nadezhda/command/swo/quarters)
 "ecv" = (
 /obj/item/tool/broken_bottle,
 /obj/effect/spider/stickyweb,
@@ -18893,9 +18901,7 @@
 	dir = 1
 	},
 /turf/simulated/floor/tiled/dark/danger,
-/area/nadezhda/security{
-	name = "Security Training"
-	})
+/area/nadezhda/security/range)
 "ecO" = (
 /obj/structure/mopbucket,
 /obj/item/reagent_containers/glass/bucket,
@@ -19173,18 +19179,11 @@
 /turf/simulated/shuttle/floor/science,
 /area/shuttle/vasiliy_shuttle_area)
 "efS" = (
-/obj/machinery/door/airlock/glass_research{
-	name = "Expedition prep";
-	req_access = list(5)
-	},
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/door/blast/regular/open{
-	id = "Colony Lockdown"
+/obj/machinery/computer/shuttle_control/multi/vasiliy{
+	dir = 1
 	},
-/turf/simulated/floor/tiled/steel/gray_perforated,
-/area/nadezhda/rnd/circuitlab{
-	name = "Science Expedition prep"
-	})
+/turf/simulated/floor/carpet/blucarpet,
+/area/nadezhda/command/swo/quarters)
 "efV" = (
 /obj/structure/sink{
 	dir = 8;
@@ -19830,7 +19829,8 @@
 "enj" = (
 /obj/machinery/door/airlock/command{
 	name = "Premier Office";
-	req_access = list(20)
+	req_access = list(20);
+	id_tag = "premierdoor"
 	},
 /obj/structure/cable/green{
 	d1 = 4;
@@ -20579,7 +20579,7 @@
 /obj/structure/disposalpipe/segment,
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/tiled/dark,
-/area/nadezhda/command/bridge)
+/area/nadezhda/command/hallway)
 "eto" = (
 /obj/effect/decal/cleanable/cobweb2{
 	icon_state = "cobweb1";
@@ -20773,9 +20773,7 @@
 	dir = 8
 	},
 /turf/simulated/floor/tiled/dark/danger,
-/area/nadezhda/security{
-	name = "Security Training"
-	})
+/area/nadezhda/security/range)
 "ewD" = (
 /obj/machinery/door/airlock/glass_research{
 	name = "Robotics Lab";
@@ -22029,15 +22027,11 @@
 /obj/machinery/photocopier/faxmachine{
 	department = "Premier's Office"
 	},
-/obj/machinery/requests_console{
-	announcementConsole = 1;
-	department = "Captain's Desk";
-	departmentType = 5;
-	name = "Captain RC";
-	pixel_y = 30
-	},
 /obj/structure/table/standard,
 /obj/machinery/camera/network/command,
+/obj/machinery/requests_console/preset/command/premier{
+	pixel_y = 35
+	},
 /turf/simulated/floor/tiled/steel/techfloor_grid,
 /area/nadezhda/command/captain/quarters)
 "eLa" = (
@@ -22062,7 +22056,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /turf/simulated/floor/plating/under,
-/area/nadezhda/command/bridge)
+/area/nadezhda/command/hallway)
 "eLq" = (
 /obj/structure/medical_stand/anesthetic,
 /obj/machinery/light/small{
@@ -22177,15 +22171,11 @@
 /turf/simulated/floor/beach/water/shallow,
 /area/nadezhda/crew_quarters/hydroponics)
 "eMD" = (
-/obj/structure/noticeboard/marshal{
-	pixel_x = -32
+/obj/item/modular_computer/console/preset/command{
+	dir = 4
 	},
-/obj/item/book/manual/wiki/security_ironparagraphs,
-/obj/item/stamp/hos,
-/obj/structure/table/woodentable,
-/obj/item/rig/combat/ert/co/wo/equipped,
-/turf/simulated/floor/wood,
-/area/nadezhda/command/swo/quarters)
+/turf/simulated/floor/tiled/steel/brown_platform,
+/area/nadezhda/pros/foreman)
 "eMM" = (
 /obj/structure/closet/crate/trashcart,
 /obj/machinery/alarm{
@@ -22935,11 +22925,21 @@
 /turf/simulated/floor/tiled/steel/techfloor_grid,
 /area/nadezhda/engineering/atmos/storage)
 "eTV" = (
-/obj/machinery/papershredder,
-/obj/machinery/camera/network/security{
-	dir = 4
+/obj/landmark/join/start/swo,
+/obj/structure/bed/chair/office/dark{
+	dir = 1
 	},
-/turf/simulated/floor/wood,
+/obj/structure/disposalpipe/segment{
+	dir = 1;
+	icon_state = "pipe-c"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 5
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 5
+	},
+/turf/simulated/floor/carpet/blucarpet,
 /area/nadezhda/command/swo/quarters)
 "eTX" = (
 /obj/structure/reagent_dispensers/fueltank/huge,
@@ -23465,9 +23465,6 @@
 	dir = 4
 	},
 /obj/machinery/light,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/tiled/steel,
 /area/nadezhda/security/sechall)
 "eZc" = (
@@ -23779,7 +23776,7 @@
 	},
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/tiled/dark,
-/area/nadezhda/command/bridge)
+/area/nadezhda/command/hallway)
 "fdy" = (
 /obj/structure/disposalpipe/segment,
 /obj/structure/cable/cyan{
@@ -23812,7 +23809,8 @@
 "fdN" = (
 /obj/machinery/door/airlock/command{
 	name = "CEO's Office";
-	req_access = list(41)
+	req_access = list(41);
+	id_tag = "ceodoor"
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -24264,7 +24262,7 @@
 	},
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/tiled/dark,
-/area/nadezhda/command/meeting_room)
+/area/nadezhda/command/bridge)
 "fia" = (
 /obj/structure/flora/ausbushes/genericbush,
 /obj/structure/flora/small/busha2,
@@ -24685,17 +24683,7 @@
 /turf/simulated/floor/tiled/white/golden,
 /area/nadezhda/engineering/atmos/surface)
 "fml" = (
-/obj/structure/filingcabinet{
-	density = 0;
-	pixel_x = 10
-	},
-/obj/structure/filingcabinet{
-	density = 0;
-	pixel_x = -10
-	},
-/obj/structure/filingcabinet{
-	density = 0
-	},
+/obj/structure/filingcabinet/chestdrawer,
 /turf/simulated/floor/tiled/dark/gray_perforated,
 /area/nadezhda/security/sechall)
 "fmo" = (
@@ -24815,10 +24803,6 @@
 /obj/structure/flora/small/grassb2,
 /turf/simulated/floor/asteroid/grass,
 /area/nadezhda/outside/forest)
-"fnA" = (
-/obj/structure/table/woodentable,
-/turf/simulated/floor/tiled/steel/brown_platform,
-/area/nadezhda/pros/foreman)
 "fnB" = (
 /obj/structure/scrap/food/large,
 /turf/simulated/floor/beach/sand,
@@ -25152,7 +25136,7 @@
 /obj/machinery/chemical_dispenser/coffee_master,
 /obj/structure/table/woodentable,
 /turf/simulated/floor/tiled/dark/monofloor,
-/area/nadezhda/command/meeting_room)
+/area/nadezhda/command/bridge)
 "fqh" = (
 /obj/machinery/atmospherics/pipe/simple/visible/universal,
 /obj/structure/railing{
@@ -25974,11 +25958,12 @@
 /turf/simulated/floor/tiled/dark/golden,
 /area/nadezhda/command/prime)
 "fAN" = (
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/tiled/steel/orangecorner,
-/area/nadezhda/rnd/circuitlab{
-	name = "Science Expedition prep"
-	})
+/obj/machinery/computer/prisoner{
+	dir = 1;
+	req_access = list(5)
+	},
+/turf/simulated/floor/carpet/blucarpet,
+/area/nadezhda/command/swo/quarters)
 "fAV" = (
 /obj/random/junk,
 /obj/machinery/light/small{
@@ -26067,6 +26052,11 @@
 /obj/machinery/button/windowtint{
 	id = "CEO"
 	},
+/obj/machinery/requests_console/preset/command/ceo{
+	dir = 8;
+	pixel_x = -35
+	},
+/obj/item/modular_computer/tablet/lease/preset/command,
 /turf/simulated/floor/carpet,
 /area/nadezhda/command/merchant)
 "fBP" = (
@@ -26126,7 +26116,7 @@
 	},
 /obj/structure/cable/green,
 /turf/simulated/floor/tiled/steel/techfloor_grid,
-/area/nadezhda/command/meeting_room)
+/area/nadezhda/command/bridge)
 "fCx" = (
 /obj/structure/table/standard,
 /obj/item/paper_bin{
@@ -26294,9 +26284,6 @@
 /area/nadezhda/engineering/engine_room)
 "fEi" = (
 /obj/structure/catwalk,
-/obj/structure/railing{
-	dir = 8
-	},
 /obj/random/scrap/dense_weighted/low_chance,
 /obj/structure/table/rack,
 /turf/simulated/floor/plating/under,
@@ -26353,9 +26340,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/tiled/steel/gray_perforated,
-/area/nadezhda/security{
-	name = "Security Training"
-	})
+/area/nadezhda/security/range)
 "fEU" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
@@ -27505,7 +27490,7 @@
 	d2 = 8;
 	icon_state = "2-8"
 	},
-/obj/structure/closet/secure_closet/reinforced/quartermaster,
+/obj/structure/filingcabinet,
 /turf/simulated/floor/tiled/steel/techfloor_grid,
 /area/nadezhda/command/merchant)
 "fTa" = (
@@ -27736,7 +27721,7 @@
 "fVW" = (
 /obj/structure/disposalpipe/segment,
 /turf/simulated/wall/r_wall,
-/area/nadezhda/command/bridge)
+/area/nadezhda/command/hallway)
 "fWf" = (
 /obj/item/trash/liquidfood,
 /turf/simulated/floor/tiled/white/bluecorner,
@@ -27902,9 +27887,7 @@
 /area/nadezhda/command/panic_room)
 "fYd" = (
 /turf/simulated/floor/tiled/dark/bluecorner,
-/area/nadezhda/security{
-	name = "Security Training"
-	})
+/area/nadezhda/security/range)
 "fYf" = (
 /obj/machinery/light/small{
 	dir = 4
@@ -28286,7 +28269,7 @@
 	},
 /obj/structure/catwalk,
 /turf/simulated/floor/plating/under,
-/area/nadezhda/command/bridge)
+/area/nadezhda/command/hallway)
 "gcn" = (
 /obj/effect/overlay/water,
 /obj/effect/overlay/water/top,
@@ -28423,7 +28406,7 @@
 	},
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/tiled/dark,
-/area/nadezhda/command/meeting_room)
+/area/nadezhda/command/bridge)
 "gdt" = (
 /obj/effect/overlay/water,
 /obj/effect/overlay/water/top,
@@ -29090,7 +29073,7 @@
 	},
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/tiled/dark,
-/area/nadezhda/command/bridge)
+/area/nadezhda/command/hallway)
 "gjH" = (
 /obj/effect/overlay/water,
 /obj/effect/overlay/water/top,
@@ -29554,7 +29537,8 @@
 "goL" = (
 /obj/machinery/door/airlock/command{
 	name = "CBO's Office";
-	req_access = list(40)
+	req_access = list(40);
+	id_tag = "cbodoor"
 	},
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -29582,9 +29566,9 @@
 /turf/simulated/floor/tiled/techmaint_perforated,
 /area/nadezhda/maintenance/undergroundfloor1east)
 "goR" = (
-/obj/item/contraband/poster/placed/generic/no_erp{
-	desc = "This poster reminds the crew that Eroticism, unsanctioned Rituals and Pornography are bad and shouldnt be film or done.";
-	pixel_y = -32
+/obj/machinery/requests_console/preset/command/gm{
+	dir = 1;
+	pixel_y = -35
 	},
 /turf/simulated/floor/carpet/oracarpet,
 /area/nadezhda/command/gmaster)
@@ -29772,7 +29756,7 @@
 	},
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/tiled/dark,
-/area/nadezhda/command/bridge)
+/area/nadezhda/command/hallway)
 "gqo" = (
 /obj/effect/floor_decal/industrial/warningwhite{
 	dir = 4
@@ -29917,6 +29901,24 @@
 /obj/effect/decal/cleanable/rubble,
 /turf/simulated/floor/asteroid/dirt/dark,
 /area/nadezhda/maintenance/undergroundfloor1west)
+"grR" = (
+/obj/structure/catwalk,
+/obj/structure/disposalpipe/segment{
+	dir = 8
+	},
+/obj/structure/cable/green{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/turf/simulated/floor/plating/under,
+/area/nadezhda/outside/inside_colony)
 "gsc" = (
 /obj/random/mob/termite_no_despawn,
 /obj/effect/decal/cleanable/dirt,
@@ -29982,6 +29984,18 @@
 /obj/machinery/atmospherics/pipe/manifold/visible/yellow,
 /turf/simulated/floor/tiled/dark/techfloor,
 /area/nadezhda/engineering/atmos)
+"gsS" = (
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/turf/simulated/floor/carpet/blucarpet,
+/area/nadezhda/command/swo/quarters)
 "gsT" = (
 /obj/machinery/door/airlock/external{
 	frequency = 1380;
@@ -30338,7 +30352,7 @@
 /obj/structure/table/woodentable,
 /obj/item/folder/red,
 /turf/simulated/floor/tiled/dark/monofloor,
-/area/nadezhda/command/meeting_room)
+/area/nadezhda/command/bridge)
 "gwG" = (
 /obj/structure/table/bench/wooden,
 /turf/simulated/floor/wood,
@@ -30423,7 +30437,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/plating/under,
-/area/nadezhda/command/bridge)
+/area/nadezhda/command/hallway)
 "gxw" = (
 /obj/structure/window/basic{
 	dir = 8
@@ -30840,9 +30854,7 @@
 	dir = 5
 	},
 /turf/simulated/floor/tiled/dark/bluecorner,
-/area/nadezhda/security{
-	name = "Security Training"
-	})
+/area/nadezhda/security/range)
 "gDv" = (
 /obj/random/structures/low_chance,
 /obj/structure/catwalk,
@@ -31758,6 +31770,13 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/tiled/dark/cargo,
 /area/nadezhda/maintenance/undergroundfloor1north)
+"gPn" = (
+/obj/machinery/alarm{
+	dir = 4;
+	pixel_x = -32
+	},
+/turf/simulated/floor/carpet/blucarpet,
+/area/nadezhda/command/swo/quarters)
 "gPp" = (
 /obj/machinery/camera/network/colony_underground,
 /obj/effect/decal/cleanable/dirt,
@@ -32052,7 +32071,7 @@
 	},
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/tiled/dark,
-/area/nadezhda/command/bridge)
+/area/nadezhda/command/hallway)
 "gSJ" = (
 /obj/machinery/light/small{
 	dir = 4
@@ -32424,6 +32443,19 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/tiled/techmaint,
 /area/nadezhda/maintenance/undergroundfloor1north)
+"gWd" = (
+/obj/structure/cable/green{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
+/obj/structure/disposalpipe/segment,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/unary/vent_pump{
+	dir = 8
+	},
+/turf/simulated/floor/tiled/dark,
+/area/nadezhda/command/hallway)
 "gWf" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -33727,6 +33759,22 @@
 "hle" = (
 /obj/structure/table/standard,
 /obj/item/stamp/ce,
+/obj/item/modular_computer/tablet/lease/preset/command,
+/obj/machinery/button/remote/airlock{
+	pixel_x = 6;
+	pixel_y = 5;
+	id = "gmdoor";
+	name = "GM Door Open Control";
+	req_access = list(19)
+	},
+/obj/machinery/button/remote/airlock{
+	pixel_x = -6;
+	pixel_y = 5;
+	id = "gmdoor";
+	name = "GM Door Bolt Control";
+	specialfunctions = 4;
+	req_access = list(19)
+	},
 /turf/simulated/floor/carpet/oracarpet,
 /area/nadezhda/command/gmaster)
 "hlf" = (
@@ -33824,6 +33872,9 @@
 /obj/structure/multiz/stairs/active{
 	dir = 1
 	},
+/obj/machinery/light{
+	dir = 1
+	},
 /turf/simulated/floor/tiled/dark/bluecorner,
 /area/nadezhda/security/tactical_blackshield)
 "hmj" = (
@@ -34031,7 +34082,7 @@
 /obj/machinery/door/firedoor,
 /obj/structure/disposalpipe/segment,
 /turf/simulated/floor/plating/under,
-/area/nadezhda/command/bridge)
+/area/nadezhda/command/hallway)
 "hoH" = (
 /turf/simulated/mineral,
 /area/nadezhda/maintenance/undergroundfloor1west)
@@ -34975,9 +35026,6 @@
 /obj/effect/floor_decal/industrial/arrows{
 	dir = 8
 	},
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/tiled/steel,
 /area/nadezhda/security/sechall)
 "hzs" = (
@@ -34988,17 +35036,14 @@
 /turf/simulated/floor/plating/under,
 /area/nadezhda/maintenance/undergroundfloor1east)
 "hzu" = (
-/obj/machinery/requests_console{
-	announcementConsole = 1;
-	department = "Prime's Office";
-	departmentType = 22;
-	name = "Prime's RC";
-	pixel_x = 30
-	},
 /obj/structure/table/woodentable,
 /obj/machinery/photocopier/faxmachine{
 	department = "Prime's Office"
 	},
+/obj/machinery/requests_console/preset/command/prime{
+	dir = 4;
+	pixel_x = 35
+	},
 /turf/simulated/floor/wood/wild3,
 /area/nadezhda/command/prime)
 "hzv" = (
@@ -35139,6 +35184,9 @@
 	pixel_y = -22
 	},
 /obj/item/toy/plushie/deer,
+/obj/machinery/camera/network/colony_surface{
+	dir = 1
+	},
 /turf/simulated/floor/tiled/steel/gray_perforated,
 /area/nadezhda/rnd/circuitlab{
 	name = "Science Expedition prep"
@@ -35673,9 +35721,7 @@
 /obj/effect/window_lwall_spawn/reinforced,
 /obj/machinery/door/firedoor,
 /turf/simulated/floor/plating/under,
-/area/nadezhda/security{
-	name = "Security Training"
-	})
+/area/nadezhda/security/range)
 "hGs" = (
 /obj/machinery/door/airlock/glass_command{
 	name = "Bridge";
@@ -35689,7 +35735,7 @@
 /obj/structure/disposalpipe/segment,
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/tiled/dark,
-/area/nadezhda/command/bridge)
+/area/nadezhda/command/hallway)
 "hGu" = (
 /obj/item/storage/deferred/crate,
 /obj/effect/decal/cleanable/dirt,
@@ -36567,13 +36613,17 @@
 /turf/simulated/floor/tiled/dark/danger,
 /area/nadezhda/rnd/research)
 "hOa" = (
-/obj/structure/table/rack,
-/obj/random/scrap/dense_weighted/low_chance,
-/obj/machinery/camera/network/colony_surface,
-/turf/simulated/floor/tiled/steel/orangecorner,
-/area/nadezhda/rnd/circuitlab{
-	name = "Science Expedition prep"
-	})
+/obj/structure/table/woodentable,
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+	dir = 8
+	},
+/obj/item/modular_computer/tablet/lease/preset/command,
+/turf/simulated/floor/carpet/blucarpet,
+/area/nadezhda/command/swo/quarters)
 "hOh" = (
 /obj/landmark/join/start/cyborg,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -36901,7 +36951,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /turf/simulated/floor/plating/under,
-/area/nadezhda/command/bridge)
+/area/nadezhda/command/hallway)
 "hTJ" = (
 /obj/effect/floor_decal/industrial/warning{
 	dir = 1
@@ -37264,6 +37314,15 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/tiled/techmaint,
 /area/nadezhda/maintenance/undergroundfloor1north)
+"hXf" = (
+/obj/effect/floor_decal/steeldecal/steel_decals10,
+/obj/machinery/photocopier/faxmachine{
+	department = "Warrent Officer's Office"
+	},
+/obj/structure/table/steel,
+/obj/machinery/light,
+/turf/simulated/floor/wood,
+/area/nadezhda/command/swo/quarters)
 "hXi" = (
 /obj/effect/window_lwall_spawn/reinforced,
 /turf/simulated/floor/tiled/dark/cargo,
@@ -37483,7 +37542,7 @@
 /obj/structure/disposalpipe/segment,
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/tiled/dark,
-/area/nadezhda/command/bridge)
+/area/nadezhda/command/hallway)
 "hYM" = (
 /obj/structure/closet/secure_closet/reinforced/foreman,
 /turf/simulated/floor/tiled/steel/brown_platform,
@@ -37513,16 +37572,17 @@
 /obj/machinery/button/remote/airlock{
 	dir = 1;
 	id = "mcbolt1";
-	name = "Door Bolt Control";
+	name = "BC Door Bolt Control";
 	pixel_x = 6;
 	req_access = list(58);
 	specialfunctions = 4
 	},
-/obj/machinery/button/remote/blast_door{
+/obj/machinery/button/remote/airlock{
 	dir = 1;
-	id = "mcshutters";
-	name = "Shutter control";
-	pixel_x = -6
+	id = "mcbolt1";
+	name = "BC Door Open Control";
+	pixel_x = -6;
+	req_access = list(58)
 	},
 /turf/simulated/floor/carpet/bcarpet,
 /area/nadezhda/command/smc/quarters)
@@ -37582,7 +37642,7 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/tiled/dark,
-/area/nadezhda/command/bridge)
+/area/nadezhda/command/hallway)
 "hZq" = (
 /obj/effect/window_lwall_spawn/plasma/reinforced,
 /obj/machinery/door/firedoor,
@@ -37964,7 +38024,7 @@
 	},
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/tiled/dark,
-/area/nadezhda/command/bridge)
+/area/nadezhda/command/hallway)
 "icV" = (
 /turf/open/pool,
 /area/nadezhda/crew_quarters/pool)
@@ -38061,11 +38121,6 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 10
 	},
-/obj/structure/cable/green{
-	d1 = 1;
-	d2 = 2;
-	icon_state = "1-2"
-	},
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/carpet/bcarpet,
@@ -39642,6 +39697,18 @@
 /obj/effect/decal/cleanable/rubble,
 /turf/simulated/floor/tiled/dark/brown_perforated,
 /area/nadezhda/maintenance/undergroundfloor1north)
+"iuK" = (
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/turf/simulated/floor/wood,
+/area/nadezhda/command/swo/quarters)
 "iuN" = (
 /obj/random/closet,
 /obj/effect/decal/cleanable/dirt,
@@ -40672,9 +40739,6 @@
 /obj/effect/floor_decal/spline/fancy{
 	dir = 1
 	},
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/tiled/steel,
 /area/nadezhda/security/sechall)
 "iHC" = (
@@ -41149,10 +41213,11 @@
 /turf/simulated/floor/asteroid/grass,
 /area/nadezhda/hallway/main/stairwell)
 "iNa" = (
-/obj/machinery/atmospherics/unary/vent_scrubber{
-	dir = 8
+/obj/effect/floor_decal/spline/wood{
+	dir = 8;
+	icon_state = "spline_fancy_corner"
 	},
-/turf/simulated/floor/carpet/blucarpet,
+/turf/simulated/floor/wood,
 /area/nadezhda/command/swo/quarters)
 "iNd" = (
 /obj/structure/table/woodentable,
@@ -41446,7 +41511,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/tiled/dark,
-/area/nadezhda/command/bridge)
+/area/nadezhda/command/hallway)
 "iPV" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
@@ -41762,9 +41827,6 @@
 	dir = 1;
 	pixel_y = -32
 	},
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/tiled/steel,
 /area/nadezhda/security/sechall)
 "iUo" = (
@@ -41784,7 +41846,7 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/tiled/dark,
-/area/nadezhda/command/bridge)
+/area/nadezhda/command/hallway)
 "iUt" = (
 /obj/structure/closet/crate/trashcart,
 /obj/structure/cable/green{
@@ -41798,7 +41860,7 @@
 /obj/effect/floor_decal/industrial/outline/red,
 /obj/structure/multiz/ladder/up,
 /turf/simulated/floor/tiled/techmaint_panels,
-/area/nadezhda/command/bridge)
+/area/nadezhda/command/hallway)
 "iUy" = (
 /obj/structure/flora/ausbushes/lavendergrass,
 /obj/machinery/portable_atmospherics/hydroponics/soil/invisible,
@@ -41892,14 +41954,10 @@
 /turf/simulated/floor/tiled/dark/bluecorner,
 /area/nadezhda/security/armoryshop)
 "iVz" = (
-/obj/effect/floor_decal/steeldecal/steel_decals10{
-	dir = 8
-	},
-/obj/structure/closet/secure_closet/reinforced/hos,
-/obj/effect/floor_decal/spline/fancy{
-	dir = 1
+/obj/structure/disposalpipe/segment{
+	dir = 4
 	},
-/turf/simulated/floor/tiled/dark/gray_perforated,
+/turf/simulated/floor/wood,
 /area/nadezhda/command/swo/quarters)
 "iVA" = (
 /obj/effect/window_lwall_spawn/reinforced,
@@ -41936,9 +41994,7 @@
 /area/nadezhda/crew_quarters/kitchen)
 "iVP" = (
 /turf/simulated/wall/r_wall,
-/area/nadezhda/security{
-	name = "Security Training"
-	})
+/area/nadezhda/security/range)
 "iVR" = (
 /obj/structure/sign/warning/siphon_valve{
 	name = "\improper SIPHON PUMP";
@@ -42912,9 +42968,6 @@
 	dir = 8
 	},
 /obj/effect/floor_decal/industrial/arrows,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/tiled/steel,
 /area/nadezhda/security/sechall)
 "jhl" = (
@@ -43040,7 +43093,10 @@
 	name = "Residential District Maintenance"
 	})
 "jig" = (
-/obj/landmark/join/start/chaplain,
+/obj/item/modular_computer/console/preset/command{
+	dir = 4;
+	pixel_x = -5
+	},
 /turf/simulated/floor/wood/wild3,
 /area/nadezhda/command/prime)
 "jij" = (
@@ -43657,9 +43713,7 @@
 "jop" = (
 /obj/machinery/hologram/holopad,
 /turf/simulated/floor/tiled/dark/danger,
-/area/nadezhda/security{
-	name = "Security Training"
-	})
+/area/nadezhda/security/range)
 "jor" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -44060,9 +44114,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/tiled/dark/danger,
-/area/nadezhda/security{
-	name = "Security Training"
-	})
+/area/nadezhda/security/range)
 "jsu" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/random/junk,
@@ -44356,7 +44408,7 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/button/remote/blast_door{
 	id = "panic_room_blastshutters";
-	name = "Guild Lobby shutter control";
+	name = "Blast Shutters";
 	pixel_x = -10;
 	pixel_y = 32
 	},
@@ -44427,9 +44479,7 @@
 	icon_state = "0-2"
 	},
 /turf/simulated/floor/tiled/dark/danger,
-/area/nadezhda/security{
-	name = "Security Training"
-	})
+/area/nadezhda/security/range)
 "jwo" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -44521,7 +44571,7 @@
 "jwR" = (
 /obj/random/furniture/pottedplant,
 /turf/simulated/floor/tiled/dark/monofloor,
-/area/nadezhda/command/meeting_room)
+/area/nadezhda/command/bridge)
 "jwT" = (
 /obj/structure/cable/green{
 	d1 = 1;
@@ -45001,6 +45051,7 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
+/obj/structure/filingcabinet,
 /turf/simulated/floor/wood,
 /area/nadezhda/command/gmaster)
 "jDG" = (
@@ -45229,9 +45280,7 @@
 "jFH" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /turf/simulated/floor/tiled/dark/danger,
-/area/nadezhda/security{
-	name = "Security Training"
-	})
+/area/nadezhda/security/range)
 "jFJ" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/door/unpowered/simple/wood/saloon,
@@ -45572,7 +45621,7 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/tiled/dark,
-/area/nadezhda/command/bridge)
+/area/nadezhda/command/hallway)
 "jJp" = (
 /obj/structure/bed/padded,
 /obj/item/bedsheet/medical,
@@ -46588,16 +46637,20 @@
 /turf/simulated/floor/tiled/white/brown_platform,
 /area/nadezhda/hallway/surface/section1)
 "jUw" = (
-/obj/structure/table/rack,
-/obj/random/scrap/dense_weighted/low_chance,
-/obj/machinery/firealarm{
-	dir = 1;
-	pixel_y = -32
+/obj/effect/floor_decal/spline/wood{
+	dir = 8
 	},
-/turf/simulated/floor/tiled/steel/orangecorner,
-/area/nadezhda/rnd/circuitlab{
-	name = "Science Expedition prep"
-	})
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/turf/simulated/floor/wood,
+/area/nadezhda/command/swo/quarters)
 "jUx" = (
 /obj/machinery/atmospherics/pipe/simple/visible/universal,
 /obj/structure/railing{
@@ -46957,6 +47010,12 @@
 /obj/machinery/photocopier/faxmachine{
 	department = "Blackshield Commander's Office"
 	},
+/obj/machinery/button/remote/airlock{
+	id = "mcshutters";
+	req_access = list(58);
+	pixel_y = 25;
+	name = "Shutters Control"
+	},
 /turf/simulated/floor/wood,
 /area/nadezhda/command/smc/quarters)
 "jZr" = (
@@ -47084,9 +47143,16 @@
 /turf/simulated/floor/tiled/dark/gray_platform,
 /area/nadezhda/pros/prep)
 "kaw" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/disposalpipe/segment,
 /obj/effect/decal/cleanable/dirt,
+/obj/machinery/light_switch{
+	dir = 4;
+	pixel_x = -32
+	},
 /turf/simulated/floor/tiled/dark,
-/area/nadezhda/command/meeting_room)
+/area/nadezhda/command/hallway)
 "kaz" = (
 /obj/machinery/atmospherics/pipe/simple/visible/red{
 	dir = 9
@@ -47669,7 +47735,7 @@
 	},
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/tiled/dark,
-/area/nadezhda/command/bridge)
+/area/nadezhda/command/hallway)
 "kgI" = (
 /obj/effect/window_lwall_spawn/reinforced,
 /turf/simulated/floor/plating,
@@ -47776,11 +47842,6 @@
 /obj/structure/flora/big/bush2,
 /turf/simulated/floor/asteroid/grass,
 /area/nadezhda/outside/lakeside)
-"khq" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/tiled/dark,
-/area/nadezhda/command/meeting_room)
 "khv" = (
 /obj/structure/table/standard,
 /obj/random/lowkeyrandom/low_chance,
@@ -48526,7 +48587,7 @@
 /obj/machinery/chemical_dispenser/soda,
 /obj/machinery/camera/network/command,
 /turf/simulated/floor/tiled/dark/monofloor,
-/area/nadezhda/command/meeting_room)
+/area/nadezhda/command/bridge)
 "kpR" = (
 /obj/structure/table/glass,
 /obj/item/storage/firstaid/regular,
@@ -48724,7 +48785,7 @@
 "krN" = (
 /obj/structure/filingcabinet/employment,
 /turf/simulated/floor/tiled/steel/techfloor_grid,
-/area/nadezhda/command/meeting_room)
+/area/nadezhda/command/bridge)
 "krP" = (
 /obj/structure/disposalpipe/segment,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -48951,9 +49012,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/tiled/steel,
-/area/nadezhda/security{
-	name = "Security Training"
-	})
+/area/nadezhda/security/range)
 "kuC" = (
 /obj/structure/shuttle_part/mining{
 	icon_state = "17,18"
@@ -49375,13 +49434,12 @@
 /turf/unsimulated/wall/jungle,
 /area/nadezhda/outside/forest)
 "kyT" = (
-/obj/structure/table/rack,
-/obj/random/scrap/dense_weighted/low_chance,
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/tiled/steel/orangecorner,
-/area/nadezhda/rnd/circuitlab{
-	name = "Science Expedition prep"
-	})
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/effect/floor_decal/spline/wood,
+/obj/structure/disposalpipe/segment,
+/turf/simulated/floor/wood,
+/area/nadezhda/command/swo/quarters)
 "kyY" = (
 /obj/structure/bed/chair/wood{
 	dir = 4;
@@ -49692,9 +49750,7 @@
 	pixel_y = 32
 	},
 /turf/simulated/floor/tiled/dark/cargo,
-/area/nadezhda/security{
-	name = "Security Training"
-	})
+/area/nadezhda/security/range)
 "kCD" = (
 /obj/machinery/vending/assist,
 /obj/machinery/firealarm{
@@ -49887,6 +49943,23 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/tiled/techmaint_perforated,
 /area/nadezhda/maintenance/undergroundfloor1east)
+"kEk" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable/green{
+	d1 = 2;
+	d2 = 8;
+	icon_state = "2-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 6
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 6
+	},
+/turf/simulated/floor/tiled/steel/violetcorener,
+/area/nadezhda/rnd/circuitlab{
+	name = "Science Expedition prep"
+	})
 "kEm" = (
 /obj/machinery/ntnet_relay,
 /turf/simulated/floor/tiled/white/techfloor_grid,
@@ -49992,7 +50065,7 @@
 	},
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/tiled/dark,
-/area/nadezhda/command/bridge)
+/area/nadezhda/command/hallway)
 "kFG" = (
 /obj/effect/spider/stickyweb,
 /obj/effect/spider/stickyweb,
@@ -50053,7 +50126,7 @@
 /obj/machinery/atmospherics/pipe/manifold4w/hidden/supply,
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/tiled/dark,
-/area/nadezhda/command/bridge)
+/area/nadezhda/command/hallway)
 "kGl" = (
 /obj/structure/boulder,
 /turf/simulated/floor/plating/under,
@@ -50369,17 +50442,11 @@
 /turf/simulated/open,
 /area/nadezhda/maintenance/undergroundfloor1north)
 "kLe" = (
-/obj/effect/window_lwall_spawn/reinforced,
-/obj/machinery/door/blast/shutters{
-	density = 0;
-	dir = 2;
-	icon_state = "shutter0";
-	id = "mcshutters";
-	name = "Commanders Office Shutters";
-	opacity = 0
-	},
 /obj/machinery/door/firedoor,
 /obj/machinery/door/firedoor,
+/obj/effect/window_lwall_spawn/reinforced/polarized{
+	id = "BC"
+	},
 /turf/simulated/floor/plating,
 /area/nadezhda/command/smc/quarters)
 "kLk" = (
@@ -50520,7 +50587,7 @@
 	},
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/tiled/dark,
-/area/nadezhda/command/meeting_room)
+/area/nadezhda/command/bridge)
 "kNl" = (
 /obj/structure/cyberplant,
 /turf/simulated/floor/rock/manmade/ruin3,
@@ -51178,12 +51245,10 @@
 /turf/simulated/floor/tiled/dark,
 /area/nadezhda/pros/prep)
 "kVl" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/effect/decal/cleanable/dirt,
 /obj/machinery/camera/network/security{
 	dir = 8
 	},
-/obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/tiled/dark/bluecorner,
 /area/nadezhda/security/sechall)
 "kVq" = (
@@ -51621,7 +51686,7 @@
 	},
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/tiled/dark,
-/area/nadezhda/command/meeting_room)
+/area/nadezhda/command/bridge)
 "lbp" = (
 /turf/simulated/floor/tiled/techmaint,
 /area/nadezhda/maintenance{
@@ -51735,13 +51800,18 @@
 /turf/simulated/floor/plating/under,
 /area/nadezhda/maintenance/undergroundfloor1east)
 "lcJ" = (
-/obj/structure/closet/emcloset/legacy,
-/obj/item/grenade/chem_grenade/metalfoam,
-/obj/item/grenade/chem_grenade/metalfoam,
-/obj/machinery/camera/network/colony_surface{
-	dir = 1
+/obj/structure/disposalpipe/segment{
+	dir = 4;
+	icon_state = "pipe-c"
 	},
-/turf/simulated/floor/tiled/steel/gray_perforated,
+/obj/structure/cable/green{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/turf/simulated/floor/tiled/steel/violetcorener,
 /area/nadezhda/rnd/circuitlab{
 	name = "Science Expedition prep"
 	})
@@ -52077,7 +52147,7 @@
 	dir = 1
 	},
 /turf/simulated/floor/tiled/steel/techfloor_grid,
-/area/nadezhda/command/meeting_room)
+/area/nadezhda/command/bridge)
 "lfZ" = (
 /obj/machinery/hologram/holopad,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -52669,7 +52739,6 @@
 	opacity = 0
 	},
 /obj/machinery/door/airlock/command{
-	id_tag = "mcbolt1";
 	name = "Blackshield Commander";
 	req_access = list(58,37)
 	},
@@ -52764,7 +52833,7 @@
 	name = "prime seat"
 	},
 /turf/simulated/floor/tiled/dark,
-/area/nadezhda/command/meeting_room)
+/area/nadezhda/command/bridge)
 "lpz" = (
 /obj/structure/flora/ausbushes/stalkybush,
 /obj/structure/flora/ausbushes/fullgrass,
@@ -53249,7 +53318,7 @@
 	department = "Command Meeting Room Office"
 	},
 /turf/simulated/floor/tiled/steel/techfloor_grid,
-/area/nadezhda/command/meeting_room)
+/area/nadezhda/command/bridge)
 "luR" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -53697,6 +53766,9 @@
 	d2 = 8;
 	icon_state = "1-8"
 	},
+/obj/effect/floor_decal/spline/wood{
+	dir = 4
+	},
 /turf/simulated/floor/wood,
 /area/nadezhda/command/smc/quarters)
 "lAo" = (
@@ -53870,12 +53942,26 @@
 /turf/simulated/floor/tiled/dark,
 /area/nadezhda/pros/prep)
 "lCH" = (
-/turf/simulated/shuttle/wall/mining{
-	icon_state = "7,10"
+/obj/structure/catwalk,
+/obj/structure/disposalpipe/segment{
+	dir = 1;
+	icon_state = "pipe-c"
 	},
-/area/nadezhda/rnd/circuitlab{
-	name = "Science Expedition prep"
-	})
+/obj/structure/cable/green{
+	d1 = 1;
+	d2 = 4;
+	icon_state = "1-4"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 5
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 5
+	},
+/obj/random/scrap/dense_weighted/low_chance,
+/obj/structure/table/rack,
+/turf/simulated/floor/plating/under,
+/area/nadezhda/outside/inside_colony)
 "lCI" = (
 /obj/machinery/power/smes/buildable{
 	RCon_tag = "Hulk Mining Barge";
@@ -54103,11 +54189,6 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 6
 	},
-/obj/structure/cable/green{
-	d1 = 2;
-	d2 = 4;
-	icon_state = "2-4"
-	},
 /turf/simulated/floor/tiled/white,
 /area/nadezhda/security/detectives_office)
 "lFC" = (
@@ -54283,7 +54364,7 @@
 	},
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/tiled/dark,
-/area/nadezhda/command/bridge)
+/area/nadezhda/command/hallway)
 "lHm" = (
 /obj/structure/cable/green{
 	d1 = 1;
@@ -54416,9 +54497,7 @@
 /obj/structure/table/steel_reinforced,
 /obj/item/ammo_magazine/ammobox/magnum_40/practice,
 /turf/simulated/floor/tiled/dark/cargo,
-/area/nadezhda/security{
-	name = "Security Training"
-	})
+/area/nadezhda/security/range)
 "lIt" = (
 /obj/random/structures/low_chance,
 /turf/simulated/floor/tiled/techmaint,
@@ -55336,6 +55415,7 @@
 /area/shuttle/vasiliy_shuttle_area)
 "lSC" = (
 /obj/structure/table/steel_reinforced,
+/obj/item/modular_computer/tablet/lease/preset/command,
 /turf/simulated/floor/carpet/bcarpet,
 /area/nadezhda/command/smc/quarters)
 "lSQ" = (
@@ -56913,12 +56993,13 @@
 	name = "East APC";
 	pixel_x = 28
 	},
+/obj/structure/filingcabinet,
 /turf/simulated/floor/wood/wild3,
 /area/nadezhda/command/prime)
 "miN" = (
 /obj/machinery/atmospherics/pipe/zpipe/up,
 /turf/simulated/floor/plating/under,
-/area/nadezhda/command/bridge)
+/area/nadezhda/command/hallway)
 "miO" = (
 /turf/simulated/floor/plating/under,
 /area/nadezhda/engineering/atmos)
@@ -57097,9 +57178,7 @@
 /obj/structure/table/steel_reinforced,
 /obj/item/ammo_magazine/ammobox/shotgun/practiceshells,
 /turf/simulated/floor/tiled/dark/cargo,
-/area/nadezhda/security{
-	name = "Security Training"
-	})
+/area/nadezhda/security/range)
 "mkL" = (
 /obj/structure/cable/green{
 	d1 = 1;
@@ -57475,9 +57554,14 @@
 /turf/simulated/floor/tiled/white,
 /area/nadezhda/medical/cryo)
 "mpg" = (
-/obj/structure/table/rack,
-/obj/random/scrap/dense_weighted/low_chance,
-/turf/simulated/floor/tiled/steel/orangecorner,
+/obj/machinery/door/blast/regular/open{
+	id = "Colony Lockdown"
+	},
+/obj/machinery/door/airlock/glass_research{
+	name = "Expedition prep";
+	req_access = list(5)
+	},
+/turf/simulated/floor/tiled/steel/violetcorener,
 /area/nadezhda/rnd/circuitlab{
 	name = "Science Expedition prep"
 	})
@@ -58029,7 +58113,7 @@
 	},
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/tiled/dark,
-/area/nadezhda/command/meeting_room)
+/area/nadezhda/command/bridge)
 "muX" = (
 /obj/structure/bed/chair,
 /turf/simulated/floor/asteroid/dirt,
@@ -58344,9 +58428,7 @@
 	dir = 10
 	},
 /turf/simulated/floor/tiled/dark/danger,
-/area/nadezhda/security{
-	name = "Security Training"
-	})
+/area/nadezhda/security/range)
 "mzy" = (
 /obj/structure/flora/ausbushes/sparsegrass,
 /obj/random/flora/jungle_tree,
@@ -59179,7 +59261,7 @@
 /obj/machinery/disposal,
 /obj/effect/floor_decal/industrial/box/red,
 /obj/structure/disposalpipe/trunk{
-	dir = 1
+	dir = 8
 	},
 /turf/simulated/floor/tiled/steel/gray_perforated,
 /area/nadezhda/rnd/circuitlab{
@@ -59289,7 +59371,7 @@
 	},
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/tiled/dark,
-/area/nadezhda/command/bridge)
+/area/nadezhda/command/hallway)
 "mIe" = (
 /obj/machinery/camera/network/research,
 /turf/simulated/floor/tiled/dark/violetcorener,
@@ -59486,10 +59568,16 @@
 	dir = 6
 	},
 /turf/simulated/floor/tiled/dark/monofloor,
-/area/nadezhda/command/meeting_room)
+/area/nadezhda/command/bridge)
 "mKR" = (
-/obj/effect/floor_decal/spline/wood,
 /obj/structure/disposalpipe/segment{
+	dir = 2;
+	icon_state = "pipe-c"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
 /turf/simulated/floor/wood,
@@ -60269,7 +60357,7 @@
 	},
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/tiled/dark,
-/area/nadezhda/command/meeting_room)
+/area/nadezhda/command/bridge)
 "mTu" = (
 /obj/effect/floor_decal/industrial/danger{
 	dir = 1
@@ -60510,12 +60598,11 @@
 /turf/simulated/floor/tiled/white/brown_platform,
 /area/nadezhda/medical/chemistry)
 "mWV" = (
-/turf/simulated/shuttle/wall/mining{
-	icon_state = "10,18"
+/obj/effect/floor_decal/spline/wood{
+	dir = 8
 	},
-/area/nadezhda/rnd/circuitlab{
-	name = "Science Expedition prep"
-	})
+/turf/simulated/floor/wood,
+/area/nadezhda/command/swo/quarters)
 "mWZ" = (
 /obj/item/remains/deer,
 /turf/simulated/floor/asteroid/grass,
@@ -60781,6 +60868,22 @@
 	id = "AISHIELD";
 	name = "AI Upload Shield"
 	},
+/obj/item/modular_computer/tablet/lease/preset/command,
+/obj/machinery/button/remote/airlock{
+	dir = 8;
+	id = "crodoor";
+	name = "CRO Door Bolt Control";
+	req_access = list(30);
+	specialfunctions = 4;
+	pixel_y = -10
+	},
+/obj/machinery/button/remote/airlock{
+	dir = 8;
+	id = "crodoor";
+	name = "CRO Door Open Control";
+	req_access = list(30);
+	pixel_y = 7
+	},
 /turf/simulated/floor/carpet/purcarpet,
 /area/nadezhda/command/cro)
 "mYW" = (
@@ -61095,7 +61198,8 @@
 "nby" = (
 /obj/machinery/door/airlock/glass_command{
 	name = "Guild Masters Office";
-	req_access = list(19)
+	req_access = list(19);
+	id_tag = "gmdoor"
 	},
 /obj/structure/cable/yellow{
 	d1 = 4;
@@ -61426,13 +61530,14 @@
 /turf/simulated/floor/tiled/dark/violetcorener,
 /area/nadezhda/rnd/research)
 "nfc" = (
-/obj/machinery/light,
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/computer/guestpass{
-	pixel_y = -32
+/obj/machinery/recharger,
+/obj/structure/table/woodentable,
+/obj/machinery/firealarm{
+	dir = 8;
+	pixel_x = 32
 	},
-/turf/simulated/floor/tiled/dark/bluecorner,
-/area/nadezhda/security/sechall)
+/turf/simulated/floor/wood,
+/area/nadezhda/command/swo/quarters)
 "nfh" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -61930,7 +62035,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/plating/under,
-/area/nadezhda/command/bridge)
+/area/nadezhda/command/hallway)
 "nkM" = (
 /obj/structure/disposalpipe/segment,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -62695,9 +62800,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/tiled/dark/danger,
-/area/nadezhda/security{
-	name = "Security Training"
-	})
+/area/nadezhda/security/range)
 "nsW" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 6
@@ -63206,12 +63309,8 @@
 /turf/simulated/floor/tiled/steel/bar_flat,
 /area/nadezhda/maintenance/undergroundfloor1north)
 "nyv" = (
-/obj/machinery/door/airlock/glass_research{
-	name = "Expedition prep";
-	req_access = list(5)
-	},
 /obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/tiled/steel/gray_perforated,
+/turf/simulated/wall/r_wall,
 /area/nadezhda/rnd/circuitlab{
 	name = "Science Expedition prep"
 	})
@@ -63278,11 +63377,6 @@
 /obj/structure/disposalpipe/segment,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/structure/cable/green{
-	d1 = 1;
-	d2 = 2;
-	icon_state = "1-2"
-	},
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/tiled/dark/gray_perforated,
 /area/nadezhda/security/detectives_office)
@@ -63299,11 +63393,6 @@
 /obj/effect/decal/cleanable/rubble,
 /turf/simulated/floor/plating/under,
 /area/nadezhda/maintenance/undergroundfloor1north)
-"nyY" = (
-/obj/structure/flora/small/rock3,
-/obj/structure/invislight,
-/turf/simulated/floor/asteroid/grass,
-/area/nadezhda/outside/inside_colony)
 "nyZ" = (
 /obj/structure/flora/small/grassb1,
 /obj/structure/flora/small/busha1,
@@ -63747,8 +63836,11 @@
 	},
 /obj/effect/floor_decal/industrial/box/red/corners,
 /obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+	dir = 8
+	},
 /turf/simulated/floor/tiled/dark,
-/area/nadezhda/command/bridge)
+/area/nadezhda/command/hallway)
 "nDm" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -63782,6 +63874,10 @@
 	d2 = 2;
 	icon_state = "1-2"
 	},
+/obj/effect/floor_decal/spline/wood{
+	dir = 1;
+	icon_state = "spline_fancy_corner"
+	},
 /turf/simulated/floor/wood,
 /area/nadezhda/command/smc/quarters)
 "nDA" = (
@@ -63890,21 +63986,9 @@
 /turf/simulated/floor/tiled/dark/monofloor,
 /area/nadezhda/crew_quarters/hydroponics/garden)
 "nEo" = (
-/obj/structure/disposalpipe/segment,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 1
-	},
-/obj/structure/cable/green{
-	d1 = 1;
-	d2 = 2;
-	icon_state = "1-2"
-	},
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/tiled/steel/orangecorner,
-/area/nadezhda/rnd/circuitlab{
-	name = "Science Expedition prep"
-	})
+/obj/machinery/light,
+/turf/simulated/floor/carpet/blucarpet,
+/area/nadezhda/command/swo/quarters)
 "nEt" = (
 /obj/structure/invislight,
 /turf/simulated/floor/asteroid/dirt/dust,
@@ -64908,7 +64992,7 @@
 	pixel_x = 24
 	},
 /turf/simulated/floor/tiled/dark,
-/area/nadezhda/command/bridge)
+/area/nadezhda/command/hallway)
 "nOS" = (
 /turf/simulated/floor/asteroid/dirt,
 /area/nadezhda/engineering/engine_room)
@@ -65918,7 +66002,7 @@
 	},
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/tiled/dark,
-/area/nadezhda/command/meeting_room)
+/area/nadezhda/command/bridge)
 "nZR" = (
 /obj/random/cluster/roaches/low_chance,
 /obj/effect/decal/cleanable/dirt,
@@ -66449,13 +66533,15 @@
 	dir = 4
 	},
 /turf/simulated/floor/tiled/dark/cargo,
-/area/nadezhda/security{
-	name = "Security Training"
-	})
+/area/nadezhda/security/range)
 "ofo" = (
-/obj/structure/table/woodentable,
-/turf/simulated/floor/carpet/blucarpet,
-/area/nadezhda/command/swo/quarters)
+/obj/machinery/computer/guestpass{
+	pixel_y = -32
+	},
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/light,
+/turf/simulated/floor/tiled/dark/bluecorner,
+/area/nadezhda/security/sechall)
 "ofs" = (
 /obj/structure/railing{
 	dir = 8
@@ -66571,9 +66657,6 @@
 /obj/effect/floor_decal/spline/fancy{
 	dir = 8
 	},
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/tiled/steel,
 /area/nadezhda/security/sechall)
 "ogF" = (
@@ -66918,7 +67001,7 @@
 	icon_state = "1-2"
 	},
 /turf/simulated/floor/tiled/techmaint,
-/area/nadezhda/command/bridge)
+/area/nadezhda/command/hallway)
 "ojJ" = (
 /obj/random/furniture/pottedplant,
 /obj/effect/floor_decal/steeldecal/steel_decals10,
@@ -67619,9 +67702,23 @@
 /turf/simulated/floor/tiled/steel/techfloor_grid,
 /area/nadezhda/rnd/server)
 "orL" = (
-/obj/machinery/hologram/holopad,
-/turf/simulated/floor/tiled/dark/bluecorner,
-/area/nadezhda/security/sechall)
+/obj/structure/disposalpipe/segment{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/structure/cable/green{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
+	},
+/obj/structure/catwalk,
+/turf/simulated/floor/plating/under,
+/area/nadezhda/outside/inside_colony)
 "orP" = (
 /obj/structure/disposalpipe/segment,
 /obj/effect/decal/cleanable/dirt,
@@ -68401,10 +68498,13 @@
 /turf/simulated/floor/tiled/steel/orangecorner,
 /area/nadezhda/crew_quarters/toilet/public)
 "oAv" = (
-/obj/structure/extinguisher_cabinet{
-	pixel_x = 24
+/obj/machinery/disposal,
+/obj/effect/floor_decal/industrial/box/red,
+/obj/structure/disposalpipe/trunk,
+/obj/machinery/light{
+	dir = 4
 	},
-/turf/simulated/floor/carpet/blucarpet,
+/turf/simulated/floor/wood,
 /area/nadezhda/command/swo/quarters)
 "oAA" = (
 /obj/effect/decal/cleanable/dirt,
@@ -68774,7 +68874,7 @@
 	},
 /obj/structure/railing,
 /turf/simulated/floor/plating/under,
-/area/nadezhda/command/bridge)
+/area/nadezhda/command/hallway)
 "oEc" = (
 /obj/machinery/light,
 /obj/structure/table/standard,
@@ -68904,6 +69004,9 @@
 	dir = 9
 	},
 /obj/effect/decal/cleanable/dirt,
+/obj/machinery/camera/network/security{
+	dir = 8
+	},
 /turf/simulated/floor/tiled/dark/bluecorner,
 /area/nadezhda/security/sechall)
 "oFU" = (
@@ -69974,7 +70077,7 @@
 	},
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/tiled/dark,
-/area/nadezhda/command/meeting_room)
+/area/nadezhda/command/bridge)
 "oRn" = (
 /obj/effect/decal/cleanable/blood/gibs/body,
 /turf/simulated/floor/rock,
@@ -70230,7 +70333,7 @@
 /obj/effect/floor_decal/industrial/box/red/corners,
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/tiled/dark,
-/area/nadezhda/command/meeting_room)
+/area/nadezhda/command/bridge)
 "oTT" = (
 /obj/structure/table/standard,
 /obj/item/oddity/common/mirror,
@@ -70470,7 +70573,7 @@
 	},
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/tiled/dark,
-/area/nadezhda/command/bridge)
+/area/nadezhda/command/hallway)
 "oWy" = (
 /obj/machinery/photocopier,
 /turf/simulated/floor/tiled/steel/techfloor_grid,
@@ -71649,6 +71752,10 @@
 	req_access = newlist();
 	req_one_access = newlist()
 	},
+/obj/machinery/requests_console/preset/command/cro{
+	dir = 4;
+	pixel_x = 34
+	},
 /turf/simulated/floor/wood,
 /area/nadezhda/command/cro)
 "pjg" = (
@@ -72276,7 +72383,7 @@
 	},
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/tiled/dark,
-/area/nadezhda/command/bridge)
+/area/nadezhda/command/hallway)
 "pqR" = (
 /obj/structure/table/rack/shelf,
 /obj/item/storage/box/bodybags{
@@ -72289,7 +72396,7 @@
 "pqS" = (
 /obj/machinery/photocopier,
 /turf/simulated/floor/tiled/steel/techfloor_grid,
-/area/nadezhda/command/meeting_room)
+/area/nadezhda/command/bridge)
 "pqZ" = (
 /obj/structure/table/gamblingtable,
 /obj/machinery/alarm{
@@ -72342,6 +72449,10 @@
 	},
 /area/shuttle/vasiliy_shuttle_area)
 "prz" = (
+/obj/machinery/requests_console/preset/steward{
+	pixel_x = -35;
+	dir = 8
+	},
 /turf/simulated/floor/carpet/bcarpet,
 /area/nadezhda/command/fo)
 "prD" = (
@@ -72568,8 +72679,10 @@
 /turf/simulated/floor/tiled/dark/gray_platform,
 /area/nadezhda/command/captain)
 "ptZ" = (
-/obj/structure/disposalpipe/segment,
 /obj/effect/decal/cleanable/dirt,
+/obj/item/grenade/chem_grenade/metalfoam,
+/obj/item/grenade/chem_grenade/metalfoam,
+/obj/structure/closet/emcloset/legacy,
 /turf/simulated/floor/tiled/steel/violetcorener,
 /area/nadezhda/rnd/circuitlab{
 	name = "Science Expedition prep"
@@ -73603,6 +73716,10 @@
 /area/nadezhda/maintenance/undergroundfloor1north)
 "pFb" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/item/modular_computer/console/preset/command{
+	dir = 4;
+	pixel_x = -5
+	},
 /turf/simulated/floor/wood,
 /area/nadezhda/command/gmaster)
 "pFc" = (
@@ -73727,13 +73844,24 @@
 /area/nadezhda/rnd/robotics)
 "pGr" = (
 /obj/structure/table/reinforced,
-/obj/item/clipboard,
-/obj/item/device/eftpos{
-	eftpos_name = "Quartermaster EFTPOS scanner"
-	},
 /obj/machinery/light{
 	dir = 8
 	},
+/obj/machinery/button/remote/airlock{
+	pixel_x = 6;
+	pixel_y = 5;
+	id = "ceodoor";
+	name = "CEO Door Open Control";
+	req_access = list(41)
+	},
+/obj/machinery/button/remote/airlock{
+	pixel_x = -6;
+	pixel_y = 5;
+	id = "ceodoor";
+	name = "CEO Door Bolt Control";
+	specialfunctions = 4;
+	req_access = list(41)
+	},
 /turf/simulated/floor/carpet,
 /area/nadezhda/command/merchant)
 "pGw" = (
@@ -74438,7 +74566,7 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/tiled/dark,
-/area/nadezhda/command/meeting_room)
+/area/nadezhda/command/bridge)
 "pNU" = (
 /obj/structure/catwalk,
 /obj/machinery/power/hydrogen_gen{
@@ -75254,6 +75382,9 @@
 /obj/machinery/atmospherics/unary/vent_scrubber{
 	dir = 1
 	},
+/obj/effect/floor_decal/spline/wood{
+	dir = 1
+	},
 /turf/simulated/floor/wood,
 /area/nadezhda/command/smc/quarters)
 "pVt" = (
@@ -76148,9 +76279,7 @@
 	icon_state = "1-2"
 	},
 /turf/simulated/floor/tiled/dark/danger,
-/area/nadezhda/security{
-	name = "Security Training"
-	})
+/area/nadezhda/security/range)
 "qfc" = (
 /obj/structure/flora/big/rocks3,
 /obj/structure/flora/small/bushc2,
@@ -76956,7 +77085,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /turf/simulated/floor/tiled/dark/gray_platform,
-/area/nadezhda/command/bridge)
+/area/nadezhda/command/hallway)
 "qoj" = (
 /obj/structure/salvageable/autolathe,
 /obj/effect/decal/cleanable/dirt,
@@ -77006,28 +77135,13 @@
 /turf/simulated/floor/tiled/dark/brown_perforated,
 /area/nadezhda/storage/primary)
 "qoG" = (
-/obj/structure/table/woodentable,
-/obj/item/paper_bin,
-/obj/item/pen/multi,
-/obj/machinery/button/windowtint{
-	id = "WO";
-	pixel_x = -6;
-	pixel_y = 4;
-	range = 4
-	},
-/obj/machinery/button/remote/airlock{
-	id = "wobolt1";
-	name = "Door Bolt Control";
-	pixel_x = 4;
-	pixel_y = 4;
-	req_access = list(58);
-	specialfunctions = 4
-	},
 /obj/machinery/light_switch{
 	dir = 8;
 	pixel_x = 32
 	},
-/turf/simulated/floor/carpet/blucarpet,
+/obj/machinery/papershredder,
+/obj/effect/floor_decal/steeldecal/steel_decals10,
+/turf/simulated/floor/wood,
 /area/nadezhda/command/swo/quarters)
 "qoI" = (
 /obj/structure/flora/big/rocks3,
@@ -77197,10 +77311,15 @@
 /turf/simulated/floor/tiled/techmaint,
 /area/nadezhda/maintenance/surface_maints_1)
 "qqM" = (
-/turf/unsimulated/mineral,
-/area/nadezhda/rnd/circuitlab{
-	name = "Science Expedition prep"
-	})
+/obj/structure/bookcase,
+/obj/item/book/manual/fiction/warandpeace,
+/obj/item/book/manual/fiction/theinvisibleman,
+/obj/item/book/manual/fiction/waroftheworlds,
+/obj/item/book/manual/nonfiction/suntzu,
+/obj/item/book/manual/nonfiction/politics,
+/obj/item/book/manual/wiki/security_ironparagraphs,
+/turf/simulated/floor/wood,
+/area/nadezhda/command/swo/quarters)
 "qqP" = (
 /obj/random/cluster/roaches/low_chance,
 /turf/simulated/floor/plating/under,
@@ -77321,7 +77440,7 @@
 /area/nadezhda/maintenance/undergroundfloor1north)
 "qrM" = (
 /turf/simulated/floor/tiled/techmaint,
-/area/nadezhda/command/bridge)
+/area/nadezhda/command/hallway)
 "qrN" = (
 /obj/structure/cable/green{
 	d1 = 4;
@@ -77409,11 +77528,10 @@
 	},
 /area/shuttle/rocinante_shuttle_area)
 "qsJ" = (
-/obj/machinery/disposal,
-/obj/effect/floor_decal/industrial/box/red,
-/obj/structure/disposalpipe/trunk,
-/turf/simulated/floor/wood,
-/area/nadezhda/command/swo/quarters)
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/bed/chair,
+/turf/simulated/floor/tiled/dark/bluecorner,
+/area/nadezhda/security/sechall)
 "qsM" = (
 /obj/structure/cable/green{
 	d1 = 1;
@@ -77835,7 +77953,7 @@
 	},
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/tiled/dark,
-/area/nadezhda/command/meeting_room)
+/area/nadezhda/command/bridge)
 "qxi" = (
 /obj/structure/bed/chair{
 	dir = 8
@@ -77982,7 +78100,7 @@
 	pixel_y = -32
 	},
 /turf/simulated/floor/tiled/dark,
-/area/nadezhda/command/meeting_room)
+/area/nadezhda/command/bridge)
 "qyG" = (
 /obj/effect/floor_decal/spline/fancy,
 /turf/simulated/floor/tiled/dark/gray_perforated,
@@ -78107,11 +78225,6 @@
 /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
 	dir = 8
 	},
-/obj/structure/cable/green{
-	d1 = 1;
-	d2 = 8;
-	icon_state = "1-8"
-	},
 /obj/structure/cable/green{
 	d1 = 1;
 	d2 = 4;
@@ -78531,7 +78644,7 @@
 /area/nadezhda/maintenance/undergroundfloor1east)
 "qEU" = (
 /turf/simulated/floor/plating/under,
-/area/nadezhda/command/bridge)
+/area/nadezhda/command/hallway)
 "qEX" = (
 /obj/structure/table/standard,
 /obj/item/device/lighting/toggleable/flashlight,
@@ -78818,7 +78931,7 @@
 /obj/machinery/door/firedoor,
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/tiled/dark,
-/area/nadezhda/command/bridge)
+/area/nadezhda/command/hallway)
 "qHt" = (
 /obj/structure/disposalpipe/sortjunction/flipped{
 	dir = 2;
@@ -79296,7 +79409,7 @@
 /area/nadezhda/outside/forest)
 "qND" = (
 /obj/structure/table/woodentable,
-/obj/item/modular_computer/laptop/preset/custom_loadout/advanced,
+/obj/item/modular_computer/tablet/lease/preset/command,
 /turf/simulated/floor/wood/wild3,
 /area/nadezhda/command/prime)
 "qNH" = (
@@ -80255,10 +80368,24 @@
 /turf/simulated/floor/tiled/white/brown_perforated,
 /area/nadezhda/maintenance/undergroundfloor1east)
 "qZj" = (
-/obj/structure/disposalpipe/segment,
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/tiled/dark,
-/area/nadezhda/command/meeting_room)
+/obj/structure/table/woodentable,
+/obj/machinery/button/remote/airlock{
+	dir = 1;
+	id = "foremandoor";
+	name = "Foreman Door Open Control";
+	pixel_x = -6;
+	req_access = list(79)
+	},
+/obj/machinery/button/remote/airlock{
+	dir = 1;
+	id = "foremandoor";
+	name = "Foreman Door Bolt Control";
+	pixel_x = 6;
+	req_access = list(79);
+	specialfunctions = 4
+	},
+/turf/simulated/floor/tiled/steel/brown_platform,
+/area/nadezhda/pros/foreman)
 "qZo" = (
 /obj/structure/table/reinforced,
 /obj/item/paper_bin{
@@ -80784,7 +80911,7 @@
 /obj/machinery/atmospherics/pipe/zpipe/up,
 /obj/machinery/camera/network/command,
 /turf/simulated/floor/plating/under,
-/area/nadezhda/command/bridge)
+/area/nadezhda/command/hallway)
 "rfj" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable/cyan{
@@ -80829,7 +80956,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/plating/under,
-/area/nadezhda/command/bridge)
+/area/nadezhda/command/hallway)
 "rfn" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
@@ -80870,7 +80997,7 @@
 	name = "research overseer seat"
 	},
 /turf/simulated/floor/tiled/dark,
-/area/nadezhda/command/meeting_room)
+/area/nadezhda/command/bridge)
 "rfB" = (
 /obj/structure/flora/ausbushes/ppflowers,
 /obj/structure/flora/ausbushes/sparsegrass,
@@ -80967,10 +81094,10 @@
 /turf/simulated/floor/tiled/dark/gray_perforated,
 /area/nadezhda/security/armory)
 "rgy" = (
-/obj/structure/closet/emcloset/legacy,
-/obj/item/grenade/chem_grenade/metalfoam,
-/obj/item/grenade/chem_grenade/metalfoam,
-/turf/simulated/floor/tiled/steel/gray_perforated,
+/obj/structure/disposalpipe/segment{
+	dir = 8
+	},
+/turf/simulated/floor/tiled/steel/violetcorener,
 /area/nadezhda/rnd/circuitlab{
 	name = "Science Expedition prep"
 	})
@@ -81117,22 +81244,10 @@
 	},
 /area/nadezhda/engineering/atmos)
 "rid" = (
-/obj/structure/disposalpipe/segment{
-	dir = 4;
-	icon_state = "pipe-c"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
-/obj/structure/cable/green{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
-	},
+/obj/item/grenade/chem_grenade/metalfoam,
+/obj/item/grenade/chem_grenade/metalfoam,
 /obj/effect/decal/cleanable/dirt,
+/obj/structure/closet/emcloset/legacy,
 /turf/simulated/floor/tiled/steel/violetcorener,
 /area/nadezhda/rnd/circuitlab{
 	name = "Science Expedition prep"
@@ -81434,15 +81549,6 @@
 	},
 /turf/simulated/floor/wood/wild3,
 /area/nadezhda/crew_quarters)
-"rlI" = (
-/obj/structure/cable/green{
-	d1 = 1;
-	d2 = 2;
-	icon_state = "1-2"
-	},
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/wood,
-/area/nadezhda/security/detectives_office)
 "rlJ" = (
 /turf/simulated/wall/r_wall,
 /area/nadezhda/command/cro)
@@ -81932,12 +82038,12 @@
 /turf/simulated/mineral,
 /area/nadezhda/outside/forest)
 "rro" = (
-/turf/simulated/shuttle/wall/mining{
-	icon_state = "7,18"
+/obj/machinery/disposal,
+/obj/structure/disposalpipe/trunk{
+	dir = 1
 	},
-/area/nadezhda/rnd/circuitlab{
-	name = "Science Expedition prep"
-	})
+/turf/simulated/floor/wood,
+/area/nadezhda/command/swo/quarters)
 "rrt" = (
 /turf/simulated/shuttle/wall/science{
 	icon_state = "2,5"
@@ -81949,7 +82055,7 @@
 	},
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/tiled/dark,
-/area/nadezhda/command/meeting_room)
+/area/nadezhda/command/bridge)
 "rrE" = (
 /obj/item/ammo_casing/rod_bolt,
 /obj/effect/decal/cleanable/dirt,
@@ -82740,6 +82846,23 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/tiled/techmaint,
 /area/nadezhda/maintenance/substation/bridge)
+"rzD" = (
+/obj/structure/cable/green{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
+/obj/structure/disposalpipe/segment,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/alarm{
+	dir = 8;
+	pixel_x = 32
+	},
+/obj/machinery/atmospherics/unary/vent_scrubber{
+	dir = 8
+	},
+/turf/simulated/floor/tiled/dark,
+/area/nadezhda/command/hallway)
 "rzP" = (
 /obj/structure/table/rack/shelf,
 /obj/item/clothing/suit/armor/vest/ironhammer,
@@ -83216,12 +83339,11 @@
 /turf/simulated/floor/carpet/bcarpet,
 /area/nadezhda/absolutism/bioreactor)
 "rFN" = (
-/obj/machinery/atmospherics/unary/vent_pump{
-	dir = 4
-	},
-/obj/item/contraband/poster/placed/generic/no_erp{
-	desc = "This poster reminds the crew that Eroticism, unsanctioned Rituals and Pornography are bad and shouldnt be film or done.";
-	pixel_x = -32
+/obj/item/biosyphon,
+/obj/structure/table/woodentable,
+/obj/item/storage/case/donut,
+/obj/machinery/light{
+	dir = 8
 	},
 /turf/simulated/floor/wood,
 /area/nadezhda/command/swo/quarters)
@@ -83537,11 +83659,6 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/structure/cable/green{
-	d1 = 1;
-	d2 = 2;
-	icon_state = "1-2"
-	},
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/wood,
 /area/nadezhda/security/detectives_office)
@@ -83576,10 +83693,10 @@
 /turf/simulated/floor/tiled/dark/gray_perforated,
 /area/nadezhda/security/sechall)
 "rKs" = (
-/obj/landmark/join/start/pg,
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/carpet/bcarpet,
-/area/nadezhda/command/fo)
+/obj/structure/bed/padded,
+/obj/item/bedsheet/hop,
+/turf/simulated/floor/wood,
+/area/nadezhda/command/swo/quarters)
 "rKz" = (
 /obj/machinery/door/airlock/glass_mining{
 	name = "Disposals";
@@ -83602,11 +83719,6 @@
 /area/nadezhda/medical/reception)
 "rKD" = (
 /obj/machinery/hologram/holopad,
-/obj/structure/cable/green{
-	d1 = 1;
-	d2 = 2;
-	icon_state = "1-2"
-	},
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/carpet/bcarpet,
 /area/nadezhda/security/detectives_office)
@@ -84187,9 +84299,7 @@
 /obj/structure/target_stake,
 /obj/item/target,
 /turf/simulated/floor/tiled/steel/techfloor_grid,
-/area/nadezhda/security{
-	name = "Security Training"
-	})
+/area/nadezhda/security/range)
 "rQD" = (
 /obj/item/contraband/poster/placed/eris/ambrosia{
 	pixel_y = 32
@@ -84388,9 +84498,7 @@
 	pixel_y = -32
 	},
 /turf/simulated/floor/tiled/dark/bluecorner,
-/area/nadezhda/security{
-	name = "Security Training"
-	})
+/area/nadezhda/security/range)
 "rSH" = (
 /obj/structure/disposalpipe/segment,
 /obj/structure/cable/green{
@@ -84438,6 +84546,9 @@
 	d2 = 2;
 	icon_state = "1-2"
 	},
+/obj/effect/floor_decal/spline/wood{
+	dir = 4
+	},
 /turf/simulated/floor/wood,
 /area/nadezhda/command/smc/quarters)
 "rTH" = (
@@ -84586,14 +84697,6 @@
 /obj/item/rig/techno/equipped,
 /turf/simulated/floor/tiled/steel/techfloor,
 /area/nadezhda/engineering/workshop)
-"rVM" = (
-/obj/structure/cable/green{
-	d1 = 2;
-	d2 = 4;
-	icon_state = "2-4"
-	},
-/turf/simulated/floor/tiled/white,
-/area/nadezhda/security/detectives_office)
 "rVN" = (
 /obj/structure/bed/chair/office/light{
 	dir = 4
@@ -84605,7 +84708,7 @@
 /obj/structure/multiz/stairs/enter/bottom{
 	dir = 4
 	},
-/turf/simulated/floor/asteroid/grass,
+/turf/simulated/floor/tiled/dark/cargo,
 /area/nadezhda/outside/inside_colony)
 "rVT" = (
 /obj/effect/floor_decal/industrial/hatch/yellow,
@@ -85311,15 +85414,11 @@
 	pixel_x = 39;
 	pixel_y = -32
 	},
-/obj/machinery/door/firedoor/multi_tile{
-	dir = 2
-	},
-/obj/machinery/door/airlock/multi_tile/glass{
-	dir = 2;
-	name = "Marshals Brig";
-	req_one_access = list(63)
-	},
 /obj/effect/decal/cleanable/dirt,
+/obj/structure/table/steel,
+/obj/machinery/camera/network/security{
+	dir = 1
+	},
 /turf/simulated/floor/tiled/dark/bluecorner,
 /area/nadezhda/security/sechall)
 "sbN" = (
@@ -87234,7 +87333,6 @@
 /turf/simulated/floor/asteroid/grass,
 /area/nadezhda/outside/inside_colony)
 "svO" = (
-/obj/structure/catwalk,
 /obj/structure/disposalpipe/segment{
 	dir = 1;
 	icon_state = "pipe-c"
@@ -87250,6 +87348,7 @@
 	d2 = 4;
 	icon_state = "1-4"
 	},
+/obj/structure/catwalk,
 /turf/simulated/floor/plating/under,
 /area/nadezhda/outside/inside_colony)
 "svP" = (
@@ -87700,7 +87799,7 @@
 	},
 /obj/structure/disposalpipe/segment,
 /turf/simulated/floor/tiled/dark/gray_platform,
-/area/nadezhda/command/bridge)
+/area/nadezhda/command/hallway)
 "sAf" = (
 /obj/item/modular_computer/console/preset/security/records{
 	dir = 4;
@@ -87851,6 +87950,11 @@
 	},
 /turf/simulated/floor/tiled/white,
 /area/nadezhda/crew_quarters/pool)
+"sBB" = (
+/obj/structure/railing,
+/obj/structure/catwalk,
+/turf/simulated/floor/plating/under,
+/area/nadezhda/outside/inside_colony)
 "sBF" = (
 /obj/structure/railing,
 /obj/structure/multiz/stairs/enter/bottom{
@@ -88517,9 +88621,7 @@
 "sJS" = (
 /obj/machinery/light/floor,
 /turf/simulated/floor/tiled/steel,
-/area/nadezhda/security{
-	name = "Security Training"
-	})
+/area/nadezhda/security/range)
 "sKb" = (
 /obj/machinery/door/airlock/research,
 /obj/structure/cable/green{
@@ -89675,7 +89777,7 @@
 	},
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/tiled/dark,
-/area/nadezhda/command/meeting_room)
+/area/nadezhda/command/bridge)
 "sXm" = (
 /obj/structure/flora/ausbushes/ppflowers,
 /obj/effect/damagedfloor/fire,
@@ -89896,29 +89998,14 @@
 /turf/simulated/floor/tiled/techmaint_perforated,
 /area/nadezhda/maintenance/undergroundfloor1west)
 "sZz" = (
-/obj/machinery/door/airlock/glass_research{
-	name = "Expedition prep";
-	req_access = list(5)
-	},
-/obj/structure/disposalpipe/segment{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
-/obj/structure/cable/green{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
+/obj/structure/noticeboard/marshal{
+	pixel_x = -32
 	},
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/tiled/steel/gray_perforated,
-/area/nadezhda/rnd/circuitlab{
-	name = "Science Expedition prep"
-	})
+/obj/structure/table/woodentable,
+/obj/item/rig/combat/ert/co/wo/equipped,
+/obj/effect/floor_decal/spline/wood,
+/turf/simulated/floor/wood,
+/area/nadezhda/command/swo/quarters)
 "sZA" = (
 /obj/structure/scrap_beacon,
 /obj/effect/decal/cleanable/dirt,
@@ -90310,11 +90397,6 @@
 	},
 /obj/machinery/atmospherics/pipe/manifold4w/hidden/supply,
 /obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers,
-/obj/structure/cable/green{
-	d1 = 1;
-	d2 = 8;
-	icon_state = "1-8"
-	},
 /obj/structure/cable/green{
 	d1 = 4;
 	d2 = 8;
@@ -90408,12 +90490,10 @@
 /obj/structure/disposalpipe/segment,
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/tiled/dark,
-/area/nadezhda/command/bridge)
+/area/nadezhda/command/hallway)
 "tfa" = (
 /turf/simulated/floor/tiled/steel,
-/area/nadezhda/security{
-	name = "Security Training"
-	})
+/area/nadezhda/security/range)
 "tfl" = (
 /obj/effect/window_lwall_spawn/reinforced,
 /obj/machinery/door/firedoor,
@@ -91084,6 +91164,10 @@
 /area/nadezhda/command/fo)
 "tnG" = (
 /obj/structure/table/reinforced,
+/obj/item/clipboard,
+/obj/item/device/eftpos{
+	eftpos_name = "Quartermaster EFTPOS scanner"
+	},
 /turf/simulated/floor/carpet,
 /area/nadezhda/command/merchant)
 "tnI" = (
@@ -91379,9 +91463,7 @@
 	dir = 4
 	},
 /turf/simulated/floor/tiled/dark/cargo,
-/area/nadezhda/security{
-	name = "Security Training"
-	})
+/area/nadezhda/security/range)
 "trp" = (
 /obj/structure/catwalk,
 /obj/structure/railing{
@@ -92738,7 +92820,7 @@
 /obj/machinery/door/firedoor,
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/tiled/dark,
-/area/nadezhda/command/bridge)
+/area/nadezhda/command/hallway)
 "tFf" = (
 /obj/structure/bed/chair/office/dark{
 	dir = 8
@@ -92820,7 +92902,7 @@
 	dir = 2
 	},
 /turf/simulated/floor/tiled/dark/monofloor,
-/area/nadezhda/command/meeting_room)
+/area/nadezhda/command/bridge)
 "tFK" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -92978,11 +93060,7 @@
 /turf/simulated/floor/plating/under,
 /area/nadezhda/maintenance/undergroundfloor1north)
 "tHt" = (
-/obj/landmark/join/start/swo,
-/obj/structure/bed/chair/office/dark{
-	dir = 1
-	},
-/turf/simulated/floor/carpet/blucarpet,
+/turf/simulated/floor/wood,
 /area/nadezhda/command/swo/quarters)
 "tHv" = (
 /obj/structure/flora/small/busha1,
@@ -93502,7 +93580,7 @@
 /obj/structure/disposalpipe/segment,
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/tiled/dark,
-/area/nadezhda/command/bridge)
+/area/nadezhda/command/hallway)
 "tMC" = (
 /obj/random/scrap/dense_even,
 /turf/simulated/floor/tiled/techmaint,
@@ -93702,7 +93780,7 @@
 	},
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/tiled/dark/monofloor,
-/area/nadezhda/command/meeting_room)
+/area/nadezhda/command/bridge)
 "tOz" = (
 /obj/effect/floor_decal/industrial/danger,
 /obj/effect/floor_decal/industrial/danger{
@@ -93822,22 +93900,12 @@
 /turf/simulated/floor/asteroid/grass,
 /area/nadezhda/outside/inside_colony)
 "tPy" = (
-/obj/structure/disposalpipe/segment,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 1
-	},
-/obj/structure/cable/green{
-	d1 = 1;
-	d2 = 2;
-	icon_state = "1-2"
+/obj/item/modular_computer/console/preset/command{
+	dir = 4;
+	pixel_x = -5
 	},
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/tiled/steel/orangecorner,
-/area/nadezhda/rnd/circuitlab{
-	name = "Science Expedition prep"
-	})
+/turf/simulated/floor/carpet/blucarpet,
+/area/nadezhda/command/swo/quarters)
 "tPz" = (
 /obj/structure/table/standard,
 /obj/machinery/photocopier/faxmachine{
@@ -94366,9 +94434,10 @@
 /turf/simulated/floor/tiled/dark/bluecorner,
 /area/nadezhda/security/tactical_blackshield)
 "tUF" = (
-/obj/structure/bed/chair/custom/onestar,
-/turf/simulated/floor/carpet/blucarpet,
-/area/nadezhda/command/swo/quarters)
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/table/steel,
+/turf/simulated/floor/tiled/dark/bluecorner,
+/area/nadezhda/security/sechall)
 "tUH" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/random/scrap/sparse_weighted,
@@ -94470,11 +94539,6 @@
 /obj/machinery/atmospherics/unary/vent_pump{
 	dir = 1
 	},
-/obj/structure/cable/green{
-	d1 = 1;
-	d2 = 8;
-	icon_state = "1-8"
-	},
 /turf/simulated/floor/tiled/white/techfloor_grid,
 /area/nadezhda/security/detectives_office)
 "tWn" = (
@@ -94713,9 +94777,6 @@
 /obj/effect/floor_decal/industrial/arrows{
 	dir = 1
 	},
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/tiled/steel,
 /area/nadezhda/security/sechall)
 "tYP" = (
@@ -94739,12 +94800,14 @@
 	d2 = 2;
 	icon_state = "1-2"
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/structure/disposalpipe/segment,
 /obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+	dir = 8
+	},
 /turf/simulated/floor/tiled/dark,
-/area/nadezhda/command/bridge)
+/area/nadezhda/command/hallway)
 "tZa" = (
 /obj/item/modular_computer/console/preset/security/camera{
 	dir = 4;
@@ -94924,9 +94987,7 @@
 /turf/simulated/floor/tiled/steel/golden,
 /area/nadezhda/hallway/surface/section1)
 "uaT" = (
-/obj/machinery/computer/prisoner{
-	req_access = list(5)
-	},
+/obj/machinery/computer/aifixer,
 /turf/simulated/floor/carpet/purcarpet,
 /area/nadezhda/command/cro)
 "uaY" = (
@@ -95299,7 +95360,7 @@
 /obj/structure/disposalpipe/segment,
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/tiled/dark,
-/area/nadezhda/command/bridge)
+/area/nadezhda/command/hallway)
 "ueJ" = (
 /obj/structure/catwalk,
 /obj/structure/railing,
@@ -95370,9 +95431,7 @@
 	dir = 1
 	},
 /turf/simulated/floor/tiled/steel,
-/area/nadezhda/security{
-	name = "Security Training"
-	})
+/area/nadezhda/security/range)
 "ufk" = (
 /obj/structure/cable/cyan{
 	d1 = 2;
@@ -95465,7 +95524,8 @@
 "ufO" = (
 /obj/machinery/door/airlock/command{
 	name = "Soteria Research Overseer's Office";
-	req_access = list(30)
+	req_access = list(30);
+	id_tag = "crodoor"
 	},
 /obj/structure/cable/green{
 	d1 = 1;
@@ -95588,14 +95648,25 @@
 /turf/simulated/floor/tiled/dark/gray_platform,
 /area/nadezhda/command/captain)
 "ugE" = (
-/obj/structure/bed/chair{
-	dir = 4
+/obj/machinery/door/blast/regular/open{
+	id = "Colony Lockdown"
 	},
-/obj/machinery/camera/network/security{
-	dir = 4
+/obj/machinery/door/airlock/glass_research{
+	name = "Expedition prep";
+	req_access = list(5)
 	},
-/turf/simulated/floor/tiled/dark/bluecorner,
-/area/nadezhda/security/sechall)
+/obj/structure/disposalpipe/segment,
+/obj/structure/cable/green{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/turf/simulated/floor/tiled/steel/violetcorener,
+/area/nadezhda/rnd/circuitlab{
+	name = "Science Expedition prep"
+	})
 "ugH" = (
 /obj/structure/bed/chair{
 	dir = 4
@@ -96099,7 +96170,7 @@
 	name = "biolab overseer seat"
 	},
 /turf/simulated/floor/tiled/dark,
-/area/nadezhda/command/meeting_room)
+/area/nadezhda/command/bridge)
 "umk" = (
 /turf/simulated/floor/tiled/dark/violetcorener,
 /area/nadezhda/rnd/research)
@@ -96432,7 +96503,7 @@
 	},
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/tiled/dark,
-/area/nadezhda/command/bridge)
+/area/nadezhda/command/hallway)
 "uqf" = (
 /obj/structure/flora/small/trailrockb2,
 /obj/structure/railing,
@@ -96599,22 +96670,19 @@
 	name = "Residential District Maintenance"
 	})
 "urR" = (
-/obj/effect/floor_decal/spline/wood{
-	icon_state = "spline_fancy_corner"
-	},
-/obj/structure/disposalpipe/segment{
-	dir = 1;
-	icon_state = "pipe-c"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/catwalk,
+/obj/structure/disposalpipe/segment,
 /obj/structure/cable/green{
 	d1 = 1;
 	d2 = 2;
 	icon_state = "1-2"
 	},
-/turf/simulated/floor/wood,
-/area/nadezhda/command/swo/quarters)
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/turf/simulated/floor/plating/under,
+/area/nadezhda/rnd/circuitlab{
+	name = "Science Expedition prep"
+	})
 "urU" = (
 /obj/structure/table/rack,
 /obj/item/gun/projectile/automatic/mamba{
@@ -96660,6 +96728,15 @@
 	},
 /turf/simulated/floor/wood,
 /area/nadezhda/crew_quarters/dorm4)
+"usV" = (
+/obj/structure/catwalk,
+/obj/machinery/light{
+	dir = 1
+	},
+/turf/simulated/floor/plating/under,
+/area/nadezhda/rnd/circuitlab{
+	name = "Science Expedition prep"
+	})
 "usW" = (
 /obj/structure/flora/small/grassb3,
 /turf/simulated/floor/asteroid/grass,
@@ -97655,7 +97732,7 @@
 	},
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/tiled/dark,
-/area/nadezhda/command/meeting_room)
+/area/nadezhda/command/bridge)
 "uFr" = (
 /obj/structure/railing/grey{
 	dir = 8
@@ -97872,9 +97949,7 @@
 	icon_state = "4-8"
 	},
 /turf/simulated/floor/tiled/steel/gray_perforated,
-/area/nadezhda/security{
-	name = "Security Training"
-	})
+/area/nadezhda/security/range)
 "uHI" = (
 /obj/structure/table/reinforced,
 /obj/effect/decal/cleanable/dirt,
@@ -98012,7 +98087,7 @@
 	},
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/tiled/dark,
-/area/nadezhda/command/meeting_room)
+/area/nadezhda/command/bridge)
 "uIH" = (
 /turf/simulated/shuttle/wall/mining{
 	icon_state = "7,10"
@@ -98074,7 +98149,7 @@
 	pixel_y = 3
 	},
 /turf/simulated/floor/tiled/dark/monofloor,
-/area/nadezhda/command/meeting_room)
+/area/nadezhda/command/bridge)
 "uJt" = (
 /obj/structure/cable/green{
 	d1 = 4;
@@ -98167,12 +98242,12 @@
 /turf/simulated/floor/tiled/steel/bar_dance,
 /area/nadezhda/maintenance/undergroundfloor1west)
 "uKC" = (
-/turf/simulated/shuttle/wall/mining{
-	icon_state = "13,15"
+/obj/structure/filingcabinet,
+/obj/machinery/light{
+	dir = 4
 	},
-/area/nadezhda/rnd/circuitlab{
-	name = "Science Expedition prep"
-	})
+/turf/simulated/floor/wood,
+/area/nadezhda/command/swo/quarters)
 "uKH" = (
 /obj/structure/table/rack/shelf,
 /obj/item/secbot_assembly,
@@ -98860,6 +98935,7 @@
 	dir = 8
 	},
 /obj/effect/decal/cleanable/dirt,
+/obj/landmark/join/start/premier,
 /turf/simulated/floor/carpet/turcarpet,
 /area/nadezhda/command/captain/quarters)
 "uQh" = (
@@ -98985,13 +99061,13 @@
 /turf/simulated/floor/tiled/steel/techfloor_grid,
 /area/nadezhda/crew_quarters/hydroponics)
 "uRi" = (
-/obj/machinery/door/airlock/lift,
-/turf/simulated/shuttle/floor/mining{
-	icon_state = "9,23"
+/obj/effect/floor_decal/spline/wood{
+	dir = 8
 	},
-/area/nadezhda/rnd/circuitlab{
-	name = "Science Expedition prep"
-	})
+/obj/structure/dogbed,
+/mob/living/simple_animal/corgi/fluff/Lisa,
+/turf/simulated/floor/wood,
+/area/nadezhda/command/swo/quarters)
 "uRk" = (
 /obj/effect/window_lwall_spawn/smartspawn,
 /turf/simulated/floor/plating,
@@ -100502,7 +100578,7 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/tiled/dark,
-/area/nadezhda/command/meeting_room)
+/area/nadezhda/command/bridge)
 "vhZ" = (
 /obj/random/structures,
 /turf/simulated/floor/tiled/dark/techfloor,
@@ -101634,7 +101710,7 @@
 	icon_state = "1-8"
 	},
 /turf/simulated/floor/tiled/dark/monofloor,
-/area/nadezhda/command/meeting_room)
+/area/nadezhda/command/bridge)
 "vtH" = (
 /obj/structure/fireaxecabinet{
 	pixel_x = -30
@@ -101803,21 +101879,12 @@
 /turf/simulated/floor/tiled/steel/gray_perforated,
 /area/nadezhda/security/sechall)
 "vvv" = (
-/obj/effect/floor_decal/spline/wood{
-	dir = 4
-	},
-/obj/machinery/light,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 9
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 5
 	},
-/obj/machinery/power/apc{
-	name = "South APC";
-	pixel_y = -28
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 9
 	},
-/obj/structure/cable/green,
 /turf/simulated/floor/wood,
 /area/nadezhda/command/swo/quarters)
 "vvx" = (
@@ -101893,22 +101960,16 @@
 /turf/simulated/floor/asteroid/dirt/dust,
 /area/nadezhda/outside/bcave)
 "vwa" = (
-/obj/machinery/alarm{
-	dir = 4;
-	pixel_x = -32
-	},
-/obj/machinery/computer/shuttle_control/multi/vasiliy{
-	dir = 4
-	},
-/turf/simulated/floor/wood,
-/area/nadezhda/command/swo/quarters)
+/obj/structure/bed/chair,
+/turf/simulated/floor/tiled/dark/bluecorner,
+/area/nadezhda/security/sechall)
 "vwc" = (
 /obj/machinery/hologram/holopad{
 	name = "meeting room holopad three"
 	},
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/tiled/dark,
-/area/nadezhda/command/meeting_room)
+/area/nadezhda/command/bridge)
 "vwg" = (
 /obj/effect/decal/cleanable/rubble,
 /obj/effect/decal/cleanable/dirt,
@@ -102037,7 +102098,7 @@
 	},
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/tiled/dark,
-/area/nadezhda/command/meeting_room)
+/area/nadezhda/command/bridge)
 "vxK" = (
 /obj/structure/table/rack/shelf,
 /obj/item/tool/pickaxe,
@@ -103172,6 +103233,9 @@
 /obj/structure/multiz/stairs/active{
 	dir = 1
 	},
+/obj/machinery/light{
+	dir = 1
+	},
 /turf/simulated/floor/tiled/dark/bluecorner,
 /area/nadezhda/security/tactical_blackshield)
 "vLa" = (
@@ -103417,7 +103481,7 @@
 /obj/structure/table/woodentable,
 /obj/item/folder/cyan,
 /turf/simulated/floor/tiled/dark/monofloor,
-/area/nadezhda/command/meeting_room)
+/area/nadezhda/command/bridge)
 "vMU" = (
 /obj/structure/cable/cyan{
 	d1 = 1;
@@ -103628,6 +103692,7 @@
 /area/nadezhda/outside/inside_colony)
 "vPL" = (
 /obj/structure/table/woodentable,
+/obj/item/modular_computer/tablet/lease/preset/command,
 /turf/simulated/floor/carpet/sblucarpet,
 /area/nadezhda/command/cbo)
 "vPQ" = (
@@ -104184,6 +104249,12 @@
 /obj/structure/bed/chair/comfy/brown{
 	dir = 6
 	},
+/obj/machinery/button/windowtint{
+	id = "BC";
+	pixel_y = 28;
+	range = 4;
+	req_access = list(58)
+	},
 /obj/landmark/join/start/smc,
 /turf/simulated/floor/carpet/bcarpet,
 /area/nadezhda/command/smc/quarters)
@@ -104271,7 +104342,7 @@
 /obj/structure/catwalk,
 /obj/structure/railing,
 /turf/simulated/floor/plating/under,
-/area/nadezhda/command/bridge)
+/area/nadezhda/command/hallway)
 "vVN" = (
 /obj/structure/lattice,
 /obj/structure/catwalk,
@@ -104899,7 +104970,7 @@
 /obj/structure/table/woodentable,
 /obj/item/folder/yellow,
 /turf/simulated/floor/tiled/dark/monofloor,
-/area/nadezhda/command/meeting_room)
+/area/nadezhda/command/bridge)
 "wck" = (
 /obj/structure/bed/psych{
 	desc = "It can be a bit noisy, but still serves well.";
@@ -105070,6 +105141,12 @@
 "wdO" = (
 /turf/simulated/floor/tiled/dark/bluecorner,
 /area/nadezhda/command/tcommsat/computer)
+"wdP" = (
+/obj/machinery/camera/network/security{
+	dir = 8
+	},
+/turf/simulated/floor/tiled/dark/bluecorner,
+/area/nadezhda/security/sechall)
 "wdZ" = (
 /obj/item/modular_computer/console/preset/medical/monitor{
 	dir = 8
@@ -105321,15 +105398,6 @@
 /obj/random/flora/jungle_tree,
 /turf/unsimulated/wall/jungle,
 /area/nadezhda/outside/forest)
-"whe" = (
-/obj/structure/cable/green{
-	d1 = 1;
-	d2 = 2;
-	icon_state = "1-2"
-	},
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/carpet/bcarpet,
-/area/nadezhda/security/detectives_office)
 "whi" = (
 /obj/random/scrap,
 /obj/random/structures/low_chance,
@@ -105409,7 +105477,6 @@
 /area/nadezhda/command/smc/quarters)
 "whG" = (
 /obj/machinery/door/airlock/command{
-	id_tag = "mcbolt1";
 	name = "Blackshield Commander";
 	req_access = list(58,37)
 	},
@@ -105649,6 +105716,10 @@
 /obj/machinery/camera/network/medbay{
 	dir = 8
 	},
+/obj/machinery/requests_console/preset/command/cbo{
+	dir = 4;
+	pixel_x = 35
+	},
 /turf/simulated/floor/tiled/steel/techfloor_grid,
 /area/nadezhda/command/cbo)
 "wkv" = (
@@ -105783,7 +105854,7 @@
 	},
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/tiled/dark,
-/area/nadezhda/command/meeting_room)
+/area/nadezhda/command/bridge)
 "wlK" = (
 /obj/structure/table/rack/shelf,
 /obj/random/lowkeyrandom/low_chance,
@@ -105850,12 +105921,21 @@
 /turf/simulated/floor/tiled/dark/golden,
 /area/nadezhda/absolutism/chapel)
 "wmB" = (
-/turf/simulated/shuttle/floor/mining{
-	icon_state = "9,23"
+/obj/machinery/door/airlock/command{
+	name = "Warrant Officer";
+	req_access = list(58,61)
 	},
-/area/nadezhda/rnd/circuitlab{
-	name = "Science Expedition prep"
-	})
+/obj/structure/disposalpipe/segment{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/turf/simulated/floor/wood,
+/area/nadezhda/command/swo/quarters)
 "wmF" = (
 /obj/structure/table/standard,
 /obj/item/reagent_containers/glass/bucket,
@@ -107057,7 +107137,7 @@
 	name = "Security Records"
 	},
 /turf/simulated/floor/tiled/steel/techfloor_grid,
-/area/nadezhda/command/meeting_room)
+/area/nadezhda/command/bridge)
 "wzg" = (
 /obj/structure/cable/cyan{
 	d1 = 2;
@@ -107395,18 +107475,19 @@
 	pixel_x = -30
 	},
 /turf/simulated/floor/tiled/dark/danger,
-/area/nadezhda/security{
-	name = "Security Training"
-	})
+/area/nadezhda/security/range)
 "wCE" = (
-/obj/machinery/computer/prisoner{
-	dir = 1;
-	req_access = list(5)
-	},
-/obj/effect/floor_decal/spline/fancy{
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/junction{
 	dir = 1
 	},
-/turf/simulated/floor/tiled/dark/gray_perforated,
+/obj/structure/cable/green{
+	d1 = 1;
+	d2 = 8;
+	icon_state = "1-8"
+	},
+/turf/simulated/floor/wood,
 /area/nadezhda/command/swo/quarters)
 "wCM" = (
 /obj/structure/table/marble,
@@ -108019,7 +108100,7 @@
 	},
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/tiled/dark,
-/area/nadezhda/command/bridge)
+/area/nadezhda/command/hallway)
 "wJD" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/boulder,
@@ -108224,17 +108305,22 @@
 /turf/simulated/floor/reinforced,
 /area/shuttle/vasiliy_shuttle_area)
 "wMp" = (
-/obj/structure/catwalk,
-/obj/structure/disposalpipe/segment,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 1
+/obj/structure/disposalpipe/segment{
+	dir = 2;
+	icon_state = "pipe-c"
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/structure/cable/green{
-	d1 = 1;
-	d2 = 2;
-	icon_state = "1-2"
+	d1 = 2;
+	d2 = 8;
+	icon_state = "2-8"
 	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 10
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 10
+	},
+/obj/structure/catwalk,
 /turf/simulated/floor/plating/under,
 /area/nadezhda/outside/inside_colony)
 "wMq" = (
@@ -108525,6 +108611,22 @@
 	},
 /turf/simulated/floor/tiled/white/gray_platform,
 /area/nadezhda/medical/cryo)
+"wPK" = (
+/obj/machinery/atmospherics/unary/vent_scrubber{
+	dir = 8
+	},
+/obj/structure/table/woodentable,
+/obj/machinery/button/windowtint{
+	id = "WO";
+	pixel_x = -6;
+	pixel_y = 4;
+	range = 4
+	},
+/obj/item/device/lighting/toggleable/lamp{
+	pixel_x = 6
+	},
+/turf/simulated/floor/carpet/blucarpet,
+/area/nadezhda/command/swo/quarters)
 "wPL" = (
 /obj/machinery/atmospherics/portables_connector{
 	dir = 1
@@ -109118,7 +109220,6 @@
 /turf/simulated/floor/plating/under,
 /area/nadezhda/maintenance/undergroundfloor1west)
 "wWw" = (
-/obj/structure/filingcabinet/chestdrawer,
 /obj/machinery/button/windowtint{
 	dir = 8;
 	id = "CBO";
@@ -109126,6 +109227,7 @@
 	pixel_y = 9;
 	range = 6
 	},
+/obj/structure/filingcabinet,
 /turf/simulated/floor/tiled/steel/techfloor_grid,
 /area/nadezhda/command/cbo)
 "wWx" = (
@@ -109277,7 +109379,7 @@
 /obj/structure/disposalpipe/segment,
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/tiled/dark,
-/area/nadezhda/command/bridge)
+/area/nadezhda/command/hallway)
 "wYq" = (
 /turf/simulated/floor/tiled/steel/gray_platform,
 /area/nadezhda/maintenance/undergroundfloor1west)
@@ -109851,7 +109953,7 @@
 	},
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/tiled/dark,
-/area/nadezhda/command/bridge)
+/area/nadezhda/command/hallway)
 "xfV" = (
 /obj/structure/catwalk,
 /obj/random/closet_tech/low_chance,
@@ -111167,9 +111269,7 @@
 /turf/simulated/floor/tiled/steel,
 /area/nadezhda/engineering/foyer)
 "xtW" = (
-/obj/item/biosyphon,
-/obj/structure/table/woodentable,
-/obj/item/storage/case/donut,
+/obj/effect/floor_decal/spline/wood,
 /turf/simulated/floor/wood,
 /area/nadezhda/command/swo/quarters)
 "xtZ" = (
@@ -111198,18 +111298,11 @@
 /turf/simulated/floor/carpet/bcarpet,
 /area/nadezhda/security/detectives_office)
 "xud" = (
-/obj/machinery/door/blast/shutters{
-	density = 0;
-	dir = 2;
-	icon_state = "shutter0";
-	id = "mcshutters";
-	name = "Commanders Office Shutters";
-	opacity = 0
+/obj/machinery/atmospherics/unary/vent_scrubber{
+	dir = 8
 	},
-/obj/effect/window_lwall_spawn/reinforced,
-/obj/machinery/door/firedoor,
-/turf/simulated/floor/plating,
-/area/nadezhda/command/smc/quarters)
+/turf/simulated/floor/wood,
+/area/nadezhda/command/swo/quarters)
 "xur" = (
 /obj/structure/table/glass,
 /obj/effect/spider/stickyweb,
@@ -111301,7 +111394,7 @@
 	},
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/tiled/dark,
-/area/nadezhda/command/bridge)
+/area/nadezhda/command/hallway)
 "xvj" = (
 /obj/machinery/light{
 	dir = 4
@@ -112199,7 +112292,7 @@
 	},
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/tiled/dark,
-/area/nadezhda/command/meeting_room)
+/area/nadezhda/command/bridge)
 "xDT" = (
 /obj/machinery/atmospherics/unary/vent_pump{
 	dir = 8
@@ -112561,6 +112654,7 @@
 /area/nadezhda/security/prisoncells)
 "xHN" = (
 /obj/structure/bed/chair/office/dark,
+/obj/landmark/join/start/chaplain,
 /turf/simulated/floor/wood/wild3,
 /area/nadezhda/command/prime)
 "xHP" = (
@@ -113376,25 +113470,9 @@
 /turf/simulated/floor/asteroid/grass,
 /area/nadezhda/hallway/surface/section1)
 "xQK" = (
-/obj/structure/catwalk,
-/obj/structure/invislight,
-/obj/structure/disposalpipe/segment,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 1
-	},
-/obj/structure/cable/green{
-	d1 = 1;
-	d2 = 2;
-	icon_state = "1-2"
-	},
-/obj/machinery/door/blast/regular/open{
-	id = "Colony Lockdown"
-	},
-/turf/simulated/floor/plating/under,
-/area/nadezhda/rnd/circuitlab{
-	name = "Science Expedition prep"
-	})
+/obj/structure/closet/secure_closet/reinforced/hos,
+/turf/simulated/floor/wood,
+/area/nadezhda/command/swo/quarters)
 "xQP" = (
 /obj/structure/flora/small/trailrockb5,
 /turf/simulated/floor/rock,
@@ -113562,7 +113640,7 @@
 	},
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/tiled/dark,
-/area/nadezhda/command/meeting_room)
+/area/nadezhda/command/bridge)
 "xSi" = (
 /obj/structure/sink{
 	pixel_y = -22
@@ -114078,9 +114156,7 @@
 "xYd" = (
 /obj/machinery/camera/network/security,
 /turf/simulated/floor/tiled/steel,
-/area/nadezhda/security{
-	name = "Security Training"
-	})
+/area/nadezhda/security/range)
 "xYp" = (
 /obj/structure/toilet{
 	dir = 1
@@ -172020,7 +172096,7 @@ jZp
 hVc
 whF
 wiw
-xud
+aWJ
 pux
 aeQ
 aeQ
@@ -172424,7 +172500,7 @@ pCf
 hYZ
 kEL
 dCj
-xud
+aWJ
 oSa
 yiC
 vdz
@@ -172626,7 +172702,7 @@ vUK
 lSC
 oJP
 pVs
-xud
+aWJ
 gPQ
 ltF
 rFr
@@ -172827,7 +172903,7 @@ tJI
 cCe
 mdi
 dMk
-dwu
+bjj
 tJI
 paW
 ltF
@@ -175273,13 +175349,13 @@ fXW
 fXW
 krN
 wza
-bns
-bns
-bns
-bns
+tPi
+tPi
+tPi
+tPi
 rmU
-bns
-bns
+tPi
+tPi
 fgl
 wUF
 vXg
@@ -175472,16 +175548,16 @@ mfT
 vRY
 wMZ
 wMZ
-bns
-kaw
-kaw
+tPi
+tit
+tit
 wlD
 oRl
 oTO
-khq
-dDS
+fTX
+skX
 mKQ
-bns
+tPi
 fgl
 ceJ
 vXg
@@ -175681,9 +175757,9 @@ laV
 vxy
 muV
 pNJ
-dDS
+skX
 pqS
-bns
+tPi
 fgl
 wUF
 vXg
@@ -175885,7 +175961,7 @@ wcj
 gdo
 sXk
 fCw
-bns
+tPi
 fgl
 wUF
 vXg
@@ -176085,9 +176161,9 @@ uJq
 vMM
 dmM
 qxe
-dDS
+skX
 lfW
-bns
+tPi
 fgl
 wUF
 vXg
@@ -176287,9 +176363,9 @@ umj
 lpx
 rfy
 vwc
-dDS
+skX
 qyF
-bns
+tPi
 fgl
 wUF
 vXg
@@ -176484,14 +176560,14 @@ pWj
 wMZ
 jwR
 xDR
-qZj
+tUU
 bKy
-kaw
-kaw
+tit
+tit
 uFm
 xSd
 luN
-bns
+tPi
 fgl
 wUF
 vXg
@@ -176684,16 +176760,16 @@ qRX
 wNz
 hJZ
 wMZ
-bns
-bns
+tPi
+tPi
 tOy
 vhW
 mTo
 nZH
 vtG
-bns
-bns
-bns
+tPi
+tPi
+tPi
 fgl
 wUF
 vXg
@@ -177297,7 +177373,7 @@ lLN
 bms
 tit
 rVN
-rVN
+aBe
 tPi
 fgl
 giu
@@ -177692,7 +177768,7 @@ lRa
 eZT
 cal
 egM
-rKs
+kLC
 dEO
 tPi
 geT
@@ -178703,7 +178779,7 @@ qob
 iPT
 kGj
 teX
-teX
+kaw
 qHp
 teX
 teX
@@ -178917,16 +178993,16 @@ fdu
 hGs
 xfR
 kFF
-ueH
-ueH
+rzD
+gWd
 jJo
 ueH
 kgH
 etn
 mId
 nOL
-tUU
-tUU
+dDS
+dDS
 gSH
 tEZ
 kgK
@@ -179921,7 +179997,7 @@ eKX
 nJb
 tdW
 pVY
-jFq
+cph
 mXv
 pdT
 pdT
@@ -180122,7 +180198,7 @@ pdT
 oes
 nJb
 tdW
-cNA
+tdW
 uQc
 ogK
 pdT
@@ -206784,14 +206860,14 @@ mrt
 rUb
 rsi
 ajp
-wTF
-wTF
-wTF
-wTF
-wTF
-wTF
-wTF
-wTF
+iVP
+iVP
+iVP
+iVP
+iVP
+iVP
+iVP
+iVP
 gBD
 gBD
 uSy
@@ -207995,7 +208071,7 @@ rLk
 gdU
 oXt
 poh
-whC
+iVP
 ewr
 nsU
 ewr
@@ -208197,7 +208273,7 @@ jXP
 fsm
 lHr
 uZe
-whC
+iVP
 kCs
 tre
 mkK
@@ -208399,7 +208475,7 @@ lmu
 amO
 fsm
 emH
-whC
+iVP
 ecz
 mzr
 jFH
@@ -208601,7 +208677,7 @@ jXP
 fsm
 pGS
 uZe
-whC
+iVP
 jwm
 qeS
 bJn
@@ -208803,7 +208879,7 @@ dhR
 dLo
 nWM
 poh
-whC
+iVP
 hGl
 hGl
 hGl
@@ -208821,13 +208897,13 @@ uSy
 qJJ
 jrD
 jOb
-nau
-jOb
+kEk
+dic
 lcJ
-qJJ
-iYY
-gBD
-gBD
+ugE
+urR
+lCH
+fEi
 gBD
 iYY
 pHb
@@ -209005,7 +209081,7 @@ whC
 xmK
 xmK
 xmK
-whC
+iVP
 avo
 avo
 avo
@@ -209026,10 +209102,10 @@ mnS
 ckE
 hvN
 rgy
-qJJ
-iYY
-qIy
-qIy
+mpg
+cNA
+grR
+fEi
 gBD
 gBD
 pHb
@@ -209215,7 +209291,7 @@ onD
 psZ
 sLB
 dje
-dje
+kIN
 dje
 hAv
 dje
@@ -209229,9 +209305,9 @@ rid
 ptZ
 mHg
 qJJ
-gBD
-qIy
-qIy
+usV
+grR
+fEi
 qIy
 gBD
 pHb
@@ -209407,19 +209483,19 @@ dje
 dje
 dje
 mET
+kVl
 dje
 dje
 dje
-aBe
-dje
 dje
 dje
 dje
+kVl
 shR
 aSR
 shy
 shy
-kVl
+shy
 shy
 oFP
 dje
@@ -209427,15 +209503,15 @@ uSy
 qJJ
 qJJ
 qJJ
-sZz
+nyv
 nyv
 qJJ
 qJJ
-qJJ
-byg
-nyY
+vLb
+grR
+hJm
 osl
-pFV
+hcX
 pHb
 pHb
 avq
@@ -209618,7 +209694,11 @@ udR
 oml
 gRC
 qwc
-nfc
+kIN
+dje
+kIN
+dje
+ofo
 acV
 acV
 acV
@@ -209627,15 +209707,11 @@ acV
 acV
 acV
 acV
-qJJ
-mpg
-bjj
-kyT
-jUw
-qJJ
-vLb
-fEi
-fEi
+acV
+acV
+acV
+grR
+hJm
 miU
 rDN
 pHb
@@ -209821,21 +209897,21 @@ onF
 oml
 qwc
 dje
+dje
+dje
+kIN
+dje
 bPl
-xtW
-eTV
-eMD
-vwa
 rFN
 aMz
-acV
-qJJ
+sZz
+gPn
 bvC
 ebR
 tPy
 nEo
-cCF
-xQK
+acV
+acV
 wMp
 svO
 frR
@@ -210024,22 +210100,22 @@ teO
 kFR
 onD
 bls
-nBP
-urR
-dsW
+bls
+bls
+bls
 dsW
-vvv
-acV
-acV
-qJJ
+nBP
+wCE
+kyT
+bWq
 hOa
+eTV
+euf
 fAN
-fAN
-fAN
-efS
-brC
+acV
+acV
 hJm
-mEU
+orL
 xHa
 rIK
 pHb
@@ -210225,23 +210301,23 @@ gUX
 oml
 goA
 dje
+vwa
+vwa
+dje
+dje
 bPl
-kJk
-mKR
-euf
-bWq
-iNa
+tHt
 iVz
+xtW
+euf
+wPK
+gsS
+euf
+efS
+acV
 acV
-qJJ
-qJJ
-uRi
-uRi
-uRi
-qJJ
-qJJ
 hJm
-mEU
+orL
 frR
 hcX
 pHb
@@ -210426,24 +210502,24 @@ atf
 qhA
 gRC
 fjI
+kIN
+qsJ
+qsJ
 dje
-bPl
-eaE
-mKR
 tUF
-ofo
+bPl
 tHt
-wCE
-acV
-qJJ
+iVz
+iNa
+mWV
+mWV
+jUw
 mWV
 uRi
-uRi
-uRi
-dic
-qJJ
+acV
+acV
 hJm
-mEU
+orL
 frR
 lSm
 pHb
@@ -210628,22 +210704,22 @@ qJG
 qJG
 qJG
 goA
+dje
+qsJ
+qsJ
+kIN
 sbM
 acV
-qsJ
-aEw
-euf
-qoG
 oAv
 auP
-acV
-qJJ
-uKC
-wmB
-wmB
-wmB
+nfc
+qoG
 uKC
-qJJ
+iuK
+cCF
+hXf
+acV
+acV
 drA
 mEU
 frR
@@ -210831,24 +210907,24 @@ vYO
 qJG
 dFy
 dje
+qsJ
+qsJ
+dje
+dje
+acV
 acV
-bPl
-bPl
-bPl
 acV
 acV
 acV
 acV
-qJJ
-uKC
-wmB
-wmB
 wmB
-uKC
-qJJ
+acV
+acV
+acV
+acV
 hJm
 mEU
-frR
+sBB
 uGM
 pHb
 kgI
@@ -211032,22 +211108,22 @@ wuW
 tQR
 qJG
 goA
+kIN
 dje
-ugE
-cgG
-cgG
-orL
+dje
+kIN
+gNj
 uSy
 lvu
 iBr
 iBg
-qJJ
-uKC
-wmB
-wmB
-wmB
-uKC
-qJJ
+acV
+kJk
+mKR
+brC
+rro
+acV
+acV
 rVQ
 pDV
 nKB
@@ -211224,11 +211300,11 @@ pJY
 qJG
 mCJ
 mcF
-rVM
+mcF
 xaZ
-rlI
-whe
-whe
+liv
+jrq
+jrq
 rKD
 iee
 rJE
@@ -211243,13 +211319,13 @@ xcW
 cxu
 vaq
 anv
-qJJ
-rro
-cce
-cce
+acV
+eaE
 cce
-lCH
-qJJ
+vvv
+cgG
+acV
+acV
 toQ
 hIn
 bRK
@@ -211445,13 +211521,13 @@ uSy
 knt
 vaq
 vaq
-qJJ
-qJJ
-qJJ
-qJJ
-qJJ
-qJJ
-qJJ
+acV
+ecu
+tHt
+xud
+tHt
+acV
+acV
 toQ
 hIn
 bRK
@@ -211647,13 +211723,13 @@ uSy
 cOa
 lej
 lej
-qJJ
-qqM
-qqM
-qqM
-qqM
+acV
 qqM
-qJJ
+xQK
+dbU
+rKs
+acV
+acV
 toQ
 hIn
 bRK
@@ -212032,7 +212108,7 @@ onD
 hgz
 onD
 oiX
-onD
+aEw
 onD
 sOH
 rRm
@@ -212241,7 +212317,7 @@ dje
 suE
 qKA
 ksZ
-aBe
+wdP
 dje
 dje
 dje
@@ -218918,7 +218994,7 @@ cMF
 xja
 cyz
 nVX
-iuW
+eMD
 uoU
 oZX
 maJ
@@ -219120,7 +219196,7 @@ cMF
 xja
 xNb
 pjU
-fnA
+iuW
 nly
 oZX
 owe
@@ -219524,7 +219600,7 @@ cMF
 xja
 hYM
 enw
-fnA
+qZj
 tUf
 ajg
 skC