diff --git a/_maps/configs/independent_solar.json b/_maps/configs/independent_solar.json
deleted file mode 100644
index 93939aa59e78..000000000000
--- a/_maps/configs/independent_solar.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-	"$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json",
-	"map_name": "Solar-class Research Vessel",
-	"map_short_name": "Solar-class",
-	"map_path": "_maps/shuttles/shiptest/independent_solar.dmm",
-	"prefix": "ISV",
-	"namelists": ["SPACE", "GENERAL"],
-	"job_slots": {
-		"Captain": 1,
-		"Head of Personnel": 1,
-		"Medical Doctor": 2,
-		"Station Engineer": 3,
-		"Shaft Miner": 2,
-		"Cargo Technician": 2,
-		"Security Officer": 1,
-		"Assistant": 5
-	},
-	"enabled": true
-}
diff --git a/_maps/configs/inteq_colossus.json b/_maps/configs/inteq_colossus.json
index 5d9ddffbc8da..a5a6602a5cb0 100644
--- a/_maps/configs/inteq_colossus.json
+++ b/_maps/configs/inteq_colossus.json
@@ -17,6 +17,11 @@
 			"officer": true,
 			"slots": 1
 		},
+		"Master At Arms": {
+			"outfit": "/datum/outfit/job/warden/inteq",
+			"officer": true,
+			"slots": 1
+		},
 		"Artificer": {
 			"outfit": "/datum/outfit/job/engineer/inteq",
 			"slots": 1
diff --git a/_maps/configs/inteq_talos.json b/_maps/configs/inteq_talos.json
index e01be1109fd6..a05aada7748f 100644
--- a/_maps/configs/inteq_talos.json
+++ b/_maps/configs/inteq_talos.json
@@ -33,7 +33,7 @@
 		},
 		"Corpsman": {
 			"outfit": "/datum/outfit/job/paramedic/inteq",
-			"slots": 1
+			"slots": 2
 		},
 		"Enforcer": {
 			"outfit": "/datum/outfit/job/security/inteq",
@@ -41,7 +41,7 @@
 		},
 		"Recruit": {
 			"outfit": "/datum/outfit/job/assistant/inteq",
-			"slots": 7
+			"slots": 4
 		}
 	},
 	"enabled": true
diff --git a/_maps/shuttles/shiptest/independent_solar.dmm b/_maps/shuttles/shiptest/independent_solar.dmm
deleted file mode 100644
index b6ecf5830cba..000000000000
--- a/_maps/shuttles/shiptest/independent_solar.dmm
+++ /dev/null
@@ -1,3164 +0,0 @@
-//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
-"ad" = (
-/obj/effect/turf_decal/industrial/warning,
-/obj/machinery/atmospherics/components/unary/tank/air{
-	dir = 1
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 8
-	},
-/turf/open/floor/plasteel,
-/area/ship/engineering)
-"ae" = (
-/obj/effect/turf_decal/number/two{
-	dir = 1
-	},
-/turf/open/floor/plating,
-/area/ship/cargo)
-"av" = (
-/obj/machinery/computer/operating,
-/obj/effect/turf_decal/corner/opaque/blue{
-	dir = 8
-	},
-/obj/effect/turf_decal/corner/opaque/blue{
-	dir = 4
-	},
-/obj/machinery/light/directional/north,
-/turf/open/floor/plasteel/white,
-/area/ship/medical)
-"aE" = (
-/obj/machinery/light/directional/south,
-/obj/effect/turf_decal/corner/opaque/purple,
-/turf/open/floor/plasteel,
-/area/ship/hallway)
-"aM" = (
-/obj/machinery/door/airlock/external{
-	name = "Escape Pod"
-	},
-/obj/effect/mapping_helpers/airlock/cyclelink_helper,
-/obj/effect/turf_decal/industrial/warning,
-/obj/effect/turf_decal/industrial/warning{
-	dir = 1
-	},
-/obj/machinery/door/firedoor/border_only,
-/obj/machinery/door/firedoor/border_only{
-	dir = 1
-	},
-/turf/open/floor/plating,
-/area/ship/hallway)
-"aT" = (
-/obj/effect/turf_decal/corner/opaque/blue{
-	dir = 4
-	},
-/turf/open/floor/plasteel,
-/area/ship/hallway)
-"aZ" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 8
-	},
-/turf/closed/wall/r_wall,
-/area/ship/engineering)
-"bc" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
-	dir = 4
-	},
-/turf/open/floor/plasteel/mono,
-/area/ship/hallway)
-"bf" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 10
-	},
-/obj/structure/cable/yellow{
-	icon_state = "1-2"
-	},
-/obj/machinery/atmospherics/pipe/manifold/orange/visible,
-/turf/open/floor/plasteel/mono,
-/area/ship/engineering)
-"by" = (
-/obj/effect/turf_decal/corner/opaque/yellow{
-	dir = 4
-	},
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
-	dir = 8
-	},
-/obj/machinery/light/directional/north,
-/turf/open/floor/plasteel/white,
-/area/ship/medical)
-"bz" = (
-/obj/machinery/power/apc/auto_name/directional/south,
-/obj/structure/cable,
-/obj/machinery/aug_manipulator,
-/obj/effect/turf_decal/corner/opaque/purple/three_quarters{
-	dir = 1
-	},
-/turf/open/floor/plasteel/white,
-/area/ship/science)
-"bK" = (
-/obj/effect/turf_decal/corner/opaque/purple,
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/turf/open/floor/plasteel/white,
-/area/ship/science)
-"bW" = (
-/obj/machinery/door/poddoor{
-	dir = 4;
-	id = "mining_window_shutter"
-	},
-/obj/effect/spawner/structure/window/reinforced,
-/turf/open/floor/plating/airless,
-/area/ship/bridge)
-"cg" = (
-/obj/structure/bed,
-/obj/item/bedsheet/medical,
-/obj/effect/turf_decal/corner/opaque/blue{
-	dir = 4
-	},
-/obj/item/radio/intercom/directional/north,
-/turf/open/floor/plasteel/white,
-/area/ship/medical)
-"ci" = (
-/obj/effect/turf_decal/industrial/warning,
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
-	dir = 1
-	},
-/obj/structure/cable{
-	icon_state = "1-8"
-	},
-/turf/open/floor/plasteel,
-/area/ship/cargo)
-"cC" = (
-/obj/machinery/door/airlock/public/glass{
-	name = "Brig"
-	},
-/obj/effect/turf_decal/industrial/warning{
-	dir = 1
-	},
-/obj/effect/turf_decal/industrial/warning,
-/obj/machinery/door/firedoor/border_only{
-	dir = 1
-	},
-/obj/machinery/door/firedoor/border_only,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/turf/open/floor/plasteel,
-/area/ship/security)
-"cU" = (
-/obj/docking_port/mobile{
-	can_move_docking_ports = 1;
-	launch_status = 0;
-	name = "SS Galaxy";
-	port_direction = 4
-	},
-/turf/closed/wall/r_wall,
-/area/ship/cargo)
-"dr" = (
-/obj/structure/chair/wood{
-	dir = 8
-	},
-/obj/effect/turf_decal/corner/opaque/black{
-	dir = 1
-	},
-/obj/effect/turf_decal/corner/opaque/black,
-/turf/open/floor/plasteel/white,
-/area/ship/security)
-"dv" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 8
-	},
-/obj/effect/turf_decal/corner/opaque/white/mono,
-/turf/open/floor/plasteel/mono/white,
-/area/ship/medical)
-"dY" = (
-/turf/closed/wall/r_wall,
-/area/ship/crew)
-"ea" = (
-/obj/machinery/atmospherics/components/unary/shuttle/heater{
-	dir = 4
-	},
-/obj/structure/window/reinforced{
-	dir = 8
-	},
-/obj/machinery/door/poddoor{
-	dir = 4;
-	id = "mining_window_shutter"
-	},
-/turf/open/floor/plating,
-/area/ship/cargo)
-"en" = (
-/obj/machinery/power/apc/auto_name/directional/south,
-/obj/structure/cable{
-	icon_state = "0-8"
-	},
-/turf/open/floor/wood,
-/area/ship/crew)
-"ev" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 4
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 8
-	},
-/turf/open/floor/plasteel,
-/area/ship/hallway)
-"eR" = (
-/obj/effect/turf_decal/corner/opaque/blue{
-	dir = 1
-	},
-/obj/effect/turf_decal/corner/opaque/blue{
-	dir = 4
-	},
-/turf/open/floor/plasteel/dark,
-/area/ship/bridge)
-"fe" = (
-/obj/machinery/light/directional/north,
-/obj/machinery/vending/snack/random,
-/turf/open/floor/plasteel,
-/area/ship/hallway)
-"fo" = (
-/obj/effect/turf_decal/ntspaceworks_small/left{
-	dir = 1
-	},
-/turf/open/floor/plating,
-/area/ship/cargo)
-"fv" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
-	dir = 4
-	},
-/turf/open/floor/plasteel/white,
-/area/ship/science)
-"fC" = (
-/obj/machinery/airalarm/directional/north,
-/obj/effect/turf_decal/corner/opaque/blue{
-	dir = 4
-	},
-/turf/open/floor/plasteel,
-/area/ship/hallway)
-"fG" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
-	dir = 8
-	},
-/obj/effect/turf_decal/corner/opaque/blue/diagonal{
-	dir = 4
-	},
-/turf/open/floor/plasteel/white,
-/area/ship/hallway)
-"fS" = (
-/obj/machinery/atmospherics/pipe/layer_manifold,
-/obj/machinery/atmospherics/pipe/simple/orange/visible{
-	dir = 4
-	},
-/turf/open/floor/plasteel/mono,
-/area/ship/engineering)
-"fW" = (
-/obj/effect/turf_decal/industrial/warning{
-	dir = 4
-	},
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
-	dir = 8
-	},
-/obj/machinery/power/apc/auto_name/directional/east,
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/structure/cable,
-/obj/structure/cable{
-	icon_state = "1-8"
-	},
-/turf/open/floor/plasteel,
-/area/ship/engineering)
-"gf" = (
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
-/obj/structure/cable{
-	icon_state = "1-4"
-	},
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
-/turf/open/floor/plasteel/mono,
-/area/ship/hallway)
-"gh" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/machinery/firealarm/directional/east,
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/item/radio/intercom/directional/west,
-/turf/open/floor/wood,
-/area/ship/crew)
-"gw" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 8
-	},
-/obj/effect/turf_decal/corner/opaque/blue/mono,
-/turf/open/floor/plasteel/mono/white,
-/area/ship/medical)
-"gJ" = (
-/obj/effect/turf_decal/industrial/warning{
-	dir = 8
-	},
-/obj/effect/turf_decal/industrial/warning{
-	dir = 4
-	},
-/obj/machinery/door/firedoor/border_only{
-	dir = 8
-	},
-/obj/machinery/door/firedoor/border_only{
-	dir = 4
-	},
-/obj/machinery/door/airlock/research{
-	dir = 4;
-	name = "Salvage Bay"
-	},
-/turf/open/floor/plasteel,
-/area/ship/cargo)
-"gW" = (
-/obj/effect/turf_decal/corner/opaque/purple{
-	dir = 9
-	},
-/turf/open/floor/plasteel/white,
-/area/ship/science)
-"hf" = (
-/obj/effect/turf_decal/industrial/warning{
-	dir = 1
-	},
-/obj/structure/cable/yellow{
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/orange/visible{
-	dir = 4
-	},
-/obj/machinery/firealarm/directional/north,
-/turf/open/floor/plasteel,
-/area/ship/engineering)
-"hg" = (
-/obj/machinery/light/directional/south,
-/obj/structure/tank_dispenser,
-/obj/effect/turf_decal/corner/opaque/purple/three_quarters,
-/turf/open/floor/plasteel/white,
-/area/ship/science)
-"hi" = (
-/turf/closed/wall/r_wall,
-/area/ship/security)
-"hj" = (
-/obj/structure/table/reinforced,
-/obj/machinery/door/firedoor,
-/obj/machinery/door/window/southleft,
-/obj/item/paicard,
-/turf/open/floor/plasteel,
-/area/ship/science)
-"hv" = (
-/obj/effect/turf_decal/industrial/warning/cee{
-	dir = 4
-	},
-/obj/structure/rack,
-/obj/machinery/door/window/southleft{
-	dir = 8
-	},
-/obj/item/clothing/gloves/color/yellow,
-/obj/item/clothing/gloves/color/yellow,
-/obj/item/storage/toolbox/electrical{
-	pixel_x = 1;
-	pixel_y = 6
-	},
-/obj/item/storage/toolbox/mechanical{
-	pixel_x = -2;
-	pixel_y = -1
-	},
-/obj/item/clothing/head/welding{
-	pixel_x = -2;
-	pixel_y = 1
-	},
-/obj/machinery/light/small/directional/east,
-/turf/open/floor/plasteel,
-/area/ship/engineering)
-"ih" = (
-/obj/machinery/light/directional/south,
-/obj/effect/turf_decal/corner/opaque/brown,
-/turf/open/floor/plasteel,
-/area/ship/hallway)
-"ik" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 6
-	},
-/obj/structure/cable{
-	icon_state = "2-8"
-	},
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
-/obj/effect/turf_decal/corner/opaque/black{
-	dir = 1
-	},
-/obj/effect/turf_decal/corner/opaque/black,
-/turf/open/floor/plasteel/white,
-/area/ship/security)
-"iB" = (
-/obj/machinery/airalarm/directional/north,
-/obj/effect/turf_decal/corner/opaque/yellow{
-	dir = 4
-	},
-/turf/open/floor/plasteel,
-/area/ship/hallway)
-"jb" = (
-/obj/machinery/computer/pandemic,
-/obj/effect/turf_decal/corner/opaque/purple{
-	dir = 10
-	},
-/turf/open/floor/plasteel/white,
-/area/ship/science)
-"jl" = (
-/obj/effect/turf_decal/industrial/hatch/yellow,
-/obj/effect/turf_decal/industrial/warning{
-	dir = 4
-	},
-/obj/machinery/autolathe/hacked,
-/turf/open/floor/plasteel/mono,
-/area/ship/science)
-"jm" = (
-/obj/effect/turf_decal/industrial/warning{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/manifold/orange/visible{
-	dir = 8
-	},
-/obj/machinery/power/terminal{
-	dir = 8
-	},
-/obj/structure/cable{
-	icon_state = "0-2"
-	},
-/obj/machinery/door/window/eastright{
-	dir = 8
-	},
-/turf/open/floor/plasteel,
-/area/ship/engineering)
-"jt" = (
-/obj/structure/window/reinforced,
-/obj/effect/turf_decal/corner/transparent/neutral{
-	dir = 4
-	},
-/obj/effect/turf_decal/corner/transparent/neutral,
-/obj/effect/turf_decal/corner/transparent/neutral{
-	dir = 1
-	},
-/obj/effect/turf_decal/corner/transparent/neutral{
-	dir = 8
-	},
-/obj/effect/turf_decal/corner/opaque/blue{
-	dir = 8
-	},
-/obj/effect/turf_decal/corner/opaque/blue,
-/obj/machinery/light/directional/north,
-/obj/structure/table/reinforced,
-/obj/machinery/microwave,
-/turf/open/floor/plasteel/dark,
-/area/ship/bridge)
-"jC" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 5
-	},
-/turf/open/floor/plasteel,
-/area/ship/cargo)
-"jJ" = (
-/obj/structure/chair/wood{
-	dir = 4
-	},
-/obj/effect/turf_decal/corner/opaque/black{
-	dir = 1
-	},
-/obj/effect/turf_decal/corner/opaque/black,
-/turf/open/floor/plasteel/white,
-/area/ship/security)
-"kk" = (
-/obj/machinery/atmospherics/pipe/simple/orange/hidden,
-/turf/closed/wall,
-/area/ship/engineering)
-"km" = (
-/obj/effect/turf_decal/industrial/warning,
-/obj/effect/turf_decal/industrial/warning/corner{
-	dir = 4
-	},
-/obj/structure/cable{
-	icon_state = "1-8"
-	},
-/obj/machinery/airalarm/directional/south,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
-	dir = 8
-	},
-/turf/open/floor/plasteel,
-/area/ship/engineering)
-"kA" = (
-/turf/open/floor/plasteel/mono,
-/area/ship/hallway)
-"kM" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/machinery/power/apc/auto_name/directional/west,
-/obj/structure/cable,
-/turf/open/floor/plasteel/stairs/medium,
-/area/ship/bridge)
-"kZ" = (
-/obj/machinery/atmospherics/components/binary/pump/on{
-	dir = 1;
-	name = "Air to Distro";
-	target_pressure = 500
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/turf/open/floor/plasteel/mono,
-/area/ship/engineering)
-"lc" = (
-/obj/effect/turf_decal/industrial/warning{
-	dir = 5
-	},
-/obj/machinery/atmospherics/components/unary/tank/toxins{
-	dir = 8
-	},
-/turf/open/floor/plasteel,
-/area/ship/engineering)
-"lf" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 6
-	},
-/obj/machinery/atmospherics/pipe/simple/orange/visible{
-	dir = 4
-	},
-/turf/open/floor/plasteel/mono,
-/area/ship/engineering)
-"ls" = (
-/obj/effect/turf_decal/corner/opaque/yellow{
-	dir = 4
-	},
-/turf/open/floor/plasteel,
-/area/ship/hallway)
-"ly" = (
-/obj/structure/chair/comfy/shuttle{
-	dir = 4
-	},
-/obj/structure/window/reinforced{
-	dir = 8;
-	pixel_x = -4
-	},
-/obj/effect/turf_decal/corner/transparent/neutral{
-	dir = 4
-	},
-/obj/effect/turf_decal/corner/transparent/neutral,
-/obj/effect/turf_decal/corner/transparent/neutral{
-	dir = 1
-	},
-/obj/effect/turf_decal/corner/transparent/neutral{
-	dir = 8
-	},
-/obj/effect/turf_decal/corner/opaque/blue{
-	dir = 1
-	},
-/obj/effect/turf_decal/corner/opaque/blue{
-	dir = 8
-	},
-/turf/open/floor/plasteel/dark,
-/area/ship/bridge)
-"lE" = (
-/obj/structure/chair/comfy/shuttle{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 10
-	},
-/obj/structure/cable{
-	icon_state = "2-8"
-	},
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
-	dir = 8
-	},
-/turf/open/floor/plasteel/dark,
-/area/ship/bridge)
-"lG" = (
-/obj/structure/window/reinforced{
-	dir = 8;
-	pixel_x = -4
-	},
-/obj/effect/turf_decal/corner/transparent/neutral{
-	dir = 4
-	},
-/obj/effect/turf_decal/corner/transparent/neutral,
-/obj/effect/turf_decal/corner/transparent/neutral{
-	dir = 1
-	},
-/obj/effect/turf_decal/corner/transparent/neutral{
-	dir = 8
-	},
-/obj/effect/turf_decal/corner/opaque/blue{
-	dir = 1
-	},
-/obj/effect/turf_decal/corner/opaque/blue{
-	dir = 8
-	},
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
-/turf/open/floor/plasteel/dark,
-/area/ship/bridge)
-"lH" = (
-/obj/effect/turf_decal/industrial/warning{
-	dir = 9
-	},
-/obj/machinery/power/port_gen/pacman/super,
-/obj/structure/cable/yellow{
-	icon_state = "0-4"
-	},
-/obj/item/stack/sheet/mineral/uranium/five,
-/obj/item/stack/sheet/mineral/uranium/five,
-/obj/machinery/atmospherics/pipe/simple/orange/visible{
-	dir = 6
-	},
-/obj/machinery/light/directional/north,
-/obj/item/radio/intercom/directional/north{
-	pixel_x = -28
-	},
-/turf/open/floor/plasteel,
-/area/ship/engineering)
-"lP" = (
-/obj/effect/turf_decal/ntspaceworks_small{
-	dir = 1
-	},
-/turf/open/floor/plating,
-/area/ship/cargo)
-"lS" = (
-/obj/machinery/power/shuttle/engine/fueled/plasma{
-	dir = 4
-	},
-/turf/open/floor/plating/airless,
-/area/ship/engineering)
-"lV" = (
-/obj/machinery/suit_storage_unit/mining/eva,
-/obj/effect/turf_decal/industrial/hatch/yellow,
-/turf/open/floor/plasteel,
-/area/ship/cargo)
-"lZ" = (
-/turf/closed/wall/r_wall,
-/area/ship/medical)
-"me" = (
-/obj/machinery/mech_bay_recharge_port{
-	dir = 1
-	},
-/obj/effect/turf_decal/industrial/warning{
-	dir = 9
-	},
-/obj/structure/cable{
-	icon_state = "0-8"
-	},
-/turf/open/floor/circuit,
-/area/ship/science)
-"mo" = (
-/obj/machinery/power/shuttle/engine/fueled/plasma{
-	dir = 4
-	},
-/turf/open/floor/plating/airless,
-/area/ship/cargo)
-"mt" = (
-/obj/effect/turf_decal/industrial/loading{
-	dir = 1
-	},
-/obj/effect/turf_decal/industrial/warning,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
-	dir = 4
-	},
-/turf/open/floor/plasteel/mono,
-/area/ship/science)
-"mx" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 4
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 8
-	},
-/turf/open/floor/plasteel/mono,
-/area/ship/hallway)
-"mY" = (
-/obj/machinery/power/terminal{
-	dir = 8
-	},
-/obj/structure/cable{
-	icon_state = "0-4"
-	},
-/obj/machinery/door/window/northleft{
-	dir = 8;
-	name = "Engine Access"
-	},
-/turf/open/floor/plating,
-/area/ship/cargo)
-"nb" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
-	dir = 8
-	},
-/obj/effect/turf_decal/corner/opaque/black{
-	dir = 1
-	},
-/obj/effect/turf_decal/corner/opaque/black,
-/obj/machinery/light/directional/south,
-/turf/open/floor/plasteel/white,
-/area/ship/security)
-"nc" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 8
-	},
-/obj/machinery/atmospherics/components/binary/pump{
-	dir = 8;
-	name = "engine fuel pump"
-	},
-/turf/open/floor/plasteel/mono,
-/area/ship/engineering)
-"nd" = (
-/turf/closed/wall,
-/area/ship/science)
-"no" = (
-/obj/machinery/atmospherics/pipe/manifold/orange/hidden{
-	dir = 4
-	},
-/obj/machinery/door/window/northleft{
-	dir = 8;
-	name = "Engine Access"
-	},
-/turf/open/floor/plasteel,
-/area/ship/hallway)
-"nv" = (
-/obj/effect/turf_decal/industrial/warning{
-	dir = 8
-	},
-/obj/machinery/portable_atmospherics/scrubber,
-/obj/machinery/atmospherics/pipe/simple/orange/visible,
-/obj/structure/cable{
-	icon_state = "1-4"
-	},
-/turf/open/floor/plasteel,
-/area/ship/engineering)
-"nM" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/effect/turf_decal/corner/opaque/white/mono,
-/turf/open/floor/plasteel/mono/white,
-/area/ship/medical)
-"nS" = (
-/obj/structure/window/reinforced{
-	dir = 8
-	},
-/obj/machinery/power/smes/shuttle/precharged{
-	dir = 4
-	},
-/obj/structure/cable{
-	icon_state = "0-8"
-	},
-/obj/machinery/door/poddoor{
-	dir = 4;
-	id = "mining_window_shutter"
-	},
-/turf/open/floor/plating,
-/area/ship/engineering)
-"nT" = (
-/obj/machinery/light/directional/west,
-/obj/structure/closet{
-	icon_state = "science";
-	name = "science experiments"
-	},
-/obj/item/seeds/replicapod,
-/obj/item/seeds/cabbage,
-/obj/item/seeds/corn,
-/obj/item/circuitboard/computer/xenobiology,
-/obj/item/bodypart/chest/robot,
-/obj/item/bodypart/leg/right/robot,
-/obj/item/bodypart/leg/left/robot,
-/obj/item/bodypart/r_arm/robot,
-/obj/item/bodypart/leg/right/robot,
-/obj/item/assembly/flash/handheld,
-/obj/item/slime_scanner,
-/obj/item/slime_extract/grey,
-/obj/item/storage/box/rndboards{
-	desc = "A box containing boards for research equipment.";
-	name = "research equipment box"
-	},
-/obj/item/radio/intercom/directional/north,
-/obj/effect/turf_decal/corner/opaque/purple/three_quarters{
-	dir = 4
-	},
-/turf/open/floor/plasteel/white,
-/area/ship/science)
-"nV" = (
-/obj/machinery/door/window/southleft{
-	dir = 1
-	},
-/obj/effect/turf_decal/industrial/hatch/yellow,
-/obj/structure/table/reinforced,
-/obj/machinery/door/firedoor/heavy,
-/turf/open/floor/plating,
-/area/ship/medical)
-"ou" = (
-/obj/item/bedsheet/dorms,
-/obj/structure/bed,
-/obj/structure/curtain/cloth/grey,
-/turf/open/floor/carpet,
-/area/ship/crew)
-"oT" = (
-/obj/structure/rack,
-/obj/item/storage/toolbox/mechanical{
-	pixel_x = -3;
-	pixel_y = 3
-	},
-/obj/item/storage/toolbox/electrical,
-/obj/item/clothing/head/welding,
-/obj/structure/cable{
-	icon_state = "1-8"
-	},
-/obj/structure/cable{
-	icon_state = "1-4"
-	},
-/obj/effect/turf_decal/corner/opaque/purple{
-	dir = 10
-	},
-/turf/open/floor/plasteel/white,
-/area/ship/science)
-"pt" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 4
-	},
-/obj/effect/turf_decal/corner/opaque/black{
-	dir = 1
-	},
-/obj/effect/turf_decal/corner/opaque/black,
-/turf/open/floor/plasteel/white,
-/area/ship/security)
-"pK" = (
-/obj/effect/turf_decal/industrial/warning,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/structure/cable{
-	icon_state = "2-4"
-	},
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
-	dir = 1
-	},
-/turf/open/floor/plasteel,
-/area/ship/engineering)
-"pN" = (
-/obj/machinery/sleeper{
-	dir = 8
-	},
-/obj/effect/turf_decal/corner/opaque/blue,
-/obj/machinery/light/directional/south,
-/turf/open/floor/plasteel/white,
-/area/ship/medical)
-"pW" = (
-/obj/effect/turf_decal/industrial/warning{
-	dir = 4
-	},
-/obj/machinery/power/smes/engineering,
-/obj/structure/cable{
-	icon_state = "0-2"
-	},
-/turf/open/floor/plasteel,
-/area/ship/engineering)
-"qb" = (
-/obj/item/bedsheet/dorms,
-/obj/structure/bed,
-/obj/structure/curtain/cloth/grey,
-/obj/machinery/light/directional/north,
-/turf/open/floor/carpet,
-/area/ship/crew)
-"qk" = (
-/obj/structure/window/reinforced{
-	dir = 8
-	},
-/obj/machinery/atmospherics/components/unary/shuttle/heater{
-	dir = 4
-	},
-/obj/machinery/door/poddoor{
-	dir = 4;
-	id = "mining_window_shutter"
-	},
-/turf/open/floor/plating,
-/area/ship/hallway)
-"ql" = (
-/obj/machinery/atmospherics/pipe/simple/orange/hidden,
-/obj/effect/turf_decal/corner/opaque/yellow{
-	dir = 4
-	},
-/obj/machinery/light/directional/north,
-/turf/open/floor/plasteel,
-/area/ship/hallway)
-"qM" = (
-/obj/effect/turf_decal/industrial/warning{
-	dir = 1
-	},
-/obj/structure/cable/yellow{
-	icon_state = "2-8"
-	},
-/obj/machinery/atmospherics/pipe/manifold4w/orange/visible,
-/turf/open/floor/plasteel,
-/area/ship/engineering)
-"rb" = (
-/turf/closed/wall,
-/area/ship/engineering)
-"rH" = (
-/obj/structure/cable{
-	icon_state = "0-2"
-	},
-/obj/machinery/power/apc/auto_name/directional/north,
-/obj/effect/turf_decal/corner/opaque/blue{
-	dir = 4
-	},
-/turf/open/floor/plasteel,
-/area/ship/hallway)
-"rJ" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 9
-	},
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/turf/open/floor/plasteel/white,
-/area/ship/science)
-"rO" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 4
-	},
-/turf/open/floor/plasteel/white,
-/area/ship/science)
-"rP" = (
-/obj/machinery/atmospherics/components/unary/portables_connector{
-	dir = 1
-	},
-/obj/item/pipe_dispenser,
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/turf/open/floor/plasteel/mono,
-/area/ship/engineering)
-"sm" = (
-/obj/machinery/computer/helm{
-	dir = 8
-	},
-/obj/effect/turf_decal/corner/transparent/neutral{
-	dir = 1
-	},
-/obj/effect/turf_decal/corner/transparent/neutral{
-	dir = 8
-	},
-/turf/open/floor/plasteel/dark,
-/area/ship/bridge)
-"st" = (
-/obj/effect/turf_decal/number/zero{
-	dir = 1
-	},
-/turf/open/floor/plating,
-/area/ship/cargo)
-"sv" = (
-/obj/machinery/door/firedoor/border_only{
-	dir = 8
-	},
-/obj/machinery/door/firedoor/border_only{
-	dir = 4
-	},
-/turf/open/floor/plasteel/stairs/medium{
-	dir = 4
-	},
-/area/ship/hallway)
-"sz" = (
-/obj/effect/turf_decal/corner/opaque/black{
-	dir = 1
-	},
-/obj/effect/turf_decal/corner/opaque/black,
-/obj/machinery/firealarm/directional/west,
-/turf/open/floor/plasteel/white,
-/area/ship/security)
-"sM" = (
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
-	dir = 1
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
-	dir = 1
-	},
-/obj/structure/cable{
-	icon_state = "2-8"
-	},
-/turf/open/floor/plasteel/mono,
-/area/ship/hallway)
-"sN" = (
-/obj/machinery/door/airlock/public/glass{
-	name = "Mining Ship Crew Quarters"
-	},
-/obj/effect/turf_decal/industrial/warning,
-/obj/effect/turf_decal/industrial/warning{
-	dir = 1
-	},
-/obj/machinery/door/firedoor/border_only{
-	dir = 1
-	},
-/obj/machinery/door/firedoor/border_only,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/turf/open/floor/plasteel,
-/area/ship/crew)
-"th" = (
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/turf/open/floor/plating,
-/area/ship/cargo)
-"tp" = (
-/obj/machinery/door/airlock/engineering{
-	name = "Engineering"
-	},
-/obj/effect/turf_decal/industrial/warning{
-	dir = 1
-	},
-/obj/effect/turf_decal/industrial/warning,
-/obj/machinery/door/firedoor/border_only,
-/obj/machinery/door/firedoor/border_only{
-	dir = 1
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/turf/open/floor/plasteel,
-/area/ship/engineering)
-"tr" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 6
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 6
-	},
-/obj/effect/turf_decal/corner/opaque/blue/mono,
-/turf/open/floor/plasteel/mono/white,
-/area/ship/medical)
-"tt" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 4
-	},
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
-	dir = 8
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/machinery/computer/cryopod/directional/south,
-/turf/open/floor/wood,
-/area/ship/crew)
-"tv" = (
-/obj/effect/turf_decal/industrial/warning{
-	dir = 1
-	},
-/obj/machinery/door/firedoor/border_only{
-	dir = 1
-	},
-/turf/open/floor/plasteel,
-/area/ship/hallway)
-"tE" = (
-/turf/closed/wall,
-/area/ship/external)
-"tH" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/turf/open/floor/plasteel/white,
-/area/ship/science)
-"tO" = (
-/obj/effect/turf_decal/industrial/warning,
-/obj/effect/turf_decal/industrial/warning{
-	dir = 1
-	},
-/obj/machinery/door/firedoor/border_only{
-	dir = 1
-	},
-/obj/machinery/door/airlock/public/glass{
-	name = "Cargo Hold"
-	},
-/obj/machinery/door/firedoor/border_only,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/turf/open/floor/plasteel,
-/area/ship/cargo)
-"tS" = (
-/obj/effect/turf_decal/industrial/warning{
-	dir = 1
-	},
-/obj/machinery/door/firedoor/border_only{
-	dir = 1
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/turf/open/floor/plasteel,
-/area/ship/hallway)
-"tV" = (
-/obj/structure/chair/comfy/shuttle{
-	dir = 4
-	},
-/obj/effect/turf_decal/corner/transparent/neutral{
-	dir = 4
-	},
-/obj/effect/turf_decal/corner/transparent/neutral,
-/obj/effect/turf_decal/corner/transparent/neutral{
-	dir = 8
-	},
-/obj/effect/turf_decal/corner/opaque/blue{
-	dir = 1
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/turf/open/floor/plasteel/dark,
-/area/ship/bridge)
-"tY" = (
-/obj/structure/closet/secure_closet/freezer/meat,
-/obj/effect/turf_decal/corner/opaque/black{
-	dir = 1
-	},
-/obj/effect/turf_decal/corner/opaque/black,
-/turf/open/floor/plasteel/white,
-/area/ship/security)
-"ud" = (
-/obj/effect/turf_decal/ntspaceworks_small/right{
-	dir = 1
-	},
-/turf/open/floor/plating,
-/area/ship/cargo)
-"ue" = (
-/obj/machinery/chem_master,
-/obj/effect/turf_decal/corner/opaque/yellow{
-	dir = 4
-	},
-/obj/effect/turf_decal/corner/opaque/yellow{
-	dir = 8
-	},
-/turf/open/floor/plasteel/white,
-/area/ship/medical)
-"uj" = (
-/turf/closed/wall,
-/area/ship/security)
-"uI" = (
-/obj/effect/spawner/structure/window,
-/turf/open/floor/plating,
-/area/ship/medical)
-"uT" = (
-/obj/machinery/door/airlock/external{
-	name = "Escape Pod"
-	},
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
-	dir = 1
-	},
-/obj/effect/turf_decal/industrial/warning{
-	dir = 1
-	},
-/obj/effect/turf_decal/industrial/warning,
-/turf/open/floor/plating,
-/area/ship/hallway)
-"uU" = (
-/obj/machinery/door/poddoor{
-	id = "mining_window_shutter"
-	},
-/obj/effect/spawner/structure/window/reinforced,
-/turf/open/floor/plating/airless,
-/area/ship/bridge)
-"vi" = (
-/obj/machinery/atmospherics/pipe/simple/orange/hidden{
-	dir = 9
-	},
-/obj/machinery/door/window/eastright{
-	dir = 8
-	},
-/turf/open/floor/plating,
-/area/ship/cargo)
-"vN" = (
-/turf/open/floor/plasteel/mono{
-	dir = 1
-	},
-/area/ship/cargo)
-"vO" = (
-/obj/machinery/mineral/ore_redemption{
-	dir = 1
-	},
-/obj/machinery/door/firedoor,
-/turf/open/floor/plating,
-/area/ship/cargo)
-"vV" = (
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
-	dir = 1
-	},
-/obj/structure/cable{
-	icon_state = "2-8"
-	},
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
-	dir = 1
-	},
-/turf/open/floor/plasteel,
-/area/ship/hallway)
-"wl" = (
-/turf/closed/wall/r_wall,
-/area/ship/engineering)
-"wm" = (
-/obj/item/reagent_containers/food/snacks/canned/beans{
-	pixel_x = -5;
-	pixel_y = 3
-	},
-/obj/item/reagent_containers/food/snacks/canned/beans{
-	pixel_x = 2;
-	pixel_y = 3
-	},
-/obj/item/reagent_containers/food/snacks/canned/beans{
-	pixel_x = -2
-	},
-/obj/item/reagent_containers/food/drinks/waterbottle/large{
-	pixel_x = 5
-	},
-/obj/item/reagent_containers/food/drinks/waterbottle/large{
-	pixel_x = 1;
-	pixel_y = -3
-	},
-/obj/item/reagent_containers/food/drinks/waterbottle/large{
-	pixel_x = 8;
-	pixel_y = -3
-	},
-/obj/structure/closet/crate{
-	name = "food crate"
-	},
-/obj/item/storage/cans/sixbeer,
-/obj/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/snacks/rationpack,
-/turf/open/floor/plating{
-	icon_state = "platingdmg2"
-	},
-/area/ship/cargo)
-"wy" = (
-/obj/effect/turf_decal/industrial/warning{
-	dir = 9
-	},
-/obj/effect/turf_decal/industrial/stand_clear{
-	dir = 4
-	},
-/turf/open/floor/plating/airless,
-/area/ship/external)
-"wM" = (
-/obj/machinery/computer{
-	dir = 8
-	},
-/obj/effect/turf_decal/corner/transparent/neutral{
-	dir = 1
-	},
-/obj/effect/turf_decal/corner/transparent/neutral{
-	dir = 8
-	},
-/turf/open/floor/plasteel/dark,
-/area/ship/bridge)
-"xb" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/machinery/power/terminal{
-	dir = 4
-	},
-/obj/structure/cable/yellow,
-/turf/open/floor/plasteel/mono,
-/area/ship/engineering)
-"xd" = (
-/obj/machinery/light/directional/east,
-/turf/open/floor/plasteel/mono{
-	dir = 1
-	},
-/area/ship/cargo)
-"xl" = (
-/obj/machinery/atmospherics/components/unary/shuttle/heater{
-	dir = 4
-	},
-/obj/structure/window/reinforced{
-	dir = 8
-	},
-/obj/machinery/door/poddoor{
-	dir = 4;
-	id = "mining_window_shutter"
-	},
-/turf/open/floor/plating,
-/area/ship/engineering)
-"xn" = (
-/obj/structure/closet/firecloset/wall{
-	dir = 1
-	},
-/turf/closed/wall,
-/area/ship/science)
-"xp" = (
-/obj/machinery/vending/cola/random,
-/obj/item/radio/intercom/directional/north,
-/turf/open/floor/plasteel,
-/area/ship/hallway)
-"xz" = (
-/obj/effect/turf_decal/industrial/warning,
-/obj/machinery/atmospherics/pipe/simple/orange/hidden,
-/obj/machinery/power/apc/auto_name/directional/west,
-/obj/structure/cable{
-	icon_state = "0-4"
-	},
-/turf/open/floor/plasteel,
-/area/ship/cargo)
-"xE" = (
-/obj/effect/turf_decal/corner/transparent/neutral{
-	dir = 4
-	},
-/obj/effect/turf_decal/corner/transparent/neutral,
-/obj/effect/turf_decal/corner/transparent/neutral{
-	dir = 1
-	},
-/obj/effect/turf_decal/corner/transparent/neutral{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 4
-	},
-/obj/machinery/airalarm/directional/south,
-/turf/open/floor/plasteel/dark,
-/area/ship/bridge)
-"xH" = (
-/obj/effect/turf_decal/industrial/warning,
-/obj/structure/closet/crate{
-	icon_state = "crateopen"
-	},
-/obj/item/pickaxe/drill,
-/obj/item/pickaxe/drill,
-/obj/item/pickaxe/drill,
-/obj/item/storage/bag/ore,
-/obj/item/storage/bag/ore,
-/obj/item/storage/bag/ore,
-/obj/item/t_scanner/adv_mining_scanner/lesser,
-/obj/item/t_scanner/adv_mining_scanner/lesser,
-/obj/item/t_scanner/adv_mining_scanner/lesser,
-/turf/open/floor/plasteel,
-/area/ship/cargo)
-"xJ" = (
-/obj/effect/turf_decal/corner/transparent/neutral{
-	dir = 4
-	},
-/obj/effect/turf_decal/corner/transparent/neutral,
-/obj/effect/turf_decal/corner/transparent/neutral{
-	dir = 1
-	},
-/obj/effect/turf_decal/corner/transparent/neutral{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 5
-	},
-/obj/machinery/light/directional/south,
-/obj/item/radio/intercom/wideband/directional/west,
-/turf/open/floor/plasteel/dark,
-/area/ship/bridge)
-"xL" = (
-/obj/machinery/atmospherics/pipe/simple/orange/visible{
-	dir = 10
-	},
-/turf/open/floor/plasteel/mono,
-/area/ship/engineering)
-"xV" = (
-/obj/effect/turf_decal/corner/transparent/neutral{
-	dir = 1
-	},
-/obj/structure/table/reinforced,
-/obj/item/storage/toolbox/mechanical,
-/obj/item/radio/off,
-/obj/item/areaeditor/shuttle,
-/obj/item/storage/firstaid/regular{
-	pixel_x = -8;
-	pixel_y = -8
-	},
-/turf/open/floor/plasteel/dark,
-/area/ship/bridge)
-"yj" = (
-/obj/machinery/door/firedoor/border_only{
-	dir = 8
-	},
-/obj/machinery/door/firedoor/border_only{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 4
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 8
-	},
-/turf/open/floor/plasteel/stairs/medium{
-	dir = 4
-	},
-/area/ship/hallway)
-"ym" = (
-/obj/machinery/door/firedoor/border_only{
-	dir = 8
-	},
-/obj/machinery/door/firedoor/border_only{
-	dir = 4
-	},
-/obj/machinery/light/directional/north,
-/turf/open/floor/plasteel/stairs/medium{
-	dir = 4
-	},
-/area/ship/hallway)
-"yx" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 4
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 8
-	},
-/obj/effect/landmark/observer_start,
-/turf/open/floor/plasteel/mono,
-/area/ship/hallway)
-"yG" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 4
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 8
-	},
-/obj/effect/turf_decal/corner/opaque/blue/diagonal{
-	dir = 4
-	},
-/turf/open/floor/plasteel/white,
-/area/ship/hallway)
-"yM" = (
-/obj/machinery/cryopod{
-	dir = 1
-	},
-/obj/effect/turf_decal/industrial/warning{
-	dir = 1
-	},
-/turf/open/floor/plasteel/mono/dark,
-/area/ship/crew)
-"yP" = (
-/obj/effect/turf_decal/corner/transparent/neutral{
-	dir = 4
-	},
-/obj/effect/turf_decal/corner/transparent/neutral,
-/obj/effect/turf_decal/corner/transparent/neutral{
-	dir = 1
-	},
-/obj/effect/turf_decal/corner/transparent/neutral{
-	dir = 8
-	},
-/obj/effect/turf_decal/corner/opaque/blue{
-	dir = 8
-	},
-/obj/effect/turf_decal/corner/opaque/blue,
-/obj/structure/window/reinforced,
-/obj/structure/closet/wall{
-	pixel_y = 32
-	},
-/obj/item/gun/energy/e_gun/mini,
-/obj/item/stock_parts/cell/gun/mini,
-/obj/item/ammo_box/magazine/co9mm,
-/obj/item/ammo_box/magazine/co9mm,
-/obj/item/ammo_box/magazine/co9mm,
-/obj/item/ammo_box/magazine/co9mm,
-/obj/item/ammo_box/magazine/co9mm,
-/obj/item/ammo_box/magazine/co9mm,
-/obj/item/gun/ballistic/automatic/pistol/commander/no_mag,
-/obj/item/gun/ballistic/automatic/pistol/commander/no_mag,
-/obj/item/gun/ballistic/automatic/pistol/commander/no_mag,
-/turf/open/floor/plasteel/dark,
-/area/ship/bridge)
-"zd" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/turf/open/floor/plasteel,
-/area/ship/hallway)
-"zf" = (
-/obj/structure/catwalk,
-/obj/machinery/light/small/directional/west,
-/turf/open/floor/plating/airless,
-/area/ship/external)
-"zq" = (
-/obj/effect/turf_decal/corner/opaque/blue{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 5
-	},
-/obj/structure/cable{
-	icon_state = "1-4"
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 5
-	},
-/turf/open/floor/plasteel/white,
-/area/ship/medical)
-"zs" = (
-/obj/structure/frame/computer{
-	dir = 8
-	},
-/obj/effect/turf_decal/corner/transparent/neutral{
-	dir = 1
-	},
-/obj/effect/turf_decal/corner/transparent/neutral{
-	dir = 8
-	},
-/turf/open/floor/plasteel/dark,
-/area/ship/bridge)
-"zQ" = (
-/obj/machinery/door/poddoor{
-	id = "mining_window_shutter"
-	},
-/obj/effect/spawner/structure/window/reinforced,
-/turf/open/floor/plating,
-/area/ship/security)
-"zR" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 8
-	},
-/obj/structure/cable{
-	icon_state = "1-8"
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/turf/open/floor/plasteel,
-/area/ship/hallway)
-"Ai" = (
-/turf/closed/wall/r_wall,
-/area/ship/cargo)
-"Av" = (
-/obj/structure/catwalk,
-/turf/closed/wall,
-/area/ship/external)
-"AD" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 4
-	},
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
-	dir = 4
-	},
-/turf/open/floor/plasteel/mono,
-/area/ship/hallway)
-"AI" = (
-/obj/machinery/modular_computer/console/preset/command{
-	dir = 1
-	},
-/obj/effect/turf_decal/corner/opaque/blue,
-/obj/effect/turf_decal/corner/opaque/blue{
-	dir = 4
-	},
-/obj/effect/turf_decal/corner/opaque/blue{
-	dir = 8
-	},
-/turf/open/floor/plasteel/dark,
-/area/ship/bridge)
-"Bf" = (
-/turf/closed/wall,
-/area/ship/bridge)
-"Bh" = (
-/obj/structure/table/reinforced,
-/obj/effect/turf_decal/corner/transparent/neutral{
-	dir = 8
-	},
-/obj/effect/spawner/lootdrop/donkpockets,
-/obj/effect/spawner/lootdrop/donkpockets,
-/obj/effect/spawner/lootdrop/donkpockets,
-/turf/open/floor/plasteel/dark,
-/area/ship/bridge)
-"Bk" = (
-/obj/machinery/light/directional/west,
-/turf/open/floor/plasteel/mono{
-	dir = 1
-	},
-/area/ship/cargo)
-"Bv" = (
-/obj/effect/turf_decal/industrial/warning{
-	dir = 4
-	},
-/obj/machinery/atmospherics/components/unary/tank/toxins{
-	dir = 8
-	},
-/turf/open/floor/plasteel,
-/area/ship/engineering)
-"BQ" = (
-/obj/structure/table,
-/obj/machinery/door/window/southright{
-	dir = 4
-	},
-/obj/item/storage/firstaid/medical{
-	pixel_x = -5;
-	pixel_y = -4
-	},
-/obj/item/storage/firstaid/fire,
-/obj/item/storage/firstaid/o2{
-	pixel_x = 4;
-	pixel_y = 3
-	},
-/turf/open/floor/plasteel/mono,
-/area/ship/medical)
-"Co" = (
-/obj/effect/turf_decal/industrial/warning,
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/turf/open/floor/plasteel,
-/area/ship/cargo)
-"Cy" = (
-/obj/effect/turf_decal/industrial/hatch/yellow,
-/obj/effect/turf_decal/industrial/warning{
-	dir = 8
-	},
-/obj/machinery/ore_silo,
-/turf/open/floor/plasteel/mono,
-/area/ship/science)
-"CC" = (
-/obj/effect/turf_decal/corner/transparent/neutral,
-/obj/effect/turf_decal/corner/transparent/neutral{
-	dir = 1
-	},
-/obj/effect/turf_decal/corner/transparent/neutral{
-	dir = 8
-	},
-/obj/machinery/button/door{
-	id = "mining_window_shutter";
-	name = "Window Shutters";
-	pixel_y = 28
-	},
-/turf/open/floor/plasteel/dark,
-/area/ship/bridge)
-"CO" = (
-/obj/machinery/advanced_airlock_controller{
-	dir = 8;
-	pixel_x = 25
-	},
-/turf/open/floor/plating,
-/area/ship/hallway)
-"CU" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/structure/cable{
-	icon_state = "2-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/effect/turf_decal/corner/opaque/blue/mono,
-/obj/machinery/firealarm/directional/east,
-/turf/open/floor/plasteel/mono/white,
-/area/ship/medical)
-"Db" = (
-/obj/structure/catwalk,
-/obj/machinery/atmospherics/components/unary/outlet_injector/on/layer4{
-	dir = 4
-	},
-/turf/open/floor/plating/airless,
-/area/ship/external)
-"Dm" = (
-/obj/structure/fans/tiny,
-/obj/machinery/door/poddoor{
-	id = "mining_galaxy_port"
-	},
-/turf/open/floor/plasteel/mono,
-/area/ship/cargo)
-"Dv" = (
-/obj/effect/spawner/structure/window,
-/turf/open/floor/plating,
-/area/ship/cargo)
-"DE" = (
-/obj/effect/turf_decal/industrial/warning{
-	dir = 8
-	},
-/obj/effect/turf_decal/industrial/warning{
-	dir = 4
-	},
-/obj/machinery/door/firedoor/border_only{
-	dir = 4
-	},
-/obj/machinery/door/firedoor/border_only{
-	dir = 8
-	},
-/turf/open/floor/plasteel/mono,
-/area/ship/hallway)
-"DK" = (
-/obj/structure/table,
-/obj/machinery/reagentgrinder{
-	pixel_y = 5
-	},
-/obj/item/stack/sheet/mineral/plasma,
-/obj/effect/turf_decal/corner/opaque/yellow{
-	dir = 4
-	},
-/obj/effect/turf_decal/corner/opaque/yellow{
-	dir = 1
-	},
-/obj/effect/turf_decal/corner/opaque/yellow{
-	dir = 8
-	},
-/turf/open/floor/plasteel/white,
-/area/ship/medical)
-"DS" = (
-/turf/open/floor/plasteel,
-/area/ship/hallway)
-"Eb" = (
-/obj/effect/turf_decal/industrial/warning{
-	dir = 1
-	},
-/obj/structure/cable/yellow{
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/components/binary/pump{
-	dir = 8;
-	name = "engine fuel pump"
-	},
-/obj/machinery/light/directional/north,
-/turf/open/floor/plasteel,
-/area/ship/engineering)
-"Et" = (
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
-	dir = 1
-	},
-/obj/structure/cable{
-	icon_state = "2-8"
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
-	dir = 1
-	},
-/turf/open/floor/plasteel,
-/area/ship/hallway)
-"EB" = (
-/obj/machinery/atmospherics/pipe/simple/orange/hidden,
-/obj/effect/turf_decal/corner/opaque/brown,
-/turf/open/floor/plasteel,
-/area/ship/hallway)
-"EX" = (
-/obj/effect/turf_decal/corner/opaque/blue{
-	dir = 8
-	},
-/obj/machinery/power/apc/auto_name/directional/west,
-/obj/structure/cable{
-	icon_state = "0-4"
-	},
-/turf/open/floor/plasteel/white,
-/area/ship/medical)
-"EY" = (
-/obj/machinery/door/airlock/command/glass{
-	dir = 4;
-	name = "Cockpit"
-	},
-/obj/machinery/door/firedoor/border_only{
-	dir = 4
-	},
-/obj/machinery/door/firedoor/border_only{
-	dir = 8
-	},
-/obj/effect/turf_decal/industrial/warning{
-	dir = 8
-	},
-/obj/effect/turf_decal/industrial/warning{
-	dir = 4
-	},
-/turf/open/floor/plasteel/dark,
-/area/ship/bridge)
-"EZ" = (
-/obj/effect/turf_decal/corner/opaque/blue/diagonal{
-	dir = 4
-	},
-/turf/open/floor/plasteel/white,
-/area/ship/hallway)
-"Fq" = (
-/obj/effect/turf_decal/industrial/warning{
-	dir = 10
-	},
-/obj/machinery/portable_atmospherics/pump,
-/obj/machinery/atmospherics/pipe/simple/orange/visible,
-/obj/machinery/light/directional/west,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 8
-	},
-/turf/open/floor/plasteel,
-/area/ship/engineering)
-"Ft" = (
-/obj/machinery/computer/mech_bay_power_console{
-	dir = 8
-	},
-/obj/effect/turf_decal/industrial/warning{
-	dir = 10
-	},
-/turf/open/floor/circuit,
-/area/ship/science)
-"Fx" = (
-/obj/machinery/atmospherics/pipe/simple/orange/hidden,
-/turf/closed/wall,
-/area/ship/cargo)
-"FK" = (
-/obj/structure/closet/secure_closet/medical2,
-/obj/effect/turf_decal/corner/opaque/blue{
-	dir = 4
-	},
-/turf/open/floor/plasteel/white,
-/area/ship/medical)
-"FV" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/machinery/airalarm/directional/east,
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/turf/open/floor/plasteel,
-/area/ship/hallway)
-"Gf" = (
-/obj/effect/turf_decal/industrial/warning,
-/obj/item/stack/sheet/mineral/titanium/twenty,
-/obj/structure/closet/crate,
-/obj/item/stack/sheet/metal/fifty,
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/turf/open/floor/plasteel,
-/area/ship/cargo)
-"Gs" = (
-/obj/machinery/door/poddoor{
-	dir = 4;
-	id = "mining_window_shutter"
-	},
-/obj/effect/spawner/structure/window/reinforced,
-/turf/open/floor/plating,
-/area/ship/hallway)
-"GY" = (
-/obj/effect/turf_decal/industrial/warning,
-/obj/effect/turf_decal/industrial/warning{
-	dir = 1
-	},
-/obj/machinery/door/firedoor/border_only,
-/obj/machinery/door/firedoor/border_only{
-	dir = 1
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/machinery/door/airlock/research{
-	name = "Salvage Bay"
-	},
-/turf/open/floor/plasteel,
-/area/ship/science)
-"Hk" = (
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/structure/cable{
-	icon_state = "1-8"
-	},
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
-/turf/open/floor/plasteel/mono,
-/area/ship/hallway)
-"Hs" = (
-/turf/closed/wall,
-/area/ship/medical)
-"HS" = (
-/obj/structure/table/wood,
-/obj/item/reagent_containers/food/condiment/saltshaker{
-	pixel_x = -2;
-	pixel_y = 6
-	},
-/obj/item/reagent_containers/food/condiment/peppermill{
-	pixel_x = 4;
-	pixel_y = 5
-	},
-/obj/item/reagent_containers/food/condiment/pack/ketchup,
-/obj/effect/turf_decal/corner/opaque/black{
-	dir = 1
-	},
-/obj/effect/turf_decal/corner/opaque/black,
-/turf/open/floor/plasteel/white,
-/area/ship/security)
-"HT" = (
-/obj/structure/closet/emcloset/wall,
-/turf/closed/wall,
-/area/ship/security)
-"HV" = (
-/obj/structure/sign/warning/docking{
-	pixel_y = -32
-	},
-/obj/effect/turf_decal/industrial/warning{
-	dir = 5
-	},
-/obj/effect/turf_decal/industrial/stand_clear{
-	dir = 8
-	},
-/turf/open/floor/plating/airless,
-/area/ship/external)
-"HZ" = (
-/obj/machinery/light/directional/east,
-/turf/open/floor/mech_bay_recharge_floor,
-/area/ship/science)
-"Ic" = (
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
-	dir = 8
-	},
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/effect/turf_decal/corner/opaque/blue/diagonal{
-	dir = 4
-	},
-/turf/open/floor/plasteel/white,
-/area/ship/hallway)
-"Ig" = (
-/obj/effect/turf_decal/industrial/warning{
-	dir = 8
-	},
-/obj/effect/turf_decal/industrial/warning{
-	dir = 4
-	},
-/obj/machinery/door/firedoor/border_only{
-	dir = 4
-	},
-/obj/machinery/door/firedoor/border_only{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 4
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 8
-	},
-/turf/open/floor/plasteel/mono,
-/area/ship/hallway)
-"Il" = (
-/obj/machinery/door/airlock/command/glass{
-	dir = 4;
-	name = "Cockpit"
-	},
-/obj/machinery/door/firedoor/border_only{
-	dir = 8
-	},
-/obj/effect/turf_decal/industrial/warning{
-	dir = 8
-	},
-/obj/effect/turf_decal/industrial/warning{
-	dir = 4
-	},
-/obj/machinery/door/firedoor/border_only{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 4
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 8
-	},
-/turf/open/floor/plasteel/dark,
-/area/ship/bridge)
-"IC" = (
-/obj/structure/closet/wall,
-/obj/item/circuitboard/machine/microwave,
-/obj/item/kitchen/knife,
-/obj/item/kitchen/fork,
-/obj/item/reagent_containers/food/condiment/enzyme,
-/obj/item/reagent_containers/food/condiment/flour,
-/obj/item/reagent_containers/food/condiment/mayonnaise,
-/obj/item/reagent_containers/food/condiment/pack/hotsauce,
-/obj/item/reagent_containers/food/condiment/pack/ketchup,
-/obj/item/reagent_containers/food/condiment/pack/bbqsauce,
-/obj/item/reagent_containers/food/condiment/pack/astrotame,
-/obj/item/reagent_containers/food/condiment/rice,
-/obj/item/reagent_containers/food/condiment/soymilk,
-/obj/item/reagent_containers/food/condiment/soysauce,
-/obj/item/reagent_containers/food/condiment/sugar,
-/obj/item/storage/box/condimentbottles,
-/turf/closed/wall/r_wall,
-/area/ship/security)
-"IH" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 9
-	},
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/turf/open/floor/plasteel/white,
-/area/ship/science)
-"Jn" = (
-/obj/machinery/suit_storage_unit/mining/eva,
-/obj/effect/turf_decal/industrial/hatch/yellow,
-/obj/machinery/atmospherics/pipe/simple/orange/hidden,
-/obj/machinery/light/directional/west,
-/obj/item/radio/intercom/directional/north,
-/turf/open/floor/plasteel,
-/area/ship/cargo)
-"Jr" = (
-/obj/machinery/recharge_station,
-/obj/effect/turf_decal/industrial/warning{
-	dir = 8
-	},
-/obj/machinery/firealarm/directional/east,
-/turf/open/floor/circuit,
-/area/ship/science)
-"JR" = (
-/obj/structure/table,
-/obj/item/reagent_containers/glass/beaker/large,
-/obj/item/reagent_containers/glass/beaker/large,
-/obj/item/lighter,
-/obj/effect/turf_decal/corner/opaque/yellow{
-	dir = 4
-	},
-/turf/open/floor/plasteel/white,
-/area/ship/medical)
-"Kg" = (
-/obj/structure/catwalk,
-/turf/open/floor/plating/airless,
-/area/ship/external)
-"Kj" = (
-/obj/effect/turf_decal/corner/transparent/neutral{
-	dir = 4
-	},
-/obj/effect/turf_decal/corner/transparent/neutral{
-	dir = 1
-	},
-/obj/effect/turf_decal/corner/transparent/neutral{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 9
-	},
-/obj/item/radio/intercom/directional/south,
-/turf/open/floor/plasteel/dark,
-/area/ship/bridge)
-"Kz" = (
-/turf/template_noop,
-/area/template_noop)
-"KJ" = (
-/obj/structure/table,
-/obj/item/storage/box/beakers{
-	pixel_x = 2;
-	pixel_y = 2
-	},
-/obj/effect/turf_decal/corner/opaque/yellow{
-	dir = 4
-	},
-/obj/effect/turf_decal/corner/opaque/yellow,
-/turf/open/floor/plasteel/white,
-/area/ship/medical)
-"Ld" = (
-/obj/machinery/atmospherics/components/binary/passive_gate,
-/obj/effect/turf_decal/industrial/warning{
-	dir = 1
-	},
-/turf/open/floor/plating/airless,
-/area/ship/external)
-"LS" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/turf/open/floor/plasteel,
-/area/ship/hallway)
-"LY" = (
-/obj/machinery/firealarm/directional/east,
-/obj/effect/turf_decal/corner/opaque/blue/diagonal{
-	dir = 4
-	},
-/turf/open/floor/plasteel/white,
-/area/ship/hallway)
-"MG" = (
-/obj/machinery/shower{
-	dir = 1
-	},
-/obj/effect/turf_decal/industrial/warning,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 8
-	},
-/turf/open/floor/noslip,
-/area/ship/engineering)
-"Nj" = (
-/obj/effect/turf_decal/number/five{
-	dir = 1
-	},
-/turf/open/floor/plating,
-/area/ship/cargo)
-"No" = (
-/turf/closed/wall,
-/area/ship/cargo)
-"Nt" = (
-/obj/effect/turf_decal/corner/transparent/neutral{
-	dir = 8
-	},
-/obj/effect/turf_decal/corner/transparent/neutral{
-	dir = 4
-	},
-/obj/effect/turf_decal/corner/transparent/neutral{
-	dir = 1
-	},
-/obj/effect/turf_decal/corner/transparent/neutral,
-/obj/structure/window/reinforced{
-	dir = 1
-	},
-/obj/structure/table/reinforced,
-/obj/machinery/recharger,
-/obj/item/spacecash/bundle/c1000,
-/obj/item/spacecash/bundle/c1000,
-/obj/item/spacecash/bundle/c1000,
-/turf/open/floor/plasteel/dark,
-/area/ship/bridge)
-"Nx" = (
-/obj/effect/turf_decal/industrial/hatch/yellow,
-/obj/effect/turf_decal/industrial/warning{
-	dir = 6
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 8
-	},
-/obj/structure/mecha_wreckage/ripley,
-/turf/open/floor/plasteel/mono,
-/area/ship/science)
-"NN" = (
-/obj/effect/turf_decal/industrial/hatch/yellow,
-/obj/effect/turf_decal/industrial/warning{
-	dir = 10
-	},
-/obj/machinery/computer/rdconsole{
-	dir = 4
-	},
-/turf/open/floor/plasteel/mono,
-/area/ship/science)
-"Oa" = (
-/obj/effect/turf_decal/corner/opaque/purple,
-/turf/open/floor/plasteel,
-/area/ship/hallway)
-"OQ" = (
-/turf/open/floor/plasteel/mono,
-/area/ship/science)
-"OU" = (
-/obj/machinery/airalarm/directional/south,
-/obj/effect/turf_decal/corner/opaque/black{
-	dir = 1
-	},
-/obj/effect/turf_decal/corner/opaque/black,
-/turf/open/floor/plasteel/white,
-/area/ship/security)
-"OY" = (
-/turf/open/floor/plating,
-/area/ship/cargo)
-"Pa" = (
-/obj/machinery/door/poddoor{
-	id = "mining_window_shutter"
-	},
-/obj/effect/spawner/structure/window/reinforced,
-/turf/open/floor/plasteel/dark,
-/area/ship/bridge)
-"Pd" = (
-/obj/effect/turf_decal/industrial/warning{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/manifold4w/orange/visible,
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/machinery/door/window/northleft{
-	dir = 8;
-	name = "Engine Access"
-	},
-/turf/open/floor/plasteel,
-/area/ship/engineering)
-"Pi" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
-	dir = 8
-	},
-/obj/machinery/airalarm/directional/south,
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/turf/open/floor/wood,
-/area/ship/crew)
-"Pk" = (
-/obj/effect/turf_decal/corner/opaque/black{
-	dir = 1
-	},
-/obj/effect/turf_decal/corner/opaque/black,
-/turf/open/floor/plasteel/white,
-/area/ship/security)
-"Pq" = (
-/obj/effect/turf_decal/corner/opaque/brown,
-/turf/open/floor/plasteel,
-/area/ship/hallway)
-"Pv" = (
-/obj/machinery/power/apc/auto_name/directional/west,
-/obj/structure/cable{
-	icon_state = "0-4"
-	},
-/obj/machinery/vending/cigarette,
-/obj/effect/turf_decal/corner/opaque/black{
-	dir = 1
-	},
-/obj/effect/turf_decal/corner/opaque/black,
-/turf/open/floor/plasteel/white,
-/area/ship/security)
-"Px" = (
-/obj/effect/turf_decal/corner/opaque/blue,
-/obj/effect/turf_decal/corner/opaque/blue{
-	dir = 4
-	},
-/obj/effect/turf_decal/corner/opaque/blue{
-	dir = 1
-	},
-/obj/machinery/holopad/emergency/science,
-/turf/open/floor/plasteel/dark,
-/area/ship/bridge)
-"PJ" = (
-/obj/structure/closet/crate/engineering,
-/obj/item/stack/sheet/metal/twenty,
-/obj/item/stack/sheet/glass/fifty,
-/turf/open/floor/plasteel,
-/area/ship/cargo)
-"Qh" = (
-/obj/machinery/light/directional/south,
-/turf/open/floor/plasteel,
-/area/ship/hallway)
-"Qn" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/turf/open/floor/plasteel/mono,
-/area/ship/hallway)
-"Qo" = (
-/obj/machinery/power/shuttle/engine/electric{
-	dir = 4
-	},
-/obj/structure/cable{
-	icon_state = "0-4"
-	},
-/turf/open/floor/plating/airless,
-/area/ship/external)
-"QX" = (
-/obj/machinery/atmospherics/pipe/simple/orange/visible,
-/obj/machinery/door/poddoor{
-	id = "mining_window_shutter"
-	},
-/obj/effect/spawner/structure/window/reinforced,
-/turf/open/floor/plating,
-/area/ship/engineering)
-"Rj" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 5
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 5
-	},
-/obj/structure/cable{
-	icon_state = "1-4"
-	},
-/turf/open/floor/wood,
-/area/ship/crew)
-"RB" = (
-/obj/effect/spawner/structure/window/reinforced,
-/turf/open/floor/plating,
-/area/ship/cargo)
-"RN" = (
-/obj/structure/cable{
-	icon_state = "1-8"
-	},
-/turf/open/floor/plating,
-/area/ship/cargo)
-"RR" = (
-/obj/effect/turf_decal/corner/opaque/blue{
-	dir = 4
-	},
-/obj/structure/table,
-/obj/item/storage/backpack/duffelbag/med/surgery,
-/obj/machinery/vending/wallmed{
-	pixel_y = 28
-	},
-/obj/item/storage/belt/medical,
-/turf/open/floor/plasteel/white,
-/area/ship/medical)
-"Sp" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/turf/open/floor/plasteel,
-/area/ship/hallway)
-"Sr" = (
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/turf/open/floor/plasteel/white,
-/area/ship/science)
-"SQ" = (
-/obj/effect/turf_decal/corner/opaque/yellow{
-	dir = 8
-	},
-/turf/open/floor/plasteel/white,
-/area/ship/medical)
-"SU" = (
-/obj/structure/closet/crate/freezer/blood,
-/obj/effect/turf_decal/corner/opaque/blue{
-	dir = 4
-	},
-/obj/effect/turf_decal/corner/opaque/yellow,
-/turf/open/floor/plasteel/white,
-/area/ship/medical)
-"Tm" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 10
-	},
-/turf/open/floor/plasteel,
-/area/ship/cargo)
-"Ty" = (
-/obj/structure/cable{
-	icon_state = "2-4"
-	},
-/obj/effect/turf_decal/corner/opaque/purple{
-	dir = 9
-	},
-/turf/open/floor/plasteel/white,
-/area/ship/science)
-"Tz" = (
-/obj/machinery/suit_storage_unit/mining/eva,
-/obj/effect/turf_decal/industrial/hatch/yellow,
-/obj/machinery/firealarm/directional/north,
-/turf/open/floor/plasteel,
-/area/ship/cargo)
-"TI" = (
-/obj/machinery/light/directional/north,
-/obj/structure/closet/secure_closet/freezer/kitchen,
-/obj/effect/turf_decal/corner/opaque/black{
-	dir = 1
-	},
-/obj/effect/turf_decal/corner/opaque/black,
-/turf/open/floor/plasteel/white,
-/area/ship/security)
-"Up" = (
-/obj/structure/table/reinforced,
-/obj/machinery/airalarm/directional/south,
-/obj/item/circuitboard/mecha/ripley/main,
-/obj/item/circuitboard/mecha/ripley/peripherals,
-/obj/item/transfer_valve,
-/obj/effect/turf_decal/corner/opaque/purple{
-	dir = 10
-	},
-/turf/open/floor/plasteel/white,
-/area/ship/science)
-"Uq" = (
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
-/obj/structure/cable{
-	icon_state = "1-8"
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
-/turf/open/floor/plasteel/mono,
-/area/ship/hallway)
-"UJ" = (
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
-	dir = 8
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/turf/open/floor/plasteel/mono,
-/area/ship/engineering)
-"UW" = (
-/obj/effect/turf_decal/industrial/warning,
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/structure/cable{
-	icon_state = "2-4"
-	},
-/turf/open/floor/plasteel,
-/area/ship/cargo)
-"Vb" = (
-/obj/structure/table,
-/obj/machinery/door/window/southleft{
-	dir = 4
-	},
-/obj/item/reagent_containers/glass/bottle/epinephrine{
-	pixel_x = -4
-	},
-/obj/item/reagent_containers/glass/bottle/charcoal{
-	pixel_x = 7;
-	pixel_y = 4
-	},
-/obj/item/reagent_containers/syringe,
-/obj/item/stack/medical/suture,
-/obj/item/defibrillator/loaded,
-/turf/open/floor/plasteel/mono,
-/area/ship/medical)
-"Vd" = (
-/obj/structure/bed,
-/obj/structure/curtain/cloth/grey,
-/obj/item/bedsheet/dorms,
-/obj/machinery/firealarm/directional/east,
-/turf/open/floor/carpet,
-/area/ship/crew)
-"VE" = (
-/turf/closed/wall/r_wall,
-/area/ship/science)
-"Wp" = (
-/turf/closed/wall,
-/area/ship/crew)
-"WG" = (
-/obj/effect/spawner/structure/window/reinforced,
-/turf/open/floor/plating,
-/area/ship/science)
-"Xg" = (
-/obj/machinery/power/shuttle/engine/fueled/plasma{
-	dir = 4
-	},
-/turf/open/floor/plating/airless,
-/area/ship/crew)
-"Xi" = (
-/turf/open/floor/plasteel/white,
-/area/ship/science)
-"Xw" = (
-/obj/effect/turf_decal/corner/opaque/yellow{
-	dir = 4
-	},
-/obj/effect/turf_decal/corner/opaque/yellow,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 8
-	},
-/turf/open/floor/plasteel/white,
-/area/ship/medical)
-"Xx" = (
-/obj/effect/turf_decal/corner/opaque/brown,
-/obj/machinery/firealarm/directional/south,
-/turf/open/floor/plasteel,
-/area/ship/hallway)
-"Yj" = (
-/obj/effect/turf_decal/corner/opaque/yellow{
-	dir = 4
-	},
-/obj/item/radio/intercom/directional/north,
-/turf/open/floor/plasteel,
-/area/ship/hallway)
-"Yy" = (
-/obj/effect/turf_decal/industrial/warning{
-	dir = 8
-	},
-/obj/effect/turf_decal/industrial/warning{
-	dir = 4
-	},
-/obj/machinery/door/firedoor/border_only{
-	dir = 4
-	},
-/obj/machinery/door/firedoor/border_only{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 4
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 8
-	},
-/obj/machinery/door/airlock/medical/glass{
-	dir = 4;
-	name = "Sickbay"
-	},
-/turf/open/floor/plasteel/white,
-/area/ship/medical)
-"YH" = (
-/obj/structure/bed/roller,
-/obj/machinery/iv_drip,
-/obj/effect/turf_decal/corner/opaque/blue{
-	dir = 8
-	},
-/obj/machinery/airalarm/directional/west,
-/turf/open/floor/plasteel/white,
-/area/ship/medical)
-"YU" = (
-/obj/effect/turf_decal/corner/opaque/blue/diagonal{
-	dir = 4
-	},
-/turf/open/floor/plasteel/white,
-/area/ship/medical)
-"Zf" = (
-/turf/closed/wall/r_wall,
-/area/ship/bridge)
-"Zk" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 10
-	},
-/obj/structure/cable{
-	icon_state = "2-8"
-	},
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
-	dir = 1
-	},
-/obj/effect/turf_decal/corner/opaque/blue/diagonal{
-	dir = 4
-	},
-/turf/open/floor/plasteel/white,
-/area/ship/hallway)
-"Zt" = (
-/obj/structure/closet/crate/internals,
-/obj/effect/spawner/lootdrop/maintenance,
-/obj/machinery/button/door{
-	id = "mining_galaxy_port";
-	name = "Port Hangar Shutters";
-	pixel_y = 28
-	},
-/obj/effect/spawner/lootdrop/maintenance,
-/obj/machinery/airalarm/directional/east,
-/turf/open/floor/plasteel,
-/area/ship/cargo)
-"ZO" = (
-/obj/structure/window/reinforced{
-	dir = 8
-	},
-/obj/machinery/power/smes/shuttle/precharged{
-	dir = 4
-	},
-/obj/structure/cable{
-	icon_state = "0-8"
-	},
-/obj/machinery/door/poddoor{
-	dir = 4;
-	id = "mining_window_shutter"
-	},
-/turf/open/floor/plating,
-/area/ship/cargo)
-"ZR" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
-	dir = 8
-	},
-/obj/effect/turf_decal/corner/opaque/blue/diagonal{
-	dir = 4
-	},
-/turf/open/floor/plasteel/white,
-/area/ship/hallway)
-"ZS" = (
-/obj/effect/turf_decal/industrial/warning,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
-	dir = 1
-	},
-/turf/open/floor/plasteel,
-/area/ship/cargo)
-
-(1,1,1) = {"
-Kg
-Kg
-Av
-Qo
-lS
-Av
-Db
-Kg
-Kg
-Xg
-Kg
-Kg
-Kg
-tE
-mo
-Qo
-tE
-Kg
-Kg
-"}
-(2,1,1) = {"
-Kg
-wl
-wl
-nS
-xl
-wl
-aZ
-wl
-Gs
-qk
-Gs
-Ai
-Ai
-Ai
-ea
-ZO
-Ai
-cU
-Kg
-"}
-(3,1,1) = {"
-Kg
-wl
-lH
-jm
-Pd
-nv
-Fq
-kk
-ql
-no
-EB
-Fx
-Jn
-xz
-vi
-mY
-Bk
-Dm
-Kg
-"}
-(4,1,1) = {"
-Kg
-wl
-hf
-lf
-fS
-kZ
-ad
-rb
-iB
-bc
-ih
-No
-lV
-UW
-th
-RN
-vN
-Dm
-Kg
-"}
-(5,1,1) = {"
-wy
-wl
-Eb
-nc
-xL
-rP
-MG
-rb
-Yj
-AD
-Xx
-No
-Tz
-Co
-OY
-OY
-vN
-Dm
-Kg
-"}
-(6,1,1) = {"
-Ld
-QX
-qM
-bf
-xb
-UJ
-pK
-tp
-LS
-gf
-Pq
-RB
-PJ
-Gf
-ae
-ud
-vN
-Dm
-Kg
-"}
-(7,1,1) = {"
-HV
-wl
-lc
-Bv
-pW
-fW
-km
-rb
-ls
-Et
-LS
-tO
-jC
-ci
-st
-lP
-vN
-Dm
-Kg
-"}
-(8,1,1) = {"
-Kg
-wl
-rb
-rb
-rb
-rb
-hv
-rb
-ym
-yj
-sv
-vO
-Tm
-ZS
-Nj
-fo
-vN
-Dm
-Kg
-"}
-(9,1,1) = {"
-Kg
-lZ
-Hs
-BQ
-Vb
-Hs
-Hs
-Hs
-rH
-zR
-Oa
-No
-Zt
-xH
-wm
-OY
-xd
-Dm
-Kg
-"}
-(10,1,1) = {"
-Kg
-lZ
-av
-YU
-YU
-EX
-YH
-uI
-aT
-mx
-Oa
-No
-No
-Dv
-Dv
-gJ
-Ai
-Ai
-Kg
-"}
-(11,1,1) = {"
-Kg
-lZ
-cg
-tr
-nM
-CU
-zq
-uI
-aT
-mx
-aE
-nd
-nT
-gW
-gW
-Ty
-bz
-VE
-Kg
-"}
-(12,1,1) = {"
-Kg
-lZ
-RR
-dv
-pN
-Hs
-Yy
-Hs
-fC
-yx
-Oa
-WG
-Cy
-NN
-Xi
-Sr
-jb
-VE
-Kg
-"}
-(13,1,1) = {"
-Kg
-lZ
-FK
-gw
-KJ
-uI
-yG
-EZ
-tv
-mx
-Oa
-hj
-OQ
-mt
-fv
-Sr
-Up
-VE
-Kg
-"}
-(14,1,1) = {"
-Kg
-lZ
-SU
-Xw
-DK
-uI
-Zk
-Ic
-tS
-Uq
-Oa
-WG
-jl
-Nx
-rO
-bK
-hg
-VE
-Kg
-"}
-(15,1,1) = {"
-Kg
-lZ
-lZ
-by
-SQ
-nV
-ZR
-fG
-tv
-sM
-Sp
-GY
-tH
-rJ
-IH
-oT
-VE
-VE
-Kg
-"}
-(16,1,1) = {"
-Kg
-Kg
-lZ
-JR
-ue
-uI
-LY
-EZ
-tv
-ev
-Oa
-nd
-Jr
-Ft
-HZ
-me
-VE
-Kg
-Kg
-"}
-(17,1,1) = {"
-Kz
-Kg
-hi
-uj
-uj
-uj
-uj
-HT
-DE
-Ig
-DE
-xn
-VE
-VE
-VE
-VE
-VE
-Kg
-Kz
-"}
-(18,1,1) = {"
-Kz
-Kg
-hi
-TI
-sz
-Pv
-uj
-fe
-DS
-ev
-DS
-DS
-aM
-CO
-uT
-zf
-Kg
-Kg
-Kz
-"}
-(19,1,1) = {"
-Kz
-Kg
-hi
-tY
-Pk
-ik
-cC
-LS
-Qn
-Hk
-kA
-Qh
-dY
-dY
-dY
-dY
-dY
-Kg
-Kz
-"}
-(20,1,1) = {"
-Kz
-Kg
-hi
-IC
-Pk
-pt
-uj
-xp
-DS
-vV
-zd
-FV
-sN
-gh
-Rj
-yM
-dY
-Kg
-Kz
-"}
-(21,1,1) = {"
-Kz
-Kg
-Kg
-zQ
-jJ
-nb
-Bf
-Bf
-EY
-Il
-Bf
-Bf
-Wp
-ou
-tt
-dY
-dY
-Kg
-Kz
-"}
-(22,1,1) = {"
-Kz
-Kz
-Kg
-zQ
-HS
-OU
-Bf
-jt
-eR
-lE
-kM
-xJ
-Wp
-qb
-Pi
-dY
-Kg
-Kg
-Kz
-"}
-(23,1,1) = {"
-Kz
-Kz
-Kg
-zQ
-dr
-Pk
-Bf
-yP
-Px
-AI
-Nt
-xE
-Wp
-Vd
-en
-dY
-Kg
-Kz
-Kz
-"}
-(24,1,1) = {"
-Kz
-Kz
-Kg
-hi
-hi
-hi
-Zf
-CC
-ly
-lG
-tV
-Kj
-dY
-dY
-dY
-dY
-Kg
-Kz
-Kz
-"}
-(25,1,1) = {"
-Kz
-Kz
-Kg
-Kg
-Kg
-zf
-uU
-Bh
-wM
-sm
-zs
-xV
-Pa
-zf
-Kg
-Kg
-Kg
-Kz
-Kz
-"}
-(26,1,1) = {"
-Kz
-Kz
-Kz
-Kz
-Kz
-Kg
-uU
-bW
-bW
-bW
-bW
-bW
-uU
-Kg
-Kz
-Kz
-Kz
-Kz
-Kz
-"}
-(27,1,1) = {"
-Kz
-Kz
-Kz
-Kz
-Kz
-Kg
-Kg
-Kg
-Kg
-Kg
-Kg
-Kg
-Kg
-Kg
-Kz
-Kz
-Kz
-Kz
-Kz
-"}
diff --git a/_maps/shuttles/shiptest/inteq_colossus.dmm b/_maps/shuttles/shiptest/inteq_colossus.dmm
index 78d1adb36117..f02355398c8b 100644
--- a/_maps/shuttles/shiptest/inteq_colossus.dmm
+++ b/_maps/shuttles/shiptest/inteq_colossus.dmm
@@ -7,28 +7,18 @@
 /turf/open/floor/plasteel/patterned/cargo_one,
 /area/ship/cargo)
 "al" = (
-/obj/structure/window/reinforced{
-	dir = 1
+/obj/machinery/suit_storage_unit/inherit{
+	req_access_txt = "1"
 	},
-/obj/structure/rack,
-/obj/machinery/door/firedoor/border_only{
-	dir = 1
+/obj/effect/turf_decal/trimline/opaque/yellow/line{
+	dir = 8
 	},
 /obj/effect/turf_decal/siding/thinplating/dark{
 	dir = 8
 	},
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/item/ammo_box/magazine/smgm10mm{
-	pixel_x = -5;
-	pixel_y = 5
-	},
-/obj/item/ammo_box/magazine/smgm10mm{
-	pixel_x = 5;
-	pixel_y = 5
-	},
-/obj/item/gun/ballistic/automatic/smg/inteq{
-	pixel_y = -2
-	},
+/obj/machinery/light/directional/west,
+/obj/item/clothing/suit/space/hardsuit/security/independent/inteq,
+/obj/item/clothing/head/helmet/space/inteq,
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/security/armory)
 "ar" = (
@@ -44,22 +34,21 @@
 /turf/open/floor/plasteel/patterned/grid,
 /area/ship/hallway/central)
 "aN" = (
-/obj/effect/turf_decal/techfloor{
+/obj/effect/turf_decal/siding/thinplating/dark{
 	dir = 1
 	},
-/obj/machinery/light/small/directional/west,
-/obj/machinery/cryopod{
+/obj/structure/sign/poster/contraband/eoehoma{
+	pixel_y = 32
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 4
 	},
-/turf/open/floor/plasteel/tech/grid,
-/area/ship/crew/cryo)
+/turf/open/floor/plasteel/tech,
+/area/ship/security/armory)
 "aU" = (
-/obj/effect/turf_decal/trimline/opaque/yellow/warning,
-/obj/effect/turf_decal/siding/thinplating/corner,
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/effect/turf_decal/siding/thinplating,
+/obj/effect/turf_decal/trimline/opaque/yellow/line,
+/obj/machinery/airalarm/directional/south,
 /turf/open/floor/plasteel/patterned/grid,
 /area/ship/hallway/central)
 "aZ" = (
@@ -132,11 +121,19 @@
 /turf/open/floor/plasteel/patterned/grid,
 /area/ship/hallway/fore)
 "bO" = (
-/obj/structure/cable{
-	icon_state = "1-2"
+/obj/machinery/cryopod{
+	dir = 8
 	},
-/turf/open/floor/carpet/black,
-/area/ship/crew)
+/obj/structure/railing,
+/obj/machinery/light/small/directional/east,
+/obj/machinery/light_switch{
+	dir = 8;
+	pixel_x = 20;
+	pixel_y = -5
+	},
+/obj/effect/turf_decal/techfloor,
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/crew/cryo)
 "bS" = (
 /obj/machinery/atmospherics/components/unary/shuttle/heater{
 	dir = 4
@@ -166,8 +163,9 @@
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
 /area/ship/bridge)
 "cv" = (
-/turf/open/floor/plating/airless,
-/area/template_noop)
+/obj/structure/catwalk/over/plated_catwalk,
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/external/dark)
 "cM" = (
 /obj/structure/closet/secure_closet/freezer{
 	anchored = 1;
@@ -191,24 +189,32 @@
 /obj/machinery/newscaster/directional/west,
 /turf/open/floor/plasteel/dark,
 /area/ship/crew/office)
-"cO" = (
-/obj/effect/turf_decal/trimline/opaque/yellow/warning,
-/obj/effect/turf_decal/siding/thinplating/corner{
-	dir = 8
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/turf/open/floor/plasteel/patterned/grid,
-/area/ship/hallway/central)
 "cT" = (
-/obj/structure/cable{
-	icon_state = "1-4"
+/obj/effect/turf_decal/corner/opaque/yellow{
+	dir = 1
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 9
+/obj/effect/turf_decal/corner/opaque/brown{
+	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/turf/open/floor/plasteel/patterned,
-/area/ship/crew/toilet)
+/obj/machinery/button/door{
+	id = "colossus_armory";
+	name = "Door Bolt Control";
+	normaldoorcontrol = 1;
+	pixel_x = 6;
+	pixel_y = 23;
+	req_access_txt = "3";
+	specialfunctions = 4
+	},
+/obj/machinery/button/door{
+	id = "colossus_armory";
+	name = "Door Control";
+	normaldoorcontrol = 1;
+	pixel_x = -6;
+	pixel_y = 23;
+	req_access_txt = "3"
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/security)
 "dq" = (
 /obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
 /obj/structure/cable{
@@ -250,9 +256,9 @@
 	icon_state = "0-8"
 	},
 /obj/machinery/door/poddoor{
+	dir = 4;
 	id = "colossus_windows";
-	name = "Window Shield";
-	dir = 4
+	name = "Window Shield"
 	},
 /turf/open/floor/plating,
 /area/ship/crew)
@@ -263,8 +269,11 @@
 /obj/structure/cable{
 	icon_state = "1-8"
 	},
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2,
+/obj/structure/cable{
+	icon_state = "2-8"
+	},
 /obj/effect/landmark/observer_start,
 /turf/open/floor/plasteel/patterned/grid,
 /area/ship/hallway/central)
@@ -320,6 +329,23 @@
 /obj/structure/catwalk/over/plated_catwalk/dark,
 /turf/open/floor/plating,
 /area/ship/engineering)
+"eh" = (
+/obj/structure/closet/crate/bin,
+/obj/effect/turf_decal/corner/opaque/brown{
+	dir = 8
+	},
+/obj/effect/turf_decal/corner/opaque/yellow{
+	dir = 1
+	},
+/obj/effect/turf_decal/corner/opaque/brown{
+	dir = 4
+	},
+/obj/machinery/light_switch{
+	pixel_y = 22
+	},
+/obj/item/paper/crumpled,
+/turf/open/floor/plasteel/dark,
+/area/ship/security)
 "ei" = (
 /obj/structure/cable{
 	icon_state = "1-4"
@@ -350,18 +376,6 @@
 	},
 /turf/open/floor/plasteel/dark,
 /area/ship/crew/office)
-"er" = (
-/obj/structure/bed,
-/obj/structure/window/reinforced/tinted/frosted{
-	dir = 4
-	},
-/obj/structure/curtain/bounty,
-/obj/item/bedsheet/brown,
-/obj/structure/sign/poster/contraband/backdoor_xeno_babes_6{
-	pixel_y = -32
-	},
-/turf/open/floor/carpet/black,
-/area/ship/crew)
 "ev" = (
 /obj/structure/weightmachine/stacklifter,
 /obj/effect/turf_decal/borderfloorblack{
@@ -376,14 +390,32 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/turf/open/floor/plasteel/grimy,
+/obj/item/radio/intercom/directional/west,
+/turf/open/floor/carpet/black,
 /area/ship/crew)
 "eH" = (
-/obj/machinery/cryopod{
-	dir = 4
+/obj/structure/rack,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/item/ammo_box/magazine/co9mm{
+	pixel_x = 5
+	},
+/obj/item/ammo_box/magazine/co9mm{
+	pixel_x = -5
+	},
+/obj/item/ammo_box/magazine/co9mm{
+	pixel_x = 5
+	},
+/obj/item/ammo_box/magazine/co9mm{
+	pixel_x = -5
+	},
+/obj/item/gun/ballistic/automatic/pistol/commander/inteq{
+	pixel_y = 5
 	},
+/obj/item/gun/ballistic/automatic/pistol/commander/inteq,
+/obj/effect/turf_decal/siding/thinplating/dark,
+/obj/effect/turf_decal/trimline/opaque/yellow/line,
 /turf/open/floor/plasteel/tech/grid,
-/area/ship/crew/cryo)
+/area/ship/security/armory)
 "eI" = (
 /obj/effect/turf_decal/box/corners,
 /obj/structure/cable{
@@ -511,19 +543,16 @@
 /turf/open/floor/plasteel/tech,
 /area/ship/engineering)
 "fT" = (
-/obj/machinery/suit_storage_unit/inherit{
-	req_access_txt = "1"
-	},
-/obj/item/clothing/suit/space/hardsuit/security/independent/inteq,
-/obj/effect/turf_decal/trimline/opaque/yellow/line{
-	dir = 8
+/obj/machinery/shower{
+	pixel_y = 19
 	},
-/obj/effect/turf_decal/siding/thinplating/dark{
-	dir = 8
+/obj/structure/curtain,
+/obj/effect/turf_decal/steeldecal/steel_decals10{
+	dir = 9
 	},
-/obj/item/tank/jetpack/oxygen,
-/turf/open/floor/plasteel/tech/grid,
-/area/ship/security/armory)
+/obj/machinery/light/small/directional/west,
+/turf/open/floor/plasteel/showroomfloor,
+/area/ship/crew/toilet)
 "fW" = (
 /obj/effect/turf_decal/siding/thinplating/corner,
 /obj/effect/turf_decal/siding/thinplating/corner{
@@ -538,12 +567,24 @@
 /turf/open/floor/plasteel/patterned/grid,
 /area/ship/hallway/central)
 "fX" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/effect/turf_decal/siding/thinplating/dark{
-	dir = 8
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+	dir = 1
 	},
-/turf/open/floor/plasteel/tech,
-/area/ship/security/armory)
+/obj/structure/cable{
+	icon_state = "1-4"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 5
+	},
+/obj/structure/sink{
+	dir = 1;
+	pixel_y = -12
+	},
+/obj/structure/mirror{
+	pixel_y = -32
+	},
+/turf/open/floor/plasteel/showroomfloor,
+/area/ship/crew/toilet)
 "gg" = (
 /obj/structure/table/reinforced,
 /obj/item/paper_bin,
@@ -556,10 +597,6 @@
 /obj/effect/turf_decal/corner/opaque/brown{
 	dir = 4
 	},
-/obj/item/stack/sheet/glass,
-/obj/item/stack/sheet/glass,
-/obj/item/stack/cable_coil/yellow,
-/obj/item/screwdriver,
 /turf/open/floor/plasteel/dark,
 /area/ship/crew/office)
 "gl" = (
@@ -572,40 +609,39 @@
 /turf/open/floor/plating,
 /area/ship/engineering)
 "gr" = (
-/obj/machinery/power/apc/auto_name/directional/west,
-/obj/structure/cable{
-	icon_state = "0-2"
+/obj/structure/closet/secure_closet/wall{
+	dir = 4;
+	icon_door = "solgov_wall";
+	icon_state = "solgov_wall";
+	name = "vanguard's locker";
+	pixel_x = -28;
+	req_access_txt = "58"
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/item/clothing/glasses/hud/security/sunglasses/inteq,
+/obj/item/clothing/mask/gas/sechailer/inteq,
+/obj/item/clothing/gloves/tackler/combat/insulated,
+/obj/item/clothing/shoes/combat,
+/obj/item/storage/belt/security/webbing/inteq/alt,
+/obj/item/storage/backpack/messenger/inteq,
+/obj/item/megaphone/command,
+/obj/item/clothing/under/syndicate/inteq/skirt,
+/obj/item/clothing/under/syndicate/inteq,
+/obj/item/clothing/suit/armor/hos/inteq,
+/obj/item/clothing/head/beret/sec/hos/inteq,
+/obj/item/radio/headset/inteq/alt/captain,
+/obj/item/areaeditor/shuttle,
+/obj/item/shield/riot/tele,
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 6
 	},
-/obj/effect/turf_decal/steeldecal/steel_decals_central7{
-	dir = 4
-	},
+/obj/item/storage/belt/security/webbing/inteq,
+/obj/item/storage/belt/military/assault,
 /turf/open/floor/carpet/orange,
 /area/ship/bridge)
-"gs" = (
-/obj/item/clothing/suit/space/hardsuit/security/independent/inteq,
-/obj/machinery/power/apc/auto_name/directional/east,
-/obj/structure/cable{
-	icon_state = "0-8"
-	},
-/obj/machinery/suit_storage_unit/inherit{
-	req_access_txt = "1"
-	},
-/obj/effect/turf_decal/trimline/opaque/yellow/line{
-	dir = 4
-	},
-/obj/effect/turf_decal/siding/thinplating/dark{
-	dir = 4
-	},
-/obj/effect/turf_decal/steeldecal/steel_decals_central7{
-	dir = 4
-	},
-/obj/item/tank/jetpack/oxygen,
-/turf/open/floor/plasteel/tech/grid,
-/area/ship/security/armory)
 "gC" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
 	dir = 4
@@ -662,9 +698,6 @@
 /obj/item/clothing/gloves/combat,
 /obj/item/clothing/gloves/combat,
 /obj/item/clothing/gloves/combat,
-/obj/effect/turf_decal/trimline/opaque/yellow/line{
-	dir = 10
-	},
 /obj/effect/turf_decal/siding/thinplating/dark{
 	dir = 8
 	},
@@ -677,6 +710,9 @@
 /obj/item/clothing/head/helmet/swat/inteq,
 /obj/item/clothing/head/helmet/swat/inteq,
 /obj/item/clothing/head/helmet/swat/inteq,
+/obj/effect/turf_decal/trimline/opaque/yellow/line{
+	dir = 8
+	},
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/security/armory)
 "hh" = (
@@ -713,7 +749,7 @@
 	name = "uniform closet";
 	pixel_y = 28
 	},
-/turf/open/floor/plasteel/grimy,
+/turf/open/floor/carpet/black,
 /area/ship/crew)
 "hD" = (
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
@@ -779,9 +815,10 @@
 /area/ship/maintenance/port)
 "im" = (
 /obj/structure/dresser,
-/obj/machinery/light/directional/south,
-/obj/item/radio/intercom/directional/south,
-/turf/open/floor/plasteel/grimy,
+/obj/machinery/power/apc/auto_name/directional/west,
+/obj/structure/cable,
+/obj/machinery/airalarm/directional/south,
+/turf/open/floor/carpet/black,
 /area/ship/crew)
 "iq" = (
 /obj/structure/cable{
@@ -816,18 +853,15 @@
 /turf/open/floor/plating,
 /area/ship/maintenance/port)
 "iH" = (
-/obj/structure/sink{
-	dir = 1;
-	pixel_y = -12
-	},
-/obj/structure/mirror{
-	pixel_y = -32
+/obj/structure/chair/office{
+	dir = 8
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 9
+	dir = 6
 	},
-/turf/open/floor/plasteel/patterned,
-/area/ship/crew/toilet)
+/obj/effect/landmark/start/warden,
+/turf/open/floor/plasteel/dark,
+/area/ship/security)
 "iT" = (
 /obj/machinery/vending/snack/random,
 /obj/effect/turf_decal/trimline/opaque/yellow/line,
@@ -866,7 +900,7 @@
 	id = "colossus_thrusters";
 	name = "Thruster Shield Control";
 	pixel_x = -6;
-	pixel_y = 25
+	pixel_y = 23
 	},
 /obj/effect/turf_decal/corner_techfloor_gray{
 	dir = 4
@@ -921,6 +955,19 @@
 	},
 /turf/open/floor/plasteel/dark,
 /area/ship/crew/office)
+"ko" = (
+/obj/machinery/power/apc/auto_name/directional/west,
+/obj/effect/turf_decal/steeldecal/steel_decals_central7{
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "0-4"
+	},
+/obj/machinery/suit_storage_unit/inherit,
+/obj/item/clothing/suit/space/hardsuit/security/independent/inteq,
+/obj/item/tank/jetpack/oxygen,
+/turf/open/floor/plasteel/dark,
+/area/ship/hallway/port)
 "kI" = (
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
 /area/ship/crew/cryo)
@@ -986,24 +1033,6 @@
 "lv" = (
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
 /area/ship/hallway/central)
-"ly" = (
-/obj/machinery/door/airlock/security{
-	name = "Armory";
-	req_access_txt = "1"
-	},
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
-/obj/effect/turf_decal/borderfloor{
-	dir = 1
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/machinery/door/firedoor/border_only,
-/obj/machinery/door/firedoor/border_only{
-	dir = 1
-	},
-/turf/open/floor/plasteel/tech,
-/area/ship/security/armory)
 "lA" = (
 /mob/living/simple_animal/pet/gondola{
 	desc = "Why Inteq keeps this Gondola around is anybody's guess. Something about its peaceful demeanor still manages to put everybody at ease.";
@@ -1074,32 +1103,52 @@
 	},
 /turf/open/floor/plasteel/patterned/grid,
 /area/ship/hallway/fore)
-"mu" = (
-/obj/machinery/suit_storage_unit/standard_unit,
-/obj/machinery/power/apc/auto_name/directional/east,
+"mz" = (
+/obj/effect/turf_decal/trimline/opaque/yellow/warning{
+	dir = 4
+	},
+/obj/effect/turf_decal/siding/thinplating/dark/corner,
+/obj/effect/turf_decal/siding/thinplating/dark{
+	dir = 1
+	},
+/obj/machinery/firealarm/directional/north,
 /obj/structure/cable{
-	icon_state = "0-8"
+	icon_state = "4-8"
 	},
-/obj/effect/turf_decal/borderfloor{
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 4
 	},
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
-	dir = 8
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
 	},
-/obj/effect/turf_decal/steeldecal/steel_decals_central7,
-/obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/plasteel/tech,
-/area/ship/hallway/port)
-"mz" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
-	dir = 1
+/area/ship/security/armory)
+"mG" = (
+/obj/structure/cable{
+	icon_state = "1-8"
+	},
+/obj/structure/cable{
+	icon_state = "1-4"
+	},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
+/obj/machinery/firealarm/directional/south,
+/turf/open/floor/plasteel/dark,
+/area/ship/security)
+"mW" = (
+/obj/machinery/door/airlock/security/glass{
+	name = "Office"
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/effect/turf_decal/siding/thinplating/dark{
-	dir = 4
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/structure/cable{
+	icon_state = "1-2"
 	},
-/turf/open/floor/plasteel/tech,
-/area/ship/security/armory)
+/obj/effect/turf_decal/borderfloor{
+	dir = 1
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/security)
 "mY" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -1111,18 +1160,25 @@
 /turf/open/floor/plasteel/patterned/grid,
 /area/ship/hallway/fore)
 "nh" = (
-/obj/structure/table/reinforced,
-/obj/machinery/recharger,
-/obj/machinery/light/directional/east,
-/obj/item/screwdriver,
-/obj/item/radio/intercom/directional/east,
-/obj/effect/turf_decal/trimline/opaque/yellow/line{
+/obj/effect/turf_decal/borderfloor{
 	dir = 4
 	},
-/obj/effect/turf_decal/siding/thinplating/dark{
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 4
 	},
-/turf/open/floor/plasteel/tech/grid,
+/obj/machinery/door/airlock/security{
+	dir = 4;
+	id_tag = "colossus_armory";
+	name = "Armory";
+	req_access_txt = "1"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/turf/open/floor/plasteel/tech,
 /area/ship/security/armory)
 "nm" = (
 /obj/machinery/atmospherics/pipe/layer_manifold,
@@ -1145,52 +1201,71 @@
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
 "nC" = (
-/obj/machinery/cryopod{
-	dir = 8
+/obj/effect/turf_decal/corner/opaque/yellow,
+/obj/effect/turf_decal/corner/opaque/brown{
+	dir = 4
 	},
-/obj/effect/turf_decal/techfloor{
-	dir = 1
+/obj/machinery/power/apc/auto_name/directional/east,
+/obj/structure/cable{
+	icon_state = "0-8"
 	},
-/obj/machinery/light/small/directional/east,
-/turf/open/floor/plasteel/tech/grid,
-/area/ship/crew/cryo)
+/turf/open/floor/plasteel/dark,
+/area/ship/security)
 "nE" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
-	dir = 1
+/obj/effect/turf_decal/siding/thinplating/dark{
+	dir = 4
 	},
 /obj/effect/turf_decal/siding/thinplating/dark{
 	dir = 8
 	},
-/obj/machinery/firealarm/directional/west,
+/obj/item/radio/intercom/directional/south,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+	dir = 1
+	},
 /turf/open/floor/plasteel/tech,
 /area/ship/security/armory)
 "nQ" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
-	dir = 1
+/obj/machinery/suit_storage_unit/inherit{
+	req_access_txt = "1"
+	},
+/obj/effect/turf_decal/trimline/opaque/yellow/line{
+	dir = 4
 	},
 /obj/effect/turf_decal/siding/thinplating/dark{
 	dir = 4
 	},
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/plasteel/tech,
+/obj/item/clothing/suit/space/hardsuit/security/independent/inteq,
+/obj/item/clothing/head/helmet/space/inteq,
+/turf/open/floor/plasteel/tech/grid,
 /area/ship/security/armory)
 "nW" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /obj/effect/turf_decal/siding/thinplating/dark{
 	dir = 8
 	},
-/obj/effect/turf_decal/trimline/opaque/yellow/filled/warning,
+/obj/effect/turf_decal/siding/thinplating/dark/corner,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /turf/open/floor/plasteel/tech,
 /area/ship/security/armory)
 "oe" = (
-/obj/structure/table/reinforced,
 /obj/structure/cable{
 	icon_state = "2-4"
 	},
 /obj/effect/turf_decal/borderfloor{
 	dir = 5
 	},
-/obj/machinery/photocopier/faxmachine/longrange,
+/obj/item/radio/intercom/directional/north{
+	freerange = 1;
+	freqlock = 1;
+	frequency = 1347;
+	name = "IRMG shortwave intercom"
+	},
+/obj/machinery/telecomms/relay/preset/mining{
+	autolinkers = list("relay","hub");
+	freq_listening = list(1347);
+	id = "IRMG Relay";
+	name = "IRMG Relay";
+	network = "irmg_commnet"
+	},
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
 "on" = (
@@ -1215,7 +1290,7 @@
 /area/ship/crew)
 "oI" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
-/turf/open/floor/plasteel/grimy,
+/turf/open/floor/carpet/black,
 /area/ship/crew)
 "oK" = (
 /obj/effect/turf_decal/trimline/opaque/yellow/line,
@@ -1224,6 +1299,7 @@
 	},
 /obj/machinery/firealarm/directional/west,
 /obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/vending/cigarette,
 /turf/open/floor/plasteel/patterned/grid,
 /area/ship/hallway/central)
 "oO" = (
@@ -1244,6 +1320,11 @@
 /obj/structure/sign/number/nine,
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
 /area/ship/security/armory)
+"pm" = (
+/obj/effect/turf_decal/siding/thinplating,
+/obj/effect/turf_decal/trimline/opaque/yellow/line,
+/turf/open/floor/plasteel/patterned/grid,
+/area/ship/hallway/central)
 "pv" = (
 /obj/machinery/atmospherics/components/binary/pump{
 	dir = 8;
@@ -1329,12 +1410,26 @@
 /turf/open/floor/engine/hull,
 /area/ship/cargo)
 "qr" = (
-/obj/structure/table,
-/obj/structure/cable{
-	icon_state = "1-2"
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+	dir = 1
 	},
-/turf/open/floor/carpet/black,
-/area/ship/crew)
+/obj/machinery/firealarm/directional/east,
+/obj/structure/sign/poster/contraband/inteq{
+	pixel_y = -32
+	},
+/obj/structure/closet,
+/obj/item/radio,
+/obj/item/radio,
+/obj/item/radio,
+/obj/item/radio,
+/obj/item/radio,
+/obj/item/radio,
+/obj/item/radio,
+/obj/item/radio,
+/obj/item/radio,
+/obj/item/radio,
+/turf/open/floor/plasteel/tech,
+/area/ship/crew/cryo)
 "qK" = (
 /obj/structure/cable/yellow{
 	icon_state = "1-4"
@@ -1419,11 +1514,12 @@
 	icon_state = "1-4"
 	},
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 9
-	},
 /obj/item/cigbutt,
-/turf/open/floor/plasteel/grimy,
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/turf/open/floor/carpet/black,
 /area/ship/crew)
 "rh" = (
 /turf/closed/wall/mineral/plastitanium,
@@ -1467,7 +1563,7 @@
 	id = "colossus_thrusters";
 	name = "Thruster Shield Control";
 	pixel_x = -6;
-	pixel_y = -25
+	pixel_y = -20
 	},
 /turf/open/floor/plating,
 /area/ship/maintenance/starboard)
@@ -1480,21 +1576,6 @@
 	},
 /turf/open/floor/plasteel/patterned/grid,
 /area/ship/hallway/fore)
-"rV" = (
-/obj/effect/turf_decal/borderfloor{
-	dir = 1
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/machinery/door/airlock/security{
-	name = "Armory";
-	req_access_txt = "1"
-	},
-/obj/machinery/door/firedoor/border_only,
-/obj/machinery/door/firedoor/border_only{
-	dir = 1
-	},
-/turf/open/floor/plasteel/tech,
-/area/ship/security/armory)
 "sb" = (
 /obj/effect/turf_decal/box/corners{
 	dir = 1
@@ -1614,15 +1695,7 @@
 	dir = 1
 	},
 /obj/structure/table/reinforced,
-/obj/item/paper_bin,
-/obj/item/pen/fountain,
-/obj/item/spacecash/bundle/c1000,
-/obj/item/spacecash/bundle/c1000,
-/obj/item/spacecash/bundle/c1000,
-/obj/item/spacecash/bundle/c1000,
-/obj/item/gps{
-	pixel_x = 12
-	},
+/obj/machinery/photocopier/faxmachine/longrange,
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
 "sP" = (
@@ -1698,18 +1771,6 @@
 	},
 /turf/open/floor/plasteel/dark,
 /area/ship/crew/office)
-"tu" = (
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
-	dir = 1
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 4
-	},
-/turf/open/floor/plasteel/patterned/grid,
-/area/ship/hallway/central)
 "tw" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 6
@@ -1724,29 +1785,10 @@
 /turf/open/floor/plasteel/dark,
 /area/ship/crew/office)
 "tG" = (
-/obj/structure/closet/secure_closet/wall{
-	dir = 4;
-	icon_door = "solgov_wall";
-	icon_state = "solgov_wall";
-	name = "vanguard's locker";
-	pixel_x = -28;
-	req_access_txt = "58"
+/obj/structure/cable{
+	icon_state = "2-8"
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/item/clothing/glasses/hud/security/sunglasses/inteq,
-/obj/item/clothing/mask/gas/sechailer/inteq,
-/obj/item/clothing/gloves/tackler/combat/insulated,
-/obj/item/clothing/shoes/combat,
-/obj/item/storage/belt/military/assault,
-/obj/item/storage/backpack/messenger/inteq,
-/obj/item/megaphone/command,
-/obj/item/clothing/under/syndicate/inteq/skirt,
-/obj/item/clothing/under/syndicate/inteq,
-/obj/item/clothing/suit/armor/hos/inteq,
-/obj/item/clothing/head/beret/sec/hos/inteq,
-/obj/item/radio/headset/inteq/alt/captain,
-/obj/item/areaeditor/shuttle,
-/obj/item/shield/riot/tele,
 /turf/open/floor/carpet/orange,
 /area/ship/bridge)
 "tI" = (
@@ -1773,6 +1815,10 @@
 /obj/structure/extinguisher_cabinet/directional/south,
 /turf/open/floor/plating,
 /area/ship/maintenance/starboard)
+"tP" = (
+/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
+/turf/open/floor/plating,
+/area/ship/security)
 "tR" = (
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
 	dir = 4
@@ -1790,12 +1836,19 @@
 /turf/open/floor/plating,
 /area/ship/engineering)
 "tT" = (
-/obj/machinery/light/small/directional/east,
-/obj/effect/turf_decal/steeldecal/steel_decals10,
-/obj/machinery/washing_machine,
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/plasteel/patterned,
-/area/ship/crew/toilet)
+/obj/structure/table/reinforced,
+/obj/machinery/recharger,
+/obj/item/screwdriver,
+/obj/effect/turf_decal/corner/opaque/yellow,
+/obj/effect/turf_decal/corner/opaque/brown{
+	dir = 4
+	},
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+	dir = 8
+	},
+/obj/machinery/computer/helm/viewscreen/directional/east,
+/turf/open/floor/plasteel/dark,
+/area/ship/security)
 "tX" = (
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
 /area/ship/bridge)
@@ -1823,23 +1876,30 @@
 /turf/open/floor/carpet/orange,
 /area/ship/bridge)
 "ui" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
-	dir = 4
+/obj/structure/table/reinforced,
+/obj/item/folder/syndicate{
+	desc = "A slick black folder stamped 'Property of Inteq Risk Management Group.'";
+	name = "folder"
 	},
-/obj/machinery/airalarm/directional/south,
-/turf/open/floor/plasteel/patterned,
-/area/ship/crew/toilet)
+/obj/item/stamp/law{
+	name = "master at arms' rubber stamp"
+	},
+/obj/item/table_bell{
+	pixel_y = 13
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/security)
 "uq" = (
-/obj/machinery/shower{
-	pixel_y = 19
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/structure/cable{
+	icon_state = "1-2"
 	},
-/obj/structure/curtain,
-/obj/structure/window/reinforced/tinted/frosted,
-/obj/effect/turf_decal/steeldecal/steel_decals10{
-	dir = 8
+/obj/effect/turf_decal/trimline/opaque/yellow/filled/warning{
+	dir = 1
 	},
-/turf/open/floor/plasteel/patterned/brushed,
-/area/ship/crew/toilet)
+/turf/open/floor/plasteel/dark,
+/area/ship/security)
 "uv" = (
 /obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
 /obj/structure/cable,
@@ -1892,18 +1952,22 @@
 	},
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
-"uz" = (
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+"uA" = (
+/obj/structure/chair/comfy/black{
+	dir = 4
+	},
+/obj/effect/turf_decal/corner/opaque/brown{
 	dir = 8
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 6
+/obj/effect/turf_decal/corner/opaque/yellow{
+	dir = 1
 	},
-/obj/effect/turf_decal/siding/thinplating/dark{
-	dir = 8
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+	dir = 4
 	},
-/turf/open/floor/plasteel/tech,
-/area/ship/security/armory)
+/obj/machinery/light/directional/west,
+/turf/open/floor/plasteel/dark,
+/area/ship/security)
 "uE" = (
 /obj/structure/cable{
 	icon_state = "0-4"
@@ -1926,6 +1990,22 @@
 	},
 /turf/open/floor/plasteel/tech,
 /area/ship/maintenance/starboard)
+"va" = (
+/obj/effect/turf_decal/trimline/opaque/yellow/filled/warning{
+	dir = 8
+	},
+/obj/structure/extinguisher_cabinet/directional/south,
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/security)
 "vc" = (
 /obj/machinery/door/airlock{
 	name = "Head"
@@ -1957,13 +2037,12 @@
 /turf/open/floor/plasteel/tech,
 /area/ship/maintenance/port)
 "vs" = (
-/obj/structure/chair/sofa/left{
-	dir = 1
-	},
-/obj/machinery/computer/security/telescreen/entertainment{
+/obj/structure/bed,
+/obj/structure/sign/poster/contraband/backdoor_xeno_babes_6{
 	pixel_y = -32
 	},
-/turf/open/floor/plasteel/grimy,
+/obj/structure/curtain/bounty,
+/turf/open/floor/carpet/black,
 /area/ship/crew)
 "vv" = (
 /obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
@@ -1976,12 +2055,25 @@
 	},
 /turf/open/floor/plating,
 /area/ship/crew/office)
+"vw" = (
+/obj/machinery/door/window/northleft{
+	dir = 8;
+	req_access_txt = "3"
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/security)
 "vH" = (
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
 /area/ship/cargo)
-"vT" = (
-/turf/open/floor/plasteel/grimy,
-/area/ship/crew)
 "vZ" = (
 /obj/effect/turf_decal/industrial/warning,
 /obj/machinery/door/poddoor{
@@ -1996,13 +2088,16 @@
 /turf/open/floor/plasteel/dark,
 /area/ship/crew/office)
 "wg" = (
-/obj/machinery/light_switch{
-	dir = 4;
-	pixel_x = -25;
-	pixel_y = -8
+/obj/effect/turf_decal/siding/white,
+/obj/effect/turf_decal/industrial/warning{
+	dir = 4
 	},
-/turf/open/floor/carpet/black,
-/area/ship/crew)
+/obj/machinery/airalarm/directional/west,
+/obj/machinery/navbeacon/wayfinding{
+	location = "cryo"
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/crew/cryo)
 "wm" = (
 /obj/structure/table,
 /obj/item/reagent_containers/food/drinks/coffee,
@@ -2109,7 +2204,7 @@
 	pixel_y = 28
 	},
 /obj/machinery/firealarm/directional/east,
-/turf/open/floor/plasteel/grimy,
+/turf/open/floor/carpet/black,
 /area/ship/crew)
 "xx" = (
 /obj/structure/cable{
@@ -2168,8 +2263,8 @@
 	dir = 1;
 	id = "colossus_starboard";
 	name = "Starboard Cargo Door Control";
-	pixel_x = -6;
-	pixel_y = -25
+	pixel_x = -4;
+	pixel_y = -20
 	},
 /obj/effect/turf_decal/industrial/caution{
 	dir = 1
@@ -2186,44 +2281,16 @@
 	dir = 1;
 	id = "colossus_cargo_starboard";
 	pixel_x = 5;
-	pixel_y = -25
+	pixel_y = -19
 	},
 /turf/open/floor/plasteel/patterned/cargo_one,
 /area/ship/cargo)
-"xY" = (
-/obj/machinery/suit_storage_unit/inherit{
-	req_access_txt = "1"
-	},
-/obj/item/clothing/suit/space/hardsuit/security/independent/inteq,
-/obj/machinery/firealarm/directional/north,
-/obj/effect/turf_decal/trimline/opaque/yellow/line{
-	dir = 4
-	},
-/obj/effect/turf_decal/siding/thinplating/dark{
-	dir = 4
-	},
-/obj/structure/sign/warning/nosmoking{
-	pixel_x = 32
-	},
-/obj/item/tank/jetpack/oxygen,
-/turf/open/floor/plasteel/tech/grid,
-/area/ship/security/armory)
 "yf" = (
 /obj/structure/railing{
 	dir = 8
 	},
 /turf/open/floor/plasteel/stairs,
 /area/ship/cargo)
-"zd" = (
-/obj/structure/bed,
-/obj/structure/window/reinforced/tinted/frosted{
-	dir = 4
-	},
-/obj/structure/curtain/bounty,
-/obj/item/bedsheet/brown,
-/obj/machinery/airalarm/directional/north,
-/turf/open/floor/carpet/black,
-/area/ship/crew)
 "zh" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -2241,42 +2308,32 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
-/turf/open/floor/carpet/black,
-/area/ship/crew)
-"zF" = (
-/turf/closed/wall/mineral/plastitanium/nodiagonal,
-/area/ship/crew)
-"zH" = (
-/obj/machinery/computer/cryopod/directional/north{
-	pixel_y = 25
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
 	},
-/obj/structure/catwalk/over/plated_catwalk,
-/obj/structure/cable{
-	icon_state = "4-8"
+/obj/machinery/door/airlock/public/glass{
+	dir = 4;
+	name = "Cryogenic Storage"
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 6
+/obj/machinery/door/firedoor/border_only{
+	dir = 4
 	},
-/turf/open/floor/plasteel/tech/grid,
+/obj/machinery/door/firedoor/border_only{
+	dir = 8
+	},
+/turf/open/floor/plasteel/tech,
 /area/ship/crew/cryo)
+"zF" = (
+/turf/closed/wall/mineral/plastitanium/nodiagonal,
+/area/ship/crew)
 "zT" = (
-/obj/structure/catwalk/over/plated_catwalk,
 /obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/structure/cable{
-	icon_state = "2-4"
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 6
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 4
+	icon_state = "1-2"
 	},
-/obj/item/radio/intercom/directional/north,
-/turf/open/floor/plasteel/tech/grid,
-/area/ship/crew/cryo)
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/turf/open/floor/plasteel/dark,
+/area/ship/security)
 "zW" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -2325,7 +2382,10 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 9
 	},
-/turf/open/floor/plasteel/grimy,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/turf/open/floor/carpet/black,
 /area/ship/crew)
 "Ao" = (
 /obj/machinery/porta_turret/centcom_shuttle/ballistic{
@@ -2338,16 +2398,6 @@
 "AB" = (
 /turf/open/floor/carpet/orange,
 /area/ship/bridge)
-"AF" = (
-/obj/structure/table,
-/obj/machinery/power/apc/auto_name/directional/north,
-/obj/structure/cable{
-	icon_state = "0-2"
-	},
-/obj/item/flashlight/lamp/green,
-/obj/effect/turf_decal/steeldecal/steel_decals_central7,
-/turf/open/floor/carpet/black,
-/area/ship/crew)
 "AG" = (
 /obj/structure/cable{
 	icon_state = "1-4"
@@ -2362,37 +2412,29 @@
 	dir = 1;
 	id = "colossus_windows";
 	name = "Window Lockdown";
-	pixel_x = -6;
-	pixel_y = -25
+	pixel_x = -4;
+	pixel_y = -21
 	},
 /obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
 "AL" = (
-/obj/structure/curtain/bounty,
-/obj/structure/bed,
-/obj/item/bedsheet/brown,
-/obj/structure/sign/poster/contraband/inteq{
-	pixel_x = -32
-	},
-/turf/open/floor/carpet/black,
-/area/ship/crew)
-"AM" = (
-/obj/machinery/door/window/northleft{
-	req_access_txt = "58"
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 5
+/obj/effect/turf_decal/industrial/warning{
+	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 6
+/obj/machinery/computer/cryopod/directional/north{
+	pixel_y = 25
 	},
-/obj/machinery/door/firedoor/border_only{
-	dir = 1
+/turf/open/floor/plasteel/tech,
+/area/ship/crew/cryo)
+"AM" = (
+/obj/effect/turf_decal/siding/thinplating/dark{
+	dir = 4
 	},
 /obj/effect/turf_decal/siding/thinplating/dark{
 	dir = 8
 	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /turf/open/floor/plasteel/tech,
 /area/ship/security/armory)
 "AP" = (
@@ -2521,30 +2563,6 @@
 	},
 /turf/open/floor/plasteel/patterned/grid,
 /area/ship/hallway/central)
-"Ci" = (
-/obj/structure/rack,
-/obj/effect/turf_decal/siding/thinplating/dark{
-	dir = 4
-	},
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/item/ammo_box/magazine/co9mm{
-	pixel_x = 5
-	},
-/obj/item/ammo_box/magazine/co9mm{
-	pixel_x = -5
-	},
-/obj/item/ammo_box/magazine/co9mm{
-	pixel_x = 5
-	},
-/obj/item/ammo_box/magazine/co9mm{
-	pixel_x = -5
-	},
-/obj/item/gun/ballistic/automatic/pistol/commander/inteq{
-	pixel_y = 5
-	},
-/obj/item/gun/ballistic/automatic/pistol/commander/inteq,
-/turf/open/floor/plasteel/tech/grid,
-/area/ship/security/armory)
 "Ck" = (
 /obj/structure/chair{
 	dir = 4
@@ -2584,31 +2602,27 @@
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
 	dir = 4
 	},
+/obj/structure/sign/poster/contraband/hacking_guide{
+	pixel_y = -32
+	},
+/obj/structure/chair{
+	dir = 1
+	},
 /turf/open/floor/plasteel/patterned/grid,
 /area/ship/hallway/central)
 "Dj" = (
-/obj/structure/rack,
-/obj/item/ammo_box/magazine/m12g/small{
-	pixel_x = 5;
-	pixel_y = 5
-	},
-/obj/item/ammo_box/magazine/m12g/small{
-	pixel_y = 5
+/obj/machinery/suit_storage_unit/inherit{
+	req_access_txt = "1"
 	},
-/obj/item/ammo_box/magazine/m12g/small{
-	pixel_x = -5;
-	pixel_y = 5
+/obj/effect/turf_decal/trimline/opaque/yellow/line{
+	dir = 8
 	},
 /obj/effect/turf_decal/siding/thinplating/dark{
 	dir = 8
 	},
-/obj/structure/sign/poster/contraband/twelve_gauge{
-	pixel_y = -32
-	},
-/obj/item/gun/ballistic/shotgun/bulldog/inteq{
-	pixel_y = -2;
-	spawnwithmagazine = 0
-	},
+/obj/machinery/airalarm/directional/west,
+/obj/item/clothing/suit/space/hardsuit/security/independent/inteq,
+/obj/item/clothing/head/helmet/space/inteq,
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/security/armory)
 "Dq" = (
@@ -2650,7 +2664,7 @@
 /obj/structure/cable{
 	icon_state = "2-8"
 	},
-/turf/open/floor/plasteel/grimy,
+/turf/open/floor/carpet/black,
 /area/ship/crew)
 "Er" = (
 /obj/structure/chair{
@@ -2677,7 +2691,6 @@
 /obj/item/clothing/glasses/hud/security/sunglasses/inteq,
 /obj/item/clothing/glasses/hud/security/sunglasses/inteq,
 /obj/item/clothing/glasses/hud/security/sunglasses/inteq,
-/obj/machinery/light/directional/west,
 /obj/item/melee/baton,
 /obj/item/melee/baton,
 /obj/item/melee/baton,
@@ -2688,6 +2701,16 @@
 	dir = 8
 	},
 /obj/item/storage/box/handcuffs,
+/obj/structure/sign/warning/nosmoking{
+	pixel_y = 28
+	},
+/obj/machinery/power/apc/auto_name/directional/west,
+/obj/structure/cable{
+	icon_state = "0-4"
+	},
+/obj/item/storage/belt/security/webbing/inteq/alt,
+/obj/item/storage/belt/security/webbing/inteq/alt,
+/obj/item/storage/belt/security/webbing/inteq/alt,
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/security/armory)
 "EC" = (
@@ -2776,27 +2799,22 @@
 /turf/open/floor/plasteel/tech,
 /area/ship/maintenance/port)
 "FQ" = (
-/obj/structure/frame/computer{
-	anchored = 1;
-	can_be_unanchored = 1;
+/obj/machinery/computer/rdconsole/core{
 	dir = 4
 	},
-/obj/item/circuitboard/computer/rdconsole,
 /turf/open/floor/plasteel/dark,
 /area/ship/crew/office)
 "FW" = (
-/obj/structure/cable{
-	icon_state = "1-2"
-	},
 /obj/effect/turf_decal/techfloor,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
-	dir = 8
-	},
 /obj/structure/sign/poster/official/safety_internals{
 	pixel_x = -32
 	},
 /obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/structure/cable{
+	icon_state = "2-4"
+	},
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/hallway/port)
 "FX" = (
@@ -2820,7 +2838,8 @@
 	icon_state = "2-4"
 	},
 /obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/plasteel/grimy,
+/obj/machinery/newscaster/directional/north,
+/turf/open/floor/carpet/black,
 /area/ship/crew)
 "Gl" = (
 /obj/structure/sign/number/one{
@@ -2831,8 +2850,8 @@
 "Gy" = (
 /obj/machinery/light_switch{
 	dir = 4;
-	pixel_x = -25;
-	pixel_y = -10
+	pixel_x = -20;
+	pixel_y = 10
 	},
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -2845,49 +2864,6 @@
 /obj/machinery/firealarm/directional/west,
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
-"GC" = (
-/obj/structure/closet,
-/obj/structure/railing,
-/obj/structure/catwalk/over/plated_catwalk,
-/obj/item/radio,
-/obj/item/radio,
-/obj/item/radio,
-/obj/item/radio,
-/obj/item/radio,
-/obj/item/radio,
-/obj/item/radio,
-/obj/item/radio,
-/obj/item/radio,
-/obj/item/radio,
-/obj/machinery/power/apc/auto_name/directional/west,
-/obj/structure/cable{
-	icon_state = "0-4"
-	},
-/obj/machinery/airalarm/directional/north,
-/turf/open/floor/plasteel/tech/grid,
-/area/ship/crew/cryo)
-"GK" = (
-/obj/machinery/door/airlock/public/glass{
-	dir = 4;
-	name = "Cryogenic Storage"
-	},
-/obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 4
-	},
-/obj/machinery/door/firedoor/border_only{
-	dir = 8
-	},
-/obj/machinery/door/firedoor/border_only{
-	dir = 4
-	},
-/turf/open/floor/plasteel/tech,
-/area/ship/crew/cryo)
 "GL" = (
 /obj/machinery/atmospherics/pipe/layer_manifold/visible,
 /obj/structure/closet/wall{
@@ -2930,32 +2906,25 @@
 /turf/open/floor/carpet/black,
 /area/ship/crew)
 "Hc" = (
-/obj/structure/closet/emcloset/empty{
-	anchored = 1;
-	can_be_unanchored = 1;
-	name = "oxygen closet"
+/obj/machinery/power/apc/auto_name/directional/east,
+/obj/structure/cable{
+	icon_state = "0-8"
 	},
 /obj/effect/turf_decal/borderfloor{
 	dir = 4
 	},
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
-	dir = 8
-	},
-/obj/item/tank/internals/plasmaman/full,
-/obj/item/tank/internals/plasmaman/full,
-/obj/item/tank/internals/oxygen,
-/obj/item/tank/internals/oxygen,
-/obj/item/tank/internals/oxygen,
-/obj/item/tank/internals/oxygen,
-/obj/item/tank/internals/oxygen,
-/obj/item/tank/internals/oxygen,
+/obj/effect/turf_decal/steeldecal/steel_decals_central7,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/item/clothing/suit/space/inteq,
+/obj/item/clothing/head/helmet/space/inteq,
+/obj/machinery/suit_storage_unit/inherit,
 /turf/open/floor/plasteel/tech,
 /area/ship/hallway/port)
 "Hd" = (
 /obj/docking_port/stationary{
-	width = 30;
+	dwidth = 15;
 	height = 15;
-	dwidth = 15
+	width = 30
 	},
 /turf/template_noop,
 /area/template_noop)
@@ -3059,6 +3028,18 @@
 "It" = (
 /turf/closed/wall/mineral/plastitanium,
 /area/ship/bridge)
+"IF" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/turf/open/floor/plasteel/patterned/grid,
+/area/ship/hallway/central)
 "II" = (
 /turf/closed/wall/mineral/plastitanium,
 /area/ship/engineering)
@@ -3076,26 +3057,32 @@
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
 /area/ship/crew/toilet)
 "Je" = (
-/obj/effect/turf_decal/industrial/warning{
-	dir = 8
-	},
-/obj/effect/turf_decal/siding/white{
+/obj/effect/turf_decal/siding/thinplating/dark{
 	dir = 1
 	},
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
-	dir = 1
+/obj/effect/turf_decal/trimline/opaque/yellow/filled/warning{
+	dir = 4
+	},
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/light/small/directional/north,
+/obj/machinery/door/window/brigdoor/eastright{
+	req_access_txt = "3"
 	},
 /turf/open/floor/plasteel/tech,
-/area/ship/crew/cryo)
+/area/ship/security/armory)
 "Jl" = (
-/obj/structure/chair/sofa/right{
-	dir = 1
-	},
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
 /obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/plasteel/grimy,
+/obj/structure/table,
+/obj/item/flashlight/lamp/green,
+/turf/open/floor/carpet/black,
 /area/ship/crew)
 "JD" = (
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
@@ -3103,7 +3090,7 @@
 "JH" = (
 /obj/structure/sign/number/one,
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
-/area/ship/crew/cryo)
+/area/ship/security/armory)
 "JO" = (
 /obj/structure/cable/yellow{
 	icon_state = "2-4"
@@ -3121,9 +3108,32 @@
 /obj/effect/turf_decal/borderfloorblack{
 	dir = 1
 	},
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/plasteel/patterned,
-/area/ship/cargo)
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/patterned,
+/area/ship/cargo)
+"JV" = (
+/obj/structure/rack,
+/obj/effect/turf_decal/siding/thinplating/dark{
+	dir = 10;
+	layer = 2.030
+	},
+/obj/effect/turf_decal/trimline/opaque/yellow/line{
+	dir = 10
+	},
+/obj/item/ammo_box/magazine/smgm10mm{
+	pixel_x = -5;
+	pixel_y = 5
+	},
+/obj/item/ammo_box/magazine/smgm10mm{
+	pixel_x = 5;
+	pixel_y = 5
+	},
+/obj/item/gun/ballistic/automatic/smg/inteq{
+	pixel_y = -2
+	},
+/obj/machinery/airalarm/directional/west,
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/security/armory)
 "Kk" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -3157,8 +3167,8 @@
 	dir = 1;
 	id = "colossus_starboard";
 	name = "Starboard Cargo Door Control";
-	pixel_x = 6;
-	pixel_y = -25
+	pixel_x = 4;
+	pixel_y = -20
 	},
 /obj/effect/turf_decal/industrial/caution{
 	dir = 1
@@ -3167,7 +3177,7 @@
 	dir = 1;
 	id = "colossus_cargo_starboard";
 	pixel_x = -5;
-	pixel_y = -25
+	pixel_y = -19
 	},
 /turf/open/floor/plasteel/patterned/cargo_one,
 /area/ship/cargo)
@@ -3197,21 +3207,6 @@
 /obj/machinery/airalarm/directional/north,
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
-"KH" = (
-/obj/structure/cable{
-	icon_state = "1-4"
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 10
-	},
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
-	dir = 4
-	},
-/obj/effect/turf_decal/siding/thinplating/dark{
-	dir = 4
-	},
-/turf/open/floor/plasteel/tech,
-/area/ship/security/armory)
 "KM" = (
 /obj/structure/closet/emcloset/wall{
 	dir = 4;
@@ -3220,15 +3215,20 @@
 /turf/open/floor/plasteel/patterned/cargo_one,
 /area/ship/cargo)
 "Lg" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
-	dir = 1
+/obj/structure/reagent_dispensers/peppertank{
+	pixel_y = 28
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /obj/effect/turf_decal/siding/thinplating/dark{
-	dir = 8
+	dir = 9
 	},
-/obj/machinery/navbeacon/wayfinding{
-	location = "armory"
+/obj/structure/cable{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 6
 	},
 /turf/open/floor/plasteel/tech,
 /area/ship/security/armory)
@@ -3307,10 +3307,6 @@
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/cargo)
 "LU" = (
-/obj/structure/frame/machine{
-	anchored = 1
-	},
-/obj/item/circuitboard/machine/rdserver,
 /obj/effect/turf_decal/corner/opaque/yellow,
 /obj/effect/turf_decal/corner/opaque/yellow{
 	dir = 1
@@ -3318,12 +3314,12 @@
 /obj/effect/turf_decal/corner/opaque/brown{
 	dir = 4
 	},
-/obj/item/stock_parts/scanning_module,
 /obj/structure/sign/poster/official/fruit_bowl{
 	pixel_x = 32
 	},
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/machinery/newscaster/security_unit/directional/north,
+/obj/machinery/rnd/server,
 /turf/open/floor/plasteel/dark,
 /area/ship/crew/office)
 "Md" = (
@@ -3354,6 +3350,40 @@
 /obj/item/cigbutt,
 /turf/open/floor/plasteel/dark,
 /area/ship/crew/office)
+"Mm" = (
+/obj/item/clothing/glasses/hud/security/sunglasses/inteq,
+/obj/item/clothing/mask/gas/sechailer/inteq,
+/obj/item/clothing/gloves/tackler/combat/insulated,
+/obj/item/clothing/shoes/combat,
+/obj/item/storage/belt/security/webbing/inteq/alt,
+/obj/item/storage/backpack/messenger/inteq,
+/obj/item/clothing/under/syndicate/inteq/skirt,
+/obj/item/clothing/under/syndicate/inteq,
+/obj/structure/closet/secure_closet{
+	anchored = 1;
+	can_be_unanchored = 1;
+	icon_state = "warden";
+	name = "master at arms' locker";
+	req_access_txt = "3"
+	},
+/obj/effect/turf_decal/corner/opaque/brown{
+	dir = 8
+	},
+/obj/effect/turf_decal/corner/opaque/yellow,
+/obj/effect/decal/cleanable/dirt,
+/obj/item/clothing/suit/armor/vest/bulletproof,
+/obj/item/clothing/head/warden/drill{
+	desc = "A special armored campaign hat with the IRMG insignia emblazoned on it. Uses reinforced fabric to offer sufficient protection.";
+	name = "master at arms' campaign hat"
+	},
+/obj/item/megaphone/sec,
+/obj/effect/turf_decal/corner/opaque/brown{
+	dir = 4
+	},
+/obj/item/storage/belt/security/webbing/inteq,
+/obj/item/storage/belt/military/assault,
+/turf/open/floor/plasteel/dark,
+/area/ship/security)
 "Mx" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
 /turf/open/floor/plasteel/patterned/cargo_one,
@@ -3412,28 +3442,14 @@
 /turf/open/floor/plasteel/dark,
 /area/ship/crew/office)
 "NA" = (
-/obj/structure/table,
 /obj/structure/cable{
 	icon_state = "1-4"
 	},
-/obj/item/toy/cards/deck/cas,
-/obj/item/toy/cards/deck/cas/black{
-	pixel_y = 10
-	},
 /obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/newscaster/directional/south,
-/turf/open/floor/plasteel/grimy,
+/obj/structure/bed,
+/obj/structure/curtain/bounty,
+/turf/open/floor/carpet/black,
 /area/ship/crew)
-"NL" = (
-/obj/structure/chair{
-	dir = 1
-	},
-/obj/effect/turf_decal/trimline/opaque/yellow/line,
-/obj/effect/turf_decal/siding/thinplating,
-/obj/item/radio/intercom/directional/south,
-/obj/item/cigbutt,
-/turf/open/floor/plasteel/patterned/grid,
-/area/ship/hallway/central)
 "NP" = (
 /obj/item/kirbyplants/random,
 /obj/effect/turf_decal/corner/opaque/yellow,
@@ -3450,22 +3466,21 @@
 /turf/open/floor/plasteel/dark,
 /area/ship/crew/office)
 "Ob" = (
-/obj/machinery/door/window/northright{
-	req_access_txt = "58"
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 10
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 9
+/obj/machinery/suit_storage_unit/inherit{
+	req_access_txt = "1"
 	},
-/obj/machinery/door/firedoor/border_only{
-	dir = 1
+/obj/effect/turf_decal/trimline/opaque/yellow/line{
+	dir = 4
 	},
 /obj/effect/turf_decal/siding/thinplating/dark{
 	dir = 4
 	},
-/turf/open/floor/plasteel/tech,
+/obj/structure/sign/poster/contraband/twelve_gauge{
+	pixel_x = 32
+	},
+/obj/item/clothing/suit/space/hardsuit/security/independent/inteq,
+/obj/item/clothing/head/helmet/space/inteq,
+/turf/open/floor/plasteel/tech/grid,
 /area/ship/security/armory)
 "Oc" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
@@ -3494,7 +3509,7 @@
 /obj/machinery/light_switch{
 	dir = 1;
 	pixel_x = 5;
-	pixel_y = -25
+	pixel_y = -20
 	},
 /obj/effect/turf_decal/corner/opaque/yellow,
 /obj/effect/turf_decal/corner/opaque/brown{
@@ -3604,11 +3619,16 @@
 /turf/open/floor/plasteel/dark,
 /area/ship/crew/office)
 "Px" = (
-/obj/effect/turf_decal/siding/thinplating/dark{
+/obj/structure/chair/stool{
+	dir = 8
+	},
+/obj/effect/turf_decal/trimline/opaque/yellow/line{
 	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/effect/turf_decal/trimline/opaque/yellow/filled/warning,
+/obj/effect/turf_decal/siding/thinplating/dark{
+	dir = 6
+	},
+/obj/machinery/light/directional/east,
 /turf/open/floor/plasteel/tech,
 /area/ship/security/armory)
 "PK" = (
@@ -3631,14 +3651,14 @@
 /obj/machinery/button/door{
 	id = "colossus_port";
 	name = "Port Cargo Door Control";
-	pixel_x = -6;
-	pixel_y = 25
+	pixel_x = -4;
+	pixel_y = 23
 	},
 /obj/effect/turf_decal/industrial/caution,
 /obj/machinery/button/shieldwallgen{
 	id = "colossus_cargo_port";
 	pixel_x = 5;
-	pixel_y = 25
+	pixel_y = 21
 	},
 /turf/open/floor/plasteel/patterned/cargo_one,
 /area/ship/cargo)
@@ -3652,6 +3672,11 @@
 /obj/item/storage/lockbox/medal/sec{
 	pixel_y = 5
 	},
+/obj/item/spacecash/bundle/c1000,
+/obj/item/spacecash/bundle/c1000,
+/obj/item/spacecash/bundle/c1000,
+/obj/item/spacecash/bundle/c1000,
+/obj/item/spacecash/bundle/c1000,
 /turf/open/floor/plasteel/tech,
 /area/ship/bridge)
 "Qm" = (
@@ -3748,15 +3773,6 @@
 	},
 /turf/open/floor/engine/hull,
 /area/ship/engineering)
-"Rm" = (
-/obj/docking_port/stationary{
-	dwidth = 3;
-	width = 7;
-	height = 15;
-	dir = 2
-	},
-/turf/template_noop,
-/area/template_noop)
 "Rq" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -3773,23 +3789,17 @@
 /turf/open/floor/plasteel/patterned/grid,
 /area/ship/hallway/central)
 "Rs" = (
-/obj/effect/turf_decal/industrial/warning{
-	dir = 4
-	},
-/obj/effect/turf_decal/siding/white{
-	dir = 1
-	},
 /obj/structure/cable{
-	icon_state = "1-2"
+	icon_state = "1-4"
 	},
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
-	dir = 1
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 9
 	},
-/obj/machinery/navbeacon/wayfinding{
-	location = "cryo"
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 9
 	},
-/turf/open/floor/plasteel/tech,
-/area/ship/crew/cryo)
+/turf/open/floor/plasteel/dark,
+/area/ship/security)
 "Ru" = (
 /obj/structure/cable/yellow{
 	icon_state = "1-2"
@@ -3816,20 +3826,25 @@
 	codes_txt = "patrol;next_patrol=starboard";
 	location = "crew"
 	},
-/turf/open/floor/plasteel/grimy,
+/obj/machinery/light_switch{
+	dir = 4;
+	pixel_x = -20;
+	pixel_y = -5
+	},
+/obj/machinery/light/small/directional/west,
+/turf/open/floor/carpet/black,
 /area/ship/crew)
 "RE" = (
 /obj/structure/cable{
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 4
+	icon_state = "2-4"
 	},
+/obj/machinery/light/small/directional/west,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 4
+	dir = 6
 	},
-/turf/open/floor/carpet/black,
-/area/ship/crew)
+/obj/structure/catwalk/over/plated_catwalk,
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/crew/cryo)
 "RH" = (
 /obj/effect/turf_decal/industrial/warning{
 	dir = 1
@@ -3860,36 +3875,21 @@
 /turf/open/floor/plasteel/tech,
 /area/ship/engineering)
 "RN" = (
-/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
-/obj/structure/cable,
-/obj/machinery/door/poddoor{
-	id = "colossus_windows";
-	name = "Window Shield"
-	},
-/turf/open/floor/plating,
-/area/ship/crew/cryo)
+/turf/closed/wall/mineral/plastitanium/nodiagonal,
+/area/ship/security)
 "RS" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+/obj/structure/table/reinforced,
+/obj/machinery/computer/secure_data/laptop{
 	dir = 4
 	},
-/obj/machinery/light/small/directional/north,
-/turf/open/floor/plasteel/patterned,
-/area/ship/crew/toilet)
-"RU" = (
-/obj/machinery/suit_storage_unit/inherit{
-	req_access_txt = "1"
-	},
-/obj/item/clothing/suit/space/hardsuit/security/independent/inteq,
-/obj/machinery/airalarm/directional/west,
-/obj/effect/turf_decal/trimline/opaque/yellow/line{
-	dir = 8
+/obj/effect/turf_decal/corner/opaque/yellow{
+	dir = 1
 	},
-/obj/effect/turf_decal/siding/thinplating/dark{
-	dir = 8
+/obj/effect/turf_decal/corner/opaque/brown{
+	dir = 4
 	},
-/obj/item/tank/jetpack/oxygen,
-/turf/open/floor/plasteel/tech/grid,
-/area/ship/security/armory)
+/turf/open/floor/plasteel/dark,
+/area/ship/security)
 "RW" = (
 /obj/effect/turf_decal/box/corners{
 	dir = 8
@@ -3921,14 +3921,13 @@
 /turf/open/floor/plasteel/tech,
 /area/ship/engineering)
 "Sf" = (
-/obj/structure/bed,
-/obj/structure/curtain/bounty,
-/obj/item/bedsheet/brown,
-/obj/structure/sign/poster/contraband/borg_fancy_2{
-	pixel_x = -32
+/obj/structure/cable,
+/obj/machinery/power/apc/auto_name/directional/south,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+	dir = 1
 	},
-/turf/open/floor/carpet/black,
-/area/ship/crew)
+/turf/open/floor/plasteel/tech,
+/area/ship/crew/cryo)
 "Sg" = (
 /obj/effect/turf_decal/box/corners,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
@@ -3975,31 +3974,6 @@
 /obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/plasteel/patterned,
 /area/ship/cargo)
-"SB" = (
-/obj/structure/window/reinforced{
-	dir = 1
-	},
-/obj/structure/rack,
-/obj/machinery/airalarm/directional/east,
-/obj/machinery/door/firedoor/border_only{
-	dir = 1
-	},
-/obj/effect/turf_decal/siding/thinplating/dark{
-	dir = 4
-	},
-/obj/item/storage/toolbox/ammo/c10mm{
-	pixel_x = 2;
-	pixel_y = 7
-	},
-/obj/item/storage/toolbox/ammo/c9mm{
-	pixel_y = 2
-	},
-/obj/item/storage/toolbox/ammo/shotgun{
-	pixel_x = -2;
-	pixel_y = -2
-	},
-/turf/open/floor/plasteel/tech/grid,
-/area/ship/security/armory)
 "SC" = (
 /obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
 /obj/structure/cable{
@@ -4076,6 +4050,13 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 9
 	},
+/obj/structure/closet/crate,
+/obj/item/clothing/suit/space/inteq,
+/obj/item/clothing/suit/space/inteq,
+/obj/item/clothing/suit/space/inteq,
+/obj/item/clothing/head/helmet/space/inteq,
+/obj/item/clothing/head/helmet/space/inteq,
+/obj/item/clothing/head/helmet/space/inteq,
 /turf/open/floor/plasteel/patterned/cargo_one,
 /area/ship/cargo)
 "TF" = (
@@ -4085,6 +4066,15 @@
 	},
 /turf/open/floor/engine/hull,
 /area/ship/engineering)
+"TH" = (
+/obj/machinery/photocopier,
+/obj/effect/turf_decal/corner/opaque/yellow,
+/obj/effect/turf_decal/corner/opaque/brown{
+	dir = 4
+	},
+/obj/machinery/airalarm/directional/east,
+/turf/open/floor/plasteel/dark,
+/area/ship/security)
 "TX" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -4092,23 +4082,36 @@
 /obj/structure/cable{
 	icon_state = "2-8"
 	},
-/turf/open/floor/plasteel/grimy,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 9
+	},
+/turf/open/floor/carpet/black,
 /area/ship/crew)
-"Ui" = (
-/obj/structure/railing,
-/obj/structure/catwalk/over/plated_catwalk,
+"Ud" = (
 /obj/structure/cable{
-	icon_state = "4-8"
+	icon_state = "2-8"
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 10
+	},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
 	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+/turf/open/floor/plasteel/dark,
+/area/ship/security)
+"Ui" = (
+/obj/structure/table/reinforced,
+/obj/item/paper_bin{
+	pixel_y = 4
+	},
+/obj/item/pen/fourcolor,
+/obj/effect/turf_decal/corner/opaque/yellow,
+/obj/effect/turf_decal/corner/opaque/brown{
 	dir = 4
 	},
-/obj/machinery/firealarm/directional/north,
-/turf/open/floor/plasteel/tech/grid,
-/area/ship/crew/cryo)
+/obj/machinery/light/directional/east,
+/turf/open/floor/plasteel/dark,
+/area/ship/security)
 "Ur" = (
 /obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
 /obj/machinery/door/firedoor,
@@ -4140,38 +4143,51 @@
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
 /area/ship/hallway/fore)
 "Vd" = (
-/obj/machinery/power/apc/auto_name/directional/north,
-/obj/structure/cable{
-	icon_state = "0-8"
+/obj/structure/filingcabinet/chestdrawer,
+/obj/effect/turf_decal/corner/opaque/yellow{
+	dir = 1
 	},
-/obj/machinery/firealarm/directional/east,
-/obj/effect/turf_decal/steeldecal/steel_decals_central7{
+/obj/effect/turf_decal/corner/opaque/yellow,
+/obj/effect/turf_decal/corner/opaque/brown{
 	dir = 4
 	},
-/turf/open/floor/plasteel/patterned,
-/area/ship/crew/toilet)
+/obj/item/radio/intercom/directional/north{
+	freerange = 1;
+	freqlock = 1;
+	frequency = 1347;
+	name = "IRMG shortwave intercom"
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/security)
 "Ve" = (
 /obj/structure/weightmachine/weightlifter,
 /turf/open/floor/plasteel/patterned/cargo_one,
 /area/ship/cargo)
 "Vr" = (
-/obj/effect/turf_decal/industrial/warning{
-	dir = 8
+/obj/structure/rack,
+/obj/item/storage/toolbox/ammo/c10mm{
+	pixel_x = 2;
+	pixel_y = 7
 	},
-/obj/structure/cable{
-	icon_state = "2-4"
+/obj/item/storage/toolbox/ammo/c9mm{
+	pixel_y = 2
 	},
-/turf/open/floor/plasteel/tech,
-/area/ship/crew/cryo)
-"VJ" = (
-/obj/structure/chair{
-	dir = 1
+/obj/structure/window/reinforced{
+	dir = 4
+	},
+/obj/effect/turf_decal/siding/thinplating/dark,
+/obj/effect/turf_decal/trimline/opaque/yellow/line{
+	dir = 6
+	},
+/obj/item/storage/toolbox/ammo/a308{
+	pixel_x = -2;
+	pixel_y = -2
 	},
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/security/armory)
+"VJ" = (
 /obj/effect/turf_decal/trimline/opaque/yellow/line,
 /obj/effect/turf_decal/siding/thinplating,
-/obj/structure/sign/poster/contraband/hacking_guide{
-	pixel_y = -32
-	},
 /turf/open/floor/plasteel/patterned/grid,
 /area/ship/hallway/central)
 "VR" = (
@@ -4186,30 +4202,61 @@
 	},
 /obj/machinery/light/directional/north,
 /obj/machinery/turretid{
+	lethal = 1;
 	pixel_y = 32;
 	req_access = null;
-	req_access_txt = "58";
-	lethal = 1
+	req_access_txt = "58"
 	},
 /obj/structure/table/reinforced,
-/obj/item/storage/fancy/cigarettes/cigars/havana,
-/obj/item/lighter{
-	pixel_y = 5
-	},
 /obj/item/toy/figure/vanguard{
 	pixel_x = -10;
 	pixel_y = 5
 	},
+/obj/item/paper_bin,
+/obj/item/pen/fountain,
+/obj/item/gps{
+	pixel_x = 12
+	},
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
 "VY" = (
-/obj/structure/toilet{
+/obj/machinery/navbeacon/wayfinding{
+	location = "armory"
+	},
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
 	dir = 4
 	},
-/obj/structure/curtain,
-/obj/effect/decal/cleanable/vomit/old,
-/turf/open/floor/plasteel/patterned/brushed,
-/area/ship/crew/toilet)
+/turf/open/floor/plasteel/dark,
+/area/ship/security)
+"Wa" = (
+/obj/structure/rack,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/turf_decal/siding/thinplating/dark{
+	dir = 9
+	},
+/obj/effect/turf_decal/trimline/opaque/yellow/line{
+	dir = 8
+	},
+/obj/item/ammo_box/magazine/gal{
+	pixel_x = -5
+	},
+/obj/item/ammo_box/magazine/gal{
+	pixel_x = 5
+	},
+/obj/item/gun/ballistic/automatic/gal/inteq{
+	pixel_x = -8;
+	pixel_y = 3
+	},
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+	dir = 4
+	},
+/obj/machinery/light/small/directional/north,
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/security/armory)
 "Wb" = (
 /obj/effect/turf_decal/trimline/opaque/yellow/warning{
 	dir = 1
@@ -4246,20 +4293,15 @@
 /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/scrubbers/hidden/layer4{
-	dir = 4
-	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 4
 	},
-/turf/open/floor/carpet/black,
-/area/ship/crew)
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 6
+	},
+/obj/structure/catwalk/over/plated_catwalk,
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/crew/cryo)
 "Wu" = (
 /obj/effect/turf_decal/industrial/traffic{
 	dir = 8
@@ -4317,17 +4359,13 @@
 /turf/open/floor/plasteel/patterned/grid,
 /area/ship/hallway/fore)
 "Xu" = (
-/obj/effect/turf_decal/industrial/warning{
-	dir = 4
-	},
-/obj/structure/cable{
-	icon_state = "1-8"
-	},
-/obj/structure/cable{
-	icon_state = "1-2"
+/obj/machinery/autolathe,
+/obj/effect/turf_decal/corner/opaque/brown{
+	dir = 8
 	},
-/turf/open/floor/plasteel/tech,
-/area/ship/crew/cryo)
+/obj/effect/turf_decal/corner/opaque/yellow,
+/turf/open/floor/plasteel/dark,
+/area/ship/security)
 "XB" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -4356,19 +4394,6 @@
 	},
 /turf/open/floor/plasteel/tech,
 /area/ship/engineering)
-"XC" = (
-/obj/machinery/rnd/production/protolathe/department/security,
-/obj/effect/turf_decal/trimline/opaque/yellow/line{
-	dir = 6
-	},
-/obj/effect/turf_decal/siding/thinplating/dark{
-	dir = 4
-	},
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/decal/cleanable/oil/streak,
-/obj/structure/extinguisher_cabinet/directional/east,
-/turf/open/floor/plasteel/tech/grid,
-/area/ship/security/armory)
 "XF" = (
 /obj/effect/turf_decal/industrial/warning{
 	dir = 1
@@ -4390,13 +4415,16 @@
 /turf/template_noop,
 /area/template_noop)
 "XK" = (
-/obj/machinery/vending/cigarette,
 /obj/effect/turf_decal/trimline/opaque/yellow/line,
 /obj/effect/turf_decal/siding/thinplating,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 9
 	},
-/obj/machinery/airalarm/directional/south,
+/obj/structure/chair{
+	dir = 1
+	},
+/obj/item/cigbutt,
+/obj/item/radio/intercom/directional/south,
 /turf/open/floor/plasteel/patterned/grid,
 /area/ship/hallway/central)
 "XS" = (
@@ -4407,26 +4435,40 @@
 /turf/open/floor/plasteel/patterned/grid,
 /area/ship/hallway/fore)
 "Yq" = (
+/obj/structure/toilet{
+	dir = 8
+	},
+/obj/structure/curtain,
+/obj/machinery/power/apc/auto_name/directional/north,
 /obj/structure/cable{
-	icon_state = "1-2"
+	icon_state = "0-8"
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/effect/turf_decal/siding/thinplating/dark{
-	dir = 4
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+	dir = 8
 	},
-/turf/open/floor/plasteel/tech,
-/area/ship/security/armory)
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/light/small/directional/east,
+/obj/machinery/airalarm/directional/south,
+/turf/open/floor/plasteel/showroomfloor,
+/area/ship/crew/toilet)
 "Yr" = (
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
 /area/ship/hallway/fore)
 "Yt" = (
-/obj/structure/cable{
-	icon_state = "2-4"
-	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /obj/machinery/light/small/directional/west,
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
-	dir = 8
+/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer4,
+/obj/item/tank/internals/plasmaman/full,
+/obj/item/tank/internals/plasmaman/full,
+/obj/item/tank/internals/oxygen,
+/obj/item/tank/internals/oxygen,
+/obj/item/tank/internals/oxygen,
+/obj/item/tank/internals/oxygen,
+/obj/item/tank/internals/oxygen,
+/obj/structure/closet/wall{
+	dir = 8;
+	icon_state = "emergency_wall";
+	pixel_x = 28
 	},
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/hallway/port)
@@ -4470,15 +4512,12 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/obj/structure/cable{
-	icon_state = "2-8"
-	},
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
-	dir = 1
-	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 4
 	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
 /turf/open/floor/plasteel/patterned/grid,
 /area/ship/hallway/central)
 "Zv" = (
@@ -4533,15 +4572,15 @@
 /obj/machinery/button/door{
 	id = "colossus_port";
 	name = "Port Cargo Door Control";
-	pixel_x = 6;
-	pixel_y = 25
+	pixel_x = 4;
+	pixel_y = 23
 	},
 /obj/effect/turf_decal/industrial/caution,
 /obj/structure/ore_box,
 /obj/machinery/button/shieldwallgen{
 	id = "colossus_cargo_port";
 	pixel_x = -5;
-	pixel_y = 25
+	pixel_y = 21
 	},
 /turf/open/floor/plasteel/patterned/cargo_one,
 /area/ship/cargo)
@@ -4842,7 +4881,7 @@ Zc
 MU
 Ks
 pX
-Rm
+XJ
 XJ
 XJ
 XJ
@@ -4926,9 +4965,9 @@ ZB
 lv
 uw
 lv
-Dq
-Dq
-Dq
+IS
+IS
+IS
 Dq
 Dq
 Dq
@@ -4948,9 +4987,9 @@ ZB
 Ce
 gJ
 oK
-Dq
+IS
 fT
-RU
+IS
 Eu
 hf
 al
@@ -4968,11 +5007,11 @@ Ck
 Od
 Cz
 Zz
-tu
-cO
-rV
+Rq
+fW
+vc
 fX
-uz
+IS
 Lg
 nW
 AM
@@ -4992,9 +5031,9 @@ Cz
 Zz
 Zu
 aU
-ly
+IS
 Yq
-KH
+IS
 mz
 Px
 Ob
@@ -5014,13 +5053,13 @@ Ur
 tY
 ar
 CP
-Dq
-xY
-gs
+IS
+IS
+IS
 nh
-XC
-SB
-Ci
+Dq
+Dq
+Dq
 pa
 "}
 (22,1,1) = {"
@@ -5036,13 +5075,13 @@ ZB
 QW
 EQ
 XK
+RN
+eh
+uA
+va
 Dq
-Dq
-Dq
-Dq
-Dq
-Dq
-Dq
+Wa
+JV
 PV
 "}
 (23,1,1) = {"
@@ -5057,12 +5096,12 @@ OV
 UN
 Lp
 dH
-NL
-IS
+fW
+mW
 uq
 VY
-kI
-GC
+mG
+Dq
 aN
 eH
 JH
@@ -5080,14 +5119,14 @@ ZB
 xr
 xd
 VJ
-IS
+tP
 RS
 ui
-kI
-zH
+vw
+Dq
 Je
 Vr
-RN
+Dq
 "}
 (25,1,1) = {"
 XJ
@@ -5100,12 +5139,12 @@ FQ
 fO
 ZB
 Sp
-Rq
-fW
-vc
+IF
+pm
+RN
 cT
 iH
-kI
+Ud
 zT
 Rs
 Xu
@@ -5124,14 +5163,14 @@ ZB
 Qm
 Oc
 Bj
-IS
+RN
 Vd
 tT
-kI
+TH
 Ui
 nC
-wS
-kI
+Mm
+RN
 "}
 (27,1,1) = {"
 XJ
@@ -5147,12 +5186,12 @@ dI
 hh
 rS
 fp
-IS
-IS
-kI
-GK
-kI
-kI
+RN
+RN
+RN
+RN
+RN
+RN
 wr
 "}
 (28,1,1) = {"
@@ -5169,12 +5208,12 @@ bz
 xB
 ju
 XS
-zF
+kI
 AL
 wg
 RE
 Sf
-zF
+kI
 XJ
 "}
 (29,1,1) = {"
@@ -5183,7 +5222,7 @@ XJ
 hD
 hD
 hD
-mu
+hD
 Hc
 hD
 pO
@@ -5191,12 +5230,12 @@ DE
 jT
 pP
 iT
-zF
-AF
+kI
+wS
 bO
 Wp
 qr
-uv
+kI
 XJ
 "}
 (30,1,1) = {"
@@ -5204,7 +5243,7 @@ XJ
 XJ
 tX
 KG
-hD
+ko
 hD
 hD
 hD
@@ -5213,12 +5252,12 @@ iq
 BY
 gC
 lV
-zF
-zd
-GW
+kI
+kI
+kI
 zm
-er
-zF
+kI
+kI
 XJ
 "}
 (31,1,1) = {"
@@ -5281,7 +5320,7 @@ fN
 Yr
 zF
 xv
-vT
+GW
 TX
 Jl
 uv
diff --git a/_maps/shuttles/shiptest/inteq_talos.dmm b/_maps/shuttles/shiptest/inteq_talos.dmm
index 98e00b50e8b6..85686e181faa 100644
--- a/_maps/shuttles/shiptest/inteq_talos.dmm
+++ b/_maps/shuttles/shiptest/inteq_talos.dmm
@@ -42,6 +42,7 @@
 /area/ship/engineering)
 "an" = (
 /obj/machinery/telecomms/processor/preset_four{
+	autolinkers = list("processor4","bus");
 	network = "irmg_commnet"
 	},
 /turf/open/floor/circuit/telecomms/mainframe,
@@ -73,11 +74,12 @@
 /turf/open/floor/plasteel/dark,
 /area/ship/security)
 "at" = (
-/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
-/obj/machinery/door/poddoor/shutters{
-	id = "talos_engine_shutter"
+/obj/effect/turf_decal/industrial/fire{
+	dir = 1
+	},
+/obj/structure/cable{
+	icon_state = "4-8"
 	},
-/obj/machinery/atmospherics/pipe/manifold/purple/visible,
 /turf/open/floor/plasteel/tech,
 /area/ship/engineering/engine)
 "au" = (
@@ -91,7 +93,7 @@
 	dir = 4;
 	id = "talos_thrusters_starboard";
 	name = "Blast Door Control";
-	pixel_x = -25;
+	pixel_x = -21;
 	pixel_y = -6
 	},
 /obj/machinery/atmospherics/pipe/simple/general/visible,
@@ -101,7 +103,7 @@
 	},
 /obj/machinery/light_switch{
 	dir = 4;
-	pixel_x = -25;
+	pixel_x = -20;
 	pixel_y = 5
 	},
 /turf/open/floor/plasteel/tech,
@@ -234,10 +236,9 @@
 	icon_state = "0-8"
 	},
 /obj/machinery/power/apc/auto_name/directional/east,
-/obj/machinery/telecomms/relay/preset/mining{
-	freq_listening = list(1347);
-	id = "IRMG Relay";
-	name = "IRMG Relay";
+/obj/machinery/telecomms/server/presets/common{
+	autolinkers = list("common","hub");
+	freq_listening = list(1459);
 	network = "irmg_commnet"
 	},
 /turf/open/floor/circuit/telecomms/mainframe,
@@ -371,7 +372,7 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/light_switch{
 	dir = 1;
-	pixel_y = -25
+	pixel_y = -19
 	},
 /turf/open/floor/plasteel/tech,
 /area/ship/crew/cryo)
@@ -387,7 +388,7 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/light_switch{
 	dir = 8;
-	pixel_x = 25
+	pixel_x = 20
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 9
@@ -500,16 +501,6 @@
 /obj/machinery/atmospherics/pipe/simple/purple/visible,
 /turf/open/floor/plasteel/tech,
 /area/ship/engineering/engine)
-"dr" = (
-/obj/effect/turf_decal/industrial/warning{
-	dir = 8
-	},
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
-	filter_types = list("n2","co2","bz","water_vapor","miasma","freon","pluox","tritium","n20","no2","nob");
-	id_tag = null
-	},
-/turf/open/floor/engine/vacuum,
-/area/ship/engineering/engine)
 "dv" = (
 /obj/effect/turf_decal/industrial/warning/fulltile,
 /obj/machinery/door/airlock/hatch{
@@ -519,6 +510,13 @@
 /obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/plating/airless,
 /area/ship/cargo/starboard)
+"dw" = (
+/obj/machinery/power/smes/engineering,
+/obj/structure/cable{
+	icon_state = "0-4"
+	},
+/turf/open/floor/plating,
+/area/ship/engineering)
 "dD" = (
 /obj/machinery/power/apc/auto_name/directional/east,
 /obj/structure/cable{
@@ -853,6 +851,7 @@
 	},
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/extinguisher_cabinet/directional/north,
+/obj/structure/extinguisher_cabinet/directional/east,
 /turf/open/floor/plasteel/grimy,
 /area/ship/crew)
 "ge" = (
@@ -956,6 +955,13 @@
 	},
 /turf/open/floor/plasteel/patterned/grid,
 /area/ship/hallway/central)
+"gF" = (
+/obj/effect/turf_decal/box/corners{
+	dir = 8
+	},
+/obj/effect/landmark/start/medical_doctor,
+/turf/open/floor/plasteel/patterned/cargo_one,
+/area/ship/cargo)
 "gG" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -998,14 +1004,6 @@
 /obj/structure/catwalk/over,
 /turf/open/floor/plating,
 /area/ship/engineering)
-"gR" = (
-/obj/effect/turf_decal/industrial/fire/fulltile,
-/obj/machinery/door/poddoor{
-	dir = 4;
-	id = "talos_tank_burn"
-	},
-/turf/open/floor/engine/hull/reinforced/interior,
-/area/ship/engineering/engine)
 "gS" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -1028,6 +1026,19 @@
 /obj/machinery/firealarm/directional/north,
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/crew/cryo)
+"gV" = (
+/obj/machinery/computer/apc_control{
+	dir = 1
+	},
+/obj/structure/cable,
+/obj/structure/cable{
+	icon_state = "1-4"
+	},
+/obj/structure/cable{
+	icon_state = "1-8"
+	},
+/turf/open/floor/plating,
+/area/ship/engineering)
 "gY" = (
 /obj/structure/cable{
 	icon_state = "0-8"
@@ -1173,7 +1184,7 @@
 	},
 /obj/machinery/light_switch{
 	dir = 1;
-	pixel_y = -25
+	pixel_y = -19
 	},
 /obj/machinery/newscaster/directional/west,
 /turf/open/floor/plasteel/grimy,
@@ -1374,10 +1385,10 @@
 /area/ship/bridge)
 "jd" = (
 /obj/docking_port/stationary{
-	width = 30;
-	height = 15;
 	dir = 4;
-	dwidth = 15
+	dwidth = 15;
+	height = 15;
+	width = 30
 	},
 /turf/template_noop,
 /area/template_noop)
@@ -1490,10 +1501,6 @@
 /obj/structure/cable{
 	icon_state = "2-4"
 	},
-/obj/structure/chair/office{
-	dir = 8
-	},
-/obj/effect/landmark/start/station_engineer,
 /obj/effect/turf_decal/number/five,
 /turf/open/floor/plasteel/dark,
 /area/ship/engineering)
@@ -1637,13 +1644,17 @@
 	},
 /obj/structure/chair/comfy/black,
 /obj/machinery/light_switch{
-	pixel_y = 25
+	pixel_y = 22
 	},
 /turf/open/floor/plasteel/dark,
 /area/ship/security)
 "kU" = (
-/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/incinerator_input,
-/turf/open/floor/engine/vacuum,
+/obj/machinery/door/poddoor{
+	id = "talos_tank_burn"
+	},
+/obj/effect/turf_decal/industrial/fire/fulltile,
+/obj/effect/decal/cleanable/oil/slippery,
+/turf/open/floor/engine/hull/reinforced/interior,
 /area/ship/engineering/engine)
 "kW" = (
 /obj/structure/cable{
@@ -1682,6 +1693,7 @@
 /area/ship/engineering/engine)
 "ls" = (
 /obj/machinery/telecomms/server/presets/inteq{
+	autolinkers = list("inteq","hub");
 	freq_listening = list(1347);
 	network = "irmg_commnet"
 	},
@@ -1814,12 +1826,14 @@
 /turf/open/floor/plasteel/telecomms_floor,
 /area/ship/bridge)
 "lS" = (
-/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
-/obj/machinery/door/poddoor/shutters{
-	id = "talos_engine_shutter"
+/obj/effect/turf_decal/industrial/fire{
+	dir = 1
 	},
-/obj/machinery/atmospherics/pipe/simple/purple/visible{
-	dir = 9
+/obj/structure/cable{
+	icon_state = "2-8"
+	},
+/obj/structure/cable{
+	icon_state = "1-2"
 	},
 /turf/open/floor/plasteel/tech,
 /area/ship/engineering/engine)
@@ -1871,6 +1885,8 @@
 /obj/structure/sign/poster/contraband/eoehoma{
 	pixel_y = -32
 	},
+/obj/item/storage/belt/security/webbing/inteq/alt,
+/obj/item/storage/belt/security/webbing/inteq,
 /turf/open/floor/plasteel/dark,
 /area/ship/security)
 "ms" = (
@@ -2064,22 +2080,6 @@
 	},
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
-"nt" = (
-/obj/machinery/power/shieldwallgen/atmos/roundstart{
-	dir = 1;
-	id = "talos_tank_burn"
-	},
-/obj/machinery/door/poddoor{
-	dir = 4;
-	id = "talos_tank_burn"
-	},
-/obj/effect/turf_decal/industrial/fire/fulltile,
-/obj/structure/cable{
-	icon_state = "0-4"
-	},
-/obj/effect/decal/cleanable/oil/slippery,
-/turf/open/floor/engine/hull/reinforced/interior,
-/area/ship/engineering/engine)
 "nz" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -2217,7 +2217,6 @@
 /turf/open/floor/plating/airless,
 /area/ship/external/dark)
 "oi" = (
-/obj/structure/table/rolling,
 /obj/item/storage/firstaid/medical{
 	pixel_x = -5
 	},
@@ -2228,6 +2227,7 @@
 /obj/machinery/status_display/shuttle{
 	pixel_y = 32
 	},
+/obj/structure/table,
 /turf/open/floor/plasteel/patterned/cargo_one,
 /area/ship/cargo)
 "om" = (
@@ -2266,9 +2266,9 @@
 /obj/effect/turf_decal/trimline/opaque/yellow/line,
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/reagent_dispensers/peppertank{
-	pixel_x = 32
+	pixel_y = -28
 	},
-/obj/structure/extinguisher_cabinet/directional/south,
+/obj/structure/extinguisher_cabinet/directional/east,
 /turf/open/floor/plasteel/tech,
 /area/ship/security/armory)
 "os" = (
@@ -2361,7 +2361,7 @@
 	icon_state = "2-4"
 	},
 /obj/machinery/light_switch{
-	pixel_y = 25
+	pixel_y = 22
 	},
 /turf/open/floor/carpet/orange,
 /area/ship/bridge)
@@ -2496,7 +2496,7 @@
 /obj/structure/cable{
 	icon_state = "2-4"
 	},
-/obj/machinery/firealarm/directional/west,
+/obj/machinery/computer/helm/viewscreen/directional/west,
 /turf/open/floor/plasteel/dark,
 /area/ship/crew/canteen)
 "pG" = (
@@ -2642,14 +2642,14 @@
 	dir = 8;
 	id = "talos_tank_air";
 	name = "Access Door Control";
-	pixel_x = 25;
+	pixel_x = 21;
 	pixel_y = -6;
 	req_access_txt = "24"
 	},
 /obj/machinery/button/shieldwallgen{
 	dir = 8;
 	id = "talos_tank_air";
-	pixel_x = 25;
+	pixel_x = 19;
 	pixel_y = 4;
 	req_access_txt = "24"
 	},
@@ -2741,7 +2741,7 @@
 	desc = "Important notices from the Vanguard.";
 	dir = 1;
 	name = "Vanguard's Notice Board";
-	pixel_y = -32
+	pixel_y = -25
 	},
 /turf/open/floor/plasteel/patterned/grid,
 /area/ship/hallway/port)
@@ -2843,25 +2843,21 @@
 	dir = 4;
 	id = "talos_engine_shutter";
 	name = "Shutter Control";
-	pixel_x = -25;
-	pixel_y = -6
+	pixel_x = -21;
+	pixel_y = -2
 	},
 /obj/machinery/button/door{
 	dir = 4;
 	id = "talos_engine_vent";
 	name = "External Vent Control";
-	pixel_x = -25;
-	pixel_y = 6
+	pixel_x = -21;
+	pixel_y = 10
 	},
 /obj/machinery/atmospherics/pipe/simple/purple/visible,
-/obj/machinery/atmospherics/components/binary/pump/layer2{
-	icon_state = "pump_map-1";
-	name = "burn chamber exhaust pump";
-	piping_layer = 1
-	},
 /obj/machinery/computer/atmos_control/incinerator{
 	dir = 4
 	},
+/obj/machinery/atmospherics/pipe/simple/dark/hidden/layer1,
 /turf/open/floor/plasteel/tech,
 /area/ship/engineering/engine)
 "sa" = (
@@ -3024,16 +3020,30 @@
 	dir = 1
 	},
 /obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/sign/poster/official/ion_carbine{
+	pixel_x = -32
+	},
+/obj/item/ammo_box/magazine/m12g/small{
+	pixel_x = 5;
+	pixel_y = 5
+	},
+/obj/item/ammo_box/magazine/m12g/small{
+	pixel_x = 5;
+	pixel_y = 5
+	},
+/obj/item/ammo_box/magazine/m12g/small{
+	pixel_x = -5
+	},
+/obj/item/ammo_box/magazine/m12g/small{
+	pixel_x = -5
+	},
 /obj/item/ammo_box/magazine/co9mm{
 	pixel_x = 5
 	},
 /obj/item/ammo_box/magazine/co9mm{
 	pixel_x = -5
 	},
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/sign/poster/official/ion_carbine{
-	pixel_x = -32
-	},
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/security/armory)
 "sN" = (
@@ -3064,6 +3074,7 @@
 	icon_state = "1-2"
 	},
 /obj/effect/landmark/start/assistant,
+/obj/machinery/firealarm/directional/west,
 /turf/open/floor/plasteel/dark,
 /area/ship/crew/canteen)
 "sV" = (
@@ -3313,13 +3324,19 @@
 /obj/structure/rack,
 /obj/effect/turf_decal/siding/thinplating/dark,
 /obj/effect/decal/cleanable/dirt/dust,
-/obj/item/gun/ballistic/automatic/pistol/commander/inteq{
-	pixel_y = 5
-	},
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/sign/poster/retro/lasergun_new{
 	pixel_x = -32
 	},
+/obj/item/gun/ballistic/shotgun/bulldog/inteq{
+	pixel_x = -8;
+	pixel_y = 8;
+	spawnwithmagazine = 0
+	},
+/obj/item/gun/ballistic/shotgun/bulldog/inteq{
+	pixel_x = -12;
+	spawnwithmagazine = 0
+	},
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/security/armory)
 "ul" = (
@@ -3423,7 +3440,7 @@
 	},
 /obj/structure/noticeboard{
 	dir = 8;
-	pixel_x = 32
+	pixel_x = 25
 	},
 /turf/open/floor/plasteel/dark,
 /area/ship/crew/canteen)
@@ -3449,9 +3466,6 @@
 /obj/structure/cable/yellow{
 	icon_state = "1-2"
 	},
-/obj/effect/turf_decal/industrial/fire{
-	dir = 8
-	},
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
@@ -3783,9 +3797,8 @@
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
 /area/ship/crew/cryo)
 "xl" = (
-/obj/machinery/telecomms/server/presets/common{
-	autolinkers = list("processor4","broadcasterB");
-	freq_listening = list(1459);
+/obj/machinery/telecomms/bus/preset_four{
+	autolinkers = list("hub","processor4","bus");
 	network = "irmg_commnet"
 	},
 /turf/open/floor/circuit/telecomms/mainframe,
@@ -3801,7 +3814,7 @@
 /obj/structure/catwalk/over,
 /obj/machinery/light_switch{
 	dir = 1;
-	pixel_y = -25
+	pixel_y = -19
 	},
 /turf/open/floor/plating,
 /area/ship/engineering)
@@ -3821,6 +3834,7 @@
 /area/ship/engineering)
 "xz" = (
 /obj/machinery/telecomms/broadcaster/preset_right{
+	autolinkers = list("broadcasterB","hub");
 	network = "irmg_commnet"
 	},
 /obj/structure/window/reinforced/survival_pod{
@@ -3923,7 +3937,7 @@
 "yc" = (
 /obj/machinery/light_switch{
 	dir = 4;
-	pixel_x = -25
+	pixel_x = -19
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 5
@@ -4134,14 +4148,14 @@
 	dir = 8;
 	id = "talos_cargo";
 	name = "Cargo Door Control";
-	pixel_x = 25;
-	pixel_y = 4
+	pixel_x = 21;
+	pixel_y = 8
 	},
 /obj/machinery/button/shieldwallgen{
 	dir = 8;
 	id = "talos_cargo";
-	pixel_x = 25;
-	pixel_y = -6
+	pixel_x = 19;
+	pixel_y = -2
 	},
 /obj/structure/weightmachine/weightlifter,
 /obj/machinery/light/directional/north,
@@ -4156,7 +4170,7 @@
 "zz" = (
 /obj/machinery/light_switch{
 	dir = 1;
-	pixel_y = -25
+	pixel_y = -19
 	},
 /obj/effect/turf_decal/siding/thinplating/dark{
 	dir = 10
@@ -4193,22 +4207,6 @@
 /turf/open/floor/carpet/black,
 /area/ship/crew/dorm)
 "zH" = (
-/obj/machinery/button/door{
-	dir = 4;
-	id = "talos_tank_burn";
-	name = "Access Door Control";
-	pixel_x = -25;
-	pixel_y = -6;
-	req_access = null;
-	req_access_txt = "56"
-	},
-/obj/machinery/button/shieldwallgen{
-	dir = 4;
-	id = "talos_tank_burn";
-	pixel_x = -25;
-	pixel_y = 4;
-	req_access_txt = "56"
-	},
 /obj/structure/cable{
 	icon_state = "5-10"
 	},
@@ -4219,14 +4217,6 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 1
 	},
-/obj/structure/sign/warning/fire{
-	pixel_x = -36;
-	pixel_y = -4
-	},
-/obj/structure/sign/warning{
-	pixel_x = -40;
-	pixel_y = 9
-	},
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
 	dir = 8
 	},
@@ -4373,10 +4363,10 @@
 /area/ship/hallway/port)
 "AB" = (
 /obj/docking_port/stationary{
-	width = 6;
-	height = 15;
 	dir = 4;
-	dwidth = 4
+	dwidth = 4;
+	height = 15;
+	width = 6
 	},
 /turf/template_noop,
 /area/template_noop)
@@ -4468,17 +4458,14 @@
 /turf/open/floor/plating,
 /area/ship/engineering)
 "AZ" = (
-/obj/structure/cable{
-	icon_state = "1-4"
+/obj/effect/landmark/start/station_engineer,
+/obj/structure/chair/office{
+	dir = 8
 	},
 /obj/structure/cable{
-	icon_state = "1-8"
-	},
-/obj/structure/cable,
-/obj/machinery/computer/apc_control{
-	dir = 1
+	icon_state = "1-2"
 	},
-/turf/open/floor/plating,
+/turf/open/floor/plasteel/dark,
 /area/ship/engineering)
 "Ba" = (
 /obj/structure/chair{
@@ -4501,11 +4488,17 @@
 /obj/item/instrument/guitar,
 /turf/open/floor/plasteel/grimy,
 /area/ship/crew)
+"Bm" = (
+/obj/machinery/power/smes/engineering,
+/obj/structure/cable{
+	icon_state = "0-8"
+	},
+/turf/open/floor/plating,
+/area/ship/engineering)
 "Bv" = (
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
 /area/ship/crew)
 "Bz" = (
-/obj/machinery/suit_storage_unit/standard_unit,
 /obj/effect/turf_decal/techfloor{
 	dir = 1
 	},
@@ -4513,6 +4506,9 @@
 /obj/structure/sign/poster/official/safety_internals{
 	pixel_y = 32
 	},
+/obj/machinery/suit_storage_unit/inherit,
+/obj/item/clothing/suit/space/inteq,
+/obj/item/clothing/head/helmet/space/inteq,
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/maintenance/port)
 "BJ" = (
@@ -4560,7 +4556,7 @@
 	},
 /obj/machinery/light_switch{
 	dir = 4;
-	pixel_x = -25
+	pixel_x = -19
 	},
 /turf/open/floor/plasteel/patterned/cargo_one,
 /area/ship/cargo)
@@ -4606,9 +4602,7 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/obj/machinery/computer/cryopod/directional/north{
-	pixel_y = 25
-	},
+/obj/machinery/computer/cryopod/directional/north,
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/crew/cryo)
 "Cy" = (
@@ -4694,7 +4688,6 @@
 /obj/structure/cable/yellow{
 	icon_state = "4-8"
 	},
-/obj/machinery/light/directional/north,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 4
 	},
@@ -4704,9 +4697,9 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 4
 	},
-/turf/open/floor/plasteel/stairs{
-	dir = 8
-	},
+/obj/structure/catwalk/over,
+/obj/machinery/light/directional/south,
+/turf/open/floor/plating,
 /area/ship/engineering/engine)
 "Dd" = (
 /obj/structure/cable{
@@ -4988,22 +4981,15 @@
 /turf/open/floor/plasteel/patterned/grid,
 /area/ship/hallway/central)
 "Fu" = (
-/obj/machinery/power/terminal,
-/obj/structure/cable/yellow,
-/obj/structure/table,
 /obj/effect/turf_decal/siding/thinplating/dark{
 	dir = 1
 	},
-/obj/item/assembly/igniter{
-	pixel_y = 6
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
 	},
-/obj/item/assembly/timer{
+/obj/item/analyzer{
 	pixel_x = 6;
-	pixel_y = -3
-	},
-/obj/item/screwdriver{
-	pixel_x = -2;
-	pixel_y = 1
+	pixel_y = 4
 	},
 /turf/open/floor/plasteel/dark,
 /area/ship/engineering)
@@ -5073,7 +5059,7 @@
 /obj/structure/catwalk/over/plated_catwalk,
 /obj/structure/railing,
 /obj/structure/noticeboard{
-	pixel_y = 32
+	pixel_y = 25
 	},
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/crew/cryo)
@@ -5127,11 +5113,8 @@
 /turf/open/floor/plating/airless,
 /area/ship/cargo/starboard)
 "Gr" = (
-/obj/effect/turf_decal/industrial/fire{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/dark/hidden/layer4{
-	dir = 9
+/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/incinerator_input{
+	dir = 8
 	},
 /turf/open/floor/engine/vacuum,
 /area/ship/engineering/engine)
@@ -5155,7 +5138,6 @@
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/security/armory)
 "Gu" = (
-/obj/machinery/suit_storage_unit/standard_unit,
 /obj/effect/turf_decal/techfloor{
 	dir = 1
 	},
@@ -5163,6 +5145,9 @@
 /obj/structure/sign/poster/official/safety_internals{
 	pixel_y = 32
 	},
+/obj/machinery/suit_storage_unit/inherit,
+/obj/item/clothing/suit/space/inteq,
+/obj/item/clothing/head/helmet/space/inteq,
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/maintenance/starboard)
 "Gv" = (
@@ -5181,13 +5166,15 @@
 	},
 /obj/machinery/light_switch{
 	dir = 8;
-	pixel_x = 25
+	pixel_x = 20
 	},
 /turf/open/floor/plasteel/dark,
 /area/ship/crew/canteen)
 "Gz" = (
 /obj/machinery/light/directional/south,
-/obj/machinery/telecomms/bus/preset_four{
+/obj/machinery/telecomms/hub{
+	autolinkers = list("hub","bus","relay","messaging","inteq","common","broadcasterB","receiverB");
+	id = "IRMG Communications Hub";
 	network = "irmg_commnet"
 	},
 /turf/open/floor/circuit/telecomms/mainframe,
@@ -5252,12 +5239,14 @@
 /turf/open/floor/plating/airless,
 /area/ship/cargo/port)
 "He" = (
-/obj/machinery/suit_storage_unit/standard_unit,
 /obj/effect/turf_decal/techfloor{
 	dir = 4
 	},
 /obj/effect/decal/cleanable/dirt,
 /obj/item/radio/intercom/directional/east,
+/obj/machinery/suit_storage_unit/inherit,
+/obj/item/clothing/suit/space/inteq,
+/obj/item/clothing/head/helmet/space/inteq,
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/hallway/central)
 "Hh" = (
@@ -5365,7 +5354,6 @@
 /obj/machinery/computer/security{
 	dir = 4
 	},
-/obj/machinery/light/directional/west,
 /obj/effect/turf_decal/corner/opaque/yellow{
 	dir = 1
 	},
@@ -5377,7 +5365,7 @@
 	id = "talos_armory";
 	name = "Door Control";
 	normaldoorcontrol = 1;
-	pixel_x = -29;
+	pixel_x = -21;
 	pixel_y = -6;
 	req_access_txt = "3"
 	},
@@ -5386,7 +5374,7 @@
 	id = "talos_armory";
 	name = "Door Bolt Control";
 	normaldoorcontrol = 1;
-	pixel_x = -29;
+	pixel_x = -21;
 	pixel_y = 6;
 	req_access_txt = "3";
 	specialfunctions = 4
@@ -5483,14 +5471,13 @@
 /obj/effect/turf_decal/industrial/warning{
 	dir = 8
 	},
-/obj/machinery/atmospherics/pipe/simple/dark/hidden/layer2{
-	dir = 9
-	},
-/obj/machinery/atmospherics/pipe/simple/dark/hidden{
-	dir = 8
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+	dir = 8;
+	filter_types = list("n2","co2","bz","water_vapor","miasma","freon","pluox","tritium","n20","no2","nob");
+	id_tag = null
 	},
-/obj/machinery/atmospherics/pipe/simple/dark/hidden/layer4{
-	dir = 4
+/obj/machinery/atmospherics/pipe/simple/purple/hidden{
+	dir = 6
 	},
 /obj/machinery/atmospherics/pipe/simple/dark/hidden/layer1{
 	dir = 10
@@ -5520,7 +5507,7 @@
 /obj/machinery/button/shieldwallgen{
 	dir = 8;
 	id = "talos_tank_fuel";
-	pixel_x = 25;
+	pixel_x = 19;
 	pixel_y = 4;
 	req_access_txt = "24"
 	},
@@ -5529,10 +5516,13 @@
 	dir = 8;
 	id = "talos_tank_fuel";
 	name = "Access Door Control (DANGER) (EXTREMELY DANGEROUS) (DO NOT PRESS)";
-	pixel_x = 25;
+	pixel_x = 21;
 	pixel_y = -6;
 	req_access_txt = "24"
 	},
+/obj/structure/cable{
+	icon_state = "1-8"
+	},
 /turf/open/floor/plasteel/tech,
 /area/ship/engineering/engine)
 "Jq" = (
@@ -5562,15 +5552,6 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /turf/open/floor/plasteel/patterned/grid,
 /area/ship/hallway/port)
-"JG" = (
-/obj/machinery/door/poddoor{
-	dir = 4;
-	id = "talos_engine_vent";
-	name = "Combustion Chamber Vent"
-	},
-/obj/effect/turf_decal/industrial/warning/fulltile,
-/turf/open/floor/engine/hull/reinforced,
-/area/ship/engineering/engine)
 "JI" = (
 /obj/effect/turf_decal/industrial/warning/fulltile,
 /obj/effect/decal/cleanable/dirt/dust,
@@ -5787,14 +5768,27 @@
 /obj/item/stamp/law{
 	name = "master at arms' rubber stamp"
 	},
+/obj/item/table_bell{
+	pixel_x = -15
+	},
 /turf/open/floor/plasteel/dark,
 /area/ship/security)
 "Lo" = (
-/obj/structure/cable{
-	icon_state = "0-4"
+/obj/machinery/power/terminal,
+/obj/structure/table,
+/obj/item/assembly/timer{
+	pixel_x = 6;
+	pixel_y = -3
 	},
-/obj/machinery/power/smes/engineering,
-/turf/open/floor/plating,
+/obj/item/screwdriver{
+	pixel_x = -2;
+	pixel_y = 1
+	},
+/obj/item/assembly/igniter{
+	pixel_y = 6
+	},
+/obj/structure/cable/yellow,
+/turf/open/floor/plasteel/dark,
 /area/ship/engineering)
 "Lu" = (
 /obj/machinery/atmospherics/components/binary/circulator/cold{
@@ -5886,6 +5880,7 @@
 /area/ship/hallway/central)
 "LV" = (
 /obj/machinery/telecomms/receiver/preset_right{
+	autolinkers = list("receiverB","hub");
 	freq_listening = list(1347,1359);
 	network = "irmg_commnet"
 	},
@@ -5898,11 +5893,15 @@
 /obj/effect/turf_decal/industrial/fire{
 	dir = 4
 	},
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
-	filter_types = list("n2","co2","bz","water_vapor","miasma","freon","pluox","tritium","n20","no2","nob");
-	id_tag = null
+/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
+/obj/machinery/door/poddoor/shutters{
+	id = "talos_engine_shutter"
 	},
-/turf/open/floor/engine/vacuum,
+/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
+/obj/machinery/door/poddoor/shutters{
+	id = "talos_engine_shutter"
+	},
+/turf/open/floor/plating,
 /area/ship/engineering/engine)
 "Mf" = (
 /obj/structure/chair{
@@ -6044,7 +6043,6 @@
 	icon_state = "1-8"
 	},
 /obj/machinery/atmospherics/pipe/layer_manifold/visible,
-/obj/machinery/firealarm/directional/east,
 /turf/open/floor/plasteel/tech,
 /area/ship/engineering/engine)
 "Nd" = (
@@ -6075,15 +6073,15 @@
 /obj/machinery/button/shieldwallgen{
 	dir = 8;
 	id = "talos_cargo";
-	pixel_x = 25;
-	pixel_y = 4
+	pixel_x = 19;
+	pixel_y = 8
 	},
 /obj/machinery/button/door{
 	dir = 8;
 	id = "talos_cargo";
 	name = "Cargo Door Control";
-	pixel_x = 25;
-	pixel_y = -6
+	pixel_x = 21;
+	pixel_y = -2
 	},
 /obj/machinery/light/directional/south,
 /obj/effect/decal/cleanable/dirt,
@@ -6214,13 +6212,13 @@
 	id = "talos_bridge";
 	name = "Bridge Shutters";
 	pixel_x = 6;
-	pixel_y = 25
+	pixel_y = 23
 	},
 /obj/machinery/button/door{
 	id = "talos_windows";
 	name = "Window Lockdown";
 	pixel_x = -6;
-	pixel_y = 25
+	pixel_y = 23
 	},
 /obj/effect/turf_decal/corner/opaque/brown{
 	dir = 4
@@ -6241,6 +6239,14 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plating/airless,
 /area/ship/external/dark)
+"Pk" = (
+/obj/machinery/door/poddoor/shutters{
+	dir = 4;
+	id = "talos_engine_shutter"
+	},
+/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
+/turf/closed/wall/mineral/plastitanium/nodiagonal,
+/area/ship/engineering/engine)
 "Pm" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
 	dir = 1;
@@ -6255,13 +6261,10 @@
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
 /area/ship/cargo/port)
 "Pr" = (
-/obj/machinery/atmospherics/pipe/simple/dark/hidden{
-	dir = 9
-	},
-/obj/machinery/atmospherics/pipe/simple/dark/hidden/layer4{
+/obj/machinery/air_sensor/atmos/incinerator_tank,
+/obj/machinery/atmospherics/pipe/simple/purple/hidden{
 	dir = 4
 	},
-/obj/machinery/air_sensor/atmos/incinerator_tank,
 /turf/open/floor/engine/vacuum,
 /area/ship/engineering/engine)
 "Ps" = (
@@ -6316,15 +6319,13 @@
 /obj/structure/cable/yellow{
 	icon_state = "1-2"
 	},
-/obj/effect/turf_decal/industrial/fire{
-	dir = 8
-	},
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /obj/structure/catwalk/over,
+/obj/machinery/firealarm/directional/west,
 /turf/open/floor/plating,
 /area/ship/engineering/engine)
 "PN" = (
@@ -6362,6 +6363,7 @@
 /obj/effect/turf_decal/corner/opaque/brown{
 	dir = 8
 	},
+/obj/machinery/light/directional/west,
 /turf/open/floor/plasteel/dark,
 /area/ship/security)
 "Qa" = (
@@ -6506,11 +6508,18 @@
 /turf/open/floor/plating/airless,
 /area/ship/cargo/starboard)
 "QZ" = (
-/obj/effect/turf_decal/industrial/fire{
-	dir = 4
+/obj/machinery/power/shieldwallgen/atmos/roundstart{
+	dir = 8;
+	id = "talos_tank_burn"
 	},
-/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/incinerator_input,
-/turf/open/floor/engine/vacuum,
+/obj/effect/turf_decal/industrial/fire/fulltile,
+/obj/machinery/door/poddoor{
+	id = "talos_tank_burn"
+	},
+/obj/structure/cable{
+	icon_state = "0-2"
+	},
+/turf/open/floor/engine/hull/reinforced/interior,
 /area/ship/engineering/engine)
 "Rc" = (
 /obj/effect/turf_decal/siding/thinplating/dark{
@@ -6560,20 +6569,6 @@
 	},
 /turf/open/floor/plating/airless,
 /area/ship/cargo/starboard)
-"Rx" = (
-/obj/effect/turf_decal/industrial/fire/fulltile,
-/obj/structure/cable{
-	icon_state = "0-4"
-	},
-/obj/machinery/door/poddoor{
-	dir = 4;
-	id = "talos_tank_burn"
-	},
-/obj/machinery/power/shieldwallgen/atmos/roundstart{
-	id = "talos_tank_burn"
-	},
-/turf/open/floor/engine/hull/reinforced/interior,
-/area/ship/engineering/engine)
 "Ry" = (
 /obj/structure/cable{
 	icon_state = "0-4"
@@ -6597,28 +6592,28 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 4
 	},
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
 /turf/open/floor/plating,
 /area/ship/engineering/engine)
 "RF" = (
-/obj/machinery/power/terminal,
-/obj/structure/cable/yellow,
 /obj/effect/turf_decal/siding/thinplating/dark{
 	dir = 1
 	},
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/obj/item/analyzer{
-	pixel_x = 6;
-	pixel_y = 4
-	},
 /obj/effect/turf_decal/number/zero,
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
 /turf/open/floor/plasteel/dark,
 /area/ship/engineering)
 "RL" = (
 /obj/machinery/light_switch{
 	dir = 8;
-	pixel_x = 25
+	pixel_x = 20
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
@@ -6839,19 +6834,14 @@
 /turf/open/floor/plasteel/grimy,
 /area/ship/crew)
 "TC" = (
-/obj/structure/cable{
-	icon_state = "0-8"
-	},
-/obj/machinery/power/smes/engineering,
-/turf/open/floor/plating,
+/obj/machinery/power/terminal,
+/obj/structure/cable/yellow,
+/turf/open/floor/plasteel/dark,
 /area/ship/engineering)
 "TD" = (
 /obj/structure/cable/yellow{
 	icon_state = "1-2"
 	},
-/obj/effect/turf_decal/industrial/fire{
-	dir = 8
-	},
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
 	dir = 8
 	},
@@ -7068,7 +7058,7 @@
 	dir = 4;
 	id = "talos_thrusters_port";
 	name = "Blast Door Control";
-	pixel_x = -25;
+	pixel_x = -21;
 	pixel_y = 3
 	},
 /obj/structure/closet/secure_closet/engineering_electrical{
@@ -7146,7 +7136,7 @@
 /obj/machinery/light/directional/north,
 /obj/machinery/light_switch{
 	dir = 8;
-	pixel_x = 25
+	pixel_x = 20
 	},
 /obj/machinery/suit_storage_unit/inherit{
 	req_access_txt = "1"
@@ -7223,6 +7213,26 @@
 /obj/structure/extinguisher_cabinet/directional/south,
 /turf/open/floor/plasteel/patterned/grid,
 /area/ship/hallway/central)
+"VL" = (
+/obj/machinery/button/shieldwallgen{
+	id = "talos_tank_burn";
+	pixel_x = -6;
+	pixel_y = 20;
+	req_access_txt = "56"
+	},
+/obj/machinery/button/door{
+	id = "talos_tank_burn";
+	name = "Access Door Control";
+	pixel_x = 4;
+	pixel_y = 21;
+	req_access = null;
+	req_access_txt = "56"
+	},
+/obj/effect/turf_decal/industrial/fire{
+	dir = 1
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/engineering/engine)
 "VO" = (
 /obj/effect/turf_decal/corner/opaque/yellow,
 /obj/effect/turf_decal/corner/opaque/brown{
@@ -7301,11 +7311,10 @@
 	},
 /obj/structure/rack,
 /obj/effect/turf_decal/siding/thinplating/dark,
-/obj/item/gun/ballistic/shotgun/lethal{
+/obj/effect/decal/cleanable/dirt,
+/obj/item/gun/ballistic/automatic/pistol/commander/inteq{
 	pixel_y = 5
 	},
-/obj/item/gun/ballistic/shotgun/lethal,
-/obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/security/armory)
 "Wr" = (
@@ -7411,11 +7420,13 @@
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/engineering)
 "Xs" = (
-/obj/machinery/suit_storage_unit/standard_unit,
 /obj/effect/turf_decal/techfloor{
 	dir = 4
 	},
 /obj/effect/decal/cleanable/dirt,
+/obj/machinery/suit_storage_unit/inherit,
+/obj/item/clothing/suit/space/inteq,
+/obj/item/clothing/head/helmet/space/inteq,
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/hallway/central)
 "XA" = (
@@ -7449,6 +7460,7 @@
 /obj/item/storage/belt/security/webbing/inteq,
 /obj/item/clothing/glasses/hud/security/sunglasses/inteq,
 /obj/item/storage/box/handcuffs,
+/obj/item/storage/belt/security/webbing/inteq/alt,
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/security/armory)
 "Ya" = (
@@ -7465,12 +7477,20 @@
 /turf/closed/wall/mineral/plastitanium,
 /area/ship/bridge)
 "Yp" = (
-/obj/effect/turf_decal/industrial/warning{
-	dir = 8
-	},
 /obj/machinery/atmospherics/pipe/simple/dark/hidden/layer1,
-/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/incinerator_input,
-/turf/open/floor/engine/vacuum,
+/obj/machinery/atmospherics/pipe/simple/purple/hidden,
+/obj/machinery/power/shieldwallgen/atmos/roundstart{
+	dir = 4;
+	id = "talos_tank_burn"
+	},
+/obj/effect/turf_decal/industrial/fire/fulltile,
+/obj/machinery/door/poddoor{
+	id = "talos_tank_burn"
+	},
+/obj/structure/cable{
+	icon_state = "0-2"
+	},
+/turf/open/floor/engine/hull/reinforced/interior,
 /area/ship/engineering/engine)
 "Yq" = (
 /obj/effect/decal/cleanable/dirt,
@@ -7525,6 +7545,8 @@
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
 	dir = 4
 	},
+/obj/item/storage/belt/security/webbing/inteq/alt,
+/obj/item/storage/belt/security/webbing/inteq,
 /turf/open/floor/plasteel/dark,
 /area/ship/bridge)
 "YC" = (
@@ -7617,13 +7639,6 @@
 	},
 /turf/open/floor/plating,
 /area/ship/maintenance/starboard)
-"Zl" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{
-	filter_types = list("n2","co2","bz","water_vapor","miasma","freon","pluox","tritium","n20","no2","nob");
-	id_tag = null
-	},
-/turf/open/floor/engine/vacuum,
-/area/ship/engineering/engine)
 "Zn" = (
 /obj/structure/closet/emcloset/empty{
 	anchored = 1;
@@ -7687,14 +7702,26 @@
 /turf/open/floor/plasteel/showroomfloor,
 /area/ship/crew/toilet)
 "ZE" = (
-/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
-/obj/machinery/door/poddoor/shutters{
-	id = "talos_engine_shutter"
+/obj/machinery/atmospherics/pipe/simple/purple/visible,
+/obj/effect/turf_decal/industrial/fire{
+	dir = 1
 	},
-/obj/machinery/atmospherics/pipe/manifold/purple/visible{
-	dir = 8
+/obj/structure/cable{
+	icon_state = "1-4"
+	},
+/obj/structure/sign/warning{
+	pixel_x = -25;
+	pixel_y = 9
+	},
+/obj/structure/sign/warning/fire{
+	pixel_x = -22;
+	pixel_y = -4
+	},
+/obj/machinery/atmospherics/components/binary/pump/layer2{
+	icon_state = "pump_map-1";
+	name = "burn chamber exhaust pump";
+	piping_layer = 1
 	},
-/obj/machinery/atmospherics/pipe/simple/dark/hidden/layer1,
 /turf/open/floor/plasteel/tech,
 /area/ship/engineering/engine)
 "ZJ" = (
@@ -7811,9 +7838,9 @@ tb
 KI
 cn
 pU
-JG
+pU
 LS
-JG
+pU
 pU
 pU
 Vk
@@ -7844,8 +7871,8 @@ Uc
 hO
 Fu
 Lo
+dw
 ge
-dr
 Je
 Yp
 ZE
@@ -7878,8 +7905,8 @@ cj
 ek
 jS
 AZ
+gV
 ge
-Zl
 Pr
 kU
 at
@@ -7912,7 +7939,7 @@ MS
 yL
 RF
 TC
-ge
+Bm
 Ma
 Gr
 QZ
@@ -7947,10 +7974,10 @@ ek
 ud
 xo
 pU
-Rx
-gR
-nt
 pU
+Pk
+pU
+VL
 Dc
 pU
 JU
@@ -8491,7 +8518,7 @@ zh
 jc
 Lc
 uO
-Ic
+gF
 nY
 ua
 MW
diff --git a/code/game/objects/items/storage/toolbox.dm b/code/game/objects/items/storage/toolbox.dm
index cc63afa058a4..57e52e8387c4 100644
--- a/code/game/objects/items/storage/toolbox.dm
+++ b/code/game/objects/items/storage/toolbox.dm
@@ -249,6 +249,11 @@
 	for (var/i in 1 to 4)
 		new /obj/item/ammo_box/a762_39(src)
 
+/obj/item/storage/toolbox/ammo/a308/PopulateContents()
+	name = "ammo can (.308)"
+	for (var/i in 1 to 4)
+		new /obj/item/ammo_box/a308(src)
+
 /obj/item/storage/toolbox/ammo/c45/PopulateContents()
 	name = "ammo can (.45)"
 	for (var/i in 1 to 4)
diff --git a/code/modules/hydroponics/hydroponics.dm b/code/modules/hydroponics/hydroponics.dm
index 7924e2ae7169..d53303e6d201 100644
--- a/code/modules/hydroponics/hydroponics.dm
+++ b/code/modules/hydroponics/hydroponics.dm
@@ -3,7 +3,7 @@
 	icon = 'icons/obj/hydroponics/equipment.dmi'
 	icon_state = "hydrotray"
 	density = TRUE
-	pixel_z = 8
+	pixel_z = 1
 	obj_flags = CAN_BE_HIT | UNIQUE_RENAME
 	circuit = /obj/item/circuitboard/machine/hydroponics
 	idle_power_usage = 0
@@ -310,19 +310,20 @@
 	else
 		var/t_growthstate = clamp(round((age / myseed.maturation) * myseed.growthstages), 1, myseed.growthstages)
 		plant_overlay.icon_state = "[myseed.icon_grow][t_growthstate]"
+	plant_overlay.pixel_y += 3 //to adjust the plant sprites to the new one without touching every single file
 	add_overlay(plant_overlay)
 
 /obj/machinery/hydroponics/proc/update_icon_lights()
-	if(waterlevel <= 10)
-		add_overlay(mutable_appearance('icons/obj/hydroponics/equipment.dmi', "over_lowwater3"))
-	if(reagents.total_volume <= 2)
-		add_overlay(mutable_appearance('icons/obj/hydroponics/equipment.dmi', "over_lownutri3"))
+	if(harvest)
+		add_overlay(mutable_appearance('icons/obj/hydroponics/equipment.dmi', "over_harvest3"))
 	if(plant_health <= (myseed.endurance / 2))
 		add_overlay(mutable_appearance('icons/obj/hydroponics/equipment.dmi', "over_lowhealth3"))
 	if(weedlevel >= 5 || pestlevel >= 5 || toxic >= 40)
 		add_overlay(mutable_appearance('icons/obj/hydroponics/equipment.dmi', "over_alert3"))
-	if(harvest)
-		add_overlay(mutable_appearance('icons/obj/hydroponics/equipment.dmi', "over_harvest3"))
+	if(reagents.total_volume <= 2)
+		add_overlay(mutable_appearance('icons/obj/hydroponics/equipment.dmi', "over_lownutri3"))
+	if(waterlevel <= 10)
+		add_overlay(mutable_appearance('icons/obj/hydroponics/equipment.dmi', "over_lowwater3"))
 
 
 /obj/machinery/hydroponics/examine(user)
diff --git a/code/modules/projectiles/boxes_magazines/ammo_boxes.dm b/code/modules/projectiles/boxes_magazines/ammo_boxes.dm
index 3ac1697423de..ce20c75b13b9 100644
--- a/code/modules/projectiles/boxes_magazines/ammo_boxes.dm
+++ b/code/modules/projectiles/boxes_magazines/ammo_boxes.dm
@@ -279,6 +279,12 @@
 	ammo_type = /obj/item/ammo_casing/a762_39
 	max_ammo = 60
 
+/obj/item/ammo_box/a308
+	name = "ammo box (.308)"
+	icon_state = "a308box"
+	ammo_type = /obj/item/ammo_casing/a308
+	max_ammo = 30
+
 /obj/item/ammo_box/foambox
 	name = "ammo box (Foam Darts)"
 	icon = 'icons/obj/guns/toy.dmi'
diff --git a/html/changelogs/AutoChangeLog-pr-2030.yml b/html/changelogs/AutoChangeLog-pr-2030.yml
new file mode 100644
index 000000000000..92223e4d3a3d
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-2030.yml
@@ -0,0 +1,5 @@
+author: Apogee-dev
+delete-after: true
+changes:
+  - rscadd: Added a Master-at-Arms to the Colossus
+  - tweak: Redesigned the Colossus's armory
diff --git a/html/changelogs/AutoChangeLog-pr-2032.yml b/html/changelogs/AutoChangeLog-pr-2032.yml
new file mode 100644
index 000000000000..3a0ea8b9cc9c
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-2032.yml
@@ -0,0 +1,4 @@
+author: Apogee-dev
+delete-after: true
+changes:
+  - tweak: Updated Talos with new assets, adjusted engine and job slots
diff --git a/html/changelogs/AutoChangeLog-pr-2057.yml b/html/changelogs/AutoChangeLog-pr-2057.yml
new file mode 100644
index 000000000000..ed5b1af2b1b5
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-2057.yml
@@ -0,0 +1,4 @@
+author: retlaw34
+delete-after: true
+changes:
+  - rscadd: New hydroponic tray sprites
diff --git a/html/changelogs/AutoChangeLog-pr-2078.yml b/html/changelogs/AutoChangeLog-pr-2078.yml
new file mode 100644
index 000000000000..d7904b0c4ba8
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-2078.yml
@@ -0,0 +1,4 @@
+author: Apogee-dev
+delete-after: true
+changes:
+  - rscdel: Removed the Solar-class
diff --git a/icons/obj/ammo.dmi b/icons/obj/ammo.dmi
index 1fafeb1bd293..e9caef955c2d 100644
Binary files a/icons/obj/ammo.dmi and b/icons/obj/ammo.dmi differ
diff --git a/icons/obj/hydroponics/equipment.dmi b/icons/obj/hydroponics/equipment.dmi
index b3a14e5bc5f3..897393afcab5 100644
Binary files a/icons/obj/hydroponics/equipment.dmi and b/icons/obj/hydroponics/equipment.dmi differ