From 6b6467dd48d544a1026347021964d0070410fdd7 Mon Sep 17 00:00:00 2001
From: Apogee-dev <60533805+Apogee-dev@users.noreply.github.com>
Date: Tue, 26 Mar 2024 19:56:54 -0700
Subject: [PATCH] Gives the Riggs a touch-up (#2721)

<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request

![rigger_remap](https://github.com/shiptest-ss13/Shiptest/assets/60533805/53fce13e-7ed8-46de-a878-077bf0614077)
The Riggs has aged incredibly well for being one of the oldest maps
still in rotation, but it's definitely fallen out of line with newer
ships as standards have been updated. This PR brings it in line with
those standards and freshens up the layout and decoration a bit.

- Removed RnD and ORM
- Added separate cryo room
- Added crew lounge area and miner ready room
- Moved atmos slightly to make accessing the empty rooms easier and
replaced the standing air tanks with a 1-tile open air tank (temporary,
really, until we get better tanks coded)
- Added access restrictions to atmos and engine room (but not
engineering bay)
- Reduced miner slots to 1 and assistant slots to 2
- Removed Mech Technician

## Why It's Good For The Game

Riggs was getting crusty and needed some love.
<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

## Changelog

:cl:
tweak: Made the Riggs-class sloop nicer to live in
balance: Removed RnD and ORM from the Riggs
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->
---
 _maps/configs/independent_rigger.json         |   16 +-
 .../independent/independent_rigger.dmm        | 3067 +++++++++--------
 2 files changed, 1542 insertions(+), 1541 deletions(-)

diff --git a/_maps/configs/independent_rigger.json b/_maps/configs/independent_rigger.json
index 77b85ce0bede..3550773cc0e4 100644
--- a/_maps/configs/independent_rigger.json
+++ b/_maps/configs/independent_rigger.json
@@ -1,19 +1,17 @@
 {
 	"$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json",
 	"map_name": "Riggs-class Sloop",
-	"prefix": "ISV",
+	"prefix": "SV",
 	"namelists": [
 		"GENERAL",
 		"SPACE",
-		"NATURAL",
-		"NATURAL_AGGRESSIVE"
+		"NATURAL"
 	],
 	"map_short_name": "Riggs-class",
-	"description": "The Rigger-class is Kasagi-Fischer Partnership’s mainstay in the independent ship market. Spacious, affordable, and versatile, Riggers offer basic capabilities for everything a Frontier spacer might need in a convenient, easy-to-modify platform, and by default come equipped with a basic medbay, a small security office, atmospherics recycling and equipment to support an APLU utility mech. Thanks to this versatility, Riggers have become extremely popular among moderately-wealthy independent captains, and can be found doing everything from mining to shipping to surveying Frontier planets.",
+	"description": "The Riggs-class is Kasagi-Fischer Partnership’s mainstay in the independent ship market. Spacious, affordable, and versatile, the Riggs offers basic capabilities for everything a Frontier spacer might need in a convenient, easy-to-modify platform, and by default come equipped with a basic medbay, a small security office, atmospherics recycling and equipment to support an APLU utility mech. Thanks to this versatility, the Riggs has become extremely popular among moderately-wealthy independent captains, and can be found doing everything from mining to shipping to surveying Frontier planets.",
 	"tags": [
 		"Mining",
 		"Medical",
-		"Robotics",
 		"Generalist"
 	],
 	"map_path": "_maps/shuttles/independent/independent_rigger.dmm",
@@ -36,14 +34,10 @@
 		},
 		"Machinist's Mate": {
 			"outfit": "/datum/outfit/job/independent/engineer",
-			"slots": 2
+			"slots": 1
 		},
 		"Asteroid Miner": {
 			"outfit": "/datum/outfit/job/independent/miner",
-			"slots": 2
-		},
-		"Mech Technician": {
-			"outfit": "/datum/outfit/job/independent/roboticist",
 			"slots": 1
 		},
 		"Security Detail": {
@@ -52,7 +46,7 @@
 		},
 		"Deckhand": {
 			"outfit": "/datum/outfit/job/independent/assistant",
-			"slots": 4
+			"slots": 2
 		}
 	},
 	"enabled": true
diff --git a/_maps/shuttles/independent/independent_rigger.dmm b/_maps/shuttles/independent/independent_rigger.dmm
index 8bd2c209481b..03044b113956 100644
--- a/_maps/shuttles/independent/independent_rigger.dmm
+++ b/_maps/shuttles/independent/independent_rigger.dmm
@@ -31,25 +31,21 @@
 	name = "Blast Shutters"
 	},
 /obj/structure/window/plasma/reinforced/plastitanium,
-/obj/structure/curtain,
 /turf/open/floor/plating,
-/area/ship/crew)
+/area/ship/crew/cryo)
 "aw" = (
 /obj/machinery/power/terminal,
 /obj/structure/cable,
 /turf/open/floor/plating,
 /area/ship/maintenance/starboard)
 "ax" = (
-/obj/structure/filingcabinet/employment,
 /obj/machinery/newscaster/security_unit/directional/west,
+/obj/machinery/photocopier,
 /turf/open/floor/carpet/blue,
 /area/ship/bridge)
 "aC" = (
-/obj/structure/window/reinforced/spawner/west{
-	dir = 4
-	},
-/turf/open/floor/plating,
-/area/ship/engineering)
+/turf/closed/wall/mineral/plastitanium/nodiagonal,
+/area/ship/maintenance/fore)
 "aD" = (
 /obj/structure/table,
 /obj/machinery/microwave,
@@ -62,32 +58,33 @@
 /area/ship/crew/canteen)
 "aT" = (
 /turf/closed/wall/mineral/plastitanium,
-/area/ship/construction)
+/area/ship/maintenance/fore)
 "bc" = (
 /obj/structure/closet/cardboard,
-/obj/item/circuitboard/machine/mechfab,
+/obj/item/paicard,
 /obj/effect/spawner/lootdrop/maintenance/three,
 /turf/open/floor/plating,
-/area/ship/construction)
+/area/ship/maintenance/fore)
 "bi" = (
-/obj/effect/turf_decal/kfp_small{
-	dir = 8
-	},
+/obj/machinery/firealarm/directional/south,
 /turf/open/floor/plating,
-/area/ship/construction)
+/area/ship/maintenance/fore)
 "bo" = (
-/obj/effect/turf_decal/industrial/outline/yellow,
-/obj/machinery/suit_storage_unit/inherit/industrial,
-/obj/item/clothing/suit/space/pilot,
-/obj/item/clothing/head/helmet/space/pilot/random,
-/obj/item/clothing/mask/breath,
 /obj/machinery/light/small/directional/south,
-/obj/machinery/light_switch{
-	dir = 1;
-	pixel_x = -7;
-	pixel_y = -20
+/obj/effect/turf_decal/box/corners{
+	dir = 4
 	},
-/turf/open/floor/plasteel/tech/techmaint,
+/obj/effect/turf_decal/box/corners,
+/obj/structure/rack,
+/obj/item/storage/toolbox/electrical{
+	pixel_x = 3;
+	pixel_y = 7
+	},
+/obj/item/storage/toolbox/mechanical{
+	pixel_x = -2
+	},
+/obj/item/clothing/head/welding,
+/turf/open/floor/plasteel/tech,
 /area/ship/cargo)
 "bx" = (
 /obj/structure/chair/office{
@@ -95,7 +92,7 @@
 	},
 /obj/effect/landmark/start/head_of_personnel,
 /turf/open/floor/carpet/blue,
-/area/ship/engineering/communications)
+/area/ship/bridge)
 "by" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -107,7 +104,6 @@
 /turf/open/floor/plasteel/mono,
 /area/ship/hallway/central)
 "bA" = (
-/obj/machinery/airalarm/directional/north,
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
@@ -118,40 +114,43 @@
 	dir = 4
 	},
 /obj/structure/catwalk/over,
+/obj/effect/turf_decal/industrial/warning{
+	dir = 4
+	},
+/obj/machinery/light_switch{
+	pixel_x = 5;
+	pixel_y = 22
+	},
 /turf/open/floor/plating,
-/area/ship/engineering)
+/area/ship/maintenance/central)
 "bB" = (
-/obj/machinery/atmospherics/components/binary/pump/on/layer2{
-	dir = 1;
-	name = "Air to Distro"
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 10
 	},
-/obj/item/multitool,
-/obj/machinery/atmospherics/components/binary/pump/layer4{
-	name = "Distro to Waste"
+/obj/machinery/atmospherics/pipe/simple/green/visible{
+	dir = 4
 	},
+/obj/machinery/atmospherics/components/binary/valve/digital/layer4,
 /turf/open/floor/plating,
 /area/ship/engineering/atmospherics)
 "bC" = (
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
-/area/ship/crew)
+/area/ship/crew/cryo)
 "bL" = (
 /obj/structure/cable/yellow{
 	icon_state = "2-8"
 	},
 /obj/effect/turf_decal/industrial/warning,
-/obj/structure/catwalk/over,
-/turf/open/floor/plating,
-/area/ship/engineering)
-"bZ" = (
-/obj/machinery/cryopod{
-	dir = 1
-	},
-/obj/machinery/computer/cryopod/directional/south,
-/obj/effect/turf_decal/industrial/warning{
-	dir = 5
+/obj/machinery/light_switch{
+	dir = 8;
+	pixel_x = 20;
+	pixel_y = 10
 	},
-/turf/open/floor/plasteel/tech/grid,
-/area/ship/crew)
+/turf/open/floor/plasteel/tech,
+/area/ship/engineering/engine)
+"bZ" = (
+/turf/open/floor/plasteel/grimy,
+/area/ship/crew/dorm)
 "cb" = (
 /obj/structure/grille,
 /obj/machinery/door/poddoor/shutters{
@@ -163,24 +162,26 @@
 /turf/open/floor/plating,
 /area/ship/bridge)
 "cc" = (
-/obj/structure/curtain,
-/obj/machinery/shower{
-	dir = 4
-	},
-/obj/structure/window/reinforced/tinted/frosted{
-	dir = 1
+/obj/machinery/airalarm/directional/south,
+/obj/machinery/light_switch{
+	dir = 4;
+	pixel_x = -20;
+	pixel_y = 5
 	},
-/obj/machinery/door/window/survival_pod{
+/obj/structure/chair{
 	dir = 4
 	},
-/obj/item/soap,
-/obj/machinery/airalarm/directional/south,
-/turf/open/floor/plasteel/patterned/brushed,
-/area/ship/crew)
+/turf/open/floor/plasteel/patterned,
+/area/ship/crew/cryo)
 "ci" = (
 /obj/effect/turf_decal/corner/opaque/brown/border{
 	dir = 1
 	},
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /turf/open/floor/plasteel/mono,
 /area/ship/hallway/central)
 "cl" = (
@@ -192,57 +193,77 @@
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
 /turf/open/floor/plasteel/mono,
 /area/ship/hallway/central)
-"cw" = (
-/obj/machinery/light/small/directional/south,
-/turf/open/floor/plating,
-/area/ship/construction)
 "cx" = (
-/obj/structure/window/reinforced,
-/obj/effect/turf_decal/industrial/outline/yellow,
-/obj/structure/rack,
-/obj/item/pickaxe,
-/obj/item/pickaxe,
-/obj/item/storage/bag/ore,
-/obj/item/storage/bag/ore,
-/obj/item/mining_scanner,
-/obj/item/mining_scanner,
-/turf/open/floor/plasteel/tech,
-/area/ship/engineering)
+/obj/structure/sign/poster/contraband/random{
+	pixel_x = 32
+	},
+/turf/open/floor/plasteel,
+/area/ship/maintenance/fore)
 "cR" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
 	dir = 1
 	},
-/obj/effect/landmark/start/shaft_miner,
+/obj/structure/chair{
+	dir = 1
+	},
+/obj/machinery/power/apc/auto_name/directional/south,
+/obj/structure/cable,
+/obj/machinery/light/small/directional/west,
 /turf/open/floor/plasteel/tech,
-/area/ship/engineering)
+/area/ship/maintenance/central)
+"cU" = (
+/obj/machinery/power/terminal,
+/obj/structure/cable,
+/obj/machinery/firealarm/directional/east,
+/turf/open/floor/plating,
+/area/ship/maintenance/starboard)
 "db" = (
 /obj/effect/turf_decal/corner/opaque/yellow/diagonal,
 /turf/open/floor/plasteel/white,
 /area/ship/crew/canteen)
 "dc" = (
-/obj/machinery/light/small/directional/west,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 6
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 6
+	},
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
 /turf/open/floor/plasteel,
-/area/ship/construction)
+/area/ship/maintenance/fore)
 "dx" = (
-/obj/structure/table,
+/obj/effect/turf_decal/corner/opaque/yellow/diagonal,
+/obj/structure/closet/secure_closet/freezer/fridge{
+	populate = 0
+	},
+/obj/item/storage/cans/sixbeer,
 /obj/effect/spawner/lootdrop/ration,
 /obj/effect/spawner/lootdrop/ration,
-/obj/effect/turf_decal/corner/opaque/yellow/diagonal,
-/obj/structure/extinguisher_cabinet/directional/north,
+/obj/item/reagent_containers/food/condiment/flour,
+/obj/item/reagent_containers/food/condiment/sugar,
+/obj/item/radio/intercom/directional/north,
 /turf/open/floor/plasteel/white,
 /area/ship/crew/canteen)
 "dH" = (
-/obj/structure/table/reinforced,
 /obj/machinery/firealarm/directional/west,
-/obj/machinery/fax/indie,
 /obj/machinery/light/directional/south,
+/obj/structure/table/reinforced,
+/obj/machinery/fax/indie,
 /turf/open/floor/carpet/blue,
 /area/ship/bridge)
 "dJ" = (
-/obj/effect/turf_decal/industrial/outline/yellow,
-/obj/structure/closet/firecloset,
+/obj/structure/window/plasma/reinforced/plastitanium,
+/obj/structure/grille,
+/obj/machinery/atmospherics/pipe/manifold/cyan/visible/layer2{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 9
+	},
 /turf/open/floor/plating,
-/area/ship/maintenance/starboard)
+/area/ship/engineering/atmospherics)
 "dU" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -250,27 +271,22 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /obj/effect/turf_decal/corner/opaque/yellow/diagonal,
-/obj/machinery/firealarm/directional/east,
+/obj/structure/extinguisher_cabinet/directional/east,
 /turf/open/floor/plasteel/white,
 /area/ship/crew/canteen)
 "ee" = (
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
 /obj/effect/landmark/observer_start,
+/obj/machinery/airalarm/directional/north,
 /turf/open/floor/plasteel/mono,
 /area/ship/hallway/central)
 "eu" = (
 /obj/structure/closet/crate,
 /obj/machinery/airalarm/directional/north,
-/obj/item/circuitboard/machine/circuit_imprinter,
 /obj/effect/spawner/lootdrop/maintenance/three,
 /turf/open/floor/plating,
-/area/ship/construction)
+/area/ship/maintenance/fore)
 "eF" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /obj/structure/sign/departments/medbay/alt{
 	pixel_x = 32
 	},
@@ -294,16 +310,17 @@
 	dir = 4
 	},
 /turf/open/floor/plating,
-/area/ship/crew)
+/area/ship/crew/dorm)
 "ff" = (
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
-	dir = 8
+/obj/structure/grille,
+/obj/machinery/door/poddoor/shutters{
+	dir = 4;
+	id = "riggerwindows";
+	name = "Blast Shutters"
 	},
+/obj/structure/window/plasma/reinforced/plastitanium,
 /turf/open/floor/plating,
-/area/ship/maintenance/starboard)
+/area/ship/maintenance/fore)
 "fg" = (
 /obj/structure/sink{
 	dir = 8;
@@ -340,7 +357,7 @@
 	locked = 0;
 	name = "mortuary locker";
 	pixel_x = 28;
-	req_access_txt = "1"
+	req_access_txt = "5"
 	},
 /obj/effect/turf_decal/corner/opaque/green{
 	dir = 8
@@ -348,14 +365,15 @@
 /turf/open/floor/plasteel/dark,
 /area/ship/medical)
 "fh" = (
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
 /obj/structure/cable{
 	icon_state = "2-4"
 	},
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 5
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 5
+	},
 /turf/open/floor/plasteel/mono,
 /area/ship/hallway/central)
 "fl" = (
@@ -374,24 +392,21 @@
 /turf/open/floor/plasteel/dark,
 /area/ship/medical)
 "fn" = (
-/obj/effect/turf_decal/corner_steel_grid{
-	dir = 8
+/obj/structure/chair/sofa/left{
+	dir = 4
 	},
-/obj/effect/turf_decal/corner_steel_grid,
-/turf/open/floor/plasteel,
-/area/ship/crew/office)
+/turf/open/floor/plasteel/grimy,
+/area/ship/crew)
 "fp" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 6
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 6
-	},
-/obj/effect/turf_decal/number/five{
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
 	dir = 8
 	},
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
 /turf/open/floor/plating,
-/area/ship/construction)
+/area/ship/maintenance/fore)
 "fx" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -402,53 +417,46 @@
 /turf/open/floor/plating,
 /area/ship/maintenance/port)
 "fO" = (
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /obj/effect/turf_decal/corner/opaque/green/border{
 	dir = 4
 	},
 /turf/open/floor/plasteel/mono,
 /area/ship/hallway/central)
 "fQ" = (
-/obj/item/analyzer,
-/obj/machinery/atmospherics/components/binary/pump/layer2{
-	name = "Input to Air"
-	},
-/obj/machinery/atmospherics/components/binary/pump/layer4{
-	name = "Input to Waste"
+/obj/machinery/atmospherics/pipe/simple/green/visible{
+	dir = 10
 	},
+/obj/machinery/atmospherics/components/binary/valve/digital/layer4,
 /turf/open/floor/plating,
 /area/ship/engineering/atmospherics)
 "gc" = (
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
 	dir = 1
 	},
+/obj/structure/bed,
+/obj/item/bedsheet/random,
+/obj/structure/curtain/bounty,
 /turf/open/floor/plasteel/grimy,
-/area/ship/crew)
+/area/ship/crew/dorm)
 "gd" = (
 /obj/structure/cable{
 	icon_state = "0-4"
 	},
 /obj/machinery/power/apc/auto_name/directional/west,
-/obj/machinery/airalarm/directional/south,
 /obj/structure/closet/emcloset,
 /obj/effect/turf_decal/industrial/outline/yellow,
-/obj/machinery/light_switch{
-	dir = 4;
-	pixel_x = -20;
-	pixel_y = 12
-	},
 /turf/open/floor/plasteel/tech/techmaint,
 /area/ship/hallway/central)
 "ge" = (
-/obj/machinery/vending/cigarette,
-/obj/effect/turf_decal/industrial/outline/yellow,
-/obj/machinery/firealarm/directional/east,
-/turf/open/floor/plasteel/tech/techmaint,
-/area/ship/crew/office)
+/obj/structure/table,
+/obj/item/paper_bin{
+	pixel_x = -5;
+	pixel_y = 2
+	},
+/obj/item/pen,
+/obj/machinery/computer/helm/viewscreen/directional/south,
+/turf/open/floor/plasteel/grimy,
+/area/ship/crew)
 "go" = (
 /obj/structure/window/reinforced/spawner/east,
 /obj/machinery/sleeper,
@@ -468,20 +476,26 @@
 /turf/open/floor/plasteel/tech/techmaint,
 /area/ship/cargo)
 "hE" = (
-/obj/effect/turf_decal/industrial/outline/yellow,
-/obj/effect/spawner/lootdrop/maintenance,
-/obj/item/radio/intercom/directional/north{
-	pixel_x = 10
-	},
-/obj/machinery/light_switch{
-	pixel_x = -5;
-	pixel_y = 22
+/obj/structure/window/plasma/reinforced/plastitanium,
+/obj/structure/grille,
+/obj/machinery/atmospherics/pipe/simple/cyan/visible/layer2{
+	dir = 5
 	},
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
 /turf/open/floor/plating,
-/area/ship/maintenance/starboard)
+/area/ship/engineering/atmospherics)
 "hG" = (
-/turf/open/floor/plasteel/patterned,
-/area/ship/crew)
+/obj/effect/turf_decal/industrial/warning{
+	dir = 8
+	},
+/obj/item/radio,
+/obj/item/radio,
+/obj/item/radio,
+/obj/item/radio,
+/obj/item/radio,
+/obj/structure/closet/wardrobe,
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/crew/cryo)
 "hI" = (
 /obj/structure/cable{
 	icon_state = "1-4"
@@ -489,12 +503,18 @@
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
-/turf/open/floor/plating,
+/turf/open/floor/plasteel/tech,
 /area/ship/engineering)
 "hP" = (
-/obj/effect/turf_decal/industrial/loading,
 /obj/machinery/airalarm/directional/west,
-/obj/structure/ore_box,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/structure/cable{
+	icon_state = "2-4"
+	},
 /turf/open/floor/plasteel/tech/techmaint,
 /area/ship/cargo)
 "hR" = (
@@ -511,17 +531,17 @@
 /turf/open/floor/plasteel/dark,
 /area/ship/crew/canteen)
 "ib" = (
-/obj/item/mecha_parts/part/ripley_left_leg{
-	pixel_x = 2;
-	pixel_y = -6
-	},
-/obj/item/mecha_parts/part/ripley_right_arm{
+/obj/item/stock_parts/cell/super,
+/obj/item/mecha_parts/mecha_equipment/hydraulic_clamp{
 	pixel_x = -7;
-	pixel_y = 6
+	pixel_y = -5
 	},
-/obj/effect/turf_decal/box/corners,
-/obj/item/stock_parts/cell/super,
-/turf/open/floor/plasteel/tech,
+/obj/item/mecha_parts/part/ripley_right_leg{
+	pixel_x = 5;
+	pixel_y = 9
+	},
+/obj/item/mecha_parts/mecha_equipment/mining_scanner,
+/turf/open/floor/plasteel/tech/techmaint,
 /area/ship/cargo)
 "id" = (
 /obj/structure/cable{
@@ -545,15 +565,10 @@
 /turf/open/floor/plasteel/dark,
 /area/ship/medical)
 "ie" = (
-/obj/machinery/door/firedoor/border_only,
-/obj/machinery/door/firedoor/border_only{
-	dir = 1
-	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/machinery/door/airlock/maintenance,
-/turf/open/floor/plasteel/tech,
-/area/ship/construction)
+/turf/open/floor/plating,
+/area/ship/maintenance/fore)
 "if" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
@@ -565,12 +580,12 @@
 	pixel_x = 20;
 	pixel_y = 5
 	},
+/obj/structure/cable{
+	icon_state = "2-8"
+	},
 /turf/open/floor/plasteel/grimy,
-/area/ship/crew)
+/area/ship/crew/dorm)
 "ik" = (
-/obj/machinery/door/airlock/maintenance_hatch{
-	dir = 4
-	},
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
@@ -586,8 +601,11 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 4
 	},
+/obj/machinery/door/airlock/maintenance_hatch{
+	dir = 4
+	},
 /turf/open/floor/plasteel/tech,
-/area/ship/maintenance/starboard)
+/area/ship/engineering)
 "ir" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
@@ -608,27 +626,33 @@
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
 	dir = 8
 	},
-/obj/effect/turf_decal/industrial/warning{
-	dir = 8
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/light_switch{
+	dir = 4;
+	pixel_x = -20;
+	pixel_y = 5
 	},
 /turf/open/floor/plasteel/tech,
 /area/ship/engineering)
 "iC" = (
-/turf/closed/wall/mineral/plastitanium,
-/area/ship/cargo)
-"iD" = (
-/turf/closed/wall/mineral/plastitanium,
-/area/ship/engineering/communications)
+/obj/machinery/power/apc/auto_name/directional/west,
+/obj/structure/cable{
+	icon_state = "0-2"
+	},
+/turf/open/floor/plating,
+/area/ship/maintenance/fore)
 "iP" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
 	dir = 8
 	},
-/obj/effect/turf_decal/number/zero{
-	dir = 4
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/structure/cable{
+	icon_state = "1-2"
 	},
 /turf/open/floor/plating,
-/area/ship/construction)
+/area/ship/maintenance/fore)
 "iR" = (
 /obj/effect/turf_decal/borderfloor{
 	dir = 4
@@ -641,15 +665,16 @@
 	},
 /obj/item/storage/backpack/satchel/med,
 /obj/item/clothing/shoes/sneakers/white,
-/obj/item/clothing/under/rank/medical/doctor,
-/obj/item/clothing/suit/toggle/labcoat,
-/obj/item/clothing/glasses/hud/health,
+/obj/item/clothing/under/rank/medical/doctor/blue,
 /obj/effect/turf_decal/corner/opaque/green{
 	dir = 8
 	},
 /obj/effect/turf_decal/corner/opaque/green{
 	dir = 1
 	},
+/obj/item/clothing/under/rank/medical/doctor/green,
+/obj/item/clothing/under/rank/medical/doctor/purple,
+/obj/item/clothing/under/rank/medical/doctor/red,
 /turf/open/floor/plasteel/dark,
 /area/ship/medical)
 "iT" = (
@@ -663,74 +688,84 @@
 /turf/open/floor/plating,
 /area/ship/construction)
 "iU" = (
+/obj/machinery/airalarm/directional/north,
 /turf/open/floor/plasteel,
 /area/ship/construction)
 "ji" = (
 /obj/structure/cable{
-	icon_state = "2-8"
+	icon_state = "1-2"
 	},
-/obj/effect/turf_decal/box/corners,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 6
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/structure/cable{
-	icon_state = "1-2"
+	dir = 4
 	},
-/turf/open/floor/plasteel/tech,
+/turf/open/floor/plasteel/tech/techmaint,
 /area/ship/cargo)
-"jl" = (
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/effect/turf_decal/corner_steel_grid{
-	dir = 8
-	},
-/obj/effect/turf_decal/corner_steel_grid,
-/turf/open/floor/plasteel,
-/area/ship/engineering/communications)
-"jm" = (
+"jn" = (
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 8
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 4
+	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 4
 	},
-/obj/structure/catwalk/over,
-/turf/open/floor/plating,
-/area/ship/maintenance/port)
+/obj/machinery/door/airlock/atmos{
+	dir = 4;
+	name = "Atmospherics";
+	req_access_txt = "10"
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/engineering)
 "jp" = (
 /obj/machinery/light/small/directional/south,
 /obj/structure/cable/yellow,
 /obj/effect/turf_decal/industrial/hatch/yellow,
 /obj/machinery/power/port_gen/pacman,
 /turf/open/floor/plasteel/dark,
-/area/ship/engineering)
+/area/ship/engineering/engine)
 "jq" = (
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
-/obj/structure/sign/poster/contraband/random{
-	pixel_x = -32
-	},
 /obj/machinery/navbeacon/wayfinding/atmos{
 	name = "navigation beacon"
 	},
 /obj/structure/catwalk/over,
+/obj/structure/cable{
+	icon_state = "2-4"
+	},
+/obj/machinery/atmospherics/pipe/simple/green/visible,
+/obj/machinery/firealarm/directional/west,
+/obj/machinery/light_switch{
+	dir = 4;
+	pixel_x = -20;
+	pixel_y = 12
+	},
 /turf/open/floor/plating,
 /area/ship/engineering/atmospherics)
 "js" = (
-/obj/structure/window/plasma/reinforced/plastitanium,
-/obj/structure/grille,
-/turf/open/floor/plating,
-/area/ship/engineering/communications)
+/obj/effect/turf_decal/corner_steel_grid,
+/obj/effect/turf_decal/corner_steel_grid{
+	dir = 8
+	},
+/obj/structure/reagent_dispensers/water_cooler,
+/obj/machinery/light/directional/north,
+/turf/open/floor/plasteel/tech/techmaint,
+/area/ship/crew)
 "jx" = (
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/machinery/power/apc/auto_name/directional/north,
+/obj/structure/cable{
+	icon_state = "0-4"
+	},
 /turf/open/floor/plasteel/tech,
-/area/ship/engineering)
+/area/ship/engineering/engine)
 "jy" = (
 /obj/machinery/atmospherics/components/unary/shuttle/heater{
 	dir = 1
@@ -750,40 +785,42 @@
 	},
 /turf/open/floor/plating,
 /area/ship/maintenance/port)
+"jC" = (
+/obj/structure/window/plasma/reinforced/plastitanium,
+/obj/structure/grille,
+/turf/open/floor/plating,
+/area/ship/hallway/central)
 "jG" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
 	dir = 8
 	},
 /obj/structure/table,
 /obj/item/storage/toolbox/electrical,
-/obj/item/clothing/gloves/color/yellow{
-	pixel_y = 9
-	},
 /obj/item/clothing/gloves/color/yellow{
 	pixel_y = 9
 	},
 /obj/item/multitool,
-/turf/open/floor/plating,
+/turf/open/floor/plasteel/tech,
 /area/ship/engineering)
 "jH" = (
-/obj/structure/chair/office/light,
-/obj/effect/landmark/start/roboticist,
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
-/obj/machinery/navbeacon/wayfinding/research{
-	name = "navigation beacon"
+/obj/effect/landmark/start/shaft_miner,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 6
 	},
-/turf/open/floor/plasteel/tech/grid,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 10
+	},
+/turf/open/floor/plasteel/tech/techmaint,
 /area/ship/hallway/central)
 "jI" = (
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/machinery/atmospherics/pipe/simple/green/visible{
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/green/hidden{
 	dir = 10
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/structure/catwalk/over,
 /turf/open/floor/plating,
 /area/ship/construction)
 "jL" = (
@@ -798,19 +835,24 @@
 /turf/open/floor/plasteel/mono/white,
 /area/ship/medical)
 "jS" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/mineral/ore_redemption,
-/obj/effect/turf_decal/industrial/hatch/yellow,
-/turf/open/floor/plasteel/dark,
-/area/ship/cargo)
-"jW" = (
+/obj/machinery/door/firedoor/border_only{
+	dir = 1
+	},
+/obj/machinery/door/firedoor/border_only,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /obj/structure/cable{
-	icon_state = "2-8"
+	icon_state = "1-2"
 	},
-/obj/effect/spawner/lootdrop/maintenance,
-/obj/machinery/firealarm/directional/east,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/door/airlock/mining/glass{
+	name = "Mech Bay"
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/cargo)
+"jW" = (
+/obj/machinery/light/small/directional/east,
 /turf/open/floor/plating,
-/area/ship/maintenance/starboard)
+/area/ship/maintenance/fore)
 "jZ" = (
 /obj/machinery/mech_bay_recharge_port{
 	dir = 1
@@ -820,7 +862,7 @@
 "kj" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
 /turf/open/floor/plating,
-/area/ship/construction)
+/area/ship/maintenance/fore)
 "kC" = (
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
 /area/ship/engineering)
@@ -837,16 +879,25 @@
 	},
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
 /obj/structure/catwalk/over,
+/obj/machinery/atmospherics/pipe/simple/green/visible{
+	dir = 5
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 6
+	},
+/obj/item/radio/intercom/directional/west,
 /turf/open/floor/plating,
 /area/ship/engineering/atmospherics)
 "lc" = (
+/obj/machinery/light/small/directional/east,
+/obj/effect/turf_decal/industrial/outline/yellow,
 /obj/structure/cable{
-	icon_state = "1-2"
+	icon_state = "2-8"
 	},
-/obj/structure/sign/poster/contraband/random{
-	pixel_x = 32
+/obj/structure/cable{
+	icon_state = "0-8"
 	},
-/obj/machinery/light/small/directional/east,
+/obj/machinery/power/apc/auto_name/directional/north,
 /turf/open/floor/plating,
 /area/ship/maintenance/starboard)
 "lf" = (
@@ -854,39 +905,35 @@
 /area/ship/engineering/atmospherics)
 "lp" = (
 /obj/structure/cable{
-	icon_state = "2-4"
+	icon_state = "4-8"
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 5
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 9
 	},
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
-/turf/open/floor/plasteel/mono,
-/area/ship/engineering/communications)
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
+/turf/open/floor/plasteel/grimy,
+/area/ship/crew)
 "lx" = (
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
-/obj/effect/turf_decal/corner_steel_grid,
 /obj/effect/turf_decal/corner_steel_grid{
-	dir = 8
+	dir = 1
 	},
-/turf/open/floor/plasteel,
+/obj/effect/turf_decal/corner_steel_grid{
+	dir = 4
+	},
+/turf/open/floor/plasteel/tech/techmaint,
 /area/ship/hallway/central)
 "lH" = (
-/obj/machinery/door/airlock/maintenance{
-	name = "Starboard Thrusters"
-	},
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
-/obj/machinery/door/firedoor/border_only{
-	dir = 1
-	},
-/obj/machinery/door/firedoor/border_only,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/turf/open/floor/plasteel/tech,
-/area/ship/maintenance/starboard)
+/obj/structure/catwalk/over,
+/turf/open/floor/plating,
+/area/ship/engineering/atmospherics)
 "lM" = (
 /obj/machinery/atmospherics/components/binary/valve/digital{
 	dir = 4
@@ -928,43 +975,11 @@
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
 "my" = (
-/obj/item/reagent_containers/food/snacks/canned/beans{
-	pixel_x = -5;
-	pixel_y = 3
-	},
-/obj/item/reagent_containers/food/snacks/canned/beans{
-	pixel_x = 2;
-	pixel_y = 3
-	},
-/obj/item/reagent_containers/food/snacks/canned/beans{
-	pixel_x = -2
-	},
-/obj/item/reagent_containers/food/drinks/waterbottle/large{
-	pixel_x = 5
-	},
-/obj/item/reagent_containers/food/drinks/waterbottle/large{
-	pixel_x = 1;
-	pixel_y = -3
-	},
-/obj/item/reagent_containers/food/drinks/waterbottle/large{
-	pixel_x = 8;
-	pixel_y = -3
-	},
-/obj/structure/closet/crate{
-	name = "food crate"
-	},
-/obj/item/storage/cans/sixbeer,
-/obj/effect/spawner/lootdrop/ration,
-/obj/effect/spawner/lootdrop/ration,
-/obj/effect/spawner/lootdrop/ration,
-/obj/effect/spawner/lootdrop/ration,
-/obj/effect/spawner/lootdrop/ration,
-/obj/effect/spawner/lootdrop/ration,
-/obj/effect/turf_decal/box/corners{
-	dir = 1
-	},
 /obj/machinery/light/small/directional/west,
-/turf/open/floor/plasteel/tech,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 6
+	},
+/turf/open/floor/plasteel/tech/techmaint,
 /area/ship/cargo)
 "mz" = (
 /obj/item/paper_bin,
@@ -989,16 +1004,16 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 4
 	},
+/obj/structure/catwalk/over,
+/obj/structure/cable{
+	icon_state = "2-8"
+	},
 /obj/structure/closet/emcloset/wall{
 	pixel_y = 28
 	},
-/obj/structure/catwalk/over,
 /turf/open/floor/plating,
-/area/ship/engineering)
+/area/ship/maintenance/central)
 "mH" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 6
-	},
 /obj/structure/closet/secure_closet/wall{
 	icon_state = "sec_wall";
 	name = "firearms locker";
@@ -1007,6 +1022,15 @@
 	},
 /obj/item/gun/ballistic/shotgun/flamingarrow,
 /obj/item/gun/ballistic/automatic/pistol/candor,
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 10
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 4
+	},
 /turf/open/floor/plasteel/dark,
 /area/ship/security)
 "mJ" = (
@@ -1018,18 +1042,8 @@
 	},
 /obj/effect/turf_decal/industrial/warning,
 /obj/item/wrench/crescent,
-/obj/structure/catwalk/over,
-/turf/open/floor/plating,
-/area/ship/engineering)
-"mK" = (
-/obj/structure/grille,
-/obj/machinery/door/poddoor/shutters{
-	id = "riggerwindows";
-	name = "Blast Shutters"
-	},
-/obj/structure/window/plasma/reinforced/plastitanium,
-/turf/open/floor/plating,
-/area/ship/crew/office)
+/turf/open/floor/plasteel/tech,
+/area/ship/engineering/engine)
 "mW" = (
 /obj/machinery/door/firedoor/border_only{
 	dir = 8
@@ -1050,25 +1064,22 @@
 /turf/open/floor/plasteel/dark,
 /area/ship/medical)
 "mY" = (
-/turf/open/floor/plating,
+/turf/open/floor/plasteel/tech,
 /area/ship/maintenance/port)
 "mZ" = (
-/obj/item/radio/intercom/directional/south,
-/obj/structure/chair{
-	dir = 1
+/obj/effect/turf_decal/corner_steel_grid{
+	dir = 4
 	},
+/obj/effect/turf_decal/corner_steel_grid,
+/obj/machinery/firealarm/directional/south,
 /turf/open/floor/plasteel/tech/techmaint,
 /area/ship/hallway/central)
 "ng" = (
-/obj/machinery/power/apc/auto_name/directional/south,
-/obj/structure/cable,
-/obj/structure/chair{
-	dir = 1
-	},
-/turf/open/floor/plasteel/tech/techmaint,
-/area/ship/engineering/communications)
+/obj/machinery/vending/cigarette,
+/obj/machinery/light/directional/south,
+/turf/open/floor/plasteel/grimy,
+/area/ship/crew)
 "nm" = (
-/obj/item/multitool,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /obj/structure/cable{
@@ -1091,43 +1102,47 @@
 	},
 /turf/open/floor/plasteel/tech/techmaint,
 /area/ship/engineering)
-"nS" = (
-/turf/open/floor/plating,
-/area/ship/crew/office)
 "nU" = (
-/obj/structure/table,
 /obj/machinery/light/directional/west,
 /obj/effect/turf_decal/corner/opaque/yellow/diagonal,
-/obj/item/storage/cans/sixbeer,
+/obj/machinery/vending/snack/random,
 /turf/open/floor/plasteel/white,
 /area/ship/crew/canteen)
 "od" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/turf/open/floor/plasteel/grimy,
-/area/ship/crew)
-"oh" = (
-/turf/closed/wall/mineral/plastitanium,
-/area/ship/hallway/central)
-"oy" = (
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
-/obj/machinery/light/small/directional/east,
-/turf/open/floor/plating,
-/area/ship/crew/office)
+/turf/open/floor/plasteel/grimy,
+/area/ship/crew/dorm)
+"oy" = (
+/obj/structure/sink{
+	dir = 8;
+	pixel_x = 12
+	},
+/obj/structure/mirror{
+	pixel_x = 25
+	},
+/obj/machinery/light_switch{
+	dir = 1;
+	pixel_x = -5;
+	pixel_y = -20
+	},
+/turf/open/floor/plasteel/patterned,
+/area/ship/crew/toilet)
 "oz" = (
-/obj/machinery/firealarm/directional/south,
-/obj/structure/closet/emcloset,
 /obj/machinery/light/small/directional/east,
 /turf/open/floor/plating,
 /area/ship/construction)
 "oO" = (
 /obj/structure/chair/office,
 /obj/effect/landmark/start/security_officer,
-/obj/machinery/navbeacon/wayfinding/sec{
-	location = "Armory";
-	name = "navigation beacon"
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+	dir = 1
 	},
 /turf/open/floor/plasteel/grimy,
 /area/ship/security)
@@ -1150,25 +1165,24 @@
 "oX" = (
 /obj/effect/spawner/lootdrop/maintenance,
 /turf/open/floor/plating,
-/area/ship/construction)
+/area/ship/maintenance/fore)
 "ph" = (
 /obj/machinery/power/apc/auto_name/directional/north,
+/obj/machinery/washing_machine,
 /obj/structure/cable{
-	icon_state = "0-2"
-	},
-/obj/structure/chair{
-	dir = 8
+	icon_state = "0-8"
 	},
-/turf/open/floor/plating,
-/area/ship/crew/office)
+/turf/open/floor/plasteel/patterned,
+/area/ship/crew/toilet)
 "pt" = (
 /obj/effect/turf_decal/industrial/outline/yellow,
 /obj/machinery/computer/helm,
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
 "pv" = (
-/obj/structure/table,
 /obj/effect/turf_decal/corner/opaque/yellow/diagonal,
+/obj/structure/table,
+/obj/item/kitchen/knife,
 /turf/open/floor/plasteel/white,
 /area/ship/crew/canteen)
 "pD" = (
@@ -1179,41 +1193,29 @@
 /turf/open/floor/plasteel/dark,
 /area/ship/medical)
 "pE" = (
-/obj/machinery/door/airlock/maintenance,
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
-/obj/machinery/door/firedoor/border_only{
-	dir = 1
-	},
-/obj/machinery/door/firedoor/border_only,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/machinery/atmospherics/pipe/simple/green/visible,
-/turf/open/floor/plasteel/tech,
+/obj/machinery/atmospherics/pipe/simple/green/hidden,
+/turf/open/floor/plating,
 /area/ship/construction)
 "pO" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
 	dir = 8
 	},
-/obj/machinery/navbeacon/wayfinding/cargo{
-	name = "navigation beacon"
-	},
-/turf/open/floor/plasteel/tech/techmaint,
+/obj/structure/reagent_dispensers/fueltank,
+/turf/open/floor/plasteel/tech,
 /area/ship/cargo)
 "pP" = (
-/obj/structure/closet/cabinet,
-/obj/item/clothing/under/utility,
-/obj/item/clothing/under/utility,
-/obj/item/clothing/under/utility,
-/obj/item/clothing/under/utility/skirt,
-/obj/item/clothing/under/utility/skirt,
-/obj/item/clothing/under/utility/skirt,
-/mob/living/simple_animal/pet/cat{
-	name = "Jonesy"
+/obj/structure/table/wood,
+/obj/item/flashlight/lamp/green{
+	pixel_x = 6;
+	pixel_y = 10
 	},
 /turf/open/floor/plasteel/grimy,
-/area/ship/crew)
+/area/ship/crew/dorm)
 "pT" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -1223,30 +1225,21 @@
 	dir = 8
 	},
 /turf/open/floor/plasteel/grimy,
-/area/ship/crew)
+/area/ship/crew/dorm)
 "qa" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 9
-	},
-/obj/effect/turf_decal/corner/opaque/purple/half,
-/obj/effect/turf_decal/techfloor{
-	dir = 1
-	},
-/obj/machinery/door/window/southright{
-	name = "Science Officer's Desk"
+/obj/effect/turf_decal/industrial/outline/yellow,
+/obj/structure/ore_box,
+/obj/machinery/light_switch{
+	dir = 1;
+	pixel_x = -7;
+	pixel_y = -20
 	},
-/obj/machinery/autolathe,
-/turf/open/floor/plasteel/tech,
+/turf/open/floor/plasteel/tech/techmaint,
 /area/ship/hallway/central)
 "qd" = (
 /turf/closed/wall/mineral/plastitanium,
 /area/ship/bridge)
 "qe" = (
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /obj/effect/turf_decal/corner/opaque/brown/border{
 	dir = 1
 	},
@@ -1256,10 +1249,11 @@
 /turf/closed/wall/mineral/plastitanium,
 /area/ship/maintenance/starboard)
 "qo" = (
-/obj/effect/turf_decal/corner_steel_grid{
-	dir = 8
+/obj/machinery/light_switch{
+	dir = 8;
+	pixel_x = 20;
+	pixel_y = 10
 	},
-/obj/effect/turf_decal/corner_steel_grid,
 /turf/open/floor/plasteel,
 /area/ship/hallway/central)
 "qu" = (
@@ -1269,14 +1263,18 @@
 /obj/effect/turf_decal/corner/opaque/blue/half{
 	dir = 1
 	},
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
-	dir = 4
-	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 9
 	},
+/obj/effect/turf_decal/corner_steel_grid,
+/obj/effect/turf_decal/corner_steel_grid{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 9
+	},
 /turf/open/floor/plasteel,
-/area/ship/engineering/communications)
+/area/ship/crew)
 "qE" = (
 /obj/machinery/airalarm/directional/north,
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
@@ -1286,8 +1284,11 @@
 "qI" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
 /turf/open/floor/plasteel/patterned,
-/area/ship/crew)
+/area/ship/crew/cryo)
 "qQ" = (
 /obj/effect/turf_decal/industrial/warning{
 	dir = 1
@@ -1330,46 +1331,40 @@
 /obj/machinery/navbeacon/wayfinding/dorms{
 	name = "navigation beacon"
 	},
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
 /turf/open/floor/plasteel/grimy,
-/area/ship/crew)
+/area/ship/crew/dorm)
 "rm" = (
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 4
 	},
-/obj/machinery/navbeacon/wayfinding/med{
-	name = "navigation beacon"
-	},
 /obj/effect/turf_decal/corner/opaque/white/mono,
 /obj/effect/turf_decal/corner/opaque/green/border{
 	dir = 10
 	},
+/obj/machinery/navbeacon{
+	codes_txt = "patrol;next_patrol=canteen";
+	location = "med"
+	},
 /turf/open/floor/plasteel/mono/white,
 /area/ship/medical)
 "rr" = (
-/obj/structure/cable{
-	icon_state = "1-4"
-	},
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
-/obj/structure/closet/crate,
-/obj/item/radio,
-/obj/item/radio,
-/obj/item/radio,
-/obj/item/radio,
-/obj/item/radio,
-/obj/item/radio,
-/obj/item/radio,
-/obj/item/radio,
-/obj/item/radio,
-/obj/item/radio,
-/obj/item/radio,
-/obj/item/radio,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 5
+/obj/machinery/door/airlock/maintenance{
+	name = "Starboard Thrusters"
 	},
-/turf/open/floor/plating,
+/obj/machinery/door/firedoor/border_only,
+/obj/machinery/door/firedoor/border_only{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/turf/open/floor/plasteel/tech,
 /area/ship/maintenance/starboard)
 "ru" = (
 /obj/machinery/power/apc/auto_name/directional/east,
@@ -1394,15 +1389,9 @@
 /obj/machinery/power/smes/engineering,
 /obj/effect/turf_decal/industrial/hatch/yellow,
 /obj/structure/cable,
-/obj/structure/window/reinforced{
-	dir = 4
-	},
-/obj/structure/window/reinforced{
-	dir = 1
-	},
 /obj/structure/catwalk/over,
 /turf/open/floor/plating,
-/area/ship/engineering)
+/area/ship/engineering/engine)
 "rH" = (
 /obj/structure/filingcabinet/medical,
 /obj/machinery/airalarm/directional/south,
@@ -1417,16 +1406,15 @@
 "rZ" = (
 /obj/structure/reagent_dispensers/fueltank,
 /obj/effect/turf_decal/industrial/outline/yellow,
-/turf/open/floor/plating,
+/obj/structure/sign/warning/nosmoking{
+	pixel_y = 32
+	},
+/turf/open/floor/plasteel/tech,
 /area/ship/maintenance/port)
 "sa" = (
-/obj/machinery/atmospherics/pipe/manifold/cyan/visible/layer2{
-	dir = 4
-	},
+/obj/machinery/atmospherics/pipe/simple/yellow/visible/layer4,
+/obj/machinery/atmospherics/components/binary/valve/digital,
 /obj/machinery/light/small/directional/east,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 9
-	},
 /turf/open/floor/plating,
 /area/ship/engineering/atmospherics)
 "sb" = (
@@ -1435,19 +1423,7 @@
 	},
 /turf/open/floor/engine/hull,
 /area/ship/external)
-"sj" = (
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
-	dir = 1
-	},
-/turf/open/floor/plasteel/mono,
-/area/ship/engineering/communications)
 "sq" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 4
-	},
 /obj/structure/closet/wall{
 	icon_door = "red_wall";
 	name = "security closet";
@@ -1460,6 +1436,12 @@
 /obj/item/clothing/glasses/hud/security/sunglasses,
 /obj/item/clothing/suit/armor/vest/duster,
 /obj/item/clothing/head/cowboy/sec,
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 4
+	},
 /turf/open/floor/plasteel/grimy,
 /area/ship/security)
 "sy" = (
@@ -1475,12 +1457,21 @@
 /obj/effect/turf_decal/corner/opaque/red/border{
 	dir = 8
 	},
+/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
+	},
 /turf/open/floor/plasteel/dark,
 /area/ship/security)
 "sL" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
-/turf/open/floor/plasteel/mono,
-/area/ship/crew/office)
+/turf/open/floor/plasteel/grimy,
+/area/ship/crew)
 "sQ" = (
 /obj/structure/grille,
 /obj/machinery/door/poddoor/shutters{
@@ -1515,12 +1506,11 @@
 /turf/open/floor/engine/hull/interior,
 /area/ship/cargo)
 "sV" = (
-/obj/effect/turf_decal/corner_steel_grid{
-	dir = 8
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+	dir = 1
 	},
-/obj/effect/turf_decal/corner_steel_grid,
-/turf/open/floor/plasteel,
-/area/ship/engineering/communications)
+/turf/open/floor/plasteel/grimy,
+/area/ship/crew)
 "th" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -1534,14 +1524,16 @@
 /obj/machinery/light/small/directional/north,
 /obj/structure/catwalk/over,
 /turf/open/floor/plating,
-/area/ship/maintenance/starboard)
+/area/ship/engineering)
 "tx" = (
 /obj/structure/cable{
 	icon_state = "1-8"
 	},
-/obj/structure/chair{
-	dir = 1
-	},
+/obj/structure/rack,
+/obj/item/stack/sheet/metal/twenty,
+/obj/item/stack/sheet/glass/twenty,
+/obj/effect/turf_decal/industrial/outline/yellow,
+/obj/item/radio/intercom/directional/south,
 /turf/open/floor/plasteel/tech/techmaint,
 /area/ship/hallway/central)
 "tE" = (
@@ -1549,10 +1541,13 @@
 	dir = 8
 	},
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
 /turf/open/floor/plasteel/grimy,
-/area/ship/crew)
+/area/ship/crew/dorm)
 "tM" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
+/obj/machinery/atmospherics/components/unary/vent_pump/siphon/on{
 	dir = 4
 	},
 /turf/open/floor/engine/hull,
@@ -1590,13 +1585,7 @@
 	dir = 4
 	},
 /obj/structure/catwalk/over,
-/obj/structure/extinguisher_cabinet/directional/north{
-	pixel_x = 5
-	},
-/obj/machinery/light_switch{
-	pixel_x = -5;
-	pixel_y = 22
-	},
+/obj/structure/extinguisher_cabinet/directional/north,
 /turf/open/floor/plating,
 /area/ship/engineering)
 "uk" = (
@@ -1616,14 +1605,9 @@
 	pixel_y = 28
 	},
 /obj/item/storage/backpack/industrial,
-/obj/item/storage/backpack/industrial,
 /obj/item/clothing/shoes/workboots,
-/obj/item/clothing/shoes/workboots,
-/obj/item/clothing/under/rank/engineering/engineer,
 /obj/item/clothing/under/rank/engineering/engineer,
 /obj/item/clothing/suit/toggle/hazard,
-/obj/item/clothing/suit/toggle/hazard,
-/obj/item/clothing/head/hardhat/dblue,
 /obj/item/clothing/head/hardhat/dblue,
 /turf/open/floor/plating,
 /area/ship/engineering)
@@ -1641,16 +1625,12 @@
 /obj/effect/turf_decal/corner/opaque/blue/border{
 	dir = 8
 	},
+/obj/machinery/airalarm/directional/east,
 /turf/open/floor/plasteel/dark,
-/area/ship/engineering/communications)
+/area/ship/bridge)
 "uC" = (
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/components/binary/valve/digital/on/layer2,
-/obj/machinery/atmospherics/pipe/simple/yellow/visible/layer4,
-/turf/open/floor/plating,
-/area/ship/engineering/atmospherics)
+/turf/closed/wall/mineral/plastitanium,
+/area/ship/crew/dorm)
 "uI" = (
 /obj/structure/grille,
 /obj/machinery/door/poddoor/shutters{
@@ -1664,11 +1644,10 @@
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
 /area/ship/maintenance/port)
 "va" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
-	dir = 8
-	},
+/obj/structure/window/plasma/reinforced/plastitanium,
+/obj/structure/grille,
 /turf/open/floor/plating,
-/area/ship/maintenance/starboard)
+/area/ship/engineering/atmospherics)
 "ve" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 4
@@ -1692,10 +1671,10 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 4
 	},
-/obj/machinery/light/small/directional/north,
 /obj/structure/catwalk/over,
+/obj/machinery/airalarm/directional/north,
 /turf/open/floor/plating,
-/area/ship/maintenance/port)
+/area/ship/maintenance/central)
 "vm" = (
 /turf/open/floor/engine/hull,
 /area/ship/external)
@@ -1703,72 +1682,57 @@
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
-/obj/structure/catwalk/over/plated_catwalk/dark,
+/obj/structure/window/plasma/reinforced/plastitanium,
+/obj/structure/grille,
 /turf/open/floor/plating,
-/area/ship/engineering)
+/area/ship/maintenance/central)
 "vo" = (
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
-/obj/structure/cable{
-	icon_state = "2-8"
-	},
-/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2,
-/obj/machinery/atmospherics/pipe/simple/green/visible{
-	dir = 5
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 9
-	},
-/obj/structure/catwalk/over,
-/turf/open/floor/plating,
-/area/ship/engineering/atmospherics)
-"vt" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
-/turf/open/floor/plasteel/mono,
-/area/ship/engineering/communications)
-"vw" = (
-/obj/item/pen,
-/turf/open/floor/plasteel/grimy,
-/area/ship/crew/office)
-"vB" = (
-/obj/machinery/airalarm/directional/west,
-/obj/effect/turf_decal/industrial/outline/yellow,
-/turf/open/floor/plating,
-/area/ship/maintenance/starboard)
-"vN" = (
-/obj/structure/window/reinforced/spawner,
-/obj/structure/window/reinforced/spawner/west{
-	dir = 4
-	},
-/obj/item/kirbyplants/random,
-/obj/item/toy/prize/deathripley,
-/obj/effect/turf_decal/corner/opaque/purple,
-/obj/effect/turf_decal/corner/opaque/purple{
-	dir = 4
-	},
-/obj/effect/turf_decal/corner/opaque/purple{
-	dir = 8
+/obj/structure/cable{
+	icon_state = "2-8"
 	},
-/obj/effect/turf_decal/techfloor/corner{
-	dir = 1
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 9
 	},
-/turf/open/floor/plasteel/tech,
-/area/ship/hallway/central)
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/green/hidden,
+/obj/effect/turf_decal/industrial/warning,
+/turf/open/floor/plasteel,
+/area/ship/construction)
+"vw" = (
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/turf/open/floor/plasteel/patterned,
+/area/ship/crew/toilet)
+"vB" = (
+/turf/closed/wall/mineral/plastitanium/nodiagonal,
+/area/ship/crew/dorm)
+"vO" = (
+/turf/closed/wall/mineral/plastitanium,
+/area/ship/engineering/engine)
 "vR" = (
 /obj/structure/cable{
-	icon_state = "1-8"
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 4
 	},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
+/obj/structure/chair/plastic,
+/turf/open/floor/plasteel/grimy,
+/area/ship/crew)
+"vW" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 9
 	},
-/turf/open/floor/plasteel/mono,
-/area/ship/crew/office)
-"vW" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 9
+	},
 /turf/open/floor/plating,
-/area/ship/construction)
+/area/ship/maintenance/fore)
 "wg" = (
 /obj/machinery/atmospherics/components/unary/shuttle/heater{
 	dir = 1
@@ -1802,24 +1766,34 @@
 /turf/open/floor/plasteel/mono/white,
 /area/ship/medical)
 "wk" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 5
+/obj/structure/cable{
+	icon_state = "4-8"
 	},
-/turf/open/floor/plasteel/mono,
-/area/ship/engineering/communications)
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+	dir = 1
+	},
+/turf/open/floor/plasteel/grimy,
+/area/ship/crew)
+"wn" = (
+/obj/structure/sign/number/random{
+	dir = 4
+	},
+/turf/closed/wall/mineral/plastitanium/nodiagonal,
+/area/ship/maintenance/starboard)
 "wo" = (
 /obj/structure/table,
 /obj/machinery/cell_charger,
 /obj/item/stock_parts/cell/high,
 /obj/item/stock_parts/cell/high,
 /obj/item/stock_parts/cell/high,
-/turf/open/floor/plating,
+/turf/open/floor/plasteel/tech,
 /area/ship/engineering)
 "wp" = (
-/obj/machinery/atmospherics/pipe/manifold/cyan/visible/layer2{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/yellow/visible/layer4,
+/obj/machinery/atmospherics/components/binary/valve/digital/on/layer2,
 /turf/open/floor/plating,
 /area/ship/engineering/atmospherics)
 "wB" = (
@@ -1847,27 +1821,20 @@
 /obj/structure/catwalk/over,
 /obj/item/multitool,
 /turf/open/floor/plating,
-/area/ship/engineering)
+/area/ship/maintenance/central)
 "wZ" = (
 /obj/item/mecha_parts/part/ripley_torso,
-/obj/effect/turf_decal/box/corners{
-	dir = 8
+/obj/item/mecha_parts/part/ripley_left_arm{
+	pixel_x = -10;
+	pixel_y = -11
 	},
-/turf/open/floor/plasteel/tech,
+/turf/open/floor/plasteel/tech/techmaint,
 /area/ship/cargo)
 "xg" = (
-/obj/machinery/atmospherics/components/unary/tank/air{
-	dir = 1;
-	piping_layer = 2
-	},
-/obj/effect/turf_decal/industrial/hatch/yellow,
+/obj/machinery/atmospherics/pipe/layer_manifold,
 /turf/open/floor/plating,
 /area/ship/engineering/atmospherics)
 "xl" = (
-/obj/machinery/power/apc/auto_name/directional/west,
-/obj/structure/cable{
-	icon_state = "0-2"
-	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /obj/machinery/light_switch{
@@ -1875,21 +1842,23 @@
 	pixel_x = -20;
 	pixel_y = 12
 	},
-/turf/open/floor/plating,
-/area/ship/construction)
-"xn" = (
-/obj/item/mop,
-/obj/item/storage/bag/trash{
-	pixel_x = 6
+/obj/structure/cable{
+	icon_state = "2-4"
 	},
-/obj/effect/turf_decal/kfp_small/left{
-	dir = 8
+/obj/structure/cable{
+	icon_state = "1-2"
 	},
 /turf/open/floor/plating,
 /area/ship/construction)
+"xn" = (
+/turf/open/floor/plasteel,
+/area/ship/maintenance/fore)
 "xp" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/effect/turf_decal/corner/opaque/brown/border{
+	dir = 1
+	},
 /turf/open/floor/plasteel/mono,
 /area/ship/hallway/central)
 "xD" = (
@@ -1909,7 +1878,7 @@
 	pixel_y = 5
 	},
 /turf/open/floor/plasteel/dark,
-/area/ship/engineering/communications)
+/area/ship/bridge)
 "xH" = (
 /obj/machinery/atmospherics/components/binary/pump{
 	name = "engine fuel pump"
@@ -1917,8 +1886,14 @@
 /turf/open/floor/plating,
 /area/ship/maintenance/starboard)
 "xJ" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
-	dir = 1
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 5
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 5
 	},
 /turf/open/floor/plasteel/grimy,
 /area/ship/security)
@@ -1935,6 +1910,9 @@
 	dir = 8
 	},
 /obj/structure/catwalk/over,
+/obj/structure/cable{
+	icon_state = "2-8"
+	},
 /turf/open/floor/plating,
 /area/ship/engineering)
 "xO" = (
@@ -1975,30 +1953,25 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /obj/machinery/door/airlock{
-	name = "Crew Quarters"
+	name = "Dormitory"
 	},
 /turf/open/floor/plasteel/dark,
-/area/ship/crew)
+/area/ship/crew/dorm)
 "xW" = (
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
-	dir = 1
-	},
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
-	dir = 1
+/obj/structure/cable{
+	icon_state = "2-8"
 	},
 /obj/structure/cable{
-	icon_state = "2-4"
+	icon_state = "1-8"
 	},
+/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4,
 /obj/structure/cable{
-	icon_state = "2-8"
+	icon_state = "4-8"
 	},
 /turf/open/floor/plasteel/mono,
 /area/ship/hallway/central)
 "xX" = (
-/obj/machinery/navbeacon{
-	codes_txt = "patrol;next_patrol=canteen";
-	location = "med"
-	},
 /obj/effect/turf_decal/corner/opaque/blue/bordercorner,
 /obj/effect/turf_decal/corner/opaque/blue/bordercorner{
 	dir = 8
@@ -2042,16 +2015,13 @@
 /turf/open/floor/plasteel/tech,
 /area/ship/engineering)
 "yr" = (
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
-	dir = 8
+/obj/effect/turf_decal/corner/opaque/green/border{
+	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
-	dir = 8
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 4
 	},
-/obj/effect/turf_decal/corner/opaque/green/border{
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 4
 	},
 /turf/open/floor/plasteel/mono,
@@ -2086,11 +2056,18 @@
 /turf/open/floor/plasteel/mono/white,
 /area/ship/medical)
 "yJ" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
-	dir = 8
+/obj/structure/closet/cabinet,
+/obj/item/clothing/under/utility,
+/obj/item/clothing/under/utility,
+/obj/item/clothing/under/utility,
+/obj/item/clothing/under/utility/skirt,
+/obj/item/clothing/under/utility/skirt,
+/obj/item/clothing/under/utility/skirt,
+/mob/living/simple_animal/pet/cat{
+	name = "Jonesy"
 	},
-/turf/open/floor/plating,
-/area/ship/construction)
+/turf/open/floor/plasteel/grimy,
+/area/ship/crew/dorm)
 "yM" = (
 /obj/machinery/power/smes/shuttle/precharged{
 	dir = 1
@@ -2112,8 +2089,7 @@
 /area/ship/maintenance/starboard)
 "yT" = (
 /obj/machinery/airalarm/directional/east,
-/obj/effect/turf_decal/industrial/outline/yellow,
-/turf/open/floor/plating,
+/turf/open/floor/plasteel/tech,
 /area/ship/maintenance/port)
 "yV" = (
 /obj/structure/cable{
@@ -2137,24 +2113,19 @@
 /turf/open/floor/plasteel/tech/techmaint,
 /area/ship/cargo)
 "yX" = (
-/obj/structure/frame/computer,
-/obj/effect/turf_decal/corner/opaque/purple/half{
-	dir = 1
-	},
-/obj/effect/turf_decal/techfloor,
-/turf/open/floor/plasteel/tech,
+/obj/structure/weightmachine/weightlifter,
+/turf/open/floor/plasteel/tech/techmaint,
 /area/ship/hallway/central)
 "zi" = (
-/obj/structure/mirror{
-	pixel_x = 25
+/obj/machinery/light/small/directional/south,
+/obj/machinery/cryopod{
+	dir = 8
 	},
-/obj/structure/sink{
-	dir = 8;
-	pixel_x = 12
+/obj/effect/turf_decal/industrial/warning{
+	dir = 8
 	},
-/obj/machinery/light/small/directional/south,
-/turf/open/floor/plasteel/patterned,
-/area/ship/crew)
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/crew/cryo)
 "zr" = (
 /obj/structure/grille,
 /obj/machinery/door/poddoor/shutters{
@@ -2165,58 +2136,68 @@
 /turf/open/floor/plating,
 /area/ship/medical)
 "zu" = (
-/obj/effect/turf_decal/corner_steel_grid,
-/obj/effect/turf_decal/corner_steel_grid{
-	dir = 8
-	},
-/turf/open/floor/plasteel,
-/area/ship/crew/office)
-"zw" = (
-/obj/effect/turf_decal/industrial/outline/yellow,
 /obj/structure/table,
-/obj/item/storage/toolbox/electrical{
-	pixel_x = 3;
-	pixel_y = 7
-	},
-/obj/item/storage/toolbox/mechanical{
-	pixel_x = -2
+/obj/item/storage/pill_bottle/dice{
+	pixel_x = -8
 	},
-/obj/item/clothing/head/welding,
-/obj/machinery/firealarm/directional/south,
+/obj/machinery/jukebox/boombox,
+/turf/open/floor/plasteel/grimy,
+/area/ship/crew)
+"zw" = (
+/obj/machinery/computer/helm/viewscreen/directional/south,
 /turf/open/floor/plasteel/tech/techmaint,
 /area/ship/cargo)
 "zy" = (
 /obj/machinery/power/apc/auto_name/directional/west,
 /obj/structure/cable{
-	icon_state = "0-4"
+	icon_state = "0-2"
 	},
-/obj/effect/turf_decal/box/corners{
-	dir = 8
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 6
 	},
-/obj/structure/closet/crate,
-/obj/item/stack/sheet/glass/fifty,
-/obj/item/stack/sheet/metal/fifty,
-/turf/open/floor/plasteel/tech,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/turf/open/floor/plasteel/tech/techmaint,
 /area/ship/cargo)
+"zJ" = (
+/obj/machinery/atmospherics/components/binary/pump/on/layer2{
+	dir = 1;
+	name = "Air to Distro"
+	},
+/obj/item/multitool,
+/obj/machinery/atmospherics/components/binary/pump/layer4{
+	name = "Distro to Waste"
+	},
+/turf/open/floor/plating,
+/area/ship/engineering/atmospherics)
 "zS" = (
 /obj/machinery/atmospherics/pipe/simple/orange/visible{
 	dir = 10
 	},
-/turf/open/floor/plating,
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/item/radio/intercom/directional/north{
+	pixel_x = 10
+	},
+/obj/machinery/light_switch{
+	pixel_x = -5;
+	pixel_y = 22
+	},
+/turf/open/floor/plasteel/tech,
 /area/ship/maintenance/starboard)
 "zV" = (
-/obj/structure/table/wood,
-/obj/item/flashlight/lamp/green{
-	pixel_x = 6;
-	pixel_y = 10
+/obj/structure/chair/office{
+	dir = 1
 	},
 /turf/open/floor/plasteel/grimy,
-/area/ship/crew)
+/area/ship/crew/dorm)
 "Ad" = (
-/obj/effect/turf_decal/industrial/outline/yellow,
-/obj/machinery/atmospherics/components/binary/valve/digital/layer4,
+/obj/effect/turf_decal/number/two{
+	dir = 8
+	},
+/obj/item/reagent_containers/glass/bucket,
 /turf/open/floor/plating,
-/area/ship/engineering/atmospherics)
+/area/ship/construction)
 "Ai" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -2235,15 +2216,21 @@
 	},
 /obj/item/radio/intercom/directional/south,
 /obj/machinery/airalarm/directional/east,
+/obj/effect/turf_decal/industrial/hatch/yellow,
+/obj/structure/catwalk/over,
 /turf/open/floor/plating,
 /area/ship/engineering)
 "Ak" = (
 /obj/structure/sign/warning/vacuum/external{
 	pixel_y = -32
 	},
-/obj/machinery/door/window/westright{
+/obj/machinery/door/airlock/engineering{
 	dir = 4;
-	name = "Generator Room"
+	name = "Engine Room";
+	req_access_txt = "10"
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
 	},
 /turf/open/floor/plasteel/tech,
 /area/ship/engineering)
@@ -2254,19 +2241,27 @@
 /obj/machinery/computer/cargo/express,
 /obj/item/radio/intercom/directional/north,
 /turf/open/floor/carpet/blue,
-/area/ship/engineering/communications)
+/area/ship/bridge)
 "Ao" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
 /turf/open/floor/plasteel/patterned,
-/area/ship/crew)
+/area/ship/crew/cryo)
 "Ap" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
 /turf/open/floor/plating,
+/area/ship/maintenance/fore)
+"As" = (
+/obj/structure/reagent_dispensers/watertank/high,
+/obj/machinery/power/apc/auto_name/directional/north,
+/obj/structure/cable{
+	icon_state = "0-8"
+	},
+/turf/open/floor/plating,
 /area/ship/construction)
-"As" = (
-/turf/closed/wall/mineral/plastitanium,
-/area/ship/medical)
 "Ax" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -2285,9 +2280,10 @@
 	dir = 8
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/effect/turf_decal/industrial/warning{
-	dir = 8
+/obj/structure/cable{
+	icon_state = "1-2"
 	},
+/obj/machinery/light/small/directional/west,
 /turf/open/floor/plasteel/tech,
 /area/ship/engineering)
 "AQ" = (
@@ -2299,9 +2295,8 @@
 /obj/effect/turf_decal/corner/opaque/blue/border{
 	dir = 8
 	},
-/obj/machinery/airalarm/directional/east,
 /turf/open/floor/plasteel/dark,
-/area/ship/engineering/communications)
+/area/ship/bridge)
 "Bp" = (
 /obj/machinery/light/small/directional/east,
 /obj/machinery/computer/mech_bay_power_console{
@@ -2325,20 +2320,14 @@
 /turf/open/floor/plasteel,
 /area/ship/engineering)
 "BQ" = (
-/obj/machinery/airalarm/directional/east,
-/obj/machinery/atmospherics/pipe/simple/green/visible{
-	dir = 10
-	},
-/obj/machinery/atmospherics/pipe/simple/yellow/visible/layer4,
+/obj/machinery/firealarm/directional/south,
+/obj/structure/closet/emcloset,
 /turf/open/floor/plating,
-/area/ship/engineering/atmospherics)
+/area/ship/construction)
 "BX" = (
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/obj/structure/sign/warning/nosmoking{
-	pixel_y = 32
-	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 4
 	},
@@ -2348,16 +2337,22 @@
 /obj/machinery/light/small/directional/north,
 /obj/structure/catwalk/over,
 /turf/open/floor/plating,
-/area/ship/maintenance/starboard)
+/area/ship/engineering/atmospherics)
 "BZ" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "1-8"
+	},
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 4
 	},
-/turf/open/floor/plasteel/mono,
-/area/ship/crew/office)
+/turf/open/floor/plasteel/grimy,
+/area/ship/crew)
 "Cc" = (
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
 	dir = 4
@@ -2365,9 +2360,18 @@
 /obj/effect/turf_decal/corner/opaque/yellow/diagonal,
 /turf/open/floor/plasteel/white,
 /area/ship/crew/canteen)
+"Cd" = (
+/obj/structure/grille,
+/obj/machinery/door/poddoor/shutters{
+	id = "riggerwindows";
+	name = "Blast Shutters"
+	},
+/obj/structure/window/plasma/reinforced/plastitanium,
+/turf/open/floor/plating,
+/area/ship/engineering/engine)
 "Ce" = (
 /turf/closed/wall/mineral/plastitanium,
-/area/ship/crew)
+/area/ship/crew/cryo)
 "Cw" = (
 /obj/machinery/power/shuttle/engine/fueled/plasma{
 	dir = 1
@@ -2378,23 +2382,24 @@
 /obj/effect/turf_decal/corner/opaque/blue/half{
 	dir = 1
 	},
+/obj/effect/turf_decal/corner_steel_grid,
+/obj/effect/turf_decal/corner_steel_grid{
+	dir = 8
+	},
 /turf/open/floor/plasteel,
-/area/ship/engineering/communications)
-"CG" = (
-/obj/structure/window/reinforced,
-/obj/effect/turf_decal/industrial/outline/yellow,
-/obj/machinery/suit_storage_unit/inherit/industrial,
-/obj/item/clothing/suit/space/hardsuit/mining/independent,
-/turf/open/floor/plating,
-/area/ship/engineering)
+/area/ship/crew)
 "CL" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
 /turf/open/floor/plasteel/grimy,
-/area/ship/crew)
+/area/ship/crew/dorm)
 "CQ" = (
-/obj/structure/closet/crate/bin,
 /obj/effect/turf_decal/industrial/outline/yellow,
+/obj/structure/closet/crate/bin,
+/obj/item/book/manual/wiki/robotics,
 /turf/open/floor/plasteel/tech/techmaint,
 /area/ship/hallway/central)
 "CR" = (
@@ -2408,7 +2413,7 @@
 	dir = 9
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/turf/open/floor/plating,
+/turf/open/floor/plasteel/tech,
 /area/ship/maintenance/port)
 "CS" = (
 /obj/structure/cable{
@@ -2444,7 +2449,6 @@
 /obj/item/flashlight/seclite,
 /obj/item/reagent_containers/spray/pepper,
 /obj/item/melee/classic_baton/telescopic,
-/obj/machinery/light/small/directional/east,
 /turf/open/floor/plasteel/dark,
 /area/ship/security)
 "Dp" = (
@@ -2458,18 +2462,26 @@
 /turf/open/floor/plasteel/tech/techmaint,
 /area/ship/engineering)
 "DE" = (
-/obj/effect/turf_decal/industrial/warning/corner{
-	dir = 1
+/obj/effect/spawner/lootdrop/maintenance,
+/obj/structure/sign/warning/nosmoking{
+	pixel_y = 32
 	},
-/turf/open/floor/plating,
-/area/ship/engineering)
-"DG" = (
-/obj/effect/turf_decal/corner/opaque/purple/half{
-	dir = 1
+/obj/effect/turf_decal/industrial/warning{
+	dir = 8
 	},
+/turf/open/floor/plasteel/tech,
+/area/ship/engineering/engine)
+"DG" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/turf/open/floor/plasteel,
+/obj/machinery/door/firedoor/border_only{
+	dir = 1
+	},
+/obj/machinery/door/firedoor/border_only,
+/obj/machinery/door/airlock/mining{
+	name = "Mining Locker Room"
+	},
+/turf/open/floor/plasteel/tech,
 /area/ship/hallway/central)
 "DJ" = (
 /obj/structure/reagent_dispensers/watertank,
@@ -2481,50 +2493,44 @@
 	pixel_x = 5;
 	pixel_y = 22
 	},
-/turf/open/floor/plating,
+/turf/open/floor/plasteel/tech,
 /area/ship/maintenance/port)
 "DL" = (
-/obj/effect/turf_decal/industrial/outline/yellow,
-/obj/machinery/portable_atmospherics/pump,
-/obj/machinery/atmospherics/components/unary/portables_connector/layer4,
+/obj/effect/turf_decal/number/zero{
+	dir = 4
+	},
 /turf/open/floor/plating,
-/area/ship/engineering/atmospherics)
-"Ec" = (
+/area/ship/construction)
+"DZ" = (
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/obj/machinery/door/airlock/grunge{
-	dir = 4;
-	name = "Armory";
-	req_access_txt = "1"
-	},
-/obj/machinery/door/firedoor/border_only{
-	dir = 8
-	},
-/obj/machinery/door/firedoor/border_only{
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 4
+/obj/structure/catwalk/over,
+/obj/machinery/light_switch{
+	pixel_x = -5;
+	pixel_y = 22
 	},
-/turf/open/floor/plasteel/dark,
-/area/ship/engineering/atmospherics)
-"Ei" = (
-/obj/machinery/navbeacon{
-	codes_txt = "patrol;next_patrol=cargo";
-	location = "canteen"
+/turf/open/floor/plating,
+/area/ship/maintenance/central)
+"Ec" = (
+/obj/effect/turf_decal/number/five{
+	dir = 8
 	},
-/obj/effect/turf_decal/corner/opaque/yellow/diagonal,
-/turf/open/floor/plasteel/white,
-/area/ship/crew/canteen)
+/turf/open/floor/plating,
+/area/ship/construction)
+"Ei" = (
+/turf/closed/wall/mineral/plastitanium/nodiagonal,
+/area/ship/maintenance/central)
 "Em" = (
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
 	dir = 8
 	},
-/obj/effect/landmark/start/station_engineer,
 /turf/open/floor/plasteel/tech,
 /area/ship/engineering)
 "Er" = (
@@ -2556,23 +2562,26 @@
 "EK" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/turf/open/floor/plasteel/mono,
-/area/ship/engineering/communications)
+/turf/open/floor/plasteel/grimy,
+/area/ship/crew)
 "EQ" = (
-/obj/structure/sign/poster/contraband/random{
-	pixel_x = 32
-	},
-/obj/effect/turf_decal/kfp_small/right{
+/obj/effect/turf_decal/kfp_small/left{
 	dir = 8
 	},
+/obj/item/mop,
+/obj/item/storage/bag/trash{
+	pixel_x = 6
+	},
 /turf/open/floor/plating,
 /area/ship/construction)
 "ES" = (
-/obj/effect/turf_decal/corner_steel_grid,
 /obj/effect/turf_decal/corner_steel_grid{
-	dir = 8
+	dir = 1
 	},
-/turf/open/floor/plasteel,
+/obj/effect/turf_decal/corner_steel_grid{
+	dir = 4
+	},
+/turf/open/floor/plasteel/tech/techmaint,
 /area/ship/hallway/central)
 "Fe" = (
 /obj/structure/table/reinforced,
@@ -2605,7 +2614,7 @@
 	pixel_y = -6
 	},
 /turf/open/floor/carpet/blue,
-/area/ship/engineering/communications)
+/area/ship/bridge)
 "Fi" = (
 /obj/structure/cable{
 	icon_state = "2-4"
@@ -2616,54 +2625,42 @@
 /turf/open/floor/plating,
 /area/ship/maintenance/port)
 "Fu" = (
-/obj/machinery/cryopod{
-	dir = 1
-	},
 /obj/machinery/airalarm/directional/south,
 /obj/machinery/light/small/directional/west,
-/obj/effect/turf_decal/industrial/warning{
-	dir = 9
-	},
-/turf/open/floor/plasteel/tech/grid,
-/area/ship/crew)
-"FC" = (
+/obj/structure/table/wood,
+/obj/structure/bedsheetbin,
 /turf/open/floor/plasteel/grimy,
-/area/ship/crew/office)
-"FJ" = (
-/obj/structure/chair{
-	dir = 8
+/area/ship/crew/dorm)
+"FC" = (
+/obj/structure/cable{
+	icon_state = "1-2"
 	},
-/obj/effect/landmark/start/assistant,
-/obj/machinery/navbeacon/wayfinding/kitchen{
-	location = "Canteen";
-	name = "navigation beacon"
+/obj/machinery/door/airlock{
+	name = "Head"
 	},
-/obj/effect/turf_decal/corner/opaque/yellow/diagonal,
-/turf/open/floor/plasteel/white,
-/area/ship/crew/canteen)
-"FO" = (
-/obj/structure/curtain,
-/obj/structure/window/reinforced/tinted/frosted,
-/obj/machinery/door/window/survival_pod{
-	dir = 4
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/toilet)
+"FJ" = (
+/obj/structure/cable{
+	icon_state = "4-8"
 	},
-/obj/structure/toilet{
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 4
 	},
-/turf/open/floor/plasteel/patterned/brushed,
-/area/ship/crew)
-"Ga" = (
-/obj/machinery/navbeacon/wayfinding/engineering{
-	name = "navigation beacon"
-	},
-/obj/structure/window/reinforced,
-/obj/structure/window/reinforced/spawner/west{
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 4
 	},
-/obj/effect/turf_decal/industrial/outline/yellow,
-/obj/structure/tank_dispenser,
+/obj/structure/catwalk/over,
+/obj/machinery/light/small/directional/north,
 /turf/open/floor/plating,
-/area/ship/engineering)
+/area/ship/maintenance/central)
+"FO" = (
+/obj/machinery/computer/cryopod/directional/west,
+/turf/open/floor/plasteel/patterned,
+/area/ship/crew/cryo)
+"Ga" = (
+/turf/closed/wall/mineral/plastitanium/nodiagonal,
+/area/ship/crew/canteen)
 "Ge" = (
 /obj/machinery/atmospherics/components/binary/valve/digital{
 	dir = 4
@@ -2671,13 +2668,16 @@
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
+/obj/structure/cable{
+	icon_state = "1-4"
+	},
 /turf/open/floor/plating,
 /area/ship/maintenance/starboard)
 "Gf" = (
 /obj/machinery/atmospherics/pipe/simple/orange/visible{
 	dir = 6
 	},
-/turf/open/floor/plating,
+/turf/open/floor/plasteel/tech,
 /area/ship/maintenance/port)
 "Gk" = (
 /obj/structure/grille,
@@ -2688,26 +2688,13 @@
 	},
 /obj/structure/window/plasma/reinforced/plastitanium,
 /turf/open/floor/plating,
-/area/ship/crew)
+/area/ship/crew/dorm)
 "Gv" = (
-/obj/effect/turf_decal/corner/opaque/purple{
-	dir = 8
-	},
-/obj/effect/turf_decal/corner/opaque/purple,
-/obj/effect/turf_decal/corner/opaque/purple{
-	dir = 1
-	},
-/obj/effect/turf_decal/techfloor/corner{
-	dir = 4
-	},
-/obj/structure/window/reinforced/spawner,
-/obj/structure/frame/machine,
-/obj/machinery/light_switch{
-	dir = 4;
-	pixel_x = -20;
-	pixel_y = 5
-	},
-/turf/open/floor/plasteel/tech,
+/obj/effect/turf_decal/industrial/outline/yellow,
+/obj/machinery/suit_storage_unit/inherit/industrial,
+/obj/item/clothing/suit/space/hardsuit/mining/independent,
+/obj/machinery/firealarm/directional/west,
+/turf/open/floor/plasteel/tech/techmaint,
 /area/ship/hallway/central)
 "Gw" = (
 /obj/effect/turf_decal/corner/opaque/blue/half{
@@ -2719,12 +2706,13 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 6
 	},
+/obj/effect/turf_decal/corner_steel_grid,
+/obj/effect/turf_decal/corner_steel_grid{
+	dir = 8
+	},
 /turf/open/floor/plasteel,
-/area/ship/engineering/communications)
+/area/ship/crew)
 "Gz" = (
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
 /obj/machinery/door/firedoor/border_only{
 	dir = 8
 	},
@@ -2733,39 +2721,31 @@
 	},
 /obj/machinery/door/airlock/public/glass{
 	dir = 4;
-	name = "Communications"
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 4
+	name = "Central Hallway"
 	},
 /turf/open/floor/plasteel/dark,
-/area/ship/engineering/communications)
+/area/ship/hallway/central)
 "GC" = (
 /obj/structure/cable/yellow{
 	icon_state = "0-4"
 	},
-/obj/effect/turf_decal/industrial/warning{
-	dir = 1
-	},
 /obj/machinery/power/terminal{
 	dir = 1
 	},
 /obj/structure/catwalk/over/plated_catwalk/dark,
 /turf/open/floor/plating,
-/area/ship/engineering)
+/area/ship/engineering/engine)
 "GM" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 10
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+	dir = 8
 	},
-/obj/machinery/atmospherics/pipe/simple/green/visible{
-	dir = 4
+/obj/machinery/light_switch{
+	dir = 1;
+	pixel_x = -7;
+	pixel_y = -20
 	},
-/obj/machinery/atmospherics/pipe/simple/yellow/visible/layer4,
 /turf/open/floor/plating,
-/area/ship/engineering/atmospherics)
+/area/ship/construction)
 "GO" = (
 /obj/machinery/door/airlock/glass{
 	dir = 4;
@@ -2789,12 +2769,20 @@
 /turf/open/floor/plasteel/dark,
 /area/ship/crew/canteen)
 "GQ" = (
-/obj/structure/table/wood,
-/obj/item/storage/fancy/donut_box,
-/turf/open/floor/plasteel/grimy,
-/area/ship/crew/office)
+/obj/structure/cable{
+	icon_state = "2-4"
+	},
+/obj/machinery/light/small/directional/north,
+/turf/open/floor/plasteel/patterned,
+/area/ship/crew/toilet)
 "GT" = (
-/obj/machinery/atmospherics/pipe/layer_manifold,
+/obj/effect/turf_decal/industrial/outline/yellow,
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/components/unary/portables_connector/layer4,
+/obj/machinery/portable_atmospherics/pump,
+/obj/machinery/light/small/directional/north,
 /turf/open/floor/plating,
 /area/ship/engineering/atmospherics)
 "GU" = (
@@ -2802,23 +2790,20 @@
 /obj/effect/turf_decal/industrial/hatch/yellow,
 /obj/machinery/power/port_gen/pacman,
 /turf/open/floor/plasteel/dark,
-/area/ship/engineering)
+/area/ship/engineering/engine)
 "He" = (
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 4
-	},
-/obj/effect/turf_decal/industrial/warning{
-	dir = 4
+/obj/effect/turf_decal/kfp_small/right{
+	dir = 8
 	},
-/obj/structure/catwalk/over,
 /turf/open/floor/plating,
-/area/ship/maintenance/port)
+/area/ship/construction)
+"Hf" = (
+/obj/structure/chair/plastic{
+	dir = 8
+	},
+/obj/machinery/newscaster/directional/south,
+/turf/open/floor/plasteel/grimy,
+/area/ship/crew)
 "Hi" = (
 /obj/machinery/door/firedoor/border_only{
 	dir = 8
@@ -2833,71 +2818,65 @@
 /turf/open/floor/plasteel/dark,
 /area/ship/medical)
 "Hl" = (
-/obj/effect/turf_decal/industrial/outline/yellow,
-/obj/machinery/portable_atmospherics/scrubber,
-/obj/machinery/atmospherics/components/unary/portables_connector/layer4,
-/turf/open/floor/plating,
-/area/ship/engineering/atmospherics)
-"Ht" = (
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 4
+/obj/effect/turf_decal/kfp_small{
+	dir = 8
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 4
+/obj/structure/sign/poster/clip/random{
+	pixel_x = 32
 	},
+/turf/open/floor/plating,
+/area/ship/construction)
+"Ht" = (
 /turf/open/floor/plasteel/mono,
 /area/ship/hallway/central)
 "Hy" = (
-/obj/item/mecha_parts/part/ripley_left_arm{
-	pixel_x = -10;
-	pixel_y = -11
-	},
 /obj/effect/turf_decal/box/corners{
-	dir = 1
+	dir = 4
 	},
+/obj/effect/turf_decal/box/corners,
 /turf/open/floor/plasteel/tech,
 /area/ship/cargo)
 "Hz" = (
 /obj/effect/turf_decal/corner_steel_grid{
-	dir = 1
-	},
-/obj/effect/turf_decal/corner_steel_grid{
-	dir = 4
+	dir = 8
 	},
-/turf/open/floor/plasteel,
-/area/ship/crew/office)
+/obj/effect/turf_decal/corner_steel_grid,
+/obj/item/kirbyplants/random,
+/turf/open/floor/plasteel/tech/techmaint,
+/area/ship/crew)
 "HD" = (
-/obj/machinery/door/firedoor/border_only{
-	dir = 8
+/obj/structure/cable{
+	icon_state = "4-8"
 	},
-/obj/machinery/door/firedoor/border_only{
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 4
 	},
-/obj/machinery/door/airlock/public/glass{
-	dir = 4;
-	name = "Communications"
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
 	},
-/turf/open/floor/plasteel/dark,
-/area/ship/engineering/communications)
+/obj/machinery/navbeacon{
+	codes_txt = "patrol;next_patrol=cargo";
+	location = "canteen"
+	},
+/turf/open/floor/plasteel/grimy,
+/area/ship/crew)
 "HG" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
 	dir = 1
 	},
 /obj/machinery/light/small/directional/west,
+/obj/structure/cable{
+	icon_state = "1-4"
+	},
 /turf/open/floor/plasteel/grimy,
 /area/ship/security)
 "HN" = (
-/obj/structure/bed,
-/obj/item/bedsheet/random,
-/obj/structure/curtain/bounty,
-/obj/structure/sign/poster/contraband/random{
+/obj/structure/table/wood,
+/obj/structure/sign/poster/rilena/random{
 	pixel_x = -32
 	},
 /turf/open/floor/plasteel/grimy,
-/area/ship/crew)
+/area/ship/crew/dorm)
 "HR" = (
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
 	dir = 1
@@ -2923,64 +2902,58 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /obj/machinery/door/airlock{
-	name = "Head"
+	name = "Cryopod Room"
 	},
 /obj/machinery/door/firedoor/border_only,
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
 /turf/open/floor/plasteel/dark,
-/area/ship/crew)
+/area/ship/crew/cryo)
 "HW" = (
 /obj/machinery/atmospherics/components/unary/tank/toxins{
 	dir = 4
 	},
 /obj/effect/turf_decal/industrial/hatch/yellow,
+/obj/machinery/airalarm/directional/west,
 /turf/open/floor/plating,
 /area/ship/maintenance/starboard)
 "Ic" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /obj/effect/turf_decal/industrial/caution,
-/obj/effect/turf_decal/industrial/warning{
-	dir = 10
+/obj/structure/cable{
+	icon_state = "1-8"
 	},
+/obj/effect/turf_decal/industrial/warning,
 /turf/open/floor/plasteel/tech,
 /area/ship/engineering)
+"Ij" = (
+/obj/structure/chair/plastic{
+	dir = 8
+	},
+/turf/open/floor/plasteel/grimy,
+/area/ship/crew)
 "Iq" = (
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
 /area/ship/security)
+"Ir" = (
+/turf/closed/wall/mineral/plastitanium,
+/area/ship/maintenance/central)
 "Iw" = (
 /obj/machinery/light/directional/north,
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
 /obj/structure/chair,
 /turf/open/floor/plasteel/mono,
 /area/ship/medical)
-"IA" = (
-/obj/machinery/door/window/eastright{
-	name = "Robotics";
-	req_access_txt = "47"
-	},
-/obj/effect/turf_decal/corner/opaque/purple/border{
-	dir = 4
-	},
-/obj/effect/turf_decal/techfloor{
-	dir = 8
-	},
-/obj/structure/closet/wall{
-	icon_door = "white_wall";
-	name = "science closet";
-	pixel_y = 28
+"IB" = (
+/obj/structure/cable{
+	icon_state = "1-2"
 	},
-/obj/item/storage/backpack/satchel/eng,
-/obj/item/clothing/shoes/workboots,
-/obj/item/clothing/under/rank/rnd/roboticist,
-/obj/item/clothing/suit/apron/overalls,
-/obj/item/clothing/gloves/color/black,
-/obj/item/clothing/head/welding,
-/turf/open/floor/plasteel/tech,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/turf/open/floor/plasteel/mono,
 /area/ship/hallway/central)
-"IB" = (
-/obj/effect/landmark/start/shaft_miner,
-/turf/open/floor/plasteel/tech,
-/area/ship/engineering)
 "ID" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -3001,61 +2974,49 @@
 /obj/effect/turf_decal/corner/opaque/yellow/diagonal,
 /turf/open/floor/plasteel/white,
 /area/ship/crew/canteen)
-"IX" = (
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/machinery/light_switch{
-	dir = 8;
-	pixel_x = 20;
-	pixel_y = 0
-	},
+"Jb" = (
+/obj/structure/table,
+/obj/item/toy/cards/deck,
 /turf/open/floor/plasteel/grimy,
-/area/ship/crew/office)
+/area/ship/crew)
 "Je" = (
 /obj/effect/turf_decal/corner/opaque/white/mono,
 /turf/open/floor/plasteel/mono/white,
 /area/ship/medical)
-"Jr" = (
-/obj/machinery/power/apc/auto_name/directional/west,
-/obj/structure/cable{
-	icon_state = "0-4"
+"Jj" = (
+/obj/item/analyzer,
+/obj/machinery/atmospherics/components/binary/pump/layer2{
+	name = "Input to Air"
+	},
+/obj/machinery/atmospherics/components/binary/pump/layer4{
+	name = "Input to Waste"
 	},
+/turf/open/floor/plating,
+/area/ship/engineering/atmospherics)
+"Jr" = (
 /obj/machinery/light_switch{
 	dir = 4;
 	pixel_x = -20;
 	pixel_y = 12
 	},
-/turf/open/floor/plating,
-/area/ship/maintenance/starboard)
+/obj/machinery/firealarm/directional/west,
+/turf/open/floor/plasteel/tech,
+/area/ship/engineering/atmospherics)
 "Jt" = (
-/obj/machinery/door/airlock/public/glass{
-	dir = 4;
-	name = "Communications"
-	},
-/obj/machinery/door/firedoor/border_only{
-	dir = 8
-	},
-/obj/machinery/door/firedoor/border_only{
-	dir = 4
-	},
-/turf/open/floor/plasteel/dark,
-/area/ship/engineering/communications)
+/turf/open/floor/plasteel/grimy,
+/area/ship/crew)
 "Jz" = (
 /obj/structure/cable{
-	icon_state = "4-8"
+	icon_state = "1-8"
 	},
 /obj/structure/cable{
-	icon_state = "1-4"
+	icon_state = "2-8"
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 4
+	dir = 10
 	},
-/turf/open/floor/plasteel/mono,
-/area/ship/engineering/communications)
+/turf/open/floor/plasteel/grimy,
+/area/ship/crew)
 "JE" = (
 /obj/effect/turf_decal/industrial/outline/yellow,
 /obj/machinery/computer/crew,
@@ -3076,7 +3037,7 @@
 	pixel_x = 20;
 	pixel_y = 11
 	},
-/turf/open/floor/plasteel/tech,
+/turf/open/floor/plating,
 /area/ship/engineering)
 "JG" = (
 /obj/structure/window/plasma/reinforced/plastitanium,
@@ -3101,10 +3062,11 @@
 /area/ship/bridge)
 "JS" = (
 /obj/item/radio/intercom/directional/east,
-/obj/item/mecha_parts/chassis/ripley,
 /obj/item/mecha_parts/mecha_equipment/drill{
 	pixel_y = -11
 	},
+/obj/item/mecha_parts/chassis/ripley,
+/obj/item/circuitboard/mecha/ripley/peripherals,
 /turf/open/floor/mech_bay_recharge_floor,
 /area/ship/cargo)
 "Kd" = (
@@ -3127,27 +3089,28 @@
 /turf/open/floor/plasteel/dark,
 /area/ship/security)
 "Kg" = (
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
 /obj/effect/turf_decal/corner_steel_grid{
-	dir = 4
+	dir = 8
 	},
-/obj/effect/turf_decal/corner_steel_grid{
-	dir = 1
+/obj/effect/turf_decal/corner_steel_grid,
+/obj/machinery/light_switch{
+	pixel_x = -5;
+	pixel_y = 22
 	},
-/turf/open/floor/plasteel,
-/area/ship/crew/office)
+/turf/open/floor/plasteel/tech/techmaint,
+/area/ship/crew)
 "Kh" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/item/radio/intercom/directional/west,
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
-	dir = 8
+/obj/machinery/door/firedoor/border_only{
+	dir = 1
 	},
-/obj/effect/turf_decal/number/two{
-	dir = 8
+/obj/machinery/door/firedoor/border_only,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/door/airlock/maintenance,
+/obj/structure/cable{
+	icon_state = "1-2"
 	},
-/turf/open/floor/plating,
+/turf/open/floor/plasteel/tech,
 /area/ship/construction)
 "Kn" = (
 /obj/structure/grille,
@@ -3169,10 +3132,8 @@
 /turf/open/floor/plasteel/mono/white,
 /area/ship/medical)
 "Le" = (
-/obj/machinery/airalarm/directional/north,
-/obj/structure/reagent_dispensers/watertank/high,
 /turf/open/floor/plating,
-/area/ship/construction)
+/area/ship/maintenance/fore)
 "Ll" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -3180,21 +3141,30 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 9
-	},
-/turf/open/floor/plasteel/mono,
-/area/ship/crew/office)
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
+/turf/open/floor/plasteel/grimy,
+/area/ship/crew)
 "Lo" = (
-/obj/item/reagent_containers/glass/bucket,
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
 	dir = 8
 	},
+/obj/machinery/light_switch{
+	dir = 1;
+	pixel_x = -7;
+	pixel_y = -20
+	},
+/obj/machinery/light/small/directional/south,
 /turf/open/floor/plating,
-/area/ship/construction)
+/area/ship/maintenance/fore)
 "Lw" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
-/turf/open/floor/plasteel/tech/grid,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+	dir = 8
+	},
+/obj/structure/chair/comfy/brown{
+	dir = 8
+	},
+/obj/machinery/light/small/directional/east,
+/turf/open/floor/plasteel/tech/techmaint,
 /area/ship/hallway/central)
 "Ly" = (
 /turf/template_noop,
@@ -3224,6 +3194,7 @@
 	name = "dried tobacco leaves"
 	},
 /obj/item/clothing/mask/cigarette/pipe/cobpipe,
+/obj/item/book/manual/wiki/piloting,
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
 "Md" = (
@@ -3232,24 +3203,26 @@
 /turf/open/floor/plating,
 /area/ship/maintenance/port)
 "MF" = (
-/obj/structure/sink{
-	pixel_y = 20
-	},
-/obj/structure/mirror{
-	pixel_y = 32
+/obj/machinery/light/small/directional/west,
+/obj/machinery/power/apc/auto_name/directional/north,
+/obj/structure/cable{
+	icon_state = "0-2"
 	},
-/obj/machinery/light/small/directional/west,
 /turf/open/floor/plasteel/patterned,
-/area/ship/crew)
+/area/ship/crew/cryo)
 "MW" = (
-/obj/structure/cable{
-	icon_state = "1-8"
-	},
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
 /obj/effect/turf_decal/corner/opaque/red/border{
 	dir = 4
 	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
 /turf/open/floor/plasteel/mono,
 /area/ship/hallway/central)
 "Nd" = (
@@ -3281,27 +3254,11 @@
 /obj/item/bedsheet/random,
 /obj/structure/curtain/bounty,
 /turf/open/floor/plasteel/grimy,
-/area/ship/crew)
+/area/ship/crew/dorm)
 "Nh" = (
-/obj/structure/table/reinforced,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 6
-	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/effect/turf_decal/corner/opaque/purple/half,
-/obj/effect/turf_decal/techfloor{
-	dir = 1
-	},
-/obj/machinery/door/window/southleft{
-	name = "Science Officer's Desk"
-	},
-/obj/item/clipboard,
-/obj/item/stamp/rd{
-	name = "mech technician's rubber stamp"
-	},
-/obj/item/circuitboard/mecha/ripley/main,
-/obj/item/circuitboard/mecha/ripley/peripherals,
-/turf/open/floor/plasteel/tech,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/turf/open/floor/plasteel/tech/techmaint,
 /area/ship/hallway/central)
 "NA" = (
 /obj/effect/turf_decal/industrial/warning{
@@ -3317,10 +3274,14 @@
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
 	dir = 1
 	},
-/turf/open/floor/plating,
-/area/ship/engineering)
+/obj/structure/closet/firecloset/wall{
+	dir = 1;
+	pixel_y = -28
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/maintenance/central)
 "NU" = (
-/obj/machinery/atmospherics/pipe/simple/green/visible{
+/obj/machinery/atmospherics/components/binary/valve/digital{
 	dir = 4
 	},
 /turf/open/floor/engine/hull,
@@ -3330,12 +3291,9 @@
 /obj/effect/turf_decal/industrial/hatch/yellow,
 /obj/machinery/power/smes/engineering,
 /obj/structure/cable,
-/obj/structure/window/reinforced{
-	dir = 1
-	},
 /obj/structure/catwalk/over,
 /turf/open/floor/plating,
-/area/ship/engineering)
+/area/ship/engineering/engine)
 "Of" = (
 /obj/machinery/power/shuttle/engine/electric{
 	dir = 1
@@ -3351,14 +3309,15 @@
 /obj/effect/turf_decal/corner/opaque/blue/border{
 	dir = 1
 	},
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+	dir = 4
+	},
 /turf/open/floor/plasteel/mono/dark,
 /area/ship/bridge)
 "Ov" = (
-/obj/machinery/firealarm/directional/south,
 /obj/machinery/light/directional/south,
-/obj/structure/chair{
-	dir = 1
-	},
+/obj/effect/turf_decal/industrial/outline/yellow,
+/obj/machinery/autolathe,
 /turf/open/floor/plasteel/tech/techmaint,
 /area/ship/hallway/central)
 "Oy" = (
@@ -3384,19 +3343,32 @@
 	},
 /obj/machinery/firealarm/directional/east,
 /obj/machinery/light/small/directional/north,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 10
+	},
 /turf/open/floor/plasteel/grimy,
 /area/ship/security)
 "OK" = (
-/obj/structure/sign/poster/contraband/random{
-	pixel_x = -32
-	},
 /obj/effect/turf_decal/corner/opaque/yellow/diagonal,
-/obj/machinery/vending/snack/random,
+/obj/structure/table,
+/obj/item/storage/box/cups,
+/obj/machinery/newscaster/directional/west,
+/obj/item/radio/intercom/directional/south,
 /turf/open/floor/plasteel/white,
 /area/ship/crew/canteen)
 "ON" = (
-/turf/closed/wall/mineral/plastitanium,
-/area/ship/security)
+/obj/machinery/door/airlock/public/glass{
+	dir = 4;
+	name = "Central Hallway"
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 8
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 4
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/hallway/central)
 "OQ" = (
 /obj/structure/table,
 /obj/item/folder/yellow,
@@ -3431,22 +3403,29 @@
 /turf/open/floor/carpet/blue,
 /area/ship/bridge)
 "OW" = (
-/obj/structure/frame/machine,
-/obj/effect/turf_decal/corner/opaque/purple/half{
-	dir = 1
+/obj/effect/turf_decal/industrial/outline/yellow,
+/obj/structure/rack,
+/obj/item/storage/bag/ore,
+/obj/item/pickaxe,
+/obj/item/pickaxe,
+/obj/item/mining_scanner,
+/obj/structure/sign/poster/random{
+	pixel_x = 32;
+	pixel_y = 3
 	},
-/obj/effect/turf_decal/techfloor,
-/turf/open/floor/plasteel/tech,
+/obj/machinery/airalarm/directional/north,
+/turf/open/floor/plasteel/tech/techmaint,
 /area/ship/hallway/central)
 "OY" = (
-/obj/machinery/computer/helm/viewscreen/directional/south,
-/turf/open/floor/plasteel/tech/techmaint,
+/obj/machinery/suit_storage_unit/inherit/industrial,
+/obj/item/clothing/suit/space/pilot,
+/obj/item/clothing/head/helmet/space/pilot/random,
+/obj/machinery/firealarm/directional/south,
+/turf/open/floor/plasteel/tech,
 /area/ship/cargo)
 "Pd" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
-	dir = 4
-	},
 /obj/effect/turf_decal/corner/opaque/blue/border,
+/obj/machinery/holopad/emergency/command,
 /turf/open/floor/plasteel/mono/dark,
 /area/ship/bridge)
 "Pg" = (
@@ -3461,7 +3440,7 @@
 	locked = 0;
 	name = "medical locker";
 	pixel_y = -28;
-	req_access_txt = "1"
+	req_access_txt = "5"
 	},
 /obj/item/roller,
 /obj/item/roller,
@@ -3474,39 +3453,58 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 10
-	},
 /obj/machinery/light_switch{
 	pixel_y = 22
 	},
+/obj/structure/cable{
+	icon_state = "2-8"
+	},
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+	dir = 1
+	},
 /turf/open/floor/plasteel/grimy,
 /area/ship/security)
 "Pw" = (
-/turf/closed/wall/mineral/plastitanium,
-/area/ship/crew/canteen)
+/obj/structure/sign/number/random{
+	dir = 4
+	},
+/turf/closed/wall/mineral/plastitanium/nodiagonal,
+/area/ship/engineering/atmospherics)
 "PA" = (
-/obj/structure/table,
-/obj/machinery/newscaster/directional/west,
-/obj/item/storage/box/cups,
 /obj/effect/turf_decal/corner/opaque/yellow/diagonal,
+/obj/structure/sign/poster/contraband/random{
+	pixel_x = -32
+	},
+/obj/structure/closet/crate/bin,
 /turf/open/floor/plasteel/white,
 /area/ship/crew/canteen)
 "PB" = (
 /obj/structure/chair,
 /turf/open/floor/plasteel/mono,
 /area/ship/medical)
-"PF" = (
-/obj/structure/chair{
-	dir = 8
+"PD" = (
+/obj/effect/turf_decal/corner_steel_grid,
+/obj/effect/turf_decal/corner_steel_grid{
+	dir = 1
 	},
-/obj/effect/landmark/start/assistant,
+/obj/effect/turf_decal/corner_steel_grid{
+	dir = 4
+	},
+/turf/open/floor/plasteel/tech/techmaint,
+/area/ship/hallway/central)
+"PF" = (
 /obj/effect/turf_decal/corner/opaque/yellow/diagonal,
+/obj/structure/table,
+/obj/item/cutting_board,
+/obj/item/kitchen/rollingpin,
 /turf/open/floor/plasteel/white,
 /area/ship/crew/canteen)
 "PV" = (
-/turf/open/floor/plating,
-/area/ship/maintenance/starboard)
+/obj/machinery/atmospherics/components/unary/passive_vent/layer2{
+	dir = 1
+	},
+/turf/open/floor/engine/air,
+/area/ship/engineering/atmospherics)
 "Qa" = (
 /obj/structure/table/reinforced,
 /obj/machinery/recharger,
@@ -3527,15 +3525,10 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/machinery/atmospherics/pipe/simple/green/visible,
-/obj/structure/catwalk/over,
-/obj/machinery/light_switch{
-	dir = 4;
-	pixel_x = -20;
-	pixel_y = 5
-	},
+/obj/machinery/atmospherics/pipe/simple/green/hidden,
+/obj/item/radio/intercom/directional/west,
 /turf/open/floor/plating,
-/area/ship/engineering/atmospherics)
+/area/ship/construction)
 "Qe" = (
 /obj/machinery/power/smes/shuttle/precharged{
 	dir = 1
@@ -3571,12 +3564,10 @@
 	icon_state = "2-4"
 	},
 /obj/structure/catwalk/over,
-/obj/machinery/firealarm/directional/north,
 /turf/open/floor/plating,
-/area/ship/engineering)
+/area/ship/maintenance/central)
 "Qv" = (
 /obj/structure/closet/crate,
-/obj/item/circuitboard/computer/rdconsole,
 /obj/effect/spawner/lootdrop/maintenance/three,
 /turf/open/floor/plasteel,
 /area/ship/construction)
@@ -3592,8 +3583,12 @@
 	},
 /turf/open/floor/plasteel/tech/techmaint,
 /area/ship/cargo)
+"QI" = (
+/obj/machinery/atmospherics/pipe/layer_manifold,
+/obj/machinery/airalarm/directional/east,
+/turf/open/floor/plating,
+/area/ship/engineering/atmospherics)
 "QQ" = (
-/obj/machinery/holopad/emergency/command,
 /obj/item/storage/backpack/captain,
 /obj/item/clothing/shoes/cowboy/black,
 /obj/item/clothing/under/rank/security/detective/grey,
@@ -3602,6 +3597,8 @@
 /obj/item/clothing/glasses/sunglasses,
 /obj/item/gun/ballistic/revolver/detective,
 /obj/item/clothing/head/HoS/cowboy,
+/obj/item/ammo_box/c38,
+/obj/item/ammo_box/c38,
 /obj/structure/closet/secure_closet/wall{
 	dir = 4;
 	icon_state = "solgov_wall";
@@ -3609,23 +3606,19 @@
 	pixel_x = -28;
 	req_access_txt = "57"
 	},
-/obj/item/ammo_box/c38,
-/obj/item/ammo_box/c38,
 /turf/open/floor/carpet/blue,
-/area/ship/engineering/communications)
+/area/ship/bridge)
 "QT" = (
-/obj/item/mecha_parts/part/ripley_right_leg{
-	pixel_x = 5;
-	pixel_y = 9
+/obj/item/mecha_parts/part/ripley_left_leg{
+	pixel_x = 2;
+	pixel_y = -6
 	},
-/obj/item/mecha_parts/mecha_equipment/hydraulic_clamp{
+/obj/item/circuitboard/mecha/ripley/main,
+/obj/item/mecha_parts/part/ripley_right_arm{
 	pixel_x = -7;
-	pixel_y = -5
-	},
-/obj/effect/turf_decal/box/corners{
-	dir = 4
+	pixel_y = 6
 	},
-/turf/open/floor/plasteel/tech,
+/turf/open/floor/plasteel/tech/techmaint,
 /area/ship/cargo)
 "Re" = (
 /obj/machinery/atmospherics/components/unary/outlet_injector/on{
@@ -3642,25 +3635,22 @@
 	dir = 4
 	},
 /obj/effect/turf_decal/corner/opaque/yellow/diagonal,
-/obj/item/radio/intercom/directional/east,
+/obj/machinery/firealarm/directional/east,
 /turf/open/floor/plasteel/white,
 /area/ship/crew/canteen)
 "Ru" = (
-/obj/structure/chair{
-	dir = 1
-	},
-/obj/machinery/light/directional/south,
-/turf/open/floor/plasteel/tech/techmaint,
-/area/ship/engineering/communications)
+/obj/machinery/vending/coffee,
+/obj/item/radio/intercom/directional/south,
+/turf/open/floor/plasteel/grimy,
+/area/ship/crew)
 "Ry" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 6
 	},
-/obj/structure/table/wood,
-/obj/structure/bedsheetbin,
 /obj/machinery/firealarm/directional/west,
+/obj/structure/dresser,
 /turf/open/floor/plasteel/grimy,
-/area/ship/crew)
+/area/ship/crew/dorm)
 "Rz" = (
 /obj/structure/grille,
 /obj/machinery/door/poddoor/shutters{
@@ -3674,47 +3664,45 @@
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
 	dir = 1
 	},
+/obj/structure/cable{
+	icon_state = "1-4"
+	},
 /turf/open/floor/plasteel/grimy,
-/area/ship/crew)
+/area/ship/crew/dorm)
 "RY" = (
-/obj/machinery/door/airlock/maintenance_hatch{
-	dir = 4
-	},
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/obj/machinery/door/firedoor/border_only{
-	dir = 8
-	},
-/obj/machinery/door/firedoor/border_only{
-	dir = 4
-	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 4
 	},
-/turf/open/floor/plasteel/tech,
-/area/ship/engineering)
+/obj/structure/catwalk/over,
+/obj/machinery/firealarm/directional/south,
+/turf/open/floor/plating,
+/area/ship/maintenance/central)
 "Sa" = (
-/obj/machinery/newscaster/directional/south,
 /obj/machinery/light/directional/south,
-/obj/machinery/vending/coffee,
-/obj/effect/turf_decal/industrial/outline/yellow,
-/turf/open/floor/plasteel/tech/techmaint,
-/area/ship/crew/office)
+/obj/structure/chair/sofa/right{
+	dir = 4
+	},
+/turf/open/floor/plasteel/grimy,
+/area/ship/crew)
 "Sh" = (
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
 /area/ship/maintenance/starboard)
 "Si" = (
-/obj/structure/dresser,
 /obj/machinery/light/small/directional/east,
 /obj/structure/sign/poster/official/cleanliness{
 	pixel_y = 32
 	},
+/obj/structure/bed,
+/obj/structure/curtain/bounty,
+/obj/item/bedsheet/random,
 /turf/open/floor/plasteel/grimy,
-/area/ship/crew)
+/area/ship/crew/dorm)
 "Sj" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -3728,39 +3716,46 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 4
 	},
-/obj/machinery/door/airlock/grunge{
-	dir = 4;
-	name = "Atmospherics"
-	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 4
 	},
+/obj/machinery/door/airlock/maintenance{
+	dir = 4
+	},
 /turf/open/floor/plasteel/dark,
-/area/ship/engineering/atmospherics)
+/area/ship/construction)
 "Su" = (
-/obj/effect/turf_decal/industrial/outline/yellow,
-/obj/structure/window/reinforced,
-/obj/machinery/suit_storage_unit/inherit/industrial,
-/obj/item/clothing/suit/space/hardsuit/mining/independent,
-/turf/open/floor/plating,
-/area/ship/engineering)
+/turf/closed/wall/mineral/plastitanium/nodiagonal,
+/area/ship/engineering/engine)
 "Sz" = (
-/obj/item/radio/intercom/directional/west,
-/turf/open/floor/plasteel/grimy,
-/area/ship/crew/office)
+/obj/structure/curtain,
+/obj/machinery/shower{
+	dir = 4
+	},
+/obj/structure/window/reinforced/tinted/frosted{
+	dir = 1
+	},
+/obj/machinery/door/window/survival_pod{
+	dir = 4
+	},
+/obj/item/soap,
+/turf/open/floor/plasteel/patterned,
+/area/ship/crew/toilet)
 "SE" = (
-/obj/machinery/washing_machine,
 /obj/machinery/light_switch{
 	dir = 8;
 	pixel_x = 20;
 	pixel_y = 5
 	},
-/turf/open/floor/plasteel/patterned,
-/area/ship/crew)
+/obj/machinery/cryopod{
+	dir = 8
+	},
+/obj/effect/turf_decal/industrial/warning{
+	dir = 8
+	},
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/crew/cryo)
 "SS" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 10
-	},
 /obj/effect/turf_decal/corner/opaque/blue/bordercorner{
 	dir = 8
 	},
@@ -3782,10 +3777,7 @@
 /obj/item/ammo_box/magazine/m45,
 /obj/item/spacecash/bundle/c1000,
 /obj/item/spacecash/bundle/c1000,
-/obj/item/spacecash/bundle/c1000,
-/obj/item/spacecash/bundle/c1000,
-/obj/item/spacecash/bundle/c1000,
-/obj/item/spacecash/bundle/c1000,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /turf/open/floor/plasteel/mono/dark,
 /area/ship/bridge)
 "SW" = (
@@ -3807,25 +3799,58 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 10
 	},
-/obj/structure/chair/office{
-	dir = 1
-	},
 /obj/machinery/power/apc/auto_name/directional/east,
 /obj/structure/cable{
 	icon_state = "0-2"
 	},
 /turf/open/floor/plasteel/grimy,
-/area/ship/crew)
+/area/ship/crew/dorm)
 "SY" = (
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
 /obj/effect/turf_decal/box/corners{
-	dir = 4
+	dir = 1
+	},
+/obj/structure/crate_shelf,
+/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/lootdrop/ration,
+/obj/effect/spawner/lootdrop/ration,
+/obj/item/reagent_containers/food/drinks/waterbottle/large{
+	pixel_x = 1;
+	pixel_y = -3
+	},
+/obj/item/reagent_containers/food/drinks/waterbottle/large{
+	pixel_x = 8;
+	pixel_y = -3
+	},
+/obj/item/reagent_containers/food/drinks/waterbottle/large{
+	pixel_x = 5
+	},
+/obj/item/storage/cans/sixbeer,
+/obj/item/reagent_containers/food/snacks/canned/beans{
+	pixel_x = 2;
+	pixel_y = 3
+	},
+/obj/item/reagent_containers/food/snacks/canned/beans{
+	pixel_x = -5;
+	pixel_y = 3
+	},
+/obj/item/reagent_containers/food/snacks/canned/beans{
+	pixel_x = -2
+	},
+/obj/structure/closet/crate{
+	name = "food crate"
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 6
+	dir = 4
 	},
-/obj/structure/reagent_dispensers/fueltank,
-/obj/structure/cable{
-	icon_state = "1-2"
+/obj/effect/turf_decal/box/corners{
+	dir = 8
 	},
 /turf/open/floor/plasteel/tech,
 /area/ship/cargo)
@@ -3834,16 +3859,12 @@
 /obj/machinery/modular_computer/console/preset/command{
 	dir = 1
 	},
-/obj/machinery/light/small/directional/west,
 /turf/open/floor/carpet/blue,
-/area/ship/engineering/communications)
+/area/ship/bridge)
 "Tm" = (
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/obj/structure/sign/warning/nosmoking{
-	pixel_y = 32
-	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 4
 	},
@@ -3876,6 +3897,9 @@
 	req_access_txt = "1"
 	},
 /obj/structure/curtain/bounty,
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
 /turf/open/floor/plasteel/dark,
 /area/ship/security)
 "TO" = (
@@ -3883,30 +3907,31 @@
 	dir = 4
 	},
 /obj/effect/turf_decal/corner/opaque/yellow/diagonal,
+/obj/structure/chair,
+/obj/effect/landmark/start/assistant,
 /turf/open/floor/plasteel/white,
 /area/ship/crew/canteen)
 "TR" = (
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
-/obj/structure/cable{
-	icon_state = "1-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 5
-	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/turf/open/floor/plating,
-/area/ship/maintenance/starboard)
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/effect/turf_decal/industrial/warning,
+/turf/open/floor/plasteel/tech,
+/area/ship/engineering/atmospherics)
 "TW" = (
-/obj/item/radio/intercom/directional/south,
-/obj/item/kirbyplants/random,
 /obj/machinery/firealarm/directional/east,
-/turf/open/floor/plasteel/tech/techmaint,
-/area/ship/engineering/communications)
+/obj/machinery/power/apc/auto_name/directional/south,
+/obj/structure/cable,
+/obj/structure/closet/crate/bin,
+/obj/effect/spawner/lootdrop/maintenance/three,
+/turf/open/floor/plasteel/grimy,
+/area/ship/crew)
 "Ug" = (
+/obj/machinery/light/small/directional/west,
 /turf/open/floor/plating,
-/area/ship/construction)
+/area/ship/maintenance/fore)
 "Uo" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -3914,10 +3939,9 @@
 /obj/machinery/light/small/directional/west,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/machinery/atmospherics/pipe/simple/green/visible,
-/obj/structure/catwalk/over,
+/obj/machinery/atmospherics/pipe/simple/green/hidden,
 /turf/open/floor/plating,
-/area/ship/engineering/atmospherics)
+/area/ship/construction)
 "Us" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 4
@@ -3938,22 +3962,27 @@
 /turf/open/floor/plasteel/mono/white,
 /area/ship/medical)
 "Uv" = (
-/obj/structure/cable{
-	icon_state = "2-4"
-	},
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
-/obj/item/radio/intercom/directional/west,
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+/obj/machinery/atmospherics/pipe/simple/green/hidden,
+/obj/machinery/door/firedoor/border_only,
+/obj/machinery/door/firedoor/border_only{
 	dir = 1
 	},
-/obj/structure/catwalk/over,
-/turf/open/floor/plating,
+/obj/machinery/door/airlock/atmos{
+	dir = 1;
+	name = "Atmospherics";
+	req_access_txt = "10"
+	},
+/turf/open/floor/plasteel/tech,
 /area/ship/engineering/atmospherics)
 "UA" = (
-/turf/open/floor/plasteel/mono,
-/area/ship/crew/office)
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/turf/open/floor/plasteel/grimy,
+/area/ship/crew)
 "UL" = (
 /obj/machinery/door/airlock/external,
 /obj/effect/mapping_helpers/airlock/cyclelink_helper,
@@ -3971,10 +4000,7 @@
 /turf/open/floor/plating,
 /area/ship/maintenance/port)
 "UW" = (
-/obj/effect/turf_decal/corner/opaque/purple/half{
-	dir = 1
-	},
-/turf/open/floor/plasteel,
+/turf/closed/wall/mineral/plastitanium/nodiagonal,
 /area/ship/hallway/central)
 "Va" = (
 /obj/structure/window/plasma/reinforced/plastitanium,
@@ -3986,7 +4012,6 @@
 /turf/open/floor/plating,
 /area/ship/engineering)
 "Vh" = (
-/obj/machinery/light/small/directional/north,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 4
 	},
@@ -3996,15 +4021,16 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/obj/structure/catwalk/over,
-/obj/structure/sign/warning/nosmoking{
-	pixel_y = 32
+/obj/machinery/door/airlock/maintenance_hatch{
+	dir = 4
 	},
-/obj/machinery/door/window/westleft{
-	dir = 4;
-	name = "Mining Room"
+/obj/machinery/door/firedoor/border_only{
+	dir = 4
 	},
-/turf/open/floor/plating,
+/obj/machinery/door/firedoor/border_only{
+	dir = 8
+	},
+/turf/open/floor/plasteel/tech,
 /area/ship/engineering)
 "Vn" = (
 /obj/structure/cable/yellow{
@@ -4015,9 +4041,8 @@
 /obj/item/stack/sheet/mineral/plasma/fifty,
 /obj/effect/turf_decal/industrial/outline/yellow,
 /obj/effect/turf_decal/radiation,
-/obj/structure/catwalk/over,
-/turf/open/floor/plating,
-/area/ship/engineering)
+/turf/open/floor/plasteel/tech,
+/area/ship/engineering/engine)
 "Vo" = (
 /obj/structure/cable{
 	icon_state = "1-8"
@@ -4025,15 +4050,13 @@
 /obj/structure/cable{
 	icon_state = "2-8"
 	},
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
-	dir = 4
-	},
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
 	dir = 4
 	},
+/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4,
 /obj/structure/catwalk/over,
 /turf/open/floor/plating,
-/area/ship/maintenance/starboard)
+/area/ship/engineering/atmospherics)
 "Vq" = (
 /obj/structure/filingcabinet/security,
 /obj/machinery/newscaster/security_unit/directional/south,
@@ -4044,25 +4067,30 @@
 	dir = 1
 	},
 /obj/item/radio/intercom/wideband/directional/east,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 10
+	},
 /turf/open/floor/plasteel/mono/dark,
 /area/ship/bridge)
 "Vt" = (
 /obj/structure/sign/poster/official/random{
 	pixel_x = -32
 	},
-/obj/structure/filingcabinet/chestdrawer,
 /obj/item/radio/intercom/wideband/directional/north,
+/obj/structure/filingcabinet/chestdrawer,
 /turf/open/floor/carpet/blue,
-/area/ship/engineering/communications)
+/area/ship/bridge)
 "VG" = (
-/obj/structure/sign/poster/solgov/solgov_enlist{
-	pixel_y = 32
+/obj/structure/curtain,
+/obj/structure/window/reinforced/tinted/frosted,
+/obj/machinery/door/window/survival_pod{
+	dir = 4
 	},
-/obj/structure/chair{
+/obj/structure/toilet{
 	dir = 4
 	},
-/turf/open/floor/plasteel/grimy,
-/area/ship/crew/office)
+/turf/open/floor/plasteel/patterned,
+/area/ship/crew/toilet)
 "VI" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -4074,19 +4102,14 @@
 /turf/open/floor/plasteel/mono,
 /area/ship/hallway/central)
 "VQ" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 4
-	},
 /obj/effect/turf_decal/corner/opaque/red/border{
 	dir = 4
 	},
 /obj/machinery/power/apc/auto_name/directional/north,
 /obj/structure/cable{
-	icon_state = "0-4"
+	icon_state = "0-8"
 	},
+/obj/machinery/light/small/directional/east,
 /turf/open/floor/plasteel/dark,
 /area/ship/security)
 "VX" = (
@@ -4110,31 +4133,22 @@
 /turf/open/floor/plasteel/tech/techmaint,
 /area/ship/cargo)
 "WD" = (
-/obj/machinery/light/directional/north,
-/obj/structure/frame/machine,
-/obj/effect/turf_decal/corner/opaque/purple{
-	dir = 4
-	},
-/obj/effect/turf_decal/corner/opaque/purple{
-	dir = 1
-	},
-/obj/effect/turf_decal/corner/opaque/purple{
-	dir = 8
+/obj/structure/closet/secure_closet/miner{
+	populate = 0
 	},
-/obj/effect/turf_decal/techfloor/corner,
-/obj/effect/turf_decal/techfloor/hole/right,
-/turf/open/floor/plasteel/tech,
+/obj/item/storage/backpack/explorer,
+/obj/item/clothing/shoes/workboots/mining,
+/obj/item/clothing/under/rank/cargo/miner/hazard,
+/obj/item/clothing/gloves/color/black,
+/obj/item/clothing/suit/toggle/hazard,
+/obj/item/clothing/head/hardhat/mining,
+/obj/effect/turf_decal/industrial/outline/yellow,
+/turf/open/floor/plasteel/tech/techmaint,
 /area/ship/hallway/central)
 "WE" = (
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
 /area/ship/cargo)
 "WG" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 6
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 4
-	},
 /obj/structure/closet/secure_closet/wall{
 	icon_state = "sec_wall";
 	name = "ammunition locker";
@@ -4145,6 +4159,12 @@
 /obj/item/ammo_box/magazine/m45/rubber,
 /obj/item/ammo_box/magazine/m45/rubber,
 /obj/item/ammo_box/magazine/m45,
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 10
+	},
 /turf/open/floor/plasteel/dark,
 /area/ship/security)
 "WH" = (
@@ -4158,117 +4178,98 @@
 	dir = 4
 	},
 /obj/structure/catwalk/over,
-/obj/structure/closet/wall{
-	icon_door = "orange_wall";
-	name = "mining closet";
-	pixel_y = 28
-	},
-/obj/item/storage/backpack/explorer,
-/obj/item/storage/backpack/explorer,
-/obj/item/clothing/shoes/workboots/mining,
-/obj/item/clothing/shoes/workboots/mining,
-/obj/item/clothing/under/rank/cargo/miner/hazard,
-/obj/item/clothing/under/rank/cargo/miner/hazard,
-/obj/item/clothing/gloves/color/black,
-/obj/item/clothing/gloves/color/black,
-/obj/item/clothing/suit/toggle/hazard,
-/obj/item/clothing/suit/toggle/hazard,
-/obj/item/clothing/head/hardhat/mining,
-/obj/item/clothing/head/hardhat/mining,
 /turf/open/floor/plating,
-/area/ship/engineering)
+/area/ship/maintenance/central)
 "WM" = (
-/turf/open/floor/plating,
-/area/ship/engineering)
-"WO" = (
-/obj/structure/chair{
-	dir = 1
+/obj/structure/cable{
+	icon_state = "4-8"
 	},
-/obj/effect/landmark/start/assistant,
+/turf/open/floor/plasteel/tech,
+/area/ship/engineering/engine)
+"WO" = (
 /obj/effect/turf_decal/corner/opaque/yellow/diagonal,
+/obj/structure/chair,
+/obj/effect/landmark/start/assistant,
 /turf/open/floor/plasteel/white,
 /area/ship/crew/canteen)
 "WS" = (
-/obj/structure/table,
-/obj/effect/turf_decal/corner/opaque/purple/half{
-	dir = 8
-	},
-/obj/effect/turf_decal/techfloor{
+/obj/item/radio/intercom/directional/west,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
 	dir = 4
 	},
-/obj/item/paper_bin{
-	pixel_x = -10
-	},
-/obj/item/paicard,
-/obj/item/clothing/glasses/hud/diagnostic{
-	pixel_x = 6
-	},
-/obj/item/radio/intercom/directional/west,
-/turf/open/floor/plasteel/tech,
+/turf/open/floor/plasteel/tech/techmaint,
 /area/ship/hallway/central)
 "WV" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
 /obj/effect/turf_decal/borderfloor{
 	dir = 1
 	},
-/obj/effect/turf_decal/corner/opaque/green,
-/obj/effect/turf_decal/corner/opaque/green{
+/obj/effect/turf_decal/corner/opaque/green,
+/obj/effect/turf_decal/corner/opaque/green{
+	dir = 8
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/medical)
+"Xb" = (
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+	dir = 1
+	},
+/turf/open/floor/plasteel/grimy,
+/area/ship/crew)
+"Xg" = (
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
 	dir = 8
 	},
-/turf/open/floor/plasteel/dark,
-/area/ship/medical)
-"Xg" = (
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+	dir = 8
+	},
+/obj/machinery/firealarm/directional/west,
 /turf/open/floor/plasteel/mono,
 /area/ship/hallway/central)
 "Xi" = (
-/obj/machinery/power/apc/auto_name/directional/east,
-/obj/structure/cable{
-	icon_state = "0-8"
+/obj/machinery/light_switch{
+	pixel_x = -5;
+	pixel_y = 22
 	},
-/obj/machinery/atmospherics/components/binary/valve/digital,
-/obj/machinery/atmospherics/pipe/simple/yellow/visible/layer4,
-/turf/open/floor/plating,
-/area/ship/engineering/atmospherics)
+/turf/open/floor/plasteel/mono,
+/area/ship/hallway/central)
 "Xm" = (
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
-/turf/open/floor/plasteel/mono,
-/area/ship/crew/office)
+/turf/open/floor/plasteel/grimy,
+/area/ship/crew)
 "Xv" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 9
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 9
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+	dir = 8
 	},
-/obj/effect/spawner/lootdrop/maintenance,
 /turf/open/floor/plating,
-/area/ship/construction)
+/area/ship/maintenance/fore)
 "XD" = (
 /obj/structure/chair/office,
 /obj/effect/landmark/start/captain,
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
 	dir = 4
 	},
-/obj/machinery/navbeacon/wayfinding/bridge{
-	name = "navigation beacon"
-	},
 /turf/open/floor/carpet/blue,
 /area/ship/bridge)
 "XM" = (
-/turf/closed/wall/mineral/plastitanium,
-/area/ship/crew/office)
+/turf/closed/wall/mineral/plastitanium/nodiagonal,
+/area/ship/crew/toilet)
 "XU" = (
-/obj/effect/turf_decal/corner_steel_grid{
-	dir = 4
+/obj/structure/cable{
+	icon_state = "1-2"
 	},
+/obj/effect/turf_decal/corner_steel_grid,
 /obj/effect/turf_decal/corner_steel_grid{
-	dir = 1
+	dir = 8
 	},
-/turf/open/floor/plasteel,
-/area/ship/crew/office)
+/turf/open/floor/plasteel/tech/techmaint,
+/area/ship/crew)
 "XV" = (
 /obj/structure/cable/yellow{
 	icon_state = "2-8"
@@ -4276,10 +4277,11 @@
 /obj/structure/cable/yellow{
 	icon_state = "4-8"
 	},
-/obj/effect/turf_decal/industrial/warning,
-/obj/structure/catwalk/over,
-/turf/open/floor/plating,
-/area/ship/engineering)
+/obj/effect/turf_decal/industrial/warning{
+	dir = 10
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/engineering/engine)
 "Yo" = (
 /obj/machinery/atmospherics/pipe/simple/green/visible{
 	dir = 4
@@ -4304,6 +4306,7 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /obj/machinery/light/small/directional/east,
 /obj/effect/turf_decal/corner/opaque/yellow/diagonal,
+/obj/effect/turf_decal/industrial/warning,
 /turf/open/floor/plasteel/white,
 /area/ship/crew/canteen)
 "YC" = (
@@ -4312,22 +4315,17 @@
 /obj/effect/turf_decal/industrial/hatch/yellow,
 /obj/machinery/light/directional/south,
 /turf/open/floor/plasteel/dark,
-/area/ship/engineering)
+/area/ship/engineering/engine)
 "YG" = (
-/obj/machinery/door/airlock/mining/glass{
-	name = "Mech Bay"
-	},
+/obj/effect/turf_decal/industrial/outline/yellow,
+/obj/machinery/power/apc/auto_name/directional/east,
 /obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/machinery/door/firedoor/border_only{
-	dir = 1
+	icon_state = "0-8"
 	},
-/obj/machinery/door/firedoor/border_only,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/turf/open/floor/plasteel/dark,
-/area/ship/cargo)
+/obj/machinery/atmospherics/components/unary/portables_connector/layer4,
+/obj/machinery/portable_atmospherics/scrubber,
+/turf/open/floor/plating,
+/area/ship/engineering/atmospherics)
 "YH" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -4347,15 +4345,16 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /obj/structure/catwalk/over,
+/obj/structure/sign/warning/nosmoking{
+	pixel_x = -32
+	},
 /turf/open/floor/plating,
 /area/ship/engineering/atmospherics)
 "YZ" = (
 /obj/machinery/airalarm/directional/south,
-/obj/structure/closet/crate/bin,
-/obj/effect/turf_decal/industrial/outline/yellow,
-/obj/item/circuitboard/machine/protolathe/department/cargo,
-/turf/open/floor/plasteel/tech/techmaint,
-/area/ship/crew/office)
+/obj/structure/bookcase/random,
+/turf/open/floor/plasteel/grimy,
+/area/ship/crew)
 "Za" = (
 /obj/effect/turf_decal/borderfloor{
 	dir = 1
@@ -4373,31 +4372,36 @@
 	icon_state = "1-2"
 	},
 /obj/item/wrench,
-/obj/structure/cable{
-	icon_state = "2-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 10
-	},
-/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4,
 /obj/structure/catwalk/over,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/structure/sign/poster/contraband/random{
+	pixel_x = -32
+	},
 /turf/open/floor/plating,
 /area/ship/engineering/atmospherics)
 "Zs" = (
 /obj/structure/cable{
-	icon_state = "1-2"
+	icon_state = "1-8"
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/turf/open/floor/plasteel/tech/techmaint,
+/obj/machinery/light_switch{
+	dir = 1;
+	pixel_x = -7;
+	pixel_y = -20
+	},
+/obj/effect/turf_decal/box/corners{
+	dir = 8
+	},
+/obj/effect/turf_decal/box/corners{
+	dir = 1
+	},
+/obj/structure/tank_dispenser,
+/turf/open/floor/plasteel/tech,
 /area/ship/cargo)
 "ZA" = (
 /obj/structure/cable/yellow{
 	icon_state = "2-8"
 	},
-/obj/effect/turf_decal/industrial/warning{
-	dir = 1
-	},
 /obj/machinery/power/terminal{
 	dir = 1
 	},
@@ -4406,20 +4410,25 @@
 	},
 /obj/structure/catwalk/over/plated_catwalk/dark,
 /turf/open/floor/plating,
-/area/ship/engineering)
+/area/ship/engineering/engine)
 "ZB" = (
 /obj/machinery/power/apc/auto_name/directional/south,
 /obj/structure/cable{
 	icon_state = "0-4"
 	},
-/obj/item/kirbyplants/random,
 /obj/effect/turf_decal/corner/opaque/yellow/diagonal,
-/obj/item/radio/intercom/directional/south,
+/obj/structure/table,
+/obj/item/reagent_containers/food/condiment/saltshaker{
+	pixel_x = -7
+	},
+/obj/item/reagent_containers/food/condiment/peppermill{
+	pixel_x = -14
+	},
 /turf/open/floor/plasteel/white,
 /area/ship/crew/canteen)
 "ZE" = (
 /turf/closed/wall/mineral/plastitanium,
-/area/ship/engineering/atmospherics)
+/area/ship/construction)
 "ZI" = (
 /obj/item/storage/backpack/duffelbag/med/surgery{
 	pixel_x = -3;
@@ -4431,6 +4440,7 @@
 /obj/machinery/defibrillator_mount/loaded{
 	pixel_y = 25
 	},
+/obj/item/clothing/suit/apron/surgical,
 /turf/open/floor/plasteel/dark,
 /area/ship/medical)
 "ZW" = (
@@ -4443,7 +4453,7 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 9
 	},
-/turf/open/floor/plating,
+/turf/open/floor/plasteel/tech,
 /area/ship/maintenance/port)
 "ZY" = (
 /obj/structure/cable{
@@ -4457,7 +4467,7 @@
 	},
 /obj/structure/catwalk/over,
 /turf/open/floor/plating,
-/area/ship/maintenance/starboard)
+/area/ship/engineering)
 "ZZ" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -4477,10 +4487,7 @@
 	pixel_y = 28
 	},
 /obj/item/storage/toolbox/mechanical,
-/obj/item/storage/toolbox/mechanical,
 /obj/item/storage/belt/utility,
-/obj/item/storage/belt/utility,
-/obj/item/clothing/glasses/welding,
 /obj/item/clothing/glasses/welding,
 /turf/open/floor/plating,
 /area/ship/engineering)
@@ -4492,30 +4499,30 @@ Ly
 Ly
 Ly
 Ce
-Ce
-Ce
 bC
-Ce
+bC
+bC
+uC
 Gk
 Gk
-Ce
+vB
 Gk
-Ce
-bC
-Pw
+vB
+vB
+Ga
 sQ
 sQ
-Pw
-Pw
+Ga
+Ga
 sQ
 sQ
-Pw
+Ga
+uN
+uN
+uN
+uN
+uN
 uN
-tT
-tT
-tT
-tT
-tT
 tT
 Ly
 "}
@@ -4528,23 +4535,23 @@ Ce
 bC
 FO
 cc
-Ce
+bC
 HN
 Ne
-Ne
+yJ
 Ry
 gc
 Fu
-Ce
+vB
 aD
-db
+PF
 pv
 nU
 PA
-WO
 db
+WO
 OK
-tT
+uN
 rZ
 mY
 Fi
@@ -4569,16 +4576,16 @@ rl
 tE
 RW
 bZ
-Ce
+vB
 dx
 Cc
-PF
-PF
-FJ
-Ei
+db
+db
+db
+db
 TO
 ZB
-tT
+uN
 DJ
 xO
 fx
@@ -4596,7 +4603,7 @@ bC
 SE
 hG
 zi
-Ce
+bC
 Si
 pP
 zV
@@ -4627,25 +4634,25 @@ Ly
 Ce
 bC
 bC
-Ce
+bC
 av
-Ce
 bC
-Ce
+bC
+vB
 Gk
 Gk
-Ce
-Ce
+vB
+vB
 eT
-bC
-Pw
-Pw
-Pw
+vB
+Ga
+Ga
+Ga
 eQ
 hR
 GO
 eQ
-Pw
+Ga
 uN
 Tm
 SW
@@ -4674,17 +4681,17 @@ sb
 XM
 VG
 Sz
-nS
+XM
 Hz
 sL
 Ll
 zu
 YZ
-tT
+uN
 xQ
 uN
 uN
-tT
+uN
 tT
 Ly
 Ly
@@ -4705,7 +4712,7 @@ Ly
 Ly
 Ly
 Re
-mK
+XM
 GQ
 vw
 FC
@@ -4714,9 +4721,9 @@ UA
 BZ
 fn
 Sa
-tT
-jm
-tT
+Ei
+DZ
+Ei
 Ly
 Ly
 Ly
@@ -4742,15 +4749,15 @@ vm
 XM
 ph
 oy
-IX
+XM
 Kg
 Xm
 vR
-fn
+Jb
 ge
-tT
+Ei
 vf
-tT
+Ei
 Ly
 Ly
 Ly
@@ -4769,22 +4776,22 @@ Ly
 Ly
 cb
 Kn
-qd
-qd
-qd
-qd
 EC
-iD
-iD
-iD
+EC
+EC
+EC
+EC
+EC
+EC
+EC
 js
 Jt
 HD
-js
-iD
-uN
-jm
-tT
+Ij
+Hf
+Ei
+WH
+Ei
 Ly
 Ly
 Ly
@@ -4807,19 +4814,19 @@ JK
 cl
 ax
 dH
-qd
+EC
 Vt
 QQ
 Te
 Cz
-vt
+Jt
 wk
 sV
 Ru
-tT
-He
-tT
-tT
+Ei
+FJ
+Ei
+Ir
 Ly
 Ly
 Ly
@@ -4841,21 +4848,21 @@ Or
 Pd
 XD
 OV
-qd
+EC
 Am
 bx
 Fe
 Gw
 EK
 lp
-jl
+Jt
 ng
-Tq
+Ei
 RY
-kC
-kC
-Tq
-Tq
+Ei
+Su
+Su
+vO
 Ly
 Ly
 "}
@@ -4880,17 +4887,17 @@ xD
 AQ
 uy
 qu
-sj
+UA
 Jz
-sV
+Xb
 TW
-Tq
+Ei
 Qm
 vn
 Od
 GC
-kC
-Tq
+Su
+vO
 Ly
 "}
 (13,1,1) = {"
@@ -4905,27 +4912,27 @@ Ly
 Ly
 cb
 cb
-qd
-qd
-qd
+EC
 qd
 EC
-iD
-iD
-iD
-js
-Jt
+EC
+EC
+UW
+UW
+UW
+UW
+ON
 Gz
-js
-iD
-kC
+jC
+UW
+Ei
 wS
 vn
 rD
 ZA
 Vn
-kC
-Tq
+Su
+vO
 "}
 (14,1,1) = {"
 Ly
@@ -4943,23 +4950,23 @@ Ly
 Ly
 Ly
 vm
-oh
+UW
 WD
 WS
 Gv
 UW
-Xg
+Xi
 Ht
 ES
 gd
-Tq
+Ei
 WH
-IB
+Ei
 Su
 DE
 XV
 YC
-Tq
+Su
 "}
 (15,1,1) = {"
 Ly
@@ -4986,14 +4993,14 @@ xp
 fh
 lx
 tx
-Tq
+Ei
 mD
 cR
-CG
+Su
 jx
 mJ
 GU
-uI
+Cd
 "}
 (16,1,1) = {"
 Ly
@@ -5011,7 +5018,7 @@ Ly
 Ly
 Ly
 vm
-oh
+UW
 OW
 Lw
 qa
@@ -5020,14 +5027,14 @@ ee
 VI
 ES
 Ov
-Tq
+Ei
 bA
 NO
-cx
+Su
 WM
 bL
 jp
-Tq
+Su
 "}
 (17,1,1) = {"
 Ly
@@ -5041,27 +5048,27 @@ Ly
 Ly
 Ly
 Ly
-iC
-iC
-iC
-iC
 WE
 WE
-IA
-vN
+WE
+WE
+WE
+WE
+UW
+UW
 UW
 cv
 by
-ES
+PD
 mZ
-Tq
+kC
 Vh
-aC
-Ga
+kC
+kC
 Ak
 kC
 kC
-Tq
+kC
 "}
 (18,1,1) = {"
 Ly
@@ -5083,8 +5090,8 @@ hP
 jS
 ci
 Xg
-Xg
-Xg
+IB
+IB
 xW
 nm
 lP
@@ -5114,7 +5121,7 @@ hy
 SY
 ji
 Zs
-YG
+WE
 qe
 yr
 fO
@@ -5122,7 +5129,7 @@ eF
 MW
 qo
 CQ
-Tq
+kC
 uk
 Em
 jG
@@ -5162,7 +5169,7 @@ hI
 yq
 OQ
 kC
-Tq
+kC
 Tq
 "}
 (21,1,1) = {"
@@ -5182,15 +5189,15 @@ yW
 Hy
 wZ
 bo
-iC
+WE
 PB
 ve
 yI
-As
+yp
 Pj
 HG
 mz
-Tq
+kC
 uj
 JF
 yV
@@ -5216,19 +5223,19 @@ NA
 QT
 ib
 zw
-iC
+WE
 Iw
 jL
 Pg
-As
+yp
 sq
 oO
 EB
-Tq
-RY
+kC
+jn
+kC
 kC
 kC
-Tq
 Tq
 Ly
 Ly
@@ -5250,18 +5257,18 @@ QB
 Bp
 JS
 jZ
-iC
+WE
 qE
 rm
 xX
-As
+yp
 OJ
 xJ
 Vq
-qm
+kC
 ZY
-qm
-qm
+kC
+Tq
 Ly
 Ly
 Ly
@@ -5279,10 +5286,10 @@ Ly
 Ly
 Ly
 Ly
-iC
-iC
-iC
-iC
+WE
+WE
+WE
+WE
 WE
 WE
 go
@@ -5292,9 +5299,9 @@ yp
 Iq
 sB
 Qa
-qm
+kC
 ZY
-qm
+kC
 Ly
 Ly
 Ly
@@ -5317,18 +5324,18 @@ Ly
 Ly
 Ly
 vm
-As
+yp
 pD
 Za
 Ax
 Je
 Nd
-ON
+Iq
 mH
 HR
-qm
+kC
 th
-qm
+kC
 Ly
 Ly
 Ly
@@ -5357,12 +5364,12 @@ WV
 Ai
 KY
 fl
-ON
+Iq
 WG
 Kd
-qm
+kC
 ZY
-qm
+kC
 Ly
 Ly
 Ly
@@ -5372,8 +5379,8 @@ Ly
 (27,1,1) = {"
 aT
 aT
-OR
-OR
+aC
+aC
 aT
 Ly
 Ly
@@ -5385,21 +5392,21 @@ Ly
 Ly
 Ly
 NU
-As
+yp
 ZI
 fg
 id
 iR
 rH
-ON
+Iq
 VQ
 CW
-qm
+kC
 ik
+kC
 Sh
 Sh
 qm
-qm
 Ly
 Ly
 "}
@@ -5407,31 +5414,31 @@ Ly
 Ly
 Ly
 aT
+aC
+aC
+aC
+ff
+aC
+aC
+aC
+ff
+ff
 OR
 OR
-aT
-iT
-aT
-OR
-aT
-iT
-iT
-aT
-aT
 Yo
 OR
-ZE
+OR
 ZE
 Sj
-ZE
-ZE
 lf
-Ec
-ZE
-Sh
+lf
+lf
+lf
+lf
+lf
 BX
 Jr
-vB
+Sh
 HW
 Sh
 qm
@@ -5442,11 +5449,11 @@ Ly
 Ly
 Ly
 aT
-OR
+aC
 Ug
 oX
-cw
-aT
+Le
+iC
 dc
 fp
 iP
@@ -5476,7 +5483,7 @@ Ly
 Ly
 Ly
 aT
-OR
+aC
 eu
 kj
 Ap
@@ -5484,22 +5491,22 @@ ie
 vW
 Xv
 Lo
-yJ
-Ug
+OR
+As
 Qv
-aT
+Ec
 DL
 Ad
 GM
-uC
+lf
 GT
 bB
 wp
 xg
-qm
+zJ
 hE
 va
-ff
+Sh
 zS
 xH
 wg
@@ -5511,31 +5518,31 @@ Ly
 Ly
 Ly
 aT
-OR
-Ug
+aC
+cx
 bc
-aT
+jW
 Le
 xn
 bi
-EQ
+OR
 iU
 oz
-aT
+EQ
 Hl
-Ad
+He
 BQ
-Xi
-GT
+lf
+YG
 fQ
 sa
-xg
-qm
+QI
+Jj
 dJ
 PV
-jW
+Sh
 lc
-aw
+cU
 yy
 sS
 "}
@@ -5546,30 +5553,30 @@ Ly
 Ly
 Ly
 aT
-aT
-aT
+aC
+aC
+aC
+aC
+ff
+ff
 OR
-aT
 iT
+OR
+OR
+OR
 iT
-aT
-iT
-aT
 OR
-ZE
-VX
-ZE
-ZE
-ZE
+lf
+lf
 VX
-ZE
-ZE
+lf
+lf
+Pw
+Pw
+Pw
+wn
+Sh
 Sh
-qm
-qm
-qm
-qm
-qm
 qm
 Ly
 "}