diff --git a/_maps/configs/nanotrasen_ranger.json b/_maps/configs/nanotrasen_ranger.json
index b4af3e797d39..3b6f105271c7 100644
--- a/_maps/configs/nanotrasen_ranger.json
+++ b/_maps/configs/nanotrasen_ranger.json
@@ -8,12 +8,11 @@
 		"WEAPONS"
 	],
 	"map_short_name": "Ranger-class",
-	"description": "A Nanotrasen rescue and aid vessel. Equipped with an AI core, moderate combat gear, and equipment fit for rescue and general aid operations. Nanotrasen often deploys these ships in lieu of a proper ERT to aid their allies in the Frontier without committing their full might. The shipowner is the Lieutenant of a Loss Prevention squad, with a Commissioner to aid with operations on the ship proper.",
+	"description": "A Vigilitas Interstellar aid vessel, manufactured by NT Spaceworks. Equipped with a NanoTrasen AI core, moderate combat gear, and equipment fit for rescue and general aid operations. Vigitilas Interstellar often deploys these ships in lieu of a proper ERT to aid their allies in the Frontier without committing their full might. The shipowner is the Lieutenant of a Loss Prevention squad.",
 	"tags": [
 		"Combat",
-		"Riot",
-		"Robotics",
 		"Medical",
+		"Firefighting",
 		"Telecomms",
 		"Generalist"
 	],
@@ -38,6 +37,10 @@
 			"outfit": "/datum/outfit/job/nanotrasen/doctor/lp",
 			"slots": 1
 		},
+		"Logistics Specialist": {
+			"outfit": "/datum/outfit/job/nanotrasen/quartermaster",
+			"slots": 1
+		},
 		"Intern": {
 			"outfit": "/datum/outfit/job/nanotrasen/assistant",
 			"slots": 1
diff --git a/_maps/shuttles/nanotrasen/nanotrasen_ranger.dmm b/_maps/shuttles/nanotrasen/nanotrasen_ranger.dmm
index 342ffb8fa928..7c54450fcfdb 100644
--- a/_maps/shuttles/nanotrasen/nanotrasen_ranger.dmm
+++ b/_maps/shuttles/nanotrasen/nanotrasen_ranger.dmm
@@ -6,12 +6,16 @@
 	pixel_y = 11;
 	layer = 4.2
 	},
-/obj/structure/railing{
+/obj/item/toy/plush/moth/redish{
+	pixel_x = -4
+	},
+/obj/structure/window/reinforced/tinted{
 	dir = 4
 	},
-/obj/item/toy/plush/moth/redish{
+/obj/item/folder/red{
 	pixel_x = -4;
-	layer = 4.3
+	layer = 3.01;
+	pixel_y = -8
 	},
 /turf/open/floor/wood,
 /area/ship/security)
@@ -29,7 +33,7 @@
 	pixel_x = 8;
 	pixel_y = 22
 	},
-/turf/open/floor/plating,
+/turf/open/floor/plasteel/tech,
 /area/ship/maintenance/port)
 "am" = (
 /obj/structure/urinal{
@@ -67,11 +71,7 @@
 /turf/open/floor/plasteel/white,
 /area/ship/hallway/starboard)
 "aG" = (
-/obj/structure/railing{
-	dir = 4
-	},
 /obj/structure/table/reinforced,
-/obj/item/storage/box/stockparts/basic,
 /obj/machinery/light/dim/directional/south,
 /obj/effect/turf_decal/techfloor{
 	dir = 4
@@ -80,10 +80,6 @@
 /turf/open/floor/plasteel/mono/dark,
 /area/ship/engineering)
 "aI" = (
-/obj/machinery/door/poddoor/shutters{
-	dir = 4;
-	id = "Ranger_FireFighting_Shut"
-	},
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
@@ -99,15 +95,27 @@
 /obj/machinery/door/firedoor/border_only{
 	dir = 4
 	},
-/obj/effect/turf_decal/corner/opaque/brown/mono,
+/obj/effect/turf_decal/corner/opaque/vired/three_quarters{
+	dir = 1
+	},
+/obj/machinery/door/poddoor/shutters{
+	dir = 4;
+	id = "Ranger_FireFighting_Shut";
+	name = "Ready Room"
+	},
 /turf/open/floor/plasteel/dark,
-/area/ship/storage)
+/area/ship/storage/equip)
 "aK" = (
 /obj/machinery/light/dim/directional/north,
 /obj/item/radio/intercom/directional/east,
-/obj/structure/reagent_dispensers/foamtank,
+/obj/effect/turf_decal/industrial/fire/corner{
+	dir = 1
+	},
+/obj/machinery/suit_storage_unit/inherit/industrial,
+/obj/item/clothing/suit/space/hardsuit/ancient/lp,
+/obj/item/clothing/mask/breath,
 /turf/open/floor/plasteel/tech,
-/area/ship/storage)
+/area/ship/storage/equip)
 "aO" = (
 /obj/structure/closet/secure_closet/lp/medical,
 /obj/item/storage/box/gloves,
@@ -119,6 +127,22 @@
 /obj/item/pinpointer/crew,
 /obj/item/storage/box/bodybags,
 /obj/item/storage/firstaid/regular,
+/obj/structure/window/reinforced/tinted{
+	dir = 4
+	},
+/obj/structure/window/reinforced/tinted{
+	dir = 1
+	},
+/obj/item/defibrillator/loaded,
+/obj/item/roller{
+	pixel_x = -3;
+	pixel_y = 7
+	},
+/obj/item/roller{
+	pixel_x = 5;
+	pixel_y = 12
+	},
+/obj/item/clothing/neck/stethoscope,
 /turf/open/floor/wood,
 /area/ship/medical)
 "aP" = (
@@ -164,7 +188,8 @@
 	},
 /obj/machinery/door/poddoor/shutters{
 	dir = 4;
-	id = "Ranger_SB_maint_shut"
+	id = "Ranger_SB_maint_shut";
+	name = "Engine Shutters"
 	},
 /turf/open/floor/plating,
 /area/ship/maintenance/starboard)
@@ -184,14 +209,13 @@
 /obj/item/clothing/suit/armor/vest/security,
 /obj/item/clothing/mask/gas/sechailer,
 /obj/item/gps,
-/obj/structure/railing{
-	dir = 4
-	},
-/obj/item/ammo_box/c9mm,
-/obj/item/ammo_box/c9mm,
 /obj/item/ammo_box/magazine/co9mm,
 /obj/item/storage/belt/security/webbing,
 /obj/item/storage/pistolcase/commander,
+/obj/item/clothing/glasses/hud/security/sunglasses,
+/obj/structure/window/reinforced/tinted{
+	dir = 4
+	},
 /turf/open/floor/wood,
 /area/ship/security)
 "bD" = (
@@ -203,12 +227,33 @@
 	},
 /turf/open/floor/plasteel/white,
 /area/ship/hallway/starboard)
-"bN" = (
-/obj/structure/window/reinforced{
+"bK" = (
+/obj/effect/turf_decal/corner/opaque/ntblue/half{
 	dir = 8
 	},
-/obj/structure/weightmachine/weightlifter,
-/turf/open/floor/plasteel/dark,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/structure/chair/handrail{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+	dir = 8
+	},
+/turf/open/floor/plasteel/white,
+/area/ship/hallway/central)
+"bN" = (
+/obj/structure/table/wood/reinforced,
+/obj/item/flashlight/lamp{
+	pixel_x = -6;
+	pixel_y = 4
+	},
+/obj/item/paper_bin{
+	pixel_x = 8;
+	pixel_y = 2
+	},
+/obj/item/pen/red{
+	pixel_x = 6
+	},
+/turf/open/floor/mineral/plastitanium/red/brig,
 /area/ship/security)
 "bX" = (
 /obj/machinery/telecomms/bus/preset_four{
@@ -217,25 +262,43 @@
 	id = "Nanotrasen Communications Bus";
 	freq_listening = list(1353,1447,1459)
 	},
+/obj/effect/turf_decal/techfloor{
+	dir = 4
+	},
 /turf/open/floor/circuit/telecomms{
 	initial_gas_mix = "TEMP=2.7"
 	},
 /area/ship/engineering/communications)
-"cj" = (
-/obj/effect/turf_decal/industrial/outline/yellow,
-/obj/structure/closet/crate/secure/loot,
+"ci" = (
+/obj/effect/turf_decal/industrial/outline/orange,
+/obj/machinery/portable_atmospherics/pump,
 /turf/open/floor/plasteel/tech,
-/area/ship/cargo)
+/area/ship/maintenance/port)
+"cj" = (
+/obj/structure/closet/cabinet,
+/obj/item/clothing/under/rank/medical/paramedic/skirt/lp,
+/obj/item/clothing/under/rank/medical/paramedic/lp,
+/obj/item/clothing/suit/hooded/wintercoat/medical,
+/obj/item/clothing/head/beret/med,
+/obj/item/storage/backpack/satchel/med,
+/obj/item/storage/backpack/messenger/med,
+/obj/item/storage/backpack/medic,
+/obj/item/storage/backpack/duffelbag/med,
+/obj/structure/window/reinforced/tinted{
+	dir = 1
+	},
+/obj/item/storage/backpack/ert/medical,
+/turf/open/floor/wood,
+/area/ship/medical)
 "cv" = (
 /obj/structure/chair/comfy/shuttle{
 	dir = 4;
-	name = "Operations"
+	name = "Navigator's Chair"
 	},
-/obj/effect/turf_decal/steeldecal/steel_decals9,
-/obj/effect/turf_decal/steeldecal/steel_decals9{
-	dir = 4
+/obj/structure/cable{
+	icon_state = "1-8"
 	},
-/turf/open/floor/plasteel/dark,
+/turf/open/floor/plasteel/telecomms_floor,
 /area/ship/bridge)
 "cx" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
@@ -263,20 +326,22 @@
 	},
 /obj/effect/decal/cleanable/glass,
 /obj/machinery/light/dim/directional/south,
+/obj/structure/janitorialcart{
+	dir = 4
+	},
+/obj/item/mop,
+/obj/item/reagent_containers/food/drinks/sillycup{
+	pixel_x = -8;
+	pixel_y = 10
+	},
 /turf/open/floor/plating,
 /area/ship/maintenance/starboard)
 "cI" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
 	dir = 10
 	},
-/obj/structure/window/reinforced/fulltile,
-/obj/structure/grille,
-/obj/machinery/door/firedoor/window,
-/obj/machinery/door/poddoor/shutters{
-	dir = 4;
-	id = "Ranger_Cycler_Shutters"
-	},
-/turf/open/floor/plating,
+/obj/structure/sign/nanotrasen/vigilitas,
+/turf/closed/wall/r_wall,
 /area/ship/hallway/central)
 "cN" = (
 /obj/structure/cable{
@@ -308,6 +373,9 @@
 /turf/open/floor/plasteel/white,
 /area/ship/hallway/port)
 "cW" = (
+/obj/effect/turf_decal/techfloor{
+	dir = 1
+	},
 /turf/open/floor/plasteel/dark,
 /area/ship/crew/cryo)
 "dd" = (
@@ -315,22 +383,34 @@
 /obj/effect/turf_decal/trimline/opaque/ntblue/filled/corner{
 	dir = 4
 	},
+/obj/structure/closet/crate/bin,
 /turf/open/floor/plasteel/white,
 /area/ship/hallway/port)
 "dl" = (
-/obj/machinery/door/poddoor/shutters{
-	dir = 4;
-	id = "Ranger_FireFighting_Shut"
-	},
 /obj/machinery/door/firedoor/border_only{
 	dir = 8
 	},
 /obj/machinery/door/firedoor/border_only{
 	dir = 4
 	},
-/obj/effect/turf_decal/corner/opaque/brown/mono,
+/obj/effect/turf_decal/corner/opaque/vired/three_quarters{
+	dir = 4
+	},
+/obj/machinery/door/poddoor/shutters{
+	dir = 4;
+	id = "Ranger_FireFighting_Shut";
+	name = "Ready Room"
+	},
 /turf/open/floor/plasteel/dark,
-/area/ship/storage)
+/area/ship/storage/equip)
+"dm" = (
+/obj/machinery/camera/autoname{
+	dir = 5
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/turf/open/floor/plasteel/white,
+/area/ship/hallway/starboard)
 "dn" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -341,7 +421,7 @@
 /obj/effect/turf_decal/steeldecal/steel_decals7{
 	dir = 4
 	},
-/turf/open/floor/plasteel/tech/airless,
+/turf/open/floor/plasteel/tech,
 /area/ship/engineering/communications)
 "dq" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
@@ -360,12 +440,18 @@
 	},
 /turf/open/floor/plating,
 /area/ship/engineering)
+"dx" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 6
+	},
+/turf/closed/wall/r_wall,
+/area/ship/hallway/central)
 "dC" = (
 /obj/effect/turf_decal/ntspaceworks_small/right,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 9
 	},
-/obj/machinery/light/dim/directional/south,
+/obj/effect/turf_decal/spline/fancy/opaque/blue,
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
 "dG" = (
@@ -403,30 +489,27 @@
 /obj/structure/grille,
 /obj/structure/window/reinforced/fulltile,
 /obj/machinery/door/poddoor/shutters{
-	id = "Engineering_Specialist_Shutters"
+	id = "Engineering_Specialist_Shutters";
+	name = "Communications Shutters"
 	},
 /obj/machinery/door/firedoor/window,
 /turf/open/floor/plating,
 /area/ship/engineering)
 "ec" = (
 /obj/effect/turf_decal/ntspaceworks_small/left,
-/obj/structure/cable{
-	icon_state = "1-8"
-	},
 /obj/structure/cable{
 	icon_state = "5-8"
 	},
-/obj/machinery/light_switch{
-	dir = 1;
-	pixel_x = -7;
-	pixel_y = -19
-	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 4
 	},
+/obj/effect/turf_decal/spline/fancy/opaque/blue,
+/obj/structure/cable{
+	icon_state = "2-8"
+	},
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
 "ef" = (
@@ -438,15 +521,17 @@
 /turf/template_noop,
 /area/template_noop)
 "eo" = (
-/obj/effect/turf_decal/techfloor{
-	dir = 4
+/obj/machinery/computer/helm/viewscreen/directional/west,
+/obj/machinery/camera/autoname{
+	dir = 5
 	},
-/obj/structure/cable{
-	icon_state = "0-2"
+/obj/structure/closet/crate/bin,
+/obj/structure/railing{
+	dir = 4;
+	layer = 4.1
 	},
-/obj/machinery/power/ship_gravity,
-/turf/open/floor/plasteel/mono/dark,
-/area/ship/engineering)
+/turf/open/floor/plasteel/dark,
+/area/ship/hallway/central)
 "er" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -467,6 +552,12 @@
 /obj/machinery/computer/cargo{
 	dir = 1
 	},
+/obj/structure/railing{
+	dir = 8
+	},
+/obj/structure/filingcabinet{
+	pixel_x = 22
+	},
 /turf/open/floor/plasteel/tech,
 /area/ship/cargo)
 "eN" = (
@@ -481,7 +572,8 @@
 	dir = 1;
 	pixel_y = -21;
 	id = "Rangar_Starboard_Blasts";
-	name = "Blast Doors"
+	name = "Blast Doors";
+	req_ship_access = 1
 	},
 /obj/machinery/button/shieldwallgen{
 	dir = 1;
@@ -498,20 +590,43 @@
 /turf/open/floor/plasteel/white,
 /area/ship/hallway/starboard)
 "eU" = (
-/obj/structure/closet/crate,
-/obj/effect/decal/cleanable/sprayweb,
-/turf/open/floor/plasteel/tech,
+/obj/effect/turf_decal/trimline/opaque/nsorange/line{
+	dir = 5
+	},
+/obj/item/stack/tape{
+	pixel_y = 10;
+	pixel_x = 6
+	},
+/obj/item/stack/tape{
+	pixel_y = 24;
+	pixel_x = 6;
+	layer = 3.02
+	},
+/obj/item/stack/tape{
+	pixel_y = 17;
+	pixel_x = 7;
+	layer = 3.01
+	},
+/obj/item/hand_labeler{
+	pixel_x = -7;
+	pixel_y = 8
+	},
+/obj/item/folder/yellow{
+	pixel_x = 6
+	},
+/obj/structure/table/reinforced{
+	color = "#c1b6a5"
+	},
+/obj/machinery/computer/helm/viewscreen/directional/east,
+/turf/open/floor/plasteel/white,
 /area/ship/cargo)
 "eY" = (
-/obj/effect/turf_decal/trimline/opaque/yellow/filled/line{
+/obj/effect/turf_decal/trimline/opaque/vired/filled/line{
 	dir = 4
 	},
 /turf/open/floor/plasteel/white,
 /area/ship/hallway/port)
 "fd" = (
-/obj/effect/turf_decal/corner/opaque/ntblue/border{
-	dir = 8
-	},
 /obj/structure/cable{
 	icon_state = "6-8"
 	},
@@ -531,46 +646,58 @@
 	dir = 1
 	},
 /obj/effect/turf_decal/techfloor/hole/right,
-/obj/machinery/telecomms/message_server/preset{
-	autolinkers = list("messaging","hub");
-	network = "nt_commnet";
-	layer = 3.1
+/obj/effect/turf_decal/spline/fancy/opaque/blue/corner{
+	dir = 8
+	},
+/obj/machinery/photocopier,
+/obj/structure/filingcabinet{
+	pixel_x = 22
 	},
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
 "fo" = (
-/obj/structure/window/reinforced/tinted/frosted,
-/obj/machinery/airalarm/directional/west,
-/turf/open/floor/plastic,
-/area/ship/crew/toilet)
+/obj/structure/girder/reinforced,
+/obj/machinery/camera/autoname{
+	dir = 10
+	},
+/turf/open/floor/engine/hull,
+/area/ship/external)
 "fy" = (
 /obj/structure/table/wood,
 /obj/item/newspaper,
 /turf/open/floor/plasteel/dark,
 /area/ship/hallway/central)
 "fz" = (
-/obj/machinery/door/poddoor/shutters{
-	dir = 8;
-	name = "Cargo Bay";
-	id = "Ranger_Cargo_Door"
-	},
 /obj/machinery/door/firedoor/border_only{
 	dir = 8
 	},
 /obj/machinery/door/firedoor/border_only{
 	dir = 4
 	},
-/turf/open/floor/plasteel/tech,
+/obj/effect/turf_decal/trimline/opaque/nsorange/line{
+	dir = 10
+	},
+/obj/machinery/door/poddoor/shutters{
+	dir = 8;
+	name = "Cargo Bay";
+	id = "Ranger_Cargo_Door"
+	},
+/turf/open/floor/plasteel/white,
 /area/ship/cargo)
 "fU" = (
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/turf/open/floor/plasteel/tech/airless,
+/obj/effect/turf_decal/techfloor/hole/right,
+/turf/open/floor/plasteel/tech,
 /area/ship/engineering/communications)
 "fV" = (
 /turf/closed/wall/r_wall,
 /area/ship/security)
+"gd" = (
+/obj/structure/sign/nanotrasen/vigilitas,
+/turf/closed/wall/r_wall,
+/area/ship/hallway/port)
 "gg" = (
 /turf/closed/wall/r_wall,
 /area/ship/crew/toilet)
@@ -578,30 +705,43 @@
 /obj/structure/chair/comfy/blue/directional/east,
 /obj/item/toy/plush/moth/lovers,
 /obj/item/radio/intercom/directional/north,
-/turf/open/floor/circuit/green/airless,
+/obj/effect/turf_decal/techfloor{
+	dir = 4
+	},
+/turf/open/floor/circuit/telecomms{
+	initial_gas_mix = "TEMP=2.7"
+	},
 /area/ship/engineering/communications)
 "gi" = (
-/obj/machinery/light_switch{
-	pixel_x = 8;
-	pixel_y = 22
-	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 6
 	},
 /obj/effect/turf_decal/siding/red{
 	dir = 1
 	},
-/obj/machinery/camera/autoname,
-/turf/open/floor/mineral/plastitanium/red/brig,
+/turf/open/floor/plasteel/tech,
 /area/ship/security)
 "gk" = (
-/obj/structure/grille,
-/obj/structure/window/reinforced/fulltile,
-/obj/machinery/door/firedoor/window,
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/turf/open/floor/plating,
+/obj/machinery/door/poddoor/preopen{
+	dir = 4;
+	name = "Intelligence Core";
+	id = "AiCore"
+	},
+/obj/effect/turf_decal/techfloor{
+	dir = 8
+	},
+/obj/effect/turf_decal/techfloor{
+	dir = 4
+	},
+/obj/machinery/door/airlock/engineering/glass{
+	dir = 4;
+	name = "Intelligence Core";
+	req_access_txt = "10"
+	},
+/turf/open/floor/plasteel/tech,
 /area/ship/engineering/communications)
 "gz" = (
 /obj/machinery/camera/autoname{
@@ -610,7 +750,7 @@
 /obj/effect/turf_decal/industrial/outline/blue,
 /obj/structure/closet/crate/trashcart,
 /obj/item/storage/bag/trash,
-/turf/open/floor/plating,
+/turf/open/floor/plasteel/tech,
 /area/ship/maintenance/starboard)
 "gD" = (
 /obj/structure/cable/cyan{
@@ -619,12 +759,17 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 6
 	},
-/obj/effect/decal/cleanable/vomit/old,
+/obj/effect/decal/cleanable/vomit/old{
+	color = "#30b7e5";
+	name = "blueish dried vomit"
+	},
+/obj/item/broken_bottle{
+	pixel_x = -10
+	},
 /turf/open/floor/plating,
 /area/ship/maintenance/starboard)
 "gG" = (
 /obj/effect/turf_decal/corner/opaque/blue/diagonal,
-/obj/machinery/door/airlock/medical/glass,
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
@@ -634,13 +779,13 @@
 	dir = 1
 	},
 /obj/machinery/door/firedoor/border_only,
+/obj/machinery/door/airlock/medical{
+	name = "Medical Bay"
+	},
 /turf/open/floor/plasteel/white,
 /area/ship/medical)
 "gL" = (
-/obj/structure/railing/corner{
-	dir = 4
-	},
-/obj/effect/turf_decal/industrial/outline/yellow,
+/obj/structure/crate_shelf,
 /turf/open/floor/plasteel/tech,
 /area/ship/cargo)
 "gN" = (
@@ -655,16 +800,18 @@
 /turf/open/floor/plating,
 /area/ship/engineering)
 "gT" = (
-/obj/structure/cable{
-	icon_state = "2-5"
-	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 10
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 10
 	},
-/obj/effect/turf_decal/siding/blue,
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/effect/turf_decal/siding/blue{
+	dir = 6
+	},
 /turf/open/floor/plasteel/white,
 /area/ship/medical)
 "gW" = (
@@ -682,8 +829,15 @@
 /turf/open/floor/plasteel/white,
 /area/ship/hallway/central)
 "hf" = (
-/obj/structure/table/reinforced,
-/turf/open/floor/plasteel/dark,
+/obj/structure/grille,
+/obj/machinery/door/poddoor/shutters/preopen{
+	id = "CellHallShutters";
+	name = "Holding Cell Hall Shutters"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/structure/window/reinforced/fulltile,
+/turf/open/floor/plating,
 /area/ship/security)
 "hk" = (
 /obj/structure/cable{
@@ -712,7 +866,6 @@
 /area/ship/maintenance/port)
 "hn" = (
 /obj/effect/turf_decal/corner/opaque/orange/full,
-/obj/structure/railing/corner,
 /obj/structure/cable{
 	icon_state = "1-8"
 	},
@@ -720,23 +873,22 @@
 /turf/open/floor/plasteel/tech,
 /area/ship/engineering)
 "hp" = (
-/obj/structure/railing{
-	dir = 4
-	},
-/obj/effect/turf_decal/industrial/outline/yellow,
-/obj/effect/turf_decal/industrial/warning{
-	dir = 1
-	},
+/obj/effect/turf_decal/industrial/outline/orange,
+/obj/effect/decal/cleanable/plasma,
+/obj/machinery/portable_atmospherics/pump,
 /turf/open/floor/plasteel/tech,
-/area/ship/cargo)
+/area/ship/maintenance/port)
 "hx" = (
 /obj/machinery/airalarm/directional/south,
-/obj/effect/turf_decal/siding/wood,
-/obj/effect/turf_decal/siding/wood/corner{
-	dir = 4
+/obj/machinery/suit_storage_unit/inherit,
+/obj/item/clothing/mask/breath,
+/obj/effect/turf_decal/siding/wood{
+	dir = 6
 	},
+/obj/item/clothing/suit/space/hardsuit/ert/lp,
+/obj/item/tank/internals/emergency_oxygen/double,
 /turf/open/floor/wood,
-/area/ship/crew/dorm)
+/area/ship/crew/dorm/captain)
 "hz" = (
 /obj/docking_port/mobile{
 	dir = 2;
@@ -748,10 +900,6 @@
 /turf/open/floor/engine/hull,
 /area/ship/external)
 "hF" = (
-/obj/machinery/power/apc/auto_name/directional/west,
-/obj/structure/cable{
-	icon_state = "0-2"
-	},
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
 "hJ" = (
@@ -772,11 +920,12 @@
 "hK" = (
 /obj/structure/grille,
 /obj/structure/window/reinforced/fulltile,
+/obj/machinery/door/firedoor/window,
 /obj/machinery/door/poddoor/shutters{
 	id = "Engineering_Specialist_Shutters";
-	dir = 4
+	dir = 4;
+	name = "Communications Shutters"
 	},
-/obj/machinery/door/firedoor/window,
 /turf/open/floor/plating,
 /area/ship/engineering)
 "hN" = (
@@ -787,26 +936,26 @@
 /turf/open/floor/engine/hull,
 /area/ship/external)
 "hQ" = (
+/obj/machinery/door/window/survival_pod{
+	dir = 4;
+	opacity = 1;
+	req_access_txt = "1";
+	name = "Security Specialist Quarters";
+	req_ship_access = 1
+	},
 /turf/open/floor/plasteel/stairs/wood{
 	dir = 8
 	},
 /area/ship/security)
 "hZ" = (
-/obj/structure/table/wood,
-/obj/item/flashlight/lamp/green{
-	pixel_x = 5;
-	pixel_y = 13;
-	layer = 4.2
-	},
-/obj/effect/turf_decal/siding/wood/end{
-	dir = 1
+/obj/machinery/camera/autoname{
+	dir = 4
 	},
-/obj/item/toy/plush/moth/deadhead{
-	pixel_x = -7;
-	layer = 4.3
+/obj/structure/chair/handrail{
+	dir = 4
 	},
-/turf/open/floor/wood,
-/area/ship/engineering)
+/turf/open/floor/plasteel/dark,
+/area/ship/hallway/central)
 "ib" = (
 /obj/structure/cable/cyan{
 	icon_state = "5-10"
@@ -851,7 +1000,7 @@
 	pixel_x = 7;
 	pixel_y = -20
 	},
-/turf/open/floor/plating,
+/turf/open/floor/plasteel/tech,
 /area/ship/maintenance/starboard)
 "iq" = (
 /obj/effect/turf_decal/industrial/warning{
@@ -862,21 +1011,29 @@
 /turf/open/floor/plating,
 /area/ship/maintenance/port)
 "ix" = (
-/obj/structure/table/greyscale,
+/obj/machinery/camera/autoname,
 /obj/effect/turf_decal/siding/blue{
-	dir = 1
+	dir = 5
 	},
-/obj/item/storage/firstaid/medical{
-	pixel_y = 7;
-	pixel_x = -2
+/obj/item/storage/firstaid/toxin{
+	pixel_x = 4;
+	pixel_y = -3
 	},
 /obj/item/storage/firstaid/o2{
 	pixel_x = 1;
 	pixel_y = 2
 	},
-/obj/item/storage/firstaid/toxin{
-	pixel_x = 4;
-	pixel_y = -3
+/obj/item/storage/firstaid/medical{
+	pixel_y = 7;
+	pixel_x = -2
+	},
+/obj/machinery/power/apc/auto_name/directional/north,
+/obj/structure/cable{
+	icon_state = "0-2"
+	},
+/obj/structure/table/reinforced,
+/obj/structure/filingcabinet{
+	pixel_x = 11
 	},
 /turf/open/floor/plasteel/white,
 /area/ship/medical)
@@ -885,20 +1042,18 @@
 	dir = 4
 	},
 /obj/effect/decal/cleanable/robot_debris/old,
+/obj/structure/reagent_dispensers/watertank,
 /turf/open/floor/plating,
 /area/ship/maintenance/starboard)
 "iD" = (
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 4
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+	dir = 1
 	},
-/obj/machinery/camera/autoname{
-	dir = 10
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+	dir = 1
 	},
 /turf/open/floor/plasteel/white,
 /area/ship/hallway/starboard)
@@ -914,23 +1069,35 @@
 /obj/structure/table/reinforced{
 	color = "#c1b6a5"
 	},
-/obj/effect/spawner/lootdrop/lpaid{
+/obj/item/stamp/captain{
+	pixel_x = 7
+	},
+/obj/item/paper_bin{
 	pixel_x = -4;
+	pixel_y = 2
+	},
+/obj/item/folder/blue{
+	pixel_x = 8;
 	pixel_y = 10
 	},
-/obj/effect/spawner/lootdrop/lpcombat{
-	pixel_y = 6
+/obj/item/pen/fourcolor{
+	pixel_x = -6;
+	pixel_y = 3
 	},
-/obj/effect/spawner/lootdrop/lpretrieval{
-	pixel_x = 3;
-	pixel_y = 1
+/obj/effect/turf_decal/techfloor{
+	dir = 10
 	},
-/turf/open/floor/plasteel/dark,
+/turf/open/floor/plasteel/telecomms_floor,
 /area/ship/bridge)
 "iH" = (
-/obj/structure/bed,
-/obj/item/bedsheet/grey,
-/turf/open/floor/plasteel/dark,
+/obj/structure/window/reinforced/fulltile,
+/obj/structure/grille,
+/obj/machinery/door/poddoor/shutters/preopen{
+	dir = 4;
+	id = "SecCellWindowShutters";
+	name = "Brig Cell Window Shutters"
+	},
+/turf/open/floor/plating,
 /area/ship/security)
 "iI" = (
 /obj/structure/closet/emcloset/wall/directional/north,
@@ -950,6 +1117,10 @@
 	dir = 10
 	},
 /obj/structure/ore_box,
+/obj/structure/railing{
+	dir = 8
+	},
+/obj/machinery/computer/helm/viewscreen/directional/east,
 /turf/open/floor/plasteel/dark,
 /area/ship/hallway/port)
 "iZ" = (
@@ -968,30 +1139,53 @@
 	},
 /turf/open/floor/plating,
 /area/ship/maintenance/port)
+"jd" = (
+/obj/structure/grille,
+/obj/structure/window/reinforced/fulltile,
+/obj/machinery/door/poddoor/shutters/preopen{
+	id = "CellHallShutters";
+	name = "Holding Cell Hall Shutters"
+	},
+/turf/open/floor/plating,
+/area/ship/security)
 "ji" = (
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/obj/structure/mopbucket,
-/obj/item/mop,
+/obj/machinery/light/dim/directional/south,
 /turf/open/floor/plasteel/white,
 /area/ship/hallway/starboard)
 "jj" = (
 /obj/machinery/holopad/emergency,
-/turf/open/floor/plasteel/dark,
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/structure/window/reinforced/survival_pod{
+	dir = 8
+	},
+/obj/effect/turf_decal/techfloor{
+	dir = 8
+	},
+/turf/open/floor/plasteel/telecomms_floor,
 /area/ship/bridge)
 "jk" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
+/obj/effect/turf_decal/siding/blue/corner{
+	dir = 4
+	},
+/obj/effect/turf_decal/siding/blue/corner{
+	dir = 8
+	},
 /turf/open/floor/plasteel/white,
 /area/ship/medical)
 "jr" = (
-/obj/machinery/suit_storage_unit/inherit,
-/obj/item/clothing/suit/space/hardsuit/ert/lp/engi,
-/obj/item/clothing/mask/breath,
-/obj/item/tank/internals/emergency_oxygen,
 /obj/effect/turf_decal/techfloor{
 	dir = 8
 	},
+/obj/structure/cable{
+	icon_state = "0-2"
+	},
+/obj/machinery/power/ship_gravity,
 /turf/open/floor/plasteel/mono/dark,
 /area/ship/engineering)
 "js" = (
@@ -999,10 +1193,10 @@
 /turf/open/floor/plasteel/telecomms_floor,
 /area/ship/crew/cryo)
 "jt" = (
-/obj/machinery/autolathe,
 /obj/effect/turf_decal/techfloor{
 	dir = 1
 	},
+/obj/structure/crate_shelf,
 /turf/open/floor/plasteel/mono/dark,
 /area/ship/engineering)
 "jv" = (
@@ -1016,29 +1210,35 @@
 /obj/item/clothing/suit/armor/vest/security/officer,
 /obj/item/clothing/under/rank/security/head_of_security/alt/lp,
 /obj/machinery/light/dim/directional/west,
+/obj/item/storage/backpack/ert/security,
 /turf/open/floor/wood,
 /area/ship/security)
 "jA" = (
 /turf/closed/wall/r_wall,
 /area/ship/hallway/port)
 "jC" = (
-/obj/machinery/atmospherics/components/unary/outlet_injector/on/layer4{
-	dir = 8
-	},
-/turf/open/floor/engine/hull,
-/area/ship/external)
+/obj/machinery/light/floor,
+/turf/closed/wall/r_wall,
+/area/ship/engineering/communications)
 "jF" = (
-/obj/effect/turf_decal/corner/opaque/orange/full,
 /obj/structure/cable{
 	icon_state = "1-4"
 	},
 /obj/structure/cable{
 	icon_state = "1-10"
 	},
-/obj/effect/turf_decal/siding/yellow{
-	dir = 10
+/obj/structure/table/reinforced,
+/obj/item/weldingtool{
+	pixel_x = -6
 	},
-/turf/open/floor/plasteel/tech,
+/obj/item/multitool,
+/obj/item/t_scanner{
+	pixel_x = 7;
+	pixel_y = 4
+	},
+/obj/item/stack/cable_coil/random,
+/obj/item/storage/belt/utility,
+/turf/open/floor/plasteel/mono/dark,
 /area/ship/engineering)
 "jH" = (
 /obj/machinery/power/apc/auto_name/directional/north,
@@ -1053,6 +1253,20 @@
 	},
 /turf/open/floor/plasteel/white,
 /area/ship/hallway/port)
+"jJ" = (
+/obj/structure/grille,
+/obj/structure/window/reinforced/fulltile,
+/obj/machinery/door/poddoor/shutters/preopen{
+	dir = 4;
+	id = "SecCellWindowShutters";
+	name = "Brig Cell Window Shutters"
+	},
+/turf/open/floor/plating,
+/area/ship/security)
+"jQ" = (
+/obj/structure/sign/nanotrasen/vigilitas,
+/turf/closed/wall/r_wall,
+/area/ship/hallway/starboard)
 "jZ" = (
 /obj/structure/cable{
 	icon_state = "6-8"
@@ -1063,10 +1277,9 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 9
 	},
-/obj/effect/turf_decal/corner/opaque/brown/mono,
-/obj/effect/turf_decal/industrial/warning,
-/turf/open/floor/plasteel/dark,
-/area/ship/storage)
+/obj/effect/turf_decal/corner/opaque/vired/half,
+/turf/open/floor/plasteel/tech,
+/area/ship/storage/equip)
 "kh" = (
 /obj/machinery/light_switch{
 	dir = 1;
@@ -1074,20 +1287,40 @@
 	pixel_y = -20
 	},
 /obj/item/radio/intercom/directional/west,
+/obj/effect/turf_decal/techfloor{
+	dir = 1
+	},
 /turf/open/floor/plasteel/dark,
 /area/ship/crew/cryo)
 "ks" = (
 /obj/effect/decal/cleanable/cobweb,
+/obj/machinery/portable_atmospherics/scrubber,
+/obj/machinery/camera/autoname,
 /turf/open/floor/plating,
 /area/ship/maintenance/port)
 "kt" = (
-/obj/effect/turf_decal/borderfloorblack,
-/turf/open/floor/plasteel/tech/airless,
-/area/ship/engineering/communications)
+/obj/machinery/light/dim/directional/south,
+/obj/structure/chair/office{
+	dir = 8;
+	name = "tactical swivel chair"
+	},
+/obj/machinery/airalarm/directional/east,
+/turf/open/floor/plasteel/patterned/brushed,
+/area/ship/bridge)
 "kw" = (
+/obj/effect/turf_decal/techfloor{
+	dir = 8
+	},
+/obj/effect/turf_decal/techfloor{
+	dir = 4
+	},
 /obj/structure/grille,
 /obj/structure/window/reinforced/fulltile,
-/obj/machinery/door/firedoor/window,
+/obj/machinery/door/poddoor/preopen{
+	dir = 4;
+	name = "Intelligence Core";
+	id = "AiCore"
+	},
 /turf/open/floor/plating,
 /area/ship/engineering/communications)
 "kK" = (
@@ -1118,8 +1351,8 @@
 /area/ship/engineering/communications)
 "kS" = (
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
-/obj/effect/turf_decal/siding/blue/corner{
-	dir = 4
+/obj/effect/turf_decal/siding/blue{
+	dir = 1
 	},
 /turf/open/floor/plasteel/white,
 /area/ship/medical)
@@ -1150,6 +1383,9 @@
 /obj/effect/turf_decal/corner/opaque/ntblue/half{
 	dir = 8
 	},
+/obj/structure/chair/handrail{
+	dir = 4
+	},
 /turf/open/floor/plasteel/white,
 /area/ship/hallway/central)
 "lp" = (
@@ -1158,7 +1394,9 @@
 	pixel_y = 6;
 	pixel_x = 22;
 	id = "Ranger_FireFighting_Shut";
-	name = "Shutters"
+	name = "Ready Room";
+	req_ship_access = 1;
+	req_one_access_txt = list(50, 10, 5, 1, 20)
 	},
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
 	dir = 1
@@ -1167,20 +1405,34 @@
 	dir = 1
 	},
 /obj/effect/turf_decal/corner/opaque/ntblue/half,
-/obj/effect/turf_decal/trimline/opaque/yellow/filled/corner{
+/obj/item/radio/intercom/directional/south,
+/obj/effect/turf_decal/trimline/opaque/vired/filled/corner{
 	dir = 4
 	},
-/obj/item/radio/intercom/directional/south,
 /turf/open/floor/plasteel/white,
 /area/ship/hallway/port)
 "lv" = (
-/obj/effect/decal/cleanable/insectguts,
-/turf/open/floor/plasteel/tech,
+/obj/effect/turf_decal/trimline/opaque/nsorange/warning{
+	dir = 1
+	},
+/obj/effect/turf_decal/siding{
+	color = "#474747";
+	dir = 1
+	},
+/turf/open/floor/plasteel/white,
 /area/ship/cargo)
 "lw" = (
-/obj/machinery/airalarm/directional/north,
-/obj/structure/closet/crate/large,
-/turf/open/floor/plasteel/tech,
+/obj/effect/turf_decal/trimline/opaque/nsorange/line{
+	dir = 9
+	},
+/obj/structure/fluff/hedge/opaque,
+/obj/structure/railing{
+	dir = 8
+	},
+/obj/effect/turf_decal/siding/thinplating/dark{
+	dir = 8
+	},
+/turf/open/floor/plasteel/white,
 /area/ship/cargo)
 "lB" = (
 /obj/structure/cable{
@@ -1192,37 +1444,32 @@
 /obj/structure/cable{
 	icon_state = "1-4"
 	},
-/obj/machinery/camera/autoname{
-	dir = 5
-	},
 /turf/open/floor/plasteel/stairs{
 	dir = 1
 	},
 /area/ship/bridge)
 "lL" = (
+/obj/structure/cable{
+	icon_state = "2-9"
+	},
 /obj/effect/turf_decal/siding/blue{
-	dir = 1
+	dir = 5
 	},
 /turf/open/floor/plasteel/white,
 /area/ship/medical)
 "lU" = (
-/obj/effect/turf_decal/industrial/outline/yellow,
-/obj/effect/turf_decal/industrial/warning{
-	dir = 1
-	},
 /obj/machinery/light_switch{
 	dir = 4;
 	pixel_x = -21;
 	pixel_y = 7
 	},
+/obj/structure/crate_shelf,
 /turf/open/floor/plasteel/tech,
 /area/ship/cargo)
 "lW" = (
-/obj/effect/turf_decal/steeldecal/steel_decals9,
-/obj/effect/turf_decal/steeldecal/steel_decals9{
-	dir = 4
-	},
-/turf/open/floor/plasteel/dark,
+/obj/item/radio/intercom/wideband/directional/south,
+/obj/effect/turf_decal/techfloor,
+/turf/open/floor/plasteel/telecomms_floor,
 /area/ship/bridge)
 "lX" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
@@ -1230,10 +1477,6 @@
 	},
 /obj/effect/turf_decal/corner/opaque/orange/full,
 /obj/effect/turf_decal/siding/yellow,
-/obj/structure/railing{
-	dir = 2;
-	layer = 4.1
-	},
 /obj/effect/turf_decal/siding/yellow,
 /turf/open/floor/plasteel/tech,
 /area/ship/engineering)
@@ -1263,12 +1506,15 @@
 /turf/open/floor/plasteel/white,
 /area/ship/hallway/port)
 "mn" = (
-/obj/structure/table/reinforced{
-	color = "#c1b6a5"
-	},
-/obj/item/modular_computer/laptop/preset/civilian,
 /obj/machinery/light/dim/directional/north,
-/turf/open/floor/plasteel/dark,
+/obj/machinery/modular_computer/console/preset/command,
+/obj/structure/cable{
+	icon_state = "0-2"
+	},
+/obj/effect/turf_decal/techfloor{
+	dir = 1
+	},
+/turf/open/floor/plasteel/telecomms_floor,
 /area/ship/bridge)
 "mv" = (
 /obj/item/radio/intercom/directional/north,
@@ -1278,7 +1524,7 @@
 /mob/living/simple_animal/pet/dog/corgi/Lisa,
 /obj/structure/bed/dogbed,
 /turf/open/floor/wood,
-/area/ship/crew/dorm)
+/area/ship/crew/dorm/captain)
 "mw" = (
 /obj/effect/turf_decal/corner/opaque/ntblue/half{
 	dir = 8
@@ -1289,16 +1535,13 @@
 /turf/open/floor/plasteel/white,
 /area/ship/hallway/central)
 "my" = (
-/obj/structure/urinal{
-	pixel_y = 29
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/turf/open/floor/plastic,
-/area/ship/crew/toilet)
+/obj/machinery/light/dim/directional/east,
+/obj/effect/turf_decal/borderfloorblack,
+/obj/structure/bed,
+/obj/item/bedsheet/nanotrasen,
+/turf/open/floor/plasteel/tech,
+/area/ship/security)
 "mJ" = (
-/obj/machinery/portable_atmospherics/pump,
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
 /obj/machinery/light_switch{
 	dir = 4;
@@ -1308,13 +1551,30 @@
 /obj/machinery/camera/autoname{
 	dir = 4
 	},
+/obj/effect/turf_decal/industrial/fire{
+	dir = 1
+	},
+/obj/structure/closet/crate/secure/gear{
+	name = "Ammunition Crate"
+	},
+/obj/structure/chair/handrail{
+	dir = 4
+	},
+/obj/item/ammo_box/c9mm,
+/obj/item/ammo_box/c9mm,
+/obj/item/ammo_box/c9mm/rubbershot,
+/obj/item/ammo_box/c9mm,
+/obj/item/ammo_box/c9mm,
 /turf/open/floor/plasteel/tech,
-/area/ship/storage)
+/area/ship/storage/equip)
 "mQ" = (
 /obj/structure/cable{
 	icon_state = "2-4"
 	},
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
+/obj/effect/turf_decal/techfloor{
+	dir = 1
+	},
 /turf/open/floor/plasteel/dark,
 /area/ship/crew/cryo)
 "nh" = (
@@ -1322,13 +1582,10 @@
 	dir = 1
 	},
 /obj/effect/turf_decal/siding/red,
-/obj/machinery/door/window/brigdoor{
-	req_ship_access = 1;
-	req_access_txt = "1";
-	id = "ranger_brig";
-	name = "Holding Cell Door"
+/obj/effect/turf_decal/siding/red{
+	dir = 6
 	},
-/turf/open/floor/mineral/plastitanium/red/brig,
+/turf/open/floor/plasteel/tech,
 /area/ship/security)
 "no" = (
 /obj/structure/cable{
@@ -1342,6 +1599,16 @@
 	},
 /turf/open/floor/plasteel/white,
 /area/ship/hallway/starboard)
+"nq" = (
+/obj/structure/grille,
+/obj/machinery/door/firedoor/window,
+/obj/machinery/door/poddoor/shutters/preopen{
+	id = "SecShutters";
+	name = "Security Specialist's Office"
+	},
+/obj/structure/window/reinforced/fulltile,
+/turf/open/floor/plating,
+/area/ship/security)
 "nA" = (
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
@@ -1351,9 +1618,10 @@
 /obj/machinery/button/door{
 	dir = 2;
 	pixel_x = -2;
-	name = "Blast Doors";
+	name = "Access Blast Doors";
 	id = "Ranger_AI_Core_Blasts";
-	pixel_y = 22
+	pixel_y = 22;
+	req_access_txt = "10"
 	},
 /obj/machinery/button/shieldwallgen{
 	dir = 2;
@@ -1361,7 +1629,14 @@
 	pixel_y = 20;
 	id = "AI_Core_Field_Engi"
 	},
-/turf/open/floor/plasteel/tech/airless,
+/obj/effect/turf_decal/techfloor{
+	dir = 8
+	},
+/obj/effect/turf_decal/techfloor{
+	dir = 4
+	},
+/obj/machinery/recharge_station,
+/turf/open/floor/plasteel/tech,
 /area/ship/engineering/communications)
 "nJ" = (
 /obj/structure/cable/cyan{
@@ -1383,11 +1658,9 @@
 /turf/open/floor/plating,
 /area/ship/maintenance/port)
 "of" = (
-/obj/machinery/light/dim/directional/south,
 /obj/structure/cable{
 	icon_state = "1-4"
 	},
-/obj/structure/reagent_dispensers/watertank,
 /turf/open/floor/plasteel/white,
 /area/ship/hallway/starboard)
 "og" = (
@@ -1398,12 +1671,22 @@
 	dir = 8;
 	icon_state = "computer-right"
 	},
-/turf/open/floor/plasteel/dark,
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/effect/turf_decal/techfloor{
+	dir = 6
+	},
+/turf/open/floor/plasteel/telecomms_floor,
 /area/ship/bridge)
 "oi" = (
-/obj/structure/railing/corner{
+/obj/effect/turf_decal/siding/blue{
 	dir = 8
 	},
+/obj/structure/chair/office{
+	dir = 4;
+	name = "tactical swivel chair"
+	},
 /turf/open/floor/plasteel/white,
 /area/ship/medical)
 "ok" = (
@@ -1419,6 +1702,11 @@
 /obj/machinery/door/firedoor/border_only{
 	dir = 8
 	},
+/obj/machinery/door/poddoor{
+	dir = 4;
+	id = "Ranger_Cycler_Shutters";
+	name = "Air Cycler Lockdown"
+	},
 /turf/open/floor/plasteel/dark,
 /area/ship/hallway/central)
 "oq" = (
@@ -1446,26 +1734,31 @@
 /obj/machinery/door/window/northleft{
 	dir = 4
 	},
-/obj/machinery/door/poddoor/shutters{
-	dir = 4;
-	id = "Ranger_Port_maint_shut"
-	},
 /obj/structure/cable/yellow{
 	icon_state = "0-8"
 	},
+/obj/machinery/door/poddoor/shutters{
+	dir = 4;
+	id = "Ranger_Port_maint_shut";
+	name = "Engine Shutters"
+	},
 /turf/open/floor/plating,
 /area/ship/maintenance/port)
 "oM" = (
-/obj/machinery/door/window/eastleft{
-	dir = 2
-	},
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
-	dir = 1
+/obj/structure/window/reinforced/fulltile,
+/obj/structure/grille,
+/obj/machinery/door/firedoor/window,
+/obj/machinery/door/poddoor/shutters/preopen{
+	id = "SecShutters";
+	name = "Security Specialist's Office"
 	},
-/turf/open/floor/plastic,
-/area/ship/crew/toilet)
+/turf/open/floor/plating,
+/area/ship/security)
 "oQ" = (
 /obj/item/radio/intercom/directional/west,
+/obj/machinery/camera/autoname{
+	dir = 4
+	},
 /turf/open/floor/wood,
 /area/ship/medical)
 "pa" = (
@@ -1495,6 +1788,7 @@
 /obj/effect/turf_decal/corner/opaque/ntblue/three_quarters{
 	dir = 8
 	},
+/obj/structure/closet/crate/bin,
 /turf/open/floor/plasteel/white,
 /area/ship/hallway/starboard)
 "pn" = (
@@ -1513,10 +1807,24 @@
 /obj/structure/mirror{
 	pixel_x = 24
 	},
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+	dir = 1
+	},
+/obj/item/towel{
+	pixel_x = 10;
+	pixel_y = 14
+	},
+/obj/structure/railing{
+	dir = 1;
+	name = "towel holder"
+	},
+/obj/item/towel{
+	pixel_x = -7;
+	pixel_y = 14
+	},
 /turf/open/floor/plastic,
 /area/ship/crew/toilet)
 "ps" = (
-/obj/structure/closet/secure_closet/lp/engineer,
 /obj/machinery/light/dim/directional/north,
 /obj/item/clothing/gloves/color/yellow{
 	pixel_y = -9
@@ -1551,9 +1859,13 @@
 /obj/item/clothing/head/welding{
 	pixel_y = -9
 	},
-/obj/item/clothing/glasses/meson/gar{
-	pixel_y = 8
+/obj/item/clothing/glasses/meson/engine,
+/obj/item/clothing/glasses/hud/diagnostic,
+/obj/item/pipe_dispenser,
+/obj/effect/turf_decal/techfloor{
+	dir = 4
 	},
+/obj/structure/closet/secure_closet/lp/engineer,
 /turf/open/floor/plasteel/mono/dark,
 /area/ship/engineering)
 "pA" = (
@@ -1571,7 +1883,12 @@
 /obj/structure/chair/comfy/blue/directional/east,
 /obj/item/toy/plush/moth/royal,
 /obj/item/radio/intercom/wideband/directional/south,
-/turf/open/floor/circuit/green/airless,
+/obj/effect/turf_decal/techfloor{
+	dir = 4
+	},
+/turf/open/floor/circuit/telecomms{
+	initial_gas_mix = "TEMP=2.7"
+	},
 /area/ship/engineering/communications)
 "pU" = (
 /obj/machinery/camera/autoname{
@@ -1586,24 +1903,16 @@
 "qb" = (
 /obj/item/radio/intercom/directional/south,
 /obj/effect/turf_decal/industrial/outline/blue,
-/obj/structure/janitorialcart{
-	dir = 4
-	},
-/obj/item/mop,
-/turf/open/floor/plating,
+/obj/structure/reagent_dispensers/foamtank,
+/turf/open/floor/plasteel/tech,
 /area/ship/maintenance/port)
 "qe" = (
-/obj/structure/urinal{
-	pixel_y = 29
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+/obj/structure/girder/reinforced,
+/obj/machinery/camera/autoname{
 	dir = 6
 	},
-/turf/open/floor/plastic,
-/area/ship/crew/toilet)
+/turf/open/floor/engine/hull,
+/area/ship/external)
 "qs" = (
 /obj/machinery/power/shuttle/engine/electric{
 	dir = 4
@@ -1620,10 +1929,6 @@
 /turf/open/floor/plating,
 /area/ship/maintenance/starboard)
 "qR" = (
-/obj/machinery/door/airlock/security/glass,
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /obj/machinery/door/firedoor/border_only{
@@ -1631,6 +1936,13 @@
 	},
 /obj/machinery/door/firedoor/border_only,
 /obj/effect/turf_decal/corner/opaque/red/full,
+/obj/machinery/door/airlock/security{
+	name = "Security Specialist's Office";
+	req_access_txt = "1"
+	},
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
 /turf/open/floor/plasteel/dark,
 /area/ship/security)
 "qS" = (
@@ -1639,21 +1951,24 @@
 	},
 /obj/effect/decal/cleanable/oil/streak,
 /obj/machinery/light/dim/directional/north,
+/obj/machinery/portable_atmospherics/scrubber,
 /turf/open/floor/plating,
 /area/ship/maintenance/port)
 "qZ" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/effect/turf_decal/corner/opaque/brown/mono,
-/obj/effect/turf_decal/industrial/warning{
+/obj/effect/turf_decal/corner/opaque/vired/half{
 	dir = 1
 	},
-/turf/open/floor/plasteel/dark,
-/area/ship/storage)
+/obj/machinery/holopad,
+/turf/open/floor/plasteel/tech,
+/area/ship/storage/equip)
 "rg" = (
-/obj/machinery/portable_atmospherics/scrubber,
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
+/obj/effect/turf_decal/industrial/fire{
+	dir = 1
+	},
 /turf/open/floor/plasteel/tech,
-/area/ship/storage)
+/area/ship/storage/equip)
 "rq" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -1661,13 +1976,25 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /turf/open/floor/plasteel/stairs,
 /area/ship/crew/cryo)
+"rw" = (
+/obj/machinery/camera/autoname{
+	dir = 5
+	},
+/obj/machinery/light/floor,
+/turf/open/floor/engine/hull,
+/area/ship/external)
 "rA" = (
 /obj/effect/turf_decal/corner/opaque/orange/full,
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/obj/effect/turf_decal/siding/yellow,
-/obj/machinery/holopad,
+/obj/structure/chair/office{
+	dir = 8;
+	name = "tactical swivel chair"
+	},
+/obj/effect/turf_decal/siding/yellow{
+	dir = 10
+	},
 /turf/open/floor/plasteel/tech,
 /area/ship/engineering)
 "rC" = (
@@ -1727,7 +2054,8 @@
 	},
 /obj/machinery/door/poddoor/shutters{
 	dir = 4;
-	id = "Ranger_SB_maint_shut"
+	id = "Ranger_SB_maint_shut";
+	name = "Engine Shutters"
 	},
 /obj/structure/cable/yellow{
 	icon_state = "0-8"
@@ -1735,16 +2063,12 @@
 /turf/open/floor/plating,
 /area/ship/maintenance/starboard)
 "rX" = (
-/obj/effect/turf_decal/corner/opaque/ntblue/half{
-	dir = 8
-	},
-/obj/machinery/power/apc/auto_name/directional/west,
-/obj/structure/cable{
-	icon_state = "0-2"
+/obj/machinery/airalarm/directional/west,
+/obj/structure/railing{
+	dir = 5;
+	layer = 4.1
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/turf/open/floor/plasteel/white,
+/turf/open/floor/plasteel/dark,
 /area/ship/hallway/central)
 "rZ" = (
 /obj/effect/turf_decal/atmos/air,
@@ -1762,13 +2086,22 @@
 	color = "#c1b6a5"
 	},
 /obj/machinery/fax/nanotrasen,
-/turf/open/floor/plasteel/dark,
+/obj/machinery/camera/autoname{
+	dir = 6
+	},
+/obj/effect/turf_decal/techfloor{
+	dir = 9
+	},
+/turf/open/floor/plasteel/telecomms_floor,
 /area/ship/bridge)
 "sl" = (
-/obj/effect/turf_decal/borderfloorblack{
-	dir = 8
+/obj/effect/turf_decal/trimline/opaque/yellow/filled/warning{
+	dir = 1
 	},
-/turf/open/floor/plasteel/tech/airless,
+/obj/effect/turf_decal/spline/fancy/opaque/black{
+	dir = 9
+	},
+/turf/open/floor/plasteel/telecomms_floor,
 /area/ship/engineering/communications)
 "sm" = (
 /obj/structure/cable{
@@ -1781,8 +2114,13 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 4
 	},
-/turf/open/floor/plating,
+/turf/open/floor/plasteel/tech,
 /area/ship/maintenance/port)
+"sp" = (
+/obj/machinery/camera/autoname,
+/obj/machinery/light/floor,
+/turf/open/floor/engine/hull,
+/area/ship/external)
 "sw" = (
 /obj/structure/cable{
 	icon_state = "6-8"
@@ -1796,7 +2134,6 @@
 /turf/open/floor/plasteel/white,
 /area/ship/hallway/port)
 "sF" = (
-/obj/structure/table/greyscale,
 /obj/item/storage/box/syringes{
 	pixel_y = 10;
 	pixel_x = -5
@@ -1812,28 +2149,50 @@
 	pixel_x = 5
 	},
 /obj/machinery/light/dim/directional/north,
+/obj/structure/table/reinforced,
+/obj/machinery/airalarm/directional/west,
 /turf/open/floor/plasteel/white,
 /area/ship/medical)
 "sJ" = (
 /turf/closed/wall/r_wall,
 /area/ship/hallway/central)
 "sR" = (
-/obj/structure/table/wood,
 /obj/machinery/light/dim/directional/south,
 /obj/effect/turf_decal/siding/red/end,
-/obj/item/toy/plush/spider,
-/turf/open/floor/mineral/plastitanium/red/brig,
+/obj/machinery/computer/security/telescreen{
+	dir = 1;
+	pixel_y = -32;
+	network = list("ss13")
+	},
+/obj/machinery/airalarm/directional/west,
+/turf/open/floor/plasteel/tech,
 /area/ship/security)
 "sU" = (
-/obj/structure/table/greyscale,
-/obj/machinery/power/apc/auto_name/directional/east,
-/obj/structure/cable{
-	icon_state = "0-10"
+/obj/effect/turf_decal/industrial/warning{
+	dir = 9
 	},
-/obj/effect/turf_decal/siding/blue{
-	dir = 5
+/obj/effect/turf_decal/siding/thinplating/light{
+	dir = 9
+	},
+/obj/effect/turf_decal/borderfloorwhite/corner,
+/obj/structure/sink{
+	dir = 8;
+	pixel_x = 12;
+	pixel_y = 4
+	},
+/obj/machinery/button/door{
+	pixel_x = 26;
+	dir = 8;
+	name = "Medical Shutters";
+	id = "MedShutters";
+	req_ship_access = 1;
+	req_access_txt = "5"
+	},
+/obj/machinery/light_switch{
+	dir = 8;
+	pixel_x = 25;
+	pixel_y = -9
 	},
-/obj/item/defibrillator/loaded,
 /turf/open/floor/plasteel/white,
 /area/ship/medical)
 "tb" = (
@@ -1877,7 +2236,8 @@
 /area/ship/maintenance/port)
 "tj" = (
 /obj/machinery/door/airlock/command{
-	dir = 4
+	dir = 4;
+	name = "Bridge"
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 4
@@ -1899,13 +2259,24 @@
 "tk" = (
 /obj/effect/turf_decal/corner/opaque/orange/full,
 /obj/effect/turf_decal/siding/yellow,
-/turf/open/floor/plasteel/tech,
-/area/ship/engineering)
-"tq" = (
-/obj/structure/bed,
-/obj/item/bedsheet/medical,
-/turf/open/floor/wood,
-/area/ship/medical)
+/obj/effect/turf_decal/siding/yellow{
+	dir = 6
+	},
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+	dir = 1
+	},
+/obj/machinery/light_switch{
+	dir = 8;
+	pixel_x = 19;
+	pixel_y = 8
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/engineering)
+"tq" = (
+/obj/structure/bed,
+/obj/item/bedsheet/medical,
+/turf/open/floor/wood,
+/area/ship/medical)
 "tr" = (
 /obj/machinery/power/shuttle/engine/fueled/plasma{
 	dir = 4
@@ -1920,7 +2291,10 @@
 	dir = 8;
 	icon_state = "computer-left"
 	},
-/turf/open/floor/plasteel/dark,
+/obj/effect/turf_decal/techfloor{
+	dir = 5
+	},
+/turf/open/floor/plasteel/telecomms_floor,
 /area/ship/bridge)
 "tQ" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
@@ -1930,10 +2304,17 @@
 /obj/effect/turf_decal/siding/red{
 	dir = 1
 	},
-/obj/structure/cable{
-	icon_state = "1-6"
+/obj/structure/cable,
+/obj/machinery/power/apc/auto_name/directional/east,
+/obj/effect/turf_decal/siding/red{
+	dir = 5
 	},
-/turf/open/floor/mineral/plastitanium/red/brig,
+/obj/machinery/light_switch{
+	pixel_x = 20;
+	pixel_y = 11;
+	dir = 8
+	},
+/turf/open/floor/plasteel/tech,
 /area/ship/security)
 "tR" = (
 /obj/structure/cable{
@@ -1947,14 +2328,17 @@
 /turf/open/floor/plasteel/white,
 /area/ship/hallway/port)
 "tT" = (
-/turf/open/floor/plasteel/tech/airless,
+/obj/effect/turf_decal/trimline/opaque/yellow/filled/warning,
+/obj/effect/turf_decal/spline/fancy/opaque/black,
+/turf/open/floor/plasteel/telecomms_floor,
 /area/ship/engineering/communications)
 "tZ" = (
 /obj/machinery/button/door{
 	dir = 4;
 	pixel_x = -21;
 	name = "Shutters";
-	id = "Ranger_SB_maint_shut"
+	id = "Ranger_SB_maint_shut";
+	req_ship_access = 1
 	},
 /turf/open/floor/plating,
 /area/ship/maintenance/starboard)
@@ -1986,12 +2370,16 @@
 /obj/effect/turf_decal/siding/yellow{
 	dir = 1
 	},
+/obj/machinery/holopad,
 /turf/open/floor/plasteel/tech,
 /area/ship/engineering)
 "us" = (
 /obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/layer2{
 	dir = 4
 	},
+/obj/machinery/camera/autoname{
+	dir = 10
+	},
 /turf/open/floor/plasteel/dark,
 /area/ship/hallway/central)
 "ux" = (
@@ -2002,6 +2390,12 @@
 	name = "Nanotrasen relay";
 	network = "nt_commnet"
 	},
+/obj/effect/turf_decal/techfloor{
+	dir = 1
+	},
+/obj/machinery/camera/autoname{
+	dir = 10
+	},
 /turf/open/floor/circuit/telecomms{
 	initial_gas_mix = "TEMP=2.7"
 	},
@@ -2018,7 +2412,6 @@
 /turf/open/floor/plasteel/white,
 /area/ship/hallway/port)
 "uH" = (
-/obj/machinery/door/airlock/public/glass,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /obj/machinery/door/firedoor/border_only,
@@ -2028,6 +2421,10 @@
 /obj/effect/turf_decal/corner/opaque/ntblue/half{
 	dir = 8
 	},
+/obj/machinery/door/poddoor/shutters/preopen{
+	name = "Corridor Lockdown Port";
+	id = "RangerPortShutters"
+	},
 /turf/open/floor/plasteel/white,
 /area/ship/hallway/port)
 "uW" = (
@@ -2038,25 +2435,32 @@
 	dir = 4
 	},
 /obj/effect/turf_decal/siding/blue,
-/obj/machinery/iv_drip,
+/obj/machinery/holopad,
 /turf/open/floor/plasteel/white,
 /area/ship/medical)
 "vh" = (
 /obj/effect/turf_decal/corner/opaque/blue/diagonal,
-/obj/machinery/door/window,
+/obj/machinery/door/window{
+	req_ship_access = 1;
+	name = "Surgical Compartment"
+	},
+/obj/structure/chair/handrail{
+	dir = 8;
+	pixel_x = 2
+	},
+/obj/effect/turf_decal/borderfloorwhite{
+	dir = 1
+	},
 /turf/open/floor/plasteel/white,
 /area/ship/medical)
 "vj" = (
 /obj/effect/turf_decal/corner/opaque/ntblue/half{
 	dir = 8
 	},
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/machinery/camera/autoname{
-	dir = 4
+/obj/structure/cable{
+	icon_state = "2-9"
 	},
 /turf/open/floor/plasteel/white,
 /area/ship/hallway/central)
@@ -2073,11 +2477,33 @@
 	pixel_x = -7;
 	pixel_y = 21
 	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 10
+	},
+/obj/item/towel{
+	pixel_x = 10;
+	pixel_y = 14
+	},
+/obj/item/towel{
+	pixel_x = -7;
+	pixel_y = 14
+	},
+/obj/structure/railing{
+	dir = 1;
+	name = "towel holder"
+	},
 /turf/open/floor/plastic,
 /area/ship/crew/toilet)
 "vm" = (
 /turf/closed/wall/r_wall,
 /area/ship/medical)
+"vo" = (
+/obj/structure/crate_shelf,
+/obj/structure/sign/nanotrasen/ns{
+	pixel_x = 32
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/cargo)
 "vp" = (
 /obj/effect/turf_decal/steeldecal/steel_decals10{
 	dir = 5
@@ -2085,7 +2511,10 @@
 /obj/effect/turf_decal/steeldecal/steel_decals10{
 	dir = 6
 	},
-/turf/open/floor/plasteel/dark,
+/obj/structure/cable{
+	icon_state = "4-10"
+	},
+/turf/open/floor/plasteel/telecomms_floor,
 /area/ship/bridge)
 "vr" = (
 /obj/structure/window/reinforced{
@@ -2100,11 +2529,17 @@
 /obj/machinery/power/apc/auto_name/directional/east,
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/structure/reagent_dispensers/fueltank,
+/obj/structure/railing{
+	dir = 1
+	},
 /turf/open/floor/plating,
 /area/ship/maintenance/starboard)
 "vz" = (
-/obj/effect/turf_decal/industrial/outline/yellow,
 /obj/machinery/light/dim/directional/south,
+/obj/machinery/camera/autoname{
+	dir = 10
+	},
 /turf/open/floor/plasteel/tech,
 /area/ship/cargo)
 "vB" = (
@@ -2113,19 +2548,30 @@
 /turf/open/floor/plasteel/telecomms_floor,
 /area/ship/crew/cryo)
 "vF" = (
-/obj/effect/turf_decal/siding/blue,
-/obj/structure/closet/crate/freezer/blood,
-/obj/structure/railing{
-	dir = 8;
-	layer = 4.1
+/obj/structure/window/reinforced/tinted{
+	dir = 1
+	},
+/obj/machinery/door/window/survival_pod{
+	dir = 4;
+	opacity = 1;
+	name = "Medical Specialist's Quarters";
+	req_access_txt = "5";
+	req_ship_access = 1
+	},
+/turf/open/floor/plasteel/stairs/wood{
+	dir = 8
 	},
-/turf/open/floor/plasteel/white,
 /area/ship/medical)
 "vO" = (
-/turf/open/floor/circuit/green/airless,
+/obj/effect/turf_decal/spline/fancy/opaque/black{
+	dir = 4
+	},
+/obj/effect/turf_decal/trimline/opaque/yellow/filled/warning{
+	dir = 4
+	},
+/turf/open/floor/plasteel/telecomms_floor,
 /area/ship/engineering/communications)
 "vR" = (
-/obj/machinery/light/dim/directional/south,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 5
 	},
@@ -2135,15 +2581,16 @@
 /obj/effect/turf_decal/industrial/warning/corner{
 	dir = 1
 	},
+/obj/machinery/light/dim/directional/west,
 /turf/open/floor/plasteel/white,
 /area/ship/hallway/starboard)
 "vS" = (
-/obj/structure/table/optable,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 5
 	},
-/obj/effect/turf_decal/siding/blue,
-/obj/item/storage/backpack/duffelbag/med/surgery,
+/obj/effect/turf_decal/siding/blue{
+	dir = 10
+	},
 /turf/open/floor/plasteel/white,
 /area/ship/medical)
 "vT" = (
@@ -2168,17 +2615,17 @@
 /turf/open/floor/plating,
 /area/ship/maintenance/port)
 "vV" = (
+/obj/effect/turf_decal/corner/opaque/blue/diagonal,
 /obj/structure/window/reinforced/spawner{
-	dir = 4
+	dir = 8
 	},
-/obj/machinery/suit_storage_unit/inherit,
-/obj/item/clothing/suit/space/hardsuit/ert/lp/med,
-/obj/item/clothing/mask/breath,
-/obj/machinery/camera/autoname,
-/obj/effect/turf_decal/siding/blue{
-	dir = 5
+/obj/machinery/iv_drip,
+/obj/machinery/defibrillator_mount/loaded{
+	pixel_y = 24
+	},
+/obj/effect/turf_decal/borderfloorwhite{
+	dir = 4
 	},
-/obj/item/tank/internals/emergency_oxygen,
 /turf/open/floor/plasteel/white,
 /area/ship/medical)
 "wc" = (
@@ -2188,25 +2635,36 @@
 /obj/machinery/door/window/northright{
 	dir = 4
 	},
-/obj/machinery/door/poddoor/shutters{
-	dir = 4;
-	id = "Ranger_Port_maint_shut"
-	},
 /obj/structure/cable/yellow{
 	icon_state = "0-8"
 	},
+/obj/machinery/door/poddoor/shutters{
+	dir = 4;
+	id = "Ranger_Port_maint_shut";
+	name = "Engine Shutters"
+	},
 /turf/open/floor/plating,
 /area/ship/maintenance/port)
 "wf" = (
-/obj/machinery/telecomms/receiver/preset_right{
-	autolinkers = list("receiverB","hub");
-	freq_listening = list(1353,1447,1459);
-	network = "nt_commnet"
+/obj/structure/chair/office{
+	dir = 4;
+	name = "tactical swivel chair"
 	},
-/turf/open/floor/circuit/telecomms{
-	initial_gas_mix = "TEMP=2.7"
+/obj/machinery/power/apc/auto_name/directional/west,
+/obj/structure/cable,
+/obj/machinery/button/door{
+	dir = 1;
+	pixel_y = -24;
+	id = "BridgeAtrium";
+	name = "Atrium Shutters"
 	},
-/area/ship/engineering/communications)
+/obj/machinery/light_switch{
+	dir = 4;
+	pixel_x = -20;
+	pixel_y = -12
+	},
+/turf/open/floor/plasteel/patterned/brushed,
+/area/ship/bridge)
 "wh" = (
 /obj/machinery/power/shieldwallgen/atmos/roundstart{
 	dir = 4;
@@ -2233,6 +2691,10 @@
 /obj/effect/turf_decal/siding/yellow{
 	dir = 6
 	},
+/obj/structure/railing{
+	dir = 4;
+	layer = 4.1
+	},
 /turf/open/floor/plasteel/dark,
 /area/ship/hallway/port)
 "wq" = (
@@ -2242,31 +2704,34 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 9
 	},
-/obj/effect/turf_decal/corner/opaque/brown/mono,
-/obj/effect/turf_decal/industrial/warning,
-/turf/open/floor/plasteel/dark,
-/area/ship/storage)
-"ww" = (
-/obj/effect/turf_decal/industrial/warning{
-	dir = 1
-	},
-/obj/effect/turf_decal/industrial/stand_clear{
-	dir = 1
-	},
+/obj/effect/turf_decal/corner/opaque/vired/half,
 /turf/open/floor/plasteel/tech,
-/area/ship/cargo)
+/area/ship/storage/equip)
+"ww" = (
+/obj/machinery/light/dim/directional/west,
+/obj/structure/chair/handrail,
+/turf/open/floor/engine/hull,
+/area/ship/external)
 "wC" = (
 /obj/effect/turf_decal/steeldecal/steel_decals6,
-/obj/effect/turf_decal/borderfloorblack{
-	dir = 6
+/obj/machinery/telecomms/receiver/preset_right{
+	autolinkers = list("receiverB","hub");
+	freq_listening = list(1353,1447,1459);
+	network = "nt_commnet"
+	},
+/obj/effect/turf_decal/techfloor{
+	dir = 8
+	},
+/turf/open/floor/circuit/telecomms{
+	initial_gas_mix = "TEMP=2.7"
 	},
-/turf/open/floor/plasteel/tech/airless,
 /area/ship/engineering/communications)
 "wE" = (
 /obj/machinery/button/door{
 	pixel_y = 21;
 	name = "Blast Doors";
-	id = "Ranger_Port_Blasts"
+	id = "Ranger_Port_Blasts";
+	req_ship_access = 1
 	},
 /obj/machinery/button/shieldwallgen{
 	pixel_y = 20;
@@ -2286,23 +2751,8 @@
 /turf/open/floor/plasteel/white,
 /area/ship/hallway/starboard)
 "wU" = (
-/obj/machinery/light_switch{
-	dir = 8;
-	pixel_x = 19;
-	pixel_y = 8
-	},
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
-	dir = 1
-	},
 /obj/effect/turf_decal/corner/opaque/orange/full,
-/obj/effect/turf_decal/siding/yellow{
-	dir = 6
-	},
-/obj/structure/railing{
-	dir = 2;
-	layer = 4.1
-	},
-/turf/open/floor/plasteel/tech,
+/turf/closed/wall/r_wall,
 /area/ship/engineering)
 "xj" = (
 /obj/structure/cable{
@@ -2317,19 +2767,35 @@
 /turf/open/floor/plasteel/white,
 /area/ship/hallway/starboard)
 "xp" = (
-/obj/machinery/airalarm/directional/west,
-/obj/machinery/firealarm/directional/north,
-/turf/open/floor/wood,
-/area/ship/medical)
+/obj/structure/table/reinforced{
+	color = "#c1b6a5"
+	},
+/obj/item/clipboard{
+	pixel_y = -2;
+	pixel_x = 3
+	},
+/obj/item/pen{
+	pixel_x = 2;
+	pixel_y = -1
+	},
+/obj/item/lighter/greyscale{
+	pixel_x = -3;
+	pixel_y = -10
+	},
+/obj/machinery/computer/helm/viewscreen/directional/south,
+/turf/open/floor/plasteel/patterned/brushed,
+/area/ship/bridge)
 "xq" = (
 /obj/effect/turf_decal/industrial/warning,
 /turf/open/floor/plating,
 /area/ship/engineering)
 "xv" = (
-/obj/machinery/recharge_station,
-/obj/machinery/light/dim/directional/east,
-/turf/open/floor/plasteel/white,
-/area/ship/crew/toilet)
+/obj/structure/curtain/bounty,
+/obj/machinery/shower{
+	dir = 1
+	},
+/turf/open/floor/plating/catwalk_floor,
+/area/ship/security)
 "xw" = (
 /obj/structure/table/wood,
 /obj/machinery/microwave,
@@ -2360,23 +2826,23 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 4
 	},
-/turf/open/floor/plating,
+/obj/effect/turf_decal/steeldecal/steel_decals10{
+	dir = 8
+	},
+/obj/effect/turf_decal/steeldecal/steel_decals10{
+	dir = 1
+	},
+/turf/open/floor/plasteel/tech,
 /area/ship/maintenance/port)
 "xK" = (
 /obj/structure/table/reinforced{
 	color = "#c1b6a5"
 	},
-/obj/item/folder/blue{
-	pixel_x = -6
-	},
-/obj/item/folder/red{
-	pixel_y = 2
-	},
-/obj/item/folder{
-	pixel_y = 5;
-	pixel_x = 7
+/obj/effect/turf_decal/techfloor{
+	dir = 4
 	},
-/turf/open/floor/plasteel/dark,
+/obj/item/binoculars,
+/turf/open/floor/plasteel/telecomms_floor,
 /area/ship/bridge)
 "yi" = (
 /obj/effect/turf_decal/industrial/warning,
@@ -2389,9 +2855,10 @@
 /obj/machinery/button/door{
 	dir = 8;
 	pixel_x = 22;
-	name = "Blast Doors";
+	name = "Access Blast Doors";
 	id = "Ranger_AI_Core_Blasts";
-	pixel_y = 1
+	pixel_y = 1;
+	req_access_txt = "10"
 	},
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -2401,8 +2868,22 @@
 	},
 /turf/open/floor/plating,
 /area/ship/engineering)
+"yk" = (
+/obj/machinery/computer/helm/viewscreen/directional/south,
+/obj/machinery/computer/secure_data{
+	dir = 8
+	},
+/obj/structure/filingcabinet{
+	pixel_x = 10;
+	density = 0
+	},
+/turf/open/floor/mineral/plastitanium/red/brig,
+/area/ship/security)
 "ym" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
+/obj/effect/turf_decal/techfloor{
+	dir = 1
+	},
 /turf/open/floor/plasteel/dark,
 /area/ship/crew/cryo)
 "yo" = (
@@ -2419,6 +2900,9 @@
 	id = "Nanotrasen Communications Hub";
 	autolinkers = list("hub","bus","relay","messaging","nanotrasen","broadcasterB","receiverB")
 	},
+/obj/effect/turf_decal/techfloor{
+	dir = 1
+	},
 /turf/open/floor/circuit/telecomms{
 	initial_gas_mix = "TEMP=2.7"
 	},
@@ -2427,37 +2911,46 @@
 /obj/structure/toilet{
 	dir = 1
 	},
+/obj/structure/curtain/bounty,
 /turf/open/floor/plastic,
 /area/ship/crew/toilet)
-"yK" = (
-/obj/item/soap/nanotrasen,
-/obj/structure/window/reinforced/tinted/frosted{
-	dir = 4
-	},
+"yG" = (
+/obj/effect/turf_decal/corner/opaque/ntblue/half{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/structure/chair/handrail{
+	dir = 4
+	},
 /turf/open/floor/plasteel/white,
-/area/ship/crew/toilet)
+/area/ship/hallway/central)
+"yK" = (
+/obj/machinery/camera/autoname{
+	dir = 9
+	},
+/obj/machinery/light/floor,
+/turf/open/floor/engine/hull,
+/area/ship/external)
 "yU" = (
 /obj/structure/table/reinforced,
-/obj/item/storage/belt/utility,
-/obj/item/t_scanner{
-	pixel_x = 7;
-	pixel_y = 4
-	},
-/obj/item/weldingtool{
-	pixel_x = -6
-	},
-/obj/item/stack/cable_coil/random,
-/obj/item/multitool,
+/obj/machinery/computer/helm/viewscreen/directional/south,
 /turf/open/floor/plasteel/mono/dark,
 /area/ship/engineering)
 "yZ" = (
-/obj/structure/reagent_dispensers/watertank,
 /obj/machinery/power/apc/auto_name/directional/south,
 /obj/structure/cable{
 	icon_state = "0-9"
 	},
+/obj/machinery/suit_storage_unit/inherit{
+	name = "Medical Specialist's Storage Unit"
+	},
+/obj/item/clothing/suit/space/hardsuit/ert/lp/med,
+/obj/item/clothing/mask/breath,
+/obj/item/tank/internals/oxygen,
+/obj/effect/turf_decal/industrial/outline/blue,
 /turf/open/floor/plasteel/tech,
-/area/ship/storage)
+/area/ship/storage/equip)
 "zc" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -2488,17 +2981,18 @@
 /turf/open/floor/plasteel/white,
 /area/ship/hallway/central)
 "zB" = (
-/obj/machinery/camera/autoname{
-	dir = 1
+/obj/effect/turf_decal/trimline/opaque/nsorange/line,
+/obj/structure/railing/corner{
+	dir = 8
 	},
-/obj/machinery/door/window{
-	dir = 4
+/obj/effect/turf_decal/siding/thinplating/dark/corner{
+	dir = 8
 	},
-/obj/machinery/door/firedoor/border_only{
-	dir = 4
+/obj/structure/chair/office{
+	dir = 8
 	},
-/turf/open/floor/circuit/green/airless,
-/area/ship/engineering/communications)
+/turf/open/floor/plasteel/white,
+/area/ship/cargo)
 "zC" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -2509,34 +3003,47 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 4
 	},
-/obj/machinery/door/poddoor/shutters{
-	dir = 8;
-	name = "Cargo Bay";
-	id = "Ranger_Cargo_Door"
-	},
 /obj/machinery/door/firedoor/border_only{
 	dir = 8
 	},
 /obj/machinery/door/firedoor/border_only{
 	dir = 4
 	},
-/turf/open/floor/plasteel/tech,
+/obj/effect/turf_decal/trimline/opaque/nsorange/line{
+	dir = 9
+	},
+/obj/machinery/door/poddoor/shutters{
+	dir = 8;
+	name = "Cargo Bay";
+	id = "Ranger_Cargo_Door"
+	},
+/turf/open/floor/plasteel/white,
 /area/ship/cargo)
 "zF" = (
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
+/obj/structure/chair/handrail{
+	dir = 1
+	},
 /turf/open/floor/plasteel/white,
 /area/ship/hallway/starboard)
 "zW" = (
 /turf/template_noop,
 /area/template_noop)
+"Ab" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/turf/open/floor/plasteel/tech,
+/area/ship/security)
 "Ao" = (
 /obj/structure/cable{
 	icon_state = "2-4"
 	},
 /turf/open/floor/wood,
-/area/ship/crew/dorm)
+/area/ship/crew/dorm/captain)
 "Av" = (
 /obj/structure/table/wood,
 /obj/item/toy/cards/deck{
@@ -2550,19 +3057,46 @@
 /area/ship/medical)
 "AF" = (
 /obj/structure/chair/comfy/shuttle{
-	dir = 4
+	dir = 4;
+	name = "Operations Monitoring"
 	},
 /obj/machinery/light/dim/directional/north,
-/turf/open/floor/plasteel/dark,
+/obj/effect/turf_decal/techfloor{
+	dir = 1
+	},
+/obj/machinery/button/door{
+	pixel_y = 19;
+	pixel_x = 24;
+	name = "Starboard Corridor Shutters";
+	id = "RangerStarboardShutters"
+	},
+/obj/machinery/button/door{
+	pixel_y = 27;
+	pixel_x = 24;
+	name = "Port Corridor Shutters";
+	id = "RangerPortShutters"
+	},
+/turf/open/floor/plasteel/telecomms_floor,
 /area/ship/bridge)
 "AH" = (
-/obj/effect/turf_decal/borderfloorblack/corner{
-	dir = 8
-	},
 /obj/effect/turf_decal/steeldecal/steel_decals7{
 	dir = 1
 	},
-/turf/open/floor/plasteel/tech/airless,
+/obj/effect/turf_decal/techfloor,
+/obj/effect/turf_decal/techfloor{
+	dir = 1
+	},
+/obj/machinery/camera/autoname{
+	dir = 5
+	},
+/obj/machinery/button/door{
+	dir = 4;
+	pixel_x = -26;
+	id = "AiCore";
+	name = "Core Access";
+	req_access_txt = "20"
+	},
+/turf/open/floor/plasteel/tech,
 /area/ship/engineering/communications)
 "AP" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
@@ -2579,24 +3113,38 @@
 "AT" = (
 /obj/effect/turf_decal/industrial/outline/blue,
 /obj/structure/reagent_dispensers/fueltank,
-/turf/open/floor/plating,
+/obj/structure/railing{
+	dir = 8
+	},
+/obj/machinery/camera/autoname{
+	dir = 1
+	},
+/turf/open/floor/plasteel/tech,
 /area/ship/maintenance/port)
 "AZ" = (
 /obj/machinery/airalarm/directional/west,
 /turf/open/floor/wood,
 /area/ship/security)
 "Be" = (
-/obj/structure/reagent_dispensers/fueltank,
 /obj/machinery/light/dim/directional/south,
 /obj/machinery/button/door{
 	dir = 4;
 	id = "Ranger_FireFighting_Shut";
-	name = "Shutters";
+	name = "Ready Room";
 	pixel_x = -22;
-	pixel_y = 6
+	pixel_y = 6;
+	req_one_access_txt = list(50, 10, 5, 1, 20);
+	req_ship_access = 1
+	},
+/obj/item/clothing/suit/space/hardsuit/ert/lp/sec,
+/obj/machinery/suit_storage_unit/inherit{
+	name = "Security Specialist's Storage Unit"
 	},
+/obj/item/clothing/mask/breath,
+/obj/item/tank/internals/oxygen/red,
+/obj/effect/turf_decal/industrial/outline/red,
 /turf/open/floor/plasteel/tech,
-/area/ship/storage)
+/area/ship/storage/equip)
 "Bg" = (
 /obj/machinery/power/shieldwallgen/atmos/roundstart{
 	dir = 8;
@@ -2615,6 +3163,12 @@
 /turf/open/floor/plasteel,
 /area/ship/hallway/starboard)
 "Bh" = (
+/obj/machinery/door/window/survival_pod{
+	dir = 1;
+	opacity = 1;
+	req_one_access_txt = "10";
+	name = "Engineering Specialist's Quarters"
+	},
 /turf/open/floor/plasteel/stairs/wood,
 /area/ship/engineering)
 "Bl" = (
@@ -2624,13 +3178,13 @@
 /obj/effect/turf_decal/trimline/opaque/orange/arrow_ccw{
 	dir = 8
 	},
+/obj/structure/chair/handrail{
+	dir = 8
+	},
 /turf/open/floor/plasteel/white,
 /area/ship/hallway/starboard)
 "Bo" = (
 /obj/effect/turf_decal/steeldecal/steel_decals4,
-/obj/effect/turf_decal/borderfloorblack{
-	dir = 4
-	},
 /obj/effect/turf_decal/steeldecal/steel_decals7{
 	dir = 1
 	},
@@ -2640,18 +3194,26 @@
 /obj/effect/turf_decal/steeldecal/steel_decals6{
 	dir = 8
 	},
-/turf/open/floor/plasteel/tech/airless,
+/obj/effect/turf_decal/trimline/opaque/yellow/filled/warning,
+/obj/effect/turf_decal/spline/fancy/opaque/black{
+	dir = 6
+	},
+/turf/open/floor/plasteel/telecomms_floor,
 /area/ship/engineering/communications)
 "BA" = (
 /obj/machinery/shower{
 	dir = 1
 	},
-/obj/structure/curtain,
 /obj/item/bikehorn/rubberducky,
+/obj/item/soap/nanotrasen,
+/obj/machinery/light/small/directional/east,
 /turf/open/floor/plasteel/white,
 /area/ship/crew/toilet)
 "BI" = (
-/obj/machinery/door/airlock/wood,
+/obj/machinery/door/airlock/wood{
+	name = "Showers";
+	req_ship_access = 0
+	},
 /turf/open/floor/plasteel/white,
 /area/ship/crew/toilet)
 "BO" = (
@@ -2661,13 +3223,14 @@
 /obj/machinery/door/window/northleft{
 	dir = 4
 	},
-/obj/machinery/door/poddoor/shutters{
-	dir = 4;
-	id = "Ranger_SB_maint_shut"
-	},
 /obj/structure/cable/yellow{
 	icon_state = "0-8"
 	},
+/obj/machinery/door/poddoor/shutters{
+	dir = 4;
+	id = "Ranger_SB_maint_shut";
+	name = "Engine Shutters"
+	},
 /turf/open/floor/plating,
 /area/ship/maintenance/starboard)
 "BX" = (
@@ -2676,7 +3239,6 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/structure/closet/firecloset/wall/directional/west,
 /turf/open/floor/plasteel/white,
 /area/ship/hallway/central)
 "BY" = (
@@ -2706,6 +3268,9 @@
 /obj/effect/turf_decal/siding/yellow{
 	dir = 1
 	},
+/obj/effect/turf_decal/siding/yellow/corner{
+	dir = 8
+	},
 /turf/open/floor/plasteel/tech,
 /area/ship/engineering)
 "Cb" = (
@@ -2716,6 +3281,8 @@
 	dir = 6
 	},
 /obj/machinery/light/dim/directional/west,
+/obj/effect/turf_decal/industrial/hatch/blue,
+/obj/structure/bed/roller,
 /turf/open/floor/plasteel/white,
 /area/ship/hallway/port)
 "Cg" = (
@@ -2731,30 +3298,37 @@
 "Cq" = (
 /obj/machinery/power/apc/auto_name/directional/south,
 /obj/structure/cable,
-/turf/open/floor/circuit/green/airless,
+/obj/machinery/blackbox_recorder,
+/obj/effect/turf_decal/techfloor{
+	dir = 1
+	},
+/turf/open/floor/circuit/telecomms{
+	initial_gas_mix = "TEMP=2.7"
+	},
 /area/ship/engineering/communications)
 "Ct" = (
-/obj/structure/table/greyscale,
 /obj/machinery/light/dim/directional/east,
-/obj/effect/turf_decal/siding/blue{
-	dir = 6
+/obj/effect/turf_decal/industrial/warning{
+	dir = 10
 	},
-/obj/item/roller{
-	pixel_x = 5;
-	pixel_y = 12
+/obj/effect/turf_decal/siding/thinplating/light{
+	dir = 10
 	},
-/obj/item/roller{
-	pixel_x = -3;
-	pixel_y = 7
+/obj/effect/turf_decal/borderfloorwhite/corner{
+	dir = 4
+	},
+/obj/machinery/shower{
+	dir = 8;
+	pixel_y = 2
 	},
 /turf/open/floor/plasteel/white,
 /area/ship/medical)
 "CB" = (
-/obj/effect/turf_decal/borderfloorblack{
-	dir = 8
+/obj/effect/turf_decal/trimline/opaque/yellow/filled/warning,
+/obj/effect/turf_decal/spline/fancy/opaque/black{
+	dir = 10
 	},
-/obj/effect/turf_decal/techfloor/hole/right,
-/turf/open/floor/plasteel/tech/airless,
+/turf/open/floor/plasteel/telecomms_floor,
 /area/ship/engineering/communications)
 "CD" = (
 /obj/effect/turf_decal/corner/opaque/orange/border{
@@ -2766,6 +3340,7 @@
 /obj/effect/turf_decal/industrial/warning{
 	dir = 1
 	},
+/obj/machinery/computer/helm/viewscreen/directional/east,
 /turf/open/floor/plasteel/white,
 /area/ship/hallway/starboard)
 "CG" = (
@@ -2812,9 +3387,15 @@
 	},
 /turf/open/floor/engine/hull,
 /area/ship/external)
+"CV" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 9
+	},
+/turf/closed/wall/r_wall,
+/area/ship/hallway/central)
 "Dd" = (
-/obj/machinery/portable_atmospherics/canister/air,
 /obj/effect/turf_decal/industrial/outline/orange,
+/obj/machinery/portable_atmospherics/canister/nitrogen,
 /turf/open/floor/plasteel/tech,
 /area/ship/maintenance/starboard)
 "Dr" = (
@@ -2824,7 +3405,8 @@
 	},
 /obj/machinery/door/poddoor{
 	dir = 2;
-	id = "Ranger_AI_Core_Blasts"
+	id = "Ranger_AI_Core_Blasts";
+	name = "Communications Access"
 	},
 /obj/structure/cable,
 /obj/machinery/door/firedoor/border_only,
@@ -2837,7 +3419,6 @@
 /obj/machinery/camera/autoname{
 	dir = 6
 	},
-/obj/effect/turf_decal/borderfloorblack/corner,
 /obj/effect/turf_decal/steeldecal/steel_decals7{
 	dir = 1
 	},
@@ -2847,22 +3428,85 @@
 /obj/effect/turf_decal/steeldecal/steel_decals6{
 	dir = 8
 	},
-/turf/open/floor/plasteel/tech/airless,
+/obj/effect/turf_decal/trimline/opaque/yellow/filled/warning{
+	dir = 1
+	},
+/obj/effect/turf_decal/spline/fancy/opaque/black{
+	dir = 5
+	},
+/turf/open/floor/plasteel/telecomms_floor,
 /area/ship/engineering/communications)
 "Dx" = (
-/turf/open/floor/plasteel/dark,
+/obj/structure/table/wood/reinforced,
+/obj/machinery/recharger{
+	pixel_x = 6;
+	pixel_y = -3
+	},
+/obj/machinery/button/door{
+	id = "SecureCell";
+	normaldoorcontrol = 1;
+	pixel_x = 7;
+	pixel_y = 10;
+	specialfunctions = 4;
+	req_access_txt = "1";
+	req_ship_access = 1;
+	name = "Cell Bolt Controls"
+	},
+/turf/open/floor/mineral/plastitanium/red/brig,
 /area/ship/security)
 "DE" = (
-/obj/item/storage/box/metalfoam,
-/obj/item/watertank/atmos,
-/obj/structure/rack,
-/obj/effect/turf_decal/corner/opaque/brown/mono,
 /obj/machinery/firealarm/directional/east,
-/obj/effect/turf_decal/industrial/warning{
-	dir = 1
+/obj/machinery/recharger{
+	dir = 4;
+	pixel_x = -8
 	},
-/turf/open/floor/plasteel/dark,
-/area/ship/storage)
+/obj/machinery/cell_charger{
+	dir = 4;
+	pixel_x = 7
+	},
+/obj/structure/table/reinforced,
+/obj/item/stack/marker_beacon/thirty{
+	icon_state = "markerrandom";
+	pixel_x = -9;
+	pixel_y = 13;
+	amount = 100
+	},
+/obj/item/stack/marker_beacon/thirty{
+	icon_state = "markerrandom";
+	pixel_x = 11;
+	pixel_y = 13;
+	amount = 100
+	},
+/obj/item/stack/marker_beacon/thirty{
+	icon_state = "markerrandom";
+	pixel_x = 5;
+	pixel_y = 13;
+	amount = 100
+	},
+/obj/item/stack/marker_beacon/thirty{
+	icon_state = "markerrandom";
+	pixel_x = -2;
+	pixel_y = 13;
+	amount = 100
+	},
+/obj/effect/turf_decal/corner/opaque/vired/three_quarters{
+	dir = 8
+	},
+/obj/item/stock_parts/cell/gun,
+/turf/open/floor/plasteel/tech,
+/area/ship/storage/equip)
+"DQ" = (
+/obj/effect/turf_decal/corner/opaque/ntblue/half{
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+	dir = 8
+	},
+/turf/open/floor/plasteel/white,
+/area/ship/hallway/central)
 "DW" = (
 /obj/structure/cable/cyan{
 	icon_state = "0-4"
@@ -2880,20 +3524,115 @@
 	pixel_x = -20;
 	name = "Cargo Bay Shutters";
 	id = "Ranger_Cargo_Door";
-	pixel_y = 1
+	pixel_y = 1;
+	req_ship_access = 1
 	},
+/obj/structure/closet/crate/secure/loot,
+/obj/machinery/airalarm/directional/north,
 /turf/open/floor/plasteel/tech,
 /area/ship/cargo)
 "Ek" = (
 /obj/machinery/computer/telecomms/server,
-/turf/open/floor/plasteel/dark,
+/obj/structure/window/reinforced/survival_pod{
+	dir = 8
+	},
+/obj/effect/turf_decal/techfloor{
+	dir = 9
+	},
+/turf/open/floor/plasteel/telecomms_floor,
 /area/ship/bridge)
+"Ep" = (
+/obj/effect/turf_decal/spline/fancy/opaque/black{
+	dir = 10
+	},
+/obj/effect/turf_decal/trimline/opaque/yellow/filled/warning{
+	dir = 8
+	},
+/turf/open/floor/plasteel/telecomms_floor,
+/area/ship/engineering/communications)
 "Eq" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
 	dir = 1
 	},
-/turf/open/floor/plasteel/tech,
+/obj/effect/turf_decal/trimline/opaque/nsorange/warning,
+/obj/effect/turf_decal/siding{
+	color = "#474747"
+	},
+/turf/open/floor/plasteel/white,
 /area/ship/cargo)
+"EA" = (
+/obj/structure/closet/crate/secure/plasma{
+	name = "Relay Parts Crate"
+	},
+/obj/item/storage/box/stockparts/basic,
+/obj/item/circuitboard/machine/telecomms/relay{
+	pixel_x = -5;
+	pixel_y = 9
+	},
+/obj/item/circuitboard/machine/telecomms/relay{
+	pixel_x = -5;
+	pixel_y = 9
+	},
+/obj/item/circuitboard/machine/telecomms/relay{
+	pixel_x = -5;
+	pixel_y = 9
+	},
+/obj/item/encryptionkey/nanotrasen{
+	pixel_x = -1
+	},
+/obj/item/encryptionkey/nanotrasen{
+	pixel_x = 3
+	},
+/obj/item/encryptionkey/nanotrasen{
+	pixel_x = 7
+	},
+/obj/item/stack/cable_coil/cyan{
+	pixel_x = 6
+	},
+/obj/item/stock_parts/subspace/filter{
+	pixel_x = -8
+	},
+/obj/item/stock_parts/subspace/filter{
+	pixel_x = -8
+	},
+/obj/item/stock_parts/subspace/filter{
+	pixel_x = -8
+	},
+/obj/item/stock_parts/subspace/filter{
+	pixel_x = -8
+	},
+/obj/item/stock_parts/subspace/filter{
+	pixel_x = -8
+	},
+/obj/item/stock_parts/subspace/filter{
+	pixel_x = -8
+	},
+/obj/item/stock_parts/manipulator{
+	pixel_x = 7;
+	pixel_y = 7
+	},
+/obj/item/stock_parts/manipulator{
+	pixel_x = 7;
+	pixel_y = 7
+	},
+/obj/item/stock_parts/manipulator{
+	pixel_x = 7;
+	pixel_y = 7
+	},
+/obj/item/stock_parts/manipulator{
+	pixel_x = 7;
+	pixel_y = 7
+	},
+/obj/item/stock_parts/manipulator{
+	pixel_x = 7;
+	pixel_y = 7
+	},
+/obj/item/stock_parts/manipulator{
+	pixel_x = 7;
+	pixel_y = 7
+	},
+/turf/open/floor/plating,
+/area/ship/engineering)
 "EL" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /obj/machinery/door/firedoor/border_only{
@@ -2918,15 +3657,11 @@
 /turf/open/floor/plasteel/white,
 /area/ship/hallway/starboard)
 "Fg" = (
-/obj/machinery/suit_storage_unit/inherit,
-/obj/item/clothing/suit/space/hardsuit/ert/lp,
-/obj/item/clothing/mask/breath,
-/obj/item/tank/internals/emergency_oxygen,
-/obj/effect/turf_decal/siding/wood/end{
+/obj/effect/turf_decal/trimline/opaque/nsorange/corner{
 	dir = 4
 	},
-/turf/open/floor/wood,
-/area/ship/crew/dorm)
+/turf/open/floor/plasteel/white,
+/area/ship/cargo)
 "Fh" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
 	dir = 9
@@ -2940,6 +3675,11 @@
 /obj/machinery/door/firedoor/border_only{
 	dir = 8
 	},
+/obj/machinery/door/poddoor{
+	dir = 4;
+	id = "Ranger_Cycler_Shutters";
+	name = "Air Cycler Lockdown"
+	},
 /turf/open/floor/plasteel/dark,
 /area/ship/hallway/central)
 "Fw" = (
@@ -2952,7 +3692,10 @@
 /obj/machinery/door/firedoor/border_only{
 	dir = 1
 	},
-/obj/machinery/door/airlock/wood,
+/obj/machinery/door/airlock/wood{
+	name = "Restroom";
+	req_ship_access = 0
+	},
 /turf/open/floor/plasteel/white,
 /area/ship/crew/toilet)
 "Fx" = (
@@ -2978,14 +3721,18 @@
 	dir = 4
 	},
 /obj/effect/turf_decal/corner/opaque/orange/full,
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
-	dir = 1
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
 	},
-/obj/effect/turf_decal/siding/yellow{
-	dir = 5
+/obj/machinery/door/firedoor/border_only{
+	dir = 8
 	},
-/obj/structure/cable{
-	icon_state = "1-4"
+/obj/machinery/door/airlock/engineering{
+	dir = 4;
+	name = "Engineering Sector"
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 4
 	},
 /turf/open/floor/plasteel/tech,
 /area/ship/engineering)
@@ -3000,7 +3747,7 @@
 	dir = 4
 	},
 /obj/machinery/airalarm/directional/south,
-/turf/open/floor/plating,
+/turf/open/floor/plasteel/tech,
 /area/ship/maintenance/starboard)
 "Gc" = (
 /obj/structure/closet/cabinet,
@@ -3017,15 +3764,19 @@
 	dir = 9
 	},
 /obj/machinery/light/dim/directional/north,
+/obj/item/storage/backpack/ert,
+/obj/machinery/camera/autoname{
+	dir = 5
+	},
 /turf/open/floor/wood,
-/area/ship/crew/dorm)
+/area/ship/crew/dorm/captain)
 "Ge" = (
 /obj/structure/cable{
 	icon_state = "0-8"
 	},
 /obj/machinery/power/port_gen/pacman,
-/obj/item/stack/sheet/mineral/plasma/twenty,
 /obj/effect/turf_decal/industrial/outline/orange,
+/obj/item/stack/sheet/mineral/plasma/twenty,
 /turf/open/floor/plating,
 /area/ship/engineering)
 "Gh" = (
@@ -3051,7 +3802,6 @@
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
 	dir = 8
 	},
-/obj/structure/closet/emcloset/wall/directional/west,
 /turf/open/floor/plasteel/white,
 /area/ship/hallway/central)
 "Gn" = (
@@ -3063,6 +3813,14 @@
 /obj/item/toy/plush/moth/snow{
 	pixel_x = -3
 	},
+/obj/item/folder/blue{
+	pixel_x = -3;
+	pixel_y = -10
+	},
+/obj/item/flashlight/pen{
+	pixel_x = -5;
+	pixel_y = -9
+	},
 /turf/open/floor/wood,
 /area/ship/medical)
 "Gz" = (
@@ -3075,21 +3833,30 @@
 /obj/effect/turf_decal/steeldecal/steel_decals7{
 	dir = 4
 	},
-/turf/open/floor/plasteel/tech/airless,
+/turf/open/floor/plasteel/tech,
 /area/ship/engineering/communications)
 "GC" = (
+/obj/effect/turf_decal/corner/opaque/blue/diagonal,
+/obj/structure/window/reinforced/spawner,
 /obj/structure/window/reinforced/spawner{
-	dir = 4
+	dir = 8
 	},
-/obj/effect/turf_decal/siding/blue{
+/obj/structure/cable{
+	icon_state = "6-8"
+	},
+/obj/effect/turf_decal/borderfloorwhite/corner{
 	dir = 4
 	},
 /turf/open/floor/plasteel/white,
 /area/ship/medical)
 "GE" = (
-/obj/effect/turf_decal/corner/opaque/blue/diagonal,
-/obj/structure/bed,
-/obj/item/bedsheet/medical,
+/obj/structure/table/optable,
+/obj/structure/extinguisher_cabinet/directional/north,
+/obj/machinery/shower{
+	layer = 2.4;
+	name = "Emergency Coolant Sprayer"
+	},
+/obj/effect/turf_decal/borderfloorwhite/full,
 /turf/open/floor/plasteel/white,
 /area/ship/medical)
 "GG" = (
@@ -3110,11 +3877,14 @@
 	},
 /obj/effect/turf_decal/siding/wood,
 /obj/item/radio/intercom/directional/south,
+/obj/item/bedsheet/orange,
+/obj/structure/bed,
+/obj/machinery/camera/autoname{
+	dir = 8
+	},
 /turf/open/floor/wood,
 /area/ship/engineering)
 "Ha" = (
-/obj/structure/closet/secure_closet/lp/lieutenant,
-/obj/item/stock_parts/cell/gun,
 /obj/item/melee/classic_baton/telescopic,
 /obj/item/kitchen/knife/combat/survival,
 /obj/item/gps,
@@ -3127,25 +3897,23 @@
 	pixel_x = 7;
 	pixel_y = -20
 	},
-/obj/item/ammo_box/c9mm,
-/obj/item/ammo_box/c9mm,
-/obj/item/ammo_box/c9mm/rubbershot,
-/obj/item/ammo_box/magazine/co9mm,
-/obj/item/storage/pistolcase/commander,
 /obj/item/storage/pistolcase/egun,
+/obj/item/megaphone/command,
+/obj/structure/closet/secure_closet/lp/lieutenant,
 /turf/open/floor/wood,
-/area/ship/crew/dorm)
-"Hd" = (
-/obj/structure/grille,
-/obj/structure/window/reinforced/fulltile,
-/obj/machinery/door/poddoor/shutters{
-	id = "Engineering_Specialist_Shutters";
-	dir = 4
-	},
+/area/ship/crew/dorm/captain)
+"Hd" = (
+/obj/structure/grille,
 /obj/structure/cable{
 	icon_state = "5-8"
 	},
 /obj/machinery/door/firedoor/window,
+/obj/structure/window/reinforced/fulltile,
+/obj/machinery/door/poddoor/shutters{
+	id = "Engineering_Specialist_Shutters";
+	dir = 4;
+	name = "Communications Shutters"
+	},
 /turf/open/floor/plating,
 /area/ship/engineering)
 "Hs" = (
@@ -3156,10 +3924,13 @@
 	dir = 4
 	},
 /obj/effect/turf_decal/corner/opaque/orange/full,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 4
+/obj/effect/turf_decal/siding/yellow{
+	dir = 1
 	},
 /obj/effect/turf_decal/siding/yellow{
+	dir = 5
+	},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
 	dir = 1
 	},
 /turf/open/floor/plasteel/tech,
@@ -3175,6 +3946,9 @@
 	dir = 4
 	},
 /obj/effect/turf_decal/industrial/warning,
+/obj/structure/chair/handrail{
+	dir = 8
+	},
 /turf/open/floor/plasteel/white,
 /area/ship/hallway/port)
 "HA" = (
@@ -3206,7 +3980,22 @@
 	dir = 4;
 	pixel_x = -21;
 	name = "Shutters";
-	id = "Ranger_Port_maint_shut"
+	id = "Ranger_Port_maint_shut";
+	req_ship_access = 1
+	},
+/obj/structure/table/rolling,
+/obj/item/chair/plastic,
+/obj/item/chair/plastic{
+	pixel_y = 4
+	},
+/obj/item/chair/plastic{
+	pixel_y = 6
+	},
+/obj/item/chair/plastic{
+	pixel_y = 10
+	},
+/obj/item/chair/plastic{
+	pixel_y = 14
 	},
 /turf/open/floor/plating,
 /area/ship/maintenance/port)
@@ -3235,11 +4024,26 @@
 /obj/structure/cable{
 	icon_state = "0-10"
 	},
+/obj/structure/closet/secure_closet{
+	icon_state = "qm";
+	name = "Logistics Specialist's Locker";
+	req_ship_access = 1;
+	req_one_access = list(50)
+	},
+/obj/item/clothing/suit/hooded/wintercoat/cargo,
+/obj/item/clothing/shoes/sneakers/brown,
+/obj/item/storage/backpack/satchel/leather,
+/obj/item/stack/packageWrap,
+/obj/item/stack/packageWrap,
+/obj/item/clothing/under/nanotrasen/supply/qm,
+/obj/item/stack/packageWrap,
 /turf/open/floor/plasteel/tech,
 /area/ship/cargo)
 "IC" = (
 /obj/effect/turf_decal/corner/opaque/orange/full,
-/obj/machinery/door/airlock/engineering/glass,
+/obj/machinery/door/airlock/engineering/glass{
+	name = "Electrical Bay"
+	},
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
@@ -3253,7 +4057,13 @@
 /area/ship/engineering)
 "IE" = (
 /obj/machinery/light/floor,
-/turf/open/floor/circuit/green/airless,
+/obj/effect/turf_decal/spline/fancy/opaque/black{
+	dir = 8
+	},
+/obj/effect/turf_decal/trimline/opaque/yellow/filled/warning{
+	dir = 8
+	},
+/turf/open/floor/plasteel/telecomms_floor,
 /area/ship/engineering/communications)
 "IM" = (
 /obj/structure/chair/sofa/brown/directional/west,
@@ -3276,15 +4086,14 @@
 /turf/open/floor/plasteel/white,
 /area/ship/hallway/port)
 "Ji" = (
-/obj/machinery/suit_storage_unit/inherit,
-/obj/item/clothing/suit/space/hardsuit/ert/lp/sec,
-/obj/item/clothing/mask/breath,
-/obj/machinery/light/dim/directional/east,
-/obj/effect/turf_decal/siding/red{
-	dir = 5
+/obj/effect/turf_decal/borderfloorblack,
+/obj/structure/chair/handrail{
+	dir = 4
 	},
-/obj/item/tank/internals/emergency_oxygen,
-/turf/open/floor/mineral/plastitanium/red/brig,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+	dir = 1
+	},
+/turf/open/floor/plasteel/tech,
 /area/ship/security)
 "Js" = (
 /obj/machinery/holopad,
@@ -3292,7 +4101,7 @@
 	dir = 8
 	},
 /obj/effect/turf_decal/siding/red/corner,
-/turf/open/floor/mineral/plastitanium/red/brig,
+/turf/open/floor/plasteel/tech,
 /area/ship/security)
 "Jw" = (
 /obj/structure/cable/cyan{
@@ -3314,10 +4123,31 @@
 	pixel_x = -25
 	},
 /obj/machinery/firealarm/directional/south,
+/obj/structure/table/wood,
+/obj/item/toy/plush/moth/deadhead{
+	pixel_x = -7;
+	layer = 4.3
+	},
+/obj/item/flashlight/lamp/green{
+	pixel_x = 5;
+	pixel_y = 13;
+	layer = 4.2
+	},
+/obj/item/folder/yellow{
+	pixel_y = -4;
+	pixel_x = 4
+	},
+/obj/item/pen/survival{
+	pixel_x = 5;
+	pixel_y = -5
+	},
 /turf/open/floor/wood,
 /area/ship/engineering)
 "JO" = (
-/obj/machinery/door/airlock/command,
+/obj/machinery/door/airlock/command{
+	req_access_txt = "20";
+	name = "Lieutenant's Quarters"
+	},
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
@@ -3326,7 +4156,7 @@
 	},
 /obj/machinery/door/firedoor/border_only,
 /turf/open/floor/wood,
-/area/ship/crew/dorm)
+/area/ship/crew/dorm/captain)
 "JP" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -3347,6 +4177,9 @@
 	dir = 1
 	},
 /obj/effect/turf_decal/corner/opaque/ntblue/three_quarters,
+/obj/structure/chair/handrail{
+	dir = 1
+	},
 /turf/open/floor/plasteel/white,
 /area/ship/hallway/port)
 "Kg" = (
@@ -3360,18 +4193,16 @@
 /turf/open/floor/plating,
 /area/ship/maintenance/port)
 "Kl" = (
-/obj/effect/turf_decal/corner/opaque/ntblue/half{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/machinery/camera/autoname{
-	dir = 5
-	},
-/turf/open/floor/plasteel/white,
+/obj/structure/closet/emcloset/wall/directional/west,
+/turf/open/floor/plasteel/dark,
 /area/ship/hallway/central)
 "Kt" = (
-/obj/machinery/holopad,
+/obj/effect/turf_decal/siding/blue{
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "1-4"
+	},
 /turf/open/floor/plasteel/white,
 /area/ship/medical)
 "Kw" = (
@@ -3380,18 +4211,17 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 9
+	dir = 5
 	},
 /turf/open/floor/plastic,
 /area/ship/crew/toilet)
 "KC" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/effect/turf_decal/corner/opaque/brown/mono,
-/obj/effect/turf_decal/industrial/warning{
+/obj/effect/turf_decal/corner/opaque/vired/half{
 	dir = 1
 	},
-/turf/open/floor/plasteel/dark,
-/area/ship/storage)
+/turf/open/floor/plasteel/tech,
+/area/ship/storage/equip)
 "KQ" = (
 /obj/structure/closet,
 /obj/item/pickaxe,
@@ -3404,6 +4234,10 @@
 /obj/effect/turf_decal/siding/yellow{
 	dir = 4
 	},
+/obj/structure/railing{
+	dir = 4;
+	layer = 4.1
+	},
 /turf/open/floor/plasteel/dark,
 /area/ship/hallway/port)
 "KX" = (
@@ -3426,12 +4260,11 @@
 /turf/open/floor/plasteel/white,
 /area/ship/hallway/starboard)
 "Lg" = (
-/obj/structure/window/reinforced,
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
 	dir = 1
 	},
 /obj/effect/turf_decal/siding/red,
-/turf/open/floor/mineral/plastitanium/red/brig,
+/turf/open/floor/plasteel/tech,
 /area/ship/security)
 "Lk" = (
 /turf/closed/wall/r_wall,
@@ -3440,6 +4273,7 @@
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
 	dir = 1
 	},
+/obj/machinery/airalarm/directional/west,
 /turf/open/floor/plastic,
 /area/ship/crew/toilet)
 "Lu" = (
@@ -3452,28 +4286,26 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 4
 	},
-/obj/effect/turf_decal/trimline/opaque/yellow/filled/line{
+/obj/effect/turf_decal/trimline/opaque/vired/filled/line{
 	dir = 4
 	},
 /turf/open/floor/plasteel/white,
 /area/ship/hallway/port)
 "Lw" = (
-/obj/structure/bed,
-/obj/item/bedsheet/orange,
-/obj/effect/turf_decal/siding/wood{
-	dir = 6
-	},
-/obj/effect/turf_decal/siding/wood/corner{
-	dir = 1
-	},
-/turf/open/floor/wood,
-/area/ship/engineering)
+/obj/effect/turf_decal/industrial/outline/orange,
+/obj/effect/decal/cleanable/plasma,
+/obj/machinery/portable_atmospherics/canister/oxygen,
+/turf/open/floor/plasteel/tech,
+/area/ship/maintenance/starboard)
 "LM" = (
 /obj/machinery/telecomms/processor/preset_four{
 	autolinkers = list("processor4","bus");
 	network = "nt_commnet";
 	id = "Nanotrasen Communications Processor"
 	},
+/obj/effect/turf_decal/techfloor{
+	dir = 4
+	},
 /turf/open/floor/circuit/telecomms{
 	initial_gas_mix = "TEMP=2.7"
 	},
@@ -3501,19 +4333,19 @@
 /turf/closed/wall/r_wall,
 /area/ship/maintenance/port)
 "Ma" = (
-/obj/structure/chair/wood,
 /obj/effect/turf_decal/siding/red{
 	dir = 4
 	},
 /obj/effect/turf_decal/siding/red{
 	dir = 8
 	},
-/turf/open/floor/mineral/plastitanium/red/brig,
+/turf/open/floor/plasteel/tech,
 /area/ship/security)
 "Mc" = (
 /obj/structure/toilet{
 	dir = 1
 	},
+/obj/structure/curtain/bounty,
 /obj/machinery/light/dim/directional/east,
 /turf/open/floor/plastic,
 /area/ship/crew/toilet)
@@ -3521,11 +4353,16 @@
 /obj/structure/AIcore,
 /obj/item/mmi/posibrain,
 /obj/item/circuitboard/aicore,
-/turf/open/floor/circuit/green/airless,
+/obj/effect/turf_decal/techfloor{
+	dir = 4
+	},
+/turf/open/floor/circuit/telecomms{
+	initial_gas_mix = "TEMP=2.7"
+	},
 /area/ship/engineering/communications)
 "Mf" = (
 /turf/closed/wall/r_wall,
-/area/ship/crew/dorm)
+/area/ship/crew/dorm/captain)
 "Mg" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -3567,11 +4404,11 @@
 	dir = 1;
 	pixel_x = 6
 	},
+/obj/effect/turf_decal/steeldecal/steel_decals4,
 /obj/effect/turf_decal/techfloor{
-	dir = 8
+	dir = 10
 	},
-/obj/effect/turf_decal/steeldecal/steel_decals4,
-/turf/open/floor/plasteel/dark,
+/turf/open/floor/plasteel/telecomms_floor,
 /area/ship/bridge)
 "Mt" = (
 /obj/structure/cable{
@@ -3587,6 +4424,9 @@
 /obj/effect/turf_decal/siding/yellow{
 	dir = 1
 	},
+/obj/structure/cable{
+	icon_state = "1-4"
+	},
 /turf/open/floor/plasteel/tech,
 /area/ship/engineering)
 "Mu" = (
@@ -3607,14 +4447,18 @@
 	dir = 5
 	},
 /turf/open/floor/wood,
-/area/ship/crew/dorm)
+/area/ship/crew/dorm/captain)
 "Mx" = (
 /obj/machinery/light_switch{
 	dir = 8;
 	pixel_x = 19;
 	pixel_y = 8
 	},
-/turf/open/floor/plasteel/tech/airless,
+/obj/effect/turf_decal/techfloor,
+/obj/effect/turf_decal/techfloor{
+	dir = 1
+	},
+/turf/open/floor/plasteel/tech,
 /area/ship/engineering/communications)
 "Mz" = (
 /obj/effect/turf_decal/corner/opaque/orange/full,
@@ -3624,15 +4468,12 @@
 /obj/structure/cable{
 	icon_state = "1-4"
 	},
-/obj/effect/turf_decal/siding/yellow{
-	dir = 9
-	},
 /obj/machinery/button/door{
 	dir = 4;
 	pixel_y = 6;
 	pixel_x = -22;
 	id = "Engineering_Specialist_Shutters";
-	name = "Privacy Shutters"
+	name = "Comms Shutters"
 	},
 /obj/machinery/camera/autoname{
 	dir = 5
@@ -3643,12 +4484,20 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 5
 	},
+/obj/effect/turf_decal/siding/yellow/end{
+	dir = 8
+	},
 /turf/open/floor/plasteel/tech,
 /area/ship/engineering)
 "MD" = (
-/obj/item/disk/design_disk/ammo_c9mm,
-/turf/open/floor/plating,
-/area/ship/engineering)
+/obj/effect/turf_decal/trimline/opaque/yellow/filled/warning{
+	dir = 1
+	},
+/obj/effect/turf_decal/spline/fancy/opaque/black{
+	dir = 1
+	},
+/turf/open/floor/plasteel/telecomms_floor,
+/area/ship/engineering/communications)
 "MI" = (
 /obj/machinery/airalarm/directional/north,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
@@ -3670,20 +4519,44 @@
 	},
 /obj/item/wrench,
 /obj/item/stack/cable_coil/cyan,
-/turf/open/floor/circuit/green/airless,
+/obj/item/screwdriver,
+/obj/structure/sign/nanotrasen{
+	pixel_x = 32
+	},
+/obj/effect/turf_decal/techfloor,
+/turf/open/floor/circuit/telecomms{
+	initial_gas_mix = "TEMP=2.7"
+	},
 /area/ship/engineering/communications)
 "ML" = (
 /obj/machinery/light/dim/directional/north,
 /obj/effect/turf_decal/industrial/outline/blue,
 /obj/structure/closet/crate/trashcart/laundry,
-/turf/open/floor/plating,
+/obj/item/clothing/under/nanotrasen,
+/obj/item/clothing/under/nanotrasen,
+/obj/item/clothing/shoes/sneakers/black,
+/obj/item/clothing/shoes/sneakers/black,
+/turf/open/floor/plasteel/tech,
 /area/ship/maintenance/starboard)
+"MR" = (
+/obj/effect/turf_decal/corner/opaque/ntblue/half{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+	dir = 8
+	},
+/turf/open/floor/plasteel/white,
+/area/ship/hallway/central)
 "MW" = (
 /obj/item/radio/intercom/directional/south,
 /obj/machinery/computer/helm{
 	dir = 8
 	},
-/turf/open/floor/plasteel/dark,
+/obj/effect/turf_decal/techfloor{
+	dir = 6
+	},
+/turf/open/floor/plasteel/telecomms_floor,
 /area/ship/bridge)
 "MY" = (
 /obj/effect/turf_decal/corner/opaque/ntblue/border{
@@ -3718,13 +4591,29 @@
 	id = "Ranger_AI_Core_Ext_Blasts"
 	},
 /obj/machinery/light/dim/directional/south,
-/turf/open/floor/circuit/green/airless,
+/obj/machinery/telecomms/message_server/preset{
+	autolinkers = list("messaging","hub");
+	network = "nt_commnet";
+	layer = 3.1
+	},
+/obj/effect/turf_decal/techfloor{
+	dir = 1
+	},
+/turf/open/floor/circuit/telecomms{
+	initial_gas_mix = "TEMP=2.7"
+	},
 /area/ship/engineering/communications)
 "Nn" = (
 /obj/structure/cable{
 	icon_state = "2-4"
 	},
-/turf/open/floor/circuit/green/airless,
+/obj/effect/turf_decal/spline/fancy/opaque/black{
+	dir = 6
+	},
+/obj/effect/turf_decal/trimline/opaque/yellow/filled/warning{
+	dir = 4
+	},
+/turf/open/floor/plasteel/telecomms_floor,
 /area/ship/engineering/communications)
 "Nu" = (
 /obj/machinery/vending/cigarette,
@@ -3743,16 +4632,35 @@
 	},
 /obj/item/clothing/under/rank/engineering/engineer/nt/lp,
 /obj/item/clothing/under/rank/engineering/engineer/nt/skirt/lp,
+/obj/item/storage/backpack/ert/engineer,
+/obj/item/clothing/suit/nanotrasen/vest,
+/obj/structure/window/reinforced/tinted{
+	dir = 1
+	},
+/obj/structure/window/reinforced/tinted{
+	dir = 8
+	},
 /turf/open/floor/wood,
 /area/ship/engineering)
 "NC" = (
 /obj/machinery/camera/autoname{
 	dir = 6
 	},
-/obj/machinery/light/floor,
+/obj/machinery/light/floor{
+	pixel_y = -9
+	},
+/obj/machinery/atmospherics/components/unary/outlet_injector/on/layer4{
+	dir = 8
+	},
 /turf/open/floor/engine/hull,
 /area/ship/external)
 "NM" = (
+/obj/effect/turf_decal/steeldecal/steel_decals10{
+	dir = 1
+	},
+/obj/effect/turf_decal/steeldecal/steel_decals10{
+	dir = 8
+	},
 /turf/open/floor/plasteel/stairs{
 	dir = 4
 	},
@@ -3771,20 +4679,10 @@
 /turf/open/floor/plasteel/white,
 /area/ship/hallway/port)
 "NS" = (
-/obj/structure/railing{
-	dir = 8;
-	layer = 4.1
-	},
-/obj/structure/closet/crate/medical{
-	name = "anesthetics crate"
-	},
-/obj/item/tank/internals/anesthetic,
-/obj/item/tank/internals/anesthetic{
-	pixel_x = 3
-	},
-/obj/item/clothing/mask/breath/medical,
-/obj/item/clothing/mask/breath/medical{
-	pixel_x = 3
+/obj/structure/crate_shelf,
+/obj/structure/closet/crate/freezer/blood,
+/obj/effect/turf_decal/siding/blue{
+	dir = 10
 	},
 /turf/open/floor/plasteel/white,
 /area/ship/medical)
@@ -3795,24 +4693,44 @@
 /obj/machinery/power/apc/auto_name/directional/south,
 /obj/effect/turf_decal/siding/wood,
 /turf/open/floor/wood,
-/area/ship/crew/dorm)
+/area/ship/crew/dorm/captain)
 "Om" = (
-/obj/structure/closet/cabinet,
-/obj/item/clothing/under/rank/medical/paramedic/skirt/lp,
-/obj/item/clothing/under/rank/medical/paramedic/lp,
-/obj/item/clothing/suit/hooded/wintercoat/medical,
-/obj/item/clothing/head/beret/med,
-/obj/item/storage/backpack/satchel/med,
-/obj/item/storage/backpack/messenger/med,
-/obj/item/storage/backpack/medic,
-/obj/item/storage/backpack/duffelbag/med,
-/turf/open/floor/wood,
-/area/ship/medical)
+/obj/effect/turf_decal/trimline/opaque/nsorange/corner{
+	dir = 1
+	},
+/obj/effect/turf_decal/siding/white/corner{
+	dir = 1;
+	color = "#474747"
+	},
+/turf/open/floor/plasteel/white,
+/area/ship/cargo)
 "On" = (
-/obj/structure/closet/crate,
-/obj/effect/decal/cleanable/sprayweb,
 /obj/machinery/light/dim/directional/east,
-/turf/open/floor/plasteel/tech,
+/obj/effect/turf_decal/trimline/opaque/nsorange/line{
+	dir = 6
+	},
+/obj/item/reagent_containers/food/drinks/coffee{
+	pixel_y = 16
+	},
+/obj/item/paper_bin{
+	pixel_x = 7;
+	pixel_y = -4
+	},
+/obj/item/pen/fountain{
+	pixel_x = 6;
+	pixel_y = -5
+	},
+/obj/structure/table/reinforced{
+	color = "#c1b6a5"
+	},
+/obj/item/toy/plush/moth/atlas{
+	pixel_x = 9;
+	pixel_y = 16
+	},
+/obj/machinery/camera/autoname{
+	dir = 1
+	},
+/turf/open/floor/plasteel/white,
 /area/ship/cargo)
 "Ou" = (
 /obj/structure/cable{
@@ -3822,7 +4740,7 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 4
 	},
-/obj/effect/turf_decal/trimline/opaque/yellow/filled/line{
+/obj/effect/turf_decal/trimline/opaque/nsorange/filled/line{
 	dir = 4
 	},
 /turf/open/floor/plasteel/white,
@@ -3833,19 +4751,22 @@
 	autolinkers = list("broadcasterB","hub");
 	network = "nt_commnet"
 	},
+/obj/effect/turf_decal/techfloor{
+	dir = 8
+	},
 /turf/open/floor/circuit/telecomms{
 	initial_gas_mix = "TEMP=2.7"
 	},
 /area/ship/engineering/communications)
 "Ox" = (
-/obj/effect/turf_decal/corner/opaque/ntblue/half{
+/obj/effect/turf_decal/spline/fancy/opaque/black{
+	dir = 9
+	},
+/obj/effect/turf_decal/trimline/opaque/yellow/filled/warning{
 	dir = 8
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/machinery/airalarm/directional/west,
-/turf/open/floor/plasteel/white,
-/area/ship/hallway/central)
+/turf/open/floor/plasteel/telecomms_floor,
+/area/ship/engineering/communications)
 "OC" = (
 /obj/machinery/power/apc/auto_name/directional/north,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
@@ -3876,9 +4797,16 @@
 	pixel_x = 20;
 	name = "Cargo Bay Shutters";
 	id = "Ranger_Cargo_Door";
-	pixel_y = 1
+	pixel_y = 1;
+	req_ship_access = 1
 	},
 /obj/effect/turf_decal/trimline/opaque/yellow/filled/corner,
+/obj/machinery/autolathe,
+/obj/item/disk/design_disk/ammo_c9mm,
+/obj/item/stack/sheet/metal/ten,
+/obj/item/stack/sheet/glass{
+	amount = 10
+	},
 /turf/open/floor/plasteel/white,
 /area/ship/hallway/starboard)
 "OP" = (
@@ -3909,7 +4837,10 @@
 	pixel_y = -6
 	},
 /obj/machinery/light/dim/directional/north,
-/turf/open/floor/circuit/green/airless,
+/obj/effect/turf_decal/techfloor,
+/turf/open/floor/circuit/telecomms{
+	initial_gas_mix = "TEMP=2.7"
+	},
 /area/ship/engineering/communications)
 "Ph" = (
 /obj/effect/turf_decal/industrial/warning,
@@ -3924,6 +4855,9 @@
 /obj/effect/turf_decal/siding/yellow{
 	dir = 8
 	},
+/obj/structure/railing{
+	dir = 8
+	},
 /turf/open/floor/plasteel/dark,
 /area/ship/hallway/port)
 "Pr" = (
@@ -3954,25 +4888,28 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
+/obj/structure/chair/handrail{
+	dir = 1
+	},
 /turf/open/floor/plasteel/white,
 /area/ship/hallway/port)
 "PV" = (
 /obj/structure/table/reinforced,
-/obj/item/storage/toolbox/mechanical,
-/obj/item/storage/toolbox/electrical{
-	pixel_x = 3;
-	pixel_y = 7
-	},
 /obj/effect/turf_decal/techfloor{
 	dir = 8
 	},
+/obj/item/stock_parts/micro_laser/high,
+/obj/item/stock_parts/micro_laser/high{
+	pixel_y = 4;
+	pixel_x = -2
+	},
+/obj/item/stack/cable_coil/cut/red,
 /turf/open/floor/plasteel/mono/dark,
 /area/ship/engineering)
 "Qf" = (
-/obj/effect/turf_decal/corner/opaque/brown/mono,
-/obj/effect/turf_decal/industrial/warning,
-/turf/open/floor/plasteel/dark,
-/area/ship/storage)
+/obj/effect/turf_decal/corner/opaque/vired/half,
+/turf/open/floor/plasteel/tech,
+/area/ship/storage/equip)
 "Qt" = (
 /obj/item/bodypart/leg/right/robot,
 /obj/item/bodypart/r_arm/robot,
@@ -3982,17 +4919,24 @@
 /obj/item/bodypart/head/robot,
 /obj/item/borg/upgrade/ai,
 /obj/item/robot_suit,
-/obj/structure/closet/crate/engineering,
+/obj/structure/closet/crate/engineering{
+	name = "Robotics Crate"
+	},
 /obj/effect/turf_decal/industrial/hatch/orange,
 /obj/item/stock_parts/cell/high,
 /obj/item/assembly/flash/handheld,
 /obj/item/assembly/flash/handheld,
+/obj/item/borg/upgrade/restart,
 /turf/open/floor/plating,
 /area/ship/engineering)
 "Qu" = (
 /obj/machinery/door/firedoor/window,
 /obj/structure/grille,
 /obj/structure/window/reinforced/fulltile,
+/obj/machinery/door/poddoor/shutters/preopen{
+	id = "MedShutters";
+	name = "Medical Privacy Shutters"
+	},
 /turf/open/floor/plating,
 /area/ship/medical)
 "QT" = (
@@ -4000,13 +4944,22 @@
 /area/ship/maintenance/starboard)
 "QV" = (
 /obj/machinery/light/dim/directional/west,
+/obj/structure/chair/handrail{
+	dir = 1
+	},
 /turf/open/floor/engine/hull,
 /area/ship/external)
 "Rn" = (
-/obj/machinery/portable_atmospherics/pump,
 /obj/machinery/light/dim/directional/north,
+/obj/structure/crate_shelf,
+/obj/machinery/door/window/brigdoor/eastleft{
+	dir = 2;
+	req_access_txt = "1";
+	name = "Armory";
+	req_ship_access = 1
+	},
 /turf/open/floor/plasteel/tech,
-/area/ship/storage)
+/area/ship/storage/equip)
 "Ro" = (
 /obj/effect/turf_decal/trimline/opaque/ntblue/filled/line{
 	dir = 1
@@ -4036,10 +4989,14 @@
 	dir = 8
 	},
 /obj/effect/turf_decal/industrial/warning,
+/obj/structure/chair/handrail{
+	dir = 4
+	},
 /turf/open/floor/plasteel/white,
 /area/ship/hallway/port)
 "RM" = (
 /obj/structure/chair/sofa/brown/left/directional/west,
+/obj/machinery/light/dim/directional/east,
 /turf/open/floor/plasteel/dark,
 /area/ship/hallway/central)
 "RS" = (
@@ -4056,68 +5013,16 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 9
 	},
-/obj/machinery/airalarm/directional/south,
+/obj/effect/turf_decal/spline/fancy/opaque/blue,
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
 "Sl" = (
 /obj/machinery/light/dim/directional/east,
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
 /obj/structure/rack,
-/obj/item/circuitboard/machine/telecomms/relay{
-	pixel_x = -5;
-	pixel_y = 9
-	},
-/obj/item/circuitboard/machine/telecomms/relay{
-	pixel_x = -5;
-	pixel_y = 9
-	},
-/obj/item/circuitboard/machine/telecomms/relay{
-	pixel_x = -5;
-	pixel_y = 9
-	},
-/obj/item/stack/cable_coil/cyan{
-	pixel_x = 6
-	},
-/obj/item/stock_parts/subspace/filter{
-	pixel_x = -8
-	},
-/obj/item/stock_parts/subspace/filter{
-	pixel_x = -8
-	},
-/obj/item/stock_parts/subspace/filter{
-	pixel_x = -8
-	},
-/obj/item/stock_parts/subspace/filter{
-	pixel_x = -8
-	},
-/obj/item/stock_parts/subspace/filter{
-	pixel_x = -8
-	},
-/obj/item/stock_parts/subspace/filter{
-	pixel_x = -8
-	},
-/obj/item/stock_parts/manipulator{
-	pixel_x = 7;
-	pixel_y = 7
-	},
-/obj/item/stock_parts/manipulator{
-	pixel_x = 7;
-	pixel_y = 7
-	},
-/obj/item/stock_parts/manipulator{
-	pixel_x = 7;
-	pixel_y = 7
-	},
-/obj/item/stock_parts/manipulator{
-	pixel_x = 7;
-	pixel_y = 7
-	},
-/obj/item/stock_parts/manipulator{
-	pixel_x = 7;
-	pixel_y = 7
-	},
-/obj/item/stock_parts/manipulator{
-	pixel_x = 7;
+/obj/item/storage/toolbox/mechanical,
+/obj/item/storage/toolbox/electrical{
+	pixel_x = 3;
 	pixel_y = 7
 	},
 /turf/open/floor/plating,
@@ -4132,8 +5037,19 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 9
 	},
-/turf/open/floor/plasteel/tech,
+/obj/effect/turf_decal/trimline/opaque/nsorange/warning{
+	dir = 1
+	},
+/obj/effect/turf_decal/siding{
+	color = "#474747";
+	dir = 1
+	},
+/turf/open/floor/plasteel/white,
 /area/ship/cargo)
+"Sv" = (
+/obj/structure/closet/firecloset/wall/directional/west,
+/turf/open/floor/plasteel/dark,
+/area/ship/hallway/central)
 "SC" = (
 /obj/structure/table/wood,
 /obj/item/storage/box/donkpockets{
@@ -4150,12 +5066,18 @@
 /turf/open/floor/plasteel/dark,
 /area/ship/hallway/central)
 "SE" = (
-/obj/machinery/portable_atmospherics/canister/nitrogen,
 /obj/effect/turf_decal/industrial/outline/orange,
+/obj/machinery/portable_atmospherics/canister/toxins,
 /turf/open/floor/plasteel/tech,
 /area/ship/maintenance/starboard)
+"SG" = (
+/obj/structure/toilet{
+	dir = 1
+	},
+/turf/open/floor/plating/catwalk_floor,
+/area/ship/security)
 "SN" = (
-/obj/effect/turf_decal/trimline/opaque/yellow/filled/line{
+/obj/effect/turf_decal/trimline/opaque/nsorange/filled/line{
 	dir = 4
 	},
 /turf/open/floor/plasteel/white,
@@ -4168,7 +5090,7 @@
 /area/ship/hallway/central)
 "Tb" = (
 /turf/closed/wall/r_wall,
-/area/ship/storage)
+/area/ship/storage/equip)
 "Te" = (
 /obj/machinery/light/floor,
 /turf/open/floor/engine/hull,
@@ -4190,10 +5112,23 @@
 "Tz" = (
 /turf/closed/wall/r_wall,
 /area/ship/engineering)
+"TG" = (
+/obj/item/toy/plush/spider,
+/obj/structure/table/wood/reinforced,
+/obj/machinery/camera/autoname{
+	dir = 9
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/security)
 "TL" = (
-/obj/structure/closet/crate,
 /obj/machinery/light/dim/directional/north,
-/turf/open/floor/plasteel/tech,
+/obj/effect/turf_decal/trimline/opaque/nsorange/line{
+	dir = 5
+	},
+/obj/item/bedsheet/qm,
+/obj/structure/bed,
+/obj/structure/curtain/bounty,
+/turf/open/floor/plasteel/white,
 /area/ship/cargo)
 "TR" = (
 /obj/structure/table/wood,
@@ -4210,33 +5145,49 @@
 /obj/effect/turf_decal/trimline/opaque/orange/filled/line{
 	dir = 8
 	},
+/obj/structure/chair/handrail{
+	dir = 4
+	},
 /turf/open/floor/plasteel/white,
 /area/ship/hallway/port)
 "Ua" = (
 /obj/machinery/camera/autoname{
 	dir = 9
 	},
-/turf/open/floor/circuit/green/airless,
+/obj/machinery/button/door{
+	dir = 8;
+	pixel_x = 26;
+	id = "AiCore";
+	name = "Core Access";
+	req_access_txt = "20"
+	},
+/obj/effect/turf_decal/spline/fancy/opaque/black{
+	dir = 5
+	},
+/obj/effect/turf_decal/trimline/opaque/yellow/filled/warning{
+	dir = 4
+	},
+/turf/open/floor/plasteel/telecomms_floor,
 /area/ship/engineering/communications)
 "Uj" = (
 /obj/structure/table/reinforced{
 	color = "#c1b6a5"
 	},
-/obj/item/paper_bin{
-	pixel_y = 8;
-	pixel_x = 5
+/obj/effect/turf_decal/techfloor{
+	dir = 5
 	},
-/obj/item/pen/fountain{
-	pixel_x = -4;
-	pixel_y = 7
+/obj/effect/spawner/lootdrop/lpretrieval{
+	pixel_x = 3;
+	pixel_y = 1
 	},
-/obj/machinery/recharger{
-	pixel_x = -4
+/obj/effect/spawner/lootdrop/lpcombat{
+	pixel_y = 6
 	},
-/obj/item/stamp/captain{
-	pixel_x = 7
+/obj/effect/spawner/lootdrop/lpaid{
+	pixel_x = -4;
+	pixel_y = 10
 	},
-/turf/open/floor/plasteel/dark,
+/turf/open/floor/plasteel/telecomms_floor,
 /area/ship/bridge)
 "Ur" = (
 /obj/structure/cable{
@@ -4251,17 +5202,20 @@
 /obj/effect/turf_decal/trimline/opaque/orange/filled/line{
 	dir = 4
 	},
+/obj/structure/chair/handrail{
+	dir = 8
+	},
 /turf/open/floor/plasteel/white,
 /area/ship/hallway/port)
 "Us" = (
 /obj/effect/turf_decal/siding/red{
 	dir = 9
 	},
-/obj/machinery/door_timer{
-	pixel_y = 28;
-	id = "ranger_brig"
+/obj/structure/closet/crate/bin,
+/obj/machinery/camera/autoname{
+	dir = 4
 	},
-/turf/open/floor/mineral/plastitanium/red/brig,
+/turf/open/floor/plasteel/tech,
 /area/ship/security)
 "Ut" = (
 /obj/structure/urinal{
@@ -4274,7 +5228,6 @@
 /turf/open/floor/engine/air,
 /area/ship/hallway/central)
 "UU" = (
-/obj/machinery/door/airlock/public/glass,
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
@@ -4285,6 +5238,10 @@
 /obj/effect/turf_decal/corner/opaque/ntblue/half{
 	dir = 4
 	},
+/obj/machinery/door/poddoor/shutters/preopen{
+	name = "Corridor Lockdown Port";
+	id = "RangerPortShutters"
+	},
 /turf/open/floor/plasteel/white,
 /area/ship/hallway/port)
 "UW" = (
@@ -4295,18 +5252,12 @@
 /turf/open/floor/plating,
 /area/ship/maintenance/port)
 "Vg" = (
-/obj/structure/grille,
-/obj/structure/window/reinforced/fulltile,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 4
-	},
-/obj/machinery/door/firedoor/window,
-/obj/machinery/door/poddoor/shutters{
-	dir = 4;
-	id = "Ranger_Cycler_Shutters"
+/obj/machinery/camera/autoname{
+	dir = 10
 	},
-/turf/open/floor/plating,
-/area/ship/hallway/central)
+/obj/machinery/light/floor,
+/turf/open/floor/engine/hull,
+/area/ship/external)
 "Vh" = (
 /obj/structure/cable{
 	icon_state = "2-4"
@@ -4332,7 +5283,7 @@
 	dir = 1
 	},
 /turf/open/floor/wood,
-/area/ship/crew/dorm)
+/area/ship/crew/dorm/captain)
 "Vm" = (
 /obj/machinery/atmospherics/components/binary/pump{
 	dir = 8
@@ -4343,9 +5294,9 @@
 /turf/closed/wall/r_wall,
 /area/ship/hallway/starboard)
 "Vq" = (
-/obj/machinery/portable_atmospherics/canister/toxins,
 /obj/effect/turf_decal/industrial/outline/orange,
 /obj/effect/decal/cleanable/plasma,
+/obj/machinery/portable_atmospherics/canister/toxins,
 /turf/open/floor/plasteel/tech,
 /area/ship/maintenance/port)
 "Vt" = (
@@ -4354,16 +5305,25 @@
 	icon_state = "0-2"
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/space_heater,
+/obj/structure/railing,
 /turf/open/floor/plating,
 /area/ship/maintenance/port)
 "VC" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /turf/open/floor/plasteel/stairs,
 /area/ship/crew/cryo)
-"VJ" = (
-/obj/machinery/door/airlock/engineering{
-	dir = 4
+"VE" = (
+/obj/structure/window/reinforced/fulltile,
+/obj/structure/grille,
+/obj/machinery/door/poddoor/shutters/preopen{
+	dir = 4;
+	name = "Bridge-Atrium Shutters";
+	id = "BridgeAtrium"
 	},
+/turf/open/floor/plating,
+/area/ship/bridge)
+"VJ" = (
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
@@ -4373,32 +5333,57 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 4
 	},
-/obj/machinery/door/firedoor/border_only{
-	dir = 4
-	},
-/obj/machinery/door/firedoor/border_only{
+/obj/effect/turf_decal/corner/opaque/solgovgold/border{
 	dir = 8
 	},
-/turf/open/floor/plasteel/dark,
+/turf/open/floor/plasteel/white,
 /area/ship/hallway/central)
 "VM" = (
 /obj/effect/turf_decal/industrial/outline/blue,
-/obj/item/storage/box/lights/mixed{
-	pixel_x = -4;
-	pixel_y = 6
+/obj/machinery/washing_machine,
+/obj/structure/railing{
+	dir = 8
 	},
-/obj/item/storage/box/mousetraps{
-	pixel_y = -1;
-	pixel_x = 3
+/obj/item/toy/plush/tali{
+	pixel_y = 14
 	},
-/turf/open/floor/plating,
+/turf/open/floor/plasteel/tech,
 /area/ship/maintenance/starboard)
 "VP" = (
-/obj/structure/window/reinforced{
-	dir = 8
+/obj/machinery/newscaster/security_unit/directional/south,
+/obj/structure/chair/office{
+	dir = 4;
+	name = "tactical swivel chair"
 	},
-/obj/structure/closet,
-/turf/open/floor/plasteel/dark,
+/obj/machinery/button/door{
+	pixel_y = -39;
+	pixel_x = 9;
+	id = "SecCellWindowShutters";
+	name = "Cell Window Shutters";
+	req_access_txt = "1";
+	req_ship_access = 1
+	},
+/obj/machinery/button/door{
+	pixel_x = 9;
+	id = "CellHallShutters";
+	name = "Cell Hall Shutters";
+	pixel_y = -31;
+	req_access_txt = "1";
+	req_ship_access = 1
+	},
+/obj/machinery/button/door{
+	pixel_y = -23;
+	pixel_x = 9;
+	id = "SecShutters";
+	name = "Privacy Shutters";
+	layer = 2.91;
+	req_ship_access = 1;
+	req_access_txt = "1"
+	},
+/obj/item/radio/intercom/directional/south{
+	pixel_x = -7
+	},
+/turf/open/floor/mineral/plastitanium/red/brig,
 /area/ship/security)
 "VQ" = (
 /obj/machinery/camera/autoname{
@@ -4406,6 +5391,18 @@
 	},
 /turf/open/floor/engine/hull,
 /area/ship/external)
+"We" = (
+/obj/machinery/power/apc/auto_name/directional/west,
+/obj/structure/cable{
+	icon_state = "0-6"
+	},
+/obj/structure/table/rolling,
+/obj/structure/railing{
+	dir = 4;
+	layer = 4.1
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/hallway/central)
 "Wj" = (
 /obj/structure/bed,
 /obj/item/radio/intercom/directional/south,
@@ -4415,7 +5412,8 @@
 "Wp" = (
 /obj/machinery/door/poddoor{
 	dir = 2;
-	id = "Ranger_AI_Core_Blasts"
+	id = "Ranger_AI_Core_Blasts";
+	name = "Communications Access"
 	},
 /obj/machinery/power/shieldwallgen/atmos/roundstart{
 	id = "AI_Core_Field_Engi";
@@ -4454,9 +5452,18 @@
 /turf/open/floor/plasteel/dark,
 /area/ship/hallway/central)
 "WF" = (
-/obj/item/radio/intercom/wideband,
-/turf/closed/wall/r_wall,
-/area/ship/bridge)
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/effect/turf_decal/techfloor{
+	dir = 8
+	},
+/obj/effect/turf_decal/techfloor{
+	dir = 4
+	},
+/obj/machinery/light/dim/directional/south,
+/turf/open/floor/plasteel/tech,
+/area/ship/engineering/communications)
 "WG" = (
 /obj/machinery/telecomms/server/presets/nanotrasen{
 	autolinkers = list("nanotrasen","hub");
@@ -4464,17 +5471,19 @@
 	freq_listening = list(1353,1447,1459)
 	},
 /obj/item/disk/holodisk/lp/stations,
+/obj/effect/turf_decal/techfloor{
+	dir = 1
+	},
 /turf/open/floor/circuit/telecomms{
 	initial_gas_mix = "TEMP=2.7"
 	},
 /area/ship/engineering/communications)
 "WR" = (
-/obj/effect/turf_decal/corner/opaque/brown/mono,
-/obj/effect/turf_decal/industrial/warning{
+/obj/effect/turf_decal/corner/opaque/vired/half{
 	dir = 1
 	},
-/turf/open/floor/plasteel/dark,
-/area/ship/storage)
+/turf/open/floor/plasteel/tech,
+/area/ship/storage/equip)
 "WZ" = (
 /obj/machinery/computer/telecomms/server{
 	dir = 4
@@ -4485,20 +5494,52 @@
 "Xb" = (
 /obj/effect/turf_decal/corner/opaque/blue/diagonal,
 /obj/structure/window/reinforced/spawner,
-/obj/structure/closet,
+/obj/structure/closet/wall/med/directional/east{
+	name = "Anesthetics Closet"
+	},
+/obj/item/tank/internals/anesthetic{
+	pixel_x = -2
+	},
+/obj/item/tank/internals/anesthetic{
+	pixel_x = 3
+	},
+/obj/item/clothing/mask/breath/medical{
+	pixel_x = 3
+	},
+/obj/item/clothing/mask/breath/medical{
+	pixel_x = 6;
+	pixel_y = -3
+	},
+/obj/effect/turf_decal/borderfloorwhite/corner{
+	dir = 1
+	},
+/obj/structure/table/chem,
+/obj/structure/sink/chem{
+	pixel_x = 2;
+	pixel_y = 3
+	},
 /turf/open/floor/plasteel/white,
 /area/ship/medical)
 "Xt" = (
-/obj/machinery/space_heater,
 /obj/machinery/light/dim/directional/south,
 /obj/machinery/airalarm/directional/east,
+/obj/machinery/suit_storage_unit/inherit{
+	name = "Engineering Specialist's Storage Unit"
+	},
+/obj/item/clothing/mask/breath,
+/obj/item/clothing/suit/space/hardsuit/ert/lp/engi,
+/obj/item/tank/internals/oxygen/yellow,
+/obj/effect/turf_decal/industrial/outline/yellow,
 /turf/open/floor/plasteel/tech,
-/area/ship/storage)
+/area/ship/storage/equip)
 "XA" = (
 /obj/structure/cable{
 	icon_state = "1-10"
 	},
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
+/obj/structure/cable{
+	icon_state = "5-10"
+	},
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
 "XE" = (
@@ -4511,6 +5552,9 @@
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+	dir = 8
+	},
 /turf/open/floor/plasteel/white,
 /area/ship/hallway/central)
 "XH" = (
@@ -4519,10 +5563,12 @@
 	icon_state = "0-8"
 	},
 /obj/machinery/firealarm/directional/south,
+/obj/effect/turf_decal/techfloor{
+	dir = 1
+	},
 /turf/open/floor/plasteel/dark,
 /area/ship/crew/cryo)
 "XL" = (
-/obj/machinery/door/airlock/public/glass,
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
@@ -4533,6 +5579,10 @@
 /obj/effect/turf_decal/corner/opaque/ntblue/half{
 	dir = 4
 	},
+/obj/machinery/door/poddoor/shutters/preopen{
+	name = "Corridor Lockdown Starboard";
+	id = "RangerStarboardShutters"
+	},
 /turf/open/floor/plasteel/white,
 /area/ship/hallway/starboard)
 "XQ" = (
@@ -4563,9 +5613,15 @@
 /area/ship/hallway/central)
 "XS" = (
 /obj/effect/turf_decal/corner/opaque/blue/diagonal,
-/obj/structure/table/greyscale,
 /obj/machinery/light/dim/directional/east,
-/obj/item/toy/plush/moth/ragged,
+/obj/item/storage/backpack/duffelbag/med/surgery,
+/obj/item/toy/plush/moth/ragged{
+	pixel_y = 11
+	},
+/obj/effect/turf_decal/borderfloorwhite{
+	dir = 8
+	},
+/obj/structure/table/chem,
 /turf/open/floor/plasteel/white,
 /area/ship/medical)
 "XT" = (
@@ -4584,11 +5640,13 @@
 /turf/open/floor/plasteel/white,
 /area/ship/hallway/starboard)
 "Yk" = (
-/obj/effect/decal/cleanable/glass,
-/turf/open/floor/plasteel/tech,
+/obj/effect/turf_decal/trimline/opaque/nsorange/warning,
+/obj/effect/turf_decal/siding{
+	color = "#474747"
+	},
+/turf/open/floor/plasteel/white,
 /area/ship/cargo)
 "Yw" = (
-/obj/machinery/door/airlock/public/glass,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /obj/machinery/door/firedoor/border_only,
@@ -4598,6 +5656,10 @@
 /obj/effect/turf_decal/corner/opaque/ntblue/half{
 	dir = 8
 	},
+/obj/machinery/door/poddoor/shutters/preopen{
+	name = "Corridor Lockdown Starboard";
+	id = "RangerStarboardShutters"
+	},
 /turf/open/floor/plasteel/white,
 /area/ship/hallway/starboard)
 "Yy" = (
@@ -4618,33 +5680,43 @@
 /turf/open/floor/plasteel,
 /area/ship/hallway/port)
 "Yz" = (
-/obj/structure/window/reinforced,
-/obj/effect/turf_decal/siding/red{
-	dir = 6
+/obj/effect/turf_decal/techfloor{
+	dir = 4
 	},
-/obj/machinery/power/apc/auto_name/directional/east,
-/obj/structure/cable{
-	icon_state = "0-9"
+/obj/effect/turf_decal/techfloor{
+	dir = 8
 	},
-/turf/open/floor/mineral/plastitanium/red/brig,
+/obj/machinery/door/airlock/security/brig{
+	dir = 8;
+	id_tag = "SecureCell";
+	name = "Holding Cell";
+	req_access_txt = "1"
+	},
+/turf/open/floor/plating,
 /area/ship/security)
 "YJ" = (
-/obj/machinery/suit_storage_unit/inherit,
-/obj/item/clothing/suit/space/hardsuit/ancient/lp,
-/obj/item/clothing/mask/breath,
-/obj/effect/turf_decal/corner/opaque/brown/mono,
-/obj/item/tank/internals/emergency_oxygen,
-/obj/effect/turf_decal/industrial/warning,
-/turf/open/floor/plasteel/dark,
-/area/ship/storage)
-"YK" = (
-/obj/machinery/light_switch{
+/obj/effect/turf_decal/corner/opaque/vired/three_quarters,
+/obj/structure/table/reinforced,
+/obj/item/screwdriver{
+	pixel_x = -7;
+	pixel_y = 7
+	},
+/obj/item/screwdriver{
+	pixel_x = -7
+	},
+/obj/item/hand_labeler{
 	pixel_x = 8;
-	pixel_y = 22
+	pixel_y = 13
 	},
-/turf/open/floor/plasteel/stairs/wood{
-	dir = 8
+/turf/open/floor/plasteel/tech,
+/area/ship/storage/equip)
+"YK" = (
+/obj/machinery/firealarm/directional/north{
+	pixel_x = -4
 	},
+/obj/structure/table/reinforced,
+/obj/machinery/computer/helm/viewscreen/directional/west,
+/turf/open/floor/plasteel/white,
 /area/ship/medical)
 "YP" = (
 /obj/structure/cable{
@@ -4662,7 +5734,13 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 6
 	},
-/turf/open/floor/plating,
+/obj/effect/turf_decal/steeldecal/steel_decals10{
+	dir = 1
+	},
+/obj/effect/turf_decal/steeldecal/steel_decals10{
+	dir = 8
+	},
+/turf/open/floor/plasteel/tech,
 /area/ship/maintenance/starboard)
 "YW" = (
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
@@ -4687,7 +5765,8 @@
 	},
 /obj/machinery/door/poddoor/shutters{
 	dir = 4;
-	id = "Ranger_Port_maint_shut"
+	id = "Ranger_Port_maint_shut";
+	name = "Engine Shutters"
 	},
 /turf/open/floor/plating,
 /area/ship/maintenance/port)
@@ -4701,8 +5780,8 @@
 /turf/open/floor/plasteel/dark,
 /area/ship/hallway/central)
 "Zl" = (
-/obj/machinery/portable_atmospherics/canister,
 /obj/effect/turf_decal/industrial/outline/orange,
+/obj/machinery/portable_atmospherics/canister/toxins,
 /turf/open/floor/plasteel/tech,
 /area/ship/maintenance/port)
 "Zs" = (
@@ -4720,6 +5799,9 @@
 /area/ship/hallway/port)
 "Zv" = (
 /obj/machinery/firealarm/directional/west,
+/obj/machinery/camera/autoname{
+	dir = 4
+	},
 /turf/open/floor/wood,
 /area/ship/security)
 "Zw" = (
@@ -4740,30 +5822,51 @@
 /obj/machinery/light/dim/directional/south,
 /obj/effect/turf_decal/industrial/outline/blue,
 /obj/structure/reagent_dispensers/watertank,
-/turf/open/floor/plating,
+/turf/open/floor/plasteel/tech,
 /area/ship/maintenance/port)
 "ZI" = (
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
 /obj/effect/turf_decal/trimline/opaque/ntblue/filled/corner,
+/obj/structure/chair/handrail{
+	dir = 1
+	},
 /turf/open/floor/plasteel/white,
 /area/ship/hallway/starboard)
 "ZJ" = (
 /obj/effect/turf_decal/industrial/warning{
 	dir = 1
 	},
-/turf/open/floor/plasteel/tech/airless,
+/turf/open/floor/plasteel/tech,
 /area/ship/engineering/communications)
 "ZL" = (
 /obj/machinery/vending/coffee,
-/obj/machinery/light/dim/directional/east,
 /turf/open/floor/plasteel/dark,
 /area/ship/hallway/central)
 "ZS" = (
-/obj/machinery/portable_atmospherics/scrubber,
+/obj/structure/closet/syndicate{
+	desc = "It's the armory closet. A closet with shelving, in an armory!"
+	},
+/obj/machinery/door/window/brigdoor/eastright{
+	dir = 2;
+	req_access_txt = "1";
+	name = "Armory";
+	req_ship_access = 1
+	},
+/obj/item/storage/pistolcase/commander,
+/obj/item/ammo_box/magazine/co9mm,
+/obj/item/clothing/suit/armor/nanotrasen/slim,
+/obj/item/clothing/suit/armor/nanotrasen/slim,
+/obj/item/gun/ballistic/automatic/smg/skm_carbine/inteq/proto,
+/obj/item/ammo_box/magazine/smgm9mm,
+/obj/item/ammo_box/magazine/smgm9mm,
+/obj/item/ammo_box/magazine/smgm9mm,
+/obj/item/storage/pistolcase,
+/obj/item/kitchen/knife/combat/survival,
+/obj/item/kitchen/knife/combat/survival,
 /turf/open/floor/plasteel/tech,
-/area/ship/storage)
+/area/ship/storage/equip)
 "ZW" = (
 /obj/machinery/light/dim/directional/north,
 /obj/effect/turf_decal/trimline/opaque/ntblue/filled/corner{
@@ -4779,6 +5882,9 @@
 /obj/effect/turf_decal/corner/opaque/ntblue/half{
 	dir = 8
 	},
+/obj/structure/chair/handrail{
+	dir = 4
+	},
 /turf/open/floor/plasteel/white,
 /area/ship/hallway/central)
 
@@ -4794,6 +5900,7 @@ tg
 tg
 LV
 zW
+yK
 zW
 zW
 zW
@@ -4807,8 +5914,7 @@ zW
 zW
 zW
 zW
-zW
-zW
+yK
 zW
 QT
 qs
@@ -4936,8 +6042,8 @@ zW
 zW
 zW
 LV
-Zl
-Vq
+ci
+hp
 aW
 UW
 hl
@@ -4961,7 +6067,7 @@ qQ
 gD
 ib
 eN
-RS
+Lw
 Dd
 QT
 zW
@@ -5044,10 +6150,10 @@ zW
 (8,1,1) = {"
 zW
 zW
-zW
+hN
 vm
-xp
-Aw
+vm
+cj
 oQ
 tq
 LV
@@ -5059,9 +6165,9 @@ zW
 zW
 Kg
 Pd
-vO
+Ox
 IE
-vO
+Ep
 Nf
 Kg
 zW
@@ -5076,7 +6182,7 @@ Zv
 AZ
 Wj
 fV
-zW
+sp
 "}
 (9,1,1) = {"
 zW
@@ -5085,7 +6191,7 @@ vm
 vm
 YK
 aO
-Om
+Aw
 Gn
 LV
 vT
@@ -5093,7 +6199,7 @@ LV
 LV
 zW
 zW
-wq
+yK
 Kg
 MK
 Ua
@@ -5101,7 +6207,7 @@ vO
 Nn
 Cq
 Kg
-wq
+yK
 zW
 zW
 QT
@@ -5136,16 +6242,16 @@ Kg
 Kg
 kw
 gk
-zB
 Kg
 Kg
+jC
 Kg
 zW
 zW
 Vp
 cN
 vR
-fV
+oM
 Us
 Js
 Ma
@@ -5164,7 +6270,7 @@ Qu
 Cb
 NR
 jA
-zW
+qe
 Tz
 Tz
 jt
@@ -5172,17 +6278,17 @@ WZ
 Mh
 Tz
 nE
-fU
-kt
+WF
+Kg
 LM
 bX
 Kg
 Kg
-zW
+fo
 Vp
 Ff
 wT
-fV
+nq
 gi
 Lg
 bN
@@ -5204,7 +6310,7 @@ jA
 zW
 Tz
 LQ
-MD
+EA
 aP
 xq
 Wp
@@ -5223,7 +6329,7 @@ qR
 tQ
 nh
 Dx
-Dx
+yk
 fV
 "}
 (13,1,1) = {"
@@ -5248,7 +6354,7 @@ Dr
 ZJ
 fU
 Mx
-tT
+MD
 tT
 ux
 Kg
@@ -5257,9 +6363,9 @@ Vp
 TR
 KX
 fV
-Ji
+fV
 Yz
-hf
+jJ
 iH
 fV
 "}
@@ -5293,11 +6399,11 @@ zW
 Vp
 bD
 iD
-fV
-fV
-fV
-fV
-fV
+dm
+hf
+Ab
+Ji
+SG
 fV
 "}
 (15,1,1) = {"
@@ -5331,11 +6437,11 @@ Vp
 yo
 Cg
 of
-gg
-Ut
-BI
+jd
+TG
+my
 xv
-gg
+fV
 "}
 (16,1,1) = {"
 zW
@@ -5358,8 +6464,8 @@ Tz
 Ca
 rA
 yU
-dP
-wf
+Tz
+Kg
 Kg
 Kg
 zW
@@ -5369,7 +6475,7 @@ pi
 iZ
 ji
 gg
-am
+gg
 gg
 gg
 gg
@@ -5388,7 +6494,7 @@ jA
 jA
 zW
 zW
-zW
+Vg
 Tz
 Tz
 Tz
@@ -5398,7 +6504,7 @@ aG
 Tz
 Kg
 Kg
-zW
+sp
 zW
 zW
 Vp
@@ -5406,8 +6512,8 @@ Vp
 MI
 zF
 gg
-my
-fo
+Ut
+BI
 BA
 gg
 "}
@@ -5443,9 +6549,9 @@ Vp
 dK
 ZI
 gg
-qe
-oM
-yK
+am
+gg
+gg
 gg
 "}
 (19,1,1) = {"
@@ -5502,11 +6608,11 @@ zW
 zW
 Tz
 Tz
-eo
+Tz
 FB
 wU
-hZ
-Lw
+Tz
+Tz
 Tz
 Tz
 zW
@@ -5538,13 +6644,13 @@ sJ
 sJ
 sJ
 sJ
-sJ
-sJ
+We
+hZ
 VJ
-sJ
-sJ
-sJ
-sJ
+rX
+Sv
+Kl
+eo
 sJ
 sJ
 sJ
@@ -5564,7 +6670,7 @@ zW
 zW
 zW
 QV
-jA
+gd
 KQ
 wp
 oz
@@ -5575,13 +6681,13 @@ gW
 ZY
 CG
 mw
-rX
+MR
 vj
 fd
-Ox
+yG
 BX
 Gk
-Kl
+bK
 mw
 zi
 lj
@@ -5592,8 +6698,8 @@ nA
 Mm
 uk
 xA
-Vp
-QV
+jQ
+ww
 zW
 "}
 (23,1,1) = {"
@@ -5612,7 +6718,7 @@ PG
 Gh
 XR
 OP
-OP
+DQ
 OP
 OP
 BY
@@ -5658,7 +6764,7 @@ tf
 bu
 rT
 sJ
-Vg
+SU
 ok
 sJ
 OK
@@ -5739,7 +6845,7 @@ DZ
 So
 Eq
 lU
-cj
+gL
 XT
 zW
 zW
@@ -5756,15 +6862,15 @@ KC
 jZ
 Be
 Tb
-sJ
-SU
+dx
+CV
 Mf
 Gc
 Ha
 Lk
-Lk
-Lk
-Lk
+VE
+VE
+VE
 tj
 Lk
 sJ
@@ -5774,8 +6880,8 @@ CP
 XT
 Iz
 lv
+Yk
 pD
-ww
 vz
 XT
 zW
@@ -5794,7 +6900,7 @@ wu
 yZ
 Tb
 NC
-jC
+Mf
 Mf
 mv
 Ao
@@ -5803,17 +6909,17 @@ pA
 lD
 hF
 ec
+wf
 Lk
-Te
 wq
-zW
-zW
+wq
+wq
 XT
 lw
-pD
+Om
 Yk
-hp
 gL
+vo
 XT
 zW
 zW
@@ -5831,7 +6937,7 @@ Qf
 Xt
 Tb
 zW
-zW
+Mf
 Mf
 Vk
 NZ
@@ -5840,15 +6946,15 @@ sf
 iF
 XA
 Sa
+xp
 Lk
 wq
 zW
 zW
-zW
 XT
 TL
-pD
-pD
+Fg
+zB
 eE
 XT
 XT
@@ -5868,7 +6974,7 @@ YJ
 Tb
 Tb
 zW
-zW
+Mf
 Mf
 Mu
 hx
@@ -5877,9 +6983,9 @@ AF
 vp
 CI
 dC
+kt
 Lk
-zW
-zW
+wq
 zW
 zW
 XT
@@ -5908,14 +7014,14 @@ zW
 zW
 Mf
 Mf
-Fg
+Mf
 Lk
 tK
 og
 NM
 ff
 Lk
-zW
+Lk
 zW
 zW
 zW
@@ -5981,14 +7087,14 @@ zW
 zW
 zW
 zW
-wq
+VQ
 wq
 Lk
 mn
 cv
 lW
-WF
-VQ
+Lk
+rw
 zW
 zW
 zW
diff --git a/code/game/area/ship_areas.dm b/code/game/area/ship_areas.dm
index 9732893523b7..deafd789f776 100644
--- a/code/game/area/ship_areas.dm
+++ b/code/game/area/ship_areas.dm
@@ -474,6 +474,9 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 	name = "EVA Storage"
 	icon_state = "eva"
 
+/area/ship/storage/equip
+	name = "Equipment Room"
+
 /// External Areas ///
 /area/ship/external
 	name = "External"