From a73206b95a13fc3ffe57eaa0b7a4a765a816cedf Mon Sep 17 00:00:00 2001
From: goober3 <118859017+goober3@users.noreply.github.com>
Date: Sat, 8 Apr 2023 19:19:18 +0100
Subject: [PATCH 01/28] tegus

---
 _maps/configs/nanotrasen_tegus.json           |   33 +
 _maps/shuttles/shiptest/nanotrasen_tegus.dmm  | 3701 +++++++++++++++++
 .../subshuttles/Subshuttle Catalog.txt        |    5 +
 .../subshuttles/nanotrasen_shuttletegus.dmm   |  438 ++
 code/datums/shuttles.dm                       |    6 +-
 code/game/area/ship_areas.dm                  |    5 +
 .../jobs/job_types/cargo_technician.dm        |   11 +
 7 files changed, 4198 insertions(+), 1 deletion(-)
 create mode 100644 _maps/configs/nanotrasen_tegus.json
 create mode 100644 _maps/shuttles/shiptest/nanotrasen_tegus.dmm
 create mode 100644 _maps/shuttles/subshuttles/nanotrasen_shuttletegus.dmm

diff --git a/_maps/configs/nanotrasen_tegus.json b/_maps/configs/nanotrasen_tegus.json
new file mode 100644
index 000000000000..e0702aa501a8
--- /dev/null
+++ b/_maps/configs/nanotrasen_tegus.json
@@ -0,0 +1,33 @@
+{
+	"$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json",
+	"map_name": "Tegus-class Mining Carrier",
+	"prefix": "NTSV",
+	"namelists": ["GENERAL", "BRITISH_NAVY", "MYTHOLOGICAL", "SPACE"],
+	"map_short_name": "Gecko-class",
+	"map_path": "_maps/shuttles/shiptest/nanotrasen_tegus.dmm",
+	"limit": 1,
+	"job_slots": {
+		"Captain": {
+			"outfit": "/datum/outfit/job/captain/nt",
+			"officer": true,
+			"slots": 1
+		},
+		"Mechanic": {
+			"outfit": "/datum/outfit/job/engineer/nt",
+			"slots": 1
+		},
+		"Shaft Miner": {
+			"outfit": "/datum/outfit/job/miner/classic",
+			"slots": 3
+		},
+		"Pilot": {
+			"outfit": "/datum/outfit/job/cargo_tech/pilot/nanotrasen",
+			"slots": 1
+		},
+		"Deckhand": {
+			"outfit": "/datum/outfit/job/assistant",
+			"slots": 2
+		}
+	},
+	"enabled": true
+}
diff --git a/_maps/shuttles/shiptest/nanotrasen_tegus.dmm b/_maps/shuttles/shiptest/nanotrasen_tegus.dmm
new file mode 100644
index 000000000000..43c8c6c8a015
--- /dev/null
+++ b/_maps/shuttles/shiptest/nanotrasen_tegus.dmm
@@ -0,0 +1,3701 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"ac" = (
+/obj/effect/turf_decal/corner/transparent/neutral{
+	dir = 5
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 5
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/bridge)
+"am" = (
+/obj/effect/turf_decal/industrial/hatch/yellow,
+/obj/structure/closet/crate,
+/turf/open/floor/plasteel/patterned,
+/area/ship/cargo)
+"aA" = (
+/obj/effect/turf_decal/industrial/warning{
+	dir = 4
+	},
+/turf/open/floor/plasteel/patterned,
+/area/ship/cargo)
+"bb" = (
+/obj/machinery/power/shuttle/engine/electric{
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "0-4"
+	},
+/turf/open/floor/plating,
+/area/ship/maintenance/port)
+"bl" = (
+/obj/machinery/power/shuttle/engine/electric{
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "0-4"
+	},
+/turf/open/floor/plating,
+/area/ship/maintenance/starboard)
+"bu" = (
+/obj/effect/turf_decal/industrial/outline/yellow,
+/obj/structure/ore_box,
+/obj/machinery/light{
+	dir = 1
+	},
+/turf/open/floor/plasteel/patterned,
+/area/ship/cargo)
+"bK" = (
+/obj/structure/closet/crate/bin,
+/obj/effect/turf_decal/corner/transparent/neutral{
+	dir = 4
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/bridge)
+"bN" = (
+/obj/structure/bed,
+/obj/item/bedsheet/dorms,
+/obj/structure/curtain/cloth/grey,
+/turf/open/floor/plasteel/patterned,
+/area/ship/crew)
+"cC" = (
+/obj/effect/turf_decal/industrial/warning{
+	dir = 8
+	},
+/obj/effect/turf_decal/industrial/warning{
+	dir = 4
+	},
+/obj/machinery/door/poddoor/multi_tile/four_tile_ver,
+/turf/open/floor/plating,
+/area/ship/cargo)
+"cK" = (
+/obj/machinery/power/smes/shuttle/precharged{
+	dir = 4
+	},
+/obj/structure/window/reinforced/spawner/west,
+/obj/machinery/door/window/eastright,
+/turf/open/floor/plating,
+/area/ship/maintenance/port)
+"cP" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/structure/cable{
+	icon_state = "2-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 6
+	},
+/turf/open/floor/plating,
+/area/ship/maintenance/port)
+"cR" = (
+/obj/effect/turf_decal/corner/transparent/solgovgold{
+	dir = 8
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/cable/yellow{
+	icon_state = "2-4"
+	},
+/turf/open/floor/plasteel/patterned,
+/area/ship/maintenance/starboard)
+"cY" = (
+/obj/machinery/vending/cigarette,
+/turf/open/floor/plasteel/patterned/ridged,
+/area/ship/crew/canteen)
+"db" = (
+/turf/closed/wall/mineral/titanium/nodiagonal,
+/area/ship/maintenance/port)
+"dk" = (
+/obj/structure/chair/stool{
+	dir = 4;
+	pixel_x = 3
+	},
+/turf/open/floor/plasteel/patterned,
+/area/ship/crew/canteen)
+"dl" = (
+/obj/structure/cable{
+	icon_state = "1-8"
+	},
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 9
+	},
+/turf/open/floor/plasteel,
+/area/ship/crew)
+"dm" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/machinery/advanced_airlock_controller{
+	pixel_x = 32
+	},
+/turf/open/floor/plating,
+/area/ship/hallway/central)
+"du" = (
+/obj/effect/turf_decal/industrial/warning{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 4
+	},
+/turf/open/floor/plasteel/patterned/ridged,
+/area/ship/cargo)
+"dy" = (
+/obj/effect/spawner/structure/window/shuttle,
+/turf/open/floor/plating,
+/area/ship/bridge)
+"dF" = (
+/obj/effect/turf_decal/corner/transparent/ntblue,
+/obj/structure/cable{
+	icon_state = "1-8"
+	},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2,
+/turf/open/floor/plasteel,
+/area/ship/hallway/central)
+"dO" = (
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2{
+	dir = 4
+	},
+/turf/open/floor/plasteel,
+/area/ship/cargo)
+"dP" = (
+/obj/structure/table/reinforced,
+/obj/item/reagent_containers/food/drinks/shaker,
+/turf/open/floor/plasteel,
+/area/ship/crew/canteen)
+"dQ" = (
+/obj/effect/turf_decal/industrial/warning{
+	dir = 1
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/light/floor,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 4
+	},
+/turf/open/floor/plasteel/patterned,
+/area/ship/cargo)
+"dR" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 4
+	},
+/turf/open/floor/plasteel,
+/area/ship/crew/canteen)
+"dV" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+	dir = 4
+	},
+/turf/open/floor/plasteel,
+/area/ship/crew/canteen)
+"dY" = (
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 1
+	},
+/turf/open/floor/plasteel/patterned,
+/area/ship/engineering/communications)
+"eh" = (
+/obj/structure/table,
+/obj/effect/turf_decal/corner/transparent/brown{
+	dir = 4
+	},
+/obj/item/clipboard,
+/obj/item/pen,
+/turf/open/floor/plasteel,
+/area/ship/cargo)
+"eo" = (
+/obj/effect/turf_decal/industrial/warning{
+	dir = 8
+	},
+/obj/effect/turf_decal/industrial/warning{
+	dir = 4
+	},
+/turf/open/floor/plating,
+/area/ship/cargo)
+"eq" = (
+/obj/effect/turf_decal/corner/transparent/solgovgold{
+	dir = 8
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
+/turf/open/floor/plasteel/patterned,
+/area/ship/maintenance/starboard)
+"eT" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 8
+	},
+/turf/open/floor/plating,
+/area/ship/hallway/central)
+"eW" = (
+/obj/machinery/telecomms/bus/preset_six,
+/turf/open/floor/plasteel/patterned/ridged,
+/area/ship/engineering/communications)
+"eZ" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 1
+	},
+/turf/open/floor/plasteel/patterned/ridged,
+/area/ship/hallway/aft)
+"ff" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/turf/open/floor/plating,
+/area/ship/hallway/central)
+"fj" = (
+/obj/effect/turf_decal/borderfloor/full,
+/obj/machinery/door/firedoor/border_only,
+/obj/machinery/door/firedoor/border_only{
+	dir = 1
+	},
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/hallway/central)
+"fx" = (
+/obj/effect/turf_decal/corner/transparent/lime,
+/obj/effect/turf_decal/corner/transparent/neutral{
+	dir = 8
+	},
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+	dir = 1
+	},
+/turf/open/floor/plasteel,
+/area/ship/hallway/central)
+"fH" = (
+/obj/effect/turf_decal/corner/transparent/bar{
+	dir = 4
+	},
+/obj/effect/turf_decal/corner/transparent/neutral{
+	dir = 1
+	},
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
+/turf/open/floor/plasteel,
+/area/ship/crew/canteen)
+"gt" = (
+/obj/effect/turf_decal/industrial/loading{
+	dir = 8
+	},
+/turf/open/floor/plasteel/patterned,
+/area/ship/cargo)
+"gL" = (
+/obj/machinery/computer/crew{
+	dir = 8;
+	icon_state = "computer-left"
+	},
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/bridge)
+"gP" = (
+/obj/machinery/atmospherics/pipe/layer_manifold{
+	dir = 4
+	},
+/turf/closed/wall/mineral/titanium/nodiagonal,
+/area/ship/crew/canteen)
+"ha" = (
+/obj/effect/turf_decal/industrial/hatch/yellow,
+/obj/machinery/light{
+	dir = 8
+	},
+/turf/open/floor/plasteel/patterned,
+/area/ship/cargo)
+"hd" = (
+/obj/structure/table/reinforced,
+/obj/item/areaeditor/shuttle{
+	pixel_x = 12;
+	pixel_y = 3
+	},
+/obj/item/megaphone/command{
+	pixel_x = -8;
+	pixel_y = 4
+	},
+/obj/machinery/light,
+/turf/open/floor/plasteel/dark,
+/area/ship/bridge)
+"hh" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/structure/cable{
+	icon_state = "2-4"
+	},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2{
+	dir = 8
+	},
+/obj/effect/turf_decal/corner/transparent/brown{
+	dir = 1
+	},
+/turf/open/floor/plasteel/patterned,
+/area/ship/hallway/aft)
+"ho" = (
+/turf/open/floor/plasteel/stairs{
+	dir = 8
+	},
+/area/ship/hallway/aft)
+"hC" = (
+/obj/structure/cable{
+	icon_state = "1-4"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 5
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 5
+	},
+/turf/open/floor/plasteel,
+/area/ship/cargo)
+"hG" = (
+/obj/structure/table,
+/obj/item/clipboard{
+	pixel_y = 4;
+	pixel_x = 4
+	},
+/obj/item/stamp{
+	pixel_x = -8;
+	pixel_y = 8
+	},
+/obj/item/stamp/denied{
+	pixel_x = -8
+	},
+/obj/machinery/light{
+	dir = 4
+	},
+/turf/open/floor/plasteel/patterned/ridged,
+/area/ship/crew)
+"hL" = (
+/turf/closed/wall/mineral/titanium/nodiagonal,
+/area/ship/engineering/communications)
+"hW" = (
+/obj/effect/turf_decal/borderfloor/full,
+/obj/machinery/door/firedoor/border_only,
+/obj/machinery/door/firedoor/border_only{
+	dir = 1
+	},
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 1
+	},
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/hallway/central)
+"im" = (
+/obj/machinery/light,
+/turf/open/floor/plasteel,
+/area/ship/crew/canteen)
+"iq" = (
+/obj/structure/table,
+/obj/effect/turf_decal/corner/transparent/brown{
+	dir = 4
+	},
+/turf/open/floor/plasteel,
+/area/ship/cargo)
+"it" = (
+/obj/effect/turf_decal/corner/transparent/brown{
+	dir = 4
+	},
+/obj/effect/turf_decal/corner/transparent/neutral{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 9
+	},
+/turf/open/floor/plasteel,
+/area/ship/hallway/central)
+"iJ" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 1
+	},
+/turf/open/floor/plasteel/patterned,
+/area/ship/engineering/communications)
+"iM" = (
+/obj/machinery/atmospherics/components/unary/portables_connector/layer2,
+/obj/machinery/airalarm/directional/east,
+/turf/open/floor/plasteel/patterned,
+/area/ship/maintenance/port)
+"iN" = (
+/obj/effect/turf_decal/industrial/warning{
+	dir = 1
+	},
+/turf/open/floor/plasteel/patterned/ridged,
+/area/ship/cargo)
+"iR" = (
+/obj/structure/chair/comfy/shuttle{
+	dir = 4;
+	name = "Helm"
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/bridge)
+"iV" = (
+/obj/machinery/telecomms/hub/preset,
+/turf/open/floor/plasteel/patterned/ridged,
+/area/ship/engineering/communications)
+"iY" = (
+/obj/machinery/power/port_gen/pacman,
+/obj/structure/window/reinforced/spawner,
+/obj/machinery/door/window/westright,
+/obj/structure/cable/yellow{
+	icon_state = "0-8"
+	},
+/turf/open/floor/plasteel/patterned/ridged,
+/area/ship/maintenance/starboard)
+"jb" = (
+/obj/effect/turf_decal/corner/transparent/neutral/full,
+/obj/effect/turf_decal/corner/transparent/bar/diagonal,
+/obj/machinery/vending/boozeomat,
+/turf/open/floor/plasteel,
+/area/ship/crew/canteen)
+"jd" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 4
+	},
+/turf/open/floor/plasteel/stairs{
+	dir = 4
+	},
+/area/ship/hallway/central)
+"jn" = (
+/obj/effect/turf_decal/industrial/warning,
+/obj/effect/turf_decal/industrial/warning,
+/obj/machinery/light/floor,
+/turf/open/floor/plasteel/patterned,
+/area/ship/cargo)
+"jq" = (
+/obj/structure/cable{
+	icon_state = "2-4"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 6
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 6
+	},
+/obj/structure/catwalk/over/plated_catwalk,
+/turf/open/floor/plating,
+/area/ship/hallway/aft)
+"js" = (
+/obj/machinery/power/terminal{
+	dir = 8
+	},
+/obj/structure/cable{
+	icon_state = "0-4"
+	},
+/turf/open/floor/plasteel/patterned/ridged,
+/area/ship/maintenance/port)
+"ju" = (
+/obj/structure/cable{
+	icon_state = "1-4"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 5
+	},
+/turf/open/floor/plasteel/patterned/ridged,
+/area/ship/crew/canteen)
+"jQ" = (
+/obj/machinery/computer/telecomms/server{
+	dir = 4;
+	network = "irmg_commnet"
+	},
+/obj/machinery/light{
+	dir = 8
+	},
+/turf/open/floor/plasteel/patterned/ridged,
+/area/ship/engineering/communications)
+"kg" = (
+/obj/machinery/suit_storage_unit/mining,
+/obj/structure/window/reinforced/spawner,
+/obj/machinery/door/window/eastright,
+/turf/open/floor/plasteel/patterned/ridged,
+/area/ship/hallway/aft)
+"kE" = (
+/obj/effect/turf_decal/borderfloor/full,
+/obj/machinery/door/firedoor/border_only,
+/obj/machinery/door/firedoor/border_only{
+	dir = 1
+	},
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/hallway/central)
+"kM" = (
+/obj/effect/turf_decal/corner/transparent/solgovgold{
+	dir = 1
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+	dir = 1
+	},
+/turf/open/floor/plasteel/patterned,
+/area/ship/maintenance/starboard)
+"kU" = (
+/obj/machinery/cryopod{
+	dir = 8
+	},
+/obj/structure/window/reinforced/spawner/north,
+/turf/open/floor/plasteel/patterned,
+/area/ship/crew)
+"lb" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/structure/cable{
+	icon_state = "2-8"
+	},
+/obj/structure/cable{
+	icon_state = "2-4"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 6
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
+/turf/open/floor/plating,
+/area/ship/maintenance/port)
+"lg" = (
+/obj/machinery/door/poddoor,
+/turf/open/floor/plating,
+/area/ship/cargo)
+"li" = (
+/obj/machinery/atmospherics/components/unary/outlet_injector/layer2{
+	dir = 4
+	},
+/turf/open/floor/engine/hull,
+/area/ship/hallway/aft)
+"lI" = (
+/turf/closed/wall/mineral/titanium,
+/area/ship/crew/canteen)
+"lW" = (
+/turf/closed/wall/mineral/titanium/nodiagonal,
+/area/ship/hallway/central)
+"mf" = (
+/obj/structure/sign/nanotrasen,
+/turf/closed/wall/mineral/titanium/nodiagonal,
+/area/ship/cargo)
+"mq" = (
+/obj/effect/turf_decal/industrial/warning,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 4
+	},
+/turf/open/floor/plasteel/patterned,
+/area/ship/cargo)
+"mu" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/structure/cable{
+	icon_state = "1-4"
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/structure/cable{
+	icon_state = "2-4"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 5
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 5
+	},
+/turf/open/floor/plating,
+/area/ship/maintenance/starboard)
+"mJ" = (
+/obj/effect/turf_decal/corner/transparent/lime{
+	dir = 4
+	},
+/obj/effect/turf_decal/corner/transparent/neutral,
+/obj/structure/chair/office,
+/turf/open/floor/plasteel,
+/area/ship/crew)
+"mV" = (
+/obj/structure/table,
+/obj/structure/bedsheetbin,
+/turf/open/floor/plasteel,
+/area/ship/crew)
+"mW" = (
+/obj/structure/ore_box,
+/obj/machinery/light,
+/obj/effect/turf_decal/industrial/hatch/yellow,
+/turf/open/floor/plasteel/patterned,
+/area/ship/cargo)
+"nk" = (
+/turf/open/floor/plasteel,
+/area/ship/crew/canteen)
+"nn" = (
+/obj/structure/closet/secure_closet/miningcloset,
+/obj/structure/window/reinforced/spawner{
+	dir = 1
+	},
+/obj/machinery/door/window/eastright,
+/turf/open/floor/plasteel/patterned/ridged,
+/area/ship/hallway/aft)
+"np" = (
+/obj/structure/table,
+/obj/machinery/light,
+/turf/open/floor/plasteel/patterned/ridged,
+/area/ship/crew/canteen)
+"nT" = (
+/obj/effect/turf_decal/corner/transparent/neutral{
+	dir = 2
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 8
+	},
+/turf/open/floor/plasteel,
+/area/ship/hallway/central)
+"nW" = (
+/obj/effect/turf_decal/corner/transparent/lime{
+	dir = 8
+	},
+/obj/effect/turf_decal/corner/transparent/lime{
+	dir = 4
+	},
+/obj/effect/turf_decal/corner/transparent/neutral,
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+	dir = 8
+	},
+/turf/open/floor/plasteel,
+/area/ship/crew)
+"oc" = (
+/obj/machinery/door/airlock/mining,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 8
+	},
+/turf/open/floor/plasteel,
+/area/ship/cargo)
+"oi" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 4
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/bridge)
+"ol" = (
+/obj/effect/turf_decal/industrial/warning,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 4
+	},
+/turf/open/floor/plasteel/patterned/cargo_one,
+/area/ship/cargo)
+"oq" = (
+/obj/structure/cable{
+	icon_state = "1-4"
+	},
+/obj/machinery/light{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 5
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 5
+	},
+/turf/open/floor/plasteel/patterned/ridged,
+/area/ship/hallway/central)
+"oE" = (
+/obj/effect/turf_decal/industrial/warning{
+	dir = 1
+	},
+/obj/structure/cable{
+	icon_state = "2-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 4
+	},
+/turf/open/floor/plasteel/patterned/ridged,
+/area/ship/cargo)
+"oU" = (
+/obj/structure/table/reinforced,
+/obj/item/paper_bin,
+/obj/item/pen,
+/turf/open/floor/plasteel/dark,
+/area/ship/bridge)
+"oW" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/structure/cable{
+	icon_state = "2-8"
+	},
+/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/plating,
+/area/ship/hallway/central)
+"pf" = (
+/turf/open/floor/plasteel/dark,
+/area/ship/bridge)
+"pg" = (
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 1
+	},
+/obj/effect/turf_decal/corner/transparent/brown{
+	dir = 1
+	},
+/turf/open/floor/plasteel/patterned,
+/area/ship/hallway/aft)
+"py" = (
+/obj/effect/turf_decal/corner/transparent/neutral{
+	dir = 8
+	},
+/obj/machinery/power/apc/auto_name/south,
+/obj/structure/cable{
+	icon_state = "0-8"
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/bridge)
+"pC" = (
+/obj/structure/closet/secure_closet{
+	anchored = 1;
+	icon_state = "eng_secure";
+	name = "mechanic's locker";
+	req_access = list(11)
+	},
+/turf/open/floor/plasteel/patterned/ridged,
+/area/ship/maintenance/starboard)
+"pH" = (
+/obj/machinery/power/terminal{
+	dir = 8
+	},
+/obj/effect/turf_decal/corner/transparent/solgovgold{
+	dir = 4
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/cable{
+	icon_state = "0-4"
+	},
+/turf/open/floor/plasteel/patterned,
+/area/ship/maintenance/starboard)
+"qd" = (
+/obj/machinery/atmospherics/components/binary/pump/layer4{
+	name = "Air to Distro"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer2{
+	dir = 10
+	},
+/turf/open/floor/plasteel/patterned/ridged,
+/area/ship/maintenance/port)
+"qf" = (
+/obj/machinery/door/airlock/external,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 1
+	},
+/turf/open/floor/plasteel,
+/area/ship/hallway/central)
+"qi" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+	dir = 4
+	},
+/turf/open/floor/plasteel,
+/area/ship/hallway/aft)
+"qD" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/structure/cable{
+	icon_state = "2-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2{
+	dir = 8
+	},
+/turf/open/floor/plating,
+/area/ship/maintenance/port)
+"qE" = (
+/obj/effect/turf_decal/corner/transparent/lime,
+/obj/effect/turf_decal/corner/transparent/neutral{
+	dir = 8
+	},
+/turf/open/floor/plasteel,
+/area/ship/hallway/central)
+"qF" = (
+/obj/machinery/airalarm/directional/east,
+/obj/machinery/vending/mining_equipment,
+/turf/open/floor/plasteel,
+/area/ship/hallway/aft)
+"qN" = (
+/obj/effect/turf_decal/industrial/warning/corner,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 8
+	},
+/turf/open/floor/plasteel/patterned/cargo_one,
+/area/ship/cargo)
+"qR" = (
+/obj/effect/turf_decal/industrial/warning{
+	dir = 1
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 4
+	},
+/turf/open/floor/plasteel/patterned,
+/area/ship/cargo)
+"qS" = (
+/obj/effect/turf_decal/borderfloor/full,
+/obj/machinery/door/firedoor/border_only{
+	dir = 4
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 8
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 4
+	},
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/hallway/central)
+"rc" = (
+/turf/open/floor/plasteel/patterned,
+/area/ship/hallway/aft)
+"rr" = (
+/obj/effect/turf_decal/corner/transparent/bar{
+	dir = 4
+	},
+/obj/effect/turf_decal/corner/transparent/neutral{
+	dir = 1
+	},
+/turf/open/floor/plasteel,
+/area/ship/crew/canteen)
+"rs" = (
+/obj/effect/turf_decal/corner/transparent/solgovgold{
+	dir = 4
+	},
+/obj/machinery/power/terminal{
+	dir = 8
+	},
+/obj/structure/cable{
+	icon_state = "0-4"
+	},
+/turf/open/floor/plasteel/patterned,
+/area/ship/maintenance/port)
+"rt" = (
+/turf/closed/wall/mineral/titanium,
+/area/ship/cargo)
+"rD" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/machinery/airalarm/directional/east,
+/turf/open/floor/plating,
+/area/ship/engineering/communications)
+"rY" = (
+/obj/effect/turf_decal/industrial/warning{
+	dir = 1
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 4
+	},
+/turf/open/floor/plasteel/patterned/ridged,
+/area/ship/cargo)
+"rZ" = (
+/obj/machinery/light/small{
+	dir = 1
+	},
+/obj/structure/reagent_dispensers/fueltank,
+/turf/open/floor/plasteel/patterned,
+/area/ship/maintenance/port)
+"sb" = (
+/obj/effect/turf_decal/industrial/warning,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 4
+	},
+/turf/open/floor/plasteel/patterned/ridged,
+/area/ship/cargo)
+"sj" = (
+/obj/machinery/shower{
+	dir = 4
+	},
+/obj/machinery/door/window/eastright,
+/obj/effect/turf_decal/floordetail/edgedrain{
+	dir = 8
+	},
+/turf/open/floor/plasteel/patterned/ridged,
+/area/ship/crew/canteen)
+"sC" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/cable{
+	icon_state = "1-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 9
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 9
+	},
+/turf/open/floor/plasteel/patterned,
+/area/ship/hallway/aft)
+"sD" = (
+/obj/structure/table/reinforced,
+/obj/item/radio/intercom{
+	dir = 1
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/bridge)
+"sF" = (
+/obj/structure/chair/stool/bar{
+	dir = 8
+	},
+/turf/open/floor/plasteel/patterned,
+/area/ship/crew/canteen)
+"tf" = (
+/obj/effect/turf_decal/industrial/warning{
+	dir = 4
+	},
+/turf/open/floor/plasteel/patterned/ridged,
+/area/ship/cargo)
+"tU" = (
+/obj/machinery/telecomms/processor/preset_four{
+	network = "irmg_commnet"
+	},
+/turf/open/floor/plasteel/patterned/ridged,
+/area/ship/engineering/communications)
+"ua" = (
+/obj/effect/turf_decal/corner/transparent/lime{
+	dir = 4
+	},
+/obj/effect/turf_decal/corner/transparent/neutral{
+	dir = 1
+	},
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
+/turf/open/floor/plasteel,
+/area/ship/hallway/central)
+"ub" = (
+/obj/effect/turf_decal/corner/transparent/ntblue{
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/structure/cable{
+	icon_state = "2-8"
+	},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2{
+	dir = 1
+	},
+/turf/open/floor/plasteel,
+/area/ship/hallway/central)
+"uc" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/turf/open/floor/plating,
+/area/ship/engineering/communications)
+"ud" = (
+/obj/item/kirbyplants{
+	icon_state = "plant-10";
+	pixel_y = 6;
+	pixel_x = -6
+	},
+/obj/machinery/light{
+	dir = 1;
+	layer = 4
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/bridge)
+"ui" = (
+/turf/open/floor/engine/hull,
+/area/ship/hallway/aft)
+"ut" = (
+/turf/template_noop,
+/area/template_noop)
+"uz" = (
+/obj/item/kirbyplants{
+	icon_state = "plant-10";
+	pixel_y = 3
+	},
+/obj/machinery/power/apc/auto_name/east,
+/obj/structure/cable{
+	icon_state = "0-8"
+	},
+/turf/open/floor/plasteel/patterned/ridged,
+/area/ship/crew)
+"uD" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 8
+	},
+/turf/open/floor/plasteel/stairs{
+	dir = 4
+	},
+/area/ship/hallway/central)
+"uO" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+	dir = 8
+	},
+/turf/open/floor/plasteel/patterned,
+/area/ship/maintenance/port)
+"uZ" = (
+/obj/effect/turf_decal/industrial/warning{
+	dir = 8
+	},
+/obj/effect/turf_decal/industrial/warning{
+	dir = 4
+	},
+/obj/machinery/door/poddoor/multi_tile/four_tile_ver,
+/obj/docking_port/mobile{
+	can_move_docking_ports = 1;
+	dir = 8;
+	launch_status = 0;
+	preferred_direction = 4
+	},
+/turf/open/floor/plating,
+/area/ship/cargo)
+"vy" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 1
+	},
+/obj/structure/catwalk/over/plated_catwalk,
+/turf/open/floor/plating,
+/area/ship/hallway/aft)
+"vE" = (
+/obj/machinery/door/airlock/engineering,
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/brown/hidden/layer2{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
+/turf/open/floor/plasteel/patterned,
+/area/ship/hallway/aft)
+"vN" = (
+/obj/machinery/door/airlock,
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
+/turf/open/floor/plasteel,
+/area/ship/crew/canteen)
+"vO" = (
+/obj/effect/turf_decal/corner/transparent/solgovgold{
+	dir = 1
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4,
+/obj/machinery/atmospherics/components/trinary/filter/flipped/layer2{
+	dir = 1;
+	name = "Waste to External"
+	},
+/turf/open/floor/plasteel/patterned,
+/area/ship/maintenance/port)
+"vT" = (
+/obj/machinery/door/airlock,
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 1
+	},
+/turf/open/floor/plasteel,
+/area/ship/crew)
+"vV" = (
+/obj/structure/chair/office{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 6
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/bridge)
+"wb" = (
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/structure/cable{
+	icon_state = "2-4"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 1
+	},
+/obj/structure/table,
+/obj/item/clipboard{
+	pixel_y = 8
+	},
+/turf/open/floor/plasteel/patterned,
+/area/ship/hallway/aft)
+"wc" = (
+/obj/machinery/power/port_gen/pacman/super,
+/obj/structure/window/reinforced/spawner/north,
+/obj/machinery/door/window/westleft,
+/obj/structure/cable/yellow{
+	icon_state = "0-8"
+	},
+/turf/open/floor/plasteel/patterned/ridged,
+/area/ship/maintenance/starboard)
+"wg" = (
+/obj/effect/turf_decal/corner/transparent/neutral{
+	dir = 10
+	},
+/obj/structure/cable{
+	icon_state = "2-4"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
+/turf/open/floor/plasteel/dark,
+/area/ship/bridge)
+"ws" = (
+/obj/machinery/cryopod{
+	dir = 4
+	},
+/obj/structure/window/reinforced/spawner/north,
+/turf/open/floor/plasteel/patterned,
+/area/ship/crew)
+"wv" = (
+/obj/structure/railing/corner{
+	dir = 4
+	},
+/obj/effect/turf_decal/corner/transparent/solgovgold{
+	dir = 1
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/airalarm/directional/south,
+/turf/open/floor/plasteel/patterned,
+/area/ship/maintenance/starboard)
+"wE" = (
+/obj/docking_port/stationary{
+	roundstart_template = /datum/map_template/shuttle/subshuttles/nanotrasen_tegus;
+	height = 8;
+	width = 16;
+	dwidth = 9;
+	dir = 2
+	},
+/turf/open/floor/plating,
+/area/ship/cargo)
+"wP" = (
+/obj/effect/turf_decal/industrial/outline/yellow,
+/turf/open/floor/plasteel/patterned,
+/area/ship/cargo)
+"xc" = (
+/obj/machinery/power/apc/auto_name/east,
+/obj/structure/cable{
+	icon_state = "0-8"
+	},
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/green/visible/layer2{
+	dir = 9
+	},
+/turf/open/floor/plasteel/patterned,
+/area/ship/maintenance/port)
+"xA" = (
+/obj/effect/turf_decal/industrial/outline/yellow,
+/obj/structure/closet/crate,
+/obj/machinery/light{
+	dir = 1
+	},
+/turf/open/floor/plasteel/patterned,
+/area/ship/cargo)
+"xB" = (
+/obj/structure/toilet{
+	pixel_y = 5
+	},
+/obj/structure/sink{
+	dir = 8;
+	pixel_x = 12
+	},
+/obj/structure/mirror{
+	pixel_x = 27
+	},
+/obj/machinery/light/small{
+	dir = 1;
+	pixel_x = 10
+	},
+/turf/open/floor/plastic,
+/area/ship/crew/canteen)
+"xE" = (
+/obj/effect/turf_decal/industrial/warning{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 4
+	},
+/turf/open/floor/plasteel/patterned/cargo_one,
+/area/ship/cargo)
+"xG" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
+/turf/open/floor/plating,
+/area/ship/hallway/central)
+"xJ" = (
+/obj/effect/turf_decal/corner/transparent/lime{
+	dir = 8
+	},
+/obj/effect/turf_decal/corner/transparent/neutral{
+	dir = 1
+	},
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
+/turf/open/floor/plasteel,
+/area/ship/crew)
+"xZ" = (
+/obj/machinery/light/small,
+/obj/machinery/autolathe,
+/obj/item/stack/sheet/glass/five,
+/obj/item/stack/sheet/metal/five{
+	pixel_y = 3
+	},
+/turf/open/floor/plasteel/patterned,
+/area/ship/maintenance/starboard)
+"yd" = (
+/obj/effect/turf_decal/industrial/warning{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 4
+	},
+/turf/open/floor/plasteel/patterned,
+/area/ship/cargo)
+"ye" = (
+/obj/effect/turf_decal/corner/transparent/ntblue,
+/obj/effect/turf_decal/corner/transparent/neutral{
+	dir = 4
+	},
+/turf/open/floor/plasteel,
+/area/ship/engineering/communications)
+"yg" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 9
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 10
+	},
+/turf/open/floor/plasteel/patterned/ridged,
+/area/ship/maintenance/starboard)
+"yI" = (
+/turf/open/floor/plasteel/stairs{
+	dir = 4
+	},
+/area/ship/maintenance/starboard)
+"yL" = (
+/obj/structure/table,
+/obj/item/storage/toolbox/electrical{
+	pixel_y = 5
+	},
+/obj/item/storage/toolbox/mechanical,
+/obj/item/stack/cable_coil/red{
+	pixel_y = 3
+	},
+/turf/open/floor/plasteel/patterned/ridged,
+/area/ship/maintenance/starboard)
+"yO" = (
+/obj/effect/turf_decal/industrial/warning{
+	dir = 1
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 4
+	},
+/turf/open/floor/plasteel/patterned,
+/area/ship/cargo)
+"yV" = (
+/obj/effect/turf_decal/industrial/hatch/yellow,
+/turf/open/floor/plasteel/patterned,
+/area/ship/cargo)
+"zj" = (
+/obj/structure/reagent_dispensers/watertank,
+/obj/structure/railing,
+/turf/open/floor/plasteel/patterned,
+/area/ship/hallway/aft)
+"zr" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/power/apc/auto_name/east,
+/obj/structure/cable{
+	icon_state = "0-8"
+	},
+/obj/structure/table,
+/obj/item/paper_bin,
+/obj/item/pen,
+/turf/open/floor/plasteel/patterned/ridged,
+/area/ship/hallway/aft)
+"zu" = (
+/obj/structure/sign/nanotrasen,
+/turf/closed/wall/mineral/titanium/nodiagonal,
+/area/ship/crew/canteen)
+"zv" = (
+/obj/structure/table,
+/turf/open/floor/plasteel,
+/area/ship/cargo)
+"zH" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2{
+	dir = 4
+	},
+/obj/structure/table,
+/obj/item/crowbar,
+/turf/open/floor/plasteel,
+/area/ship/hallway/aft)
+"Ag" = (
+/obj/machinery/door/airlock/engineering,
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 1
+	},
+/turf/open/floor/plasteel,
+/area/ship/engineering/communications)
+"Ao" = (
+/obj/structure/table,
+/obj/item/storage/toolbox/electrical,
+/obj/item/multitool{
+	pixel_y = 3
+	},
+/turf/open/floor/plasteel/patterned/ridged,
+/area/ship/engineering/communications)
+"Aq" = (
+/obj/effect/turf_decal/industrial/warning/corner{
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 4
+	},
+/turf/open/floor/plasteel/patterned/cargo_one,
+/area/ship/cargo)
+"Au" = (
+/turf/open/floor/plasteel/stairs{
+	dir = 4
+	},
+/area/ship/hallway/central)
+"Ay" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/light{
+	dir = 4
+	},
+/obj/structure/table,
+/obj/item/extinguisher/mini,
+/turf/open/floor/plasteel/patterned/ridged,
+/area/ship/hallway/aft)
+"Az" = (
+/obj/effect/turf_decal/industrial/warning{
+	dir = 1
+	},
+/obj/machinery/light/floor,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 4
+	},
+/turf/open/floor/plasteel/patterned,
+/area/ship/cargo)
+"AB" = (
+/obj/effect/turf_decal/corner/transparent/lime{
+	dir = 4
+	},
+/obj/effect/turf_decal/corner/transparent/neutral{
+	dir = 1
+	},
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
+/turf/open/floor/plasteel,
+/area/ship/hallway/central)
+"Ba" = (
+/obj/structure/cable{
+	icon_state = "2-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 10
+	},
+/turf/open/floor/plasteel,
+/area/ship/crew/canteen)
+"Be" = (
+/obj/structure/filingcabinet/double,
+/turf/open/floor/plasteel,
+/area/ship/cargo)
+"Bh" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
+/turf/open/floor/plasteel/patterned,
+/area/ship/hallway/central)
+"Bk" = (
+/obj/effect/turf_decal/corner/transparent/ntblue,
+/obj/effect/turf_decal/corner/transparent/neutral{
+	dir = 4
+	},
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
+/turf/open/floor/plasteel,
+/area/ship/engineering/communications)
+"Bn" = (
+/obj/effect/turf_decal/corner/transparent/brown,
+/obj/machinery/power/apc/auto_name/south,
+/obj/structure/cable,
+/turf/open/floor/plasteel,
+/area/ship/cargo)
+"Bv" = (
+/obj/effect/turf_decal/corner/transparent/bar{
+	dir = 4
+	},
+/obj/effect/turf_decal/corner/transparent/neutral{
+	dir = 1
+	},
+/obj/structure/chair/stool{
+	pixel_y = -3
+	},
+/obj/machinery/airalarm/directional/east,
+/turf/open/floor/plasteel,
+/area/ship/crew/canteen)
+"Bx" = (
+/obj/effect/turf_decal/corner/transparent/brown,
+/obj/machinery/airalarm/directional/south,
+/turf/open/floor/plasteel,
+/area/ship/cargo)
+"BE" = (
+/obj/effect/turf_decal/industrial/warning,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 8
+	},
+/turf/open/floor/plasteel/patterned/ridged,
+/area/ship/cargo)
+"BG" = (
+/obj/effect/turf_decal/corner/transparent/brown,
+/obj/effect/turf_decal/corner/transparent/neutral{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 5
+	},
+/turf/open/floor/plasteel,
+/area/ship/hallway/central)
+"BP" = (
+/obj/effect/turf_decal/corner/transparent/brown{
+	dir = 4
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel,
+/area/ship/hallway/aft)
+"Cg" = (
+/obj/effect/turf_decal/corner/transparent/neutral{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 8
+	},
+/obj/machinery/airalarm/directional/north,
+/turf/open/floor/plasteel/dark,
+/area/ship/bridge)
+"Ch" = (
+/obj/effect/turf_decal/industrial/warning{
+	dir = 1
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 4
+	},
+/turf/open/floor/plasteel/patterned/cargo_one,
+/area/ship/cargo)
+"Cr" = (
+/obj/structure/bed,
+/obj/item/bedsheet/dorms,
+/obj/structure/curtain/cloth/grey,
+/turf/open/floor/plasteel/patterned/ridged,
+/area/ship/crew)
+"Cz" = (
+/obj/effect/turf_decal/corner/transparent/brown{
+	dir = 1
+	},
+/obj/machinery/light{
+	dir = 1
+	},
+/turf/open/floor/plasteel,
+/area/ship/hallway/central)
+"CB" = (
+/obj/effect/turf_decal/industrial/warning{
+	dir = 4
+	},
+/turf/open/floor/plasteel/patterned/cargo_one,
+/area/ship/cargo)
+"CD" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/machinery/power/terminal{
+	dir = 8
+	},
+/obj/structure/cable/yellow{
+	icon_state = "0-2"
+	},
+/obj/structure/cable/yellow,
+/turf/open/floor/plating,
+/area/ship/maintenance/starboard)
+"CH" = (
+/obj/structure/cable{
+	icon_state = "2-4"
+	},
+/obj/machinery/light{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 6
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 6
+	},
+/turf/open/floor/plasteel/patterned/ridged,
+/area/ship/hallway/central)
+"CI" = (
+/obj/machinery/door/airlock/mining,
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 4
+	},
+/turf/open/floor/plasteel,
+/area/ship/cargo)
+"CO" = (
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 1
+	},
+/turf/open/floor/plasteel/patterned/ridged,
+/area/ship/hallway/aft)
+"CQ" = (
+/obj/machinery/door/airlock/engineering,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 1
+	},
+/turf/open/floor/plasteel,
+/area/ship/engineering/communications)
+"CX" = (
+/obj/structure/chair/stool/bar{
+	dir = 8
+	},
+/turf/open/floor/plasteel,
+/area/ship/crew/canteen)
+"Df" = (
+/obj/effect/turf_decal/corner/transparent/neutral{
+	dir = 9
+	},
+/obj/effect/turf_decal/corner/transparent/neutral{
+	dir = 2
+	},
+/turf/open/floor/plasteel,
+/area/ship/hallway/central)
+"Dj" = (
+/obj/structure/table,
+/obj/item/paper_bin,
+/obj/item/pen,
+/turf/open/floor/plasteel,
+/area/ship/cargo)
+"DA" = (
+/turf/closed/wall/mineral/titanium,
+/area/ship/crew)
+"DF" = (
+/obj/machinery/atmospherics/components/unary/tank/air{
+	dir = 1;
+	piping_layer = 2
+	},
+/turf/open/floor/plasteel/patterned,
+/area/ship/maintenance/port)
+"Ea" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+	dir = 4
+	},
+/turf/open/floor/plasteel,
+/area/ship/hallway/aft)
+"Em" = (
+/obj/machinery/power/terminal{
+	dir = 8
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/cable{
+	icon_state = "0-4"
+	},
+/turf/open/floor/plasteel/patterned/ridged,
+/area/ship/maintenance/starboard)
+"Ev" = (
+/obj/structure/table/reinforced,
+/obj/item/radio/intercom/wideband{
+	pixel_x = 2;
+	dir = 8
+	},
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/bridge)
+"EA" = (
+/obj/effect/turf_decal/industrial/warning,
+/obj/machinery/light/floor,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 4
+	},
+/turf/open/floor/plasteel/patterned,
+/area/ship/cargo)
+"ES" = (
+/obj/effect/turf_decal/corner/transparent/ntblue{
+	dir = 4
+	},
+/obj/effect/turf_decal/corner/transparent/neutral{
+	dir = 2
+	},
+/obj/machinery/power/apc/auto_name/south,
+/obj/structure/cable,
+/turf/open/floor/plasteel,
+/area/ship/engineering/communications)
+"Fd" = (
+/obj/effect/turf_decal/industrial/warning,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+	dir = 8
+	},
+/turf/open/floor/plasteel/patterned,
+/area/ship/cargo)
+"Fg" = (
+/obj/effect/turf_decal/corner/transparent/brown{
+	dir = 4
+	},
+/obj/item/kirbyplants{
+	icon_state = "plant-14";
+	pixel_y = 5
+	},
+/turf/open/floor/plasteel,
+/area/ship/cargo)
+"Fk" = (
+/obj/effect/turf_decal/corner/transparent/brown{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 1
+	},
+/turf/open/floor/plasteel,
+/area/ship/hallway/central)
+"Fn" = (
+/obj/structure/railing,
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 4
+	},
+/turf/open/floor/plasteel/stairs{
+	dir = 8
+	},
+/area/ship/hallway/aft)
+"Ft" = (
+/obj/effect/turf_decal/corner/transparent/brown{
+	dir = 4
+	},
+/obj/effect/turf_decal/corner/transparent/neutral{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 6
+	},
+/turf/open/floor/plasteel,
+/area/ship/hallway/central)
+"FA" = (
+/obj/effect/turf_decal/corner/transparent/neutral{
+	dir = 1
+	},
+/obj/effect/turf_decal/corner/transparent/lime{
+	dir = 8
+	},
+/obj/effect/turf_decal/corner/transparent/neutral,
+/obj/structure/cable{
+	icon_state = "1-4"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 5
+	},
+/turf/open/floor/plasteel,
+/area/ship/crew)
+"FL" = (
+/obj/effect/turf_decal/corner/transparent/ntblue{
+	dir = 4
+	},
+/obj/effect/turf_decal/corner/transparent/neutral{
+	dir = 2
+	},
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+	dir = 1
+	},
+/turf/open/floor/plasteel,
+/area/ship/engineering/communications)
+"FN" = (
+/obj/effect/turf_decal/industrial/warning,
+/obj/machinery/light/floor,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 8
+	},
+/turf/open/floor/plasteel/patterned,
+/area/ship/cargo)
+"FQ" = (
+/obj/machinery/light,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2,
+/turf/open/floor/plasteel,
+/area/ship/hallway/central)
+"Gb" = (
+/obj/effect/turf_decal/corner/transparent/solgovgold{
+	dir = 1
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/cable{
+	icon_state = "1-8"
+	},
+/turf/open/floor/plasteel/patterned,
+/area/ship/maintenance/starboard)
+"Gj" = (
+/turf/closed/wall/mineral/titanium/nodiagonal,
+/area/ship/crew)
+"Gx" = (
+/obj/effect/turf_decal/corner/transparent/neutral{
+	dir = 9
+	},
+/obj/effect/turf_decal/corner/transparent/neutral{
+	dir = 2
+	},
+/obj/machinery/power/apc/auto_name/east,
+/obj/structure/cable{
+	icon_state = "0-8"
+	},
+/turf/open/floor/plasteel,
+/area/ship/hallway/central)
+"GF" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 9
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 9
+	},
+/obj/machinery/advanced_airlock_controller{
+	pixel_x = 32
+	},
+/turf/open/floor/plating,
+/area/ship/hallway/central)
+"GQ" = (
+/turf/open/floor/plasteel,
+/area/ship/cargo)
+"GU" = (
+/obj/machinery/atmospherics/pipe/simple/brown/hidden/layer2{
+	dir = 8
+	},
+/turf/closed/wall/mineral/titanium/nodiagonal,
+/area/ship/hallway/aft)
+"Hc" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+	dir = 8
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/bridge)
+"Ht" = (
+/obj/effect/turf_decal/corner/transparent/lime{
+	dir = 8
+	},
+/obj/effect/turf_decal/corner/transparent/neutral,
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 8
+	},
+/turf/open/floor/plasteel,
+/area/ship/crew)
+"Hw" = (
+/turf/closed/wall/mineral/titanium/nodiagonal,
+/area/ship/cargo)
+"Iv" = (
+/obj/effect/turf_decal/corner/transparent/ntblue,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2{
+	dir = 1
+	},
+/turf/open/floor/plasteel,
+/area/ship/hallway/central)
+"Iw" = (
+/obj/structure/cable{
+	icon_state = "2-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 10
+	},
+/turf/open/floor/plasteel/patterned,
+/area/ship/crew/canteen)
+"IF" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/patterned,
+/area/ship/hallway/aft)
+"Jr" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/cable{
+	icon_state = "2-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 10
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 10
+	},
+/turf/open/floor/plasteel/patterned,
+/area/ship/hallway/aft)
+"JO" = (
+/obj/effect/turf_decal/corner/transparent/brown{
+	dir = 1
+	},
+/turf/open/floor/plasteel,
+/area/ship/hallway/central)
+"JR" = (
+/turf/open/floor/plasteel/patterned,
+/area/ship/cargo)
+"JS" = (
+/obj/structure/sign/nanotrasen,
+/turf/closed/wall/mineral/titanium/nodiagonal,
+/area/ship/crew)
+"Kc" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2{
+	dir = 1
+	},
+/turf/open/floor/plasteel,
+/area/ship/hallway/central)
+"Kj" = (
+/obj/structure/tank_dispenser,
+/turf/open/floor/plasteel/patterned,
+/area/ship/hallway/aft)
+"Ku" = (
+/turf/closed/wall/mineral/titanium,
+/area/ship/maintenance/port)
+"Ky" = (
+/obj/machinery/power/smes/engineering,
+/obj/structure/railing{
+	pixel_y = -8
+	},
+/obj/structure/cable{
+	icon_state = "0-8"
+	},
+/turf/open/floor/plating,
+/area/ship/maintenance/starboard)
+"KI" = (
+/obj/structure/cable{
+	icon_state = "2-8"
+	},
+/obj/structure/cable{
+	icon_state = "1-8"
+	},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2{
+	dir = 4
+	},
+/turf/open/floor/plasteel/patterned,
+/area/ship/hallway/central)
+"KR" = (
+/obj/structure/closet/wall/blue{
+	pixel_y = 30;
+	secure = 1
+	},
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+	dir = 8
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/bridge)
+"Ls" = (
+/obj/structure/rack,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/item/stack/sheet/mineral/plasma/five,
+/obj/item/stack/sheet/mineral/uranium/five,
+/turf/open/floor/plasteel/patterned,
+/area/ship/maintenance/starboard)
+"Lw" = (
+/obj/effect/turf_decal/industrial/warning,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 4
+	},
+/turf/open/floor/plasteel/patterned,
+/area/ship/cargo)
+"LF" = (
+/obj/structure/tank_dispenser,
+/turf/open/floor/plasteel/patterned/ridged,
+/area/ship/hallway/central)
+"Me" = (
+/obj/effect/turf_decal/borderfloor/full,
+/obj/machinery/door/firedoor/border_only{
+	dir = 4
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 8
+	},
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/hallway/central)
+"MH" = (
+/obj/structure/table/reinforced,
+/obj/machinery/computer/secure_data/laptop{
+	dir = 4
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/bridge)
+"MP" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/light{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2{
+	dir = 1
+	},
+/turf/open/floor/plasteel,
+/area/ship/hallway/central)
+"MS" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
+/turf/open/floor/plasteel/patterned/ridged,
+/area/ship/hallway/central)
+"MU" = (
+/obj/effect/turf_decal/corner/transparent/brown{
+	dir = 8
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel,
+/area/ship/hallway/aft)
+"MY" = (
+/obj/structure/rack,
+/obj/item/tank/internals/emergency_oxygen/double,
+/obj/item/tank/internals/emergency_oxygen/double,
+/obj/item/tank/internals/emergency_oxygen/double,
+/obj/item/gps/mining/internal,
+/turf/open/floor/plasteel/patterned/ridged,
+/area/ship/hallway/aft)
+"Nc" = (
+/obj/effect/turf_decal/corner/transparent/lime{
+	dir = 8
+	},
+/obj/effect/turf_decal/corner/transparent/neutral{
+	dir = 1
+	},
+/obj/structure/cable{
+	icon_state = "2-4"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 6
+	},
+/obj/machinery/airalarm/directional/north,
+/turf/open/floor/plasteel,
+/area/ship/crew)
+"Nw" = (
+/obj/effect/turf_decal/corner/transparent/brown,
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel,
+/area/ship/hallway/aft)
+"Nz" = (
+/obj/effect/turf_decal/corner/transparent/lime,
+/obj/effect/turf_decal/corner/transparent/neutral{
+	dir = 8
+	},
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 1
+	},
+/turf/open/floor/plasteel,
+/area/ship/hallway/central)
+"NA" = (
+/turf/open/floor/plating,
+/area/ship/cargo)
+"NL" = (
+/obj/effect/turf_decal/corner/transparent/neutral{
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 8
+	},
+/turf/open/floor/plasteel,
+/area/ship/hallway/central)
+"NT" = (
+/obj/machinery/telecomms/receiver/preset_right{
+	freq_listening = list(1347,1359);
+	network = "irmg_commnet"
+	},
+/turf/open/floor/plasteel/patterned/ridged,
+/area/ship/engineering/communications)
+"NU" = (
+/obj/effect/turf_decal/corner/transparent/brown,
+/obj/effect/turf_decal/corner/transparent/neutral{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 10
+	},
+/turf/open/floor/plasteel,
+/area/ship/hallway/central)
+"NV" = (
+/obj/machinery/computer/helm{
+	dir = 8;
+	icon_state = "computer-right"
+	},
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/bridge)
+"Oo" = (
+/obj/effect/turf_decal/borderfloor/full,
+/obj/machinery/door/firedoor/border_only{
+	dir = 4
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 4
+	},
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/hallway/central)
+"Or" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 10
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 10
+	},
+/turf/open/floor/plating,
+/area/ship/hallway/central)
+"Ou" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 8
+	},
+/turf/open/floor/plating,
+/area/ship/hallway/central)
+"Ow" = (
+/obj/machinery/holopad/emergency/command,
+/obj/effect/turf_decal/box/white,
+/turf/open/floor/plasteel/dark,
+/area/ship/bridge)
+"OK" = (
+/obj/effect/turf_decal/corner/transparent/lime{
+	dir = 4
+	},
+/obj/effect/turf_decal/corner/transparent/neutral,
+/obj/structure/table,
+/turf/open/floor/plasteel,
+/area/ship/crew)
+"OL" = (
+/turf/closed/wall/mineral/titanium/nodiagonal,
+/area/ship/crew/canteen)
+"OW" = (
+/obj/effect/turf_decal/corner/transparent/brown{
+	dir = 4
+	},
+/turf/open/floor/plasteel,
+/area/ship/hallway/aft)
+"Pb" = (
+/obj/structure/table,
+/obj/item/clipboard{
+	pixel_y = -4
+	},
+/turf/open/floor/plasteel,
+/area/ship/cargo)
+"Pt" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 1
+	},
+/turf/open/floor/plating,
+/area/ship/hallway/central)
+"Pw" = (
+/obj/effect/turf_decal/corner/transparent/neutral/full,
+/obj/effect/turf_decal/corner/transparent/bar/diagonal,
+/obj/structure/table,
+/obj/machinery/microwave,
+/turf/open/floor/plasteel,
+/area/ship/crew/canteen)
+"PF" = (
+/obj/effect/turf_decal/industrial/warning{
+	dir = 1
+	},
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+	dir = 8
+	},
+/turf/open/floor/plasteel/patterned,
+/area/ship/cargo)
+"PL" = (
+/obj/structure/chair/office{
+	dir = 8
+	},
+/obj/machinery/light,
+/turf/open/floor/plasteel,
+/area/ship/cargo)
+"PQ" = (
+/obj/effect/turf_decal/corner/transparent/solgovgold{
+	dir = 1
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/cable/yellow{
+	icon_state = "1-4"
+	},
+/obj/machinery/light/small,
+/turf/open/floor/plasteel/patterned,
+/area/ship/maintenance/starboard)
+"Qa" = (
+/turf/closed/wall/mineral/titanium,
+/area/ship/maintenance/starboard)
+"Qw" = (
+/obj/structure/cable{
+	icon_state = "1-4"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 5
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 5
+	},
+/turf/open/floor/plasteel/patterned/ridged,
+/area/ship/hallway/aft)
+"QA" = (
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 1
+	},
+/obj/structure/catwalk/over/plated_catwalk,
+/turf/open/floor/plating,
+/area/ship/hallway/aft)
+"QZ" = (
+/obj/effect/turf_decal/corner/transparent/brown,
+/obj/machinery/mineral/ore_redemption{
+	dir = 4;
+	output_dir = 8;
+	input_dir = 4
+	},
+/turf/open/floor/plasteel,
+/area/ship/cargo)
+"Rm" = (
+/obj/structure/table/reinforced,
+/obj/item/storage/box/donkpockets/donkpocketspicy,
+/turf/open/floor/plasteel,
+/area/ship/crew/canteen)
+"Rv" = (
+/obj/machinery/telecomms/broadcaster/preset_left,
+/obj/machinery/light{
+	dir = 8
+	},
+/turf/open/floor/plasteel/patterned/ridged,
+/area/ship/engineering/communications)
+"Rx" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 6
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 6
+	},
+/turf/open/floor/plasteel,
+/area/ship/cargo)
+"Ry" = (
+/obj/effect/turf_decal/corner/transparent/brown{
+	dir = 1
+	},
+/turf/open/floor/plasteel,
+/area/ship/hallway/aft)
+"Rz" = (
+/turf/closed/wall/mineral/titanium/nodiagonal,
+/area/ship/hallway/aft)
+"RB" = (
+/turf/closed/wall/mineral/titanium/nodiagonal,
+/area/ship/maintenance/starboard)
+"RD" = (
+/obj/machinery/computer/cargo/express{
+	dir = 8
+	},
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/bridge)
+"RI" = (
+/obj/structure/cable{
+	icon_state = "2-8"
+	},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2{
+	dir = 4
+	},
+/turf/open/floor/plasteel,
+/area/ship/cargo)
+"RP" = (
+/obj/effect/turf_decal/industrial/warning{
+	dir = 1
+	},
+/obj/machinery/light/floor,
+/turf/open/floor/plasteel/patterned,
+/area/ship/cargo)
+"RR" = (
+/obj/machinery/door/airlock/engineering,
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
+/turf/open/floor/plating,
+/area/ship/hallway/aft)
+"Sa" = (
+/obj/effect/turf_decal/corner/transparent/lime{
+	dir = 4
+	},
+/obj/effect/turf_decal/corner/transparent/neutral{
+	dir = 1
+	},
+/turf/open/floor/plasteel,
+/area/ship/hallway/central)
+"Sg" = (
+/obj/effect/turf_decal/borderfloor/full,
+/obj/machinery/door/firedoor/border_only{
+	dir = 4
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 8
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 8
+	},
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/hallway/central)
+"Sj" = (
+/obj/effect/turf_decal/industrial/traffic{
+	dir = 8
+	},
+/obj/effect/turf_decal/industrial/traffic{
+	dir = 4
+	},
+/turf/open/floor/plasteel/patterned/ridged,
+/area/ship/cargo)
+"Sp" = (
+/turf/closed/wall/mineral/titanium/nodiagonal,
+/area/ship/bridge)
+"Sz" = (
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2,
+/turf/open/floor/plasteel,
+/area/ship/hallway/central)
+"SC" = (
+/obj/effect/turf_decal/corner/transparent/ntblue{
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "1-8"
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 8
+	},
+/turf/open/floor/plasteel,
+/area/ship/hallway/central)
+"SS" = (
+/obj/structure/railing,
+/turf/open/floor/plasteel/stairs{
+	dir = 4
+	},
+/area/ship/maintenance/starboard)
+"SW" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/structure/railing{
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/structure/cable{
+	icon_state = "1-4"
+	},
+/turf/open/floor/plating,
+/area/ship/maintenance/starboard)
+"Tk" = (
+/obj/effect/turf_decal/industrial/warning{
+	dir = 1
+	},
+/obj/machinery/light,
+/turf/open/floor/plasteel/patterned,
+/area/ship/crew)
+"Ty" = (
+/obj/effect/turf_decal/industrial/outline/yellow,
+/obj/structure/ore_box,
+/turf/open/floor/plasteel/patterned,
+/area/ship/cargo)
+"TB" = (
+/obj/machinery/door/airlock,
+/turf/open/floor/plasteel,
+/area/ship/crew/canteen)
+"TH" = (
+/obj/effect/turf_decal/industrial/warning,
+/turf/open/floor/plasteel/patterned/ridged,
+/area/ship/cargo)
+"UD" = (
+/obj/machinery/power/apc/auto_name/north,
+/obj/structure/cable{
+	icon_state = "0-4"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 4
+	},
+/turf/open/floor/plasteel,
+/area/ship/crew/canteen)
+"UM" = (
+/obj/effect/turf_decal/corner/transparent/neutral{
+	dir = 9
+	},
+/obj/effect/turf_decal/corner/transparent/neutral{
+	dir = 2
+	},
+/obj/machinery/airalarm/directional/east,
+/turf/open/floor/plasteel,
+/area/ship/hallway/central)
+"UY" = (
+/obj/machinery/door/airlock/command{
+	req_access = list(19)
+	},
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
+/turf/open/floor/plasteel/dark,
+/area/ship/bridge)
+"Vd" = (
+/obj/machinery/light/small,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/brown/visible/layer2,
+/turf/open/floor/plasteel/patterned/ridged,
+/area/ship/maintenance/port)
+"Vf" = (
+/obj/machinery/power/smes/shuttle/precharged{
+	dir = 4
+	},
+/obj/structure/window/reinforced/spawner/west,
+/obj/machinery/door/window/eastright,
+/obj/structure/cable{
+	icon_state = "0-8"
+	},
+/turf/open/floor/plating,
+/area/ship/maintenance/starboard)
+"Vn" = (
+/obj/structure/cable{
+	icon_state = "2-4"
+	},
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
+/turf/open/floor/plasteel/patterned/ridged,
+/area/ship/hallway/central)
+"Vs" = (
+/obj/effect/turf_decal/corner/transparent/neutral/full,
+/obj/effect/turf_decal/corner/transparent/bar/diagonal,
+/turf/open/floor/plasteel,
+/area/ship/crew/canteen)
+"VC" = (
+/obj/effect/turf_decal/industrial/warning{
+	dir = 8
+	},
+/obj/effect/turf_decal/industrial/warning{
+	dir = 4
+	},
+/obj/effect/turf_decal/industrial/caution{
+	dir = 4
+	},
+/turf/open/floor/plating,
+/area/ship/cargo)
+"VO" = (
+/obj/machinery/suit_storage_unit/standard_unit,
+/obj/machinery/light/small{
+	dir = 8
+	},
+/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/layer4{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 8
+	},
+/turf/open/floor/plasteel/patterned/ridged,
+/area/ship/hallway/central)
+"VU" = (
+/turf/open/floor/plasteel/patterned/ridged,
+/area/ship/cargo)
+"Wf" = (
+/obj/structure/table,
+/obj/item/paper_bin,
+/obj/item/pen,
+/turf/open/floor/plasteel/patterned,
+/area/ship/crew)
+"Wh" = (
+/obj/effect/turf_decal/industrial/warning{
+	dir = 1
+	},
+/turf/open/floor/plasteel/patterned/ridged,
+/area/ship/crew)
+"Wm" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/structure/cable{
+	icon_state = "2-8"
+	},
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
+/turf/open/floor/plating,
+/area/ship/maintenance/starboard)
+"WO" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 4
+	},
+/turf/open/floor/plasteel/patterned/ridged,
+/area/ship/hallway/central)
+"WR" = (
+/obj/machinery/atmospherics/pipe/simple/brown/hidden/layer2{
+	dir = 9
+	},
+/turf/closed/wall/mineral/titanium/nodiagonal,
+/area/ship/engineering/communications)
+"WS" = (
+/obj/structure/railing/corner,
+/obj/effect/turf_decal/corner/transparent/solgovgold{
+	dir = 8
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/power/apc/auto_name/north,
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/turf/open/floor/plasteel/patterned,
+/area/ship/maintenance/starboard)
+"Xm" = (
+/obj/effect/turf_decal/industrial/outline/yellow,
+/obj/structure/closet/crate,
+/turf/open/floor/plasteel/patterned,
+/area/ship/cargo)
+"Xy" = (
+/obj/effect/turf_decal/corner/transparent/brown{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
+/turf/open/floor/plasteel,
+/area/ship/cargo)
+"XC" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
+/turf/open/floor/plasteel/patterned/ridged,
+/area/ship/hallway/central)
+"XL" = (
+/obj/machinery/door/airlock/external,
+/turf/open/floor/plasteel,
+/area/ship/hallway/central)
+"XM" = (
+/turf/closed/wall/mineral/titanium,
+/area/ship/hallway/aft)
+"XQ" = (
+/obj/effect/turf_decal/corner/transparent/brown{
+	dir = 1
+	},
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
+/turf/open/floor/plasteel,
+/area/ship/hallway/central)
+"XV" = (
+/obj/machinery/telecomms/relay/preset,
+/turf/open/floor/plasteel/patterned/ridged,
+/area/ship/engineering/communications)
+"Yk" = (
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
+/turf/open/floor/plasteel,
+/area/ship/crew/canteen)
+"Yl" = (
+/obj/machinery/door/airlock/command{
+	req_access = list(19)
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
+/turf/open/floor/plasteel,
+/area/ship/bridge)
+"YT" = (
+/obj/structure/table,
+/turf/open/floor/plasteel/patterned,
+/area/ship/maintenance/port)
+"YZ" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 8
+	},
+/turf/open/floor/plasteel/patterned/ridged,
+/area/ship/hallway/central)
+"Zl" = (
+/obj/structure/filingcabinet/double,
+/obj/effect/turf_decal/corner/transparent/neutral,
+/turf/open/floor/plasteel/dark,
+/area/ship/bridge)
+"Zs" = (
+/obj/machinery/atmospherics/pipe/layer_manifold{
+	dir = 4
+	},
+/turf/closed/wall/mineral/titanium/nodiagonal,
+/area/ship/crew)
+"ZY" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/light{
+	dir = 4
+	},
+/obj/structure/chair/office{
+	dir = 8
+	},
+/turf/open/floor/plasteel,
+/area/ship/hallway/aft)
+
+(1,1,1) = {"
+ut
+ut
+ut
+ut
+ut
+li
+XM
+Rz
+Rz
+Rz
+Rz
+Rz
+Rz
+Rz
+Rz
+XM
+ui
+ut
+ut
+ut
+ut
+ut
+"}
+(2,1,1) = {"
+ut
+db
+bb
+bb
+bb
+GU
+Rz
+kg
+kg
+kg
+Kj
+MY
+nn
+nn
+nn
+Rz
+Rz
+bl
+bl
+bl
+RB
+ut
+"}
+(3,1,1) = {"
+Ku
+db
+cK
+cK
+cK
+GU
+OW
+BP
+Ea
+IF
+Ry
+MU
+IF
+qi
+Nw
+Nw
+Rz
+Vf
+Vf
+Vf
+RB
+Qa
+"}
+(4,1,1) = {"
+db
+YT
+js
+rs
+js
+GU
+jq
+CO
+pg
+vy
+eZ
+hh
+QA
+zH
+wb
+Qw
+Rz
+Em
+pH
+Em
+yL
+RB
+"}
+(5,1,1) = {"
+db
+rZ
+cP
+lb
+qD
+vE
+sC
+Ay
+qF
+zj
+ho
+Fn
+rc
+ZY
+zr
+Jr
+RR
+Wm
+mu
+Gb
+xZ
+RB
+"}
+(6,1,1) = {"
+db
+DF
+qd
+vO
+Vd
+WR
+hL
+hL
+hL
+hL
+Me
+qS
+hL
+hL
+hL
+hL
+hL
+eq
+yg
+kM
+pC
+RB
+"}
+(7,1,1) = {"
+Ku
+db
+iM
+xc
+uO
+hL
+eW
+Rv
+uc
+hL
+Cz
+WO
+hL
+uc
+jQ
+iV
+hL
+WS
+SW
+wv
+RB
+Qa
+"}
+(8,1,1) = {"
+ut
+OL
+OL
+OL
+OL
+hL
+ye
+Bk
+iJ
+CQ
+Fk
+oW
+Ag
+dY
+FL
+ES
+hL
+SS
+Ky
+yI
+RB
+ut
+"}
+(9,1,1) = {"
+ut
+OL
+Pw
+Vs
+jb
+hL
+tU
+NT
+uc
+hL
+XQ
+YZ
+hL
+rD
+Ao
+XV
+hL
+cR
+CD
+PQ
+RB
+ut
+"}
+(10,1,1) = {"
+ut
+OL
+dV
+nk
+im
+hL
+hL
+hL
+hL
+hL
+JO
+Ou
+hL
+hL
+hL
+hL
+hL
+iY
+Ls
+wc
+RB
+ut
+"}
+(11,1,1) = {"
+ut
+OL
+UD
+dP
+Rm
+OL
+Sa
+CH
+kE
+xG
+Vn
+KI
+Pt
+hW
+oq
+qE
+Gj
+Gj
+Gj
+Gj
+Gj
+ut
+"}
+(12,1,1) = {"
+zu
+OL
+dR
+CX
+sF
+OL
+Sa
+eT
+fj
+Df
+Gx
+Df
+UM
+fj
+eT
+qE
+Gj
+bN
+Cr
+bN
+Gj
+JS
+"}
+(13,1,1) = {"
+OL
+cY
+Ba
+Yk
+ju
+OL
+ua
+nT
+Sp
+Sp
+Sp
+Sp
+Sp
+Sp
+NL
+fx
+Gj
+Nc
+xJ
+FA
+ws
+Gj
+"}
+(14,1,1) = {"
+OL
+OL
+OL
+fH
+Iw
+vN
+AB
+dF
+Sp
+bK
+MH
+oU
+Zl
+Sp
+ub
+Nz
+vT
+dl
+mV
+Ht
+Tk
+Gj
+"}
+(15,1,1) = {"
+OL
+sj
+OL
+rr
+dk
+OL
+Sa
+Iv
+Yl
+ac
+pf
+vV
+wg
+UY
+SC
+qE
+Gj
+mJ
+OK
+nW
+Wh
+Gj
+"}
+(16,1,1) = {"
+OL
+xB
+TB
+Bv
+np
+OL
+Me
+Oo
+Sp
+Cg
+Ow
+oi
+py
+Sp
+Sg
+Me
+Gj
+Wf
+hG
+uz
+kU
+Gj
+"}
+(17,1,1) = {"
+lI
+OL
+OL
+gP
+OL
+OL
+Au
+jd
+Sp
+KR
+pf
+Hc
+sD
+Sp
+uD
+Au
+Gj
+Gj
+Zs
+Gj
+Gj
+DA
+"}
+(18,1,1) = {"
+ut
+lW
+LF
+VO
+lW
+Ft
+Bh
+FQ
+Sp
+ud
+iR
+pf
+hd
+Sp
+MP
+Bh
+BG
+lW
+VO
+LF
+lW
+ut
+"}
+(19,1,1) = {"
+ut
+XL
+dm
+Or
+qf
+it
+MS
+Sz
+Sp
+RD
+NV
+gL
+Ev
+Sp
+Kc
+XC
+NU
+qf
+GF
+ff
+XL
+ut
+"}
+(20,1,1) = {"
+ut
+lW
+lW
+lW
+lW
+Hw
+Hw
+oc
+Sp
+dy
+dy
+dy
+dy
+Sp
+CI
+Hw
+Hw
+lW
+lW
+lW
+lW
+ut
+"}
+(21,1,1) = {"
+ut
+ut
+Hw
+JR
+wP
+ha
+Rx
+dO
+Xy
+Xy
+Xy
+Xy
+Xy
+Xy
+RI
+hC
+ha
+Xm
+JR
+Hw
+ut
+ut
+"}
+(22,1,1) = {"
+ut
+ut
+lg
+VU
+Xm
+wP
+qN
+aA
+tf
+aA
+CB
+aA
+aA
+tf
+aA
+Aq
+wP
+wP
+VU
+lg
+ut
+ut
+"}
+(23,1,1) = {"
+ut
+ut
+lg
+JR
+Sj
+Sj
+FN
+NA
+NA
+NA
+NA
+NA
+NA
+NA
+NA
+dQ
+Sj
+Sj
+JR
+lg
+ut
+ut
+"}
+(24,1,1) = {"
+ut
+ut
+lg
+VU
+wP
+yV
+BE
+NA
+NA
+NA
+NA
+NA
+NA
+NA
+NA
+rY
+yV
+wP
+VU
+lg
+ut
+ut
+"}
+(25,1,1) = {"
+ut
+ut
+lg
+JR
+wP
+wP
+mq
+NA
+NA
+NA
+NA
+NA
+NA
+NA
+NA
+qR
+Xm
+Ty
+JR
+lg
+ut
+ut
+"}
+(26,1,1) = {"
+ut
+ut
+Hw
+VU
+Sj
+Sj
+Lw
+NA
+NA
+NA
+NA
+NA
+NA
+NA
+NA
+yO
+Sj
+Sj
+VU
+Hw
+ut
+ut
+"}
+(27,1,1) = {"
+ut
+ut
+rt
+Hw
+wP
+yV
+ol
+NA
+NA
+NA
+NA
+NA
+NA
+NA
+NA
+Ch
+Pb
+Dj
+Hw
+rt
+ut
+ut
+"}
+(28,1,1) = {"
+ut
+ut
+ut
+Hw
+bu
+wP
+Lw
+NA
+NA
+NA
+NA
+NA
+NA
+NA
+NA
+yO
+GQ
+PL
+Hw
+ut
+ut
+ut
+"}
+(29,1,1) = {"
+ut
+ut
+ut
+Hw
+Be
+GQ
+sb
+NA
+NA
+NA
+NA
+NA
+NA
+NA
+NA
+yO
+GQ
+zv
+Hw
+ut
+ut
+ut
+"}
+(30,1,1) = {"
+ut
+ut
+ut
+mf
+Hw
+Fg
+Lw
+NA
+NA
+NA
+NA
+NA
+NA
+NA
+NA
+oE
+Bn
+Hw
+mf
+ut
+ut
+ut
+"}
+(31,1,1) = {"
+ut
+ut
+ut
+ut
+Hw
+yV
+EA
+wE
+NA
+NA
+NA
+NA
+NA
+NA
+NA
+Az
+yV
+Hw
+ut
+ut
+ut
+ut
+"}
+(32,1,1) = {"
+ut
+ut
+ut
+ut
+Hw
+Ty
+Lw
+NA
+NA
+NA
+NA
+NA
+NA
+NA
+NA
+yd
+Xm
+Hw
+ut
+ut
+ut
+ut
+"}
+(33,1,1) = {"
+ut
+ut
+ut
+ut
+Hw
+wP
+sb
+NA
+NA
+NA
+NA
+NA
+NA
+NA
+NA
+du
+Ty
+Hw
+ut
+ut
+ut
+ut
+"}
+(34,1,1) = {"
+ut
+ut
+ut
+ut
+Hw
+eh
+Lw
+NA
+NA
+NA
+NA
+NA
+NA
+NA
+NA
+yd
+Bx
+Hw
+ut
+ut
+ut
+ut
+"}
+(35,1,1) = {"
+ut
+ut
+ut
+ut
+Hw
+iq
+Lw
+NA
+NA
+NA
+NA
+NA
+NA
+NA
+NA
+xE
+QZ
+Hw
+ut
+ut
+ut
+ut
+"}
+(36,1,1) = {"
+ut
+ut
+ut
+ut
+Hw
+am
+ol
+NA
+NA
+NA
+NA
+NA
+NA
+NA
+NA
+yd
+gt
+Hw
+ut
+ut
+ut
+ut
+"}
+(37,1,1) = {"
+ut
+ut
+ut
+ut
+Hw
+xA
+Fd
+NA
+NA
+NA
+NA
+NA
+NA
+NA
+NA
+PF
+mW
+Hw
+ut
+ut
+ut
+ut
+"}
+(38,1,1) = {"
+ut
+ut
+ut
+ut
+Hw
+wP
+TH
+NA
+NA
+NA
+NA
+NA
+NA
+NA
+NA
+iN
+wP
+Hw
+ut
+ut
+ut
+ut
+"}
+(39,1,1) = {"
+ut
+ut
+ut
+ut
+rt
+Hw
+jn
+NA
+NA
+NA
+NA
+NA
+NA
+NA
+NA
+RP
+Hw
+rt
+ut
+ut
+ut
+ut
+"}
+(40,1,1) = {"
+ut
+ut
+ut
+ut
+ut
+rt
+Hw
+eo
+VC
+eo
+uZ
+eo
+eo
+VC
+cC
+Hw
+rt
+ut
+ut
+ut
+ut
+ut
+"}
diff --git a/_maps/shuttles/subshuttles/Subshuttle Catalog.txt b/_maps/shuttles/subshuttles/Subshuttle Catalog.txt
index ec233968ea03..fbbaf41afba8 100644
--- a/_maps/shuttles/subshuttles/Subshuttle Catalog.txt	
+++ b/_maps/shuttles/subshuttles/Subshuttle Catalog.txt	
@@ -2,3 +2,8 @@ Name = "Example Name Subshuttle"
 Size = "1x3"
 Purpose = "Showing people how to fill this document in"
 File Path = "_maps\shuttles\subshuttles\example.dmm"
+
+Name = "Tegus Transport Shuttle"
+Size = "16x8"
+Purpose = "Transporting Nanotrasen employees"
+File Path = "_maps\shuttles\subshuttles\nanotrasen_shuttletegus.dmm"
diff --git a/_maps/shuttles/subshuttles/nanotrasen_shuttletegus.dmm b/_maps/shuttles/subshuttles/nanotrasen_shuttletegus.dmm
new file mode 100644
index 000000000000..339750ad163f
--- /dev/null
+++ b/_maps/shuttles/subshuttles/nanotrasen_shuttletegus.dmm
@@ -0,0 +1,438 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"a" = (
+/turf/closed/wall/mineral/titanium,
+/area/ship/shuttle)
+"b" = (
+/obj/effect/turf_decal/industrial/warning{
+	dir = 10
+	},
+/obj/structure/cable{
+	icon_state = "2-8"
+	},
+/turf/open/floor/plasteel,
+/area/ship/shuttle)
+"c" = (
+/obj/machinery/holopad/emergency/command,
+/obj/effect/turf_decal/box,
+/turf/open/floor/plasteel,
+/area/ship/shuttle)
+"d" = (
+/obj/structure/cable{
+	icon_state = "0-4"
+	},
+/turf/open/floor/plating,
+/area/ship/shuttle)
+"e" = (
+/obj/machinery/power/smes/shuttle/precharged{
+	dir = 4
+	},
+/obj/structure/window/reinforced/spawner/west,
+/obj/machinery/door/window/eastleft,
+/turf/open/floor/plating,
+/area/ship/shuttle)
+"f" = (
+/obj/machinery/door/airlock/shuttle,
+/turf/open/floor/plasteel,
+/area/ship/shuttle)
+"g" = (
+/obj/machinery/atmospherics/components/unary/tank/air{
+	dir = 1;
+	piping_layer = 2
+	},
+/turf/open/floor/plasteel/patterned/ridged,
+/area/ship/shuttle)
+"h" = (
+/obj/structure/chair/comfy/shuttle{
+	dir = 1
+	},
+/obj/structure/window/reinforced/spawner,
+/turf/open/floor/plasteel/patterned/monofloor{
+	dir = 1
+	},
+/area/ship/shuttle)
+"i" = (
+/obj/machinery/power/smes/shuttle/precharged{
+	dir = 4
+	},
+/obj/structure/window/reinforced/spawner/west,
+/obj/machinery/door/window/eastright,
+/turf/open/floor/plating,
+/area/ship/shuttle)
+"j" = (
+/obj/structure/sign/nanotrasen,
+/turf/closed/wall/mineral/titanium,
+/area/ship/shuttle)
+"n" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/structure/cable{
+	icon_state = "1-8"
+	},
+/turf/open/floor/plating,
+/area/ship/shuttle)
+"o" = (
+/obj/machinery/power/shuttle/engine/electric{
+	dir = 4
+	},
+/turf/open/floor/plating,
+/area/ship/shuttle)
+"p" = (
+/obj/machinery/power/terminal{
+	dir = 1
+	},
+/obj/structure/cable/yellow{
+	icon_state = "0-4"
+	},
+/turf/open/floor/plating,
+/area/ship/shuttle)
+"q" = (
+/obj/machinery/door/poddoor,
+/obj/docking_port/mobile{
+	dir = 2
+	},
+/turf/open/floor/plasteel/patterned/ridged,
+/area/ship/shuttle)
+"r" = (
+/obj/machinery/computer/helm{
+	dir = 8
+	},
+/turf/open/floor/plasteel/patterned/monofloor{
+	dir = 1
+	},
+/area/ship/shuttle)
+"s" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/structure/cable{
+	icon_state = "2-8"
+	},
+/turf/open/floor/plating,
+/area/ship/shuttle)
+"t" = (
+/obj/structure/chair/comfy/shuttle{
+	dir = 1
+	},
+/obj/structure/window/reinforced/spawner,
+/turf/open/floor/plasteel/patterned/monofloor{
+	dir = 8
+	},
+/area/ship/shuttle)
+"u" = (
+/obj/structure/chair/comfy/shuttle{
+	dir = 4
+	},
+/turf/open/floor/plasteel,
+/area/ship/shuttle)
+"v" = (
+/obj/effect/turf_decal/industrial/warning{
+	dir = 1
+	},
+/obj/structure/cable,
+/obj/structure/cable{
+	icon_state = "1-10"
+	},
+/obj/machinery/power/apc/auto_name/east,
+/turf/open/floor/plasteel,
+/area/ship/shuttle)
+"w" = (
+/obj/structure/table/reinforced,
+/obj/item/binoculars,
+/turf/open/floor/plasteel,
+/area/ship/shuttle)
+"y" = (
+/obj/effect/turf_decal/industrial/warning,
+/obj/machinery/telecomms/relay/preset/mining,
+/turf/open/floor/plasteel/patterned/ridged,
+/area/ship/shuttle)
+"A" = (
+/obj/machinery/power/smes/engineering,
+/obj/structure/cable{
+	icon_state = "0-4"
+	},
+/turf/open/floor/plating,
+/area/ship/shuttle)
+"B" = (
+/obj/effect/turf_decal/industrial/traffic{
+	dir = 8
+	},
+/turf/open/floor/plasteel/patterned/ridged,
+/area/ship/shuttle)
+"C" = (
+/obj/machinery/door/poddoor,
+/obj/effect/turf_decal/industrial/traffic{
+	dir = 4
+	},
+/turf/open/floor/plasteel/patterned/ridged,
+/area/ship/shuttle)
+"D" = (
+/obj/machinery/computer/crew{
+	dir = 8
+	},
+/turf/open/floor/plasteel/patterned/monofloor,
+/area/ship/shuttle)
+"E" = (
+/obj/effect/turf_decal/trimline/opaque/solgovgold/warning{
+	dir = 1
+	},
+/turf/open/floor/plasteel,
+/area/ship/shuttle)
+"G" = (
+/obj/effect/spawner/structure/window/shuttle,
+/turf/open/floor/plating,
+/area/ship/shuttle)
+"H" = (
+/obj/effect/turf_decal/trimline/opaque/solgovgold/warning,
+/turf/open/floor/plasteel,
+/area/ship/shuttle)
+"I" = (
+/obj/machinery/door/poddoor,
+/turf/open/floor/plasteel/patterned/ridged,
+/area/ship/shuttle)
+"J" = (
+/turf/open/floor/plasteel,
+/area/ship/shuttle)
+"K" = (
+/obj/structure/chair/comfy/shuttle,
+/turf/open/floor/plasteel/patterned/monofloor{
+	dir = 4
+	},
+/area/ship/shuttle)
+"L" = (
+/obj/item/radio/intercom/wideband,
+/obj/structure/table/reinforced,
+/turf/open/floor/plasteel,
+/area/ship/shuttle)
+"N" = (
+/obj/effect/turf_decal/industrial/traffic{
+	dir = 4
+	},
+/turf/open/floor/plasteel/patterned/ridged,
+/area/ship/shuttle)
+"O" = (
+/obj/structure/chair/comfy/shuttle{
+	dir = 1
+	},
+/obj/structure/window/reinforced/spawner,
+/turf/open/floor/plasteel/patterned/monofloor{
+	dir = 4
+	},
+/area/ship/shuttle)
+"P" = (
+/obj/machinery/door/poddoor,
+/obj/effect/turf_decal/industrial/traffic{
+	dir = 8
+	},
+/turf/open/floor/plasteel/patterned/ridged,
+/area/ship/shuttle)
+"Q" = (
+/obj/effect/turf_decal/industrial/warning{
+	dir = 8
+	},
+/obj/machinery/power/port_gen/pacman,
+/obj/structure/cable/yellow,
+/obj/structure/cable{
+	icon_state = "5-8"
+	},
+/turf/open/floor/plasteel/patterned/ridged,
+/area/ship/shuttle)
+"R" = (
+/obj/effect/turf_decal/industrial/warning{
+	dir = 9
+	},
+/obj/structure/cable/yellow{
+	icon_state = "2-8"
+	},
+/turf/open/floor/plasteel,
+/area/ship/shuttle)
+"T" = (
+/turf/template_noop,
+/area/template_noop)
+"U" = (
+/obj/effect/turf_decal/trimline/opaque/solgovgold/line,
+/turf/open/floor/plasteel,
+/area/ship/shuttle)
+"V" = (
+/obj/structure/chair/comfy/shuttle{
+	dir = 4;
+	name = "Helm"
+	},
+/turf/open/floor/plasteel,
+/area/ship/shuttle)
+"W" = (
+/obj/structure/chair/comfy/shuttle,
+/turf/open/floor/plasteel/patterned/monofloor{
+	dir = 8
+	},
+/area/ship/shuttle)
+"X" = (
+/obj/structure/chair/comfy/shuttle,
+/turf/open/floor/plasteel/patterned/monofloor,
+/area/ship/shuttle)
+"Y" = (
+/obj/effect/turf_decal/trimline/opaque/solgovgold/line{
+	dir = 1
+	},
+/turf/open/floor/plasteel,
+/area/ship/shuttle)
+
+(1,1,1) = {"
+T
+T
+o
+T
+T
+o
+T
+T
+"}
+(2,1,1) = {"
+T
+a
+e
+a
+a
+i
+a
+T
+"}
+(3,1,1) = {"
+T
+a
+d
+A
+p
+d
+a
+T
+"}
+(4,1,1) = {"
+T
+a
+b
+n
+R
+Q
+a
+T
+"}
+(5,1,1) = {"
+T
+a
+y
+s
+v
+g
+a
+T
+"}
+(6,1,1) = {"
+T
+j
+a
+f
+a
+a
+j
+T
+"}
+(7,1,1) = {"
+a
+a
+U
+J
+J
+Y
+a
+a
+"}
+(8,1,1) = {"
+P
+B
+H
+t
+W
+E
+B
+P
+"}
+(9,1,1) = {"
+q
+J
+H
+h
+X
+E
+J
+I
+"}
+(10,1,1) = {"
+C
+N
+H
+O
+K
+E
+N
+C
+"}
+(11,1,1) = {"
+a
+a
+U
+J
+J
+Y
+a
+a
+"}
+(12,1,1) = {"
+T
+j
+a
+f
+a
+a
+j
+T
+"}
+(13,1,1) = {"
+T
+a
+J
+J
+c
+J
+a
+T
+"}
+(14,1,1) = {"
+T
+G
+L
+V
+u
+w
+G
+T
+"}
+(15,1,1) = {"
+T
+a
+a
+r
+D
+a
+a
+T
+"}
+(16,1,1) = {"
+T
+T
+a
+G
+G
+a
+T
+T
+"}
diff --git a/code/datums/shuttles.dm b/code/datums/shuttles.dm
index fdf8cdb021b9..fd70f27909ac 100644
--- a/code/datums/shuttles.dm
+++ b/code/datums/shuttles.dm
@@ -351,5 +351,9 @@
 /datum/map_template/shuttle/subshuttles
 	category = "subshuttles"
 
-//your subshuttle here
+/datum/map_template/shuttle/subshuttles/nanotrasen_tegus
+	file_name = "nanotrasen_shuttletegus"
+	name = "Tegus Transport Shuttle"
+	prefix = "NTSV"
 
+//your subshuttle here
diff --git a/code/game/area/ship_areas.dm b/code/game/area/ship_areas.dm
index fade2147cea8..816bf4f61c67 100644
--- a/code/game/area/ship_areas.dm
+++ b/code/game/area/ship_areas.dm
@@ -126,6 +126,11 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 	lighting_colour_bulb = "#ffdbb4"
 	lighting_brightness_tube = 6
 
+/area/ship/shuttle
+	name = "Shuttle"
+	icon_state = "bridge"
+	ambientsounds = list('sound/ambience/signal.ogg')
+
 /// Crew Quarters ///
 /area/ship/crew
 	name = "Crew Quarters"
diff --git a/code/modules/jobs/job_types/cargo_technician.dm b/code/modules/jobs/job_types/cargo_technician.dm
index cf7582b66b58..bd4ac73542f9 100644
--- a/code/modules/jobs/job_types/cargo_technician.dm
+++ b/code/modules/jobs/job_types/cargo_technician.dm
@@ -65,6 +65,17 @@
 	gloves = /obj/item/clothing/gloves/fingerless
 	glasses = /obj/item/clothing/glasses/sunglasses/big
 
+/datum/outfit/job/cargo_tech/pilot/nanotrasen
+	name = "Pilot (Nanotrasen)"
+
+	uniform = /obj/item/clothing/under/rank/cargo/tech
+	accessory = /obj/item/clothing/accessory/armband/cargo
+	suit = /obj/item/clothing/suit/jacket
+	shoes = /obj/item/clothing/shoes/jackboots
+	gloves = /obj/item/clothing/gloves/fingerless
+	glasses = /obj/item/clothing/glasses/sunglasses/big
+
+
 /datum/outfit/job/cargo_tech/donk
 	name = "Customer Associate (Donk! Co.)"
 	id = /obj/item/card/id/syndicate_command/crew_id

From d3dfa8baba5dea34e3925c2e03836aad48aa37ba Mon Sep 17 00:00:00 2001
From: goober3 <118859017+goober3@users.noreply.github.com>
Date: Sat, 8 Apr 2023 19:36:13 +0100
Subject: [PATCH 02/28] fsdfsdfdsf

---
 _maps/shuttles/shiptest/nanotrasen_tegus.dmm  | 24 ++++++++++++-------
 .../subshuttles/nanotrasen_shuttletegus.dmm   |  4 +++-
 code/datums/shuttles.dm                       |  2 +-
 3 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/_maps/shuttles/shiptest/nanotrasen_tegus.dmm b/_maps/shuttles/shiptest/nanotrasen_tegus.dmm
index 43c8c6c8a015..87304ea183fa 100644
--- a/_maps/shuttles/shiptest/nanotrasen_tegus.dmm
+++ b/_maps/shuttles/shiptest/nanotrasen_tegus.dmm
@@ -249,7 +249,9 @@
 /turf/open/floor/plating,
 /area/ship/hallway/central)
 "eW" = (
-/obj/machinery/telecomms/bus/preset_six,
+/obj/machinery/telecomms/bus/preset_six{
+	network = "ntsv_commnet"
+	},
 /turf/open/floor/plasteel/patterned/ridged,
 /area/ship/engineering/communications)
 "eZ" = (
@@ -456,7 +458,9 @@
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
 "iV" = (
-/obj/machinery/telecomms/hub/preset,
+/obj/machinery/telecomms/hub/preset{
+	network = "ntsv_commnet"
+	},
 /turf/open/floor/plasteel/patterned/ridged,
 /area/ship/engineering/communications)
 "iY" = (
@@ -525,7 +529,7 @@
 "jQ" = (
 /obj/machinery/computer/telecomms/server{
 	dir = 4;
-	network = "irmg_commnet"
+	network = "ntsv_commnet"
 	},
 /obj/machinery/light{
 	dir = 8
@@ -1018,7 +1022,7 @@
 /area/ship/cargo)
 "tU" = (
 /obj/machinery/telecomms/processor/preset_four{
-	network = "irmg_commnet"
+	network = "ntsv_commnet"
 	},
 /turf/open/floor/plasteel/patterned/ridged,
 /area/ship/engineering/communications)
@@ -1242,7 +1246,7 @@
 /area/ship/maintenance/starboard)
 "wE" = (
 /obj/docking_port/stationary{
-	roundstart_template = /datum/map_template/shuttle/subshuttles/nanotrasen_tegus;
+	roundstart_template = /datum/map_template/shuttle/subshuttles/nanotrasen_shuttletegus;
 	height = 8;
 	width = 16;
 	dwidth = 9;
@@ -2164,7 +2168,7 @@
 "NT" = (
 /obj/machinery/telecomms/receiver/preset_right{
 	freq_listening = list(1347,1359);
-	network = "irmg_commnet"
+	network = "ntsv_commnet"
 	},
 /turf/open/floor/plasteel/patterned/ridged,
 /area/ship/engineering/communications)
@@ -2340,7 +2344,9 @@
 /turf/open/floor/plasteel,
 /area/ship/crew/canteen)
 "Rv" = (
-/obj/machinery/telecomms/broadcaster/preset_left,
+/obj/machinery/telecomms/broadcaster/preset_left{
+	network = "ntsv_commnet"
+	},
 /obj/machinery/light{
 	dir = 8
 	},
@@ -2683,7 +2689,9 @@
 /turf/open/floor/plasteel,
 /area/ship/hallway/central)
 "XV" = (
-/obj/machinery/telecomms/relay/preset,
+/obj/machinery/telecomms/relay/preset{
+	network = "nstv_commnet"
+	},
 /turf/open/floor/plasteel/patterned/ridged,
 /area/ship/engineering/communications)
 "Yk" = (
diff --git a/_maps/shuttles/subshuttles/nanotrasen_shuttletegus.dmm b/_maps/shuttles/subshuttles/nanotrasen_shuttletegus.dmm
index 339750ad163f..501dd48c7a66 100644
--- a/_maps/shuttles/subshuttles/nanotrasen_shuttletegus.dmm
+++ b/_maps/shuttles/subshuttles/nanotrasen_shuttletegus.dmm
@@ -142,7 +142,9 @@
 /area/ship/shuttle)
 "y" = (
 /obj/effect/turf_decal/industrial/warning,
-/obj/machinery/telecomms/relay/preset/mining,
+/obj/machinery/telecomms/relay/preset/mining{
+	network = "ntsv_commnet"
+	},
 /turf/open/floor/plasteel/patterned/ridged,
 /area/ship/shuttle)
 "A" = (
diff --git a/code/datums/shuttles.dm b/code/datums/shuttles.dm
index fd70f27909ac..867237494404 100644
--- a/code/datums/shuttles.dm
+++ b/code/datums/shuttles.dm
@@ -351,7 +351,7 @@
 /datum/map_template/shuttle/subshuttles
 	category = "subshuttles"
 
-/datum/map_template/shuttle/subshuttles/nanotrasen_tegus
+/datum/map_template/shuttle/subshuttles/nanotrasen_shuttletegus
 	file_name = "nanotrasen_shuttletegus"
 	name = "Tegus Transport Shuttle"
 	prefix = "NTSV"

From bf16254908d66a0172395ab634f5bed6ad75f500 Mon Sep 17 00:00:00 2001
From: goober3 <118859017+goober3@users.noreply.github.com>
Date: Sun, 9 Apr 2023 00:49:04 +0100
Subject: [PATCH 03/28] PRing now. for real.

---
 _maps/shuttles/shiptest/nanotrasen_tegus.dmm  | 414 ++++++++--
 .../subshuttles/Subshuttle Catalog.txt        |   2 +-
 .../subshuttles/nanotrasen_shuttle_tegus.dmm  | 745 ++++++++++++++++++
 .../subshuttles/nanotrasen_shuttletegus.dmm   | 440 -----------
 code/datums/action.dm                         |   4 +
 code/datums/shuttles.dm                       |   4 +-
 code/game/objects/items/devices/spyglasses.dm |  59 +-
 7 files changed, 1127 insertions(+), 541 deletions(-)
 create mode 100644 _maps/shuttles/subshuttles/nanotrasen_shuttle_tegus.dmm
 delete mode 100644 _maps/shuttles/subshuttles/nanotrasen_shuttletegus.dmm

diff --git a/_maps/shuttles/shiptest/nanotrasen_tegus.dmm b/_maps/shuttles/shiptest/nanotrasen_tegus.dmm
index 87304ea183fa..06a81ea403ba 100644
--- a/_maps/shuttles/shiptest/nanotrasen_tegus.dmm
+++ b/_maps/shuttles/shiptest/nanotrasen_tegus.dmm
@@ -45,6 +45,20 @@
 	},
 /turf/open/floor/plasteel/patterned,
 /area/ship/cargo)
+"bz" = (
+/obj/effect/turf_decal/industrial/warning,
+/obj/effect/turf_decal/industrial/warning{
+	dir = 1
+	},
+/obj/machinery/door/poddoor{
+	id = "tegus_port_cargo"
+	},
+/obj/machinery/power/shieldwallgen/atmos/roundstart{
+	dir = 4;
+	id = "cargo_shield_port"
+	},
+/turf/open/floor/plating,
+/area/ship/cargo)
 "bK" = (
 /obj/structure/closet/crate/bin,
 /obj/effect/turf_decal/corner/transparent/neutral{
@@ -65,7 +79,13 @@
 /obj/effect/turf_decal/industrial/warning{
 	dir = 4
 	},
-/obj/machinery/door/poddoor/multi_tile/four_tile_ver,
+/obj/machinery/door/poddoor/multi_tile/four_tile_ver{
+	id = "tegus_shuttle_door"
+	},
+/obj/machinery/power/shieldwallgen/atmos/roundstart{
+	dir = 1;
+	id = "cargo_shield_fore"
+	},
 /turf/open/floor/plating,
 /area/ship/cargo)
 "cK" = (
@@ -74,6 +94,9 @@
 	},
 /obj/structure/window/reinforced/spawner/west,
 /obj/machinery/door/window/eastright,
+/obj/machinery/door/poddoor{
+	id = "tegus_port_engine"
+	},
 /turf/open/floor/plating,
 /area/ship/maintenance/port)
 "cP" = (
@@ -141,6 +164,9 @@
 /area/ship/cargo)
 "dy" = (
 /obj/effect/spawner/structure/window/shuttle,
+/obj/machinery/door/poddoor/shutters/preopen{
+	id = "tegus_bridge"
+	},
 /turf/open/floor/plating,
 /area/ship/bridge)
 "dF" = (
@@ -235,6 +261,29 @@
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
 /turf/open/floor/plasteel/patterned,
 /area/ship/maintenance/starboard)
+"eu" = (
+/obj/effect/turf_decal/industrial/warning{
+	dir = 8
+	},
+/obj/effect/turf_decal/industrial/warning{
+	dir = 4
+	},
+/obj/machinery/power/shieldwallgen/atmos/roundstart{
+	dir = 2;
+	id = "cargo_shield_fore"
+	},
+/turf/open/floor/plating,
+/area/ship/cargo)
+"eN" = (
+/obj/machinery/power/terminal{
+	dir = 8
+	},
+/obj/structure/cable{
+	icon_state = "0-4"
+	},
+/obj/machinery/atmospherics/components/binary/volume_pump/layer2,
+/turf/open/floor/plasteel/patterned/ridged,
+/area/ship/maintenance/port)
 "eT" = (
 /obj/structure/catwalk/over/plated_catwalk,
 /obj/structure/cable{
@@ -249,7 +298,7 @@
 /turf/open/floor/plating,
 /area/ship/hallway/central)
 "eW" = (
-/obj/machinery/telecomms/bus/preset_six{
+/obj/machinery/telecomms/bus/preset_two{
 	network = "ntsv_commnet"
 	},
 /turf/open/floor/plasteel/patterned/ridged,
@@ -287,6 +336,20 @@
 	},
 /turf/open/floor/plasteel,
 /area/ship/hallway/central)
+"fG" = (
+/obj/machinery/door/poddoor{
+	id = "tegus_starboard_cargo"
+	},
+/obj/effect/turf_decal/industrial/warning{
+	dir = 1
+	},
+/obj/effect/turf_decal/industrial/warning,
+/obj/machinery/power/shieldwallgen/atmos/roundstart{
+	dir = 8;
+	id = "cargo_shield_starboard"
+	},
+/turf/open/floor/plating,
+/area/ship/cargo)
 "fH" = (
 /obj/effect/turf_decal/corner/transparent/bar{
 	dir = 4
@@ -326,14 +389,25 @@
 "hd" = (
 /obj/structure/table/reinforced,
 /obj/item/areaeditor/shuttle{
-	pixel_x = 12;
+	pixel_x = 15;
 	pixel_y = 3
 	},
-/obj/item/megaphone/command{
-	pixel_x = -8;
-	pixel_y = 4
-	},
 /obj/machinery/light,
+/obj/machinery/recharger,
+/obj/machinery/button/door{
+	id = "tegus_bridge";
+	name = "Bridge Window Shutters";
+	dir = 1;
+	pixel_x = -14;
+	pixel_y = 5
+	},
+/obj/machinery/button/door{
+	id = "bridge_lockdown";
+	name = "Bridge Lockdown";
+	dir = 1;
+	pixel_x = -14;
+	pixel_y = -5
+	},
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
 "hh" = (
@@ -440,9 +514,8 @@
 /turf/open/floor/plasteel/patterned,
 /area/ship/engineering/communications)
 "iM" = (
-/obj/machinery/atmospherics/components/unary/portables_connector/layer2,
 /obj/machinery/airalarm/directional/east,
-/turf/open/floor/plasteel/patterned,
+/turf/open/floor/plasteel/patterned/ridged,
 /area/ship/maintenance/port)
 "iN" = (
 /obj/effect/turf_decal/industrial/warning{
@@ -493,6 +566,20 @@
 /obj/effect/turf_decal/industrial/warning,
 /obj/effect/turf_decal/industrial/warning,
 /obj/machinery/light/floor,
+/obj/machinery/button/door{
+	pixel_x = 27;
+	id = "tegus_shuttle_door";
+	name = "Shuttle Bay Blast Door";
+	dir = 8;
+	pixel_y = -5
+	},
+/obj/machinery/button/shieldwallgen{
+	pixel_x = 27;
+	id = "cargo_shield_fore";
+	pixel_y = 5;
+	dir = 8;
+	name = "Shuttle Bay Holofield"
+	},
 /turf/open/floor/plasteel/patterned,
 /area/ship/cargo)
 "jq" = (
@@ -527,15 +614,23 @@
 /turf/open/floor/plasteel/patterned/ridged,
 /area/ship/crew/canteen)
 "jQ" = (
-/obj/machinery/computer/telecomms/server{
-	dir = 4;
-	network = "ntsv_commnet"
-	},
 /obj/machinery/light{
 	dir = 8
 	},
+/obj/machinery/computer/telecomms/monitor{
+	dir = 4;
+	network = "ntsv_commnet"
+	},
 /turf/open/floor/plasteel/patterned/ridged,
 /area/ship/engineering/communications)
+"kc" = (
+/obj/machinery/door/airlock/external,
+/obj/effect/turf_decal/industrial/warning{
+	dir = 1
+	},
+/obj/effect/turf_decal/industrial/warning,
+/turf/open/floor/plating,
+/area/ship/hallway/central)
 "kg" = (
 /obj/machinery/suit_storage_unit/mining,
 /obj/structure/window/reinforced/spawner,
@@ -586,11 +681,23 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
 	dir = 6
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2{
+	dir = 4
+	},
 /turf/open/floor/plating,
 /area/ship/maintenance/port)
 "lg" = (
-/obj/machinery/door/poddoor,
+/obj/effect/turf_decal/industrial/warning{
+	dir = 1
+	},
+/obj/effect/turf_decal/industrial/warning,
+/obj/machinery/door/poddoor{
+	id = "tegus_starboard_cargo"
+	},
+/obj/machinery/power/shieldwallgen/atmos/roundstart{
+	dir = 4;
+	id = "cargo_shield_starboard"
+	},
 /turf/open/floor/plating,
 /area/ship/cargo)
 "li" = (
@@ -666,6 +773,15 @@
 	dir = 1
 	},
 /obj/machinery/door/window/eastright,
+/obj/item/flashlight/seclite,
+/obj/item/storage/bag/ore,
+/obj/item/kitchen/knife/combat/survival,
+/obj/item/gun/energy/kinetic_accelerator,
+/obj/item/stack/marker_beacon/thirty,
+/obj/item/gps/mining,
+/obj/item/clothing/glasses/meson/prescription,
+/obj/item/clothing/glasses/meson,
+/obj/item/t_scanner/adv_mining_scanner/lesser,
 /turf/open/floor/plasteel/patterned/ridged,
 /area/ship/hallway/aft)
 "np" = (
@@ -754,6 +870,20 @@
 	},
 /turf/open/floor/plasteel/patterned/ridged,
 /area/ship/cargo)
+"oF" = (
+/obj/machinery/door/poddoor{
+	id = "tegus_port_cargo"
+	},
+/obj/effect/turf_decal/industrial/warning,
+/obj/effect/turf_decal/industrial/warning{
+	dir = 1
+	},
+/obj/machinery/power/shieldwallgen/atmos/roundstart{
+	dir = 8;
+	id = "cargo_shield_port"
+	},
+/turf/open/floor/plating,
+/area/ship/cargo)
 "oU" = (
 /obj/structure/table/reinforced,
 /obj/item/paper_bin,
@@ -807,6 +937,15 @@
 	name = "mechanic's locker";
 	req_access = list(11)
 	},
+/obj/item/clothing/head/hardhat,
+/obj/item/clothing/under/rank/engineering/engineer/nt,
+/obj/item/clothing/under/rank/engineering/engineer/nt/skirt,
+/obj/item/clothing/shoes/workboots,
+/obj/item/clothing/suit/hazardvest,
+/obj/item/clothing/gloves/color/yellow,
+/obj/item/clothing/glasses/meson/engine/tray,
+/obj/item/holosign_creator/engineering,
+/obj/item/tank/internals/emergency_oxygen/engi,
 /turf/open/floor/plasteel/patterned/ridged,
 /area/ship/maintenance/starboard)
 "pH" = (
@@ -823,13 +962,15 @@
 /turf/open/floor/plasteel/patterned,
 /area/ship/maintenance/starboard)
 "qd" = (
-/obj/machinery/atmospherics/components/binary/pump/layer4{
-	name = "Air to Distro"
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer2{
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
 	dir = 10
 	},
-/turf/open/floor/plasteel/patterned/ridged,
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/machinery/atmospherics/components/binary/pump/on/layer4{
+	name = "Air to Distro";
+	target_pressure = 1000
+	},
+/turf/open/floor/plating,
 /area/ship/maintenance/port)
 "qf" = (
 /obj/machinery/door/airlock/external,
@@ -939,6 +1080,9 @@
 /obj/structure/cable{
 	icon_state = "0-4"
 	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 5
+	},
 /turf/open/floor/plasteel/patterned,
 /area/ship/maintenance/port)
 "rt" = (
@@ -968,7 +1112,10 @@
 /obj/machinery/light/small{
 	dir = 1
 	},
-/obj/structure/reagent_dispensers/fueltank,
+/obj/structure/table,
+/obj/item/analyzer{
+	pixel_y = 4
+	},
 /turf/open/floor/plasteel/patterned,
 /area/ship/maintenance/port)
 "sb" = (
@@ -988,6 +1135,20 @@
 	},
 /turf/open/floor/plasteel/patterned/ridged,
 /area/ship/crew/canteen)
+"sn" = (
+/obj/machinery/button/door{
+	pixel_x = -5;
+	pixel_y = 27;
+	id = "tegus_port_cargo";
+	name = "Cargo Blast Door"
+	},
+/obj/machinery/button/shieldwallgen{
+	pixel_x = 5;
+	pixel_y = 27;
+	id = "cargo_shield_port"
+	},
+/turf/open/floor/plasteel/patterned/ridged,
+/area/ship/cargo)
 "sC" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/structure/cable{
@@ -1021,7 +1182,7 @@
 /turf/open/floor/plasteel/patterned/ridged,
 /area/ship/cargo)
 "tU" = (
-/obj/machinery/telecomms/processor/preset_four{
+/obj/machinery/telecomms/processor/preset_two{
 	network = "ntsv_commnet"
 	},
 /turf/open/floor/plasteel/patterned/ridged,
@@ -1105,7 +1266,7 @@
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
 	dir = 8
 	},
-/turf/open/floor/plasteel/patterned,
+/turf/open/floor/plasteel/patterned/ridged,
 /area/ship/maintenance/port)
 "uZ" = (
 /obj/effect/turf_decal/industrial/warning{
@@ -1114,7 +1275,9 @@
 /obj/effect/turf_decal/industrial/warning{
 	dir = 4
 	},
-/obj/machinery/door/poddoor/multi_tile/four_tile_ver,
+/obj/machinery/door/poddoor/multi_tile/four_tile_ver{
+	id = "tegus_shuttle_door"
+	},
 /obj/docking_port/mobile{
 	can_move_docking_ports = 1;
 	dir = 8;
@@ -1157,18 +1320,15 @@
 /turf/open/floor/plasteel,
 /area/ship/crew/canteen)
 "vO" = (
-/obj/effect/turf_decal/corner/transparent/solgovgold{
-	dir = 1
-	},
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4,
-/obj/machinery/atmospherics/components/trinary/filter/flipped/layer2{
-	dir = 1;
-	name = "Waste to External"
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/machinery/atmospherics/components/binary/volume_pump/on/layer2{
+	name = "Scrubbers to External"
 	},
-/turf/open/floor/plasteel/patterned,
+/turf/open/floor/plating,
 /area/ship/maintenance/port)
 "vT" = (
 /obj/machinery/door/airlock,
@@ -1244,16 +1404,6 @@
 /obj/machinery/airalarm/directional/south,
 /turf/open/floor/plasteel/patterned,
 /area/ship/maintenance/starboard)
-"wE" = (
-/obj/docking_port/stationary{
-	roundstart_template = /datum/map_template/shuttle/subshuttles/nanotrasen_shuttletegus;
-	height = 8;
-	width = 16;
-	dwidth = 9;
-	dir = 2
-	},
-/turf/open/floor/plating,
-/area/ship/cargo)
 "wP" = (
 /obj/effect/turf_decal/industrial/outline/yellow,
 /turf/open/floor/plasteel/patterned,
@@ -1266,8 +1416,8 @@
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
 	dir = 8
 	},
-/obj/machinery/atmospherics/pipe/simple/green/visible/layer2{
-	dir = 9
+/obj/effect/turf_decal/corner/transparent/solgovgold{
+	dir = 1
 	},
 /turf/open/floor/plasteel/patterned,
 /area/ship/maintenance/port)
@@ -1378,6 +1528,12 @@
 /obj/item/stack/cable_coil/red{
 	pixel_y = 3
 	},
+/obj/machinery/button/door{
+	pixel_x = -27;
+	dir = 4;
+	id = "tegus_starboard_engine";
+	name = "Engine Blast Door"
+	},
 /turf/open/floor/plasteel/patterned/ridged,
 /area/ship/maintenance/starboard)
 "yO" = (
@@ -1632,10 +1788,10 @@
 /obj/machinery/power/terminal{
 	dir = 8
 	},
+/obj/structure/cable/yellow,
 /obj/structure/cable/yellow{
 	icon_state = "0-2"
 	},
-/obj/structure/cable/yellow,
 /turf/open/floor/plating,
 /area/ship/maintenance/starboard)
 "CH" = (
@@ -1712,8 +1868,7 @@
 /area/ship/crew)
 "DF" = (
 /obj/machinery/atmospherics/components/unary/tank/air{
-	dir = 1;
-	piping_layer = 2
+	piping_layer = 4
 	},
 /turf/open/floor/plasteel/patterned,
 /area/ship/maintenance/port)
@@ -2033,15 +2188,35 @@
 /turf/open/floor/plasteel/patterned,
 /area/ship/hallway/central)
 "KR" = (
-/obj/structure/closet/wall/blue{
-	pixel_y = 30;
-	secure = 1
-	},
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
-	dir = 8
-	},
+/obj/structure/closet/secure_closet/wall{
+	name = "captain's locker";
+	req_access_txt = "20";
+	icon_state = "solgov_wall";
+	pixel_y = 30
+	},
+/obj/item/storage/backpack/captain,
+/obj/item/storage/backpack/duffelbag/captain,
+/obj/item/clothing/under/rank/command/captain/nt,
+/obj/item/clothing/under/rank/command/captain/nt/skirt,
+/obj/item/clothing/shoes/laceup,
+/obj/item/clothing/gloves/color/captain,
+/obj/item/clothing/head/caphat/nt,
+/obj/item/clothing/neck/cloak/cap,
+/obj/item/gun/energy/laser,
+/obj/item/storage/box/rxglasses/minerspykit,
+/obj/item/megaphone/command,
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
+"Lq" = (
+/obj/effect/turf_decal/industrial/warning{
+	dir = 1
+	},
+/obj/effect/turf_decal/industrial/warning,
+/obj/machinery/door/poddoor{
+	id = "tegus_starboard_cargo"
+	},
+/turf/open/floor/plating,
+/area/ship/cargo)
 "Ls" = (
 /obj/structure/rack,
 /obj/effect/decal/cleanable/dirt/dust,
@@ -2056,6 +2231,16 @@
 	},
 /turf/open/floor/plasteel/patterned,
 /area/ship/cargo)
+"LC" = (
+/obj/effect/turf_decal/industrial/warning,
+/obj/effect/turf_decal/industrial/warning{
+	dir = 1
+	},
+/obj/machinery/door/poddoor{
+	id = "tegus_port_cargo"
+	},
+/turf/open/floor/plating,
+/area/ship/cargo)
 "LF" = (
 /obj/structure/tank_dispenser,
 /turf/open/floor/plasteel/patterned/ridged,
@@ -2070,6 +2255,22 @@
 	},
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/hallway/central)
+"Mx" = (
+/obj/machinery/button/door{
+	pixel_x = -5;
+	pixel_y = -27;
+	id = "tegus_starboard_cargo";
+	name = "Cargo Blast Door";
+	dir = 1
+	},
+/obj/machinery/button/shieldwallgen{
+	pixel_x = 5;
+	pixel_y = -27;
+	id = "cargo_shield_starboard";
+	dir = 1
+	},
+/turf/open/floor/plasteel/patterned/ridged,
+/area/ship/cargo)
 "MH" = (
 /obj/structure/table/reinforced,
 /obj/machinery/computer/secure_data/laptop{
@@ -2109,6 +2310,7 @@
 /obj/item/tank/internals/emergency_oxygen/double,
 /obj/item/tank/internals/emergency_oxygen/double,
 /obj/item/tank/internals/emergency_oxygen/double,
+/obj/item/binoculars,
 /obj/item/gps/mining/internal,
 /turf/open/floor/plasteel/patterned/ridged,
 /area/ship/hallway/aft)
@@ -2166,9 +2368,9 @@
 /turf/open/floor/plasteel,
 /area/ship/hallway/central)
 "NT" = (
-/obj/machinery/telecomms/receiver/preset_right{
-	freq_listening = list(1347,1359);
-	network = "ntsv_commnet"
+/obj/machinery/telecomms/receiver/preset_left{
+	network = "ntsv_commnet";
+	id = "Nanotrasen Receiver"
 	},
 /turf/open/floor/plasteel/patterned/ridged,
 /area/ship/engineering/communications)
@@ -2272,8 +2474,7 @@
 "Pw" = (
 /obj/effect/turf_decal/corner/transparent/neutral/full,
 /obj/effect/turf_decal/corner/transparent/bar/diagonal,
-/obj/structure/table,
-/obj/machinery/microwave,
+/obj/structure/closet/crate/bin,
 /turf/open/floor/plasteel,
 /area/ship/crew/canteen)
 "PF" = (
@@ -2343,9 +2544,16 @@
 /obj/item/storage/box/donkpockets/donkpocketspicy,
 /turf/open/floor/plasteel,
 /area/ship/crew/canteen)
+"Rp" = (
+/obj/effect/landmark/subship{
+	subship_template = /datum/map_template/shuttle/subshuttles/nanotrasen_tegus
+	},
+/turf/open/floor/plating,
+/area/ship/cargo)
 "Rv" = (
 /obj/machinery/telecomms/broadcaster/preset_left{
-	network = "ntsv_commnet"
+	network = "ntsv_commnet";
+	id = "Nanotrasen Broadcaster"
 	},
 /obj/machinery/light{
 	dir = 8
@@ -2396,6 +2604,20 @@
 	dir = 1
 	},
 /obj/machinery/light/floor,
+/obj/machinery/button/door{
+	pixel_x = 27;
+	id = "tegus_shuttle_door";
+	name = "Shuttle Bay Blast Door";
+	dir = 8;
+	pixel_y = 5
+	},
+/obj/machinery/button/shieldwallgen{
+	pixel_x = 27;
+	id = "cargo_shield_fore";
+	pixel_y = -5;
+	dir = 8;
+	name = "Shuttle Bay Holofield"
+	},
 /turf/open/floor/plasteel/patterned,
 /area/ship/cargo)
 "RR" = (
@@ -2501,7 +2723,8 @@
 /area/ship/cargo)
 "TB" = (
 /obj/machinery/door/airlock,
-/turf/open/floor/plasteel,
+/obj/effect/turf_decal/industrial/warning,
+/turf/open/floor/plastic,
 /area/ship/crew/canteen)
 "TH" = (
 /obj/effect/turf_decal/industrial/warning,
@@ -2535,7 +2758,10 @@
 	icon_state = "1-2"
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
-/turf/open/floor/plasteel/dark,
+/obj/machinery/door/poddoor/shutters/preopen{
+	id = "bridge_lockdown"
+	},
+/turf/open/floor/plasteel,
 /area/ship/bridge)
 "Vd" = (
 /obj/machinery/light/small,
@@ -2543,7 +2769,8 @@
 	dir = 8
 	},
 /obj/machinery/atmospherics/pipe/simple/brown/visible/layer2,
-/turf/open/floor/plasteel/patterned/ridged,
+/obj/structure/catwalk/over/plated_catwalk,
+/turf/open/floor/plating,
 /area/ship/maintenance/port)
 "Vf" = (
 /obj/machinery/power/smes/shuttle/precharged{
@@ -2554,6 +2781,9 @@
 /obj/structure/cable{
 	icon_state = "0-8"
 	},
+/obj/machinery/door/poddoor{
+	id = "tegus_starboard_engine"
+	},
 /turf/open/floor/plating,
 /area/ship/maintenance/starboard)
 "Vn" = (
@@ -2570,6 +2800,11 @@
 "Vs" = (
 /obj/effect/turf_decal/corner/transparent/neutral/full,
 /obj/effect/turf_decal/corner/transparent/bar/diagonal,
+/obj/machinery/microwave{
+	pixel_y = 6;
+	layer = 3
+	},
+/obj/structure/table,
 /turf/open/floor/plasteel,
 /area/ship/crew/canteen)
 "VC" = (
@@ -2610,6 +2845,10 @@
 /obj/effect/turf_decal/industrial/warning{
 	dir = 1
 	},
+/obj/machinery/computer/cryopod{
+	dir = 1;
+	pixel_y = -27
+	},
 /turf/open/floor/plasteel/patterned/ridged,
 /area/ship/crew)
 "Wm" = (
@@ -2676,7 +2915,11 @@
 /area/ship/hallway/central)
 "XL" = (
 /obj/machinery/door/airlock/external,
-/turf/open/floor/plasteel,
+/obj/effect/turf_decal/industrial/warning,
+/obj/effect/turf_decal/industrial/warning{
+	dir = 1
+	},
+/turf/open/floor/plating,
 /area/ship/hallway/central)
 "XM" = (
 /turf/closed/wall/mineral/titanium,
@@ -2689,8 +2932,9 @@
 /turf/open/floor/plasteel,
 /area/ship/hallway/central)
 "XV" = (
-/obj/machinery/telecomms/relay/preset{
-	network = "nstv_commnet"
+/obj/machinery/telecomms/relay/preset/auto{
+	network = "ntsv_commnet";
+	id = "Tegus Relay"
 	},
 /turf/open/floor/plasteel/patterned/ridged,
 /area/ship/engineering/communications)
@@ -2706,10 +2950,20 @@
 	req_access = list(19)
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
+/obj/machinery/door/poddoor/shutters/preopen{
+	id = "bridge_lockdown"
+	},
 /turf/open/floor/plasteel,
 /area/ship/bridge)
 "YT" = (
-/obj/structure/table,
+/obj/machinery/portable_atmospherics/scrubber,
+/obj/machinery/atmospherics/components/unary/portables_connector/layer2,
+/obj/machinery/button/door{
+	pixel_x = -27;
+	dir = 4;
+	id = "tegus_port_engine";
+	name = "Engine Blast Door"
+	},
 /turf/open/floor/plasteel/patterned,
 /area/ship/maintenance/port)
 "YZ" = (
@@ -2822,7 +3076,7 @@ Qa
 (4,1,1) = {"
 db
 YT
-js
+eN
 rs
 js
 GU
@@ -3181,7 +3435,7 @@ ut
 "}
 (19,1,1) = {"
 ut
-XL
+kc
 dm
 Or
 qf
@@ -3254,7 +3508,7 @@ ut
 (22,1,1) = {"
 ut
 ut
-lg
+bz
 VU
 Xm
 wP
@@ -3278,7 +3532,7 @@ ut
 (23,1,1) = {"
 ut
 ut
-lg
+LC
 JR
 Sj
 Sj
@@ -3290,19 +3544,19 @@ NA
 NA
 NA
 NA
-NA
+Rp
 dQ
 Sj
 Sj
 JR
-lg
+Lq
 ut
 ut
 "}
 (24,1,1) = {"
 ut
 ut
-lg
+LC
 VU
 wP
 yV
@@ -3319,14 +3573,14 @@ rY
 yV
 wP
 VU
-lg
+Lq
 ut
 ut
 "}
 (25,1,1) = {"
 ut
 ut
-lg
+oF
 JR
 wP
 wP
@@ -3343,7 +3597,7 @@ qR
 Xm
 Ty
 JR
-lg
+fG
 ut
 ut
 "}
@@ -3351,7 +3605,7 @@ ut
 ut
 ut
 Hw
-VU
+sn
 Sj
 Sj
 Lw
@@ -3366,7 +3620,7 @@ NA
 yO
 Sj
 Sj
-VU
+Mx
 Hw
 ut
 ut
@@ -3475,7 +3729,7 @@ ut
 Hw
 yV
 EA
-wE
+NA
 NA
 NA
 NA
@@ -3691,7 +3945,7 @@ ut
 ut
 rt
 Hw
-eo
+eu
 VC
 eo
 uZ
diff --git a/_maps/shuttles/subshuttles/Subshuttle Catalog.txt b/_maps/shuttles/subshuttles/Subshuttle Catalog.txt
index fbbaf41afba8..edfd9d344738 100644
--- a/_maps/shuttles/subshuttles/Subshuttle Catalog.txt	
+++ b/_maps/shuttles/subshuttles/Subshuttle Catalog.txt	
@@ -6,4 +6,4 @@ File Path = "_maps\shuttles\subshuttles\example.dmm"
 Name = "Tegus Transport Shuttle"
 Size = "16x8"
 Purpose = "Transporting Nanotrasen employees"
-File Path = "_maps\shuttles\subshuttles\nanotrasen_shuttletegus.dmm"
+File Path = "_maps\shuttles\subshuttles\nanotrasen_shuttle_tegus.dmm"
diff --git a/_maps/shuttles/subshuttles/nanotrasen_shuttle_tegus.dmm b/_maps/shuttles/subshuttles/nanotrasen_shuttle_tegus.dmm
new file mode 100644
index 000000000000..dae41c6d83c7
--- /dev/null
+++ b/_maps/shuttles/subshuttles/nanotrasen_shuttle_tegus.dmm
@@ -0,0 +1,745 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"bj" = (
+/obj/effect/turf_decal/trimline/opaque/solgovgold/warning,
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4,
+/turf/open/floor/plasteel/airless,
+/area/ship/shuttle)
+"bt" = (
+/obj/effect/turf_decal/industrial/traffic{
+	dir = 8
+	},
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/button/shieldwallgen{
+	dir = 4;
+	pixel_x = -27;
+	pixel_y = 5;
+	id = "tegus_shield_port";
+	name = "Port Holofield"
+	},
+/obj/machinery/button/door{
+	dir = 4;
+	pixel_x = -27;
+	pixel_y = -5;
+	id = "tegus_shuttle_port";
+	name = "Port Blast Door"
+	},
+/turf/open/floor/plasteel/patterned/ridged,
+/area/ship/shuttle)
+"cu" = (
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/structure/cable{
+	icon_state = "2-8"
+	},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4{
+	dir = 4
+	},
+/turf/open/floor/plasteel/airless,
+/area/ship/shuttle)
+"cR" = (
+/obj/structure/chair/comfy/shuttle,
+/turf/open/floor/plasteel/patterned/monofloor{
+	dir = 8
+	},
+/area/ship/shuttle)
+"dm" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+	dir = 1
+	},
+/turf/open/floor/plasteel/airless,
+/area/ship/shuttle)
+"dK" = (
+/obj/machinery/power/smes/engineering,
+/obj/structure/cable{
+	icon_state = "0-4"
+	},
+/turf/open/floor/plating,
+/area/ship/shuttle)
+"dU" = (
+/obj/effect/turf_decal/industrial/traffic{
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/turf/open/floor/plasteel/patterned/ridged,
+/area/ship/shuttle)
+"fx" = (
+/turf/open/floor/plasteel,
+/area/ship/shuttle)
+"fO" = (
+/obj/structure/sign/nanotrasen,
+/turf/closed/wall/mineral/titanium/nodiagonal,
+/area/ship/shuttle)
+"fV" = (
+/obj/effect/turf_decal/trimline/opaque/solgovgold/line{
+	dir = 1
+	},
+/obj/machinery/light,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 9
+	},
+/turf/open/floor/plasteel/airless,
+/area/ship/shuttle)
+"ge" = (
+/obj/effect/turf_decal/industrial/traffic{
+	dir = 4
+	},
+/obj/machinery/door/poddoor/preopen{
+	id = "tegus_shuttle_port"
+	},
+/obj/structure/cable{
+	icon_state = "0-2"
+	},
+/obj/machinery/power/shieldwallgen/atmos/roundstart{
+	dir = 8;
+	id = "tegus_shield_port"
+	},
+/turf/open/floor/plasteel/patterned/ridged,
+/area/ship/shuttle)
+"gz" = (
+/obj/effect/turf_decal/trimline/opaque/solgovgold/warning{
+	dir = 1
+	},
+/obj/structure/cable{
+	icon_state = "2-8"
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 8
+	},
+/turf/open/floor/plasteel/airless,
+/area/ship/shuttle)
+"jW" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
+/turf/open/floor/plasteel,
+/area/ship/shuttle)
+"kH" = (
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4{
+	dir = 8
+	},
+/turf/open/floor/plasteel/airless,
+/area/ship/shuttle)
+"lV" = (
+/obj/structure/chair/comfy/shuttle{
+	dir = 1
+	},
+/obj/structure/window/reinforced/spawner,
+/turf/open/floor/plasteel/patterned/monofloor{
+	dir = 4
+	},
+/area/ship/shuttle)
+"nB" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 9
+	},
+/turf/open/floor/plasteel,
+/area/ship/shuttle)
+"nL" = (
+/obj/effect/turf_decal/trimline/opaque/solgovgold/line{
+	dir = 1
+	},
+/obj/structure/cable{
+	icon_state = "1-4"
+	},
+/obj/machinery/light,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 5
+	},
+/turf/open/floor/plasteel/airless,
+/area/ship/shuttle)
+"oi" = (
+/obj/machinery/atmospherics/components/unary/tank/air{
+	dir = 1;
+	piping_layer = 4
+	},
+/turf/open/floor/plasteel/patterned/ridged,
+/area/ship/shuttle)
+"oI" = (
+/obj/machinery/computer/crew{
+	dir = 8
+	},
+/turf/open/floor/plasteel/patterned/monofloor,
+/area/ship/shuttle)
+"pm" = (
+/turf/closed/wall/mineral/titanium/nodiagonal,
+/area/ship/shuttle)
+"qx" = (
+/obj/effect/turf_decal/industrial/traffic{
+	dir = 4
+	},
+/obj/machinery/door/poddoor/preopen{
+	id = "tegus_shuttle_starboard"
+	},
+/obj/machinery/power/shieldwallgen/atmos/roundstart{
+	dir = 8;
+	id = "tegus_shield_starboard"
+	},
+/obj/structure/cable,
+/turf/open/floor/plasteel/patterned/ridged,
+/area/ship/shuttle)
+"qz" = (
+/obj/structure/chair/comfy/shuttle{
+	dir = 1
+	},
+/obj/structure/window/reinforced/spawner,
+/turf/open/floor/plasteel/patterned/monofloor{
+	dir = 8
+	},
+/area/ship/shuttle)
+"rp" = (
+/obj/effect/spawner/structure/window/shuttle,
+/obj/machinery/door/poddoor/shutters/preopen{
+	id = "tegus_shuttle_window"
+	},
+/turf/open/floor/plating,
+/area/ship/shuttle)
+"rx" = (
+/turf/template_noop,
+/area/template_noop)
+"rR" = (
+/obj/machinery/power/shuttle/engine/electric{
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "0-4"
+	},
+/turf/open/floor/plating,
+/area/ship/shuttle)
+"sa" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/structure/cable{
+	icon_state = "1-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 5
+	},
+/turf/open/floor/plating,
+/area/ship/shuttle)
+"sq" = (
+/obj/machinery/door/poddoor/preopen{
+	id = "tegus_shuttle_starboard"
+	},
+/turf/open/floor/plasteel/patterned/ridged,
+/area/ship/shuttle)
+"tB" = (
+/obj/machinery/holopad/emergency/command,
+/obj/effect/turf_decal/box,
+/obj/machinery/light{
+	dir = 8
+	},
+/turf/open/floor/plasteel,
+/area/ship/shuttle)
+"uJ" = (
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
+/turf/open/floor/plasteel/airless,
+/area/ship/shuttle)
+"wV" = (
+/obj/effect/turf_decal/industrial/traffic{
+	dir = 8
+	},
+/obj/machinery/door/poddoor/preopen{
+	id = "tegus_shuttle_port"
+	},
+/obj/structure/cable{
+	icon_state = "0-2"
+	},
+/obj/machinery/power/shieldwallgen/atmos/roundstart{
+	dir = 4;
+	id = "tegus_shield_port"
+	},
+/turf/open/floor/plasteel/patterned/ridged,
+/area/ship/shuttle)
+"xB" = (
+/obj/structure/cable{
+	icon_state = "0-4"
+	},
+/obj/machinery/power/terminal{
+	dir = 8
+	},
+/turf/open/floor/plating,
+/area/ship/shuttle)
+"yr" = (
+/obj/effect/turf_decal/industrial/traffic{
+	dir = 8
+	},
+/obj/machinery/door/poddoor/preopen{
+	id = "tegus_shuttle_starboard"
+	},
+/obj/machinery/power/shieldwallgen/atmos/roundstart{
+	dir = 4;
+	id = "tegus_shield_starboard"
+	},
+/obj/structure/cable,
+/turf/open/floor/plasteel/patterned/ridged,
+/area/ship/shuttle)
+"yP" = (
+/obj/machinery/computer/helm{
+	dir = 8
+	},
+/turf/open/floor/plasteel/patterned/monofloor{
+	dir = 1
+	},
+/area/ship/shuttle)
+"zG" = (
+/obj/effect/turf_decal/industrial/traffic{
+	dir = 8
+	},
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/button/shieldwallgen{
+	dir = 4;
+	pixel_x = -27;
+	pixel_y = -5;
+	id = "tegus_shield_starboard";
+	name = "Starboard Holofield"
+	},
+/obj/machinery/button/door{
+	dir = 4;
+	pixel_x = -27;
+	pixel_y = 5;
+	id = "tegus_shuttle_starboard";
+	name = "Starboard Blast Door"
+	},
+/turf/open/floor/plasteel/patterned/ridged,
+/area/ship/shuttle)
+"Au" = (
+/obj/effect/turf_decal/industrial/warning,
+/obj/machinery/telecomms/relay/preset/mining{
+	network = "ntsv_commnet"
+	},
+/obj/machinery/airalarm/directional/east,
+/turf/open/floor/plasteel/patterned/ridged,
+/area/ship/shuttle)
+"AQ" = (
+/obj/machinery/power/smes/shuttle/precharged{
+	dir = 4
+	},
+/obj/structure/window/reinforced/spawner/west,
+/obj/machinery/door/window/eastleft,
+/obj/structure/cable{
+	icon_state = "0-8"
+	},
+/obj/machinery/door/poddoor/shutters/preopen{
+	id = "tegus_shuttle_engine"
+	},
+/turf/open/floor/plating,
+/area/ship/shuttle)
+"AW" = (
+/obj/effect/turf_decal/trimline/opaque/solgovgold/line,
+/obj/machinery/light{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 10
+	},
+/turf/open/floor/plasteel/airless,
+/area/ship/shuttle)
+"Bg" = (
+/obj/effect/turf_decal/industrial/warning{
+	dir = 8
+	},
+/obj/machinery/power/port_gen/pacman,
+/obj/structure/cable/yellow,
+/obj/structure/cable{
+	icon_state = "5-8"
+	},
+/obj/machinery/light/small,
+/turf/open/floor/plasteel/patterned/ridged,
+/area/ship/shuttle)
+"BM" = (
+/obj/effect/turf_decal/industrial/warning{
+	dir = 1
+	},
+/obj/structure/cable,
+/obj/structure/cable{
+	icon_state = "1-10"
+	},
+/obj/machinery/power/apc/auto_name/east,
+/obj/machinery/atmospherics/components/binary/pump/on/layer4{
+	name = "Air to Distro";
+	target_pressure = 1000;
+	dir = 1
+	},
+/turf/open/floor/plasteel,
+/area/ship/shuttle)
+"Cu" = (
+/obj/structure/chair/comfy/shuttle{
+	dir = 4
+	},
+/turf/open/floor/plasteel,
+/area/ship/shuttle)
+"CM" = (
+/turf/closed/wall/mineral/titanium,
+/area/ship/shuttle)
+"Em" = (
+/obj/effect/turf_decal/trimline/opaque/solgovgold/warning{
+	dir = 1
+	},
+/obj/structure/cable{
+	icon_state = "2-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 8
+	},
+/turf/open/floor/plasteel/airless,
+/area/ship/shuttle)
+"Iq" = (
+/obj/machinery/power/smes/shuttle/precharged{
+	dir = 4
+	},
+/obj/structure/window/reinforced/spawner/west,
+/obj/machinery/door/window/eastright,
+/obj/structure/cable{
+	icon_state = "0-8"
+	},
+/obj/machinery/door/poddoor/shutters/preopen{
+	id = "tegus_shuttle_engine"
+	},
+/turf/open/floor/plating,
+/area/ship/shuttle)
+"IR" = (
+/obj/effect/turf_decal/trimline/opaque/solgovgold/warning{
+	dir = 1
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4{
+	dir = 1
+	},
+/turf/open/floor/plasteel/airless,
+/area/ship/shuttle)
+"Ks" = (
+/obj/machinery/power/terminal{
+	dir = 1
+	},
+/obj/structure/cable/yellow{
+	icon_state = "0-4"
+	},
+/turf/open/floor/plating,
+/area/ship/shuttle)
+"LC" = (
+/obj/effect/turf_decal/trimline/opaque/solgovgold/warning,
+/obj/structure/cable{
+	icon_state = "1-8"
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 8
+	},
+/turf/open/floor/plasteel/airless,
+/area/ship/shuttle)
+"LN" = (
+/obj/machinery/door/airlock/shuttle,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 8
+	},
+/turf/open/floor/plasteel,
+/area/ship/shuttle)
+"LU" = (
+/obj/structure/chair/comfy/shuttle,
+/turf/open/floor/plasteel/patterned/monofloor,
+/area/ship/shuttle)
+"Mp" = (
+/obj/effect/turf_decal/industrial/warning{
+	dir = 9
+	},
+/obj/structure/cable/yellow{
+	icon_state = "2-8"
+	},
+/turf/open/floor/plasteel,
+/area/ship/shuttle)
+"MD" = (
+/obj/effect/turf_decal/trimline/opaque/solgovgold/line,
+/obj/structure/cable{
+	icon_state = "2-4"
+	},
+/obj/machinery/light{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 6
+	},
+/turf/open/floor/plasteel/airless,
+/area/ship/shuttle)
+"MK" = (
+/obj/structure/table/reinforced,
+/obj/machinery/button/door{
+	dir = 1;
+	id = "tegus_shuttle_window";
+	name = "Window Shutters";
+	pixel_x = 6
+	},
+/obj/machinery/button/door{
+	dir = 1;
+	id = "tegus_shuttle_engine";
+	name = "Engine Shutters";
+	pixel_x = -6
+	},
+/turf/open/floor/plasteel,
+/area/ship/shuttle)
+"NJ" = (
+/obj/machinery/door/airlock/shuttle,
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 4
+	},
+/turf/open/floor/plasteel,
+/area/ship/shuttle)
+"Og" = (
+/obj/structure/chair/comfy/shuttle,
+/turf/open/floor/plasteel/patterned/monofloor{
+	dir = 4
+	},
+/area/ship/shuttle)
+"Ol" = (
+/obj/docking_port/mobile{
+	dir = 2
+	},
+/obj/machinery/door/poddoor/preopen{
+	id = "tegus_shuttle_port"
+	},
+/turf/open/floor/plasteel/patterned/ridged,
+/area/ship/shuttle)
+"Rf" = (
+/obj/item/radio/intercom/wideband,
+/obj/structure/table/reinforced,
+/turf/open/floor/plasteel,
+/area/ship/shuttle)
+"Rs" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
+/turf/open/floor/plasteel/airless,
+/area/ship/shuttle)
+"Sp" = (
+/obj/structure/chair/comfy/shuttle{
+	dir = 1
+	},
+/obj/structure/window/reinforced/spawner,
+/turf/open/floor/plasteel/patterned/monofloor{
+	dir = 1
+	},
+/area/ship/shuttle)
+"SG" = (
+/obj/effect/turf_decal/industrial/warning{
+	dir = 10
+	},
+/obj/structure/cable{
+	icon_state = "2-8"
+	},
+/obj/machinery/light/small{
+	dir = 1
+	},
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
+/turf/open/floor/plasteel,
+/area/ship/shuttle)
+"To" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/structure/cable{
+	icon_state = "2-8"
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4{
+	dir = 1
+	},
+/turf/open/floor/plating,
+/area/ship/shuttle)
+"Tz" = (
+/obj/effect/turf_decal/trimline/opaque/solgovgold/warning,
+/obj/structure/cable{
+	icon_state = "1-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 8
+	},
+/turf/open/floor/plasteel/airless,
+/area/ship/shuttle)
+"Wx" = (
+/obj/structure/chair/comfy/shuttle{
+	dir = 4;
+	name = "Helm"
+	},
+/turf/open/floor/plasteel,
+/area/ship/shuttle)
+
+(1,1,1) = {"
+rx
+rx
+rR
+rx
+rx
+rR
+rx
+rx
+"}
+(2,1,1) = {"
+rx
+pm
+AQ
+pm
+pm
+Iq
+pm
+rx
+"}
+(3,1,1) = {"
+rx
+pm
+xB
+dK
+Ks
+xB
+pm
+rx
+"}
+(4,1,1) = {"
+rx
+pm
+SG
+sa
+Mp
+Bg
+pm
+rx
+"}
+(5,1,1) = {"
+rx
+pm
+Au
+To
+BM
+oi
+pm
+rx
+"}
+(6,1,1) = {"
+rx
+fO
+pm
+NJ
+pm
+pm
+fO
+rx
+"}
+(7,1,1) = {"
+pm
+pm
+MD
+cu
+uJ
+nL
+pm
+pm
+"}
+(8,1,1) = {"
+wV
+bt
+LC
+qz
+cR
+gz
+zG
+yr
+"}
+(9,1,1) = {"
+Ol
+jW
+bj
+Sp
+LU
+IR
+dm
+sq
+"}
+(10,1,1) = {"
+ge
+dU
+Tz
+lV
+Og
+Em
+dU
+qx
+"}
+(11,1,1) = {"
+pm
+pm
+AW
+kH
+Rs
+fV
+pm
+pm
+"}
+(12,1,1) = {"
+rx
+fO
+pm
+LN
+pm
+pm
+fO
+rx
+"}
+(13,1,1) = {"
+rx
+pm
+jW
+nB
+tB
+fx
+pm
+rx
+"}
+(14,1,1) = {"
+rx
+rp
+Rf
+Wx
+Cu
+MK
+rp
+rx
+"}
+(15,1,1) = {"
+rx
+CM
+pm
+yP
+oI
+pm
+CM
+rx
+"}
+(16,1,1) = {"
+rx
+rx
+CM
+rp
+rp
+CM
+rx
+rx
+"}
diff --git a/_maps/shuttles/subshuttles/nanotrasen_shuttletegus.dmm b/_maps/shuttles/subshuttles/nanotrasen_shuttletegus.dmm
deleted file mode 100644
index 501dd48c7a66..000000000000
--- a/_maps/shuttles/subshuttles/nanotrasen_shuttletegus.dmm
+++ /dev/null
@@ -1,440 +0,0 @@
-//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
-"a" = (
-/turf/closed/wall/mineral/titanium,
-/area/ship/shuttle)
-"b" = (
-/obj/effect/turf_decal/industrial/warning{
-	dir = 10
-	},
-/obj/structure/cable{
-	icon_state = "2-8"
-	},
-/turf/open/floor/plasteel,
-/area/ship/shuttle)
-"c" = (
-/obj/machinery/holopad/emergency/command,
-/obj/effect/turf_decal/box,
-/turf/open/floor/plasteel,
-/area/ship/shuttle)
-"d" = (
-/obj/structure/cable{
-	icon_state = "0-4"
-	},
-/turf/open/floor/plating,
-/area/ship/shuttle)
-"e" = (
-/obj/machinery/power/smes/shuttle/precharged{
-	dir = 4
-	},
-/obj/structure/window/reinforced/spawner/west,
-/obj/machinery/door/window/eastleft,
-/turf/open/floor/plating,
-/area/ship/shuttle)
-"f" = (
-/obj/machinery/door/airlock/shuttle,
-/turf/open/floor/plasteel,
-/area/ship/shuttle)
-"g" = (
-/obj/machinery/atmospherics/components/unary/tank/air{
-	dir = 1;
-	piping_layer = 2
-	},
-/turf/open/floor/plasteel/patterned/ridged,
-/area/ship/shuttle)
-"h" = (
-/obj/structure/chair/comfy/shuttle{
-	dir = 1
-	},
-/obj/structure/window/reinforced/spawner,
-/turf/open/floor/plasteel/patterned/monofloor{
-	dir = 1
-	},
-/area/ship/shuttle)
-"i" = (
-/obj/machinery/power/smes/shuttle/precharged{
-	dir = 4
-	},
-/obj/structure/window/reinforced/spawner/west,
-/obj/machinery/door/window/eastright,
-/turf/open/floor/plating,
-/area/ship/shuttle)
-"j" = (
-/obj/structure/sign/nanotrasen,
-/turf/closed/wall/mineral/titanium,
-/area/ship/shuttle)
-"n" = (
-/obj/structure/catwalk/over/plated_catwalk,
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/structure/cable{
-	icon_state = "1-8"
-	},
-/turf/open/floor/plating,
-/area/ship/shuttle)
-"o" = (
-/obj/machinery/power/shuttle/engine/electric{
-	dir = 4
-	},
-/turf/open/floor/plating,
-/area/ship/shuttle)
-"p" = (
-/obj/machinery/power/terminal{
-	dir = 1
-	},
-/obj/structure/cable/yellow{
-	icon_state = "0-4"
-	},
-/turf/open/floor/plating,
-/area/ship/shuttle)
-"q" = (
-/obj/machinery/door/poddoor,
-/obj/docking_port/mobile{
-	dir = 2
-	},
-/turf/open/floor/plasteel/patterned/ridged,
-/area/ship/shuttle)
-"r" = (
-/obj/machinery/computer/helm{
-	dir = 8
-	},
-/turf/open/floor/plasteel/patterned/monofloor{
-	dir = 1
-	},
-/area/ship/shuttle)
-"s" = (
-/obj/structure/catwalk/over/plated_catwalk,
-/obj/structure/cable{
-	icon_state = "2-8"
-	},
-/turf/open/floor/plating,
-/area/ship/shuttle)
-"t" = (
-/obj/structure/chair/comfy/shuttle{
-	dir = 1
-	},
-/obj/structure/window/reinforced/spawner,
-/turf/open/floor/plasteel/patterned/monofloor{
-	dir = 8
-	},
-/area/ship/shuttle)
-"u" = (
-/obj/structure/chair/comfy/shuttle{
-	dir = 4
-	},
-/turf/open/floor/plasteel,
-/area/ship/shuttle)
-"v" = (
-/obj/effect/turf_decal/industrial/warning{
-	dir = 1
-	},
-/obj/structure/cable,
-/obj/structure/cable{
-	icon_state = "1-10"
-	},
-/obj/machinery/power/apc/auto_name/east,
-/turf/open/floor/plasteel,
-/area/ship/shuttle)
-"w" = (
-/obj/structure/table/reinforced,
-/obj/item/binoculars,
-/turf/open/floor/plasteel,
-/area/ship/shuttle)
-"y" = (
-/obj/effect/turf_decal/industrial/warning,
-/obj/machinery/telecomms/relay/preset/mining{
-	network = "ntsv_commnet"
-	},
-/turf/open/floor/plasteel/patterned/ridged,
-/area/ship/shuttle)
-"A" = (
-/obj/machinery/power/smes/engineering,
-/obj/structure/cable{
-	icon_state = "0-4"
-	},
-/turf/open/floor/plating,
-/area/ship/shuttle)
-"B" = (
-/obj/effect/turf_decal/industrial/traffic{
-	dir = 8
-	},
-/turf/open/floor/plasteel/patterned/ridged,
-/area/ship/shuttle)
-"C" = (
-/obj/machinery/door/poddoor,
-/obj/effect/turf_decal/industrial/traffic{
-	dir = 4
-	},
-/turf/open/floor/plasteel/patterned/ridged,
-/area/ship/shuttle)
-"D" = (
-/obj/machinery/computer/crew{
-	dir = 8
-	},
-/turf/open/floor/plasteel/patterned/monofloor,
-/area/ship/shuttle)
-"E" = (
-/obj/effect/turf_decal/trimline/opaque/solgovgold/warning{
-	dir = 1
-	},
-/turf/open/floor/plasteel,
-/area/ship/shuttle)
-"G" = (
-/obj/effect/spawner/structure/window/shuttle,
-/turf/open/floor/plating,
-/area/ship/shuttle)
-"H" = (
-/obj/effect/turf_decal/trimline/opaque/solgovgold/warning,
-/turf/open/floor/plasteel,
-/area/ship/shuttle)
-"I" = (
-/obj/machinery/door/poddoor,
-/turf/open/floor/plasteel/patterned/ridged,
-/area/ship/shuttle)
-"J" = (
-/turf/open/floor/plasteel,
-/area/ship/shuttle)
-"K" = (
-/obj/structure/chair/comfy/shuttle,
-/turf/open/floor/plasteel/patterned/monofloor{
-	dir = 4
-	},
-/area/ship/shuttle)
-"L" = (
-/obj/item/radio/intercom/wideband,
-/obj/structure/table/reinforced,
-/turf/open/floor/plasteel,
-/area/ship/shuttle)
-"N" = (
-/obj/effect/turf_decal/industrial/traffic{
-	dir = 4
-	},
-/turf/open/floor/plasteel/patterned/ridged,
-/area/ship/shuttle)
-"O" = (
-/obj/structure/chair/comfy/shuttle{
-	dir = 1
-	},
-/obj/structure/window/reinforced/spawner,
-/turf/open/floor/plasteel/patterned/monofloor{
-	dir = 4
-	},
-/area/ship/shuttle)
-"P" = (
-/obj/machinery/door/poddoor,
-/obj/effect/turf_decal/industrial/traffic{
-	dir = 8
-	},
-/turf/open/floor/plasteel/patterned/ridged,
-/area/ship/shuttle)
-"Q" = (
-/obj/effect/turf_decal/industrial/warning{
-	dir = 8
-	},
-/obj/machinery/power/port_gen/pacman,
-/obj/structure/cable/yellow,
-/obj/structure/cable{
-	icon_state = "5-8"
-	},
-/turf/open/floor/plasteel/patterned/ridged,
-/area/ship/shuttle)
-"R" = (
-/obj/effect/turf_decal/industrial/warning{
-	dir = 9
-	},
-/obj/structure/cable/yellow{
-	icon_state = "2-8"
-	},
-/turf/open/floor/plasteel,
-/area/ship/shuttle)
-"T" = (
-/turf/template_noop,
-/area/template_noop)
-"U" = (
-/obj/effect/turf_decal/trimline/opaque/solgovgold/line,
-/turf/open/floor/plasteel,
-/area/ship/shuttle)
-"V" = (
-/obj/structure/chair/comfy/shuttle{
-	dir = 4;
-	name = "Helm"
-	},
-/turf/open/floor/plasteel,
-/area/ship/shuttle)
-"W" = (
-/obj/structure/chair/comfy/shuttle,
-/turf/open/floor/plasteel/patterned/monofloor{
-	dir = 8
-	},
-/area/ship/shuttle)
-"X" = (
-/obj/structure/chair/comfy/shuttle,
-/turf/open/floor/plasteel/patterned/monofloor,
-/area/ship/shuttle)
-"Y" = (
-/obj/effect/turf_decal/trimline/opaque/solgovgold/line{
-	dir = 1
-	},
-/turf/open/floor/plasteel,
-/area/ship/shuttle)
-
-(1,1,1) = {"
-T
-T
-o
-T
-T
-o
-T
-T
-"}
-(2,1,1) = {"
-T
-a
-e
-a
-a
-i
-a
-T
-"}
-(3,1,1) = {"
-T
-a
-d
-A
-p
-d
-a
-T
-"}
-(4,1,1) = {"
-T
-a
-b
-n
-R
-Q
-a
-T
-"}
-(5,1,1) = {"
-T
-a
-y
-s
-v
-g
-a
-T
-"}
-(6,1,1) = {"
-T
-j
-a
-f
-a
-a
-j
-T
-"}
-(7,1,1) = {"
-a
-a
-U
-J
-J
-Y
-a
-a
-"}
-(8,1,1) = {"
-P
-B
-H
-t
-W
-E
-B
-P
-"}
-(9,1,1) = {"
-q
-J
-H
-h
-X
-E
-J
-I
-"}
-(10,1,1) = {"
-C
-N
-H
-O
-K
-E
-N
-C
-"}
-(11,1,1) = {"
-a
-a
-U
-J
-J
-Y
-a
-a
-"}
-(12,1,1) = {"
-T
-j
-a
-f
-a
-a
-j
-T
-"}
-(13,1,1) = {"
-T
-a
-J
-J
-c
-J
-a
-T
-"}
-(14,1,1) = {"
-T
-G
-L
-V
-u
-w
-G
-T
-"}
-(15,1,1) = {"
-T
-a
-a
-r
-D
-a
-a
-T
-"}
-(16,1,1) = {"
-T
-T
-a
-G
-G
-a
-T
-T
-"}
diff --git a/code/datums/action.dm b/code/datums/action.dm
index ec5c6702b750..f05078bbd602 100644
--- a/code/datums/action.dm
+++ b/code/datums/action.dm
@@ -789,3 +789,7 @@
 		to_chat(owner, "<span class='warning'>You overload the lanternbang!</span>")
 		L.activate()
 		return
+
+/datum/action/item_action/activate_remote_view
+	name = "Activate Remote View"
+	desc = "Activates the Remote View of your spy sunglasses."
diff --git a/code/datums/shuttles.dm b/code/datums/shuttles.dm
index 867237494404..b7d76a38064f 100644
--- a/code/datums/shuttles.dm
+++ b/code/datums/shuttles.dm
@@ -351,8 +351,8 @@
 /datum/map_template/shuttle/subshuttles
 	category = "subshuttles"
 
-/datum/map_template/shuttle/subshuttles/nanotrasen_shuttletegus
-	file_name = "nanotrasen_shuttletegus"
+/datum/map_template/shuttle/subshuttles/nanotrasen_tegus
+	file_name = "nanotrasen_shuttle_tegus"
 	name = "Tegus Transport Shuttle"
 	prefix = "NTSV"
 
diff --git a/code/game/objects/items/devices/spyglasses.dm b/code/game/objects/items/devices/spyglasses.dm
index 8e59cfe19616..61eec511d783 100644
--- a/code/game/objects/items/devices/spyglasses.dm
+++ b/code/game/objects/items/devices/spyglasses.dm
@@ -1,9 +1,10 @@
 //antag spyglasses. meant to be an example for map_popups.dm
-/obj/item/clothing/glasses/regular/spy
+/obj/item/clothing/glasses/sunglasses/spy
 	desc = "Made by Nerd. Co's infiltration and surveillance department. Upon closer inspection, there's a small screen in each lens."
+	actions_types = list(/datum/action/item_action/activate_remote_view)
 	var/obj/item/spy_bug/linked_bug
 
-/obj/item/clothing/glasses/regular/spy/proc/show_to_user(mob/user)//this is the meat of it. most of the map_popup usage is in this.
+/obj/item/clothing/glasses/sunglasses/spy/proc/show_to_user(mob/user)//this is the meat of it. most of the map_popup usage is in this.
 	if(!user)
 		return
 	if(!user.client)
@@ -17,23 +18,23 @@
 	user.client.register_map_obj(linked_bug.cam_plane_master)
 	linked_bug.update_view()
 
-/obj/item/clothing/glasses/regular/spy/equipped(mob/user, slot)
+/obj/item/clothing/glasses/sunglasses/spy/equipped(mob/user, slot)
 	. = ..()
 	if(slot != ITEM_SLOT_EYES)
 		user.client.close_popup("spypopup")
 
-/obj/item/clothing/glasses/regular/spy/dropped(mob/user)
+/obj/item/clothing/glasses/sunglasses/spy/dropped(mob/user)
 	. = ..()
 	user.client.close_popup("spypopup")
 
-/obj/item/clothing/glasses/regular/spy/verb/activate_remote_view()
-	//yada yada check to see if the glasses are in their eye slot
-	if(ishuman(usr))
-		var/mob/living/carbon/human/user = usr
-		if(user.glasses == src)
-			show_to_user(user)
+/obj/item/clothing/glasses/sunglasses/spy/ui_action_click(mob/user)
+	show_to_user(user)
 
-/obj/item/clothing/glasses/regular/spy/Destroy()
+/obj/item/clothing/glasses/sunglasses/spy/item_action_slot_check(slot)
+	if(slot == ITEM_SLOT_EYES)
+		return TRUE
+
+/obj/item/clothing/glasses/sunglasses/spy/Destroy()
 	if(linked_bug)
 		linked_bug.linked_glasses = null
 	. = ..()
@@ -43,9 +44,9 @@
 	name = "pocket protector"
 	icon = 'icons/obj/clothing/accessories.dmi'
 	icon_state = "pocketprotector"
-	desc = "an advanced peice of espionage equipment in the shape of a pocket protector. it has a built in 360 degree camera for all your nefarious needs. Microphone not included."
+	desc = "An advanced piece of espionage equipment in the shape of a pocket protector. it has a built in 360 degree camera for all your nefarious needs. Microphone not included."
 
-	var/obj/item/clothing/glasses/regular/spy/linked_glasses
+	var/obj/item/clothing/glasses/sunglasses/spy/linked_glasses
 	var/atom/movable/screen/map_view/cam_screen
 	var/atom/movable/screen/plane_master/lighting/cam_plane_master
 	// Ranges higher than one can be used to see through walls.
@@ -90,26 +91,48 @@
 //it needs to be linked, hence a kit.
 /obj/item/storage/box/rxglasses/spyglasskit
 	name = "spyglass kit"
-	desc = "this box contains <i>cool</i> nerd glasses; with built-in displays to view a linked camera."
+	desc = "this box contains <i>cool</i> sunglasses; with built-in displays to view a linked camera."
 
 /obj/item/paper/fluff/nerddocs
 	name = "Espionage For Dummies"
 	color = "#FFFF00"
 	desc = "An eye gougingly yellow pamphlet with a badly designed image of a detective on it. the subtext says \" The Latest way to violate privacy guidelines!\" "
 	info = @{"
-
 Thank you for your purchase of the Nerd Co SpySpeks <small>tm</small>, this paper will be your quick-start guide to violating the privacy of your crewmates in three easy steps!<br><br>Step One: Nerd Co SpySpeks <small>tm</small> upon your face. <br>
 Step Two: Place the included "ProfitProtektor <small>tm</small>" camera assembly in a place of your choosing - make sure to make heavy use of it's inconspicous design!
-
 Step Three: Press the "Activate Remote View" Button on the side of your SpySpeks <small>tm</small> to open a movable camera display in the corner of your vision, it's just that easy!<br><br><br><center><b>TROUBLESHOOTING</b><br></center>
 My SpySpeks <small>tm</small> Make a shrill beep while attempting to use!
-
 A shrill beep coming from your SpySpeks means that they can't connect to the included ProfitProtektor <small>tm</small>, please make sure your ProfitProtektor is still active, and functional!
 	"}
 
 /obj/item/storage/box/rxglasses/spyglasskit/PopulateContents()
 	var/obj/item/spy_bug/newbug = new(src)
-	var/obj/item/clothing/glasses/regular/spy/newglasses = new(src)
+	var/obj/item/clothing/glasses/sunglasses/spy/newglasses = new(src)
 	newbug.linked_glasses = newglasses
 	newglasses.linked_bug = newbug
 	new /obj/item/paper/fluff/nerddocs(src)
+
+//miner monitoring kit
+/obj/item/storage/box/rxglasses/minerspykit
+	name = "miner monitoring kit"
+	desc = "this box contains an EXOCOM monitoring kit; with built-in displays to view an advanced mining camera."
+
+/obj/item/spy_bug/miner
+	icon = 'icons/obj/telescience.dmi'
+	icon_state = "gps-m"
+	name = "mining camera"
+	desc = "An advanced piece of monitoring equipment. it has a built in 360 degree camera for all your /official/ needs. Microphone not included."
+
+/obj/item/clothing/glasses/sunglasses/spy/miner
+	icon = 'icons/obj/clothing/glasses.dmi'
+	icon_state = "prescriptionmeson"
+	name = "EXOCOM Monitor Glasses"
+	desc = "A pair of EXOCOM monitor glasses. Contains a small screen in each lens, for monitoring a linked mining camera."
+	flash_protect = FLASH_PROTECTION_FLASH
+	invis_view = SEE_INVISIBLE_LIVING
+
+/obj/item/storage/box/rxglasses/minerspykit/PopulateContents()
+	var/obj/item/spy_bug/miner/newminerbug = new(src)
+	var/obj/item/clothing/glasses/sunglasses/spy/miner/newminerglasses = new(src)
+	newminerbug.linked_glasses = newminerglasses
+	newminerglasses.linked_bug = newminerbug

From 1ce2bc502eceb28e41c79b1ada5af226d877560c Mon Sep 17 00:00:00 2001
From: goober3 <118859017+goober3@users.noreply.github.com>
Date: Sun, 9 Apr 2023 02:23:03 +0100
Subject: [PATCH 04/28] Summary (required)

---
 _maps/configs/nanotrasen_tegus.json          |   2 +-
 _maps/shuttles/shiptest/nanotrasen_tegus.dmm | 209 ++++++++++++++++++-
 2 files changed, 199 insertions(+), 12 deletions(-)

diff --git a/_maps/configs/nanotrasen_tegus.json b/_maps/configs/nanotrasen_tegus.json
index e0702aa501a8..aa192a275fca 100644
--- a/_maps/configs/nanotrasen_tegus.json
+++ b/_maps/configs/nanotrasen_tegus.json
@@ -3,7 +3,7 @@
 	"map_name": "Tegus-class Mining Carrier",
 	"prefix": "NTSV",
 	"namelists": ["GENERAL", "BRITISH_NAVY", "MYTHOLOGICAL", "SPACE"],
-	"map_short_name": "Gecko-class",
+	"map_short_name": "Tegus-class",
 	"map_path": "_maps/shuttles/shiptest/nanotrasen_tegus.dmm",
 	"limit": 1,
 	"job_slots": {
diff --git a/_maps/shuttles/shiptest/nanotrasen_tegus.dmm b/_maps/shuttles/shiptest/nanotrasen_tegus.dmm
index 06a81ea403ba..ba07cc0f0d36 100644
--- a/_maps/shuttles/shiptest/nanotrasen_tegus.dmm
+++ b/_maps/shuttles/shiptest/nanotrasen_tegus.dmm
@@ -13,6 +13,12 @@
 /obj/structure/closet/crate,
 /turf/open/floor/plasteel/patterned,
 /area/ship/cargo)
+"aw" = (
+/obj/structure/cable{
+	icon_state = "1-4"
+	},
+/turf/open/floor/plasteel/patterned/ridged,
+/area/ship/cargo)
 "aA" = (
 /obj/effect/turf_decal/industrial/warning{
 	dir = 4
@@ -26,6 +32,9 @@
 /obj/structure/cable{
 	icon_state = "0-4"
 	},
+/obj/structure/cable{
+	icon_state = "0-4"
+	},
 /turf/open/floor/plating,
 /area/ship/maintenance/port)
 "bl" = (
@@ -57,6 +66,9 @@
 	dir = 4;
 	id = "cargo_shield_port"
 	},
+/obj/structure/cable{
+	icon_state = "0-2"
+	},
 /turf/open/floor/plating,
 /area/ship/cargo)
 "bK" = (
@@ -86,6 +98,9 @@
 	dir = 1;
 	id = "cargo_shield_fore"
 	},
+/obj/structure/cable{
+	icon_state = "0-10"
+	},
 /turf/open/floor/plating,
 /area/ship/cargo)
 "cK" = (
@@ -97,6 +112,9 @@
 /obj/machinery/door/poddoor{
 	id = "tegus_port_engine"
 	},
+/obj/structure/cable{
+	icon_state = "0-8"
+	},
 /turf/open/floor/plating,
 /area/ship/maintenance/port)
 "cP" = (
@@ -160,6 +178,9 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
 	dir = 4
 	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
 /turf/open/floor/plasteel/patterned/ridged,
 /area/ship/cargo)
 "dy" = (
@@ -176,6 +197,9 @@
 	},
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2,
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
 /turf/open/floor/plasteel,
 /area/ship/hallway/central)
 "dO" = (
@@ -185,6 +209,12 @@
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2{
 	dir = 4
 	},
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/structure/cable{
+	icon_state = "1-8"
+	},
 /turf/open/floor/plasteel,
 /area/ship/cargo)
 "dP" = (
@@ -272,6 +302,9 @@
 	dir = 2;
 	id = "cargo_shield_fore"
 	},
+/obj/structure/cable{
+	icon_state = "0-9"
+	},
 /turf/open/floor/plating,
 /area/ship/cargo)
 "eN" = (
@@ -348,6 +381,9 @@
 	dir = 8;
 	id = "cargo_shield_starboard"
 	},
+/obj/structure/cable{
+	icon_state = "0-1"
+	},
 /turf/open/floor/plating,
 /area/ship/cargo)
 "fH" = (
@@ -410,6 +446,15 @@
 	},
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
+"he" = (
+/obj/structure/cable{
+	icon_state = "2-8"
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/turf/open/floor/plasteel/patterned,
+/area/ship/cargo)
 "hh" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/structure/cable{
@@ -521,6 +566,9 @@
 /obj/effect/turf_decal/industrial/warning{
 	dir = 1
 	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
 /turf/open/floor/plasteel/patterned/ridged,
 /area/ship/cargo)
 "iR" = (
@@ -558,6 +606,9 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
 	dir = 4
 	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
 /turf/open/floor/plasteel/stairs{
 	dir = 4
 	},
@@ -580,6 +631,9 @@
 	dir = 8;
 	name = "Shuttle Bay Holofield"
 	},
+/obj/structure/cable{
+	icon_state = "6-8"
+	},
 /turf/open/floor/plasteel/patterned,
 /area/ship/cargo)
 "jq" = (
@@ -650,6 +704,24 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/hallway/central)
+"kG" = (
+/obj/effect/turf_decal/industrial/traffic{
+	dir = 8
+	},
+/obj/effect/turf_decal/industrial/traffic{
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/turf/open/floor/plasteel/patterned/ridged,
+/area/ship/cargo)
+"kH" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/turf/open/floor/plasteel/patterned,
+/area/ship/cargo)
 "kM" = (
 /obj/effect/turf_decal/corner/transparent/solgovgold{
 	dir = 1
@@ -698,6 +770,9 @@
 	dir = 4;
 	id = "cargo_shield_starboard"
 	},
+/obj/structure/cable{
+	icon_state = "0-1"
+	},
 /turf/open/floor/plating,
 /area/ship/cargo)
 "li" = (
@@ -724,6 +799,9 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
 	dir = 4
 	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
 /turf/open/floor/plasteel/patterned,
 /area/ship/cargo)
 "mu" = (
@@ -828,6 +906,9 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
 	dir = 8
 	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
 /turf/open/floor/plasteel,
 /area/ship/cargo)
 "oi" = (
@@ -841,6 +922,9 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
 	dir = 4
 	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
 /turf/open/floor/plasteel/patterned/cargo_one,
 /area/ship/cargo)
 "oq" = (
@@ -868,6 +952,9 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
 	dir = 4
 	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
 /turf/open/floor/plasteel/patterned/ridged,
 /area/ship/cargo)
 "oF" = (
@@ -882,6 +969,9 @@
 	dir = 8;
 	id = "cargo_shield_port"
 	},
+/obj/structure/cable{
+	icon_state = "0-2"
+	},
 /turf/open/floor/plating,
 /area/ship/cargo)
 "oU" = (
@@ -961,6 +1051,12 @@
 	},
 /turf/open/floor/plasteel/patterned,
 /area/ship/maintenance/starboard)
+"pU" = (
+/obj/structure/cable{
+	icon_state = "1-8"
+	},
+/turf/open/floor/plasteel/patterned,
+/area/ship/cargo)
 "qd" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
 	dir = 10
@@ -1022,6 +1118,9 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
 	dir = 8
 	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
 /turf/open/floor/plasteel/patterned/cargo_one,
 /area/ship/cargo)
 "qR" = (
@@ -1123,6 +1222,9 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
 	dir = 4
 	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
 /turf/open/floor/plasteel/patterned/ridged,
 /area/ship/cargo)
 "sj" = (
@@ -1453,6 +1555,9 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
 	dir = 4
 	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
 /turf/open/floor/plasteel/patterned/cargo_one,
 /area/ship/cargo)
 "xG" = (
@@ -1493,6 +1598,9 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
 	dir = 4
 	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
 /turf/open/floor/plasteel/patterned,
 /area/ship/cargo)
 "ye" = (
@@ -1623,6 +1731,9 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
 	dir = 4
 	},
+/obj/structure/cable{
+	icon_state = "2-8"
+	},
 /turf/open/floor/plasteel/patterned/cargo_one,
 /area/ship/cargo)
 "Au" = (
@@ -1648,6 +1759,9 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
 	dir = 4
 	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
 /turf/open/floor/plasteel/patterned,
 /area/ship/cargo)
 "AB" = (
@@ -1721,6 +1835,9 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
 	dir = 8
 	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
 /turf/open/floor/plasteel/patterned/ridged,
 /area/ship/cargo)
 "BG" = (
@@ -1903,6 +2020,9 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
 	dir = 4
 	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
 /turf/open/floor/plasteel/patterned,
 /area/ship/cargo)
 "ES" = (
@@ -1921,6 +2041,9 @@
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
 	dir = 8
 	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
 /turf/open/floor/plasteel/patterned,
 /area/ship/cargo)
 "Fg" = (
@@ -2012,6 +2135,12 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
 	dir = 8
 	},
+/obj/structure/cable{
+	icon_state = "1-8"
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
 /turf/open/floor/plasteel/patterned,
 /area/ship/cargo)
 "FQ" = (
@@ -2020,6 +2149,9 @@
 	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2,
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
 /turf/open/floor/plasteel,
 /area/ship/hallway/central)
 "Gb" = (
@@ -2033,6 +2165,12 @@
 	},
 /turf/open/floor/plasteel/patterned,
 /area/ship/maintenance/starboard)
+"Gg" = (
+/obj/structure/cable{
+	icon_state = "2-8"
+	},
+/turf/open/floor/plasteel/patterned,
+/area/ship/cargo)
 "Gj" = (
 /turf/closed/wall/mineral/titanium/nodiagonal,
 /area/ship/crew)
@@ -2101,6 +2239,9 @@
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2{
 	dir = 1
 	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
 /turf/open/floor/plasteel,
 /area/ship/hallway/central)
 "Iw" = (
@@ -2229,6 +2370,9 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
 	dir = 4
 	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
 /turf/open/floor/plasteel/patterned,
 /area/ship/cargo)
 "LC" = (
@@ -2392,6 +2536,13 @@
 	},
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/bridge)
+"NZ" = (
+/obj/effect/turf_decal/industrial/outline/yellow,
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/turf/open/floor/plasteel/patterned,
+/area/ship/cargo)
 "Oo" = (
 /obj/effect/turf_decal/borderfloor/full,
 /obj/machinery/door/firedoor/border_only{
@@ -2406,6 +2557,9 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
 	dir = 4
 	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/hallway/central)
 "Or" = (
@@ -2484,6 +2638,9 @@
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
 	dir = 8
 	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
 /turf/open/floor/plasteel/patterned,
 /area/ship/cargo)
 "PL" = (
@@ -2567,6 +2724,9 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
 	dir = 6
 	},
+/obj/structure/cable{
+	icon_state = "2-4"
+	},
 /turf/open/floor/plasteel,
 /area/ship/cargo)
 "Ry" = (
@@ -2597,6 +2757,9 @@
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2{
 	dir = 4
 	},
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
 /turf/open/floor/plasteel,
 /area/ship/cargo)
 "RP" = (
@@ -2618,6 +2781,9 @@
 	dir = 8;
 	name = "Shuttle Bay Holofield"
 	},
+/obj/structure/cable{
+	icon_state = "5-8"
+	},
 /turf/open/floor/plasteel/patterned,
 /area/ship/cargo)
 "RR" = (
@@ -2672,6 +2838,9 @@
 "Sz" = (
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2,
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
 /turf/open/floor/plasteel,
 /area/ship/hallway/central)
 "SC" = (
@@ -2728,6 +2897,9 @@
 /area/ship/crew/canteen)
 "TH" = (
 /obj/effect/turf_decal/industrial/warning,
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
 /turf/open/floor/plasteel/patterned/ridged,
 /area/ship/cargo)
 "UD" = (
@@ -2833,6 +3005,12 @@
 /turf/open/floor/plasteel/patterned/ridged,
 /area/ship/hallway/central)
 "VU" = (
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/structure/cable{
+	icon_state = "1-4"
+	},
 /turf/open/floor/plasteel/patterned/ridged,
 /area/ship/cargo)
 "Wf" = (
@@ -2904,6 +3082,9 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
 /turf/open/floor/plasteel,
 /area/ship/cargo)
 "XC" = (
@@ -2966,6 +3147,12 @@
 	},
 /turf/open/floor/plasteel/patterned,
 /area/ship/maintenance/port)
+"YV" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/turf/open/floor/plasteel/patterned/ridged,
+/area/ship/cargo)
 "YZ" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -3509,7 +3696,7 @@ ut
 ut
 ut
 bz
-VU
+aw
 Xm
 wP
 qN
@@ -3522,8 +3709,8 @@ aA
 tf
 aA
 Aq
-wP
-wP
+NZ
+NZ
 VU
 lg
 ut
@@ -3533,9 +3720,9 @@ ut
 ut
 ut
 LC
-JR
-Sj
-Sj
+he
+kG
+kG
 FN
 NA
 NA
@@ -3548,7 +3735,7 @@ Rp
 dQ
 Sj
 Sj
-JR
+kH
 Lq
 ut
 ut
@@ -3557,7 +3744,7 @@ ut
 ut
 ut
 LC
-VU
+YV
 wP
 yV
 BE
@@ -3572,7 +3759,7 @@ NA
 rY
 yV
 wP
-VU
+YV
 Lq
 ut
 ut
@@ -3581,7 +3768,7 @@ ut
 ut
 ut
 oF
-JR
+pU
 wP
 wP
 mq
@@ -3596,7 +3783,7 @@ NA
 qR
 Xm
 Ty
-JR
+Gg
 fG
 ut
 ut

From 1472b4aa721f319abf2f08924a7957c10121685d Mon Sep 17 00:00:00 2001
From: goober3 <118859017+goober3@users.noreply.github.com>
Date: Sun, 9 Apr 2023 02:56:50 +0100
Subject: [PATCH 05/28] never making a descriptive commit

---
 _maps/configs/nanotrasen_tegus.json             | 4 ++--
 code/modules/jobs/job_types/cargo_technician.dm | 5 ++---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/_maps/configs/nanotrasen_tegus.json b/_maps/configs/nanotrasen_tegus.json
index aa192a275fca..43eb0ec5b07a 100644
--- a/_maps/configs/nanotrasen_tegus.json
+++ b/_maps/configs/nanotrasen_tegus.json
@@ -17,11 +17,11 @@
 			"slots": 1
 		},
 		"Shaft Miner": {
-			"outfit": "/datum/outfit/job/miner/classic",
+			"outfit": "/datum/outfit/job/miner",
 			"slots": 3
 		},
 		"Pilot": {
-			"outfit": "/datum/outfit/job/cargo_tech/pilot/nanotrasen",
+			"outfit": "/datum/outfit/job/cargo_tech/nanotrasen_pilot",
 			"slots": 1
 		},
 		"Deckhand": {
diff --git a/code/modules/jobs/job_types/cargo_technician.dm b/code/modules/jobs/job_types/cargo_technician.dm
index bd4ac73542f9..ea9169cd6f44 100644
--- a/code/modules/jobs/job_types/cargo_technician.dm
+++ b/code/modules/jobs/job_types/cargo_technician.dm
@@ -65,16 +65,15 @@
 	gloves = /obj/item/clothing/gloves/fingerless
 	glasses = /obj/item/clothing/glasses/sunglasses/big
 
-/datum/outfit/job/cargo_tech/pilot/nanotrasen
+/datum/outfit/job/cargo_tech/nanotrasen_pilot
 	name = "Pilot (Nanotrasen)"
 
 	uniform = /obj/item/clothing/under/rank/cargo/tech
 	accessory = /obj/item/clothing/accessory/armband/cargo
-	suit = /obj/item/clothing/suit/jacket
 	shoes = /obj/item/clothing/shoes/jackboots
 	gloves = /obj/item/clothing/gloves/fingerless
 	glasses = /obj/item/clothing/glasses/sunglasses/big
-
+	head = /obj/item/clothing/head/soft
 
 /datum/outfit/job/cargo_tech/donk
 	name = "Customer Associate (Donk! Co.)"

From 2776d62a6aa2d07f8f26f236347f86bc5e114ee6 Mon Sep 17 00:00:00 2001
From: goober3 <118859017+goober3@users.noreply.github.com>
Date: Sun, 9 Apr 2023 18:03:04 +0100
Subject: [PATCH 06/28] adds tegu from retlaw, removes the mining vendor

I LIED.
---
 _maps/shuttles/shiptest/nanotrasen_tegus.dmm  | 148 +++++++++++++++---
 .../subshuttles/nanotrasen_shuttle_tegus.dmm  |  26 ++-
 .../mob/living/simple_animal/friendly/tegu.dm |  77 +++++++++
 icons/mob/pets.dmi                            | Bin 73842 -> 74629 bytes
 shiptest.dme                                  |   1 +
 5 files changed, 224 insertions(+), 28 deletions(-)
 create mode 100644 code/modules/mob/living/simple_animal/friendly/tegu.dm

diff --git a/_maps/shuttles/shiptest/nanotrasen_tegus.dmm b/_maps/shuttles/shiptest/nanotrasen_tegus.dmm
index ba07cc0f0d36..e3cbeeabef8b 100644
--- a/_maps/shuttles/shiptest/nanotrasen_tegus.dmm
+++ b/_maps/shuttles/shiptest/nanotrasen_tegus.dmm
@@ -251,6 +251,9 @@
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
 	dir = 4
 	},
+/obj/structure/sign/poster/official/random{
+	pixel_y = 32
+	},
 /turf/open/floor/plasteel,
 /area/ship/crew/canteen)
 "dY" = (
@@ -846,7 +849,9 @@
 /turf/open/floor/plasteel,
 /area/ship/crew/canteen)
 "nn" = (
-/obj/structure/closet/secure_closet/miningcloset,
+/obj/structure/closet/secure_closet/miningcloset{
+	req_access_txt = "48"
+	},
 /obj/structure/window/reinforced/spawner{
 	dir = 1
 	},
@@ -857,6 +862,7 @@
 /obj/item/gun/energy/kinetic_accelerator,
 /obj/item/stack/marker_beacon/thirty,
 /obj/item/gps/mining,
+/obj/item/storage/backpack/satchel/explorer,
 /obj/item/clothing/glasses/meson/prescription,
 /obj/item/clothing/glasses/meson,
 /obj/item/t_scanner/adv_mining_scanner/lesser,
@@ -865,6 +871,9 @@
 "np" = (
 /obj/structure/table,
 /obj/machinery/light,
+/obj/structure/sign/poster/official/random{
+	pixel_x = 32
+	},
 /turf/open/floor/plasteel/patterned/ridged,
 /area/ship/crew/canteen)
 "nT" = (
@@ -899,7 +908,6 @@
 /turf/open/floor/plasteel,
 /area/ship/crew)
 "oc" = (
-/obj/machinery/door/airlock/mining,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
 	dir = 4
 	},
@@ -909,6 +917,9 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
+/obj/machinery/door/airlock/mining{
+	name = "Shuttle Bay"
+	},
 /turf/open/floor/plasteel,
 /area/ship/cargo)
 "oi" = (
@@ -1107,7 +1118,7 @@
 /area/ship/hallway/central)
 "qF" = (
 /obj/machinery/airalarm/directional/east,
-/obj/machinery/vending/mining_equipment,
+/obj/structure/reagent_dispensers/watertank,
 /turf/open/floor/plasteel,
 /area/ship/hallway/aft)
 "qN" = (
@@ -1227,6 +1238,18 @@
 	},
 /turf/open/floor/plasteel/patterned/ridged,
 /area/ship/cargo)
+"sf" = (
+/obj/effect/turf_decal/corner/transparent/neutral{
+	dir = 9
+	},
+/obj/effect/turf_decal/corner/transparent/neutral{
+	dir = 2
+	},
+/obj/structure/sign/poster/official/random{
+	pixel_x = 32
+	},
+/turf/open/floor/plasteel,
+/area/ship/hallway/central)
 "sj" = (
 /obj/machinery/shower{
 	dir = 4
@@ -1401,7 +1424,9 @@
 /turf/open/floor/plating,
 /area/ship/hallway/aft)
 "vE" = (
-/obj/machinery/door/airlock/engineering,
+/obj/machinery/door/airlock/engineering{
+	name = "Engine Room"
+	},
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
@@ -1413,7 +1438,9 @@
 /turf/open/floor/plasteel/patterned,
 /area/ship/hallway/aft)
 "vN" = (
-/obj/machinery/door/airlock,
+/obj/machinery/door/airlock{
+	name = "Canteen"
+	},
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
@@ -1433,7 +1460,9 @@
 /turf/open/floor/plating,
 /area/ship/maintenance/port)
 "vT" = (
-/obj/machinery/door/airlock,
+/obj/machinery/door/airlock{
+	name = "Crew Quarters"
+	},
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
@@ -1661,7 +1690,7 @@
 /turf/open/floor/plasteel/patterned,
 /area/ship/cargo)
 "zj" = (
-/obj/structure/reagent_dispensers/watertank,
+/obj/structure/reagent_dispensers/fueltank,
 /obj/structure/railing,
 /turf/open/floor/plasteel/patterned,
 /area/ship/hallway/aft)
@@ -1698,7 +1727,6 @@
 /turf/open/floor/plasteel,
 /area/ship/hallway/aft)
 "Ag" = (
-/obj/machinery/door/airlock/engineering,
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
@@ -1708,6 +1736,10 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
 	dir = 1
 	},
+/obj/machinery/door/airlock/engineering{
+	req_access_txt = "61";
+	name = "Communications"
+	},
 /turf/open/floor/plasteel,
 /area/ship/engineering/communications)
 "Ao" = (
@@ -1927,7 +1959,9 @@
 /turf/open/floor/plasteel/patterned/ridged,
 /area/ship/hallway/central)
 "CI" = (
-/obj/machinery/door/airlock/mining,
+/obj/machinery/door/airlock/mining{
+	name = "Shuttle Bay"
+	},
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
@@ -1950,13 +1984,16 @@
 /turf/open/floor/plasteel/patterned/ridged,
 /area/ship/hallway/aft)
 "CQ" = (
-/obj/machinery/door/airlock/engineering,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
 	dir = 1
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
 	dir = 1
 	},
+/obj/machinery/door/airlock/engineering{
+	req_access_txt = "61";
+	name = "Communications"
+	},
 /turf/open/floor/plasteel,
 /area/ship/engineering/communications)
 "CX" = (
@@ -2454,7 +2491,7 @@
 /obj/item/tank/internals/emergency_oxygen/double,
 /obj/item/tank/internals/emergency_oxygen/double,
 /obj/item/tank/internals/emergency_oxygen/double,
-/obj/item/binoculars,
+/obj/item/storage/firstaid,
 /obj/item/gps/mining/internal,
 /turf/open/floor/plasteel/patterned/ridged,
 /area/ship/hallway/aft)
@@ -2607,6 +2644,19 @@
 	},
 /turf/open/floor/plasteel,
 /area/ship/hallway/aft)
+"OX" = (
+/obj/effect/turf_decal/borderfloor/full,
+/obj/machinery/door/firedoor/border_only{
+	dir = 4
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 8
+	},
+/obj/structure/sign/poster/official/random{
+	pixel_y = 32
+	},
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/hallway/central)
 "Pb" = (
 /obj/structure/table,
 /obj/item/clipboard{
@@ -2614,6 +2664,16 @@
 	},
 /turf/open/floor/plasteel,
 /area/ship/cargo)
+"Pl" = (
+/obj/effect/turf_decal/corner/transparent/lime,
+/obj/effect/turf_decal/corner/transparent/neutral{
+	dir = 8
+	},
+/obj/structure/sign/poster/official/random{
+	pixel_y = -32
+	},
+/turf/open/floor/plasteel,
+/area/ship/hallway/central)
 "Pt" = (
 /obj/structure/catwalk/over/plated_catwalk,
 /obj/structure/cable{
@@ -2674,7 +2734,8 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
 	dir = 5
 	},
-/turf/open/floor/plasteel/patterned/ridged,
+/obj/structure/catwalk/over/plated_catwalk,
+/turf/open/floor/plating,
 /area/ship/hallway/aft)
 "QA" = (
 /obj/structure/cable{
@@ -2787,13 +2848,15 @@
 /turf/open/floor/plasteel/patterned,
 /area/ship/cargo)
 "RR" = (
-/obj/machinery/door/airlock/engineering,
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
-/turf/open/floor/plating,
+/obj/machinery/door/airlock/engineering{
+	name = "Engine Room"
+	},
+/turf/open/floor/plasteel/patterned,
 /area/ship/hallway/aft)
 "Sa" = (
 /obj/effect/turf_decal/corner/transparent/lime{
@@ -2891,7 +2954,9 @@
 /turf/open/floor/plasteel/patterned,
 /area/ship/cargo)
 "TB" = (
-/obj/machinery/door/airlock,
+/obj/machinery/door/airlock{
+	name = "Bathroom"
+	},
 /obj/effect/turf_decal/industrial/warning,
 /turf/open/floor/plastic,
 /area/ship/crew/canteen)
@@ -2902,6 +2967,18 @@
 	},
 /turf/open/floor/plasteel/patterned/ridged,
 /area/ship/cargo)
+"Ub" = (
+/obj/effect/turf_decal/corner/transparent/lime{
+	dir = 4
+	},
+/obj/effect/turf_decal/corner/transparent/neutral{
+	dir = 1
+	},
+/obj/structure/sign/poster/official/random{
+	pixel_y = 32
+	},
+/turf/open/floor/plasteel,
+/area/ship/hallway/central)
 "UD" = (
 /obj/machinery/power/apc/auto_name/north,
 /obj/structure/cable{
@@ -2924,7 +3001,8 @@
 /area/ship/hallway/central)
 "UY" = (
 /obj/machinery/door/airlock/command{
-	req_access = list(19)
+	req_access = list(19);
+	name = "Bridge"
 	},
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -2979,6 +3057,12 @@
 /obj/structure/table,
 /turf/open/floor/plasteel,
 /area/ship/crew/canteen)
+"Vv" = (
+/mob/living/simple_animal/hostile/retaliate/tegu/atlas{
+	dir = 8
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/bridge)
 "VC" = (
 /obj/effect/turf_decal/industrial/warning{
 	dir = 8
@@ -3127,15 +3211,29 @@
 /turf/open/floor/plasteel,
 /area/ship/crew/canteen)
 "Yl" = (
-/obj/machinery/door/airlock/command{
-	req_access = list(19)
-	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
 /obj/machinery/door/poddoor/shutters/preopen{
 	id = "bridge_lockdown"
 	},
+/obj/machinery/door/airlock/command{
+	req_access = list(19);
+	name = "Bridge"
+	},
 /turf/open/floor/plasteel,
 /area/ship/bridge)
+"Yt" = (
+/obj/effect/turf_decal/borderfloor/full,
+/obj/machinery/door/firedoor/border_only{
+	dir = 4
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 8
+	},
+/obj/structure/sign/poster/official/random{
+	pixel_y = -32
+	},
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/hallway/central)
 "YT" = (
 /obj/machinery/portable_atmospherics/scrubber,
 /obj/machinery/atmospherics/components/unary/portables_connector/layer2,
@@ -3459,16 +3557,16 @@ dR
 CX
 sF
 OL
-Sa
+Ub
 eT
 fj
 Df
 Gx
-Df
+sf
 UM
 fj
 eT
-qE
+Pl
 Gj
 bN
 Cr
@@ -3555,7 +3653,7 @@ TB
 Bv
 np
 OL
-Me
+OX
 Oo
 Sp
 Cg
@@ -3564,7 +3662,7 @@ oi
 py
 Sp
 Sg
-Me
+Yt
 Gj
 Wf
 hG
@@ -3583,7 +3681,7 @@ Au
 jd
 Sp
 KR
-pf
+Vv
 Hc
 sD
 Sp
diff --git a/_maps/shuttles/subshuttles/nanotrasen_shuttle_tegus.dmm b/_maps/shuttles/subshuttles/nanotrasen_shuttle_tegus.dmm
index dae41c6d83c7..c218f345ed0b 100644
--- a/_maps/shuttles/subshuttles/nanotrasen_shuttle_tegus.dmm
+++ b/_maps/shuttles/subshuttles/nanotrasen_shuttle_tegus.dmm
@@ -71,6 +71,20 @@
 /turf/open/floor/plasteel/patterned/ridged,
 /area/ship/shuttle)
 "fx" = (
+/obj/structure/closet/secure_closet/wall{
+	name = "pilot's locker";
+	req_access_txt = "31";
+	icon_state = "solgov_wall";
+	dir = 4;
+	pixel_x = -30
+	},
+/obj/item/binoculars,
+/obj/item/storage/firstaid,
+/obj/item/storage/box/bodybags,
+/obj/item/pinpointer,
+/obj/item/storage/toolbox/emergency,
+/obj/item/roller,
+/obj/item/gps/mining/internal,
 /turf/open/floor/plasteel,
 /area/ship/shuttle)
 "fO" = (
@@ -448,7 +462,9 @@
 /turf/open/floor/plasteel/airless,
 /area/ship/shuttle)
 "LN" = (
-/obj/machinery/door/airlock/shuttle,
+/obj/machinery/door/airlock/shuttle{
+	name = "Cockpit"
+	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
 	dir = 8
 	},
@@ -497,7 +513,9 @@
 /turf/open/floor/plasteel,
 /area/ship/shuttle)
 "NJ" = (
-/obj/machinery/door/airlock/shuttle,
+/obj/machinery/door/airlock/shuttle{
+	name = "Engine Room"
+	},
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
@@ -514,7 +532,9 @@
 /area/ship/shuttle)
 "Ol" = (
 /obj/docking_port/mobile{
-	dir = 2
+	dir = 2;
+	port_direction = 8;
+	preferred_direction = 4
 	},
 /obj/machinery/door/poddoor/preopen{
 	id = "tegus_shuttle_port"
diff --git a/code/modules/mob/living/simple_animal/friendly/tegu.dm b/code/modules/mob/living/simple_animal/friendly/tegu.dm
new file mode 100644
index 000000000000..660ee90141b4
--- /dev/null
+++ b/code/modules/mob/living/simple_animal/friendly/tegu.dm
@@ -0,0 +1,77 @@
+/mob/living/simple_animal/hostile/retaliate/tegu
+	name = "tegu"
+	desc = "Thats a tegu."
+	icon = 'icons/mob/pets.dmi'
+	icon_state = "tegu"
+	icon_living = "tegu"
+	icon_dead ="tegu_dead"
+	mob_biotypes = MOB_ORGANIC|MOB_BEAST
+	speak_emote = list("hisses")
+	emote_hear = list("hisses.")
+	emote_see = list("waits apprehensively.", "walks around.")
+	speak_chance = 1
+	turns_per_move = 5
+	response_help_continuous = "pets"
+	response_help_simple = "pet"
+	response_disarm_continuous = "rolls over"
+	response_disarm_simple = "roll over"
+	response_harm_continuous = "kicks"
+	response_harm_simple = "kick"
+	melee_damage_lower = 18
+	melee_damage_upper = 22
+	health = 75
+	maxHealth = 75
+	speed = 5
+	footstep_type = FOOTSTEP_MOB_CLAW
+	attack_verb_continuous = "bites"
+	attack_verb_simple = "bite"
+	attack_sound = 'sound/weapons/bite.ogg'
+	var/obj/item/clothing/head/caphat/current_hat
+	var/obj/item/card/id/captains_spare/current_id
+
+/mob/living/simple_animal/hostile/retaliate/tegu/atlas
+	name = "Atlas"
+	desc = "That's the captain's small, but mighty pet tegu. They might have the blood of greytiders on them."
+	gender = MALE
+	gold_core_spawnable = NO_SPAWN
+
+/mob/living/simple_animal/hostile/retaliate/tegu/attacked_by(obj/item/I, mob/living/user)
+	. = ..()
+	if(!(user.a_intent == INTENT_HELP))
+		return
+	if(!user.transferItemToLoc(I, src))
+		to_chat(user, "<span class='warning'>[I] is stuck to your hand.</span>")
+		return
+
+	if(istype(I, /obj/item/clothing/head/caphat))
+		if(current_hat)
+			to_chat(user, "<span class='warning'>[src] already has a hat!</span>")
+		to_chat(user, "<span class='notice'>You put on the [I] on \the [src].</span>")
+		current_hat = I
+		update_icon()
+
+	if(istype(I, /obj/item/card/id/captains_spare))
+		if(current_id)
+			to_chat(user, "<span class='warning'>[src] is already protecting [current_id]!</span>")
+		to_chat(user, "<span class='notice'>You put the [I] in \the [src]'s mouth. Perfect. [src] will keep this safe.</span>")
+		current_id = I
+		update_icon()
+
+/mob/living/simple_animal/hostile/retaliate/tegu/death(gibbed)
+	. = ..()
+	var/atom/tegu_turf = drop_location()
+	if(current_hat)
+		current_hat.forceMove(tegu_turf)
+		current_hat = null
+
+	if(current_id)
+		current_id.forceMove(tegu_turf)
+		current_id = null
+	update_icon()
+
+/mob/living/simple_animal/hostile/retaliate/tegu/update_overlays()
+	. = ..()
+	if(current_hat)
+		. += "captain_overlay"
+	if(current_id)
+		. += "spare_id_overlay"
diff --git a/icons/mob/pets.dmi b/icons/mob/pets.dmi
index a4dc31d0f062b2f368a89d6347f24f22b4070c2b..a8ceb558678db52b4a6b80392f4da20c3ff1fae7 100644
GIT binary patch
delta 16879
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

delta 16086
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

diff --git a/shiptest.dme b/shiptest.dme
index 779d16d42aa9..7faf56ed89cb 100644
--- a/shiptest.dme
+++ b/shiptest.dme
@@ -2578,6 +2578,7 @@
 #include "code\modules\mob\living\simple_animal\friendly\sloth.dm"
 #include "code\modules\mob\living\simple_animal\friendly\snake.dm"
 #include "code\modules\mob\living\simple_animal\friendly\turtle.dm"
+#include "code\modules\mob\living\simple_animal\friendly\tegu.dm"
 #include "code\modules\mob\living\simple_animal\friendly\drone\_drone.dm"
 #include "code\modules\mob\living\simple_animal\friendly\drone\drone_say.dm"
 #include "code\modules\mob\living\simple_animal\friendly\drone\drones_as_items.dm"

From 2ebd3e827e3ce7f00ade0e7ca5149304ec4b06d2 Mon Sep 17 00:00:00 2001
From: goober3 <118859017+goober3@users.noreply.github.com>
Date: Sun, 9 Apr 2023 18:18:23 +0100
Subject: [PATCH 07/28] fixes

---
 _maps/shuttles/shiptest/nanotrasen_tegus.dmm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/_maps/shuttles/shiptest/nanotrasen_tegus.dmm b/_maps/shuttles/shiptest/nanotrasen_tegus.dmm
index e3cbeeabef8b..e9a1b7495b64 100644
--- a/_maps/shuttles/shiptest/nanotrasen_tegus.dmm
+++ b/_maps/shuttles/shiptest/nanotrasen_tegus.dmm
@@ -32,9 +32,6 @@
 /obj/structure/cable{
 	icon_state = "0-4"
 	},
-/obj/structure/cable{
-	icon_state = "0-4"
-	},
 /turf/open/floor/plating,
 /area/ship/maintenance/port)
 "bl" = (
@@ -2383,6 +2380,9 @@
 /obj/item/gun/energy/laser,
 /obj/item/storage/box/rxglasses/minerspykit,
 /obj/item/megaphone/command,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+	dir = 8
+	},
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
 "Lq" = (
@@ -3151,7 +3151,7 @@
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/machinery/power/apc/auto_name/north,
 /obj/structure/cable{
-	icon_state = "1-2"
+	icon_state = "0-2"
 	},
 /turf/open/floor/plasteel/patterned,
 /area/ship/maintenance/starboard)

From 550bfef7f0c999fe0b42a20621a65780702507cf Mon Sep 17 00:00:00 2001
From: goober3 <118859017+goober3@users.noreply.github.com>
Date: Sun, 9 Apr 2023 20:12:27 +0100
Subject: [PATCH 08/28] gwa

---
 _maps/shuttles/shiptest/nanotrasen_tegus.dmm  |  2 +-
 .../mob/living/simple_animal/friendly/tegu.dm | 43 -------------------
 2 files changed, 1 insertion(+), 44 deletions(-)

diff --git a/_maps/shuttles/shiptest/nanotrasen_tegus.dmm b/_maps/shuttles/shiptest/nanotrasen_tegus.dmm
index e9a1b7495b64..dcb8887ba3e4 100644
--- a/_maps/shuttles/shiptest/nanotrasen_tegus.dmm
+++ b/_maps/shuttles/shiptest/nanotrasen_tegus.dmm
@@ -1402,8 +1402,8 @@
 	},
 /obj/docking_port/mobile{
 	can_move_docking_ports = 1;
-	dir = 8;
 	launch_status = 0;
+	port_direction = 4;
 	preferred_direction = 4
 	},
 /turf/open/floor/plating,
diff --git a/code/modules/mob/living/simple_animal/friendly/tegu.dm b/code/modules/mob/living/simple_animal/friendly/tegu.dm
index 660ee90141b4..5a9d5ec16dc8 100644
--- a/code/modules/mob/living/simple_animal/friendly/tegu.dm
+++ b/code/modules/mob/living/simple_animal/friendly/tegu.dm
@@ -26,52 +26,9 @@
 	attack_verb_continuous = "bites"
 	attack_verb_simple = "bite"
 	attack_sound = 'sound/weapons/bite.ogg'
-	var/obj/item/clothing/head/caphat/current_hat
-	var/obj/item/card/id/captains_spare/current_id
 
 /mob/living/simple_animal/hostile/retaliate/tegu/atlas
 	name = "Atlas"
 	desc = "That's the captain's small, but mighty pet tegu. They might have the blood of greytiders on them."
 	gender = MALE
 	gold_core_spawnable = NO_SPAWN
-
-/mob/living/simple_animal/hostile/retaliate/tegu/attacked_by(obj/item/I, mob/living/user)
-	. = ..()
-	if(!(user.a_intent == INTENT_HELP))
-		return
-	if(!user.transferItemToLoc(I, src))
-		to_chat(user, "<span class='warning'>[I] is stuck to your hand.</span>")
-		return
-
-	if(istype(I, /obj/item/clothing/head/caphat))
-		if(current_hat)
-			to_chat(user, "<span class='warning'>[src] already has a hat!</span>")
-		to_chat(user, "<span class='notice'>You put on the [I] on \the [src].</span>")
-		current_hat = I
-		update_icon()
-
-	if(istype(I, /obj/item/card/id/captains_spare))
-		if(current_id)
-			to_chat(user, "<span class='warning'>[src] is already protecting [current_id]!</span>")
-		to_chat(user, "<span class='notice'>You put the [I] in \the [src]'s mouth. Perfect. [src] will keep this safe.</span>")
-		current_id = I
-		update_icon()
-
-/mob/living/simple_animal/hostile/retaliate/tegu/death(gibbed)
-	. = ..()
-	var/atom/tegu_turf = drop_location()
-	if(current_hat)
-		current_hat.forceMove(tegu_turf)
-		current_hat = null
-
-	if(current_id)
-		current_id.forceMove(tegu_turf)
-		current_id = null
-	update_icon()
-
-/mob/living/simple_animal/hostile/retaliate/tegu/update_overlays()
-	. = ..()
-	if(current_hat)
-		. += "captain_overlay"
-	if(current_id)
-		. += "spare_id_overlay"

From ff76a36e6fb8bfdbab9a03b752760bfe858c5f69 Mon Sep 17 00:00:00 2001
From: goober3 <118859017+goober3@users.noreply.github.com>
Date: Thu, 13 Apr 2023 18:39:24 +0100
Subject: [PATCH 09/28] addressing the review except for the parts I disagree
 with

---
 _maps/shuttles/shiptest/nanotrasen_tegus.dmm  | 39 ++++++++++++++-----
 .../subshuttles/nanotrasen_shuttle_tegus.dmm  |  4 +-
 2 files changed, 33 insertions(+), 10 deletions(-)

diff --git a/_maps/shuttles/shiptest/nanotrasen_tegus.dmm b/_maps/shuttles/shiptest/nanotrasen_tegus.dmm
index dcb8887ba3e4..1d3fa219df75 100644
--- a/_maps/shuttles/shiptest/nanotrasen_tegus.dmm
+++ b/_maps/shuttles/shiptest/nanotrasen_tegus.dmm
@@ -536,6 +536,11 @@
 /obj/effect/turf_decal/corner/transparent/brown{
 	dir = 4
 	},
+/obj/item/price_tagger{
+	pixel_y = 7;
+	pixel_x = -14
+	},
+/obj/item/stack/packageWrap,
 /turf/open/floor/plasteel,
 /area/ship/cargo)
 "it" = (
@@ -880,12 +885,10 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
-	dir = 4
-	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
 	dir = 8
 	},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4,
 /turf/open/floor/plasteel,
 /area/ship/hallway/central)
 "nW" = (
@@ -1042,6 +1045,7 @@
 /obj/item/clothing/suit/hazardvest,
 /obj/item/clothing/gloves/color/yellow,
 /obj/item/clothing/glasses/meson/engine/tray,
+/obj/item/pipe_dispenser,
 /obj/item/holosign_creator/engineering,
 /obj/item/tank/internals/emergency_oxygen/engi,
 /turf/open/floor/plasteel/patterned/ridged,
@@ -1082,6 +1086,10 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
 	dir = 1
 	},
+/obj/effect/turf_decal/industrial/warning,
+/obj/effect/turf_decal/industrial/warning{
+	dir = 1
+	},
 /turf/open/floor/plasteel,
 /area/ship/hallway/central)
 "qi" = (
@@ -1267,7 +1275,8 @@
 /obj/machinery/button/shieldwallgen{
 	pixel_x = 5;
 	pixel_y = 27;
-	id = "cargo_shield_port"
+	id = "cargo_shield_port";
+	name = "Cargo Holofield"
 	},
 /turf/open/floor/plasteel/patterned/ridged,
 /area/ship/cargo)
@@ -1708,6 +1717,7 @@
 /area/ship/crew/canteen)
 "zv" = (
 /obj/structure/table,
+/obj/item/stack/packageWrap,
 /turf/open/floor/plasteel,
 /area/ship/cargo)
 "zH" = (
@@ -2426,6 +2436,18 @@
 /obj/structure/tank_dispenser,
 /turf/open/floor/plasteel/patterned/ridged,
 /area/ship/hallway/central)
+"LV" = (
+/obj/machinery/door/airlock/external,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 1
+	},
+/obj/effect/turf_decal/industrial/warning{
+	dir = 1
+	},
+/obj/effect/turf_decal/industrial/warning,
+/turf/open/floor/plasteel,
+/area/ship/hallway/central)
 "Me" = (
 /obj/effect/turf_decal/borderfloor/full,
 /obj/machinery/door/firedoor/border_only{
@@ -2448,7 +2470,8 @@
 	pixel_x = 5;
 	pixel_y = -27;
 	id = "cargo_shield_starboard";
-	dir = 1
+	dir = 1;
+	name = "Cargo Holofield"
 	},
 /turf/open/floor/plasteel/patterned/ridged,
 /area/ship/cargo)
@@ -3258,9 +3281,7 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
 	dir = 8
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
-	dir = 8
-	},
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2,
 /turf/open/floor/plasteel/patterned/ridged,
 /area/ship/hallway/central)
 "Zl" = (
@@ -3723,7 +3744,7 @@ ut
 kc
 dm
 Or
-qf
+LV
 it
 MS
 Sz
diff --git a/_maps/shuttles/subshuttles/nanotrasen_shuttle_tegus.dmm b/_maps/shuttles/subshuttles/nanotrasen_shuttle_tegus.dmm
index c218f345ed0b..2033513ecee4 100644
--- a/_maps/shuttles/subshuttles/nanotrasen_shuttle_tegus.dmm
+++ b/_maps/shuttles/subshuttles/nanotrasen_shuttle_tegus.dmm
@@ -84,7 +84,9 @@
 /obj/item/pinpointer,
 /obj/item/storage/toolbox/emergency,
 /obj/item/roller,
-/obj/item/gps/mining/internal,
+/obj/item/gps{
+	gpstag = "TEGUS1"
+	},
 /turf/open/floor/plasteel,
 /area/ship/shuttle)
 "fO" = (

From f40be0b371d4757eb27f46c10ead89c61b15a129 Mon Sep 17 00:00:00 2001
From: goober3 <118859017+goober3@users.noreply.github.com>
Date: Fri, 14 Apr 2023 18:25:37 +0100
Subject: [PATCH 10/28] standardises shuttle, more infrastructure

---
 _maps/shuttles/shiptest/nanotrasen_tegus.dmm  | 210 ++++++++++++++++--
 .../subshuttles/nanotrasen_shuttle_tegus.dmm  | 183 +++++++--------
 2 files changed, 282 insertions(+), 111 deletions(-)

diff --git a/_maps/shuttles/shiptest/nanotrasen_tegus.dmm b/_maps/shuttles/shiptest/nanotrasen_tegus.dmm
index 1d3fa219df75..264cfb579d61 100644
--- a/_maps/shuttles/shiptest/nanotrasen_tegus.dmm
+++ b/_maps/shuttles/shiptest/nanotrasen_tegus.dmm
@@ -185,6 +185,7 @@
 /obj/machinery/door/poddoor/shutters/preopen{
 	id = "tegus_bridge"
 	},
+/obj/machinery/door/firedoor/heavy,
 /turf/open/floor/plating,
 /area/ship/bridge)
 "dF" = (
@@ -242,6 +243,9 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
 	dir = 4
 	},
+/obj/machinery/firealarm{
+	pixel_y = 25
+	},
 /turf/open/floor/plasteel,
 /area/ship/crew/canteen)
 "dV" = (
@@ -554,6 +558,9 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
 	dir = 9
 	},
+/obj/structure/extinguisher_cabinet{
+	pixel_x = 32
+	},
 /turf/open/floor/plasteel,
 /area/ship/hallway/central)
 "iJ" = (
@@ -661,6 +668,10 @@
 /obj/structure/cable{
 	icon_state = "0-4"
 	},
+/obj/machinery/firealarm{
+	pixel_y = -25;
+	dir = 1
+	},
 /turf/open/floor/plasteel/patterned/ridged,
 /area/ship/maintenance/port)
 "ju" = (
@@ -737,6 +748,14 @@
 	},
 /turf/open/floor/plasteel/patterned,
 /area/ship/maintenance/starboard)
+"kT" = (
+/obj/effect/turf_decal/industrial/outline/yellow,
+/obj/machinery/firealarm{
+	dir = 4;
+	pixel_x = -25
+	},
+/turf/open/floor/plasteel/patterned,
+/area/ship/cargo)
 "kU" = (
 /obj/machinery/cryopod{
 	dir = 8
@@ -834,6 +853,9 @@
 	},
 /obj/effect/turf_decal/corner/transparent/neutral,
 /obj/structure/chair/office,
+/obj/machinery/firealarm{
+	pixel_y = 25
+	},
 /turf/open/floor/plasteel,
 /area/ship/crew)
 "mV" = (
@@ -920,6 +942,12 @@
 /obj/machinery/door/airlock/mining{
 	name = "Shuttle Bay"
 	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 4
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 8
+	},
 /turf/open/floor/plasteel,
 /area/ship/cargo)
 "oi" = (
@@ -1250,8 +1278,9 @@
 /obj/effect/turf_decal/corner/transparent/neutral{
 	dir = 2
 	},
-/obj/structure/sign/poster/official/random{
-	pixel_x = 32
+/obj/structure/closet/emcloset/wall{
+	dir = 8;
+	pixel_x = 30
 	},
 /turf/open/floor/plasteel,
 /area/ship/hallway/central)
@@ -1298,6 +1327,10 @@
 /obj/item/radio/intercom{
 	dir = 1
 	},
+/obj/machinery/firealarm{
+	pixel_y = -25;
+	dir = 1
+	},
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
 "sF" = (
@@ -1397,6 +1430,9 @@
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
 	dir = 8
 	},
+/obj/structure/extinguisher_cabinet{
+	pixel_y = -32
+	},
 /turf/open/floor/plasteel/patterned/ridged,
 /area/ship/maintenance/port)
 "uZ" = (
@@ -1441,6 +1477,10 @@
 	dir = 8
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
+/obj/machinery/door/firedoor/border_only,
+/obj/machinery/door/firedoor/border_only{
+	dir = 1
+	},
 /turf/open/floor/plasteel/patterned,
 /area/ship/hallway/aft)
 "vN" = (
@@ -1452,6 +1492,10 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
+/obj/machinery/door/firedoor/border_only,
+/obj/machinery/door/firedoor/border_only{
+	dir = 1
+	},
 /turf/open/floor/plasteel,
 /area/ship/crew/canteen)
 "vO" = (
@@ -1476,6 +1520,10 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
 	dir = 1
 	},
+/obj/machinery/door/firedoor/border_only,
+/obj/machinery/door/firedoor/border_only{
+	dir = 1
+	},
 /turf/open/floor/plasteel,
 /area/ship/crew)
 "vV" = (
@@ -1718,6 +1766,9 @@
 "zv" = (
 /obj/structure/table,
 /obj/item/stack/packageWrap,
+/obj/structure/extinguisher_cabinet{
+	pixel_y = -32
+	},
 /turf/open/floor/plasteel,
 /area/ship/cargo)
 "zH" = (
@@ -1747,8 +1798,20 @@
 	req_access_txt = "61";
 	name = "Communications"
 	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 1
+	},
+/obj/machinery/door/firedoor/border_only,
 /turf/open/floor/plasteel,
 /area/ship/engineering/communications)
+"Ak" = (
+/obj/effect/turf_decal/industrial/hatch/yellow,
+/obj/machinery/firealarm{
+	pixel_y = -25;
+	dir = 1
+	},
+/turf/open/floor/plasteel/patterned,
+/area/ship/cargo)
 "Ao" = (
 /obj/structure/table,
 /obj/item/storage/toolbox/electrical,
@@ -1978,6 +2041,12 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
 	dir = 4
 	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 4
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 8
+	},
 /turf/open/floor/plasteel,
 /area/ship/cargo)
 "CO" = (
@@ -2001,6 +2070,10 @@
 	req_access_txt = "61";
 	name = "Communications"
 	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 1
+	},
+/obj/machinery/door/firedoor/border_only,
 /turf/open/floor/plasteel,
 /area/ship/engineering/communications)
 "CX" = (
@@ -2098,6 +2171,9 @@
 	icon_state = "plant-14";
 	pixel_y = 5
 	},
+/obj/structure/extinguisher_cabinet{
+	pixel_y = 32
+	},
 /turf/open/floor/plasteel,
 /area/ship/cargo)
 "Fk" = (
@@ -2259,6 +2335,15 @@
 	},
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
+"Hk" = (
+/obj/effect/turf_decal/industrial/outline/yellow,
+/obj/structure/closet/crate,
+/obj/machinery/firealarm{
+	dir = 4;
+	pixel_x = -25
+	},
+/turf/open/floor/plasteel/patterned,
+/area/ship/cargo)
 "Ht" = (
 /obj/effect/turf_decal/corner/transparent/lime{
 	dir = 8
@@ -2275,6 +2360,32 @@
 "Hw" = (
 /turf/closed/wall/mineral/titanium/nodiagonal,
 /area/ship/cargo)
+"HM" = (
+/obj/effect/turf_decal/corner/transparent/lime,
+/obj/effect/turf_decal/corner/transparent/neutral{
+	dir = 8
+	},
+/obj/structure/extinguisher_cabinet{
+	pixel_x = -32
+	},
+/turf/open/floor/plasteel,
+/area/ship/hallway/central)
+"HY" = (
+/obj/effect/turf_decal/corner/transparent/brown,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/firealarm{
+	dir = 4;
+	pixel_x = -25
+	},
+/turf/open/floor/plasteel,
+/area/ship/hallway/aft)
+"Ia" = (
+/obj/effect/turf_decal/industrial/hatch/yellow,
+/obj/machinery/firealarm{
+	pixel_y = 25
+	},
+/turf/open/floor/plasteel/patterned,
+/area/ship/cargo)
 "Iv" = (
 /obj/effect/turf_decal/corner/transparent/ntblue,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
@@ -2313,6 +2424,9 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
 	dir = 10
 	},
+/obj/structure/extinguisher_cabinet{
+	pixel_x = 32
+	},
 /turf/open/floor/plasteel/patterned,
 /area/ship/hallway/aft)
 "JO" = (
@@ -2338,6 +2452,9 @@
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2{
 	dir = 1
 	},
+/obj/machinery/firealarm{
+	pixel_y = 25
+	},
 /turf/open/floor/plasteel,
 /area/ship/hallway/central)
 "Kj" = (
@@ -2518,6 +2635,19 @@
 /obj/item/gps/mining/internal,
 /turf/open/floor/plasteel/patterned/ridged,
 /area/ship/hallway/aft)
+"Nb" = (
+/obj/machinery/power/terminal{
+	dir = 8
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/cable{
+	icon_state = "0-4"
+	},
+/obj/machinery/firealarm{
+	pixel_y = 25
+	},
+/turf/open/floor/plasteel/patterned/ridged,
+/area/ship/maintenance/starboard)
 "Nc" = (
 /obj/effect/turf_decal/corner/transparent/lime{
 	dir = 8
@@ -2879,6 +3009,10 @@
 /obj/machinery/door/airlock/engineering{
 	name = "Engine Room"
 	},
+/obj/machinery/door/firedoor/border_only,
+/obj/machinery/door/firedoor/border_only{
+	dir = 1
+	},
 /turf/open/floor/plasteel/patterned,
 /area/ship/hallway/aft)
 "Sa" = (
@@ -2945,6 +3079,19 @@
 	},
 /turf/open/floor/plasteel,
 /area/ship/hallway/central)
+"SN" = (
+/obj/effect/turf_decal/corner/transparent/lime{
+	dir = 4
+	},
+/obj/effect/turf_decal/corner/transparent/neutral{
+	dir = 1
+	},
+/obj/machinery/firealarm{
+	dir = 4;
+	pixel_x = -25
+	},
+/turf/open/floor/plasteel,
+/area/ship/hallway/central)
 "SS" = (
 /obj/structure/railing,
 /turf/open/floor/plasteel/stairs{
@@ -3034,6 +3181,14 @@
 /obj/machinery/door/poddoor/shutters/preopen{
 	id = "bridge_lockdown"
 	},
+/obj/machinery/door/firedoor/border_only,
+/obj/machinery/door/firedoor/border_only{
+	dir = 1
+	},
+/obj/effect/turf_decal/industrial/warning,
+/obj/effect/turf_decal/industrial/warning{
+	dir = 1
+	},
 /turf/open/floor/plasteel,
 /area/ship/bridge)
 "Vd" = (
@@ -3086,6 +3241,14 @@
 	},
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
+"Vy" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/machinery/firealarm{
+	dir = 8;
+	pixel_x = 25
+	},
+/turf/open/floor/plating,
+/area/ship/engineering/communications)
 "VC" = (
 /obj/effect/turf_decal/industrial/warning{
 	dir = 8
@@ -3217,8 +3380,19 @@
 	dir = 1
 	},
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
+/obj/structure/extinguisher_cabinet{
+	pixel_y = 32
+	},
 /turf/open/floor/plasteel,
 /area/ship/hallway/central)
+"XS" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/machinery/firealarm{
+	dir = 4;
+	pixel_x = -25
+	},
+/turf/open/floor/plating,
+/area/ship/engineering/communications)
 "XV" = (
 /obj/machinery/telecomms/relay/preset/auto{
 	network = "ntsv_commnet";
@@ -3242,6 +3416,14 @@
 	req_access = list(19);
 	name = "Bridge"
 	},
+/obj/machinery/door/firedoor/border_only,
+/obj/machinery/door/firedoor/border_only{
+	dir = 1
+	},
+/obj/effect/turf_decal/industrial/warning,
+/obj/effect/turf_decal/industrial/warning{
+	dir = 1
+	},
 /turf/open/floor/plasteel,
 /area/ship/bridge)
 "Yt" = (
@@ -3371,7 +3553,7 @@ MU
 IF
 qi
 Nw
-Nw
+HY
 Rz
 Vf
 Vf
@@ -3397,7 +3579,7 @@ zH
 wb
 Qw
 Rz
-Em
+Nb
 pH
 Em
 yL
@@ -3465,7 +3647,7 @@ hL
 Cz
 WO
 hL
-uc
+XS
 jQ
 iV
 hL
@@ -3508,7 +3690,7 @@ jb
 hL
 tU
 NT
-uc
+Vy
 hL
 XQ
 YZ
@@ -3554,7 +3736,7 @@ UD
 dP
 Rm
 OL
-Sa
+SN
 CH
 kE
 xG
@@ -3563,7 +3745,7 @@ KI
 Pt
 hW
 oq
-qE
+HM
 Gj
 Gj
 Gj
@@ -3792,7 +3974,7 @@ ut
 ut
 Hw
 JR
-wP
+kT
 ha
 Rx
 dO
@@ -3805,7 +3987,7 @@ Xy
 RI
 hC
 ha
-Xm
+Hk
 JR
 Hw
 ut
@@ -3850,7 +4032,7 @@ NA
 NA
 NA
 NA
-Rp
+NA
 dQ
 Sj
 Sj
@@ -3874,7 +4056,7 @@ NA
 NA
 NA
 NA
-NA
+Rp
 rY
 yV
 wP
@@ -4033,7 +4215,7 @@ ut
 ut
 ut
 Hw
-yV
+Ia
 EA
 NA
 NA
@@ -4044,7 +4226,7 @@ NA
 NA
 NA
 Az
-yV
+Ak
 Hw
 ut
 ut
diff --git a/_maps/shuttles/subshuttles/nanotrasen_shuttle_tegus.dmm b/_maps/shuttles/subshuttles/nanotrasen_shuttle_tegus.dmm
index 2033513ecee4..b87495ebed57 100644
--- a/_maps/shuttles/subshuttles/nanotrasen_shuttle_tegus.dmm
+++ b/_maps/shuttles/subshuttles/nanotrasen_shuttle_tegus.dmm
@@ -71,23 +71,20 @@
 /turf/open/floor/plasteel/patterned/ridged,
 /area/ship/shuttle)
 "fx" = (
-/obj/structure/closet/secure_closet/wall{
-	name = "pilot's locker";
-	req_access_txt = "31";
-	icon_state = "solgov_wall";
-	dir = 4;
-	pixel_x = -30
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/structure/cable{
+	icon_state = "4-8"
 	},
-/obj/item/binoculars,
-/obj/item/storage/firstaid,
-/obj/item/storage/box/bodybags,
-/obj/item/pinpointer,
-/obj/item/storage/toolbox/emergency,
-/obj/item/roller,
-/obj/item/gps{
-	gpstag = "TEGUS1"
+/obj/structure/cable{
+	icon_state = "1-4"
 	},
-/turf/open/floor/plasteel,
+/obj/structure/cable{
+	icon_state = "2-4"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 6
+	},
+/turf/open/floor/plating,
 /area/ship/shuttle)
 "fO" = (
 /obj/structure/sign/nanotrasen,
@@ -231,17 +228,24 @@
 /turf/open/floor/plating,
 /area/ship/shuttle)
 "sa" = (
-/obj/structure/catwalk/over/plated_catwalk,
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/structure/cable{
-	icon_state = "1-8"
+/obj/structure/closet/secure_closet/wall{
+	name = "pilot's locker";
+	req_access_txt = "31";
+	icon_state = "solgov_wall";
+	dir = 4;
+	pixel_x = -30
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
-	dir = 5
+/obj/item/binoculars,
+/obj/item/storage/firstaid,
+/obj/item/storage/box/bodybags,
+/obj/item/pinpointer,
+/obj/item/storage/toolbox/emergency,
+/obj/item/extinguisher/mini,
+/obj/item/roller,
+/obj/item/gps{
+	gpstag = "TEGUS1"
 	},
-/turf/open/floor/plating,
+/turf/open/floor/plasteel,
 /area/ship/shuttle)
 "sq" = (
 /obj/machinery/door/poddoor/preopen{
@@ -281,13 +285,19 @@
 /turf/open/floor/plasteel/patterned/ridged,
 /area/ship/shuttle)
 "xB" = (
+/obj/effect/turf_decal/industrial/warning{
+	dir = 10
+	},
+/obj/machinery/light/small{
+	dir = 1
+	},
 /obj/structure/cable{
-	icon_state = "0-4"
+	icon_state = "0-2"
 	},
 /obj/machinery/power/terminal{
 	dir = 8
 	},
-/turf/open/floor/plating,
+/turf/open/floor/plasteel,
 /area/ship/shuttle)
 "yr" = (
 /obj/effect/turf_decal/industrial/traffic{
@@ -346,7 +356,6 @@
 /obj/machinery/power/smes/shuttle/precharged{
 	dir = 4
 	},
-/obj/structure/window/reinforced/spawner/west,
 /obj/machinery/door/window/eastleft,
 /obj/structure/cable{
 	icon_state = "0-8"
@@ -354,6 +363,8 @@
 /obj/machinery/door/poddoor/shutters/preopen{
 	id = "tegus_shuttle_engine"
 	},
+/obj/structure/window/reinforced/spawner,
+/obj/structure/window/reinforced/spawner/west,
 /turf/open/floor/plating,
 /area/ship/shuttle)
 "AW" = (
@@ -366,33 +377,12 @@
 	},
 /turf/open/floor/plasteel/airless,
 /area/ship/shuttle)
-"Bg" = (
-/obj/effect/turf_decal/industrial/warning{
-	dir = 8
-	},
-/obj/machinery/power/port_gen/pacman,
-/obj/structure/cable/yellow,
-/obj/structure/cable{
-	icon_state = "5-8"
-	},
-/obj/machinery/light/small,
-/turf/open/floor/plasteel/patterned/ridged,
-/area/ship/shuttle)
 "BM" = (
-/obj/effect/turf_decal/industrial/warning{
-	dir = 1
-	},
-/obj/structure/cable,
-/obj/structure/cable{
-	icon_state = "1-10"
-	},
-/obj/machinery/power/apc/auto_name/east,
-/obj/machinery/atmospherics/components/binary/pump/on/layer4{
-	name = "Air to Distro";
-	target_pressure = 1000;
+/obj/machinery/power/terminal{
 	dir = 1
 	},
-/turf/open/floor/plasteel,
+/obj/machinery/power/port_gen/pacman,
+/turf/open/floor/plating,
 /area/ship/shuttle)
 "Cu" = (
 /obj/structure/chair/comfy/shuttle{
@@ -416,11 +406,15 @@
 /turf/open/floor/plasteel/airless,
 /area/ship/shuttle)
 "Iq" = (
+/obj/machinery/power/terminal{
+	dir = 8
+	},
+/obj/machinery/door/window/eastright,
 /obj/machinery/power/smes/shuttle/precharged{
 	dir = 4
 	},
+/obj/structure/window/reinforced/spawner/north,
 /obj/structure/window/reinforced/spawner/west,
-/obj/machinery/door/window/eastright,
 /obj/structure/cable{
 	icon_state = "0-8"
 	},
@@ -442,13 +436,16 @@
 /turf/open/floor/plasteel/airless,
 /area/ship/shuttle)
 "Ks" = (
-/obj/machinery/power/terminal{
-	dir = 1
+/obj/effect/turf_decal/industrial/warning{
+	dir = 9
 	},
-/obj/structure/cable/yellow{
-	icon_state = "0-4"
+/obj/structure/cable{
+	icon_state = "1-2"
 	},
-/turf/open/floor/plating,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+	dir = 1
+	},
+/turf/open/floor/plasteel,
 /area/ship/shuttle)
 "LC" = (
 /obj/effect/turf_decal/trimline/opaque/solgovgold/warning,
@@ -478,10 +475,14 @@
 /area/ship/shuttle)
 "Mp" = (
 /obj/effect/turf_decal/industrial/warning{
-	dir = 9
+	dir = 1
 	},
-/obj/structure/cable/yellow{
-	icon_state = "2-8"
+/obj/structure/cable,
+/obj/machinery/power/apc/auto_name/east,
+/obj/machinery/atmospherics/components/binary/pump/on/layer4{
+	name = "Air to Distro";
+	target_pressure = 1000;
+	dir = 1
 	},
 /turf/open/floor/plasteel,
 /area/ship/shuttle)
@@ -563,16 +564,14 @@
 /area/ship/shuttle)
 "SG" = (
 /obj/effect/turf_decal/industrial/warning{
-	dir = 10
-	},
-/obj/structure/cable{
-	icon_state = "2-8"
+	dir = 8
 	},
-/obj/machinery/light/small{
-	dir = 1
+/obj/machinery/light/small,
+/obj/structure/cable,
+/obj/machinery/power/terminal{
+	dir = 8
 	},
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
-/turf/open/floor/plasteel,
+/turf/open/floor/plasteel/patterned/ridged,
 /area/ship/shuttle)
 "To" = (
 /obj/structure/catwalk/over/plated_catwalk,
@@ -609,8 +608,8 @@
 rx
 rx
 rR
-rx
-rx
+pm
+pm
 rR
 rx
 rx
@@ -619,8 +618,8 @@ rx
 rx
 pm
 AQ
-pm
-pm
+dK
+BM
 Iq
 pm
 rx
@@ -629,33 +628,23 @@ rx
 rx
 pm
 xB
-dK
+fx
 Ks
-xB
-pm
-rx
-"}
-(4,1,1) = {"
-rx
-pm
 SG
-sa
-Mp
-Bg
 pm
 rx
 "}
-(5,1,1) = {"
+(4,1,1) = {"
 rx
 pm
 Au
 To
-BM
+Mp
 oi
 pm
 rx
 "}
-(6,1,1) = {"
+(5,1,1) = {"
 rx
 fO
 pm
@@ -665,7 +654,7 @@ pm
 fO
 rx
 "}
-(7,1,1) = {"
+(6,1,1) = {"
 pm
 pm
 MD
@@ -675,7 +664,7 @@ nL
 pm
 pm
 "}
-(8,1,1) = {"
+(7,1,1) = {"
 wV
 bt
 LC
@@ -685,7 +674,7 @@ gz
 zG
 yr
 "}
-(9,1,1) = {"
+(8,1,1) = {"
 Ol
 jW
 bj
@@ -695,7 +684,7 @@ IR
 dm
 sq
 "}
-(10,1,1) = {"
+(9,1,1) = {"
 ge
 dU
 Tz
@@ -705,7 +694,7 @@ Em
 dU
 qx
 "}
-(11,1,1) = {"
+(10,1,1) = {"
 pm
 pm
 AW
@@ -715,7 +704,7 @@ fV
 pm
 pm
 "}
-(12,1,1) = {"
+(11,1,1) = {"
 rx
 fO
 pm
@@ -725,17 +714,17 @@ pm
 fO
 rx
 "}
-(13,1,1) = {"
+(12,1,1) = {"
 rx
 pm
 jW
 nB
 tB
-fx
+sa
 pm
 rx
 "}
-(14,1,1) = {"
+(13,1,1) = {"
 rx
 rp
 Rf
@@ -745,7 +734,7 @@ MK
 rp
 rx
 "}
-(15,1,1) = {"
+(14,1,1) = {"
 rx
 CM
 pm
@@ -755,7 +744,7 @@ pm
 CM
 rx
 "}
-(16,1,1) = {"
+(15,1,1) = {"
 rx
 rx
 CM

From 9d7b7270eea5fc0d9443daf40764339a71006d59 Mon Sep 17 00:00:00 2001
From: goober3 <118859017+goober3@users.noreply.github.com>
Date: Sun, 30 Apr 2023 00:59:56 +0100
Subject: [PATCH 11/28] big changes! (addressses the review part 2)

---
 _maps/shuttles/shiptest/nanotrasen_tegus.dmm  | 2511 +++++++++++------
 .../subshuttles/Subshuttle Catalog.txt        |    4 +-
 .../subshuttles/nanotrasen_shuttle_tegus.dmm  |  584 ++--
 code/datums/shuttles.dm                       |    2 +-
 4 files changed, 2037 insertions(+), 1064 deletions(-)

diff --git a/_maps/shuttles/shiptest/nanotrasen_tegus.dmm b/_maps/shuttles/shiptest/nanotrasen_tegus.dmm
index 264cfb579d61..4394a3205c5a 100644
--- a/_maps/shuttles/shiptest/nanotrasen_tegus.dmm
+++ b/_maps/shuttles/shiptest/nanotrasen_tegus.dmm
@@ -9,47 +9,67 @@
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
 "am" = (
-/obj/effect/turf_decal/industrial/hatch/yellow,
-/obj/structure/closet/crate,
-/turf/open/floor/plasteel/patterned,
+/obj/structure/cable{
+	icon_state = "1-8"
+	},
+/turf/closed/wall/mineral/titanium/nodiagonal,
 /area/ship/cargo)
 "aw" = (
 /obj/structure/cable{
-	icon_state = "1-4"
+	icon_state = "1-8"
 	},
 /turf/open/floor/plasteel/patterned/ridged,
 /area/ship/cargo)
 "aA" = (
-/obj/effect/turf_decal/industrial/warning{
-	dir = 4
+/obj/structure/cable{
+	icon_state = "1-2"
 	},
-/turf/open/floor/plasteel/patterned,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
+/obj/structure/catwalk/over/plated_catwalk,
+/turf/open/floor/plating,
+/area/ship/cargo)
+"aH" = (
+/obj/machinery/light,
+/turf/open/floor/plating,
 /area/ship/cargo)
 "bb" = (
-/obj/machinery/power/shuttle/engine/electric{
-	dir = 4
-	},
 /obj/structure/cable{
 	icon_state = "0-4"
 	},
+/obj/machinery/power/shuttle/engine/electric/bad{
+	dir = 4
+	},
 /turf/open/floor/plating,
 /area/ship/maintenance/port)
 "bl" = (
-/obj/machinery/power/shuttle/engine/electric{
-	dir = 4
-	},
 /obj/structure/cable{
 	icon_state = "0-4"
 	},
+/obj/machinery/power/shuttle/engine/electric/bad{
+	dir = 4
+	},
 /turf/open/floor/plating,
 /area/ship/maintenance/starboard)
+"bs" = (
+/obj/structure/rack,
+/obj/item/tank/internals/emergency_oxygen/double,
+/obj/item/tank/internals/emergency_oxygen/double,
+/obj/item/tank/internals/emergency_oxygen/double,
+/obj/item/storage/firstaid,
+/obj/item/gps/mining/internal,
+/turf/open/floor/plasteel/patterned/ridged,
+/area/ship/cargo)
 "bu" = (
-/obj/effect/turf_decal/industrial/outline/yellow,
-/obj/structure/ore_box,
-/obj/machinery/light{
+/obj/effect/turf_decal/industrial/loading,
+/turf/open/floor/plasteel/patterned,
+/area/ship/cargo)
+"bv" = (
+/obj/structure/railing{
 	dir = 1
 	},
-/turf/open/floor/plasteel/patterned,
+/obj/structure/catwalk/over/plated_catwalk,
+/turf/open/floor/plating/airless,
 /area/ship/cargo)
 "bz" = (
 /obj/effect/turf_decal/industrial/warning,
@@ -68,6 +88,12 @@
 	},
 /turf/open/floor/plating,
 /area/ship/cargo)
+"bD" = (
+/obj/structure/extinguisher_cabinet{
+	pixel_y = -32
+	},
+/turf/open/floor/plasteel/patterned/ridged,
+/area/ship/cargo)
 "bK" = (
 /obj/structure/closet/crate/bin,
 /obj/effect/turf_decal/corner/transparent/neutral{
@@ -81,24 +107,34 @@
 /obj/structure/curtain/cloth/grey,
 /turf/open/floor/plasteel/patterned,
 /area/ship/crew)
-"cC" = (
-/obj/effect/turf_decal/industrial/warning{
-	dir = 8
+"cn" = (
+/obj/structure/cable{
+	icon_state = "2-4"
 	},
+/turf/open/floor/plasteel/patterned,
+/area/ship/cargo)
+"cC" = (
 /obj/effect/turf_decal/industrial/warning{
 	dir = 4
 	},
-/obj/machinery/door/poddoor/multi_tile/four_tile_ver{
-	id = "tegus_shuttle_door"
-	},
-/obj/machinery/power/shieldwallgen/atmos/roundstart{
-	dir = 1;
-	id = "cargo_shield_fore"
+/obj/structure/cable{
+	icon_state = "1-2"
 	},
 /obj/structure/cable{
-	icon_state = "0-10"
+	icon_state = "2-8"
 	},
-/turf/open/floor/plating,
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4{
+	dir = 4
+	},
+/turf/open/floor/plasteel,
+/area/ship/cargo)
+"cI" = (
+/obj/structure/railing,
+/obj/structure/catwalk/over/plated_catwalk,
+/turf/open/floor/plating/airless,
 /area/ship/cargo)
 "cK" = (
 /obj/machinery/power/smes/shuttle/precharged{
@@ -114,6 +150,16 @@
 	},
 /turf/open/floor/plating,
 /area/ship/maintenance/port)
+"cO" = (
+/obj/structure/railing{
+	dir = 6;
+	layer = 4.1
+	},
+/obj/effect/turf_decal/spline/fancy/opaque/grey{
+	dir = 6
+	},
+/turf/open/floor/plasteel/patterned,
+/area/ship/hallway/aft)
 "cP" = (
 /obj/structure/catwalk/over/plated_catwalk,
 /obj/structure/cable{
@@ -166,19 +212,30 @@
 /obj/machinery/advanced_airlock_controller{
 	pixel_x = 32
 	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 10
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 10
+	},
 /turf/open/floor/plating,
 /area/ship/hallway/central)
 "du" = (
-/obj/effect/turf_decal/industrial/warning{
-	dir = 1
-	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
 	dir = 4
 	},
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/turf/open/floor/plasteel/patterned/ridged,
+/obj/effect/turf_decal/industrial/warning{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 8
+	},
+/obj/structure/table/reinforced,
+/obj/machinery/computer/helm/viewscreen,
+/turf/open/floor/plasteel/patterned,
 /area/ship/cargo)
 "dy" = (
 /obj/effect/spawner/structure/window/shuttle,
@@ -201,19 +258,15 @@
 /turf/open/floor/plasteel,
 /area/ship/hallway/central)
 "dO" = (
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2{
-	dir = 4
-	},
-/obj/structure/cable{
-	icon_state = "1-2"
+/obj/structure/railing{
+	dir = 8;
+	pixel_x = -1
 	},
-/obj/structure/cable{
-	icon_state = "1-8"
+/obj/machinery/conveyor/inverted{
+	dir = 5;
+	id = "tegusbelt"
 	},
-/turf/open/floor/plasteel,
+/turf/open/floor/plasteel/tech/grid,
 /area/ship/cargo)
 "dP" = (
 /obj/structure/table/reinforced,
@@ -221,62 +274,86 @@
 /turf/open/floor/plasteel,
 /area/ship/crew/canteen)
 "dQ" = (
+/obj/machinery/light/floor,
 /obj/effect/turf_decal/industrial/warning{
 	dir = 1
 	},
 /obj/structure/cable{
-	icon_state = "4-8"
+	icon_state = "2-4"
 	},
-/obj/machinery/light/floor,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
-	dir = 4
+/obj/structure/cable{
+	icon_state = "4-8"
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
 	dir = 4
 	},
-/turf/open/floor/plasteel/patterned,
+/turf/open/floor/plasteel/patterned/cargo_one,
 /area/ship/cargo)
 "dR" = (
-/obj/structure/cable{
-	icon_state = "4-8"
+/obj/machinery/firealarm{
+	pixel_y = 25
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+/obj/effect/turf_decal/corner/transparent/neutral{
 	dir = 4
 	},
-/obj/machinery/firealarm{
-	pixel_y = 25
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+	dir = 4
 	},
 /turf/open/floor/plasteel,
 /area/ship/crew/canteen)
 "dV" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
-	dir = 4
-	},
 /obj/structure/sign/poster/official/random{
 	pixel_y = 32
 	},
+/obj/effect/turf_decal/corner/transparent/neutral/full,
+/obj/effect/turf_decal/corner/transparent/bar/diagonal,
+/obj/effect/turf_decal/spline/fancy/opaque/grey{
+	dir = 4
+	},
 /turf/open/floor/plasteel,
 /area/ship/crew/canteen)
+"dX" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 4
+	},
+/obj/effect/turf_decal/industrial/warning{
+	dir = 1
+	},
+/obj/machinery/light/floor,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 6
+	},
+/turf/open/floor/plasteel/patterned/cargo_one,
+/area/ship/cargo)
 "dY" = (
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
 	dir = 1
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
 	dir = 1
 	},
-/turf/open/floor/plasteel/patterned,
+/turf/open/floor/plasteel/telecomms_floor,
 /area/ship/engineering/communications)
 "eh" = (
-/obj/structure/table,
-/obj/effect/turf_decal/corner/transparent/brown{
-	dir = 4
+/obj/effect/turf_decal/industrial/warning{
+	dir = 1
 	},
-/obj/item/clipboard,
-/obj/item/pen,
-/turf/open/floor/plasteel,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 6
+	},
+/turf/open/floor/plasteel/patterned,
 /area/ship/cargo)
 "eo" = (
 /obj/effect/turf_decal/industrial/warning{
@@ -285,6 +362,9 @@
 /obj/effect/turf_decal/industrial/warning{
 	dir = 4
 	},
+/obj/machinery/door/poddoor{
+	id = "tegus_shuttle_door"
+	},
 /turf/open/floor/plating,
 /area/ship/cargo)
 "eq" = (
@@ -295,22 +375,6 @@
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
 /turf/open/floor/plasteel/patterned,
 /area/ship/maintenance/starboard)
-"eu" = (
-/obj/effect/turf_decal/industrial/warning{
-	dir = 8
-	},
-/obj/effect/turf_decal/industrial/warning{
-	dir = 4
-	},
-/obj/machinery/power/shieldwallgen/atmos/roundstart{
-	dir = 2;
-	id = "cargo_shield_fore"
-	},
-/obj/structure/cable{
-	icon_state = "0-9"
-	},
-/turf/open/floor/plating,
-/area/ship/cargo)
 "eN" = (
 /obj/machinery/power/terminal{
 	dir = 8
@@ -319,7 +383,10 @@
 	icon_state = "0-4"
 	},
 /obj/machinery/atmospherics/components/binary/volume_pump/layer2,
-/turf/open/floor/plasteel/patterned/ridged,
+/obj/effect/turf_decal/corner/transparent/solgovgold{
+	dir = 4
+	},
+/turf/open/floor/plasteel/patterned,
 /area/ship/maintenance/port)
 "eT" = (
 /obj/structure/catwalk/over/plated_catwalk,
@@ -338,21 +405,29 @@
 /obj/machinery/telecomms/bus/preset_two{
 	network = "ntsv_commnet"
 	},
-/turf/open/floor/plasteel/patterned/ridged,
+/turf/open/floor/plasteel/tech/grid,
 /area/ship/engineering/communications)
 "eZ" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
 	dir = 1
 	},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4{
+	dir = 8
+	},
 /turf/open/floor/plasteel/patterned/ridged,
 /area/ship/hallway/aft)
 "ff" = (
 /obj/structure/catwalk/over/plated_catwalk,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 9
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 9
+	},
 /turf/open/floor/plating,
 /area/ship/hallway/central)
 "fj" = (
@@ -373,7 +448,19 @@
 	},
 /turf/open/floor/plasteel,
 /area/ship/hallway/central)
+"fD" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 4
+	},
+/turf/open/floor/plasteel/patterned,
+/area/ship/cargo)
 "fG" = (
+/obj/structure/cable{
+	icon_state = "0-1"
+	},
 /obj/machinery/door/poddoor{
 	id = "tegus_starboard_cargo"
 	},
@@ -385,26 +472,30 @@
 	dir = 8;
 	id = "cargo_shield_starboard"
 	},
-/obj/structure/cable{
-	icon_state = "0-1"
-	},
 /turf/open/floor/plating,
 /area/ship/cargo)
 "fH" = (
-/obj/effect/turf_decal/corner/transparent/bar{
-	dir = 4
-	},
 /obj/effect/turf_decal/corner/transparent/neutral{
 	dir = 1
 	},
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
+/obj/effect/turf_decal/corner/transparent/lime{
+	dir = 4
+	},
 /turf/open/floor/plasteel,
 /area/ship/crew/canteen)
 "gt" = (
-/obj/effect/turf_decal/industrial/loading{
-	dir = 8
+/obj/structure/tank_dispenser,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/layer4{
+	dir = 1
 	},
-/turf/open/floor/plasteel/patterned,
+/turf/open/floor/plasteel/patterned/ridged,
+/area/ship/cargo)
+"gK" = (
+/obj/effect/turf_decal/corner/transparent/neutral{
+	dir = 10
+	},
+/turf/open/floor/plasteel/dark,
 /area/ship/cargo)
 "gL" = (
 /obj/machinery/computer/crew{
@@ -419,12 +510,26 @@
 	},
 /turf/closed/wall/mineral/titanium/nodiagonal,
 /area/ship/crew/canteen)
-"ha" = (
-/obj/effect/turf_decal/industrial/hatch/yellow,
-/obj/machinery/light{
-	dir = 8
+"gV" = (
+/obj/machinery/suit_storage_unit/standard_unit,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/layer4{
+	dir = 1
+	},
+/obj/machinery/light/small{
+	dir = 1
+	},
+/turf/open/floor/plasteel/patterned/ridged,
+/area/ship/cargo)
+"ha" = (
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
+/turf/open/floor/plasteel/stairs{
+	dir = 1
 	},
-/turf/open/floor/plasteel/patterned,
 /area/ship/cargo)
 "hd" = (
 /obj/structure/table/reinforced,
@@ -450,15 +555,6 @@
 	},
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
-"he" = (
-/obj/structure/cable{
-	icon_state = "2-8"
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/turf/open/floor/plasteel/patterned,
-/area/ship/cargo)
 "hh" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/structure/cable{
@@ -473,27 +569,34 @@
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2{
 	dir = 8
 	},
-/obj/effect/turf_decal/corner/transparent/brown{
-	dir = 1
-	},
 /turf/open/floor/plasteel/patterned,
 /area/ship/hallway/aft)
+"hi" = (
+/obj/structure/cable{
+	icon_state = "1-4"
+	},
+/turf/open/floor/plasteel/patterned,
+/area/ship/cargo)
 "ho" = (
-/turf/open/floor/plasteel/stairs{
+/obj/effect/turf_decal/corner/transparent/solgovgold{
 	dir = 8
 	},
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+	dir = 8
+	},
+/turf/open/floor/plasteel/patterned,
+/area/ship/hallway/aft)
+"ht" = (
+/obj/structure/chair/office{
+	dir = 1
+	},
+/turf/open/floor/plasteel,
 /area/ship/hallway/aft)
 "hC" = (
 /obj/structure/cable{
-	icon_state = "1-4"
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
-	dir = 5
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
-	dir = 5
+	icon_state = "4-8"
 	},
-/turf/open/floor/plasteel,
+/turf/open/floor/plasteel/patterned,
 /area/ship/cargo)
 "hG" = (
 /obj/structure/table,
@@ -533,20 +636,13 @@
 /area/ship/hallway/central)
 "im" = (
 /obj/machinery/light,
-/turf/open/floor/plasteel,
-/area/ship/crew/canteen)
-"iq" = (
-/obj/structure/table,
-/obj/effect/turf_decal/corner/transparent/brown{
+/obj/effect/turf_decal/corner/transparent/neutral/full,
+/obj/effect/turf_decal/corner/transparent/bar/diagonal,
+/obj/effect/turf_decal/spline/fancy/opaque/grey{
 	dir = 4
 	},
-/obj/item/price_tagger{
-	pixel_y = 7;
-	pixel_x = -14
-	},
-/obj/item/stack/packageWrap,
 /turf/open/floor/plasteel,
-/area/ship/cargo)
+/area/ship/crew/canteen)
 "it" = (
 /obj/effect/turf_decal/corner/transparent/brown{
 	dir = 4
@@ -558,31 +654,30 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
 	dir = 9
 	},
-/obj/structure/extinguisher_cabinet{
-	pixel_x = 32
-	},
 /turf/open/floor/plasteel,
 /area/ship/hallway/central)
 "iJ" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
 	dir = 1
 	},
-/turf/open/floor/plasteel/patterned,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 1
+	},
+/turf/open/floor/plasteel/telecomms_floor,
 /area/ship/engineering/communications)
 "iM" = (
-/obj/machinery/airalarm/directional/east,
-/turf/open/floor/plasteel/patterned/ridged,
-/area/ship/maintenance/port)
-"iN" = (
-/obj/effect/turf_decal/industrial/warning{
-	dir = 1
+/obj/structure/table,
+/obj/item/storage/toolbox/mechanical{
+	pixel_y = 7
 	},
-/obj/structure/cable{
-	icon_state = "4-8"
+/obj/item/hand_labeler{
+	pixel_x = 4
 	},
 /turf/open/floor/plasteel/patterned/ridged,
-/area/ship/cargo)
+/area/ship/maintenance/port)
+"iN" = (
+/turf/closed/wall/mineral/titanium,
+/area/ship/hallway/central)
 "iR" = (
 /obj/structure/chair/comfy/shuttle{
 	dir = 4;
@@ -594,21 +689,25 @@
 /obj/machinery/telecomms/hub/preset{
 	network = "ntsv_commnet"
 	},
-/turf/open/floor/plasteel/patterned/ridged,
+/turf/open/floor/plasteel/tech/grid,
 /area/ship/engineering/communications)
 "iY" = (
-/obj/machinery/power/port_gen/pacman,
 /obj/structure/window/reinforced/spawner,
 /obj/machinery/door/window/westright,
 /obj/structure/cable/yellow{
 	icon_state = "0-8"
 	},
+/obj/machinery/power/port_gen/pacman/super,
 /turf/open/floor/plasteel/patterned/ridged,
 /area/ship/maintenance/starboard)
 "jb" = (
 /obj/effect/turf_decal/corner/transparent/neutral/full,
 /obj/effect/turf_decal/corner/transparent/bar/diagonal,
-/obj/machinery/vending/boozeomat,
+/obj/structure/table,
+/obj/machinery/microwave{
+	pixel_y = 6;
+	layer = 3
+	},
 /turf/open/floor/plasteel,
 /area/ship/crew/canteen)
 "jd" = (
@@ -626,25 +725,12 @@
 	},
 /area/ship/hallway/central)
 "jn" = (
-/obj/effect/turf_decal/industrial/warning,
-/obj/effect/turf_decal/industrial/warning,
-/obj/machinery/light/floor,
-/obj/machinery/button/door{
-	pixel_x = 27;
-	id = "tegus_shuttle_door";
-	name = "Shuttle Bay Blast Door";
-	dir = 8;
-	pixel_y = -5
-	},
-/obj/machinery/button/shieldwallgen{
-	pixel_x = 27;
-	id = "cargo_shield_fore";
-	pixel_y = 5;
-	dir = 8;
-	name = "Shuttle Bay Holofield"
-	},
 /obj/structure/cable{
-	icon_state = "6-8"
+	icon_state = "4-8"
+	},
+/obj/effect/turf_decal/industrial/warning,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+	dir = 8
 	},
 /turf/open/floor/plasteel/patterned,
 /area/ship/cargo)
@@ -672,7 +758,7 @@
 	pixel_y = -25;
 	dir = 1
 	},
-/turf/open/floor/plasteel/patterned/ridged,
+/turf/open/floor/plasteel/patterned,
 /area/ship/maintenance/port)
 "ju" = (
 /obj/structure/cable{
@@ -681,8 +767,26 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
 	dir = 5
 	},
-/turf/open/floor/plasteel/patterned/ridged,
+/turf/open/floor/plasteel/patterned,
 /area/ship/crew/canteen)
+"jw" = (
+/obj/structure/tank_dispenser,
+/turf/open/floor/plasteel/patterned/cargo_one,
+/area/ship/cargo)
+"jx" = (
+/obj/effect/turf_decal/industrial/warning,
+/turf/open/floor/plasteel/dark,
+/area/ship/cargo)
+"jO" = (
+/obj/docking_port/stationary{
+	dir = 1;
+	height = 15;
+	dwidth = 7;
+	width = 15;
+	name = "Subship Port 2"
+	},
+/turf/template_noop,
+/area/template_noop)
 "jQ" = (
 /obj/machinery/light{
 	dir = 8
@@ -691,7 +795,7 @@
 	dir = 4;
 	network = "ntsv_commnet"
 	},
-/turf/open/floor/plasteel/patterned/ridged,
+/turf/open/floor/plasteel/tech/grid,
 /area/ship/engineering/communications)
 "kc" = (
 /obj/machinery/door/airlock/external,
@@ -702,11 +806,28 @@
 /turf/open/floor/plating,
 /area/ship/hallway/central)
 "kg" = (
-/obj/machinery/suit_storage_unit/mining,
-/obj/structure/window/reinforced/spawner,
-/obj/machinery/door/window/eastright,
+/obj/structure/table,
+/obj/machinery/cell_charger,
 /turf/open/floor/plasteel/patterned/ridged,
 /area/ship/hallway/aft)
+"ko" = (
+/obj/docking_port/stationary{
+	dir = 2;
+	height = 15;
+	dwidth = 7;
+	width = 15;
+	name = "Subship Port 1"
+	},
+/turf/template_noop,
+/area/template_noop)
+"kp" = (
+/obj/structure/plasticflaps/opaque,
+/obj/machinery/conveyor{
+	dir = 8;
+	id = "tegusbelt"
+	},
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/cargo)
 "kE" = (
 /obj/effect/turf_decal/borderfloor/full,
 /obj/machinery/door/firedoor/border_only,
@@ -733,10 +854,7 @@
 /turf/open/floor/plasteel/patterned/ridged,
 /area/ship/cargo)
 "kH" = (
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/turf/open/floor/plasteel/patterned,
+/turf/open/floor/plasteel/patterned/ridged,
 /area/ship/cargo)
 "kM" = (
 /obj/effect/turf_decal/corner/transparent/solgovgold{
@@ -748,13 +866,19 @@
 	},
 /turf/open/floor/plasteel/patterned,
 /area/ship/maintenance/starboard)
+"kS" = (
+/obj/structure/railing{
+	dir = 8;
+	pixel_x = -1
+	},
+/turf/open/floor/plating,
+/area/ship/cargo)
 "kT" = (
-/obj/effect/turf_decal/industrial/outline/yellow,
-/obj/machinery/firealarm{
-	dir = 4;
-	pixel_x = -25
+/obj/machinery/light{
+	dir = 1;
+	layer = 4
 	},
-/turf/open/floor/plasteel/patterned,
+/turf/open/floor/plating,
 /area/ship/cargo)
 "kU" = (
 /obj/machinery/cryopod{
@@ -782,6 +906,15 @@
 	},
 /turf/open/floor/plating,
 /area/ship/maintenance/port)
+"lf" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4,
+/obj/machinery/advanced_airlock_controller{
+	pixel_y = -32
+	},
+/turf/open/floor/plating,
+/area/ship/cargo)
 "lg" = (
 /obj/effect/turf_decal/industrial/warning{
 	dir = 1
@@ -811,22 +944,24 @@
 "lW" = (
 /turf/closed/wall/mineral/titanium/nodiagonal,
 /area/ship/hallway/central)
+"ma" = (
+/obj/structure/table,
+/obj/item/crowbar{
+	pixel_y = 3
+	},
+/turf/open/floor/plasteel/patterned/cargo_one,
+/area/ship/cargo)
 "mf" = (
 /obj/structure/sign/nanotrasen,
 /turf/closed/wall/mineral/titanium/nodiagonal,
 /area/ship/cargo)
 "mq" = (
-/obj/effect/turf_decal/industrial/warning,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
-	dir = 4
-	},
 /obj/structure/cable{
-	icon_state = "4-8"
+	icon_state = "1-2"
 	},
-/turf/open/floor/plasteel/patterned,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
+/turf/open/floor/plasteel/stairs,
 /area/ship/cargo)
 "mu" = (
 /obj/structure/catwalk/over/plated_catwalk,
@@ -864,32 +999,47 @@
 /turf/open/floor/plasteel,
 /area/ship/crew)
 "mW" = (
-/obj/structure/ore_box,
-/obj/machinery/light,
-/obj/effect/turf_decal/industrial/hatch/yellow,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 5
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 5
+	},
 /turf/open/floor/plasteel/patterned,
 /area/ship/cargo)
+"ng" = (
+/obj/structure/table,
+/obj/structure/window/reinforced/spawner/north,
+/obj/item/reagent_containers/glass/rag{
+	pixel_y = 8;
+	pixel_x = -13
+	},
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/cargo)
 "nk" = (
+/obj/effect/turf_decal/corner/transparent/neutral/full,
+/obj/effect/turf_decal/corner/transparent/bar/diagonal,
+/obj/effect/turf_decal/spline/fancy/opaque/grey{
+	dir = 4
+	},
 /turf/open/floor/plasteel,
 /area/ship/crew/canteen)
 "nn" = (
-/obj/structure/closet/secure_closet/miningcloset{
-	req_access_txt = "48"
+/obj/structure/table,
+/obj/item/clipboard{
+	pixel_y = 2;
+	pixel_x = 14
 	},
-/obj/structure/window/reinforced/spawner{
+/obj/structure/railing{
 	dir = 1
 	},
-/obj/machinery/door/window/eastright,
-/obj/item/flashlight/seclite,
-/obj/item/storage/bag/ore,
-/obj/item/kitchen/knife/combat/survival,
-/obj/item/gun/energy/kinetic_accelerator,
-/obj/item/stack/marker_beacon/thirty,
-/obj/item/gps/mining,
-/obj/item/storage/backpack/satchel/explorer,
-/obj/item/clothing/glasses/meson/prescription,
-/obj/item/clothing/glasses/meson,
-/obj/item/t_scanner/adv_mining_scanner/lesser,
+/obj/effect/turf_decal/spline/fancy/opaque/grey{
+	dir = 1
+	},
+/obj/item/flashlight/lamp{
+	pixel_x = -5;
+	pixel_y = 3
+	},
 /turf/open/floor/plasteel/patterned/ridged,
 /area/ship/hallway/aft)
 "np" = (
@@ -957,14 +1107,17 @@
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
 "ol" = (
-/obj/effect/turf_decal/industrial/warning,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
 	dir = 4
 	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 8
+	},
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/turf/open/floor/plasteel/patterned/cargo_one,
+/obj/effect/turf_decal/industrial/warning,
+/turf/open/floor/plasteel/patterned,
 /area/ship/cargo)
 "oq" = (
 /obj/structure/cable{
@@ -981,22 +1134,31 @@
 	},
 /turf/open/floor/plasteel/patterned/ridged,
 /area/ship/hallway/central)
-"oE" = (
-/obj/effect/turf_decal/industrial/warning{
-	dir = 1
+"oA" = (
+/obj/structure/cable{
+	icon_state = "4-8"
 	},
+/turf/closed/wall/mineral/titanium/nodiagonal,
+/area/ship/cargo)
+"oE" = (
 /obj/structure/cable{
-	icon_state = "2-8"
+	icon_state = "4-8"
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
 	dir = 4
 	},
-/obj/structure/cable{
-	icon_state = "4-8"
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+	dir = 8
 	},
-/turf/open/floor/plasteel/patterned/ridged,
+/obj/effect/turf_decal/industrial/warning{
+	dir = 1
+	},
+/turf/open/floor/plasteel/patterned,
 /area/ship/cargo)
 "oF" = (
+/obj/structure/cable{
+	icon_state = "0-2"
+	},
 /obj/machinery/door/poddoor{
 	id = "tegus_port_cargo"
 	},
@@ -1008,9 +1170,6 @@
 	dir = 8;
 	id = "cargo_shield_port"
 	},
-/obj/structure/cable{
-	icon_state = "0-2"
-	},
 /turf/open/floor/plating,
 /area/ship/cargo)
 "oU" = (
@@ -1038,15 +1197,11 @@
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4{
-	dir = 4
-	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
 	dir = 1
 	},
-/obj/effect/turf_decal/corner/transparent/brown{
-	dir = 1
-	},
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
 /turf/open/floor/plasteel/patterned,
 /area/ship/hallway/aft)
 "py" = (
@@ -1089,24 +1244,25 @@
 /obj/structure/cable{
 	icon_state = "0-4"
 	},
-/turf/open/floor/plasteel/patterned,
+/turf/open/floor/plasteel,
 /area/ship/maintenance/starboard)
-"pU" = (
-/obj/structure/cable{
-	icon_state = "1-8"
-	},
-/turf/open/floor/plasteel/patterned,
+"pO" = (
+/obj/machinery/suit_storage_unit/mining,
+/obj/machinery/light,
+/turf/open/floor/plasteel/tech/grid,
 /area/ship/cargo)
 "qd" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
-	dir = 10
-	},
-/obj/structure/catwalk/over/plated_catwalk,
 /obj/machinery/atmospherics/components/binary/pump/on/layer4{
 	name = "Air to Distro";
 	target_pressure = 1000
 	},
-/turf/open/floor/plating,
+/obj/effect/turf_decal/corner/transparent/solgovgold{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer2{
+	dir = 10
+	},
+/turf/open/floor/plasteel/patterned,
 /area/ship/maintenance/port)
 "qf" = (
 /obj/machinery/door/airlock/external,
@@ -1123,11 +1279,33 @@
 "qi" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
-	dir = 4
+/obj/structure/table,
+/obj/item/paper_bin,
+/obj/item/pen,
+/obj/structure/railing{
+	dir = 5
 	},
-/turf/open/floor/plasteel,
+/obj/effect/turf_decal/spline/fancy/opaque/grey{
+	dir = 5
+	},
+/obj/effect/turf_decal/industrial/warning/corner,
+/turf/open/floor/plasteel/patterned/ridged,
 /area/ship/hallway/aft)
+"qw" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/effect/turf_decal/industrial/warning{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 8
+	},
+/turf/open/floor/plasteel/patterned,
+/area/ship/cargo)
 "qD" = (
 /obj/structure/catwalk/over/plated_catwalk,
 /obj/structure/cable{
@@ -1151,68 +1329,81 @@
 /area/ship/hallway/central)
 "qF" = (
 /obj/machinery/airalarm/directional/east,
-/obj/structure/reagent_dispensers/watertank,
+/obj/structure/table,
+/obj/item/extinguisher/mini/empty,
 /turf/open/floor/plasteel,
 /area/ship/hallway/aft)
+"qL" = (
+/obj/structure/table,
+/obj/structure/window/reinforced/spawner/north,
+/obj/item/clipboard,
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/cargo)
 "qN" = (
 /obj/effect/turf_decal/industrial/warning/corner,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
-	dir = 4
+/obj/structure/cable{
+	icon_state = "2-4"
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
-	dir = 8
+	dir = 6
 	},
-/obj/structure/cable{
-	icon_state = "4-8"
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 6
 	},
-/turf/open/floor/plasteel/patterned/cargo_one,
+/turf/open/floor/plasteel,
 /area/ship/cargo)
-"qR" = (
-/obj/effect/turf_decal/industrial/warning{
-	dir = 1
-	},
+"qS" = (
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
-	dir = 8
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
 	dir = 4
 	},
-/turf/open/floor/plasteel/patterned,
-/area/ship/cargo)
-"qS" = (
-/obj/effect/turf_decal/borderfloor/full,
-/obj/machinery/door/firedoor/border_only{
-	dir = 4
+/obj/machinery/door/airlock/engineering{
+	name = "Engine Room"
 	},
 /obj/machinery/door/firedoor/border_only{
 	dir = 8
 	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+/obj/machinery/door/firedoor/border_only{
 	dir = 4
 	},
-/turf/open/floor/plasteel/tech/grid,
+/turf/open/floor/plasteel/dark,
 /area/ship/hallway/central)
 "rc" = (
+/obj/effect/turf_decal/corner/transparent/solgovgold{
+	dir = 1
+	},
+/obj/structure/chair,
 /turf/open/floor/plasteel/patterned,
 /area/ship/hallway/aft)
-"rr" = (
-/obj/effect/turf_decal/corner/transparent/bar{
+"rg" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
 	dir = 4
 	},
-/obj/effect/turf_decal/corner/transparent/neutral{
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/effect/turf_decal/industrial/warning,
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2,
+/turf/open/floor/plasteel/patterned,
+/area/ship/cargo)
+"rr" = (
+/obj/effect/turf_decal/spline/fancy/opaque/black{
 	dir = 1
 	},
-/turf/open/floor/plasteel,
-/area/ship/crew/canteen)
+/obj/machinery/conveyor{
+	dir = 8;
+	id = "tegusbelt"
+	},
+/obj/structure/railing{
+	layer = 4.1
+	},
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/cargo)
 "rs" = (
 /obj/effect/turf_decal/corner/transparent/solgovgold{
 	dir = 4
@@ -1223,19 +1414,51 @@
 /obj/structure/cable{
 	icon_state = "0-4"
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer2{
 	dir = 5
 	},
-/turf/open/floor/plasteel/patterned,
+/turf/open/floor/plasteel,
 /area/ship/maintenance/port)
 "rt" = (
-/turf/closed/wall/mineral/titanium,
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 4
+	},
+/obj/effect/turf_decal/industrial/warning{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4{
+	dir = 1
+	},
+/turf/open/floor/plasteel/patterned,
+/area/ship/cargo)
+"ru" = (
+/obj/machinery/conveyor_switch/oneway{
+	id = "tegusbelt";
+	pixel_y = 4
+	},
+/obj/effect/turf_decal/spline/fancy/opaque/black,
+/obj/effect/turf_decal/industrial/warning/corner{
+	dir = 8
+	},
+/obj/structure/railing{
+	layer = 4.1
+	},
+/turf/open/floor/plasteel/tech,
 /area/ship/cargo)
 "rD" = (
 /obj/structure/catwalk/over/plated_catwalk,
 /obj/machinery/airalarm/directional/east,
 /turf/open/floor/plating,
 /area/ship/engineering/communications)
+"rH" = (
+/obj/effect/turf_decal/industrial/loading{
+	dir = 8
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/cargo)
 "rY" = (
 /obj/effect/turf_decal/industrial/warning{
 	dir = 1
@@ -1243,13 +1466,13 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
-	dir = 4
-	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
 	dir = 4
 	},
-/turf/open/floor/plasteel/patterned/ridged,
+/turf/open/floor/plasteel/patterned,
 /area/ship/cargo)
 "rZ" = (
 /obj/machinery/light/small{
@@ -1262,25 +1485,22 @@
 /turf/open/floor/plasteel/patterned,
 /area/ship/maintenance/port)
 "sb" = (
-/obj/effect/turf_decal/industrial/warning,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
 	dir = 4
 	},
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/turf/open/floor/plasteel/patterned/ridged,
+/obj/effect/turf_decal/industrial/warning,
+/turf/open/floor/plasteel/patterned,
 /area/ship/cargo)
 "sf" = (
-/obj/effect/turf_decal/corner/transparent/neutral{
-	dir = 9
-	},
-/obj/effect/turf_decal/corner/transparent/neutral{
-	dir = 2
-	},
 /obj/structure/closet/emcloset/wall{
 	dir = 8;
-	pixel_x = 30
+	pixel_x = 28
+	},
+/obj/effect/turf_decal/corner/transparent/neutral/three_quarters{
+	dir = 1
 	},
 /turf/open/floor/plasteel,
 /area/ship/hallway/central)
@@ -1307,7 +1527,20 @@
 	id = "cargo_shield_port";
 	name = "Cargo Holofield"
 	},
-/turf/open/floor/plasteel/patterned/ridged,
+/turf/open/floor/plasteel/patterned,
+/area/ship/cargo)
+"sv" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/effect/turf_decal/industrial/warning,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 8
+	},
+/turf/open/floor/plasteel/patterned,
 /area/ship/cargo)
 "sC" = (
 /obj/effect/decal/cleanable/dirt/dust,
@@ -1320,7 +1553,10 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
 	dir = 9
 	},
-/turf/open/floor/plasteel/patterned,
+/obj/effect/turf_decal/corner/transparent/solgovgold{
+	dir = 8
+	},
+/turf/open/floor/plasteel,
 /area/ship/hallway/aft)
 "sD" = (
 /obj/structure/table/reinforced,
@@ -1337,19 +1573,76 @@
 /obj/structure/chair/stool/bar{
 	dir = 8
 	},
+/obj/effect/turf_decal/corner/transparent/neutral{
+	dir = 9
+	},
 /turf/open/floor/plasteel/patterned,
 /area/ship/crew/canteen)
-"tf" = (
+"sH" = (
+/obj/structure/ore_box,
+/obj/effect/turf_decal/industrial/hatch/yellow,
+/turf/open/floor/plasteel/dark,
+/area/ship/cargo)
+"sK" = (
+/obj/effect/turf_decal/industrial/warning{
+	dir = 8
+	},
 /obj/effect/turf_decal/industrial/warning{
 	dir = 4
 	},
+/obj/machinery/power/shieldwallgen/atmos/roundstart{
+	dir = 1;
+	id = "cargo_shield_fore"
+	},
+/obj/structure/cable{
+	icon_state = "0-2"
+	},
+/obj/machinery/door/poddoor{
+	id = "tegus_shuttle_door"
+	},
+/turf/open/floor/plating,
+/area/ship/cargo)
+"sR" = (
+/obj/machinery/power/apc/auto_name/south,
+/obj/structure/cable{
+	icon_state = "0-8"
+	},
+/turf/open/floor/plasteel/patterned,
+/area/ship/cargo)
+"sW" = (
+/obj/effect/turf_decal/industrial/traffic{
+	dir = 8
+	},
+/obj/effect/turf_decal/industrial/traffic{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 5
+	},
 /turf/open/floor/plasteel/patterned/ridged,
 /area/ship/cargo)
+"tf" = (
+/turf/open/floor/plasteel/stairs{
+	dir = 1
+	},
+/area/ship/cargo)
+"ti" = (
+/obj/effect/turf_decal/industrial/warning{
+	dir = 1
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/cargo)
+"tD" = (
+/obj/structure/cable{
+	icon_state = "2-8"
+	},
+/turf/closed/wall/mineral/titanium/nodiagonal,
+/area/ship/cargo)
 "tU" = (
 /obj/machinery/telecomms/processor/preset_two{
 	network = "ntsv_commnet"
 	},
-/turf/open/floor/plasteel/patterned/ridged,
+/turf/open/floor/plasteel/tech/grid,
 /area/ship/engineering/communications)
 "ua" = (
 /obj/effect/turf_decal/corner/transparent/lime{
@@ -1433,34 +1726,17 @@
 /obj/structure/extinguisher_cabinet{
 	pixel_y = -32
 	},
+/obj/machinery/airalarm/directional/east,
 /turf/open/floor/plasteel/patterned/ridged,
 /area/ship/maintenance/port)
-"uZ" = (
-/obj/effect/turf_decal/industrial/warning{
-	dir = 8
-	},
-/obj/effect/turf_decal/industrial/warning{
-	dir = 4
+"vy" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/cable{
+	icon_state = "1-2"
 	},
-/obj/machinery/door/poddoor/multi_tile/four_tile_ver{
-	id = "tegus_shuttle_door"
-	},
-/obj/docking_port/mobile{
-	can_move_docking_ports = 1;
-	launch_status = 0;
-	port_direction = 4;
-	preferred_direction = 4
-	},
-/turf/open/floor/plating,
-/area/ship/cargo)
-"vy" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
-	dir = 1
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 1
 	},
 /obj/structure/catwalk/over/plated_catwalk,
 /turf/open/floor/plating,
@@ -1481,7 +1757,7 @@
 /obj/machinery/door/firedoor/border_only{
 	dir = 1
 	},
-/turf/open/floor/plasteel/patterned,
+/turf/open/floor/plasteel/dark,
 /area/ship/hallway/aft)
 "vN" = (
 /obj/machinery/door/airlock{
@@ -1502,12 +1778,14 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4,
-/obj/structure/catwalk/over/plated_catwalk,
 /obj/machinery/atmospherics/components/binary/volume_pump/on/layer2{
 	name = "Scrubbers to External"
 	},
-/turf/open/floor/plating,
+/obj/effect/turf_decal/corner/transparent/solgovgold{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/manifold/supply/visible/layer4,
+/turf/open/floor/plasteel,
 /area/ship/maintenance/port)
 "vT" = (
 /obj/machinery/door/airlock{
@@ -1546,10 +1824,7 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
 	dir = 1
 	},
-/obj/structure/table,
-/obj/item/clipboard{
-	pixel_y = 8
-	},
+/obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/plasteel/patterned,
 /area/ship/hallway/aft)
 "wc" = (
@@ -1587,12 +1862,18 @@
 	},
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/machinery/airalarm/directional/south,
-/turf/open/floor/plasteel/patterned,
+/turf/open/floor/plasteel,
 /area/ship/maintenance/starboard)
 "wP" = (
 /obj/effect/turf_decal/industrial/outline/yellow,
 /turf/open/floor/plasteel/patterned,
 /area/ship/cargo)
+"wT" = (
+/obj/structure/table,
+/obj/item/paper_bin,
+/obj/item/pen,
+/turf/open/floor/plasteel/patterned/ridged,
+/area/ship/cargo)
 "xc" = (
 /obj/machinery/power/apc/auto_name/east,
 /obj/structure/cable{
@@ -1601,17 +1882,40 @@
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
 	dir = 8
 	},
-/obj/effect/turf_decal/corner/transparent/solgovgold{
-	dir = 1
-	},
 /turf/open/floor/plasteel/patterned,
 /area/ship/maintenance/port)
-"xA" = (
-/obj/effect/turf_decal/industrial/outline/yellow,
-/obj/structure/closet/crate,
-/obj/machinery/light{
+"xf" = (
+/obj/machinery/door/airlock/external,
+/obj/effect/turf_decal/industrial/warning{
+	dir = 4
+	},
+/obj/effect/turf_decal/industrial/warning{
+	dir = 8
+	},
+/turf/open/floor/plating,
+/area/ship/cargo)
+"xh" = (
+/obj/machinery/conveyor/inverted{
+	dir = 6;
+	id = "tegusbelt"
+	},
+/obj/effect/turf_decal/spline/fancy/opaque/black{
 	dir = 1
 	},
+/obj/structure/railing{
+	dir = 4;
+	pixel_x = 4
+	},
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/cargo)
+"xu" = (
+/obj/machinery/light{
+	dir = 1;
+	layer = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 6
+	},
 /turf/open/floor/plasteel/patterned,
 /area/ship/cargo)
 "xB" = (
@@ -1632,16 +1936,32 @@
 /turf/open/floor/plastic,
 /area/ship/crew/canteen)
 "xE" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
 /obj/effect/turf_decal/industrial/warning{
 	dir = 1
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
-	dir = 4
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2{
+	dir = 1
 	},
-/obj/structure/cable{
-	icon_state = "4-8"
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 10
 	},
-/turf/open/floor/plasteel/patterned/cargo_one,
+/obj/structure/table/reinforced,
+/obj/machinery/button/door{
+	pixel_x = -6;
+	id = "tegus_shuttle_door";
+	name = "Shuttle Bay Blast Door";
+	pixel_y = 2
+	},
+/obj/machinery/button/shieldwallgen{
+	id = "cargo_shield_fore";
+	pixel_y = 2;
+	name = "Shuttle Bay Holofield";
+	pixel_x = 6
+	},
+/turf/open/floor/plasteel/patterned/ridged,
 /area/ship/cargo)
 "xG" = (
 /obj/structure/catwalk/over/plated_catwalk,
@@ -1667,22 +1987,26 @@
 /area/ship/crew)
 "xZ" = (
 /obj/machinery/light/small,
-/obj/machinery/autolathe,
-/obj/item/stack/sheet/glass/five,
-/obj/item/stack/sheet/metal/five{
+/obj/structure/table,
+/obj/item/storage/box/lights/mixed{
+	pixel_x = -12;
 	pixel_y = 3
 	},
+/obj/item/wrench{
+	pixel_y = 4;
+	pixel_x = -3
+	},
 /turf/open/floor/plasteel/patterned,
 /area/ship/maintenance/starboard)
 "yd" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
 /obj/effect/turf_decal/industrial/warning{
 	dir = 1
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
-	dir = 4
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+	dir = 8
 	},
 /turf/open/floor/plasteel/patterned,
 /area/ship/cargo)
@@ -1691,7 +2015,8 @@
 /obj/effect/turf_decal/corner/transparent/neutral{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
+/turf/open/floor/plasteel/dark,
 /area/ship/engineering/communications)
 "yg" = (
 /obj/structure/cable{
@@ -1705,6 +2030,15 @@
 	},
 /turf/open/floor/plasteel/patterned/ridged,
 /area/ship/maintenance/starboard)
+"yC" = (
+/obj/item/kirbyplants{
+	icon_state = "plant-03";
+	pixel_y = 8;
+	pixel_x = 4;
+	layer = 4.2
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/cargo)
 "yI" = (
 /turf/open/floor/plasteel/stairs{
 	dir = 4
@@ -1716,60 +2050,63 @@
 	pixel_y = 5
 	},
 /obj/item/storage/toolbox/mechanical,
-/obj/item/stack/cable_coil/red{
-	pixel_y = 3
-	},
 /obj/machinery/button/door{
 	pixel_x = -27;
 	dir = 4;
 	id = "tegus_starboard_engine";
 	name = "Engine Blast Door"
 	},
+/obj/item/stack/cable_coil/red,
 /turf/open/floor/plasteel/patterned/ridged,
 /area/ship/maintenance/starboard)
 "yO" = (
-/obj/effect/turf_decal/industrial/warning{
-	dir = 1
-	},
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
 	dir = 4
 	},
-/turf/open/floor/plasteel/patterned,
+/obj/effect/turf_decal/industrial/warning{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 4
+	},
+/turf/open/floor/plasteel/patterned/ridged,
 /area/ship/cargo)
 "yV" = (
 /obj/effect/turf_decal/industrial/hatch/yellow,
 /turf/open/floor/plasteel/patterned,
 /area/ship/cargo)
 "zj" = (
-/obj/structure/reagent_dispensers/fueltank,
-/obj/structure/railing,
-/turf/open/floor/plasteel/patterned,
+/obj/structure/reagent_dispensers/watertank,
+/obj/effect/turf_decal/industrial/hatch/yellow,
+/turf/open/floor/plasteel,
 /area/ship/hallway/aft)
 "zr" = (
 /obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/power/apc/auto_name/east,
 /obj/structure/cable{
 	icon_state = "0-8"
 	},
-/obj/structure/table,
-/obj/item/paper_bin,
-/obj/item/pen,
-/turf/open/floor/plasteel/patterned/ridged,
+/obj/effect/turf_decal/corner/transparent/solgovgold{
+	dir = 1
+	},
+/obj/structure/chair{
+	dir = 1
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel,
 /area/ship/hallway/aft)
 "zu" = (
 /obj/structure/sign/nanotrasen,
 /turf/closed/wall/mineral/titanium/nodiagonal,
 /area/ship/crew/canteen)
 "zv" = (
-/obj/structure/table,
-/obj/item/stack/packageWrap,
-/obj/structure/extinguisher_cabinet{
-	pixel_y = -32
+/obj/structure/tank_dispenser,
+/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/layer4{
+	dir = 1
 	},
-/turf/open/floor/plasteel,
+/turf/open/floor/plasteel/patterned/ridged,
 /area/ship/cargo)
 "zH" = (
 /obj/effect/decal/cleanable/dirt/dust,
@@ -1777,13 +2114,36 @@
 	icon_state = "1-2"
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2{
-	dir = 4
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 1
 	},
-/obj/structure/table,
-/obj/item/crowbar,
-/turf/open/floor/plasteel,
+/turf/open/floor/plasteel/patterned/ridged,
 /area/ship/hallway/aft)
+"zQ" = (
+/obj/machinery/suit_storage_unit/standard_unit,
+/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/layer4{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 8
+	},
+/turf/open/floor/plasteel/patterned/ridged,
+/area/ship/hallway/central)
+"zR" = (
+/obj/effect/turf_decal/industrial/outline/yellow,
+/obj/structure/closet/crate,
+/obj/machinery/light{
+	dir = 8
+	},
+/turf/open/floor/plasteel/patterned,
+/area/ship/cargo)
+"zY" = (
+/obj/effect/turf_decal/spline/fancy/opaque/black,
+/obj/structure/railing{
+	layer = 4.1
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/cargo)
 "Ag" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -1805,12 +2165,12 @@
 /turf/open/floor/plasteel,
 /area/ship/engineering/communications)
 "Ak" = (
-/obj/effect/turf_decal/industrial/hatch/yellow,
-/obj/machinery/firealarm{
-	pixel_y = -25;
-	dir = 1
+/obj/structure/railing{
+	dir = 8;
+	pixel_x = -4
 	},
-/turf/open/floor/plasteel/patterned,
+/obj/effect/turf_decal/industrial/outline/yellow,
+/turf/open/floor/plasteel/dark,
 /area/ship/cargo)
 "Ao" = (
 /obj/structure/table,
@@ -1818,25 +2178,22 @@
 /obj/item/multitool{
 	pixel_y = 3
 	},
-/turf/open/floor/plasteel/patterned/ridged,
+/turf/open/floor/plasteel/tech/grid,
 /area/ship/engineering/communications)
 "Aq" = (
 /obj/effect/turf_decal/industrial/warning/corner{
 	dir = 4
 	},
 /obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
-	dir = 4
+	icon_state = "1-4"
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
-	dir = 4
+	dir = 5
 	},
-/obj/structure/cable{
-	icon_state = "2-8"
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 5
 	},
-/turf/open/floor/plasteel/patterned/cargo_one,
+/turf/open/floor/plasteel,
 /area/ship/cargo)
 "Au" = (
 /turf/open/floor/plasteel/stairs{
@@ -1849,20 +2206,19 @@
 /obj/machinery/light{
 	dir = 4
 	},
-/obj/structure/table,
-/obj/item/extinguisher/mini,
-/turf/open/floor/plasteel/patterned/ridged,
+/obj/structure/reagent_dispensers/fueltank,
+/obj/effect/turf_decal/industrial/hatch/yellow,
+/turf/open/floor/plasteel,
 /area/ship/hallway/aft)
 "Az" = (
-/obj/effect/turf_decal/industrial/warning{
-	dir = 1
+/obj/structure/cable{
+	icon_state = "4-8"
 	},
-/obj/machinery/light/floor,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
 	dir = 4
 	},
-/obj/structure/cable{
-	icon_state = "4-8"
+/obj/effect/turf_decal/industrial/warning{
+	dir = 1
 	},
 /turf/open/floor/plasteel/patterned,
 /area/ship/cargo)
@@ -1881,18 +2237,18 @@
 /turf/open/floor/plasteel,
 /area/ship/hallway/central)
 "Ba" = (
-/obj/structure/cable{
-	icon_state = "2-8"
-	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
 	dir = 10
 	},
+/obj/effect/turf_decal/corner/transparent/neutral{
+	dir = 5
+	},
+/obj/machinery/power/apc/auto_name/east,
+/obj/structure/cable{
+	icon_state = "0-2"
+	},
 /turf/open/floor/plasteel,
 /area/ship/crew/canteen)
-"Be" = (
-/obj/structure/filingcabinet/double,
-/turf/open/floor/plasteel,
-/area/ship/cargo)
 "Bh" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
 /turf/open/floor/plasteel/patterned,
@@ -1903,18 +2259,42 @@
 	dir = 4
 	},
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
-/turf/open/floor/plasteel,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 1
+	},
+/turf/open/floor/plasteel/dark,
 /area/ship/engineering/communications)
-"Bn" = (
-/obj/effect/turf_decal/corner/transparent/brown,
-/obj/machinery/power/apc/auto_name/south,
-/obj/structure/cable,
+"Bl" = (
+/obj/machinery/door/airlock/external,
+/obj/effect/turf_decal/industrial/warning{
+	dir = 8
+	},
+/obj/effect/turf_decal/industrial/warning{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 8
+	},
 /turf/open/floor/plasteel,
 /area/ship/cargo)
-"Bv" = (
-/obj/effect/turf_decal/corner/transparent/bar{
+"Bn" = (
+/obj/structure/railing{
+	layer = 4.1
+	},
+/turf/open/floor/plasteel/stairs{
 	dir = 4
 	},
+/area/ship/maintenance/starboard)
+"Bs" = (
+/turf/open/floor/plasteel/stairs{
+	icon = 'icons/obj/stairs.dmi';
+	dir = 1
+	},
+/area/ship/cargo)
+"Bv" = (
 /obj/effect/turf_decal/corner/transparent/neutral{
 	dir = 1
 	},
@@ -1922,43 +2302,83 @@
 	pixel_y = -3
 	},
 /obj/machinery/airalarm/directional/east,
+/obj/effect/turf_decal/corner/transparent/lime{
+	dir = 4
+	},
 /turf/open/floor/plasteel,
 /area/ship/crew/canteen)
-"Bx" = (
-/obj/effect/turf_decal/corner/transparent/brown,
-/obj/machinery/airalarm/directional/south,
-/turf/open/floor/plasteel,
-/area/ship/cargo)
 "BE" = (
 /obj/effect/turf_decal/industrial/warning,
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 8
+	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
-	dir = 4
+	dir = 8
+	},
+/turf/open/floor/plasteel/patterned,
+/area/ship/cargo)
+"BG" = (
+/obj/effect/turf_decal/corner/transparent/brown,
+/obj/effect/turf_decal/corner/transparent/neutral{
+	dir = 8
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 5
+	},
+/turf/open/floor/plasteel,
+/area/ship/hallway/central)
+"BH" = (
+/obj/structure/cable{
+	icon_state = "1-8"
+	},
+/obj/structure/cable{
+	icon_state = "1-4"
+	},
+/turf/open/floor/plasteel/patterned/ridged,
+/area/ship/cargo)
+"BJ" = (
+/obj/machinery/suit_storage_unit/standard_unit,
+/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/layer4{
+	dir = 1
+	},
+/obj/machinery/light/small{
+	dir = 1
+	},
+/turf/open/floor/plasteel/patterned/ridged,
+/area/ship/cargo)
+"BP" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/railing{
+	dir = 4
+	},
+/obj/effect/turf_decal/spline/fancy/opaque/grey{
+	dir = 4
+	},
+/obj/effect/turf_decal/industrial/warning/corner,
+/turf/open/floor/plasteel/patterned,
+/area/ship/hallway/aft)
+"Cb" = (
+/obj/effect/turf_decal/industrial/warning{
 	dir = 8
 	},
-/obj/structure/cable{
-	icon_state = "4-8"
+/obj/effect/turf_decal/industrial/warning{
+	dir = 4
 	},
-/turf/open/floor/plasteel/patterned/ridged,
-/area/ship/cargo)
-"BG" = (
-/obj/effect/turf_decal/corner/transparent/brown,
-/obj/effect/turf_decal/corner/transparent/neutral{
-	dir = 8
+/obj/machinery/power/shieldwallgen/atmos/roundstart{
+	dir = 2;
+	id = "cargo_shield_fore"
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
-	dir = 5
+/obj/structure/cable{
+	icon_state = "0-1"
 	},
-/turf/open/floor/plasteel,
-/area/ship/hallway/central)
-"BP" = (
-/obj/effect/turf_decal/corner/transparent/brown{
-	dir = 4
+/obj/machinery/door/poddoor{
+	id = "tegus_shuttle_door"
 	},
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/plasteel,
-/area/ship/hallway/aft)
+/turf/open/floor/plating,
+/area/ship/cargo)
 "Cg" = (
 /obj/effect/turf_decal/corner/transparent/neutral{
 	dir = 1
@@ -1970,16 +2390,19 @@
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
 "Ch" = (
-/obj/effect/turf_decal/industrial/warning{
-	dir = 1
-	},
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 4
+	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
 	dir = 4
 	},
-/turf/open/floor/plasteel/patterned/cargo_one,
+/obj/effect/turf_decal/industrial/warning{
+	dir = 1
+	},
+/turf/open/floor/plasteel/patterned,
 /area/ship/cargo)
 "Cr" = (
 /obj/structure/bed,
@@ -1997,10 +2420,22 @@
 /turf/open/floor/plasteel,
 /area/ship/hallway/central)
 "CB" = (
-/obj/effect/turf_decal/industrial/warning{
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
 	dir = 4
 	},
-/turf/open/floor/plasteel/patterned/cargo_one,
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/effect/turf_decal/industrial/warning,
+/obj/structure/table/reinforced,
+/obj/machinery/computer/helm/viewscreen{
+	dir = 1
+	},
+/turf/open/floor/plasteel/patterned,
+/area/ship/cargo)
+"CC" = (
+/obj/machinery/atmospherics/pipe/layer_manifold,
+/turf/closed/wall/mineral/titanium/nodiagonal,
 /area/ship/cargo)
 "CD" = (
 /obj/structure/catwalk/over/plated_catwalk,
@@ -2076,26 +2511,52 @@
 /obj/machinery/door/firedoor/border_only,
 /turf/open/floor/plasteel,
 /area/ship/engineering/communications)
+"CT" = (
+/obj/machinery/autolathe,
+/obj/item/stack/sheet/glass/five,
+/obj/item/stack/sheet/metal/five{
+	pixel_y = 3
+	},
+/turf/open/floor/plasteel/patterned/ridged,
+/area/ship/hallway/aft)
 "CX" = (
 /obj/structure/chair/stool/bar{
 	dir = 8
 	},
-/turf/open/floor/plasteel,
-/area/ship/crew/canteen)
-"Df" = (
 /obj/effect/turf_decal/corner/transparent/neutral{
-	dir = 9
+	dir = 8
 	},
-/obj/effect/turf_decal/corner/transparent/neutral{
-	dir = 2
+/turf/open/floor/plasteel/patterned,
+/area/ship/crew/canteen)
+"Df" = (
+/obj/effect/turf_decal/corner/transparent/neutral/three_quarters{
+	dir = 1
 	},
 /turf/open/floor/plasteel,
 /area/ship/hallway/central)
 "Dj" = (
-/obj/structure/table,
-/obj/item/paper_bin,
-/obj/item/pen,
-/turf/open/floor/plasteel,
+/obj/effect/turf_decal/industrial/warning{
+	dir = 8
+	},
+/obj/effect/turf_decal/industrial/warning{
+	dir = 4
+	},
+/obj/machinery/door/poddoor{
+	id = "tegus_shuttle_door"
+	},
+/obj/docking_port/mobile{
+	can_move_docking_ports = 1;
+	dir = 8;
+	launch_status = 0;
+	preferred_direction = 4
+	},
+/turf/open/floor/plating,
+/area/ship/cargo)
+"Dk" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 8
+	},
+/turf/open/floor/plasteel/patterned,
 /area/ship/cargo)
 "DA" = (
 /turf/closed/wall/mineral/titanium,
@@ -2104,15 +2565,23 @@
 /obj/machinery/atmospherics/components/unary/tank/air{
 	piping_layer = 4
 	},
-/turf/open/floor/plasteel/patterned,
+/turf/open/floor/plasteel/patterned/ridged,
 /area/ship/maintenance/port)
 "Ea" = (
 /obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+/obj/effect/turf_decal/industrial/warning{
 	dir = 4
 	},
 /turf/open/floor/plasteel,
 /area/ship/hallway/aft)
+"Eg" = (
+/obj/effect/turf_decal/industrial/hatch/yellow,
+/obj/machinery/firealarm{
+	dir = 4;
+	pixel_x = -25
+	},
+/turf/open/floor/plasteel/patterned,
+/area/ship/cargo)
 "Em" = (
 /obj/machinery/power/terminal{
 	dir = 8
@@ -2121,8 +2590,17 @@
 /obj/structure/cable{
 	icon_state = "0-4"
 	},
-/turf/open/floor/plasteel/patterned/ridged,
+/turf/open/floor/plasteel/patterned,
 /area/ship/maintenance/starboard)
+"En" = (
+/obj/structure/cable{
+	icon_state = "2-8"
+	},
+/obj/structure/cable{
+	icon_state = "2-4"
+	},
+/turf/open/floor/plasteel/patterned/ridged,
+/area/ship/cargo)
 "Ev" = (
 /obj/structure/table/reinforced,
 /obj/item/radio/intercom/wideband{
@@ -2131,17 +2609,6 @@
 	},
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/bridge)
-"EA" = (
-/obj/effect/turf_decal/industrial/warning,
-/obj/machinery/light/floor,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
-	dir = 4
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/turf/open/floor/plasteel/patterned,
-/area/ship/cargo)
 "ES" = (
 /obj/effect/turf_decal/corner/transparent/ntblue{
 	dir = 4
@@ -2151,30 +2618,42 @@
 	},
 /obj/machinery/power/apc/auto_name/south,
 /obj/structure/cable,
-/turf/open/floor/plasteel,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+	dir = 1
+	},
+/turf/open/floor/plasteel/dark,
 /area/ship/engineering/communications)
-"Fd" = (
-/obj/effect/turf_decal/industrial/warning,
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+"EU" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
 	dir = 8
 	},
+/obj/effect/turf_decal/industrial/warning,
+/turf/open/floor/plasteel/patterned,
+/area/ship/cargo)
+"Fd" = (
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
+/obj/effect/turf_decal/industrial/warning,
 /turf/open/floor/plasteel/patterned,
 /area/ship/cargo)
 "Fg" = (
-/obj/effect/turf_decal/corner/transparent/brown{
+/obj/effect/turf_decal/industrial/warning/corner{
 	dir = 4
 	},
-/obj/item/kirbyplants{
-	icon_state = "plant-14";
-	pixel_y = 5
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 8
 	},
 /obj/structure/extinguisher_cabinet{
 	pixel_y = 32
 	},
-/turf/open/floor/plasteel,
+/turf/open/floor/plasteel/patterned,
 /area/ship/cargo)
 "Fk" = (
 /obj/effect/turf_decal/corner/transparent/brown{
@@ -2189,7 +2668,6 @@
 /turf/open/floor/plasteel,
 /area/ship/hallway/central)
 "Fn" = (
-/obj/structure/railing,
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
@@ -2199,9 +2677,8 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
 	dir = 4
 	},
-/turf/open/floor/plasteel/stairs{
-	dir = 8
-	},
+/obj/structure/catwalk/over/plated_catwalk,
+/turf/open/floor/plating,
 /area/ship/hallway/aft)
 "Ft" = (
 /obj/effect/turf_decal/corner/transparent/brown{
@@ -2215,6 +2692,18 @@
 	},
 /turf/open/floor/plasteel,
 /area/ship/hallway/central)
+"Fy" = (
+/obj/structure/table,
+/obj/item/crowbar{
+	pixel_y = 6;
+	pixel_x = -2
+	},
+/obj/item/stock_parts/cell/high/empty{
+	pixel_x = 3;
+	pixel_y = -8
+	},
+/turf/open/floor/plasteel/patterned/ridged,
+/area/ship/hallway/aft)
 "FA" = (
 /obj/effect/turf_decal/corner/transparent/neutral{
 	dir = 1
@@ -2231,6 +2720,15 @@
 	},
 /turf/open/floor/plasteel,
 /area/ship/crew)
+"FF" = (
+/obj/effect/turf_decal/industrial/caution{
+	dir = 8
+	},
+/obj/machinery/light/small{
+	dir = 1
+	},
+/turf/open/floor/engine/hull,
+/area/ship/cargo)
 "FL" = (
 /obj/effect/turf_decal/corner/transparent/ntblue{
 	dir = 4
@@ -2244,24 +2742,27 @@
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
 	dir = 1
 	},
-/turf/open/floor/plasteel,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 1
+	},
+/turf/open/floor/plasteel/dark,
 /area/ship/engineering/communications)
 "FN" = (
-/obj/effect/turf_decal/industrial/warning,
 /obj/machinery/light/floor,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
-	dir = 8
-	},
+/obj/effect/turf_decal/industrial/warning,
 /obj/structure/cable{
-	icon_state = "1-8"
+	icon_state = "1-4"
 	},
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/turf/open/floor/plasteel/patterned,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 8
+	},
+/turf/open/floor/plasteel/patterned/cargo_one,
 /area/ship/cargo)
 "FQ" = (
 /obj/machinery/light,
@@ -2283,11 +2784,14 @@
 /obj/structure/cable{
 	icon_state = "1-8"
 	},
-/turf/open/floor/plasteel/patterned,
+/turf/open/floor/plasteel,
 /area/ship/maintenance/starboard)
 "Gg" = (
-/obj/structure/cable{
-	icon_state = "2-8"
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 10
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 10
 	},
 /turf/open/floor/plasteel/patterned,
 /area/ship/cargo)
@@ -2295,29 +2799,26 @@
 /turf/closed/wall/mineral/titanium/nodiagonal,
 /area/ship/crew)
 "Gx" = (
-/obj/effect/turf_decal/corner/transparent/neutral{
-	dir = 9
-	},
-/obj/effect/turf_decal/corner/transparent/neutral{
-	dir = 2
-	},
 /obj/machinery/power/apc/auto_name/east,
 /obj/structure/cable{
 	icon_state = "0-8"
 	},
+/obj/effect/turf_decal/corner/transparent/neutral/three_quarters{
+	dir = 1
+	},
 /turf/open/floor/plasteel,
 /area/ship/hallway/central)
 "GF" = (
 /obj/structure/catwalk/over/plated_catwalk,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
-	dir = 9
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
-	dir = 9
-	},
 /obj/machinery/advanced_airlock_controller{
 	pixel_x = 32
 	},
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4{
+	dir = 4
+	},
 /turf/open/floor/plating,
 /area/ship/hallway/central)
 "GQ" = (
@@ -2336,13 +2837,15 @@
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
 "Hk" = (
-/obj/effect/turf_decal/industrial/outline/yellow,
-/obj/structure/closet/crate,
-/obj/machinery/firealarm{
-	dir = 4;
-	pixel_x = -25
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel,
+/area/ship/hallway/aft)
+"Hl" = (
+/obj/effect/turf_decal/industrial/caution{
+	dir = 8
 	},
-/turf/open/floor/plasteel/patterned,
+/obj/machinery/light/small,
+/turf/open/floor/engine/hull,
 /area/ship/cargo)
 "Ht" = (
 /obj/effect/turf_decal/corner/transparent/lime{
@@ -2370,21 +2873,50 @@
 	},
 /turf/open/floor/plasteel,
 /area/ship/hallway/central)
+"HP" = (
+/obj/structure/table,
+/obj/item/clipboard{
+	pixel_y = 3;
+	pixel_x = 13
+	},
+/obj/item/flashlight/lamp{
+	pixel_y = 3;
+	pixel_x = -4
+	},
+/turf/open/floor/plasteel/patterned/ridged,
+/area/ship/cargo)
 "HY" = (
-/obj/effect/turf_decal/corner/transparent/brown,
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/machinery/firealarm{
 	dir = 4;
 	pixel_x = -25
 	},
-/turf/open/floor/plasteel,
+/obj/structure/filingcabinet/double,
+/obj/effect/turf_decal/spline/fancy/opaque/grey{
+	dir = 4
+	},
+/obj/effect/turf_decal/industrial/hatch/yellow,
+/obj/effect/turf_decal/industrial/warning/corner{
+	dir = 4
+	},
+/obj/structure/railing{
+	dir = 4
+	},
+/turf/open/floor/plasteel/patterned/ridged,
 /area/ship/hallway/aft)
 "Ia" = (
-/obj/effect/turf_decal/industrial/hatch/yellow,
-/obj/machinery/firealarm{
-	pixel_y = 25
+/obj/effect/turf_decal/spline/fancy/opaque/black{
+	dir = 1
 	},
-/turf/open/floor/plasteel/patterned,
+/obj/machinery/conveyor{
+	dir = 8;
+	id = "tegusbelt"
+	},
+/obj/structure/railing/corner{
+	dir = 8;
+	layer = 4.1
+	},
+/turf/open/floor/plasteel/tech/grid,
 /area/ship/cargo)
 "Iv" = (
 /obj/effect/turf_decal/corner/transparent/ntblue,
@@ -2403,16 +2935,33 @@
 /obj/structure/cable{
 	icon_state = "2-8"
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
 	dir = 10
 	},
-/turf/open/floor/plasteel/patterned,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
+/turf/open/floor/plasteel/patterned/ridged,
 /area/ship/crew/canteen)
 "IF" = (
 /obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/turf_decal/corner/transparent/solgovgold{
+	dir = 4
+	},
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+	dir = 4
+	},
 /turf/open/floor/plasteel/patterned,
 /area/ship/hallway/aft)
+"IU" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/effect/turf_decal/industrial/warning,
+/obj/machinery/light/floor,
+/turf/open/floor/plasteel/patterned/cargo_one,
+/area/ship/cargo)
 "Jr" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/structure/cable{
@@ -2427,7 +2976,8 @@
 /obj/structure/extinguisher_cabinet{
 	pixel_x = 32
 	},
-/turf/open/floor/plasteel/patterned,
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel,
 /area/ship/hallway/aft)
 "JO" = (
 /obj/effect/turf_decal/corner/transparent/brown{
@@ -2458,9 +3008,17 @@
 /turf/open/floor/plasteel,
 /area/ship/hallway/central)
 "Kj" = (
-/obj/structure/tank_dispenser,
-/turf/open/floor/plasteel/patterned,
-/area/ship/hallway/aft)
+/obj/effect/decal/cleanable/oil/slippery,
+/obj/effect/turf_decal/spline/fancy/opaque/black,
+/obj/item/caution{
+	pixel_y = 12;
+	pixel_x = 14
+	},
+/obj/structure/railing{
+	layer = 4.1
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/cargo)
 "Ku" = (
 /turf/closed/wall/mineral/titanium,
 /area/ship/maintenance/port)
@@ -2472,7 +3030,7 @@
 /obj/structure/cable{
 	icon_state = "0-8"
 	},
-/turf/open/floor/plating,
+/turf/open/floor/plasteel/tech/grid,
 /area/ship/maintenance/starboard)
 "KI" = (
 /obj/structure/cable{
@@ -2494,7 +3052,7 @@
 	name = "captain's locker";
 	req_access_txt = "20";
 	icon_state = "solgov_wall";
-	pixel_y = 30
+	pixel_y = 28
 	},
 /obj/item/storage/backpack/captain,
 /obj/item/storage/backpack/duffelbag/captain,
@@ -2525,19 +3083,31 @@
 "Ls" = (
 /obj/structure/rack,
 /obj/effect/decal/cleanable/dirt/dust,
-/obj/item/stack/sheet/mineral/plasma/five,
 /obj/item/stack/sheet/mineral/uranium/five,
-/turf/open/floor/plasteel/patterned,
+/turf/open/floor/plasteel/patterned/ridged,
 /area/ship/maintenance/starboard)
 "Lw" = (
-/obj/effect/turf_decal/industrial/warning,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
-	dir = 4
-	},
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/turf/open/floor/plasteel/patterned,
+/obj/effect/turf_decal/industrial/warning,
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4,
+/obj/structure/table/reinforced,
+/obj/machinery/button/shieldwallgen{
+	id = "cargo_shield_fore";
+	pixel_y = 2;
+	name = "Shuttle Bay Holofield";
+	pixel_x = 6;
+	dir = 1
+	},
+/obj/machinery/button/door{
+	pixel_x = -6;
+	id = "tegus_shuttle_door";
+	name = "Shuttle Bay Blast Door";
+	dir = 1;
+	pixel_y = 2
+	},
+/turf/open/floor/plasteel/patterned/ridged,
 /area/ship/cargo)
 "LC" = (
 /obj/effect/turf_decal/industrial/warning,
@@ -2553,6 +3123,16 @@
 /obj/structure/tank_dispenser,
 /turf/open/floor/plasteel/patterned/ridged,
 /area/ship/hallway/central)
+"LR" = (
+/obj/effect/turf_decal/industrial/warning{
+	dir = 4
+	},
+/obj/effect/turf_decal/industrial/warning{
+	dir = 8
+	},
+/obj/machinery/door/airlock/external,
+/turf/open/floor/plating,
+/area/ship/cargo)
 "LV" = (
 /obj/machinery/door/airlock/external,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
@@ -2566,15 +3146,29 @@
 /turf/open/floor/plasteel,
 /area/ship/hallway/central)
 "Me" = (
-/obj/effect/turf_decal/borderfloor/full,
-/obj/machinery/door/firedoor/border_only{
+/obj/effect/turf_decal/corner/transparent/neutral{
+	dir = 8
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/cargo)
+"Ml" = (
+/obj/effect/turf_decal/industrial/warning{
 	dir = 4
 	},
-/obj/machinery/door/firedoor/border_only{
-	dir = 8
+/obj/structure/cable{
+	icon_state = "1-2"
 	},
-/turf/open/floor/plasteel/tech/grid,
-/area/ship/hallway/central)
+/obj/structure/cable{
+	icon_state = "1-8"
+	},
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4{
+	dir = 4
+	},
+/turf/open/floor/plasteel,
+/area/ship/cargo)
 "Mx" = (
 /obj/machinery/button/door{
 	pixel_x = -5;
@@ -2590,7 +3184,10 @@
 	dir = 1;
 	name = "Cargo Holofield"
 	},
-/turf/open/floor/plasteel/patterned/ridged,
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/turf/open/floor/plasteel/patterned,
 /area/ship/cargo)
 "MH" = (
 /obj/structure/table/reinforced,
@@ -2599,6 +3196,26 @@
 	},
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
+"ML" = (
+/obj/structure/closet/secure_closet/miningcloset{
+	req_access_txt = "48"
+	},
+/obj/item/flashlight/seclite,
+/obj/item/storage/bag/ore,
+/obj/item/kitchen/knife/combat/survival,
+/obj/item/gun/energy/kinetic_accelerator,
+/obj/item/stack/marker_beacon/thirty,
+/obj/item/gps/mining,
+/obj/item/storage/backpack/satchel/explorer,
+/obj/item/clothing/glasses/meson/prescription,
+/obj/item/clothing/glasses/meson,
+/obj/item/t_scanner/adv_mining_scanner/lesser,
+/obj/machinery/door/window/eastright{
+	dir = 1
+	},
+/obj/structure/window/reinforced/spawner/west,
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/cargo)
 "MP" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -2617,23 +3234,20 @@
 "MS" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
+/obj/structure/extinguisher_cabinet{
+	pixel_x = 32
+	},
 /turf/open/floor/plasteel/patterned/ridged,
 /area/ship/hallway/central)
 "MU" = (
-/obj/effect/turf_decal/corner/transparent/brown{
-	dir = 8
-	},
 /obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/plasteel,
+/obj/structure/catwalk/over/plated_catwalk,
+/turf/open/floor/plating,
 /area/ship/hallway/aft)
 "MY" = (
-/obj/structure/rack,
-/obj/item/tank/internals/emergency_oxygen/double,
-/obj/item/tank/internals/emergency_oxygen/double,
-/obj/item/tank/internals/emergency_oxygen/double,
-/obj/item/storage/firstaid,
-/obj/item/gps/mining/internal,
-/turf/open/floor/plasteel/patterned/ridged,
+/obj/machinery/power/apc/auto_name/west,
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/patterned,
 /area/ship/hallway/aft)
 "Nb" = (
 /obj/machinery/power/terminal{
@@ -2646,7 +3260,7 @@
 /obj/machinery/firealarm{
 	pixel_y = 25
 	},
-/turf/open/floor/plasteel/patterned/ridged,
+/turf/open/floor/plasteel/patterned,
 /area/ship/maintenance/starboard)
 "Nc" = (
 /obj/effect/turf_decal/corner/transparent/lime{
@@ -2665,10 +3279,18 @@
 /turf/open/floor/plasteel,
 /area/ship/crew)
 "Nw" = (
-/obj/effect/turf_decal/corner/transparent/brown,
 /obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/plasteel,
+/obj/effect/turf_decal/corner/transparent/solgovgold{
+	dir = 4
+	},
+/obj/effect/turf_decal/industrial/warning{
+	dir = 4
+	},
+/turf/open/floor/plasteel/patterned,
 /area/ship/hallway/aft)
+"Nx" = (
+/turf/closed/wall/mineral/titanium,
+/area/ship/cargo)
 "Nz" = (
 /obj/effect/turf_decal/corner/transparent/lime,
 /obj/effect/turf_decal/corner/transparent/neutral{
@@ -2706,7 +3328,7 @@
 	network = "ntsv_commnet";
 	id = "Nanotrasen Receiver"
 	},
-/turf/open/floor/plasteel/patterned/ridged,
+/turf/open/floor/plasteel/tech/grid,
 /area/ship/engineering/communications)
 "NU" = (
 /obj/effect/turf_decal/corner/transparent/brown,
@@ -2727,9 +3349,11 @@
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/bridge)
 "NZ" = (
-/obj/effect/turf_decal/industrial/outline/yellow,
-/obj/structure/cable{
-	icon_state = "1-2"
+/obj/effect/turf_decal/industrial/warning{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 8
 	},
 /turf/open/floor/plasteel/patterned,
 /area/ship/cargo)
@@ -2754,11 +3378,11 @@
 /area/ship/hallway/central)
 "Or" = (
 /obj/structure/catwalk/over/plated_catwalk,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
-	dir = 10
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4{
+	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
-	dir = 10
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2{
+	dir = 4
 	},
 /turf/open/floor/plating,
 /area/ship/hallway/central)
@@ -2780,6 +3404,18 @@
 /obj/effect/turf_decal/box/white,
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
+"Ox" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 8
+	},
+/turf/open/floor/plasteel,
+/area/ship/cargo)
 "OK" = (
 /obj/effect/turf_decal/corner/transparent/lime{
 	dir = 4
@@ -2791,11 +3427,18 @@
 "OL" = (
 /turf/closed/wall/mineral/titanium/nodiagonal,
 /area/ship/crew/canteen)
+"OQ" = (
+/obj/machinery/suit_storage_unit/mining,
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/cargo)
 "OW" = (
-/obj/effect/turf_decal/corner/transparent/brown{
+/obj/structure/railing{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
+/obj/effect/turf_decal/spline/fancy/opaque/grey{
+	dir = 4
+	},
+/turf/open/floor/plasteel/patterned,
 /area/ship/hallway/aft)
 "OX" = (
 /obj/effect/turf_decal/borderfloor/full,
@@ -2811,11 +3454,11 @@
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/hallway/central)
 "Pb" = (
-/obj/structure/table,
-/obj/item/clipboard{
-	pixel_y = -4
+/obj/effect/turf_decal/industrial/outline/yellow,
+/obj/machinery/light{
+	dir = 8
 	},
-/turf/open/floor/plasteel,
+/turf/open/floor/plasteel/patterned,
 /area/ship/cargo)
 "Pl" = (
 /obj/effect/turf_decal/corner/transparent/lime,
@@ -2841,27 +3484,24 @@
 "Pw" = (
 /obj/effect/turf_decal/corner/transparent/neutral/full,
 /obj/effect/turf_decal/corner/transparent/bar/diagonal,
-/obj/structure/closet/crate/bin,
+/obj/machinery/vending/boozeomat,
 /turf/open/floor/plasteel,
 /area/ship/crew/canteen)
 "PF" = (
 /obj/effect/turf_decal/industrial/warning{
 	dir = 1
 	},
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
-	dir = 8
-	},
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
 /turf/open/floor/plasteel/patterned,
 /area/ship/cargo)
-"PL" = (
-/obj/structure/chair/office{
-	dir = 8
+"PI" = (
+/obj/effect/turf_decal/corner/transparent/neutral{
+	dir = 10
 	},
-/obj/machinery/light,
-/turf/open/floor/plasteel,
+/obj/effect/turf_decal/industrial/warning,
+/turf/open/floor/plasteel/dark,
 /area/ship/cargo)
 "PQ" = (
 /obj/effect/turf_decal/corner/transparent/solgovgold{
@@ -2877,6 +3517,19 @@
 "Qa" = (
 /turf/closed/wall/mineral/titanium,
 /area/ship/maintenance/starboard)
+"Qq" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/railing{
+	dir = 4
+	},
+/obj/effect/turf_decal/spline/fancy/opaque/grey{
+	dir = 4
+	},
+/obj/effect/turf_decal/industrial/warning/corner{
+	dir = 4
+	},
+/turf/open/floor/plasteel,
+/area/ship/hallway/aft)
 "Qw" = (
 /obj/structure/cable{
 	icon_state = "1-4"
@@ -2895,24 +3548,23 @@
 	icon_state = "1-2"
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
-	dir = 1
-	},
 /obj/structure/catwalk/over/plated_catwalk,
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2{
+	dir = 4
+	},
 /turf/open/floor/plating,
 /area/ship/hallway/aft)
 "QZ" = (
-/obj/effect/turf_decal/corner/transparent/brown,
-/obj/machinery/mineral/ore_redemption{
-	dir = 4;
-	output_dir = 8;
-	input_dir = 4
+/obj/effect/turf_decal/corner/transparent/neutral{
+	dir = 5
 	},
-/turf/open/floor/plasteel,
+/obj/effect/turf_decal/industrial/warning{
+	dir = 1
+	},
+/turf/open/floor/plasteel/dark,
 /area/ship/cargo)
 "Rm" = (
 /obj/structure/table/reinforced,
-/obj/item/storage/box/donkpockets/donkpocketspicy,
 /turf/open/floor/plasteel,
 /area/ship/crew/canteen)
 "Rp" = (
@@ -2929,26 +3581,25 @@
 /obj/machinery/light{
 	dir = 8
 	},
-/turf/open/floor/plasteel/patterned/ridged,
+/turf/open/floor/plasteel/tech/grid,
 /area/ship/engineering/communications)
 "Rx" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
-	dir = 6
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
-	dir = 6
+/obj/effect/turf_decal/industrial/hatch/yellow,
+/obj/structure/ore_box,
+/turf/open/floor/plasteel/patterned,
+/area/ship/cargo)
+"Ry" = (
+/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/layer4{
+	dir = 8
 	},
-/obj/structure/cable{
-	icon_state = "2-4"
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 8
 	},
-/turf/open/floor/plasteel,
-/area/ship/cargo)
-"Ry" = (
-/obj/effect/turf_decal/corner/transparent/brown{
-	dir = 1
+/obj/machinery/light/small{
+	dir = 8
 	},
-/turf/open/floor/plasteel,
-/area/ship/hallway/aft)
+/turf/open/floor/plasteel/patterned/ridged,
+/area/ship/hallway/central)
 "Rz" = (
 /turf/closed/wall/mineral/titanium/nodiagonal,
 /area/ship/hallway/aft)
@@ -2961,45 +3612,54 @@
 	},
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/bridge)
-"RI" = (
-/obj/structure/cable{
-	icon_state = "2-8"
+"RF" = (
+/obj/machinery/light{
+	dir = 1
 	},
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4{
-	dir = 4
+/obj/effect/turf_decal/spline/fancy/opaque/black,
+/obj/structure/railing{
+	layer = 4.1
 	},
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2{
-	dir = 4
+/turf/open/floor/plasteel/dark,
+/area/ship/cargo)
+"RI" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 9
 	},
-/obj/structure/cable{
-	icon_state = "1-2"
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 9
 	},
-/turf/open/floor/plasteel,
+/turf/open/floor/plating,
 /area/ship/cargo)
-"RP" = (
-/obj/effect/turf_decal/industrial/warning{
-	dir = 1
+"RJ" = (
+/obj/structure/railing/corner{
+	layer = 4.1
 	},
-/obj/machinery/light/floor,
-/obj/machinery/button/door{
-	pixel_x = 27;
-	id = "tegus_shuttle_door";
-	name = "Shuttle Bay Blast Door";
-	dir = 8;
-	pixel_y = 5
+/obj/effect/turf_decal/corner/transparent/solgovgold{
+	dir = 8
 	},
-/obj/machinery/button/shieldwallgen{
-	pixel_x = 27;
-	id = "cargo_shield_fore";
-	pixel_y = -5;
-	dir = 8;
-	name = "Shuttle Bay Holofield"
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/power/apc/auto_name/north,
+/obj/structure/cable{
+	icon_state = "0-2"
 	},
+/turf/open/floor/plasteel,
+/area/ship/maintenance/starboard)
+"RP" = (
 /obj/structure/cable{
-	icon_state = "5-8"
+	icon_state = "4-8"
 	},
-/turf/open/floor/plasteel/patterned,
+/obj/machinery/atmospherics/pipe/layer_manifold,
+/turf/closed/wall/mineral/titanium/nodiagonal,
 /area/ship/cargo)
+"RQ" = (
+/mob/living/simple_animal/hostile/retaliate/tegu/atlas{
+	dir = 8;
+	faction = list("neutral")
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/bridge)
 "RR" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -3013,8 +3673,20 @@
 /obj/machinery/door/firedoor/border_only{
 	dir = 1
 	},
-/turf/open/floor/plasteel/patterned,
+/turf/open/floor/plasteel/dark,
 /area/ship/hallway/aft)
+"RT" = (
+/obj/effect/turf_decal/industrial/warning{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 8
+	},
+/turf/open/floor/plasteel/patterned,
+/area/ship/cargo)
 "Sa" = (
 /obj/effect/turf_decal/corner/transparent/lime{
 	dir = 4
@@ -3079,6 +3751,17 @@
 	},
 /turf/open/floor/plasteel,
 /area/ship/hallway/central)
+"SI" = (
+/obj/machinery/conveyor{
+	dir = 1;
+	id = "tegusbelt"
+	},
+/obj/machinery/mineral/unloading_machine{
+	input_dir = 4;
+	output_dir = 1
+	},
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/cargo)
 "SN" = (
 /obj/effect/turf_decal/corner/transparent/lime{
 	dir = 4
@@ -3093,11 +3776,16 @@
 /turf/open/floor/plasteel,
 /area/ship/hallway/central)
 "SS" = (
-/obj/structure/railing,
-/turf/open/floor/plasteel/stairs{
-	dir = 4
+/obj/item/kirbyplants{
+	icon_state = "plant-10";
+	pixel_y = 7
 	},
-/area/ship/maintenance/starboard)
+/obj/structure/railing{
+	layer = 4.1
+	},
+/obj/effect/turf_decal/spline/fancy/opaque/grey,
+/turf/open/floor/plasteel/patterned,
+/area/ship/hallway/aft)
 "SW" = (
 /obj/structure/catwalk/over/plated_catwalk,
 /obj/structure/railing{
@@ -3118,11 +3806,6 @@
 /obj/machinery/light,
 /turf/open/floor/plasteel/patterned,
 /area/ship/crew)
-"Ty" = (
-/obj/effect/turf_decal/industrial/outline/yellow,
-/obj/structure/ore_box,
-/turf/open/floor/plasteel/patterned,
-/area/ship/cargo)
 "TB" = (
 /obj/machinery/door/airlock{
 	name = "Bathroom"
@@ -3131,12 +3814,9 @@
 /turf/open/floor/plastic,
 /area/ship/crew/canteen)
 "TH" = (
-/obj/effect/turf_decal/industrial/warning,
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/turf/open/floor/plasteel/patterned/ridged,
-/area/ship/cargo)
+/obj/structure/catwalk/over/plated_catwalk,
+/turf/open/floor/plating,
+/area/ship/hallway/central)
 "Ub" = (
 /obj/effect/turf_decal/corner/transparent/lime{
 	dir = 4
@@ -3150,23 +3830,14 @@
 /turf/open/floor/plasteel,
 /area/ship/hallway/central)
 "UD" = (
-/obj/machinery/power/apc/auto_name/north,
-/obj/structure/cable{
-	icon_state = "0-4"
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
-	dir = 4
-	},
-/turf/open/floor/plasteel,
+/obj/machinery/door/window/eastleft,
+/turf/open/floor/plasteel/patterned/ridged,
 /area/ship/crew/canteen)
 "UM" = (
-/obj/effect/turf_decal/corner/transparent/neutral{
-	dir = 9
-	},
-/obj/effect/turf_decal/corner/transparent/neutral{
-	dir = 2
-	},
 /obj/machinery/airalarm/directional/east,
+/obj/effect/turf_decal/corner/transparent/neutral/three_quarters{
+	dir = 1
+	},
 /turf/open/floor/plasteel,
 /area/ship/hallway/central)
 "UY" = (
@@ -3228,19 +3899,20 @@
 "Vs" = (
 /obj/effect/turf_decal/corner/transparent/neutral/full,
 /obj/effect/turf_decal/corner/transparent/bar/diagonal,
-/obj/machinery/microwave{
-	pixel_y = 6;
-	layer = 3
-	},
 /obj/structure/table,
+/obj/item/storage/box/donkpockets/donkpocketspicy{
+	pixel_y = 4
+	},
 /turf/open/floor/plasteel,
 /area/ship/crew/canteen)
 "Vv" = (
-/mob/living/simple_animal/hostile/retaliate/tegu/atlas{
-	dir = 8
+/obj/effect/turf_decal/spline/fancy/opaque/black,
+/obj/effect/turf_decal/industrial/warning/corner,
+/obj/structure/railing{
+	layer = 4.1
 	},
 /turf/open/floor/plasteel/dark,
-/area/ship/bridge)
+/area/ship/cargo)
 "Vy" = (
 /obj/structure/catwalk/over/plated_catwalk,
 /obj/machinery/firealarm{
@@ -3259,27 +3931,29 @@
 /obj/effect/turf_decal/industrial/caution{
 	dir = 4
 	},
+/obj/machinery/door/poddoor{
+	id = "tegus_shuttle_door"
+	},
 /turf/open/floor/plating,
 /area/ship/cargo)
 "VO" = (
-/obj/machinery/suit_storage_unit/standard_unit,
-/obj/machinery/light/small{
-	dir = 8
-	},
 /obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/layer4{
 	dir = 8
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/light/small{
 	dir = 8
 	},
 /turf/open/floor/plasteel/patterned/ridged,
 /area/ship/hallway/central)
 "VU" = (
 /obj/structure/cable{
-	icon_state = "1-2"
+	icon_state = "2-8"
 	},
 /obj/structure/cable{
-	icon_state = "1-4"
+	icon_state = "4-8"
 	},
 /turf/open/floor/plasteel/patterned/ridged,
 /area/ship/cargo)
@@ -3311,6 +3985,16 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
 /turf/open/floor/plating,
 /area/ship/maintenance/starboard)
+"Ww" = (
+/obj/effect/turf_decal/corner/transparent/neutral/three_quarters{
+	dir = 4
+	},
+/obj/effect/turf_decal/industrial/warning{
+	dir = 9
+	},
+/obj/machinery/airalarm/directional/south,
+/turf/open/floor/plasteel/dark,
+/area/ship/cargo)
 "WO" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -3330,32 +4014,35 @@
 /turf/closed/wall/mineral/titanium/nodiagonal,
 /area/ship/engineering/communications)
 "WS" = (
-/obj/structure/railing/corner,
-/obj/effect/turf_decal/corner/transparent/solgovgold{
-	dir = 8
+/obj/structure/railing/corner{
+	layer = 4.1
 	},
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/power/apc/auto_name/north,
-/obj/structure/cable{
-	icon_state = "0-2"
+/obj/machinery/mineral/processing_unit{
+	input_dir = 4;
+	output_dir = 8
 	},
-/turf/open/floor/plasteel/patterned,
-/area/ship/maintenance/starboard)
+/obj/machinery/conveyor{
+	dir = 8;
+	id = "tegusbelt"
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/cargo)
+"WV" = (
+/obj/effect/turf_decal/corner/transparent/neutral{
+	dir = 4
+	},
+/obj/effect/turf_decal/industrial/warning{
+	dir = 1
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/cargo)
 "Xm" = (
 /obj/effect/turf_decal/industrial/outline/yellow,
 /obj/structure/closet/crate,
 /turf/open/floor/plasteel/patterned,
 /area/ship/cargo)
 "Xy" = (
-/obj/effect/turf_decal/corner/transparent/brown{
-	dir = 1
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/turf/open/floor/plasteel,
+/turf/open/floor/plasteel/stairs,
 /area/ship/cargo)
 "XC" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
@@ -3398,7 +4085,7 @@
 	network = "ntsv_commnet";
 	id = "Tegus Relay"
 	},
-/turf/open/floor/plasteel/patterned/ridged,
+/turf/open/floor/plasteel/tech/grid,
 /area/ship/engineering/communications)
 "Yk" = (
 /obj/structure/cable{
@@ -3448,9 +4135,10 @@
 	id = "tegus_port_engine";
 	name = "Engine Blast Door"
 	},
-/turf/open/floor/plasteel/patterned,
+/turf/open/floor/plasteel/patterned/ridged,
 /area/ship/maintenance/port)
 "YV" = (
+/obj/machinery/light,
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
@@ -3471,20 +4159,45 @@
 /obj/effect/turf_decal/corner/transparent/neutral,
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
+"Zp" = (
+/obj/machinery/conveyor{
+	dir = 8;
+	id = "tegusbelt"
+	},
+/obj/structure/railing{
+	layer = 4.1
+	},
+/obj/effect/turf_decal/spline/fancy/opaque/black{
+	dir = 1
+	},
+/obj/machinery/mineral/processing_unit_console{
+	machinedir = 8;
+	pixel_x = -30;
+	pixel_y = 28
+	},
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/cargo)
 "Zs" = (
 /obj/machinery/atmospherics/pipe/layer_manifold{
 	dir = 4
 	},
 /turf/closed/wall/mineral/titanium/nodiagonal,
 /area/ship/crew)
+"Zw" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 9
+	},
+/turf/open/floor/plasteel/patterned,
+/area/ship/cargo)
 "ZY" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/machinery/light{
 	dir = 4
 	},
-/obj/structure/chair/office{
-	dir = 8
+/obj/structure/table,
+/obj/item/toy/cards/deck{
+	pixel_y = 3
 	},
 /turf/open/floor/plasteel,
 /area/ship/hallway/aft)
@@ -3495,6 +4208,7 @@ ut
 ut
 ut
 ut
+ut
 li
 XM
 Rz
@@ -3512,23 +4226,25 @@ ut
 ut
 ut
 ut
+ut
 "}
 (2,1,1) = {"
 ut
+ut
 db
 bb
 bb
 bb
 GU
 Rz
+CT
+Fy
 kg
-kg
-kg
-Kj
+SS
 MY
+Hk
 nn
-nn
-nn
+ht
 Rz
 Rz
 bl
@@ -3536,8 +4252,10 @@ bl
 bl
 RB
 ut
+ut
 "}
 (3,1,1) = {"
+ut
 Ku
 db
 cK
@@ -3547,8 +4265,8 @@ GU
 OW
 BP
 Ea
-IF
-Ry
+Qq
+cO
 MU
 IF
 qi
@@ -3560,8 +4278,10 @@ Vf
 Vf
 RB
 Qa
+ut
 "}
 (4,1,1) = {"
+ut
 db
 YT
 eN
@@ -3584,8 +4304,10 @@ pH
 Em
 yL
 RB
+ut
 "}
 (5,1,1) = {"
+ut
 db
 rZ
 cP
@@ -3608,8 +4330,10 @@ mu
 Gb
 xZ
 RB
+ut
 "}
 (6,1,1) = {"
+ut
 db
 DF
 qd
@@ -3620,7 +4344,7 @@ hL
 hL
 hL
 hL
-Me
+lW
 qS
 hL
 hL
@@ -3632,8 +4356,10 @@ yg
 kM
 pC
 RB
+ut
 "}
 (7,1,1) = {"
+ut
 Ku
 db
 iM
@@ -3651,14 +4377,16 @@ XS
 jQ
 iV
 hL
-WS
+RJ
 SW
 wv
 RB
 Qa
+ut
 "}
 (8,1,1) = {"
 ut
+ut
 OL
 OL
 OL
@@ -3675,14 +4403,16 @@ dY
 FL
 ES
 hL
-SS
+Bn
 Ky
 yI
 RB
 ut
+ut
 "}
 (9,1,1) = {"
 ut
+ut
 OL
 Pw
 Vs
@@ -3704,9 +4434,11 @@ CD
 PQ
 RB
 ut
+ut
 "}
 (10,1,1) = {"
 ut
+ut
 OL
 dV
 nk
@@ -3728,9 +4460,11 @@ Ls
 wc
 RB
 ut
+ut
 "}
 (11,1,1) = {"
 ut
+ut
 OL
 UD
 dP
@@ -3752,8 +4486,10 @@ Gj
 Gj
 Gj
 ut
+ut
 "}
 (12,1,1) = {"
+ut
 zu
 OL
 dR
@@ -3776,8 +4512,10 @@ Cr
 bN
 Gj
 JS
+ut
 "}
 (13,1,1) = {"
+ut
 OL
 cY
 Ba
@@ -3800,8 +4538,10 @@ xJ
 FA
 ws
 Gj
+ut
 "}
 (14,1,1) = {"
+ut
 OL
 OL
 OL
@@ -3824,12 +4564,14 @@ mV
 Ht
 Tk
 Gj
+ut
 "}
 (15,1,1) = {"
+ut
 OL
 sj
 OL
-rr
+fH
 dk
 OL
 Sa
@@ -3848,8 +4590,10 @@ OK
 nW
 Wh
 Gj
+ut
 "}
 (16,1,1) = {"
+ut
 OL
 xB
 TB
@@ -3872,11 +4616,13 @@ hG
 uz
 kU
 Gj
+ut
 "}
 (17,1,1) = {"
+ut
 lI
 OL
-OL
+gP
 gP
 OL
 OL
@@ -3884,7 +4630,7 @@ Au
 jd
 Sp
 KR
-Vv
+RQ
 Hc
 sD
 Sp
@@ -3893,15 +4639,17 @@ Au
 Gj
 Gj
 Zs
-Gj
+Zs
 Gj
 DA
+ut
 "}
 (18,1,1) = {"
 ut
 lW
 LF
-VO
+Ry
+zQ
 lW
 Ft
 Bh
@@ -3916,14 +4664,16 @@ MP
 Bh
 BG
 lW
+zQ
 VO
 LF
 lW
 ut
 "}
 (19,1,1) = {"
-ut
+jO
 kc
+TH
 dm
 Or
 LV
@@ -3942,11 +4692,13 @@ NU
 qf
 GF
 ff
+TH
 XL
-ut
+ko
 "}
 (20,1,1) = {"
 ut
+iN
 lW
 lW
 lW
@@ -3967,87 +4719,95 @@ lW
 lW
 lW
 lW
+iN
 ut
 "}
 (21,1,1) = {"
 ut
 ut
+ut
 Hw
-JR
-kT
-ha
-Rx
-dO
-Xy
-Xy
-Xy
-Xy
-Xy
+kH
+Pb
+Eg
+GQ
+Ox
 Xy
-RI
-hC
-ha
-Hk
-JR
+kH
+QZ
+PI
+kH
+tf
+Ox
+GQ
+Eg
+zR
+kH
 Hw
 ut
 ut
+ut
 "}
 (22,1,1) = {"
 ut
 ut
+ut
 bz
-aw
+hi
 Xm
 wP
 qN
+Ml
+mq
 aA
-tf
-aA
-CB
 aA
 aA
-tf
 aA
+ha
+cC
 Aq
-NZ
-NZ
-VU
+wP
+wP
+cn
 lg
 ut
 ut
+ut
 "}
 (23,1,1) = {"
 ut
 ut
+ut
 LC
-he
+En
 kG
 kG
 FN
 NA
-NA
-NA
-NA
-NA
-NA
-NA
+kS
+kS
+kS
+kS
+kS
+kS
 NA
 dQ
-Sj
-Sj
-kH
+kG
+kG
+BH
 Lq
 ut
 ut
+ut
 "}
 (24,1,1) = {"
 ut
 ut
+ut
 LC
-YV
+hC
 wP
-yV
+Rx
 BE
 NA
 NA
@@ -4059,20 +4819,22 @@ NA
 Rp
 rY
 yV
-wP
-YV
+Xm
+hC
 Lq
 ut
 ut
+ut
 "}
 (25,1,1) = {"
 ut
 ut
+ut
 oF
-pU
-wP
+aw
+Xm
 wP
-mq
+ol
 NA
 NA
 NA
@@ -4081,22 +4843,24 @@ NA
 NA
 NA
 NA
-qR
-Xm
-Ty
-Gg
+Ch
+wP
+wP
+VU
 fG
 ut
 ut
+ut
 "}
 (26,1,1) = {"
 ut
 ut
+ut
 Hw
 sn
 Sj
 Sj
-Lw
+ol
 NA
 NA
 NA
@@ -4105,19 +4869,21 @@ NA
 NA
 NA
 NA
-yO
+Ch
 Sj
 Sj
 Mx
 Hw
 ut
 ut
+ut
 "}
 (27,1,1) = {"
 ut
 ut
-rt
+ut
 Hw
+kH
 wP
 yV
 ol
@@ -4130,10 +4896,11 @@ NA
 NA
 NA
 Ch
-Pb
-Dj
+Rx
+wP
+YV
 Hw
-rt
+ut
 ut
 ut
 "}
@@ -4142,9 +4909,10 @@ ut
 ut
 ut
 Hw
+dO
 bu
-wP
-Lw
+GQ
+sv
 NA
 NA
 NA
@@ -4154,8 +4922,9 @@ NA
 NA
 NA
 yO
-GQ
-PL
+wP
+wP
+sR
 Hw
 ut
 ut
@@ -4166,9 +4935,10 @@ ut
 ut
 ut
 Hw
-Be
-GQ
-sb
+kp
+Hw
+xu
+rg
 NA
 NA
 NA
@@ -4177,9 +4947,10 @@ NA
 NA
 NA
 NA
-yO
-GQ
-zv
+rt
+sW
+Sj
+bD
 Hw
 ut
 ut
@@ -4188,11 +4959,12 @@ ut
 (30,1,1) = {"
 ut
 ut
-ut
 mf
 Hw
+WS
+Hw
 Fg
-Lw
+EU
 NA
 NA
 NA
@@ -4202,21 +4974,23 @@ NA
 NA
 NA
 oE
-Bn
+Dk
+JR
+Ww
 Hw
 mf
 ut
 ut
-ut
 "}
 (31,1,1) = {"
 ut
 ut
-ut
-ut
 Hw
-Ia
-EA
+zY
+Zp
+yC
+NZ
+sb
 NA
 NA
 NA
@@ -4226,21 +5000,23 @@ NA
 NA
 NA
 Az
-Ak
+Dk
+bs
+QZ
+OQ
 Hw
 ut
 ut
-ut
-ut
 "}
 (32,1,1) = {"
 ut
 ut
-ut
-ut
 Hw
-Ty
-Lw
+Kj
+rr
+qL
+NZ
+IU
 NA
 NA
 NA
@@ -4249,21 +5025,23 @@ NA
 NA
 NA
 NA
-yd
-Xm
+dX
+Zw
+jw
+ti
+pO
 Hw
 ut
 ut
-ut
-ut
 "}
 (33,1,1) = {"
 ut
 ut
-ut
-ut
 Hw
-wP
+RF
+Ia
+ng
+NZ
 sb
 NA
 NA
@@ -4273,22 +5051,24 @@ NA
 NA
 NA
 NA
-du
-Ty
+qw
+JR
+JR
+ti
+OQ
 Hw
 ut
 ut
-ut
-ut
 "}
 (34,1,1) = {"
 ut
 ut
-ut
-ut
 Hw
-eh
-Lw
+Vv
+xh
+SI
+NZ
+CB
 NA
 NA
 NA
@@ -4297,21 +5077,23 @@ NA
 NA
 NA
 NA
-yd
-Bx
+du
+JR
+HP
+ti
+ML
 Hw
 ut
 ut
-ut
-ut
 "}
 (35,1,1) = {"
 ut
 ut
-ut
-ut
 Hw
-iq
+jx
+Bs
+rH
+eh
 Lw
 NA
 NA
@@ -4322,21 +5104,23 @@ NA
 NA
 NA
 xE
-QZ
+mW
+ma
+WV
+ML
 Hw
 ut
 ut
-ut
-ut
 "}
 (36,1,1) = {"
 ut
 ut
-ut
-ut
 Hw
-am
-ol
+ru
+Ak
+gK
+RT
+jn
 NA
 NA
 NA
@@ -4346,20 +5130,22 @@ NA
 NA
 NA
 yd
-gt
+fD
+wT
+QZ
+ML
 Hw
 ut
 ut
-ut
-ut
 "}
 (37,1,1) = {"
 ut
 ut
-ut
-ut
+Nx
 Hw
-xA
+sH
+Me
+RT
 Fd
 NA
 NA
@@ -4370,10 +5156,11 @@ NA
 NA
 NA
 PF
+Gg
 mW
+QZ
 Hw
-ut
-ut
+Nx
 ut
 ut
 "}
@@ -4381,10 +5168,11 @@ ut
 ut
 ut
 ut
-ut
+Nx
 Hw
-wP
-TH
+Hw
+Bl
+oA
 NA
 NA
 NA
@@ -4393,10 +5181,11 @@ NA
 NA
 NA
 NA
-iN
-wP
+oA
 Hw
-ut
+Bl
+Hw
+Nx
 ut
 ut
 ut
@@ -4406,9 +5195,10 @@ ut
 ut
 ut
 ut
-rt
-Hw
-jn
+CC
+gt
+lf
+oA
 NA
 NA
 NA
@@ -4418,8 +5208,9 @@ NA
 NA
 NA
 RP
+zv
+lf
 Hw
-rt
 ut
 ut
 ut
@@ -4430,19 +5221,73 @@ ut
 ut
 ut
 ut
+CC
+gV
+RI
+oA
+kT
+NA
+NA
+NA
+NA
+NA
+NA
+aH
+RP
+BJ
+RI
+Hw
+ut
+ut
 ut
-rt
+ut
+"}
+(41,1,1) = {"
+ut
+ut
+ut
+ut
+mf
+Hw
+LR
+oA
+NA
+NA
+NA
+NA
+NA
+NA
+NA
+NA
+oA
 Hw
-eu
+xf
+mf
+ut
+ut
+ut
+ut
+"}
+(42,1,1) = {"
+ut
+ut
+ut
+ut
+ut
+bv
+Hl
+tD
+Cb
 VC
 eo
-uZ
+Dj
 eo
 eo
 VC
-cC
-Hw
-rt
+sK
+am
+FF
+cI
 ut
 ut
 ut
diff --git a/_maps/shuttles/subshuttles/Subshuttle Catalog.txt b/_maps/shuttles/subshuttles/Subshuttle Catalog.txt
index 630c7c8f2e89..9176da34e3cf 100644
--- a/_maps/shuttles/subshuttles/Subshuttle Catalog.txt	
+++ b/_maps/shuttles/subshuttles/Subshuttle Catalog.txt	
@@ -3,8 +3,8 @@ Size = "1x3"
 Purpose = "Showing people how to fill this document in"
 File Path = "_maps\shuttles\subshuttles\example.dmm"
 
-Name = "Tegus Transport Shuttle"
-Size = "16x8"
+Name = "Anole Transport Shuttle"
+Size = "15x8"
 Purpose = "Transporting Nanotrasen employees"
 File Path = "_maps\shuttles\subshuttles\nanotrasen_shuttle_tegus.dmm"
 
diff --git a/_maps/shuttles/subshuttles/nanotrasen_shuttle_tegus.dmm b/_maps/shuttles/subshuttles/nanotrasen_shuttle_tegus.dmm
index b87495ebed57..dd89f3afaa8d 100644
--- a/_maps/shuttles/subshuttles/nanotrasen_shuttle_tegus.dmm
+++ b/_maps/shuttles/subshuttles/nanotrasen_shuttle_tegus.dmm
@@ -4,8 +4,13 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4,
-/turf/open/floor/plasteel/airless,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 10
+	},
+/obj/structure/cable{
+	icon_state = "1-8"
+	},
+/turf/open/floor/plasteel/patterned,
 /area/ship/shuttle)
 "bt" = (
 /obj/effect/turf_decal/industrial/traffic{
@@ -32,27 +37,39 @@
 /area/ship/shuttle)
 "cu" = (
 /obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/structure/cable{
-	icon_state = "2-8"
-	},
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4{
-	dir = 4
+	icon_state = "1-8"
 	},
-/turf/open/floor/plasteel/airless,
+/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer4,
+/turf/open/floor/plasteel/patterned,
 /area/ship/shuttle)
 "cR" = (
-/obj/structure/chair/comfy/shuttle,
-/turf/open/floor/plasteel/patterned/monofloor{
-	dir = 8
+/obj/effect/turf_decal/trimline/opaque/solgovgold/warning{
+	dir = 1
 	},
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2,
+/obj/item/kirbyplants{
+	icon_state = "plant-20";
+	pixel_x = 3;
+	name = "Emotional Support Plant";
+	desc = "The light of your life!"
+	},
+/turf/open/floor/plasteel/patterned/cargo_one,
 /area/ship/shuttle)
 "dm" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
-	dir = 1
+/obj/machinery/light/small{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 10
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
 	},
-/turf/open/floor/plasteel/airless,
+/obj/structure/catwalk/over/plated_catwalk,
+/turf/open/floor/plating,
 /area/ship/shuttle)
 "dK" = (
 /obj/machinery/power/smes/engineering,
@@ -91,122 +108,133 @@
 /turf/closed/wall/mineral/titanium/nodiagonal,
 /area/ship/shuttle)
 "fV" = (
-/obj/effect/turf_decal/trimline/opaque/solgovgold/line{
-	dir = 1
-	},
-/obj/machinery/light,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
 	dir = 9
 	},
-/turf/open/floor/plasteel/airless,
+/turf/closed/wall/mineral/titanium/nodiagonal,
 /area/ship/shuttle)
-"ge" = (
-/obj/effect/turf_decal/industrial/traffic{
-	dir = 4
+"ir" = (
+/obj/effect/turf_decal/steeldecal/steel_decals_central4{
+	dir = 1
 	},
-/obj/machinery/door/poddoor/preopen{
-	id = "tegus_shuttle_port"
+/obj/effect/turf_decal/steeldecal/steel_decals9,
+/obj/machinery/atmospherics/components/binary/valve/layer2{
+	dir = 4
 	},
-/obj/structure/cable{
-	icon_state = "0-2"
+/turf/open/floor/engine/hull,
+/area/ship/shuttle)
+"jW" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
+/obj/effect/turf_decal/corner/transparent/neutral{
+	dir = 8
 	},
-/obj/machinery/power/shieldwallgen/atmos/roundstart{
-	dir = 8;
-	id = "tegus_shield_port"
+/obj/machinery/turretid{
+	icon_state = "control_kill";
+	lethal = 1;
+	locked = 0;
+	name = "Mining Turret control panel";
+	pixel_x = -28;
+	req_access = null
 	},
-/turf/open/floor/plasteel/patterned/ridged,
+/turf/open/floor/plasteel/dark,
 /area/ship/shuttle)
-"gz" = (
-/obj/effect/turf_decal/trimline/opaque/solgovgold/warning{
-	dir = 1
-	},
-/obj/structure/cable{
-	icon_state = "2-8"
+"kH" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 4
 	},
-/obj/structure/cable{
-	icon_state = "4-8"
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 6
 	},
+/turf/open/floor/plasteel/patterned,
+/area/ship/shuttle)
+"lV" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
 	dir = 8
 	},
-/turf/open/floor/plasteel/airless,
-/area/ship/shuttle)
-"jW" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
-/turf/open/floor/plasteel,
-/area/ship/shuttle)
-"kH" = (
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4{
+/obj/machinery/atmospherics/components/unary/vent_scrubber/layer2{
 	dir = 8
 	},
-/turf/open/floor/plasteel/airless,
+/turf/open/floor/plasteel/patterned,
 /area/ship/shuttle)
-"lV" = (
-/obj/structure/chair/comfy/shuttle{
-	dir = 1
-	},
-/obj/structure/window/reinforced/spawner,
-/turf/open/floor/plasteel/patterned/monofloor{
-	dir = 4
+"mq" = (
+/obj/effect/turf_decal/steeldecal/steel_decals_central2,
+/obj/effect/turf_decal/steeldecal/steel_decals6,
+/obj/machinery/atmospherics/components/unary/outlet_injector/on/layer2{
+	dir = 8
 	},
+/turf/open/floor/plasteel/tech/grid,
 /area/ship/shuttle)
 "nB" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
 	dir = 9
 	},
-/turf/open/floor/plasteel,
+/obj/effect/turf_decal/corner/transparent/neutral{
+	dir = 9
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 10
+	},
+/turf/open/floor/plasteel/dark,
 /area/ship/shuttle)
 "nL" = (
-/obj/effect/turf_decal/trimline/opaque/solgovgold/line{
+/obj/effect/turf_decal/industrial/warning,
+/obj/effect/turf_decal/industrial/warning{
 	dir = 1
 	},
-/obj/structure/cable{
-	icon_state = "1-4"
-	},
-/obj/machinery/light,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
-	dir = 5
-	},
-/turf/open/floor/plasteel/airless,
+/obj/machinery/door/airlock/external,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
+/turf/open/floor/plasteel/patterned/ridged,
 /area/ship/shuttle)
 "oi" = (
 /obj/machinery/atmospherics/components/unary/tank/air{
 	dir = 1;
 	piping_layer = 4
 	},
-/turf/open/floor/plasteel/patterned/ridged,
+/turf/open/floor/plasteel/tech/grid,
 /area/ship/shuttle)
 "oI" = (
 /obj/machinery/computer/crew{
 	dir = 8
 	},
-/turf/open/floor/plasteel/patterned/monofloor,
-/area/ship/shuttle)
-"pm" = (
-/turf/closed/wall/mineral/titanium/nodiagonal,
+/obj/effect/turf_decal/corner/transparent/neutral{
+	dir = 4
+	},
+/turf/open/floor/plasteel/dark,
 /area/ship/shuttle)
-"qx" = (
+"oS" = (
 /obj/effect/turf_decal/industrial/traffic{
-	dir = 4
+	dir = 8
 	},
-/obj/machinery/door/poddoor/preopen{
-	id = "tegus_shuttle_starboard"
+/obj/structure/cable{
+	icon_state = "0-2"
 	},
 /obj/machinery/power/shieldwallgen/atmos/roundstart{
-	dir = 8;
-	id = "tegus_shield_starboard"
+	dir = 4;
+	id = "tegus_shield_port"
+	},
+/obj/machinery/door/poddoor{
+	id = "tegus_shuttle_port"
 	},
-/obj/structure/cable,
 /turf/open/floor/plasteel/patterned/ridged,
 /area/ship/shuttle)
-"qz" = (
-/obj/structure/chair/comfy/shuttle{
-	dir = 1
+"pm" = (
+/turf/closed/wall/mineral/titanium/nodiagonal,
+/area/ship/shuttle)
+"qx" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 8
 	},
-/obj/structure/window/reinforced/spawner,
-/turf/open/floor/plasteel/patterned/monofloor{
+/turf/closed/wall/mineral/titanium/nodiagonal,
+/area/ship/shuttle)
+"qz" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
 	dir = 8
 	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 6
+	},
+/turf/open/floor/plasteel/patterned/cargo_one,
 /area/ship/shuttle)
 "rp" = (
 /obj/effect/spawner/structure/window/shuttle,
@@ -233,7 +261,7 @@
 	req_access_txt = "31";
 	icon_state = "solgov_wall";
 	dir = 4;
-	pixel_x = -30
+	pixel_x = -28
 	},
 /obj/item/binoculars,
 /obj/item/storage/firstaid,
@@ -241,108 +269,128 @@
 /obj/item/pinpointer,
 /obj/item/storage/toolbox/emergency,
 /obj/item/extinguisher/mini,
+/obj/item/clothing/suit/space/orange,
+/obj/item/clothing/head/helmet/space/orange,
 /obj/item/roller,
 /obj/item/gps{
 	gpstag = "TEGUS1"
 	},
-/turf/open/floor/plasteel,
+/obj/effect/turf_decal/corner/transparent/neutral{
+	dir = 2
+	},
+/obj/machinery/atmospherics/components/unary/vent_scrubber/layer2{
+	dir = 1
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/shuttle)
+"sk" = (
+/obj/effect/turf_decal/steeldecal/steel_decals_central4,
+/obj/effect/turf_decal/steeldecal/steel_decals9{
+	dir = 4
+	},
+/turf/open/floor/engine/hull,
 /area/ship/shuttle)
 "sq" = (
-/obj/machinery/door/poddoor/preopen{
-	id = "tegus_shuttle_starboard"
+/obj/effect/turf_decal/industrial/warning,
+/obj/effect/turf_decal/industrial/warning{
+	dir = 1
+	},
+/obj/machinery/door/airlock/external,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 5
 	},
 /turf/open/floor/plasteel/patterned/ridged,
 /area/ship/shuttle)
 "tB" = (
 /obj/machinery/holopad/emergency/command,
 /obj/effect/turf_decal/box,
-/obj/machinery/light{
-	dir = 8
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
+/obj/machinery/light/dim{
+	dir = 8;
+	bulb_power = 0.5
 	},
-/turf/open/floor/plasteel,
+/turf/open/floor/plasteel/dark,
 /area/ship/shuttle)
 "uJ" = (
-/obj/structure/cable{
-	icon_state = "1-2"
+/obj/effect/turf_decal/trimline/opaque/solgovgold/warning{
+	dir = 1
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
-/turf/open/floor/plasteel/airless,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 6
+	},
+/turf/open/floor/plasteel/patterned,
 /area/ship/shuttle)
 "wV" = (
-/obj/effect/turf_decal/industrial/traffic{
-	dir = 8
+/obj/docking_port/mobile{
+	dir = 2;
+	port_direction = 8;
+	preferred_direction = 4
 	},
-/obj/machinery/door/poddoor/preopen{
+/obj/machinery/door/poddoor{
 	id = "tegus_shuttle_port"
 	},
-/obj/structure/cable{
-	icon_state = "0-2"
-	},
-/obj/machinery/power/shieldwallgen/atmos/roundstart{
-	dir = 4;
-	id = "tegus_shield_port"
-	},
 /turf/open/floor/plasteel/patterned/ridged,
 /area/ship/shuttle)
 "xB" = (
 /obj/effect/turf_decal/industrial/warning{
 	dir = 10
 	},
-/obj/machinery/light/small{
-	dir = 1
-	},
 /obj/structure/cable{
 	icon_state = "0-2"
 	},
 /obj/machinery/power/terminal{
 	dir = 8
 	},
-/turf/open/floor/plasteel,
-/area/ship/shuttle)
-"yr" = (
-/obj/effect/turf_decal/industrial/traffic{
-	dir = 8
-	},
-/obj/machinery/door/poddoor/preopen{
-	id = "tegus_shuttle_starboard"
+/obj/machinery/button/door{
+	id = "tegus_shuttle_engine";
+	name = "Engine Shutters";
+	pixel_x = -3;
+	pixel_y = 27
 	},
-/obj/machinery/power/shieldwallgen/atmos/roundstart{
+/turf/open/floor/plasteel/tech,
+/area/ship/shuttle)
+"yD" = (
+/obj/machinery/porta_turret/centcom_shuttle/weak{
 	dir = 4;
-	id = "tegus_shield_starboard"
+	name = "Old Mining Turret"
 	},
-/obj/structure/cable,
-/turf/open/floor/plasteel/patterned/ridged,
+/turf/closed/wall/mineral/titanium,
 /area/ship/shuttle)
 "yP" = (
 /obj/machinery/computer/helm{
 	dir = 8
 	},
-/turf/open/floor/plasteel/patterned/monofloor{
+/obj/effect/turf_decal/corner/transparent/neutral,
+/turf/open/floor/plasteel/dark,
+/area/ship/shuttle)
+"yZ" = (
+/obj/effect/turf_decal/steeldecal/steel_decals_central2{
 	dir = 1
 	},
+/obj/effect/turf_decal/steeldecal/steel_decals_central1,
+/turf/open/floor/plasteel/tech/grid,
 /area/ship/shuttle)
 "zG" = (
-/obj/effect/turf_decal/industrial/traffic{
+/obj/effect/turf_decal/industrial/warning{
 	dir = 8
 	},
-/obj/structure/cable{
-	icon_state = "1-2"
+/obj/effect/turf_decal/industrial/warning{
+	dir = 4
 	},
-/obj/machinery/button/shieldwallgen{
-	dir = 4;
-	pixel_x = -27;
-	pixel_y = -5;
-	id = "tegus_shield_starboard";
-	name = "Starboard Holofield"
+/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume{
+	dir = 8
 	},
-/obj/machinery/button/door{
-	dir = 4;
-	pixel_x = -27;
-	pixel_y = 5;
-	id = "tegus_shuttle_starboard";
-	name = "Starboard Blast Door"
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 8
 	},
-/turf/open/floor/plasteel/patterned/ridged,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 8
+	},
+/obj/machinery/advanced_airlock_controller{
+	pixel_y = 32
+	},
+/turf/open/floor/plasteel/tech,
 /area/ship/shuttle)
 "Au" = (
 /obj/effect/turf_decal/industrial/warning,
@@ -350,90 +398,93 @@
 	network = "ntsv_commnet"
 	},
 /obj/machinery/airalarm/directional/east,
-/turf/open/floor/plasteel/patterned/ridged,
+/obj/machinery/light/small{
+	dir = 4;
+	bulb_power = 0.5
+	},
+/turf/open/floor/plasteel/telecomms_floor,
 /area/ship/shuttle)
 "AQ" = (
-/obj/machinery/power/smes/shuttle/precharged{
-	dir = 4
-	},
 /obj/machinery/door/window/eastleft,
 /obj/structure/cable{
 	icon_state = "0-8"
 	},
-/obj/machinery/door/poddoor/shutters/preopen{
-	id = "tegus_shuttle_engine"
-	},
 /obj/structure/window/reinforced/spawner,
 /obj/structure/window/reinforced/spawner/west,
+/obj/machinery/door/poddoor/shutters{
+	id = "tegus_shuttle_engine"
+	},
+/obj/machinery/power/smes/shuttle/micro{
+	dir = 4
+	},
 /turf/open/floor/plating,
 /area/ship/shuttle)
 "AW" = (
-/obj/effect/turf_decal/trimline/opaque/solgovgold/line,
-/obj/machinery/light{
-	dir = 1
+/obj/structure/chair/comfy/shuttle{
+	layer = 2.9
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
-	dir = 10
+/obj/structure/railing{
+	dir = 1;
+	layer = 4.1
+	},
+/turf/open/floor/plasteel/patterned/monofloor{
+	dir = 4
 	},
-/turf/open/floor/plasteel/airless,
 /area/ship/shuttle)
 "BM" = (
 /obj/machinery/power/terminal{
 	dir = 1
 	},
 /obj/machinery/power/port_gen/pacman,
+/obj/structure/cable,
 /turf/open/floor/plating,
 /area/ship/shuttle)
 "Cu" = (
 /obj/structure/chair/comfy/shuttle{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
+/turf/open/floor/plasteel/dark,
 /area/ship/shuttle)
 "CM" = (
 /turf/closed/wall/mineral/titanium,
 /area/ship/shuttle)
+"CS" = (
+/turf/open/floor/plasteel,
+/area/ship/shuttle)
 "Em" = (
-/obj/effect/turf_decal/trimline/opaque/solgovgold/warning{
-	dir = 1
-	},
-/obj/structure/cable{
-	icon_state = "2-8"
-	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
 	dir = 8
 	},
-/turf/open/floor/plasteel/airless,
+/turf/closed/wall/mineral/titanium/nodiagonal,
+/area/ship/shuttle)
+"EJ" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 5
+	},
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+	dir = 4
+	},
+/obj/structure/catwalk/over/plated_catwalk,
+/turf/open/floor/plating,
 /area/ship/shuttle)
 "Iq" = (
 /obj/machinery/power/terminal{
 	dir = 8
 	},
 /obj/machinery/door/window/eastright,
-/obj/machinery/power/smes/shuttle/precharged{
-	dir = 4
-	},
 /obj/structure/window/reinforced/spawner/north,
 /obj/structure/window/reinforced/spawner/west,
 /obj/structure/cable{
 	icon_state = "0-8"
 	},
-/obj/machinery/door/poddoor/shutters/preopen{
+/obj/machinery/door/poddoor/shutters{
 	id = "tegus_shuttle_engine"
 	},
-/turf/open/floor/plating,
-/area/ship/shuttle)
-"IR" = (
-/obj/effect/turf_decal/trimline/opaque/solgovgold/warning{
-	dir = 1
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4{
-	dir = 1
+/obj/machinery/power/smes/shuttle/micro{
+	dir = 4
 	},
-/turf/open/floor/plasteel/airless,
+/turf/open/floor/plating,
 /area/ship/shuttle)
 "Ks" = (
 /obj/effect/turf_decal/industrial/warning{
@@ -445,20 +496,24 @@
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
 	dir = 1
 	},
-/turf/open/floor/plasteel,
+/turf/open/floor/plasteel/tech,
+/area/ship/shuttle)
+"KQ" = (
+/obj/machinery/porta_turret/centcom_shuttle/weak{
+	dir = 4;
+	name = "Old Mining Turret"
+	},
+/turf/closed/wall/mineral/titanium/nodiagonal,
 /area/ship/shuttle)
 "LC" = (
 /obj/effect/turf_decal/trimline/opaque/solgovgold/warning,
-/obj/structure/cable{
-	icon_state = "1-8"
-	},
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
 	dir = 8
 	},
-/turf/open/floor/plasteel/airless,
+/turf/open/floor/plasteel/patterned/cargo_one,
 /area/ship/shuttle)
 "LN" = (
 /obj/machinery/door/airlock/shuttle{
@@ -467,11 +522,31 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
 	dir = 8
 	},
+/obj/effect/turf_decal/industrial/warning{
+	dir = 8
+	},
+/obj/effect/turf_decal/industrial/warning{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 8
+	},
 /turf/open/floor/plasteel,
 /area/ship/shuttle)
 "LU" = (
-/obj/structure/chair/comfy/shuttle,
-/turf/open/floor/plasteel/patterned/monofloor,
+/obj/structure/chair/comfy/shuttle{
+	dir = 1;
+	layer = 2.8
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 8
+	},
+/obj/structure/railing{
+	layer = 4.1
+	},
+/turf/open/floor/plasteel/patterned/monofloor{
+	dir = 8
+	},
 /area/ship/shuttle)
 "Mp" = (
 /obj/effect/turf_decal/industrial/warning{
@@ -484,20 +559,20 @@
 	target_pressure = 1000;
 	dir = 1
 	},
-/turf/open/floor/plasteel,
+/turf/open/floor/plasteel/tech,
 /area/ship/shuttle)
 "MD" = (
-/obj/effect/turf_decal/trimline/opaque/solgovgold/line,
 /obj/structure/cable{
 	icon_state = "2-4"
 	},
-/obj/machinery/light{
-	dir = 1
-	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
 	dir = 6
 	},
-/turf/open/floor/plasteel/airless,
+/obj/effect/turf_decal/trimline/opaque/solgovgold/warning,
+/obj/structure/cable{
+	icon_state = "1-4"
+	},
+/turf/open/floor/plasteel/patterned,
 /area/ship/shuttle)
 "MK" = (
 /obj/structure/table/reinforced,
@@ -513,7 +588,10 @@
 	name = "Engine Shutters";
 	pixel_x = -6
 	},
-/turf/open/floor/plasteel,
+/obj/effect/turf_decal/corner/transparent/neutral{
+	dir = 8
+	},
+/turf/open/floor/plasteel/dark,
 /area/ship/shuttle)
 "NJ" = (
 /obj/machinery/door/airlock/shuttle{
@@ -525,21 +603,44 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
 	dir = 4
 	},
+/obj/effect/turf_decal/industrial/warning{
+	dir = 8
+	},
+/obj/effect/turf_decal/industrial/warning{
+	dir = 4
+	},
 /turf/open/floor/plasteel,
 /area/ship/shuttle)
 "Og" = (
-/obj/structure/chair/comfy/shuttle,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 8
+	},
+/obj/structure/chair/comfy/shuttle{
+	dir = 1;
+	layer = 2.8
+	},
+/obj/machinery/light{
+	bulb_power = 0.5
+	},
+/obj/structure/railing{
+	layer = 4.1
+	},
 /turf/open/floor/plasteel/patterned/monofloor{
-	dir = 4
+	dir = 1
 	},
 /area/ship/shuttle)
 "Ol" = (
-/obj/docking_port/mobile{
-	dir = 2;
-	port_direction = 8;
-	preferred_direction = 4
+/obj/effect/turf_decal/industrial/traffic{
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "0-2"
+	},
+/obj/machinery/power/shieldwallgen/atmos/roundstart{
+	dir = 8;
+	id = "tegus_shield_port"
 	},
-/obj/machinery/door/poddoor/preopen{
+/obj/machinery/door/poddoor{
 	id = "tegus_shuttle_port"
 	},
 /turf/open/floor/plasteel/patterned/ridged,
@@ -547,31 +648,44 @@
 "Rf" = (
 /obj/item/radio/intercom/wideband,
 /obj/structure/table/reinforced,
-/turf/open/floor/plasteel,
+/turf/open/floor/plasteel/dark,
 /area/ship/shuttle)
 "Rs" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
-/turf/open/floor/plasteel/airless,
-/area/ship/shuttle)
-"Sp" = (
+/obj/structure/railing{
+	layer = 4.1
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 9
+	},
 /obj/structure/chair/comfy/shuttle{
-	dir = 1
+	dir = 1;
+	layer = 2.8
 	},
-/obj/structure/window/reinforced/spawner,
 /turf/open/floor/plasteel/patterned/monofloor{
-	dir = 1
+	dir = 4
+	},
+/area/ship/shuttle)
+"Sp" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 5
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 8
 	},
+/turf/open/floor/plasteel/patterned,
 /area/ship/shuttle)
 "SG" = (
 /obj/effect/turf_decal/industrial/warning{
 	dir = 8
 	},
-/obj/machinery/light/small,
+/obj/machinery/light/small{
+	bulb_power = 0.5
+	},
 /obj/structure/cable,
 /obj/machinery/power/terminal{
 	dir = 8
 	},
-/turf/open/floor/plasteel/patterned/ridged,
+/turf/open/floor/plasteel/telecomms_floor,
 /area/ship/shuttle)
 "To" = (
 /obj/structure/catwalk/over/plated_catwalk,
@@ -587,21 +701,35 @@
 /turf/open/floor/plating,
 /area/ship/shuttle)
 "Tz" = (
-/obj/effect/turf_decal/trimline/opaque/solgovgold/warning,
 /obj/structure/cable{
 	icon_state = "1-8"
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+/obj/structure/chair/comfy/shuttle{
+	layer = 2.9
+	},
+/obj/structure/railing{
+	dir = 1;
+	layer = 4.1
+	},
+/obj/machinery/light{
+	dir = 1
+	},
+/turf/open/floor/plasteel/patterned/monofloor{
 	dir = 8
 	},
-/turf/open/floor/plasteel/airless,
 /area/ship/shuttle)
 "Wx" = (
 /obj/structure/chair/comfy/shuttle{
 	dir = 4;
 	name = "Helm"
 	},
-/turf/open/floor/plasteel,
+/turf/open/floor/plasteel/dark,
+/area/ship/shuttle)
+"WB" = (
+/obj/machinery/atmospherics/pipe/layer_manifold{
+	dir = 4
+	},
+/turf/closed/wall/mineral/titanium/nodiagonal,
 /area/ship/shuttle)
 
 (1,1,1) = {"
@@ -616,12 +744,12 @@ rx
 "}
 (2,1,1) = {"
 rx
-pm
+KQ
 AQ
 dK
 BM
 Iq
-pm
+KQ
 rx
 "}
 (3,1,1) = {"
@@ -645,74 +773,74 @@ pm
 rx
 "}
 (5,1,1) = {"
-rx
 fO
 pm
+pm
 NJ
 pm
 pm
+pm
 fO
-rx
 "}
 (6,1,1) = {"
-pm
-pm
+oS
+bt
 MD
 cu
 uJ
 nL
-pm
+EJ
 pm
 "}
 (7,1,1) = {"
 wV
-bt
+CS
 LC
 qz
 cR
-gz
+pm
 zG
-yr
+pm
 "}
 (8,1,1) = {"
 Ol
-jW
+dU
 bj
 Sp
 LU
-IR
+pm
 dm
 sq
 "}
 (9,1,1) = {"
-ge
-dU
+pm
+pm
 Tz
 lV
 Og
 Em
-dU
+WB
 qx
 "}
 (10,1,1) = {"
-pm
+sk
 pm
 AW
 kH
 Rs
 fV
 pm
-pm
+ir
 "}
 (11,1,1) = {"
-rx
+yZ
 fO
 pm
 LN
 pm
 pm
 fO
-rx
+mq
 "}
 (12,1,1) = {"
 rx
@@ -736,12 +864,12 @@ rx
 "}
 (14,1,1) = {"
 rx
-CM
+yD
 pm
 yP
 oI
 pm
-CM
+yD
 rx
 "}
 (15,1,1) = {"
diff --git a/code/datums/shuttles.dm b/code/datums/shuttles.dm
index 8772d52ce639..60ccaf5623ed 100644
--- a/code/datums/shuttles.dm
+++ b/code/datums/shuttles.dm
@@ -348,7 +348,7 @@
 
 /datum/map_template/shuttle/subshuttles/nanotrasen_tegus
 	file_name = "nanotrasen_shuttle_tegus"
-	name = "Tegus Transport Shuttle"
+	name = "Anole Transport Shuttle"
 	prefix = "NTSV"
 
 /datum/map_template/shuttle/subshuttles/pill

From b49fd0fae8a7004c692118bcba667570aa250dcc Mon Sep 17 00:00:00 2001
From: goober3 <118859017+goober3@users.noreply.github.com>
Date: Fri, 5 May 2023 18:30:07 +0100
Subject: [PATCH 12/28] oops I forgot to commit this

---
 _maps/shuttles/shiptest/nanotrasen_tegus.dmm  | 22 ++++++++++-------
 .../subshuttles/nanotrasen_shuttle_tegus.dmm  | 24 +++++++++++--------
 2 files changed, 27 insertions(+), 19 deletions(-)

diff --git a/_maps/shuttles/shiptest/nanotrasen_tegus.dmm b/_maps/shuttles/shiptest/nanotrasen_tegus.dmm
index 4394a3205c5a..a14eda600b5c 100644
--- a/_maps/shuttles/shiptest/nanotrasen_tegus.dmm
+++ b/_maps/shuttles/shiptest/nanotrasen_tegus.dmm
@@ -65,10 +65,10 @@
 /turf/open/floor/plasteel/patterned,
 /area/ship/cargo)
 "bv" = (
+/obj/structure/catwalk/over/plated_catwalk,
 /obj/structure/railing{
 	dir = 1
 	},
-/obj/structure/catwalk/over/plated_catwalk,
 /turf/open/floor/plating/airless,
 /area/ship/cargo)
 "bz" = (
@@ -132,8 +132,10 @@
 /turf/open/floor/plasteel,
 /area/ship/cargo)
 "cI" = (
-/obj/structure/railing,
 /obj/structure/catwalk/over/plated_catwalk,
+/obj/structure/railing{
+	layer = 4.1
+	},
 /turf/open/floor/plating/airless,
 /area/ship/cargo)
 "cK" = (
@@ -534,7 +536,7 @@
 "hd" = (
 /obj/structure/table/reinforced,
 /obj/item/areaeditor/shuttle{
-	pixel_x = 15;
+	pixel_x = 13;
 	pixel_y = 3
 	},
 /obj/machinery/light,
@@ -2165,10 +2167,6 @@
 /turf/open/floor/plasteel,
 /area/ship/engineering/communications)
 "Ak" = (
-/obj/structure/railing{
-	dir = 8;
-	pixel_x = -4
-	},
 /obj/effect/turf_decal/industrial/outline/yellow,
 /turf/open/floor/plasteel/dark,
 /area/ship/cargo)
@@ -2289,6 +2287,9 @@
 	},
 /area/ship/maintenance/starboard)
 "Bs" = (
+/obj/structure/railing{
+	dir = 4
+	},
 /turf/open/floor/plasteel/stairs{
 	icon = 'icons/obj/stairs.dmi';
 	dir = 1
@@ -2604,8 +2605,7 @@
 "Ev" = (
 /obj/structure/table/reinforced,
 /obj/item/radio/intercom/wideband{
-	pixel_x = 2;
-	dir = 8
+	dir = 1
 	},
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/bridge)
@@ -3068,6 +3068,10 @@
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
 	dir = 8
 	},
+/obj/item/assembly/signaler{
+	name = "Emergency Signaler";
+	desc = "A compact device. Your shuttle team will ping this when they are in danger. Listen for beeps!"
+	},
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
 "Lq" = (
diff --git a/_maps/shuttles/subshuttles/nanotrasen_shuttle_tegus.dmm b/_maps/shuttles/subshuttles/nanotrasen_shuttle_tegus.dmm
index dd89f3afaa8d..f75f780b10f6 100644
--- a/_maps/shuttles/subshuttles/nanotrasen_shuttle_tegus.dmm
+++ b/_maps/shuttles/subshuttles/nanotrasen_shuttle_tegus.dmm
@@ -281,6 +281,10 @@
 /obj/machinery/atmospherics/components/unary/vent_scrubber/layer2{
 	dir = 1
 	},
+/obj/item/assembly/signaler{
+	name = "Emergency Signaler";
+	desc = "A remote signaler device. The label reads ''Stranded without communications? Ping this device to alert your captain who, too, has been provided with a remote signaler!''"
+	},
 /turf/open/floor/plasteel/dark,
 /area/ship/shuttle)
 "sk" = (
@@ -425,7 +429,7 @@
 	},
 /obj/structure/railing{
 	dir = 1;
-	layer = 4.1
+	layer = 4.2
 	},
 /turf/open/floor/plasteel/patterned/monofloor{
 	dir = 4
@@ -542,7 +546,7 @@
 	dir = 8
 	},
 /obj/structure/railing{
-	layer = 4.1
+	layer = 4.2
 	},
 /turf/open/floor/plasteel/patterned/monofloor{
 	dir = 8
@@ -623,7 +627,7 @@
 	bulb_power = 0.5
 	},
 /obj/structure/railing{
-	layer = 4.1
+	layer = 4.2
 	},
 /turf/open/floor/plasteel/patterned/monofloor{
 	dir = 1
@@ -651,9 +655,6 @@
 /turf/open/floor/plasteel/dark,
 /area/ship/shuttle)
 "Rs" = (
-/obj/structure/railing{
-	layer = 4.1
-	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
 	dir = 9
 	},
@@ -661,6 +662,9 @@
 	dir = 1;
 	layer = 2.8
 	},
+/obj/structure/railing{
+	layer = 4.2
+	},
 /turf/open/floor/plasteel/patterned/monofloor{
 	dir = 4
 	},
@@ -707,13 +711,13 @@
 /obj/structure/chair/comfy/shuttle{
 	layer = 2.9
 	},
-/obj/structure/railing{
-	dir = 1;
-	layer = 4.1
-	},
 /obj/machinery/light{
 	dir = 1
 	},
+/obj/structure/railing{
+	dir = 1;
+	layer = 4.2
+	},
 /turf/open/floor/plasteel/patterned/monofloor{
 	dir = 8
 	},

From e4dce579bb59ca54b9d2c5925d1f1cb18bd80ccb Mon Sep 17 00:00:00 2001
From: goober3 <118859017+goober3@users.noreply.github.com>
Date: Fri, 5 May 2023 20:19:10 +0100
Subject: [PATCH 13/28] fixes

---
 _maps/shuttles/shiptest/nanotrasen_tegus.dmm          |  3 ++-
 .../shuttles/subshuttles/nanotrasen_shuttle_tegus.dmm | 11 ++++++-----
 code/game/objects/items/devices/spyglasses.dm         |  2 +-
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/_maps/shuttles/shiptest/nanotrasen_tegus.dmm b/_maps/shuttles/shiptest/nanotrasen_tegus.dmm
index a14eda600b5c..ed07ac9fc670 100644
--- a/_maps/shuttles/shiptest/nanotrasen_tegus.dmm
+++ b/_maps/shuttles/shiptest/nanotrasen_tegus.dmm
@@ -56,7 +56,7 @@
 /obj/item/tank/internals/emergency_oxygen/double,
 /obj/item/tank/internals/emergency_oxygen/double,
 /obj/item/tank/internals/emergency_oxygen/double,
-/obj/item/storage/firstaid,
+/obj/item/storage/firstaid/regular,
 /obj/item/gps/mining/internal,
 /turf/open/floor/plasteel/patterned/ridged,
 /area/ship/cargo)
@@ -3072,6 +3072,7 @@
 	name = "Emergency Signaler";
 	desc = "A compact device. Your shuttle team will ping this when they are in danger. Listen for beeps!"
 	},
+/obj/item/clothing/glasses/sunglasses,
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
 "Lq" = (
diff --git a/_maps/shuttles/subshuttles/nanotrasen_shuttle_tegus.dmm b/_maps/shuttles/subshuttles/nanotrasen_shuttle_tegus.dmm
index f75f780b10f6..27673174e2c2 100644
--- a/_maps/shuttles/subshuttles/nanotrasen_shuttle_tegus.dmm
+++ b/_maps/shuttles/subshuttles/nanotrasen_shuttle_tegus.dmm
@@ -151,7 +151,7 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
 	dir = 8
 	},
-/obj/machinery/atmospherics/components/unary/vent_scrubber/layer2{
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
 	dir = 8
 	},
 /turf/open/floor/plasteel/patterned,
@@ -264,7 +264,7 @@
 	pixel_x = -28
 	},
 /obj/item/binoculars,
-/obj/item/storage/firstaid,
+/obj/item/storage/firstaid/regular,
 /obj/item/storage/box/bodybags,
 /obj/item/pinpointer,
 /obj/item/storage/toolbox/emergency,
@@ -278,13 +278,13 @@
 /obj/effect/turf_decal/corner/transparent/neutral{
 	dir = 2
 	},
-/obj/machinery/atmospherics/components/unary/vent_scrubber/layer2{
-	dir = 1
-	},
 /obj/item/assembly/signaler{
 	name = "Emergency Signaler";
 	desc = "A remote signaler device. The label reads ''Stranded without communications? Ping this device to alert your captain who, too, has been provided with a remote signaler!''"
 	},
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+	dir = 1
+	},
 /turf/open/floor/plasteel/dark,
 /area/ship/shuttle)
 "sk" = (
@@ -441,6 +441,7 @@
 	},
 /obj/machinery/power/port_gen/pacman,
 /obj/structure/cable,
+/obj/item/stack/sheet/mineral/plasma/five,
 /turf/open/floor/plating,
 /area/ship/shuttle)
 "Cu" = (
diff --git a/code/game/objects/items/devices/spyglasses.dm b/code/game/objects/items/devices/spyglasses.dm
index 61eec511d783..e1c067d9f5ac 100644
--- a/code/game/objects/items/devices/spyglasses.dm
+++ b/code/game/objects/items/devices/spyglasses.dm
@@ -115,7 +115,7 @@ A shrill beep coming from your SpySpeks means that they can't connect to the inc
 //miner monitoring kit
 /obj/item/storage/box/rxglasses/minerspykit
 	name = "miner monitoring kit"
-	desc = "this box contains an EXOCOM monitoring kit; with built-in displays to view an advanced mining camera."
+	desc = "Contains an EXOCOM monitoring kit, with built-in displays to view an advanced mining camera."
 
 /obj/item/spy_bug/miner
 	icon = 'icons/obj/telescience.dmi'

From 8f68b268dbe435cec94c0da743f9b0636e2c5b18 Mon Sep 17 00:00:00 2001
From: goober3 <118859017+goober3@users.noreply.github.com>
Date: Sat, 27 May 2023 01:16:56 +0100
Subject: [PATCH 14/28] the stuff

---
 _maps/shuttles/shiptest/nanotrasen_tegus.dmm  | 768 +++++++++---------
 .../subshuttles/nanotrasen_shuttle_tegus.dmm  | 100 ++-
 2 files changed, 464 insertions(+), 404 deletions(-)

diff --git a/_maps/shuttles/shiptest/nanotrasen_tegus.dmm b/_maps/shuttles/shiptest/nanotrasen_tegus.dmm
index ed07ac9fc670..8362e4917182 100644
--- a/_maps/shuttles/shiptest/nanotrasen_tegus.dmm
+++ b/_maps/shuttles/shiptest/nanotrasen_tegus.dmm
@@ -30,7 +30,9 @@
 /turf/open/floor/plating,
 /area/ship/cargo)
 "aH" = (
-/obj/machinery/light,
+/obj/machinery/light{
+	layer = 4
+	},
 /turf/open/floor/plating,
 /area/ship/cargo)
 "bb" = (
@@ -56,7 +58,7 @@
 /obj/item/tank/internals/emergency_oxygen/double,
 /obj/item/tank/internals/emergency_oxygen/double,
 /obj/item/tank/internals/emergency_oxygen/double,
-/obj/item/storage/firstaid/regular,
+/obj/item/storage/firstaid,
 /obj/item/gps/mining/internal,
 /turf/open/floor/plasteel/patterned/ridged,
 /area/ship/cargo)
@@ -65,10 +67,10 @@
 /turf/open/floor/plasteel/patterned,
 /area/ship/cargo)
 "bv" = (
-/obj/structure/catwalk/over/plated_catwalk,
 /obj/structure/railing{
 	dir = 1
 	},
+/obj/structure/catwalk/over/plated_catwalk,
 /turf/open/floor/plating/airless,
 /area/ship/cargo)
 "bz" = (
@@ -90,15 +92,22 @@
 /area/ship/cargo)
 "bD" = (
 /obj/structure/extinguisher_cabinet{
-	pixel_y = -32
+	pixel_y = -28
 	},
 /turf/open/floor/plasteel/patterned/ridged,
 /area/ship/cargo)
 "bK" = (
-/obj/structure/closet/crate/bin,
 /obj/effect/turf_decal/corner/transparent/neutral{
 	dir = 4
 	},
+/obj/structure/bed/dogbed{
+	name = "Atlas's Bed";
+	desc = "A comfy-looking tegu bed. You can even strap your pet in, in case the gravity turns off."
+	},
+/mob/living/simple_animal/hostile/retaliate/tegu/atlas{
+	dir = 8;
+	faction = list("neutral")
+	},
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
 "bN" = (
@@ -107,6 +116,10 @@
 /obj/structure/curtain/cloth/grey,
 /turf/open/floor/plasteel/patterned,
 /area/ship/crew)
+"ca" = (
+/obj/machinery/vending/clothing,
+/turf/open/floor/plasteel/patterned,
+/area/ship/crew)
 "cn" = (
 /obj/structure/cable{
 	icon_state = "2-4"
@@ -144,12 +157,13 @@
 	},
 /obj/structure/window/reinforced/spawner/west,
 /obj/machinery/door/window/eastright,
-/obj/machinery/door/poddoor{
-	id = "tegus_port_engine"
-	},
 /obj/structure/cable{
 	icon_state = "0-8"
 	},
+/obj/machinery/door/poddoor{
+	id = "tegus_port_engine";
+	dir = 4
+	},
 /turf/open/floor/plating,
 /area/ship/maintenance/port)
 "cO" = (
@@ -163,13 +177,13 @@
 /turf/open/floor/plasteel/patterned,
 /area/ship/hallway/aft)
 "cP" = (
-/obj/structure/catwalk/over/plated_catwalk,
 /obj/structure/cable{
 	icon_state = "2-8"
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
 	dir = 6
 	},
+/obj/structure/catwalk/over/plated_catwalk/dark,
 /turf/open/floor/plating,
 /area/ship/maintenance/port)
 "cR" = (
@@ -181,7 +195,7 @@
 /obj/structure/cable/yellow{
 	icon_state = "2-4"
 	},
-/turf/open/floor/plasteel/patterned,
+/turf/open/floor/plasteel/dark,
 /area/ship/maintenance/starboard)
 "cY" = (
 /obj/machinery/vending/cigarette,
@@ -191,11 +205,9 @@
 /turf/closed/wall/mineral/titanium/nodiagonal,
 /area/ship/maintenance/port)
 "dk" = (
-/obj/structure/chair/stool{
-	dir = 4;
-	pixel_x = 3
-	},
-/turf/open/floor/plasteel/patterned,
+/obj/structure/reagent_dispensers/water_cooler,
+/obj/machinery/light,
+/turf/open/floor/plasteel/patterned/ridged,
 /area/ship/crew/canteen)
 "dl" = (
 /obj/structure/cable{
@@ -241,22 +253,22 @@
 /area/ship/cargo)
 "dy" = (
 /obj/effect/spawner/structure/window/shuttle,
+/obj/machinery/door/firedoor/heavy,
 /obj/machinery/door/poddoor/shutters/preopen{
-	id = "tegus_bridge"
+	id = "tegus_bridge";
+	dir = 4
 	},
-/obj/machinery/door/firedoor/heavy,
 /turf/open/floor/plating,
 /area/ship/bridge)
 "dF" = (
 /obj/effect/turf_decal/corner/transparent/ntblue,
-/obj/structure/cable{
-	icon_state = "1-8"
-	},
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2,
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 4
+	},
 /turf/open/floor/plasteel,
 /area/ship/hallway/central)
 "dO" = (
@@ -271,9 +283,7 @@
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/cargo)
 "dP" = (
-/obj/structure/table/reinforced,
-/obj/item/reagent_containers/food/drinks/shaker,
-/turf/open/floor/plasteel,
+/turf/open/floor/plasteel/dark,
 /area/ship/crew/canteen)
 "dQ" = (
 /obj/machinery/light/floor,
@@ -295,27 +305,9 @@
 /turf/open/floor/plasteel/patterned/cargo_one,
 /area/ship/cargo)
 "dR" = (
-/obj/machinery/firealarm{
-	pixel_y = 25
-	},
-/obj/effect/turf_decal/corner/transparent/neutral{
-	dir = 4
-	},
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
-	dir = 4
-	},
-/turf/open/floor/plasteel,
-/area/ship/crew/canteen)
-"dV" = (
-/obj/structure/sign/poster/official/random{
-	pixel_y = 32
-	},
-/obj/effect/turf_decal/corner/transparent/neutral/full,
-/obj/effect/turf_decal/corner/transparent/bar/diagonal,
-/obj/effect/turf_decal/spline/fancy/opaque/grey{
-	dir = 4
-	},
-/turf/open/floor/plasteel,
+/obj/effect/turf_decal/spline/fancy/opaque/grey,
+/obj/machinery/smartfridge/food,
+/turf/open/floor/plasteel/dark,
 /area/ship/crew/canteen)
 "dX" = (
 /obj/structure/cable{
@@ -365,7 +357,8 @@
 	dir = 4
 	},
 /obj/machinery/door/poddoor{
-	id = "tegus_shuttle_door"
+	id = "tegus_shuttle_door";
+	dir = 4
 	},
 /turf/open/floor/plating,
 /area/ship/cargo)
@@ -375,7 +368,7 @@
 	},
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
-/turf/open/floor/plasteel/patterned,
+/turf/open/floor/plasteel/dark,
 /area/ship/maintenance/starboard)
 "eN" = (
 /obj/machinery/power/terminal{
@@ -388,7 +381,7 @@
 /obj/effect/turf_decal/corner/transparent/solgovgold{
 	dir = 4
 	},
-/turf/open/floor/plasteel/patterned,
+/turf/open/floor/plasteel/dark,
 /area/ship/maintenance/port)
 "eT" = (
 /obj/structure/catwalk/over/plated_catwalk,
@@ -477,13 +470,22 @@
 /turf/open/floor/plating,
 /area/ship/cargo)
 "fH" = (
-/obj/effect/turf_decal/corner/transparent/neutral{
-	dir = 1
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 8
 	},
-/obj/effect/turf_decal/corner/transparent/lime{
-	dir = 4
+/obj/structure/cable{
+	icon_state = "4-8"
 	},
-/turf/open/floor/plasteel,
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/canteen)
+"fU" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+	dir = 8
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/turf/open/floor/plasteel/dark,
 /area/ship/crew/canteen)
 "gt" = (
 /obj/structure/tank_dispenser,
@@ -571,6 +573,9 @@
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2{
 	dir = 8
 	},
+/obj/structure/cable{
+	icon_state = "2-8"
+	},
 /turf/open/floor/plasteel/patterned,
 /area/ship/hallway/aft)
 "hi" = (
@@ -636,15 +641,6 @@
 	},
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/hallway/central)
-"im" = (
-/obj/machinery/light,
-/obj/effect/turf_decal/corner/transparent/neutral/full,
-/obj/effect/turf_decal/corner/transparent/bar/diagonal,
-/obj/effect/turf_decal/spline/fancy/opaque/grey{
-	dir = 4
-	},
-/turf/open/floor/plasteel,
-/area/ship/crew/canteen)
 "it" = (
 /obj/effect/turf_decal/corner/transparent/brown{
 	dir = 4
@@ -675,7 +671,7 @@
 /obj/item/hand_labeler{
 	pixel_x = 4
 	},
-/turf/open/floor/plasteel/patterned/ridged,
+/turf/open/floor/plasteel/tech,
 /area/ship/maintenance/port)
 "iN" = (
 /turf/closed/wall/mineral/titanium,
@@ -700,17 +696,18 @@
 	icon_state = "0-8"
 	},
 /obj/machinery/power/port_gen/pacman/super,
-/turf/open/floor/plasteel/patterned/ridged,
+/turf/open/floor/plasteel/tech,
 /area/ship/maintenance/starboard)
 "jb" = (
-/obj/effect/turf_decal/corner/transparent/neutral/full,
-/obj/effect/turf_decal/corner/transparent/bar/diagonal,
-/obj/structure/table,
-/obj/machinery/microwave{
-	pixel_y = 6;
-	layer = 3
+/obj/effect/turf_decal/floordetail/edgedrain{
+	dir = 1
 	},
-/turf/open/floor/plasteel,
+/obj/machinery/door/window/northright,
+/obj/machinery/shower{
+	dir = 1
+	},
+/obj/structure/curtain,
+/turf/open/floor/plasteel/patterned/ridged,
 /area/ship/crew/canteen)
 "jd" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
@@ -757,19 +754,22 @@
 	icon_state = "0-4"
 	},
 /obj/machinery/firealarm{
-	pixel_y = -25;
+	pixel_y = -28;
 	dir = 1
 	},
-/turf/open/floor/plasteel/patterned,
+/turf/open/floor/plasteel/dark,
 /area/ship/maintenance/port)
 "ju" = (
-/obj/structure/cable{
-	icon_state = "1-4"
+/obj/effect/turf_decal/corner/transparent/neutral,
+/obj/effect/turf_decal/corner/transparent/lime{
+	dir = 8
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
-	dir = 5
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
+/obj/structure/cable{
+	icon_state = "1-2"
 	},
-/turf/open/floor/plasteel/patterned,
+/turf/open/floor/plasteel/dark,
 /area/ship/crew/canteen)
 "jw" = (
 /obj/structure/tank_dispenser,
@@ -777,6 +777,11 @@
 /area/ship/cargo)
 "jx" = (
 /obj/effect/turf_decal/industrial/warning,
+/obj/structure/railing/corner,
+/obj/structure/railing/corner{
+	dir = 8;
+	layer = 4.1
+	},
 /turf/open/floor/plasteel/dark,
 /area/ship/cargo)
 "jO" = (
@@ -866,7 +871,7 @@
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
 	dir = 1
 	},
-/turf/open/floor/plasteel/patterned,
+/turf/open/floor/plasteel/dark,
 /area/ship/maintenance/starboard)
 "kS" = (
 /obj/structure/railing{
@@ -890,7 +895,6 @@
 /turf/open/floor/plasteel/patterned,
 /area/ship/crew)
 "lb" = (
-/obj/structure/catwalk/over/plated_catwalk,
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
@@ -906,6 +910,7 @@
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2{
 	dir = 4
 	},
+/obj/structure/catwalk/over/plated_catwalk/dark,
 /turf/open/floor/plating,
 /area/ship/maintenance/port)
 "lf" = (
@@ -935,7 +940,7 @@
 /turf/open/floor/plating,
 /area/ship/cargo)
 "li" = (
-/obj/machinery/atmospherics/components/unary/outlet_injector/layer2{
+/obj/machinery/atmospherics/components/unary/outlet_injector/on/layer2{
 	dir = 4
 	},
 /turf/open/floor/engine/hull,
@@ -943,6 +948,16 @@
 "lI" = (
 /turf/closed/wall/mineral/titanium,
 /area/ship/crew/canteen)
+"lQ" = (
+/obj/structure/chair/sofa/right{
+	dir = 4
+	},
+/obj/effect/turf_decal/corner/transparent/neutral,
+/obj/effect/turf_decal/corner/transparent/lime{
+	dir = 8
+	},
+/turf/open/floor/plasteel/patterned,
+/area/ship/crew/canteen)
 "lW" = (
 /turf/closed/wall/mineral/titanium/nodiagonal,
 /area/ship/hallway/central)
@@ -966,7 +981,6 @@
 /turf/open/floor/plasteel/stairs,
 /area/ship/cargo)
 "mu" = (
-/obj/structure/catwalk/over/plated_catwalk,
 /obj/structure/cable{
 	icon_state = "1-4"
 	},
@@ -982,6 +996,7 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
 	dir = 5
 	},
+/obj/structure/catwalk/over/plated_catwalk/dark,
 /turf/open/floor/plating,
 /area/ship/maintenance/starboard)
 "mJ" = (
@@ -991,7 +1006,7 @@
 /obj/effect/turf_decal/corner/transparent/neutral,
 /obj/structure/chair/office,
 /obj/machinery/firealarm{
-	pixel_y = 25
+	pixel_y = 28
 	},
 /turf/open/floor/plasteel,
 /area/ship/crew)
@@ -1019,12 +1034,14 @@
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/cargo)
 "nk" = (
-/obj/effect/turf_decal/corner/transparent/neutral/full,
-/obj/effect/turf_decal/corner/transparent/bar/diagonal,
-/obj/effect/turf_decal/spline/fancy/opaque/grey{
+/obj/effect/turf_decal/industrial/warning{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
+/obj/machinery/door/airlock{
+	name = "Bathroom";
+	dir = 4
+	},
+/turf/open/floor/plastic,
 /area/ship/crew/canteen)
 "nn" = (
 /obj/structure/table,
@@ -1045,11 +1062,7 @@
 /turf/open/floor/plasteel/patterned/ridged,
 /area/ship/hallway/aft)
 "np" = (
-/obj/structure/table,
-/obj/machinery/light,
-/obj/structure/sign/poster/official/random{
-	pixel_x = 32
-	},
+/obj/structure/fluff/hedge,
 /turf/open/floor/plasteel/patterned/ridged,
 /area/ship/crew/canteen)
 "nT" = (
@@ -1059,10 +1072,11 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
-	dir = 8
-	},
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4,
+/obj/structure/cable{
+	icon_state = "1-8"
+	},
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2,
 /turf/open/floor/plasteel,
 /area/ship/hallway/central)
 "nW" = (
@@ -1091,15 +1105,16 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/obj/machinery/door/airlock/mining{
-	name = "Shuttle Bay"
-	},
 /obj/machinery/door/firedoor/border_only{
 	dir = 4
 	},
 /obj/machinery/door/firedoor/border_only{
 	dir = 8
 	},
+/obj/machinery/door/airlock/mining{
+	name = "Shuttle Bay";
+	dir = 4
+	},
 /turf/open/floor/plasteel,
 /area/ship/cargo)
 "oi" = (
@@ -1176,8 +1191,16 @@
 /area/ship/cargo)
 "oU" = (
 /obj/structure/table/reinforced,
-/obj/item/paper_bin,
-/obj/item/pen,
+/obj/item/paper_bin{
+	pixel_x = -5
+	},
+/obj/item/pen{
+	pixel_x = -5
+	},
+/obj/item/stamp/captain{
+	pixel_x = 7;
+	pixel_y = 4
+	},
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
 "oW" = (
@@ -1210,10 +1233,10 @@
 /obj/effect/turf_decal/corner/transparent/neutral{
 	dir = 8
 	},
-/obj/machinery/power/apc/auto_name/south,
 /obj/structure/cable{
 	icon_state = "0-8"
 	},
+/obj/machinery/power/apc/auto_name/south,
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
 "pC" = (
@@ -1233,7 +1256,7 @@
 /obj/item/pipe_dispenser,
 /obj/item/holosign_creator/engineering,
 /obj/item/tank/internals/emergency_oxygen/engi,
-/turf/open/floor/plasteel/patterned/ridged,
+/turf/open/floor/plasteel/tech,
 /area/ship/maintenance/starboard)
 "pH" = (
 /obj/machinery/power/terminal{
@@ -1246,7 +1269,7 @@
 /obj/structure/cable{
 	icon_state = "0-4"
 	},
-/turf/open/floor/plasteel,
+/turf/open/floor/plasteel/dark,
 /area/ship/maintenance/starboard)
 "pO" = (
 /obj/machinery/suit_storage_unit/mining,
@@ -1264,7 +1287,7 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer2{
 	dir = 10
 	},
-/turf/open/floor/plasteel/patterned,
+/turf/open/floor/plasteel/dark,
 /area/ship/maintenance/port)
 "qf" = (
 /obj/machinery/door/airlock/external,
@@ -1309,7 +1332,6 @@
 /turf/open/floor/plasteel/patterned,
 /area/ship/cargo)
 "qD" = (
-/obj/structure/catwalk/over/plated_catwalk,
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
@@ -1320,6 +1342,7 @@
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2{
 	dir = 8
 	},
+/obj/structure/catwalk/over/plated_catwalk/dark,
 /turf/open/floor/plating,
 /area/ship/maintenance/port)
 "qE" = (
@@ -1364,15 +1387,16 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
 	dir = 4
 	},
-/obj/machinery/door/airlock/engineering{
-	name = "Engine Room"
-	},
 /obj/machinery/door/firedoor/border_only{
 	dir = 8
 	},
 /obj/machinery/door/firedoor/border_only{
 	dir = 4
 	},
+/obj/machinery/door/airlock/engineering{
+	name = "Engine Room";
+	dir = 8
+	},
 /turf/open/floor/plasteel/dark,
 /area/ship/hallway/central)
 "rc" = (
@@ -1419,7 +1443,7 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer2{
 	dir = 5
 	},
-/turf/open/floor/plasteel,
+/turf/open/floor/plasteel/dark,
 /area/ship/maintenance/port)
 "rt" = (
 /obj/structure/cable{
@@ -1451,8 +1475,8 @@
 /turf/open/floor/plasteel/tech,
 /area/ship/cargo)
 "rD" = (
-/obj/structure/catwalk/over/plated_catwalk,
 /obj/machinery/airalarm/directional/east,
+/obj/structure/catwalk/over/plated_catwalk/dark,
 /turf/open/floor/plating,
 /area/ship/engineering/communications)
 "rH" = (
@@ -1484,7 +1508,7 @@
 /obj/item/analyzer{
 	pixel_y = 4
 	},
-/turf/open/floor/plasteel/patterned,
+/turf/open/floor/plasteel/dark,
 /area/ship/maintenance/port)
 "sb" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
@@ -1504,15 +1528,25 @@
 /obj/effect/turf_decal/corner/transparent/neutral/three_quarters{
 	dir = 1
 	},
-/turf/open/floor/plasteel,
+/turf/open/floor/plasteel/dark,
 /area/ship/hallway/central)
 "sj" = (
-/obj/machinery/shower{
-	dir = 4
+/obj/structure/table/wood,
+/obj/item/toy/cards/deck/cas/black,
+/obj/item/toy/cards/deck/cas{
+	pixel_y = 9;
+	pixel_x = -4
 	},
-/obj/machinery/door/window/eastright,
-/obj/effect/turf_decal/floordetail/edgedrain{
-	dir = 8
+/obj/machinery/light{
+	dir = 1
+	},
+/obj/item/trash/plate{
+	pixel_y = -13;
+	pixel_x = -4
+	},
+/obj/item/reagent_containers/food/snacks/meat/slab/goliath{
+	pixel_y = -16;
+	pixel_x = 5
 	},
 /turf/open/floor/plasteel/patterned/ridged,
 /area/ship/crew/canteen)
@@ -1566,19 +1600,18 @@
 	dir = 1
 	},
 /obj/machinery/firealarm{
-	pixel_y = -25;
+	pixel_y = -28;
 	dir = 1
 	},
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
 "sF" = (
-/obj/structure/chair/stool/bar{
-	dir = 8
-	},
-/obj/effect/turf_decal/corner/transparent/neutral{
-	dir = 9
+/obj/structure/railing{
+	dir = 8;
+	pixel_x = -1
 	},
-/turf/open/floor/plasteel/patterned,
+/obj/effect/turf_decal/corner/transparent/neutral,
+/turf/open/floor/plasteel/dark,
 /area/ship/crew/canteen)
 "sH" = (
 /obj/structure/ore_box,
@@ -1600,15 +1633,16 @@
 	icon_state = "0-2"
 	},
 /obj/machinery/door/poddoor{
-	id = "tegus_shuttle_door"
+	id = "tegus_shuttle_door";
+	dir = 4
 	},
 /turf/open/floor/plating,
 /area/ship/cargo)
 "sR" = (
-/obj/machinery/power/apc/auto_name/south,
 /obj/structure/cable{
 	icon_state = "0-8"
 	},
+/obj/machinery/power/apc/auto_name/south,
 /turf/open/floor/plasteel/patterned,
 /area/ship/cargo)
 "sW" = (
@@ -1634,6 +1668,11 @@
 	},
 /turf/open/floor/plasteel/dark,
 /area/ship/cargo)
+"ts" = (
+/obj/effect/spawner/structure/window/shuttle,
+/obj/structure/curtain/cloth/grey,
+/turf/open/floor/plating,
+/area/ship/hallway/central)
 "tD" = (
 /obj/structure/cable{
 	icon_state = "2-8"
@@ -1675,7 +1714,7 @@
 /turf/open/floor/plasteel,
 /area/ship/hallway/central)
 "uc" = (
-/obj/structure/catwalk/over/plated_catwalk,
+/obj/structure/catwalk/over/plated_catwalk/dark,
 /turf/open/floor/plating,
 /area/ship/engineering/communications)
 "ud" = (
@@ -1690,6 +1729,19 @@
 	},
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
+"uf" = (
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
+/obj/machinery/door/firedoor/border_only,
+/obj/machinery/door/firedoor/border_only{
+	dir = 1
+	},
+/obj/machinery/door/airlock/glass,
+/turf/open/floor/plasteel,
+/area/ship/crew/canteen)
 "ui" = (
 /turf/open/floor/engine/hull,
 /area/ship/hallway/aft)
@@ -1701,10 +1753,10 @@
 	icon_state = "plant-10";
 	pixel_y = 3
 	},
-/obj/machinery/power/apc/auto_name/east,
 /obj/structure/cable{
 	icon_state = "0-8"
 	},
+/obj/machinery/power/apc/auto_name/east,
 /turf/open/floor/plasteel/patterned/ridged,
 /area/ship/crew)
 "uD" = (
@@ -1729,7 +1781,7 @@
 	pixel_y = -32
 	},
 /obj/machinery/airalarm/directional/east,
-/turf/open/floor/plasteel/patterned/ridged,
+/turf/open/floor/plasteel/tech,
 /area/ship/maintenance/port)
 "vy" = (
 /obj/effect/decal/cleanable/dirt/dust,
@@ -1761,21 +1813,6 @@
 	},
 /turf/open/floor/plasteel/dark,
 /area/ship/hallway/aft)
-"vN" = (
-/obj/machinery/door/airlock{
-	name = "Canteen"
-	},
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
-/obj/machinery/door/firedoor/border_only,
-/obj/machinery/door/firedoor/border_only{
-	dir = 1
-	},
-/turf/open/floor/plasteel,
-/area/ship/crew/canteen)
 "vO" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -1787,7 +1824,7 @@
 	dir = 1
 	},
 /obj/machinery/atmospherics/pipe/manifold/supply/visible/layer4,
-/turf/open/floor/plasteel,
+/turf/open/floor/plasteel/dark,
 /area/ship/maintenance/port)
 "vT" = (
 /obj/machinery/door/airlock{
@@ -1819,9 +1856,6 @@
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
-/obj/structure/cable{
-	icon_state = "2-4"
-	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
 	dir = 1
@@ -1836,7 +1870,7 @@
 /obj/structure/cable/yellow{
 	icon_state = "0-8"
 	},
-/turf/open/floor/plasteel/patterned/ridged,
+/turf/open/floor/plasteel/tech,
 /area/ship/maintenance/starboard)
 "wg" = (
 /obj/effect/turf_decal/corner/transparent/neutral{
@@ -1853,6 +1887,7 @@
 	dir = 4
 	},
 /obj/structure/window/reinforced/spawner/north,
+/obj/machinery/light,
 /turf/open/floor/plasteel/patterned,
 /area/ship/crew)
 "wv" = (
@@ -1864,12 +1899,8 @@
 	},
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/machinery/airalarm/directional/south,
-/turf/open/floor/plasteel,
+/turf/open/floor/plasteel/dark,
 /area/ship/maintenance/starboard)
-"wP" = (
-/obj/effect/turf_decal/industrial/outline/yellow,
-/turf/open/floor/plasteel/patterned,
-/area/ship/cargo)
 "wT" = (
 /obj/structure/table,
 /obj/item/paper_bin,
@@ -1877,23 +1908,25 @@
 /turf/open/floor/plasteel/patterned/ridged,
 /area/ship/cargo)
 "xc" = (
-/obj/machinery/power/apc/auto_name/east,
 /obj/structure/cable{
 	icon_state = "0-8"
 	},
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
 	dir = 8
 	},
-/turf/open/floor/plasteel/patterned,
+/obj/machinery/power/apc/auto_name/east,
+/turf/open/floor/plasteel/dark,
 /area/ship/maintenance/port)
 "xf" = (
-/obj/machinery/door/airlock/external,
 /obj/effect/turf_decal/industrial/warning{
 	dir = 4
 	},
 /obj/effect/turf_decal/industrial/warning{
 	dir = 8
 	},
+/obj/machinery/door/airlock/external{
+	dir = 8
+	},
 /turf/open/floor/plating,
 /area/ship/cargo)
 "xh" = (
@@ -1904,16 +1937,13 @@
 /obj/effect/turf_decal/spline/fancy/opaque/black{
 	dir = 1
 	},
-/obj/structure/railing{
-	dir = 4;
-	pixel_x = 4
-	},
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/cargo)
 "xu" = (
 /obj/machinery/light{
 	dir = 1;
-	layer = 4
+	layer = 4;
+	pixel_y = 32
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
 	dir = 6
@@ -1921,21 +1951,10 @@
 /turf/open/floor/plasteel/patterned,
 /area/ship/cargo)
 "xB" = (
-/obj/structure/toilet{
-	pixel_y = 5
-	},
-/obj/structure/sink{
-	dir = 8;
-	pixel_x = 12
-	},
-/obj/structure/mirror{
-	pixel_x = 27
-	},
-/obj/machinery/light/small{
-	dir = 1;
-	pixel_x = 10
+/obj/structure/chair/sofa/right{
+	dir = 8
 	},
-/turf/open/floor/plastic,
+/turf/open/floor/plasteel/patterned,
 /area/ship/crew/canteen)
 "xE" = (
 /obj/structure/cable{
@@ -1988,7 +2007,6 @@
 /turf/open/floor/plasteel,
 /area/ship/crew)
 "xZ" = (
-/obj/machinery/light/small,
 /obj/structure/table,
 /obj/item/storage/box/lights/mixed{
 	pixel_x = -12;
@@ -1998,7 +2016,8 @@
 	pixel_y = 4;
 	pixel_x = -3
 	},
-/turf/open/floor/plasteel/patterned,
+/obj/machinery/light/small,
+/turf/open/floor/plasteel/dark,
 /area/ship/maintenance/starboard)
 "yd" = (
 /obj/structure/cable{
@@ -2030,7 +2049,7 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
 	dir = 10
 	},
-/turf/open/floor/plasteel/patterned/ridged,
+/turf/open/floor/plasteel/tech,
 /area/ship/maintenance/starboard)
 "yC" = (
 /obj/item/kirbyplants{
@@ -2046,6 +2065,12 @@
 	dir = 4
 	},
 /area/ship/maintenance/starboard)
+"yJ" = (
+/obj/structure/chair/sofa/left{
+	dir = 4
+	},
+/turf/open/floor/plasteel/patterned,
+/area/ship/crew/canteen)
 "yL" = (
 /obj/structure/table,
 /obj/item/storage/toolbox/electrical{
@@ -2059,7 +2084,7 @@
 	name = "Engine Blast Door"
 	},
 /obj/item/stack/cable_coil/red,
-/turf/open/floor/plasteel/patterned/ridged,
+/turf/open/floor/plasteel/tech,
 /area/ship/maintenance/starboard)
 "yO" = (
 /obj/structure/cable{
@@ -2078,7 +2103,7 @@
 /area/ship/cargo)
 "yV" = (
 /obj/effect/turf_decal/industrial/hatch/yellow,
-/turf/open/floor/plasteel/patterned,
+/turf/open/floor/plasteel/dark,
 /area/ship/cargo)
 "zj" = (
 /obj/structure/reagent_dispensers/watertank,
@@ -2087,9 +2112,6 @@
 /area/ship/hallway/aft)
 "zr" = (
 /obj/effect/decal/cleanable/dirt/dust,
-/obj/structure/cable{
-	icon_state = "0-8"
-	},
 /obj/effect/turf_decal/corner/transparent/solgovgold{
 	dir = 1
 	},
@@ -2108,6 +2130,7 @@
 /obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/layer4{
 	dir = 1
 	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
 /turf/open/floor/plasteel/patterned/ridged,
 /area/ship/cargo)
 "zH" = (
@@ -2137,7 +2160,7 @@
 /obj/machinery/light{
 	dir = 8
 	},
-/turf/open/floor/plasteel/patterned,
+/turf/open/floor/plasteel/dark,
 /area/ship/cargo)
 "zY" = (
 /obj/effect/turf_decal/spline/fancy/opaque/black,
@@ -2234,19 +2257,6 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
 /turf/open/floor/plasteel,
 /area/ship/hallway/central)
-"Ba" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
-	dir = 10
-	},
-/obj/effect/turf_decal/corner/transparent/neutral{
-	dir = 5
-	},
-/obj/machinery/power/apc/auto_name/east,
-/obj/structure/cable{
-	icon_state = "0-2"
-	},
-/turf/open/floor/plasteel,
-/area/ship/crew/canteen)
 "Bh" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
 /turf/open/floor/plasteel/patterned,
@@ -2263,7 +2273,6 @@
 /turf/open/floor/plasteel/dark,
 /area/ship/engineering/communications)
 "Bl" = (
-/obj/machinery/door/airlock/external,
 /obj/effect/turf_decal/industrial/warning{
 	dir = 8
 	},
@@ -2276,6 +2285,9 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
 	dir = 8
 	},
+/obj/machinery/door/airlock/external{
+	dir = 8
+	},
 /turf/open/floor/plasteel,
 /area/ship/cargo)
 "Bn" = (
@@ -2290,23 +2302,28 @@
 /obj/structure/railing{
 	dir = 4
 	},
+/obj/structure/railing{
+	dir = 8
+	},
 /turf/open/floor/plasteel/stairs{
 	icon = 'icons/obj/stairs.dmi';
 	dir = 1
 	},
 /area/ship/cargo)
-"Bv" = (
-/obj/effect/turf_decal/corner/transparent/neutral{
-	dir = 1
-	},
-/obj/structure/chair/stool{
-	pixel_y = -3
+"Bv" = (
+/obj/structure/cable{
+	icon_state = "0-8"
 	},
-/obj/machinery/airalarm/directional/east,
-/obj/effect/turf_decal/corner/transparent/lime{
-	dir = 4
+/obj/machinery/power/apc/auto_name/east,
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/canteen)
+"Bx" = (
+/obj/structure/table/wood,
+/obj/item/storage/box/donkpockets/donkpocketspicy{
+	pixel_y = 3;
+	pixel_x = -3
 	},
-/turf/open/floor/plasteel,
+/turf/open/floor/plasteel/patterned/ridged,
 /area/ship/crew/canteen)
 "BE" = (
 /obj/effect/turf_decal/industrial/warning,
@@ -2348,6 +2365,7 @@
 /obj/machinery/light/small{
 	dir = 1
 	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
 /turf/open/floor/plasteel/patterned/ridged,
 /area/ship/cargo)
 "BP" = (
@@ -2376,7 +2394,8 @@
 	icon_state = "0-1"
 	},
 /obj/machinery/door/poddoor{
-	id = "tegus_shuttle_door"
+	id = "tegus_shuttle_door";
+	dir = 4
 	},
 /turf/open/floor/plating,
 /area/ship/cargo)
@@ -2430,7 +2449,8 @@
 /obj/effect/turf_decal/industrial/warning,
 /obj/structure/table/reinforced,
 /obj/machinery/computer/helm/viewscreen{
-	dir = 1
+	dir = 1;
+	pixel_y = 5
 	},
 /turf/open/floor/plasteel/patterned,
 /area/ship/cargo)
@@ -2439,7 +2459,6 @@
 /turf/closed/wall/mineral/titanium/nodiagonal,
 /area/ship/cargo)
 "CD" = (
-/obj/structure/catwalk/over/plated_catwalk,
 /obj/machinery/power/terminal{
 	dir = 8
 	},
@@ -2447,6 +2466,7 @@
 /obj/structure/cable/yellow{
 	icon_state = "0-2"
 	},
+/obj/structure/catwalk/over/plated_catwalk/dark,
 /turf/open/floor/plating,
 /area/ship/maintenance/starboard)
 "CH" = (
@@ -2465,9 +2485,6 @@
 /turf/open/floor/plasteel/patterned/ridged,
 /area/ship/hallway/central)
 "CI" = (
-/obj/machinery/door/airlock/mining{
-	name = "Shuttle Bay"
-	},
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
@@ -2483,6 +2500,10 @@
 /obj/machinery/door/firedoor/border_only{
 	dir = 8
 	},
+/obj/machinery/door/airlock/mining{
+	name = "Shuttle Bay";
+	dir = 4
+	},
 /turf/open/floor/plasteel,
 /area/ship/cargo)
 "CO" = (
@@ -2521,19 +2542,16 @@
 /turf/open/floor/plasteel/patterned/ridged,
 /area/ship/hallway/aft)
 "CX" = (
-/obj/structure/chair/stool/bar{
-	dir = 8
-	},
-/obj/effect/turf_decal/corner/transparent/neutral{
-	dir = 8
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+	dir = 4
 	},
-/turf/open/floor/plasteel/patterned,
+/turf/open/floor/plasteel/dark,
 /area/ship/crew/canteen)
 "Df" = (
 /obj/effect/turf_decal/corner/transparent/neutral/three_quarters{
 	dir = 1
 	},
-/turf/open/floor/plasteel,
+/turf/open/floor/plasteel/dark,
 /area/ship/hallway/central)
 "Dj" = (
 /obj/effect/turf_decal/industrial/warning{
@@ -2542,15 +2560,16 @@
 /obj/effect/turf_decal/industrial/warning{
 	dir = 4
 	},
-/obj/machinery/door/poddoor{
-	id = "tegus_shuttle_door"
-	},
 /obj/docking_port/mobile{
 	can_move_docking_ports = 1;
 	dir = 8;
 	launch_status = 0;
 	preferred_direction = 4
 	},
+/obj/machinery/door/poddoor{
+	id = "tegus_shuttle_door";
+	dir = 4
+	},
 /turf/open/floor/plating,
 /area/ship/cargo)
 "Dk" = (
@@ -2559,14 +2578,11 @@
 	},
 /turf/open/floor/plasteel/patterned,
 /area/ship/cargo)
-"DA" = (
-/turf/closed/wall/mineral/titanium,
-/area/ship/crew)
 "DF" = (
 /obj/machinery/atmospherics/components/unary/tank/air{
 	piping_layer = 4
 	},
-/turf/open/floor/plasteel/patterned/ridged,
+/turf/open/floor/plasteel/tech,
 /area/ship/maintenance/port)
 "Ea" = (
 /obj/effect/decal/cleanable/dirt/dust,
@@ -2579,9 +2595,9 @@
 /obj/effect/turf_decal/industrial/hatch/yellow,
 /obj/machinery/firealarm{
 	dir = 4;
-	pixel_x = -25
+	pixel_x = -28
 	},
-/turf/open/floor/plasteel/patterned,
+/turf/open/floor/plasteel/dark,
 /area/ship/cargo)
 "Em" = (
 /obj/machinery/power/terminal{
@@ -2591,7 +2607,7 @@
 /obj/structure/cable{
 	icon_state = "0-4"
 	},
-/turf/open/floor/plasteel/patterned,
+/turf/open/floor/plasteel/dark,
 /area/ship/maintenance/starboard)
 "En" = (
 /obj/structure/cable{
@@ -2616,11 +2632,11 @@
 /obj/effect/turf_decal/corner/transparent/neutral{
 	dir = 2
 	},
-/obj/machinery/power/apc/auto_name/south,
 /obj/structure/cable,
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
 	dir = 1
 	},
+/obj/machinery/power/apc/auto_name/south,
 /turf/open/floor/plasteel/dark,
 /area/ship/engineering/communications)
 "EU" = (
@@ -2651,7 +2667,8 @@
 	dir = 8
 	},
 /obj/structure/extinguisher_cabinet{
-	pixel_y = 32
+	pixel_y = 28;
+	dir = 1
 	},
 /turf/open/floor/plasteel/patterned,
 /area/ship/cargo)
@@ -2784,7 +2801,7 @@
 /obj/structure/cable{
 	icon_state = "1-8"
 	},
-/turf/open/floor/plasteel,
+/turf/open/floor/plasteel/dark,
 /area/ship/maintenance/starboard)
 "Gg" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
@@ -2799,14 +2816,13 @@
 /turf/closed/wall/mineral/titanium/nodiagonal,
 /area/ship/crew)
 "Gx" = (
-/obj/machinery/power/apc/auto_name/east,
 /obj/structure/cable{
 	icon_state = "0-8"
 	},
 /obj/effect/turf_decal/corner/transparent/neutral/three_quarters{
 	dir = 1
 	},
-/turf/open/floor/plasteel,
+/turf/open/floor/plasteel/dark,
 /area/ship/hallway/central)
 "GF" = (
 /obj/structure/catwalk/over/plated_catwalk,
@@ -2869,7 +2885,8 @@
 	dir = 8
 	},
 /obj/structure/extinguisher_cabinet{
-	pixel_x = -32
+	pixel_x = -28;
+	dir = 8
 	},
 /turf/open/floor/plasteel,
 /area/ship/hallway/central)
@@ -2889,7 +2906,7 @@
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/machinery/firealarm{
 	dir = 4;
-	pixel_x = -25
+	pixel_x = -28
 	},
 /obj/structure/filingcabinet/double,
 /obj/effect/turf_decal/spline/fancy/opaque/grey{
@@ -2932,14 +2949,13 @@
 /turf/open/floor/plasteel,
 /area/ship/hallway/central)
 "Iw" = (
-/obj/structure/cable{
-	icon_state = "2-8"
+/obj/structure/railing{
+	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
-	dir = 10
+/obj/effect/turf_decal/corner/transparent/lime{
+	dir = 8
 	},
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
-/turf/open/floor/plasteel/patterned/ridged,
+/turf/open/floor/plasteel/dark,
 /area/ship/crew/canteen)
 "IF" = (
 /obj/effect/decal/cleanable/dirt/dust,
@@ -2974,7 +2990,8 @@
 	dir = 10
 	},
 /obj/structure/extinguisher_cabinet{
-	pixel_x = 32
+	pixel_x = 28;
+	dir = 4
 	},
 /obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/plasteel,
@@ -2992,6 +3009,10 @@
 /obj/structure/sign/nanotrasen,
 /turf/closed/wall/mineral/titanium/nodiagonal,
 /area/ship/crew)
+"JY" = (
+/obj/effect/spawner/structure/window/shuttle,
+/turf/open/floor/plating,
+/area/ship/crew/canteen)
 "Kc" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -3003,7 +3024,7 @@
 	dir = 1
 	},
 /obj/machinery/firealarm{
-	pixel_y = 25
+	pixel_y = 28
 	},
 /turf/open/floor/plasteel,
 /area/ship/hallway/central)
@@ -3062,7 +3083,7 @@
 /obj/item/clothing/gloves/color/captain,
 /obj/item/clothing/head/caphat/nt,
 /obj/item/clothing/neck/cloak/cap,
-/obj/item/gun/energy/laser,
+/obj/item/gun/energy/laser/captain,
 /obj/item/storage/box/rxglasses/minerspykit,
 /obj/item/megaphone/command,
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
@@ -3072,7 +3093,6 @@
 	name = "Emergency Signaler";
 	desc = "A compact device. Your shuttle team will ping this when they are in danger. Listen for beeps!"
 	},
-/obj/item/clothing/glasses/sunglasses,
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
 "Lq" = (
@@ -3089,7 +3109,7 @@
 /obj/structure/rack,
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/item/stack/sheet/mineral/uranium/five,
-/turf/open/floor/plasteel/patterned/ridged,
+/turf/open/floor/plasteel/tech,
 /area/ship/maintenance/starboard)
 "Lw" = (
 /obj/structure/cable{
@@ -3128,16 +3148,6 @@
 /obj/structure/tank_dispenser,
 /turf/open/floor/plasteel/patterned/ridged,
 /area/ship/hallway/central)
-"LR" = (
-/obj/effect/turf_decal/industrial/warning{
-	dir = 4
-	},
-/obj/effect/turf_decal/industrial/warning{
-	dir = 8
-	},
-/obj/machinery/door/airlock/external,
-/turf/open/floor/plating,
-/area/ship/cargo)
 "LV" = (
 /obj/machinery/door/airlock/external,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
@@ -3240,18 +3250,25 @@
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
 /obj/structure/extinguisher_cabinet{
-	pixel_x = 32
+	pixel_x = 28;
+	dir = 4
 	},
-/turf/open/floor/plasteel/patterned/ridged,
+/turf/open/floor/plasteel/patterned,
 /area/ship/hallway/central)
 "MU" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/structure/catwalk/over/plated_catwalk,
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
 /turf/open/floor/plating,
 /area/ship/hallway/aft)
 "MY" = (
-/obj/machinery/power/apc/auto_name/west,
 /obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/power/apc/auto_name/west,
+/obj/structure/cable{
+	icon_state = "0-4"
+	},
 /turf/open/floor/plasteel/patterned,
 /area/ship/hallway/aft)
 "Nb" = (
@@ -3263,9 +3280,10 @@
 	icon_state = "0-4"
 	},
 /obj/machinery/firealarm{
-	pixel_y = 25
+	pixel_y = 32;
+	dir = 1
 	},
-/turf/open/floor/plasteel/patterned,
+/turf/open/floor/plasteel/dark,
 /area/ship/maintenance/starboard)
 "Nc" = (
 /obj/effect/turf_decal/corner/transparent/lime{
@@ -3463,7 +3481,7 @@
 /obj/machinery/light{
 	dir = 8
 	},
-/turf/open/floor/plasteel/patterned,
+/turf/open/floor/plasteel/dark,
 /area/ship/cargo)
 "Pl" = (
 /obj/effect/turf_decal/corner/transparent/lime,
@@ -3487,10 +3505,16 @@
 /turf/open/floor/plating,
 /area/ship/hallway/central)
 "Pw" = (
-/obj/effect/turf_decal/corner/transparent/neutral/full,
-/obj/effect/turf_decal/corner/transparent/bar/diagonal,
-/obj/machinery/vending/boozeomat,
-/turf/open/floor/plasteel,
+/obj/structure/sink{
+	pixel_y = 22
+	},
+/obj/structure/toilet{
+	pixel_y = 13
+	},
+/obj/machinery/light/small{
+	dir = 8
+	},
+/turf/open/floor/plastic,
 /area/ship/crew/canteen)
 "PF" = (
 /obj/effect/turf_decal/industrial/warning{
@@ -3517,7 +3541,7 @@
 	icon_state = "1-4"
 	},
 /obj/machinery/light/small,
-/turf/open/floor/plasteel/patterned,
+/turf/open/floor/plasteel/dark,
 /area/ship/maintenance/starboard)
 "Qa" = (
 /turf/closed/wall/mineral/titanium,
@@ -3568,10 +3592,6 @@
 	},
 /turf/open/floor/plasteel/dark,
 /area/ship/cargo)
-"Rm" = (
-/obj/structure/table/reinforced,
-/turf/open/floor/plasteel,
-/area/ship/crew/canteen)
 "Rp" = (
 /obj/effect/landmark/subship{
 	subship_template = /datum/map_template/shuttle/subshuttles/nanotrasen_tegus
@@ -3591,7 +3611,7 @@
 "Rx" = (
 /obj/effect/turf_decal/industrial/hatch/yellow,
 /obj/structure/ore_box,
-/turf/open/floor/plasteel/patterned,
+/turf/open/floor/plasteel/dark,
 /area/ship/cargo)
 "Ry" = (
 /obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/layer4{
@@ -3619,7 +3639,8 @@
 /area/ship/bridge)
 "RF" = (
 /obj/machinery/light{
-	dir = 1
+	dir = 1;
+	pixel_y = 28
 	},
 /obj/effect/turf_decal/spline/fancy/opaque/black,
 /obj/structure/railing{
@@ -3645,11 +3666,11 @@
 	dir = 8
 	},
 /obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/power/apc/auto_name/north,
 /obj/structure/cable{
 	icon_state = "0-2"
 	},
-/turf/open/floor/plasteel,
+/obj/machinery/power/apc/auto_name/north,
+/turf/open/floor/plasteel/dark,
 /area/ship/maintenance/starboard)
 "RP" = (
 /obj/structure/cable{
@@ -3658,13 +3679,6 @@
 /obj/machinery/atmospherics/pipe/layer_manifold,
 /turf/closed/wall/mineral/titanium/nodiagonal,
 /area/ship/cargo)
-"RQ" = (
-/mob/living/simple_animal/hostile/retaliate/tegu/atlas{
-	dir = 8;
-	faction = list("neutral")
-	},
-/turf/open/floor/plasteel/dark,
-/area/ship/bridge)
 "RR" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -3776,7 +3790,10 @@
 	},
 /obj/machinery/firealarm{
 	dir = 4;
-	pixel_x = -25
+	pixel_x = -28
+	},
+/obj/structure/sign/poster/official/random{
+	pixel_y = 32
 	},
 /turf/open/floor/plasteel,
 /area/ship/hallway/central)
@@ -3792,7 +3809,6 @@
 /turf/open/floor/plasteel/patterned,
 /area/ship/hallway/aft)
 "SW" = (
-/obj/structure/catwalk/over/plated_catwalk,
 /obj/structure/railing{
 	dir = 4
 	},
@@ -3802,48 +3818,47 @@
 /obj/structure/cable{
 	icon_state = "1-4"
 	},
+/obj/structure/catwalk/over/plated_catwalk/dark,
 /turf/open/floor/plating,
 /area/ship/maintenance/starboard)
 "Tk" = (
 /obj/effect/turf_decal/industrial/warning{
 	dir = 1
 	},
-/obj/machinery/light,
+/obj/structure/noticeboard{
+	dir = 1;
+	pixel_y = -28
+	},
 /turf/open/floor/plasteel/patterned,
 /area/ship/crew)
 "TB" = (
-/obj/machinery/door/airlock{
-	name = "Bathroom"
+/obj/structure/chair/sofa/left{
+	dir = 8
 	},
-/obj/effect/turf_decal/industrial/warning,
-/turf/open/floor/plastic,
+/obj/effect/turf_decal/corner/transparent/lime{
+	dir = 8
+	},
+/obj/effect/turf_decal/corner/transparent/neutral,
+/turf/open/floor/plasteel/patterned,
 /area/ship/crew/canteen)
 "TH" = (
 /obj/structure/catwalk/over/plated_catwalk,
 /turf/open/floor/plating,
 /area/ship/hallway/central)
-"Ub" = (
-/obj/effect/turf_decal/corner/transparent/lime{
-	dir = 4
-	},
-/obj/effect/turf_decal/corner/transparent/neutral{
-	dir = 1
-	},
-/obj/structure/sign/poster/official/random{
-	pixel_y = 32
-	},
-/turf/open/floor/plasteel,
-/area/ship/hallway/central)
 "UD" = (
-/obj/machinery/door/window/eastleft,
-/turf/open/floor/plasteel/patterned/ridged,
+/obj/structure/table/reinforced,
+/obj/effect/turf_decal/spline/fancy/opaque/grey,
+/obj/machinery/microwave{
+	pixel_y = 4
+	},
+/turf/open/floor/plasteel/dark,
 /area/ship/crew/canteen)
 "UM" = (
 /obj/machinery/airalarm/directional/east,
 /obj/effect/turf_decal/corner/transparent/neutral/three_quarters{
 	dir = 1
 	},
-/turf/open/floor/plasteel,
+/turf/open/floor/plasteel/dark,
 /area/ship/hallway/central)
 "UY" = (
 /obj/machinery/door/airlock/command{
@@ -3873,7 +3888,7 @@
 	dir = 8
 	},
 /obj/machinery/atmospherics/pipe/simple/brown/visible/layer2,
-/obj/structure/catwalk/over/plated_catwalk,
+/obj/structure/catwalk/over/plated_catwalk/dark,
 /turf/open/floor/plating,
 /area/ship/maintenance/port)
 "Vf" = (
@@ -3886,7 +3901,8 @@
 	icon_state = "0-8"
 	},
 /obj/machinery/door/poddoor{
-	id = "tegus_starboard_engine"
+	id = "tegus_starboard_engine";
+	dir = 4
 	},
 /turf/open/floor/plating,
 /area/ship/maintenance/starboard)
@@ -3902,13 +3918,16 @@
 /turf/open/floor/plasteel/patterned/ridged,
 /area/ship/hallway/central)
 "Vs" = (
-/obj/effect/turf_decal/corner/transparent/neutral/full,
-/obj/effect/turf_decal/corner/transparent/bar/diagonal,
-/obj/structure/table,
-/obj/item/storage/box/donkpockets/donkpocketspicy{
-	pixel_y = 4
+/obj/structure/sink{
+	dir = 4;
+	pixel_x = -12;
+	pixel_y = 7
 	},
-/turf/open/floor/plasteel,
+/obj/structure/mirror{
+	pixel_x = -25;
+	pixel_y = 7
+	},
+/turf/open/floor/plastic,
 /area/ship/crew/canteen)
 "Vv" = (
 /obj/effect/turf_decal/spline/fancy/opaque/black,
@@ -3919,11 +3938,11 @@
 /turf/open/floor/plasteel/dark,
 /area/ship/cargo)
 "Vy" = (
-/obj/structure/catwalk/over/plated_catwalk,
 /obj/machinery/firealarm{
 	dir = 8;
-	pixel_x = 25
+	pixel_x = 28
 	},
+/obj/structure/catwalk/over/plated_catwalk/dark,
 /turf/open/floor/plating,
 /area/ship/engineering/communications)
 "VC" = (
@@ -3937,7 +3956,8 @@
 	dir = 4
 	},
 /obj/machinery/door/poddoor{
-	id = "tegus_shuttle_door"
+	id = "tegus_shuttle_door";
+	dir = 4
 	},
 /turf/open/floor/plating,
 /area/ship/cargo)
@@ -3973,13 +3993,12 @@
 	dir = 1
 	},
 /obj/machinery/computer/cryopod{
-	dir = 1;
-	pixel_y = -27
+	pixel_y = -27;
+	dir = 1
 	},
 /turf/open/floor/plasteel/patterned/ridged,
 /area/ship/crew)
 "Wm" = (
-/obj/structure/catwalk/over/plated_catwalk,
 /obj/structure/cable{
 	icon_state = "2-8"
 	},
@@ -3988,6 +4007,7 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
+/obj/structure/catwalk/over/plated_catwalk/dark,
 /turf/open/floor/plating,
 /area/ship/maintenance/starboard)
 "Ww" = (
@@ -4044,7 +4064,7 @@
 "Xm" = (
 /obj/effect/turf_decal/industrial/outline/yellow,
 /obj/structure/closet/crate,
-/turf/open/floor/plasteel/patterned,
+/turf/open/floor/plasteel/dark,
 /area/ship/cargo)
 "Xy" = (
 /turf/open/floor/plasteel/stairs,
@@ -4054,7 +4074,7 @@
 	dir = 1
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
-/turf/open/floor/plasteel/patterned/ridged,
+/turf/open/floor/plasteel/patterned,
 /area/ship/hallway/central)
 "XL" = (
 /obj/machinery/door/airlock/external,
@@ -4073,16 +4093,17 @@
 	},
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
 /obj/structure/extinguisher_cabinet{
-	pixel_y = 32
+	pixel_y = 28;
+	dir = 1
 	},
 /turf/open/floor/plasteel,
 /area/ship/hallway/central)
 "XS" = (
-/obj/structure/catwalk/over/plated_catwalk,
 /obj/machinery/firealarm{
 	dir = 4;
-	pixel_x = -25
+	pixel_x = -28
 	},
+/obj/structure/catwalk/over/plated_catwalk/dark,
 /turf/open/floor/plating,
 /area/ship/engineering/communications)
 "XV" = (
@@ -4093,11 +4114,20 @@
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/engineering/communications)
 "Yk" = (
+/obj/structure/sign/poster/official/random{
+	pixel_y = 32;
+	layer = 2.8
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 6
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 10
+	},
 /obj/structure/cable{
-	icon_state = "1-2"
+	icon_state = "2-4"
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
-/turf/open/floor/plasteel,
+/turf/open/floor/plasteel/dark,
 /area/ship/crew/canteen)
 "Yl" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
@@ -4140,10 +4170,12 @@
 	id = "tegus_port_engine";
 	name = "Engine Blast Door"
 	},
-/turf/open/floor/plasteel/patterned/ridged,
+/turf/open/floor/plasteel/tech,
 /area/ship/maintenance/port)
 "YV" = (
-/obj/machinery/light,
+/obj/machinery/light{
+	pixel_y = -32
+	},
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
@@ -4162,6 +4194,8 @@
 "Zl" = (
 /obj/structure/filingcabinet/double,
 /obj/effect/turf_decal/corner/transparent/neutral,
+/obj/item/folder/documents,
+/obj/item/folder/blue,
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
 "Zp" = (
@@ -4197,11 +4231,15 @@
 "ZY" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/table,
 /obj/machinery/light{
 	dir = 4
 	},
-/obj/structure/table,
-/obj/item/toy/cards/deck{
+/obj/item/toy/cards/deck/tarot{
+	pixel_y = 4
+	},
+/obj/item/cigbutt{
+	pixel_x = 7;
 	pixel_y = 3
 	},
 /turf/open/floor/plasteel,
@@ -4349,7 +4387,7 @@ hL
 hL
 hL
 hL
-lW
+ts
 qS
 hL
 hL
@@ -4445,9 +4483,9 @@ ut
 ut
 ut
 OL
-dV
+OL
 nk
-im
+OL
 hL
 hL
 hL
@@ -4473,7 +4511,7 @@ ut
 OL
 UD
 dP
-Rm
+cY
 OL
 SN
 CH
@@ -4500,8 +4538,8 @@ OL
 dR
 CX
 sF
-OL
-Ub
+JY
+Sa
 eT
 fj
 Df
@@ -4514,7 +4552,7 @@ Pl
 Gj
 bN
 Cr
-bN
+ca
 Gj
 JS
 ut
@@ -4522,12 +4560,12 @@ ut
 (13,1,1) = {"
 ut
 OL
-cY
-Ba
+OL
+OL
 Yk
 ju
-OL
-ua
+uf
+AB
 nT
 Sp
 Sp
@@ -4548,12 +4586,12 @@ ut
 (14,1,1) = {"
 ut
 OL
-OL
-OL
+yJ
+lQ
 fH
 Iw
-vN
-AB
+JY
+ua
 dF
 Sp
 bK
@@ -4575,8 +4613,8 @@ ut
 ut
 OL
 sj
-OL
-fH
+Bx
+fU
 dk
 OL
 Sa
@@ -4635,7 +4673,7 @@ Au
 jd
 Sp
 KR
-RQ
+pf
 Hc
 sD
 Sp
@@ -4646,7 +4684,7 @@ Gj
 Zs
 Zs
 Gj
-DA
+Gj
 ut
 "}
 (18,1,1) = {"
@@ -4760,7 +4798,7 @@ ut
 bz
 hi
 Xm
-wP
+Ak
 qN
 Ml
 mq
@@ -4771,8 +4809,8 @@ aA
 ha
 cC
 Aq
-wP
-wP
+Ak
+Ak
 cn
 lg
 ut
@@ -4811,7 +4849,7 @@ ut
 ut
 LC
 hC
-wP
+Ak
 Rx
 BE
 NA
@@ -4838,7 +4876,7 @@ ut
 oF
 aw
 Xm
-wP
+Ak
 ol
 NA
 NA
@@ -4849,8 +4887,8 @@ NA
 NA
 NA
 Ch
-wP
-wP
+Ak
+Ak
 VU
 fG
 ut
@@ -4889,7 +4927,7 @@ ut
 ut
 Hw
 kH
-wP
+Ak
 yV
 ol
 NA
@@ -4902,7 +4940,7 @@ NA
 NA
 Ch
 Rx
-wP
+Ak
 YV
 Hw
 ut
@@ -4927,8 +4965,8 @@ NA
 NA
 NA
 yO
-wP
-wP
+Ak
+Ak
 sR
 Hw
 ut
@@ -5254,7 +5292,7 @@ ut
 ut
 mf
 Hw
-LR
+xf
 oA
 NA
 NA
diff --git a/_maps/shuttles/subshuttles/nanotrasen_shuttle_tegus.dmm b/_maps/shuttles/subshuttles/nanotrasen_shuttle_tegus.dmm
index 27673174e2c2..d4faf0a93b20 100644
--- a/_maps/shuttles/subshuttles/nanotrasen_shuttle_tegus.dmm
+++ b/_maps/shuttles/subshuttles/nanotrasen_shuttle_tegus.dmm
@@ -151,7 +151,7 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
 	dir = 8
 	},
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+/obj/machinery/atmospherics/components/unary/vent_scrubber/layer2{
 	dir = 8
 	},
 /turf/open/floor/plasteel/patterned,
@@ -188,18 +188,18 @@
 /area/ship/shuttle)
 "oi" = (
 /obj/machinery/atmospherics/components/unary/tank/air{
-	dir = 1;
-	piping_layer = 4
+	piping_layer = 4;
+	dir = 1
 	},
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/shuttle)
 "oI" = (
-/obj/machinery/computer/crew{
-	dir = 8
-	},
 /obj/effect/turf_decal/corner/transparent/neutral{
 	dir = 4
 	},
+/obj/machinery/computer/crew{
+	dir = 8
+	},
 /turf/open/floor/plasteel/dark,
 /area/ship/shuttle)
 "oS" = (
@@ -264,9 +264,9 @@
 	pixel_x = -28
 	},
 /obj/item/binoculars,
-/obj/item/storage/firstaid/regular,
+/obj/item/storage/firstaid,
 /obj/item/storage/box/bodybags,
-/obj/item/pinpointer,
+/obj/item/pinpointer/crew,
 /obj/item/storage/toolbox/emergency,
 /obj/item/extinguisher/mini,
 /obj/item/clothing/suit/space/orange,
@@ -278,13 +278,13 @@
 /obj/effect/turf_decal/corner/transparent/neutral{
 	dir = 2
 	},
+/obj/machinery/atmospherics/components/unary/vent_scrubber/layer2{
+	dir = 1
+	},
 /obj/item/assembly/signaler{
 	name = "Emergency Signaler";
 	desc = "A remote signaler device. The label reads ''Stranded without communications? Ping this device to alert your captain who, too, has been provided with a remote signaler!''"
 	},
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
-	dir = 1
-	},
 /turf/open/floor/plasteel/dark,
 /area/ship/shuttle)
 "sk" = (
@@ -357,15 +357,16 @@
 "yD" = (
 /obj/machinery/porta_turret/centcom_shuttle/weak{
 	dir = 4;
-	name = "Old Mining Turret"
+	name = "Old Mining Turret";
+	shot_delay = 7.5
 	},
 /turf/closed/wall/mineral/titanium,
 /area/ship/shuttle)
 "yP" = (
+/obj/effect/turf_decal/corner/transparent/neutral,
 /obj/machinery/computer/helm{
 	dir = 8
 	},
-/obj/effect/turf_decal/corner/transparent/neutral,
 /turf/open/floor/plasteel/dark,
 /area/ship/shuttle)
 "yZ" = (
@@ -403,7 +404,7 @@
 	},
 /obj/machinery/airalarm/directional/east,
 /obj/machinery/light/small{
-	dir = 4;
+	dir = 1;
 	bulb_power = 0.5
 	},
 /turf/open/floor/plasteel/telecomms_floor,
@@ -415,12 +416,13 @@
 	},
 /obj/structure/window/reinforced/spawner,
 /obj/structure/window/reinforced/spawner/west,
-/obj/machinery/door/poddoor/shutters{
-	id = "tegus_shuttle_engine"
-	},
 /obj/machinery/power/smes/shuttle/micro{
 	dir = 4
 	},
+/obj/machinery/door/poddoor/shutters{
+	id = "tegus_shuttle_engine";
+	dir = 4
+	},
 /turf/open/floor/plating,
 /area/ship/shuttle)
 "AW" = (
@@ -435,13 +437,20 @@
 	dir = 4
 	},
 /area/ship/shuttle)
+"AZ" = (
+/obj/effect/spawner/structure/window/shuttle,
+/obj/machinery/door/poddoor/shutters/preopen{
+	id = "tegus_shuttle_window";
+	dir = 4
+	},
+/turf/open/floor/plating,
+/area/ship/shuttle)
 "BM" = (
 /obj/machinery/power/terminal{
 	dir = 1
 	},
 /obj/machinery/power/port_gen/pacman,
 /obj/structure/cable,
-/obj/item/stack/sheet/mineral/plasma/five,
 /turf/open/floor/plating,
 /area/ship/shuttle)
 "Cu" = (
@@ -483,12 +492,13 @@
 /obj/structure/cable{
 	icon_state = "0-8"
 	},
-/obj/machinery/door/poddoor/shutters{
-	id = "tegus_shuttle_engine"
-	},
 /obj/machinery/power/smes/shuttle/micro{
 	dir = 4
 	},
+/obj/machinery/door/poddoor/shutters{
+	id = "tegus_shuttle_engine";
+	dir = 4
+	},
 /turf/open/floor/plating,
 /area/ship/shuttle)
 "Ks" = (
@@ -506,7 +516,8 @@
 "KQ" = (
 /obj/machinery/porta_turret/centcom_shuttle/weak{
 	dir = 4;
-	name = "Old Mining Turret"
+	name = "Old Mining Turret";
+	shot_delay = 7.5
 	},
 /turf/closed/wall/mineral/titanium/nodiagonal,
 /area/ship/shuttle)
@@ -521,9 +532,6 @@
 /turf/open/floor/plasteel/patterned/cargo_one,
 /area/ship/shuttle)
 "LN" = (
-/obj/machinery/door/airlock/shuttle{
-	name = "Cockpit"
-	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
 	dir = 8
 	},
@@ -536,6 +544,10 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
 	dir = 8
 	},
+/obj/machinery/door/airlock/grunge{
+	dir = 4;
+	req_access = list(31)
+	},
 /turf/open/floor/plasteel,
 /area/ship/shuttle)
 "LU" = (
@@ -558,12 +570,12 @@
 	dir = 1
 	},
 /obj/structure/cable,
-/obj/machinery/power/apc/auto_name/east,
 /obj/machinery/atmospherics/components/binary/pump/on/layer4{
 	name = "Air to Distro";
 	target_pressure = 1000;
 	dir = 1
 	},
+/obj/machinery/power/apc/auto_name/east,
 /turf/open/floor/plasteel/tech,
 /area/ship/shuttle)
 "MD" = (
@@ -599,9 +611,6 @@
 /turf/open/floor/plasteel/dark,
 /area/ship/shuttle)
 "NJ" = (
-/obj/machinery/door/airlock/shuttle{
-	name = "Engine Room"
-	},
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
@@ -614,6 +623,9 @@
 /obj/effect/turf_decal/industrial/warning{
 	dir = 4
 	},
+/obj/machinery/door/airlock/grunge{
+	dir = 4
+	},
 /turf/open/floor/plasteel,
 /area/ship/shuttle)
 "Og" = (
@@ -651,11 +663,16 @@
 /turf/open/floor/plasteel/patterned/ridged,
 /area/ship/shuttle)
 "Rf" = (
-/obj/item/radio/intercom/wideband,
+/obj/item/radio/intercom/wideband{
+	pixel_y = 3
+	},
 /obj/structure/table/reinforced,
 /turf/open/floor/plasteel/dark,
 /area/ship/shuttle)
 "Rs" = (
+/obj/structure/railing{
+	layer = 4.2
+	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
 	dir = 9
 	},
@@ -663,9 +680,6 @@
 	dir = 1;
 	layer = 2.8
 	},
-/obj/structure/railing{
-	layer = 4.2
-	},
 /turf/open/floor/plasteel/patterned/monofloor{
 	dir = 4
 	},
@@ -712,17 +726,25 @@
 /obj/structure/chair/comfy/shuttle{
 	layer = 2.9
 	},
-/obj/machinery/light{
-	dir = 1
-	},
 /obj/structure/railing{
 	dir = 1;
 	layer = 4.2
 	},
+/obj/machinery/light{
+	dir = 1
+	},
 /turf/open/floor/plasteel/patterned/monofloor{
 	dir = 8
 	},
 /area/ship/shuttle)
+"TB" = (
+/obj/effect/spawner/structure/window/shuttle,
+/obj/machinery/door/poddoor/shutters/preopen{
+	id = "tegus_shuttle_window";
+	dir = 1
+	},
+/turf/open/floor/plating,
+/area/ship/shuttle)
 "Wx" = (
 /obj/structure/chair/comfy/shuttle{
 	dir = 4;
@@ -859,7 +881,7 @@ rx
 "}
 (13,1,1) = {"
 rx
-rp
+TB
 Rf
 Wx
 Cu
@@ -881,8 +903,8 @@ rx
 rx
 rx
 CM
-rp
-rp
+AZ
+AZ
 CM
 rx
 rx

From a5d7dbcc415c9a54b85bc702640c7678a5351f11 Mon Sep 17 00:00:00 2001
From: goober3 <118859017+goober3@users.noreply.github.com>
Date: Wed, 7 Jun 2023 21:33:57 +0100
Subject: [PATCH 15/28] hwuergh

any% walls
---
 _maps/shuttles/shiptest/nanotrasen_tegus.dmm  | 291 +++++++++++-------
 .../subshuttles/nanotrasen_shuttle_tegus.dmm  |  37 ++-
 code/modules/jobs/job_types/assistant.dm      |   1 +
 .../jobs/job_types/cargo_technician.dm        |   1 +
 4 files changed, 210 insertions(+), 120 deletions(-)

diff --git a/_maps/shuttles/shiptest/nanotrasen_tegus.dmm b/_maps/shuttles/shiptest/nanotrasen_tegus.dmm
index 8362e4917182..de2b8f8f4a60 100644
--- a/_maps/shuttles/shiptest/nanotrasen_tegus.dmm
+++ b/_maps/shuttles/shiptest/nanotrasen_tegus.dmm
@@ -30,11 +30,17 @@
 /turf/open/floor/plating,
 /area/ship/cargo)
 "aH" = (
+/obj/effect/turf_decal/ntspaceworks_big/seven,
 /obj/machinery/light{
-	layer = 4
+	layer = 4;
+	pixel_y = -32
 	},
 /turf/open/floor/plating,
 /area/ship/cargo)
+"aR" = (
+/obj/effect/turf_decal/ntspaceworks_big/three,
+/turf/open/floor/plating,
+/area/ship/cargo)
 "bb" = (
 /obj/structure/cable{
 	icon_state = "0-4"
@@ -58,7 +64,7 @@
 /obj/item/tank/internals/emergency_oxygen/double,
 /obj/item/tank/internals/emergency_oxygen/double,
 /obj/item/tank/internals/emergency_oxygen/double,
-/obj/item/storage/firstaid,
+/obj/item/storage/firstaid/regular,
 /obj/item/gps/mining/internal,
 /turf/open/floor/plasteel/patterned/ridged,
 /area/ship/cargo)
@@ -105,7 +111,7 @@
 	desc = "A comfy-looking tegu bed. You can even strap your pet in, in case the gravity turns off."
 	},
 /mob/living/simple_animal/hostile/retaliate/tegu/atlas{
-	dir = 8;
+	dir = 4;
 	faction = list("neutral")
 	},
 /turf/open/floor/plasteel/dark,
@@ -117,7 +123,31 @@
 /turf/open/floor/plasteel/patterned,
 /area/ship/crew)
 "ca" = (
-/obj/machinery/vending/clothing,
+/obj/structure/railing{
+	dir = 1;
+	layer = 2
+	},
+/obj/structure/closet/cabinet,
+/obj/item/clothing/shoes/sneakers/black,
+/obj/item/clothing/shoes/sneakers/black,
+/obj/item/clothing/shoes/sneakers/black,
+/obj/item/clothing/shoes/sneakers/black,
+/obj/item/clothing/shoes/sneakers/black,
+/obj/item/clothing/under/color/blue,
+/obj/item/clothing/under/color/black,
+/obj/item/clothing/under/color/green,
+/obj/item/clothing/under/color/lightpurple,
+/obj/item/clothing/under/color/grey,
+/obj/item/clothing/under/color/jumpskirt/blue,
+/obj/item/clothing/under/color/jumpskirt/black,
+/obj/item/clothing/under/color/jumpskirt/green,
+/obj/item/clothing/under/color/jumpskirt/lightpurple,
+/obj/item/clothing/under/color/jumpskirt/grey,
+/obj/item/radio/headset,
+/obj/item/radio/headset,
+/obj/item/radio/headset,
+/obj/item/radio/headset,
+/obj/item/radio/headset,
 /turf/open/floor/plasteel/patterned,
 /area/ship/crew)
 "cn" = (
@@ -206,7 +236,9 @@
 /area/ship/maintenance/port)
 "dk" = (
 /obj/structure/reagent_dispensers/water_cooler,
-/obj/machinery/light,
+/obj/machinery/light{
+	pixel_y = -32
+	},
 /turf/open/floor/plasteel/patterned/ridged,
 /area/ship/crew/canteen)
 "dl" = (
@@ -234,6 +266,10 @@
 	},
 /turf/open/floor/plating,
 /area/ship/hallway/central)
+"dr" = (
+/obj/effect/turf_decal/ntspaceworks_big/five,
+/turf/open/floor/plating,
+/area/ship/cargo)
 "du" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
 	dir = 4
@@ -248,7 +284,9 @@
 	dir = 8
 	},
 /obj/structure/table/reinforced,
-/obj/machinery/computer/helm/viewscreen,
+/obj/machinery/computer/helm/viewscreen{
+	dir = 1
+	},
 /turf/open/floor/plasteel/patterned,
 /area/ship/cargo)
 "dy" = (
@@ -504,7 +542,7 @@
 "gL" = (
 /obj/machinery/computer/crew{
 	dir = 8;
-	icon_state = "computer-left"
+	icon_state = "computer-right"
 	},
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/bridge)
@@ -521,7 +559,8 @@
 	dir = 1
 	},
 /obj/machinery/light/small{
-	dir = 1
+	dir = 1;
+	pixel_y = 28
 	},
 /turf/open/floor/plasteel/patterned/ridged,
 /area/ship/cargo)
@@ -541,7 +580,9 @@
 	pixel_x = 13;
 	pixel_y = 3
 	},
-/obj/machinery/light,
+/obj/machinery/light{
+	pixel_y = -32
+	},
 /obj/machinery/recharger,
 /obj/machinery/button/door{
 	id = "tegus_bridge";
@@ -573,9 +614,6 @@
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2{
 	dir = 8
 	},
-/obj/structure/cable{
-	icon_state = "2-8"
-	},
 /turf/open/floor/plasteel/patterned,
 /area/ship/hallway/aft)
 "hi" = (
@@ -619,7 +657,8 @@
 	pixel_x = -8
 	},
 /obj/machinery/light{
-	dir = 4
+	dir = 4;
+	pixel_x = 32
 	},
 /turf/open/floor/plasteel/patterned/ridged,
 /area/ship/crew)
@@ -652,6 +691,10 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
 	dir = 9
 	},
+/obj/structure/extinguisher_cabinet{
+	pixel_x = 28;
+	dir = 4
+	},
 /turf/open/floor/plasteel,
 /area/ship/hallway/central)
 "iJ" = (
@@ -754,8 +797,7 @@
 	icon_state = "0-4"
 	},
 /obj/machinery/firealarm{
-	pixel_y = -28;
-	dir = 1
+	pixel_y = -32
 	},
 /turf/open/floor/plasteel/dark,
 /area/ship/maintenance/port)
@@ -796,7 +838,8 @@
 /area/template_noop)
 "jQ" = (
 /obj/machinery/light{
-	dir = 8
+	dir = 8;
+	pixel_x = -32
 	},
 /obj/machinery/computer/telecomms/monitor{
 	dir = 4;
@@ -883,7 +926,8 @@
 "kT" = (
 /obj/machinery/light{
 	dir = 1;
-	layer = 4
+	layer = 4;
+	pixel_y = 32
 	},
 /turf/open/floor/plating,
 /area/ship/cargo)
@@ -940,7 +984,7 @@
 /turf/open/floor/plating,
 /area/ship/cargo)
 "li" = (
-/obj/machinery/atmospherics/components/unary/outlet_injector/on/layer2{
+/obj/machinery/atmospherics/components/unary/outlet_injector/layer2{
 	dir = 4
 	},
 /turf/open/floor/engine/hull,
@@ -1006,7 +1050,8 @@
 /obj/effect/turf_decal/corner/transparent/neutral,
 /obj/structure/chair/office,
 /obj/machinery/firealarm{
-	pixel_y = 28
+	pixel_y = 32;
+	dir = 1
 	},
 /turf/open/floor/plasteel,
 /area/ship/crew)
@@ -1111,8 +1156,7 @@
 /obj/machinery/door/firedoor/border_only{
 	dir = 8
 	},
-/obj/machinery/door/airlock/mining{
-	name = "Shuttle Bay";
+/obj/machinery/door/airlock/mining/glass{
 	dir = 4
 	},
 /turf/open/floor/plasteel,
@@ -1141,7 +1185,8 @@
 	icon_state = "1-4"
 	},
 /obj/machinery/light{
-	dir = 8
+	dir = 8;
+	pixel_x = -32
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
 	dir = 5
@@ -1236,7 +1281,7 @@
 /obj/structure/cable{
 	icon_state = "0-8"
 	},
-/obj/machinery/power/apc/auto_name/south,
+/obj/machinery/power/apc/auto_name/directional/south,
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
 "pC" = (
@@ -1273,7 +1318,9 @@
 /area/ship/maintenance/starboard)
 "pO" = (
 /obj/machinery/suit_storage_unit/mining,
-/obj/machinery/light,
+/obj/machinery/light{
+	pixel_y = -32
+	},
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/cargo)
 "qd" = (
@@ -1358,6 +1405,10 @@
 /obj/item/extinguisher/mini/empty,
 /turf/open/floor/plasteel,
 /area/ship/hallway/aft)
+"qK" = (
+/obj/effect/turf_decal/ntspaceworks_big/four,
+/turf/open/floor/plating,
+/area/ship/cargo)
 "qL" = (
 /obj/structure/table,
 /obj/structure/window/reinforced/spawner/north,
@@ -1502,7 +1553,8 @@
 /area/ship/cargo)
 "rZ" = (
 /obj/machinery/light/small{
-	dir = 1
+	dir = 1;
+	pixel_y = 28
 	},
 /obj/structure/table,
 /obj/item/analyzer{
@@ -1538,7 +1590,8 @@
 	pixel_x = -4
 	},
 /obj/machinery/light{
-	dir = 1
+	dir = 1;
+	pixel_y = 32
 	},
 /obj/item/trash/plate{
 	pixel_y = -13;
@@ -1597,11 +1650,10 @@
 "sD" = (
 /obj/structure/table/reinforced,
 /obj/item/radio/intercom{
-	dir = 1
+	pixel_y = -10
 	},
 /obj/machinery/firealarm{
-	pixel_y = -28;
-	dir = 1
+	pixel_y = -32
 	},
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
@@ -1642,7 +1694,7 @@
 /obj/structure/cable{
 	icon_state = "0-8"
 	},
-/obj/machinery/power/apc/auto_name/south,
+/obj/machinery/power/apc/auto_name/directional/south,
 /turf/open/floor/plasteel/patterned,
 /area/ship/cargo)
 "sW" = (
@@ -1668,11 +1720,6 @@
 	},
 /turf/open/floor/plasteel/dark,
 /area/ship/cargo)
-"ts" = (
-/obj/effect/spawner/structure/window/shuttle,
-/obj/structure/curtain/cloth/grey,
-/turf/open/floor/plating,
-/area/ship/hallway/central)
 "tD" = (
 /obj/structure/cable{
 	icon_state = "2-8"
@@ -1725,11 +1772,15 @@
 	},
 /obj/machinery/light{
 	dir = 1;
-	layer = 4
+	layer = 4;
+	pixel_y = 32
 	},
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
 "uf" = (
+/obj/machinery/door/airlock{
+	name = "Canteen"
+	},
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
@@ -1739,7 +1790,6 @@
 /obj/machinery/door/firedoor/border_only{
 	dir = 1
 	},
-/obj/machinery/door/airlock/glass,
 /turf/open/floor/plasteel,
 /area/ship/crew/canteen)
 "ui" = (
@@ -1756,7 +1806,7 @@
 /obj/structure/cable{
 	icon_state = "0-8"
 	},
-/obj/machinery/power/apc/auto_name/east,
+/obj/machinery/power/apc/auto_name/directional/east,
 /turf/open/floor/plasteel/patterned/ridged,
 /area/ship/crew)
 "uD" = (
@@ -1783,6 +1833,10 @@
 /obj/machinery/airalarm/directional/east,
 /turf/open/floor/plasteel/tech,
 /area/ship/maintenance/port)
+"vi" = (
+/obj/effect/turf_decal/ntspaceworks_big/eight,
+/turf/open/floor/plating,
+/area/ship/cargo)
 "vy" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/structure/cable{
@@ -1856,6 +1910,9 @@
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
+/obj/structure/cable{
+	icon_state = "2-4"
+	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
 	dir = 1
@@ -1887,7 +1944,9 @@
 	dir = 4
 	},
 /obj/structure/window/reinforced/spawner/north,
-/obj/machinery/light,
+/obj/machinery/light{
+	pixel_y = -32
+	},
 /turf/open/floor/plasteel/patterned,
 /area/ship/crew)
 "wv" = (
@@ -1914,7 +1973,7 @@
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
 	dir = 8
 	},
-/obj/machinery/power/apc/auto_name/east,
+/obj/machinery/power/apc/auto_name/directional/east,
 /turf/open/floor/plasteel/dark,
 /area/ship/maintenance/port)
 "xf" = (
@@ -2016,7 +2075,9 @@
 	pixel_y = 4;
 	pixel_x = -3
 	},
-/obj/machinery/light/small,
+/obj/machinery/light/small{
+	pixel_y = -28
+	},
 /turf/open/floor/plasteel/dark,
 /area/ship/maintenance/starboard)
 "yd" = (
@@ -2112,6 +2173,9 @@
 /area/ship/hallway/aft)
 "zr" = (
 /obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/cable{
+	icon_state = "0-8"
+	},
 /obj/effect/turf_decal/corner/transparent/solgovgold{
 	dir = 1
 	},
@@ -2119,6 +2183,7 @@
 	dir = 1
 	},
 /obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/power/apc/auto_name/directional/east,
 /turf/open/floor/plasteel,
 /area/ship/hallway/aft)
 "zu" = (
@@ -2130,7 +2195,6 @@
 /obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/layer4{
 	dir = 1
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
 /turf/open/floor/plasteel/patterned/ridged,
 /area/ship/cargo)
 "zH" = (
@@ -2158,7 +2222,8 @@
 /obj/effect/turf_decal/industrial/outline/yellow,
 /obj/structure/closet/crate,
 /obj/machinery/light{
-	dir = 8
+	dir = 8;
+	pixel_x = -32
 	},
 /turf/open/floor/plasteel/dark,
 /area/ship/cargo)
@@ -2225,7 +2290,8 @@
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/machinery/light{
-	dir = 4
+	dir = 4;
+	pixel_x = 32
 	},
 /obj/structure/reagent_dispensers/fueltank,
 /obj/effect/turf_decal/industrial/hatch/yellow,
@@ -2311,10 +2377,10 @@
 	},
 /area/ship/cargo)
 "Bv" = (
+/obj/machinery/power/apc/auto_name/directional/east,
 /obj/structure/cable{
 	icon_state = "0-8"
 	},
-/obj/machinery/power/apc/auto_name/east,
 /turf/open/floor/plasteel/dark,
 /area/ship/crew/canteen)
 "Bx" = (
@@ -2363,9 +2429,9 @@
 	dir = 1
 	},
 /obj/machinery/light/small{
-	dir = 1
+	dir = 1;
+	pixel_y = 28
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
 /turf/open/floor/plasteel/patterned/ridged,
 /area/ship/cargo)
 "BP" = (
@@ -2435,7 +2501,8 @@
 	dir = 1
 	},
 /obj/machinery/light{
-	dir = 1
+	dir = 1;
+	pixel_y = 32
 	},
 /turf/open/floor/plasteel,
 /area/ship/hallway/central)
@@ -2449,8 +2516,7 @@
 /obj/effect/turf_decal/industrial/warning,
 /obj/structure/table/reinforced,
 /obj/machinery/computer/helm/viewscreen{
-	dir = 1;
-	pixel_y = 5
+	pixel_y = 6
 	},
 /turf/open/floor/plasteel/patterned,
 /area/ship/cargo)
@@ -2474,7 +2540,8 @@
 	icon_state = "2-4"
 	},
 /obj/machinery/light{
-	dir = 8
+	dir = 8;
+	pixel_x = -32
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
 	dir = 6
@@ -2500,8 +2567,7 @@
 /obj/machinery/door/firedoor/border_only{
 	dir = 8
 	},
-/obj/machinery/door/airlock/mining{
-	name = "Shuttle Bay";
+/obj/machinery/door/airlock/mining/glass{
 	dir = 4
 	},
 /turf/open/floor/plasteel,
@@ -2584,6 +2650,10 @@
 	},
 /turf/open/floor/plasteel/tech,
 /area/ship/maintenance/port)
+"DT" = (
+/obj/effect/turf_decal/ntspaceworks_big/six,
+/turf/open/floor/plating,
+/area/ship/cargo)
 "Ea" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/effect/turf_decal/industrial/warning{
@@ -2594,8 +2664,8 @@
 "Eg" = (
 /obj/effect/turf_decal/industrial/hatch/yellow,
 /obj/machinery/firealarm{
-	dir = 4;
-	pixel_x = -28
+	dir = 8;
+	pixel_x = -32
 	},
 /turf/open/floor/plasteel/dark,
 /area/ship/cargo)
@@ -2621,7 +2691,7 @@
 "Ev" = (
 /obj/structure/table/reinforced,
 /obj/item/radio/intercom/wideband{
-	dir = 1
+	pixel_y = -6
 	},
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/bridge)
@@ -2636,7 +2706,7 @@
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
 	dir = 1
 	},
-/obj/machinery/power/apc/auto_name/south,
+/obj/machinery/power/apc/auto_name/directional/south,
 /turf/open/floor/plasteel/dark,
 /area/ship/engineering/communications)
 "EU" = (
@@ -2742,7 +2812,8 @@
 	dir = 8
 	},
 /obj/machinery/light/small{
-	dir = 1
+	dir = 1;
+	pixel_y = 28
 	},
 /turf/open/floor/engine/hull,
 /area/ship/cargo)
@@ -2782,7 +2853,9 @@
 /turf/open/floor/plasteel/patterned/cargo_one,
 /area/ship/cargo)
 "FQ" = (
-/obj/machinery/light,
+/obj/machinery/light{
+	pixel_y = -32
+	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
 	dir = 4
 	},
@@ -2822,6 +2895,7 @@
 /obj/effect/turf_decal/corner/transparent/neutral/three_quarters{
 	dir = 1
 	},
+/obj/machinery/power/apc/auto_name/directional/east,
 /turf/open/floor/plasteel/dark,
 /area/ship/hallway/central)
 "GF" = (
@@ -2860,7 +2934,9 @@
 /obj/effect/turf_decal/industrial/caution{
 	dir = 8
 	},
-/obj/machinery/light/small,
+/obj/machinery/light/small{
+	pixel_y = -28
+	},
 /turf/open/floor/engine/hull,
 /area/ship/cargo)
 "Ht" = (
@@ -2905,8 +2981,8 @@
 "HY" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/machinery/firealarm{
-	dir = 4;
-	pixel_x = -28
+	dir = 8;
+	pixel_x = -32
 	},
 /obj/structure/filingcabinet/double,
 /obj/effect/turf_decal/spline/fancy/opaque/grey{
@@ -3011,6 +3087,7 @@
 /area/ship/crew)
 "JY" = (
 /obj/effect/spawner/structure/window/shuttle,
+/obj/structure/curtain/cloth/grey,
 /turf/open/floor/plating,
 /area/ship/crew/canteen)
 "Kc" = (
@@ -3024,7 +3101,8 @@
 	dir = 1
 	},
 /obj/machinery/firealarm{
-	pixel_y = 28
+	pixel_y = 32;
+	dir = 1
 	},
 /turf/open/floor/plasteel,
 /area/ship/hallway/central)
@@ -3166,6 +3244,10 @@
 	},
 /turf/open/floor/plasteel/dark,
 /area/ship/cargo)
+"Mi" = (
+/obj/effect/turf_decal/ntspaceworks_big/two,
+/turf/open/floor/plating,
+/area/ship/cargo)
 "Ml" = (
 /obj/effect/turf_decal/industrial/warning{
 	dir = 4
@@ -3236,7 +3318,8 @@
 	icon_state = "4-8"
 	},
 /obj/machinery/light{
-	dir = 1
+	dir = 1;
+	pixel_y = 32
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
 	dir = 4
@@ -3249,26 +3332,15 @@
 "MS" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
-/obj/structure/extinguisher_cabinet{
-	pixel_x = 28;
-	dir = 4
-	},
 /turf/open/floor/plasteel/patterned,
 /area/ship/hallway/central)
 "MU" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/structure/catwalk/over/plated_catwalk,
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
 /turf/open/floor/plating,
 /area/ship/hallway/aft)
 "MY" = (
 /obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/power/apc/auto_name/west,
-/obj/structure/cable{
-	icon_state = "0-4"
-	},
 /turf/open/floor/plasteel/patterned,
 /area/ship/hallway/aft)
 "Nb" = (
@@ -3331,6 +3403,10 @@
 "NA" = (
 /turf/open/floor/plating,
 /area/ship/cargo)
+"NC" = (
+/obj/effect/turf_decal/ntspaceworks_big/one,
+/turf/open/floor/plating,
+/area/ship/cargo)
 "NL" = (
 /obj/effect/turf_decal/corner/transparent/neutral{
 	dir = 4
@@ -3367,7 +3443,7 @@
 "NV" = (
 /obj/machinery/computer/helm{
 	dir = 8;
-	icon_state = "computer-right"
+	icon_state = "computer-left"
 	},
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/bridge)
@@ -3479,7 +3555,8 @@
 "Pb" = (
 /obj/effect/turf_decal/industrial/outline/yellow,
 /obj/machinery/light{
-	dir = 8
+	dir = 8;
+	pixel_x = -32
 	},
 /turf/open/floor/plasteel/dark,
 /area/ship/cargo)
@@ -3512,7 +3589,8 @@
 	pixel_y = 13
 	},
 /obj/machinery/light/small{
-	dir = 8
+	dir = 8;
+	pixel_x = -28
 	},
 /turf/open/floor/plastic,
 /area/ship/crew/canteen)
@@ -3540,7 +3618,9 @@
 /obj/structure/cable/yellow{
 	icon_state = "1-4"
 	},
-/obj/machinery/light/small,
+/obj/machinery/light/small{
+	pixel_y = -28
+	},
 /turf/open/floor/plasteel/dark,
 /area/ship/maintenance/starboard)
 "Qa" = (
@@ -3604,7 +3684,8 @@
 	id = "Nanotrasen Broadcaster"
 	},
 /obj/machinery/light{
-	dir = 8
+	dir = 8;
+	pixel_x = -32
 	},
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/engineering/communications)
@@ -3621,7 +3702,8 @@
 	dir = 8
 	},
 /obj/machinery/light/small{
-	dir = 8
+	dir = 8;
+	pixel_x = -28
 	},
 /turf/open/floor/plasteel/patterned/ridged,
 /area/ship/hallway/central)
@@ -3669,7 +3751,7 @@
 /obj/structure/cable{
 	icon_state = "0-2"
 	},
-/obj/machinery/power/apc/auto_name/north,
+/obj/machinery/power/apc/auto_name/directional/north,
 /turf/open/floor/plasteel/dark,
 /area/ship/maintenance/starboard)
 "RP" = (
@@ -3789,8 +3871,8 @@
 	dir = 1
 	},
 /obj/machinery/firealarm{
-	dir = 4;
-	pixel_x = -28
+	dir = 8;
+	pixel_x = -32
 	},
 /obj/structure/sign/poster/official/random{
 	pixel_y = 32
@@ -3883,7 +3965,9 @@
 /turf/open/floor/plasteel,
 /area/ship/bridge)
 "Vd" = (
-/obj/machinery/light/small,
+/obj/machinery/light/small{
+	pixel_y = -28
+	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
 	dir = 8
 	},
@@ -3939,8 +4023,8 @@
 /area/ship/cargo)
 "Vy" = (
 /obj/machinery/firealarm{
-	dir = 8;
-	pixel_x = 28
+	dir = 4;
+	pixel_x = 32
 	},
 /obj/structure/catwalk/over/plated_catwalk/dark,
 /turf/open/floor/plating,
@@ -3969,7 +4053,8 @@
 	dir = 4
 	},
 /obj/machinery/light/small{
-	dir = 8
+	dir = 8;
+	pixel_x = -28
 	},
 /turf/open/floor/plasteel/patterned/ridged,
 /area/ship/hallway/central)
@@ -3993,8 +4078,7 @@
 	dir = 1
 	},
 /obj/machinery/computer/cryopod{
-	pixel_y = -27;
-	dir = 1
+	pixel_y = -27
 	},
 /turf/open/floor/plasteel/patterned/ridged,
 /area/ship/crew)
@@ -4100,8 +4184,8 @@
 /area/ship/hallway/central)
 "XS" = (
 /obj/machinery/firealarm{
-	dir = 4;
-	pixel_x = -28
+	dir = 8;
+	pixel_x = -32
 	},
 /obj/structure/catwalk/over/plated_catwalk/dark,
 /turf/open/floor/plating,
@@ -4233,15 +4317,12 @@
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/structure/table,
 /obj/machinery/light{
-	dir = 4
+	dir = 4;
+	pixel_x = 32
 	},
 /obj/item/toy/cards/deck/tarot{
 	pixel_y = 4
 	},
-/obj/item/cigbutt{
-	pixel_x = 7;
-	pixel_y = 3
-	},
 /turf/open/floor/plasteel,
 /area/ship/hallway/aft)
 
@@ -4387,7 +4468,7 @@ hL
 hL
 hL
 hL
-ts
+lW
 qS
 hL
 hL
@@ -5222,8 +5303,8 @@ NA
 NA
 NA
 NA
-NA
-NA
+NC
+dr
 oA
 Hw
 Bl
@@ -5248,8 +5329,8 @@ NA
 NA
 NA
 NA
-NA
-NA
+Mi
+DT
 RP
 zv
 lf
@@ -5274,7 +5355,7 @@ NA
 NA
 NA
 NA
-NA
+aR
 aH
 RP
 BJ
@@ -5300,8 +5381,8 @@ NA
 NA
 NA
 NA
-NA
-NA
+qK
+vi
 oA
 Hw
 xf
diff --git a/_maps/shuttles/subshuttles/nanotrasen_shuttle_tegus.dmm b/_maps/shuttles/subshuttles/nanotrasen_shuttle_tegus.dmm
index d4faf0a93b20..ac739d8998f1 100644
--- a/_maps/shuttles/subshuttles/nanotrasen_shuttle_tegus.dmm
+++ b/_maps/shuttles/subshuttles/nanotrasen_shuttle_tegus.dmm
@@ -57,7 +57,8 @@
 /area/ship/shuttle)
 "dm" = (
 /obj/machinery/light/small{
-	dir = 4
+	dir = 4;
+	pixel_x = 28
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
 	dir = 10
@@ -151,7 +152,7 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
 	dir = 8
 	},
-/obj/machinery/atmospherics/components/unary/vent_scrubber/layer2{
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
 	dir = 8
 	},
 /turf/open/floor/plasteel/patterned,
@@ -197,7 +198,7 @@
 /obj/effect/turf_decal/corner/transparent/neutral{
 	dir = 4
 	},
-/obj/machinery/computer/crew{
+/obj/machinery/computer/crew/retro{
 	dir = 8
 	},
 /turf/open/floor/plasteel/dark,
@@ -264,7 +265,7 @@
 	pixel_x = -28
 	},
 /obj/item/binoculars,
-/obj/item/storage/firstaid,
+/obj/item/storage/firstaid/regular,
 /obj/item/storage/box/bodybags,
 /obj/item/pinpointer/crew,
 /obj/item/storage/toolbox/emergency,
@@ -278,13 +279,13 @@
 /obj/effect/turf_decal/corner/transparent/neutral{
 	dir = 2
 	},
-/obj/machinery/atmospherics/components/unary/vent_scrubber/layer2{
-	dir = 1
-	},
 /obj/item/assembly/signaler{
 	name = "Emergency Signaler";
 	desc = "A remote signaler device. The label reads ''Stranded without communications? Ping this device to alert your captain who, too, has been provided with a remote signaler!''"
 	},
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+	dir = 1
+	},
 /turf/open/floor/plasteel/dark,
 /area/ship/shuttle)
 "sk" = (
@@ -311,7 +312,8 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
 /obj/machinery/light/dim{
 	dir = 8;
-	bulb_power = 0.5
+	bulb_power = 0.5;
+	pixel_x = -32
 	},
 /turf/open/floor/plasteel/dark,
 /area/ship/shuttle)
@@ -364,7 +366,7 @@
 /area/ship/shuttle)
 "yP" = (
 /obj/effect/turf_decal/corner/transparent/neutral,
-/obj/machinery/computer/helm{
+/obj/machinery/computer/helm/retro{
 	dir = 8
 	},
 /turf/open/floor/plasteel/dark,
@@ -405,7 +407,8 @@
 /obj/machinery/airalarm/directional/east,
 /obj/machinery/light/small{
 	dir = 1;
-	bulb_power = 0.5
+	bulb_power = 0.5;
+	pixel_y = 28
 	},
 /turf/open/floor/plasteel/telecomms_floor,
 /area/ship/shuttle)
@@ -575,7 +578,7 @@
 	target_pressure = 1000;
 	dir = 1
 	},
-/obj/machinery/power/apc/auto_name/east,
+/obj/machinery/power/apc/auto_name/directional/east,
 /turf/open/floor/plasteel/tech,
 /area/ship/shuttle)
 "MD" = (
@@ -637,7 +640,8 @@
 	layer = 2.8
 	},
 /obj/machinery/light{
-	bulb_power = 0.5
+	bulb_power = 0.5;
+	pixel_y = -32
 	},
 /obj/structure/railing{
 	layer = 4.2
@@ -664,7 +668,8 @@
 /area/ship/shuttle)
 "Rf" = (
 /obj/item/radio/intercom/wideband{
-	pixel_y = 3
+	dir = 1;
+	pixel_y = 10
 	},
 /obj/structure/table/reinforced,
 /turf/open/floor/plasteel/dark,
@@ -698,7 +703,8 @@
 	dir = 8
 	},
 /obj/machinery/light/small{
-	bulb_power = 0.5
+	bulb_power = 0.5;
+	pixel_y = -28
 	},
 /obj/structure/cable,
 /obj/machinery/power/terminal{
@@ -731,7 +737,8 @@
 	layer = 4.2
 	},
 /obj/machinery/light{
-	dir = 1
+	dir = 1;
+	pixel_y = 32
 	},
 /turf/open/floor/plasteel/patterned/monofloor{
 	dir = 8
diff --git a/code/modules/jobs/job_types/assistant.dm b/code/modules/jobs/job_types/assistant.dm
index c1e73a823d10..43985dd0f3e4 100644
--- a/code/modules/jobs/job_types/assistant.dm
+++ b/code/modules/jobs/job_types/assistant.dm
@@ -24,6 +24,7 @@ Assistant
 	jobtype = /datum/job/assistant
 	r_pocket = /obj/item/radio
 	belt = /obj/item/pda
+	ears = /obj/item/radio/headset
 
 /datum/outfit/job/assistant/pre_equip(mob/living/carbon/human/H)
 	..()
diff --git a/code/modules/jobs/job_types/cargo_technician.dm b/code/modules/jobs/job_types/cargo_technician.dm
index ed422955f1d0..33f00d56a9b9 100644
--- a/code/modules/jobs/job_types/cargo_technician.dm
+++ b/code/modules/jobs/job_types/cargo_technician.dm
@@ -61,6 +61,7 @@
 	gloves = /obj/item/clothing/gloves/fingerless
 	glasses = /obj/item/clothing/glasses/sunglasses/big
 	head = /obj/item/clothing/head/soft
+	ears = /obj/item/radio/headset/nanotrasen
 
 /datum/outfit/job/cargo_tech/donk
 	name = "Customer Associate (Donk! Co.)"

From 38d08cd62dc44b6c028ef6118b5d09615be8f4a1 Mon Sep 17 00:00:00 2001
From: goober3 <118859017+goober3@users.noreply.github.com>
Date: Wed, 7 Jun 2023 21:36:11 +0100
Subject: [PATCH 16/28] hweurgh

any% walls
---
 _maps/shuttles/shiptest/nanotrasen_tegus.dmm | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/_maps/shuttles/shiptest/nanotrasen_tegus.dmm b/_maps/shuttles/shiptest/nanotrasen_tegus.dmm
index de2b8f8f4a60..27fe0c9f90bd 100644
--- a/_maps/shuttles/shiptest/nanotrasen_tegus.dmm
+++ b/_maps/shuttles/shiptest/nanotrasen_tegus.dmm
@@ -614,6 +614,9 @@
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2{
 	dir = 8
 	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
 /turf/open/floor/plasteel/patterned,
 /area/ship/hallway/aft)
 "hi" = (
@@ -1910,9 +1913,6 @@
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
-/obj/structure/cable{
-	icon_state = "2-4"
-	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
 	dir = 1
@@ -2173,9 +2173,6 @@
 /area/ship/hallway/aft)
 "zr" = (
 /obj/effect/decal/cleanable/dirt/dust,
-/obj/structure/cable{
-	icon_state = "0-8"
-	},
 /obj/effect/turf_decal/corner/transparent/solgovgold{
 	dir = 1
 	},
@@ -2183,7 +2180,6 @@
 	dir = 1
 	},
 /obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/power/apc/auto_name/directional/east,
 /turf/open/floor/plasteel,
 /area/ship/hallway/aft)
 "zu" = (
@@ -3337,10 +3333,17 @@
 "MU" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/structure/catwalk/over/plated_catwalk,
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
 /turf/open/floor/plating,
 /area/ship/hallway/aft)
 "MY" = (
 /obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/power/apc/auto_name/directional/west,
+/obj/structure/cable{
+	icon_state = "0-4"
+	},
 /turf/open/floor/plasteel/patterned,
 /area/ship/hallway/aft)
 "Nb" = (

From 4aee103d0d5f4c892293150333d829fab5e096f6 Mon Sep 17 00:00:00 2001
From: goober3 <118859017+goober3@users.noreply.github.com>
Date: Mon, 12 Jun 2023 20:37:24 +0100
Subject: [PATCH 17/28] the tegu re-re-rework

---
 _maps/configs/nanotrasen_tegus.json          |    4 +-
 _maps/shuttles/shiptest/nanotrasen_tegus.dmm | 6229 +++++++++---------
 code/game/area/ship_areas.dm                 |    4 +
 icons/turf/areas.dmi                         |  Bin 41884 -> 42047 bytes
 4 files changed, 3112 insertions(+), 3125 deletions(-)

diff --git a/_maps/configs/nanotrasen_tegus.json b/_maps/configs/nanotrasen_tegus.json
index 43eb0ec5b07a..7ef81a8ad3f5 100644
--- a/_maps/configs/nanotrasen_tegus.json
+++ b/_maps/configs/nanotrasen_tegus.json
@@ -18,7 +18,7 @@
 		},
 		"Shaft Miner": {
 			"outfit": "/datum/outfit/job/miner",
-			"slots": 3
+			"slots": 2
 		},
 		"Pilot": {
 			"outfit": "/datum/outfit/job/cargo_tech/nanotrasen_pilot",
@@ -26,7 +26,7 @@
 		},
 		"Deckhand": {
 			"outfit": "/datum/outfit/job/assistant",
-			"slots": 2
+			"slots": 1
 		}
 	},
 	"enabled": true
diff --git a/_maps/shuttles/shiptest/nanotrasen_tegus.dmm b/_maps/shuttles/shiptest/nanotrasen_tegus.dmm
index 27fe0c9f90bd..98db12fad645 100644
--- a/_maps/shuttles/shiptest/nanotrasen_tegus.dmm
+++ b/_maps/shuttles/shiptest/nanotrasen_tegus.dmm
@@ -9,249 +9,248 @@
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
 "am" = (
-/obj/structure/cable{
-	icon_state = "1-8"
+/obj/effect/turf_decal/industrial/warning{
+	dir = 1
 	},
-/turf/closed/wall/mineral/titanium/nodiagonal,
-/area/ship/cargo)
-"aw" = (
+/obj/effect/decal/cleanable/dirt/dust,
 /obj/structure/cable{
-	icon_state = "1-8"
+	icon_state = "4-8"
 	},
-/turf/open/floor/plasteel/patterned/ridged,
-/area/ship/cargo)
+/turf/open/floor/plasteel,
+/area/ship/cargo/hangar)
+"aw" = (
+/turf/closed/wall/mineral/titanium,
+/area/ship/cargo/hangar)
 "aA" = (
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
-/obj/structure/catwalk/over/plated_catwalk,
-/turf/open/floor/plating,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
+/turf/open/floor/plasteel,
 /area/ship/cargo)
 "aH" = (
-/obj/effect/turf_decal/ntspaceworks_big/seven,
-/obj/machinery/light{
-	layer = 4;
-	pixel_y = -32
-	},
-/turf/open/floor/plating,
-/area/ship/cargo)
+/obj/effect/turf_decal/trimline/opaque/white/line,
+/turf/open/floor/plasteel,
+/area/ship/cargo/hangar)
 "aR" = (
-/obj/effect/turf_decal/ntspaceworks_big/three,
-/turf/open/floor/plating,
-/area/ship/cargo)
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/dark,
+/area/ship/cargo/hangar)
 "bb" = (
-/obj/structure/cable{
-	icon_state = "0-4"
+/obj/machinery/airalarm/directional/east,
+/obj/effect/turf_decal/siding/thinplating{
+	dir = 4
 	},
-/obj/machinery/power/shuttle/engine/electric/bad{
+/obj/effect/turf_decal/trimline/opaque/white/line{
 	dir = 4
 	},
-/turf/open/floor/plating,
-/area/ship/maintenance/port)
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel,
+/area/ship/hallway/central)
 "bl" = (
-/obj/structure/cable{
-	icon_state = "0-4"
-	},
-/obj/machinery/power/shuttle/engine/electric/bad{
-	dir = 4
+/obj/effect/turf_decal/ntspaceworks_big/six{
+	dir = 8
 	},
-/turf/open/floor/plating,
-/area/ship/maintenance/starboard)
+/turf/open/floor/plasteel/patterned,
+/area/ship/cargo/hangar)
 "bs" = (
-/obj/structure/rack,
-/obj/item/tank/internals/emergency_oxygen/double,
-/obj/item/tank/internals/emergency_oxygen/double,
-/obj/item/tank/internals/emergency_oxygen/double,
-/obj/item/storage/firstaid/regular,
-/obj/item/gps/mining/internal,
-/turf/open/floor/plasteel/patterned/ridged,
-/area/ship/cargo)
+/obj/structure/tank_dispenser,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/light/dim/directional/south,
+/turf/open/floor/plasteel,
+/area/ship/cargo/hangar)
 "bu" = (
-/obj/effect/turf_decal/industrial/loading,
-/turf/open/floor/plasteel/patterned,
-/area/ship/cargo)
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+	dir = 8
+	},
+/obj/machinery/light/small/directional/east,
+/turf/open/floor/plasteel,
+/area/ship/crew)
 "bv" = (
-/obj/structure/railing{
-	dir = 1
+/obj/effect/turf_decal/corner/transparent/neutral,
+/obj/structure/table/reinforced,
+/obj/machinery/computer/helm/viewscreen{
+	pixel_y = 6
 	},
-/obj/structure/catwalk/over/plated_catwalk,
-/turf/open/floor/plating/airless,
-/area/ship/cargo)
+/turf/open/floor/plasteel/telecomms_floor,
+/area/ship/cargo/hangar)
 "bz" = (
-/obj/effect/turf_decal/industrial/warning,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/closet/emcloset/wall{
+	dir = 1;
+	pixel_y = -28
+	},
+/turf/open/floor/plasteel,
+/area/ship/cargo/hangar)
+"bD" = (
 /obj/effect/turf_decal/industrial/warning{
 	dir = 1
 	},
+/obj/effect/turf_decal/industrial/warning,
 /obj/machinery/door/poddoor{
-	id = "tegus_port_cargo"
-	},
-/obj/machinery/power/shieldwallgen/atmos/roundstart{
-	dir = 4;
-	id = "cargo_shield_port"
-	},
-/obj/structure/cable{
-	icon_state = "0-2"
+	id = "tegus_starboard_cargo"
 	},
+/obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plating,
 /area/ship/cargo)
-"bD" = (
-/obj/structure/extinguisher_cabinet{
-	pixel_y = -28
-	},
-/turf/open/floor/plasteel/patterned/ridged,
-/area/ship/cargo)
 "bK" = (
-/obj/effect/turf_decal/corner/transparent/neutral{
-	dir = 4
+/obj/structure/table/reinforced,
+/obj/machinery/button/door{
+	id = "tegus_shuttle_door";
+	name = "Shuttle Bay Blast Door";
+	pixel_x = -4;
+	req_access = list(31)
 	},
-/obj/structure/bed/dogbed{
-	name = "Atlas's Bed";
-	desc = "A comfy-looking tegu bed. You can even strap your pet in, in case the gravity turns off."
+/obj/machinery/button/door{
+	pixel_x = -4;
+	id = "tegus_hangar_shutters";
+	name = "Window Shutters";
+	pixel_y = 8
 	},
-/mob/living/simple_animal/hostile/retaliate/tegu/atlas{
-	dir = 4;
-	faction = list("neutral")
+/obj/machinery/button/shieldwallgen{
+	id = "cargo_shield_fore";
+	pixel_y = 2;
+	name = "Shuttle Bay Holofield";
+	pixel_x = 6
 	},
-/turf/open/floor/plasteel/dark,
-/area/ship/bridge)
+/obj/effect/turf_decal/corner/transparent/neutral{
+	dir = 1
+	},
+/turf/open/floor/plasteel/telecomms_floor,
+/area/ship/cargo/hangar)
 "bN" = (
-/obj/structure/bed,
-/obj/item/bedsheet/dorms,
-/obj/structure/curtain/cloth/grey,
-/turf/open/floor/plasteel/patterned,
+/obj/structure/chair/sofa/right,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/airalarm/directional/north,
+/turf/open/floor/wood,
 /area/ship/crew)
 "ca" = (
-/obj/structure/railing{
-	dir = 1;
-	layer = 2
-	},
-/obj/structure/closet/cabinet,
-/obj/item/clothing/shoes/sneakers/black,
-/obj/item/clothing/shoes/sneakers/black,
-/obj/item/clothing/shoes/sneakers/black,
-/obj/item/clothing/shoes/sneakers/black,
-/obj/item/clothing/shoes/sneakers/black,
-/obj/item/clothing/under/color/blue,
-/obj/item/clothing/under/color/black,
-/obj/item/clothing/under/color/green,
-/obj/item/clothing/under/color/lightpurple,
-/obj/item/clothing/under/color/grey,
-/obj/item/clothing/under/color/jumpskirt/blue,
-/obj/item/clothing/under/color/jumpskirt/black,
-/obj/item/clothing/under/color/jumpskirt/green,
-/obj/item/clothing/under/color/jumpskirt/lightpurple,
-/obj/item/clothing/under/color/jumpskirt/grey,
-/obj/item/radio/headset,
-/obj/item/radio/headset,
-/obj/item/radio/headset,
-/obj/item/radio/headset,
-/obj/item/radio/headset,
-/turf/open/floor/plasteel/patterned,
+/obj/machinery/vending/clothing,
+/turf/open/floor/wood,
 /area/ship/crew)
 "cn" = (
 /obj/structure/cable{
 	icon_state = "2-4"
 	},
-/turf/open/floor/plasteel/patterned,
-/area/ship/cargo)
+/obj/machinery/light{
+	dir = 8;
+	pixel_x = -32
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 6
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 6
+	},
+/obj/effect/turf_decal/siding/thinplating{
+	dir = 8
+	},
+/obj/effect/turf_decal/trimline/opaque/white/line{
+	dir = 8
+	},
+/turf/open/floor/plasteel,
+/area/ship/hallway/central)
 "cC" = (
-/obj/effect/turf_decal/industrial/warning{
+/obj/effect/turf_decal/industrial/loading{
 	dir = 4
 	},
-/obj/structure/cable{
-	icon_state = "1-2"
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 8
 	},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4,
 /obj/structure/cable{
 	icon_state = "2-8"
 	},
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4{
-	dir = 4
+/obj/structure/cable{
+	icon_state = "4-8"
 	},
-/turf/open/floor/plasteel,
+/turf/open/floor/plasteel/patterned/ridged,
 /area/ship/cargo)
 "cI" = (
-/obj/structure/catwalk/over/plated_catwalk,
-/obj/structure/railing{
-	layer = 4.1
+/obj/structure/table/reinforced,
+/obj/machinery/computer/helm/viewscreen{
+	dir = 1
 	},
-/turf/open/floor/plating/airless,
-/area/ship/cargo)
-"cK" = (
-/obj/machinery/power/smes/shuttle/precharged{
+/obj/effect/turf_decal/corner/transparent/neutral{
 	dir = 4
 	},
-/obj/structure/window/reinforced/spawner/west,
-/obj/machinery/door/window/eastright,
-/obj/structure/cable{
-	icon_state = "0-8"
+/turf/open/floor/plasteel/telecomms_floor,
+/area/ship/cargo/hangar)
+"cK" = (
+/obj/structure/reagent_dispensers/water_cooler,
+/obj/effect/turf_decal/corner/transparent/neutral{
+	dir = 8
 	},
-/obj/machinery/door/poddoor{
-	id = "tegus_port_engine";
-	dir = 4
+/obj/machinery/light/dim/directional/north,
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/canteen)
+"cO" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/structure/cable/yellow{
+	icon_state = "2-8"
 	},
 /turf/open/floor/plating,
-/area/ship/maintenance/port)
-"cO" = (
-/obj/structure/railing{
-	dir = 6;
-	layer = 4.1
+/area/ship/engineering/engine)
+"cP" = (
+/obj/effect/turf_decal/industrial/warning{
+	dir = 8
 	},
-/obj/effect/turf_decal/spline/fancy/opaque/grey{
-	dir = 6
+/obj/effect/turf_decal/industrial/warning{
+	dir = 4
+	},
+/obj/machinery/power/shieldwallgen/atmos/roundstart{
+	dir = 1;
+	id = "cargo_shield_fore"
 	},
-/turf/open/floor/plasteel/patterned,
-/area/ship/hallway/aft)
-"cP" = (
 /obj/structure/cable{
-	icon_state = "2-8"
+	icon_state = "0-2"
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
-	dir = 6
+/obj/machinery/door/poddoor{
+	id = "tegus_shuttle_door";
+	dir = 4
 	},
-/obj/structure/catwalk/over/plated_catwalk/dark,
 /turf/open/floor/plating,
-/area/ship/maintenance/port)
+/area/ship/cargo/hangar)
 "cR" = (
-/obj/effect/turf_decal/corner/transparent/solgovgold{
-	dir = 8
-	},
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/structure/cable/yellow{
-	icon_state = "2-4"
-	},
-/turf/open/floor/plasteel/dark,
-/area/ship/maintenance/starboard)
+/obj/machinery/cryopod,
+/turf/open/floor/plasteel/tech,
+/area/ship/crew)
 "cY" = (
-/obj/machinery/vending/cigarette,
-/turf/open/floor/plasteel/patterned/ridged,
+/obj/machinery/airalarm/directional/south,
+/turf/open/floor/plasteel,
 /area/ship/crew/canteen)
 "db" = (
-/turf/closed/wall/mineral/titanium/nodiagonal,
-/area/ship/maintenance/port)
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/decal/cleanable/ash,
+/turf/open/floor/plating,
+/area/ship/engineering/engine)
 "dk" = (
-/obj/structure/reagent_dispensers/water_cooler,
-/obj/machinery/light{
-	pixel_y = -32
+/obj/machinery/firealarm{
+	dir = 8;
+	pixel_x = -32
 	},
-/turf/open/floor/plasteel/patterned/ridged,
-/area/ship/crew/canteen)
-"dl" = (
-/obj/structure/cable{
-	icon_state = "1-8"
+/obj/structure/sign/poster/official/random{
+	pixel_y = 32
 	},
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
-	dir = 1
+/obj/effect/turf_decal/siding/thinplating{
+	dir = 9
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+/obj/effect/turf_decal/trimline/opaque/white/line{
 	dir = 9
 	},
 /turf/open/floor/plasteel,
+/area/ship/hallway/central)
+"dl" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/power/apc/auto_name/directional/east,
+/obj/structure/cable{
+	icon_state = "0-1"
+	},
+/turf/open/floor/wood,
 /area/ship/crew)
 "dm" = (
 /obj/structure/catwalk/over/plated_catwalk,
@@ -267,192 +266,162 @@
 /turf/open/floor/plating,
 /area/ship/hallway/central)
 "dr" = (
-/obj/effect/turf_decal/ntspaceworks_big/five,
 /turf/open/floor/plating,
-/area/ship/cargo)
+/area/ship/cargo/hangar)
 "du" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
-	dir = 4
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/effect/turf_decal/industrial/warning{
-	dir = 1
-	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
 	dir = 8
 	},
-/obj/structure/table/reinforced,
-/obj/machinery/computer/helm/viewscreen{
-	dir = 1
-	},
-/turf/open/floor/plasteel/patterned,
-/area/ship/cargo)
+/turf/open/floor/plasteel/dark,
+/area/ship/cargo/hangar)
 "dy" = (
-/obj/effect/spawner/structure/window/shuttle,
-/obj/machinery/door/firedoor/heavy,
-/obj/machinery/door/poddoor/shutters/preopen{
-	id = "tegus_bridge";
-	dir = 4
+/obj/machinery/modular_computer/console/preset/command{
+	dir = 8
 	},
-/turf/open/floor/plating,
+/turf/open/floor/plasteel/tech/grid,
 /area/ship/bridge)
 "dF" = (
-/obj/effect/turf_decal/corner/transparent/ntblue,
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4,
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
-	dir = 4
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4,
+/obj/structure/cable{
+	icon_state = "1-8"
 	},
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2,
+/obj/effect/turf_decal/siding/thinplating,
+/obj/effect/turf_decal/trimline/opaque/white/line,
+/obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/plasteel,
 /area/ship/hallway/central)
 "dO" = (
-/obj/structure/railing{
-	dir = 8;
-	pixel_x = -1
+/obj/machinery/firealarm{
+	dir = 4;
+	pixel_x = 32
 	},
-/obj/machinery/conveyor/inverted{
-	dir = 5;
-	id = "tegusbelt"
+/obj/machinery/computer/telecomms/monitor{
+	dir = 8;
+	network = "ntsv_commnet"
 	},
-/turf/open/floor/plasteel/tech/grid,
-/area/ship/cargo)
-"dP" = (
 /turf/open/floor/plasteel/dark,
-/area/ship/crew/canteen)
-"dQ" = (
-/obj/machinery/light/floor,
-/obj/effect/turf_decal/industrial/warning{
-	dir = 1
-	},
-/obj/structure/cable{
-	icon_state = "2-4"
-	},
+/area/ship/engineering/communications)
+"dP" = (
 /obj/structure/cable{
-	icon_state = "4-8"
+	icon_state = "1-4"
 	},
+/turf/open/floor/plasteel,
+/area/ship/crew/canteen)
+"dQ" = (
+/obj/effect/turf_decal/industrial/hatch/yellow,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
 	dir = 8
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
 	dir = 4
 	},
-/turf/open/floor/plasteel/patterned/cargo_one,
-/area/ship/cargo)
-"dR" = (
-/obj/effect/turf_decal/spline/fancy/opaque/grey,
-/obj/machinery/smartfridge/food,
-/turf/open/floor/plasteel/dark,
-/area/ship/crew/canteen)
-"dX" = (
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
-	dir = 4
-	},
-/obj/effect/turf_decal/industrial/warning{
-	dir = 1
-	},
-/obj/machinery/light/floor,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
-	dir = 6
-	},
-/turf/open/floor/plasteel/patterned/cargo_one,
-/area/ship/cargo)
-"dY" = (
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
-	dir = 1
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
-	dir = 1
-	},
-/turf/open/floor/plasteel/telecomms_floor,
-/area/ship/engineering/communications)
-"eh" = (
-/obj/effect/turf_decal/industrial/warning{
-	dir = 1
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
-	dir = 6
-	},
-/turf/open/floor/plasteel/patterned,
+/turf/open/floor/plasteel/dark,
 /area/ship/cargo)
-"eo" = (
+"dR" = (
 /obj/effect/turf_decal/industrial/warning{
 	dir = 8
 	},
 /obj/effect/turf_decal/industrial/warning{
 	dir = 4
 	},
+/obj/docking_port/mobile{
+	can_move_docking_ports = 1;
+	dir = 8;
+	launch_status = 0;
+	preferred_direction = 4
+	},
 /obj/machinery/door/poddoor{
 	id = "tegus_shuttle_door";
 	dir = 4
 	},
 /turf/open/floor/plating,
+/area/ship/cargo/hangar)
+"dX" = (
+/obj/structure/cable{
+	icon_state = "1-8"
+	},
+/turf/closed/wall/mineral/titanium/nodiagonal,
+/area/ship/cargo/hangar)
+"dY" = (
+/obj/machinery/firealarm{
+	dir = 8;
+	pixel_x = -32
+	},
+/obj/structure/table,
+/obj/item/storage/toolbox/electrical,
+/obj/item/multitool{
+	pixel_y = 3
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/engineering/communications)
+"eh" = (
+/obj/effect/turf_decal/industrial/outline/yellow,
+/obj/machinery/vending/cigarette,
+/obj/machinery/light/directional/north,
+/turf/open/floor/plasteel/dark,
+/area/ship/cargo/hangar)
+"eo" = (
+/obj/structure/railing,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+	dir = 1
+	},
+/turf/open/floor/plasteel,
 /area/ship/cargo)
 "eq" = (
-/obj/effect/turf_decal/corner/transparent/solgovgold{
-	dir = 8
-	},
 /obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
-/turf/open/floor/plasteel/dark,
-/area/ship/maintenance/starboard)
+/turf/open/floor/plating,
+/area/ship/engineering/engine)
 "eN" = (
-/obj/machinery/power/terminal{
-	dir = 8
-	},
-/obj/structure/cable{
-	icon_state = "0-4"
-	},
-/obj/machinery/atmospherics/components/binary/volume_pump/layer2,
-/obj/effect/turf_decal/corner/transparent/solgovgold{
-	dir = 4
+/obj/machinery/door/airlock/external,
+/obj/effect/turf_decal/industrial/warning,
+/obj/effect/turf_decal/industrial/warning{
+	dir = 1
 	},
-/turf/open/floor/plasteel/dark,
-/area/ship/maintenance/port)
+/obj/machinery/atmospherics/pipe/layer_manifold,
+/turf/open/floor/plating,
+/area/ship/engineering/engine)
 "eT" = (
-/obj/structure/catwalk/over/plated_catwalk,
 /obj/structure/cable{
-	icon_state = "4-8"
+	icon_state = "1-4"
+	},
+/obj/machinery/light{
+	dir = 8;
+	pixel_x = -32
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
-	dir = 4
+	dir = 5
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 5
+	},
+/obj/effect/turf_decal/siding/thinplating{
 	dir = 8
 	},
-/turf/open/floor/plating,
+/obj/effect/turf_decal/trimline/opaque/white/line{
+	dir = 8
+	},
+/turf/open/floor/plasteel,
 /area/ship/hallway/central)
 "eW" = (
-/obj/machinery/telecomms/bus/preset_two{
-	network = "ntsv_commnet"
+/obj/effect/turf_decal/ntspaceworks_big/seven{
+	dir = 8
 	},
-/turf/open/floor/plasteel/tech/grid,
-/area/ship/engineering/communications)
+/turf/open/floor/plasteel/patterned,
+/area/ship/cargo/hangar)
 "eZ" = (
+/obj/structure/table,
+/obj/machinery/cell_charger,
 /obj/effect/decal/cleanable/dirt/dust,
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
-	dir = 1
-	},
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4{
-	dir = 8
-	},
-/turf/open/floor/plasteel/patterned/ridged,
-/area/ship/hallway/aft)
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel,
+/area/ship/engineering/engine)
 "ff" = (
 /obj/structure/catwalk/over/plated_catwalk,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
@@ -472,73 +441,58 @@
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/hallway/central)
 "fx" = (
-/obj/effect/turf_decal/corner/transparent/lime,
-/obj/effect/turf_decal/corner/transparent/neutral{
-	dir = 8
-	},
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
-	dir = 1
-	},
+/obj/effect/turf_decal/siding/thinplating,
+/obj/effect/turf_decal/trimline/opaque/white/line,
 /turf/open/floor/plasteel,
 /area/ship/hallway/central)
 "fD" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
-	dir = 4
-	},
-/turf/open/floor/plasteel/patterned,
-/area/ship/cargo)
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/airalarm/directional/south,
+/turf/open/floor/plasteel,
+/area/ship/cargo/hangar)
 "fG" = (
-/obj/structure/cable{
-	icon_state = "0-1"
-	},
-/obj/machinery/door/poddoor{
-	id = "tegus_starboard_cargo"
-	},
-/obj/effect/turf_decal/industrial/warning{
-	dir = 1
-	},
-/obj/effect/turf_decal/industrial/warning,
-/obj/machinery/power/shieldwallgen/atmos/roundstart{
-	dir = 8;
-	id = "cargo_shield_starboard"
+/obj/structure/railing{
+	dir = 4
 	},
-/turf/open/floor/plating,
-/area/ship/cargo)
+/turf/open/floor/plasteel,
+/area/ship/cargo/hangar)
 "fH" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
-	dir = 8
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 10
 	},
 /obj/structure/cable{
-	icon_state = "4-8"
+	icon_state = "2-8"
 	},
-/turf/open/floor/plasteel/dark,
+/turf/open/floor/plasteel,
 /area/ship/crew/canteen)
 "fU" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
-	dir = 8
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
+/obj/structure/chair{
+	dir = 4
 	},
 /turf/open/floor/plasteel/dark,
 /area/ship/crew/canteen)
 "gt" = (
-/obj/structure/tank_dispenser,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/layer4{
-	dir = 1
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 6
 	},
-/turf/open/floor/plasteel/patterned/ridged,
-/area/ship/cargo)
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 6
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/cargo/hangar)
 "gK" = (
-/obj/effect/turf_decal/corner/transparent/neutral{
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
 	dir = 10
 	},
-/turf/open/floor/plasteel/dark,
-/area/ship/cargo)
+/obj/effect/turf_decal/siding/thinplating/corner,
+/obj/effect/turf_decal/siding/thinplating/corner{
+	dir = 8
+	},
+/obj/effect/turf_decal/trimline/opaque/white/warning,
+/turf/open/floor/plasteel,
+/area/ship/hallway/central)
 "gL" = (
 /obj/machinery/computer/crew{
 	dir = 8;
@@ -553,26 +507,24 @@
 /turf/closed/wall/mineral/titanium/nodiagonal,
 /area/ship/crew/canteen)
 "gV" = (
-/obj/machinery/suit_storage_unit/standard_unit,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/layer4{
-	dir = 1
+/obj/machinery/door/airlock/grunge{
+	dir = 4;
+	name = "Port Control Room"
 	},
-/obj/machinery/light/small{
-	dir = 1;
-	pixel_y = 28
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 8
 	},
-/turf/open/floor/plasteel/patterned/ridged,
-/area/ship/cargo)
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 4
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/cargo/hangar)
 "ha" = (
-/obj/structure/cable{
-	icon_state = "1-2"
+/obj/effect/turf_decal/industrial/traffic{
+	dir = 8
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
-/turf/open/floor/plasteel/stairs{
-	dir = 1
-	},
+/turf/open/floor/plasteel/patterned/ridged,
 /area/ship/cargo)
 "hd" = (
 /obj/structure/table/reinforced,
@@ -601,69 +553,87 @@
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
 "hh" = (
+/obj/machinery/power/terminal{
+	dir = 4
+	},
 /obj/effect/decal/cleanable/dirt/dust,
-/obj/structure/cable{
-	icon_state = "1-2"
+/obj/structure/cable/yellow{
+	icon_state = "0-8"
 	},
-/obj/structure/cable{
-	icon_state = "2-4"
+/obj/structure/reagent_dispensers/fueltank,
+/obj/effect/turf_decal/industrial/hatch/yellow,
+/turf/open/floor/plasteel,
+/area/ship/engineering/engine)
+"hi" = (
+/obj/structure/closet/secure_closet{
+	anchored = 1;
+	icon_state = "eng_secure";
+	name = "mechanic's locker";
+	req_access = list(11)
 	},
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4{
-	dir = 8
+/obj/item/clothing/head/hardhat,
+/obj/item/clothing/under/rank/engineering/engineer/nt,
+/obj/item/clothing/under/rank/engineering/engineer/nt/skirt,
+/obj/item/clothing/shoes/workboots,
+/obj/item/clothing/suit/hazardvest,
+/obj/item/clothing/gloves/color/yellow,
+/obj/item/clothing/glasses/meson/engine/tray,
+/obj/item/pipe_dispenser,
+/obj/item/holosign_creator/engineering,
+/obj/item/tank/internals/emergency_oxygen/engi,
+/obj/effect/turf_decal/box,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/item/clothing/head/welding,
+/turf/open/floor/plasteel/dark,
+/area/ship/engineering/engine)
+"ho" = (
+/obj/machinery/autolathe,
+/obj/item/stack/sheet/glass/five,
+/obj/item/stack/sheet/metal/five{
+	pixel_y = 3
 	},
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2{
-	dir = 8
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel,
+/area/ship/engineering/engine)
+"ht" = (
+/obj/machinery/power/smes/shuttle/precharged{
+	dir = 4
 	},
+/obj/structure/window/reinforced/spawner/west,
+/obj/machinery/door/window/eastright,
 /obj/structure/cable{
-	icon_state = "4-8"
+	icon_state = "0-8"
 	},
-/turf/open/floor/plasteel/patterned,
-/area/ship/hallway/aft)
-"hi" = (
-/obj/structure/cable{
-	icon_state = "1-4"
+/obj/machinery/door/poddoor{
+	id = "tegus_starboard_engine";
+	dir = 4
 	},
-/turf/open/floor/plasteel/patterned,
-/area/ship/cargo)
-"ho" = (
-/obj/effect/turf_decal/corner/transparent/solgovgold{
-	dir = 8
+/turf/open/floor/plating,
+/area/ship/engineering/engine)
+"hC" = (
+/obj/effect/turf_decal/industrial/warning{
+	dir = 1
 	},
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
 	dir = 8
 	},
-/turf/open/floor/plasteel/patterned,
-/area/ship/hallway/aft)
-"ht" = (
-/obj/structure/chair/office{
-	dir = 1
-	},
-/turf/open/floor/plasteel,
-/area/ship/hallway/aft)
-"hC" = (
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/turf/open/floor/plasteel/patterned,
-/area/ship/cargo)
+/turf/open/floor/plasteel,
+/area/ship/cargo/hangar)
 "hG" = (
-/obj/structure/table,
-/obj/item/clipboard{
-	pixel_y = 4;
-	pixel_x = 4
-	},
-/obj/item/stamp{
-	pixel_x = -8;
-	pixel_y = 8
-	},
-/obj/item/stamp/denied{
-	pixel_x = -8
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 10
 	},
-/obj/machinery/light{
-	dir = 4;
-	pixel_x = 32
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 4
 	},
-/turf/open/floor/plasteel/patterned/ridged,
+/turf/open/floor/plasteel,
 /area/ship/crew)
 "hL" = (
 /turf/closed/wall/mineral/titanium/nodiagonal,
@@ -684,41 +654,37 @@
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/hallway/central)
 "it" = (
-/obj/effect/turf_decal/corner/transparent/brown{
-	dir = 4
-	},
-/obj/effect/turf_decal/corner/transparent/neutral{
-	dir = 1
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 6
+	},
+/obj/effect/turf_decal/siding/thinplating{
 	dir = 9
 	},
-/obj/structure/extinguisher_cabinet{
-	pixel_x = 28;
-	dir = 4
+/obj/effect/turf_decal/trimline/opaque/white/line{
+	dir = 9
 	},
 /turf/open/floor/plasteel,
 /area/ship/hallway/central)
 "iJ" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
-	dir = 1
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
-	dir = 1
+/obj/machinery/power/apc/auto_name/directional/west,
+/obj/structure/cable{
+	icon_state = "0-4"
 	},
-/turf/open/floor/plasteel/telecomms_floor,
+/turf/open/floor/plasteel/dark,
 /area/ship/engineering/communications)
 "iM" = (
-/obj/structure/table,
-/obj/item/storage/toolbox/mechanical{
-	pixel_y = 7
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/item/reagent_containers/food/condiment/sugar{
+	pixel_y = 3;
+	pixel_x = 5
 	},
-/obj/item/hand_labeler{
-	pixel_x = 4
+/obj/structure/rack,
+/obj/item/reagent_containers/food/condiment/flour{
+	pixel_x = -5;
+	pixel_y = 3
 	},
-/turf/open/floor/plasteel/tech,
-/area/ship/maintenance/port)
+/turf/open/floor/plating,
+/area/ship/engineering/engine)
 "iN" = (
 /turf/closed/wall/mineral/titanium,
 /area/ship/hallway/central)
@@ -730,31 +696,55 @@
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
 "iV" = (
-/obj/machinery/telecomms/hub/preset{
-	network = "ntsv_commnet"
-	},
-/turf/open/floor/plasteel/tech/grid,
-/area/ship/engineering/communications)
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
+/turf/open/floor/plating,
+/area/ship/engineering/engine)
 "iY" = (
-/obj/structure/window/reinforced/spawner,
-/obj/machinery/door/window/westright,
-/obj/structure/cable/yellow{
-	icon_state = "0-8"
+/obj/item/radio/headset,
+/obj/item/radio/headset,
+/obj/item/radio/headset,
+/obj/item/radio/headset,
+/obj/item/radio/headset,
+/obj/item/radio/headset,
+/obj/item/radio/headset,
+/obj/item/radio/headset,
+/obj/item/radio/headset,
+/obj/item/radio/headset,
+/obj/structure/closet/wall{
+	dir = 8;
+	pixel_x = 32;
+	name = "radio closet"
 	},
-/obj/machinery/power/port_gen/pacman/super,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
 /turf/open/floor/plasteel/tech,
-/area/ship/maintenance/starboard)
+/area/ship/crew)
 "jb" = (
-/obj/effect/turf_decal/floordetail/edgedrain{
-	dir = 1
+/obj/structure/closet/secure_closet/miningcloset{
+	req_access_txt = "48"
 	},
-/obj/machinery/door/window/northright,
-/obj/machinery/shower{
+/obj/item/flashlight/seclite,
+/obj/item/storage/bag/ore,
+/obj/item/kitchen/knife/combat/survival,
+/obj/item/gun/energy/kinetic_accelerator,
+/obj/item/stack/marker_beacon/thirty,
+/obj/item/gps/mining,
+/obj/item/storage/backpack/satchel/explorer,
+/obj/item/clothing/glasses/meson/prescription,
+/obj/item/clothing/glasses/meson,
+/obj/item/t_scanner/adv_mining_scanner/lesser,
+/obj/machinery/door/window/eastright{
 	dir = 1
 	},
-/obj/structure/curtain,
-/turf/open/floor/plasteel/patterned/ridged,
-/area/ship/crew/canteen)
+/obj/structure/window/reinforced/spawner/west,
+/obj/effect/turf_decal/corner/transparent/neutral{
+	dir = 8
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/dark,
+/area/ship/cargo/hangar)
 "jd" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
 	dir = 4
@@ -770,65 +760,75 @@
 	},
 /area/ship/hallway/central)
 "jn" = (
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
 /obj/effect/turf_decal/industrial/warning,
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
 	dir = 8
 	},
-/turf/open/floor/plasteel/patterned,
-/area/ship/cargo)
-"jq" = (
-/obj/structure/cable{
-	icon_state = "2-4"
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 8
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
-	dir = 6
+/obj/structure/cable{
+	icon_state = "4-8"
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
-	dir = 6
+/turf/open/floor/plasteel,
+/area/ship/cargo/hangar)
+"jq" = (
+/obj/structure/catwalk/over/plated_catwalk/white{
+	color = "#4c535b"
 	},
-/obj/structure/catwalk/over/plated_catwalk,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
 /turf/open/floor/plating,
-/area/ship/hallway/aft)
+/area/ship/engineering/engine)
 "js" = (
-/obj/machinery/power/terminal{
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
 	dir = 8
 	},
-/obj/structure/cable{
-	icon_state = "0-4"
-	},
-/obj/machinery/firealarm{
-	pixel_y = -32
-	},
 /turf/open/floor/plasteel/dark,
-/area/ship/maintenance/port)
+/area/ship/cargo/hangar)
 "ju" = (
-/obj/effect/turf_decal/corner/transparent/neutral,
-/obj/effect/turf_decal/corner/transparent/lime{
+/obj/effect/turf_decal/corner/transparent/neutral{
 	dir = 8
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
-/obj/structure/cable{
-	icon_state = "1-2"
+/obj/structure/table,
+/obj/item/toy/figure/miner{
+	pixel_y = 3
 	},
 /turf/open/floor/plasteel/dark,
 /area/ship/crew/canteen)
 "jw" = (
-/obj/structure/tank_dispenser,
-/turf/open/floor/plasteel/patterned/cargo_one,
-/area/ship/cargo)
-"jx" = (
-/obj/effect/turf_decal/industrial/warning,
-/obj/structure/railing/corner,
-/obj/structure/railing/corner{
-	dir = 8;
-	layer = 4.1
+/obj/structure/closet/secure_closet/miningcloset{
+	req_access_txt = "48"
+	},
+/obj/item/flashlight/seclite,
+/obj/item/storage/bag/ore,
+/obj/item/kitchen/knife/combat/survival,
+/obj/item/gun/energy/kinetic_accelerator,
+/obj/item/stack/marker_beacon/thirty,
+/obj/item/gps/mining,
+/obj/item/storage/backpack/satchel/explorer,
+/obj/item/clothing/glasses/meson/prescription,
+/obj/item/clothing/glasses/meson,
+/obj/item/t_scanner/adv_mining_scanner/lesser,
+/obj/machinery/door/window/eastright{
+	dir = 1
 	},
+/obj/structure/window/reinforced/spawner/west,
+/obj/effect/turf_decal/corner/transparent/neutral,
+/obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/plasteel/dark,
-/area/ship/cargo)
+/area/ship/cargo/hangar)
+"jx" = (
+/obj/effect/turf_decal/trimline/opaque/white/line{
+	dir = 1
+	},
+/obj/effect/turf_decal/industrial/warning{
+	dir = 4
+	},
+/turf/open/floor/plasteel,
+/area/ship/cargo/hangar)
 "jO" = (
 /obj/docking_port/stationary{
 	dir = 1;
@@ -840,15 +840,7 @@
 /turf/template_noop,
 /area/template_noop)
 "jQ" = (
-/obj/machinery/light{
-	dir = 8;
-	pixel_x = -32
-	},
-/obj/machinery/computer/telecomms/monitor{
-	dir = 4;
-	network = "ntsv_commnet"
-	},
-/turf/open/floor/plasteel/tech/grid,
+/turf/closed/wall,
 /area/ship/engineering/communications)
 "kc" = (
 /obj/machinery/door/airlock/external,
@@ -859,10 +851,9 @@
 /turf/open/floor/plating,
 /area/ship/hallway/central)
 "kg" = (
-/obj/structure/table,
-/obj/machinery/cell_charger,
-/turf/open/floor/plasteel/patterned/ridged,
-/area/ship/hallway/aft)
+/obj/effect/spawner/structure/window/shuttle,
+/turf/open/floor/plating,
+/area/ship/crew/canteen)
 "ko" = (
 /obj/docking_port/stationary{
 	dir = 2;
@@ -874,13 +865,13 @@
 /turf/template_noop,
 /area/template_noop)
 "kp" = (
-/obj/structure/plasticflaps/opaque,
-/obj/machinery/conveyor{
-	dir = 8;
-	id = "tegusbelt"
+/obj/structure/chair/office,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 8
 	},
-/turf/open/floor/plasteel/tech/grid,
-/area/ship/cargo)
+/turf/open/floor/plasteel/dark,
+/area/ship/cargo/hangar)
 "kE" = (
 /obj/effect/turf_decal/borderfloor/full,
 /obj/machinery/door/firedoor/border_only,
@@ -895,80 +886,84 @@
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/hallway/central)
 "kG" = (
-/obj/effect/turf_decal/industrial/traffic{
-	dir = 8
-	},
-/obj/effect/turf_decal/industrial/traffic{
-	dir = 4
-	},
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/turf/open/floor/plasteel/patterned/ridged,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel,
 /area/ship/cargo)
 "kH" = (
-/turf/open/floor/plasteel/patterned/ridged,
-/area/ship/cargo)
-"kM" = (
-/obj/effect/turf_decal/corner/transparent/solgovgold{
-	dir = 1
+/obj/machinery/door/firedoor/heavy,
+/obj/machinery/door/poddoor/shutters/preopen{
+	id = "tegus_bridge";
+	dir = 4
 	},
+/obj/effect/spawner/structure/window/reinforced,
+/turf/open/floor/plating,
+/area/ship/bridge)
+"kM" = (
 /obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
-	dir = 1
-	},
-/turf/open/floor/plasteel/dark,
-/area/ship/maintenance/starboard)
-"kS" = (
-/obj/structure/railing{
-	dir = 8;
-	pixel_x = -1
-	},
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/reagent_dispensers/watertank,
 /turf/open/floor/plating,
+/area/ship/engineering/engine)
+"kS" = (
+/obj/effect/turf_decal/industrial/warning,
+/turf/open/floor/plasteel/dark,
 /area/ship/cargo)
 "kT" = (
-/obj/machinery/light{
-	dir = 1;
-	layer = 4;
-	pixel_y = 32
-	},
-/turf/open/floor/plating,
-/area/ship/cargo)
-"kU" = (
-/obj/machinery/cryopod{
+/obj/effect/turf_decal/industrial/loading{
 	dir = 8
 	},
-/obj/structure/window/reinforced/spawner/north,
-/turf/open/floor/plasteel/patterned,
-/area/ship/crew)
-"lb" = (
-/obj/structure/cable{
-	icon_state = "1-2"
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 8
 	},
 /obj/structure/cable{
 	icon_state = "2-8"
 	},
 /obj/structure/cable{
-	icon_state = "2-4"
+	icon_state = "4-8"
+	},
+/turf/open/floor/plasteel/patterned/ridged,
+/area/ship/cargo)
+"kU" = (
+/obj/structure/toilet{
+	dir = 1
+	},
+/obj/structure/curtain,
+/turf/open/floor/plasteel/dark,
+/area/ship/crew)
+"lb" = (
+/obj/machinery/door/airlock/mining/glass{
+	dir = 4;
+	name = "Hangar"
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
-	dir = 6
+	dir = 8
 	},
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2{
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
 	dir = 4
 	},
-/obj/structure/catwalk/over/plated_catwalk/dark,
-/turf/open/floor/plating,
-/area/ship/maintenance/port)
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 4
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 8
+	},
+/turf/open/floor/plasteel,
+/area/ship/cargo/hangar)
 "lf" = (
-/obj/structure/catwalk/over/plated_catwalk,
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4,
-/obj/machinery/advanced_airlock_controller{
-	pixel_y = -32
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 5
 	},
-/turf/open/floor/plating,
-/area/ship/cargo)
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 5
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/cargo/hangar)
 "lg" = (
 /obj/effect/turf_decal/industrial/warning{
 	dir = 1
@@ -987,183 +982,178 @@
 /turf/open/floor/plating,
 /area/ship/cargo)
 "li" = (
-/obj/machinery/atmospherics/components/unary/outlet_injector/layer2{
-	dir = 4
+/obj/effect/turf_decal/industrial/warning,
+/obj/machinery/light/floor,
+/obj/structure/cable{
+	icon_state = "4-8"
 	},
-/turf/open/floor/engine/hull,
-/area/ship/hallway/aft)
+/turf/open/floor/plasteel,
+/area/ship/cargo/hangar)
 "lI" = (
 /turf/closed/wall/mineral/titanium,
 /area/ship/crew/canteen)
 "lQ" = (
-/obj/structure/chair/sofa/right{
-	dir = 4
-	},
-/obj/effect/turf_decal/corner/transparent/neutral,
-/obj/effect/turf_decal/corner/transparent/lime{
-	dir = 8
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 6
 	},
-/turf/open/floor/plasteel/patterned,
+/turf/open/floor/plasteel,
 /area/ship/crew/canteen)
 "lW" = (
 /turf/closed/wall/mineral/titanium/nodiagonal,
 /area/ship/hallway/central)
 "ma" = (
-/obj/structure/table,
-/obj/item/crowbar{
-	pixel_y = 3
-	},
-/turf/open/floor/plasteel/patterned/cargo_one,
-/area/ship/cargo)
-"mf" = (
-/obj/structure/sign/nanotrasen,
-/turf/closed/wall/mineral/titanium/nodiagonal,
-/area/ship/cargo)
-"mq" = (
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
-/turf/open/floor/plasteel/stairs,
-/area/ship/cargo)
-"mu" = (
 /obj/structure/cable{
-	icon_state = "1-4"
+	icon_state = "1-8"
 	},
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/obj/structure/cable{
-	icon_state = "2-4"
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
-	dir = 5
-	},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
-	dir = 5
+	dir = 8
 	},
-/obj/structure/catwalk/over/plated_catwalk/dark,
-/turf/open/floor/plating,
-/area/ship/maintenance/starboard)
-"mJ" = (
-/obj/effect/turf_decal/corner/transparent/lime{
+/obj/effect/turf_decal/siding/thinplating/corner{
+	dir = 1
+	},
+/obj/effect/turf_decal/siding/thinplating/corner{
 	dir = 4
 	},
-/obj/effect/turf_decal/corner/transparent/neutral,
-/obj/structure/chair/office,
-/obj/machinery/firealarm{
-	pixel_y = 32;
+/obj/effect/turf_decal/trimline/opaque/white/warning{
 	dir = 1
 	},
 /turf/open/floor/plasteel,
-/area/ship/crew)
-"mV" = (
-/obj/structure/table,
-/obj/structure/bedsheetbin,
-/turf/open/floor/plasteel,
-/area/ship/crew)
-"mW" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
-	dir = 5
+/area/ship/hallway/central)
+"mf" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/light/small/directional/west{
+	bulb_colour = "#d5fcff"
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
-	dir = 5
+	dir = 6
 	},
-/turf/open/floor/plasteel/patterned,
-/area/ship/cargo)
-"ng" = (
-/obj/structure/table,
-/obj/structure/window/reinforced/spawner/north,
-/obj/item/reagent_containers/glass/rag{
-	pixel_y = 8;
-	pixel_x = -13
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
+/turf/open/floor/plasteel/dark,
+/area/ship/cargo/hangar)
+"mq" = (
+/obj/effect/turf_decal/industrial/traffic{
+	dir = 8
 	},
-/turf/open/floor/plasteel/tech/grid,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
+/turf/open/floor/plasteel/patterned/ridged,
 /area/ship/cargo)
-"nk" = (
-/obj/effect/turf_decal/industrial/warning{
-	dir = 4
+"mu" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 6
 	},
-/obj/machinery/door/airlock{
-	name = "Bathroom";
-	dir = 4
+/obj/structure/cable{
+	icon_state = "2-4"
 	},
-/turf/open/floor/plastic,
-/area/ship/crew/canteen)
-"nn" = (
-/obj/structure/table,
-/obj/item/clipboard{
-	pixel_y = 2;
-	pixel_x = 14
+/obj/machinery/light/small/directional/north,
+/turf/open/floor/plasteel,
+/area/ship/cargo/hangar)
+"mJ" = (
+/obj/machinery/suit_storage_unit/standard_unit,
+/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/layer4{
+	dir = 8
 	},
-/obj/structure/railing{
-	dir = 1
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 8
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/hallway/central)
+"mV" = (
+/obj/effect/turf_decal/siding/wood/end{
+	dir = 4
 	},
-/obj/effect/turf_decal/spline/fancy/opaque/grey{
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2,
+/turf/open/floor/carpet,
+/area/ship/crew)
+"mW" = (
+/obj/machinery/vending/cola/random,
+/turf/open/floor/plasteel,
+/area/ship/cargo/hangar)
+"ng" = (
+/obj/effect/turf_decal/spline/fancy/opaque/black{
 	dir = 1
 	},
-/obj/item/flashlight/lamp{
-	pixel_x = -5;
-	pixel_y = 3
+/obj/machinery/conveyor/inverted{
+	dir = 6;
+	id = "tegusbelt"
 	},
-/turf/open/floor/plasteel/patterned/ridged,
-/area/ship/hallway/aft)
-"np" = (
-/obj/structure/fluff/hedge,
-/turf/open/floor/plasteel/patterned/ridged,
-/area/ship/crew/canteen)
-"nT" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/cargo/hangar)
+"nk" = (
+/obj/structure/table,
 /obj/effect/turf_decal/corner/transparent/neutral{
-	dir = 2
+	dir = 9
 	},
-/obj/structure/cable{
-	icon_state = "4-8"
+/obj/item/paper_bin{
+	pixel_y = 3
 	},
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4,
-/obj/structure/cable{
-	icon_state = "1-8"
+/obj/item/pen{
+	pixel_y = 3
 	},
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2,
-/turf/open/floor/plasteel,
-/area/ship/hallway/central)
-"nW" = (
-/obj/effect/turf_decal/corner/transparent/lime{
-	dir = 8
+/obj/structure/sign/poster/official/pda_ad{
+	pixel_x = -32
 	},
-/obj/effect/turf_decal/corner/transparent/lime{
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/canteen)
+"nn" = (
+/obj/structure/table,
+/obj/item/stack/packageWrap,
+/obj/item/stack/packageWrap{
+	pixel_y = 8;
+	pixel_x = -5
+	},
+/obj/structure/railing{
 	dir = 4
 	},
-/obj/effect/turf_decal/corner/transparent/neutral,
+/turf/open/floor/plasteel,
+/area/ship/cargo/hangar)
+"np" = (
+/obj/structure/table,
+/obj/item/cigbutt{
+	pixel_y = 3;
+	pixel_x = 3
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/canteen)
+"nT" = (
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
-	dir = 8
-	},
-/turf/open/floor/plasteel,
-/area/ship/crew)
-"oc" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
 	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
 	dir = 8
 	},
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/turf_decal/trimline/opaque/white/corner,
+/obj/effect/turf_decal/siding/thinplating/corner,
+/turf/open/floor/plasteel,
+/area/ship/hallway/central)
+"nW" = (
+/obj/structure/plasticflaps/opaque,
+/obj/machinery/conveyor{
+	dir = 8;
+	id = "tegusbelt"
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/cargo/hangar)
+"oc" = (
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2,
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/obj/machinery/door/firedoor/border_only{
-	dir = 4
-	},
-/obj/machinery/door/firedoor/border_only{
-	dir = 8
-	},
-/obj/machinery/door/airlock/mining/glass{
-	dir = 4
-	},
+/obj/effect/turf_decal/siding/thinplating,
+/obj/effect/turf_decal/trimline/opaque/white/line,
 /turf/open/floor/plasteel,
-/area/ship/cargo)
+/area/ship/hallway/central)
 "oi" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
 	dir = 4
@@ -1172,70 +1162,66 @@
 /area/ship/bridge)
 "ol" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
-	dir = 8
+	dir = 6
 	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
 /obj/structure/cable{
-	icon_state = "4-8"
+	icon_state = "1-2"
 	},
-/obj/effect/turf_decal/industrial/warning,
-/turf/open/floor/plasteel/patterned,
-/area/ship/cargo)
-"oq" = (
 /obj/structure/cable{
-	icon_state = "1-4"
-	},
-/obj/machinery/light{
-	dir = 8;
-	pixel_x = -32
+	icon_state = "2-4"
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
-	dir = 5
+/turf/open/floor/plasteel,
+/area/ship/cargo/hangar)
+"oq" = (
+/obj/effect/turf_decal/industrial/warning{
+	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
-	dir = 5
+	dir = 9
 	},
-/turf/open/floor/plasteel/patterned/ridged,
-/area/ship/hallway/central)
+/turf/open/floor/plasteel,
+/area/ship/cargo/hangar)
 "oA" = (
+/obj/effect/turf_decal/industrial/warning,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+	dir = 8
+	},
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/turf/closed/wall/mineral/titanium/nodiagonal,
-/area/ship/cargo)
+/turf/open/floor/plasteel,
+/area/ship/cargo/hangar)
 "oE" = (
-/obj/structure/cable{
-	icon_state = "4-8"
+/obj/structure/closet/secure_closet/freezer{
+	anchored = 1;
+	locked = 0;
+	name = "fridge"
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+/obj/effect/turf_decal/corner/transparent/neutral{
 	dir = 4
 	},
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
-	dir = 8
-	},
-/obj/effect/turf_decal/industrial/warning{
-	dir = 1
+/obj/item/storage/cans/sixbeer,
+/obj/item/reagent_containers/food/snacks/meat/slab/goliath,
+/obj/item/reagent_containers/food/snacks/meat/slab/goliath,
+/obj/machinery/button/door{
+	id = "tegus_canteen_shutters";
+	name = "Window Shutters";
+	pixel_x = -27;
+	dir = 4
 	},
-/turf/open/floor/plasteel/patterned,
-/area/ship/cargo)
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/canteen)
 "oF" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/power/apc/auto_name/directional/east,
 /obj/structure/cable{
-	icon_state = "0-2"
-	},
-/obj/machinery/door/poddoor{
-	id = "tegus_port_cargo"
-	},
-/obj/effect/turf_decal/industrial/warning,
-/obj/effect/turf_decal/industrial/warning{
-	dir = 1
+	icon_state = "1-2"
 	},
-/obj/machinery/power/shieldwallgen/atmos/roundstart{
-	dir = 8;
-	id = "cargo_shield_port"
+/obj/structure/cable{
+	icon_state = "0-1"
 	},
-/turf/open/floor/plating,
+/turf/open/floor/plasteel,
 /area/ship/cargo)
 "oU" = (
 /obj/structure/table/reinforced,
@@ -1252,31 +1238,41 @@
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
 "oW" = (
-/obj/structure/catwalk/over/plated_catwalk,
+/obj/effect/turf_decal/siding/thinplating,
+/obj/effect/turf_decal/trimline/opaque/white/line,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 8
+	},
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/obj/structure/cable{
-	icon_state = "2-8"
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer2,
-/turf/open/floor/plating,
+/turf/open/floor/plasteel,
 /area/ship/hallway/central)
 "pf" = (
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
 "pg" = (
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+/obj/effect/turf_decal/industrial/warning,
+/obj/effect/turf_decal/industrial/warning{
 	dir = 1
 	},
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
-/turf/open/floor/plasteel/patterned,
-/area/ship/hallway/aft)
+/obj/machinery/door/poddoor{
+	id = "tegus_port_cargo"
+	},
+/obj/machinery/power/shieldwallgen/atmos/roundstart{
+	dir = 4;
+	id = "cargo_shield_port"
+	},
+/obj/structure/cable{
+	icon_state = "0-2"
+	},
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plating,
+/area/ship/cargo)
 "py" = (
 /obj/effect/turf_decal/corner/transparent/neutral{
 	dir = 8
@@ -1288,57 +1284,31 @@
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
 "pC" = (
-/obj/structure/closet/secure_closet{
-	anchored = 1;
-	icon_state = "eng_secure";
-	name = "mechanic's locker";
-	req_access = list(11)
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 5
 	},
-/obj/item/clothing/head/hardhat,
-/obj/item/clothing/under/rank/engineering/engineer/nt,
-/obj/item/clothing/under/rank/engineering/engineer/nt/skirt,
-/obj/item/clothing/shoes/workboots,
-/obj/item/clothing/suit/hazardvest,
-/obj/item/clothing/gloves/color/yellow,
-/obj/item/clothing/glasses/meson/engine/tray,
-/obj/item/pipe_dispenser,
-/obj/item/holosign_creator/engineering,
-/obj/item/tank/internals/emergency_oxygen/engi,
-/turf/open/floor/plasteel/tech,
-/area/ship/maintenance/starboard)
+/turf/open/floor/plasteel,
+/area/ship/cargo/hangar)
 "pH" = (
-/obj/machinery/power/terminal{
-	dir = 8
-	},
-/obj/effect/turf_decal/corner/transparent/solgovgold{
-	dir = 4
-	},
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/structure/cable{
-	icon_state = "0-4"
+/obj/machinery/advanced_airlock_controller{
+	pixel_x = 32
 	},
+/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/layer4,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
+/obj/machinery/light/small/directional/west,
 /turf/open/floor/plasteel/dark,
-/area/ship/maintenance/starboard)
+/area/ship/engineering/engine)
 "pO" = (
-/obj/machinery/suit_storage_unit/mining,
-/obj/machinery/light{
-	pixel_y = -32
-	},
-/turf/open/floor/plasteel/tech/grid,
+/obj/structure/railing,
+/turf/open/floor/plasteel,
 /area/ship/cargo)
 "qd" = (
-/obj/machinery/atmospherics/components/binary/pump/on/layer4{
-	name = "Air to Distro";
-	target_pressure = 1000
-	},
-/obj/effect/turf_decal/corner/transparent/solgovgold{
-	dir = 1
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer2{
-	dir = 10
-	},
-/turf/open/floor/plasteel/dark,
-/area/ship/maintenance/port)
+/obj/structure/closet/crate/secure/loot,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/decal/cleanable/cobweb,
+/turf/open/floor/plating,
+/area/ship/engineering/engine)
 "qf" = (
 /obj/machinery/door/airlock/external,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
@@ -1352,304 +1322,240 @@
 /turf/open/floor/plasteel,
 /area/ship/hallway/central)
 "qi" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/structure/table,
-/obj/item/paper_bin,
-/obj/item/pen,
-/obj/structure/railing{
-	dir = 5
-	},
-/obj/effect/turf_decal/spline/fancy/opaque/grey{
-	dir = 5
+/obj/machinery/photocopier,
+/obj/effect/turf_decal/corner/transparent/neutral{
+	dir = 1
 	},
-/obj/effect/turf_decal/industrial/warning/corner,
-/turf/open/floor/plasteel/patterned/ridged,
-/area/ship/hallway/aft)
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/canteen)
 "qw" = (
+/obj/effect/decal/cleanable/dirt/dust,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
 	dir = 4
 	},
+/obj/machinery/power/apc/auto_name/directional/north,
 /obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/effect/turf_decal/industrial/warning{
-	dir = 1
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
-	dir = 8
+	icon_state = "0-8"
 	},
-/turf/open/floor/plasteel/patterned,
-/area/ship/cargo)
+/turf/open/floor/plasteel,
+/area/ship/cargo/hangar)
 "qD" = (
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/structure/cable{
-	icon_state = "2-8"
+/obj/effect/turf_decal/industrial/traffic{
+	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2{
-	dir = 8
-	},
-/obj/structure/catwalk/over/plated_catwalk/dark,
-/turf/open/floor/plating,
-/area/ship/maintenance/port)
+/turf/open/floor/plasteel/patterned/ridged,
+/area/ship/cargo)
 "qE" = (
-/obj/effect/turf_decal/corner/transparent/lime,
-/obj/effect/turf_decal/corner/transparent/neutral{
-	dir = 8
+/obj/effect/turf_decal/siding/thinplating,
+/obj/effect/turf_decal/trimline/opaque/white/line,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+	dir = 1
 	},
 /turf/open/floor/plasteel,
 /area/ship/hallway/central)
 "qF" = (
-/obj/machinery/airalarm/directional/east,
-/obj/structure/table,
-/obj/item/extinguisher/mini/empty,
-/turf/open/floor/plasteel,
-/area/ship/hallway/aft)
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 5
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
+/turf/open/floor/plasteel/stairs{
+	dir = 1
+	},
+/area/ship/engineering/engine)
 "qK" = (
-/obj/effect/turf_decal/ntspaceworks_big/four,
-/turf/open/floor/plating,
-/area/ship/cargo)
+/obj/effect/turf_decal/corner/transparent/neutral{
+	dir = 1
+	},
+/obj/machinery/vending/coffee,
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/canteen)
 "qL" = (
-/obj/structure/table,
-/obj/structure/window/reinforced/spawner/north,
-/obj/item/clipboard,
+/obj/machinery/conveyor{
+	dir = 8;
+	id = "tegusbelt"
+	},
+/obj/structure/railing{
+	layer = 4.1
+	},
+/obj/effect/turf_decal/spline/fancy/opaque/black{
+	dir = 1
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/light/dim/directional/north,
 /turf/open/floor/plasteel/tech/grid,
-/area/ship/cargo)
+/area/ship/cargo/hangar)
 "qN" = (
-/obj/effect/turf_decal/industrial/warning/corner,
+/turf/open/floor/engine/hull,
+/area/ship/engineering/engine)
+"qS" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2{
+	dir = 8
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
 /obj/structure/cable{
 	icon_state = "2-4"
 	},
+/turf/open/floor/plating,
+/area/ship/engineering/engine)
+"rc" = (
+/obj/structure/catwalk/over/plated_catwalk,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
-	dir = 6
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
-	dir = 6
+	dir = 4
 	},
-/turf/open/floor/plasteel,
-/area/ship/cargo)
-"qS" = (
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
+/turf/open/floor/plating,
+/area/ship/engineering/engine)
+"rg" = (
+/obj/effect/turf_decal/industrial/warning,
+/obj/machinery/light/floor,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
-	dir = 4
+	dir = 8
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
-	dir = 4
+	dir = 5
 	},
-/obj/machinery/door/firedoor/border_only{
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/turf/open/floor/plasteel,
+/area/ship/cargo/hangar)
+"rr" = (
+/obj/structure/chair{
 	dir = 8
 	},
-/obj/machinery/door/firedoor/border_only{
-	dir = 4
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/canteen)
+"rs" = (
+/obj/machinery/advanced_airlock_controller{
+	pixel_x = 32
 	},
-/obj/machinery/door/airlock/engineering{
-	name = "Engine Room";
-	dir = 8
+/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/layer4{
+	dir = 1
 	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
+/obj/machinery/light/small/directional/west,
 /turf/open/floor/plasteel/dark,
-/area/ship/hallway/central)
-"rc" = (
-/obj/effect/turf_decal/corner/transparent/solgovgold{
+/area/ship/engineering/engine)
+"rt" = (
+/obj/effect/turf_decal/industrial/warning{
 	dir = 1
 	},
-/obj/structure/chair,
-/turf/open/floor/plasteel/patterned,
-/area/ship/hallway/aft)
-"rg" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/light/floor,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 8
+	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
-	dir = 4
+	dir = 6
 	},
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/obj/effect/turf_decal/industrial/warning,
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2,
-/turf/open/floor/plasteel/patterned,
-/area/ship/cargo)
-"rr" = (
-/obj/effect/turf_decal/spline/fancy/opaque/black{
-	dir = 1
-	},
-/obj/machinery/conveyor{
-	dir = 8;
-	id = "tegusbelt"
-	},
-/obj/structure/railing{
-	layer = 4.1
+/turf/open/floor/plasteel,
+/area/ship/cargo/hangar)
+"ru" = (
+/obj/structure/cable{
+	icon_state = "2-8"
 	},
-/turf/open/floor/plasteel/tech/grid,
-/area/ship/cargo)
-"rs" = (
-/obj/effect/turf_decal/corner/transparent/solgovgold{
+/turf/closed/wall/mineral/titanium/nodiagonal,
+/area/ship/cargo/hangar)
+"rD" = (
+/turf/open/floor/plasteel/dark,
+/area/ship/engineering/communications)
+"rH" = (
+/turf/closed/wall/mineral/titanium/nodiagonal,
+/area/ship/cargo/hangar)
+"rY" = (
+/obj/structure/filingcabinet/chestdrawer,
+/turf/open/floor/plasteel/telecomms_floor,
+/area/ship/cargo/hangar)
+"rZ" = (
+/obj/effect/turf_decal/borderfloor/full,
+/obj/machinery/door/firedoor/border_only{
 	dir = 4
 	},
-/obj/machinery/power/terminal{
+/obj/machinery/door/firedoor/border_only{
 	dir = 8
 	},
-/obj/structure/cable{
-	icon_state = "0-4"
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/hallway/central)
+"sb" = (
+/obj/structure/catwalk/over/plated_catwalk/white{
+	color = "#4c535b"
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer2{
-	dir = 5
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2{
+	dir = 4
 	},
-/turf/open/floor/plasteel/dark,
-/area/ship/maintenance/port)
-"rt" = (
+/turf/open/floor/plating,
+/area/ship/engineering/engine)
+"sf" = (
 /obj/structure/cable{
-	icon_state = "4-8"
+	icon_state = "1-8"
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4{
 	dir = 4
 	},
-/obj/effect/turf_decal/industrial/warning{
-	dir = 1
-	},
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4{
-	dir = 1
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2{
+	dir = 4
 	},
-/turf/open/floor/plasteel/patterned,
-/area/ship/cargo)
-"ru" = (
-/obj/machinery/conveyor_switch/oneway{
-	id = "tegusbelt";
-	pixel_y = 4
+/obj/effect/turf_decal/siding/thinplating/corner{
+	dir = 8
 	},
-/obj/effect/turf_decal/spline/fancy/opaque/black,
-/obj/effect/turf_decal/industrial/warning/corner{
+/obj/effect/turf_decal/trimline/opaque/white/corner{
 	dir = 8
 	},
-/obj/structure/railing{
-	layer = 4.1
+/obj/structure/cable{
+	icon_state = "1-2"
 	},
-/turf/open/floor/plasteel/tech,
-/area/ship/cargo)
-"rD" = (
-/obj/machinery/airalarm/directional/east,
-/obj/structure/catwalk/over/plated_catwalk/dark,
-/turf/open/floor/plating,
-/area/ship/engineering/communications)
-"rH" = (
-/obj/effect/turf_decal/industrial/loading{
-	dir = 8
+/turf/open/floor/plasteel,
+/area/ship/hallway/central)
+"sj" = (
+/obj/structure/table/reinforced,
+/obj/effect/turf_decal/corner/transparent/neutral{
+	dir = 5
+	},
+/obj/machinery/microwave{
+	pixel_y = 3
 	},
+/obj/machinery/light/directional/north,
 /turf/open/floor/plasteel/dark,
+/area/ship/crew/canteen)
+"sn" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel,
 /area/ship/cargo)
-"rY" = (
-/obj/effect/turf_decal/industrial/warning{
-	dir = 1
+"sv" = (
+/obj/effect/turf_decal/industrial/warning/corner,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 8
 	},
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
-	dir = 4
-	},
-/turf/open/floor/plasteel/patterned,
-/area/ship/cargo)
-"rZ" = (
-/obj/machinery/light/small{
-	dir = 1;
-	pixel_y = 28
-	},
+/turf/open/floor/plasteel,
+/area/ship/cargo/hangar)
+"sC" = (
 /obj/structure/table,
 /obj/item/analyzer{
 	pixel_y = 4
 	},
+/obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/plasteel/dark,
-/area/ship/maintenance/port)
-"sb" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
-	dir = 4
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/effect/turf_decal/industrial/warning,
-/turf/open/floor/plasteel/patterned,
-/area/ship/cargo)
-"sf" = (
-/obj/structure/closet/emcloset/wall{
-	dir = 8;
-	pixel_x = 28
-	},
-/obj/effect/turf_decal/corner/transparent/neutral/three_quarters{
-	dir = 1
-	},
-/turf/open/floor/plasteel/dark,
-/area/ship/hallway/central)
-"sj" = (
-/obj/structure/table/wood,
-/obj/item/toy/cards/deck/cas/black,
-/obj/item/toy/cards/deck/cas{
-	pixel_y = 9;
-	pixel_x = -4
-	},
-/obj/machinery/light{
-	dir = 1;
-	pixel_y = 32
-	},
-/obj/item/trash/plate{
-	pixel_y = -13;
-	pixel_x = -4
-	},
-/obj/item/reagent_containers/food/snacks/meat/slab/goliath{
-	pixel_y = -16;
-	pixel_x = 5
-	},
-/turf/open/floor/plasteel/patterned/ridged,
-/area/ship/crew/canteen)
-"sn" = (
-/obj/machinery/button/door{
-	pixel_x = -5;
-	pixel_y = 27;
-	id = "tegus_port_cargo";
-	name = "Cargo Blast Door"
-	},
-/obj/machinery/button/shieldwallgen{
-	pixel_x = 5;
-	pixel_y = 27;
-	id = "cargo_shield_port";
-	name = "Cargo Holofield"
-	},
-/turf/open/floor/plasteel/patterned,
-/area/ship/cargo)
-"sv" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
-	dir = 4
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/effect/turf_decal/industrial/warning,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
-	dir = 8
-	},
-/turf/open/floor/plasteel/patterned,
-/area/ship/cargo)
-"sC" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/structure/cable{
-	icon_state = "1-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
-	dir = 9
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
-	dir = 9
-	},
-/obj/effect/turf_decal/corner/transparent/solgovgold{
-	dir = 8
-	},
-/turf/open/floor/plasteel,
-/area/ship/hallway/aft)
+/area/ship/engineering/engine)
 "sD" = (
 /obj/structure/table/reinforced,
 /obj/item/radio/intercom{
@@ -1661,62 +1567,55 @@
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
 "sF" = (
-/obj/structure/railing{
-	dir = 8;
-	pixel_x = -1
+/obj/item/kirbyplants{
+	icon_state = "plant-03";
+	pixel_x = 4;
+	layer = 4.2
 	},
 /obj/effect/turf_decal/corner/transparent/neutral,
 /turf/open/floor/plasteel/dark,
 /area/ship/crew/canteen)
 "sH" = (
-/obj/structure/ore_box,
-/obj/effect/turf_decal/industrial/hatch/yellow,
-/turf/open/floor/plasteel/dark,
-/area/ship/cargo)
-"sK" = (
-/obj/effect/turf_decal/industrial/warning{
-	dir = 8
-	},
-/obj/effect/turf_decal/industrial/warning{
-	dir = 4
-	},
-/obj/machinery/power/shieldwallgen/atmos/roundstart{
-	dir = 1;
-	id = "cargo_shield_fore"
-	},
 /obj/structure/cable{
-	icon_state = "0-2"
+	icon_state = "0-8"
 	},
-/obj/machinery/door/poddoor{
-	id = "tegus_shuttle_door";
+/obj/machinery/power/apc/auto_name/directional/east,
+/obj/effect/turf_decal/siding/thinplating{
 	dir = 4
 	},
-/turf/open/floor/plating,
-/area/ship/cargo)
-"sR" = (
-/obj/structure/cable{
-	icon_state = "0-8"
+/obj/effect/turf_decal/trimline/opaque/white/line{
+	dir = 4
 	},
-/obj/machinery/power/apc/auto_name/directional/south,
-/turf/open/floor/plasteel/patterned,
-/area/ship/cargo)
-"sW" = (
-/obj/effect/turf_decal/industrial/traffic{
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel,
+/area/ship/hallway/central)
+"sK" = (
+/obj/effect/turf_decal/industrial/warning,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
 	dir = 8
 	},
-/obj/effect/turf_decal/industrial/traffic{
-	dir = 4
+/obj/structure/cable{
+	icon_state = "4-8"
 	},
+/turf/open/floor/plasteel,
+/area/ship/cargo/hangar)
+"sR" = (
+/obj/structure/sign/nanotrasen,
+/turf/closed/wall/mineral/titanium/nodiagonal,
+/area/ship/cargo/hangar)
+"sW" = (
+/obj/effect/decal/cleanable/dirt/dust,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
-	dir = 5
+	dir = 9
 	},
-/turf/open/floor/plasteel/patterned/ridged,
-/area/ship/cargo)
+/turf/open/floor/plasteel,
+/area/ship/cargo/hangar)
 "tf" = (
-/turf/open/floor/plasteel/stairs{
-	dir = 1
+/obj/structure/sign/poster/official/miners{
+	pixel_x = 32
 	},
-/area/ship/cargo)
+/turf/open/floor/plasteel,
+/area/ship/crew/canteen)
 "ti" = (
 /obj/effect/turf_decal/industrial/warning{
 	dir = 1
@@ -1724,36 +1623,42 @@
 /turf/open/floor/plasteel/dark,
 /area/ship/cargo)
 "tD" = (
+/obj/effect/turf_decal/industrial/warning,
 /obj/structure/cable{
-	icon_state = "2-8"
+	icon_state = "4-8"
 	},
-/turf/closed/wall/mineral/titanium/nodiagonal,
-/area/ship/cargo)
+/turf/open/floor/plasteel,
+/area/ship/cargo/hangar)
 "tU" = (
-/obj/machinery/telecomms/processor/preset_two{
-	network = "ntsv_commnet"
-	},
-/turf/open/floor/plasteel/tech/grid,
+/obj/machinery/light/directional/north,
+/turf/open/floor/plasteel/telecomms_floor,
 /area/ship/engineering/communications)
 "ua" = (
-/obj/effect/turf_decal/corner/transparent/lime{
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
+/obj/effect/turf_decal/siding/thinplating/corner{
+	dir = 1
+	},
+/obj/effect/turf_decal/siding/thinplating/corner{
 	dir = 4
 	},
-/obj/effect/turf_decal/corner/transparent/neutral{
+/obj/effect/turf_decal/trimline/opaque/white/warning{
 	dir = 1
 	},
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
 /turf/open/floor/plasteel,
 /area/ship/hallway/central)
 "ub" = (
-/obj/effect/turf_decal/corner/transparent/ntblue{
-	dir = 4
-	},
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/obj/structure/cable{
-	icon_state = "2-8"
+/obj/effect/turf_decal/siding/thinplating{
+	dir = 1
+	},
+/obj/effect/turf_decal/trimline/opaque/white/line{
+	dir = 1
 	},
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4{
 	dir = 1
@@ -1761,12 +1666,27 @@
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2{
 	dir = 1
 	},
+/obj/structure/cable{
+	icon_state = "2-8"
+	},
 /turf/open/floor/plasteel,
 /area/ship/hallway/central)
 "uc" = (
-/obj/structure/catwalk/over/plated_catwalk/dark,
+/obj/effect/turf_decal/industrial/warning{
+	dir = 8
+	},
+/obj/effect/turf_decal/industrial/warning{
+	dir = 4
+	},
+/obj/effect/turf_decal/industrial/caution{
+	dir = 4
+	},
+/obj/machinery/door/poddoor{
+	id = "tegus_shuttle_door";
+	dir = 4
+	},
 /turf/open/floor/plating,
-/area/ship/engineering/communications)
+/area/ship/cargo/hangar)
 "ud" = (
 /obj/item/kirbyplants{
 	icon_state = "plant-10";
@@ -1781,36 +1701,27 @@
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
 "uf" = (
-/obj/machinery/door/airlock{
-	name = "Canteen"
-	},
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
-/obj/machinery/door/firedoor/border_only,
-/obj/machinery/door/firedoor/border_only{
-	dir = 1
-	},
-/turf/open/floor/plasteel,
-/area/ship/crew/canteen)
+/turf/open/floor/plasteel/stairs,
+/area/ship/cargo/hangar)
 "ui" = (
-/turf/open/floor/engine/hull,
-/area/ship/hallway/aft)
+/obj/structure/cable{
+	icon_state = "0-4"
+	},
+/obj/machinery/power/shuttle/engine/electric/bad{
+	dir = 4
+	},
+/turf/open/floor/plating,
+/area/ship/engineering/engine)
 "ut" = (
 /turf/template_noop,
 /area/template_noop)
 "uz" = (
-/obj/item/kirbyplants{
-	icon_state = "plant-10";
-	pixel_y = 3
-	},
-/obj/structure/cable{
-	icon_state = "0-8"
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+	dir = 1
 	},
-/obj/machinery/power/apc/auto_name/directional/east,
-/turf/open/floor/plasteel/patterned/ridged,
+/turf/open/floor/plasteel,
 /area/ship/crew)
 "uD" = (
 /obj/structure/cable{
@@ -1827,77 +1738,68 @@
 	},
 /area/ship/hallway/central)
 "uO" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
-	dir = 8
+/obj/structure/closet/crate/hydroponics,
+/obj/item/seeds/watermelon,
+/obj/item/seeds/wheat,
+/obj/item/seeds/banana,
+/obj/item/seeds/corn,
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plating,
+/area/ship/engineering/engine)
+"vi" = (
+/obj/machinery/computer/cargo/express{
+	dir = 4
 	},
-/obj/structure/extinguisher_cabinet{
-	pixel_y = -32
+/obj/effect/turf_decal/industrial/warning/corner{
+	dir = 4
 	},
-/obj/machinery/airalarm/directional/east,
-/turf/open/floor/plasteel/tech,
-/area/ship/maintenance/port)
-"vi" = (
-/obj/effect/turf_decal/ntspaceworks_big/eight,
-/turf/open/floor/plating,
+/turf/open/floor/plasteel/dark,
 /area/ship/cargo)
 "vy" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/structure/cable{
-	icon_state = "1-2"
+/obj/structure/sign/poster/official/wtf_is_co2{
+	pixel_y = 32
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
-	dir = 1
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+	dir = 4
 	},
-/obj/structure/catwalk/over/plated_catwalk,
-/turf/open/floor/plating,
-/area/ship/hallway/aft)
+/turf/open/floor/plasteel,
+/area/ship/engineering/engine)
 "vE" = (
-/obj/machinery/door/airlock/engineering{
-	name = "Engine Room"
-	},
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/simple/brown/hidden/layer2{
+/obj/effect/turf_decal/ntspaceworks_big/five{
 	dir = 8
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
+/turf/open/floor/plasteel/patterned,
+/area/ship/cargo/hangar)
+"vO" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/closet/crate,
+/obj/item/reagent_containers/food/snacks/rationpack,
+/obj/item/reagent_containers/food/snacks/rationpack,
+/obj/item/reagent_containers/food/snacks/rationpack,
+/obj/item/reagent_containers/food/snacks/rationpack,
+/obj/item/reagent_containers/food/snacks/rationpack,
+/obj/item/reagent_containers/food/drinks/waterbottle,
+/obj/item/reagent_containers/food/drinks/waterbottle,
+/obj/item/reagent_containers/food/drinks/waterbottle,
+/obj/item/reagent_containers/food/drinks/waterbottle,
+/obj/machinery/light/small/directional/west,
+/obj/item/reagent_containers/food/drinks/waterbottle/empty,
+/turf/open/floor/plating,
+/area/ship/engineering/engine)
+"vT" = (
 /obj/machinery/door/firedoor/border_only,
 /obj/machinery/door/firedoor/border_only{
 	dir = 1
 	},
-/turf/open/floor/plasteel/dark,
-/area/ship/hallway/aft)
-"vO" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
 /obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/components/binary/volume_pump/on/layer2{
-	name = "Scrubbers to External"
-	},
-/obj/effect/turf_decal/corner/transparent/solgovgold{
-	dir = 1
+	icon_state = "1-2"
 	},
-/obj/machinery/atmospherics/pipe/manifold/supply/visible/layer4,
-/turf/open/floor/plasteel/dark,
-/area/ship/maintenance/port)
-"vT" = (
 /obj/machinery/door/airlock{
 	name = "Crew Quarters"
 	},
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
-	dir = 1
-	},
-/obj/machinery/door/firedoor/border_only,
-/obj/machinery/door/firedoor/border_only{
-	dir = 1
-	},
 /turf/open/floor/plasteel,
 /area/ship/crew)
 "vV" = (
@@ -1910,25 +1812,21 @@
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
 "wb" = (
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
-	dir = 1
+/obj/structure/table,
+/obj/item/storage/toolbox/electrical{
+	pixel_y = 5
 	},
+/obj/item/storage/toolbox/mechanical,
+/obj/item/stack/cable_coil/red,
 /obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/plasteel/patterned,
-/area/ship/hallway/aft)
+/turf/open/floor/plasteel/dark,
+/area/ship/engineering/engine)
 "wc" = (
-/obj/machinery/power/port_gen/pacman/super,
-/obj/structure/window/reinforced/spawner/north,
-/obj/machinery/door/window/westleft,
-/obj/structure/cable/yellow{
-	icon_state = "0-8"
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+	dir = 1
 	},
 /turf/open/floor/plasteel/tech,
-/area/ship/maintenance/starboard)
+/area/ship/crew)
 "wg" = (
 /obj/effect/turf_decal/corner/transparent/neutral{
 	dir = 10
@@ -1940,342 +1838,331 @@
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
 "ws" = (
-/obj/machinery/cryopod{
+/obj/structure/bedsheetbin,
+/obj/structure/table,
+/obj/machinery/button/door{
+	id = "tegus_crew_shutters";
+	name = "Window Shutters";
+	pixel_x = -27;
 	dir = 4
 	},
-/obj/structure/window/reinforced/spawner/north,
-/obj/machinery/light{
-	pixel_y = -32
-	},
-/turf/open/floor/plasteel/patterned,
+/turf/open/floor/wood,
 /area/ship/crew)
 "wv" = (
-/obj/structure/railing/corner{
-	dir = 4
-	},
-/obj/effect/turf_decal/corner/transparent/solgovgold{
-	dir = 1
-	},
 /obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/airalarm/directional/south,
-/turf/open/floor/plasteel/dark,
-/area/ship/maintenance/starboard)
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/mopbucket,
+/obj/item/mop,
+/turf/open/floor/plating,
+/area/ship/engineering/engine)
 "wT" = (
-/obj/structure/table,
-/obj/item/paper_bin,
-/obj/item/pen,
-/turf/open/floor/plasteel/patterned/ridged,
-/area/ship/cargo)
-"xc" = (
-/obj/structure/cable{
-	icon_state = "0-8"
-	},
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
-	dir = 8
-	},
-/obj/machinery/power/apc/auto_name/directional/east,
-/turf/open/floor/plasteel/dark,
-/area/ship/maintenance/port)
-"xf" = (
+/obj/effect/turf_decal/trimline/opaque/white/line,
 /obj/effect/turf_decal/industrial/warning{
 	dir = 4
 	},
-/obj/effect/turf_decal/industrial/warning{
-	dir = 8
+/turf/open/floor/plasteel,
+/area/ship/cargo/hangar)
+"xc" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/decal/cleanable/oil,
+/turf/open/floor/plating,
+/area/ship/engineering/engine)
+"xf" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 10
 	},
-/obj/machinery/door/airlock/external{
-	dir = 8
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 10
 	},
-/turf/open/floor/plating,
-/area/ship/cargo)
+/turf/open/floor/plasteel/dark,
+/area/ship/cargo/hangar)
 "xh" = (
-/obj/machinery/conveyor/inverted{
-	dir = 6;
-	id = "tegusbelt"
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/cable{
+	icon_state = "1-2"
 	},
-/obj/effect/turf_decal/spline/fancy/opaque/black{
-	dir = 1
+/obj/machinery/button/shieldwallgen{
+	pixel_x = -27;
+	pixel_y = -5;
+	id = "cargo_shield_starboard";
+	name = "Cargo Holofield";
+	dir = 4
 	},
-/turf/open/floor/plasteel/tech/grid,
+/obj/machinery/button/door{
+	pixel_x = -27;
+	pixel_y = 5;
+	id = "tegus_starboard_cargo";
+	name = "Cargo Blast Door";
+	dir = 4
+	},
+/turf/open/floor/plasteel,
 /area/ship/cargo)
 "xu" = (
-/obj/machinery/light{
-	dir = 1;
-	layer = 4;
-	pixel_y = 32
-	},
+/obj/effect/decal/cleanable/dirt/dust,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
-	dir = 6
+	dir = 10
 	},
-/turf/open/floor/plasteel/patterned,
-/area/ship/cargo)
+/obj/effect/turf_decal/industrial/loading,
+/turf/open/floor/plasteel,
+/area/ship/cargo/hangar)
 "xB" = (
-/obj/structure/chair/sofa/right{
-	dir = 8
+/obj/machinery/vending/snack/random,
+/obj/effect/turf_decal/corner/transparent/neutral{
+	dir = 5
 	},
-/turf/open/floor/plasteel/patterned,
+/turf/open/floor/plasteel/dark,
 /area/ship/crew/canteen)
 "xE" = (
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
 /obj/effect/turf_decal/industrial/warning{
 	dir = 1
 	},
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2{
-	dir = 1
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 8
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
-	dir = 10
-	},
-/obj/structure/table/reinforced,
-/obj/machinery/button/door{
-	pixel_x = -6;
-	id = "tegus_shuttle_door";
-	name = "Shuttle Bay Blast Door";
-	pixel_y = 2
+	dir = 8
 	},
-/obj/machinery/button/shieldwallgen{
-	id = "cargo_shield_fore";
-	pixel_y = 2;
-	name = "Shuttle Bay Holofield";
-	pixel_x = 6
+/obj/structure/cable{
+	icon_state = "4-8"
 	},
-/turf/open/floor/plasteel/patterned/ridged,
-/area/ship/cargo)
+/turf/open/floor/plasteel,
+/area/ship/cargo/hangar)
 "xG" = (
-/obj/structure/catwalk/over/plated_catwalk,
+/obj/effect/turf_decal/industrial/outline/yellow,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 4
+	},
 /obj/structure/cable{
-	icon_state = "1-2"
+	icon_state = "4-8"
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
-/turf/open/floor/plating,
-/area/ship/hallway/central)
+/turf/open/floor/plasteel/dark,
+/area/ship/cargo)
 "xJ" = (
-/obj/effect/turf_decal/corner/transparent/lime{
-	dir = 8
+/obj/effect/turf_decal/siding/wood,
+/obj/effect/turf_decal/siding/wood{
+	dir = 1
 	},
-/obj/effect/turf_decal/corner/transparent/neutral{
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4{
 	dir = 1
 	},
-/obj/structure/cable{
-	icon_state = "1-2"
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 8
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
-/turf/open/floor/plasteel,
+/turf/open/floor/carpet,
 /area/ship/crew)
 "xZ" = (
-/obj/structure/table,
-/obj/item/storage/box/lights/mixed{
-	pixel_x = -12;
-	pixel_y = 3
-	},
-/obj/item/wrench{
-	pixel_y = 4;
-	pixel_x = -3
-	},
-/obj/machinery/light/small{
-	pixel_y = -28
-	},
-/turf/open/floor/plasteel/dark,
-/area/ship/maintenance/starboard)
+/turf/closed/wall/mineral/titanium/nodiagonal,
+/area/ship/engineering/engine)
 "yd" = (
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
 /obj/effect/turf_decal/industrial/warning{
 	dir = 1
 	},
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
 	dir = 8
 	},
-/turf/open/floor/plasteel/patterned,
-/area/ship/cargo)
-"ye" = (
-/obj/effect/turf_decal/corner/transparent/ntblue,
-/obj/effect/turf_decal/corner/transparent/neutral{
-	dir = 4
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 8
 	},
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
-/turf/open/floor/plasteel/dark,
-/area/ship/engineering/communications)
-"yg" = (
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
-	dir = 9
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
-	dir = 10
+/turf/open/floor/plasteel,
+/area/ship/cargo/hangar)
+"ye" = (
+/obj/machinery/telecomms/bus/preset_two{
+	network = "ntsv_commnet"
 	},
-/turf/open/floor/plasteel/tech,
-/area/ship/maintenance/starboard)
+/turf/open/floor/circuit/green/telecomms/mainframe,
+/area/ship/engineering/communications)
+"yg" = (
+/obj/structure/girder,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/light/small/directional/west,
+/turf/open/floor/plating,
+/area/ship/engineering/engine)
 "yC" = (
-/obj/item/kirbyplants{
-	icon_state = "plant-03";
-	pixel_y = 8;
-	pixel_x = 4;
-	layer = 4.2
+/obj/structure/railing/corner{
+	layer = 4.1
+	},
+/obj/machinery/mineral/processing_unit{
+	input_dir = 4;
+	output_dir = 8
+	},
+/obj/machinery/conveyor{
+	dir = 8;
+	id = "tegusbelt"
 	},
+/obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/plasteel/tech,
-/area/ship/cargo)
+/area/ship/cargo/hangar)
 "yI" = (
-/turf/open/floor/plasteel/stairs{
-	dir = 4
+/obj/machinery/telecomms/receiver/preset_left{
+	network = "ntsv_commnet";
+	id = "Nanotrasen Receiver"
 	},
-/area/ship/maintenance/starboard)
+/obj/structure/window/reinforced/spawner,
+/turf/open/floor/circuit/green/telecomms/mainframe,
+/area/ship/engineering/communications)
 "yJ" = (
-/obj/structure/chair/sofa/left{
-	dir = 4
+/obj/structure/table/reinforced,
+/obj/effect/turf_decal/corner/transparent/neutral{
+	dir = 5
 	},
-/turf/open/floor/plasteel/patterned,
+/obj/effect/spawner/lootdrop/donkpockets,
+/turf/open/floor/plasteel/dark,
 /area/ship/crew/canteen)
 "yL" = (
-/obj/structure/table,
-/obj/item/storage/toolbox/electrical{
-	pixel_y = 5
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 8
 	},
-/obj/item/storage/toolbox/mechanical,
-/obj/machinery/button/door{
-	pixel_x = -27;
-	dir = 4;
-	id = "tegus_starboard_engine";
-	name = "Engine Blast Door"
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 4
 	},
-/obj/item/stack/cable_coil/red,
-/turf/open/floor/plasteel/tech,
-/area/ship/maintenance/starboard)
-"yO" = (
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+/obj/machinery/door/firedoor/border_only{
+	dir = 8
+	},
+/obj/machinery/door/firedoor/border_only{
 	dir = 4
 	},
-/obj/effect/turf_decal/industrial/warning{
-	dir = 1
+/obj/machinery/door/airlock/mining/glass{
+	dir = 4;
+	name = "Cargo Bay"
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+/turf/open/floor/plasteel,
+/area/ship/hallway/central)
+"yO" = (
+/obj/effect/turf_decal/industrial/warning/corner{
 	dir = 4
 	},
-/turf/open/floor/plasteel/patterned/ridged,
-/area/ship/cargo)
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 8
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/turf/open/floor/plasteel,
+/area/ship/cargo/hangar)
 "yV" = (
 /obj/effect/turf_decal/industrial/hatch/yellow,
 /turf/open/floor/plasteel/dark,
 /area/ship/cargo)
 "zj" = (
-/obj/structure/reagent_dispensers/watertank,
-/obj/effect/turf_decal/industrial/hatch/yellow,
-/turf/open/floor/plasteel,
-/area/ship/hallway/aft)
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 5
+	},
+/turf/open/floor/plating,
+/area/ship/engineering/engine)
 "zr" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/turf_decal/corner/transparent/solgovgold{
-	dir = 1
+/obj/structure/catwalk/over/plated_catwalk/white{
+	color = "#4c535b"
 	},
-/obj/structure/chair{
-	dir = 1
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 6
 	},
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/plasteel,
-/area/ship/hallway/aft)
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 6
+	},
+/turf/open/floor/plating,
+/area/ship/engineering/engine)
 "zu" = (
 /obj/structure/sign/nanotrasen,
 /turf/closed/wall/mineral/titanium/nodiagonal,
 /area/ship/crew/canteen)
 "zv" = (
-/obj/structure/tank_dispenser,
-/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/layer4{
-	dir = 1
-	},
-/turf/open/floor/plasteel/patterned/ridged,
-/area/ship/cargo)
-"zH" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+/turf/open/floor/plasteel/stairs{
 	dir = 1
 	},
-/turf/open/floor/plasteel/patterned/ridged,
-/area/ship/hallway/aft)
-"zQ" = (
-/obj/machinery/suit_storage_unit/standard_unit,
-/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/layer4{
+/area/ship/cargo/hangar)
+"zH" = (
+/obj/machinery/power/terminal{
 	dir = 8
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
-	dir = 8
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/light/small/directional/south,
+/obj/effect/turf_decal/industrial/warning{
+	dir = 4
 	},
-/turf/open/floor/plasteel/patterned/ridged,
-/area/ship/hallway/central)
+/turf/open/floor/plasteel/dark,
+/area/ship/engineering/engine)
+"zQ" = (
+/obj/structure/table,
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/dark,
+/area/ship/crew)
 "zR" = (
-/obj/effect/turf_decal/industrial/outline/yellow,
-/obj/structure/closet/crate,
-/obj/machinery/light{
-	dir = 8;
-	pixel_x = -32
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/decal/cleanable/dirt/dust,
+/mob/living/simple_animal/hostile/cockroach{
+	name = "Mart";
+	desc = "The captain's beloved pet, long forgotten."
 	},
-/turf/open/floor/plasteel/dark,
-/area/ship/cargo)
+/obj/structure/spider/stickyweb,
+/turf/open/floor/plating,
+/area/ship/engineering/engine)
 "zY" = (
-/obj/effect/turf_decal/spline/fancy/opaque/black,
-/obj/structure/railing{
-	layer = 4.1
+/obj/effect/landmark/subship{
+	subship_template = /datum/map_template/shuttle/subshuttles/nanotrasen_tegus
 	},
-/turf/open/floor/plasteel/tech,
-/area/ship/cargo)
+/turf/open/floor/plating,
+/area/ship/cargo/hangar)
 "Ag" = (
-/obj/structure/cable{
-	icon_state = "1-2"
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 9
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
-	dir = 1
+/obj/structure/extinguisher_cabinet{
+	pixel_x = 28;
+	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+/obj/effect/turf_decal/siding/thinplating/corner{
 	dir = 1
 	},
-/obj/machinery/door/airlock/engineering{
-	req_access_txt = "61";
-	name = "Communications"
+/obj/effect/turf_decal/siding/thinplating/corner{
+	dir = 4
 	},
-/obj/machinery/door/firedoor/border_only{
+/obj/effect/turf_decal/trimline/opaque/white/warning{
 	dir = 1
 	},
-/obj/machinery/door/firedoor/border_only,
 /turf/open/floor/plasteel,
-/area/ship/engineering/communications)
+/area/ship/hallway/central)
 "Ak" = (
 /obj/effect/turf_decal/industrial/outline/yellow,
 /turf/open/floor/plasteel/dark,
 /area/ship/cargo)
 "Ao" = (
-/obj/structure/table,
-/obj/item/storage/toolbox/electrical,
-/obj/item/multitool{
-	pixel_y = 3
+/obj/machinery/door/window/northleft{
+	req_access_txt = "61"
 	},
-/turf/open/floor/plasteel/tech/grid,
+/turf/open/floor/plasteel/telecomms_floor,
 /area/ship/engineering/communications)
 "Aq" = (
-/obj/effect/turf_decal/industrial/warning/corner{
-	dir = 4
+/obj/effect/turf_decal/industrial/traffic{
+	dir = 8
 	},
+/obj/machinery/light/directional/west,
 /obj/structure/cable{
-	icon_state = "1-4"
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
-	dir = 5
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
-	dir = 5
+	icon_state = "1-2"
 	},
-/turf/open/floor/plasteel,
+/turf/open/floor/plasteel/patterned/ridged,
 /area/ship/cargo)
 "Au" = (
 /turf/open/floor/plasteel/stairs{
@@ -2283,184 +2170,149 @@
 	},
 /area/ship/hallway/central)
 "Ay" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/light{
-	dir = 4;
-	pixel_x = 32
+/obj/structure/catwalk/over/plated_catwalk/white{
+	color = "#4c535b"
 	},
-/obj/structure/reagent_dispensers/fueltank,
-/obj/effect/turf_decal/industrial/hatch/yellow,
-/turf/open/floor/plasteel,
-/area/ship/hallway/aft)
-"Az" = (
-/obj/structure/cable{
-	icon_state = "4-8"
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 10
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
-	dir = 4
-	},
-/obj/effect/turf_decal/industrial/warning{
-	dir = 1
+	dir = 10
 	},
-/turf/open/floor/plasteel/patterned,
-/area/ship/cargo)
+/turf/open/floor/plating,
+/area/ship/engineering/engine)
+"Az" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/girder,
+/turf/open/floor/plating,
+/area/ship/engineering/engine)
 "AB" = (
-/obj/effect/turf_decal/corner/transparent/lime{
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
+/obj/machinery/light/directional/east,
+/turf/open/floor/plasteel/stairs,
+/area/ship/engineering/engine)
+"Bh" = (
+/obj/effect/turf_decal/siding/thinplating{
 	dir = 4
 	},
-/obj/effect/turf_decal/corner/transparent/neutral{
-	dir = 1
-	},
-/obj/structure/cable{
-	icon_state = "1-2"
+/obj/effect/turf_decal/trimline/opaque/white/line{
+	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
+/obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/plasteel,
 /area/ship/hallway/central)
-"Bh" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
-/turf/open/floor/plasteel/patterned,
-/area/ship/hallway/central)
 "Bk" = (
-/obj/effect/turf_decal/corner/transparent/ntblue,
-/obj/effect/turf_decal/corner/transparent/neutral{
-	dir = 4
-	},
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
-	dir = 1
+/obj/machinery/telecomms/broadcaster/preset_left{
+	network = "ntsv_commnet";
+	id = "Nanotrasen Broadcaster"
 	},
-/turf/open/floor/plasteel/dark,
+/obj/structure/window/reinforced/spawner,
+/turf/open/floor/circuit/green/telecomms/mainframe,
 /area/ship/engineering/communications)
 "Bl" = (
-/obj/effect/turf_decal/industrial/warning{
-	dir = 8
-	},
-/obj/effect/turf_decal/industrial/warning{
+/obj/structure/railing{
 	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
-	dir = 8
-	},
-/obj/machinery/door/airlock/external{
-	dir = 8
-	},
+/obj/structure/table,
 /turf/open/floor/plasteel,
-/area/ship/cargo)
+/area/ship/cargo/hangar)
 "Bn" = (
-/obj/structure/railing{
-	layer = 4.1
-	},
-/turf/open/floor/plasteel/stairs{
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
 	dir = 4
 	},
-/area/ship/maintenance/starboard)
-"Bs" = (
-/obj/structure/railing{
-	dir = 4
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2{
+	dir = 1
 	},
-/obj/structure/railing{
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/effect/turf_decal/siding/thinplating/corner,
+/obj/effect/turf_decal/siding/thinplating/corner{
 	dir = 8
 	},
-/turf/open/floor/plasteel/stairs{
-	icon = 'icons/obj/stairs.dmi';
-	dir = 1
+/obj/effect/turf_decal/trimline/opaque/white/warning,
+/turf/open/floor/plasteel,
+/area/ship/hallway/central)
+"Bs" = (
+/obj/item/kirbyplants{
+	icon_state = "plant-22";
+	pixel_x = -6;
+	pixel_y = 5
 	},
-/area/ship/cargo)
+/turf/open/floor/plasteel/dark,
+/area/ship/cargo/hangar)
 "Bv" = (
-/obj/machinery/power/apc/auto_name/directional/east,
-/obj/structure/cable{
-	icon_state = "0-8"
+/obj/structure/table,
+/obj/item/reagent_containers/food/drinks/coffee{
+	pixel_y = 3
 	},
 /turf/open/floor/plasteel/dark,
 /area/ship/crew/canteen)
 "Bx" = (
-/obj/structure/table/wood,
-/obj/item/storage/box/donkpockets/donkpocketspicy{
-	pixel_y = 3;
-	pixel_x = -3
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 8
 	},
-/turf/open/floor/plasteel/patterned/ridged,
+/turf/open/floor/plasteel,
 /area/ship/crew/canteen)
 "BE" = (
-/obj/effect/turf_decal/industrial/warning,
-/obj/structure/cable{
-	icon_state = "4-8"
+/turf/open/floor/plasteel,
+/area/ship/crew/canteen)
+"BG" = (
+/obj/machinery/light/directional/south,
+/turf/open/floor/plasteel,
+/area/ship/cargo/hangar)
+"BH" = (
+/obj/structure/table,
+/obj/item/stack/packageWrap{
+	pixel_x = 3
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
-	dir = 8
+/obj/structure/railing,
+/obj/item/flashlight/lamp{
+	pixel_x = -5;
+	pixel_y = 12
 	},
-/turf/open/floor/plasteel/patterned,
+/turf/open/floor/plasteel/dark,
 /area/ship/cargo)
-"BG" = (
-/obj/effect/turf_decal/corner/transparent/brown,
+"BJ" = (
+/obj/machinery/suit_storage_unit/mining,
 /obj/effect/turf_decal/corner/transparent/neutral{
 	dir = 8
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
-	dir = 5
-	},
-/turf/open/floor/plasteel,
-/area/ship/hallway/central)
-"BH" = (
-/obj/structure/cable{
-	icon_state = "1-8"
-	},
-/obj/structure/cable{
-	icon_state = "1-4"
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/dark,
+/area/ship/cargo/hangar)
+"BP" = (
+/obj/machinery/power/terminal{
+	dir = 8
 	},
-/turf/open/floor/plasteel/patterned/ridged,
-/area/ship/cargo)
-"BJ" = (
-/obj/machinery/suit_storage_unit/standard_unit,
-/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/layer4{
+/obj/machinery/atmospherics/pipe/simple/brown/visible/layer2{
 	dir = 1
 	},
-/obj/machinery/light/small{
-	dir = 1;
-	pixel_y = 28
-	},
-/turf/open/floor/plasteel/patterned/ridged,
-/area/ship/cargo)
-"BP" = (
 /obj/effect/decal/cleanable/dirt/dust,
-/obj/structure/railing{
+/obj/effect/turf_decal/industrial/warning{
 	dir = 4
 	},
-/obj/effect/turf_decal/spline/fancy/opaque/grey{
-	dir = 4
+/obj/machinery/button/door{
+	dir = 1;
+	id = "tegus_port_engine";
+	name = "Engine Blast Door";
+	pixel_y = -27
 	},
-/obj/effect/turf_decal/industrial/warning/corner,
-/turf/open/floor/plasteel/patterned,
-/area/ship/hallway/aft)
+/turf/open/floor/plasteel/dark,
+/area/ship/engineering/engine)
 "Cb" = (
-/obj/effect/turf_decal/industrial/warning{
-	dir = 8
-	},
-/obj/effect/turf_decal/industrial/warning{
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2{
 	dir = 4
 	},
-/obj/machinery/power/shieldwallgen/atmos/roundstart{
-	dir = 2;
-	id = "cargo_shield_fore"
-	},
 /obj/structure/cable{
-	icon_state = "0-1"
-	},
-/obj/machinery/door/poddoor{
-	id = "tegus_shuttle_door";
-	dir = 4
+	icon_state = "1-8"
 	},
 /turf/open/floor/plating,
-/area/ship/cargo)
+/area/ship/engineering/engine)
 "Cg" = (
 /obj/effect/turf_decal/corner/transparent/neutral{
 	dir = 1
@@ -2472,218 +2324,260 @@
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
 "Ch" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 5
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
 /obj/structure/cable{
-	icon_state = "4-8"
+	icon_state = "1-4"
+	},
+/turf/open/floor/plasteel,
+/area/ship/cargo/hangar)
+"Cr" = (
+/obj/effect/turf_decal/siding/wood/end{
+	dir = 8
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
-	dir = 4
+	dir = 8
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
-	dir = 4
-	},
-/obj/effect/turf_decal/industrial/warning{
-	dir = 1
+	dir = 8
 	},
-/turf/open/floor/plasteel/patterned,
-/area/ship/cargo)
-"Cr" = (
-/obj/structure/bed,
-/obj/item/bedsheet/dorms,
-/obj/structure/curtain/cloth/grey,
-/turf/open/floor/plasteel/patterned/ridged,
+/turf/open/floor/carpet,
 /area/ship/crew)
 "Cz" = (
-/obj/effect/turf_decal/corner/transparent/brown{
-	dir = 1
-	},
-/obj/machinery/light{
-	dir = 1;
-	pixel_y = 32
-	},
-/turf/open/floor/plasteel,
-/area/ship/hallway/central)
+/turf/closed/wall,
+/area/ship/engineering/engine)
 "CB" = (
+/obj/effect/turf_decal/industrial/warning,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
-	dir = 4
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 8
+	},
+/obj/structure/closet/firecloset/wall{
+	pixel_y = 28
 	},
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/obj/effect/turf_decal/industrial/warning,
-/obj/structure/table/reinforced,
-/obj/machinery/computer/helm/viewscreen{
-	pixel_y = 6
-	},
-/turf/open/floor/plasteel/patterned,
-/area/ship/cargo)
+/turf/open/floor/plasteel,
+/area/ship/cargo/hangar)
 "CC" = (
-/obj/machinery/atmospherics/pipe/layer_manifold,
-/turf/closed/wall/mineral/titanium/nodiagonal,
-/area/ship/cargo)
-"CD" = (
-/obj/machinery/power/terminal{
-	dir = 8
+/obj/effect/turf_decal/industrial/warning{
+	dir = 1
 	},
-/obj/structure/cable/yellow,
-/obj/structure/cable/yellow{
-	icon_state = "0-2"
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+	dir = 8
 	},
-/obj/structure/catwalk/over/plated_catwalk/dark,
-/turf/open/floor/plating,
-/area/ship/maintenance/starboard)
-"CH" = (
 /obj/structure/cable{
-	icon_state = "2-4"
-	},
-/obj/machinery/light{
-	dir = 8;
-	pixel_x = -32
+	icon_state = "4-8"
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
-	dir = 6
+/turf/open/floor/plasteel,
+/area/ship/cargo/hangar)
+"CD" = (
+/obj/effect/turf_decal/industrial/warning{
+	dir = 1
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
-	dir = 6
+/obj/effect/turf_decal/industrial/warning,
+/obj/machinery/light/dim/directional/west,
+/turf/open/floor/plasteel/dark,
+/area/ship/crew)
+"CH" = (
+/obj/structure/table,
+/obj/structure/railing,
+/obj/item/stamp{
+	pixel_y = 10
 	},
-/turf/open/floor/plasteel/patterned/ridged,
-/area/ship/hallway/central)
+/obj/item/stamp/denied,
+/obj/effect/turf_decal/industrial/warning/corner,
+/turf/open/floor/plasteel/dark,
+/area/ship/cargo)
 "CI" = (
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
-	dir = 8
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4{
+	dir = 1
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
-	dir = 4
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2{
+	dir = 1
 	},
-/obj/machinery/door/firedoor/border_only{
-	dir = 4
+/obj/machinery/firealarm{
+	pixel_y = 32;
+	dir = 1
 	},
-/obj/machinery/door/firedoor/border_only{
-	dir = 8
+/obj/effect/turf_decal/siding/thinplating{
+	dir = 1
 	},
-/obj/machinery/door/airlock/mining/glass{
-	dir = 4
+/obj/effect/turf_decal/trimline/opaque/white/line{
+	dir = 1
 	},
+/obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/plasteel,
-/area/ship/cargo)
+/area/ship/hallway/central)
 "CO" = (
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
-	dir = 1
+/obj/structure/catwalk/over/plated_catwalk/white{
+	color = "#4c535b"
 	},
-/turf/open/floor/plasteel/patterned/ridged,
-/area/ship/hallway/aft)
-"CQ" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
-	dir = 1
+	dir = 5
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
-	dir = 1
+	dir = 5
 	},
-/obj/machinery/door/airlock/engineering{
-	req_access_txt = "61";
-	name = "Communications"
+/turf/open/floor/plating,
+/area/ship/engineering/engine)
+"CQ" = (
+/obj/effect/turf_decal/corner/transparent/neutral{
+	dir = 8
 	},
-/obj/machinery/door/firedoor/border_only{
+/obj/structure/table/reinforced,
+/obj/machinery/button/door{
+	pixel_x = -6;
+	id = "tegus_shuttle_door";
+	name = "Shuttle Bay Blast Door";
+	dir = 1;
+	pixel_y = 5;
+	req_access = list(31)
+	},
+/obj/machinery/button/shieldwallgen{
+	id = "cargo_shield_fore";
+	pixel_y = 2;
+	name = "Shuttle Bay Holofield";
+	pixel_x = 6;
 	dir = 1
 	},
-/obj/machinery/door/firedoor/border_only,
-/turf/open/floor/plasteel,
-/area/ship/engineering/communications)
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/button/door{
+	pixel_x = -6;
+	id = "tegus_hangar_shutters";
+	name = "Window Shutters";
+	dir = 1;
+	pixel_y = -3
+	},
+/turf/open/floor/plasteel/telecomms_floor,
+/area/ship/cargo/hangar)
 "CT" = (
-/obj/machinery/autolathe,
-/obj/item/stack/sheet/glass/five,
-/obj/item/stack/sheet/metal/five{
-	pixel_y = 3
+/obj/machinery/power/smes/shuttle/precharged{
+	dir = 4
 	},
-/turf/open/floor/plasteel/patterned/ridged,
-/area/ship/hallway/aft)
+/obj/structure/window/reinforced/spawner/west,
+/obj/machinery/door/window/eastright,
+/obj/structure/cable{
+	icon_state = "0-8"
+	},
+/obj/machinery/door/poddoor{
+	id = "tegus_port_engine";
+	dir = 4
+	},
+/turf/open/floor/plating,
+/area/ship/engineering/engine)
 "CX" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
 	dir = 4
 	},
-/turf/open/floor/plasteel/dark,
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/turf/open/floor/plasteel,
 /area/ship/crew/canteen)
 "Df" = (
-/obj/effect/turf_decal/corner/transparent/neutral/three_quarters{
-	dir = 1
+/obj/structure/cable{
+	icon_state = "1-2"
 	},
-/turf/open/floor/plasteel/dark,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
+/obj/effect/turf_decal/siding/thinplating{
+	dir = 8
+	},
+/obj/effect/turf_decal/trimline/opaque/white/line{
+	dir = 8
+	},
+/turf/open/floor/plasteel,
 /area/ship/hallway/central)
 "Dj" = (
-/obj/effect/turf_decal/industrial/warning{
+/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/layer4{
 	dir = 8
 	},
-/obj/effect/turf_decal/industrial/warning{
-	dir = 4
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 8
 	},
-/obj/docking_port/mobile{
-	can_move_docking_ports = 1;
+/obj/machinery/light/small{
 	dir = 8;
-	launch_status = 0;
-	preferred_direction = 4
+	pixel_x = -28
 	},
-/obj/machinery/door/poddoor{
-	id = "tegus_shuttle_door";
+/obj/effect/turf_decal/industrial/warning{
 	dir = 4
 	},
-/turf/open/floor/plating,
-/area/ship/cargo)
+/turf/open/floor/plasteel/patterned,
+/area/ship/hallway/central)
 "Dk" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+/turf/open/floor/plasteel,
+/area/ship/cargo/hangar)
+"DF" = (
+/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/layer4{
 	dir = 8
 	},
-/turf/open/floor/plasteel/patterned,
-/area/ship/cargo)
-"DF" = (
-/obj/machinery/atmospherics/components/unary/tank/air{
-	piping_layer = 4
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 4
 	},
-/turf/open/floor/plasteel/tech,
-/area/ship/maintenance/port)
+/obj/machinery/light/small{
+	dir = 8;
+	pixel_x = -28
+	},
+/obj/effect/turf_decal/industrial/warning{
+	dir = 4
+	},
+/turf/open/floor/plasteel/patterned,
+/area/ship/hallway/central)
 "DT" = (
-/obj/effect/turf_decal/ntspaceworks_big/six,
-/turf/open/floor/plating,
+/obj/effect/turf_decal/industrial/traffic{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
+/obj/machinery/airalarm/directional/east,
+/turf/open/floor/plasteel/patterned/ridged,
 /area/ship/cargo)
 "Ea" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/turf_decal/industrial/warning{
-	dir = 4
+/obj/machinery/atmospherics/pipe/simple/brown/visible/layer2{
+	dir = 9
 	},
-/turf/open/floor/plasteel,
-/area/ship/hallway/aft)
+/turf/closed/wall/mineral/titanium/nodiagonal,
+/area/ship/engineering/engine)
 "Eg" = (
-/obj/effect/turf_decal/industrial/hatch/yellow,
-/obj/machinery/firealarm{
+/turf/closed/wall,
+/area/ship/hallway/central)
+"Em" = (
+/obj/structure/closet/emcloset/wall{
 	dir = 8;
-	pixel_x = -32
+	pixel_x = 28
 	},
-/turf/open/floor/plasteel/dark,
-/area/ship/cargo)
-"Em" = (
-/obj/machinery/power/terminal{
-	dir = 8
+/obj/effect/turf_decal/siding/thinplating{
+	dir = 4
 	},
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/structure/cable{
-	icon_state = "0-4"
+/obj/effect/turf_decal/trimline/opaque/white/line{
+	dir = 4
 	},
-/turf/open/floor/plasteel/dark,
-/area/ship/maintenance/starboard)
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel,
+/area/ship/hallway/central)
 "En" = (
-/obj/structure/cable{
-	icon_state = "2-8"
+/obj/effect/turf_decal/industrial/warning,
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 9
 	},
 /obj/structure/cable{
-	icon_state = "2-4"
+	icon_state = "4-8"
 	},
-/turf/open/floor/plasteel/patterned/ridged,
-/area/ship/cargo)
+/turf/open/floor/plasteel,
+/area/ship/cargo/hangar)
 "Ev" = (
 /obj/structure/table/reinforced,
 /obj/item/radio/intercom/wideband{
@@ -2692,218 +2586,166 @@
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/bridge)
 "ES" = (
-/obj/effect/turf_decal/corner/transparent/ntblue{
-	dir = 4
-	},
-/obj/effect/turf_decal/corner/transparent/neutral{
-	dir = 2
-	},
-/obj/structure/cable,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
-	dir = 1
+/obj/machinery/telecomms/hub/preset{
+	network = "ntsv_commnet"
 	},
-/obj/machinery/power/apc/auto_name/directional/south,
-/turf/open/floor/plasteel/dark,
+/turf/open/floor/circuit/telecomms/mainframe,
 /area/ship/engineering/communications)
 "EU" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
-	dir = 4
+/obj/effect/turf_decal/industrial/warning{
+	dir = 1
 	},
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/light/floor,
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+/turf/open/floor/plasteel,
+/area/ship/cargo/hangar)
+"Fd" = (
+/obj/effect/turf_decal/industrial/warning,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/light/floor,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
 	dir = 8
 	},
-/obj/effect/turf_decal/industrial/warning,
-/turf/open/floor/plasteel/patterned,
-/area/ship/cargo)
-"Fd" = (
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/obj/effect/turf_decal/industrial/warning,
-/turf/open/floor/plasteel/patterned,
-/area/ship/cargo)
+/turf/open/floor/plasteel,
+/area/ship/cargo/hangar)
 "Fg" = (
+/obj/structure/table,
+/obj/item/paper_bin,
+/obj/item/pen,
+/obj/structure/railing,
 /obj/effect/turf_decal/industrial/warning/corner{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
 	dir = 8
 	},
-/obj/structure/extinguisher_cabinet{
-	pixel_y = 28;
-	dir = 1
-	},
-/turf/open/floor/plasteel/patterned,
+/turf/open/floor/plasteel/dark,
 /area/ship/cargo)
 "Fk" = (
-/obj/effect/turf_decal/corner/transparent/brown{
-	dir = 1
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
-	dir = 1
+/obj/machinery/shower{
+	pixel_y = 19
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
-	dir = 1
+/obj/structure/curtain,
+/obj/machinery/door/window/southright,
+/obj/structure/window/reinforced/tinted/frosted{
+	dir = 8
 	},
-/turf/open/floor/plasteel,
-/area/ship/hallway/central)
+/turf/open/floor/plasteel/patterned,
+/area/ship/crew)
 "Fn" = (
+/obj/machinery/power/smes/engineering,
 /obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
-	dir = 4
+	icon_state = "0-4"
 	},
-/obj/structure/catwalk/over/plated_catwalk,
-/turf/open/floor/plating,
-/area/ship/hallway/aft)
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel,
+/area/ship/engineering/engine)
 "Ft" = (
-/obj/effect/turf_decal/corner/transparent/brown{
-	dir = 4
-	},
-/obj/effect/turf_decal/corner/transparent/neutral{
-	dir = 1
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
-	dir = 6
+/obj/effect/turf_decal/ntspaceworks_big/eight{
+	dir = 8
 	},
-/turf/open/floor/plasteel,
-/area/ship/hallway/central)
+/turf/open/floor/plasteel/patterned,
+/area/ship/cargo/hangar)
 "Fy" = (
-/obj/structure/table,
-/obj/item/crowbar{
-	pixel_y = 6;
-	pixel_x = -2
-	},
-/obj/item/stock_parts/cell/high/empty{
-	pixel_x = 3;
-	pixel_y = -8
+/obj/machinery/atmospherics/pipe/simple/brown/visible/layer2{
+	dir = 4
 	},
-/turf/open/floor/plasteel/patterned/ridged,
-/area/ship/hallway/aft)
+/turf/closed/wall/mineral/titanium/nodiagonal,
+/area/ship/engineering/engine)
 "FA" = (
-/obj/effect/turf_decal/corner/transparent/neutral{
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
 	dir = 1
 	},
-/obj/effect/turf_decal/corner/transparent/lime{
-	dir = 8
+/turf/open/floor/wood,
+/area/ship/crew)
+"FF" = (
+/obj/effect/spawner/structure/window/shuttle,
+/turf/open/floor/plating,
+/area/ship/cargo/hangar)
+"FL" = (
+/obj/machinery/blackbox_recorder,
+/obj/structure/window/reinforced/spawner/north,
+/turf/open/floor/circuit/telecomms/mainframe,
+/area/ship/engineering/communications)
+"FN" = (
+/obj/machinery/telecomms/processor/preset_two{
+	network = "ntsv_commnet"
 	},
-/obj/effect/turf_decal/corner/transparent/neutral,
-/obj/structure/cable{
-	icon_state = "1-4"
+/turf/open/floor/circuit/green/telecomms/mainframe,
+/area/ship/engineering/communications)
+"FQ" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+	dir = 1
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
 	dir = 5
 	},
+/obj/machinery/light/small/directional/west{
+	bulb_colour = "#d5fcff"
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/cargo/hangar)
+"Gb" = (
+/obj/structure/sink{
+	dir = 8;
+	pixel_x = 11
+	},
+/obj/structure/mirror{
+	pixel_x = 28
+	},
 /turf/open/floor/plasteel,
 /area/ship/crew)
-"FF" = (
-/obj/effect/turf_decal/industrial/caution{
-	dir = 8
+"Gg" = (
+/obj/effect/turf_decal/industrial/warning,
+/obj/effect/turf_decal/industrial/warning{
+	dir = 1
 	},
-/obj/machinery/light/small{
-	dir = 1;
-	pixel_y = 28
+/obj/machinery/door/poddoor{
+	id = "tegus_port_cargo"
 	},
-/turf/open/floor/engine/hull,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plating,
 /area/ship/cargo)
-"FL" = (
-/obj/effect/turf_decal/corner/transparent/ntblue{
-	dir = 4
-	},
-/obj/effect/turf_decal/corner/transparent/neutral{
-	dir = 2
+"Gj" = (
+/turf/closed/wall/mineral/titanium/nodiagonal,
+/area/ship/crew)
+"Gx" = (
+/obj/structure/cable{
+	icon_state = "2-4"
 	},
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
+/obj/effect/turf_decal/siding/thinplating/corner{
 	dir = 1
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+/obj/effect/turf_decal/trimline/opaque/white/corner{
 	dir = 1
 	},
-/turf/open/floor/plasteel/dark,
-/area/ship/engineering/communications)
-"FN" = (
-/obj/machinery/light/floor,
-/obj/effect/turf_decal/industrial/warning,
-/obj/structure/cable{
-	icon_state = "1-4"
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel,
+/area/ship/hallway/central)
+"GF" = (
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/machinery/advanced_airlock_controller{
+	pixel_x = 32
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
-	dir = 8
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2{
+	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
-	dir = 8
-	},
-/turf/open/floor/plasteel/patterned/cargo_one,
-/area/ship/cargo)
-"FQ" = (
-/obj/machinery/light{
-	pixel_y = -32
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2,
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/turf/open/floor/plasteel,
-/area/ship/hallway/central)
-"Gb" = (
-/obj/effect/turf_decal/corner/transparent/solgovgold{
-	dir = 1
-	},
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/structure/cable{
-	icon_state = "1-8"
-	},
-/turf/open/floor/plasteel/dark,
-/area/ship/maintenance/starboard)
-"Gg" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
-	dir = 10
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
-	dir = 10
-	},
-/turf/open/floor/plasteel/patterned,
-/area/ship/cargo)
-"Gj" = (
-/turf/closed/wall/mineral/titanium/nodiagonal,
-/area/ship/crew)
-"Gx" = (
-/obj/structure/cable{
-	icon_state = "0-8"
-	},
-/obj/effect/turf_decal/corner/transparent/neutral/three_quarters{
-	dir = 1
-	},
-/obj/machinery/power/apc/auto_name/directional/east,
-/turf/open/floor/plasteel/dark,
-/area/ship/hallway/central)
-"GF" = (
-/obj/structure/catwalk/over/plated_catwalk,
-/obj/machinery/advanced_airlock_controller{
-	pixel_x = 32
-	},
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4{
-	dir = 4
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4{
+	dir = 4
 	},
 /turf/open/floor/plating,
 /area/ship/hallway/central)
@@ -2911,11 +2753,20 @@
 /turf/open/floor/plasteel,
 /area/ship/cargo)
 "GU" = (
-/obj/machinery/atmospherics/pipe/simple/brown/hidden/layer2{
+/obj/machinery/power/terminal{
 	dir = 8
 	},
-/turf/closed/wall/mineral/titanium/nodiagonal,
-/area/ship/hallway/aft)
+/obj/machinery/atmospherics/pipe/simple/brown/visible/layer2{
+	dir = 6
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/light/small/directional/north,
+/obj/effect/turf_decal/industrial/warning{
+	dir = 4
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/engineering/engine)
 "Hc" = (
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
 	dir = 8
@@ -2923,224 +2774,236 @@
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
 "Hk" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/plasteel,
-/area/ship/hallway/aft)
+/obj/machinery/telecomms/relay/preset/auto{
+	network = "ntsv_commnet";
+	id = "Tegus Relay"
+	},
+/turf/open/floor/circuit/telecomms/mainframe,
+/area/ship/engineering/communications)
 "Hl" = (
-/obj/effect/turf_decal/industrial/caution{
-	dir = 8
+/obj/effect/turf_decal/industrial/traffic{
+	dir = 4
 	},
-/obj/machinery/light/small{
-	pixel_y = -28
+/obj/machinery/light/directional/east,
+/obj/structure/cable{
+	icon_state = "1-2"
 	},
-/turf/open/floor/engine/hull,
+/turf/open/floor/plasteel/patterned/ridged,
 /area/ship/cargo)
 "Ht" = (
-/obj/effect/turf_decal/corner/transparent/lime{
-	dir = 8
-	},
-/obj/effect/turf_decal/corner/transparent/neutral,
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
-	dir = 8
-	},
-/turf/open/floor/plasteel,
+/obj/structure/bed/pod,
+/obj/structure/curtain/cloth/grey,
+/obj/item/bedsheet/dorms,
+/turf/open/floor/wood,
 /area/ship/crew)
 "Hw" = (
-/turf/closed/wall/mineral/titanium/nodiagonal,
-/area/ship/cargo)
-"HM" = (
-/obj/effect/turf_decal/corner/transparent/lime,
-/obj/effect/turf_decal/corner/transparent/neutral{
-	dir = 8
-	},
-/obj/structure/extinguisher_cabinet{
-	pixel_x = -28;
-	dir = 8
-	},
-/turf/open/floor/plasteel,
-/area/ship/hallway/central)
-"HP" = (
-/obj/structure/table,
-/obj/item/clipboard{
-	pixel_y = 3;
-	pixel_x = 13
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 9
 	},
-/obj/item/flashlight/lamp{
-	pixel_y = 3;
-	pixel_x = -4
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 9
 	},
-/turf/open/floor/plasteel/patterned/ridged,
-/area/ship/cargo)
-"HY" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/firealarm{
-	dir = 8;
-	pixel_x = -32
+/turf/open/floor/plasteel/dark,
+/area/ship/cargo/hangar)
+"HM" = (
+/obj/effect/turf_decal/industrial/warning{
+	dir = 8
 	},
-/obj/structure/filingcabinet/double,
-/obj/effect/turf_decal/spline/fancy/opaque/grey{
+/obj/effect/turf_decal/industrial/warning{
 	dir = 4
 	},
-/obj/effect/turf_decal/industrial/hatch/yellow,
-/obj/effect/turf_decal/industrial/warning/corner{
+/obj/machinery/door/poddoor{
+	id = "tegus_shuttle_door";
 	dir = 4
 	},
-/obj/structure/railing{
-	dir = 4
+/turf/open/floor/plating,
+/area/ship/cargo/hangar)
+"HP" = (
+/obj/machinery/door/airlock/engineering{
+	req_access_txt = "61";
+	name = "Communications"
 	},
-/turf/open/floor/plasteel/patterned/ridged,
-/area/ship/hallway/aft)
-"Ia" = (
-/obj/effect/turf_decal/spline/fancy/opaque/black{
+/obj/machinery/door/firedoor/border_only{
 	dir = 1
 	},
-/obj/machinery/conveyor{
-	dir = 8;
-	id = "tegusbelt"
+/obj/machinery/door/firedoor/border_only,
+/obj/structure/cable{
+	icon_state = "1-2"
 	},
-/obj/structure/railing/corner{
-	dir = 8;
-	layer = 4.1
+/turf/open/floor/plasteel/dark,
+/area/ship/engineering/communications)
+"HY" = (
+/obj/machinery/power/terminal{
+	dir = 8
 	},
-/turf/open/floor/plasteel/tech/grid,
-/area/ship/cargo)
-"Iv" = (
-/obj/effect/turf_decal/corner/transparent/ntblue,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/turf_decal/industrial/warning{
 	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2{
+/obj/effect/turf_decal/steeldecal/steel_decals_central7,
+/turf/open/floor/plasteel/dark,
+/area/ship/engineering/engine)
+"Ia" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 10
+	},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4{
 	dir = 1
 	},
+/obj/structure/cable{
+	icon_state = "2-8"
+	},
+/turf/open/floor/plasteel,
+/area/ship/cargo/hangar)
+"Iv" = (
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4,
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 4
+	},
+/obj/effect/turf_decal/siding/thinplating,
+/obj/effect/turf_decal/trimline/opaque/white/line,
+/obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/plasteel,
 /area/ship/hallway/central)
 "Iw" = (
-/obj/structure/railing{
-	dir = 4
-	},
-/obj/effect/turf_decal/corner/transparent/lime{
-	dir = 8
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
+/obj/structure/cable{
+	icon_state = "1-2"
 	},
-/turf/open/floor/plasteel/dark,
+/turf/open/floor/plasteel,
 /area/ship/crew/canteen)
 "IF" = (
 /obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/turf_decal/corner/transparent/solgovgold{
-	dir = 4
-	},
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
-	dir = 4
+/obj/machinery/power/apc/auto_name/directional/west,
+/obj/structure/cable{
+	icon_state = "0-4"
 	},
-/turf/open/floor/plasteel/patterned,
-/area/ship/hallway/aft)
+/turf/open/floor/plasteel,
+/area/ship/engineering/engine)
 "IU" = (
+/obj/effect/turf_decal/industrial/warning,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
-	dir = 4
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 8
 	},
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/obj/effect/turf_decal/industrial/warning,
-/obj/machinery/light/floor,
-/turf/open/floor/plasteel/patterned/cargo_one,
-/area/ship/cargo)
+/turf/open/floor/plasteel,
+/area/ship/cargo/hangar)
 "Jr" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/structure/cable{
-	icon_state = "2-8"
+/obj/structure/catwalk/over/plated_catwalk/white{
+	color = "#4c535b"
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
-	dir = 10
+	dir = 9
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
-	dir = 10
-	},
-/obj/structure/extinguisher_cabinet{
-	pixel_x = 28;
-	dir = 4
+	dir = 9
 	},
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/plasteel,
-/area/ship/hallway/aft)
+/turf/open/floor/plating,
+/area/ship/engineering/engine)
 "JO" = (
-/obj/effect/turf_decal/corner/transparent/brown{
-	dir = 1
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
+/obj/structure/closet/emcloset/wall{
+	dir = 8;
+	pixel_x = 28
 	},
 /turf/open/floor/plasteel,
 /area/ship/hallway/central)
 "JR" = (
-/turf/open/floor/plasteel/patterned,
-/area/ship/cargo)
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel,
+/area/ship/cargo/hangar)
 "JS" = (
 /obj/structure/sign/nanotrasen,
 /turf/closed/wall/mineral/titanium/nodiagonal,
 /area/ship/crew)
 "JY" = (
-/obj/effect/spawner/structure/window/shuttle,
-/obj/structure/curtain/cloth/grey,
-/turf/open/floor/plating,
+/obj/machinery/door/airlock/glass{
+	name = "Canteen"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/door/firedoor/border_only,
+/obj/machinery/door/firedoor/border_only{
+	dir = 1
+	},
+/turf/open/floor/plasteel,
 /area/ship/crew/canteen)
 "Kc" = (
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4{
-	dir = 1
+/obj/machinery/light{
+	dir = 1;
+	pixel_y = 32
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2{
 	dir = 1
 	},
-/obj/machinery/firealarm{
-	pixel_y = 32;
+/obj/effect/turf_decal/siding/thinplating{
+	dir = 1
+	},
+/obj/effect/turf_decal/trimline/opaque/white/line{
 	dir = 1
 	},
 /turf/open/floor/plasteel,
 /area/ship/hallway/central)
 "Kj" = (
-/obj/effect/decal/cleanable/oil/slippery,
-/obj/effect/turf_decal/spline/fancy/opaque/black,
-/obj/item/caution{
-	pixel_y = 12;
-	pixel_x = 14
-	},
 /obj/structure/railing{
-	layer = 4.1
+	dir = 8;
+	pixel_x = -1
 	},
-/turf/open/floor/plasteel/tech,
-/area/ship/cargo)
+/obj/machinery/conveyor/inverted{
+	dir = 5;
+	id = "tegusbelt"
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/cargo/hangar)
 "Ku" = (
-/turf/closed/wall/mineral/titanium,
-/area/ship/maintenance/port)
-"Ky" = (
-/obj/machinery/power/smes/engineering,
-/obj/structure/railing{
-	pixel_y = -8
+/obj/structure/chair/office{
+	dir = 4
 	},
-/obj/structure/cable{
-	icon_state = "0-8"
+/obj/effect/turf_decal/industrial/warning/corner{
+	dir = 1
 	},
-/turf/open/floor/plasteel/tech/grid,
-/area/ship/maintenance/starboard)
-"KI" = (
-/obj/structure/cable{
-	icon_state = "2-8"
+/turf/open/floor/plasteel/dark,
+/area/ship/cargo)
+"Ky" = (
+/obj/machinery/mineral/unloading_machine{
+	output_dir = 1
 	},
+/turf/open/floor/plasteel/dark,
+/area/ship/cargo/hangar)
+"KI" = (
+/obj/effect/turf_decal/siding/thinplating,
+/obj/effect/turf_decal/trimline/opaque/white/line,
+/obj/effect/decal/cleanable/dirt/dust,
 /obj/structure/cable{
-	icon_state = "1-8"
+	icon_state = "4-8"
 	},
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4{
-	dir = 4
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 8
 	},
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2{
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
 	dir = 4
 	},
-/turf/open/floor/plasteel/patterned,
+/turf/open/floor/plasteel,
 /area/ship/hallway/central)
 "KR" = (
 /obj/structure/closet/secure_closet/wall{
@@ -3170,44 +3033,41 @@
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
 "Lq" = (
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4{
+	dir = 4
+	},
+/obj/machinery/light/directional/east,
+/turf/open/floor/plasteel/stairs{
+	dir = 1
+	},
+/area/ship/engineering/engine)
+"Ls" = (
 /obj/effect/turf_decal/industrial/warning{
 	dir = 1
 	},
 /obj/effect/turf_decal/industrial/warning,
-/obj/machinery/door/poddoor{
-	id = "tegus_starboard_cargo"
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 6
 	},
-/turf/open/floor/plating,
-/area/ship/cargo)
-"Ls" = (
-/obj/structure/rack,
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/item/stack/sheet/mineral/uranium/five,
-/turf/open/floor/plasteel/tech,
-/area/ship/maintenance/starboard)
-"Lw" = (
-/obj/structure/cable{
-	icon_state = "4-8"
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 5
 	},
+/turf/open/floor/plasteel/dark,
+/area/ship/crew)
+"Lw" = (
 /obj/effect/turf_decal/industrial/warning,
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4,
-/obj/structure/table/reinforced,
-/obj/machinery/button/shieldwallgen{
-	id = "cargo_shield_fore";
-	pixel_y = 2;
-	name = "Shuttle Bay Holofield";
-	pixel_x = 6;
-	dir = 1
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 8
 	},
-/obj/machinery/button/door{
-	pixel_x = -6;
-	id = "tegus_shuttle_door";
-	name = "Shuttle Bay Blast Door";
-	dir = 1;
-	pixel_y = 2
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 8
 	},
-/turf/open/floor/plasteel/patterned/ridged,
-/area/ship/cargo)
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/turf/open/floor/plasteel,
+/area/ship/cargo/hangar)
 "LC" = (
 /obj/effect/turf_decal/industrial/warning,
 /obj/effect/turf_decal/industrial/warning{
@@ -3219,9 +3079,21 @@
 /turf/open/floor/plating,
 /area/ship/cargo)
 "LF" = (
-/obj/structure/tank_dispenser,
-/turf/open/floor/plasteel/patterned/ridged,
-/area/ship/hallway/central)
+/obj/effect/turf_decal/corner/transparent/neutral{
+	dir = 4
+	},
+/obj/structure/bed/dogbed{
+	name = "Atlas's Bed";
+	desc = "A comfy-looking tegu bed. You can even strap your pet in, in case the gravity turns off.";
+	anchored = 1
+	},
+/mob/living/simple_animal/hostile/retaliate/tegu/atlas{
+	dir = 4;
+	faction = list("neutral");
+	environment_smash = 0
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/bridge)
 "LV" = (
 /obj/machinery/door/airlock/external,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
@@ -3235,53 +3107,62 @@
 /turf/open/floor/plasteel,
 /area/ship/hallway/central)
 "Me" = (
-/obj/effect/turf_decal/corner/transparent/neutral{
-	dir = 8
+/obj/structure/table,
+/obj/item/storage/box/lights/mixed{
+	pixel_y = 8;
+	pixel_x = 6
 	},
-/turf/open/floor/plasteel/dark,
-/area/ship/cargo)
+/obj/item/hand_labeler{
+	pixel_x = -4
+	},
+/turf/open/floor/plasteel,
+/area/ship/cargo/hangar)
 "Mi" = (
-/obj/effect/turf_decal/ntspaceworks_big/two,
+/obj/structure/cable{
+	icon_state = "0-1"
+	},
+/obj/machinery/door/poddoor{
+	id = "tegus_starboard_cargo"
+	},
+/obj/effect/turf_decal/industrial/warning{
+	dir = 1
+	},
+/obj/effect/turf_decal/industrial/warning,
+/obj/machinery/power/shieldwallgen/atmos/roundstart{
+	dir = 8;
+	id = "cargo_shield_starboard"
+	},
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plating,
 /area/ship/cargo)
 "Ml" = (
-/obj/effect/turf_decal/industrial/warning{
+/obj/effect/turf_decal/industrial/loading{
 	dir = 4
 	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2{
+	dir = 1
+	},
 /obj/structure/cable{
-	icon_state = "1-2"
+	icon_state = "4-8"
 	},
 /obj/structure/cable{
 	icon_state = "1-8"
 	},
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4{
-	dir = 4
-	},
-/turf/open/floor/plasteel,
+/turf/open/floor/plasteel/patterned/ridged,
 /area/ship/cargo)
 "Mx" = (
-/obj/machinery/button/door{
-	pixel_x = -5;
-	pixel_y = -27;
-	id = "tegus_starboard_cargo";
-	name = "Cargo Blast Door";
-	dir = 1
-	},
-/obj/machinery/button/shieldwallgen{
-	pixel_x = 5;
-	pixel_y = -27;
-	id = "cargo_shield_starboard";
-	dir = 1;
-	name = "Cargo Holofield"
+/obj/effect/turf_decal/industrial/warning{
+	dir = 4
 	},
-/obj/structure/cable{
-	icon_state = "4-8"
+/obj/effect/turf_decal/ntspaceworks_big/one{
+	dir = 8
 	},
 /turf/open/floor/plasteel/patterned,
-/area/ship/cargo)
+/area/ship/cargo/hangar)
 "MH" = (
 /obj/structure/table/reinforced,
 /obj/machinery/computer/secure_data/laptop{
@@ -3290,155 +3171,161 @@
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
 "ML" = (
-/obj/structure/closet/secure_closet/miningcloset{
-	req_access_txt = "48"
-	},
-/obj/item/flashlight/seclite,
-/obj/item/storage/bag/ore,
-/obj/item/kitchen/knife/combat/survival,
-/obj/item/gun/energy/kinetic_accelerator,
-/obj/item/stack/marker_beacon/thirty,
-/obj/item/gps/mining,
-/obj/item/storage/backpack/satchel/explorer,
-/obj/item/clothing/glasses/meson/prescription,
-/obj/item/clothing/glasses/meson,
-/obj/item/t_scanner/adv_mining_scanner/lesser,
-/obj/machinery/door/window/eastright{
-	dir = 1
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable{
+	icon_state = "1-2"
 	},
-/obj/structure/window/reinforced/spawner/west,
-/turf/open/floor/plasteel/tech/grid,
+/turf/open/floor/plasteel,
 /area/ship/cargo)
 "MP" = (
-/obj/structure/cable{
-	icon_state = "4-8"
+/obj/effect/turf_decal/industrial/warning{
+	dir = 8
 	},
-/obj/machinery/light{
-	dir = 1;
-	pixel_y = 32
+/obj/effect/turf_decal/industrial/warning{
+	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+/obj/machinery/power/shieldwallgen/atmos/roundstart{
+	dir = 2;
+	id = "cargo_shield_fore"
+	},
+/obj/structure/cable{
+	icon_state = "0-1"
+	},
+/obj/machinery/door/poddoor{
+	id = "tegus_shuttle_door";
 	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2{
+/turf/open/floor/plating,
+/area/ship/cargo/hangar)
+"MS" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
+/obj/effect/turf_decal/siding/thinplating/corner{
+	dir = 1
+	},
+/obj/effect/turf_decal/trimline/opaque/white/corner{
 	dir = 1
 	},
 /turf/open/floor/plasteel,
 /area/ship/hallway/central)
-"MS" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
-/turf/open/floor/plasteel/patterned,
-/area/ship/hallway/central)
 "MU" = (
-/obj/effect/decal/cleanable/dirt/dust,
 /obj/structure/catwalk/over/plated_catwalk,
-/obj/structure/cable{
+/obj/structure/cable/yellow{
 	icon_state = "4-8"
 	},
+/obj/structure/cable/yellow{
+	icon_state = "1-4"
+	},
 /turf/open/floor/plating,
-/area/ship/hallway/aft)
+/area/ship/engineering/engine)
 "MY" = (
+/obj/machinery/power/port_gen/pacman/super,
+/obj/structure/window/reinforced/spawner/north,
+/obj/machinery/door/window/eastright,
+/obj/item/stack/sheet/mineral/uranium/five,
 /obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/power/apc/auto_name/directional/west,
-/obj/structure/cable{
+/obj/structure/cable/yellow{
 	icon_state = "0-4"
 	},
-/turf/open/floor/plasteel/patterned,
-/area/ship/hallway/aft)
+/turf/open/floor/plasteel/dark,
+/area/ship/engineering/engine)
 "Nb" = (
-/obj/machinery/power/terminal{
-	dir = 8
+/obj/machinery/door/airlock/external,
+/obj/structure/catwalk/over/plated_catwalk/white{
+	color = "#4c535b"
 	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
+/turf/open/floor/plating,
+/area/ship/engineering/engine)
+"Nc" = (
+/obj/structure/chair/sofa/left,
 /obj/effect/decal/cleanable/dirt/dust,
-/obj/structure/cable{
-	icon_state = "0-4"
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+	dir = 4
 	},
-/obj/machinery/firealarm{
-	pixel_y = 32;
-	dir = 1
+/obj/machinery/light/directional/north,
+/turf/open/floor/wood,
+/area/ship/crew)
+"Nw" = (
+/obj/machinery/button/door{
+	id = "tegus_starboard_engine";
+	name = "Engine Blast Door";
+	pixel_y = 27
 	},
-/turf/open/floor/plasteel/dark,
-/area/ship/maintenance/starboard)
-"Nc" = (
-/obj/effect/turf_decal/corner/transparent/lime{
+/obj/machinery/power/terminal{
 	dir = 8
 	},
-/obj/effect/turf_decal/corner/transparent/neutral{
-	dir = 1
-	},
-/obj/structure/cable{
-	icon_state = "2-4"
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
-	dir = 6
-	},
-/obj/machinery/airalarm/directional/north,
-/turf/open/floor/plasteel,
-/area/ship/crew)
-"Nw" = (
 /obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/turf_decal/corner/transparent/solgovgold{
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/turf_decal/industrial/warning{
 	dir = 4
 	},
+/turf/open/floor/plasteel/dark,
+/area/ship/engineering/engine)
+"Nx" = (
 /obj/effect/turf_decal/industrial/warning{
 	dir = 4
 	},
-/turf/open/floor/plasteel/patterned,
-/area/ship/hallway/aft)
-"Nx" = (
-/turf/closed/wall/mineral/titanium,
-/area/ship/cargo)
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 10
+	},
+/turf/open/floor/plasteel,
+/area/ship/cargo/hangar)
 "Nz" = (
-/obj/effect/turf_decal/corner/transparent/lime,
-/obj/effect/turf_decal/corner/transparent/neutral{
+/obj/effect/turf_decal/siding/thinplating/corner,
+/obj/effect/turf_decal/siding/thinplating/corner{
 	dir = 8
 	},
+/obj/effect/turf_decal/trimline/opaque/white/warning,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
-	dir = 1
-	},
 /turf/open/floor/plasteel,
 /area/ship/hallway/central)
 "NA" = (
-/turf/open/floor/plating,
-/area/ship/cargo)
+/turf/closed/wall,
+/area/ship/cargo/hangar)
 "NC" = (
-/obj/effect/turf_decal/ntspaceworks_big/one,
-/turf/open/floor/plating,
-/area/ship/cargo)
-"NL" = (
-/obj/effect/turf_decal/corner/transparent/neutral{
+/obj/effect/turf_decal/industrial/warning{
 	dir = 4
 	},
+/obj/effect/turf_decal/ntspaceworks_big/two{
+	dir = 8
+	},
+/turf/open/floor/plasteel/patterned,
+/area/ship/cargo/hangar)
+"NL" = (
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4{
-	dir = 1
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
 	dir = 8
 	},
+/obj/effect/turf_decal/trimline/opaque/white/corner{
+	dir = 4
+	},
+/obj/effect/turf_decal/siding/thinplating/corner{
+	dir = 4
+	},
 /turf/open/floor/plasteel,
 /area/ship/hallway/central)
 "NT" = (
-/obj/machinery/telecomms/receiver/preset_left{
-	network = "ntsv_commnet";
-	id = "Nanotrasen Receiver"
-	},
-/turf/open/floor/plasteel/tech/grid,
+/obj/machinery/door/window/southleft,
+/turf/open/floor/plasteel/telecomms_floor,
 /area/ship/engineering/communications)
 "NU" = (
-/obj/effect/turf_decal/corner/transparent/brown,
-/obj/effect/turf_decal/corner/transparent/neutral{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 5
+	},
+/obj/effect/turf_decal/siding/thinplating{
+	dir = 10
+	},
+/obj/effect/turf_decal/trimline/opaque/white/line{
 	dir = 10
 	},
 /turf/open/floor/plasteel,
@@ -3451,14 +3338,13 @@
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/bridge)
 "NZ" = (
-/obj/effect/turf_decal/industrial/warning{
-	dir = 1
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
-	dir = 8
+/obj/machinery/mineral/processing_unit_console{
+	machinedir = 8;
+	pixel_x = -30
 	},
-/turf/open/floor/plasteel/patterned,
-/area/ship/cargo)
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/dark,
+/area/ship/cargo/hangar)
 "Oo" = (
 /obj/effect/turf_decal/borderfloor/full,
 /obj/machinery/door/firedoor/border_only{
@@ -3489,17 +3375,20 @@
 /turf/open/floor/plating,
 /area/ship/hallway/central)
 "Ou" = (
-/obj/structure/catwalk/over/plated_catwalk,
+/obj/effect/turf_decal/siding/thinplating,
+/obj/effect/turf_decal/trimline/opaque/white/line,
+/obj/effect/decal/cleanable/dirt/dust,
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
 	dir = 8
 	},
+/obj/machinery/light/directional/south,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
-	dir = 8
+	dir = 4
 	},
-/turf/open/floor/plating,
+/turf/open/floor/plasteel,
 /area/ship/hallway/central)
 "Ow" = (
 /obj/machinery/holopad/emergency/command,
@@ -3510,38 +3399,68 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
 	dir = 8
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 4
+	},
+/obj/machinery/door/firedoor/border_only{
 	dir = 8
 	},
+/obj/machinery/door/airlock/mining/glass{
+	dir = 4;
+	name = "Cargo Bay"
+	},
 /turf/open/floor/plasteel,
-/area/ship/cargo)
+/area/ship/hallway/central)
 "OK" = (
-/obj/effect/turf_decal/corner/transparent/lime{
+/obj/machinery/door/airlock{
+	name = "Bathroom";
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 8
+	},
+/obj/machinery/door/firedoor/border_only{
 	dir = 4
 	},
-/obj/effect/turf_decal/corner/transparent/neutral,
-/obj/structure/table,
 /turf/open/floor/plasteel,
 /area/ship/crew)
 "OL" = (
 /turf/closed/wall/mineral/titanium/nodiagonal,
 /area/ship/crew/canteen)
 "OQ" = (
-/obj/machinery/suit_storage_unit/mining,
-/turf/open/floor/plasteel/tech/grid,
-/area/ship/cargo)
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 8
+	},
+/turf/open/floor/plasteel,
+/area/ship/cargo/hangar)
 "OW" = (
-/obj/structure/railing{
-	dir = 4
+/obj/machinery/power/terminal{
+	dir = 8
 	},
-/obj/effect/turf_decal/spline/fancy/opaque/grey{
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/turf_decal/industrial/warning{
 	dir = 4
 	},
-/turf/open/floor/plasteel/patterned,
-/area/ship/hallway/aft)
+/obj/effect/turf_decal/steeldecal/steel_decals_central7,
+/obj/machinery/atmospherics/components/binary/volume_pump/layer2{
+	name = "Scrubbers to External"
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/engineering/engine)
 "OX" = (
 /obj/effect/turf_decal/borderfloor/full,
 /obj/machinery/door/firedoor/border_only{
@@ -3556,246 +3475,247 @@
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/hallway/central)
 "Pb" = (
-/obj/effect/turf_decal/industrial/outline/yellow,
-/obj/machinery/light{
-	dir = 8;
-	pixel_x = -32
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable{
+	icon_state = "1-2"
 	},
-/turf/open/floor/plasteel/dark,
+/obj/machinery/button/shieldwallgen{
+	pixel_x = -27;
+	pixel_y = -5;
+	id = "cargo_shield_port";
+	name = "Cargo Holofield";
+	dir = 4
+	},
+/obj/machinery/button/door{
+	pixel_x = -27;
+	pixel_y = 5;
+	id = "tegus_port_cargo";
+	name = "Cargo Blast Door";
+	dir = 4
+	},
+/turf/open/floor/plasteel,
 /area/ship/cargo)
 "Pl" = (
-/obj/effect/turf_decal/corner/transparent/lime,
-/obj/effect/turf_decal/corner/transparent/neutral{
+/obj/structure/extinguisher_cabinet{
+	pixel_x = -28;
 	dir = 8
 	},
-/obj/structure/sign/poster/official/random{
-	pixel_y = -32
+/obj/effect/turf_decal/siding/thinplating{
+	dir = 10
+	},
+/obj/effect/turf_decal/trimline/opaque/white/line{
+	dir = 10
 	},
 /turf/open/floor/plasteel,
 /area/ship/hallway/central)
 "Pt" = (
-/obj/structure/catwalk/over/plated_catwalk,
-/obj/structure/cable{
-	icon_state = "1-2"
+/obj/machinery/door/airlock/engineering{
+	req_access_txt = "61";
+	name = "Communications"
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+/obj/machinery/door/firedoor/border_only{
 	dir = 1
 	},
-/turf/open/floor/plating,
-/area/ship/hallway/central)
+/obj/machinery/door/firedoor/border_only,
+/turf/open/floor/plasteel/dark,
+/area/ship/engineering/communications)
 "Pw" = (
-/obj/structure/sink{
-	pixel_y = 22
-	},
-/obj/structure/toilet{
-	pixel_y = 13
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/light/small/directional/east{
+	bulb_colour = "#d5fcff"
 	},
-/obj/machinery/light/small{
-	dir = 8;
-	pixel_x = -28
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+	dir = 8
 	},
-/turf/open/floor/plastic,
-/area/ship/crew/canteen)
+/turf/open/floor/plasteel/dark,
+/area/ship/cargo/hangar)
 "PF" = (
 /obj/effect/turf_decal/industrial/warning{
 	dir = 1
 	},
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/light/floor,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 8
+	},
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/turf/open/floor/plasteel/patterned,
-/area/ship/cargo)
+/turf/open/floor/plasteel,
+/area/ship/cargo/hangar)
 "PI" = (
-/obj/effect/turf_decal/corner/transparent/neutral{
-	dir = 10
+/obj/machinery/telecomms/server/presets/nanotrasen{
+	network = "ntsv_commnet"
 	},
-/obj/effect/turf_decal/industrial/warning,
-/turf/open/floor/plasteel/dark,
-/area/ship/cargo)
+/obj/structure/window/reinforced/spawner/north,
+/turf/open/floor/circuit/telecomms/mainframe,
+/area/ship/engineering/communications)
 "PQ" = (
-/obj/effect/turf_decal/corner/transparent/solgovgold{
+/obj/machinery/cryopod{
 	dir = 1
 	},
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/structure/cable/yellow{
-	icon_state = "1-4"
-	},
-/obj/machinery/light/small{
-	pixel_y = -28
-	},
-/turf/open/floor/plasteel/dark,
-/area/ship/maintenance/starboard)
+/turf/open/floor/plasteel/tech,
+/area/ship/crew)
 "Qa" = (
-/turf/closed/wall/mineral/titanium,
-/area/ship/maintenance/starboard)
+/obj/machinery/airalarm/directional/east,
+/turf/open/floor/plasteel/dark,
+/area/ship/engineering/communications)
 "Qq" = (
 /obj/effect/decal/cleanable/dirt/dust,
-/obj/structure/railing{
-	dir = 4
-	},
-/obj/effect/turf_decal/spline/fancy/opaque/grey{
-	dir = 4
+/turf/open/floor/plasteel,
+/area/ship/engineering/engine)
+"Qw" = (
+/obj/effect/spawner/structure/window/reinforced,
+/turf/open/floor/plating,
+/area/ship/cargo/hangar)
+"QA" = (
+/obj/structure/sign/poster/official/build{
+	pixel_y = -32
 	},
-/obj/effect/turf_decal/industrial/warning/corner{
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
-/area/ship/hallway/aft)
-"Qw" = (
 /obj/structure/cable{
-	icon_state = "1-4"
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
-	dir = 5
+	icon_state = "4-8"
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
-	dir = 5
+/turf/open/floor/plasteel,
+/area/ship/engineering/engine)
+"QZ" = (
+/obj/effect/spawner/structure/window/shuttle,
+/obj/machinery/door/poddoor/shutters/preopen{
+	id = "tegus_hangar_shutters"
 	},
-/obj/structure/catwalk/over/plated_catwalk,
 /turf/open/floor/plating,
-/area/ship/hallway/aft)
-"QA" = (
-/obj/structure/cable{
-	icon_state = "1-2"
+/area/ship/cargo/hangar)
+"Rp" = (
+/obj/effect/turf_decal/industrial/outline/yellow,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 8
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
-/obj/structure/catwalk/over/plated_catwalk,
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2{
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
 	dir = 4
 	},
-/turf/open/floor/plating,
-/area/ship/hallway/aft)
-"QZ" = (
-/obj/effect/turf_decal/corner/transparent/neutral{
-	dir = 5
-	},
-/obj/effect/turf_decal/industrial/warning{
-	dir = 1
+/obj/structure/cable{
+	icon_state = "4-8"
 	},
 /turf/open/floor/plasteel/dark,
 /area/ship/cargo)
-"Rp" = (
-/obj/effect/landmark/subship{
-	subship_template = /datum/map_template/shuttle/subshuttles/nanotrasen_tegus
-	},
-/turf/open/floor/plating,
-/area/ship/cargo)
 "Rv" = (
-/obj/machinery/telecomms/broadcaster/preset_left{
-	network = "ntsv_commnet";
-	id = "Nanotrasen Broadcaster"
-	},
-/obj/machinery/light{
-	dir = 8;
-	pixel_x = -32
+/obj/effect/turf_decal/trimline/opaque/white/line{
+	dir = 1
 	},
-/turf/open/floor/plasteel/tech/grid,
-/area/ship/engineering/communications)
+/turf/open/floor/plasteel,
+/area/ship/cargo/hangar)
 "Rx" = (
-/obj/effect/turf_decal/industrial/hatch/yellow,
-/obj/structure/ore_box,
-/turf/open/floor/plasteel/dark,
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel,
 /area/ship/cargo)
 "Ry" = (
-/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/layer4{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
-	dir = 8
-	},
-/obj/machinery/light/small{
-	dir = 8;
-	pixel_x = -28
+/obj/machinery/atmospherics/components/binary/pump/on/layer4{
+	name = "Air to Distro";
+	target_pressure = 1000
 	},
-/turf/open/floor/plasteel/patterned/ridged,
-/area/ship/hallway/central)
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/decal/cleanable/oil,
+/obj/machinery/airalarm/directional/east,
+/turf/open/floor/plasteel/dark,
+/area/ship/engineering/engine)
 "Rz" = (
-/turf/closed/wall/mineral/titanium/nodiagonal,
-/area/ship/hallway/aft)
+/obj/machinery/atmospherics/components/unary/outlet_injector/layer2{
+	dir = 4
+	},
+/turf/open/floor/engine/hull,
+/area/ship/engineering/engine)
 "RB" = (
-/turf/closed/wall/mineral/titanium/nodiagonal,
-/area/ship/maintenance/starboard)
+/obj/structure/tank_dispenser,
+/turf/open/floor/plasteel/dark,
+/area/ship/hallway/central)
 "RD" = (
-/obj/machinery/computer/cargo/express{
-	dir = 8
-	},
-/turf/open/floor/plasteel/tech/grid,
-/area/ship/bridge)
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
+/turf/open/floor/plasteel,
+/area/ship/cargo)
 "RF" = (
-/obj/machinery/light{
-	dir = 1;
-	pixel_y = 28
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 9
 	},
-/obj/effect/turf_decal/spline/fancy/opaque/black,
-/obj/structure/railing{
-	layer = 4.1
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2,
+/obj/structure/cable{
+	icon_state = "1-8"
 	},
-/turf/open/floor/plasteel/dark,
-/area/ship/cargo)
+/turf/open/floor/plasteel,
+/area/ship/cargo/hangar)
 "RI" = (
-/obj/structure/catwalk/over/plated_catwalk,
+/obj/machinery/door/airlock/grunge{
+	dir = 4;
+	name = "Starboard Control Room"
+	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
-	dir = 9
+	dir = 8
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
-	dir = 9
+	dir = 8
 	},
-/turf/open/floor/plating,
-/area/ship/cargo)
+/turf/open/floor/plasteel/dark,
+/area/ship/cargo/hangar)
 "RJ" = (
-/obj/structure/railing/corner{
-	layer = 4.1
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/decal/cleanable/cobweb/cobweb2,
+/obj/item/reagent_containers/glass/bucket{
+	pixel_x = 8
 	},
-/obj/effect/turf_decal/corner/transparent/solgovgold{
-	dir = 8
+/turf/open/floor/plating,
+/area/ship/engineering/engine)
+"RP" = (
+/obj/effect/turf_decal/industrial/warning{
+	dir = 1
 	},
 /obj/effect/decal/cleanable/dirt/dust,
-/obj/structure/cable{
-	icon_state = "0-2"
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 10
 	},
-/obj/machinery/power/apc/auto_name/directional/north,
-/turf/open/floor/plasteel/dark,
-/area/ship/maintenance/starboard)
-"RP" = (
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/obj/machinery/atmospherics/pipe/layer_manifold,
-/turf/closed/wall/mineral/titanium/nodiagonal,
-/area/ship/cargo)
+/turf/open/floor/plasteel,
+/area/ship/cargo/hangar)
 "RR" = (
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
-/obj/machinery/door/airlock/engineering{
-	name = "Engine Room"
-	},
-/obj/machinery/door/firedoor/border_only,
-/obj/machinery/door/firedoor/border_only{
-	dir = 1
+/obj/effect/turf_decal/industrial/loading{
+	dir = 8
 	},
-/turf/open/floor/plasteel/dark,
-/area/ship/hallway/aft)
-"RT" = (
-/obj/effect/turf_decal/industrial/warning{
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4{
 	dir = 1
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
-	dir = 8
+	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
-	dir = 8
+/obj/structure/cable{
+	icon_state = "4-8"
 	},
-/turf/open/floor/plasteel/patterned,
+/obj/structure/cable{
+	icon_state = "1-8"
+	},
+/turf/open/floor/plasteel/patterned/ridged,
 /area/ship/cargo)
+"RT" = (
+/obj/effect/turf_decal/industrial/hatch/yellow,
+/obj/structure/ore_box,
+/turf/open/floor/plasteel/dark,
+/area/ship/cargo/hangar)
 "Sa" = (
-/obj/effect/turf_decal/corner/transparent/lime{
-	dir = 4
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
+/obj/effect/turf_decal/siding/thinplating{
+	dir = 1
 	},
-/obj/effect/turf_decal/corner/transparent/neutral{
+/obj/effect/turf_decal/trimline/opaque/white/line{
 	dir = 1
 	},
 /turf/open/floor/plasteel,
@@ -3820,130 +3740,126 @@
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/hallway/central)
 "Sj" = (
-/obj/effect/turf_decal/industrial/traffic{
-	dir = 8
-	},
-/obj/effect/turf_decal/industrial/traffic{
-	dir = 4
-	},
-/turf/open/floor/plasteel/patterned/ridged,
-/area/ship/cargo)
+/obj/machinery/suit_storage_unit/mining,
+/obj/effect/turf_decal/corner/transparent/neutral,
+/turf/open/floor/plasteel/dark,
+/area/ship/cargo/hangar)
 "Sp" = (
-/turf/closed/wall/mineral/titanium/nodiagonal,
+/turf/closed/wall/r_wall,
 /area/ship/bridge)
 "Sz" = (
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4,
+/obj/machinery/light{
+	pixel_y = -32
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 4
+	},
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2,
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
+/obj/effect/turf_decal/siding/thinplating,
+/obj/effect/turf_decal/trimline/opaque/white/line,
 /turf/open/floor/plasteel,
 /area/ship/hallway/central)
 "SC" = (
-/obj/effect/turf_decal/corner/transparent/ntblue{
-	dir = 4
-	},
-/obj/structure/cable{
-	icon_state = "1-8"
-	},
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4,
+/obj/effect/turf_decal/siding/thinplating{
+	dir = 1
+	},
+/obj/effect/turf_decal/trimline/opaque/white/line{
+	dir = 1
+	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
 	dir = 8
 	},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4{
+	dir = 1
+	},
 /turf/open/floor/plasteel,
 /area/ship/hallway/central)
 "SI" = (
-/obj/machinery/conveyor{
-	dir = 1;
-	id = "tegusbelt"
+/obj/machinery/door/airlock/grunge{
+	dir = 4;
+	name = "Cryogenic Storage"
 	},
-/obj/machinery/mineral/unloading_machine{
-	input_dir = 4;
-	output_dir = 1
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 8
 	},
-/turf/open/floor/plasteel/tech/grid,
-/area/ship/cargo)
-"SN" = (
-/obj/effect/turf_decal/corner/transparent/lime{
-	dir = 4
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 8
 	},
-/obj/effect/turf_decal/corner/transparent/neutral{
-	dir = 1
+/obj/machinery/door/firedoor/border_only{
+	dir = 8
 	},
-/obj/machinery/firealarm{
-	dir = 8;
-	pixel_x = -32
+/obj/machinery/door/firedoor/border_only{
+	dir = 4
 	},
-/obj/structure/sign/poster/official/random{
-	pixel_y = 32
+/turf/open/floor/plasteel/dark,
+/area/ship/crew)
+"SN" = (
+/obj/structure/railing,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+	dir = 1
 	},
 /turf/open/floor/plasteel,
-/area/ship/hallway/central)
+/area/ship/cargo)
 "SS" = (
-/obj/item/kirbyplants{
-	icon_state = "plant-10";
-	pixel_y = 7
-	},
-/obj/structure/railing{
-	layer = 4.1
+/obj/machinery/power/port_gen/pacman/super,
+/obj/machinery/door/window/eastleft,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/cable/yellow{
+	icon_state = "0-4"
 	},
-/obj/effect/turf_decal/spline/fancy/opaque/grey,
-/turf/open/floor/plasteel/patterned,
-/area/ship/hallway/aft)
+/turf/open/floor/plasteel/dark,
+/area/ship/engineering/engine)
 "SW" = (
-/obj/structure/railing{
-	dir = 4
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/structure/cable{
-	icon_state = "1-4"
-	},
-/obj/structure/catwalk/over/plated_catwalk/dark,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/spider/stickyweb,
 /turf/open/floor/plating,
-/area/ship/maintenance/starboard)
+/area/ship/engineering/engine)
 "Tk" = (
-/obj/effect/turf_decal/industrial/warning{
-	dir = 1
-	},
-/obj/structure/noticeboard{
-	dir = 1;
-	pixel_y = -28
-	},
-/turf/open/floor/plasteel/patterned,
+/obj/structure/bed/pod,
+/obj/item/bedsheet/dorms,
+/obj/structure/curtain/cloth/grey,
+/turf/open/floor/wood,
 /area/ship/crew)
 "TB" = (
-/obj/structure/chair/sofa/left{
-	dir = 8
-	},
-/obj/effect/turf_decal/corner/transparent/lime{
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
 	dir = 8
 	},
-/obj/effect/turf_decal/corner/transparent/neutral,
-/turf/open/floor/plasteel/patterned,
+/turf/open/floor/plasteel,
 /area/ship/crew/canteen)
 "TH" = (
 /obj/structure/catwalk/over/plated_catwalk,
 /turf/open/floor/plating,
 /area/ship/hallway/central)
 "UD" = (
-/obj/structure/table/reinforced,
-/obj/effect/turf_decal/spline/fancy/opaque/grey,
-/obj/machinery/microwave{
-	pixel_y = 4
+/obj/machinery/newscaster/directional/east,
+/obj/machinery/power/apc/auto_name/directional/north,
+/obj/structure/cable{
+	icon_state = "0-2"
 	},
-/turf/open/floor/plasteel/dark,
+/turf/open/floor/plasteel,
 /area/ship/crew/canteen)
 "UM" = (
-/obj/machinery/airalarm/directional/east,
-/obj/effect/turf_decal/corner/transparent/neutral/three_quarters{
-	dir = 1
+/obj/structure/cable{
+	icon_state = "1-2"
 	},
-/turf/open/floor/plasteel/dark,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 1
+	},
+/obj/effect/turf_decal/siding/thinplating{
+	dir = 8
+	},
+/obj/effect/turf_decal/trimline/opaque/white/line{
+	dir = 8
+	},
+/turf/open/floor/plasteel,
 /area/ship/hallway/central)
 "UY" = (
 /obj/machinery/door/airlock/command{
@@ -3968,200 +3884,166 @@
 /turf/open/floor/plasteel,
 /area/ship/bridge)
 "Vd" = (
-/obj/machinery/light/small{
-	pixel_y = -28
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/simple/brown/visible/layer2,
-/obj/structure/catwalk/over/plated_catwalk/dark,
+/obj/structure/grille,
 /turf/open/floor/plating,
-/area/ship/maintenance/port)
+/area/ship/engineering/engine)
 "Vf" = (
-/obj/machinery/power/smes/shuttle/precharged{
-	dir = 4
-	},
-/obj/structure/window/reinforced/spawner/west,
-/obj/machinery/door/window/eastright,
-/obj/structure/cable{
-	icon_state = "0-8"
-	},
-/obj/machinery/door/poddoor{
-	id = "tegus_starboard_engine";
-	dir = 4
-	},
-/turf/open/floor/plating,
-/area/ship/maintenance/starboard)
+/obj/structure/table,
+/obj/item/clipboard,
+/turf/open/floor/plasteel/dark,
+/area/ship/cargo)
 "Vn" = (
-/obj/structure/cable{
-	icon_state = "2-4"
+/obj/effect/turf_decal/siding/thinplating{
+	dir = 1
 	},
-/obj/structure/cable{
-	icon_state = "1-2"
+/obj/effect/turf_decal/trimline/opaque/white/line{
+	dir = 1
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
-/turf/open/floor/plasteel/patterned/ridged,
+/turf/open/floor/plasteel,
 /area/ship/hallway/central)
 "Vs" = (
-/obj/structure/sink{
-	dir = 4;
-	pixel_x = -12;
-	pixel_y = 7
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+	dir = 8
 	},
-/obj/structure/mirror{
-	pixel_x = -25;
-	pixel_y = 7
+/obj/machinery/light/small/directional/east{
+	bulb_colour = "#d5fcff"
 	},
-/turf/open/floor/plastic,
-/area/ship/crew/canteen)
+/turf/open/floor/plasteel/dark,
+/area/ship/cargo/hangar)
 "Vv" = (
-/obj/effect/turf_decal/spline/fancy/opaque/black,
-/obj/effect/turf_decal/industrial/warning/corner,
-/obj/structure/railing{
-	layer = 4.1
+/obj/effect/turf_decal/industrial/warning{
+	dir = 4
 	},
-/turf/open/floor/plasteel/dark,
-/area/ship/cargo)
+/obj/effect/turf_decal/ntspaceworks_big/four{
+	dir = 8
+	},
+/turf/open/floor/plasteel/patterned,
+/area/ship/cargo/hangar)
 "Vy" = (
-/obj/machinery/firealarm{
-	dir = 4;
-	pixel_x = 32
+/obj/structure/cable{
+	icon_state = "2-8"
 	},
-/obj/structure/catwalk/over/plated_catwalk/dark,
-/turf/open/floor/plating,
+/turf/open/floor/plasteel/dark,
 /area/ship/engineering/communications)
 "VC" = (
-/obj/effect/turf_decal/industrial/warning{
+/obj/structure/chair{
 	dir = 8
 	},
-/obj/effect/turf_decal/industrial/warning{
-	dir = 4
-	},
-/obj/effect/turf_decal/industrial/caution{
-	dir = 4
-	},
-/obj/machinery/door/poddoor{
-	id = "tegus_shuttle_door";
-	dir = 4
-	},
-/turf/open/floor/plating,
-/area/ship/cargo)
+/obj/machinery/light/directional/east,
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/canteen)
 "VO" = (
-/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/layer4{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
-	dir = 4
-	},
-/obj/machinery/light/small{
-	dir = 8;
-	pixel_x = -28
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+	dir = 1
 	},
-/turf/open/floor/plasteel/patterned/ridged,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
+/turf/open/floor/plasteel,
 /area/ship/hallway/central)
 "VU" = (
-/obj/structure/cable{
-	icon_state = "2-8"
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4{
+	dir = 4
 	},
-/obj/structure/cable{
-	icon_state = "4-8"
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 10
 	},
-/turf/open/floor/plasteel/patterned/ridged,
-/area/ship/cargo)
+/turf/open/floor/plating,
+/area/ship/engineering/engine)
 "Wf" = (
-/obj/structure/table,
-/obj/item/paper_bin,
-/obj/item/pen,
-/turf/open/floor/plasteel/patterned,
-/area/ship/crew)
-"Wh" = (
-/obj/effect/turf_decal/industrial/warning{
-	dir = 1
-	},
-/obj/machinery/computer/cryopod{
-	pixel_y = -27
-	},
-/turf/open/floor/plasteel/patterned/ridged,
+/obj/machinery/washing_machine,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/dark,
 /area/ship/crew)
 "Wm" = (
-/obj/structure/cable{
-	icon_state = "2-8"
+/obj/effect/turf_decal/siding/thinplating{
+	dir = 1
 	},
-/obj/structure/cable{
-	icon_state = "1-2"
+/obj/effect/turf_decal/trimline/opaque/white/line{
+	dir = 1
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
-/obj/structure/catwalk/over/plated_catwalk/dark,
-/turf/open/floor/plating,
-/area/ship/maintenance/starboard)
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel,
+/area/ship/hallway/central)
 "Ww" = (
-/obj/effect/turf_decal/corner/transparent/neutral/three_quarters{
+/obj/effect/turf_decal/industrial/warning{
 	dir = 4
 	},
-/obj/effect/turf_decal/industrial/warning{
-	dir = 9
+/obj/effect/turf_decal/ntspaceworks_big/three{
+	dir = 8
 	},
-/obj/machinery/airalarm/directional/south,
-/turf/open/floor/plasteel/dark,
-/area/ship/cargo)
+/turf/open/floor/plasteel/patterned,
+/area/ship/cargo/hangar)
 "WO" = (
+/obj/machinery/door/airlock/engineering{
+	name = "Engine Room";
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 8
+	},
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
 	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+/obj/machinery/door/firedoor/border_only{
 	dir = 4
 	},
-/turf/open/floor/plasteel/patterned/ridged,
-/area/ship/hallway/central)
+/obj/machinery/door/firedoor/border_only{
+	dir = 8
+	},
+/turf/open/floor/plasteel,
+/area/ship/engineering/engine)
 "WR" = (
-/obj/machinery/atmospherics/pipe/simple/brown/hidden/layer2{
-	dir = 9
+/obj/effect/spawner/structure/window/shuttle,
+/obj/machinery/door/poddoor/shutters/preopen{
+	id = "tegus_canteen_shutters"
 	},
-/turf/closed/wall/mineral/titanium/nodiagonal,
-/area/ship/engineering/communications)
+/turf/open/floor/plating,
+/area/ship/crew/canteen)
 "WS" = (
-/obj/structure/railing/corner{
-	layer = 4.1
-	},
-/obj/machinery/mineral/processing_unit{
-	input_dir = 4;
-	output_dir = 8
-	},
-/obj/machinery/conveyor{
-	dir = 8;
-	id = "tegusbelt"
+/obj/effect/spawner/structure/window/shuttle,
+/obj/machinery/door/poddoor/shutters/preopen{
+	id = "tegus_crew_shutters"
 	},
-/turf/open/floor/plasteel/tech,
-/area/ship/cargo)
+/turf/open/floor/plating,
+/area/ship/crew)
 "WV" = (
-/obj/effect/turf_decal/corner/transparent/neutral{
-	dir = 4
+/obj/structure/cable{
+	icon_state = "0-2"
+	},
+/obj/machinery/door/poddoor{
+	id = "tegus_port_cargo"
 	},
+/obj/effect/turf_decal/industrial/warning,
 /obj/effect/turf_decal/industrial/warning{
 	dir = 1
 	},
-/turf/open/floor/plasteel/dark,
+/obj/machinery/power/shieldwallgen/atmos/roundstart{
+	dir = 8;
+	id = "cargo_shield_port"
+	},
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plating,
 /area/ship/cargo)
 "Xm" = (
 /obj/effect/turf_decal/industrial/outline/yellow,
 /obj/structure/closet/crate,
 /turf/open/floor/plasteel/dark,
 /area/ship/cargo)
-"Xy" = (
-/turf/open/floor/plasteel/stairs,
-/area/ship/cargo)
 "XC" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
-	dir = 1
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
+/obj/effect/turf_decal/siding/thinplating/corner{
+	dir = 8
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
-/turf/open/floor/plasteel/patterned,
+/obj/effect/turf_decal/trimline/opaque/white/corner{
+	dir = 8
+	},
+/turf/open/floor/plasteel,
 /area/ship/hallway/central)
 "XL" = (
 /obj/machinery/door/airlock/external,
@@ -4172,49 +4054,44 @@
 /turf/open/floor/plating,
 /area/ship/hallway/central)
 "XM" = (
-/turf/closed/wall/mineral/titanium,
-/area/ship/hallway/aft)
+/obj/effect/turf_decal/industrial/warning{
+	dir = 1
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/turf/open/floor/plasteel,
+/area/ship/cargo/hangar)
 "XQ" = (
-/obj/effect/turf_decal/corner/transparent/brown{
+/obj/effect/turf_decal/siding/thinplating/corner{
 	dir = 1
 	},
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
-/obj/structure/extinguisher_cabinet{
-	pixel_y = 28;
+/obj/effect/turf_decal/siding/thinplating/corner{
+	dir = 4
+	},
+/obj/effect/turf_decal/trimline/opaque/white/warning{
 	dir = 1
 	},
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
 /turf/open/floor/plasteel,
 /area/ship/hallway/central)
 "XS" = (
-/obj/machinery/firealarm{
-	dir = 8;
-	pixel_x = -32
-	},
-/obj/structure/catwalk/over/plated_catwalk/dark,
-/turf/open/floor/plating,
-/area/ship/engineering/communications)
+/turf/closed/wall/mineral/titanium,
+/area/ship/engineering/engine)
 "XV" = (
-/obj/machinery/telecomms/relay/preset/auto{
-	network = "ntsv_commnet";
-	id = "Tegus Relay"
-	},
-/turf/open/floor/plasteel/tech/grid,
+/obj/machinery/light/directional/south,
+/turf/open/floor/plasteel/telecomms_floor,
 /area/ship/engineering/communications)
 "Yk" = (
-/obj/structure/sign/poster/official/random{
-	pixel_y = 32;
-	layer = 2.8
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
-	dir = 6
-	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
-	dir = 10
+	dir = 4
 	},
 /obj/structure/cable{
-	icon_state = "2-4"
+	icon_state = "4-8"
 	},
-/turf/open/floor/plasteel/dark,
+/turf/open/floor/plasteel,
 /area/ship/crew/canteen)
 "Yl" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
@@ -4236,47 +4113,64 @@
 /turf/open/floor/plasteel,
 /area/ship/bridge)
 "Yt" = (
-/obj/effect/turf_decal/borderfloor/full,
-/obj/machinery/door/firedoor/border_only{
-	dir = 4
-	},
-/obj/machinery/door/firedoor/border_only{
-	dir = 8
-	},
 /obj/structure/sign/poster/official/random{
 	pixel_y = -32
 	},
-/turf/open/floor/plasteel/tech/grid,
+/obj/effect/turf_decal/siding/thinplating,
+/obj/effect/turf_decal/trimline/opaque/white/line,
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel,
 /area/ship/hallway/central)
 "YT" = (
-/obj/machinery/portable_atmospherics/scrubber,
-/obj/machinery/atmospherics/components/unary/portables_connector/layer2,
-/obj/machinery/button/door{
-	pixel_x = -27;
-	dir = 4;
-	id = "tegus_port_engine";
-	name = "Engine Blast Door"
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 4
 	},
-/turf/open/floor/plasteel/tech,
-/area/ship/maintenance/port)
-"YV" = (
-/obj/machinery/light{
-	pixel_y = -32
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 8
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 4
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 8
 	},
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/turf/open/floor/plasteel/patterned/ridged,
-/area/ship/cargo)
+/obj/machinery/door/airlock/mining/glass{
+	dir = 4;
+	name = "Hangar"
+	},
+/turf/open/floor/plasteel,
+/area/ship/cargo/hangar)
+"YV" = (
+/obj/machinery/computer/telecomms/server{
+	dir = 8;
+	network = "ntsv_commnet"
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/telecomms_floor,
+/area/ship/cargo/hangar)
 "YZ" = (
+/obj/effect/turf_decal/siding/thinplating/corner,
+/obj/effect/turf_decal/siding/thinplating/corner{
+	dir = 8
+	},
+/obj/effect/turf_decal/trimline/opaque/white/warning,
+/obj/effect/decal/cleanable/dirt/dust,
 /obj/structure/cable{
-	icon_state = "4-8"
+	icon_state = "1-4"
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
 	dir = 8
 	},
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2,
-/turf/open/floor/plasteel/patterned/ridged,
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 4
+	},
+/turf/open/floor/plasteel,
 /area/ship/hallway/central)
 "Zl" = (
 /obj/structure/filingcabinet/double,
@@ -4286,23 +4180,14 @@
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
 "Zp" = (
-/obj/machinery/conveyor{
-	dir = 8;
-	id = "tegusbelt"
-	},
-/obj/structure/railing{
-	layer = 4.1
-	},
-/obj/effect/turf_decal/spline/fancy/opaque/black{
+/obj/structure/chair/office{
 	dir = 1
 	},
-/obj/machinery/mineral/processing_unit_console{
-	machinedir = 8;
-	pixel_x = -30;
-	pixel_y = 28
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 8
 	},
-/turf/open/floor/plasteel/tech/grid,
-/area/ship/cargo)
+/turf/open/floor/plasteel/dark,
+/area/ship/cargo/hangar)
 "Zs" = (
 /obj/machinery/atmospherics/pipe/layer_manifold{
 	dir = 4
@@ -4310,24 +4195,18 @@
 /turf/closed/wall/mineral/titanium/nodiagonal,
 /area/ship/crew)
 "Zw" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
-	dir = 9
+/obj/machinery/atmospherics/components/unary/tank/air{
+	piping_layer = 4
 	},
-/turf/open/floor/plasteel/patterned,
-/area/ship/cargo)
-"ZY" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/effect/decal/cleanable/dirt/dust,
-/obj/structure/table,
-/obj/machinery/light{
-	dir = 4;
-	pixel_x = 32
-	},
-/obj/item/toy/cards/deck/tarot{
-	pixel_y = 4
-	},
-/turf/open/floor/plasteel,
-/area/ship/hallway/aft)
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/dark,
+/area/ship/engineering/engine)
+"ZY" = (
+/turf/open/floor/plasteel/stairs,
+/area/ship/engineering/engine)
 
 (1,1,1) = {"
 ut
@@ -4336,17 +4215,17 @@ ut
 ut
 ut
 ut
-li
-XM
-Rz
-Rz
-Rz
-Rz
-Rz
-Rz
-Rz
+ui
+ui
+ui
 Rz
-XM
+XS
+xZ
+xZ
+XS
+qN
+ui
+ui
 ui
 ut
 ut
@@ -4358,36 +4237,36 @@ ut
 (2,1,1) = {"
 ut
 ut
-db
-bb
-bb
-bb
-GU
-Rz
+ut
+ut
+ut
+xZ
+CT
+CT
 CT
 Fy
-kg
+xZ
 SS
 MY
-Hk
-nn
+xZ
+xZ
 ht
-Rz
-Rz
-bl
-bl
-bl
-RB
+ht
+ht
+xZ
+ut
+ut
+ut
 ut
 ut
 "}
 (3,1,1) = {"
 ut
-Ku
-db
-cK
-cK
-cK
+ut
+ut
+xZ
+xZ
+xZ
 GU
 OW
 BP
@@ -4396,51 +4275,51 @@ Qq
 cO
 MU
 IF
-qi
+xZ
 Nw
 HY
-Rz
-Vf
-Vf
-Vf
-RB
-Qa
+zH
+xZ
+xZ
+xZ
+ut
+ut
 ut
 "}
 (4,1,1) = {"
 ut
-db
-YT
+ut
+ut
 eN
 rs
-js
-GU
+Nb
+sb
 jq
 CO
-pg
+xZ
 vy
 eZ
 hh
 QA
-zH
+xZ
 wb
-Qw
-Rz
+zr
+jq
 Nb
 pH
-Em
-yL
-RB
+eN
+ut
+ut
 ut
 "}
 (5,1,1) = {"
 ut
-db
-rZ
-cP
-lb
-qD
-vE
+ut
+xZ
+xZ
+xZ
+xZ
+xZ
 sC
 Ay
 qF
@@ -4451,89 +4330,89 @@ rc
 ZY
 zr
 Jr
-RR
-Wm
-mu
-Gb
 xZ
-RB
+xZ
+xZ
+xZ
+xZ
+ut
 ut
 "}
 (6,1,1) = {"
 ut
-db
-DF
+ut
+xZ
 qd
 vO
 Vd
-WR
-hL
-hL
-hL
-hL
-lW
+xZ
+Zw
+Ry
+Lq
+VU
+iV
 qS
-hL
-hL
-hL
-hL
-hL
+Cb
+AB
+Jr
+hi
+xZ
 eq
 yg
 kM
-pC
-RB
+xZ
+ut
 ut
 "}
 (7,1,1) = {"
 ut
-Ku
-db
+ut
+xZ
 iM
 xc
 uO
 hL
-eW
-Rv
-uc
-hL
+jQ
+jQ
+jQ
+jQ
 Cz
 WO
-hL
-XS
 jQ
-iV
+jQ
+jQ
+jQ
 hL
 RJ
 SW
 wv
-RB
-Qa
+xZ
+ut
 ut
 "}
 (8,1,1) = {"
 ut
 ut
-OL
-OL
-OL
-OL
+xZ
+zR
+db
+Az
 hL
 ye
 Bk
 iJ
-CQ
-Fk
+hL
+Vn
 oW
-Ag
+hL
 dY
 FL
 ES
 hL
-Bn
-Ky
-yI
-RB
+Gj
+Gj
+Gj
+Gj
 ut
 ut
 "}
@@ -4541,17 +4420,17 @@ ut
 ut
 ut
 OL
-Pw
-Vs
-jb
+OL
+OL
+OL
 hL
 tU
 NT
 Vy
-hL
+HP
 XQ
 YZ
-hL
+Pt
 rD
 Ao
 XV
@@ -4559,7 +4438,7 @@ hL
 cR
 CD
 PQ
-RB
+Gj
 ut
 ut
 "}
@@ -4567,25 +4446,25 @@ ut
 ut
 ut
 OL
-OL
+cK
 nk
-OL
-hL
-hL
-hL
+qi
 hL
+FN
+yI
+dO
 hL
-JO
+Vn
 Ou
 hL
-hL
-hL
-hL
+Qa
+PI
+Hk
 hL
 iY
 Ls
 wc
-RB
+Gj
 ut
 ut
 "}
@@ -4596,20 +4475,20 @@ OL
 UD
 dP
 cY
-OL
-SN
-CH
-kE
-xG
+hL
+hL
+hL
+hL
+hL
 Vn
 KI
-Pt
-hW
-oq
-HM
-Gj
-Gj
+hL
+hL
+hL
+hL
+hL
 Gj
+SI
 Gj
 Gj
 ut
@@ -4619,18 +4498,18 @@ ut
 ut
 zu
 OL
-dR
+OL
 CX
 sF
-JY
-Sa
-eT
-fj
+OL
+dk
+cn
+kE
 Df
 Gx
 sf
 UM
-fj
+hW
 eT
 Pl
 Gj
@@ -4643,20 +4522,20 @@ ut
 "}
 (13,1,1) = {"
 ut
-OL
-OL
-OL
+WR
+oE
+BE
 Yk
 ju
-uf
-AB
+OL
+Vn
 nT
-Sp
-Sp
-Sp
-Sp
-Sp
-Sp
+fj
+Bh
+sH
+Em
+bb
+fj
 NL
 fx
 Gj
@@ -4664,12 +4543,12 @@ Nc
 xJ
 FA
 ws
-Gj
+WS
 ut
 "}
 (14,1,1) = {"
 ut
-OL
+WR
 yJ
 lQ
 fH
@@ -4678,10 +4557,10 @@ JY
 ua
 dF
 Sp
-bK
-MH
-oU
-Zl
+Sp
+Sp
+Sp
+Sp
 Sp
 ub
 Nz
@@ -4690,7 +4569,7 @@ dl
 mV
 Ht
 Tk
-Gj
+WS
 ut
 "}
 (15,1,1) = {"
@@ -4699,33 +4578,59 @@ OL
 sj
 Bx
 fU
-dk
-OL
+fU
+kg
 Sa
 Iv
-Yl
-ac
-pf
-vV
-wg
-UY
+Sp
+LF
+MH
+oU
+Zl
+Sp
 SC
 qE
 Gj
-mJ
+Gj
 OK
-nW
-Wh
+Gj
+Gj
 Gj
 ut
 "}
 (16,1,1) = {"
 ut
-OL
+WR
 xB
 TB
 Bv
 np
+kg
+Wm
+Bn
+Yl
+ac
+pf
+vV
+wg
+UY
+ma
+Yt
+Gj
+Wf
+hG
+uz
+kU
+Gj
+ut
+"}
+(17,1,1) = {"
+ut
+WR
+qK
+tf
+VC
+rr
 OL
 OX
 Oo
@@ -4736,16 +4641,16 @@ oi
 py
 Sp
 Sg
-Yt
+rZ
 Gj
-Wf
-hG
-uz
-kU
+Fk
+bu
+Gb
+zQ
 Gj
 ut
 "}
-(17,1,1) = {"
+(18,1,1) = {"
 ut
 lI
 OL
@@ -4771,51 +4676,51 @@ Gj
 Gj
 ut
 "}
-(18,1,1) = {"
+(19,1,1) = {"
 ut
 lW
-LF
-Ry
-zQ
+RB
+Dj
+mJ
 lW
-Ft
-Bh
-FQ
+it
+MS
+Sz
 Sp
 ud
 iR
 pf
 hd
 Sp
-MP
-Bh
-BG
+Kc
+XC
+NU
 lW
-zQ
-VO
-LF
+mJ
+DF
+RB
 lW
 ut
 "}
-(19,1,1) = {"
+(20,1,1) = {"
 jO
 kc
 TH
 dm
 Or
 LV
-it
-MS
-Sz
+Ag
+JO
+oc
 Sp
-RD
+dy
 NV
 gL
 Ev
 Sp
-Kc
-XC
-NU
+CI
+VO
+gK
 qf
 GF
 ff
@@ -4823,25 +4728,25 @@ TH
 XL
 ko
 "}
-(20,1,1) = {"
+(21,1,1) = {"
 ut
 iN
 lW
 lW
 lW
 lW
-Hw
-Hw
-oc
+Eg
+Eg
+yL
 Sp
-dy
-dy
-dy
-dy
+kH
+kH
+kH
+kH
 Sp
-CI
-Hw
-Hw
+Ox
+Eg
+Eg
 lW
 lW
 lW
@@ -4849,80 +4754,54 @@ lW
 iN
 ut
 "}
-(21,1,1) = {"
+(22,1,1) = {"
 ut
 ut
 ut
-Hw
-kH
-Pb
-Eg
-GQ
-Ox
-Xy
-kH
-QZ
-PI
-kH
-tf
-Ox
-GQ
-Eg
-zR
-kH
-Hw
-ut
-ut
-ut
-"}
-(22,1,1) = {"
 ut
 ut
-ut
-bz
-hi
-Xm
-Ak
-qN
+pg
+Pb
+Aq
 Ml
 mq
-aA
-aA
-aA
+SN
+vi
+CH
 aA
 ha
 cC
 Aq
-Ak
-Ak
-cn
+xh
 lg
 ut
 ut
 ut
+ut
+ut
 "}
 (23,1,1) = {"
 ut
 ut
 ut
-LC
-En
-kG
-kG
-FN
-NA
-kS
-kS
-kS
-kS
-kS
+ut
+ut
+Gg
+sn
+yV
+xG
+yV
+GQ
+ti
 kS
-NA
+GQ
+Xm
 dQ
+Ak
 kG
-kG
-BH
-Lq
+bD
+ut
+ut
 ut
 ut
 ut
@@ -4931,24 +4810,24 @@ ut
 ut
 ut
 ut
+ut
+ut
 LC
-hC
-Ak
 Rx
-BE
-NA
-NA
-NA
-NA
-NA
-NA
-NA
+Xm
+xG
+Ak
+pO
+Ku
+Fg
+GQ
+Ak
 Rp
-rY
-yV
 Xm
-hC
-Lq
+kG
+bD
+ut
+ut
 ut
 ut
 ut
@@ -4957,24 +4836,24 @@ ut
 ut
 ut
 ut
+ut
+ut
+WV
+ML
+Hl
+RR
+qD
+eo
+Vf
+BH
+RD
+DT
+kT
+Hl
 oF
-aw
-Xm
-Ak
-ol
-NA
-NA
-NA
-NA
-NA
-NA
-NA
-NA
-Ch
-Ak
-Ak
-VU
-fG
+Mi
+ut
+ut
 ut
 ut
 ut
@@ -4983,24 +4862,24 @@ ut
 ut
 ut
 ut
-Hw
-sn
-Sj
-Sj
-ol
-NA
-NA
+ut
+ut
+rH
 NA
 NA
+lb
 NA
+Qw
+Qw
+Qw
+Qw
 NA
+YT
 NA
 NA
-Ch
-Sj
-Sj
-Mx
-Hw
+rH
+ut
+ut
 ut
 ut
 ut
@@ -5009,24 +4888,24 @@ ut
 ut
 ut
 ut
-Hw
-kH
-Ak
-yV
+ut
+ut
+rH
+mu
 ol
-NA
-NA
-NA
-NA
-NA
-NA
-NA
-NA
+RF
+aH
+vE
+bl
+eW
+Ft
+Rv
+Ia
 Ch
-Rx
-Ak
-YV
-Hw
+pC
+rH
+ut
+ut
 ut
 ut
 ut
@@ -5035,24 +4914,24 @@ ut
 ut
 ut
 ut
-Hw
-dO
-bu
-GQ
+ut
+sR
+rH
+qw
 sv
-NA
-NA
-NA
-NA
-NA
-NA
-NA
-NA
+oq
+wT
+Mx
+NC
+Ww
+Vv
+jx
+Nx
 yO
-Ak
-Ak
+OQ
+rH
 sR
-Hw
+ut
 ut
 ut
 ut
@@ -5061,24 +4940,24 @@ ut
 ut
 ut
 ut
-Hw
-kp
-Hw
+ut
+rH
+Kj
 xu
 rg
-NA
-NA
-NA
-NA
-NA
-NA
-NA
-NA
+dr
+dr
+dr
+dr
+dr
+dr
+dr
+dr
 rt
 sW
 Sj
-bD
-Hw
+rH
+ut
 ut
 ut
 ut
@@ -5086,208 +4965,208 @@ ut
 (30,1,1) = {"
 ut
 ut
-mf
-Hw
-WS
-Hw
-Fg
-EU
-NA
-NA
-NA
-NA
-NA
-NA
-NA
-NA
-oE
+ut
+ut
+rH
+nW
+rH
+IU
+dr
+dr
+dr
+dr
+dr
+dr
+dr
+zY
+xE
 Dk
-JR
-Ww
-Hw
-mf
+BJ
+rH
+ut
+ut
 ut
 ut
 "}
 (31,1,1) = {"
 ut
 ut
-Hw
-zY
-Zp
+ut
+ut
+rH
 yC
-NZ
-sb
-NA
-NA
-NA
-NA
-NA
-NA
-NA
-NA
-Az
-Dk
+rH
+IU
+dr
+dr
+dr
+dr
+dr
+dr
+dr
+dr
+xE
+JR
 bs
-QZ
-OQ
-Hw
+rH
+ut
+ut
 ut
 ut
 "}
 (32,1,1) = {"
 ut
 ut
-Hw
-Kj
-rr
+ut
+ut
+rH
 qL
 NZ
 IU
-NA
-NA
-NA
-NA
-NA
-NA
-NA
-NA
-dX
-Zw
+dr
+dr
+dr
+dr
+dr
+dr
+dr
+dr
+xE
+JR
 jw
-ti
-pO
-Hw
+rH
+ut
+ut
 ut
 ut
 "}
 (33,1,1) = {"
 ut
 ut
-Hw
-RF
-Ia
+ut
+ut
+rH
 ng
-NZ
-sb
-NA
-NA
-NA
-NA
-NA
-NA
-NA
-NA
-qw
-JR
+Ky
+Lw
+dr
+dr
+dr
+dr
+dr
+dr
+dr
+dr
+xE
 JR
-ti
-OQ
-Hw
+jb
+rH
+ut
+ut
 ut
 ut
 "}
 (34,1,1) = {"
 ut
 ut
-Hw
-Vv
-xh
-SI
-NZ
+ut
+ut
+rH
+rH
+rH
 CB
-NA
-NA
-NA
-NA
-NA
-NA
-NA
-NA
-du
-JR
-HP
-ti
-ML
-Hw
+dr
+dr
+dr
+dr
+dr
+dr
+dr
+dr
+xE
+bz
+rH
+rH
+ut
+ut
 ut
 ut
 "}
 (35,1,1) = {"
 ut
 ut
-Hw
-jx
-Bs
+ut
+ut
+ut
 rH
 eh
 Lw
-NA
-NA
-NA
-NA
-NA
-NA
-NA
-NA
+dr
+dr
+dr
+dr
+dr
+dr
+dr
+dr
 xE
-mW
-ma
-WV
-ML
-Hw
+BG
+rH
+ut
+ut
+ut
 ut
 ut
 "}
 (36,1,1) = {"
 ut
 ut
-Hw
-ru
-Ak
-gK
+ut
+ut
+sR
+rH
 RT
 jn
-NA
-NA
-NA
-NA
-NA
-NA
-NA
-NA
+dr
+dr
+dr
+dr
+dr
+dr
+dr
+dr
 yd
 fD
-wT
-QZ
-ML
-Hw
+rH
+sR
+ut
+ut
 ut
 ut
 "}
 (37,1,1) = {"
 ut
 ut
-Nx
-Hw
-sH
+ut
+ut
+QZ
 Me
-RT
+Dk
 Fd
-NA
-NA
-NA
-NA
-NA
-NA
-NA
-NA
+dr
+dr
+dr
+dr
+dr
+dr
+dr
+dr
 PF
-Gg
+JR
 mW
 QZ
-Hw
-Nx
+ut
+ut
 ut
 ut
 "}
@@ -5295,24 +5174,24 @@ ut
 ut
 ut
 ut
-Nx
-Hw
-Hw
-Bl
-oA
-NA
-NA
-NA
-NA
-NA
-NA
-NC
+ut
+QZ
+nn
+fG
+jn
 dr
-oA
-Hw
+dr
+dr
+dr
+dr
+dr
+dr
+dr
+yd
+fG
 Bl
-Hw
-Nx
+QZ
+ut
 ut
 ut
 ut
@@ -5322,22 +5201,22 @@ ut
 ut
 ut
 ut
-CC
+QZ
 gt
-lf
-oA
-NA
-NA
-NA
-NA
-NA
-NA
-Mi
-DT
+uf
+En
+dr
+dr
+dr
+dr
+dr
+dr
+dr
+dr
 RP
 zv
 lf
-Hw
+QZ
 ut
 ut
 ut
@@ -5347,24 +5226,24 @@ ut
 ut
 ut
 ut
-ut
-CC
+aw
+rH
 gV
+rH
+sK
+dr
+dr
+dr
+dr
+dr
+dr
+dr
+dr
+hC
+rH
 RI
-oA
-kT
-NA
-NA
-NA
-NA
-NA
-aR
-aH
-RP
-BJ
-RI
-Hw
-ut
+rH
+rH
 ut
 ut
 ut
@@ -5373,24 +5252,24 @@ ut
 ut
 ut
 ut
-ut
+aw
 mf
 Hw
-xf
-oA
-NA
-NA
-NA
-NA
-NA
-NA
-qK
-vi
+rH
 oA
-Hw
+dr
+dr
+dr
+dr
+dr
+dr
+dr
+dr
+CC
+rH
 xf
-mf
-ut
+FQ
+rH
 ut
 ut
 ut
@@ -5399,25 +5278,129 @@ ut
 ut
 ut
 ut
-ut
-ut
+QZ
+du
 bv
-Hl
+FF
 tD
-Cb
-VC
-eo
-Dj
-eo
-eo
-VC
-sK
+dr
+dr
+dr
+dr
+dr
+dr
+dr
+dr
 am
 FF
 cI
+js
+QZ
+ut
+ut
+ut
+"}
+(43,1,1) = {"
+ut
+ut
+ut
+QZ
+kp
+CQ
+FF
+tD
+dr
+dr
+dr
+dr
+dr
+dr
+dr
+dr
+XM
+FF
+bK
+Zp
+QZ
+ut
+ut
+ut
+"}
+(44,1,1) = {"
+ut
+ut
+ut
+QZ
+Vs
+aR
+FF
+tD
+dr
+dr
+dr
+dr
+dr
+dr
+dr
+dr
+am
+FF
+Bs
+Pw
+QZ
+ut
+ut
+ut
+"}
+(45,1,1) = {"
+ut
+ut
+ut
+rH
+aw
+YV
+rH
+li
+dr
+dr
+dr
+dr
+dr
+dr
+dr
+dr
+EU
+rH
+rY
+aw
+rH
 ut
 ut
 ut
+"}
+(46,1,1) = {"
+ut
+ut
+ut
+ut
+aw
+aw
+rH
+ru
+MP
+uc
+HM
+dR
+HM
+HM
+uc
+cP
+dX
+rH
+aw
+aw
+ut
+ut
 ut
 ut
 "}
diff --git a/code/game/area/ship_areas.dm b/code/game/area/ship_areas.dm
index f918a7f76e2b..1015f1cc7597 100644
--- a/code/game/area/ship_areas.dm
+++ b/code/game/area/ship_areas.dm
@@ -351,6 +351,10 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 /area/ship/cargo/starboard
 	name = "Starboard Cargo Bay"
 
+/area/ship/cargo/hangar
+	name = "Hangar"
+	icon_state = "hangar"
+
 /// Hallways ///
 /area/ship/hallway
 	name = "Hallway"
diff --git a/icons/turf/areas.dmi b/icons/turf/areas.dmi
index 05379e97a79c8f5303a6332f7060dbd8a14a5333..be9c66df57e9094dab8cb01d91a296415a15c743 100644
GIT binary patch
delta 11123
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

delta 11003
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


From 1a0202a2fb57d320d013a672155c4819e7d17a3b Mon Sep 17 00:00:00 2001
From: goober3 <118859017+goober3@users.noreply.github.com>
Date: Mon, 12 Jun 2023 21:00:47 +0100
Subject: [PATCH 18/28] fuckg  you im not updating screenshots for this i hate
 the establishment

---
 _maps/shuttles/shiptest/nanotrasen_tegus.dmm | 112 +++++++++++++++++--
 1 file changed, 104 insertions(+), 8 deletions(-)

diff --git a/_maps/shuttles/shiptest/nanotrasen_tegus.dmm b/_maps/shuttles/shiptest/nanotrasen_tegus.dmm
index 98db12fad645..9e0c0ff2a966 100644
--- a/_maps/shuttles/shiptest/nanotrasen_tegus.dmm
+++ b/_maps/shuttles/shiptest/nanotrasen_tegus.dmm
@@ -72,6 +72,21 @@
 	},
 /turf/open/floor/plasteel/telecomms_floor,
 /area/ship/cargo/hangar)
+"bw" = (
+/obj/structure/catwalk/over/plated_catwalk/white{
+	color = "#4c535b"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 9
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 9
+	},
+/obj/structure/cable{
+	icon_state = "1-8"
+	},
+/turf/open/floor/plating,
+/area/ship/engineering/engine)
 "bz" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/structure/closet/emcloset/wall{
@@ -625,6 +640,17 @@
 	},
 /turf/open/floor/plasteel,
 /area/ship/cargo/hangar)
+"hE" = (
+/obj/structure/catwalk/over/plated_catwalk/white{
+	color = "#4c535b"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
+/obj/structure/cable{
+	icon_state = "6-8"
+	},
+/turf/open/floor/plating,
+/area/ship/engineering/engine)
 "hG" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
@@ -699,6 +725,9 @@
 /obj/structure/catwalk/over/plated_catwalk,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
 /turf/open/floor/plating,
 /area/ship/engineering/engine)
 "iY" = (
@@ -1360,6 +1389,9 @@
 	dir = 5
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
 /turf/open/floor/plasteel/stairs{
 	dir = 1
 	},
@@ -1404,6 +1436,9 @@
 /obj/structure/cable{
 	icon_state = "2-4"
 	},
+/obj/structure/cable{
+	icon_state = "1-4"
+	},
 /turf/open/floor/plating,
 /area/ship/engineering/engine)
 "rc" = (
@@ -2066,6 +2101,9 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
 	dir = 5
 	},
+/obj/structure/cable{
+	icon_state = "1-4"
+	},
 /turf/open/floor/plating,
 /area/ship/engineering/engine)
 "zr" = (
@@ -2078,6 +2116,9 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
 	dir = 6
 	},
+/obj/structure/cable{
+	icon_state = "5-8"
+	},
 /turf/open/floor/plating,
 /area/ship/engineering/engine)
 "zu" = (
@@ -2097,10 +2138,12 @@
 	},
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/light/small/directional/south,
 /obj/effect/turf_decal/industrial/warning{
 	dir = 4
 	},
+/obj/structure/cable{
+	icon_state = "0-1"
+	},
 /turf/open/floor/plasteel/dark,
 /area/ship/engineering/engine)
 "zQ" = (
@@ -2179,6 +2222,9 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
 	dir = 10
 	},
+/obj/structure/cable{
+	icon_state = "2-9"
+	},
 /turf/open/floor/plating,
 /area/ship/engineering/engine)
 "Az" = (
@@ -2190,7 +2236,10 @@
 "AB" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
-/obj/machinery/light/directional/east,
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/light/dim/directional/east,
 /turf/open/floor/plasteel/stairs,
 /area/ship/engineering/engine)
 "Bh" = (
@@ -2300,6 +2349,9 @@
 	name = "Engine Blast Door";
 	pixel_y = -27
 	},
+/obj/structure/cable{
+	icon_state = "0-1"
+	},
 /turf/open/floor/plasteel/dark,
 /area/ship/engineering/engine)
 "Cb" = (
@@ -2311,6 +2363,9 @@
 /obj/structure/cable{
 	icon_state = "1-8"
 	},
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
 /turf/open/floor/plating,
 /area/ship/engineering/engine)
 "Cg" = (
@@ -2761,10 +2816,12 @@
 	},
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/light/small/directional/north,
 /obj/effect/turf_decal/industrial/warning{
 	dir = 4
 	},
+/obj/structure/cable{
+	icon_state = "0-2"
+	},
 /turf/open/floor/plasteel/dark,
 /area/ship/engineering/engine)
 "Hc" = (
@@ -2841,6 +2898,15 @@
 	dir = 4
 	},
 /obj/effect/turf_decal/steeldecal/steel_decals_central7,
+/obj/structure/cable{
+	icon_state = "0-4"
+	},
+/obj/structure/cable{
+	icon_state = "1-4"
+	},
+/obj/structure/cable{
+	icon_state = "2-4"
+	},
 /turf/open/floor/plasteel/dark,
 /area/ship/engineering/engine)
 "Ia" = (
@@ -3036,7 +3102,7 @@
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4{
 	dir = 4
 	},
-/obj/machinery/light/directional/east,
+/obj/machinery/light/dim/directional/east,
 /turf/open/floor/plasteel/stairs{
 	dir = 1
 	},
@@ -3229,12 +3295,12 @@
 /turf/open/floor/plasteel/dark,
 /area/ship/engineering/engine)
 "Nb" = (
-/obj/machinery/door/airlock/external,
 /obj/structure/catwalk/over/plated_catwalk/white{
 	color = "#4c535b"
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
+/obj/machinery/door/airlock/external/glass,
 /turf/open/floor/plating,
 /area/ship/engineering/engine)
 "Nc" = (
@@ -3260,6 +3326,9 @@
 /obj/effect/turf_decal/industrial/warning{
 	dir = 4
 	},
+/obj/structure/cable{
+	icon_state = "0-2"
+	},
 /turf/open/floor/plasteel/dark,
 /area/ship/engineering/engine)
 "Nx" = (
@@ -3446,6 +3515,21 @@
 	},
 /turf/open/floor/plasteel,
 /area/ship/cargo/hangar)
+"OU" = (
+/obj/structure/catwalk/over/plated_catwalk/white{
+	color = "#4c535b"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 6
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 6
+	},
+/obj/structure/cable{
+	icon_state = "4-10"
+	},
+/turf/open/floor/plating,
+/area/ship/engineering/engine)
 "OW" = (
 /obj/machinery/power/terminal{
 	dir = 8
@@ -3459,6 +3543,15 @@
 /obj/machinery/atmospherics/components/binary/volume_pump/layer2{
 	name = "Scrubbers to External"
 	},
+/obj/structure/cable{
+	icon_state = "0-4"
+	},
+/obj/structure/cable{
+	icon_state = "1-4"
+	},
+/obj/structure/cable{
+	icon_state = "2-4"
+	},
 /turf/open/floor/plasteel/dark,
 /area/ship/engineering/engine)
 "OX" = (
@@ -3949,6 +4042,9 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
 	dir = 10
 	},
+/obj/structure/cable{
+	icon_state = "2-8"
+	},
 /turf/open/floor/plating,
 /area/ship/engineering/engine)
 "Wf" = (
@@ -4294,7 +4390,7 @@ eN
 rs
 Nb
 sb
-jq
+hE
 CO
 xZ
 vy
@@ -4328,7 +4424,7 @@ ho
 Fn
 rc
 ZY
-zr
+OU
 Jr
 xZ
 xZ
@@ -4354,7 +4450,7 @@ iV
 qS
 Cb
 AB
-Jr
+bw
 hi
 xZ
 eq

From 2675374913f447b23c721ed5652bc862199029de Mon Sep 17 00:00:00 2001
From: goober3 <118859017+goober3@users.noreply.github.com>
Date: Mon, 12 Jun 2023 21:09:34 +0100
Subject: [PATCH 19/28] integration test

---
 _maps/shuttles/shiptest/nanotrasen_tegus.dmm | 24 ++------------------
 1 file changed, 2 insertions(+), 22 deletions(-)

diff --git a/_maps/shuttles/shiptest/nanotrasen_tegus.dmm b/_maps/shuttles/shiptest/nanotrasen_tegus.dmm
index 9e0c0ff2a966..f65d710f4986 100644
--- a/_maps/shuttles/shiptest/nanotrasen_tegus.dmm
+++ b/_maps/shuttles/shiptest/nanotrasen_tegus.dmm
@@ -858,16 +858,6 @@
 	},
 /turf/open/floor/plasteel,
 /area/ship/cargo/hangar)
-"jO" = (
-/obj/docking_port/stationary{
-	dir = 1;
-	height = 15;
-	dwidth = 7;
-	width = 15;
-	name = "Subship Port 2"
-	},
-/turf/template_noop,
-/area/template_noop)
 "jQ" = (
 /turf/closed/wall,
 /area/ship/engineering/communications)
@@ -883,16 +873,6 @@
 /obj/effect/spawner/structure/window/shuttle,
 /turf/open/floor/plating,
 /area/ship/crew/canteen)
-"ko" = (
-/obj/docking_port/stationary{
-	dir = 2;
-	height = 15;
-	dwidth = 7;
-	width = 15;
-	name = "Subship Port 1"
-	},
-/turf/template_noop,
-/area/template_noop)
 "kp" = (
 /obj/structure/chair/office,
 /obj/effect/decal/cleanable/dirt/dust,
@@ -4799,7 +4779,7 @@ lW
 ut
 "}
 (20,1,1) = {"
-jO
+ut
 kc
 TH
 dm
@@ -4822,7 +4802,7 @@ GF
 ff
 TH
 XL
-ko
+ut
 "}
 (21,1,1) = {"
 ut

From 66d4bdf144725f21e49e7938e6f0b629bc2b4d60 Mon Sep 17 00:00:00 2001
From: goober3 <118859017+goober3@users.noreply.github.com>
Date: Mon, 12 Jun 2023 21:31:40 +0100
Subject: [PATCH 20/28] this is almost guaranteed to do nothing but one can
 hope

---
 _maps/shuttles/shiptest/nanotrasen_tegus.dmm  | 26 ++++++++++++++++---
 .../subshuttles/Subshuttle Catalog.txt        |  2 +-
 ...shuttle_tegus.dmm => nanotrasen_anole.dmm} |  0
 code/datums/shuttles.dm                       |  4 +--
 4 files changed, 26 insertions(+), 6 deletions(-)
 rename _maps/shuttles/subshuttles/{nanotrasen_shuttle_tegus.dmm => nanotrasen_anole.dmm} (100%)

diff --git a/_maps/shuttles/shiptest/nanotrasen_tegus.dmm b/_maps/shuttles/shiptest/nanotrasen_tegus.dmm
index f65d710f4986..4c7d7d85fe93 100644
--- a/_maps/shuttles/shiptest/nanotrasen_tegus.dmm
+++ b/_maps/shuttles/shiptest/nanotrasen_tegus.dmm
@@ -447,6 +447,16 @@
 	},
 /turf/open/floor/plating,
 /area/ship/hallway/central)
+"fh" = (
+/obj/docking_port/stationary{
+	dir = 1;
+	height = 15;
+	dwidth = 7;
+	width = 15;
+	name = "Subship Port 2"
+	},
+/turf/template_noop,
+/area/template_noop)
 "fj" = (
 /obj/effect/turf_decal/borderfloor/full,
 /obj/machinery/door/firedoor/border_only,
@@ -964,6 +974,16 @@
 	},
 /turf/open/floor/plasteel,
 /area/ship/cargo/hangar)
+"le" = (
+/obj/docking_port/stationary{
+	dir = 2;
+	height = 15;
+	dwidth = 7;
+	width = 15;
+	name = "Subship Port 1"
+	},
+/turf/template_noop,
+/area/template_noop)
 "lf" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
 	dir = 5
@@ -2143,7 +2163,7 @@
 /area/ship/engineering/engine)
 "zY" = (
 /obj/effect/landmark/subship{
-	subship_template = /datum/map_template/shuttle/subshuttles/nanotrasen_tegus
+	subship_template = /datum/map_template/shuttle/subshuttles/anole
 	},
 /turf/open/floor/plating,
 /area/ship/cargo/hangar)
@@ -4779,7 +4799,7 @@ lW
 ut
 "}
 (20,1,1) = {"
-ut
+fh
 kc
 TH
 dm
@@ -4802,7 +4822,7 @@ GF
 ff
 TH
 XL
-ut
+le
 "}
 (21,1,1) = {"
 ut
diff --git a/_maps/shuttles/subshuttles/Subshuttle Catalog.txt b/_maps/shuttles/subshuttles/Subshuttle Catalog.txt
index 9176da34e3cf..948b01e41fd2 100644
--- a/_maps/shuttles/subshuttles/Subshuttle Catalog.txt	
+++ b/_maps/shuttles/subshuttles/Subshuttle Catalog.txt	
@@ -6,7 +6,7 @@ File Path = "_maps\shuttles\subshuttles\example.dmm"
 Name = "Anole Transport Shuttle"
 Size = "15x8"
 Purpose = "Transporting Nanotrasen employees"
-File Path = "_maps\shuttles\subshuttles\nanotrasen_shuttle_tegus.dmm"
+File Path = "_maps\shuttles\subshuttles\nanotrasen_anole.dmm"
 
 Name = "Kunai Dropship"
 Size = "12x7"
diff --git a/_maps/shuttles/subshuttles/nanotrasen_shuttle_tegus.dmm b/_maps/shuttles/subshuttles/nanotrasen_anole.dmm
similarity index 100%
rename from _maps/shuttles/subshuttles/nanotrasen_shuttle_tegus.dmm
rename to _maps/shuttles/subshuttles/nanotrasen_anole.dmm
diff --git a/code/datums/shuttles.dm b/code/datums/shuttles.dm
index 60ccaf5623ed..dd1fdad6ddeb 100644
--- a/code/datums/shuttles.dm
+++ b/code/datums/shuttles.dm
@@ -346,8 +346,8 @@
 /datum/map_template/shuttle/subshuttles
 	category = "subshuttles"
 
-/datum/map_template/shuttle/subshuttles/nanotrasen_tegus
-	file_name = "nanotrasen_shuttle_tegus"
+/datum/map_template/shuttle/subshuttles/anole
+	file_name = "nanotrasen_anole"
 	name = "Anole Transport Shuttle"
 	prefix = "NTSV"
 

From 7dbfd887ffe25d6061e428db1468ef1d0a623dfd Mon Sep 17 00:00:00 2001
From: goober3 <118859017+goober3@users.noreply.github.com>
Date: Wed, 21 Jun 2023 02:45:43 +0100
Subject: [PATCH 21/28] atomizing? what

---
 _maps/configs/nanotrasen_tegus.json           |   12 +-
 _maps/shuttles/shiptest/nanotrasen_tegus.dmm  | 1376 +++++++++++------
 .../shuttles/subshuttles/nanotrasen_anole.dmm |   92 +-
 .../subshuttles/nanotrasen_anole_damaged.dmm  |  978 ++++++++++++
 code/datums/shuttles.dm                       |   15 +-
 .../circuitboards/machine_circuitboards.dm    |    8 +
 .../jobs/job_types/station_engineer.dm        |    6 +
 code/modules/power/smes.dm                    |   11 +-
 code/modules/research/designs.dm              |   16 +
 .../research/designs/stock_parts_designs.dm   |   14 +-
 shiptest.dme                                  |    2 +-
 11 files changed, 1994 insertions(+), 536 deletions(-)
 create mode 100644 _maps/shuttles/subshuttles/nanotrasen_anole_damaged.dmm

diff --git a/_maps/configs/nanotrasen_tegus.json b/_maps/configs/nanotrasen_tegus.json
index 7ef81a8ad3f5..d6ac1dee3ecd 100644
--- a/_maps/configs/nanotrasen_tegus.json
+++ b/_maps/configs/nanotrasen_tegus.json
@@ -1,6 +1,6 @@
 {
 	"$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json",
-	"map_name": "Tegus-class Mining Carrier",
+	"map_name": "Tegus-class Logistics Freighter",
 	"prefix": "NTSV",
 	"namelists": ["GENERAL", "BRITISH_NAVY", "MYTHOLOGICAL", "SPACE"],
 	"map_short_name": "Tegus-class",
@@ -12,12 +12,8 @@
 			"officer": true,
 			"slots": 1
 		},
-		"Mechanic": {
-			"outfit": "/datum/outfit/job/engineer/nt",
-			"slots": 1
-		},
-		"Shaft Miner": {
-			"outfit": "/datum/outfit/job/miner",
+		"Field Technician": {
+			"outfit": "/datum/outfit/job/engineer/nt/field",
 			"slots": 2
 		},
 		"Pilot": {
@@ -26,7 +22,7 @@
 		},
 		"Deckhand": {
 			"outfit": "/datum/outfit/job/assistant",
-			"slots": 1
+			"slots": 2
 		}
 	},
 	"enabled": true
diff --git a/_maps/shuttles/shiptest/nanotrasen_tegus.dmm b/_maps/shuttles/shiptest/nanotrasen_tegus.dmm
index 4c7d7d85fe93..63a9b656a2be 100644
--- a/_maps/shuttles/shiptest/nanotrasen_tegus.dmm
+++ b/_maps/shuttles/shiptest/nanotrasen_tegus.dmm
@@ -16,23 +16,30 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/turf/open/floor/plasteel,
+/obj/effect/turf_decal/siding/thinplating,
+/turf/open/floor/plasteel/patterned,
 /area/ship/cargo/hangar)
 "aw" = (
 /turf/closed/wall/mineral/titanium,
 /area/ship/cargo/hangar)
 "aA" = (
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
+/obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/plasteel,
 /area/ship/cargo)
-"aH" = (
-/obj/effect/turf_decal/trimline/opaque/white/line,
-/turf/open/floor/plasteel,
-/area/ship/cargo/hangar)
 "aR" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/plasteel/dark,
 /area/ship/cargo/hangar)
+"aV" = (
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/obj/structure/cable/yellow{
+	icon_state = "1-4"
+	},
+/turf/closed/wall/r_wall,
+/area/ship/engineering/engine)
 "bb" = (
 /obj/machinery/airalarm/directional/east,
 /obj/effect/turf_decal/siding/thinplating{
@@ -45,17 +52,15 @@
 /turf/open/floor/plasteel,
 /area/ship/hallway/central)
 "bl" = (
-/obj/effect/turf_decal/ntspaceworks_big/six{
-	dir = 8
-	},
-/turf/open/floor/plasteel/patterned,
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/patterned/cargo_one,
 /area/ship/cargo/hangar)
 "bs" = (
 /obj/structure/tank_dispenser,
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/machinery/light/dim/directional/south,
-/turf/open/floor/plasteel,
+/turf/open/floor/plasteel/dark,
 /area/ship/cargo/hangar)
 "bu" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
@@ -73,9 +78,7 @@
 /turf/open/floor/plasteel/telecomms_floor,
 /area/ship/cargo/hangar)
 "bw" = (
-/obj/structure/catwalk/over/plated_catwalk/white{
-	color = "#4c535b"
-	},
+/obj/structure/catwalk/over/plated_catwalk/dark,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
 	dir = 9
 	},
@@ -93,7 +96,7 @@
 	dir = 1;
 	pixel_y = -28
 	},
-/turf/open/floor/plasteel,
+/turf/open/floor/plasteel/dark,
 /area/ship/cargo/hangar)
 "bD" = (
 /obj/effect/turf_decal/industrial/warning{
@@ -131,6 +134,10 @@
 	},
 /turf/open/floor/plasteel/telecomms_floor,
 /area/ship/cargo/hangar)
+"bL" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/patterned/ridged,
+/area/ship/cargo/hangar)
 "bN" = (
 /obj/structure/chair/sofa/right,
 /obj/effect/decal/cleanable/dirt/dust,
@@ -140,6 +147,7 @@
 /area/ship/crew)
 "ca" = (
 /obj/machinery/vending/clothing,
+/obj/machinery/light/directional/south,
 /turf/open/floor/wood,
 /area/ship/crew)
 "cn" = (
@@ -199,10 +207,11 @@
 /turf/open/floor/plasteel/dark,
 /area/ship/crew/canteen)
 "cO" = (
-/obj/structure/catwalk/over/plated_catwalk,
 /obj/structure/cable/yellow{
 	icon_state = "2-8"
 	},
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/catwalk/over/plated_catwalk,
 /turf/open/floor/plating,
 /area/ship/engineering/engine)
 "cP" = (
@@ -318,7 +327,10 @@
 	dir = 8;
 	network = "ntsv_commnet"
 	},
-/turf/open/floor/plasteel/dark,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+	dir = 8
+	},
+/turf/open/floor/plasteel/tech,
 /area/ship/engineering/communications)
 "dP" = (
 /obj/structure/cable{
@@ -374,12 +386,15 @@
 /obj/item/multitool{
 	pixel_y = 3
 	},
-/turf/open/floor/plasteel/dark,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+	dir = 4
+	},
+/turf/open/floor/plasteel/tech,
 /area/ship/engineering/communications)
 "eh" = (
 /obj/effect/turf_decal/industrial/outline/yellow,
-/obj/machinery/vending/cigarette,
 /obj/machinery/light/directional/north,
+/obj/structure/ore_box,
 /turf/open/floor/plasteel/dark,
 /area/ship/cargo/hangar)
 "eo" = (
@@ -425,17 +440,26 @@
 /turf/open/floor/plasteel,
 /area/ship/hallway/central)
 "eW" = (
-/obj/effect/turf_decal/ntspaceworks_big/seven{
-	dir = 8
-	},
-/turf/open/floor/plasteel/patterned,
+/obj/effect/turf_decal/ntspaceworks_small/right,
+/turf/open/floor/plating,
 /area/ship/cargo/hangar)
 "eZ" = (
 /obj/structure/table,
 /obj/machinery/cell_charger,
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/plasteel,
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/turf/open/floor/plasteel/patterned/ridged,
+/area/ship/engineering/engine)
+"fe" = (
+/obj/effect/turf_decal/solarpanel,
+/obj/machinery/power/solar,
+/obj/structure/cable/yellow{
+	icon_state = "0-2"
+	},
+/turf/open/floor/plating,
 /area/ship/engineering/engine)
 "ff" = (
 /obj/structure/catwalk/over/plated_catwalk,
@@ -458,12 +482,15 @@
 /turf/template_noop,
 /area/template_noop)
 "fj" = (
-/obj/effect/turf_decal/borderfloor/full,
 /obj/machinery/door/firedoor/border_only,
 /obj/machinery/door/firedoor/border_only{
 	dir = 1
 	},
-/turf/open/floor/plasteel/tech/grid,
+/obj/effect/turf_decal/steeldecal/steel_decals_central2,
+/obj/effect/turf_decal/steeldecal/steel_decals_central2{
+	dir = 1
+	},
+/turf/open/floor/plasteel/dark,
 /area/ship/hallway/central)
 "fx" = (
 /obj/effect/turf_decal/siding/thinplating,
@@ -473,13 +500,13 @@
 "fD" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/machinery/airalarm/directional/south,
-/turf/open/floor/plasteel,
+/turf/open/floor/plasteel/dark,
 /area/ship/cargo/hangar)
 "fG" = (
 /obj/structure/railing{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
+/turf/open/floor/plasteel/dark,
 /area/ship/cargo/hangar)
 "fH" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
@@ -495,8 +522,15 @@
 /obj/structure/chair{
 	dir = 4
 	},
+/obj/effect/turf_decal/corner/transparent/neutral,
 /turf/open/floor/plasteel/dark,
 /area/ship/crew/canteen)
+"gh" = (
+/obj/effect/turf_decal/solarpanel,
+/obj/machinery/power/solar,
+/obj/structure/cable/yellow,
+/turf/open/floor/plating,
+/area/ship/engineering/engine)
 "gt" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
 	dir = 6
@@ -516,7 +550,7 @@
 	dir = 8
 	},
 /obj/effect/turf_decal/trimline/opaque/white/warning,
-/turf/open/floor/plasteel,
+/turf/open/floor/plasteel/dark,
 /area/ship/hallway/central)
 "gL" = (
 /obj/machinery/computer/crew{
@@ -587,30 +621,26 @@
 	},
 /obj/structure/reagent_dispensers/fueltank,
 /obj/effect/turf_decal/industrial/hatch/yellow,
-/turf/open/floor/plasteel,
+/obj/structure/cable/yellow{
+	icon_state = "0-6"
+	},
+/obj/structure/cable/yellow{
+	icon_state = "0-1"
+	},
+/turf/open/floor/plasteel/patterned/ridged,
 /area/ship/engineering/engine)
 "hi" = (
-/obj/structure/closet/secure_closet{
-	anchored = 1;
-	icon_state = "eng_secure";
-	name = "mechanic's locker";
-	req_access = list(11)
-	},
-/obj/item/clothing/head/hardhat,
-/obj/item/clothing/under/rank/engineering/engineer/nt,
-/obj/item/clothing/under/rank/engineering/engineer/nt/skirt,
-/obj/item/clothing/shoes/workboots,
-/obj/item/clothing/suit/hazardvest,
-/obj/item/clothing/gloves/color/yellow,
-/obj/item/clothing/glasses/meson/engine/tray,
-/obj/item/pipe_dispenser,
-/obj/item/holosign_creator/engineering,
-/obj/item/tank/internals/emergency_oxygen/engi,
-/obj/effect/turf_decal/box,
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/item/clothing/head/welding,
+/obj/structure/table,
+/obj/item/storage/toolbox/electrical{
+	pixel_y = 5
+	},
+/obj/item/storage/toolbox/mechanical,
+/obj/item/stack/cable_coil/red,
+/obj/effect/turf_decal/corner/transparent/neutral{
+	dir = 8
+	},
 /turf/open/floor/plasteel/dark,
 /area/ship/engineering/engine)
 "ho" = (
@@ -620,7 +650,7 @@
 	pixel_y = 3
 	},
 /obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/plasteel,
+/turf/open/floor/plasteel/patterned/ridged,
 /area/ship/engineering/engine)
 "ht" = (
 /obj/machinery/power/smes/shuttle/precharged{
@@ -637,6 +667,15 @@
 	},
 /turf/open/floor/plating,
 /area/ship/engineering/engine)
+"hw" = (
+/obj/structure/cable/yellow{
+	icon_state = "2-8"
+	},
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/turf/closed/wall/mineral/titanium/nodiagonal,
+/area/ship/engineering/engine)
 "hC" = (
 /obj/effect/turf_decal/industrial/warning{
 	dir = 1
@@ -648,12 +687,12 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/turf/open/floor/plasteel,
+/obj/effect/turf_decal/siding/thinplating,
+/obj/machinery/firealarm/directional/south,
+/turf/open/floor/plasteel/patterned/ridged,
 /area/ship/cargo/hangar)
 "hE" = (
-/obj/structure/catwalk/over/plated_catwalk/white{
-	color = "#4c535b"
-	},
+/obj/structure/catwalk/over/plated_catwalk/dark,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
 /obj/structure/cable{
@@ -675,7 +714,6 @@
 /turf/closed/wall/mineral/titanium/nodiagonal,
 /area/ship/engineering/communications)
 "hW" = (
-/obj/effect/turf_decal/borderfloor/full,
 /obj/machinery/door/firedoor/border_only,
 /obj/machinery/door/firedoor/border_only{
 	dir = 1
@@ -687,7 +725,11 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
 	dir = 1
 	},
-/turf/open/floor/plasteel/tech/grid,
+/obj/effect/turf_decal/steeldecal/steel_decals_central2,
+/obj/effect/turf_decal/steeldecal/steel_decals_central2{
+	dir = 1
+	},
+/turf/open/floor/plasteel/dark,
 /area/ship/hallway/central)
 "it" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
@@ -699,14 +741,17 @@
 /obj/effect/turf_decal/trimline/opaque/white/line{
 	dir = 9
 	},
-/turf/open/floor/plasteel,
+/turf/open/floor/plasteel/dark,
 /area/ship/hallway/central)
 "iJ" = (
 /obj/machinery/power/apc/auto_name/directional/west,
 /obj/structure/cable{
 	icon_state = "0-4"
 	},
-/turf/open/floor/plasteel/dark,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+	dir = 4
+	},
+/turf/open/floor/plasteel/tech,
 /area/ship/engineering/communications)
 "iM" = (
 /obj/effect/decal/cleanable/dirt/dust,
@@ -731,13 +776,22 @@
 	},
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
+"iS" = (
+/obj/structure/cable/yellow{
+	icon_state = "2-8"
+	},
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/turf/closed/wall/mineral/titanium/nodiagonal,
+/area/ship/crew)
 "iV" = (
-/obj/structure/catwalk/over/plated_catwalk,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
+/obj/structure/catwalk/over/plated_catwalk,
 /turf/open/floor/plating,
 /area/ship/engineering/engine)
 "iY" = (
@@ -760,28 +814,35 @@
 /turf/open/floor/plasteel/tech,
 /area/ship/crew)
 "jb" = (
-/obj/structure/closet/secure_closet/miningcloset{
-	req_access_txt = "48"
+/obj/structure/closet/secure_closet{
+	anchored = 1;
+	icon_state = "eng_secure";
+	name = "field technician's locker";
+	req_access = list(11)
 	},
-/obj/item/flashlight/seclite,
+/obj/item/clothing/gloves/color/yellow,
+/obj/item/storage/toolbox/mechanical,
+/obj/item/holosign_creator/engineering,
+/obj/item/tank/internals/emergency_oxygen/engi,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/turf_decal/box,
 /obj/item/storage/bag/ore,
-/obj/item/kitchen/knife/combat/survival,
-/obj/item/gun/energy/kinetic_accelerator,
+/obj/item/clothing/mask/gas/explorer,
 /obj/item/stack/marker_beacon/thirty,
-/obj/item/gps/mining,
-/obj/item/storage/backpack/satchel/explorer,
-/obj/item/clothing/glasses/meson/prescription,
-/obj/item/clothing/glasses/meson,
-/obj/item/t_scanner/adv_mining_scanner/lesser,
-/obj/machinery/door/window/eastright{
-	dir = 1
+/obj/item/gun/energy/kinetic_accelerator,
+/obj/item/gps/engineering{
+	gpstag = "TECH0"
 	},
-/obj/structure/window/reinforced/spawner/west,
+/obj/item/mining_scanner,
+/obj/item/analyzer{
+	pixel_y = 4
+	},
+/obj/item/clothing/head/hardhat/weldhat,
+/obj/item/clothing/glasses/meson/engine,
 /obj/effect/turf_decal/corner/transparent/neutral{
 	dir = 8
 	},
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/plasteel/dark,
 /area/ship/cargo/hangar)
 "jd" = (
@@ -810,12 +871,13 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/turf/open/floor/plasteel,
+/obj/effect/turf_decal/siding/thinplating{
+	dir = 1
+	},
+/turf/open/floor/plasteel/patterned/ridged,
 /area/ship/cargo/hangar)
 "jq" = (
-/obj/structure/catwalk/over/plated_catwalk/white{
-	color = "#4c535b"
-	},
+/obj/structure/catwalk/over/plated_catwalk/dark,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
 /turf/open/floor/plating,
@@ -831,42 +893,17 @@
 /obj/effect/turf_decal/corner/transparent/neutral{
 	dir = 8
 	},
-/obj/structure/table,
-/obj/item/toy/figure/miner{
-	pixel_y = 3
-	},
+/obj/machinery/jukebox,
 /turf/open/floor/plasteel/dark,
 /area/ship/crew/canteen)
 "jw" = (
-/obj/structure/closet/secure_closet/miningcloset{
-	req_access_txt = "48"
-	},
-/obj/item/flashlight/seclite,
-/obj/item/storage/bag/ore,
-/obj/item/kitchen/knife/combat/survival,
-/obj/item/gun/energy/kinetic_accelerator,
-/obj/item/stack/marker_beacon/thirty,
-/obj/item/gps/mining,
-/obj/item/storage/backpack/satchel/explorer,
-/obj/item/clothing/glasses/meson/prescription,
-/obj/item/clothing/glasses/meson,
-/obj/item/t_scanner/adv_mining_scanner/lesser,
-/obj/machinery/door/window/eastright{
-	dir = 1
-	},
-/obj/structure/window/reinforced/spawner/west,
-/obj/effect/turf_decal/corner/transparent/neutral,
 /obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/plasteel/dark,
-/area/ship/cargo/hangar)
-"jx" = (
-/obj/effect/turf_decal/trimline/opaque/white/line{
-	dir = 1
-	},
-/obj/effect/turf_decal/industrial/warning{
-	dir = 4
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 5
 	},
-/turf/open/floor/plasteel,
+/obj/structure/table,
+/obj/structure/extinguisher_cabinet/directional/south,
+/turf/open/floor/plasteel/dark,
 /area/ship/cargo/hangar)
 "jQ" = (
 /turf/closed/wall,
@@ -892,7 +929,6 @@
 /turf/open/floor/plasteel/dark,
 /area/ship/cargo/hangar)
 "kE" = (
-/obj/effect/turf_decal/borderfloor/full,
 /obj/machinery/door/firedoor/border_only,
 /obj/machinery/door/firedoor/border_only{
 	dir = 1
@@ -902,7 +938,11 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
-/turf/open/floor/plasteel/tech/grid,
+/obj/effect/turf_decal/steeldecal/steel_decals_central2,
+/obj/effect/turf_decal/steeldecal/steel_decals_central2{
+	dir = 1
+	},
+/turf/open/floor/plasteel/dark,
 /area/ship/hallway/central)
 "kG" = (
 /obj/effect/decal/cleanable/dirt/dust,
@@ -1010,17 +1050,38 @@
 	},
 /turf/open/floor/plating,
 /area/ship/cargo)
+"lh" = (
+/obj/structure/cable/yellow{
+	icon_state = "1-8"
+	},
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/turf/closed/wall/mineral/titanium/nodiagonal,
+/area/ship/crew/canteen)
 "li" = (
 /obj/effect/turf_decal/industrial/warning,
 /obj/machinery/light/floor,
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/turf/open/floor/plasteel,
+/obj/effect/turf_decal/siding/thinplating{
+	dir = 1
+	},
+/turf/open/floor/plasteel/patterned/cargo_one,
 /area/ship/cargo/hangar)
 "lI" = (
 /turf/closed/wall/mineral/titanium,
 /area/ship/crew/canteen)
+"lP" = (
+/obj/structure/cable/yellow{
+	icon_state = "1-8"
+	},
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/turf/closed/wall/mineral/titanium/nodiagonal,
+/area/ship/engineering/engine)
 "lQ" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
 	dir = 6
@@ -1078,7 +1139,8 @@
 	icon_state = "2-4"
 	},
 /obj/machinery/light/small/directional/north,
-/turf/open/floor/plasteel,
+/obj/machinery/vending/cigarette,
+/turf/open/floor/plasteel/dark,
 /area/ship/cargo/hangar)
 "mJ" = (
 /obj/machinery/suit_storage_unit/standard_unit,
@@ -1111,6 +1173,7 @@
 	id = "tegusbelt"
 	},
 /obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/decal/cleanable/cobweb/cobweb2,
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/cargo/hangar)
 "nk" = (
@@ -1139,7 +1202,7 @@
 /obj/structure/railing{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
+/turf/open/floor/plasteel/dark,
 /area/ship/cargo/hangar)
 "np" = (
 /obj/structure/table,
@@ -1147,8 +1210,17 @@
 	pixel_y = 3;
 	pixel_x = 3
 	},
+/obj/effect/turf_decal/corner/transparent/lime{
+	dir = 5
+	},
 /turf/open/floor/plasteel/dark,
 /area/ship/crew/canteen)
+"nw" = (
+/obj/structure/cable/yellow{
+	icon_state = "1-8"
+	},
+/turf/closed/wall/mineral/titanium/nodiagonal,
+/area/ship/crew/canteen)
 "nT" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -1181,7 +1253,7 @@
 	},
 /obj/effect/turf_decal/siding/thinplating,
 /obj/effect/turf_decal/trimline/opaque/white/line,
-/turf/open/floor/plasteel,
+/turf/open/floor/plasteel/dark,
 /area/ship/hallway/central)
 "oi" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
@@ -1200,7 +1272,10 @@
 /obj/structure/cable{
 	icon_state = "2-4"
 	},
-/turf/open/floor/plasteel,
+/obj/effect/turf_decal/siding/thinplating{
+	dir = 1
+	},
+/turf/open/floor/plasteel/patterned/cargo_one,
 /area/ship/cargo/hangar)
 "oq" = (
 /obj/effect/turf_decal/industrial/warning{
@@ -1209,7 +1284,8 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
 	dir = 9
 	},
-/turf/open/floor/plasteel,
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/patterned,
 /area/ship/cargo/hangar)
 "oA" = (
 /obj/effect/turf_decal/industrial/warning,
@@ -1219,12 +1295,14 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/turf/open/floor/plasteel,
+/obj/effect/turf_decal/siding/thinplating{
+	dir = 1
+	},
+/turf/open/floor/plasteel/patterned/cargo_one,
 /area/ship/cargo/hangar)
 "oE" = (
 /obj/structure/closet/secure_closet/freezer{
 	anchored = 1;
-	locked = 0;
 	name = "fridge"
 	},
 /obj/effect/turf_decal/corner/transparent/neutral{
@@ -1313,12 +1391,30 @@
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
 "pC" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
-	dir = 5
+/obj/effect/turf_decal/industrial/outline/yellow,
+/obj/structure/closet/crate/engineering/electrical{
+	name = "Field Technician Supplies"
 	},
-/turf/open/floor/plasteel,
-/area/ship/cargo/hangar)
+/obj/item/stack/sheet/metal/ten,
+/obj/item/stack/sheet/glass/five,
+/obj/item/stack/sheet/glass/five,
+/obj/item/storage/bag/construction,
+/obj/item/stack/circuit_stack/full,
+/obj/item/stack/sticky_tape,
+/obj/item/circuitboard/machine/telecomms/relay,
+/obj/item/circuitboard/machine/telecomms/relay,
+/obj/item/circuitboard/machine/telecomms/relay,
+/obj/item/stock_parts/cell/high,
+/obj/item/stock_parts/cell/high,
+/obj/item/stock_parts/cell/high,
+/obj/item/chisel,
+/obj/item/airlock_painter,
+/obj/item/decal_painter,
+/obj/item/floor_painter,
+/obj/item/rcl/pre_loaded,
+/obj/item/disk/design_disk/tcomms_parts,
+/turf/open/floor/plasteel/dark,
+/area/ship/cargo)
 "pH" = (
 /obj/machinery/advanced_airlock_controller{
 	pixel_x = 32
@@ -1330,6 +1426,7 @@
 /area/ship/engineering/engine)
 "pO" = (
 /obj/structure/railing,
+/obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/plasteel,
 /area/ship/cargo)
 "qd" = (
@@ -1357,6 +1454,23 @@
 	},
 /turf/open/floor/plasteel/dark,
 /area/ship/crew/canteen)
+"qt" = (
+/obj/effect/turf_decal/industrial/warning,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 8
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/effect/turf_decal/siding/thinplating{
+	dir = 1
+	},
+/turf/open/floor/plasteel/patterned/cargo_one,
+/area/ship/cargo/hangar)
 "qw" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
@@ -1366,13 +1480,21 @@
 /obj/structure/cable{
 	icon_state = "0-8"
 	},
-/turf/open/floor/plasteel,
+/obj/effect/turf_decal/steeldecal/steel_decals_central7,
+/turf/open/floor/plasteel/dark,
 /area/ship/cargo/hangar)
+"qB" = (
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/turf/closed/wall/mineral/titanium/nodiagonal,
+/area/ship/crew)
 "qD" = (
 /obj/effect/turf_decal/industrial/traffic{
 	dir = 4
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
+/obj/machinery/firealarm/directional/east,
 /turf/open/floor/plasteel/patterned/ridged,
 /area/ship/cargo)
 "qE" = (
@@ -1417,13 +1539,17 @@
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/machinery/light/dim/directional/north,
+/obj/machinery/mineral/processing_unit_console{
+	machinedir = 8;
+	pixel_x = -30;
+	pixel_y = -32
+	},
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/cargo/hangar)
 "qN" = (
 /turf/open/floor/engine/hull,
 /area/ship/engineering/engine)
 "qS" = (
-/obj/structure/catwalk/over/plated_catwalk,
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4{
 	dir = 8
 	},
@@ -1439,16 +1565,20 @@
 /obj/structure/cable{
 	icon_state = "1-4"
 	},
+/obj/structure/catwalk/over/plated_catwalk,
 /turf/open/floor/plating,
 /area/ship/engineering/engine)
 "rc" = (
-/obj/structure/catwalk/over/plated_catwalk,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
 	dir = 4
 	},
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
+/obj/structure/catwalk/over/plated_catwalk,
+/obj/structure/cable/yellow{
+	icon_state = "2-9"
+	},
 /turf/open/floor/plating,
 /area/ship/engineering/engine)
 "rg" = (
@@ -1463,12 +1593,18 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/turf/open/floor/plasteel,
+/obj/effect/turf_decal/siding/thinplating{
+	dir = 1
+	},
+/turf/open/floor/plasteel/patterned/cargo_one,
 /area/ship/cargo/hangar)
 "rr" = (
 /obj/structure/chair{
 	dir = 8
 	},
+/obj/effect/turf_decal/corner/transparent/neutral{
+	dir = 1
+	},
 /turf/open/floor/plasteel/dark,
 /area/ship/crew/canteen)
 "rs" = (
@@ -1497,7 +1633,8 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/turf/open/floor/plasteel,
+/obj/effect/turf_decal/siding/thinplating,
+/turf/open/floor/plasteel/patterned/cargo_one,
 /area/ship/cargo/hangar)
 "ru" = (
 /obj/structure/cable{
@@ -1505,7 +1642,27 @@
 	},
 /turf/closed/wall/mineral/titanium/nodiagonal,
 /area/ship/cargo/hangar)
+"rB" = (
+/obj/effect/turf_decal/industrial/warning{
+	dir = 1
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/effect/turf_decal/siding/thinplating,
+/turf/open/floor/plasteel/patterned/cargo_one,
+/area/ship/cargo/hangar)
 "rD" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 9
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 5
+	},
+/obj/effect/turf_decal/industrial/caution{
+	dir = 1
+	},
 /turf/open/floor/plasteel/dark,
 /area/ship/engineering/communications)
 "rH" = (
@@ -1516,19 +1673,22 @@
 /turf/open/floor/plasteel/telecomms_floor,
 /area/ship/cargo/hangar)
 "rZ" = (
-/obj/effect/turf_decal/borderfloor/full,
 /obj/machinery/door/firedoor/border_only{
 	dir = 4
 	},
 /obj/machinery/door/firedoor/border_only{
 	dir = 8
 	},
-/turf/open/floor/plasteel/tech/grid,
+/obj/effect/turf_decal/steeldecal/steel_decals_central2{
+	dir = 4
+	},
+/obj/effect/turf_decal/steeldecal/steel_decals_central2{
+	dir = 8
+	},
+/turf/open/floor/plasteel/dark,
 /area/ship/hallway/central)
 "sb" = (
-/obj/structure/catwalk/over/plated_catwalk/white{
-	color = "#4c535b"
-	},
+/obj/structure/catwalk/over/plated_catwalk/dark,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2{
 	dir = 4
@@ -1570,8 +1730,17 @@
 "sn" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
+/turf/open/floor/plasteel/patterned,
 /area/ship/cargo)
+"sq" = (
+/obj/effect/turf_decal/solarpanel,
+/obj/machinery/power/solar,
+/obj/structure/cable/yellow,
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/turf/open/floor/plating,
+/area/ship/engineering/engine)
 "sv" = (
 /obj/effect/turf_decal/industrial/warning/corner,
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
@@ -1581,7 +1750,10 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/turf/open/floor/plasteel,
+/obj/effect/turf_decal/siding/thinplating{
+	dir = 1
+	},
+/turf/open/floor/plasteel/patterned,
 /area/ship/cargo/hangar)
 "sC" = (
 /obj/structure/table,
@@ -1589,6 +1761,12 @@
 	pixel_y = 4
 	},
 /obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/turf_decal/corner/transparent/neutral{
+	dir = 4
+	},
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
 /turf/open/floor/plasteel/dark,
 /area/ship/engineering/engine)
 "sD" = (
@@ -1602,12 +1780,8 @@
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
 "sF" = (
-/obj/item/kirbyplants{
-	icon_state = "plant-03";
-	pixel_x = 4;
-	layer = 4.2
-	},
 /obj/effect/turf_decal/corner/transparent/neutral,
+/obj/structure/closet/crate/bin,
 /turf/open/floor/plasteel/dark,
 /area/ship/crew/canteen)
 "sH" = (
@@ -1632,7 +1806,11 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/turf/open/floor/plasteel,
+/obj/effect/turf_decal/siding/thinplating{
+	dir = 1
+	},
+/obj/machinery/firealarm/directional/north,
+/turf/open/floor/plasteel/patterned/ridged,
 /area/ship/cargo/hangar)
 "sR" = (
 /obj/structure/sign/nanotrasen,
@@ -1643,7 +1821,7 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
 	dir = 9
 	},
-/turf/open/floor/plasteel,
+/turf/open/floor/plasteel/dark,
 /area/ship/cargo/hangar)
 "tf" = (
 /obj/structure/sign/poster/official/miners{
@@ -1662,7 +1840,10 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/turf/open/floor/plasteel,
+/obj/effect/turf_decal/siding/thinplating{
+	dir = 1
+	},
+/turf/open/floor/plasteel/patterned,
 /area/ship/cargo/hangar)
 "tU" = (
 /obj/machinery/light/directional/north,
@@ -1744,7 +1925,7 @@
 /obj/structure/cable{
 	icon_state = "0-4"
 	},
-/obj/machinery/power/shuttle/engine/electric/bad{
+/obj/machinery/power/shuttle/engine/electric{
 	dir = 4
 	},
 /turf/open/floor/plating,
@@ -1752,12 +1933,24 @@
 "ut" = (
 /turf/template_noop,
 /area/template_noop)
+"uv" = (
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/turf/closed/wall/r_wall,
+/area/ship/engineering/engine)
 "uz" = (
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
 	dir = 1
 	},
 /turf/open/floor/plasteel,
 /area/ship/crew)
+"uA" = (
+/obj/effect/turf_decal/solarpanel,
+/obj/machinery/power/tracker,
+/obj/structure/cable/yellow,
+/turf/open/floor/plating,
+/area/ship/engineering/engine)
 "uD" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -1781,6 +1974,12 @@
 /obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/plating,
 /area/ship/engineering/engine)
+"uZ" = (
+/obj/structure/cable/yellow{
+	icon_state = "2-8"
+	},
+/turf/closed/wall/mineral/titanium/nodiagonal,
+/area/ship/crew)
 "vi" = (
 /obj/machinery/computer/cargo/express{
 	dir = 4
@@ -1798,14 +1997,14 @@
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
-/area/ship/engineering/engine)
-"vE" = (
-/obj/effect/turf_decal/ntspaceworks_big/five{
-	dir = 8
+/obj/effect/turf_decal/corner/transparent/neutral{
+	dir = 5
 	},
-/turf/open/floor/plasteel/patterned,
-/area/ship/cargo/hangar)
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/engineering/engine)
 "vO" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/structure/closet/crate,
@@ -1847,14 +2046,15 @@
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
 "wb" = (
-/obj/structure/table,
-/obj/item/storage/toolbox/electrical{
-	pixel_y = 5
-	},
-/obj/item/storage/toolbox/mechanical,
-/obj/item/stack/cable_coil/red,
 /obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/plasteel/dark,
+/obj/structure/catwalk/over/plated_catwalk/dark,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 6
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 6
+	},
+/turf/open/floor/plating,
 /area/ship/engineering/engine)
 "wc" = (
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
@@ -1872,6 +2072,36 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
+"wh" = (
+/obj/structure/closet/secure_closet{
+	anchored = 1;
+	icon_state = "eng_secure";
+	name = "field technician's locker";
+	req_access = list(11)
+	},
+/obj/item/clothing/gloves/color/yellow,
+/obj/item/storage/toolbox/mechanical,
+/obj/item/holosign_creator/engineering,
+/obj/item/tank/internals/emergency_oxygen/engi,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/turf_decal/box,
+/obj/effect/turf_decal/corner/transparent/neutral,
+/obj/item/storage/bag/ore,
+/obj/item/clothing/mask/gas/explorer,
+/obj/item/stack/marker_beacon/thirty,
+/obj/item/gun/energy/kinetic_accelerator,
+/obj/item/gps/engineering{
+	gpstag = "TECH0"
+	},
+/obj/item/mining_scanner,
+/obj/item/analyzer{
+	pixel_y = 4
+	},
+/obj/item/clothing/head/hardhat/weldhat,
+/obj/item/clothing/glasses/meson/engine,
+/turf/open/floor/plasteel/dark,
+/area/ship/cargo/hangar)
 "ws" = (
 /obj/structure/bedsheetbin,
 /obj/structure/table,
@@ -1891,11 +2121,7 @@
 /turf/open/floor/plating,
 /area/ship/engineering/engine)
 "wT" = (
-/obj/effect/turf_decal/trimline/opaque/white/line,
-/obj/effect/turf_decal/industrial/warning{
-	dir = 4
-	},
-/turf/open/floor/plasteel,
+/turf/open/floor/plasteel/dark,
 /area/ship/cargo/hangar)
 "xc" = (
 /obj/effect/decal/cleanable/dirt/dust,
@@ -1939,7 +2165,7 @@
 	dir = 10
 	},
 /obj/effect/turf_decal/industrial/loading,
-/turf/open/floor/plasteel,
+/turf/open/floor/plasteel/dark,
 /area/ship/cargo/hangar)
 "xB" = (
 /obj/machinery/vending/snack/random,
@@ -1961,7 +2187,8 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/turf/open/floor/plasteel,
+/obj/effect/turf_decal/siding/thinplating,
+/turf/open/floor/plasteel/patterned,
 /area/ship/cargo/hangar)
 "xG" = (
 /obj/effect/turf_decal/industrial/outline/yellow,
@@ -1990,6 +2217,9 @@
 /turf/open/floor/carpet,
 /area/ship/crew)
 "xZ" = (
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
 /turf/closed/wall/mineral/titanium/nodiagonal,
 /area/ship/engineering/engine)
 "yd" = (
@@ -2006,11 +2236,12 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/turf/open/floor/plasteel,
+/obj/effect/turf_decal/siding/thinplating,
+/turf/open/floor/plasteel/patterned/ridged,
 /area/ship/cargo/hangar)
 "ye" = (
 /obj/machinery/telecomms/bus/preset_two{
-	network = "ntsv_commnet"
+	network = "nt_commnet"
 	},
 /turf/open/floor/circuit/green/telecomms/mainframe,
 /area/ship/engineering/communications)
@@ -2037,7 +2268,7 @@
 /area/ship/cargo/hangar)
 "yI" = (
 /obj/machinery/telecomms/receiver/preset_left{
-	network = "ntsv_commnet";
+	network = "nt_commnet";
 	id = "Nanotrasen Receiver"
 	},
 /obj/structure/window/reinforced/spawner,
@@ -2071,7 +2302,7 @@
 	dir = 4;
 	name = "Cargo Bay"
 	},
-/turf/open/floor/plasteel,
+/turf/open/floor/plasteel/dark,
 /area/ship/hallway/central)
 "yO" = (
 /obj/effect/turf_decal/industrial/warning/corner{
@@ -2087,14 +2318,14 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/turf/open/floor/plasteel,
+/obj/effect/turf_decal/siding/thinplating,
+/turf/open/floor/plasteel/patterned,
 /area/ship/cargo/hangar)
 "yV" = (
 /obj/effect/turf_decal/industrial/hatch/yellow,
 /turf/open/floor/plasteel/dark,
 /area/ship/cargo)
 "zj" = (
-/obj/structure/catwalk/over/plated_catwalk,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
 	dir = 8
 	},
@@ -2104,21 +2335,16 @@
 /obj/structure/cable{
 	icon_state = "1-4"
 	},
+/obj/structure/catwalk/over/plated_catwalk,
 /turf/open/floor/plating,
 /area/ship/engineering/engine)
 "zr" = (
-/obj/structure/catwalk/over/plated_catwalk/white{
-	color = "#4c535b"
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
-	dir = 6
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
-	dir = 6
-	},
+/obj/structure/catwalk/over/plated_catwalk/dark,
 /obj/structure/cable{
 	icon_state = "5-8"
 	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
 /turf/open/floor/plating,
 /area/ship/engineering/engine)
 "zu" = (
@@ -2138,9 +2364,6 @@
 	},
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/turf_decal/industrial/warning{
-	dir = 4
-	},
 /obj/structure/cable{
 	icon_state = "0-1"
 	},
@@ -2163,8 +2386,9 @@
 /area/ship/engineering/engine)
 "zY" = (
 /obj/effect/landmark/subship{
-	subship_template = /datum/map_template/shuttle/subshuttles/anole
+	subship_template = /datum/map_template/shuttle/subshuttles/anole/damaged
 	},
+/obj/effect/turf_decal/ntspaceworks_small,
 /turf/open/floor/plating,
 /area/ship/cargo/hangar)
 "Ag" = (
@@ -2185,7 +2409,7 @@
 /obj/effect/turf_decal/trimline/opaque/white/warning{
 	dir = 1
 	},
-/turf/open/floor/plasteel,
+/turf/open/floor/plasteel/dark,
 /area/ship/hallway/central)
 "Ak" = (
 /obj/effect/turf_decal/industrial/outline/yellow,
@@ -2195,6 +2419,9 @@
 /obj/machinery/door/window/northleft{
 	req_access_txt = "61"
 	},
+/obj/effect/turf_decal/industrial/warning{
+	dir = 1
+	},
 /turf/open/floor/plasteel/telecomms_floor,
 /area/ship/engineering/communications)
 "Aq" = (
@@ -2213,9 +2440,7 @@
 	},
 /area/ship/hallway/central)
 "Ay" = (
-/obj/structure/catwalk/over/plated_catwalk/white{
-	color = "#4c535b"
-	},
+/obj/structure/catwalk/over/plated_catwalk/dark,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
 	dir = 10
 	},
@@ -2225,6 +2450,9 @@
 /obj/structure/cable{
 	icon_state = "2-9"
 	},
+/obj/structure/cable/yellow{
+	icon_state = "1-10"
+	},
 /turf/open/floor/plating,
 /area/ship/engineering/engine)
 "Az" = (
@@ -2242,6 +2470,10 @@
 /obj/machinery/light/dim/directional/east,
 /turf/open/floor/plasteel/stairs,
 /area/ship/engineering/engine)
+"AU" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel,
+/area/ship/cargo)
 "Bh" = (
 /obj/effect/turf_decal/siding/thinplating{
 	dir = 4
@@ -2254,7 +2486,7 @@
 /area/ship/hallway/central)
 "Bk" = (
 /obj/machinery/telecomms/broadcaster/preset_left{
-	network = "ntsv_commnet";
+	network = "nt_commnet";
 	id = "Nanotrasen Broadcaster"
 	},
 /obj/structure/window/reinforced/spawner,
@@ -2264,7 +2496,7 @@
 /obj/structure/railing{
 	dir = 4
 	},
-/obj/structure/table,
+/obj/structure/closet/crate/bin,
 /turf/open/floor/plasteel,
 /area/ship/cargo/hangar)
 "Bn" = (
@@ -2297,6 +2529,9 @@
 /obj/item/reagent_containers/food/drinks/coffee{
 	pixel_y = 3
 	},
+/obj/effect/turf_decal/corner/transparent/lime{
+	dir = 10
+	},
 /turf/open/floor/plasteel/dark,
 /area/ship/crew/canteen)
 "Bx" = (
@@ -2310,7 +2545,12 @@
 /area/ship/crew/canteen)
 "BG" = (
 /obj/machinery/light/directional/south,
-/turf/open/floor/plasteel,
+/obj/structure/plaque/static_plaque{
+	name = "Prospector Tribute";
+	desc = "Erected in 484 FS, this plaque pays homage to all of the Nanotrasen miners and salvagers who were killed or injured in their excursions.";
+	pixel_y = -32
+	},
+/turf/open/floor/plasteel/dark,
 /area/ship/cargo/hangar)
 "BH" = (
 /obj/structure/table,
@@ -2325,11 +2565,11 @@
 /turf/open/floor/plasteel/dark,
 /area/ship/cargo)
 "BJ" = (
-/obj/machinery/suit_storage_unit/mining,
 /obj/effect/turf_decal/corner/transparent/neutral{
 	dir = 8
 	},
 /obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/suit_storage_unit/engine,
 /turf/open/floor/plasteel/dark,
 /area/ship/cargo/hangar)
 "BP" = (
@@ -2340,9 +2580,6 @@
 	dir = 1
 	},
 /obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/turf_decal/industrial/warning{
-	dir = 4
-	},
 /obj/machinery/button/door{
 	dir = 1;
 	id = "tegus_port_engine";
@@ -2355,7 +2592,6 @@
 /turf/open/floor/plasteel/dark,
 /area/ship/engineering/engine)
 "Cb" = (
-/obj/structure/catwalk/over/plated_catwalk,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2{
 	dir = 4
@@ -2366,6 +2602,7 @@
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
+/obj/structure/catwalk/over/plated_catwalk,
 /turf/open/floor/plating,
 /area/ship/engineering/engine)
 "Cg" = (
@@ -2387,8 +2624,16 @@
 /obj/structure/cable{
 	icon_state = "1-4"
 	},
-/turf/open/floor/plasteel,
+/obj/effect/turf_decal/siding/thinplating,
+/turf/open/floor/plasteel/patterned/cargo_one,
 /area/ship/cargo/hangar)
+"Cm" = (
+/obj/effect/turf_decal/industrial/outline/yellow,
+/obj/machinery/pipedispenser{
+	anchored = 0
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/cargo)
 "Cr" = (
 /obj/effect/turf_decal/siding/wood/end{
 	dir = 8
@@ -2420,7 +2665,10 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/turf/open/floor/plasteel,
+/obj/effect/turf_decal/siding/thinplating{
+	dir = 1
+	},
+/turf/open/floor/plasteel/patterned,
 /area/ship/cargo/hangar)
 "CC" = (
 /obj/effect/turf_decal/industrial/warning{
@@ -2433,7 +2681,8 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/turf/open/floor/plasteel,
+/obj/effect/turf_decal/siding/thinplating,
+/turf/open/floor/plasteel/patterned/cargo_one,
 /area/ship/cargo/hangar)
 "CD" = (
 /obj/effect/turf_decal/industrial/warning{
@@ -2474,12 +2723,10 @@
 	dir = 1
 	},
 /obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/plasteel,
+/turf/open/floor/plasteel/dark,
 /area/ship/hallway/central)
 "CO" = (
-/obj/structure/catwalk/over/plated_catwalk/white{
-	color = "#4c535b"
-	},
+/obj/structure/catwalk/over/plated_catwalk/dark,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
 	dir = 5
 	},
@@ -2573,7 +2820,7 @@
 /turf/open/floor/plasteel/patterned,
 /area/ship/hallway/central)
 "Dk" = (
-/turf/open/floor/plasteel,
+/turf/open/floor/plasteel/patterned/ridged,
 /area/ship/cargo/hangar)
 "DF" = (
 /obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/layer4{
@@ -2603,7 +2850,7 @@
 /obj/machinery/atmospherics/pipe/simple/brown/visible/layer2{
 	dir = 9
 	},
-/turf/closed/wall/mineral/titanium/nodiagonal,
+/turf/closed/wall,
 /area/ship/engineering/engine)
 "Eg" = (
 /turf/closed/wall,
@@ -2631,7 +2878,10 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/turf/open/floor/plasteel,
+/obj/effect/turf_decal/siding/thinplating{
+	dir = 1
+	},
+/turf/open/floor/plasteel/patterned/ridged,
 /area/ship/cargo/hangar)
 "Ev" = (
 /obj/structure/table/reinforced,
@@ -2642,7 +2892,7 @@
 /area/ship/bridge)
 "ES" = (
 /obj/machinery/telecomms/hub/preset{
-	network = "ntsv_commnet"
+	network = "nt_commnet"
 	},
 /turf/open/floor/circuit/telecomms/mainframe,
 /area/ship/engineering/communications)
@@ -2655,7 +2905,8 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/turf/open/floor/plasteel,
+/obj/effect/turf_decal/siding/thinplating,
+/turf/open/floor/plasteel/patterned/cargo_one,
 /area/ship/cargo/hangar)
 "Fd" = (
 /obj/effect/turf_decal/industrial/warning,
@@ -2670,7 +2921,10 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/turf/open/floor/plasteel,
+/obj/effect/turf_decal/siding/thinplating{
+	dir = 1
+	},
+/turf/open/floor/plasteel/patterned/cargo_one,
 /area/ship/cargo/hangar)
 "Fg" = (
 /obj/structure/table,
@@ -2699,19 +2953,13 @@
 	icon_state = "0-4"
 	},
 /obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/plasteel,
+/turf/open/floor/plasteel/patterned/ridged,
 /area/ship/engineering/engine)
-"Ft" = (
-/obj/effect/turf_decal/ntspaceworks_big/eight{
-	dir = 8
-	},
-/turf/open/floor/plasteel/patterned,
-/area/ship/cargo/hangar)
 "Fy" = (
 /obj/machinery/atmospherics/pipe/simple/brown/visible/layer2{
 	dir = 4
 	},
-/turf/closed/wall/mineral/titanium/nodiagonal,
+/turf/closed/wall/r_wall,
 /area/ship/engineering/engine)
 "FA" = (
 /obj/effect/decal/cleanable/dirt/dust,
@@ -2721,17 +2969,29 @@
 /turf/open/floor/wood,
 /area/ship/crew)
 "FF" = (
-/obj/effect/spawner/structure/window/shuttle,
-/turf/open/floor/plating,
-/area/ship/cargo/hangar)
-"FL" = (
-/obj/machinery/blackbox_recorder,
-/obj/structure/window/reinforced/spawner/north,
-/turf/open/floor/circuit/telecomms/mainframe,
-/area/ship/engineering/communications)
-"FN" = (
-/obj/machinery/telecomms/processor/preset_two{
-	network = "ntsv_commnet"
+/obj/effect/turf_decal/industrial/warning,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 8
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/effect/turf_decal/siding/thinplating{
+	dir = 1
+	},
+/turf/open/floor/plasteel/patterned,
+/area/ship/cargo/hangar)
+"FL" = (
+/obj/machinery/blackbox_recorder,
+/obj/structure/window/reinforced/spawner/north,
+/turf/open/floor/circuit/telecomms/mainframe,
+/area/ship/engineering/communications)
+"FN" = (
+/obj/machinery/telecomms/processor/preset_two{
+	network = "nt_commnet"
 	},
 /turf/open/floor/circuit/green/telecomms/mainframe,
 /area/ship/engineering/communications)
@@ -2816,9 +3076,6 @@
 	},
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/turf_decal/industrial/warning{
-	dir = 4
-	},
 /obj/structure/cable{
 	icon_state = "0-2"
 	},
@@ -2832,7 +3089,7 @@
 /area/ship/bridge)
 "Hk" = (
 /obj/machinery/telecomms/relay/preset/auto{
-	network = "ntsv_commnet";
+	network = "nt_commnet";
 	id = "Tegus Relay"
 	},
 /turf/open/floor/circuit/telecomms/mainframe,
@@ -2887,6 +3144,12 @@
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
+/obj/effect/turf_decal/industrial/warning,
+/obj/effect/turf_decal/industrial/warning{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
 /turf/open/floor/plasteel/dark,
 /area/ship/engineering/communications)
 "HY" = (
@@ -2894,10 +3157,6 @@
 	dir = 8
 	},
 /obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/turf_decal/industrial/warning{
-	dir = 4
-	},
-/obj/effect/turf_decal/steeldecal/steel_decals_central7,
 /obj/structure/cable{
 	icon_state = "0-4"
 	},
@@ -2919,7 +3178,8 @@
 /obj/structure/cable{
 	icon_state = "2-8"
 	},
-/turf/open/floor/plasteel,
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/patterned/ridged,
 /area/ship/cargo/hangar)
 "Iv" = (
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4,
@@ -2948,32 +3208,24 @@
 /obj/structure/cable{
 	icon_state = "0-4"
 	},
-/turf/open/floor/plasteel,
-/area/ship/engineering/engine)
-"IU" = (
-/obj/effect/turf_decal/industrial/warning,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
-	dir = 8
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
+/obj/effect/turf_decal/corner/transparent/neutral/three_quarters{
+	dir = 1
 	},
-/turf/open/floor/plasteel,
-/area/ship/cargo/hangar)
+/turf/open/floor/plasteel/dark,
+/area/ship/engineering/engine)
 "Jr" = (
-/obj/structure/catwalk/over/plated_catwalk/white{
-	color = "#4c535b"
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/turf_decal/corner/transparent/neutral,
+/obj/machinery/power/solar_control{
+	dir = 1
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
-	dir = 9
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
-	dir = 9
+/obj/structure/cable/yellow{
+	icon_state = "0-2"
 	},
-/turf/open/floor/plating,
+/turf/open/floor/plasteel/dark,
 /area/ship/engineering/engine)
 "JO" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
@@ -2982,12 +3234,8 @@
 	dir = 8;
 	pixel_x = 28
 	},
-/turf/open/floor/plasteel,
+/turf/open/floor/plasteel/dark,
 /area/ship/hallway/central)
-"JR" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/plasteel,
-/area/ship/cargo/hangar)
 "JS" = (
 /obj/structure/sign/nanotrasen,
 /turf/closed/wall/mineral/titanium/nodiagonal,
@@ -3027,7 +3275,7 @@
 /obj/effect/turf_decal/trimline/opaque/white/line{
 	dir = 1
 	},
-/turf/open/floor/plasteel,
+/turf/open/floor/plasteel/dark,
 /area/ship/hallway/central)
 "Kj" = (
 /obj/structure/railing{
@@ -3078,7 +3326,6 @@
 	icon_state = "solgov_wall";
 	pixel_y = 28
 	},
-/obj/item/storage/backpack/captain,
 /obj/item/storage/backpack/duffelbag/captain,
 /obj/item/clothing/under/rank/command/captain/nt,
 /obj/item/clothing/under/rank/command/captain/nt/skirt,
@@ -3132,7 +3379,10 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/turf/open/floor/plasteel,
+/obj/effect/turf_decal/siding/thinplating{
+	dir = 1
+	},
+/turf/open/floor/plasteel/patterned,
 /area/ship/cargo/hangar)
 "LC" = (
 /obj/effect/turf_decal/industrial/warning,
@@ -3160,6 +3410,14 @@
 	},
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
+"LM" = (
+/obj/effect/turf_decal/industrial/warning{
+	dir = 4
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/patterned,
+/area/ship/cargo/hangar)
 "LV" = (
 /obj/machinery/door/airlock/external,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
@@ -3181,7 +3439,7 @@
 /obj/item/hand_labeler{
 	pixel_x = -4
 	},
-/turf/open/floor/plasteel,
+/turf/open/floor/plasteel/dark,
 /area/ship/cargo/hangar)
 "Mi" = (
 /obj/structure/cable{
@@ -3220,15 +3478,17 @@
 	},
 /turf/open/floor/plasteel/patterned/ridged,
 /area/ship/cargo)
-"Mx" = (
-/obj/effect/turf_decal/industrial/warning{
-	dir = 4
+"Mn" = (
+/obj/effect/turf_decal/solarpanel,
+/obj/machinery/power/solar,
+/obj/structure/cable/yellow{
+	icon_state = "0-2"
 	},
-/obj/effect/turf_decal/ntspaceworks_big/one{
-	dir = 8
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
 	},
-/turf/open/floor/plasteel/patterned,
-/area/ship/cargo/hangar)
+/turf/open/floor/plating,
+/area/ship/engineering/engine)
 "MH" = (
 /obj/structure/table/reinforced,
 /obj/machinery/computer/secure_data/laptop{
@@ -3241,7 +3501,7 @@
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
-/turf/open/floor/plasteel,
+/turf/open/floor/plasteel/patterned,
 /area/ship/cargo)
 "MP" = (
 /obj/effect/turf_decal/industrial/warning{
@@ -3271,33 +3531,32 @@
 /obj/effect/turf_decal/trimline/opaque/white/corner{
 	dir = 1
 	},
-/turf/open/floor/plasteel,
+/turf/open/floor/plasteel/dark,
 /area/ship/hallway/central)
 "MU" = (
-/obj/structure/catwalk/over/plated_catwalk,
 /obj/structure/cable/yellow{
 	icon_state = "4-8"
 	},
 /obj/structure/cable/yellow{
 	icon_state = "1-4"
 	},
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/catwalk/over/plated_catwalk,
 /turf/open/floor/plating,
 /area/ship/engineering/engine)
 "MY" = (
-/obj/machinery/power/port_gen/pacman/super,
 /obj/structure/window/reinforced/spawner/north,
 /obj/machinery/door/window/eastright,
-/obj/item/stack/sheet/mineral/uranium/five,
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/structure/cable/yellow{
 	icon_state = "0-4"
 	},
+/obj/machinery/power/port_gen/pacman,
+/obj/item/stack/sheet/mineral/plasma/five,
 /turf/open/floor/plasteel/dark,
 /area/ship/engineering/engine)
 "Nb" = (
-/obj/structure/catwalk/over/plated_catwalk/white{
-	color = "#4c535b"
-	},
+/obj/structure/catwalk/over/plated_catwalk/dark,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
 /obj/machinery/door/airlock/external/glass,
@@ -3309,7 +3568,9 @@
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
 	dir = 4
 	},
-/obj/machinery/light/directional/north,
+/obj/structure/noticeboard{
+	pixel_y = 28
+	},
 /turf/open/floor/wood,
 /area/ship/crew)
 "Nw" = (
@@ -3323,9 +3584,6 @@
 	},
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/turf_decal/industrial/warning{
-	dir = 4
-	},
 /obj/structure/cable{
 	icon_state = "0-2"
 	},
@@ -3338,7 +3596,7 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
 	dir = 10
 	},
-/turf/open/floor/plasteel,
+/turf/open/floor/plasteel/patterned,
 /area/ship/cargo/hangar)
 "Nz" = (
 /obj/effect/turf_decal/siding/thinplating/corner,
@@ -3357,13 +3615,8 @@
 /turf/closed/wall,
 /area/ship/cargo/hangar)
 "NC" = (
-/obj/effect/turf_decal/industrial/warning{
-	dir = 4
-	},
-/obj/effect/turf_decal/ntspaceworks_big/two{
-	dir = 8
-	},
-/turf/open/floor/plasteel/patterned,
+/obj/effect/turf_decal/ntspaceworks_small/left,
+/turf/open/floor/plating,
 /area/ship/cargo/hangar)
 "NL" = (
 /obj/structure/cable{
@@ -3385,6 +3638,7 @@
 /area/ship/hallway/central)
 "NT" = (
 /obj/machinery/door/window/southleft,
+/obj/effect/turf_decal/industrial/warning,
 /turf/open/floor/plasteel/telecomms_floor,
 /area/ship/engineering/communications)
 "NU" = (
@@ -3397,7 +3651,7 @@
 /obj/effect/turf_decal/trimline/opaque/white/line{
 	dir = 10
 	},
-/turf/open/floor/plasteel,
+/turf/open/floor/plasteel/dark,
 /area/ship/hallway/central)
 "NV" = (
 /obj/machinery/computer/helm{
@@ -3407,15 +3661,15 @@
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/bridge)
 "NZ" = (
-/obj/machinery/mineral/processing_unit_console{
-	machinedir = 8;
-	pixel_x = -30
-	},
 /obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/conveyor_switch/oneway{
+	pixel_x = -10;
+	pixel_y = 10;
+	id = "tegusbelt"
+	},
 /turf/open/floor/plasteel/dark,
 /area/ship/cargo/hangar)
 "Oo" = (
-/obj/effect/turf_decal/borderfloor/full,
 /obj/machinery/door/firedoor/border_only{
 	dir = 4
 	},
@@ -3431,7 +3685,13 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/turf/open/floor/plasteel/tech/grid,
+/obj/effect/turf_decal/steeldecal/steel_decals_central2{
+	dir = 4
+	},
+/obj/effect/turf_decal/steeldecal/steel_decals_central2{
+	dir = 8
+	},
+/turf/open/floor/plasteel/dark,
 /area/ship/hallway/central)
 "Or" = (
 /obj/structure/catwalk/over/plated_catwalk,
@@ -3484,7 +3744,7 @@
 	dir = 4;
 	name = "Cargo Bay"
 	},
-/turf/open/floor/plasteel,
+/turf/open/floor/plasteel/dark,
 /area/ship/hallway/central)
 "OK" = (
 /obj/machinery/door/airlock{
@@ -3513,20 +3773,26 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
 	dir = 8
 	},
-/turf/open/floor/plasteel,
+/obj/item/kirbyplants{
+	icon_state = "plant-14";
+	layer = 4.2;
+	pixel_x = -3
+	},
+/turf/open/floor/plasteel/dark,
 /area/ship/cargo/hangar)
 "OU" = (
-/obj/structure/catwalk/over/plated_catwalk/white{
-	color = "#4c535b"
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
-	dir = 6
+/obj/structure/catwalk/over/plated_catwalk/dark,
+/obj/structure/cable{
+	icon_state = "4-10"
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
-	dir = 6
+	dir = 8
 	},
-/obj/structure/cable{
-	icon_state = "4-10"
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 4
+	},
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
 	},
 /turf/open/floor/plating,
 /area/ship/engineering/engine)
@@ -3536,10 +3802,6 @@
 	},
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/turf_decal/industrial/warning{
-	dir = 4
-	},
-/obj/effect/turf_decal/steeldecal/steel_decals_central7,
 /obj/machinery/atmospherics/components/binary/volume_pump/layer2{
 	name = "Scrubbers to External"
 	},
@@ -3555,7 +3817,6 @@
 /turf/open/floor/plasteel/dark,
 /area/ship/engineering/engine)
 "OX" = (
-/obj/effect/turf_decal/borderfloor/full,
 /obj/machinery/door/firedoor/border_only{
 	dir = 4
 	},
@@ -3565,8 +3826,21 @@
 /obj/structure/sign/poster/official/random{
 	pixel_y = 32
 	},
-/turf/open/floor/plasteel/tech/grid,
+/obj/effect/turf_decal/steeldecal/steel_decals_central2{
+	dir = 4
+	},
+/obj/effect/turf_decal/steeldecal/steel_decals_central2{
+	dir = 8
+	},
+/turf/open/floor/plasteel/dark,
 /area/ship/hallway/central)
+"Pa" = (
+/obj/effect/turf_decal/industrial/warning{
+	dir = 4
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/patterned,
+/area/ship/cargo/hangar)
 "Pb" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable{
@@ -3610,6 +3884,12 @@
 	dir = 1
 	},
 /obj/machinery/door/firedoor/border_only,
+/obj/effect/turf_decal/industrial/warning,
+/obj/effect/turf_decal/industrial/warning{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
 /turf/open/floor/plasteel/dark,
 /area/ship/engineering/communications)
 "Pw" = (
@@ -3637,11 +3917,12 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/turf/open/floor/plasteel,
+/obj/effect/turf_decal/siding/thinplating,
+/turf/open/floor/plasteel/patterned/cargo_one,
 /area/ship/cargo/hangar)
 "PI" = (
 /obj/machinery/telecomms/server/presets/nanotrasen{
-	network = "ntsv_commnet"
+	network = "nt_commnet"
 	},
 /obj/structure/window/reinforced/spawner/north,
 /turf/open/floor/circuit/telecomms/mainframe,
@@ -3654,11 +3935,29 @@
 /area/ship/crew)
 "Qa" = (
 /obj/machinery/airalarm/directional/east,
-/turf/open/floor/plasteel/dark,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+	dir = 8
+	},
+/turf/open/floor/plasteel/tech,
 /area/ship/engineering/communications)
+"Qd" = (
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/obj/structure/cable/yellow{
+	icon_state = "2-4"
+	},
+/turf/closed/wall/r_wall,
+/area/ship/engineering/engine)
 "Qq" = (
 /obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/plasteel,
+/obj/structure/sign/warning/electricshock{
+	pixel_x = -32
+	},
+/obj/effect/turf_decal/corner/transparent/neutral/three_quarters{
+	dir = 4
+	},
+/turf/open/floor/plasteel/dark,
 /area/ship/engineering/engine)
 "Qw" = (
 /obj/effect/spawner/structure/window/reinforced,
@@ -3675,7 +3974,10 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/turf/open/floor/plasteel,
+/obj/effect/turf_decal/corner/transparent/neutral{
+	dir = 10
+	},
+/turf/open/floor/plasteel/dark,
 /area/ship/engineering/engine)
 "QZ" = (
 /obj/effect/spawner/structure/window/shuttle,
@@ -3697,15 +3999,9 @@
 	},
 /turf/open/floor/plasteel/dark,
 /area/ship/cargo)
-"Rv" = (
-/obj/effect/turf_decal/trimline/opaque/white/line{
-	dir = 1
-	},
-/turf/open/floor/plasteel,
-/area/ship/cargo/hangar)
 "Rx" = (
 /obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/plasteel,
+/turf/open/floor/plasteel/patterned,
 /area/ship/cargo)
 "Ry" = (
 /obj/machinery/atmospherics/components/binary/pump/on/layer4{
@@ -3716,10 +4012,13 @@
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/effect/decal/cleanable/oil,
 /obj/machinery/airalarm/directional/east,
+/obj/effect/turf_decal/corner/transparent/neutral{
+	dir = 4
+	},
 /turf/open/floor/plasteel/dark,
 /area/ship/engineering/engine)
 "Rz" = (
-/obj/machinery/atmospherics/components/unary/outlet_injector/layer2{
+/obj/machinery/atmospherics/components/unary/outlet_injector/on/layer2{
 	dir = 4
 	},
 /turf/open/floor/engine/hull,
@@ -3740,7 +4039,8 @@
 /obj/structure/cable{
 	icon_state = "1-8"
 	},
-/turf/open/floor/plasteel,
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/patterned/ridged,
 /area/ship/cargo/hangar)
 "RI" = (
 /obj/machinery/door/airlock/grunge{
@@ -3778,7 +4078,8 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/turf/open/floor/plasteel,
+/obj/effect/turf_decal/siding/thinplating,
+/turf/open/floor/plasteel/patterned/ridged,
 /area/ship/cargo/hangar)
 "RR" = (
 /obj/effect/turf_decal/industrial/loading{
@@ -3814,7 +4115,6 @@
 /turf/open/floor/plasteel,
 /area/ship/hallway/central)
 "Sg" = (
-/obj/effect/turf_decal/borderfloor/full,
 /obj/machinery/door/firedoor/border_only{
 	dir = 4
 	},
@@ -3830,11 +4130,17 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
 	dir = 8
 	},
-/turf/open/floor/plasteel/tech/grid,
+/obj/effect/turf_decal/steeldecal/steel_decals_central2{
+	dir = 4
+	},
+/obj/effect/turf_decal/steeldecal/steel_decals_central2{
+	dir = 8
+	},
+/turf/open/floor/plasteel/dark,
 /area/ship/hallway/central)
 "Sj" = (
-/obj/machinery/suit_storage_unit/mining,
 /obj/effect/turf_decal/corner/transparent/neutral,
+/obj/machinery/suit_storage_unit/engine,
 /turf/open/floor/plasteel/dark,
 /area/ship/cargo/hangar)
 "Sp" = (
@@ -3853,7 +4159,7 @@
 	},
 /obj/effect/turf_decal/siding/thinplating,
 /obj/effect/turf_decal/trimline/opaque/white/line,
-/turf/open/floor/plasteel,
+/turf/open/floor/plasteel/dark,
 /area/ship/hallway/central)
 "SC" = (
 /obj/structure/cable{
@@ -3873,6 +4179,19 @@
 	},
 /turf/open/floor/plasteel,
 /area/ship/hallway/central)
+"SF" = (
+/obj/effect/turf_decal/industrial/outline/yellow,
+/obj/structure/closet/crate/engineering{
+	name = "Shuttle Repair Supplies"
+	},
+/obj/item/stack/sheet/metal/five,
+/obj/item/stack/sheet/glass/five,
+/obj/item/storage/box/lights/mixed,
+/obj/item/storage/box/stockparts/basic,
+/obj/item/circuitboard/computer/crew,
+/obj/item/circuitboard/computer/shuttle/helm,
+/turf/open/floor/plasteel/dark,
+/area/ship/cargo)
 "SI" = (
 /obj/machinery/door/airlock/grunge{
 	dir = 4;
@@ -3900,13 +4219,13 @@
 /turf/open/floor/plasteel,
 /area/ship/cargo)
 "SS" = (
-/obj/machinery/power/port_gen/pacman/super,
 /obj/machinery/door/window/eastleft,
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/structure/cable/yellow{
 	icon_state = "0-4"
 	},
+/obj/machinery/power/port_gen/pacman,
 /turf/open/floor/plasteel/dark,
 /area/ship/engineering/engine)
 "SW" = (
@@ -4009,15 +4328,19 @@
 /obj/effect/turf_decal/industrial/warning{
 	dir = 4
 	},
-/obj/effect/turf_decal/ntspaceworks_big/four{
-	dir = 8
-	},
 /turf/open/floor/plasteel/patterned,
 /area/ship/cargo/hangar)
 "Vy" = (
 /obj/structure/cable{
 	icon_state = "2-8"
 	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 10
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 6
+	},
+/obj/effect/turf_decal/industrial/caution,
 /turf/open/floor/plasteel/dark,
 /area/ship/engineering/communications)
 "VC" = (
@@ -4025,6 +4348,9 @@
 	dir = 8
 	},
 /obj/machinery/light/directional/east,
+/obj/effect/turf_decal/corner/transparent/neutral{
+	dir = 8
+	},
 /turf/open/floor/plasteel/dark,
 /area/ship/crew/canteen)
 "VO" = (
@@ -4032,10 +4358,9 @@
 	dir = 1
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
-/turf/open/floor/plasteel,
+/turf/open/floor/plasteel/dark,
 /area/ship/hallway/central)
 "VU" = (
-/obj/structure/catwalk/over/plated_catwalk,
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4{
 	dir = 4
 	},
@@ -4045,6 +4370,7 @@
 /obj/structure/cable{
 	icon_state = "2-8"
 	},
+/obj/structure/catwalk/over/plated_catwalk,
 /turf/open/floor/plating,
 /area/ship/engineering/engine)
 "Wf" = (
@@ -4063,15 +4389,12 @@
 /obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/plasteel,
 /area/ship/hallway/central)
-"Ww" = (
-/obj/effect/turf_decal/industrial/warning{
-	dir = 4
-	},
-/obj/effect/turf_decal/ntspaceworks_big/three{
-	dir = 8
+"Wp" = (
+/obj/structure/cable/yellow{
+	icon_state = "2-5"
 	},
-/turf/open/floor/plasteel/patterned,
-/area/ship/cargo/hangar)
+/turf/closed/wall,
+/area/ship/engineering/engine)
 "WO" = (
 /obj/machinery/door/airlock/engineering{
 	name = "Engine Room";
@@ -4092,6 +4415,12 @@
 /obj/machinery/door/firedoor/border_only{
 	dir = 8
 	},
+/obj/effect/turf_decal/industrial/warning{
+	dir = 4
+	},
+/obj/effect/turf_decal/industrial/warning{
+	dir = 8
+	},
 /turf/open/floor/plasteel,
 /area/ship/engineering/engine)
 "WR" = (
@@ -4139,7 +4468,7 @@
 /obj/effect/turf_decal/trimline/opaque/white/corner{
 	dir = 8
 	},
-/turf/open/floor/plasteel,
+/turf/open/floor/plasteel/dark,
 /area/ship/hallway/central)
 "XL" = (
 /obj/machinery/door/airlock/external,
@@ -4156,7 +4485,8 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/turf/open/floor/plasteel,
+/obj/effect/turf_decal/siding/thinplating,
+/turf/open/floor/plasteel/patterned,
 /area/ship/cargo/hangar)
 "XQ" = (
 /obj/effect/turf_decal/siding/thinplating/corner{
@@ -4171,10 +4501,12 @@
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
 /turf/open/floor/plasteel,
 /area/ship/hallway/central)
 "XS" = (
-/turf/closed/wall/mineral/titanium,
+/turf/closed/wall/r_wall,
 /area/ship/engineering/engine)
 "XV" = (
 /obj/machinery/light/directional/south,
@@ -4242,11 +4574,20 @@
 "YV" = (
 /obj/machinery/computer/telecomms/server{
 	dir = 8;
-	network = "ntsv_commnet"
+	network = "nt_commnet"
 	},
 /obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/plasteel/telecomms_floor,
 /area/ship/cargo/hangar)
+"YY" = (
+/obj/structure/chair{
+	dir = 4
+	},
+/obj/effect/turf_decal/corner/transparent/neutral{
+	dir = 4
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/crew/canteen)
 "YZ" = (
 /obj/effect/turf_decal/siding/thinplating/corner,
 /obj/effect/turf_decal/siding/thinplating/corner{
@@ -4257,15 +4598,11 @@
 /obj/structure/cable{
 	icon_state = "1-4"
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
-	dir = 8
-	},
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
-	dir = 4
-	},
+/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/plasteel,
 /area/ship/hallway/central)
 "Zl" = (
@@ -4298,9 +4635,42 @@
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/turf_decal/corner/transparent/neutral/three_quarters{
+	dir = 8
+	},
 /turf/open/floor/plasteel/dark,
 /area/ship/engineering/engine)
+"ZT" = (
+/obj/effect/turf_decal/industrial/warning,
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/effect/turf_decal/siding/thinplating{
+	dir = 1
+	},
+/turf/open/floor/plasteel/patterned/cargo_one,
+/area/ship/cargo/hangar)
+"ZV" = (
+/obj/effect/turf_decal/industrial/warning{
+	dir = 1
+	},
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 8
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/effect/turf_decal/siding/thinplating,
+/turf/open/floor/plasteel/patterned/cargo_one,
+/area/ship/cargo/hangar)
 "ZY" = (
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
 /turf/open/floor/plasteel/stairs,
 /area/ship/engineering/engine)
 
@@ -4311,13 +4681,14 @@ ut
 ut
 ut
 ut
+ut
 ui
 ui
 ui
 Rz
 XS
-xZ
-xZ
+XS
+XS
 XS
 qN
 ui
@@ -4329,6 +4700,7 @@ ut
 ut
 ut
 ut
+ut
 "}
 (2,1,1) = {"
 ut
@@ -4336,20 +4708,22 @@ ut
 ut
 ut
 ut
-xZ
+ut
+XS
 CT
 CT
 CT
 Fy
-xZ
+XS
 SS
 MY
-xZ
-xZ
+XS
+XS
 ht
 ht
 ht
-xZ
+XS
+ut
 ut
 ut
 ut
@@ -4360,9 +4734,10 @@ ut
 ut
 ut
 ut
-xZ
-xZ
-xZ
+ut
+XS
+XS
+XS
 GU
 OW
 BP
@@ -4371,13 +4746,14 @@ Qq
 cO
 MU
 IF
-xZ
+Cz
 Nw
 HY
 zH
-xZ
-xZ
-xZ
+XS
+XS
+XS
+ut
 ut
 ut
 ut
@@ -4386,18 +4762,19 @@ ut
 ut
 ut
 ut
+ut
 eN
 rs
 Nb
 sb
 hE
 CO
-xZ
+Wp
 vy
 eZ
 hh
 QA
-xZ
+Cz
 wb
 zr
 jq
@@ -4407,15 +4784,17 @@ eN
 ut
 ut
 ut
+ut
 "}
 (5,1,1) = {"
-ut
-ut
-xZ
-xZ
-xZ
-xZ
-xZ
+fe
+Mn
+Mn
+Qd
+uv
+uv
+uv
+uv
 sC
 Ay
 qF
@@ -4426,22 +4805,24 @@ rc
 ZY
 OU
 Jr
-xZ
-xZ
-xZ
-xZ
-xZ
-ut
-ut
+uv
+uv
+uv
+uv
+aV
+sq
+sq
+gh
 "}
 (6,1,1) = {"
-ut
-ut
-xZ
+fe
+Mn
+Mn
+lP
 qd
 vO
 Vd
-xZ
+Cz
 Zw
 Ry
 Lq
@@ -4452,22 +4833,24 @@ Cb
 AB
 bw
 hi
-xZ
+Cz
 eq
 yg
 kM
-xZ
-ut
-ut
+hw
+sq
+sq
+gh
 "}
 (7,1,1) = {"
 ut
 ut
+ut
 xZ
 iM
 xc
 uO
-hL
+jQ
 jQ
 jQ
 jQ
@@ -4478,17 +4861,19 @@ jQ
 jQ
 jQ
 jQ
-hL
+jQ
 RJ
 SW
 wv
 xZ
 ut
 ut
+ut
 "}
 (8,1,1) = {"
 ut
 ut
+ut
 xZ
 zR
 db
@@ -4508,14 +4893,16 @@ hL
 Gj
 Gj
 Gj
-Gj
+qB
+ut
 ut
 ut
 "}
 (9,1,1) = {"
-ut
-ut
-OL
+fe
+Mn
+Mn
+lh
 OL
 OL
 OL
@@ -4534,14 +4921,16 @@ hL
 cR
 CD
 PQ
-Gj
-ut
-ut
+iS
+sq
+sq
+gh
 "}
 (10,1,1) = {"
-ut
-ut
-OL
+fe
+Mn
+Mn
+nw
 cK
 nk
 qi
@@ -4560,13 +4949,15 @@ hL
 iY
 Ls
 wc
-Gj
-ut
-ut
+uZ
+sq
+sq
+uA
 "}
 (11,1,1) = {"
 ut
 ut
+ut
 OL
 UD
 dP
@@ -4589,9 +4980,11 @@ Gj
 Gj
 ut
 ut
+ut
 "}
 (12,1,1) = {"
 ut
+ut
 zu
 OL
 OL
@@ -4615,9 +5008,11 @@ ca
 Gj
 JS
 ut
+ut
 "}
 (13,1,1) = {"
 ut
+ut
 WR
 oE
 BE
@@ -4641,9 +5036,11 @@ FA
 ws
 WS
 ut
+ut
 "}
 (14,1,1) = {"
 ut
+ut
 WR
 yJ
 lQ
@@ -4667,14 +5064,16 @@ Ht
 Tk
 WS
 ut
+ut
 "}
 (15,1,1) = {"
 ut
+ut
 OL
 sj
 Bx
 fU
-fU
+YY
 kg
 Sa
 Iv
@@ -4693,9 +5092,11 @@ Gj
 Gj
 Gj
 ut
+ut
 "}
 (16,1,1) = {"
 ut
+ut
 WR
 xB
 TB
@@ -4719,9 +5120,11 @@ uz
 kU
 Gj
 ut
+ut
 "}
 (17,1,1) = {"
 ut
+ut
 WR
 qK
 tf
@@ -4745,9 +5148,11 @@ Gb
 zQ
 Gj
 ut
+ut
 "}
 (18,1,1) = {"
 ut
+ut
 lI
 OL
 gP
@@ -4771,9 +5176,11 @@ Zs
 Gj
 Gj
 ut
+ut
 "}
 (19,1,1) = {"
 ut
+ut
 lW
 RB
 Dj
@@ -4797,8 +5204,10 @@ DF
 RB
 lW
 ut
+ut
 "}
 (20,1,1) = {"
+ut
 fh
 kc
 TH
@@ -4823,9 +5232,11 @@ ff
 TH
 XL
 le
+ut
 "}
 (21,1,1) = {"
 ut
+ut
 iN
 lW
 lW
@@ -4849,6 +5260,7 @@ lW
 lW
 iN
 ut
+ut
 "}
 (22,1,1) = {"
 ut
@@ -4856,6 +5268,7 @@ ut
 ut
 ut
 ut
+ut
 pg
 Pb
 Aq
@@ -4875,6 +5288,7 @@ ut
 ut
 ut
 ut
+ut
 "}
 (23,1,1) = {"
 ut
@@ -4882,6 +5296,7 @@ ut
 ut
 ut
 ut
+ut
 Gg
 sn
 yV
@@ -4890,10 +5305,10 @@ yV
 GQ
 ti
 kS
-GQ
+AU
 Xm
 dQ
-Ak
+Cm
 kG
 bD
 ut
@@ -4901,6 +5316,7 @@ ut
 ut
 ut
 ut
+ut
 "}
 (24,1,1) = {"
 ut
@@ -4908,6 +5324,7 @@ ut
 ut
 ut
 ut
+ut
 LC
 Rx
 Xm
@@ -4917,9 +5334,9 @@ pO
 Ku
 Fg
 GQ
-Ak
+SF
 Rp
-Xm
+pC
 kG
 bD
 ut
@@ -4927,6 +5344,7 @@ ut
 ut
 ut
 ut
+ut
 "}
 (25,1,1) = {"
 ut
@@ -4934,6 +5352,7 @@ ut
 ut
 ut
 ut
+ut
 WV
 ML
 Hl
@@ -4953,6 +5372,7 @@ ut
 ut
 ut
 ut
+ut
 "}
 (26,1,1) = {"
 ut
@@ -4960,6 +5380,7 @@ ut
 ut
 ut
 ut
+ut
 rH
 NA
 NA
@@ -4979,6 +5400,7 @@ ut
 ut
 ut
 ut
+ut
 "}
 (27,1,1) = {"
 ut
@@ -4986,42 +5408,45 @@ ut
 ut
 ut
 ut
+ut
 rH
 mu
 ol
 RF
-aH
-vE
+bL
+bL
 bl
-eW
-Ft
-Rv
+bl
+Dk
+bL
 Ia
 Ch
-pC
+jw
 rH
 ut
 ut
 ut
 ut
 ut
+ut
 "}
 (28,1,1) = {"
 ut
 ut
 ut
 ut
+ut
 sR
 rH
 qw
 sv
 oq
-wT
-Mx
-NC
-Ww
 Vv
-jx
+Pa
+Vv
+Pa
+LM
+LM
 Nx
 yO
 OQ
@@ -5031,12 +5456,14 @@ ut
 ut
 ut
 ut
+ut
 "}
 (29,1,1) = {"
 ut
 ut
 ut
 ut
+ut
 rH
 Kj
 xu
@@ -5048,7 +5475,7 @@ dr
 dr
 dr
 dr
-dr
+NC
 rt
 sW
 Sj
@@ -5057,16 +5484,18 @@ ut
 ut
 ut
 ut
+ut
 "}
 (30,1,1) = {"
 ut
 ut
 ut
 ut
+ut
 rH
 nW
 rH
-IU
+FF
 dr
 dr
 dr
@@ -5076,24 +5505,25 @@ dr
 dr
 zY
 xE
-Dk
+wT
 BJ
 rH
 ut
 ut
 ut
 ut
+ut
 "}
 (31,1,1) = {"
 ut
 ut
 ut
 ut
+ut
 rH
 yC
 rH
-IU
-dr
+FF
 dr
 dr
 dr
@@ -5101,24 +5531,27 @@ dr
 dr
 dr
 dr
+eW
 xE
-JR
+aR
 bs
 rH
 ut
 ut
 ut
 ut
+ut
 "}
 (32,1,1) = {"
 ut
 ut
 ut
 ut
+ut
 rH
 qL
 NZ
-IU
+FF
 dr
 dr
 dr
@@ -5128,19 +5561,21 @@ dr
 dr
 dr
 xE
-JR
-jw
+aR
+wh
 rH
 ut
 ut
 ut
 ut
+ut
 "}
 (33,1,1) = {"
 ut
 ut
 ut
 ut
+ut
 rH
 ng
 Ky
@@ -5154,19 +5589,21 @@ dr
 dr
 dr
 xE
-JR
+aR
 jb
 rH
 ut
 ut
 ut
 ut
+ut
 "}
 (34,1,1) = {"
 ut
 ut
 ut
 ut
+ut
 rH
 rH
 rH
@@ -5187,6 +5624,7 @@ ut
 ut
 ut
 ut
+ut
 "}
 (35,1,1) = {"
 ut
@@ -5194,6 +5632,7 @@ ut
 ut
 ut
 ut
+ut
 rH
 eh
 Lw
@@ -5213,16 +5652,18 @@ ut
 ut
 ut
 ut
+ut
 "}
 (36,1,1) = {"
 ut
 ut
 ut
 ut
+ut
 sR
 rH
 RT
-jn
+qt
 dr
 dr
 dr
@@ -5231,7 +5672,7 @@ dr
 dr
 dr
 dr
-yd
+ZV
 fD
 rH
 sR
@@ -5239,15 +5680,17 @@ ut
 ut
 ut
 ut
+ut
 "}
 (37,1,1) = {"
 ut
 ut
 ut
 ut
+ut
 QZ
 Me
-Dk
+wT
 Fd
 dr
 dr
@@ -5258,19 +5701,21 @@ dr
 dr
 dr
 PF
-JR
+aR
 mW
 QZ
 ut
 ut
 ut
 ut
+ut
 "}
 (38,1,1) = {"
 ut
 ut
 ut
 ut
+ut
 QZ
 nn
 fG
@@ -5291,12 +5736,14 @@ ut
 ut
 ut
 ut
+ut
 "}
 (39,1,1) = {"
 ut
 ut
 ut
 ut
+ut
 QZ
 gt
 uf
@@ -5317,15 +5764,17 @@ ut
 ut
 ut
 ut
+ut
 "}
 (40,1,1) = {"
 ut
 ut
 ut
+ut
 aw
 rH
 gV
-rH
+NA
 sK
 dr
 dr
@@ -5336,22 +5785,24 @@ dr
 dr
 dr
 hC
-rH
+NA
 RI
 rH
 rH
 ut
 ut
 ut
+ut
 "}
 (41,1,1) = {"
 ut
 ut
 ut
+ut
 aw
 mf
 Hw
-rH
+NA
 oA
 dr
 dr
@@ -5362,23 +5813,25 @@ dr
 dr
 dr
 CC
-rH
+NA
 xf
 FQ
 rH
 ut
 ut
 ut
+ut
 "}
 (42,1,1) = {"
 ut
 ut
 ut
+ut
 QZ
 du
 bv
-FF
-tD
+Qw
+ZT
 dr
 dr
 dr
@@ -5387,23 +5840,25 @@ dr
 dr
 dr
 dr
-am
-FF
+rB
+Qw
 cI
 js
 QZ
 ut
 ut
 ut
+ut
 "}
 (43,1,1) = {"
 ut
 ut
 ut
+ut
 QZ
 kp
 CQ
-FF
+Qw
 tD
 dr
 dr
@@ -5414,22 +5869,24 @@ dr
 dr
 dr
 XM
-FF
+Qw
 bK
 Zp
 QZ
 ut
 ut
 ut
+ut
 "}
 (44,1,1) = {"
 ut
 ut
 ut
+ut
 QZ
 Vs
 aR
-FF
+Qw
 tD
 dr
 dr
@@ -5440,22 +5897,24 @@ dr
 dr
 dr
 am
-FF
+Qw
 Bs
 Pw
 QZ
 ut
 ut
 ut
+ut
 "}
 (45,1,1) = {"
 ut
 ut
 ut
+ut
 rH
 aw
 YV
-rH
+NA
 li
 dr
 dr
@@ -5466,19 +5925,21 @@ dr
 dr
 dr
 EU
-rH
+NA
 rY
 aw
 rH
 ut
 ut
 ut
+ut
 "}
 (46,1,1) = {"
 ut
 ut
 ut
 ut
+ut
 aw
 aw
 rH
@@ -5499,4 +5960,5 @@ ut
 ut
 ut
 ut
+ut
 "}
diff --git a/_maps/shuttles/subshuttles/nanotrasen_anole.dmm b/_maps/shuttles/subshuttles/nanotrasen_anole.dmm
index ac739d8998f1..26ce2faf06ae 100644
--- a/_maps/shuttles/subshuttles/nanotrasen_anole.dmm
+++ b/_maps/shuttles/subshuttles/nanotrasen_anole.dmm
@@ -69,14 +69,14 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/obj/structure/catwalk/over/plated_catwalk,
+/obj/structure/catwalk/over/plated_catwalk/dark,
 /turf/open/floor/plating,
 /area/ship/shuttle)
 "dK" = (
-/obj/machinery/power/smes/engineering,
 /obj/structure/cable{
 	icon_state = "0-4"
 	},
+/obj/machinery/power/smes/micro/precharged,
 /turf/open/floor/plating,
 /area/ship/shuttle)
 "dU" = (
@@ -89,7 +89,6 @@
 /turf/open/floor/plasteel/patterned/ridged,
 /area/ship/shuttle)
 "fx" = (
-/obj/structure/catwalk/over/plated_catwalk,
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
@@ -102,6 +101,7 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
 	dir = 6
 	},
+/obj/structure/catwalk/over/plated_catwalk/dark,
 /turf/open/floor/plating,
 /area/ship/shuttle)
 "fO" = (
@@ -124,6 +124,15 @@
 	},
 /turf/open/floor/engine/hull,
 /area/ship/shuttle)
+"jk" = (
+/obj/machinery/porta_turret/centcom_shuttle/weak{
+	dir = 4;
+	name = "Sharplite Mining Turret";
+	shot_delay = 7.5;
+	desc = "An old Sharplite laser turret model developed for securing fauna-infested areas. Heavy use and much foundering renders this turret noticably inefficient, but it's still capable of packing a punch."
+	},
+/turf/closed/wall/mineral/titanium/nodiagonal,
+/area/ship/shuttle)
 "jW" = (
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
 /obj/effect/turf_decal/corner/transparent/neutral{
@@ -188,11 +197,11 @@
 /turf/open/floor/plasteel/patterned/ridged,
 /area/ship/shuttle)
 "oi" = (
-/obj/machinery/atmospherics/components/unary/tank/air{
-	piping_layer = 4;
+/obj/machinery/atmospherics/components/unary/portables_connector/visible/layer4{
 	dir = 1
 	},
-/turf/open/floor/plasteel/tech/grid,
+/obj/machinery/portable_atmospherics/canister/air,
+/turf/open/floor/plasteel/tech,
 /area/ship/shuttle)
 "oI" = (
 /obj/effect/turf_decal/corner/transparent/neutral{
@@ -339,9 +348,6 @@
 /turf/open/floor/plasteel/patterned/ridged,
 /area/ship/shuttle)
 "xB" = (
-/obj/effect/turf_decal/industrial/warning{
-	dir = 10
-	},
 /obj/structure/cable{
 	icon_state = "0-2"
 	},
@@ -354,13 +360,14 @@
 	pixel_x = -3;
 	pixel_y = 27
 	},
-/turf/open/floor/plasteel/tech,
+/turf/open/floor/plasteel/dark,
 /area/ship/shuttle)
 "yD" = (
 /obj/machinery/porta_turret/centcom_shuttle/weak{
 	dir = 4;
-	name = "Old Mining Turret";
-	shot_delay = 7.5
+	name = "Sharplite Mining Turret";
+	shot_delay = 7.5;
+	desc = "An old Sharplite laser turret model developed for securing fauna-infested areas. Heavy use and much foundering renders this turret noticably inefficient, but it's still capable of packing a punch."
 	},
 /turf/closed/wall/mineral/titanium,
 /area/ship/shuttle)
@@ -400,9 +407,8 @@
 /turf/open/floor/plasteel/tech,
 /area/ship/shuttle)
 "Au" = (
-/obj/effect/turf_decal/industrial/warning,
 /obj/machinery/telecomms/relay/preset/mining{
-	network = "ntsv_commnet"
+	network = "nt_commnet"
 	},
 /obj/machinery/airalarm/directional/east,
 /obj/machinery/light/small{
@@ -410,7 +416,7 @@
 	bulb_power = 0.5;
 	pixel_y = 28
 	},
-/turf/open/floor/plasteel/telecomms_floor,
+/turf/open/floor/plasteel/tech,
 /area/ship/shuttle)
 "AQ" = (
 /obj/machinery/door/window/eastleft,
@@ -436,9 +442,7 @@
 	dir = 1;
 	layer = 4.2
 	},
-/turf/open/floor/plasteel/patterned/monofloor{
-	dir = 4
-	},
+/turf/open/floor/plasteel/patterned/ridged,
 /area/ship/shuttle)
 "AZ" = (
 /obj/effect/spawner/structure/window/shuttle,
@@ -482,7 +486,7 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
 	},
-/obj/structure/catwalk/over/plated_catwalk,
+/obj/structure/catwalk/over/plated_catwalk/dark,
 /turf/open/floor/plating,
 /area/ship/shuttle)
 "Iq" = (
@@ -505,24 +509,13 @@
 /turf/open/floor/plating,
 /area/ship/shuttle)
 "Ks" = (
-/obj/effect/turf_decal/industrial/warning{
-	dir = 9
-	},
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
 	dir = 1
 	},
-/turf/open/floor/plasteel/tech,
-/area/ship/shuttle)
-"KQ" = (
-/obj/machinery/porta_turret/centcom_shuttle/weak{
-	dir = 4;
-	name = "Old Mining Turret";
-	shot_delay = 7.5
-	},
-/turf/closed/wall/mineral/titanium/nodiagonal,
+/turf/open/floor/plasteel/dark,
 /area/ship/shuttle)
 "LC" = (
 /obj/effect/turf_decal/trimline/opaque/solgovgold/warning,
@@ -548,8 +541,7 @@
 	dir = 8
 	},
 /obj/machinery/door/airlock/grunge{
-	dir = 4;
-	req_access = list(31)
+	dir = 4
 	},
 /turf/open/floor/plasteel,
 /area/ship/shuttle)
@@ -564,14 +556,9 @@
 /obj/structure/railing{
 	layer = 4.2
 	},
-/turf/open/floor/plasteel/patterned/monofloor{
-	dir = 8
-	},
+/turf/open/floor/plasteel/patterned/ridged,
 /area/ship/shuttle)
 "Mp" = (
-/obj/effect/turf_decal/industrial/warning{
-	dir = 1
-	},
 /obj/structure/cable,
 /obj/machinery/atmospherics/components/binary/pump/on/layer4{
 	name = "Air to Distro";
@@ -646,9 +633,7 @@
 /obj/structure/railing{
 	layer = 4.2
 	},
-/turf/open/floor/plasteel/patterned/monofloor{
-	dir = 1
-	},
+/turf/open/floor/plasteel/patterned/ridged,
 /area/ship/shuttle)
 "Ol" = (
 /obj/effect/turf_decal/industrial/traffic{
@@ -685,9 +670,7 @@
 	dir = 1;
 	layer = 2.8
 	},
-/turf/open/floor/plasteel/patterned/monofloor{
-	dir = 4
-	},
+/turf/open/floor/plasteel/patterned/ridged,
 /area/ship/shuttle)
 "Sp" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
@@ -699,9 +682,6 @@
 /turf/open/floor/plasteel/patterned,
 /area/ship/shuttle)
 "SG" = (
-/obj/effect/turf_decal/industrial/warning{
-	dir = 8
-	},
 /obj/machinery/light/small{
 	bulb_power = 0.5;
 	pixel_y = -28
@@ -710,10 +690,9 @@
 /obj/machinery/power/terminal{
 	dir = 8
 	},
-/turf/open/floor/plasteel/telecomms_floor,
+/turf/open/floor/plasteel/dark,
 /area/ship/shuttle)
 "To" = (
-/obj/structure/catwalk/over/plated_catwalk,
 /obj/structure/cable{
 	icon_state = "2-8"
 	},
@@ -723,6 +702,7 @@
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4{
 	dir = 1
 	},
+/obj/structure/catwalk/over/plated_catwalk/dark,
 /turf/open/floor/plating,
 /area/ship/shuttle)
 "Tz" = (
@@ -740,9 +720,7 @@
 	dir = 1;
 	pixel_y = 32
 	},
-/turf/open/floor/plasteel/patterned/monofloor{
-	dir = 8
-	},
+/turf/open/floor/plasteel/patterned/ridged,
 /area/ship/shuttle)
 "TB" = (
 /obj/effect/spawner/structure/window/shuttle,
@@ -778,12 +756,12 @@ rx
 "}
 (2,1,1) = {"
 rx
-KQ
+pm
 AQ
 dK
 BM
 Iq
-KQ
+pm
 rx
 "}
 (3,1,1) = {"
@@ -824,7 +802,7 @@ cu
 uJ
 nL
 EJ
-pm
+jk
 "}
 (7,1,1) = {"
 wV
@@ -847,7 +825,7 @@ dm
 sq
 "}
 (9,1,1) = {"
-pm
+jk
 pm
 Tz
 lV
diff --git a/_maps/shuttles/subshuttles/nanotrasen_anole_damaged.dmm b/_maps/shuttles/subshuttles/nanotrasen_anole_damaged.dmm
new file mode 100644
index 000000000000..d8ffd541bdfb
--- /dev/null
+++ b/_maps/shuttles/subshuttles/nanotrasen_anole_damaged.dmm
@@ -0,0 +1,978 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"bj" = (
+/obj/effect/turf_decal/trimline/opaque/solgovgold/warning,
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 10
+	},
+/obj/structure/cable{
+	icon_state = "1-8"
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/patterned,
+/area/ship/shuttle)
+"bl" = (
+/obj/structure/cable{
+	icon_state = "0-4"
+	},
+/obj/item/circuitboard/machine/shuttle/engine/electric{
+	pixel_y = 3;
+	pixel_x = -3
+	},
+/obj/item/stack/cable_coil/cut/red,
+/obj/item/stack/ore/salvage/scrapmetal/five{
+	pixel_x = 3
+	},
+/obj/structure/frame/machine{
+	anchored = 1
+	},
+/turf/open/floor/plating,
+/area/ship/shuttle)
+"bt" = (
+/obj/effect/turf_decal/industrial/traffic{
+	dir = 8
+	},
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/button/shieldwallgen{
+	dir = 4;
+	pixel_x = -27;
+	pixel_y = 5;
+	id = "tegus_shield_port";
+	name = "Port Holofield"
+	},
+/obj/machinery/button/door{
+	dir = 4;
+	pixel_x = -27;
+	pixel_y = -5;
+	id = "tegus_shuttle_port";
+	name = "Port Blast Door"
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/patterned/ridged,
+/area/ship/shuttle)
+"cu" = (
+/obj/structure/cable{
+	icon_state = "1-8"
+	},
+/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer4,
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/patterned,
+/area/ship/shuttle)
+"cR" = (
+/obj/effect/turf_decal/trimline/opaque/solgovgold/warning{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2,
+/obj/item/kirbyplants{
+	icon_state = "plant-20";
+	pixel_x = 3;
+	name = "Emotional Support Plant";
+	desc = "The light of your life!"
+	},
+/turf/open/floor/plasteel/patterned/cargo_one,
+/area/ship/shuttle)
+"dm" = (
+/obj/machinery/light/small{
+	dir = 4;
+	pixel_x = 28
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 10
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
+/obj/structure/catwalk/over/plated_catwalk/dark,
+/turf/open/floor/plating,
+/area/ship/shuttle)
+"dK" = (
+/obj/structure/cable{
+	icon_state = "0-4"
+	},
+/obj/machinery/power/smes/micro/precharged,
+/turf/open/floor/plating,
+/area/ship/shuttle)
+"dU" = (
+/obj/effect/turf_decal/industrial/traffic{
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/patterned/ridged,
+/area/ship/shuttle)
+"fx" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/structure/cable{
+	icon_state = "1-4"
+	},
+/obj/structure/cable{
+	icon_state = "2-4"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 6
+	},
+/obj/structure/catwalk/over/plated_catwalk/dark,
+/turf/open/floor/plating,
+/area/ship/shuttle)
+"fO" = (
+/obj/structure/sign/nanotrasen,
+/turf/closed/wall/mineral/titanium/nodiagonal,
+/area/ship/shuttle)
+"fV" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 9
+	},
+/turf/closed/wall/mineral/titanium/nodiagonal,
+/area/ship/shuttle)
+"ir" = (
+/obj/effect/turf_decal/steeldecal/steel_decals_central4{
+	dir = 1
+	},
+/obj/effect/turf_decal/steeldecal/steel_decals9,
+/obj/machinery/atmospherics/components/binary/valve/layer2{
+	dir = 4
+	},
+/turf/open/floor/engine/hull,
+/area/ship/shuttle)
+"jW" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
+/obj/effect/turf_decal/corner/transparent/neutral{
+	dir = 8
+	},
+/obj/machinery/turretid{
+	icon_state = "control_kill";
+	lethal = 1;
+	locked = 0;
+	name = "Mining Turret control panel";
+	pixel_x = -28;
+	req_access = null
+	},
+/obj/item/stack/ore/salvage/scraptitanium{
+	pixel_y = 6
+	},
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel/dark,
+/area/ship/shuttle)
+"kH" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 6
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/decal/cleanable/vomit,
+/turf/open/floor/plasteel/patterned,
+/area/ship/shuttle)
+"lV" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 8
+	},
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+	dir = 8
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/patterned,
+/area/ship/shuttle)
+"mq" = (
+/obj/effect/turf_decal/steeldecal/steel_decals_central2,
+/obj/effect/turf_decal/steeldecal/steel_decals6,
+/obj/machinery/atmospherics/components/unary/outlet_injector/on/layer2{
+	dir = 8
+	},
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/shuttle)
+"mM" = (
+/obj/machinery/door/poddoor/shutters/preopen{
+	id = "tegus_shuttle_window";
+	dir = 4
+	},
+/obj/structure/grille/broken,
+/obj/effect/decal/cleanable/glass,
+/turf/open/floor/plating,
+/area/ship/shuttle)
+"nB" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 9
+	},
+/obj/effect/turf_decal/corner/transparent/neutral{
+	dir = 9
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 10
+	},
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/blood/old,
+/turf/open/floor/plasteel/dark,
+/area/ship/shuttle)
+"nL" = (
+/obj/effect/turf_decal/industrial/warning,
+/obj/effect/turf_decal/industrial/warning{
+	dir = 1
+	},
+/obj/machinery/door/airlock/external,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
+/turf/open/floor/plasteel/patterned/ridged,
+/area/ship/shuttle)
+"oi" = (
+/obj/machinery/atmospherics/components/unary/portables_connector/visible/layer4{
+	dir = 1
+	},
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/portable_atmospherics/canister/air,
+/turf/open/floor/plasteel/tech,
+/area/ship/shuttle)
+"oI" = (
+/obj/effect/turf_decal/corner/transparent/neutral{
+	dir = 4
+	},
+/obj/structure/frame/computer/retro{
+	dir = 8;
+	anchored = 1
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/shuttle)
+"oS" = (
+/obj/effect/turf_decal/industrial/traffic{
+	dir = 8
+	},
+/obj/structure/cable{
+	icon_state = "0-2"
+	},
+/obj/machinery/power/shieldwallgen/atmos/roundstart{
+	dir = 4;
+	id = "tegus_shield_port"
+	},
+/obj/machinery/door/poddoor{
+	id = "tegus_shuttle_port"
+	},
+/turf/open/floor/plasteel/patterned/ridged,
+/area/ship/shuttle)
+"pm" = (
+/turf/closed/wall/mineral/titanium/nodiagonal,
+/area/ship/shuttle)
+"qx" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 8
+	},
+/turf/closed/wall/mineral/titanium/nodiagonal,
+/area/ship/shuttle)
+"qz" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 6
+	},
+/turf/open/floor/plasteel/patterned/cargo_one,
+/area/ship/shuttle)
+"rp" = (
+/obj/effect/spawner/structure/window/shuttle,
+/obj/machinery/door/poddoor/shutters/preopen{
+	id = "tegus_shuttle_window"
+	},
+/turf/open/floor/plating,
+/area/ship/shuttle)
+"rx" = (
+/turf/template_noop,
+/area/template_noop)
+"rR" = (
+/obj/machinery/power/shuttle/engine/electric{
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "0-4"
+	},
+/turf/open/floor/plating,
+/area/ship/shuttle)
+"sa" = (
+/obj/structure/closet/secure_closet/wall{
+	name = "pilot's locker";
+	req_access_txt = "31";
+	icon_state = "solgov_wall";
+	dir = 4;
+	pixel_x = -28
+	},
+/obj/item/binoculars,
+/obj/item/storage/firstaid/regular,
+/obj/item/storage/box/bodybags,
+/obj/item/pinpointer/crew,
+/obj/item/storage/toolbox/emergency,
+/obj/item/extinguisher/mini,
+/obj/item/clothing/suit/space/orange,
+/obj/item/clothing/head/helmet/space/orange,
+/obj/item/roller,
+/obj/item/gps{
+	gpstag = "TEGUS1"
+	},
+/obj/effect/turf_decal/corner/transparent/neutral{
+	dir = 2
+	},
+/obj/item/tank/internals/emergency_oxygen/engi,
+/obj/item/assembly/signaler{
+	name = "Emergency Signaler";
+	desc = "A remote signaler device. The label reads ''Stranded without communications? Ping this device to alert your captain who, too, has been provided with a remote signaler!''"
+	},
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+	dir = 1
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/dark,
+/area/ship/shuttle)
+"sk" = (
+/obj/effect/turf_decal/steeldecal/steel_decals_central4,
+/obj/effect/turf_decal/steeldecal/steel_decals9{
+	dir = 4
+	},
+/obj/item/stack/ore/salvage/scraptitanium{
+	layer = 2.9;
+	pixel_y = -9
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/engine/hull,
+/area/ship/shuttle)
+"sq" = (
+/obj/effect/turf_decal/industrial/warning,
+/obj/effect/turf_decal/industrial/warning{
+	dir = 1
+	},
+/obj/machinery/door/airlock/external,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 5
+	},
+/turf/open/floor/plasteel/patterned/ridged,
+/area/ship/shuttle)
+"tB" = (
+/obj/machinery/holopad/emergency/command,
+/obj/effect/turf_decal/box,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
+/obj/machinery/light/dim{
+	dir = 8;
+	bulb_power = 0.5;
+	pixel_x = -32
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/dark,
+/area/ship/shuttle)
+"uJ" = (
+/obj/effect/turf_decal/trimline/opaque/solgovgold/warning{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 6
+	},
+/turf/open/floor/plasteel/patterned,
+/area/ship/shuttle)
+"wV" = (
+/obj/docking_port/mobile{
+	dir = 2;
+	port_direction = 8;
+	preferred_direction = 4
+	},
+/obj/machinery/door/poddoor{
+	id = "tegus_shuttle_port"
+	},
+/turf/open/floor/plasteel/patterned/ridged,
+/area/ship/shuttle)
+"xB" = (
+/obj/structure/cable{
+	icon_state = "0-2"
+	},
+/obj/machinery/power/terminal{
+	dir = 8
+	},
+/obj/machinery/button/door{
+	id = "tegus_shuttle_engine";
+	name = "Engine Shutters";
+	pixel_x = -3;
+	pixel_y = 27
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/dark,
+/area/ship/shuttle)
+"yD" = (
+/obj/machinery/porta_turret/centcom_shuttle/weak{
+	dir = 4;
+	name = "Sharplite Mining Turret";
+	shot_delay = 7.5;
+	desc = "An old Sharplite laser turret model developed for securing fauna-infested areas. Heavy use and much foundering renders this turret noticably inefficient, but it's still capable of packing a punch."
+	},
+/turf/closed/wall/mineral/titanium,
+/area/ship/shuttle)
+"yP" = (
+/obj/effect/turf_decal/corner/transparent/neutral,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/frame/computer/retro{
+	dir = 8;
+	anchored = 1
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/shuttle)
+"yZ" = (
+/obj/effect/turf_decal/steeldecal/steel_decals_central2{
+	dir = 1
+	},
+/obj/effect/turf_decal/steeldecal/steel_decals_central1,
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/shuttle)
+"zG" = (
+/obj/effect/turf_decal/industrial/warning{
+	dir = 8
+	},
+/obj/effect/turf_decal/industrial/warning{
+	dir = 4
+	},
+/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 8
+	},
+/obj/machinery/advanced_airlock_controller{
+	pixel_y = 32
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/shuttle)
+"Au" = (
+/obj/machinery/telecomms/relay/preset/mining{
+	network = "nt_commnet"
+	},
+/obj/machinery/airalarm/directional/east,
+/obj/machinery/light/small{
+	dir = 1;
+	bulb_power = 0.5;
+	pixel_y = 28
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/decal/cleanable/cobweb/cobweb2,
+/turf/open/floor/plasteel/tech,
+/area/ship/shuttle)
+"AQ" = (
+/obj/machinery/door/window/eastleft,
+/obj/structure/cable{
+	icon_state = "0-8"
+	},
+/obj/structure/window/reinforced/spawner,
+/obj/structure/window/reinforced/spawner/west,
+/obj/machinery/power/smes/shuttle/micro{
+	dir = 4
+	},
+/obj/machinery/door/poddoor/shutters{
+	id = "tegus_shuttle_engine";
+	dir = 4
+	},
+/turf/open/floor/plating,
+/area/ship/shuttle)
+"AW" = (
+/obj/structure/chair/comfy/shuttle{
+	layer = 2.9
+	},
+/obj/structure/railing{
+	dir = 1;
+	layer = 4.2
+	},
+/turf/open/floor/plasteel/patterned/ridged,
+/area/ship/shuttle)
+"AZ" = (
+/obj/effect/spawner/structure/window/shuttle,
+/obj/machinery/door/poddoor/shutters/preopen{
+	id = "tegus_shuttle_window";
+	dir = 4
+	},
+/turf/open/floor/plating,
+/area/ship/shuttle)
+"BM" = (
+/obj/machinery/power/terminal{
+	dir = 1
+	},
+/obj/machinery/power/port_gen/pacman,
+/obj/structure/cable,
+/turf/open/floor/plating,
+/area/ship/shuttle)
+"Cu" = (
+/obj/structure/chair/comfy/shuttle{
+	dir = 4
+	},
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/dark,
+/area/ship/shuttle)
+"CM" = (
+/obj/structure/girder,
+/turf/open/floor/plating,
+/area/ship/shuttle)
+"CS" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel,
+/area/ship/shuttle)
+"Em" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 8
+	},
+/turf/closed/wall/mineral/titanium/nodiagonal,
+/area/ship/shuttle)
+"EJ" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 5
+	},
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+	dir = 4
+	},
+/obj/structure/catwalk/over/plated_catwalk/dark,
+/turf/open/floor/plating,
+/area/ship/shuttle)
+"Iq" = (
+/obj/machinery/power/terminal{
+	dir = 8
+	},
+/obj/machinery/door/window/eastright,
+/obj/structure/window/reinforced/spawner/north,
+/obj/structure/window/reinforced/spawner/west,
+/obj/structure/cable{
+	icon_state = "0-8"
+	},
+/obj/machinery/power/smes/shuttle/micro{
+	dir = 4
+	},
+/obj/machinery/door/poddoor/shutters{
+	id = "tegus_shuttle_engine";
+	dir = 4
+	},
+/turf/open/floor/plating,
+/area/ship/shuttle)
+"Ks" = (
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+	dir = 1
+	},
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel/dark,
+/area/ship/shuttle)
+"KQ" = (
+/obj/machinery/porta_turret/centcom_shuttle/weak{
+	dir = 4;
+	name = "Sharplite Mining Turret";
+	shot_delay = 7.5;
+	desc = "An old Sharplite laser turret model developed for securing fauna-infested areas. Heavy use and much foundering renders this turret noticably inefficient, but it's still capable of packing a punch."
+	},
+/turf/closed/wall/mineral/titanium/nodiagonal,
+/area/ship/shuttle)
+"LC" = (
+/obj/effect/turf_decal/trimline/opaque/solgovgold/warning,
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 8
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/patterned/cargo_one,
+/area/ship/shuttle)
+"LN" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 8
+	},
+/obj/effect/turf_decal/industrial/warning{
+	dir = 8
+	},
+/obj/effect/turf_decal/industrial/warning{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 8
+	},
+/obj/machinery/door/airlock/grunge{
+	dir = 4;
+	req_one_access = list(31,11)
+	},
+/turf/open/floor/plasteel,
+/area/ship/shuttle)
+"LU" = (
+/obj/structure/chair/comfy/shuttle{
+	dir = 1;
+	layer = 2.8
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 8
+	},
+/obj/structure/railing{
+	layer = 4.2
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/patterned/ridged,
+/area/ship/shuttle)
+"Mp" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/components/binary/pump/on/layer4{
+	name = "Air to Distro";
+	target_pressure = 1000;
+	dir = 1
+	},
+/obj/machinery/power/apc/auto_name/directional/east,
+/obj/effect/turf_decal/steeldecal/steel_decals_central7,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel/tech,
+/area/ship/shuttle)
+"MD" = (
+/obj/structure/cable{
+	icon_state = "2-4"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 6
+	},
+/obj/effect/turf_decal/trimline/opaque/solgovgold/warning,
+/obj/structure/cable{
+	icon_state = "1-4"
+	},
+/turf/open/floor/plasteel/patterned,
+/area/ship/shuttle)
+"MK" = (
+/obj/structure/table/reinforced,
+/obj/machinery/button/door{
+	dir = 1;
+	id = "tegus_shuttle_window";
+	name = "Window Shutters";
+	pixel_x = 6
+	},
+/obj/machinery/button/door{
+	dir = 1;
+	id = "tegus_shuttle_engine";
+	name = "Engine Shutters";
+	pixel_x = -6
+	},
+/obj/effect/turf_decal/corner/transparent/neutral{
+	dir = 8
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/shuttle)
+"NJ" = (
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 4
+	},
+/obj/effect/turf_decal/industrial/warning{
+	dir = 8
+	},
+/obj/effect/turf_decal/industrial/warning{
+	dir = 4
+	},
+/obj/machinery/door/airlock/grunge{
+	dir = 4
+	},
+/turf/open/floor/plasteel,
+/area/ship/shuttle)
+"Og" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 8
+	},
+/obj/structure/chair/comfy/shuttle{
+	dir = 1;
+	layer = 2.8
+	},
+/obj/structure/railing{
+	layer = 4.2
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/light/broken/directional/south,
+/turf/open/floor/plasteel/patterned/ridged,
+/area/ship/shuttle)
+"Ol" = (
+/obj/effect/turf_decal/industrial/traffic{
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "0-2"
+	},
+/obj/machinery/power/shieldwallgen/atmos/roundstart{
+	dir = 8;
+	id = "tegus_shield_port"
+	},
+/obj/machinery/door/poddoor{
+	id = "tegus_shuttle_port"
+	},
+/turf/open/floor/plasteel/patterned/ridged,
+/area/ship/shuttle)
+"Rf" = (
+/obj/item/radio/intercom/wideband{
+	dir = 1;
+	pixel_y = 10
+	},
+/obj/structure/table/reinforced,
+/turf/open/floor/plasteel/dark,
+/area/ship/shuttle)
+"Rs" = (
+/obj/structure/railing{
+	layer = 4.2
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 9
+	},
+/obj/structure/chair/comfy/shuttle{
+	dir = 1;
+	layer = 2.8
+	},
+/turf/open/floor/plasteel/patterned/ridged,
+/area/ship/shuttle)
+"Sp" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 5
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
+	dir = 8
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/patterned,
+/area/ship/shuttle)
+"SG" = (
+/obj/structure/cable,
+/obj/machinery/power/terminal{
+	dir = 8
+	},
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/light/small/broken/directional/south,
+/obj/item/stack/ore/salvage/scraptitanium{
+	pixel_y = -7;
+	pixel_x = 12
+	},
+/obj/item/stack/ore/salvage/scraptitanium{
+	pixel_y = -7;
+	pixel_x = 12
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/shuttle)
+"To" = (
+/obj/structure/cable{
+	icon_state = "2-8"
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4{
+	dir = 1
+	},
+/obj/structure/catwalk/over/plated_catwalk/dark,
+/turf/open/floor/plating,
+/area/ship/shuttle)
+"Tz" = (
+/obj/structure/cable{
+	icon_state = "1-8"
+	},
+/obj/structure/chair/comfy/shuttle{
+	layer = 2.9
+	},
+/obj/structure/railing{
+	dir = 1;
+	layer = 4.2
+	},
+/obj/machinery/light{
+	dir = 1;
+	pixel_y = 32
+	},
+/turf/open/floor/plasteel/patterned/ridged,
+/area/ship/shuttle)
+"TB" = (
+/obj/effect/spawner/structure/window/shuttle,
+/obj/machinery/door/poddoor/shutters/preopen{
+	id = "tegus_shuttle_window";
+	dir = 1
+	},
+/turf/open/floor/plating,
+/area/ship/shuttle)
+"Wx" = (
+/obj/structure/chair/comfy/shuttle{
+	dir = 4;
+	name = "Helm"
+	},
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel/dark,
+/area/ship/shuttle)
+"WB" = (
+/obj/machinery/atmospherics/pipe/layer_manifold{
+	dir = 4
+	},
+/turf/closed/wall/mineral/titanium/nodiagonal,
+/area/ship/shuttle)
+
+(1,1,1) = {"
+rx
+rx
+bl
+CM
+pm
+rR
+rx
+rx
+"}
+(2,1,1) = {"
+rx
+pm
+AQ
+dK
+BM
+Iq
+pm
+rx
+"}
+(3,1,1) = {"
+rx
+pm
+xB
+fx
+Ks
+SG
+pm
+rx
+"}
+(4,1,1) = {"
+rx
+pm
+Au
+To
+Mp
+oi
+CM
+rx
+"}
+(5,1,1) = {"
+fO
+pm
+pm
+NJ
+pm
+pm
+pm
+fO
+"}
+(6,1,1) = {"
+oS
+bt
+MD
+cu
+uJ
+nL
+EJ
+KQ
+"}
+(7,1,1) = {"
+wV
+CS
+LC
+qz
+cR
+pm
+zG
+pm
+"}
+(8,1,1) = {"
+Ol
+dU
+bj
+Sp
+LU
+pm
+dm
+sq
+"}
+(9,1,1) = {"
+KQ
+pm
+Tz
+lV
+Og
+Em
+WB
+qx
+"}
+(10,1,1) = {"
+sk
+CM
+AW
+kH
+Rs
+fV
+pm
+ir
+"}
+(11,1,1) = {"
+yZ
+fO
+pm
+LN
+pm
+pm
+fO
+mq
+"}
+(12,1,1) = {"
+rx
+CM
+jW
+nB
+tB
+sa
+CM
+rx
+"}
+(13,1,1) = {"
+rx
+TB
+Rf
+Wx
+Cu
+MK
+rp
+rx
+"}
+(14,1,1) = {"
+rx
+yD
+CM
+yP
+oI
+CM
+yD
+rx
+"}
+(15,1,1) = {"
+rx
+rx
+CM
+mM
+AZ
+CM
+rx
+rx
+"}
diff --git a/code/datums/shuttles.dm b/code/datums/shuttles.dm
index dd1fdad6ddeb..35aa9d564a7b 100644
--- a/code/datums/shuttles.dm
+++ b/code/datums/shuttles.dm
@@ -346,11 +346,6 @@
 /datum/map_template/shuttle/subshuttles
 	category = "subshuttles"
 
-/datum/map_template/shuttle/subshuttles/anole
-	file_name = "nanotrasen_anole"
-	name = "Anole Transport Shuttle"
-	prefix = "NTSV"
-
 /datum/map_template/shuttle/subshuttles/pill
 	file_name = "independent_pill"
 	name = "Pill-Class Torture Device"
@@ -379,4 +374,14 @@
 	name = "Sugarcube Transport"
 	prefix = "ISV"
 
+/datum/map_template/shuttle/subshuttles/anole
+	file_name = "nanotrasen_anole"
+	name = "Anole Transport Shuttle"
+	prefix = "NTSV"
+
+/datum/map_template/shuttle/subshuttles/anole/damaged
+	file_name = "nanotrasen_anole_damaged"
+	name = "Anole Transport Shuttle (Damaged)"
+	prefix = "NTSV"
+
 //your subshuttle here
diff --git a/code/game/objects/items/circuitboards/machine_circuitboards.dm b/code/game/objects/items/circuitboards/machine_circuitboards.dm
index b10b55824ebc..50f19ad5bdcf 100644
--- a/code/game/objects/items/circuitboards/machine_circuitboards.dm
+++ b/code/game/objects/items/circuitboards/machine_circuitboards.dm
@@ -325,6 +325,14 @@
 		/obj/item/stock_parts/capacitor = 1)
 	def_components = list(/obj/item/stock_parts/cell = /obj/item/stock_parts/cell/high/empty)
 
+/obj/item/circuitboard/machine/smes/micro
+	name = "Micro SMES (Machine Board)"
+	build_path = /obj/machinery/power/smes/micro
+	req_components = list(
+		/obj/item/stack/cable_coil = 5,
+		/obj/item/stock_parts/cell = 3,
+		/obj/item/stock_parts/capacitor = 1)
+
 /obj/item/circuitboard/machine/techfab/department/engineering
 	name = "\improper Departmental Techfab (Machine Board) - Engineering"
 	build_path = /obj/machinery/rnd/production/techfab/department/engineering
diff --git a/code/modules/jobs/job_types/station_engineer.dm b/code/modules/jobs/job_types/station_engineer.dm
index 303187683e21..d85a1baca065 100644
--- a/code/modules/jobs/job_types/station_engineer.dm
+++ b/code/modules/jobs/job_types/station_engineer.dm
@@ -57,6 +57,12 @@
 	uniform = /obj/item/clothing/under/rank/engineering/engineer/nt
 	head = /obj/item/clothing/head/hardhat
 
+/datum/outfit/job/engineer/nt/field
+	name = "Field Technician (Nanotrasen)"
+	uniform = /obj/item/clothing/under/rank/cargo/miner/lavaland
+	head = /obj/item/clothing/head/hardhat
+	suit = /obj/item/clothing/suit/hazardvest
+
 /datum/outfit/job/engineer/electrician
 	name = "Station Engineer (Electrician)"
 
diff --git a/code/modules/power/smes.dm b/code/modules/power/smes.dm
index 8e8ad0a579ff..1401ab94ec95 100644
--- a/code/modules/power/smes.dm
+++ b/code/modules/power/smes.dm
@@ -464,7 +464,16 @@
 	log_smes()
 
 /obj/machinery/power/smes/engineering
-	charge = 1.5e6 // Engineering starts with some charge for singulo
+	charge = 1.5e6 // Engineering starts with some charge for singulo //yeah that's totally what they're used for
+
+/obj/machinery/power/smes/micro //like a micro engine precharger but an SMES unit
+	name = "micro power storage unit"
+	desc = "A low-capacity superconducting magnetic energy storage (SMES) unit."
+	capacity = 1e6
+	circuit = /obj/item/circuitboard/machine/smes/micro
+
+/obj/machinery/power/smes/micro/precharged
+	charge = 3e5 //same ratio as engineering SMESes. that's fair, i think.
 
 /obj/machinery/power/smes/magical
 	name = "magical power storage unit"
diff --git a/code/modules/research/designs.dm b/code/modules/research/designs.dm
index daab6997766c..a2c057b466bd 100644
--- a/code/modules/research/designs.dm
+++ b/code/modules/research/designs.dm
@@ -155,3 +155,19 @@ other types of metals and chemistry for reagents).
 	. = ..()
 	blueprints[1] = new /datum/design/cmm_ripley_upgrade
 	blueprints[2] = new /datum/design/cmm_durand_upgrade
+
+/obj/item/disk/design_disk/tcomms_parts
+	name = "design disk - telecomms parts"
+	desc = "A design disk containing stock part blueprints for Nanotrasen's renowned telecommunications systems." //patented!
+	color = "#01476F"
+	max_blueprints = 7
+
+/obj/item/disk/design_disk/tcomms_parts/Initialize()
+	. = ..()
+	blueprints[1] = new /datum/design/subspace_ansible
+	blueprints[2] = new /datum/design/hyperwave_filter
+	blueprints[3] = new /datum/design/subspace_amplifier
+	blueprints[4] = new /datum/design/subspace_treatment
+	blueprints[5] = new /datum/design/subspace_analyzer
+	blueprints[6] = new /datum/design/subspace_crystal
+	blueprints[7] = new /datum/design/subspace_transmitter
diff --git a/code/modules/research/designs/stock_parts_designs.dm b/code/modules/research/designs/stock_parts_designs.dm
index ba52f69c5502..6c7097b351a4 100644
--- a/code/modules/research/designs/stock_parts_designs.dm
+++ b/code/modules/research/designs/stock_parts_designs.dm
@@ -251,7 +251,7 @@
 	name = "Subspace Ansible"
 	desc = "A compact module capable of sensing extradimensional activity."
 	id = "s-ansible"
-	build_type = PROTOLATHE
+	build_type = PROTOLATHE | AUTOLATHE
 	materials = list(/datum/material/iron = 100, /datum/material/silver = 100)
 	build_path = /obj/item/stock_parts/subspace/ansible
 	category = list("Stock Parts")
@@ -261,7 +261,7 @@
 	name = "Hyperwave Filter"
 	desc = "A tiny device capable of filtering and converting super-intense radiowaves."
 	id = "s-filter"
-	build_type = PROTOLATHE
+	build_type = PROTOLATHE | AUTOLATHE
 	materials = list(/datum/material/iron = 100, /datum/material/silver = 100)
 	build_path = /obj/item/stock_parts/subspace/filter
 	category = list("Stock Parts")
@@ -271,7 +271,7 @@
 	name = "Subspace Amplifier"
 	desc = "A compact micro-machine capable of amplifying weak subspace transmissions."
 	id = "s-amplifier"
-	build_type = PROTOLATHE
+	build_type = PROTOLATHE | AUTOLATHE
 	materials = list(/datum/material/iron = 100, /datum/material/gold = 100, /datum/material/uranium = 100)
 	build_path = /obj/item/stock_parts/subspace/amplifier
 	category = list("Stock Parts")
@@ -281,7 +281,7 @@
 	name = "Subspace Treatment Disk"
 	desc = "A compact micro-machine capable of stretching out hyper-compressed radio waves."
 	id = "s-treatment"
-	build_type = PROTOLATHE
+	build_type = PROTOLATHE | AUTOLATHE
 	materials = list(/datum/material/iron = 100, /datum/material/silver = 200)
 	build_path = /obj/item/stock_parts/subspace/treatment
 	category = list("Stock Parts")
@@ -291,7 +291,7 @@
 	name = "Subspace Analyzer"
 	desc = "A sophisticated analyzer capable of analyzing cryptic subspace wavelengths."
 	id = "s-analyzer"
-	build_type = PROTOLATHE
+	build_type = PROTOLATHE | AUTOLATHE
 	materials = list(/datum/material/iron = 100, /datum/material/gold = 100)
 	build_path = /obj/item/stock_parts/subspace/analyzer
 	category = list("Stock Parts")
@@ -301,7 +301,7 @@
 	name = "Ansible Crystal"
 	desc = "A sophisticated analyzer capable of analyzing cryptic subspace wavelengths."
 	id = "s-crystal"
-	build_type = PROTOLATHE
+	build_type = PROTOLATHE | AUTOLATHE
 	materials = list(/datum/material/glass = 800, /datum/material/silver = 100, /datum/material/gold = 100)
 	build_path = /obj/item/stock_parts/subspace/crystal
 	category = list("Stock Parts")
@@ -311,7 +311,7 @@
 	name = "Subspace Transmitter"
 	desc = "A large piece of equipment used to open a window into the subspace dimension."
 	id = "s-transmitter"
-	build_type = PROTOLATHE
+	build_type = PROTOLATHE | AUTOLATHE
 	materials = list(/datum/material/glass = 100, /datum/material/silver = 100, /datum/material/uranium = 100)
 	build_path = /obj/item/stock_parts/subspace/transmitter
 	category = list("Stock Parts")
diff --git a/shiptest.dme b/shiptest.dme
index e65929eab53b..c84a307ecdd6 100644
--- a/shiptest.dme
+++ b/shiptest.dme
@@ -2602,8 +2602,8 @@
 #include "code\modules\mob\living\simple_animal\friendly\pet.dm"
 #include "code\modules\mob\living\simple_animal\friendly\sloth.dm"
 #include "code\modules\mob\living\simple_animal\friendly\snake.dm"
-#include "code\modules\mob\living\simple_animal\friendly\turtle.dm"
 #include "code\modules\mob\living\simple_animal\friendly\tegu.dm"
+#include "code\modules\mob\living\simple_animal\friendly\turtle.dm"
 #include "code\modules\mob\living\simple_animal\friendly\drone\_drone.dm"
 #include "code\modules\mob\living\simple_animal\friendly\drone\drone_say.dm"
 #include "code\modules\mob\living\simple_animal\friendly\drone\drones_as_items.dm"

From 08c54c6c1cd80e4ff55b359feb215a7f4c0c339a Mon Sep 17 00:00:00 2001
From: goober3 <118859017+goober3@users.noreply.github.com>
Date: Sun, 25 Jun 2023 02:01:33 +0100
Subject: [PATCH 22/28] shuttle access, hangar area fix, cryo console, computer
 choice beacon

---
 _maps/shuttles/shiptest/nanotrasen_tegus.dmm  | 227 +++++++++---------
 .../subshuttles/nanotrasen_anole_damaged.dmm  |   2 +-
 code/game/area/ship_areas.dm                  |   8 +-
 code/game/objects/items/miscellaneous.dm      |  18 ++
 4 files changed, 136 insertions(+), 119 deletions(-)

diff --git a/_maps/shuttles/shiptest/nanotrasen_tegus.dmm b/_maps/shuttles/shiptest/nanotrasen_tegus.dmm
index 63a9b656a2be..fc98ea3b6d06 100644
--- a/_maps/shuttles/shiptest/nanotrasen_tegus.dmm
+++ b/_maps/shuttles/shiptest/nanotrasen_tegus.dmm
@@ -18,10 +18,10 @@
 	},
 /obj/effect/turf_decal/siding/thinplating,
 /turf/open/floor/plasteel/patterned,
-/area/ship/cargo/hangar)
+/area/ship/hangar)
 "aw" = (
 /turf/closed/wall/mineral/titanium,
-/area/ship/cargo/hangar)
+/area/ship/hangar)
 "aA" = (
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
 /obj/effect/decal/cleanable/dirt/dust,
@@ -30,7 +30,7 @@
 "aR" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/plasteel/dark,
-/area/ship/cargo/hangar)
+/area/ship/hangar)
 "aV" = (
 /obj/structure/cable/yellow{
 	icon_state = "1-2"
@@ -54,14 +54,14 @@
 "bl" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/plasteel/patterned/cargo_one,
-/area/ship/cargo/hangar)
+/area/ship/hangar)
 "bs" = (
 /obj/structure/tank_dispenser,
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/machinery/light/dim/directional/south,
 /turf/open/floor/plasteel/dark,
-/area/ship/cargo/hangar)
+/area/ship/hangar)
 "bu" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
 	dir = 8
@@ -76,7 +76,7 @@
 	pixel_y = 6
 	},
 /turf/open/floor/plasteel/telecomms_floor,
-/area/ship/cargo/hangar)
+/area/ship/hangar)
 "bw" = (
 /obj/structure/catwalk/over/plated_catwalk/dark,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
@@ -97,7 +97,7 @@
 	pixel_y = -28
 	},
 /turf/open/floor/plasteel/dark,
-/area/ship/cargo/hangar)
+/area/ship/hangar)
 "bD" = (
 /obj/effect/turf_decal/industrial/warning{
 	dir = 1
@@ -133,11 +133,11 @@
 	dir = 1
 	},
 /turf/open/floor/plasteel/telecomms_floor,
-/area/ship/cargo/hangar)
+/area/ship/hangar)
 "bL" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/plasteel/patterned/ridged,
-/area/ship/cargo/hangar)
+/area/ship/hangar)
 "bN" = (
 /obj/structure/chair/sofa/right,
 /obj/effect/decal/cleanable/dirt/dust,
@@ -197,7 +197,7 @@
 	dir = 4
 	},
 /turf/open/floor/plasteel/telecomms_floor,
-/area/ship/cargo/hangar)
+/area/ship/hangar)
 "cK" = (
 /obj/structure/reagent_dispensers/water_cooler,
 /obj/effect/turf_decal/corner/transparent/neutral{
@@ -233,7 +233,7 @@
 	dir = 4
 	},
 /turf/open/floor/plating,
-/area/ship/cargo/hangar)
+/area/ship/hangar)
 "cR" = (
 /obj/machinery/cryopod,
 /turf/open/floor/plasteel/tech,
@@ -291,13 +291,13 @@
 /area/ship/hallway/central)
 "dr" = (
 /turf/open/floor/plating,
-/area/ship/cargo/hangar)
+/area/ship/hangar)
 "du" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
 	dir = 8
 	},
 /turf/open/floor/plasteel/dark,
-/area/ship/cargo/hangar)
+/area/ship/hangar)
 "dy" = (
 /obj/machinery/modular_computer/console/preset/command{
 	dir = 8
@@ -369,13 +369,13 @@
 	dir = 4
 	},
 /turf/open/floor/plating,
-/area/ship/cargo/hangar)
+/area/ship/hangar)
 "dX" = (
 /obj/structure/cable{
 	icon_state = "1-8"
 	},
 /turf/closed/wall/mineral/titanium/nodiagonal,
-/area/ship/cargo/hangar)
+/area/ship/hangar)
 "dY" = (
 /obj/machinery/firealarm{
 	dir = 8;
@@ -396,7 +396,7 @@
 /obj/machinery/light/directional/north,
 /obj/structure/ore_box,
 /turf/open/floor/plasteel/dark,
-/area/ship/cargo/hangar)
+/area/ship/hangar)
 "eo" = (
 /obj/structure/railing,
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
@@ -442,7 +442,7 @@
 "eW" = (
 /obj/effect/turf_decal/ntspaceworks_small/right,
 /turf/open/floor/plating,
-/area/ship/cargo/hangar)
+/area/ship/hangar)
 "eZ" = (
 /obj/structure/table,
 /obj/machinery/cell_charger,
@@ -501,13 +501,13 @@
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/machinery/airalarm/directional/south,
 /turf/open/floor/plasteel/dark,
-/area/ship/cargo/hangar)
+/area/ship/hangar)
 "fG" = (
 /obj/structure/railing{
 	dir = 4
 	},
 /turf/open/floor/plasteel/dark,
-/area/ship/cargo/hangar)
+/area/ship/hangar)
 "fH" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
@@ -539,7 +539,7 @@
 	dir = 6
 	},
 /turf/open/floor/plasteel/dark,
-/area/ship/cargo/hangar)
+/area/ship/hangar)
 "gK" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
@@ -577,7 +577,7 @@
 	dir = 4
 	},
 /turf/open/floor/plasteel/dark,
-/area/ship/cargo/hangar)
+/area/ship/hangar)
 "ha" = (
 /obj/effect/turf_decal/industrial/traffic{
 	dir = 8
@@ -690,7 +690,7 @@
 /obj/effect/turf_decal/siding/thinplating,
 /obj/machinery/firealarm/directional/south,
 /turf/open/floor/plasteel/patterned/ridged,
-/area/ship/cargo/hangar)
+/area/ship/hangar)
 "hE" = (
 /obj/structure/catwalk/over/plated_catwalk/dark,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
@@ -844,7 +844,7 @@
 	dir = 8
 	},
 /turf/open/floor/plasteel/dark,
-/area/ship/cargo/hangar)
+/area/ship/hangar)
 "jd" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
 	dir = 4
@@ -875,7 +875,7 @@
 	dir = 1
 	},
 /turf/open/floor/plasteel/patterned/ridged,
-/area/ship/cargo/hangar)
+/area/ship/hangar)
 "jq" = (
 /obj/structure/catwalk/over/plated_catwalk/dark,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
@@ -888,7 +888,7 @@
 	dir = 8
 	},
 /turf/open/floor/plasteel/dark,
-/area/ship/cargo/hangar)
+/area/ship/hangar)
 "ju" = (
 /obj/effect/turf_decal/corner/transparent/neutral{
 	dir = 8
@@ -904,7 +904,7 @@
 /obj/structure/table,
 /obj/structure/extinguisher_cabinet/directional/south,
 /turf/open/floor/plasteel/dark,
-/area/ship/cargo/hangar)
+/area/ship/hangar)
 "jQ" = (
 /turf/closed/wall,
 /area/ship/engineering/communications)
@@ -927,7 +927,7 @@
 	dir = 8
 	},
 /turf/open/floor/plasteel/dark,
-/area/ship/cargo/hangar)
+/area/ship/hangar)
 "kE" = (
 /obj/machinery/door/firedoor/border_only,
 /obj/machinery/door/firedoor/border_only{
@@ -1013,7 +1013,7 @@
 	dir = 8
 	},
 /turf/open/floor/plasteel,
-/area/ship/cargo/hangar)
+/area/ship/hangar)
 "le" = (
 /obj/docking_port/stationary{
 	dir = 2;
@@ -1032,7 +1032,7 @@
 	dir = 5
 	},
 /turf/open/floor/plasteel/dark,
-/area/ship/cargo/hangar)
+/area/ship/hangar)
 "lg" = (
 /obj/effect/turf_decal/industrial/warning{
 	dir = 1
@@ -1069,7 +1069,7 @@
 	dir = 1
 	},
 /turf/open/floor/plasteel/patterned/cargo_one,
-/area/ship/cargo/hangar)
+/area/ship/hangar)
 "lI" = (
 /turf/closed/wall/mineral/titanium,
 /area/ship/crew/canteen)
@@ -1123,7 +1123,7 @@
 	},
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
 /turf/open/floor/plasteel/dark,
-/area/ship/cargo/hangar)
+/area/ship/hangar)
 "mq" = (
 /obj/effect/turf_decal/industrial/traffic{
 	dir = 8
@@ -1141,7 +1141,7 @@
 /obj/machinery/light/small/directional/north,
 /obj/machinery/vending/cigarette,
 /turf/open/floor/plasteel/dark,
-/area/ship/cargo/hangar)
+/area/ship/hangar)
 "mJ" = (
 /obj/machinery/suit_storage_unit/standard_unit,
 /obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/layer4{
@@ -1163,7 +1163,7 @@
 "mW" = (
 /obj/machinery/vending/cola/random,
 /turf/open/floor/plasteel,
-/area/ship/cargo/hangar)
+/area/ship/hangar)
 "ng" = (
 /obj/effect/turf_decal/spline/fancy/opaque/black{
 	dir = 1
@@ -1175,7 +1175,7 @@
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/effect/decal/cleanable/cobweb/cobweb2,
 /turf/open/floor/plasteel/tech/grid,
-/area/ship/cargo/hangar)
+/area/ship/hangar)
 "nk" = (
 /obj/structure/table,
 /obj/effect/turf_decal/corner/transparent/neutral{
@@ -1203,7 +1203,7 @@
 	dir = 4
 	},
 /turf/open/floor/plasteel/dark,
-/area/ship/cargo/hangar)
+/area/ship/hangar)
 "np" = (
 /obj/structure/table,
 /obj/item/cigbutt{
@@ -1244,7 +1244,7 @@
 	},
 /obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/plasteel/tech/grid,
-/area/ship/cargo/hangar)
+/area/ship/hangar)
 "oc" = (
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2,
@@ -1276,7 +1276,7 @@
 	dir = 1
 	},
 /turf/open/floor/plasteel/patterned/cargo_one,
-/area/ship/cargo/hangar)
+/area/ship/hangar)
 "oq" = (
 /obj/effect/turf_decal/industrial/warning{
 	dir = 4
@@ -1286,7 +1286,7 @@
 	},
 /obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/plasteel/patterned,
-/area/ship/cargo/hangar)
+/area/ship/hangar)
 "oA" = (
 /obj/effect/turf_decal/industrial/warning,
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
@@ -1299,7 +1299,7 @@
 	dir = 1
 	},
 /turf/open/floor/plasteel/patterned/cargo_one,
-/area/ship/cargo/hangar)
+/area/ship/hangar)
 "oE" = (
 /obj/structure/closet/secure_closet/freezer{
 	anchored = 1;
@@ -1470,7 +1470,7 @@
 	dir = 1
 	},
 /turf/open/floor/plasteel/patterned/cargo_one,
-/area/ship/cargo/hangar)
+/area/ship/hangar)
 "qw" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
@@ -1482,7 +1482,7 @@
 	},
 /obj/effect/turf_decal/steeldecal/steel_decals_central7,
 /turf/open/floor/plasteel/dark,
-/area/ship/cargo/hangar)
+/area/ship/hangar)
 "qB" = (
 /obj/structure/cable/yellow{
 	icon_state = "4-8"
@@ -1545,7 +1545,7 @@
 	pixel_y = -32
 	},
 /turf/open/floor/plasteel/tech/grid,
-/area/ship/cargo/hangar)
+/area/ship/hangar)
 "qN" = (
 /turf/open/floor/engine/hull,
 /area/ship/engineering/engine)
@@ -1597,7 +1597,7 @@
 	dir = 1
 	},
 /turf/open/floor/plasteel/patterned/cargo_one,
-/area/ship/cargo/hangar)
+/area/ship/hangar)
 "rr" = (
 /obj/structure/chair{
 	dir = 8
@@ -1635,13 +1635,13 @@
 	},
 /obj/effect/turf_decal/siding/thinplating,
 /turf/open/floor/plasteel/patterned/cargo_one,
-/area/ship/cargo/hangar)
+/area/ship/hangar)
 "ru" = (
 /obj/structure/cable{
 	icon_state = "2-8"
 	},
 /turf/closed/wall/mineral/titanium/nodiagonal,
-/area/ship/cargo/hangar)
+/area/ship/hangar)
 "rB" = (
 /obj/effect/turf_decal/industrial/warning{
 	dir = 1
@@ -1652,7 +1652,7 @@
 	},
 /obj/effect/turf_decal/siding/thinplating,
 /turf/open/floor/plasteel/patterned/cargo_one,
-/area/ship/cargo/hangar)
+/area/ship/hangar)
 "rD" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
 	dir = 9
@@ -1667,11 +1667,11 @@
 /area/ship/engineering/communications)
 "rH" = (
 /turf/closed/wall/mineral/titanium/nodiagonal,
-/area/ship/cargo/hangar)
+/area/ship/hangar)
 "rY" = (
 /obj/structure/filingcabinet/chestdrawer,
 /turf/open/floor/plasteel/telecomms_floor,
-/area/ship/cargo/hangar)
+/area/ship/hangar)
 "rZ" = (
 /obj/machinery/door/firedoor/border_only{
 	dir = 4
@@ -1754,7 +1754,7 @@
 	dir = 1
 	},
 /turf/open/floor/plasteel/patterned,
-/area/ship/cargo/hangar)
+/area/ship/hangar)
 "sC" = (
 /obj/structure/table,
 /obj/item/analyzer{
@@ -1811,18 +1811,18 @@
 	},
 /obj/machinery/firealarm/directional/north,
 /turf/open/floor/plasteel/patterned/ridged,
-/area/ship/cargo/hangar)
+/area/ship/hangar)
 "sR" = (
 /obj/structure/sign/nanotrasen,
 /turf/closed/wall/mineral/titanium/nodiagonal,
-/area/ship/cargo/hangar)
+/area/ship/hangar)
 "sW" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
 	dir = 9
 	},
 /turf/open/floor/plasteel/dark,
-/area/ship/cargo/hangar)
+/area/ship/hangar)
 "tf" = (
 /obj/structure/sign/poster/official/miners{
 	pixel_x = 32
@@ -1844,7 +1844,7 @@
 	dir = 1
 	},
 /turf/open/floor/plasteel/patterned,
-/area/ship/cargo/hangar)
+/area/ship/hangar)
 "tU" = (
 /obj/machinery/light/directional/north,
 /turf/open/floor/plasteel/telecomms_floor,
@@ -1902,7 +1902,7 @@
 	dir = 4
 	},
 /turf/open/floor/plating,
-/area/ship/cargo/hangar)
+/area/ship/hangar)
 "ud" = (
 /obj/item/kirbyplants{
 	icon_state = "plant-10";
@@ -1920,7 +1920,7 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
 /turf/open/floor/plasteel/stairs,
-/area/ship/cargo/hangar)
+/area/ship/hangar)
 "ui" = (
 /obj/structure/cable{
 	icon_state = "0-4"
@@ -2060,6 +2060,7 @@
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
 	dir = 1
 	},
+/obj/machinery/light/dim/directional/south,
 /turf/open/floor/plasteel/tech,
 /area/ship/crew)
 "wg" = (
@@ -2101,7 +2102,7 @@
 /obj/item/clothing/head/hardhat/weldhat,
 /obj/item/clothing/glasses/meson/engine,
 /turf/open/floor/plasteel/dark,
-/area/ship/cargo/hangar)
+/area/ship/hangar)
 "ws" = (
 /obj/structure/bedsheetbin,
 /obj/structure/table,
@@ -2122,7 +2123,7 @@
 /area/ship/engineering/engine)
 "wT" = (
 /turf/open/floor/plasteel/dark,
-/area/ship/cargo/hangar)
+/area/ship/hangar)
 "xc" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/effect/decal/cleanable/oil,
@@ -2137,7 +2138,7 @@
 	dir = 10
 	},
 /turf/open/floor/plasteel/dark,
-/area/ship/cargo/hangar)
+/area/ship/hangar)
 "xh" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/structure/cable{
@@ -2166,7 +2167,7 @@
 	},
 /obj/effect/turf_decal/industrial/loading,
 /turf/open/floor/plasteel/dark,
-/area/ship/cargo/hangar)
+/area/ship/hangar)
 "xB" = (
 /obj/machinery/vending/snack/random,
 /obj/effect/turf_decal/corner/transparent/neutral{
@@ -2189,7 +2190,7 @@
 	},
 /obj/effect/turf_decal/siding/thinplating,
 /turf/open/floor/plasteel/patterned,
-/area/ship/cargo/hangar)
+/area/ship/hangar)
 "xG" = (
 /obj/effect/turf_decal/industrial/outline/yellow,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
@@ -2238,7 +2239,7 @@
 	},
 /obj/effect/turf_decal/siding/thinplating,
 /turf/open/floor/plasteel/patterned/ridged,
-/area/ship/cargo/hangar)
+/area/ship/hangar)
 "ye" = (
 /obj/machinery/telecomms/bus/preset_two{
 	network = "nt_commnet"
@@ -2265,7 +2266,7 @@
 	},
 /obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/plasteel/tech,
-/area/ship/cargo/hangar)
+/area/ship/hangar)
 "yI" = (
 /obj/machinery/telecomms/receiver/preset_left{
 	network = "nt_commnet";
@@ -2320,7 +2321,7 @@
 	},
 /obj/effect/turf_decal/siding/thinplating,
 /turf/open/floor/plasteel/patterned,
-/area/ship/cargo/hangar)
+/area/ship/hangar)
 "yV" = (
 /obj/effect/turf_decal/industrial/hatch/yellow,
 /turf/open/floor/plasteel/dark,
@@ -2357,7 +2358,7 @@
 /turf/open/floor/plasteel/stairs{
 	dir = 1
 	},
-/area/ship/cargo/hangar)
+/area/ship/hangar)
 "zH" = (
 /obj/machinery/power/terminal{
 	dir = 8
@@ -2390,7 +2391,7 @@
 	},
 /obj/effect/turf_decal/ntspaceworks_small,
 /turf/open/floor/plating,
-/area/ship/cargo/hangar)
+/area/ship/hangar)
 "Ag" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
@@ -2498,7 +2499,7 @@
 	},
 /obj/structure/closet/crate/bin,
 /turf/open/floor/plasteel,
-/area/ship/cargo/hangar)
+/area/ship/hangar)
 "Bn" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
 	dir = 4
@@ -2523,7 +2524,7 @@
 	pixel_y = 5
 	},
 /turf/open/floor/plasteel/dark,
-/area/ship/cargo/hangar)
+/area/ship/hangar)
 "Bv" = (
 /obj/structure/table,
 /obj/item/reagent_containers/food/drinks/coffee{
@@ -2551,7 +2552,7 @@
 	pixel_y = -32
 	},
 /turf/open/floor/plasteel/dark,
-/area/ship/cargo/hangar)
+/area/ship/hangar)
 "BH" = (
 /obj/structure/table,
 /obj/item/stack/packageWrap{
@@ -2571,7 +2572,7 @@
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/machinery/suit_storage_unit/engine,
 /turf/open/floor/plasteel/dark,
-/area/ship/cargo/hangar)
+/area/ship/hangar)
 "BP" = (
 /obj/machinery/power/terminal{
 	dir = 8
@@ -2626,7 +2627,7 @@
 	},
 /obj/effect/turf_decal/siding/thinplating,
 /turf/open/floor/plasteel/patterned/cargo_one,
-/area/ship/cargo/hangar)
+/area/ship/hangar)
 "Cm" = (
 /obj/effect/turf_decal/industrial/outline/yellow,
 /obj/machinery/pipedispenser{
@@ -2669,7 +2670,7 @@
 	dir = 1
 	},
 /turf/open/floor/plasteel/patterned,
-/area/ship/cargo/hangar)
+/area/ship/hangar)
 "CC" = (
 /obj/effect/turf_decal/industrial/warning{
 	dir = 1
@@ -2683,13 +2684,13 @@
 	},
 /obj/effect/turf_decal/siding/thinplating,
 /turf/open/floor/plasteel/patterned/cargo_one,
-/area/ship/cargo/hangar)
+/area/ship/hangar)
 "CD" = (
 /obj/effect/turf_decal/industrial/warning{
 	dir = 1
 	},
 /obj/effect/turf_decal/industrial/warning,
-/obj/machinery/light/dim/directional/west,
+/obj/machinery/computer/cryopod/directional/west,
 /turf/open/floor/plasteel/dark,
 /area/ship/crew)
 "CH" = (
@@ -2764,7 +2765,7 @@
 	pixel_y = -3
 	},
 /turf/open/floor/plasteel/telecomms_floor,
-/area/ship/cargo/hangar)
+/area/ship/hangar)
 "CT" = (
 /obj/machinery/power/smes/shuttle/precharged{
 	dir = 4
@@ -2821,7 +2822,7 @@
 /area/ship/hallway/central)
 "Dk" = (
 /turf/open/floor/plasteel/patterned/ridged,
-/area/ship/cargo/hangar)
+/area/ship/hangar)
 "DF" = (
 /obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/layer4{
 	dir = 8
@@ -2882,7 +2883,7 @@
 	dir = 1
 	},
 /turf/open/floor/plasteel/patterned/ridged,
-/area/ship/cargo/hangar)
+/area/ship/hangar)
 "Ev" = (
 /obj/structure/table/reinforced,
 /obj/item/radio/intercom/wideband{
@@ -2907,7 +2908,7 @@
 	},
 /obj/effect/turf_decal/siding/thinplating,
 /turf/open/floor/plasteel/patterned/cargo_one,
-/area/ship/cargo/hangar)
+/area/ship/hangar)
 "Fd" = (
 /obj/effect/turf_decal/industrial/warning,
 /obj/effect/decal/cleanable/dirt,
@@ -2925,7 +2926,7 @@
 	dir = 1
 	},
 /turf/open/floor/plasteel/patterned/cargo_one,
-/area/ship/cargo/hangar)
+/area/ship/hangar)
 "Fg" = (
 /obj/structure/table,
 /obj/item/paper_bin,
@@ -2983,7 +2984,7 @@
 	dir = 1
 	},
 /turf/open/floor/plasteel/patterned,
-/area/ship/cargo/hangar)
+/area/ship/hangar)
 "FL" = (
 /obj/machinery/blackbox_recorder,
 /obj/structure/window/reinforced/spawner/north,
@@ -3007,7 +3008,7 @@
 	bulb_colour = "#d5fcff"
 	},
 /turf/open/floor/plasteel/dark,
-/area/ship/cargo/hangar)
+/area/ship/hangar)
 "Gb" = (
 /obj/structure/sink{
 	dir = 8;
@@ -3118,7 +3119,7 @@
 	dir = 9
 	},
 /turf/open/floor/plasteel/dark,
-/area/ship/cargo/hangar)
+/area/ship/hangar)
 "HM" = (
 /obj/effect/turf_decal/industrial/warning{
 	dir = 8
@@ -3131,7 +3132,7 @@
 	dir = 4
 	},
 /turf/open/floor/plating,
-/area/ship/cargo/hangar)
+/area/ship/hangar)
 "HP" = (
 /obj/machinery/door/airlock/engineering{
 	req_access_txt = "61";
@@ -3180,7 +3181,7 @@
 	},
 /obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/plasteel/patterned/ridged,
-/area/ship/cargo/hangar)
+/area/ship/hangar)
 "Iv" = (
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4,
 /obj/structure/cable{
@@ -3288,7 +3289,7 @@
 	},
 /obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/plasteel/tech/grid,
-/area/ship/cargo/hangar)
+/area/ship/hangar)
 "Ku" = (
 /obj/structure/chair/office{
 	dir = 4
@@ -3303,7 +3304,7 @@
 	output_dir = 1
 	},
 /turf/open/floor/plasteel/dark,
-/area/ship/cargo/hangar)
+/area/ship/hangar)
 "KI" = (
 /obj/effect/turf_decal/siding/thinplating,
 /obj/effect/turf_decal/trimline/opaque/white/line,
@@ -3383,7 +3384,7 @@
 	dir = 1
 	},
 /turf/open/floor/plasteel/patterned,
-/area/ship/cargo/hangar)
+/area/ship/hangar)
 "LC" = (
 /obj/effect/turf_decal/industrial/warning,
 /obj/effect/turf_decal/industrial/warning{
@@ -3417,7 +3418,7 @@
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/plasteel/patterned,
-/area/ship/cargo/hangar)
+/area/ship/hangar)
 "LV" = (
 /obj/machinery/door/airlock/external,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
@@ -3440,7 +3441,7 @@
 	pixel_x = -4
 	},
 /turf/open/floor/plasteel/dark,
-/area/ship/cargo/hangar)
+/area/ship/hangar)
 "Mi" = (
 /obj/structure/cable{
 	icon_state = "0-1"
@@ -3522,7 +3523,7 @@
 	dir = 4
 	},
 /turf/open/floor/plating,
-/area/ship/cargo/hangar)
+/area/ship/hangar)
 "MS" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
 /obj/effect/turf_decal/siding/thinplating/corner{
@@ -3597,7 +3598,7 @@
 	dir = 10
 	},
 /turf/open/floor/plasteel/patterned,
-/area/ship/cargo/hangar)
+/area/ship/hangar)
 "Nz" = (
 /obj/effect/turf_decal/siding/thinplating/corner,
 /obj/effect/turf_decal/siding/thinplating/corner{
@@ -3613,11 +3614,11 @@
 /area/ship/hallway/central)
 "NA" = (
 /turf/closed/wall,
-/area/ship/cargo/hangar)
+/area/ship/hangar)
 "NC" = (
 /obj/effect/turf_decal/ntspaceworks_small/left,
 /turf/open/floor/plating,
-/area/ship/cargo/hangar)
+/area/ship/hangar)
 "NL" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -3668,7 +3669,7 @@
 	id = "tegusbelt"
 	},
 /turf/open/floor/plasteel/dark,
-/area/ship/cargo/hangar)
+/area/ship/hangar)
 "Oo" = (
 /obj/machinery/door/firedoor/border_only{
 	dir = 4
@@ -3779,7 +3780,7 @@
 	pixel_x = -3
 	},
 /turf/open/floor/plasteel/dark,
-/area/ship/cargo/hangar)
+/area/ship/hangar)
 "OU" = (
 /obj/structure/catwalk/over/plated_catwalk/dark,
 /obj/structure/cable{
@@ -3840,7 +3841,7 @@
 	},
 /obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/plasteel/patterned,
-/area/ship/cargo/hangar)
+/area/ship/hangar)
 "Pb" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable{
@@ -3901,7 +3902,7 @@
 	dir = 8
 	},
 /turf/open/floor/plasteel/dark,
-/area/ship/cargo/hangar)
+/area/ship/hangar)
 "PF" = (
 /obj/effect/turf_decal/industrial/warning{
 	dir = 1
@@ -3919,7 +3920,7 @@
 	},
 /obj/effect/turf_decal/siding/thinplating,
 /turf/open/floor/plasteel/patterned/cargo_one,
-/area/ship/cargo/hangar)
+/area/ship/hangar)
 "PI" = (
 /obj/machinery/telecomms/server/presets/nanotrasen{
 	network = "nt_commnet"
@@ -3962,7 +3963,7 @@
 "Qw" = (
 /obj/effect/spawner/structure/window/reinforced,
 /turf/open/floor/plating,
-/area/ship/cargo/hangar)
+/area/ship/hangar)
 "QA" = (
 /obj/structure/sign/poster/official/build{
 	pixel_y = -32
@@ -3985,7 +3986,7 @@
 	id = "tegus_hangar_shutters"
 	},
 /turf/open/floor/plating,
-/area/ship/cargo/hangar)
+/area/ship/hangar)
 "Rp" = (
 /obj/effect/turf_decal/industrial/outline/yellow,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
@@ -4041,7 +4042,7 @@
 	},
 /obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/plasteel/patterned/ridged,
-/area/ship/cargo/hangar)
+/area/ship/hangar)
 "RI" = (
 /obj/machinery/door/airlock/grunge{
 	dir = 4;
@@ -4054,7 +4055,7 @@
 	dir = 8
 	},
 /turf/open/floor/plasteel/dark,
-/area/ship/cargo/hangar)
+/area/ship/hangar)
 "RJ" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/effect/decal/cleanable/dirt/dust,
@@ -4080,7 +4081,7 @@
 	},
 /obj/effect/turf_decal/siding/thinplating,
 /turf/open/floor/plasteel/patterned/ridged,
-/area/ship/cargo/hangar)
+/area/ship/hangar)
 "RR" = (
 /obj/effect/turf_decal/industrial/loading{
 	dir = 8
@@ -4103,7 +4104,7 @@
 /obj/effect/turf_decal/industrial/hatch/yellow,
 /obj/structure/ore_box,
 /turf/open/floor/plasteel/dark,
-/area/ship/cargo/hangar)
+/area/ship/hangar)
 "Sa" = (
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
 /obj/effect/turf_decal/siding/thinplating{
@@ -4142,7 +4143,7 @@
 /obj/effect/turf_decal/corner/transparent/neutral,
 /obj/machinery/suit_storage_unit/engine,
 /turf/open/floor/plasteel/dark,
-/area/ship/cargo/hangar)
+/area/ship/hangar)
 "Sp" = (
 /turf/closed/wall/r_wall,
 /area/ship/bridge)
@@ -4188,7 +4189,7 @@
 /obj/item/stack/sheet/glass/five,
 /obj/item/storage/box/lights/mixed,
 /obj/item/storage/box/stockparts/basic,
-/obj/item/circuitboard/computer/crew,
+/obj/item/choice_beacon/computer,
 /obj/item/circuitboard/computer/shuttle/helm,
 /turf/open/floor/plasteel/dark,
 /area/ship/cargo)
@@ -4323,13 +4324,13 @@
 	bulb_colour = "#d5fcff"
 	},
 /turf/open/floor/plasteel/dark,
-/area/ship/cargo/hangar)
+/area/ship/hangar)
 "Vv" = (
 /obj/effect/turf_decal/industrial/warning{
 	dir = 4
 	},
 /turf/open/floor/plasteel/patterned,
-/area/ship/cargo/hangar)
+/area/ship/hangar)
 "Vy" = (
 /obj/structure/cable{
 	icon_state = "2-8"
@@ -4487,7 +4488,7 @@
 	},
 /obj/effect/turf_decal/siding/thinplating,
 /turf/open/floor/plasteel/patterned,
-/area/ship/cargo/hangar)
+/area/ship/hangar)
 "XQ" = (
 /obj/effect/turf_decal/siding/thinplating/corner{
 	dir = 1
@@ -4570,7 +4571,7 @@
 	name = "Hangar"
 	},
 /turf/open/floor/plasteel,
-/area/ship/cargo/hangar)
+/area/ship/hangar)
 "YV" = (
 /obj/machinery/computer/telecomms/server{
 	dir = 8;
@@ -4578,7 +4579,7 @@
 	},
 /obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/plasteel/telecomms_floor,
-/area/ship/cargo/hangar)
+/area/ship/hangar)
 "YY" = (
 /obj/structure/chair{
 	dir = 4
@@ -4620,7 +4621,7 @@
 	dir = 8
 	},
 /turf/open/floor/plasteel/dark,
-/area/ship/cargo/hangar)
+/area/ship/hangar)
 "Zs" = (
 /obj/machinery/atmospherics/pipe/layer_manifold{
 	dir = 4
@@ -4649,7 +4650,7 @@
 	dir = 1
 	},
 /turf/open/floor/plasteel/patterned/cargo_one,
-/area/ship/cargo/hangar)
+/area/ship/hangar)
 "ZV" = (
 /obj/effect/turf_decal/industrial/warning{
 	dir = 1
@@ -4666,7 +4667,7 @@
 	},
 /obj/effect/turf_decal/siding/thinplating,
 /turf/open/floor/plasteel/patterned/cargo_one,
-/area/ship/cargo/hangar)
+/area/ship/hangar)
 "ZY" = (
 /obj/structure/cable/yellow{
 	icon_state = "1-2"
diff --git a/_maps/shuttles/subshuttles/nanotrasen_anole_damaged.dmm b/_maps/shuttles/subshuttles/nanotrasen_anole_damaged.dmm
index d8ffd541bdfb..da05bee3d41d 100644
--- a/_maps/shuttles/subshuttles/nanotrasen_anole_damaged.dmm
+++ b/_maps/shuttles/subshuttles/nanotrasen_anole_damaged.dmm
@@ -609,7 +609,7 @@
 	},
 /obj/machinery/door/airlock/grunge{
 	dir = 4;
-	req_one_access = list(31,11)
+	req_one_access = list(31)
 	},
 /turf/open/floor/plasteel,
 /area/ship/shuttle)
diff --git a/code/game/area/ship_areas.dm b/code/game/area/ship_areas.dm
index c3ae367b204e..7eaa7fb77408 100644
--- a/code/game/area/ship_areas.dm
+++ b/code/game/area/ship_areas.dm
@@ -351,15 +351,13 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 /area/ship/cargo/starboard
 	name = "Starboard Cargo Bay"
 
-/area/ship/cargo/hangar
-	name = "Hangar"
-	icon_state = "hangar"
-
 /// Hangars ///
 
 /area/ship/hangar
 	name = "Hangar"
-	icon_state = "shuttlered"
+	icon_state = "hangar"
+	lighting_colour_tube = "#ffe3cc"
+	lighting_colour_bulb = "#ffdbb8"
 	sound_environment = SOUND_AREA_LARGE_ENCLOSED
 	ambientsounds = ENGINEERING
 
diff --git a/code/game/objects/items/miscellaneous.dm b/code/game/objects/items/miscellaneous.dm
index c5de2589f1d3..9075c7c0ddd2 100644
--- a/code/game/objects/items/miscellaneous.dm
+++ b/code/game/objects/items/miscellaneous.dm
@@ -248,6 +248,24 @@
 			ouija_spaghetti_list[initial(A.name)] = A
 	return ouija_spaghetti_list
 
+/obj/item/choice_beacon/computer
+	name = "computer board delivery beacon"
+	desc = "Use Nanotrasen's finest cargo pod delivery systems to deliver a computer of your choice to your doorstep." //replace Nanotrasen with any other faction (they all have nice delivery systems)
+
+/obj/item/choice_beacon/computer/generate_display_names()
+	var/static/list/computer_list
+	if(!computer_list)
+		computer_list = list()
+		var/list/templist = list(
+		/obj/item/circuitboard/computer/crew,
+		/obj/item/circuitboard/computer/cargo/express,
+		/obj/item/circuitboard/computer/arcade/orion_trail,
+		/obj/item/circuitboard/computer/security)
+		for(var/V in templist)
+			var/atom/A = V
+			computer_list[initial(A.name)] = A
+	return computer_list
+
 /obj/structure/legionpike
 	name = "legion on a spear"
 	desc = "EXTREME interior decorating. You can feel it watching you."

From 0d9ef667175d8d1af2627db7c96da6f8a13e24bf Mon Sep 17 00:00:00 2001
From: goober3 <118859017+goober3@users.noreply.github.com>
Date: Wed, 28 Jun 2023 18:30:45 +0100
Subject: [PATCH 23/28] tweaks

---
 _maps/shuttles/shiptest/nanotrasen_tegus.dmm   | 18 +++++++++---------
 .../subshuttles/nanotrasen_anole_damaged.dmm   |  6 +++---
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/_maps/shuttles/shiptest/nanotrasen_tegus.dmm b/_maps/shuttles/shiptest/nanotrasen_tegus.dmm
index fc98ea3b6d06..6fcebcd865f0 100644
--- a/_maps/shuttles/shiptest/nanotrasen_tegus.dmm
+++ b/_maps/shuttles/shiptest/nanotrasen_tegus.dmm
@@ -325,7 +325,7 @@
 	},
 /obj/machinery/computer/telecomms/monitor{
 	dir = 8;
-	network = "ntsv_commnet"
+	network = "nt_commnet"
 	},
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
 	dir = 8
@@ -2244,7 +2244,7 @@
 /obj/machinery/telecomms/bus/preset_two{
 	network = "nt_commnet"
 	},
-/turf/open/floor/circuit/green/telecomms/mainframe,
+/turf/open/floor/circuit/green,
 /area/ship/engineering/communications)
 "yg" = (
 /obj/structure/girder,
@@ -2273,7 +2273,7 @@
 	id = "Nanotrasen Receiver"
 	},
 /obj/structure/window/reinforced/spawner,
-/turf/open/floor/circuit/green/telecomms/mainframe,
+/turf/open/floor/circuit/green,
 /area/ship/engineering/communications)
 "yJ" = (
 /obj/structure/table/reinforced,
@@ -2491,7 +2491,7 @@
 	id = "Nanotrasen Broadcaster"
 	},
 /obj/structure/window/reinforced/spawner,
-/turf/open/floor/circuit/green/telecomms/mainframe,
+/turf/open/floor/circuit/green,
 /area/ship/engineering/communications)
 "Bl" = (
 /obj/structure/railing{
@@ -2895,7 +2895,7 @@
 /obj/machinery/telecomms/hub/preset{
 	network = "nt_commnet"
 	},
-/turf/open/floor/circuit/telecomms/mainframe,
+/turf/open/floor/circuit,
 /area/ship/engineering/communications)
 "EU" = (
 /obj/effect/turf_decal/industrial/warning{
@@ -2988,13 +2988,13 @@
 "FL" = (
 /obj/machinery/blackbox_recorder,
 /obj/structure/window/reinforced/spawner/north,
-/turf/open/floor/circuit/telecomms/mainframe,
+/turf/open/floor/circuit,
 /area/ship/engineering/communications)
 "FN" = (
 /obj/machinery/telecomms/processor/preset_two{
 	network = "nt_commnet"
 	},
-/turf/open/floor/circuit/green/telecomms/mainframe,
+/turf/open/floor/circuit/green,
 /area/ship/engineering/communications)
 "FQ" = (
 /obj/effect/decal/cleanable/dirt/dust,
@@ -3093,7 +3093,7 @@
 	network = "nt_commnet";
 	id = "Tegus Relay"
 	},
-/turf/open/floor/circuit/telecomms/mainframe,
+/turf/open/floor/circuit,
 /area/ship/engineering/communications)
 "Hl" = (
 /obj/effect/turf_decal/industrial/traffic{
@@ -3926,7 +3926,7 @@
 	network = "nt_commnet"
 	},
 /obj/structure/window/reinforced/spawner/north,
-/turf/open/floor/circuit/telecomms/mainframe,
+/turf/open/floor/circuit,
 /area/ship/engineering/communications)
 "PQ" = (
 /obj/machinery/cryopod{
diff --git a/_maps/shuttles/subshuttles/nanotrasen_anole_damaged.dmm b/_maps/shuttles/subshuttles/nanotrasen_anole_damaged.dmm
index da05bee3d41d..31bd2ff9aaed 100644
--- a/_maps/shuttles/subshuttles/nanotrasen_anole_damaged.dmm
+++ b/_maps/shuttles/subshuttles/nanotrasen_anole_damaged.dmm
@@ -28,7 +28,7 @@
 /obj/structure/frame/machine{
 	anchored = 1
 	},
-/turf/open/floor/plating,
+/turf/open/floor/plating/airless,
 /area/ship/shuttle)
 "bt" = (
 /obj/effect/turf_decal/industrial/traffic{
@@ -297,7 +297,7 @@
 /obj/structure/cable{
 	icon_state = "0-4"
 	},
-/turf/open/floor/plating,
+/turf/open/floor/plating/airless,
 /area/ship/shuttle)
 "sa" = (
 /obj/structure/closet/secure_closet/wall{
@@ -520,7 +520,7 @@
 /area/ship/shuttle)
 "CM" = (
 /obj/structure/girder,
-/turf/open/floor/plating,
+/turf/open/floor/plating/airless,
 /area/ship/shuttle)
 "CS" = (
 /obj/effect/decal/cleanable/dirt/dust,

From 927b686ac82069dcdd8b91393bc66846c23f6725 Mon Sep 17 00:00:00 2001
From: goober3 <118859017+goober3@users.noreply.github.com>
Date: Wed, 28 Jun 2023 18:53:02 +0100
Subject: [PATCH 24/28] damaged shuttle....gone!!

---
 _maps/shuttles/shiptest/nanotrasen_tegus.dmm  |  17 +-
 .../shuttles/subshuttles/nanotrasen_anole.dmm |  10 +-
 .../subshuttles/nanotrasen_anole_damaged.dmm  | 978 ------------------
 code/datums/shuttles.dm                       |   5 -
 4 files changed, 8 insertions(+), 1002 deletions(-)
 delete mode 100644 _maps/shuttles/subshuttles/nanotrasen_anole_damaged.dmm

diff --git a/_maps/shuttles/shiptest/nanotrasen_tegus.dmm b/_maps/shuttles/shiptest/nanotrasen_tegus.dmm
index 6fcebcd865f0..6dbf2824b797 100644
--- a/_maps/shuttles/shiptest/nanotrasen_tegus.dmm
+++ b/_maps/shuttles/shiptest/nanotrasen_tegus.dmm
@@ -2387,7 +2387,7 @@
 /area/ship/engineering/engine)
 "zY" = (
 /obj/effect/landmark/subship{
-	subship_template = /datum/map_template/shuttle/subshuttles/anole/damaged
+	subship_template = /datum/map_template/shuttle/subshuttles/anole
 	},
 /obj/effect/turf_decal/ntspaceworks_small,
 /turf/open/floor/plating,
@@ -4180,19 +4180,6 @@
 	},
 /turf/open/floor/plasteel,
 /area/ship/hallway/central)
-"SF" = (
-/obj/effect/turf_decal/industrial/outline/yellow,
-/obj/structure/closet/crate/engineering{
-	name = "Shuttle Repair Supplies"
-	},
-/obj/item/stack/sheet/metal/five,
-/obj/item/stack/sheet/glass/five,
-/obj/item/storage/box/lights/mixed,
-/obj/item/storage/box/stockparts/basic,
-/obj/item/choice_beacon/computer,
-/obj/item/circuitboard/computer/shuttle/helm,
-/turf/open/floor/plasteel/dark,
-/area/ship/cargo)
 "SI" = (
 /obj/machinery/door/airlock/grunge{
 	dir = 4;
@@ -5335,7 +5322,7 @@ pO
 Ku
 Fg
 GQ
-SF
+Ak
 Rp
 pC
 kG
diff --git a/_maps/shuttles/subshuttles/nanotrasen_anole.dmm b/_maps/shuttles/subshuttles/nanotrasen_anole.dmm
index 26ce2faf06ae..3ef065b10ad5 100644
--- a/_maps/shuttles/subshuttles/nanotrasen_anole.dmm
+++ b/_maps/shuttles/subshuttles/nanotrasen_anole.dmm
@@ -197,18 +197,20 @@
 /turf/open/floor/plasteel/patterned/ridged,
 /area/ship/shuttle)
 "oi" = (
-/obj/machinery/atmospherics/components/unary/portables_connector/visible/layer4{
+/obj/machinery/atmospherics/components/unary/tank/air{
+	piping_layer = 4;
 	dir = 1
 	},
-/obj/machinery/portable_atmospherics/canister/air,
 /turf/open/floor/plasteel/tech,
 /area/ship/shuttle)
 "oI" = (
 /obj/effect/turf_decal/corner/transparent/neutral{
 	dir = 4
 	},
-/obj/machinery/computer/crew/retro{
-	dir = 8
+/obj/item/choice_beacon/computer,
+/obj/structure/frame/computer/retro{
+	dir = 8;
+	anchored = 1
 	},
 /turf/open/floor/plasteel/dark,
 /area/ship/shuttle)
diff --git a/_maps/shuttles/subshuttles/nanotrasen_anole_damaged.dmm b/_maps/shuttles/subshuttles/nanotrasen_anole_damaged.dmm
deleted file mode 100644
index 31bd2ff9aaed..000000000000
--- a/_maps/shuttles/subshuttles/nanotrasen_anole_damaged.dmm
+++ /dev/null
@@ -1,978 +0,0 @@
-//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
-"bj" = (
-/obj/effect/turf_decal/trimline/opaque/solgovgold/warning,
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
-	dir = 10
-	},
-/obj/structure/cable{
-	icon_state = "1-8"
-	},
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/plasteel/patterned,
-/area/ship/shuttle)
-"bl" = (
-/obj/structure/cable{
-	icon_state = "0-4"
-	},
-/obj/item/circuitboard/machine/shuttle/engine/electric{
-	pixel_y = 3;
-	pixel_x = -3
-	},
-/obj/item/stack/cable_coil/cut/red,
-/obj/item/stack/ore/salvage/scrapmetal/five{
-	pixel_x = 3
-	},
-/obj/structure/frame/machine{
-	anchored = 1
-	},
-/turf/open/floor/plating/airless,
-/area/ship/shuttle)
-"bt" = (
-/obj/effect/turf_decal/industrial/traffic{
-	dir = 8
-	},
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/machinery/button/shieldwallgen{
-	dir = 4;
-	pixel_x = -27;
-	pixel_y = 5;
-	id = "tegus_shield_port";
-	name = "Port Holofield"
-	},
-/obj/machinery/button/door{
-	dir = 4;
-	pixel_x = -27;
-	pixel_y = -5;
-	id = "tegus_shuttle_port";
-	name = "Port Blast Door"
-	},
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/plasteel/patterned/ridged,
-/area/ship/shuttle)
-"cu" = (
-/obj/structure/cable{
-	icon_state = "1-8"
-	},
-/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer4,
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/plasteel/patterned,
-/area/ship/shuttle)
-"cR" = (
-/obj/effect/turf_decal/trimline/opaque/solgovgold/warning{
-	dir = 1
-	},
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2,
-/obj/item/kirbyplants{
-	icon_state = "plant-20";
-	pixel_x = 3;
-	name = "Emotional Support Plant";
-	desc = "The light of your life!"
-	},
-/turf/open/floor/plasteel/patterned/cargo_one,
-/area/ship/shuttle)
-"dm" = (
-/obj/machinery/light/small{
-	dir = 4;
-	pixel_x = 28
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
-	dir = 10
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
-	dir = 4
-	},
-/obj/structure/catwalk/over/plated_catwalk/dark,
-/turf/open/floor/plating,
-/area/ship/shuttle)
-"dK" = (
-/obj/structure/cable{
-	icon_state = "0-4"
-	},
-/obj/machinery/power/smes/micro/precharged,
-/turf/open/floor/plating,
-/area/ship/shuttle)
-"dU" = (
-/obj/effect/turf_decal/industrial/traffic{
-	dir = 4
-	},
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/plasteel/patterned/ridged,
-/area/ship/shuttle)
-"fx" = (
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/structure/cable{
-	icon_state = "1-4"
-	},
-/obj/structure/cable{
-	icon_state = "2-4"
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
-	dir = 6
-	},
-/obj/structure/catwalk/over/plated_catwalk/dark,
-/turf/open/floor/plating,
-/area/ship/shuttle)
-"fO" = (
-/obj/structure/sign/nanotrasen,
-/turf/closed/wall/mineral/titanium/nodiagonal,
-/area/ship/shuttle)
-"fV" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
-	dir = 9
-	},
-/turf/closed/wall/mineral/titanium/nodiagonal,
-/area/ship/shuttle)
-"ir" = (
-/obj/effect/turf_decal/steeldecal/steel_decals_central4{
-	dir = 1
-	},
-/obj/effect/turf_decal/steeldecal/steel_decals9,
-/obj/machinery/atmospherics/components/binary/valve/layer2{
-	dir = 4
-	},
-/turf/open/floor/engine/hull,
-/area/ship/shuttle)
-"jW" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
-/obj/effect/turf_decal/corner/transparent/neutral{
-	dir = 8
-	},
-/obj/machinery/turretid{
-	icon_state = "control_kill";
-	lethal = 1;
-	locked = 0;
-	name = "Mining Turret control panel";
-	pixel_x = -28;
-	req_access = null
-	},
-/obj/item/stack/ore/salvage/scraptitanium{
-	pixel_y = 6
-	},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel/dark,
-/area/ship/shuttle)
-"kH" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
-	dir = 6
-	},
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/decal/cleanable/vomit,
-/turf/open/floor/plasteel/patterned,
-/area/ship/shuttle)
-"lV" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
-	dir = 8
-	},
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
-	dir = 8
-	},
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/plasteel/patterned,
-/area/ship/shuttle)
-"mq" = (
-/obj/effect/turf_decal/steeldecal/steel_decals_central2,
-/obj/effect/turf_decal/steeldecal/steel_decals6,
-/obj/machinery/atmospherics/components/unary/outlet_injector/on/layer2{
-	dir = 8
-	},
-/turf/open/floor/plasteel/tech/grid,
-/area/ship/shuttle)
-"mM" = (
-/obj/machinery/door/poddoor/shutters/preopen{
-	id = "tegus_shuttle_window";
-	dir = 4
-	},
-/obj/structure/grille/broken,
-/obj/effect/decal/cleanable/glass,
-/turf/open/floor/plating,
-/area/ship/shuttle)
-"nB" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
-	dir = 9
-	},
-/obj/effect/turf_decal/corner/transparent/neutral{
-	dir = 9
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
-	dir = 10
-	},
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/blood/old,
-/turf/open/floor/plasteel/dark,
-/area/ship/shuttle)
-"nL" = (
-/obj/effect/turf_decal/industrial/warning,
-/obj/effect/turf_decal/industrial/warning{
-	dir = 1
-	},
-/obj/machinery/door/airlock/external,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
-/turf/open/floor/plasteel/patterned/ridged,
-/area/ship/shuttle)
-"oi" = (
-/obj/machinery/atmospherics/components/unary/portables_connector/visible/layer4{
-	dir = 1
-	},
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/portable_atmospherics/canister/air,
-/turf/open/floor/plasteel/tech,
-/area/ship/shuttle)
-"oI" = (
-/obj/effect/turf_decal/corner/transparent/neutral{
-	dir = 4
-	},
-/obj/structure/frame/computer/retro{
-	dir = 8;
-	anchored = 1
-	},
-/turf/open/floor/plasteel/dark,
-/area/ship/shuttle)
-"oS" = (
-/obj/effect/turf_decal/industrial/traffic{
-	dir = 8
-	},
-/obj/structure/cable{
-	icon_state = "0-2"
-	},
-/obj/machinery/power/shieldwallgen/atmos/roundstart{
-	dir = 4;
-	id = "tegus_shield_port"
-	},
-/obj/machinery/door/poddoor{
-	id = "tegus_shuttle_port"
-	},
-/turf/open/floor/plasteel/patterned/ridged,
-/area/ship/shuttle)
-"pm" = (
-/turf/closed/wall/mineral/titanium/nodiagonal,
-/area/ship/shuttle)
-"qx" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
-	dir = 8
-	},
-/turf/closed/wall/mineral/titanium/nodiagonal,
-/area/ship/shuttle)
-"qz" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
-	dir = 6
-	},
-/turf/open/floor/plasteel/patterned/cargo_one,
-/area/ship/shuttle)
-"rp" = (
-/obj/effect/spawner/structure/window/shuttle,
-/obj/machinery/door/poddoor/shutters/preopen{
-	id = "tegus_shuttle_window"
-	},
-/turf/open/floor/plating,
-/area/ship/shuttle)
-"rx" = (
-/turf/template_noop,
-/area/template_noop)
-"rR" = (
-/obj/machinery/power/shuttle/engine/electric{
-	dir = 4
-	},
-/obj/structure/cable{
-	icon_state = "0-4"
-	},
-/turf/open/floor/plating/airless,
-/area/ship/shuttle)
-"sa" = (
-/obj/structure/closet/secure_closet/wall{
-	name = "pilot's locker";
-	req_access_txt = "31";
-	icon_state = "solgov_wall";
-	dir = 4;
-	pixel_x = -28
-	},
-/obj/item/binoculars,
-/obj/item/storage/firstaid/regular,
-/obj/item/storage/box/bodybags,
-/obj/item/pinpointer/crew,
-/obj/item/storage/toolbox/emergency,
-/obj/item/extinguisher/mini,
-/obj/item/clothing/suit/space/orange,
-/obj/item/clothing/head/helmet/space/orange,
-/obj/item/roller,
-/obj/item/gps{
-	gpstag = "TEGUS1"
-	},
-/obj/effect/turf_decal/corner/transparent/neutral{
-	dir = 2
-	},
-/obj/item/tank/internals/emergency_oxygen/engi,
-/obj/item/assembly/signaler{
-	name = "Emergency Signaler";
-	desc = "A remote signaler device. The label reads ''Stranded without communications? Ping this device to alert your captain who, too, has been provided with a remote signaler!''"
-	},
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
-	dir = 1
-	},
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/plasteel/dark,
-/area/ship/shuttle)
-"sk" = (
-/obj/effect/turf_decal/steeldecal/steel_decals_central4,
-/obj/effect/turf_decal/steeldecal/steel_decals9{
-	dir = 4
-	},
-/obj/item/stack/ore/salvage/scraptitanium{
-	layer = 2.9;
-	pixel_y = -9
-	},
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/engine/hull,
-/area/ship/shuttle)
-"sq" = (
-/obj/effect/turf_decal/industrial/warning,
-/obj/effect/turf_decal/industrial/warning{
-	dir = 1
-	},
-/obj/machinery/door/airlock/external,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
-	dir = 5
-	},
-/turf/open/floor/plasteel/patterned/ridged,
-/area/ship/shuttle)
-"tB" = (
-/obj/machinery/holopad/emergency/command,
-/obj/effect/turf_decal/box,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
-/obj/machinery/light/dim{
-	dir = 8;
-	bulb_power = 0.5;
-	pixel_x = -32
-	},
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/plasteel/dark,
-/area/ship/shuttle)
-"uJ" = (
-/obj/effect/turf_decal/trimline/opaque/solgovgold/warning{
-	dir = 1
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
-	dir = 6
-	},
-/turf/open/floor/plasteel/patterned,
-/area/ship/shuttle)
-"wV" = (
-/obj/docking_port/mobile{
-	dir = 2;
-	port_direction = 8;
-	preferred_direction = 4
-	},
-/obj/machinery/door/poddoor{
-	id = "tegus_shuttle_port"
-	},
-/turf/open/floor/plasteel/patterned/ridged,
-/area/ship/shuttle)
-"xB" = (
-/obj/structure/cable{
-	icon_state = "0-2"
-	},
-/obj/machinery/power/terminal{
-	dir = 8
-	},
-/obj/machinery/button/door{
-	id = "tegus_shuttle_engine";
-	name = "Engine Shutters";
-	pixel_x = -3;
-	pixel_y = 27
-	},
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/plasteel/dark,
-/area/ship/shuttle)
-"yD" = (
-/obj/machinery/porta_turret/centcom_shuttle/weak{
-	dir = 4;
-	name = "Sharplite Mining Turret";
-	shot_delay = 7.5;
-	desc = "An old Sharplite laser turret model developed for securing fauna-infested areas. Heavy use and much foundering renders this turret noticably inefficient, but it's still capable of packing a punch."
-	},
-/turf/closed/wall/mineral/titanium,
-/area/ship/shuttle)
-"yP" = (
-/obj/effect/turf_decal/corner/transparent/neutral,
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/structure/frame/computer/retro{
-	dir = 8;
-	anchored = 1
-	},
-/turf/open/floor/plasteel/dark,
-/area/ship/shuttle)
-"yZ" = (
-/obj/effect/turf_decal/steeldecal/steel_decals_central2{
-	dir = 1
-	},
-/obj/effect/turf_decal/steeldecal/steel_decals_central1,
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/plasteel/tech/grid,
-/area/ship/shuttle)
-"zG" = (
-/obj/effect/turf_decal/industrial/warning{
-	dir = 8
-	},
-/obj/effect/turf_decal/industrial/warning{
-	dir = 4
-	},
-/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
-	dir = 8
-	},
-/obj/machinery/advanced_airlock_controller{
-	pixel_y = 32
-	},
-/turf/open/floor/plasteel/tech,
-/area/ship/shuttle)
-"Au" = (
-/obj/machinery/telecomms/relay/preset/mining{
-	network = "nt_commnet"
-	},
-/obj/machinery/airalarm/directional/east,
-/obj/machinery/light/small{
-	dir = 1;
-	bulb_power = 0.5;
-	pixel_y = 28
-	},
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/decal/cleanable/cobweb/cobweb2,
-/turf/open/floor/plasteel/tech,
-/area/ship/shuttle)
-"AQ" = (
-/obj/machinery/door/window/eastleft,
-/obj/structure/cable{
-	icon_state = "0-8"
-	},
-/obj/structure/window/reinforced/spawner,
-/obj/structure/window/reinforced/spawner/west,
-/obj/machinery/power/smes/shuttle/micro{
-	dir = 4
-	},
-/obj/machinery/door/poddoor/shutters{
-	id = "tegus_shuttle_engine";
-	dir = 4
-	},
-/turf/open/floor/plating,
-/area/ship/shuttle)
-"AW" = (
-/obj/structure/chair/comfy/shuttle{
-	layer = 2.9
-	},
-/obj/structure/railing{
-	dir = 1;
-	layer = 4.2
-	},
-/turf/open/floor/plasteel/patterned/ridged,
-/area/ship/shuttle)
-"AZ" = (
-/obj/effect/spawner/structure/window/shuttle,
-/obj/machinery/door/poddoor/shutters/preopen{
-	id = "tegus_shuttle_window";
-	dir = 4
-	},
-/turf/open/floor/plating,
-/area/ship/shuttle)
-"BM" = (
-/obj/machinery/power/terminal{
-	dir = 1
-	},
-/obj/machinery/power/port_gen/pacman,
-/obj/structure/cable,
-/turf/open/floor/plating,
-/area/ship/shuttle)
-"Cu" = (
-/obj/structure/chair/comfy/shuttle{
-	dir = 4
-	},
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/plasteel/dark,
-/area/ship/shuttle)
-"CM" = (
-/obj/structure/girder,
-/turf/open/floor/plating/airless,
-/area/ship/shuttle)
-"CS" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/plasteel,
-/area/ship/shuttle)
-"Em" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
-	dir = 8
-	},
-/turf/closed/wall/mineral/titanium/nodiagonal,
-/area/ship/shuttle)
-"EJ" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
-	dir = 5
-	},
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
-	dir = 4
-	},
-/obj/structure/catwalk/over/plated_catwalk/dark,
-/turf/open/floor/plating,
-/area/ship/shuttle)
-"Iq" = (
-/obj/machinery/power/terminal{
-	dir = 8
-	},
-/obj/machinery/door/window/eastright,
-/obj/structure/window/reinforced/spawner/north,
-/obj/structure/window/reinforced/spawner/west,
-/obj/structure/cable{
-	icon_state = "0-8"
-	},
-/obj/machinery/power/smes/shuttle/micro{
-	dir = 4
-	},
-/obj/machinery/door/poddoor/shutters{
-	id = "tegus_shuttle_engine";
-	dir = 4
-	},
-/turf/open/floor/plating,
-/area/ship/shuttle)
-"Ks" = (
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
-	dir = 1
-	},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel/dark,
-/area/ship/shuttle)
-"KQ" = (
-/obj/machinery/porta_turret/centcom_shuttle/weak{
-	dir = 4;
-	name = "Sharplite Mining Turret";
-	shot_delay = 7.5;
-	desc = "An old Sharplite laser turret model developed for securing fauna-infested areas. Heavy use and much foundering renders this turret noticably inefficient, but it's still capable of packing a punch."
-	},
-/turf/closed/wall/mineral/titanium/nodiagonal,
-/area/ship/shuttle)
-"LC" = (
-/obj/effect/turf_decal/trimline/opaque/solgovgold/warning,
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
-	dir = 8
-	},
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/plasteel/patterned/cargo_one,
-/area/ship/shuttle)
-"LN" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
-	dir = 8
-	},
-/obj/effect/turf_decal/industrial/warning{
-	dir = 8
-	},
-/obj/effect/turf_decal/industrial/warning{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
-	dir = 8
-	},
-/obj/machinery/door/airlock/grunge{
-	dir = 4;
-	req_one_access = list(31)
-	},
-/turf/open/floor/plasteel,
-/area/ship/shuttle)
-"LU" = (
-/obj/structure/chair/comfy/shuttle{
-	dir = 1;
-	layer = 2.8
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
-	dir = 8
-	},
-/obj/structure/railing{
-	layer = 4.2
-	},
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/plasteel/patterned/ridged,
-/area/ship/shuttle)
-"Mp" = (
-/obj/structure/cable,
-/obj/machinery/atmospherics/components/binary/pump/on/layer4{
-	name = "Air to Distro";
-	target_pressure = 1000;
-	dir = 1
-	},
-/obj/machinery/power/apc/auto_name/directional/east,
-/obj/effect/turf_decal/steeldecal/steel_decals_central7,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel/tech,
-/area/ship/shuttle)
-"MD" = (
-/obj/structure/cable{
-	icon_state = "2-4"
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
-	dir = 6
-	},
-/obj/effect/turf_decal/trimline/opaque/solgovgold/warning,
-/obj/structure/cable{
-	icon_state = "1-4"
-	},
-/turf/open/floor/plasteel/patterned,
-/area/ship/shuttle)
-"MK" = (
-/obj/structure/table/reinforced,
-/obj/machinery/button/door{
-	dir = 1;
-	id = "tegus_shuttle_window";
-	name = "Window Shutters";
-	pixel_x = 6
-	},
-/obj/machinery/button/door{
-	dir = 1;
-	id = "tegus_shuttle_engine";
-	name = "Engine Shutters";
-	pixel_x = -6
-	},
-/obj/effect/turf_decal/corner/transparent/neutral{
-	dir = 8
-	},
-/turf/open/floor/plasteel/dark,
-/area/ship/shuttle)
-"NJ" = (
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
-	dir = 4
-	},
-/obj/effect/turf_decal/industrial/warning{
-	dir = 8
-	},
-/obj/effect/turf_decal/industrial/warning{
-	dir = 4
-	},
-/obj/machinery/door/airlock/grunge{
-	dir = 4
-	},
-/turf/open/floor/plasteel,
-/area/ship/shuttle)
-"Og" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
-	dir = 8
-	},
-/obj/structure/chair/comfy/shuttle{
-	dir = 1;
-	layer = 2.8
-	},
-/obj/structure/railing{
-	layer = 4.2
-	},
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/light/broken/directional/south,
-/turf/open/floor/plasteel/patterned/ridged,
-/area/ship/shuttle)
-"Ol" = (
-/obj/effect/turf_decal/industrial/traffic{
-	dir = 4
-	},
-/obj/structure/cable{
-	icon_state = "0-2"
-	},
-/obj/machinery/power/shieldwallgen/atmos/roundstart{
-	dir = 8;
-	id = "tegus_shield_port"
-	},
-/obj/machinery/door/poddoor{
-	id = "tegus_shuttle_port"
-	},
-/turf/open/floor/plasteel/patterned/ridged,
-/area/ship/shuttle)
-"Rf" = (
-/obj/item/radio/intercom/wideband{
-	dir = 1;
-	pixel_y = 10
-	},
-/obj/structure/table/reinforced,
-/turf/open/floor/plasteel/dark,
-/area/ship/shuttle)
-"Rs" = (
-/obj/structure/railing{
-	layer = 4.2
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
-	dir = 9
-	},
-/obj/structure/chair/comfy/shuttle{
-	dir = 1;
-	layer = 2.8
-	},
-/turf/open/floor/plasteel/patterned/ridged,
-/area/ship/shuttle)
-"Sp" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
-	dir = 5
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
-	dir = 8
-	},
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/plasteel/patterned,
-/area/ship/shuttle)
-"SG" = (
-/obj/structure/cable,
-/obj/machinery/power/terminal{
-	dir = 8
-	},
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/light/small/broken/directional/south,
-/obj/item/stack/ore/salvage/scraptitanium{
-	pixel_y = -7;
-	pixel_x = 12
-	},
-/obj/item/stack/ore/salvage/scraptitanium{
-	pixel_y = -7;
-	pixel_x = 12
-	},
-/turf/open/floor/plasteel/dark,
-/area/ship/shuttle)
-"To" = (
-/obj/structure/cable{
-	icon_state = "2-8"
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4{
-	dir = 1
-	},
-/obj/structure/catwalk/over/plated_catwalk/dark,
-/turf/open/floor/plating,
-/area/ship/shuttle)
-"Tz" = (
-/obj/structure/cable{
-	icon_state = "1-8"
-	},
-/obj/structure/chair/comfy/shuttle{
-	layer = 2.9
-	},
-/obj/structure/railing{
-	dir = 1;
-	layer = 4.2
-	},
-/obj/machinery/light{
-	dir = 1;
-	pixel_y = 32
-	},
-/turf/open/floor/plasteel/patterned/ridged,
-/area/ship/shuttle)
-"TB" = (
-/obj/effect/spawner/structure/window/shuttle,
-/obj/machinery/door/poddoor/shutters/preopen{
-	id = "tegus_shuttle_window";
-	dir = 1
-	},
-/turf/open/floor/plating,
-/area/ship/shuttle)
-"Wx" = (
-/obj/structure/chair/comfy/shuttle{
-	dir = 4;
-	name = "Helm"
-	},
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel/dark,
-/area/ship/shuttle)
-"WB" = (
-/obj/machinery/atmospherics/pipe/layer_manifold{
-	dir = 4
-	},
-/turf/closed/wall/mineral/titanium/nodiagonal,
-/area/ship/shuttle)
-
-(1,1,1) = {"
-rx
-rx
-bl
-CM
-pm
-rR
-rx
-rx
-"}
-(2,1,1) = {"
-rx
-pm
-AQ
-dK
-BM
-Iq
-pm
-rx
-"}
-(3,1,1) = {"
-rx
-pm
-xB
-fx
-Ks
-SG
-pm
-rx
-"}
-(4,1,1) = {"
-rx
-pm
-Au
-To
-Mp
-oi
-CM
-rx
-"}
-(5,1,1) = {"
-fO
-pm
-pm
-NJ
-pm
-pm
-pm
-fO
-"}
-(6,1,1) = {"
-oS
-bt
-MD
-cu
-uJ
-nL
-EJ
-KQ
-"}
-(7,1,1) = {"
-wV
-CS
-LC
-qz
-cR
-pm
-zG
-pm
-"}
-(8,1,1) = {"
-Ol
-dU
-bj
-Sp
-LU
-pm
-dm
-sq
-"}
-(9,1,1) = {"
-KQ
-pm
-Tz
-lV
-Og
-Em
-WB
-qx
-"}
-(10,1,1) = {"
-sk
-CM
-AW
-kH
-Rs
-fV
-pm
-ir
-"}
-(11,1,1) = {"
-yZ
-fO
-pm
-LN
-pm
-pm
-fO
-mq
-"}
-(12,1,1) = {"
-rx
-CM
-jW
-nB
-tB
-sa
-CM
-rx
-"}
-(13,1,1) = {"
-rx
-TB
-Rf
-Wx
-Cu
-MK
-rp
-rx
-"}
-(14,1,1) = {"
-rx
-yD
-CM
-yP
-oI
-CM
-yD
-rx
-"}
-(15,1,1) = {"
-rx
-rx
-CM
-mM
-AZ
-CM
-rx
-rx
-"}
diff --git a/code/datums/shuttles.dm b/code/datums/shuttles.dm
index d5aeac9387f9..1d5ecd4655bf 100644
--- a/code/datums/shuttles.dm
+++ b/code/datums/shuttles.dm
@@ -392,9 +392,4 @@
 	name = "Anole Transport Shuttle"
 	prefix = "NTSV"
 
-/datum/map_template/shuttle/subshuttles/anole/damaged
-	file_name = "nanotrasen_anole_damaged"
-	name = "Anole Transport Shuttle (Damaged)"
-	prefix = "NTSV"
-
 //your subshuttle here

From 6bee15188b8119e5b2509669b03102a47db2ffad Mon Sep 17 00:00:00 2001
From: goober3 <118859017+goober3@users.noreply.github.com>
Date: Sat, 1 Jul 2023 22:52:17 +0100
Subject: [PATCH 25/28] more tweaks

---
 _maps/shuttles/shiptest/nanotrasen_tegus.dmm    | 4 +++-
 _maps/shuttles/subshuttles/nanotrasen_anole.dmm | 3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/_maps/shuttles/shiptest/nanotrasen_tegus.dmm b/_maps/shuttles/shiptest/nanotrasen_tegus.dmm
index 6dbf2824b797..4e26d54a255f 100644
--- a/_maps/shuttles/shiptest/nanotrasen_tegus.dmm
+++ b/_maps/shuttles/shiptest/nanotrasen_tegus.dmm
@@ -3638,7 +3638,9 @@
 /turf/open/floor/plasteel,
 /area/ship/hallway/central)
 "NT" = (
-/obj/machinery/door/window/southleft,
+/obj/machinery/door/window/southleft{
+	req_access_txt = "61"
+	},
 /obj/effect/turf_decal/industrial/warning,
 /turf/open/floor/plasteel/telecomms_floor,
 /area/ship/engineering/communications)
diff --git a/_maps/shuttles/subshuttles/nanotrasen_anole.dmm b/_maps/shuttles/subshuttles/nanotrasen_anole.dmm
index 3ef065b10ad5..903514ec418f 100644
--- a/_maps/shuttles/subshuttles/nanotrasen_anole.dmm
+++ b/_maps/shuttles/subshuttles/nanotrasen_anole.dmm
@@ -543,7 +543,8 @@
 	dir = 8
 	},
 /obj/machinery/door/airlock/grunge{
-	dir = 4
+	dir = 4;
+	req_access_txt = "31"
 	},
 /turf/open/floor/plasteel,
 /area/ship/shuttle)

From 2dfa9d50bf2bbee52ade3dd85b012ab9d38e592c Mon Sep 17 00:00:00 2001
From: goober3 <118859017+goober3@users.noreply.github.com>
Date: Sun, 2 Jul 2023 00:19:48 +0100
Subject: [PATCH 26/28] description by Roger

---
 _maps/configs/nanotrasen_tegus.json | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/_maps/configs/nanotrasen_tegus.json b/_maps/configs/nanotrasen_tegus.json
index d6ac1dee3ecd..2aa970ce9d7c 100644
--- a/_maps/configs/nanotrasen_tegus.json
+++ b/_maps/configs/nanotrasen_tegus.json
@@ -6,6 +6,8 @@
 	"map_short_name": "Tegus-class",
 	"map_path": "_maps/shuttles/shiptest/nanotrasen_tegus.dmm",
 	"limit": 1,
+	"tags": ["Mining" , "Engineering", "Subshuttle", "Telecomms"],
+	"description": "The Tegus-class is an industrial logistics vessel with its legacy hailing from the Inter-Corporate War on the side of Nanotrasen. Featuring an advanced telecommunications array, a large shuttle capable of comfortably holding the entire crew and a host of mining as well as engineering equipment, the Tegus-class is a robust and capable vessel designed to coordinate crews and get the job done.",
 	"job_slots": {
 		"Captain": {
 			"outfit": "/datum/outfit/job/captain/nt",

From 6dcb7f5b40c9d6208f8a9f1e4c8f8a7c9c4dd81f Mon Sep 17 00:00:00 2001
From: goober3 <118859017+goober3@users.noreply.github.com>
Date: Sat, 8 Jul 2023 23:08:07 +0100
Subject: [PATCH 27/28] gazillionth update

---
 _maps/shuttles/shiptest/nanotrasen_tegus.dmm  | 66 ++++++++++++-------
 .../shuttles/subshuttles/nanotrasen_anole.dmm | 27 ++++----
 2 files changed, 54 insertions(+), 39 deletions(-)

diff --git a/_maps/shuttles/shiptest/nanotrasen_tegus.dmm b/_maps/shuttles/shiptest/nanotrasen_tegus.dmm
index 4e26d54a255f..03884fe8fa42 100644
--- a/_maps/shuttles/shiptest/nanotrasen_tegus.dmm
+++ b/_maps/shuttles/shiptest/nanotrasen_tegus.dmm
@@ -693,11 +693,16 @@
 /area/ship/hangar)
 "hE" = (
 /obj/structure/catwalk/over/plated_catwalk/dark,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2,
 /obj/structure/cable{
 	icon_state = "6-8"
 	},
+/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
+	dir = 6
+	},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4{
+	dir = 8
+	},
 /turf/open/floor/plating,
 /area/ship/engineering/engine)
 "hG" = (
@@ -1756,10 +1761,6 @@
 /turf/open/floor/plasteel/patterned,
 /area/ship/hangar)
 "sC" = (
-/obj/structure/table,
-/obj/item/analyzer{
-	pixel_y = 4
-	},
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/effect/turf_decal/corner/transparent/neutral{
 	dir = 4
@@ -1767,6 +1768,9 @@
 /obj/structure/cable/yellow{
 	icon_state = "1-2"
 	},
+/obj/machinery/atmospherics/pipe/layer_manifold/visible{
+	dir = 8
+	},
 /turf/open/floor/plasteel/dark,
 /area/ship/engineering/engine)
 "sD" = (
@@ -2441,7 +2445,6 @@
 	},
 /area/ship/hallway/central)
 "Ay" = (
-/obj/structure/catwalk/over/plated_catwalk/dark,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
 	dir = 10
 	},
@@ -2454,7 +2457,12 @@
 /obj/structure/cable/yellow{
 	icon_state = "1-10"
 	},
-/turf/open/floor/plating,
+/obj/machinery/atmospherics/components/binary/pump/on{
+	dir = 8;
+	target_pressure = 500;
+	name = "Air to Distro"
+	},
+/turf/open/floor/plasteel/dark,
 /area/ship/engineering/engine)
 "Az" = (
 /obj/effect/decal/cleanable/dirt/dust,
@@ -2577,9 +2585,6 @@
 /obj/machinery/power/terminal{
 	dir = 8
 	},
-/obj/machinery/atmospherics/pipe/simple/brown/visible/layer2{
-	dir = 1
-	},
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/machinery/button/door{
 	dir = 1;
@@ -2590,6 +2595,9 @@
 /obj/structure/cable{
 	icon_state = "0-1"
 	},
+/obj/machinery/atmospherics/components/binary/volume_pump/layer2{
+	name = "Scrubbers to External"
+	},
 /turf/open/floor/plasteel/dark,
 /area/ship/engineering/engine)
 "Cb" = (
@@ -2734,6 +2742,9 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
 	dir = 5
 	},
+/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
+	dir = 5
+	},
 /turf/open/floor/plating,
 /area/ship/engineering/engine)
 "CQ" = (
@@ -3080,6 +3091,8 @@
 /obj/structure/cable{
 	icon_state = "0-2"
 	},
+/obj/machinery/atmospherics/components/unary/portables_connector,
+/obj/machinery/portable_atmospherics/scrubber,
 /turf/open/floor/plasteel/dark,
 /area/ship/engineering/engine)
 "Hc" = (
@@ -3347,10 +3360,10 @@
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
 "Lq" = (
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4{
-	dir = 4
-	},
 /obj/machinery/light/dim/directional/east,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
+	dir = 10
+	},
 /turf/open/floor/plasteel/stairs{
 	dir = 1
 	},
@@ -3670,6 +3683,9 @@
 	pixel_y = 10;
 	id = "tegusbelt"
 	},
+/obj/effect/turf_decal/arrows{
+	dir = 4
+	},
 /turf/open/floor/plasteel/dark,
 /area/ship/hangar)
 "Oo" = (
@@ -3805,9 +3821,6 @@
 	},
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/atmospherics/components/binary/volume_pump/layer2{
-	name = "Scrubbers to External"
-	},
 /obj/structure/cable{
 	icon_state = "0-4"
 	},
@@ -3817,6 +3830,8 @@
 /obj/structure/cable{
 	icon_state = "2-4"
 	},
+/obj/machinery/atmospherics/pipe/layer_manifold/visible,
+/obj/effect/turf_decal/arrows,
 /turf/open/floor/plasteel/dark,
 /area/ship/engineering/engine)
 "OX" = (
@@ -4007,10 +4022,6 @@
 /turf/open/floor/plasteel/patterned,
 /area/ship/cargo)
 "Ry" = (
-/obj/machinery/atmospherics/components/binary/pump/on/layer4{
-	name = "Air to Distro";
-	target_pressure = 1000
-	},
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/effect/decal/cleanable/oil,
@@ -4018,6 +4029,9 @@
 /obj/effect/turf_decal/corner/transparent/neutral{
 	dir = 4
 	},
+/obj/machinery/atmospherics/pipe/simple/cyan/visible{
+	dir = 9
+	},
 /turf/open/floor/plasteel/dark,
 /area/ship/engineering/engine)
 "Rz" = (
@@ -4221,6 +4235,12 @@
 "SW" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/structure/spider/stickyweb,
+/obj/item/toy/plush/lizardplushie{
+	pixel_y = 4;
+	pixel_x = -3;
+	name = "The Creature";
+	desc = "Sealed for a reason!"
+	},
 /turf/open/floor/plating,
 /area/ship/engineering/engine)
 "Tk" = (
@@ -4618,9 +4638,6 @@
 /turf/closed/wall/mineral/titanium/nodiagonal,
 /area/ship/crew)
 "Zw" = (
-/obj/machinery/atmospherics/components/unary/tank/air{
-	piping_layer = 4
-	},
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/effect/decal/cleanable/dirt/dust,
@@ -4628,6 +4645,9 @@
 /obj/effect/turf_decal/corner/transparent/neutral/three_quarters{
 	dir = 8
 	},
+/obj/machinery/atmospherics/components/unary/portables_connector,
+/obj/machinery/portable_atmospherics/canister/air,
+/obj/effect/turf_decal/industrial/hatch/yellow,
 /turf/open/floor/plasteel/dark,
 /area/ship/engineering/engine)
 "ZT" = (
diff --git a/_maps/shuttles/subshuttles/nanotrasen_anole.dmm b/_maps/shuttles/subshuttles/nanotrasen_anole.dmm
index 903514ec418f..778db113c25e 100644
--- a/_maps/shuttles/subshuttles/nanotrasen_anole.dmm
+++ b/_maps/shuttles/subshuttles/nanotrasen_anole.dmm
@@ -125,11 +125,10 @@
 /turf/open/floor/engine/hull,
 /area/ship/shuttle)
 "jk" = (
-/obj/machinery/porta_turret/centcom_shuttle/weak{
-	dir = 4;
+/obj/machinery/porta_turret/ship/weak{
 	name = "Sharplite Mining Turret";
-	shot_delay = 7.5;
-	desc = "An old Sharplite laser turret model developed for securing fauna-infested areas. Heavy use and much foundering renders this turret noticably inefficient, but it's still capable of packing a punch."
+	desc = "An old Sharplite laser turret model developed for securing fauna-infested areas. Heavy use and much foundering renders this turret noticably inefficient, but it's still capable of packing a punch.";
+	shot_delay = 7.5
 	},
 /turf/closed/wall/mineral/titanium/nodiagonal,
 /area/ship/shuttle)
@@ -138,13 +137,10 @@
 /obj/effect/turf_decal/corner/transparent/neutral{
 	dir = 8
 	},
-/obj/machinery/turretid{
-	icon_state = "control_kill";
-	lethal = 1;
+/obj/machinery/turretid/lethal{
 	locked = 0;
-	name = "Mining Turret control panel";
-	pixel_x = -28;
-	req_access = null
+	req_access = null;
+	pixel_x = -28
 	},
 /turf/open/floor/plasteel/dark,
 /area/ship/shuttle)
@@ -365,11 +361,10 @@
 /turf/open/floor/plasteel/dark,
 /area/ship/shuttle)
 "yD" = (
-/obj/machinery/porta_turret/centcom_shuttle/weak{
-	dir = 4;
+/obj/machinery/porta_turret/ship/weak{
 	name = "Sharplite Mining Turret";
-	shot_delay = 7.5;
-	desc = "An old Sharplite laser turret model developed for securing fauna-infested areas. Heavy use and much foundering renders this turret noticably inefficient, but it's still capable of packing a punch."
+	desc = "An old Sharplite laser turret model developed for securing fauna-infested areas. Heavy use and much foundering renders this turret noticably inefficient, but it's still capable of packing a punch.";
+	shot_delay = 7.5
 	},
 /turf/closed/wall/mineral/titanium,
 /area/ship/shuttle)
@@ -546,7 +541,7 @@
 	dir = 4;
 	req_access_txt = "31"
 	},
-/turf/open/floor/plasteel,
+/turf/open/floor/plasteel/dark,
 /area/ship/shuttle)
 "LU" = (
 /obj/structure/chair/comfy/shuttle{
@@ -619,7 +614,7 @@
 /obj/machinery/door/airlock/grunge{
 	dir = 4
 	},
-/turf/open/floor/plasteel,
+/turf/open/floor/plasteel/dark,
 /area/ship/shuttle)
 "Og" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{

From 702a1e976a74c8086346289005b9858328732d8c Mon Sep 17 00:00:00 2001
From: tmtmtl30 <53132901+tmtmtl30@users.noreply.github.com>
Date: Fri, 17 Nov 2023 14:34:44 -0800
Subject: [PATCH 28/28] Update controlled_ship_datum.dm

maybe fixes tests

Signed-off-by: tmtmtl30 <53132901+tmtmtl30@users.noreply.github.com>
---
 code/modules/overmap/ships/controlled_ship_datum.dm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/modules/overmap/ships/controlled_ship_datum.dm b/code/modules/overmap/ships/controlled_ship_datum.dm
index df5c6038b822..6b02fc36007e 100644
--- a/code/modules/overmap/ships/controlled_ship_datum.dm
+++ b/code/modules/overmap/ships/controlled_ship_datum.dm
@@ -77,7 +77,7 @@
 		shuttle_area.rename_area("[new_name] [initial(shuttle_area.name)]")
 	if(!force)
 		COOLDOWN_START(src, rename_cooldown, 5 MINUTES)
-		if(shuttle_port.virtual_z() == null)
+		if(shuttle_port?.virtual_z() == null)
 			return TRUE
 		priority_announce("The [oldname] has been renamed to the [new_name].", "Docking Announcement", sender_override = new_name, zlevel = shuttle_port.virtual_z())
 	return TRUE