diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm
index d7da3f0c00f..7d0d5624b86 100644
--- a/_maps/map_files/MetaStation/MetaStation.dmm
+++ b/_maps/map_files/MetaStation/MetaStation.dmm
@@ -16950,12 +16950,13 @@
 /turf/open/floor/plating,
 /area/engine/engineering)
 "aDr" = (
-/turf/closed/wall,
-/area/construction)
+/turf/open/floor/plating/warnplate{
+	dir = 9
+	},
+/area/shuttle/auxillary_base)
 "aDs" = (
-/obj/machinery/door/airlock/external,
-/turf/open/floor/plating,
-/area/construction)
+/turf/closed/wall,
+/area/mining_construction)
 "aDt" = (
 /obj/structure/closet/crate,
 /obj/item/weapon/coin/silver,
@@ -19597,8 +19598,12 @@
 /turf/open/floor/plasteel,
 /area/construction)
 "aHF" = (
+/obj/machinery/camera{
+	c_tag = "Auxillary Mining Base";
+	dir = 1
+	},
 /turf/open/floor/plating,
-/area/construction)
+/area/shuttle/auxillary_base)
 "aHG" = (
 /turf/open/floor/plating{
 	icon_state = "panelscorched"
@@ -20206,8 +20211,20 @@
 /turf/open/floor/plating/airless,
 /area/space)
 "aIO" = (
-/turf/open/floor/plasteel,
-/area/construction)
+/obj/machinery/camera{
+	c_tag = "Auxillary Base Construction";
+	dir = 1
+	},
+/obj/machinery/button/door{
+	id = "aux_base_shutters";
+	name = "Public Shutters Control";
+	pixel_x = 0;
+	pixel_y = -24;
+	req_access_txt = "0";
+	req_one_access_txt = "32;47;48"
+	},
+/turf/open/floor/plasteel/yellow/side,
+/area/mining_construction)
 "aIP" = (
 /obj/structure/closet/crate,
 /obj/effect/spawner/lootdrop/maintenance{
@@ -24071,12 +24088,10 @@
 /turf/open/floor/plating,
 /area/construction)
 "aQe" = (
-/obj/machinery/light_construct{
-	dir = 4
+/turf/open/floor/plating/warnplate{
+	dir = 6
 	},
-/obj/machinery/pipedispenser/disposal/transit_tube,
-/turf/open/floor/plasteel,
-/area/construction)
+/area/shuttle/auxillary_base)
 "aQf" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 9;
@@ -25652,20 +25667,19 @@
 	},
 /area/shuttle/pod_1)
 "aSN" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber{
-	dir = 4;
-	on = 1;
-	scrub_N2O = 0;
-	scrub_Toxins = 0
+/obj/structure/closet/toolcloset,
+/obj/machinery/light{
+	dir = 8
 	},
-/turf/open/floor/plasteel,
-/area/construction)
+/turf/open/floor/plasteel/yellow/side{
+	dir = 9
+	},
+/area/mining_construction)
 "aSO" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
-	dir = 4
+/turf/open/floor/plasteel/yellow/side{
+	dir = 1
 	},
-/turf/open/floor/plasteel,
-/area/construction)
+/area/mining_construction)
 "aSP" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 10
@@ -25673,12 +25687,15 @@
 /turf/open/floor/plasteel,
 /area/construction)
 "aSQ" = (
-/obj/structure/rack{
-	dir = 1
+/obj/structure/reagent_dispensers/fueltank,
+/obj/machinery/light{
+	icon_state = "tube1";
+	dir = 4
 	},
-/obj/item/clothing/suit/hazardvest,
-/turf/open/floor/plasteel,
-/area/construction)
+/turf/open/floor/plasteel/yellow/side{
+	dir = 5
+	},
+/area/mining_construction)
 "aSR" = (
 /obj/effect/landmark{
 	name = "revenantspawn"
@@ -26219,9 +26236,14 @@
 	name = "Arrivals"
 	})
 "aTT" = (
-/obj/machinery/light/small,
-/turf/open/floor/plating/warnplate{
-	dir = 1
+/obj/structure/chair{
+	dir = 4
+	},
+/obj/machinery/light/small{
+	dir = 8
+	},
+/turf/open/floor/plating{
+	icon_state = "platingdmg1"
 	},
 /area/hallway/secondary/entry{
 	name = "Arrivals"
@@ -26244,14 +26266,14 @@
 /turf/open/floor/plasteel,
 /area/construction)
 "aTX" = (
-/obj/machinery/light_construct,
-/turf/open/floor/plasteel,
-/area/construction)
+/obj/structure/closet/toolcloset,
+/turf/open/floor/plasteel/yellow/side{
+	dir = 10
+	},
+/area/mining_construction)
 "aTY" = (
-/obj/structure/table,
-/obj/item/clothing/gloves/color/orange,
-/turf/open/floor/plasteel,
-/area/construction)
+/turf/open/floor/plasteel/yellow/side,
+/area/mining_construction)
 "aTZ" = (
 /obj/structure/table,
 /obj/item/clothing/head/hardhat/orange{
@@ -26262,34 +26284,64 @@
 /turf/open/floor/plasteel,
 /area/construction)
 "aUa" = (
+/obj/structure/rack{
+	dir = 4
+	},
+/obj/item/weapon/electronics/airlock,
+/obj/item/weapon/electronics/airlock,
+/obj/item/weapon/electronics/airlock,
+/obj/item/weapon/electronics/airlock,
+/obj/item/stack/cable_coil,
+/obj/item/stack/cable_coil,
+/obj/item/wallframe/camera,
+/obj/item/wallframe/camera,
+/obj/item/wallframe/camera,
+/obj/item/wallframe/camera,
+/obj/item/device/assault_pod/mining,
+/obj/structure/cable/yellow{
+	d2 = 8;
+	icon_state = "0-8"
+	},
 /obj/machinery/power/apc{
 	dir = 2;
-	name = "Construction Area APC";
+	name = "Auxillary Base Construction APC";
+	pixel_x = 0;
 	pixel_y = -24
 	},
-/obj/structure/cable/yellow{
-	d2 = 4;
-	icon_state = "0-4"
-	},
-/obj/machinery/light_construct,
-/turf/open/floor/plating,
-/area/construction)
+/turf/open/floor/plasteel/yellow/side,
+/area/mining_construction)
 "aUb" = (
-/obj/structure/cable/yellow{
-	d1 = 2;
-	d2 = 8;
-	icon_state = "2-8"
+/obj/structure/table,
+/obj/item/stack/sheet/metal{
+	amount = 50
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel,
-/area/construction)
+/obj/item/stack/sheet/metal{
+	amount = 50
+	},
+/obj/item/stack/sheet/glass{
+	amount = 50
+	},
+/obj/item/weapon/pipe_dispenser,
+/obj/machinery/airalarm{
+	dir = 1;
+	icon_state = "alarm0";
+	pixel_y = -22
+	},
+/turf/open/floor/plasteel/yellow/side,
+/area/mining_construction)
 "aUc" = (
-/obj/machinery/light_switch{
-	pixel_x = 26;
-	pixel_y = 0
+/obj/structure/table,
+/obj/item/stack/sheet/plasteel{
+	amount = 10
 	},
-/turf/open/floor/plasteel,
-/area/construction)
+/obj/item/stack/rods{
+	amount = 50
+	},
+/obj/item/weapon/storage/box/lights/mixed,
+/turf/open/floor/plasteel/yellow/side{
+	dir = 6
+	},
+/area/mining_construction)
 "aUd" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /obj/structure/cable/yellow{
@@ -27931,26 +27983,37 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/obj/machinery/light{
-	dir = 1
+/obj/structure/cable/yellow{
+	icon_state = "1-4";
+	d1 = 1;
+	d2 = 4
 	},
-/turf/open/floor/plasteel/warning{
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/turf/open/floor/plasteel/yellow/side{
 	dir = 1
 	},
 /area/hallway/secondary/entry{
 	name = "Arrivals"
 	})
 "aWW" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
-	dir = 4
-	},
 /obj/machinery/status_display{
 	density = 0;
 	layer = 4;
 	pixel_x = 0;
 	pixel_y = 32
 	},
-/turf/open/floor/plasteel/warning{
+/obj/machinery/light{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
+	dir = 2
+	},
+/obj/structure/cable/yellow{
+	icon_state = "4-8";
+	d1 = 4;
+	d2 = 8
+	},
+/turf/open/floor/plasteel/yellow/corner{
 	dir = 1
 	},
 /area/hallway/secondary/entry{
@@ -28714,7 +28777,6 @@
 	pixel_x = 0;
 	pixel_y = -32
 	},
-/obj/machinery/light,
 /turf/open/floor/plasteel/warning,
 /area/hallway/secondary/entry{
 	name = "Arrivals"
@@ -28744,8 +28806,9 @@
 	name = "Arrivals"
 	})
 "aYv" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
-	dir = 4
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
+	dir = 8;
+	initialize_directions = 11
 	},
 /turf/open/floor/plasteel/warning/corner{
 	dir = 2
@@ -29813,6 +29876,12 @@
 	name = "Arrivals"
 	})
 "bad" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber{
+	dir = 1;
+	on = 1;
+	scrub_N2O = 0;
+	scrub_Toxins = 0
+	},
 /turf/open/floor/plasteel/warning{
 	dir = 6
 	},
@@ -90575,11 +90644,10 @@
 /turf/closed/wall/mineral/titanium/overspace,
 /area/shuttle/abandoned)
 "cZy" = (
-/turf/closed/wall/shuttle{
-	icon_state = "swall12";
-	dir = 2
+/turf/open/floor/plating/warnplate{
+	dir = 1
 	},
-/area/shuttle/abandoned)
+/area/shuttle/auxillary_base)
 "cZz" = (
 /turf/closed/wall/mineral/titanium,
 /area/shuttle/abandoned)
@@ -90589,8 +90657,10 @@
 /turf/open/floor/plating,
 /area/shuttle/abandoned)
 "cZB" = (
-/turf/closed/wall/mineral/titanium/nodiagonal,
-/area/shuttle/abandoned)
+/turf/open/floor/plating/warnplate{
+	dir = 5
+	},
+/area/shuttle/auxillary_base)
 "cZC" = (
 /obj/machinery/door/airlock/shuttle{
 	name = "recovery shuttle external airlock"
@@ -90618,23 +90688,20 @@
 	},
 /area/atmos)
 "cZE" = (
-/turf/closed/wall/shuttle{
-	icon_state = "swallc2";
-	dir = 2
+/turf/open/floor/plating/warnplate{
+	dir = 8
 	},
-/area/shuttle/abandoned)
+/area/shuttle/auxillary_base)
 "cZF" = (
-/turf/closed/wall/shuttle{
-	icon_state = "swall_s10";
-	dir = 2
-	},
-/area/shuttle/abandoned)
+/turf/open/floor/plating,
+/area/shuttle/auxillary_base)
 "cZG" = (
-/turf/closed/wall/shuttle{
-	icon_state = "swall13";
-	dir = 2
+/turf/open/floor/plating/warnplate{
+	dir = 4;
+	luminosity = 2;
+	initial_gas_mix = "o2=0.01;n2=0.01"
 	},
-/area/shuttle/abandoned)
+/area/shuttle/auxillary_base)
 "cZH" = (
 /obj/structure/shuttle/engine/propulsion{
 	icon_state = "propulsion_l";
@@ -90656,17 +90723,20 @@
 /turf/open/floor/mineral/titanium,
 /area/shuttle/abandoned)
 "cZJ" = (
-/turf/closed/wall/shuttle{
-	icon_state = "swall11";
-	dir = 2
+/obj/structure/sign/poster{
+	pixel_x = 32
 	},
-/area/shuttle/abandoned)
+/turf/open/floor/plating,
+/area/maintenance/fpmaint2{
+	name = "Port Maintenance"
+	})
 "cZK" = (
-/turf/closed/wall/shuttle{
-	icon_state = "swall3";
-	dir = 2
+/obj/machinery/light{
+	icon_state = "tube1";
+	dir = 4
 	},
-/area/shuttle/abandoned)
+/turf/open/floor/plating,
+/area/shuttle/auxillary_base)
 "cZL" = (
 /obj/structure/mirror{
 	pixel_x = 28;
@@ -90879,17 +90949,17 @@
 /turf/open/floor/plating/airless,
 /area/shuttle/abandoned)
 "daa" = (
-/turf/closed/wall/shuttle{
-	icon_state = "swall8";
-	dir = 2
+/obj/machinery/computer/shuttle/auxillary_base{
+	pixel_y = 0
 	},
-/area/shuttle/abandoned)
+/turf/closed/wall,
+/area/shuttle/auxillary_base)
 "dab" = (
-/turf/closed/wall/shuttle{
-	icon_state = "swall7";
-	dir = 2
+/obj/machinery/light{
+	dir = 8
 	},
-/area/shuttle/abandoned)
+/turf/open/floor/plating,
+/area/shuttle/auxillary_base)
 "dac" = (
 /obj/machinery/door/airlock/shuttle{
 	name = "bathroom"
@@ -91118,10 +91188,11 @@
 /turf/open/floor/mineral/titanium,
 /area/shuttle/abandoned)
 "dau" = (
-/turf/closed/wall/shuttle{
-	icon_state = "swall2"
-	},
-/area/shuttle/abandoned)
+/obj/effect/spawner/lootdrop/maintenance,
+/turf/open/floor/plating,
+/area/maintenance/fpmaint2{
+	name = "Port Maintenance"
+	})
 "dav" = (
 /obj/machinery/portable_atmospherics/canister/oxygen,
 /obj/effect/decal/cleanable/dirt{
@@ -91155,11 +91226,10 @@
 /turf/open/floor/plasteel/bot,
 /area/shuttle/abandoned)
 "daz" = (
-/turf/closed/wall/shuttle{
-	icon_state = "swall1";
-	dir = 2
+/turf/open/floor/plating/warnplate{
+	dir = 10
 	},
-/area/shuttle/abandoned)
+/area/shuttle/auxillary_base)
 "daA" = (
 /obj/machinery/door/airlock/shuttle{
 	name = "bathroom"
@@ -91195,17 +91265,13 @@
 /turf/open/floor/mineral/titanium/blue,
 /area/shuttle/abandoned)
 "daD" = (
-/turf/closed/wall/shuttle{
-	icon_state = "swallc4";
-	dir = 2
-	},
-/area/shuttle/abandoned)
+/turf/open/floor/plating/warnplate,
+/area/shuttle/auxillary_base)
 "daE" = (
-/turf/closed/wall/shuttle{
-	icon_state = "swall4";
-	dir = 2
-	},
-/area/shuttle/abandoned)
+/obj/structure/grille,
+/obj/structure/window/reinforced/fulltile,
+/turf/open/floor/plating,
+/area/mining_construction)
 "daF" = (
 /obj/machinery/door/airlock/shuttle{
 	name = "recovery shuttle interior airlock"
@@ -91221,11 +91287,15 @@
 /turf/open/floor/mineral/titanium/blue,
 /area/shuttle/abandoned)
 "daG" = (
-/turf/closed/wall/shuttle{
-	icon_state = "swallc3";
-	dir = 2
+/obj/machinery/door/airlock/external{
+	cyclelinkeddir = 1;
+	name = "Construction Zone";
+	req_access = null;
+	req_access_txt = "0";
+	req_one_access_txt = "0"
 	},
-/area/shuttle/abandoned)
+/turf/open/floor/plating,
+/area/mining_construction)
 "daH" = (
 /obj/machinery/door/airlock/shuttle{
 	name = "cargo bay"
@@ -91671,11 +91741,16 @@
 /turf/open/floor/mineral/titanium/blue,
 /area/shuttle/abandoned)
 "dby" = (
-/turf/closed/wall/shuttle{
-	icon_state = "swall_s5";
-	dir = 2
+/obj/machinery/atmospherics/components/unary/vent_scrubber{
+	dir = 4;
+	on = 1;
+	scrub_N2O = 0;
+	scrub_Toxins = 0
 	},
-/area/shuttle/abandoned)
+/turf/open/floor/plasteel/yellow/side{
+	dir = 1
+	},
+/area/mining_construction)
 "dbz" = (
 /obj/machinery/vending/snack{
 	pixel_x = -1;
@@ -91777,11 +91852,13 @@
 /turf/open/floor/mineral/titanium/blue,
 /area/shuttle/abandoned)
 "dbL" = (
-/turf/closed/wall/shuttle{
-	icon_state = "swall_s9";
-	dir = 2
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+	dir = 10
 	},
-/area/shuttle/abandoned)
+/turf/open/floor/plasteel/yellow/side{
+	dir = 1
+	},
+/area/mining_construction)
 "dbM" = (
 /obj/item/weapon/storage/bag/plants/portaseeder,
 /obj/structure/table,
@@ -92220,22 +92297,27 @@
 /turf/open/floor/mineral/titanium,
 /area/shuttle/abandoned)
 "dcy" = (
-/turf/closed/wall/shuttle{
-	icon_state = "swall7";
-	dir = 2
+/obj/machinery/atmospherics/components/unary/vent_pump{
+	on = 1
 	},
-/area/shuttle/escape)
+/turf/open/floor/plasteel/yellow/side{
+	dir = 1
+	},
+/area/mining_construction)
 "dcz" = (
 /obj/structure/grille,
 /obj/structure/window/shuttle,
 /turf/open/floor/plating,
 /area/shuttle/escape)
 "dcA" = (
-/turf/closed/wall/shuttle{
-	icon_state = "swall12";
-	dir = 2
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/structure/cable/yellow{
+	d1 = 2;
+	d2 = 4;
+	icon_state = "2-4"
 	},
-/area/shuttle/escape)
+/turf/open/floor/plasteel/yellow/side,
+/area/mining_construction)
 "dcB" = (
 /obj/machinery/door/airlock/shuttle{
 	name = "Emergency Shuttle Airlock"
@@ -92268,17 +92350,24 @@
 /turf/open/floor/mineral/titanium/blue,
 /area/shuttle/escape)
 "dcE" = (
-/turf/closed/wall/shuttle{
-	icon_state = "swall8";
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/structure/cable/yellow{
+	icon_state = "4-8";
+	d1 = 4;
+	d2 = 8
+	},
+/obj/structure/mining_shuttle_beacon{
 	dir = 2
 	},
-/area/shuttle/escape)
+/turf/open/floor/plasteel/yellow/side,
+/area/mining_construction)
 "dcF" = (
-/turf/closed/wall/shuttle{
-	icon_state = "swall3";
-	dir = 2
+/obj/machinery/door/poddoor/shutters{
+	id = "aux_base_shutters";
+	name = "Auxillary Base Shutters"
 	},
-/area/shuttle/escape)
+/turf/open/floor/plasteel/delivery,
+/area/mining_construction)
 "dcG" = (
 /obj/structure/tank_dispenser/oxygen{
 	layer = 2.7;
@@ -92372,17 +92461,24 @@
 /turf/open/floor/mineral/titanium/blue,
 /area/shuttle/escape)
 "dcJ" = (
-/turf/closed/wall/shuttle{
-	icon_state = "swall4";
-	dir = 2
+/obj/machinery/door/airlock/engineering{
+	cyclelinkeddir = 1;
+	name = "Auxillary Base Construction";
+	req_access_txt = "0";
+	req_one_access_txt = "32;47;48"
 	},
-/area/shuttle/escape)
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/structure/cable/yellow{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2"
+	},
+/turf/open/floor/plasteel,
+/area/mining_construction)
 "dcK" = (
-/obj/structure/sign/bluecross_2,
-/turf/closed/wall/shuttle{
-	icon_state = "swall2"
-	},
-/area/shuttle/escape)
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/turf/closed/wall,
+/area/mining_construction)
 "dcL" = (
 /obj/structure/table,
 /obj/item/stack/medical/gauze,
@@ -92537,20 +92633,30 @@
 /turf/closed/wall/mineral/titanium,
 /area/shuttle/escape)
 "ddc" = (
-/turf/closed/wall/shuttle{
-	icon_state = "swall1"
+/obj/structure/chair,
+/obj/machinery/light{
+	dir = 1
 	},
-/area/shuttle/escape)
+/turf/open/floor/plasteel/warning{
+	dir = 1
+	},
+/area/hallway/secondary/entry{
+	name = "Arrivals"
+	})
 "ddd" = (
 /obj/structure/sign/nosmoking_2,
 /turf/closed/wall/mineral/titanium,
 /area/shuttle/escape)
 "dde" = (
-/turf/closed/wall/shuttle{
-	icon_state = "swall_s10";
-	dir = 2
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
 	},
-/area/shuttle/escape)
+/turf/open/floor/plasteel/yellow/corner{
+	dir = 4
+	},
+/area/hallway/secondary/entry{
+	name = "Arrivals"
+	})
 "ddf" = (
 /obj/structure/chair,
 /turf/open/floor/mineral/titanium,
@@ -92607,11 +92713,20 @@
 /turf/open/floor/mineral/titanium/blue,
 /area/shuttle/escape)
 "ddn" = (
-/turf/closed/wall/shuttle{
-	icon_state = "swall11";
-	dir = 2
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
 	},
-/area/shuttle/escape)
+/obj/structure/cable/yellow{
+	icon_state = "4-8";
+	d1 = 4;
+	d2 = 8
+	},
+/turf/open/floor/plasteel/warning{
+	dir = 1
+	},
+/area/hallway/secondary/entry{
+	name = "Arrivals"
+	})
 "ddo" = (
 /obj/structure/sign/bluecross_2,
 /turf/closed/wall/mineral/titanium,
@@ -102559,11 +102674,11 @@ aaa
 aaa
 aaa
 aaa
-aaW
-bnn
-aSJ
-aSJ
-aSJ
+aaa
+aaa
+aaa
+aaa
+aaa
 aaa
 aaa
 aaf
@@ -102815,11 +102930,11 @@ aaa
 aaa
 aaa
 aaa
-aQb
-aQb
-aQb
-aSK
-aTS
+aaa
+aaW
+bnn
+aSJ
+aSJ
 aSJ
 aWM
 aYo
@@ -103071,11 +103186,11 @@ aaa
 aaa
 aaa
 aaa
-cWl
-aOz
-cWs
-cWF
-aSL
+aaa
+aQb
+aQb
+aQb
+aSK
 aTT
 aVr
 aWN
@@ -103328,12 +103443,12 @@ aaa
 aaa
 aaa
 aaa
-aaa
-aQb
-aQb
-aQb
-aSK
-aTU
+cWl
+aOz
+cWs
+cWF
+aSL
+bum
 aVs
 aWO
 aYq
@@ -103584,12 +103699,12 @@ aaf
 aaf
 aaa
 aaa
-aaf
 aaa
 aaa
-aaZ
-bnn
-aSJ
+aQb
+aQb
+aQb
+aSK
 aTV
 aSJ
 aWP
@@ -103838,18 +103953,18 @@ aaf
 aaf
 aaa
 aaa
-aDr
-aDr
-aDr
-aDr
-aGd
-aGd
-aDr
-aDr
-aDr
-aDr
+aaa
+aaa
+aaa
+aaa
+aaf
+aaa
+aaZ
+bnn
 aSJ
-aWQ
+aSJ
+aSJ
+ddc
 aYr
 aSJ
 aaa
@@ -104092,19 +104207,19 @@ aoa
 aoa
 aoa
 aoa
-aDr
-aDr
-aDr
-aDr
-aIO
-aKl
-aLA
-aHF
-aHF
-aHF
-aLA
-aHG
-aTW
+aaf
+aoa
+aaa
+aaf
+aaa
+aaa
+aaf
+aaf
+aaf
+aaf
+aaa
+aaf
+aaf
 aSJ
 aWR
 aYq
@@ -104350,19 +104465,19 @@ aoa
 aaf
 aoa
 aDs
-aEM
 aDs
-aHC
-aIO
-aHF
-aHF
-aHF
-aHF
-aHF
-aIO
-aIO
-aIO
-aVt
+aDs
+aDs
+aDs
+aDs
+aDs
+aDs
+aDs
+aDs
+aDs
+aDs
+aDs
+aDs
 aWO
 aYq
 bab
@@ -104606,20 +104721,20 @@ aoa
 azx
 aoa
 aoa
+aDs
 aDr
-aDr
-aDr
-aHD
-aIO
-aHF
-aHF
-aHF
-aHF
-aHF
-aHF
+cZE
+cZE
+cZE
+cZE
+cZE
+cZE
+cZE
+daz
+daE
 aSN
 aTX
-aSJ
+aDs
 aWS
 aYq
 aYo
@@ -104863,20 +104978,20 @@ aoa
 aoa
 aaf
 aai
-aag
-aaf
-aDr
-aHE
-aHF
-aHF
-aHF
-aHF
-aOB
-aHF
-aHF
+aDs
+cZy
+cZF
+cZF
+cZF
+cZF
+cZF
+cZF
+cZF
+daD
+daE
 aSO
 aTY
-aSJ
+dcF
 aWT
 aYs
 aYp
@@ -105120,22 +105235,22 @@ ayv
 aoa
 aaf
 aaa
-aaa
-aaf
-aGd
-aHF
-aHF
-aHF
-aHF
-aHF
-aHC
-aHF
-aHF
-aSP
-aTZ
-aVu
-aWU
-aYt
+aDs
+cZy
+cZF
+cZF
+cZF
+cZF
+cZF
+cZF
+cZF
+daD
+daE
+aSO
+aTY
+dcF
+aWT
+bxI
 aYq
 bbz
 aYo
@@ -105377,23 +105492,23 @@ aoa
 aoa
 aoa
 aaf
-aaf
-aaf
-aGd
-aHF
-aHF
-aHF
-aLB
-aHF
-aHF
-aHF
-aHF
-aHF
+aDs
+cZy
+cZF
+cZF
+cZF
+cZK
+cZF
+cZF
+cZF
+daD
+daE
+dby
 aIO
-aVv
-aWT
-aYu
-bac
+aDs
+dde
+bxI
+aYq
 bbA
 aYo
 bew
@@ -105634,20 +105749,20 @@ aaf
 aoa
 aoa
 aaf
-aaa
-aaf
-aGd
-aHG
+aDs
+cZy
+cZF
+cZF
 aHF
-aHF
-aHF
-aHF
-aOC
-aHF
-aHF
-aHF
-aIO
-aSJ
+daa
+cZF
+cZF
+cZF
+daD
+daG
+dbL
+dcA
+dcJ
 aWV
 aYv
 bad
@@ -105891,20 +106006,20 @@ aaf
 aaf
 aaf
 aaf
-aaf
-aaf
-aDr
-aHH
-aHF
-aHF
-aLC
-aHF
-aOD
-aHF
-aRk
-aHF
-aIO
-aSJ
+aDs
+cZy
+cZF
+cZF
+cZF
+dab
+cZF
+cZF
+cZF
+daD
+daE
+dcy
+dcE
+dcK
 aWW
 aYw
 aYo
@@ -106147,22 +106262,22 @@ alQ
 aaf
 aaa
 aaf
-alQ
-alQ
-alQ
-aDr
-aHI
-aHF
-aHF
-aHF
-aHF
-aOD
-aHF
-aHF
-aHF
+aaa
+aDs
+cZy
+cZF
+cZF
+cZF
+cZF
+cZF
+cZF
+cZF
+daD
+daE
+aSO
 aUa
-aSJ
-aWT
+aDs
+ddn
 aYw
 bab
 bby
@@ -106405,21 +106520,21 @@ aaf
 aaf
 alQ
 alQ
-aDt
-aMz
-aDr
-aHJ
-aIO
-aIO
-aHF
-aHF
-aOE
-aQd
-aRl
-aRl
+aDs
+cZy
+cZF
+cZF
+cZF
+cZF
+cZF
+cZF
+cZF
+daD
+daE
+aSO
 aUb
-aVw
-aWX
+aDs
+ddn
 aYw
 aYo
 aYo
@@ -106662,20 +106777,20 @@ alQ
 aiv
 alQ
 alI
-aDu
-aoj
-aDr
-aHK
-aIO
-aIO
-aIO
-aNk
-aOF
+aDs
+cZB
+cZG
+cZG
+cZG
+cZG
+cZG
+cZG
+cZG
 aQe
-aRm
+daE
 aSQ
 aUc
-aSJ
+aDs
 aWY
 aYx
 bae
@@ -106919,20 +107034,20 @@ alI
 auR
 aqS
 alI
-aku
-aoj
-aDr
-aDr
-aIP
-aIO
-aLD
-aDr
-aDr
-aDr
-aDr
-aDr
-aDr
-aSJ
+aDs
+aDs
+aDs
+aDs
+aDs
+aDs
+aDs
+aDs
+aDs
+aDs
+aDs
+aDs
+aDs
+aDs
 aWZ
 aYy
 baf
@@ -107177,16 +107292,16 @@ awf
 awf
 aJS
 awf
-aEO
-aGe
-aDr
-aDr
-aKm
-aDr
-aDr
-anf
-aqU
-aRn
+bBG
+avY
+awf
+awf
+awf
+awf
+awf
+awf
+awf
+awf
 awf
 aUd
 aVx
@@ -107434,16 +107549,16 @@ ana
 alQ
 aiv
 alQ
-aEP
-aGf
-awf
-awf
-aKn
-aJS
-aNl
-awf
-aQf
-axg
+bRZ
+aDt
+cZJ
+aoj
+aoj
+dau
+auS
+aku
+aDu
+alI
 aSR
 aUe
 alQ
diff --git a/_maps/map_files/TgStation/tgstation.2.1.3.dmm b/_maps/map_files/TgStation/tgstation.2.1.3.dmm
index eab81182fa2..8a6f1fa1229 100644
--- a/_maps/map_files/TgStation/tgstation.2.1.3.dmm
+++ b/_maps/map_files/TgStation/tgstation.2.1.3.dmm
@@ -7391,13 +7391,8 @@
 /turf/closed/wall/mineral/titanium/overspace,
 /area/shuttle/pod_2)
 "apJ" = (
-/turf/open/space,
-/turf/closed/wall/shuttle{
-	dir = 2;
-	icon_state = "swall_f10";
-	layer = 2
-	},
-/area/shuttle/pod_2)
+/turf/closed/wall,
+/area/mining_construction)
 "apK" = (
 /obj/structure/grille,
 /obj/structure/window/shuttle,
@@ -7412,15 +7407,17 @@
 /turf/open/floor/plasteel/floorgrime,
 /area/maintenance/fpmaint2)
 "apM" = (
+/obj/machinery/atmospherics/components/unary/portables_connector/visible,
 /obj/machinery/light/small{
 	dir = 1
 	},
 /turf/open/floor/plasteel/floorgrime,
 /area/maintenance/fpmaint2)
 "apN" = (
-/obj/machinery/atmospherics/components/unary/portables_connector/visible,
-/turf/open/floor/plasteel/floorgrime,
-/area/maintenance/fpmaint2)
+/turf/open/floor/plating/warnplate{
+	dir = 9
+	},
+/area/shuttle/auxillary_base)
 "apO" = (
 /obj/machinery/atmospherics/components/unary/portables_connector/visible{
 	dir = 1
@@ -7808,12 +7805,10 @@
 /turf/closed/wall/mineral/titanium,
 /area/shuttle/pod_2)
 "aqI" = (
-/obj/docking_port/stationary/random{
-	id = "pod_asteroid1";
-	name = "asteroid"
+/turf/open/floor/plating/warnplate{
+	dir = 1
 	},
-/turf/open/space,
-/area/space)
+/area/shuttle/auxillary_base)
 "aqJ" = (
 /obj/machinery/door/airlock/external{
 	cyclelinkeddir = 2;
@@ -7839,16 +7834,14 @@
 	icon_state = "intact";
 	dir = 10
 	},
+/obj/machinery/meter,
 /turf/open/floor/plating,
 /area/maintenance/fpmaint2)
 "aqN" = (
-/obj/machinery/meter,
-/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{
-	icon_state = "intact";
-	dir = 4
+/turf/open/floor/plating/warnplate{
+	dir = 5
 	},
-/turf/open/floor/plating,
-/area/maintenance/fpmaint2)
+/area/shuttle/auxillary_base)
 "aqO" = (
 /obj/structure/closet,
 /obj/effect/spawner/lootdrop/maintenance{
@@ -8153,42 +8146,21 @@
 /turf/closed/wall/r_wall,
 /area/hallway/secondary/entry)
 "arC" = (
-/obj/docking_port/stationary/random{
-	id = "pod_asteroid2";
-	name = "asteroid"
+/turf/open/floor/plating/warnplate{
+	dir = 8
 	},
-/turf/open/space,
-/area/space)
+/area/shuttle/auxillary_base)
 "arD" = (
-/obj/structure/chair{
-	dir = 1
-	},
-/obj/machinery/status_display{
-	density = 0;
-	layer = 3;
-	pixel_x = 32;
-	pixel_y = 0
-	},
-/obj/machinery/computer/shuttle/pod{
-	pixel_x = -32;
-	possible_destinations = "pod_asteroid1";
-	shuttleId = "pod1"
-	},
-/turf/open/floor/mineral/titanium/blue,
-/area/shuttle/pod_1)
-"arE" = (
-/obj/structure/grille,
-/obj/structure/sign/securearea{
-	desc = "A warning sign which reads 'EXTERNAL AIRLOCK'";
-	icon_state = "space";
-	layer = 4;
-	name = "EXTERNAL AIRLOCK";
-	pixel_x = 0;
-	pixel_y = 32
-	},
-/obj/structure/window/reinforced/fulltile,
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2)
+/area/shuttle/auxillary_base)
+"arE" = (
+/obj/machinery/atmospherics/components/unary/vent_pump{
+	on = 1
+	},
+/turf/open/floor/plasteel/yellow/side{
+	dir = 8
+	},
+/area/mining_construction)
 "arF" = (
 /obj/machinery/atmospherics/pipe/simple/supplymain/hidden{
 	icon_state = "intact";
@@ -8616,54 +8588,42 @@
 /turf/open/floor/plasteel/airless,
 /area/space/nearstation)
 "asD" = (
-/obj/structure/shuttle/engine/propulsion/burst,
-/turf/closed/wall/mineral/titanium,
-/area/shuttle/pod_1)
+/turf/open/floor/plating/warnplate{
+	dir = 4;
+	luminosity = 2;
+	initial_gas_mix = "o2=0.01;n2=0.01"
+	},
+/area/shuttle/auxillary_base)
 "asE" = (
 /turf/closed/wall,
 /area/hallway/secondary/entry)
 "asF" = (
+/obj/structure/grille,
+/obj/structure/window/reinforced/fulltile,
 /turf/open/floor/plating,
-/obj/structure/shuttle/engine/propulsion/burst,
-/turf/closed/wall/shuttle{
-	icon_state = "swall_f9";
-	dir = 2
-	},
-/area/shuttle/pod_1)
+/area/mining_construction)
 "asG" = (
-/obj/machinery/door/airlock/shuttle{
-	name = "Escape Pod Airlock"
-	},
-/obj/docking_port/mobile/pod{
-	id = "pod1";
-	name = "escape pod 1";
-	port_angle = 180
-	},
-/turf/open/floor/mineral/titanium/blue,
-/area/shuttle/pod_1)
-"asH" = (
-/obj/structure/shuttle/engine/propulsion/burst,
-/turf/closed/wall/mineral/titanium,
-/area/shuttle/pod_2)
-"asI" = (
+/obj/machinery/light,
 /turf/open/floor/plating,
-/obj/structure/shuttle/engine/propulsion/burst,
-/turf/closed/wall/shuttle{
-	icon_state = "swall_f9";
-	dir = 2
+/area/shuttle/auxillary_base)
+"asH" = (
+/obj/structure/closet/toolcloset,
+/turf/open/floor/plasteel/yellow/side{
+	dir = 9
 	},
-/area/shuttle/pod_2)
+/area/mining_construction)
+"asI" = (
+/obj/structure/closet/toolcloset,
+/turf/open/floor/plasteel/yellow/side{
+	dir = 1
+	},
+/area/mining_construction)
 "asJ" = (
-/obj/machinery/door/airlock/shuttle{
-	name = "Escape Pod Airlock"
+/obj/structure/reagent_dispensers/fueltank,
+/turf/open/floor/plasteel/yellow/side{
+	dir = 5
 	},
-/obj/docking_port/mobile/pod{
-	id = "pod2";
-	name = "escape pod 2";
-	port_angle = 180
-	},
-/turf/open/floor/mineral/titanium/blue,
-/area/shuttle/pod_2)
+/area/mining_construction)
 "asK" = (
 /obj/structure/cable{
 	d1 = 4;
@@ -8790,16 +8750,17 @@
 /turf/open/floor/wood,
 /area/lawoffice)
 "atb" = (
-/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance{
-	lootcount = 2;
-	name = "2maintenance loot spawner"
+/obj/structure/table,
+/obj/item/stack/sheet/plasteel{
+	amount = 10
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+/obj/item/stack/rods{
+	amount = 50
+	},
+/turf/open/floor/plasteel/yellow/side{
 	dir = 4
 	},
-/turf/open/floor/plating,
-/area/maintenance/fpmaint2)
+/area/mining_construction)
 "atc" = (
 /obj/structure/chair/office/dark,
 /obj/effect/landmark/start{
@@ -8872,25 +8833,24 @@
 	},
 /area/crew_quarters/sleep)
 "atk" = (
-/obj/structure/reagent_dispensers/watertank,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
-	dir = 4
+/obj/machinery/camera{
+	c_tag = "Auxillary Mining Base";
+	dir = 8
 	},
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2)
+/area/shuttle/auxillary_base)
 "atl" = (
-/obj/structure/reagent_dispensers/fueltank,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
-	dir = 4
+/obj/machinery/computer/shuttle/auxillary_base{
+	pixel_y = 0
 	},
-/turf/open/floor/plating,
-/area/maintenance/fpmaint2)
+/turf/closed/wall,
+/area/shuttle/auxillary_base)
 "atm" = (
 /turf/open/floor/wood,
 /area/crew_quarters/sleep)
 "atn" = (
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
-	dir = 1
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+	dir = 6
 	},
 /turf/closed/wall,
 /area/maintenance/fpmaint2)
@@ -8902,17 +8862,15 @@
 /turf/open/floor/carpet,
 /area/security/hos)
 "atp" = (
-/obj/structure/cable{
-	d1 = 1;
-	d2 = 2;
-	icon_state = "1-2"
+/obj/machinery/door/airlock/external{
+	cyclelinkeddir = 1;
+	name = "Construction Zone";
+	req_access = null;
+	req_access_txt = "0";
+	req_one_access_txt = "0"
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2)
+/area/mining_construction)
 "atq" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
@@ -9043,13 +9001,10 @@
 /turf/open/floor/bluegrid,
 /area/maintenance/electrical)
 "atI" = (
-/obj/machinery/door/airlock/external{
-	cyclelinkeddir = 2;
-	name = "Escape Pod One";
-	shuttledocked = 1
+/turf/open/floor/plasteel/yellow/side{
+	dir = 8
 	},
-/turf/open/floor/plating,
-/area/hallway/secondary/entry)
+/area/mining_construction)
 "atJ" = (
 /obj/machinery/space_heater,
 /turf/open/floor/plating,
@@ -9168,26 +9123,15 @@
 	},
 /area/crew_quarters/fitness)
 "aub" = (
-/obj/structure/cable{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8"
-	},
-/obj/machinery/light/small,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
-	dir = 6
-	},
-/turf/open/floor/plating,
-/area/maintenance/fpmaint2)
-"auc" = (
-/obj/structure/cable{
-	d1 = 2;
-	d2 = 4;
-	icon_state = "2-4"
-	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plating,
-/area/maintenance/fpmaint2)
+/turf/open/floor/plasteel/yellow/side,
+/area/mining_construction)
+"auc" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/turf/open/floor/plasteel/yellow/side{
+	dir = 10
+	},
+/area/mining_construction)
 "aud" = (
 /obj/structure/cable{
 	d1 = 4;
@@ -9195,7 +9139,7 @@
 	icon_state = "4-8";
 	pixel_y = 0
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
 	},
 /turf/open/floor/plating,
@@ -9286,7 +9230,8 @@
 	d2 = 8;
 	icon_state = "1-8"
 	},
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
 	},
 /turf/open/floor/plating,
@@ -9517,15 +9462,8 @@
 /turf/open/floor/plasteel/floorgrime,
 /area/maintenance/electrical)
 "auN" = (
-/obj/machinery/light/small{
-	dir = 8
-	},
-/obj/machinery/camera{
-	c_tag = "Arrivals Escape Pod 1";
-	dir = 1
-	},
-/turf/open/floor/plating,
-/area/hallway/secondary/entry)
+/turf/open/floor/plating/warnplate,
+/area/shuttle/auxillary_base)
 "auO" = (
 /obj/structure/closet/emcloset,
 /turf/open/floor/plating,
@@ -9534,15 +9472,8 @@
 /turf/open/floor/plating,
 /area/hallway/secondary/entry)
 "auQ" = (
-/obj/machinery/light/small{
-	dir = 8
-	},
-/obj/machinery/camera{
-	c_tag = "Arrivals Escape Pod 2";
-	dir = 1
-	},
-/turf/open/floor/plating,
-/area/hallway/secondary/entry)
+/turf/open/floor/plasteel,
+/area/mining_construction)
 "auR" = (
 /obj/machinery/light{
 	icon_state = "tube1";
@@ -9765,17 +9696,13 @@
 /turf/closed/wall,
 /area/maintenance/electrical)
 "avp" = (
-/obj/machinery/door/airlock/maintenance{
-	req_access_txt = "12"
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/machinery/door/poddoor/shutters{
+	id = "aux_base_shutters";
+	name = "Auxillary Base Shutters"
 	},
-/obj/structure/cable{
-	d1 = 1;
-	d2 = 2;
-	icon_state = "1-2"
-	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/turf/open/floor/plating,
-/area/maintenance/fpmaint2)
+/turf/open/floor/plasteel/delivery,
+/area/mining_construction)
 "avq" = (
 /obj/structure/cable{
 	d1 = 1;
@@ -9985,11 +9912,26 @@
 /turf/closed/wall,
 /area/hallway/secondary/entry)
 "avQ" = (
-/obj/machinery/door/airlock/external{
-	name = "Escape Pod Two"
+/obj/machinery/airalarm{
+	dir = 8;
+	icon_state = "alarm0";
+	pixel_x = 24
 	},
-/turf/open/floor/plating,
-/area/hallway/secondary/entry)
+/obj/machinery/light{
+	icon_state = "tube1";
+	dir = 4
+	},
+/obj/machinery/camera{
+	c_tag = "Auxillary Base Construction";
+	dir = 8
+	},
+/obj/structure/mining_shuttle_beacon{
+	dir = 2
+	},
+/turf/open/floor/plasteel/yellow/side{
+	dir = 4
+	},
+/area/mining_construction)
 "avR" = (
 /obj/structure/table/wood,
 /obj/item/weapon/storage/firstaid/regular,
@@ -10535,8 +10477,8 @@
 /obj/machinery/light{
 	dir = 1
 	},
-/turf/open/floor/plasteel,
-/area/hallway/secondary/entry)
+/turf/open/floor/plating,
+/area/shuttle/auxillary_base)
 "awY" = (
 /obj/machinery/light{
 	dir = 1
@@ -10563,21 +10505,38 @@
 /turf/open/floor/plating,
 /area/maintenance/electrical)
 "axb" = (
+/obj/structure/cable{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2";
+	pixel_y = 0
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+	dir = 9
+	},
 /turf/open/floor/plasteel/arrival{
 	dir = 5
 	},
 /area/hallway/secondary/entry)
 "axc" = (
-/obj/machinery/atmospherics/components/unary/vent_scrubber{
-	dir = 4;
-	on = 1;
-	scrub_N2O = 0;
-	scrub_Toxins = 0
+/obj/structure/rack{
+	dir = 4
 	},
-/turf/open/floor/plasteel/warning{
-	dir = 1
+/obj/item/weapon/electronics/airlock,
+/obj/item/weapon/electronics/airlock,
+/obj/item/weapon/electronics/airlock,
+/obj/item/weapon/electronics/airlock,
+/obj/item/stack/cable_coil,
+/obj/item/stack/cable_coil,
+/obj/item/wallframe/camera,
+/obj/item/wallframe/camera,
+/obj/item/wallframe/camera,
+/obj/item/wallframe/camera,
+/obj/item/device/assault_pod/mining,
+/turf/open/floor/plasteel/yellow/side{
+	dir = 4
 	},
-/area/hallway/secondary/entry)
+/area/mining_construction)
 "axd" = (
 /mob/living/simple_animal/mouse,
 /turf/open/floor/plating,
@@ -10601,12 +10560,15 @@
 /turf/open/floor/plating,
 /area/maintenance/fpmaint2)
 "axh" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber{
+	dir = 4;
+	on = 1;
+	scrub_N2O = 0;
+	scrub_Toxins = 0
+	},
 /obj/machinery/light{
 	dir = 1
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
-	dir = 4
-	},
 /turf/open/floor/plasteel/arrival{
 	dir = 1
 	},
@@ -10850,27 +10812,18 @@
 	},
 /area/hallway/secondary/entry)
 "axH" = (
-/obj/machinery/atmospherics/components/unary/vent_pump{
-	dir = 1;
-	external_pressure_bound = 101.325;
-	on = 1;
-	pressure_checks = 1
-	},
-/turf/open/floor/plasteel/arrival{
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
+/turf/open/floor/plasteel/yellow/side{
 	dir = 1
 	},
 /area/hallway/secondary/entry)
 "axI" = (
-/obj/structure/cable{
-	d1 = 1;
-	d2 = 2;
-	icon_state = "1-2"
-	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
-	dir = 9
+	dir = 4
 	},
-/turf/open/floor/plasteel/arrival{
-	dir = 1
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/turf/open/floor/plasteel/yellow/corner{
+	dir = 4
 	},
 /area/hallway/secondary/entry)
 "axJ" = (
@@ -11117,43 +11070,37 @@
 	},
 /area/hallway/secondary/entry)
 "ayo" = (
-/obj/structure/cable{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8";
-	pixel_y = 0
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
 	},
 /turf/open/floor/plasteel/warning/corner{
 	dir = 1
 	},
 /area/hallway/secondary/entry)
 "ayp" = (
-/obj/structure/cable{
-	d1 = 1;
-	d2 = 4;
-	icon_state = "1-4"
-	},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
 /turf/open/floor/plasteel/warning,
 /area/hallway/secondary/entry)
 "ayq" = (
-/obj/structure/cable{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8";
-	pixel_y = 0
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/turf/open/floor/plasteel/yellow/side{
+	dir = 8
 	},
-/turf/open/floor/plasteel,
-/area/hallway/secondary/entry)
+/area/mining_construction)
 "ayr" = (
-/obj/structure/cable{
-	d1 = 2;
-	d2 = 8;
-	icon_state = "2-8"
-	},
 /obj/structure/extinguisher_cabinet{
 	pixel_x = 27;
 	pixel_y = 0
 	},
+/obj/structure/cable{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2";
+	pixel_y = 0
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
 /turf/open/floor/plasteel/arrival{
 	dir = 4
 	},
@@ -13181,8 +13128,20 @@
 /turf/closed/wall/mineral/titanium,
 /area/shuttle/arrival)
 "aCT" = (
-/turf/closed/wall/mineral/titanium/overspace,
-/area/shuttle/arrival)
+/obj/structure/table,
+/obj/item/stack/sheet/metal{
+	amount = 50
+	},
+/obj/item/stack/sheet/metal{
+	amount = 50
+	},
+/obj/item/stack/sheet/glass{
+	amount = 50
+	},
+/turf/open/floor/plasteel/yellow/side{
+	dir = 4
+	},
+/area/mining_construction)
 "aCU" = (
 /obj/machinery/door/airlock/shuttle{
 	name = "Arrivals Shuttle Airlock"
@@ -13195,19 +13154,18 @@
 /turf/open/floor/plating,
 /area/shuttle/arrival)
 "aCW" = (
-/turf/open/space,
-/turf/closed/wall/shuttle{
-	dir = 2;
-	icon_state = "swall_f10";
-	layer = 2
-	},
-/area/shuttle/arrival)
+/obj/structure/reagent_dispensers/watertank,
+/obj/effect/spawner/lootdrop/maintenance,
+/turf/open/floor/plating,
+/area/maintenance/fpmaint2)
 "aCX" = (
-/turf/closed/wall/shuttle{
-	icon_state = "swall14";
-	dir = 2
+/obj/machinery/atmospherics/components/unary/vent_scrubber{
+	on = 1;
+	scrub_N2O = 0;
+	scrub_Toxins = 0
 	},
-/area/shuttle/arrival)
+/turf/open/floor/plasteel,
+/area/mining_construction)
 "aCY" = (
 /obj/machinery/computer/security,
 /obj/structure/reagent_dispensers/peppertank{
@@ -13869,11 +13827,10 @@
 /turf/open/floor/mineral/titanium/blue,
 /area/shuttle/arrival)
 "aEp" = (
-/turf/closed/wall/shuttle{
-	icon_state = "swall11";
-	dir = 2
+/turf/open/floor/plating/warnplate{
+	dir = 10
 	},
-/area/shuttle/arrival)
+/area/shuttle/auxillary_base)
 "aEq" = (
 /obj/machinery/computer/arcade,
 /turf/open/floor/mineral/titanium/blue,
@@ -14427,11 +14384,10 @@
 /turf/open/floor/mineral/titanium/blue,
 /area/shuttle/arrival)
 "aFD" = (
-/turf/closed/wall/shuttle{
-	icon_state = "swall1";
-	dir = 2
+/turf/open/floor/plating/warnplate{
+	dir = 6
 	},
-/area/shuttle/arrival)
+/area/shuttle/auxillary_base)
 "aFE" = (
 /obj/structure/chair{
 	dir = 8
@@ -15947,11 +15903,21 @@
 /turf/open/floor/mineral/titanium/blue,
 /area/shuttle/arrival)
 "aIH" = (
-/turf/closed/wall/shuttle{
-	icon_state = "swall2";
-	dir = 2
+/obj/structure/table,
+/obj/item/weapon/storage/box/lights/mixed,
+/obj/item/weapon/pipe_dispenser,
+/obj/machinery/button/door{
+	id = "aux_base_shutters";
+	name = "Public Shutters Control";
+	pixel_x = 24;
+	pixel_y = 0;
+	req_access_txt = "0";
+	req_one_access_txt = "32;47;48"
 	},
-/area/shuttle/arrival)
+/turf/open/floor/plasteel/yellow/side{
+	dir = 6
+	},
+/area/mining_construction)
 "aII" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	on = 1;
@@ -16565,12 +16531,26 @@
 	},
 /area/chapel/main)
 "aKf" = (
-/turf/open/space,
-/turf/closed/wall/shuttle{
-	icon_state = "swall_f5";
-	dir = 2
+/obj/structure/cable{
+	icon_state = "0-4";
+	d2 = 4
 	},
-/area/shuttle/arrival)
+/obj/machinery/power/apc{
+	dir = 8;
+	name = "Auxillary Base Construction APC";
+	pixel_x = -24;
+	pixel_y = 0
+	},
+/obj/structure/cable{
+	d1 = 2;
+	d2 = 4;
+	icon_state = "2-4"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+	dir = 6
+	},
+/turf/open/floor/plating,
+/area/mining_construction)
 "aKg" = (
 /obj/structure/closet/emcloset,
 /turf/open/floor/mineral/titanium/blue,
@@ -17105,18 +17085,21 @@
 /turf/open/floor/plating,
 /area/shuttle/arrival)
 "aLt" = (
-/turf/open/space,
-/turf/closed/wall/shuttle{
-	icon_state = "swall_f9";
-	dir = 2
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
+	dir = 4
 	},
-/area/shuttle/arrival)
+/turf/closed/wall,
+/area/maintenance/fpmaint2)
 "aLu" = (
-/turf/closed/wall/shuttle{
-	icon_state = "swall13";
-	dir = 2
+/obj/machinery/door/airlock/engineering{
+	cyclelinkeddir = 1;
+	name = "Auxillary Base Construction";
+	req_access_txt = "0";
+	req_one_access_txt = "32;47;48"
 	},
-/area/shuttle/arrival)
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/turf/open/floor/plasteel,
+/area/mining_construction)
 "aLv" = (
 /obj/machinery/firealarm{
 	dir = 8;
@@ -20189,15 +20172,11 @@
 "aTs" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /turf/closed/wall,
-/area/security/vacantoffice{
-	name = "Vacant Office A"
-	})
+/area/security/vacantoffice)
 "aTt" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /turf/closed/wall,
-/area/security/vacantoffice{
-	name = "Vacant Office A"
-	})
+/area/security/vacantoffice)
 "aTu" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4;
@@ -20494,15 +20473,11 @@
 	dir = 8
 	},
 /turf/open/floor/wood,
-/area/security/vacantoffice{
-	name = "Vacant Office A"
-	})
+/area/security/vacantoffice)
 "aUm" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /turf/open/floor/wood,
-/area/security/vacantoffice{
-	name = "Vacant Office A"
-	})
+/area/security/vacantoffice)
 "aUn" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 6
@@ -20599,9 +20574,7 @@
 	network = list("SS13")
 	},
 /turf/open/floor/wood,
-/area/security/vacantoffice{
-	name = "Vacant Office A"
-	})
+/area/security/vacantoffice)
 "aUz" = (
 /obj/machinery/hydroponics/constructable,
 /obj/machinery/airalarm{
@@ -20615,9 +20588,7 @@
 /obj/structure/table/wood,
 /obj/item/device/flashlight/lamp,
 /turf/open/floor/wood,
-/area/security/vacantoffice{
-	name = "Vacant Office A"
-	})
+/area/security/vacantoffice)
 "aUB" = (
 /obj/structure/bookcase/random/adult,
 /turf/open/floor/wood,
@@ -20705,36 +20676,26 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /turf/open/floor/wood,
-/area/security/vacantoffice{
-	name = "Vacant Office A"
-	})
+/area/security/vacantoffice)
 "aUO" = (
 /turf/open/floor/wood,
-/area/security/vacantoffice{
-	name = "Vacant Office A"
-	})
+/area/security/vacantoffice)
 "aUP" = (
 /obj/machinery/airalarm{
 	frequency = 1439;
 	pixel_y = 23
 	},
 /turf/open/floor/wood,
-/area/security/vacantoffice{
-	name = "Vacant Office A"
-	})
+/area/security/vacantoffice)
 "aUQ" = (
 /obj/structure/table/wood,
 /turf/open/floor/wood,
-/area/security/vacantoffice{
-	name = "Vacant Office A"
-	})
+/area/security/vacantoffice)
 "aUR" = (
 /obj/structure/table/wood,
 /obj/item/weapon/pen/red,
 /turf/open/floor/wood,
-/area/security/vacantoffice{
-	name = "Vacant Office A"
-	})
+/area/security/vacantoffice)
 "aUS" = (
 /obj/structure/disposalpipe/segment,
 /obj/structure/cable{
@@ -20774,9 +20735,7 @@
 /obj/structure/table/wood,
 /obj/item/device/flashlight/lamp/green,
 /turf/open/floor/wood,
-/area/security/vacantoffice{
-	name = "Vacant Office A"
-	})
+/area/security/vacantoffice)
 "aUX" = (
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden{
 	dir = 8
@@ -21351,9 +21310,7 @@
 	dir = 4
 	},
 /turf/open/floor/wood,
-/area/security/vacantoffice{
-	name = "Vacant Office A"
-	})
+/area/security/vacantoffice)
 "aWg" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 5
@@ -21369,9 +21326,7 @@
 	dir = 8
 	},
 /turf/open/floor/wood,
-/area/security/vacantoffice{
-	name = "Vacant Office A"
-	})
+/area/security/vacantoffice)
 "aWj" = (
 /obj/structure/grille,
 /obj/structure/window{
@@ -21409,9 +21364,7 @@
 	pixel_y = 0
 	},
 /turf/open/floor/wood,
-/area/security/vacantoffice{
-	name = "Vacant Office A"
-	})
+/area/security/vacantoffice)
 "aWn" = (
 /obj/structure/closet/wardrobe/black,
 /obj/item/clothing/shoes/jackboots,
@@ -21446,9 +21399,7 @@
 	on = 1
 	},
 /turf/open/floor/carpet,
-/area/security/vacantoffice{
-	name = "Vacant Office A"
-	})
+/area/security/vacantoffice)
 "aWs" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 4;
@@ -21457,17 +21408,13 @@
 	scrub_Toxins = 0
 	},
 /turf/open/floor/carpet,
-/area/security/vacantoffice{
-	name = "Vacant Office A"
-	})
+/area/security/vacantoffice)
 "aWt" = (
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
 	dir = 4
 	},
 /turf/open/floor/wood,
-/area/security/vacantoffice{
-	name = "Vacant Office A"
-	})
+/area/security/vacantoffice)
 "aWu" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 6
@@ -22151,9 +22098,7 @@
 /area/security/detectives_office)
 "aXL" = (
 /turf/open/floor/carpet,
-/area/security/vacantoffice{
-	name = "Vacant Office A"
-	})
+/area/security/vacantoffice)
 "aXM" = (
 /obj/structure/disposalpipe/segment{
 	dir = 4
@@ -22173,9 +22118,7 @@
 	},
 /obj/structure/filingcabinet/chestdrawer,
 /turf/open/floor/wood,
-/area/security/vacantoffice{
-	name = "Vacant Office A"
-	})
+/area/security/vacantoffice)
 "aXO" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber{
 	dir = 1;
@@ -22250,9 +22193,7 @@
 	dir = 4
 	},
 /turf/open/floor/wood,
-/area/security/vacantoffice{
-	name = "Vacant Office A"
-	})
+/area/security/vacantoffice)
 "aXY" = (
 /obj/structure/chair/office/dark,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
@@ -22260,17 +22201,13 @@
 	dir = 4
 	},
 /turf/open/floor/wood,
-/area/security/vacantoffice{
-	name = "Vacant Office A"
-	})
+/area/security/vacantoffice)
 "aXZ" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
 	},
 /turf/open/floor/carpet,
-/area/security/vacantoffice{
-	name = "Vacant Office A"
-	})
+/area/security/vacantoffice)
 "aYa" = (
 /obj/machinery/power/apc{
 	dir = 8;
@@ -22326,9 +22263,7 @@
 	dir = 4
 	},
 /turf/open/floor/wood,
-/area/security/vacantoffice{
-	name = "Vacant Office A"
-	})
+/area/security/vacantoffice)
 "aYe" = (
 /obj/machinery/light_switch{
 	pixel_y = 28
@@ -22818,9 +22753,7 @@
 /obj/item/weapon/folder/blue,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /turf/open/floor/wood,
-/area/security/vacantoffice{
-	name = "Vacant Office A"
-	})
+/area/security/vacantoffice)
 "aZo" = (
 /obj/structure/sink{
 	dir = 4;
@@ -23370,9 +23303,7 @@
 /obj/structure/table/wood,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /turf/open/floor/wood,
-/area/security/vacantoffice{
-	name = "Vacant Office A"
-	})
+/area/security/vacantoffice)
 "baI" = (
 /obj/machinery/atmospherics/components/unary/vent_pump{
 	dir = 4;
@@ -23386,9 +23317,7 @@
 	pixel_y = -29
 	},
 /turf/open/floor/wood,
-/area/security/vacantoffice{
-	name = "Vacant Office A"
-	})
+/area/security/vacantoffice)
 "baK" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -37475,11 +37404,18 @@
 /turf/open/floor/plating,
 /area/maintenance/asmaint2)
 "bEJ" = (
-/turf/closed/wall/shuttle{
-	icon_state = "swall12";
-	dir = 2
+/obj/machinery/door/airlock/maintenance{
+	req_access_txt = "12"
 	},
-/area/shuttle/labor)
+/obj/structure/cable{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2";
+	pixel_y = 0
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/turf/open/floor/plating,
+/area/maintenance/fpmaint2)
 "bEK" = (
 /obj/machinery/computer/security/mining,
 /obj/machinery/camera{
@@ -52297,12 +52233,13 @@
 /turf/open/floor/plating,
 /area/maintenance/asmaint2)
 "ckq" = (
-/turf/open/space,
-/turf/closed/wall/shuttle{
-	dir = 8;
-	icon_state = "diagonalWall3"
+/obj/structure/shuttle/engine/propulsion/burst{
+	tag = "icon-propulsion (WEST)";
+	icon_state = "propulsion";
+	dir = 8
 	},
-/area/shuttle/syndicate)
+/turf/closed/wall/mineral/titanium,
+/area/shuttle/pod_2)
 "ckr" = (
 /obj/structure/reagent_dispensers/fueltank,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
@@ -52864,11 +52801,13 @@
 /turf/open/floor/plating,
 /area/maintenance/aft)
 "clB" = (
-/obj/machinery/door/airlock/external{
-	req_access_txt = "13"
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+	dir = 4
 	},
-/turf/open/floor/plating,
-/area/maintenance/aft)
+/turf/open/floor/plasteel/yellow/corner{
+	dir = 1
+	},
+/area/hallway/secondary/entry)
 "clC" = (
 /obj/structure/cable{
 	d1 = 1;
@@ -54592,8 +54531,13 @@
 /turf/closed/wall/mineral/titanium,
 /area/shuttle/pod_4)
 "cpe" = (
-/turf/closed/wall/mineral/titanium/overspace,
-/area/shuttle/pod_4)
+/obj/docking_port/stationary/random{
+	dir = 8;
+	id = "pod_asteroid2";
+	name = "asteroid"
+	},
+/turf/open/space,
+/area/space)
 "cpf" = (
 /obj/machinery/telecomms/allinone{
 	intercept = 1
@@ -54888,34 +54832,37 @@
 /turf/open/floor/mineral/titanium/blue,
 /area/shuttle/pod_4)
 "cpK" = (
+/obj/machinery/computer/shuttle/pod{
+	pixel_x = 0;
+	pixel_y = -32;
+	possible_destinations = "pod_asteroid2";
+	shuttleId = "pod2"
+	},
 /obj/structure/chair{
-	dir = 1
+	dir = 8
 	},
 /obj/machinery/status_display{
 	density = 0;
 	layer = 3;
-	pixel_x = 32;
-	pixel_y = 0
-	},
-/obj/machinery/computer/shuttle/pod{
-	pixel_x = -32;
-	possible_destinations = "pod_asteroid2";
-	shuttleId = "pod2"
+	pixel_x = 0;
+	pixel_y = 32
 	},
 /turf/open/floor/mineral/titanium/blue,
 /area/shuttle/pod_2)
 "cpL" = (
-/obj/structure/chair{
-	dir = 1
+/obj/item/weapon/storage/pod{
+	pixel_x = 6;
+	pixel_y = -28
 	},
 /obj/item/device/radio/intercom{
-	pixel_x = 25
+	pixel_x = 0;
+	pixel_y = 25
 	},
-/obj/item/weapon/storage/pod{
-	pixel_x = -26
+/obj/structure/chair{
+	dir = 8
 	},
 /turf/open/floor/mineral/titanium/blue,
-/area/shuttle/pod_1)
+/area/shuttle/pod_2)
 "cpM" = (
 /obj/structure/grille,
 /obj/structure/window/shuttle,
@@ -55203,22 +55150,26 @@
 /turf/open/floor/plating,
 /area/engine/engineering)
 "cqq" = (
-/turf/open/floor/plating,
-/obj/structure/shuttle/engine/propulsion/burst{
-	dir = 4
+/obj/machinery/door/airlock/shuttle{
+	name = "Escape Pod Airlock"
 	},
-/turf/closed/wall/shuttle{
-	icon_state = "swall_f5";
-	dir = 2
+/obj/docking_port/mobile/pod{
+	dir = 8;
+	id = "pod2";
+	name = "escape pod 2";
+	port_angle = 180
 	},
-/area/shuttle/pod_4)
+/turf/open/floor/mineral/titanium/blue,
+/area/shuttle/pod_2)
 "cqr" = (
-/turf/open/space,
-/turf/closed/wall/shuttle{
-	icon_state = "swall_f9";
-	dir = 2
+/obj/machinery/atmospherics/components/unary/vent_pump{
+	dir = 4;
+	on = 1
 	},
-/area/shuttle/pod_4)
+/turf/open/floor/plasteel/warning/corner{
+	dir = 1
+	},
+/area/hallway/secondary/entry)
 "cqs" = (
 /obj/structure/sign/fire{
 	pixel_x = 0;
@@ -55686,14 +55637,19 @@
 /turf/open/floor/plating,
 /area/shuttle/escape)
 "cry" = (
-/turf/closed/wall/mineral/titanium/overspace,
-/area/shuttle/escape)
-"crz" = (
-/turf/closed/wall/shuttle{
-	icon_state = "swall_s10";
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
+/turf/open/floor/plasteel/warning/corner{
 	dir = 2
 	},
-/area/shuttle/escape)
+/area/hallway/secondary/entry)
+"crz" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
+/turf/open/floor/plasteel/warning,
+/area/hallway/secondary/entry)
 "crA" = (
 /obj/structure/transit_tube/station{
 	dir = 8;
@@ -58349,11 +58305,17 @@
 /turf/open/floor/mineral/titanium,
 /area/shuttle/escape)
 "cwH" = (
-/turf/open/floor/plasteel/shuttle/white,
-/turf/closed/wall/shuttle/interior{
-	icon_state = "swall_f5"
+/obj/structure/cable{
+	d1 = 1;
+	d2 = 2;
+	icon_state = "1-2";
+	pixel_y = 0
 	},
-/area/shuttle/escape)
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
+	dir = 4
+	},
+/turf/open/floor/plating,
+/area/maintenance/fpmaint2)
 "cwI" = (
 /turf/closed/wall/mineral/titanium,
 /area/shuttle/escape)
@@ -58424,23 +58386,29 @@
 /turf/open/floor/mineral/titanium,
 /area/shuttle/escape)
 "cwT" = (
-/turf/closed/wall/shuttle{
-	icon_state = "swall13";
-	dir = 2
+/obj/machinery/camera{
+	c_tag = "Arrivals Escape Pod 2";
+	dir = 8
 	},
-/area/shuttle/escape)
+/obj/machinery/light/small,
+/turf/open/floor/plating,
+/area/hallway/secondary/entry)
 "cwU" = (
-/turf/closed/wall/shuttle{
-	icon_state = "swall12";
-	dir = 2
+/obj/structure/shuttle/engine/propulsion/burst{
+	tag = "icon-propulsion (WEST)";
+	icon_state = "propulsion";
+	dir = 8
 	},
-/area/shuttle/escape)
+/turf/closed/wall/mineral/titanium,
+/area/shuttle/pod_1)
 "cwV" = (
-/turf/closed/wall/shuttle{
-	icon_state = "swall14";
-	dir = 2
+/obj/docking_port/stationary/random{
+	dir = 8;
+	id = "pod_asteroid1";
+	name = "asteroid"
 	},
-/area/shuttle/escape)
+/turf/open/space,
+/area/space)
 "cwW" = (
 /obj/machinery/status_display,
 /turf/closed/wall/mineral/titanium,
@@ -58540,11 +58508,23 @@
 /turf/open/floor/plasteel/showroomfloor,
 /area/security/warden)
 "cxl" = (
-/turf/closed/wall/shuttle{
-	icon_state = "swall7";
-	dir = 2
+/obj/machinery/computer/shuttle/pod{
+	pixel_x = 0;
+	pixel_y = -32;
+	possible_destinations = "pod_asteroid1";
+	shuttleId = "pod1"
 	},
-/area/shuttle/escape)
+/obj/structure/chair{
+	dir = 8
+	},
+/obj/machinery/status_display{
+	density = 0;
+	layer = 3;
+	pixel_x = 0;
+	pixel_y = 32
+	},
+/turf/open/floor/mineral/titanium/blue,
+/area/shuttle/pod_1)
 "cxm" = (
 /turf/closed/wall/mineral/titanium/nodiagonal,
 /area/shuttle/escape)
@@ -58614,8 +58594,19 @@
 /turf/open/floor/plating,
 /area/shuttle/transport)
 "cxx" = (
-/turf/closed/wall/mineral/titanium/overspace,
-/area/shuttle/transport)
+/obj/item/weapon/storage/pod{
+	pixel_x = 6;
+	pixel_y = -28
+	},
+/obj/item/device/radio/intercom{
+	pixel_x = 0;
+	pixel_y = 25
+	},
+/obj/structure/chair{
+	dir = 8
+	},
+/turf/open/floor/mineral/titanium/blue,
+/area/shuttle/pod_1)
 "cxy" = (
 /turf/open/floor/mineral/titanium/blue,
 /turf/closed/wall/mineral/titanium/interior,
@@ -58665,11 +58656,17 @@
 /turf/open/floor/mineral/titanium/blue,
 /area/shuttle/transport)
 "cxF" = (
-/turf/open/floor/plasteel/shuttle,
-/turf/closed/wall/shuttle/interior{
-	icon_state = "swall_f10"
+/obj/machinery/door/airlock/shuttle{
+	name = "Escape Pod Airlock"
 	},
-/area/shuttle/transport)
+/obj/docking_port/mobile/pod{
+	dir = 8;
+	id = "pod1";
+	name = "escape pod 1";
+	port_angle = 180
+	},
+/turf/open/floor/mineral/titanium/blue,
+/area/shuttle/pod_1)
 "cxG" = (
 /obj/machinery/door/airlock/external{
 	cyclelinkeddir = 4;
@@ -58798,14 +58795,13 @@
 /turf/open/floor/plating/airless,
 /area/shuttle/escape)
 "cxY" = (
-/obj/machinery/door/airlock/external{
-	cyclelinkeddir = 1;
-	name = "External Access";
-	req_access = null;
-	req_access_txt = "13"
+/obj/machinery/camera{
+	c_tag = "Arrivals Escape Pod 1";
+	dir = 8
 	},
+/obj/machinery/light/small,
 /turf/open/floor/plating,
-/area/maintenance/fpmaint2)
+/area/hallway/secondary/entry)
 "cxZ" = (
 /obj/structure/shuttle/engine/propulsion,
 /turf/open/floor/plating/airless,
@@ -59449,17 +59445,8 @@
 /turf/open/floor/plating/airless,
 /area/maintenance/incinerator)
 "czK" = (
-/obj/structure/chair{
-	dir = 1
-	},
-/obj/item/device/radio/intercom{
-	pixel_x = 25
-	},
-/obj/item/weapon/storage/pod{
-	pixel_x = -26
-	},
-/turf/open/floor/mineral/titanium/blue,
-/area/shuttle/pod_2)
+/turf/closed/wall,
+/area/security/vacantoffice)
 "czL" = (
 /obj/machinery/computer/shuttle/pod{
 	pixel_y = -32;
@@ -67501,7 +67488,7 @@ aaa
 aaa
 aaa
 aaa
-aaa
+aae
 aaa
 aaa
 aaa
@@ -68000,6 +67987,7 @@ aaa
 aaa
 aaa
 aaa
+cpe
 aaa
 aaa
 aaa
@@ -68013,10 +68001,9 @@ aaa
 aaa
 aaa
 aaa
+cwV
 aaa
 aaa
-aae
-aaa
 aaa
 aaa
 aaa
@@ -68253,14 +68240,14 @@ aaa
 aaa
 aaa
 aaa
-aaa
-aaa
 aae
+aaf
 aaa
+aqH
+apK
+aqH
 aaa
 aaa
-aag
-aaa
 aae
 aaa
 aaa
@@ -68269,10 +68256,10 @@ aaa
 aaa
 aaa
 aaa
-aag
-aaa
-aaa
 aaa
+aqF
+apH
+aqF
 aaa
 aaa
 aaa
@@ -68511,13 +68498,11 @@ aaa
 aaa
 aaa
 aaa
-aaa
-aaa
-aaa
-aaa
-aaa
 aaf
 aaa
+aqH
+cpK
+aqH
 aaa
 aaa
 aaa
@@ -68526,10 +68511,12 @@ aaa
 aaa
 aaa
 aaa
-aaf
 aaa
 aaa
 aaa
+aqF
+cxl
+aqF
 aaa
 aaa
 aaa
@@ -68768,13 +68755,11 @@ aaa
 aaa
 aaa
 aaa
-aaa
-aaa
-aaa
-aaa
-aaa
 aaf
 aaa
+aqH
+cpL
+aqH
 aaa
 aaa
 aaa
@@ -68783,11 +68768,13 @@ aaa
 aaa
 aaa
 aaa
-aaf
 aaa
 aaa
 aaa
-aaf
+aqF
+cxx
+aqF
+aaa
 aaa
 aaa
 aaa
@@ -69020,18 +69007,18 @@ aaa
 aaa
 aaa
 aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
+aaf
 aaa
 aaa
 aaa
 aaa
 aaf
 aaa
+ckq
+cqq
+ckq
+aaa
+aaa
 aaa
 aCS
 aCV
@@ -69040,12 +69027,12 @@ aCV
 aCS
 aaa
 aaa
-aaf
 aaa
+cwU
+cxF
+cwU
 aaa
 aaa
-aaf
-aaa
 aaa
 aaa
 aaa
@@ -69276,18 +69263,18 @@ aaa
 aaa
 aaa
 aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
+aaf
+aaf
+aaf
+aaf
+aaf
 aaa
 aaf
+arB
+asE
+cyb
+asE
+arB
 aaa
 aaa
 aCS
@@ -69297,11 +69284,11 @@ aIG
 aCS
 aaa
 aaa
-aaf
-aaf
-aaa
-aaa
-aaf
+arB
+asE
+cyb
+asE
+arB
 aaa
 cxt
 cxD
@@ -69530,20 +69517,20 @@ aaa
 aaa
 aaa
 aaa
-aaa
-aaa
-aaf
-aaf
-aaf
-aaf
-aaf
-aaa
-aaa
-aaa
-aaf
-aaa
-aaa
-aaa
+apJ
+apJ
+apJ
+apJ
+apJ
+apJ
+apJ
+apJ
+apJ
+apJ
+apJ
+auO
+auP
+cwT
 aAC
 aaa
 aaa
@@ -69555,10 +69542,10 @@ aCS
 aaa
 aaa
 aAC
-aaf
-aaa
-aaa
-aaf
+auO
+auP
+cxY
+arB
 cxt
 cxy
 cxC
@@ -69787,19 +69774,19 @@ aaa
 aaa
 aaa
 aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-arB
-asE
-asE
-asE
-arB
-awW
-awW
+apJ
+apN
+arC
+arC
+arC
+arC
+arC
+arC
+arC
+aEp
+apJ
+avP
+cyb
 asE
 arB
 aaa
@@ -69813,8 +69800,8 @@ aCS
 aaa
 arB
 asE
-awW
-awW
+cyb
+avP
 arB
 cxu
 cxC
@@ -70043,19 +70030,19 @@ aaa
 aaa
 aaa
 aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aqF
-aqF
-aqF
-asD
-asE
+aaf
+apJ
+aqI
+arD
+arD
+arD
+arD
+arD
+arD
+arD
 auN
-asE
-awV
+apJ
+awY
 ayk
 awW
 aAD
@@ -70298,21 +70285,21 @@ aaa
 aaa
 aaa
 aaa
-aae
-aaa
-aaa
-aaa
 aaa
 aaa
+aaf
+apJ
 aqI
-apH
 arD
-cpL
-asG
-atI
-auP
-cyb
-awV
+arD
+arD
+arD
+arD
+arD
+arD
+auN
+apJ
+awZ
 ayl
 azy
 auP
@@ -70557,19 +70544,19 @@ aaa
 aaa
 aaa
 aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aqF
-aqF
-aqF
-asD
-asE
-auO
-avP
-awV
+aaf
+apJ
+aqI
+arD
+arD
+arD
+atk
+arD
+arD
+arD
+auN
+apJ
+awZ
 ayk
 awW
 awW
@@ -70815,19 +70802,19 @@ aaa
 aaa
 aaa
 aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-arB
-asE
-asE
-asE
-arB
+apJ
+aqI
+arD
+arD
+asG
+atl
 awX
-aym
+arD
+arD
+auN
+apJ
+awZ
+cqr
 azz
 aAF
 awW
@@ -71072,19 +71059,19 @@ aaa
 aaa
 aaa
 aaa
-aaa
-aaa
-aaa
-aaa
-aqH
-aqH
-aqH
-asH
-asE
-auQ
-asE
-awV
-ayl
+apJ
+aqI
+arD
+arD
+arD
+arD
+arD
+arD
+arD
+auN
+apJ
+awZ
+aIK
 ayl
 aAE
 awW
@@ -71329,19 +71316,19 @@ aaa
 aaa
 aaa
 aaa
-aaa
-aaa
-aaa
-arC
-apK
-cpK
-czK
-asJ
-atI
-auP
-cyb
-awV
-ayl
+apJ
+aqI
+arD
+arD
+arD
+arD
+arD
+arD
+arD
+auN
+apJ
+awZ
+aIK
 ayl
 aAH
 awW
@@ -71585,20 +71572,20 @@ aaa
 aaa
 aaa
 aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aqH
-aqH
-aqH
-asH
-asE
-auO
-avP
-axc
-ayn
+aaf
+apJ
+aqI
+arD
+arD
+arD
+arD
+arD
+arD
+arD
+auN
+apJ
+awZ
+cry
 azA
 aAG
 awW
@@ -71843,19 +71830,19 @@ aaa
 aaa
 aaa
 aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-arB
-asE
-asE
-asE
-arB
-axG
-ayk
+apJ
+aqN
+asD
+asD
+asD
+asD
+asD
+asD
+asD
+aFD
+apJ
+awZ
+crz
 awW
 awW
 awW
@@ -72100,19 +72087,19 @@ aaa
 aaa
 aaa
 aaa
-aaa
-aaa
-aaf
-aaf
-aaf
-aaf
-aaf
-alU
-atJ
-aqO
-alU
+apJ
+apJ
+apJ
+apJ
+asF
+atp
+asF
+asF
+asF
+asF
+apJ
 axh
-ayl
+aIK
 azy
 auP
 azy
@@ -72358,14 +72345,14 @@ aaa
 aaa
 aaa
 aaa
-aaa
-aaa
-aaa
-aag
-ali
+aaf
+aaf
+apJ
+asH
+atI
 arE
-ali
-axk
+ayq
+ayq
 auc
 avp
 axI
@@ -72617,14 +72604,14 @@ aaa
 aaa
 aaa
 aaa
-aaa
-aag
-aqJ
-amC
-cxY
-aAY
+asF
+asI
+auQ
+auQ
+auQ
+aCX
 aub
-auV
+aLu
 axH
 ayo
 azB
@@ -72874,16 +72861,16 @@ aaa
 aaa
 aaa
 aaa
-aaa
-aag
-ali
-ali
-ali
+apJ
+asJ
+avQ
+axc
+aCT
 atb
-asc
-alU
-awZ
-ayq
+aIH
+apJ
+clB
+aIK
 azC
 arB
 arB
@@ -73131,16 +73118,16 @@ aaa
 aaa
 aaa
 aaa
-aaa
-aaa
-aaa
-aaa
-ali
-atb
-asc
-alU
-awZ
-ayq
+apJ
+apJ
+apJ
+apJ
+apJ
+apJ
+apJ
+apJ
+axG
+aIK
 aym
 aAI
 aBH
@@ -73387,15 +73374,15 @@ aaa
 aaa
 aaa
 aaa
-aaa
-aaa
-aaa
-aaa
-aaa
-ali
-atl
-asc
+aaf
+aaf
+aaf
+aaf
 alU
+atJ
+amC
+aKf
+bEJ
 axb
 ayr
 azD
@@ -73645,16 +73632,16 @@ aae
 aaa
 aaa
 aaa
-aaa
-aaf
-aaf
+aag
 alU
 alU
-atk
+alU
+aCW
+amC
 aud
 alU
 alU
-alU
+atO
 alU
 alU
 aBI
@@ -73670,13 +73657,13 @@ aLw
 aLw
 aQI
 aNh
-aTq
-aTq
-aTq
-aTq
+czK
+czK
+czK
+czK
 aXX
-aTq
-aTq
+czK
+czK
 bbc
 beO
 beO
@@ -73902,16 +73889,16 @@ aaa
 aaa
 aaa
 aaa
-alU
-alU
-alU
-alU
+aag
+aqJ
+amC
+aqJ
 ase
-atp
+avq
 aum
 avq
 axJ
-axJ
+cwH
 axJ
 aAj
 aBK
@@ -73927,13 +73914,13 @@ aOj
 aPx
 aQJ
 ayl
-aTq
+czK
 aUO
 aUy
 aWm
 aWf
 aUQ
-aTq
+czK
 bhN
 bcl
 beQ
@@ -74160,12 +74147,12 @@ aaa
 aaa
 aaa
 alU
-apL
-aqK
+alU
+alU
 alU
 asc
 atn
-aue
+aLt
 aue
 aue
 aue
@@ -74417,8 +74404,8 @@ aaa
 aaa
 aaa
 alU
-apN
-aqL
+apL
+aqK
 alU
 asc
 atq
@@ -74441,13 +74428,13 @@ aNe
 aLz
 aQo
 aSb
-aTq
+czK
 aUQ
 aUA
 aWr
 aXZ
 aUQ
-aTq
+czK
 bbe
 beO
 beS
@@ -74675,7 +74662,7 @@ aaf
 alU
 alU
 apM
-aom
+aqL
 alU
 asc
 atq
@@ -74698,13 +74685,13 @@ aMP
 aPa
 aQn
 ayl
-aTq
+czK
 aUP
 aUO
 aXL
 aXZ
 aUO
-aTq
+czK
 bbe
 beO
 beR
@@ -74932,7 +74919,7 @@ aaa
 alU
 aoS
 amC
-aqN
+aom
 ank
 asc
 atq
@@ -74955,13 +74942,13 @@ aNf
 aLA
 aQD
 aSd
-aTq
+czK
 aUQ
 aUW
 aXL
 aXZ
 baJ
-aTq
+czK
 bbe
 beO
 beU
@@ -75212,13 +75199,13 @@ asE
 asE
 aQD
 ayl
-aTq
+czK
 aUl
 aUR
 aWs
 aXZ
 aUQ
-aTq
+czK
 bbf
 beT
 beT
@@ -75726,13 +75713,13 @@ aLB
 aLB
 aQK
 aSe
-aTq
+czK
 aUQ
 aUQ
 aXN
 aUO
 aUQ
-aTq
+czK
 bcI
 aPz
 bdt
diff --git a/code/modules/mining/mine_items.dm b/code/modules/mining/mine_items.dm
index 0ef623b7717..5719a095b1c 100644
--- a/code/modules/mining/mine_items.dm
+++ b/code/modules/mining/mine_items.dm
@@ -55,7 +55,7 @@
 	desc = "Used to call and send the mining shuttle."
 	circuit = /obj/item/weapon/circuitboard/computer/mining_shuttle
 	shuttleId = "mining"
-	possible_destinations = "mining_home;mining_away;mining_base"
+	possible_destinations = "mining_home;mining_away;landing_zone_dock"
 	no_destination_swap = 1
 	var/global/list/dumb_rev_heads = list()
 
@@ -532,10 +532,10 @@
 	shuttle_id = "colony_drop"
 	var/setting = FALSE
 	var/no_restrictions = FALSE //Badmin variable to let you drop the colony ANYWHERE.
-	dwidth = 11 //These dimensions are to be set by the mappers for their respective maps.
-	dheight = 0
-	width = 23
-	height = 23
+	dwidth = 4 //These dimensions are to be set by the mappers for their respective maps.
+	dheight = 4
+	width = 9
+	height = 9
 	lz_dir = 1
 
 /obj/item/device/assault_pod/mining/attack_self(mob/living/user)
@@ -554,7 +554,7 @@
 
 	user << "<span class='notice'>You begin setting the landing zone parameters...</span>"
 	setting = TRUE
-	if(!do_after(user, 50, target = src)) //You get a few seconds to cancel if you do not want to drop there.
+	if(!do_after(user, 50, target = user)) //You get a few seconds to cancel if you do not want to drop there.
 		setting = FALSE
 		return
 
@@ -589,6 +589,98 @@
 /obj/docking_port/mobile/auxillary_base
 	name = "auxillary base"
 	id = "colony_drop"
-	dwidth = 11
-	width = 23
-	height = 23
\ No newline at end of file
+	//Reminder to map-makers to set these values equal to the size of your base.
+	dheight = 4
+	dwidth = 4
+	width = 9
+	height = 9
+	var/anti_spam_cd = 0
+
+
+/obj/structure/mining_shuttle_beacon
+	name = "mining shuttle beacon"
+	anchored = 0
+	density = 0
+	var/shuttle_ID = "landing_zone_dock"
+	icon = 'icons/obj/objects.dmi'
+	icon_state = "miningbeacon" //Temp until proper sprite
+	var/obj/docking_port/stationary/Mport //Linked docking port for the mining shuttle
+	pressure_resistance = 200 //So it does not get blown into lava.
+	var/anti_spam_cd = 0 //The linking process might be a bit intensive, so this here to prevent over use.
+
+/obj/structure/mining_shuttle_beacon/attack_hand(mob/user)
+	if(anchored)
+		user << "<span class='warning'>Landing zone already set.</span>"
+		return
+
+	if(anti_spam_cd)
+		user << "<span class='warning'>[src] is currently recalibrating. Please wait.</span>"
+		return
+
+	anti_spam_cd = 1
+	addtimer(src, "clear_cooldown", 100)
+
+	var/turf/landing_spot = get_turf(src)
+
+	if(landing_spot.z != ZLEVEL_MINING)
+		user << "<span class='warning'>This device is only to be used in a mining zone.</span>"
+		return
+
+	if(!locate(/obj/machinery/computer/shuttle/auxillary_base) in view(src,15))
+		user << "<span class='warning'>The aux base console must be within view in order to interface.</span>"
+		return //It does not really interface with the base console, it just needs to be near.
+
+
+//Mining shuttles may not be created equal, so we find the map's shuttle dock and size accordingly.
+
+
+	for(var/S in SSshuttle.stationary)
+		var/obj/docking_port/stationary/SM = S //SM is declared outside so it can be checked for null
+		if(SM.id == "mining_home" || SM.id == "mining_away")
+			Mport = new(landing_spot)
+			Mport.id = "landing_zone_dock"
+			Mport.name = "landing zone dock"
+			Mport.dwidth = SM.dwidth
+			Mport.dheight = SM.dheight
+			Mport.width = SM.width
+			Mport.height = SM.height
+			Mport.setDir(dir)
+			break
+	if(!Mport)
+		user << "<span class='warning'>This station is not equipped with an approprite mining shuttle. Please contact Nanotrasen Support.</span>"
+		return
+	var/search_radius = max(Mport.width, Mport.height)/2
+	var/list/landing_areas = get_areas_in_range(search_radius, landing_spot)
+	for(var/area/shuttle/auxillary_base/AB in landing_areas) //You land NEAR the base, not IN it.
+		user << "<span class='warning'>The mining shuttle must not land within the mining base itself.</span>"
+		SSshuttle.stationary.Remove(Mport)
+		qdel(Mport)
+		return
+	var/obj/docking_port/mobile/mining_shuttle
+	for(var/S in SSshuttle.mobile)
+		var/obj/docking_port/mobile/MS = S
+		if(MS.id != "mining")
+			continue
+		mining_shuttle = MS
+
+	if(!mining_shuttle) //Not having a mining shuttle is a map issue
+		user << "<span class='warning'>No mining shuttle signal detected. Please contact Nanotrasen Support.</span>"
+		SSshuttle.stationary.Remove(Mport)
+		qdel(Mport)
+		return
+
+	if(!mining_shuttle.canDock(Mport))
+		user << "<span class='warning'>Unable to secure a valid docking zone. Please try again in an open area near, but not within the aux. mining base.</span>"
+		SSshuttle.stationary.Remove(Mport)
+		qdel(Mport)
+		return
+
+	user << "<span class='notice'>Mining shuttle calibration successful!</span>"
+	anchored = 1 //Locks in place to mark the landing zone.
+	playsound(src.loc, 'sound/machines/ping.ogg', 50, 0)
+
+/obj/structure/mining_shuttle_beacon/proc/clear_cooldown()
+	anti_spam_cd = 0
+
+/obj/structure/mining_shuttle_beacon/attack_robot(mob/user)
+	return (attack_hand(user)) //So borgies can help
\ No newline at end of file
diff --git a/icons/obj/objects.dmi b/icons/obj/objects.dmi
index 97ae900613c..505eae306ab 100644
Binary files a/icons/obj/objects.dmi and b/icons/obj/objects.dmi differ