Atlas bug fixes, minor shuttle refactor.

_maps/atlas.json

@@ -7,11 +7,13 @@
 	"run_mapping_tests": true,
 	"traits": [
 		{
-			"Gravity": 1
+			"Gravity": 1,
+			"Linkage": "Cross"
 		}
 	],
 	"shuttles": {
-		"emergency": "emergency_goon"
+		"emergency": "emergency_goon",
+		"cargo": "cargo_atlas"
 	},
 	"disable_headset_common": true
 }

_maps/map_files/Atlas/atlas.dmm

@@ -2356,7 +2356,6 @@
 /obj/structure/cable/yellow{
 	icon_state = "12"
 	},
-/obj/machinery/light/small/maintenance/directional/south,
 /obj/structure/cable/yellow{
 	icon_state = "10"
 	},
@@ -5096,7 +5095,7 @@
 "fqF" = (
 /obj/effect/turf_decal/bot,
 /obj/structure/reagent_dispensers/fueltank,
-/turf/open/floor/iron/white/white_large,
+/turf/open/floor/plating,
 /area/station/maintenance/starboard/greater)
 "fqW" = (
 /obj/effect/turf_decal/tile/neutral{
@@ -7213,14 +7212,6 @@
 	},
 /turf/open/floor/plating,
 /area/station/maintenance/port/aft)
-"hwF" = (
-/obj/structure/lattice/catwalk,
-/obj/machinery/camera/autoname/directional/west{
-	name = "cargo camera";
-	network = list("Cargo")
-	},
-/turf/open/space/basic,
-/area/space/nearstation)
 "hwP" = (
 /obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{
 	dir = 4
@@ -7826,10 +7817,6 @@
 	},
 /turf/open/floor/iron/ported/techfloor,
 /area/station/service/hydroponics)
-"hVY" = (
-/obj/effect/mapping_helpers/burnt_floor,
-/turf/open/floor/iron/white,
-/area/station/maintenance/starboard/greater)
 "hWJ" = (
 /obj/structure/table/wood/fancy,
 /obj/item/flashlight/lamp/green{
@@ -17481,7 +17468,7 @@
 "rxO" = (
 /obj/structure/closet/l3closet/virology,
 /obj/effect/turf_decal/bot,
-/turf/open/floor/iron/white/white_large,
+/turf/open/floor/plating,
 /area/station/maintenance/starboard/greater)
 "ryP" = (
 /obj/structure/cable/yellow{
@@ -19656,6 +19643,16 @@
 	},
 /turf/open/floor/plating,
 /area/station/maintenance/port/aft)
+"tOk" = (
+/obj/docking_port/stationary{
+	name = "Cargo Bay";
+	width = 12;
+	height = 7;
+	id = "supply_home";
+	dwidth = 6
+	},
+/turf/open/space/basic,
+/area/space/nearstation)
 "tOv" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -19723,7 +19720,7 @@
 "tQN" = (
 /obj/effect/turf_decal/bot,
 /obj/effect/spawner/random/structure/crate_loot,
-/turf/open/floor/iron/white/white_large,
+/turf/open/floor/plating,
 /area/station/maintenance/starboard/greater)
 "tRt" = (
 /obj/structure/overfloor_catwalk/iron_dark,
@@ -21468,8 +21465,8 @@
 /area/station/medical/medbay)
 "vFe" = (
 /obj/machinery/asteroid_magnet{
-	center_x = 87;
-	center_y = 94;
+	center_x = 94;
+	center_y = 89;
 	area_size = 6
 	},
 /obj/effect/turf_decal/delivery,
@@ -22652,14 +22649,6 @@
 	},
 /turf/open/floor/plating,
 /area/station/maintenance/port/aft)
-"wMi" = (
-/obj/structure/lattice/catwalk,
-/obj/machinery/camera/autoname/directional/east{
-	name = "cargo camera";
-	network = list("Cargo")
-	},
-/turf/open/space/basic,
-/area/space/nearstation)
 "wMC" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -45376,7 +45365,7 @@ bSM
 rQm
 rQm
 dpx
-vBF
+gUm
 gUm
 sGj
 dwn
@@ -46176,7 +46165,7 @@ xvH
 xvH
 xvH
 xvH
-wMi
+xvH
 xvH
 xvH
 xvH
@@ -46433,7 +46422,7 @@ xvH
 xvH
 xvH
 xvH
-wvh
+xvH
 xvH
 xvH
 xvH
@@ -47986,7 +47975,7 @@ xvH
 gDJ
 gDJ
 gDJ
-xvH
+vaQ
 gDJ
 gDJ
 vOe
@@ -48500,7 +48489,7 @@ xvH
 gDJ
 gDJ
 gDJ
-xvH
+vaQ
 gDJ
 gDJ
 vOe
@@ -50031,7 +50020,7 @@ xvH
 xvH
 xvH
 xvH
-wvh
+xvH
 xvH
 xvH
 xvH
@@ -50288,7 +50277,7 @@ xvH
 xvH
 xvH
 xvH
-hwF
+xvH
 xvH
 xvH
 xvH
@@ -53304,7 +53293,7 @@ vOe
 vOe
 vOe
 vOe
-qkY
+tOk
 sKQ
 uEr
 uEr
@@ -57463,7 +57452,7 @@ mkE
 nxZ
 iMn
 rxO
-hVY
+oDB
 vPR
 jiE
 rmv

_maps/shuttles/arrival_atlas.dmm

@@ -1,6 +1,6 @@
 //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
 "a" = (
-/turf/open/space/basic,
+/turf/template_noop,
 /area/template_noop)
 "b" = (
 /obj/structure/chair/comfy/shuttle{

_maps/shuttles/cargo_atlas.dmm

@@ -0,0 +1,185 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"b" = (
+/turf/closed/wall/mineral/titanium,
+/area/shuttle/supply)
+"e" = (
+/turf/open/floor/mineral/titanium/blue,
+/area/shuttle/supply)
+"f" = (
+/obj/machinery/conveyor{
+	dir = 4;
+	id = "QMLoad2"
+	},
+/obj/machinery/door/poddoor{
+	id = "QMLoaddoor2";
+	name = "supply dock loading door"
+	},
+/turf/open/floor/plating,
+/area/shuttle/supply)
+"g" = (
+/obj/docking_port/mobile/supply{
+	dwidth = 6
+	},
+/obj/machinery/door/airlock/titanium{
+	name = "Supply Shuttle Airlock";
+	req_access_txt = "31"
+	},
+/turf/open/floor/mineral/titanium/blue,
+/area/shuttle/supply)
+"h" = (
+/obj/machinery/button/door/directional/east{
+	id = "QMLoaddoor2";
+	name = "Loading Doors";
+	pixel_y = 8
+	},
+/obj/machinery/button/door/directional/east{
+	id = "QMLoaddoor";
+	name = "Loading Doors";
+	pixel_y = -8
+	},
+/obj/machinery/light/directional/east,
+/turf/open/floor/mineral/titanium/blue,
+/area/shuttle/supply)
+"j" = (
+/obj/machinery/conveyor{
+	dir = 8;
+	id = "QMLoad"
+	},
+/obj/machinery/door/poddoor{
+	id = "QMLoaddoor";
+	name = "supply dock loading door"
+	},
+/turf/open/floor/plating,
+/area/shuttle/supply)
+"l" = (
+/turf/closed/wall/mineral/titanium/interior,
+/area/shuttle/supply)
+"q" = (
+/obj/structure/window/reinforced{
+	dir = 1
+	},
+/obj/structure/shuttle/engine/heater,
+/turf/open/floor/plating/airless,
+/area/shuttle/supply)
+"s" = (
+/turf/template_noop,
+/area/template_noop)
+"t" = (
+/obj/structure/shuttle/engine/propulsion/burst/left,
+/turf/open/floor/plating/airless,
+/area/shuttle/supply)
+"u" = (
+/obj/structure/shuttle/engine/propulsion,
+/turf/open/floor/plating/airless,
+/area/shuttle/supply)
+"v" = (
+/obj/structure/shuttle/engine/propulsion/burst/right,
+/turf/open/floor/plating/airless,
+/area/shuttle/supply)
+"w" = (
+/obj/machinery/light/directional/north,
+/turf/open/floor/mineral/titanium/blue,
+/area/shuttle/supply)
+"x" = (
+/obj/machinery/light/directional/west,
+/turf/open/floor/mineral/titanium/blue,
+/area/shuttle/supply)
+
+(1,1,1) = {"
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+s
+"}
+(2,1,1) = {"
+b
+e
+e
+e
+e
+x
+e
+e
+e
+l
+b
+t
+"}
+(3,1,1) = {"
+b
+e
+e
+e
+e
+e
+e
+e
+e
+e
+q
+u
+"}
+(4,1,1) = {"
+b
+w
+e
+e
+e
+e
+e
+e
+e
+e
+q
+u
+"}
+(5,1,1) = {"
+b
+e
+e
+e
+e
+e
+e
+e
+e
+e
+q
+u
+"}
+(6,1,1) = {"
+b
+e
+e
+e
+e
+e
+h
+e
+e
+l
+b
+v
+"}
+(7,1,1) = {"
+b
+b
+b
+f
+b
+g
+b
+j
+b
+b
+b
+s
+"}