diff --git a/_maps/shuttles/~doppler_shuttles/salvage/salvage_fengzhou_patrol.dmm b/_maps/shuttles/~doppler_shuttles/salvage/salvage_fengzhou_patrol.dmm
new file mode 100644
index 00000000000000..cfd4c110cbb951
--- /dev/null
+++ b/_maps/shuttles/~doppler_shuttles/salvage/salvage_fengzhou_patrol.dmm
@@ -0,0 +1,967 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"cP" = (
+/obj/structure/shuttle_decoration/rcs/directional/north,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"dD" = (
+/obj/structure/railing/eva_handhold/directional/south,
+/obj/structure/railing/eva_handhold/directional/north,
+/obj/structure/marker_beacon/jade,
+/turf/open/floor/engine/anchor_jack,
+/area/shuttle/salvaged_shuttle)
+"ez" = (
+/obj/structure/shuttle_decoration/landing_engine/directional/south,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"eB" = (
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/primary_colour{
+	dir = 1
+	},
+/obj/structure/titanium_structure,
+/turf/open/floor/plating/nanocarbon/exterior/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"fI" = (
+/obj/structure/shuttle_decoration/landing_engine/directional/north,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"gM" = (
+/obj/structure/railing/eva_handhold/directional/south,
+/obj/structure/railing/eva_handhold/directional/north,
+/obj/structure/marker_beacon/yellow,
+/obj/effect/mapping_helpers/salvage_anchor/three,
+/turf/open/floor/engine/anchor_jack,
+/area/shuttle/salvaged_shuttle)
+"hx" = (
+/obj/structure/shuttle_decoration/radiator/directional/north,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"ik" = (
+/obj/structure/chair/comfy/shuttle{
+	dir = 4
+	},
+/obj/effect/spawner/random/salvage/interior_trash_n_debris,
+/turf/open/floor/iron/colony/texture/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"iz" = (
+/obj/effect/mapping_helpers/salvage_anchor/end/six,
+/turf/closed/wall/mineral/nanocarbon/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"iA" = (
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/primary_colour{
+	dir = 1
+	},
+/obj/structure/titanium_structure,
+/obj/structure/shuttle_decoration/wall_plate/armor,
+/turf/open/floor/plating/nanocarbon/exterior/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"jv" = (
+/obj/structure/shuttle_decoration/radiator/directional/north,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/black,
+/area/shuttle/salvaged_shuttle)
+"km" = (
+/obj/structure/shuttle_decoration/radiator/directional/south,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/black,
+/area/shuttle/salvaged_shuttle)
+"kO" = (
+/obj/structure/railing{
+	dir = 8
+	},
+/obj/effect/spawner/random/salvage/interior_trash_n_debris,
+/turf/open/floor/plating/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"nk" = (
+/obj/structure/railing/eva_handhold/directional/south,
+/obj/structure/railing/eva_handhold/directional/north,
+/obj/structure/marker_beacon/yellow,
+/obj/effect/mapping_helpers/salvage_anchor/seven,
+/turf/open/floor/engine/anchor_jack,
+/area/shuttle/salvaged_shuttle)
+"nN" = (
+/obj/structure/shuttle_decoration/console/directional/west,
+/obj/structure/shuttle_decoration/aux_engine/directional/east,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"nP" = (
+/turf/open/floor/plating/nanocarbon/exterior/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"pH" = (
+/obj/structure/railing{
+	dir = 1
+	},
+/obj/structure/shuttle_decoration/eva_catwalks/directional/north,
+/turf/open/floor/plating/nanocarbon/exterior/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"qp" = (
+/obj/structure/shuttle_decoration/rcs/directional/south,
+/obj/effect/mapping_helpers/salvage_anchor/end/two,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/black,
+/area/shuttle/salvaged_shuttle)
+"rb" = (
+/turf/open/floor/plating/aluminum,
+/area/shuttle/salvaged_shuttle)
+"rL" = (
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/primary_colour,
+/obj/structure/titanium_structure,
+/turf/open/floor/plating/nanocarbon/exterior/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"tC" = (
+/obj/effect/spawner/random/salvage/interior_trash_n_debris,
+/turf/open/floor/plating/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"vn" = (
+/obj/structure/shuttle_decoration/eva_catwalks/directional/north,
+/turf/open/floor/plating/nanocarbon/exterior/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"xx" = (
+/obj/machinery/power/shuttle_engine/propulsion/salvage{
+	dir = 8
+	},
+/obj/structure/engine_covers/thruster_nozzle{
+	dir = 8
+	},
+/turf/open/floor/plating/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"yi" = (
+/turf/open/floor/plating/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"yu" = (
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"zd" = (
+/obj/machinery/exoscanner/shuttle_part/radar_panel/directional/south,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"zm" = (
+/obj/structure/shuttle_decoration/liquid_tank/battery,
+/turf/open/floor/plating/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"Av" = (
+/obj/machinery/exoscanner/shuttle_part/radio_dish/directional/east,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/black,
+/area/shuttle/salvaged_shuttle)
+"BV" = (
+/turf/open/floor/plating/nanocarbon/exterior/black,
+/area/shuttle/salvaged_shuttle)
+"BW" = (
+/obj/structure/railing/eva_handhold/directional/south,
+/obj/structure/railing/eva_handhold/directional/north,
+/obj/structure/marker_beacon/yellow,
+/obj/effect/mapping_helpers/salvage_anchor/two,
+/turf/open/floor/engine/anchor_jack,
+/area/shuttle/salvaged_shuttle)
+"CC" = (
+/obj/structure/shuttle_decoration/wall_plate/armor,
+/obj/machinery/exoscanner/shuttle_part/sensors_blister/directional/south,
+/obj/effect/mapping_helpers/salvage_anchor/end/three,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/black,
+/area/shuttle/salvaged_shuttle)
+"CU" = (
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/black,
+/area/shuttle/salvaged_shuttle)
+"Du" = (
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/primary_colour,
+/obj/structure/titanium_structure,
+/obj/structure/shuttle_decoration/wall_plate/armor{
+	dir = 1
+	},
+/turf/open/floor/plating/nanocarbon/exterior/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"Dx" = (
+/obj/structure/window/fulltile/salvage_shuttle,
+/turf/open/floor/plating/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"Em" = (
+/obj/structure/shuttle_decoration/extinguisher/directional/south,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"Fz" = (
+/obj/structure/shuttle_decoration/wall_plate/armor/diagonal{
+	dir = 6
+	},
+/turf/closed/wall/mineral/nanocarbon/black,
+/area/shuttle/salvaged_shuttle)
+"Gu" = (
+/obj/structure/railing,
+/turf/open/floor/plating/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"HG" = (
+/obj/structure/shuttle_decoration/eva_catwalks/directional/west,
+/obj/effect/spawner/random/salvage/munitions/only_missiles,
+/turf/open/floor/plating/nanocarbon/exterior/black,
+/area/shuttle/salvaged_shuttle)
+"HR" = (
+/obj/structure/railing/eva_handhold/directional/south,
+/obj/structure/railing/eva_handhold/directional/north,
+/obj/structure/marker_beacon/yellow,
+/turf/open/floor/engine/anchor_jack,
+/area/shuttle/salvaged_shuttle)
+"IP" = (
+/obj/structure/shuttle_decoration/rcs/directional/north,
+/obj/effect/mapping_helpers/salvage_anchor/end/seven,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/black,
+/area/shuttle/salvaged_shuttle)
+"Jd" = (
+/obj/structure/shuttle_decoration/radiator/directional/south,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"Md" = (
+/obj/structure/shuttle_decoration/liquid_tank/reactor,
+/turf/open/floor/plating/aluminum,
+/area/shuttle/salvaged_shuttle)
+"Mn" = (
+/obj/structure/shuttle_decoration/rcs/directional/south,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/black,
+/area/shuttle/salvaged_shuttle)
+"MV" = (
+/obj/docking_port/mobile/salvage,
+/obj/structure/railing/eva_handhold/directional/south,
+/obj/structure/railing/eva_handhold/directional/north,
+/obj/structure/marker_beacon/yellow,
+/turf/open/floor/engine/anchor_jack,
+/area/shuttle/salvaged_shuttle)
+"NP" = (
+/obj/structure/railing,
+/obj/structure/shuttle_decoration/liquid_tank/explosive/hydrazine,
+/turf/open/floor/plating/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"Pp" = (
+/obj/structure/mineral_door/manual_colony_door/shuttle,
+/turf/open/floor/iron/colony/white/texture/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"Qv" = (
+/obj/structure/shuttle_access_panel,
+/turf/open/floor/plating/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"Qx" = (
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/secondary_colour{
+	dir = 1
+	},
+/obj/structure/shuttle_decoration/wall_plate/armor,
+/turf/open/floor/plating/nanocarbon/exterior/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"QB" = (
+/obj/structure/railing{
+	dir = 1
+	},
+/obj/structure/shuttle_decoration/liquid_tank/explosive/lithium,
+/turf/open/floor/plating/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"QT" = (
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/secondary_colour,
+/obj/structure/shuttle_decoration/wall_plate/armor{
+	dir = 1
+	},
+/turf/open/floor/plating/nanocarbon/exterior/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"RM" = (
+/obj/structure/shuttle_decoration/junction_box/directional/south,
+/obj/machinery/exoscanner/shuttle_part/radar_panel/directional/north,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"Tf" = (
+/obj/machinery/computer/old{
+	dir = 8
+	},
+/turf/open/floor/catwalk_floor/colony_fabricator/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"UN" = (
+/obj/structure/railing{
+	dir = 1
+	},
+/obj/effect/spawner/random/salvage/interior_trash_n_debris,
+/turf/open/floor/plating/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"UU" = (
+/obj/structure/shuttle_decoration/headlight/directional/east,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"UW" = (
+/obj/structure/railing/eva_handhold/directional/south,
+/obj/structure/railing/eva_handhold/directional/north,
+/obj/structure/marker_beacon/yellow,
+/obj/effect/mapping_helpers/salvage_anchor/six,
+/turf/open/floor/engine/anchor_jack,
+/area/shuttle/salvaged_shuttle)
+"VR" = (
+/obj/structure/railing{
+	dir = 1
+	},
+/obj/structure/shuttle_decoration/liquid_tank/explosive,
+/turf/open/floor/plating/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"Wc" = (
+/obj/machinery/power/shuttle_engine/heater/salvage{
+	dir = 8
+	},
+/obj/structure/engine_covers/heater_cover{
+	dir = 4
+	},
+/turf/open/floor/plating/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"Xt" = (
+/obj/structure/shuttle_decoration/ladder_black/directional/north,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"YC" = (
+/turf/template_noop,
+/area/template_noop)
+"YJ" = (
+/obj/effect/spawner/random/salvage/munitions/only_ammoboxes,
+/turf/open/floor/plating/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"Zy" = (
+/obj/structure/shuttle_decoration/junction_box/directional/north,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour,
+/area/shuttle/salvaged_shuttle)
+
+(1,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+"}
+(2,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+"}
+(3,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+"}
+(4,1,1) = {"
+YC
+dD
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+dD
+YC
+"}
+(5,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+"}
+(6,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+"}
+(7,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+"}
+(8,1,1) = {"
+YC
+nk
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+BW
+YC
+"}
+(9,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+"}
+(10,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+CU
+xx
+xx
+xx
+CU
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+"}
+(11,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+IP
+Wc
+Wc
+Wc
+qp
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+"}
+(12,1,1) = {"
+dD
+YC
+YC
+YC
+eB
+YC
+YC
+jv
+NP
+rb
+QB
+km
+YC
+YC
+rL
+YC
+YC
+YC
+dD
+"}
+(13,1,1) = {"
+YC
+YC
+YC
+YC
+iA
+HG
+HG
+hx
+NP
+Md
+VR
+Jd
+HG
+HG
+Du
+YC
+YC
+YC
+YC
+"}
+(14,1,1) = {"
+YC
+YC
+YC
+YC
+Qx
+BV
+BV
+RM
+Gu
+rb
+UN
+zd
+BV
+BV
+QT
+YC
+YC
+YC
+YC
+"}
+(15,1,1) = {"
+YC
+YC
+YC
+YC
+iA
+YC
+YC
+fI
+yu
+kO
+YJ
+ez
+YC
+YC
+Du
+YC
+YC
+YC
+YC
+"}
+(16,1,1) = {"
+HR
+YC
+YC
+YC
+YC
+YC
+YC
+pH
+Qv
+yi
+zm
+Em
+YC
+YC
+YC
+YC
+YC
+YC
+MV
+"}
+(17,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+vn
+Xt
+tC
+CU
+CU
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+"}
+(18,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+YC
+cP
+Pp
+yu
+nN
+CU
+Mn
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+"}
+(19,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+YC
+Dx
+ik
+Zy
+nP
+CU
+CC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+"}
+(20,1,1) = {"
+dD
+YC
+YC
+YC
+YC
+YC
+Dx
+Tf
+Dx
+YC
+Av
+Fz
+YC
+YC
+YC
+YC
+YC
+YC
+dD
+"}
+(21,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+YC
+iz
+Dx
+UU
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+"}
+(22,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+"}
+(23,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+"}
+(24,1,1) = {"
+YC
+UW
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+gM
+YC
+"}
+(25,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+"}
+(26,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+"}
+(27,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+"}
+(28,1,1) = {"
+YC
+dD
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+dD
+YC
+"}
+(29,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+"}
+(30,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+"}
+(31,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+"}
diff --git a/_maps/shuttles/~doppler_shuttles/salvage/salvage_ikwa_cargo.dmm b/_maps/shuttles/~doppler_shuttles/salvage/salvage_ikwa_cargo.dmm
new file mode 100644
index 00000000000000..22261c4e7c695b
--- /dev/null
+++ b/_maps/shuttles/~doppler_shuttles/salvage/salvage_ikwa_cargo.dmm
@@ -0,0 +1,1337 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"ar" = (
+/obj/structure/shuttle_decoration/wall_plate/plastamic{
+	dir = 1
+	},
+/obj/structure/chair/comfy/shuttle{
+	dir = 2
+	},
+/obj/structure/sign/poster/random/directional/east,
+/turf/open/floor/iron/colony/bolts/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"bb" = (
+/obj/structure/lattice/catwalk,
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/primary_colour{
+	dir = 1
+	},
+/obj/structure/titanium_structure,
+/obj/structure/shuttle_decoration/eva_catwalks/directional/north,
+/turf/template_noop,
+/area/shuttle/salvaged_shuttle)
+"bo" = (
+/obj/structure/lattice/catwalk,
+/turf/template_noop,
+/area/shuttle/salvaged_shuttle)
+"bA" = (
+/obj/structure/shuttle_decoration/wall_plate/plastamic{
+	dir = 1
+	},
+/obj/effect/spawner/random/salvage/crate_only/civilian_supply,
+/turf/open/floor/iron/colony/bolts/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"bJ" = (
+/obj/machinery/light/red/directional/north,
+/obj/effect/spawner/random/salvage/interior_trash_n_debris,
+/turf/open/floor/plating/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"ce" = (
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/secondary_colour,
+/area/shuttle/salvaged_shuttle)
+"cl" = (
+/obj/structure/shuttle_decoration/radiator/directional/south,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"dw" = (
+/obj/structure/shuttle_decoration/wall_plate/armor/diagonal{
+	dir = 4
+	},
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"ez" = (
+/obj/structure/shuttle_decoration/wall_plate/silver_foil{
+	dir = 9
+	},
+/turf/closed/wall/mineral/aluminum,
+/area/shuttle/salvaged_shuttle)
+"eB" = (
+/obj/structure/shuttle_decoration/wall_plate/plastamic{
+	dir = 1
+	},
+/obj/structure/bed/pod,
+/obj/effect/spawner/random/bedsheet,
+/turf/open/floor/iron/colony/bolts/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"fI" = (
+/obj/structure/shuttle_decoration/wall_plate/silver_foil{
+	dir = 10
+	},
+/turf/closed/wall/mineral/aluminum,
+/area/shuttle/salvaged_shuttle)
+"go" = (
+/obj/structure/lattice/catwalk,
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/primary_colour,
+/obj/structure/shuttle_decoration/eva_catwalks/directional/south,
+/obj/structure/titanium_structure,
+/turf/template_noop,
+/area/shuttle/salvaged_shuttle)
+"gt" = (
+/obj/structure/shuttle_decoration/eva_catwalks/directional/north,
+/obj/effect/spawner/random/salvage/container,
+/turf/open/floor/plating/nanocarbon/exterior/black,
+/area/shuttle/salvaged_shuttle)
+"gT" = (
+/obj/structure/shuttle_decoration/headlight/directional/east,
+/turf/closed/wall/mineral/aluminum,
+/area/shuttle/salvaged_shuttle)
+"hx" = (
+/obj/structure/lattice,
+/turf/template_noop,
+/area/shuttle/salvaged_shuttle)
+"is" = (
+/obj/machinery/light/red/directional/north,
+/obj/effect/spawner/random/salvage/crate_only,
+/turf/open/floor/plating/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"jU" = (
+/obj/effect/mapping_helpers/salvage_anchor/end/three,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/secondary_colour,
+/area/shuttle/salvaged_shuttle)
+"jX" = (
+/obj/structure/lattice,
+/obj/effect/spawner/random/salvage/interior_trash_n_debris,
+/turf/template_noop,
+/area/shuttle/salvaged_shuttle)
+"kO" = (
+/obj/structure/shuttle_decoration/wall_plate/armor,
+/turf/open/floor/plating/nanocarbon/exterior/black,
+/area/shuttle/salvaged_shuttle)
+"lu" = (
+/obj/structure/shuttle_decoration/eva_catwalks/directional/south,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"ly" = (
+/obj/structure/shuttle_decoration/aux_engine/directional/west,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"lN" = (
+/obj/structure/lattice/catwalk,
+/obj/structure/shuttle_decoration/eva_catwalks/directional/south,
+/obj/structure/shuttle_decoration/eva_catwalks/directional/north,
+/turf/template_noop,
+/area/shuttle/salvaged_shuttle)
+"lV" = (
+/obj/structure/shuttle_decoration/eva_catwalks/directional/north,
+/obj/structure/titanium_structure,
+/turf/open/floor/plating/nanocarbon/exterior/black,
+/area/shuttle/salvaged_shuttle)
+"mS" = (
+/obj/structure/shuttle_decoration/wall_plate/armor{
+	dir = 1
+	},
+/obj/structure/titanium_structure,
+/turf/open/floor/plating/nanocarbon/exterior/black,
+/area/shuttle/salvaged_shuttle)
+"nE" = (
+/obj/machinery/light/red/directional/west,
+/obj/effect/spawner/random/salvage/interior_trash_n_debris,
+/turf/open/floor/iron/colony/bolts/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"nO" = (
+/obj/structure/shuttle_decoration/wall_plate/plastamic,
+/obj/effect/spawner/random/salvage/interior_trash_n_debris,
+/turf/open/floor/iron/colony/bolts/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"ol" = (
+/obj/structure/lattice/catwalk,
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/primary_colour{
+	dir = 1
+	},
+/obj/structure/shuttle_decoration/eva_catwalks/directional/north,
+/turf/template_noop,
+/area/shuttle/salvaged_shuttle)
+"oM" = (
+/obj/machinery/light/red/directional/south,
+/obj/effect/spawner/random/salvage/interior_trash_n_debris,
+/turf/open/floor/plating/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"oP" = (
+/obj/structure/shuttle_decoration/wall_plate/armor/diagonal,
+/obj/structure/railing/eva_handhold/directional/south,
+/turf/open/floor/plating/nanocarbon/exterior/standard,
+/area/shuttle/salvaged_shuttle)
+"oV" = (
+/obj/structure/mineral_door/manual_colony_door/shuttle/interior,
+/turf/open/floor/iron/colony/white/texture/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"oY" = (
+/obj/effect/mapping_helpers/salvage_anchor/end/six,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/secondary_colour,
+/area/shuttle/salvaged_shuttle)
+"pB" = (
+/turf/closed/wall/mineral/nanocarbon/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"pM" = (
+/obj/structure/railing{
+	dir = 8
+	},
+/obj/structure/railing{
+	dir = 4
+	},
+/turf/open/floor/iron/colony/texture,
+/area/shuttle/salvaged_shuttle)
+"pN" = (
+/obj/structure/shuttle_decoration/wall_plate/armor/diagonal{
+	dir = 1
+	},
+/obj/structure/railing/eva_handhold/directional/north,
+/turf/open/floor/plating/nanocarbon/exterior/standard,
+/area/shuttle/salvaged_shuttle)
+"qr" = (
+/obj/effect/spawner/random/salvage/crate_only,
+/turf/open/floor/iron/colony/bolts/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"rb" = (
+/obj/structure/shuttle_decoration/liquid_tank/battery,
+/obj/structure/sign/poster/random/directional/north,
+/turf/open/floor/plating/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"sm" = (
+/obj/structure/lattice/catwalk,
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/primary_colour,
+/obj/structure/titanium_structure,
+/obj/structure/shuttle_decoration/eva_catwalks/directional/south,
+/turf/template_noop,
+/area/shuttle/salvaged_shuttle)
+"st" = (
+/obj/effect/mapping_helpers/salvage_anchor/end/seven,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"sE" = (
+/obj/structure/chair/comfy/shuttle{
+	dir = 4
+	},
+/obj/structure/sign/poster/random/directional/north,
+/turf/open/floor/iron/colony/bolts/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"sN" = (
+/obj/effect/spawner/random/salvage/every_small_tank,
+/turf/open/floor/plating/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"tC" = (
+/obj/effect/spawner/random/salvage/interior_trash_n_debris,
+/turf/open/floor/plating/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"tH" = (
+/obj/structure/shuttle_decoration/wall_plate/plastamic,
+/obj/effect/spawner/random/salvage/crate_only/civilian_supply,
+/turf/open/floor/iron/colony/bolts/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"uk" = (
+/obj/structure/railing/eva_handhold/directional/south,
+/obj/structure/railing/eva_handhold/directional/north,
+/obj/structure/marker_beacon/jade,
+/turf/open/floor/engine/anchor_jack,
+/area/shuttle/salvaged_shuttle)
+"uM" = (
+/obj/structure/shuttle_decoration/radiator/directional/north,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"vn" = (
+/turf/open/floor/plating/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"vE" = (
+/obj/structure/railing/eva_handhold/directional/south,
+/obj/structure/railing/eva_handhold/directional/north,
+/obj/structure/marker_beacon/yellow,
+/obj/effect/mapping_helpers/salvage_anchor/three,
+/turf/open/floor/engine/anchor_jack,
+/area/shuttle/salvaged_shuttle)
+"wd" = (
+/obj/machinery/light/red/directional/south,
+/turf/open/floor/plating/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"wC" = (
+/obj/structure/shuttle_decoration/headlight/directional/west,
+/turf/closed/wall/mineral/aluminum,
+/area/shuttle/salvaged_shuttle)
+"wF" = (
+/obj/structure/lattice/catwalk,
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/primary_colour,
+/obj/structure/titanium_structure,
+/turf/template_noop,
+/area/shuttle/salvaged_shuttle)
+"wS" = (
+/obj/structure/shuttle_decoration/bullbar/directional/east,
+/obj/structure/shuttle_decoration/headlight/directional/east,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"xx" = (
+/obj/effect/spawner/random/salvage/crate_only,
+/turf/open/floor/plating/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"yi" = (
+/obj/structure/shuttle_decoration/wall_plate/armor/diagonal,
+/obj/structure/titanium_structure,
+/turf/open/floor/plating/nanocarbon/exterior/standard,
+/area/shuttle/salvaged_shuttle)
+"yo" = (
+/obj/structure/shuttle_decoration/wall_plate/plastamic,
+/turf/closed/wall/mineral/aluminum,
+/area/shuttle/salvaged_shuttle)
+"zd" = (
+/obj/structure/lattice/catwalk,
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/primary_colour{
+	dir = 1
+	},
+/turf/template_noop,
+/area/shuttle/salvaged_shuttle)
+"zm" = (
+/obj/effect/spawner/random/salvage/small_fuel_tanks,
+/turf/open/floor/plating/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"Aq" = (
+/obj/structure/shuttle_decoration/console/directional/north,
+/obj/machinery/exoscanner/shuttle_part/sensors_blister/directional/south,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"Au" = (
+/obj/effect/spawner/random/salvage/interior_trash_n_debris,
+/turf/open/floor/iron/colony/bolts/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"AH" = (
+/obj/structure/lattice/catwalk,
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/primary_colour,
+/obj/structure/shuttle_decoration/eva_catwalks/directional/south,
+/turf/template_noop,
+/area/shuttle/salvaged_shuttle)
+"Bp" = (
+/obj/structure/shuttle_decoration/wall_plate/armor,
+/obj/structure/titanium_structure,
+/turf/open/floor/plating/nanocarbon/exterior/black,
+/area/shuttle/salvaged_shuttle)
+"Bs" = (
+/obj/machinery/light/red/directional/north,
+/obj/effect/spawner/random/salvage/container_or_crate_or_cargo,
+/turf/open/floor/plating/aluminum,
+/area/shuttle/salvaged_shuttle)
+"BV" = (
+/obj/structure/shuttle_access_panel,
+/turf/open/floor/plating/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"CC" = (
+/turf/closed/wall/mineral/aluminum,
+/area/shuttle/salvaged_shuttle)
+"CQ" = (
+/obj/structure/shuttle_decoration/liquid_tank/coolant,
+/turf/open/floor/plating/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"Dq" = (
+/obj/structure/shuttle_decoration/wall_plate/plastamic{
+	dir = 1
+	},
+/turf/closed/wall/mineral/aluminum,
+/area/shuttle/salvaged_shuttle)
+"Ed" = (
+/obj/structure/shuttle_decoration/ladder/directional/east,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/black,
+/area/shuttle/salvaged_shuttle)
+"Ej" = (
+/obj/structure/shuttle_decoration/wall_plate/plastamic{
+	dir = 1
+	},
+/obj/structure/chair/comfy/shuttle{
+	dir = 2
+	},
+/obj/effect/spawner/random/salvage/interior_trash_n_debris,
+/turf/open/floor/iron/colony/bolts/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"Ev" = (
+/obj/structure/railing/eva_handhold/directional/south,
+/obj/structure/railing/eva_handhold/directional/north,
+/obj/structure/marker_beacon/yellow,
+/obj/effect/mapping_helpers/salvage_anchor/seven,
+/turf/open/floor/engine/anchor_jack,
+/area/shuttle/salvaged_shuttle)
+"Ey" = (
+/obj/structure/lattice/catwalk,
+/obj/structure/railing/eva_handhold/directional/north,
+/obj/structure/railing/eva_handhold/directional/south,
+/obj/effect/spawner/random/salvage/interior_trash_n_debris,
+/turf/template_noop,
+/area/shuttle/salvaged_shuttle)
+"EV" = (
+/obj/machinery/exoscanner/shuttle_part/radio_dish/directional/east,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"Fg" = (
+/obj/structure/shuttle_decoration/wall_plate/plastamic{
+	dir = 1
+	},
+/obj/structure/chair/comfy/shuttle{
+	dir = 2
+	},
+/turf/open/floor/iron/colony/bolts/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"Fo" = (
+/obj/structure/shuttle_decoration/wall_plate/plastamic,
+/obj/effect/spawner/random/engineering/toolbox,
+/turf/open/floor/iron/colony/bolts/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"Fz" = (
+/obj/structure/shuttle_decoration/wall_plate/plastamic,
+/obj/structure/bed/pod,
+/obj/effect/spawner/random/bedsheet,
+/obj/structure/sign/poster/random/directional/west,
+/turf/open/floor/iron/colony/bolts/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"FL" = (
+/obj/structure/lattice/catwalk,
+/obj/structure/shuttle_decoration/wall_plate/armor/diagonal{
+	dir = 6
+	},
+/turf/template_noop,
+/area/shuttle/salvaged_shuttle)
+"FV" = (
+/obj/effect/spawner/random/salvage/interior_trash_n_debris,
+/turf/open/floor/catwalk_floor/colony_fabricator/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"FY" = (
+/obj/structure/shuttle_decoration/wall_plate/silver_foil{
+	dir = 1
+	},
+/obj/structure/shuttle_decoration/wall_plate/plastamic,
+/turf/closed/wall/mineral/aluminum,
+/area/shuttle/salvaged_shuttle)
+"GS" = (
+/obj/structure/shuttle_decoration/junction_box/directional/north,
+/obj/structure/shuttle_decoration/ladder_black/directional/south,
+/obj/structure/shuttle_decoration/eva_catwalks/directional/south,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"Hc" = (
+/obj/structure/shuttle_decoration/junction_box/directional/east,
+/turf/closed/wall/mineral/aluminum,
+/area/shuttle/salvaged_shuttle)
+"Hg" = (
+/obj/structure/lattice,
+/obj/structure/shuttle_decoration/wall_plate/armor/diagonal{
+	dir = 5
+	},
+/turf/template_noop,
+/area/shuttle/salvaged_shuttle)
+"Hh" = (
+/obj/structure/shuttle_decoration/wall_plate/silver_foil,
+/obj/structure/shuttle_decoration/wall_plate/plastamic{
+	dir = 1
+	},
+/turf/closed/wall/mineral/aluminum,
+/area/shuttle/salvaged_shuttle)
+"HR" = (
+/obj/structure/railing/eva_handhold/directional/south,
+/obj/structure/railing/eva_handhold/directional/north,
+/obj/structure/marker_beacon/yellow,
+/turf/open/floor/engine/anchor_jack,
+/area/shuttle/salvaged_shuttle)
+"Ii" = (
+/obj/structure/railing/eva_handhold/directional/south,
+/obj/structure/railing/eva_handhold/directional/north,
+/obj/structure/marker_beacon/yellow,
+/obj/effect/mapping_helpers/salvage_anchor/two,
+/turf/open/floor/engine/anchor_jack,
+/area/shuttle/salvaged_shuttle)
+"Im" = (
+/obj/structure/railing/eva_handhold/directional/south,
+/obj/structure/railing/eva_handhold/directional/north,
+/obj/structure/marker_beacon/yellow,
+/obj/effect/mapping_helpers/salvage_anchor/six,
+/turf/open/floor/engine/anchor_jack,
+/area/shuttle/salvaged_shuttle)
+"IM" = (
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/black,
+/area/shuttle/salvaged_shuttle)
+"IZ" = (
+/obj/structure/window/fulltile/salvage_shuttle,
+/turf/open/floor/plating/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"JH" = (
+/obj/structure/lattice/catwalk,
+/obj/structure/shuttle_decoration/wall_plate/armor/diagonal{
+	dir = 5
+	},
+/turf/template_noop,
+/area/shuttle/salvaged_shuttle)
+"Kj" = (
+/obj/machinery/power/shuttle_engine/heater/salvage{
+	dir = 8
+	},
+/obj/structure/engine_covers/heater_cover{
+	dir = 4
+	},
+/turf/open/floor/plating/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"Kk" = (
+/obj/machinery/light/red/directional/south,
+/turf/open/floor/catwalk_floor/colony_fabricator/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"Ku" = (
+/obj/structure/lattice/catwalk,
+/obj/structure/shuttle_decoration/wall_plate/armor/diagonal{
+	dir = 1
+	},
+/turf/template_noop,
+/area/shuttle/salvaged_shuttle)
+"KJ" = (
+/obj/structure/shuttle_decoration/extinguisher/directional/north,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/black,
+/area/shuttle/salvaged_shuttle)
+"KS" = (
+/obj/structure/shuttle_decoration/liquid_tank/reactor/super,
+/turf/open/floor/iron/colony/white/texture/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"LC" = (
+/obj/effect/mapping_helpers/salvage_anchor/end/two,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"LF" = (
+/obj/structure/shuttle_decoration/console/directional/east,
+/turf/closed/wall/mineral/aluminum,
+/area/shuttle/salvaged_shuttle)
+"LV" = (
+/turf/open/floor/iron/colony/bolts/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"Md" = (
+/obj/structure/shuttle_decoration/wall_plate/armor/diagonal{
+	dir = 1
+	},
+/obj/structure/titanium_structure,
+/turf/open/floor/plating/nanocarbon/exterior/standard,
+/area/shuttle/salvaged_shuttle)
+"Mn" = (
+/turf/open/floor/catwalk_floor/colony_fabricator/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"MJ" = (
+/obj/structure/chair/comfy/shuttle{
+	pixel_y = 12
+	},
+/obj/effect/spawner/random/salvage/interior_trash_n_debris,
+/turf/open/floor/iron/colony/bolts/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"MV" = (
+/obj/docking_port/mobile/salvage,
+/obj/structure/railing/eva_handhold/directional/south,
+/obj/structure/railing/eva_handhold/directional/north,
+/obj/structure/marker_beacon/yellow,
+/turf/open/floor/engine/anchor_jack,
+/area/shuttle/salvaged_shuttle)
+"NP" = (
+/obj/structure/shuttle_decoration/junction_box/directional/west,
+/turf/closed/wall/mineral/aluminum,
+/area/shuttle/salvaged_shuttle)
+"Ox" = (
+/obj/machinery/light/red/directional/south,
+/obj/effect/spawner/random/salvage/container_or_crate_or_cargo,
+/turf/open/floor/plating/aluminum,
+/area/shuttle/salvaged_shuttle)
+"OM" = (
+/obj/structure/shuttle_decoration/eva_catwalks/directional/south,
+/obj/effect/spawner/random/salvage/container,
+/turf/open/floor/plating/nanocarbon/exterior/black,
+/area/shuttle/salvaged_shuttle)
+"Pg" = (
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/primary_colour{
+	dir = 8
+	},
+/turf/closed/wall/mineral/aluminum,
+/area/shuttle/salvaged_shuttle)
+"PS" = (
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"Qv" = (
+/obj/effect/spawner/random/salvage/industrial_fuel_only,
+/turf/open/floor/plating/nanocarbon/exterior/standard,
+/area/shuttle/salvaged_shuttle)
+"QB" = (
+/obj/structure/lattice/catwalk,
+/obj/structure/shuttle_decoration/wall_plate/armor/diagonal{
+	dir = 10
+	},
+/turf/template_noop,
+/area/shuttle/salvaged_shuttle)
+"QT" = (
+/obj/structure/shuttle_decoration/wall_plate/plastamic,
+/obj/structure/bed/pod,
+/obj/effect/spawner/random/bedsheet,
+/obj/effect/spawner/random/salvage/interior_trash_n_debris,
+/turf/open/floor/iron/colony/bolts/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"QW" = (
+/obj/structure/shuttle_decoration/eva_catwalks/directional/south,
+/obj/structure/titanium_structure,
+/turf/open/floor/plating/nanocarbon/exterior/black,
+/area/shuttle/salvaged_shuttle)
+"RU" = (
+/obj/effect/spawner/random/salvage/container_or_crate_or_cargo,
+/turf/open/floor/plating/aluminum,
+/area/shuttle/salvaged_shuttle)
+"RV" = (
+/obj/structure/lattice/catwalk,
+/obj/structure/railing/eva_handhold/directional/north,
+/obj/structure/railing/eva_handhold/directional/south,
+/turf/template_noop,
+/area/shuttle/salvaged_shuttle)
+"Tv" = (
+/obj/structure/lattice/catwalk,
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/primary_colour{
+	dir = 1
+	},
+/obj/structure/shuttle_decoration/eva_catwalks/directional/north,
+/obj/structure/titanium_structure,
+/turf/template_noop,
+/area/shuttle/salvaged_shuttle)
+"TN" = (
+/obj/structure/lattice/catwalk,
+/obj/structure/shuttle_decoration/wall_plate/armor/diagonal{
+	dir = 9
+	},
+/turf/template_noop,
+/area/shuttle/salvaged_shuttle)
+"Ul" = (
+/obj/structure/shuttle_decoration/extinguisher/directional/south,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/black,
+/area/shuttle/salvaged_shuttle)
+"Ut" = (
+/obj/structure/shuttle_decoration/console/directional/west,
+/turf/closed/wall/mineral/aluminum,
+/area/shuttle/salvaged_shuttle)
+"UU" = (
+/turf/template_noop,
+/area/shuttle/salvaged_shuttle)
+"Vh" = (
+/turf/closed/wall/mineral/nanocarbon/black,
+/area/shuttle/salvaged_shuttle)
+"VR" = (
+/obj/structure/lattice/catwalk,
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/primary_colour,
+/turf/template_noop,
+/area/shuttle/salvaged_shuttle)
+"VV" = (
+/obj/structure/lattice/catwalk,
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/primary_colour{
+	dir = 1
+	},
+/obj/structure/titanium_structure,
+/turf/template_noop,
+/area/shuttle/salvaged_shuttle)
+"Wj" = (
+/obj/machinery/power/shuttle_engine/propulsion/salvage{
+	dir = 8
+	},
+/obj/structure/engine_covers/thruster_nozzle{
+	dir = 8
+	},
+/turf/open/floor/plating/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"Wp" = (
+/obj/machinery/light/red/directional/north,
+/obj/effect/spawner/random/salvage/every_small_tank,
+/turf/open/floor/plating/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"Wu" = (
+/obj/structure/shuttle_decoration/wall_plate/plastamic,
+/turf/open/floor/iron/colony/bolts/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"Ww" = (
+/obj/structure/shuttle_decoration/wall_plate/armor{
+	dir = 1
+	},
+/turf/open/floor/plating/nanocarbon/exterior/black,
+/area/shuttle/salvaged_shuttle)
+"Wz" = (
+/obj/structure/chair/comfy/shuttle{
+	dir = 8;
+	pixel_x = 5
+	},
+/turf/open/floor/iron/colony/bolts/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"Xb" = (
+/obj/structure/shuttle_decoration/junction_box/directional/south,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/secondary_colour,
+/area/shuttle/salvaged_shuttle)
+"Yb" = (
+/obj/machinery/light/red/directional/south,
+/obj/effect/spawner/random/salvage/interior_trash_n_debris,
+/turf/open/floor/catwalk_floor/colony_fabricator/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"Yn" = (
+/obj/structure/shuttle_decoration/wall_plate/silver_foil{
+	dir = 8
+	},
+/obj/structure/shuttle_decoration/wall_plate/plastamic{
+	dir = 4
+	},
+/turf/closed/wall/mineral/aluminum,
+/area/shuttle/salvaged_shuttle)
+"YC" = (
+/turf/template_noop,
+/area/template_noop)
+"Zq" = (
+/obj/structure/mineral_door/manual_colony_door/shuttle,
+/turf/open/floor/iron/colony/white/texture/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"Zy" = (
+/obj/effect/spawner/random/salvage/interior_trash_n_debris,
+/obj/effect/spawner/random/salvage/interior_trash_n_debris,
+/turf/open/floor/catwalk_floor/colony_fabricator/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+
+(1,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+YC
+Vh
+Wj
+Wj
+IM
+Wj
+Wj
+Vh
+YC
+YC
+YC
+YC
+YC
+YC
+"}
+(2,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+mS
+IM
+Kj
+Kj
+Ed
+Kj
+Kj
+IM
+Bp
+YC
+YC
+YC
+YC
+YC
+"}
+(3,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+Ww
+KJ
+zm
+vn
+LV
+vn
+zm
+Ul
+kO
+YC
+YC
+YC
+YC
+YC
+"}
+(4,1,1) = {"
+YC
+uk
+YC
+YC
+YC
+mS
+IM
+zm
+ez
+Yn
+fI
+zm
+IM
+Bp
+YC
+YC
+YC
+uk
+YC
+"}
+(5,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+zd
+PS
+vn
+FY
+KS
+Hh
+vn
+PS
+VR
+YC
+YC
+YC
+YC
+YC
+"}
+(6,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+bb
+PS
+CC
+LF
+IZ
+CC
+BV
+PS
+sm
+YC
+YC
+YC
+YC
+YC
+"}
+(7,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+gt
+ce
+is
+Au
+Mn
+LV
+oM
+ce
+OM
+YC
+YC
+YC
+YC
+YC
+"}
+(8,1,1) = {"
+YC
+Ev
+YC
+YC
+YC
+gt
+Xb
+vn
+Wz
+FV
+qr
+xx
+ce
+OM
+YC
+YC
+YC
+Ii
+YC
+"}
+(9,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+gt
+st
+rb
+CC
+Zq
+CC
+CQ
+LC
+OM
+YC
+YC
+YC
+YC
+YC
+"}
+(10,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+Tv
+PS
+gT
+yo
+Yb
+Dq
+gT
+PS
+go
+YC
+YC
+YC
+YC
+YC
+"}
+(11,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+zd
+hx
+hx
+CC
+Zq
+CC
+hx
+hx
+VR
+YC
+YC
+YC
+YC
+YC
+"}
+(12,1,1) = {"
+uk
+YC
+YC
+YC
+YC
+YC
+TN
+bo
+UU
+lN
+UU
+bo
+QB
+YC
+YC
+YC
+YC
+YC
+uk
+"}
+(13,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+YC
+Md
+Qv
+hx
+Ey
+hx
+Qv
+yi
+YC
+YC
+YC
+YC
+YC
+YC
+"}
+(14,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+YC
+pN
+Qv
+UU
+lN
+UU
+Qv
+oP
+YC
+YC
+YC
+YC
+YC
+YC
+"}
+(15,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+YC
+Md
+Qv
+hx
+RV
+jX
+Qv
+yi
+YC
+YC
+YC
+YC
+YC
+YC
+"}
+(16,1,1) = {"
+HR
+YC
+YC
+YC
+YC
+YC
+JH
+bo
+UU
+lN
+UU
+bo
+FL
+YC
+YC
+YC
+YC
+YC
+MV
+"}
+(17,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+zd
+hx
+hx
+CC
+Zq
+CC
+hx
+hx
+VR
+YC
+YC
+YC
+YC
+YC
+"}
+(18,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+zd
+ly
+wC
+yo
+Kk
+Dq
+wC
+ly
+VR
+YC
+YC
+YC
+YC
+YC
+"}
+(19,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+VV
+PS
+vn
+CC
+Zq
+CC
+sN
+PS
+wF
+YC
+YC
+YC
+YC
+YC
+"}
+(20,1,1) = {"
+uk
+YC
+YC
+YC
+YC
+ol
+uM
+sN
+eB
+Au
+Fz
+vn
+cl
+AH
+YC
+YC
+YC
+YC
+uk
+"}
+(21,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+gt
+PS
+bJ
+eB
+Mn
+tH
+wd
+PS
+OM
+YC
+YC
+YC
+YC
+YC
+"}
+(22,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+gt
+ce
+vn
+ar
+FV
+QT
+vn
+ce
+OM
+YC
+YC
+YC
+YC
+YC
+"}
+(23,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+gt
+oY
+CC
+CC
+oV
+NP
+CC
+jU
+OM
+YC
+YC
+YC
+YC
+YC
+"}
+(24,1,1) = {"
+YC
+Im
+YC
+YC
+YC
+lV
+PS
+RU
+RU
+FV
+RU
+RU
+PS
+QW
+YC
+YC
+YC
+vE
+YC
+"}
+(25,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+gt
+ce
+Bs
+RU
+Mn
+RU
+Ox
+ce
+OM
+YC
+YC
+YC
+YC
+YC
+"}
+(26,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+gt
+PS
+CC
+Ut
+oV
+Hc
+CC
+PS
+OM
+YC
+YC
+YC
+YC
+YC
+"}
+(27,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+gt
+PS
+tC
+Ej
+Mn
+Wu
+vn
+PS
+Pg
+PS
+YC
+YC
+YC
+YC
+"}
+(28,1,1) = {"
+YC
+uk
+YC
+YC
+YC
+ol
+PS
+vn
+Fg
+Zy
+Mn
+pM
+Zq
+nE
+GS
+YC
+YC
+uk
+YC
+"}
+(29,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+VV
+PS
+Wp
+bA
+LV
+nO
+oM
+PS
+MJ
+Aq
+YC
+YC
+YC
+YC
+"}
+(30,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+Ku
+PS
+sN
+Fg
+Au
+Fo
+vn
+PS
+sE
+lu
+YC
+YC
+YC
+YC
+"}
+(31,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+Hg
+dw
+wS
+IZ
+IZ
+IZ
+wS
+EV
+IZ
+pB
+YC
+YC
+YC
+YC
+"}
diff --git a/_maps/shuttles/~doppler_shuttles/salvage/salvage_ikwa_tanker.dmm b/_maps/shuttles/~doppler_shuttles/salvage/salvage_ikwa_tanker.dmm
new file mode 100644
index 00000000000000..5e072dceee5354
--- /dev/null
+++ b/_maps/shuttles/~doppler_shuttles/salvage/salvage_ikwa_tanker.dmm
@@ -0,0 +1,1234 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"bo" = (
+/obj/structure/lattice/catwalk,
+/turf/template_noop,
+/area/shuttle/salvaged_shuttle)
+"bA" = (
+/obj/structure/shuttle_decoration/wall_plate/plastamic{
+	dir = 1
+	},
+/obj/effect/spawner/random/salvage/crate_only/civilian_supply,
+/turf/open/floor/iron/colony/bolts/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"bB" = (
+/obj/structure/shuttle_decoration/wall_plate/plastamic{
+	dir = 1
+	},
+/obj/structure/sign/poster/random/directional/east,
+/obj/effect/spawner/random/salvage/interior_trash_n_debris,
+/turf/open/floor/iron/colony/bolts/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"bJ" = (
+/obj/machinery/light/red/directional/north,
+/turf/open/floor/plating/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"ce" = (
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/secondary_colour,
+/area/shuttle/salvaged_shuttle)
+"cl" = (
+/obj/structure/lattice,
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/primary_colour,
+/turf/template_noop,
+/area/shuttle/salvaged_shuttle)
+"dw" = (
+/obj/structure/shuttle_decoration/wall_plate/armor/diagonal{
+	dir = 4
+	},
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"ez" = (
+/obj/structure/shuttle_decoration/wall_plate/silver_foil{
+	dir = 9
+	},
+/turf/closed/wall/mineral/aluminum,
+/area/shuttle/salvaged_shuttle)
+"eB" = (
+/obj/structure/titanium_structure,
+/obj/structure/shuttle_decoration/wall_plate/armor,
+/obj/structure/lattice,
+/turf/template_noop,
+/area/shuttle/salvaged_shuttle)
+"eP" = (
+/obj/effect/mapping_helpers/salvage_anchor/end/two,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"fI" = (
+/obj/structure/shuttle_decoration/wall_plate/silver_foil{
+	dir = 10
+	},
+/turf/closed/wall/mineral/aluminum,
+/area/shuttle/salvaged_shuttle)
+"gT" = (
+/obj/structure/shuttle_decoration/headlight/directional/east,
+/turf/closed/wall/mineral/aluminum,
+/area/shuttle/salvaged_shuttle)
+"hx" = (
+/obj/structure/lattice,
+/turf/template_noop,
+/area/shuttle/salvaged_shuttle)
+"is" = (
+/obj/machinery/light/red/directional/north,
+/obj/effect/spawner/random/salvage/crate_only/construction,
+/turf/open/floor/plating/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"km" = (
+/obj/effect/spawner/random/salvage/interior_trash_n_debris,
+/turf/open/floor/plating/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"kO" = (
+/obj/structure/shuttle_decoration/wall_plate/armor,
+/turf/open/floor/plating/nanocarbon/exterior/black,
+/area/shuttle/salvaged_shuttle)
+"lu" = (
+/obj/structure/shuttle_decoration/eva_catwalks/directional/south,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"ly" = (
+/obj/structure/shuttle_decoration/aux_engine/directional/west,
+/obj/effect/mapping_helpers/salvage_anchor/end/three,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"lN" = (
+/turf/open/floor/plating/nanocarbon/exterior/black,
+/area/shuttle/salvaged_shuttle)
+"mO" = (
+/obj/effect/spawner/random/salvage/every_small_tank,
+/turf/open/floor/plating/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"mS" = (
+/obj/structure/shuttle_decoration/wall_plate/armor{
+	dir = 1
+	},
+/obj/structure/titanium_structure,
+/turf/open/floor/plating/nanocarbon/exterior/black,
+/area/shuttle/salvaged_shuttle)
+"nE" = (
+/obj/machinery/light/red/directional/west,
+/turf/open/floor/iron/colony/bolts/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"nO" = (
+/obj/structure/shuttle_decoration/wall_plate/plastamic,
+/obj/effect/spawner/random/salvage/interior_trash_n_debris,
+/turf/open/floor/iron/colony/bolts/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"nP" = (
+/obj/effect/spawner/random/salvage/interior_trash_n_debris,
+/turf/open/floor/iron/colony/bolts/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"oV" = (
+/obj/structure/mineral_door/manual_colony_door/shuttle/interior,
+/turf/open/floor/iron/colony/white/texture/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"pB" = (
+/turf/closed/wall/mineral/nanocarbon/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"pM" = (
+/obj/structure/railing{
+	dir = 8
+	},
+/obj/structure/railing{
+	dir = 4
+	},
+/turf/open/floor/iron/colony/texture,
+/area/shuttle/salvaged_shuttle)
+"pN" = (
+/obj/structure/lattice,
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/primary_colour{
+	dir = 1
+	},
+/turf/template_noop,
+/area/shuttle/salvaged_shuttle)
+"qr" = (
+/obj/effect/spawner/random/salvage/crate_only/construction,
+/turf/open/floor/iron/colony/bolts/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"rb" = (
+/obj/structure/shuttle_decoration/liquid_tank/battery,
+/obj/structure/sign/poster/random/directional/north,
+/turf/open/floor/plating/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"sm" = (
+/obj/structure/lattice/catwalk,
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/secondary_colour{
+	dir = 1
+	},
+/turf/template_noop,
+/area/shuttle/salvaged_shuttle)
+"sE" = (
+/obj/structure/chair/comfy/shuttle{
+	dir = 4
+	},
+/obj/structure/sign/poster/random/directional/north,
+/obj/effect/spawner/random/salvage/interior_trash_n_debris,
+/turf/open/floor/iron/colony/bolts/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"tC" = (
+/obj/machinery/light/red/directional/south,
+/obj/effect/spawner/random/salvage/interior_trash_n_debris,
+/turf/open/floor/plating/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"uk" = (
+/obj/structure/railing/eva_handhold/directional/south,
+/obj/structure/railing/eva_handhold/directional/north,
+/obj/structure/marker_beacon/jade,
+/turf/open/floor/engine/anchor_jack,
+/area/shuttle/salvaged_shuttle)
+"uM" = (
+/obj/structure/lattice,
+/obj/structure/shuttle_decoration/wall_plate/armor{
+	dir = 1
+	},
+/turf/template_noop,
+/area/shuttle/salvaged_shuttle)
+"vn" = (
+/turf/open/floor/plating/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"vE" = (
+/obj/structure/railing/eva_handhold/directional/south,
+/obj/structure/railing/eva_handhold/directional/north,
+/obj/structure/marker_beacon/yellow,
+/obj/effect/mapping_helpers/salvage_anchor/three,
+/turf/open/floor/engine/anchor_jack,
+/area/shuttle/salvaged_shuttle)
+"wd" = (
+/obj/machinery/light/red/directional/south,
+/turf/open/floor/plating/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"wC" = (
+/obj/structure/shuttle_decoration/headlight/directional/west,
+/turf/closed/wall/mineral/aluminum,
+/area/shuttle/salvaged_shuttle)
+"wF" = (
+/obj/structure/lattice/catwalk,
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/primary_colour,
+/obj/structure/titanium_structure,
+/turf/template_noop,
+/area/shuttle/salvaged_shuttle)
+"wS" = (
+/obj/structure/shuttle_decoration/bullbar/directional/east,
+/obj/structure/shuttle_decoration/headlight/directional/east,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"xx" = (
+/obj/effect/spawner/random/salvage/crate_only/salvage,
+/turf/open/floor/plating/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"yi" = (
+/obj/structure/lattice,
+/obj/structure/titanium_structure,
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/secondary_colour,
+/turf/template_noop,
+/area/shuttle/salvaged_shuttle)
+"yo" = (
+/obj/structure/shuttle_decoration/wall_plate/plastamic,
+/turf/closed/wall/mineral/aluminum,
+/area/shuttle/salvaged_shuttle)
+"zd" = (
+/obj/structure/lattice/catwalk,
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/primary_colour{
+	dir = 1
+	},
+/turf/template_noop,
+/area/shuttle/salvaged_shuttle)
+"zm" = (
+/obj/effect/spawner/random/salvage/small_fuel_tanks,
+/turf/open/floor/plating/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"Aq" = (
+/obj/structure/shuttle_decoration/console/directional/north,
+/obj/machinery/exoscanner/shuttle_part/sensors_blister/directional/south,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"Bp" = (
+/obj/structure/shuttle_decoration/wall_plate/armor,
+/obj/structure/titanium_structure,
+/turf/open/floor/plating/nanocarbon/exterior/black,
+/area/shuttle/salvaged_shuttle)
+"BV" = (
+/obj/structure/shuttle_access_panel,
+/turf/open/floor/plating/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"CC" = (
+/turf/closed/wall/mineral/aluminum,
+/area/shuttle/salvaged_shuttle)
+"CQ" = (
+/obj/structure/shuttle_decoration/liquid_tank/coolant,
+/turf/open/floor/plating/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"Dq" = (
+/obj/structure/shuttle_decoration/wall_plate/plastamic{
+	dir = 1
+	},
+/turf/closed/wall/mineral/aluminum,
+/area/shuttle/salvaged_shuttle)
+"DA" = (
+/obj/structure/lattice/catwalk,
+/obj/structure/titanium_structure,
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/primary_colour{
+	dir = 1
+	},
+/turf/template_noop,
+/area/shuttle/salvaged_shuttle)
+"Ed" = (
+/obj/structure/shuttle_decoration/ladder/directional/east,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/black,
+/area/shuttle/salvaged_shuttle)
+"Ej" = (
+/obj/structure/shuttle_decoration/wall_plate/plastamic{
+	dir = 1
+	},
+/obj/structure/chair/comfy/shuttle{
+	dir = 2
+	},
+/obj/effect/spawner/random/salvage/interior_trash_n_debris,
+/turf/open/floor/iron/colony/bolts/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"Ev" = (
+/obj/structure/railing/eva_handhold/directional/south,
+/obj/structure/railing/eva_handhold/directional/north,
+/obj/structure/marker_beacon/yellow,
+/obj/effect/mapping_helpers/salvage_anchor/seven,
+/turf/open/floor/engine/anchor_jack,
+/area/shuttle/salvaged_shuttle)
+"EV" = (
+/obj/machinery/exoscanner/shuttle_part/radio_dish/directional/east,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"Fg" = (
+/obj/structure/shuttle_decoration/wall_plate/plastamic{
+	dir = 1
+	},
+/obj/structure/chair/comfy/shuttle{
+	dir = 2
+	},
+/turf/open/floor/iron/colony/bolts/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"Fz" = (
+/obj/structure/titanium_structure,
+/obj/structure/shuttle_decoration/wall_plate/armor{
+	dir = 1
+	},
+/obj/structure/lattice,
+/turf/template_noop,
+/area/shuttle/salvaged_shuttle)
+"FL" = (
+/obj/structure/lattice,
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/secondary_colour,
+/turf/template_noop,
+/area/shuttle/salvaged_shuttle)
+"FV" = (
+/obj/structure/lattice/catwalk,
+/obj/effect/spawner/random/salvage/interior_trash_n_debris,
+/turf/template_noop,
+/area/shuttle/salvaged_shuttle)
+"FY" = (
+/obj/structure/shuttle_decoration/wall_plate/silver_foil{
+	dir = 1
+	},
+/obj/structure/shuttle_decoration/wall_plate/plastamic,
+/turf/closed/wall/mineral/aluminum,
+/area/shuttle/salvaged_shuttle)
+"GS" = (
+/obj/structure/shuttle_decoration/junction_box/directional/north,
+/obj/structure/shuttle_decoration/ladder_black/directional/south,
+/obj/structure/shuttle_decoration/eva_catwalks/directional/south,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"Hc" = (
+/obj/structure/shuttle_decoration/junction_box/directional/east,
+/turf/closed/wall/mineral/aluminum,
+/area/shuttle/salvaged_shuttle)
+"Hg" = (
+/obj/structure/lattice,
+/obj/structure/shuttle_decoration/wall_plate/armor/diagonal{
+	dir = 5
+	},
+/turf/template_noop,
+/area/shuttle/salvaged_shuttle)
+"Hh" = (
+/obj/structure/shuttle_decoration/wall_plate/silver_foil,
+/obj/structure/shuttle_decoration/wall_plate/plastamic{
+	dir = 1
+	},
+/turf/closed/wall/mineral/aluminum,
+/area/shuttle/salvaged_shuttle)
+"HR" = (
+/obj/structure/railing/eva_handhold/directional/south,
+/obj/structure/railing/eva_handhold/directional/north,
+/obj/structure/marker_beacon/yellow,
+/turf/open/floor/engine/anchor_jack,
+/area/shuttle/salvaged_shuttle)
+"Ii" = (
+/obj/structure/railing/eva_handhold/directional/south,
+/obj/structure/railing/eva_handhold/directional/north,
+/obj/structure/marker_beacon/yellow,
+/obj/effect/mapping_helpers/salvage_anchor/two,
+/turf/open/floor/engine/anchor_jack,
+/area/shuttle/salvaged_shuttle)
+"Im" = (
+/obj/structure/railing/eva_handhold/directional/south,
+/obj/structure/railing/eva_handhold/directional/north,
+/obj/structure/marker_beacon/yellow,
+/obj/effect/mapping_helpers/salvage_anchor/six,
+/turf/open/floor/engine/anchor_jack,
+/area/shuttle/salvaged_shuttle)
+"IG" = (
+/obj/structure/lattice/catwalk,
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/secondary_colour,
+/turf/template_noop,
+/area/shuttle/salvaged_shuttle)
+"IM" = (
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/black,
+/area/shuttle/salvaged_shuttle)
+"IZ" = (
+/obj/structure/window/fulltile/salvage_shuttle,
+/turf/open/floor/plating/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"JH" = (
+/obj/structure/lattice,
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/secondary_colour{
+	dir = 1
+	},
+/turf/template_noop,
+/area/shuttle/salvaged_shuttle)
+"Kj" = (
+/obj/machinery/power/shuttle_engine/heater/salvage{
+	dir = 8
+	},
+/obj/structure/engine_covers/heater_cover{
+	dir = 4
+	},
+/turf/open/floor/plating/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"Kk" = (
+/obj/machinery/light/red/directional/south,
+/turf/open/floor/catwalk_floor/colony_fabricator/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"Ku" = (
+/obj/structure/lattice/catwalk,
+/obj/structure/shuttle_decoration/wall_plate/armor/diagonal{
+	dir = 1
+	},
+/turf/template_noop,
+/area/shuttle/salvaged_shuttle)
+"KJ" = (
+/obj/structure/shuttle_decoration/extinguisher/directional/north,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/black,
+/area/shuttle/salvaged_shuttle)
+"KS" = (
+/obj/structure/shuttle_decoration/liquid_tank/reactor/super,
+/turf/open/floor/iron/colony/white/texture/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"LF" = (
+/obj/structure/shuttle_decoration/console/directional/east,
+/turf/closed/wall/mineral/aluminum,
+/area/shuttle/salvaged_shuttle)
+"LV" = (
+/turf/open/floor/iron/colony/bolts/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"Md" = (
+/obj/structure/lattice,
+/obj/structure/titanium_structure,
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/secondary_colour{
+	dir = 1
+	},
+/turf/template_noop,
+/area/shuttle/salvaged_shuttle)
+"Mn" = (
+/turf/open/floor/catwalk_floor/colony_fabricator/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"MJ" = (
+/obj/structure/chair/comfy/shuttle{
+	pixel_y = 12
+	},
+/turf/open/floor/iron/colony/bolts/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"MV" = (
+/obj/docking_port/mobile/salvage,
+/obj/structure/railing/eva_handhold/directional/south,
+/obj/structure/railing/eva_handhold/directional/north,
+/obj/structure/marker_beacon/yellow,
+/turf/open/floor/engine/anchor_jack,
+/area/shuttle/salvaged_shuttle)
+"Ox" = (
+/obj/effect/spawner/random/salvage/every_industrial_tank,
+/turf/open/floor/plating/nanocarbon/exterior/standard,
+/area/shuttle/salvaged_shuttle)
+"OM" = (
+/obj/structure/lattice/catwalk,
+/obj/structure/shuttle_decoration/wall_plate/armor/diagonal,
+/turf/template_noop,
+/area/shuttle/salvaged_shuttle)
+"Pg" = (
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/primary_colour{
+	dir = 8
+	},
+/turf/closed/wall/mineral/aluminum,
+/area/shuttle/salvaged_shuttle)
+"PS" = (
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"Qv" = (
+/obj/effect/spawner/random/salvage/interior_trash_n_debris,
+/turf/open/floor/plating/nanocarbon/exterior/black,
+/area/shuttle/salvaged_shuttle)
+"QW" = (
+/obj/structure/lattice/catwalk,
+/obj/structure/titanium_structure,
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/primary_colour,
+/turf/template_noop,
+/area/shuttle/salvaged_shuttle)
+"Ra" = (
+/obj/structure/lattice,
+/obj/structure/shuttle_decoration/wall_plate/armor,
+/turf/template_noop,
+/area/shuttle/salvaged_shuttle)
+"RT" = (
+/obj/effect/mapping_helpers/salvage_anchor/end/seven,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"TR" = (
+/obj/structure/shuttle_decoration/wall_plate/plastamic,
+/obj/effect/spawner/random/salvage/crate_only/civilian_supply,
+/turf/open/floor/iron/colony/bolts/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"Ul" = (
+/obj/structure/shuttle_decoration/extinguisher/directional/south,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/black,
+/area/shuttle/salvaged_shuttle)
+"UU" = (
+/turf/template_noop,
+/area/shuttle/salvaged_shuttle)
+"Vh" = (
+/turf/closed/wall/mineral/nanocarbon/black,
+/area/shuttle/salvaged_shuttle)
+"VR" = (
+/obj/structure/lattice/catwalk,
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/primary_colour,
+/turf/template_noop,
+/area/shuttle/salvaged_shuttle)
+"VV" = (
+/obj/structure/lattice/catwalk,
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/primary_colour{
+	dir = 1
+	},
+/obj/structure/titanium_structure,
+/turf/template_noop,
+/area/shuttle/salvaged_shuttle)
+"Wj" = (
+/obj/machinery/power/shuttle_engine/propulsion/salvage{
+	dir = 8
+	},
+/obj/structure/engine_covers/thruster_nozzle{
+	dir = 8
+	},
+/turf/open/floor/plating/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"Wp" = (
+/obj/machinery/light/red/directional/north,
+/obj/effect/spawner/random/salvage/every_small_tank,
+/turf/open/floor/plating/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"Wu" = (
+/obj/structure/shuttle_decoration/wall_plate/plastamic,
+/turf/open/floor/iron/colony/bolts/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"Ww" = (
+/obj/structure/shuttle_decoration/wall_plate/armor{
+	dir = 1
+	},
+/turf/open/floor/plating/nanocarbon/exterior/black,
+/area/shuttle/salvaged_shuttle)
+"Wz" = (
+/obj/structure/chair/comfy/shuttle{
+	dir = 8;
+	pixel_x = 5
+	},
+/turf/open/floor/iron/colony/bolts/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"Xb" = (
+/obj/structure/shuttle_decoration/junction_box/directional/south,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/secondary_colour,
+/area/shuttle/salvaged_shuttle)
+"Yb" = (
+/obj/machinery/light/red/directional/south,
+/obj/effect/spawner/random/salvage/interior_trash_n_debris,
+/turf/open/floor/catwalk_floor/colony_fabricator/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"Yn" = (
+/obj/structure/shuttle_decoration/wall_plate/silver_foil{
+	dir = 8
+	},
+/obj/structure/shuttle_decoration/wall_plate/plastamic{
+	dir = 4
+	},
+/turf/closed/wall/mineral/aluminum,
+/area/shuttle/salvaged_shuttle)
+"YC" = (
+/turf/template_noop,
+/area/template_noop)
+"Zq" = (
+/obj/structure/mineral_door/manual_colony_door/shuttle,
+/turf/open/floor/iron/colony/white/texture/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"Zy" = (
+/obj/effect/spawner/random/salvage/interior_trash_n_debris,
+/turf/open/floor/catwalk_floor/colony_fabricator/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"ZL" = (
+/obj/structure/shuttle_decoration/aux_engine/directional/west,
+/obj/effect/mapping_helpers/salvage_anchor/end/six,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour,
+/area/shuttle/salvaged_shuttle)
+
+(1,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+YC
+Vh
+Wj
+Wj
+IM
+Wj
+Wj
+Vh
+YC
+YC
+YC
+YC
+YC
+YC
+"}
+(2,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+mS
+IM
+Kj
+Kj
+Ed
+Kj
+Kj
+IM
+Bp
+YC
+YC
+YC
+YC
+YC
+"}
+(3,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+Ww
+KJ
+zm
+km
+LV
+vn
+zm
+Ul
+kO
+YC
+YC
+YC
+YC
+YC
+"}
+(4,1,1) = {"
+YC
+uk
+YC
+YC
+YC
+mS
+IM
+zm
+ez
+Yn
+fI
+zm
+IM
+Bp
+YC
+YC
+YC
+uk
+YC
+"}
+(5,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+zd
+PS
+vn
+FY
+KS
+Hh
+vn
+PS
+VR
+YC
+YC
+YC
+YC
+YC
+"}
+(6,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+VV
+PS
+CC
+LF
+IZ
+CC
+BV
+PS
+wF
+YC
+YC
+YC
+YC
+YC
+"}
+(7,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+sm
+ce
+is
+nP
+Mn
+nP
+wd
+ce
+IG
+YC
+YC
+YC
+YC
+YC
+"}
+(8,1,1) = {"
+YC
+Ev
+YC
+YC
+YC
+sm
+Xb
+vn
+Wz
+Zy
+qr
+xx
+ce
+IG
+YC
+YC
+YC
+Ii
+YC
+"}
+(9,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+VV
+RT
+rb
+CC
+Zq
+CC
+CQ
+eP
+wF
+YC
+YC
+YC
+YC
+YC
+"}
+(10,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+zd
+PS
+gT
+yo
+Yb
+Dq
+gT
+PS
+VR
+YC
+YC
+YC
+YC
+YC
+"}
+(11,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+zd
+hx
+hx
+CC
+Zq
+CC
+hx
+hx
+VR
+YC
+YC
+YC
+YC
+YC
+"}
+(12,1,1) = {"
+uk
+YC
+YC
+YC
+YC
+YC
+hx
+UU
+hx
+bo
+hx
+UU
+hx
+YC
+YC
+YC
+YC
+YC
+uk
+"}
+(13,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+YC
+pN
+Ox
+eB
+bo
+Fz
+Ox
+cl
+YC
+YC
+YC
+YC
+YC
+YC
+"}
+(14,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+YC
+pN
+Ox
+Ra
+lN
+uM
+Ox
+cl
+YC
+YC
+YC
+YC
+YC
+YC
+"}
+(15,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+YC
+Md
+Ox
+eB
+lN
+Fz
+Ox
+yi
+YC
+YC
+YC
+YC
+YC
+YC
+"}
+(16,1,1) = {"
+HR
+YC
+YC
+YC
+YC
+YC
+JH
+Ox
+eB
+bo
+Fz
+Ox
+FL
+YC
+YC
+YC
+YC
+YC
+MV
+"}
+(17,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+YC
+pN
+Ox
+eB
+FV
+Fz
+Ox
+cl
+YC
+YC
+YC
+YC
+YC
+YC
+"}
+(18,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+YC
+Md
+Ox
+eB
+Qv
+Fz
+Ox
+yi
+YC
+YC
+YC
+YC
+YC
+YC
+"}
+(19,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+YC
+pN
+Ox
+Ra
+lN
+uM
+Ox
+cl
+YC
+YC
+YC
+YC
+YC
+YC
+"}
+(20,1,1) = {"
+uk
+YC
+YC
+YC
+YC
+YC
+pN
+Ox
+eB
+FV
+Fz
+Ox
+cl
+YC
+YC
+YC
+YC
+YC
+uk
+"}
+(21,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+YC
+hx
+UU
+hx
+bo
+hx
+UU
+hx
+YC
+YC
+YC
+YC
+YC
+YC
+"}
+(22,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+Ku
+hx
+hx
+CC
+Zq
+CC
+hx
+hx
+OM
+YC
+YC
+YC
+YC
+YC
+"}
+(23,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+Ku
+ZL
+wC
+yo
+Kk
+Dq
+wC
+ly
+OM
+YC
+YC
+YC
+YC
+YC
+"}
+(24,1,1) = {"
+YC
+Im
+YC
+YC
+YC
+DA
+PS
+mO
+CC
+Zq
+CC
+vn
+PS
+QW
+YC
+YC
+YC
+vE
+YC
+"}
+(25,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+sm
+ce
+bJ
+bB
+Mn
+TR
+tC
+ce
+IG
+YC
+YC
+YC
+YC
+YC
+"}
+(26,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+sm
+ce
+CC
+CC
+oV
+Hc
+CC
+ce
+IG
+YC
+YC
+YC
+YC
+YC
+"}
+(27,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+DA
+PS
+km
+Ej
+Mn
+TR
+mO
+PS
+Pg
+PS
+YC
+YC
+YC
+YC
+"}
+(28,1,1) = {"
+YC
+uk
+YC
+YC
+YC
+zd
+PS
+vn
+Fg
+Zy
+Mn
+pM
+Zq
+nE
+GS
+YC
+YC
+uk
+YC
+"}
+(29,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+VV
+PS
+Wp
+bA
+nP
+nO
+wd
+PS
+MJ
+Aq
+YC
+YC
+YC
+YC
+"}
+(30,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+Ku
+PS
+mO
+Fg
+nP
+Wu
+vn
+PS
+sE
+lu
+YC
+YC
+YC
+YC
+"}
+(31,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+Hg
+dw
+wS
+IZ
+IZ
+IZ
+wS
+EV
+IZ
+pB
+YC
+YC
+YC
+YC
+"}
diff --git a/_maps/shuttles/~doppler_shuttles/salvage/salvage_meridian_cargo.dmm b/_maps/shuttles/~doppler_shuttles/salvage/salvage_meridian_cargo.dmm
new file mode 100644
index 00000000000000..5868c49f74ff9f
--- /dev/null
+++ b/_maps/shuttles/~doppler_shuttles/salvage/salvage_meridian_cargo.dmm
@@ -0,0 +1,1154 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"cP" = (
+/obj/machinery/exoscanner/shuttle_part/radar_panel/directional/south,
+/obj/structure/shuttle_decoration/wall_plate/plastamic{
+	dir = 1
+	},
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"dD" = (
+/obj/structure/railing/eva_handhold/directional/south,
+/obj/structure/railing/eva_handhold/directional/north,
+/obj/effect/mapping_helpers/salvage_anchor/five,
+/obj/structure/marker_beacon/jade,
+/turf/open/floor/engine/anchor_jack,
+/area/shuttle/salvaged_shuttle)
+"ez" = (
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"eB" = (
+/obj/effect/spawner/random/salvage/crate_or_cargo,
+/turf/open/floor/iron/colony/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"fe" = (
+/obj/structure/shuttle_decoration/wall_plate/silver_foil{
+	dir = 8
+	},
+/turf/closed/wall/mineral/aluminum,
+/area/shuttle/salvaged_shuttle)
+"fj" = (
+/obj/structure/shuttle_decoration/wall_plate/plastamic{
+	dir = 1
+	},
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"fI" = (
+/obj/effect/spawner/random/salvage/every_industrial_tank,
+/turf/open/floor/iron/colony/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"gM" = (
+/obj/machinery/power/shuttle_engine/heater/salvage{
+	dir = 8
+	},
+/turf/open/floor/plating/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"hx" = (
+/obj/structure/lattice,
+/obj/structure/titanium_structure,
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/diagonal/primary_colour{
+	dir = 4
+	},
+/turf/template_noop,
+/area/shuttle/salvaged_shuttle)
+"ik" = (
+/obj/structure/shuttle_decoration/wall_plate/gold_foil{
+	dir = 8
+	},
+/turf/closed/wall/mineral/aluminum,
+/area/shuttle/salvaged_shuttle)
+"iy" = (
+/obj/structure/shuttle_decoration/liquid_tank/reactor,
+/turf/open/floor/plating/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"jv" = (
+/obj/structure/shuttle_decoration/rcs/directional/north,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"jX" = (
+/obj/machinery/light/cold/directional/south,
+/turf/open/floor/plating/aluminum,
+/area/shuttle/salvaged_shuttle)
+"km" = (
+/obj/structure/lattice,
+/obj/structure/titanium_structure,
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/diagonal/primary_colour,
+/turf/template_noop,
+/area/shuttle/salvaged_shuttle)
+"kO" = (
+/turf/open/floor/catwalk_floor/colony_fabricator/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"kP" = (
+/obj/machinery/exoscanner/shuttle_part/radar_panel/directional/north,
+/obj/structure/shuttle_decoration/wall_plate/plastamic,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"kZ" = (
+/obj/structure/railing/eva_handhold/directional/south,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/black,
+/area/shuttle/salvaged_shuttle)
+"ly" = (
+/obj/structure/shuttle_decoration/wall_plate/gold_foil{
+	dir = 4
+	},
+/turf/closed/wall/mineral/aluminum,
+/area/shuttle/salvaged_shuttle)
+"md" = (
+/obj/structure/shuttle_decoration/radiator/directional/west,
+/turf/closed/wall/mineral/nanocarbon/black,
+/area/shuttle/salvaged_shuttle)
+"nk" = (
+/obj/structure/lattice,
+/obj/structure/titanium_structure,
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/diagonal/secondary_colour{
+	dir = 1
+	},
+/turf/template_noop,
+/area/shuttle/salvaged_shuttle)
+"nN" = (
+/obj/structure/shuttle_decoration/wall_plate/gold_foil{
+	dir = 1
+	},
+/turf/closed/wall/mineral/aluminum,
+/area/shuttle/salvaged_shuttle)
+"nP" = (
+/obj/structure/mineral_door/manual_colony_door/shuttle/interior,
+/turf/open/floor/iron/colony/white/texture,
+/area/shuttle/salvaged_shuttle)
+"pa" = (
+/obj/effect/spawner/random/salvage/small_fuel_tanks,
+/turf/open/floor/plating/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"pH" = (
+/obj/machinery/light/cold/dim/directional/west,
+/turf/open/floor/catwalk_floor/colony_fabricator/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"rb" = (
+/obj/machinery/light/cold/directional/north,
+/obj/effect/spawner/random/salvage/crate_or_cargo,
+/turf/open/floor/iron/colony/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"rL" = (
+/obj/machinery/power/shuttle_engine/propulsion/salvage{
+	dir = 8
+	},
+/obj/structure/engine_covers/thruster_nozzle{
+	dir = 8
+	},
+/turf/open/floor/plating/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"sj" = (
+/obj/structure/shuttle_decoration/wall_plate/armor,
+/turf/closed/wall/mineral/aluminum,
+/area/shuttle/salvaged_shuttle)
+"tC" = (
+/obj/structure/shuttle_decoration/wall_plate/silver_foil{
+	dir = 1
+	},
+/turf/closed/wall/mineral/aluminum,
+/area/shuttle/salvaged_shuttle)
+"uk" = (
+/obj/structure/railing/eva_handhold/directional/south,
+/obj/structure/railing/eva_handhold/directional/north,
+/obj/effect/mapping_helpers/salvage_anchor/seven,
+/obj/structure/marker_beacon/jade,
+/turf/open/floor/engine/anchor_jack,
+/area/shuttle/salvaged_shuttle)
+"uK" = (
+/obj/structure/railing/eva_handhold/directional/north,
+/obj/structure/shuttle_decoration/rcs/directional/north,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"uL" = (
+/turf/open/floor/plating/aluminum,
+/area/shuttle/salvaged_shuttle)
+"vn" = (
+/obj/machinery/exoscanner/shuttle_part/radio_dish/directional/east,
+/obj/structure/shuttle_decoration/console/directional/west,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"vE" = (
+/obj/structure/railing/eva_handhold/directional/south,
+/obj/structure/railing/eva_handhold/directional/north,
+/obj/effect/mapping_helpers/salvage_anchor/two,
+/obj/structure/marker_beacon/jade,
+/turf/open/floor/engine/anchor_jack,
+/area/shuttle/salvaged_shuttle)
+"wC" = (
+/obj/structure/engine_covers/thruster_nozzle{
+	dir = 8
+	},
+/obj/machinery/power/shuttle_engine/propulsion/salvage{
+	dir = 8
+	},
+/turf/open/floor/plating/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"xs" = (
+/obj/structure/shuttle_decoration/rcs/directional/south,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"xx" = (
+/obj/machinery/light/cold/directional/south,
+/obj/structure/chair/comfy/shuttle{
+	dir = 1
+	},
+/turf/open/floor/iron/colony/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"yi" = (
+/turf/open/floor/plating/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"ym" = (
+/obj/structure/railing/eva_handhold/directional/south,
+/obj/structure/shuttle_decoration/rcs/directional/south,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"yu" = (
+/obj/effect/spawner/random/salvage/interior_trash_n_debris,
+/turf/open/floor/iron/colony/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"yx" = (
+/obj/effect/mapping_helpers/salvage_anchor/end/seven,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/secondary_colour,
+/area/shuttle/salvaged_shuttle)
+"zd" = (
+/obj/structure/railing/eva_handhold/directional/north,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"zm" = (
+/obj/structure/mineral_door/manual_colony_door/shuttle,
+/turf/open/floor/iron/colony/white/texture,
+/area/shuttle/salvaged_shuttle)
+"Av" = (
+/obj/machinery/power/shuttle_engine/heater/salvage{
+	dir = 8
+	},
+/obj/structure/engine_covers/heater_cover{
+	dir = 4
+	},
+/turf/open/floor/plating/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"BC" = (
+/obj/structure/lattice,
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/diagonal/secondary_colour{
+	dir = 5
+	},
+/turf/template_noop,
+/area/shuttle/salvaged_shuttle)
+"BV" = (
+/obj/structure/titanium_structure,
+/turf/open/floor/plating/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"BW" = (
+/obj/machinery/light/blacklight/directional/south,
+/turf/open/floor/iron/colony/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"CC" = (
+/turf/open/floor/iron/colony/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"CU" = (
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/black,
+/area/shuttle/salvaged_shuttle)
+"Dm" = (
+/obj/structure/railing/eva_handhold/directional/south,
+/obj/structure/railing/eva_handhold/directional/north,
+/obj/effect/mapping_helpers/salvage_anchor/six,
+/obj/structure/marker_beacon/jade,
+/turf/open/floor/engine/anchor_jack,
+/area/shuttle/salvaged_shuttle)
+"Dp" = (
+/obj/structure/lattice,
+/obj/structure/titanium_structure,
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/diagonal/secondary_colour{
+	dir = 4
+	},
+/turf/template_noop,
+/area/shuttle/salvaged_shuttle)
+"Du" = (
+/obj/structure/lattice,
+/obj/effect/spawner/random/salvage/every_small_tank,
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/diagonal/primary_colour,
+/turf/template_noop,
+/area/shuttle/salvaged_shuttle)
+"Dx" = (
+/obj/structure/window/fulltile/salvage_shuttle,
+/turf/open/floor/plating/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"Em" = (
+/obj/structure/railing/eva_handhold/directional/south,
+/obj/structure/railing/eva_handhold/directional/north,
+/obj/effect/mapping_helpers/salvage_anchor/three,
+/obj/structure/marker_beacon/jade,
+/turf/open/floor/engine/anchor_jack,
+/area/shuttle/salvaged_shuttle)
+"Ev" = (
+/obj/structure/railing/eva_handhold/directional/south,
+/obj/structure/railing/eva_handhold/directional/north,
+/obj/effect/mapping_helpers/salvage_anchor/four,
+/obj/structure/marker_beacon/jade,
+/turf/open/floor/engine/anchor_jack,
+/area/shuttle/salvaged_shuttle)
+"Ew" = (
+/obj/structure/railing/eva_handhold/directional/north,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/black,
+/area/shuttle/salvaged_shuttle)
+"Ex" = (
+/obj/structure/engine_covers/heater_cover{
+	dir = 4
+	},
+/obj/effect/spawner/random/salvage/every_small_tank,
+/turf/open/floor/plating/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"Fg" = (
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/primary_colour{
+	dir = 1
+	},
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"Fz" = (
+/obj/structure/shuttle_decoration/wall_plate/gold_foil,
+/obj/structure/shuttle_decoration/wall_plate/plastamic{
+	dir = 1
+	},
+/turf/closed/wall/mineral/aluminum,
+/area/shuttle/salvaged_shuttle)
+"Gu" = (
+/obj/structure/shuttle_decoration/aux_engine/directional/west,
+/turf/closed/wall/mineral/nanocarbon/black,
+/area/shuttle/salvaged_shuttle)
+"Gy" = (
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/secondary_colour{
+	dir = 1
+	},
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/secondary_colour,
+/area/shuttle/salvaged_shuttle)
+"HG" = (
+/obj/effect/spawner/random/salvage/interior_trash_n_debris,
+/turf/open/floor/plating/aluminum,
+/area/shuttle/salvaged_shuttle)
+"HR" = (
+/obj/structure/railing/eva_handhold/directional/south,
+/obj/structure/railing/eva_handhold/directional/north,
+/obj/structure/marker_beacon/yellow,
+/turf/open/floor/engine/anchor_jack,
+/area/shuttle/salvaged_shuttle)
+"Ii" = (
+/obj/structure/railing/eva_handhold/directional/south,
+/obj/structure/railing/eva_handhold/directional/north,
+/obj/effect/mapping_helpers/salvage_anchor/one,
+/obj/structure/marker_beacon/jade,
+/turf/open/floor/engine/anchor_jack,
+/area/shuttle/salvaged_shuttle)
+"Is" = (
+/obj/structure/shuttle_decoration/wall_plate/silver_foil,
+/turf/closed/wall/mineral/aluminum,
+/area/shuttle/salvaged_shuttle)
+"IG" = (
+/obj/machinery/light/cold/directional/north,
+/obj/effect/spawner/random/salvage/crate_or_cargo,
+/turf/open/floor/plating/aluminum,
+/area/shuttle/salvaged_shuttle)
+"IM" = (
+/obj/effect/spawner/random/salvage/every_small_tank,
+/turf/open/floor/plating/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"IP" = (
+/obj/structure/chair/comfy/shuttle{
+	dir = 4;
+	pixel_x = -5
+	},
+/turf/open/floor/iron/colony/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"IZ" = (
+/obj/effect/spawner/random/salvage/interior_trash_n_debris,
+/turf/open/floor/catwalk_floor/colony_fabricator/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"Jd" = (
+/obj/effect/mapping_helpers/salvage_anchor/end/five,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"Jp" = (
+/turf/closed/wall/mineral/nanocarbon/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"Kk" = (
+/obj/machinery/light/cold/directional/south,
+/turf/open/floor/iron/colony/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"KV" = (
+/obj/effect/mapping_helpers/salvage_anchor/end/one,
+/obj/structure/shuttle_decoration/landing_engine/directional/south,
+/turf/closed/wall/mineral/nanocarbon/black,
+/area/shuttle/salvaged_shuttle)
+"LH" = (
+/obj/effect/mapping_helpers/salvage_anchor/end/eight,
+/obj/structure/shuttle_decoration/landing_engine/directional/north,
+/turf/closed/wall/mineral/nanocarbon/black,
+/area/shuttle/salvaged_shuttle)
+"LJ" = (
+/obj/effect/mapping_helpers/salvage_anchor/end/three,
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/primary_colour,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"LV" = (
+/obj/effect/mapping_helpers/salvage_anchor/end/six,
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/primary_colour{
+	dir = 1
+	},
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"LY" = (
+/obj/structure/shuttle_decoration/wall_plate/plastamic,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"Md" = (
+/obj/effect/mapping_helpers/salvage_anchor/end/two,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/secondary_colour,
+/area/shuttle/salvaged_shuttle)
+"MV" = (
+/obj/docking_port/mobile/salvage,
+/obj/structure/railing/eva_handhold/directional/south,
+/obj/structure/railing/eva_handhold/directional/north,
+/obj/structure/marker_beacon/yellow,
+/turf/open/floor/engine/anchor_jack,
+/area/shuttle/salvaged_shuttle)
+"No" = (
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/secondary_colour,
+/area/shuttle/salvaged_shuttle)
+"NP" = (
+/obj/effect/spawner/random/salvage/crate_or_cargo,
+/turf/open/floor/plating/aluminum,
+/area/shuttle/salvaged_shuttle)
+"Oe" = (
+/obj/structure/shuttle_decoration/headlight/directional/east,
+/obj/structure/shuttle_decoration/console/directional/west,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"Ow" = (
+/obj/machinery/light/blacklight/directional/north,
+/obj/effect/spawner/random/salvage/interior_trash_n_debris,
+/turf/open/floor/iron/colony/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"Pp" = (
+/obj/effect/spawner/random/salvage/interior_trash_n_debris,
+/turf/open/floor/plating/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"Qv" = (
+/obj/structure/shuttle_access_panel,
+/turf/open/floor/plating/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"RM" = (
+/obj/machinery/light/cold/directional/north,
+/obj/effect/spawner/random/salvage/interior_trash_n_debris,
+/turf/open/floor/iron/colony/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"RS" = (
+/turf/closed/wall/mineral/nanocarbon/black,
+/area/shuttle/salvaged_shuttle)
+"Sv" = (
+/obj/structure/railing/eva_handhold/directional/south,
+/obj/structure/railing/eva_handhold/directional/north,
+/obj/effect/mapping_helpers/salvage_anchor/eight,
+/obj/structure/marker_beacon/jade,
+/turf/open/floor/engine/anchor_jack,
+/area/shuttle/salvaged_shuttle)
+"Tf" = (
+/obj/structure/shuttle_decoration/wall_plate/gold_foil{
+	dir = 1
+	},
+/obj/structure/shuttle_decoration/wall_plate/plastamic,
+/turf/closed/wall/mineral/aluminum,
+/area/shuttle/salvaged_shuttle)
+"Tm" = (
+/obj/structure/lattice,
+/obj/effect/spawner/random/salvage/small_fuel_tanks,
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/diagonal/secondary_colour{
+	dir = 1
+	},
+/turf/template_noop,
+/area/shuttle/salvaged_shuttle)
+"UE" = (
+/obj/structure/shuttle_decoration/wall_plate/armor{
+	dir = 1
+	},
+/turf/closed/wall/mineral/aluminum,
+/area/shuttle/salvaged_shuttle)
+"UU" = (
+/turf/closed/wall/mineral/aluminum,
+/area/shuttle/salvaged_shuttle)
+"VR" = (
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/primary_colour,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"Xt" = (
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/secondary_colour,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/secondary_colour,
+/area/shuttle/salvaged_shuttle)
+"YC" = (
+/turf/template_noop,
+/area/template_noop)
+"YR" = (
+/obj/effect/mapping_helpers/salvage_anchor/end/four,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"Zq" = (
+/obj/structure/lattice,
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/diagonal/primary_colour{
+	dir = 6
+	},
+/turf/template_noop,
+/area/shuttle/salvaged_shuttle)
+"Zy" = (
+/obj/structure/shuttle_decoration/junction_box/directional/west,
+/obj/structure/shuttle_decoration/junction_box/directional/east,
+/turf/closed/wall/mineral/aluminum,
+/area/shuttle/salvaged_shuttle)
+
+(1,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+"}
+(2,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+"}
+(3,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+"}
+(4,1,1) = {"
+YC
+Sv
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+Ii
+YC
+"}
+(5,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+"}
+(6,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+"}
+(7,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+RS
+md
+rL
+md
+RS
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+"}
+(8,1,1) = {"
+YC
+HR
+YC
+YC
+YC
+UE
+YC
+LH
+RS
+Av
+RS
+KV
+YC
+sj
+YC
+YC
+YC
+HR
+YC
+"}
+(9,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+UE
+YC
+RS
+Ow
+iy
+BW
+RS
+YC
+sj
+YC
+YC
+YC
+YC
+YC
+"}
+(10,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+Ew
+Gu
+CU
+CC
+yi
+yu
+CU
+Gu
+kZ
+YC
+YC
+YC
+YC
+YC
+"}
+(11,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+jv
+pa
+UU
+fe
+nP
+fe
+UU
+pa
+xs
+YC
+YC
+YC
+YC
+YC
+"}
+(12,1,1) = {"
+uk
+YC
+YC
+Fg
+wC
+ez
+yi
+BV
+fI
+IZ
+yu
+BV
+yi
+ez
+wC
+VR
+YC
+YC
+vE
+"}
+(13,1,1) = {"
+YC
+YC
+YC
+Gy
+gM
+yx
+Pp
+Qv
+NP
+NP
+HG
+Qv
+Pp
+Md
+gM
+Xt
+YC
+YC
+YC
+"}
+(14,1,1) = {"
+YC
+YC
+YC
+Gy
+BV
+No
+yi
+BV
+HG
+NP
+NP
+BV
+IM
+No
+BV
+Xt
+YC
+YC
+YC
+"}
+(15,1,1) = {"
+YC
+YC
+YC
+Gy
+Ex
+No
+Pp
+tC
+IG
+NP
+jX
+Is
+Pp
+No
+Ex
+Xt
+YC
+YC
+YC
+"}
+(16,1,1) = {"
+HR
+YC
+YC
+YC
+YC
+zd
+ik
+UU
+NP
+uL
+NP
+BV
+IM
+ez
+YC
+YC
+YC
+YC
+MV
+"}
+(17,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+zm
+pH
+zm
+NP
+HG
+NP
+BV
+IM
+VR
+YC
+YC
+YC
+YC
+YC
+"}
+(18,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+zd
+ly
+UU
+RM
+kO
+Kk
+BV
+yi
+VR
+YC
+YC
+YC
+YC
+YC
+"}
+(19,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+LV
+yi
+nN
+Zy
+nP
+UU
+UU
+Pp
+LJ
+YC
+YC
+YC
+YC
+YC
+"}
+(20,1,1) = {"
+Dm
+YC
+YC
+YC
+YC
+uK
+IM
+Tf
+eB
+kO
+eB
+Fz
+IM
+ym
+YC
+YC
+YC
+YC
+Em
+"}
+(21,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+Jp
+ez
+LY
+rb
+IZ
+xx
+fj
+ez
+Jp
+YC
+YC
+YC
+YC
+YC
+"}
+(22,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+YC
+nk
+kP
+IP
+yu
+IP
+cP
+km
+YC
+YC
+YC
+YC
+YC
+YC
+"}
+(23,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+YC
+Tm
+Jd
+Oe
+Dx
+vn
+YR
+Du
+YC
+YC
+YC
+YC
+YC
+YC
+"}
+(24,1,1) = {"
+YC
+HR
+YC
+YC
+YC
+YC
+BC
+Dp
+YC
+YC
+YC
+hx
+Zq
+YC
+YC
+YC
+YC
+HR
+YC
+"}
+(25,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+"}
+(26,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+"}
+(27,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+"}
+(28,1,1) = {"
+YC
+dD
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+Ev
+YC
+"}
+(29,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+"}
+(30,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+"}
+(31,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+"}
diff --git a/_maps/shuttles/~doppler_shuttles/salvage/salvage_meridian_exolab.dmm b/_maps/shuttles/~doppler_shuttles/salvage/salvage_meridian_exolab.dmm
new file mode 100644
index 00000000000000..81a43a617da463
--- /dev/null
+++ b/_maps/shuttles/~doppler_shuttles/salvage/salvage_meridian_exolab.dmm
@@ -0,0 +1,1204 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"bo" = (
+/obj/machinery/light/cold/directional/north,
+/obj/effect/spawner/random/salvage/crate_only/civilian_supply,
+/turf/open/floor/iron/colony/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"ce" = (
+/obj/machinery/light/cold/directional/south,
+/obj/structure/chair/comfy/shuttle{
+	dir = 4;
+	pixel_x = -5
+	},
+/turf/open/floor/iron/colony/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"cP" = (
+/obj/machinery/exoscanner/shuttle_part/radar_panel/directional/south,
+/obj/structure/shuttle_decoration/wall_plate/plastamic{
+	dir = 1
+	},
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"dD" = (
+/obj/structure/railing/eva_handhold/directional/south,
+/obj/structure/railing/eva_handhold/directional/north,
+/obj/effect/mapping_helpers/salvage_anchor/five,
+/obj/structure/marker_beacon/jade,
+/turf/open/floor/engine/anchor_jack,
+/area/shuttle/salvaged_shuttle)
+"ez" = (
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"eB" = (
+/obj/effect/spawner/random/salvage/crate_only/civilian_supply,
+/turf/open/floor/iron/colony/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"fI" = (
+/obj/effect/spawner/random/salvage/crate_or_cargo/medical_or_research,
+/turf/open/floor/iron/colony/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"gM" = (
+/obj/structure/shuttle_decoration/wall_plate/silver_foil,
+/turf/closed/wall/mineral/aluminum,
+/area/shuttle/salvaged_shuttle)
+"hx" = (
+/obj/structure/lattice,
+/obj/structure/titanium_structure,
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/diagonal/primary_colour{
+	dir = 4
+	},
+/turf/template_noop,
+/area/shuttle/salvaged_shuttle)
+"ik" = (
+/obj/structure/shuttle_decoration/wall_plate/gold_foil{
+	dir = 8
+	},
+/turf/closed/wall/mineral/aluminum,
+/area/shuttle/salvaged_shuttle)
+"iy" = (
+/obj/machinery/power/shuttle_engine/propulsion/salvage{
+	dir = 8
+	},
+/obj/structure/engine_covers/thruster_nozzle{
+	dir = 8
+	},
+/turf/open/floor/plating/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"iA" = (
+/obj/effect/spawner/random/salvage/small_fuel_tanks,
+/turf/open/floor/plating/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"jj" = (
+/obj/structure/titanium_structure,
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/blue,
+/turf/open/floor/plating/nanocarbon/exterior/black,
+/area/shuttle/salvaged_shuttle)
+"jv" = (
+/obj/structure/lattice,
+/obj/structure/shuttle_decoration/wall_plate/armor,
+/obj/structure/titanium_structure,
+/turf/template_noop,
+/area/shuttle/salvaged_shuttle)
+"jX" = (
+/obj/structure/shuttle_decoration/wall_plate/silver_foil{
+	dir = 8
+	},
+/obj/structure/shuttle_decoration/wall_plate/plastamic{
+	dir = 4
+	},
+/turf/closed/wall/mineral/aluminum,
+/area/shuttle/salvaged_shuttle)
+"km" = (
+/obj/structure/lattice,
+/obj/structure/titanium_structure,
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/diagonal/primary_colour,
+/turf/template_noop,
+/area/shuttle/salvaged_shuttle)
+"kO" = (
+/turf/open/floor/catwalk_floor/colony_fabricator/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"kP" = (
+/obj/machinery/exoscanner/shuttle_part/radar_panel/directional/north,
+/obj/structure/shuttle_decoration/wall_plate/plastamic,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"kT" = (
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/blue{
+	dir = 1
+	},
+/turf/open/floor/plating/nanocarbon/exterior/black,
+/area/shuttle/salvaged_shuttle)
+"kZ" = (
+/obj/structure/railing/eva_handhold/directional/south,
+/obj/structure/shuttle_decoration/rcs/directional/south,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/black,
+/area/shuttle/salvaged_shuttle)
+"ly" = (
+/obj/structure/shuttle_decoration/wall_plate/gold_foil{
+	dir = 4
+	},
+/turf/closed/wall/mineral/aluminum,
+/area/shuttle/salvaged_shuttle)
+"md" = (
+/obj/structure/shuttle_decoration/radiator/directional/west,
+/turf/closed/wall/mineral/nanocarbon/black,
+/area/shuttle/salvaged_shuttle)
+"nk" = (
+/obj/structure/lattice,
+/obj/structure/titanium_structure,
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/diagonal/secondary_colour{
+	dir = 1
+	},
+/turf/template_noop,
+/area/shuttle/salvaged_shuttle)
+"nl" = (
+/obj/structure/shuttle_decoration/wall_plate/silver_foil{
+	dir = 1
+	},
+/turf/closed/wall/mineral/aluminum,
+/area/shuttle/salvaged_shuttle)
+"nN" = (
+/obj/structure/shuttle_decoration/wall_plate/gold_foil{
+	dir = 1
+	},
+/turf/closed/wall/mineral/aluminum,
+/area/shuttle/salvaged_shuttle)
+"nP" = (
+/obj/structure/mineral_door/manual_colony_door/shuttle/interior,
+/turf/open/floor/iron/colony/white/texture,
+/area/shuttle/salvaged_shuttle)
+"oM" = (
+/obj/machinery/light/cold/directional/south,
+/obj/effect/spawner/random/salvage/crate_or_cargo/medical_or_research,
+/turf/open/floor/iron/colony/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"pH" = (
+/obj/machinery/light/cold/dim/directional/west,
+/turf/open/floor/catwalk_floor/colony_fabricator/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"rL" = (
+/obj/structure/shuttle_decoration/wall_plate/plastamic,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"sj" = (
+/obj/structure/shuttle_decoration/wall_plate/armor,
+/turf/closed/wall/mineral/aluminum,
+/area/shuttle/salvaged_shuttle)
+"tj" = (
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/blue,
+/turf/open/floor/plating/nanocarbon/exterior/black,
+/area/shuttle/salvaged_shuttle)
+"tC" = (
+/obj/structure/shuttle_decoration/wall_plate/plastamic{
+	dir = 1
+	},
+/obj/structure/shuttle_decoration/wall_plate/silver_foil,
+/turf/closed/wall/mineral/aluminum,
+/area/shuttle/salvaged_shuttle)
+"uk" = (
+/obj/structure/railing/eva_handhold/directional/south,
+/obj/structure/railing/eva_handhold/directional/north,
+/obj/effect/mapping_helpers/salvage_anchor/seven,
+/obj/structure/marker_beacon/jade,
+/turf/open/floor/engine/anchor_jack,
+/area/shuttle/salvaged_shuttle)
+"uK" = (
+/obj/structure/railing/eva_handhold/directional/north,
+/obj/structure/shuttle_decoration/rcs/directional/north,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"uL" = (
+/obj/structure/shuttle_decoration/ladder/directional/south,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"vn" = (
+/obj/machinery/exoscanner/shuttle_part/radio_dish/directional/east,
+/obj/structure/shuttle_decoration/console/directional/west,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"vE" = (
+/obj/structure/railing/eva_handhold/directional/south,
+/obj/structure/railing/eva_handhold/directional/north,
+/obj/effect/mapping_helpers/salvage_anchor/two,
+/obj/structure/marker_beacon/jade,
+/turf/open/floor/engine/anchor_jack,
+/area/shuttle/salvaged_shuttle)
+"wC" = (
+/obj/structure/shuttle_decoration/wall_plate/plastamic,
+/turf/closed/wall/mineral/aluminum,
+/area/shuttle/salvaged_shuttle)
+"xs" = (
+/obj/structure/table/reinforced/rglass,
+/obj/item/paperwork/ancient,
+/obj/item/paperwork/ancient{
+	pixel_y = 5;
+	pixel_x = 14
+	},
+/turf/open/floor/iron/colony/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"xx" = (
+/obj/machinery/light/cold/directional/south,
+/obj/structure/chair/comfy/shuttle{
+	dir = 1
+	},
+/turf/open/floor/iron/colony/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"yi" = (
+/turf/open/floor/plating/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"ym" = (
+/obj/structure/railing/eva_handhold/directional/south,
+/obj/structure/shuttle_decoration/rcs/directional/south,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"yu" = (
+/obj/effect/spawner/random/salvage/interior_trash_n_debris,
+/turf/open/floor/iron/colony/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"yx" = (
+/obj/effect/mapping_helpers/salvage_anchor/end/seven,
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/secondary_colour{
+	dir = 1
+	},
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/secondary_colour,
+/area/shuttle/salvaged_shuttle)
+"zd" = (
+/obj/structure/railing/eva_handhold/directional/north,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"zm" = (
+/obj/structure/mineral_door/manual_colony_door/shuttle,
+/turf/open/floor/iron/colony/white/texture,
+/area/shuttle/salvaged_shuttle)
+"zJ" = (
+/turf/closed/wall/mineral/nanocarbon/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"Av" = (
+/obj/machinery/power/shuttle_engine/heater/salvage{
+	dir = 8
+	},
+/obj/structure/engine_covers/heater_cover{
+	dir = 4
+	},
+/turf/open/floor/plating/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"BC" = (
+/obj/structure/lattice,
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/diagonal/secondary_colour{
+	dir = 5
+	},
+/turf/template_noop,
+/area/shuttle/salvaged_shuttle)
+"BV" = (
+/obj/structure/shuttle_decoration/liquid_tank/reactor,
+/turf/open/floor/plating/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"BW" = (
+/obj/machinery/light/blacklight/directional/south,
+/obj/effect/spawner/random/salvage/interior_trash_n_debris,
+/turf/open/floor/iron/colony/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"CC" = (
+/turf/open/floor/iron/colony/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"CU" = (
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/black,
+/area/shuttle/salvaged_shuttle)
+"Dm" = (
+/obj/structure/railing/eva_handhold/directional/south,
+/obj/structure/railing/eva_handhold/directional/north,
+/obj/effect/mapping_helpers/salvage_anchor/six,
+/obj/structure/marker_beacon/jade,
+/turf/open/floor/engine/anchor_jack,
+/area/shuttle/salvaged_shuttle)
+"Dp" = (
+/obj/structure/lattice,
+/obj/structure/titanium_structure,
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/diagonal/secondary_colour{
+	dir = 4
+	},
+/turf/template_noop,
+/area/shuttle/salvaged_shuttle)
+"Du" = (
+/obj/structure/lattice,
+/obj/effect/spawner/random/salvage/every_small_tank,
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/diagonal/primary_colour,
+/turf/template_noop,
+/area/shuttle/salvaged_shuttle)
+"Dx" = (
+/obj/structure/window/fulltile/salvage_shuttle,
+/turf/open/floor/plating/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"Ek" = (
+/obj/structure/lattice,
+/obj/structure/shuttle_decoration/wall_plate/armor{
+	dir = 1
+	},
+/obj/structure/titanium_structure,
+/turf/template_noop,
+/area/shuttle/salvaged_shuttle)
+"Em" = (
+/obj/structure/railing/eva_handhold/directional/south,
+/obj/structure/railing/eva_handhold/directional/north,
+/obj/effect/mapping_helpers/salvage_anchor/three,
+/obj/structure/marker_beacon/jade,
+/turf/open/floor/engine/anchor_jack,
+/area/shuttle/salvaged_shuttle)
+"Ev" = (
+/obj/structure/railing/eva_handhold/directional/south,
+/obj/structure/railing/eva_handhold/directional/north,
+/obj/effect/mapping_helpers/salvage_anchor/four,
+/obj/structure/marker_beacon/jade,
+/turf/open/floor/engine/anchor_jack,
+/area/shuttle/salvaged_shuttle)
+"Ew" = (
+/obj/structure/railing/eva_handhold/directional/north,
+/obj/structure/shuttle_decoration/rcs/directional/north,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/black,
+/area/shuttle/salvaged_shuttle)
+"Ex" = (
+/obj/machinery/exoscanner/shuttle_part/open_sensors_blister/directional/south,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"Fg" = (
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/primary_colour{
+	dir = 1
+	},
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"Fz" = (
+/obj/structure/shuttle_decoration/wall_plate/gold_foil,
+/obj/structure/shuttle_decoration/wall_plate/plastamic{
+	dir = 1
+	},
+/turf/closed/wall/mineral/aluminum,
+/area/shuttle/salvaged_shuttle)
+"Gu" = (
+/obj/structure/shuttle_decoration/aux_engine/directional/west,
+/turf/closed/wall/mineral/nanocarbon/black,
+/area/shuttle/salvaged_shuttle)
+"Gy" = (
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/secondary_colour{
+	dir = 1
+	},
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/secondary_colour,
+/area/shuttle/salvaged_shuttle)
+"HG" = (
+/obj/structure/table/reinforced/rglass,
+/turf/open/floor/iron/colony/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"HR" = (
+/obj/structure/railing/eva_handhold/directional/south,
+/obj/structure/railing/eva_handhold/directional/north,
+/obj/structure/marker_beacon/yellow,
+/turf/open/floor/engine/anchor_jack,
+/area/shuttle/salvaged_shuttle)
+"Ii" = (
+/obj/structure/railing/eva_handhold/directional/south,
+/obj/structure/railing/eva_handhold/directional/north,
+/obj/effect/mapping_helpers/salvage_anchor/one,
+/obj/structure/marker_beacon/jade,
+/turf/open/floor/engine/anchor_jack,
+/area/shuttle/salvaged_shuttle)
+"IG" = (
+/obj/machinery/light/cold/directional/north,
+/obj/effect/spawner/random/salvage/interior_trash_n_debris,
+/turf/open/floor/iron/colony/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"IM" = (
+/obj/effect/spawner/random/salvage/every_small_tank,
+/turf/open/floor/plating/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"IP" = (
+/obj/structure/chair/comfy/shuttle{
+	dir = 4;
+	pixel_x = -5
+	},
+/turf/open/floor/iron/colony/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"IZ" = (
+/obj/effect/spawner/random/salvage/interior_trash_n_debris,
+/turf/open/floor/catwalk_floor/colony_fabricator/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"Jd" = (
+/obj/effect/mapping_helpers/salvage_anchor/end/five,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"JN" = (
+/obj/structure/titanium_structure,
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/blue{
+	dir = 1
+	},
+/turf/open/floor/plating/nanocarbon/exterior/black,
+/area/shuttle/salvaged_shuttle)
+"Kk" = (
+/obj/structure/shuttle_decoration/wall_plate/plastamic,
+/obj/structure/shuttle_decoration/wall_plate/silver_foil{
+	dir = 1
+	},
+/turf/closed/wall/mineral/aluminum,
+/area/shuttle/salvaged_shuttle)
+"KV" = (
+/obj/effect/mapping_helpers/salvage_anchor/end/one,
+/obj/structure/shuttle_decoration/landing_engine/directional/south,
+/turf/closed/wall/mineral/nanocarbon/black,
+/area/shuttle/salvaged_shuttle)
+"LH" = (
+/obj/effect/mapping_helpers/salvage_anchor/end/eight,
+/obj/structure/shuttle_decoration/landing_engine/directional/north,
+/turf/closed/wall/mineral/nanocarbon/black,
+/area/shuttle/salvaged_shuttle)
+"LJ" = (
+/obj/effect/mapping_helpers/salvage_anchor/end/three,
+/obj/machinery/exoscanner/shuttle_part/radio_dish/directional/south,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"LV" = (
+/obj/effect/mapping_helpers/salvage_anchor/end/six,
+/obj/machinery/exoscanner/shuttle_part/radio_dish/directional/north,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"Md" = (
+/obj/effect/mapping_helpers/salvage_anchor/end/two,
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/secondary_colour,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/secondary_colour,
+/area/shuttle/salvaged_shuttle)
+"MV" = (
+/obj/docking_port/mobile/salvage,
+/obj/structure/railing/eva_handhold/directional/south,
+/obj/structure/railing/eva_handhold/directional/north,
+/obj/structure/marker_beacon/yellow,
+/turf/open/floor/engine/anchor_jack,
+/area/shuttle/salvaged_shuttle)
+"No" = (
+/obj/structure/shuttle_decoration/extinguisher/directional/south,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/secondary_colour,
+/area/shuttle/salvaged_shuttle)
+"NP" = (
+/obj/structure/shuttle_decoration/console/directional/west,
+/turf/closed/wall/mineral/aluminum,
+/area/shuttle/salvaged_shuttle)
+"Oe" = (
+/obj/structure/shuttle_decoration/headlight/directional/east,
+/obj/structure/shuttle_decoration/console/directional/west,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"Ow" = (
+/obj/machinery/light/blacklight/directional/north,
+/turf/open/floor/iron/colony/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"Pp" = (
+/obj/effect/spawner/random/salvage/interior_trash_n_debris,
+/turf/open/floor/plating/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"Qv" = (
+/obj/structure/shuttle_access_panel,
+/turf/open/floor/plating/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"RM" = (
+/obj/machinery/light/cold/directional/north,
+/obj/structure/chair/comfy/shuttle{
+	dir = 8
+	},
+/obj/effect/spawner/random/salvage/interior_trash_n_debris,
+/turf/open/floor/iron/colony/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"RS" = (
+/turf/closed/wall/mineral/nanocarbon/black,
+/area/shuttle/salvaged_shuttle)
+"Sv" = (
+/obj/structure/railing/eva_handhold/directional/south,
+/obj/structure/railing/eva_handhold/directional/north,
+/obj/effect/mapping_helpers/salvage_anchor/eight,
+/obj/structure/marker_beacon/jade,
+/turf/open/floor/engine/anchor_jack,
+/area/shuttle/salvaged_shuttle)
+"Tf" = (
+/obj/structure/shuttle_decoration/wall_plate/gold_foil{
+	dir = 1
+	},
+/obj/structure/shuttle_decoration/wall_plate/plastamic,
+/turf/closed/wall/mineral/aluminum,
+/area/shuttle/salvaged_shuttle)
+"Tm" = (
+/obj/structure/lattice,
+/obj/effect/spawner/random/salvage/small_fuel_tanks,
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/diagonal/secondary_colour{
+	dir = 1
+	},
+/turf/template_noop,
+/area/shuttle/salvaged_shuttle)
+"UE" = (
+/obj/structure/shuttle_decoration/wall_plate/armor{
+	dir = 1
+	},
+/turf/closed/wall/mineral/aluminum,
+/area/shuttle/salvaged_shuttle)
+"UN" = (
+/obj/structure/shuttle_decoration/wall_plate/plastamic{
+	dir = 1
+	},
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"UU" = (
+/turf/closed/wall/mineral/aluminum,
+/area/shuttle/salvaged_shuttle)
+"VR" = (
+/obj/machinery/exoscanner/shuttle_part/sensors_blister/directional/south,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"Xt" = (
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/secondary_colour,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/secondary_colour,
+/area/shuttle/salvaged_shuttle)
+"YC" = (
+/turf/template_noop,
+/area/template_noop)
+"YR" = (
+/obj/effect/mapping_helpers/salvage_anchor/end/four,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"Zq" = (
+/obj/structure/lattice,
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/diagonal/primary_colour{
+	dir = 6
+	},
+/turf/template_noop,
+/area/shuttle/salvaged_shuttle)
+"Zy" = (
+/obj/structure/shuttle_decoration/junction_box/directional/west,
+/obj/structure/shuttle_decoration/junction_box/directional/east,
+/turf/closed/wall/mineral/aluminum,
+/area/shuttle/salvaged_shuttle)
+
+(1,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+"}
+(2,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+"}
+(3,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+"}
+(4,1,1) = {"
+YC
+Sv
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+Ii
+YC
+"}
+(5,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+"}
+(6,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+"}
+(7,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+RS
+md
+iy
+md
+RS
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+"}
+(8,1,1) = {"
+YC
+HR
+YC
+YC
+YC
+UE
+YC
+LH
+RS
+Av
+RS
+KV
+YC
+sj
+YC
+YC
+YC
+HR
+YC
+"}
+(9,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+UE
+YC
+RS
+Ow
+BV
+BW
+RS
+YC
+sj
+YC
+YC
+YC
+YC
+YC
+"}
+(10,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+Ew
+Gu
+CU
+yu
+Pp
+CC
+CU
+Gu
+kZ
+YC
+YC
+YC
+YC
+YC
+"}
+(11,1,1) = {"
+YC
+YC
+YC
+YC
+Ek
+ez
+iA
+UU
+jX
+nP
+jX
+UU
+iA
+ez
+jv
+YC
+YC
+YC
+YC
+"}
+(12,1,1) = {"
+uk
+YC
+YC
+YC
+kT
+Fg
+yi
+Kk
+fI
+IZ
+fI
+tC
+yi
+uL
+tj
+YC
+YC
+YC
+vE
+"}
+(13,1,1) = {"
+YC
+YC
+YC
+YC
+JN
+yx
+Pp
+Qv
+CC
+IZ
+xs
+Qv
+Pp
+Md
+jj
+YC
+YC
+YC
+YC
+"}
+(14,1,1) = {"
+YC
+YC
+YC
+YC
+kT
+Gy
+yi
+nl
+fI
+kO
+HG
+tC
+IM
+No
+tj
+YC
+YC
+YC
+YC
+"}
+(15,1,1) = {"
+YC
+YC
+YC
+YC
+Ek
+Gy
+Pp
+Kk
+IG
+IZ
+ce
+tC
+Pp
+Xt
+jv
+YC
+YC
+YC
+YC
+"}
+(16,1,1) = {"
+HR
+YC
+YC
+YC
+YC
+zd
+ik
+UU
+NP
+nP
+NP
+gM
+yi
+ez
+YC
+YC
+YC
+YC
+MV
+"}
+(17,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+zm
+pH
+zm
+CC
+IZ
+fI
+tC
+yi
+Ex
+YC
+YC
+YC
+YC
+YC
+"}
+(18,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+zd
+ly
+wC
+RM
+kO
+oM
+tC
+yi
+VR
+YC
+YC
+YC
+YC
+YC
+"}
+(19,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+LV
+yi
+nN
+Zy
+nP
+UU
+UU
+IM
+LJ
+YC
+YC
+YC
+YC
+YC
+"}
+(20,1,1) = {"
+Dm
+YC
+YC
+YC
+YC
+uK
+IM
+Tf
+eB
+kO
+fI
+Fz
+IM
+ym
+YC
+YC
+YC
+YC
+Em
+"}
+(21,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+zJ
+ez
+rL
+bo
+kO
+xx
+UN
+ez
+zJ
+YC
+YC
+YC
+YC
+YC
+"}
+(22,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+YC
+nk
+kP
+IP
+CC
+IP
+cP
+km
+YC
+YC
+YC
+YC
+YC
+YC
+"}
+(23,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+YC
+Tm
+Jd
+Oe
+Dx
+vn
+YR
+Du
+YC
+YC
+YC
+YC
+YC
+YC
+"}
+(24,1,1) = {"
+YC
+HR
+YC
+YC
+YC
+YC
+BC
+Dp
+YC
+YC
+YC
+hx
+Zq
+YC
+YC
+YC
+YC
+HR
+YC
+"}
+(25,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+"}
+(26,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+"}
+(27,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+"}
+(28,1,1) = {"
+YC
+dD
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+Ev
+YC
+"}
+(29,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+"}
+(30,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+"}
+(31,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+"}
diff --git a/_maps/shuttles/~doppler_shuttles/salvage/salvage_meridian_passenger.dmm b/_maps/shuttles/~doppler_shuttles/salvage/salvage_meridian_passenger.dmm
new file mode 100644
index 00000000000000..59b4fa2ac7c7bb
--- /dev/null
+++ b/_maps/shuttles/~doppler_shuttles/salvage/salvage_meridian_passenger.dmm
@@ -0,0 +1,1167 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"bo" = (
+/obj/effect/spawner/random/salvage/every_small_tank,
+/turf/open/floor/plating/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"ce" = (
+/obj/machinery/power/shuttle_engine/propulsion/salvage{
+	dir = 8
+	},
+/obj/structure/engine_covers/thruster_nozzle{
+	dir = 8
+	},
+/turf/open/floor/plating/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"cP" = (
+/obj/machinery/exoscanner/shuttle_part/radar_panel/directional/south,
+/obj/structure/shuttle_decoration/wall_plate/plastamic{
+	dir = 1
+	},
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"dD" = (
+/obj/structure/railing/eva_handhold/directional/south,
+/obj/structure/railing/eva_handhold/directional/north,
+/obj/effect/mapping_helpers/salvage_anchor/five,
+/obj/structure/marker_beacon/jade,
+/turf/open/floor/engine/anchor_jack,
+/area/shuttle/salvaged_shuttle)
+"ez" = (
+/turf/closed/wall/mineral/nanocarbon/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"eB" = (
+/obj/effect/spawner/random/salvage/crate_only/civilian_supply,
+/turf/open/floor/iron/colony/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"fe" = (
+/obj/structure/shuttle_decoration/wall_plate/silver_foil{
+	dir = 8
+	},
+/obj/structure/shuttle_decoration/wall_plate/plastamic{
+	dir = 4
+	},
+/turf/closed/wall/mineral/aluminum,
+/area/shuttle/salvaged_shuttle)
+"fI" = (
+/obj/structure/chair/comfy/shuttle,
+/turf/open/floor/iron/colony/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"gM" = (
+/obj/structure/shuttle_decoration/wall_plate/silver_foil,
+/obj/structure/shuttle_decoration/console/directional/north,
+/turf/closed/wall/mineral/aluminum,
+/area/shuttle/salvaged_shuttle)
+"hx" = (
+/obj/structure/lattice,
+/obj/structure/titanium_structure,
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/diagonal/primary_colour{
+	dir = 4
+	},
+/turf/template_noop,
+/area/shuttle/salvaged_shuttle)
+"ik" = (
+/obj/structure/shuttle_decoration/wall_plate/gold_foil{
+	dir = 8
+	},
+/turf/closed/wall/mineral/aluminum,
+/area/shuttle/salvaged_shuttle)
+"iA" = (
+/obj/effect/spawner/random/salvage/small_fuel_tanks,
+/turf/open/floor/plating/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"jv" = (
+/obj/structure/shuttle_decoration/rcs/directional/north,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"jX" = (
+/obj/machinery/light/cold/directional/south,
+/obj/structure/chair/comfy/shuttle{
+	dir = 1
+	},
+/obj/effect/spawner/random/salvage/interior_trash_n_debris,
+/turf/open/floor/iron/colony/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"km" = (
+/obj/structure/lattice,
+/obj/structure/titanium_structure,
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/diagonal/primary_colour,
+/turf/template_noop,
+/area/shuttle/salvaged_shuttle)
+"kO" = (
+/turf/open/floor/catwalk_floor/colony_fabricator/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"kP" = (
+/obj/machinery/exoscanner/shuttle_part/radar_panel/directional/north,
+/obj/structure/shuttle_decoration/wall_plate/plastamic,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"kZ" = (
+/obj/structure/railing/eva_handhold/directional/south,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/black,
+/area/shuttle/salvaged_shuttle)
+"ly" = (
+/obj/structure/shuttle_decoration/wall_plate/gold_foil{
+	dir = 4
+	},
+/turf/closed/wall/mineral/aluminum,
+/area/shuttle/salvaged_shuttle)
+"md" = (
+/obj/structure/shuttle_decoration/radiator/directional/west,
+/turf/closed/wall/mineral/nanocarbon/black,
+/area/shuttle/salvaged_shuttle)
+"nk" = (
+/obj/structure/lattice,
+/obj/structure/titanium_structure,
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/diagonal/secondary_colour{
+	dir = 1
+	},
+/turf/template_noop,
+/area/shuttle/salvaged_shuttle)
+"nN" = (
+/obj/structure/shuttle_decoration/wall_plate/gold_foil{
+	dir = 1
+	},
+/turf/closed/wall/mineral/aluminum,
+/area/shuttle/salvaged_shuttle)
+"nP" = (
+/obj/structure/mineral_door/manual_colony_door/shuttle/interior,
+/turf/open/floor/iron/colony/white/texture,
+/area/shuttle/salvaged_shuttle)
+"oM" = (
+/obj/structure/shuttle_decoration/console/directional/south,
+/turf/closed/wall/mineral/aluminum,
+/area/shuttle/salvaged_shuttle)
+"pa" = (
+/obj/structure/shuttle_decoration/wall_plate/plastamic,
+/obj/structure/shuttle_decoration/wall_plate/silver_foil{
+	dir = 1
+	},
+/turf/closed/wall/mineral/aluminum,
+/area/shuttle/salvaged_shuttle)
+"pH" = (
+/obj/machinery/light/cold/dim/directional/west,
+/turf/open/floor/catwalk_floor/colony_fabricator/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"rL" = (
+/obj/structure/shuttle_decoration/wall_plate/plastamic{
+	dir = 1
+	},
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"sj" = (
+/obj/structure/shuttle_decoration/wall_plate/armor,
+/turf/closed/wall/mineral/aluminum,
+/area/shuttle/salvaged_shuttle)
+"tC" = (
+/obj/structure/shuttle_decoration/wall_plate/plastamic{
+	dir = 1
+	},
+/obj/structure/shuttle_decoration/wall_plate/silver_foil,
+/turf/closed/wall/mineral/aluminum,
+/area/shuttle/salvaged_shuttle)
+"uk" = (
+/obj/structure/railing/eva_handhold/directional/south,
+/obj/structure/railing/eva_handhold/directional/north,
+/obj/effect/mapping_helpers/salvage_anchor/seven,
+/obj/structure/marker_beacon/jade,
+/turf/open/floor/engine/anchor_jack,
+/area/shuttle/salvaged_shuttle)
+"uK" = (
+/obj/structure/railing/eva_handhold/directional/north,
+/obj/structure/shuttle_decoration/rcs/directional/north,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"uL" = (
+/obj/structure/shuttle_decoration/eva_catwalks/directional/south,
+/obj/structure/shuttle_decoration/ladder/directional/south,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"vn" = (
+/obj/machinery/exoscanner/shuttle_part/radio_dish/directional/east,
+/obj/structure/shuttle_decoration/console/directional/west,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"vE" = (
+/obj/structure/railing/eva_handhold/directional/south,
+/obj/structure/railing/eva_handhold/directional/north,
+/obj/effect/mapping_helpers/salvage_anchor/two,
+/obj/structure/marker_beacon/jade,
+/turf/open/floor/engine/anchor_jack,
+/area/shuttle/salvaged_shuttle)
+"wC" = (
+/obj/structure/shuttle_decoration/wall_plate/plastamic,
+/turf/closed/wall/mineral/aluminum,
+/area/shuttle/salvaged_shuttle)
+"xs" = (
+/obj/structure/shuttle_decoration/rcs/directional/south,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"xx" = (
+/obj/machinery/light/cold/directional/south,
+/obj/structure/chair/comfy/shuttle{
+	dir = 1
+	},
+/turf/open/floor/iron/colony/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"yi" = (
+/turf/open/floor/plating/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"ym" = (
+/obj/structure/railing/eva_handhold/directional/south,
+/obj/structure/shuttle_decoration/rcs/directional/south,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"yu" = (
+/obj/effect/spawner/random/salvage/interior_trash_n_debris,
+/turf/open/floor/iron/colony/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"yx" = (
+/obj/effect/mapping_helpers/salvage_anchor/end/seven,
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/secondary_colour{
+	dir = 1
+	},
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/secondary_colour,
+/area/shuttle/salvaged_shuttle)
+"zm" = (
+/obj/structure/mineral_door/manual_colony_door/shuttle,
+/turf/open/floor/iron/colony/white/texture,
+/area/shuttle/salvaged_shuttle)
+"Av" = (
+/obj/machinery/power/shuttle_engine/heater/salvage{
+	dir = 8
+	},
+/obj/structure/engine_covers/heater_cover{
+	dir = 4
+	},
+/turf/open/floor/plating/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"BC" = (
+/obj/structure/lattice,
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/diagonal/secondary_colour{
+	dir = 5
+	},
+/turf/template_noop,
+/area/shuttle/salvaged_shuttle)
+"BV" = (
+/obj/structure/shuttle_decoration/wall_plate/plastamic,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"BW" = (
+/obj/machinery/light/blacklight/directional/south,
+/turf/open/floor/iron/colony/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"CC" = (
+/turf/open/floor/iron/colony/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"CU" = (
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/black,
+/area/shuttle/salvaged_shuttle)
+"Dm" = (
+/obj/structure/railing/eva_handhold/directional/south,
+/obj/structure/railing/eva_handhold/directional/north,
+/obj/effect/mapping_helpers/salvage_anchor/six,
+/obj/structure/marker_beacon/jade,
+/turf/open/floor/engine/anchor_jack,
+/area/shuttle/salvaged_shuttle)
+"Dp" = (
+/obj/structure/lattice,
+/obj/structure/titanium_structure,
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/diagonal/secondary_colour{
+	dir = 4
+	},
+/turf/template_noop,
+/area/shuttle/salvaged_shuttle)
+"Du" = (
+/obj/structure/lattice,
+/obj/effect/spawner/random/salvage/every_small_tank,
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/diagonal/primary_colour,
+/turf/template_noop,
+/area/shuttle/salvaged_shuttle)
+"Dx" = (
+/obj/structure/window/fulltile/salvage_shuttle,
+/turf/open/floor/plating/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"Em" = (
+/obj/structure/railing/eva_handhold/directional/south,
+/obj/structure/railing/eva_handhold/directional/north,
+/obj/effect/mapping_helpers/salvage_anchor/three,
+/obj/structure/marker_beacon/jade,
+/turf/open/floor/engine/anchor_jack,
+/area/shuttle/salvaged_shuttle)
+"Ev" = (
+/obj/structure/railing/eva_handhold/directional/south,
+/obj/structure/railing/eva_handhold/directional/north,
+/obj/effect/mapping_helpers/salvage_anchor/four,
+/obj/structure/marker_beacon/jade,
+/turf/open/floor/engine/anchor_jack,
+/area/shuttle/salvaged_shuttle)
+"Ew" = (
+/obj/structure/railing/eva_handhold/directional/north,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/black,
+/area/shuttle/salvaged_shuttle)
+"Ex" = (
+/obj/machinery/exoscanner/shuttle_part/open_sensors_blister/directional/south,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"Fg" = (
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/primary_colour{
+	dir = 1
+	},
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"Fz" = (
+/obj/structure/shuttle_decoration/wall_plate/gold_foil,
+/obj/structure/shuttle_decoration/wall_plate/plastamic{
+	dir = 1
+	},
+/turf/closed/wall/mineral/aluminum,
+/area/shuttle/salvaged_shuttle)
+"Gu" = (
+/obj/structure/shuttle_decoration/aux_engine/directional/west,
+/turf/closed/wall/mineral/nanocarbon/black,
+/area/shuttle/salvaged_shuttle)
+"Gy" = (
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/secondary_colour{
+	dir = 1
+	},
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/secondary_colour,
+/area/shuttle/salvaged_shuttle)
+"HG" = (
+/obj/structure/chair/comfy/shuttle{
+	dir = 1
+	},
+/turf/open/floor/iron/colony/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"HR" = (
+/obj/structure/railing/eva_handhold/directional/south,
+/obj/structure/railing/eva_handhold/directional/north,
+/obj/structure/marker_beacon/yellow,
+/turf/open/floor/engine/anchor_jack,
+/area/shuttle/salvaged_shuttle)
+"Ii" = (
+/obj/structure/railing/eva_handhold/directional/south,
+/obj/structure/railing/eva_handhold/directional/north,
+/obj/effect/mapping_helpers/salvage_anchor/one,
+/obj/structure/marker_beacon/jade,
+/turf/open/floor/engine/anchor_jack,
+/area/shuttle/salvaged_shuttle)
+"IG" = (
+/obj/machinery/light/cold/directional/north,
+/obj/structure/chair/comfy/shuttle,
+/obj/effect/spawner/random/salvage/interior_trash_n_debris,
+/turf/open/floor/iron/colony/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"IP" = (
+/obj/structure/chair/comfy/shuttle{
+	dir = 4;
+	pixel_x = -5
+	},
+/turf/open/floor/iron/colony/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"IZ" = (
+/obj/effect/spawner/random/salvage/interior_trash_n_debris,
+/turf/open/floor/catwalk_floor/colony_fabricator/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"Jd" = (
+/obj/effect/mapping_helpers/salvage_anchor/end/five,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"Kk" = (
+/obj/structure/shuttle_decoration/liquid_tank/reactor,
+/turf/open/floor/plating/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"KV" = (
+/obj/effect/mapping_helpers/salvage_anchor/end/one,
+/obj/structure/shuttle_decoration/landing_engine/directional/south,
+/turf/closed/wall/mineral/nanocarbon/black,
+/area/shuttle/salvaged_shuttle)
+"LH" = (
+/obj/effect/mapping_helpers/salvage_anchor/end/eight,
+/obj/structure/shuttle_decoration/landing_engine/directional/north,
+/turf/closed/wall/mineral/nanocarbon/black,
+/area/shuttle/salvaged_shuttle)
+"LJ" = (
+/obj/effect/mapping_helpers/salvage_anchor/end/three,
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/primary_colour,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"LV" = (
+/obj/effect/mapping_helpers/salvage_anchor/end/six,
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/primary_colour{
+	dir = 1
+	},
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"Md" = (
+/obj/effect/mapping_helpers/salvage_anchor/end/two,
+/obj/structure/shuttle_decoration/eva_catwalks/directional/south,
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/secondary_colour,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/secondary_colour,
+/area/shuttle/salvaged_shuttle)
+"MV" = (
+/obj/docking_port/mobile/salvage,
+/obj/structure/railing/eva_handhold/directional/south,
+/obj/structure/railing/eva_handhold/directional/north,
+/obj/structure/marker_beacon/yellow,
+/turf/open/floor/engine/anchor_jack,
+/area/shuttle/salvaged_shuttle)
+"No" = (
+/obj/structure/shuttle_decoration/eva_catwalks/directional/south,
+/obj/structure/shuttle_decoration/extinguisher/directional/south,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/secondary_colour,
+/area/shuttle/salvaged_shuttle)
+"NP" = (
+/obj/structure/chair/comfy/shuttle{
+	dir = 1
+	},
+/obj/effect/spawner/random/salvage/interior_trash_n_debris,
+/turf/open/floor/iron/colony/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"Oe" = (
+/obj/structure/shuttle_decoration/headlight/directional/east,
+/obj/structure/shuttle_decoration/console/directional/west,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"Ow" = (
+/obj/machinery/light/blacklight/directional/north,
+/obj/effect/spawner/random/salvage/interior_trash_n_debris,
+/turf/open/floor/iron/colony/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"Pp" = (
+/obj/effect/spawner/random/salvage/interior_trash_n_debris,
+/turf/open/floor/plating/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"Qv" = (
+/obj/structure/shuttle_access_panel,
+/turf/open/floor/plating/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"QT" = (
+/obj/structure/railing/eva_handhold/directional/north,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"RB" = (
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"RM" = (
+/obj/machinery/light/cold/directional/north,
+/obj/structure/chair/comfy/shuttle,
+/turf/open/floor/iron/colony/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"RS" = (
+/turf/closed/wall/mineral/nanocarbon/black,
+/area/shuttle/salvaged_shuttle)
+"Sv" = (
+/obj/structure/railing/eva_handhold/directional/south,
+/obj/structure/railing/eva_handhold/directional/north,
+/obj/effect/mapping_helpers/salvage_anchor/eight,
+/obj/structure/marker_beacon/jade,
+/turf/open/floor/engine/anchor_jack,
+/area/shuttle/salvaged_shuttle)
+"Tf" = (
+/obj/structure/shuttle_decoration/wall_plate/gold_foil{
+	dir = 1
+	},
+/obj/structure/shuttle_decoration/wall_plate/plastamic,
+/turf/closed/wall/mineral/aluminum,
+/area/shuttle/salvaged_shuttle)
+"Tm" = (
+/obj/structure/lattice,
+/obj/effect/spawner/random/salvage/small_fuel_tanks,
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/diagonal/secondary_colour{
+	dir = 1
+	},
+/turf/template_noop,
+/area/shuttle/salvaged_shuttle)
+"UE" = (
+/obj/structure/shuttle_decoration/wall_plate/armor{
+	dir = 1
+	},
+/turf/closed/wall/mineral/aluminum,
+/area/shuttle/salvaged_shuttle)
+"UN" = (
+/obj/machinery/light/cold/directional/north,
+/obj/effect/spawner/random/salvage/crate_only/civilian_supply,
+/turf/open/floor/iron/colony/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"UU" = (
+/turf/closed/wall/mineral/aluminum,
+/area/shuttle/salvaged_shuttle)
+"VR" = (
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/primary_colour,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"Xt" = (
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/secondary_colour,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/secondary_colour,
+/area/shuttle/salvaged_shuttle)
+"YC" = (
+/turf/template_noop,
+/area/template_noop)
+"YR" = (
+/obj/effect/mapping_helpers/salvage_anchor/end/four,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"Zq" = (
+/obj/structure/lattice,
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/diagonal/primary_colour{
+	dir = 6
+	},
+/turf/template_noop,
+/area/shuttle/salvaged_shuttle)
+"Zy" = (
+/obj/structure/shuttle_decoration/junction_box/directional/west,
+/obj/structure/shuttle_decoration/junction_box/directional/east,
+/turf/closed/wall/mineral/aluminum,
+/area/shuttle/salvaged_shuttle)
+
+(1,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+"}
+(2,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+"}
+(3,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+"}
+(4,1,1) = {"
+YC
+Sv
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+Ii
+YC
+"}
+(5,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+"}
+(6,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+"}
+(7,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+RS
+md
+ce
+md
+RS
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+"}
+(8,1,1) = {"
+YC
+HR
+YC
+YC
+YC
+UE
+YC
+LH
+RS
+Av
+RS
+KV
+YC
+sj
+YC
+YC
+YC
+HR
+YC
+"}
+(9,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+UE
+YC
+RS
+Ow
+Kk
+BW
+RS
+YC
+sj
+YC
+YC
+YC
+YC
+YC
+"}
+(10,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+Ew
+Gu
+CU
+CC
+yi
+yu
+CU
+Gu
+kZ
+YC
+YC
+YC
+YC
+YC
+"}
+(11,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+jv
+iA
+UU
+fe
+nP
+fe
+UU
+iA
+xs
+YC
+YC
+YC
+YC
+YC
+"}
+(12,1,1) = {"
+uk
+YC
+YC
+YC
+YC
+Fg
+yi
+pa
+fI
+kO
+NP
+tC
+yi
+uL
+YC
+YC
+YC
+YC
+vE
+"}
+(13,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+yx
+Pp
+Qv
+fI
+IZ
+HG
+Qv
+Pp
+Md
+YC
+YC
+YC
+YC
+YC
+"}
+(14,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+Gy
+yi
+pa
+fI
+IZ
+HG
+tC
+bo
+No
+YC
+YC
+YC
+YC
+YC
+"}
+(15,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+Gy
+Pp
+pa
+IG
+IZ
+jX
+tC
+Pp
+Xt
+YC
+YC
+YC
+YC
+YC
+"}
+(16,1,1) = {"
+HR
+YC
+YC
+YC
+YC
+QT
+ik
+oM
+CC
+kO
+CC
+gM
+bo
+Ex
+YC
+YC
+YC
+YC
+MV
+"}
+(17,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+zm
+pH
+zm
+yu
+kO
+NP
+tC
+bo
+VR
+YC
+YC
+YC
+YC
+YC
+"}
+(18,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+QT
+ly
+wC
+RM
+kO
+xx
+tC
+yi
+VR
+YC
+YC
+YC
+YC
+YC
+"}
+(19,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+LV
+yi
+nN
+Zy
+nP
+UU
+UU
+Pp
+LJ
+YC
+YC
+YC
+YC
+YC
+"}
+(20,1,1) = {"
+Dm
+YC
+YC
+YC
+YC
+uK
+bo
+Tf
+eB
+kO
+CC
+Fz
+yi
+ym
+YC
+YC
+YC
+YC
+Em
+"}
+(21,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+ez
+RB
+BV
+UN
+kO
+xx
+rL
+RB
+ez
+YC
+YC
+YC
+YC
+YC
+"}
+(22,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+YC
+nk
+kP
+IP
+CC
+IP
+cP
+km
+YC
+YC
+YC
+YC
+YC
+YC
+"}
+(23,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+YC
+Tm
+Jd
+Oe
+Dx
+vn
+YR
+Du
+YC
+YC
+YC
+YC
+YC
+YC
+"}
+(24,1,1) = {"
+YC
+HR
+YC
+YC
+YC
+YC
+BC
+Dp
+YC
+YC
+YC
+hx
+Zq
+YC
+YC
+YC
+YC
+HR
+YC
+"}
+(25,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+"}
+(26,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+"}
+(27,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+"}
+(28,1,1) = {"
+YC
+dD
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+Ev
+YC
+"}
+(29,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+"}
+(30,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+"}
+(31,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+"}
diff --git a/_maps/shuttles/~doppler_shuttles/salvage/salvage_scrappie.dmm b/_maps/shuttles/~doppler_shuttles/salvage/salvage_scrappie.dmm
new file mode 100644
index 00000000000000..1a0aa2142da09d
--- /dev/null
+++ b/_maps/shuttles/~doppler_shuttles/salvage/salvage_scrappie.dmm
@@ -0,0 +1,1177 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"bo" = (
+/obj/structure/shuttle_decoration/liquid_tank/coolant,
+/turf/open/floor/plating/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"ce" = (
+/obj/machinery/portable_atmospherics/canister/air,
+/turf/open/floor/plating/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"cP" = (
+/obj/machinery/exoscanner/shuttle_part/radar_panel/directional/south,
+/turf/closed/wall/mineral/nanocarbon/black,
+/area/shuttle/salvaged_shuttle)
+"dD" = (
+/obj/structure/railing/eva_handhold/directional/south,
+/obj/structure/railing/eva_handhold/directional/north,
+/obj/effect/mapping_helpers/salvage_anchor/five,
+/obj/structure/marker_beacon/jade,
+/turf/open/floor/engine/anchor_jack,
+/area/shuttle/salvaged_shuttle)
+"ez" = (
+/turf/closed/wall/mineral/nanocarbon/yellow,
+/area/shuttle/salvaged_shuttle)
+"eB" = (
+/obj/structure/chair/comfy/shuttle,
+/obj/effect/spawner/random/salvage/interior_trash_n_debris,
+/turf/open/floor/iron/colony/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"fe" = (
+/obj/machinery/light/cold/directional/north,
+/obj/effect/spawner/random/salvage/interior_trash_n_debris,
+/turf/open/floor/iron/colony/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"fI" = (
+/obj/effect/spawner/random/salvage/crate_or_cargo/civilian_supply,
+/turf/open/floor/plating/aluminum,
+/area/shuttle/salvaged_shuttle)
+"gM" = (
+/obj/structure/shuttle_decoration/wall_plate/gold_foil,
+/turf/closed/wall/mineral/aluminum,
+/area/shuttle/salvaged_shuttle)
+"hx" = (
+/obj/structure/lattice,
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/black{
+	dir = 4
+	},
+/obj/structure/shuttle_decoration/bullbar/directional/east,
+/obj/structure/titanium_structure,
+/turf/template_noop,
+/area/shuttle/salvaged_shuttle)
+"ik" = (
+/obj/structure/shuttle_decoration/wall_plate/gold_foil{
+	dir = 8
+	},
+/turf/closed/wall/mineral/aluminum,
+/area/shuttle/salvaged_shuttle)
+"iy" = (
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/yellow,
+/turf/closed/wall/mineral/nanocarbon/yellow,
+/area/shuttle/salvaged_shuttle)
+"iA" = (
+/obj/structure/lattice,
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/yellow{
+	dir = 1
+	},
+/obj/structure/titanium_structure,
+/turf/template_noop,
+/area/shuttle/salvaged_shuttle)
+"jv" = (
+/obj/structure/shuttle_decoration/rcs/directional/north,
+/turf/closed/wall/mineral/nanocarbon/black,
+/area/shuttle/salvaged_shuttle)
+"jX" = (
+/obj/machinery/light/cold/directional/south,
+/obj/effect/spawner/random/salvage/crate_or_cargo/civilian_supply,
+/turf/open/floor/iron/colony/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"km" = (
+/obj/structure/lattice,
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/black,
+/obj/structure/titanium_structure,
+/turf/template_noop,
+/area/shuttle/salvaged_shuttle)
+"kO" = (
+/turf/open/floor/catwalk_floor/colony_fabricator/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"kP" = (
+/obj/machinery/exoscanner/shuttle_part/radar_panel/directional/north,
+/turf/closed/wall/mineral/nanocarbon/black,
+/area/shuttle/salvaged_shuttle)
+"kZ" = (
+/obj/structure/railing/eva_handhold/directional/south,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/black,
+/area/shuttle/salvaged_shuttle)
+"ly" = (
+/obj/structure/shuttle_decoration/wall_plate/gold_foil{
+	dir = 4
+	},
+/turf/closed/wall/mineral/aluminum,
+/area/shuttle/salvaged_shuttle)
+"md" = (
+/obj/structure/shuttle_decoration/radiator/directional/west,
+/turf/closed/wall/mineral/nanocarbon/black,
+/area/shuttle/salvaged_shuttle)
+"nk" = (
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/yellow{
+	dir = 1
+	},
+/obj/structure/lattice,
+/obj/structure/titanium_structure,
+/turf/template_noop,
+/area/shuttle/salvaged_shuttle)
+"nN" = (
+/obj/structure/shuttle_decoration/wall_plate/gold_foil{
+	dir = 1
+	},
+/turf/closed/wall/mineral/aluminum,
+/area/shuttle/salvaged_shuttle)
+"nP" = (
+/obj/structure/mineral_door/manual_colony_door/shuttle/interior,
+/turf/open/floor/iron/colony/white/texture,
+/area/shuttle/salvaged_shuttle)
+"oM" = (
+/obj/structure/lattice,
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/yellow,
+/obj/structure/titanium_structure,
+/turf/template_noop,
+/area/shuttle/salvaged_shuttle)
+"pa" = (
+/obj/structure/lattice,
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/black{
+	dir = 1
+	},
+/obj/structure/titanium_structure,
+/turf/template_noop,
+/area/shuttle/salvaged_shuttle)
+"pH" = (
+/obj/machinery/light/cold/dim/directional/west,
+/obj/effect/spawner/random/salvage/interior_trash_n_debris,
+/turf/open/floor/catwalk_floor/colony_fabricator/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"rb" = (
+/turf/open/floor/plating/aluminum,
+/area/shuttle/salvaged_shuttle)
+"rL" = (
+/obj/structure/lattice,
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/yellow,
+/turf/template_noop,
+/area/shuttle/salvaged_shuttle)
+"sj" = (
+/obj/structure/shuttle_decoration/wall_plate/armor,
+/turf/closed/wall/mineral/aluminum,
+/area/shuttle/salvaged_shuttle)
+"sl" = (
+/obj/structure/lattice/catwalk,
+/turf/template_noop,
+/area/shuttle/salvaged_shuttle)
+"tC" = (
+/obj/structure/titanium_structure,
+/turf/open/floor/plating/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"uk" = (
+/obj/structure/railing/eva_handhold/directional/south,
+/obj/structure/railing/eva_handhold/directional/north,
+/obj/effect/mapping_helpers/salvage_anchor/seven,
+/obj/structure/marker_beacon/jade,
+/turf/open/floor/engine/anchor_jack,
+/area/shuttle/salvaged_shuttle)
+"uK" = (
+/obj/structure/railing/eva_handhold/directional/north,
+/obj/structure/shuttle_decoration/rcs/directional/north,
+/turf/closed/wall/mineral/nanocarbon/yellow,
+/area/shuttle/salvaged_shuttle)
+"uL" = (
+/obj/structure/shuttle_decoration/eva_catwalks/directional/south,
+/obj/structure/shuttle_decoration/ladder/directional/south,
+/turf/closed/wall/mineral/nanocarbon/yellow,
+/area/shuttle/salvaged_shuttle)
+"vn" = (
+/obj/machinery/exoscanner/shuttle_part/radio_dish/directional/east,
+/obj/structure/shuttle_decoration/console/directional/west,
+/turf/closed/wall/mineral/nanocarbon/black,
+/area/shuttle/salvaged_shuttle)
+"vE" = (
+/obj/structure/railing/eva_handhold/directional/south,
+/obj/structure/railing/eva_handhold/directional/north,
+/obj/effect/mapping_helpers/salvage_anchor/two,
+/obj/structure/marker_beacon/jade,
+/turf/open/floor/engine/anchor_jack,
+/area/shuttle/salvaged_shuttle)
+"wC" = (
+/obj/structure/shuttle_decoration/wall_plate/plastamic,
+/turf/closed/wall/mineral/aluminum,
+/area/shuttle/salvaged_shuttle)
+"xs" = (
+/obj/structure/shuttle_decoration/rcs/directional/south,
+/turf/closed/wall/mineral/nanocarbon/black,
+/area/shuttle/salvaged_shuttle)
+"xx" = (
+/obj/machinery/light/cold/directional/south,
+/obj/structure/chair/comfy/shuttle{
+	dir = 1
+	},
+/turf/open/floor/iron/colony/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"yi" = (
+/turf/open/floor/plating/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"ym" = (
+/obj/structure/railing/eva_handhold/directional/south,
+/obj/structure/shuttle_decoration/rcs/directional/south,
+/turf/closed/wall/mineral/nanocarbon/yellow,
+/area/shuttle/salvaged_shuttle)
+"yu" = (
+/obj/structure/shuttle_decoration/wall_plate/silver_foil{
+	dir = 8
+	},
+/turf/closed/wall/mineral/aluminum,
+/area/shuttle/salvaged_shuttle)
+"yx" = (
+/obj/effect/mapping_helpers/salvage_anchor/end/seven,
+/obj/structure/shuttle_decoration/eva_catwalks/directional/north,
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/yellow{
+	dir = 1
+	},
+/turf/closed/wall/mineral/nanocarbon/yellow,
+/area/shuttle/salvaged_shuttle)
+"zd" = (
+/obj/structure/railing/eva_handhold/directional/north,
+/turf/closed/wall/mineral/nanocarbon/black,
+/area/shuttle/salvaged_shuttle)
+"zm" = (
+/obj/structure/mineral_door/manual_colony_door/shuttle,
+/turf/open/floor/iron/colony/white/texture,
+/area/shuttle/salvaged_shuttle)
+"Av" = (
+/obj/structure/shuttle_decoration/liquid_tank/battery,
+/turf/open/floor/plating/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"BC" = (
+/obj/structure/lattice,
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/diagonal/yellow{
+	dir = 5
+	},
+/turf/template_noop,
+/area/shuttle/salvaged_shuttle)
+"BV" = (
+/turf/open/floor/iron/colony/white/texture,
+/area/shuttle/salvaged_shuttle)
+"BW" = (
+/obj/machinery/light/blacklight/directional/south,
+/turf/open/floor/iron/colony/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"CC" = (
+/turf/open/floor/iron/colony/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"CU" = (
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/black,
+/area/shuttle/salvaged_shuttle)
+"Dm" = (
+/obj/structure/railing/eva_handhold/directional/south,
+/obj/structure/railing/eva_handhold/directional/north,
+/obj/effect/mapping_helpers/salvage_anchor/six,
+/obj/structure/marker_beacon/jade,
+/turf/open/floor/engine/anchor_jack,
+/area/shuttle/salvaged_shuttle)
+"Dp" = (
+/obj/structure/lattice,
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/diagonal/yellow{
+	dir = 4
+	},
+/obj/structure/shuttle_decoration/bullbar/directional/east,
+/obj/structure/titanium_structure,
+/turf/template_noop,
+/area/shuttle/salvaged_shuttle)
+"Du" = (
+/obj/structure/lattice,
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/black,
+/turf/template_noop,
+/area/shuttle/salvaged_shuttle)
+"Dx" = (
+/obj/structure/window/fulltile/salvage_shuttle,
+/turf/open/floor/plating/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"Em" = (
+/obj/structure/railing/eva_handhold/directional/south,
+/obj/structure/railing/eva_handhold/directional/north,
+/obj/effect/mapping_helpers/salvage_anchor/three,
+/obj/structure/marker_beacon/jade,
+/turf/open/floor/engine/anchor_jack,
+/area/shuttle/salvaged_shuttle)
+"Ev" = (
+/obj/structure/railing/eva_handhold/directional/south,
+/obj/structure/railing/eva_handhold/directional/north,
+/obj/effect/mapping_helpers/salvage_anchor/four,
+/obj/structure/marker_beacon/jade,
+/turf/open/floor/engine/anchor_jack,
+/area/shuttle/salvaged_shuttle)
+"Ew" = (
+/obj/structure/railing/eva_handhold/directional/north,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/black,
+/area/shuttle/salvaged_shuttle)
+"Ex" = (
+/obj/machinery/exoscanner/shuttle_part/open_sensors_blister/directional/south,
+/turf/closed/wall/mineral/nanocarbon/yellow,
+/area/shuttle/salvaged_shuttle)
+"Fg" = (
+/obj/structure/shuttle_decoration/eva_catwalks/directional/north,
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/yellow{
+	dir = 1
+	},
+/turf/closed/wall/mineral/nanocarbon/yellow,
+/area/shuttle/salvaged_shuttle)
+"Fz" = (
+/obj/structure/shuttle_decoration/wall_plate/gold_foil,
+/obj/structure/shuttle_decoration/wall_plate/plastamic{
+	dir = 1
+	},
+/turf/closed/wall/mineral/aluminum,
+/area/shuttle/salvaged_shuttle)
+"Gu" = (
+/obj/structure/shuttle_decoration/aux_engine/directional/west,
+/turf/closed/wall/mineral/nanocarbon/black,
+/area/shuttle/salvaged_shuttle)
+"Gy" = (
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/black{
+	dir = 1
+	},
+/turf/closed/wall/mineral/nanocarbon/black,
+/area/shuttle/salvaged_shuttle)
+"HG" = (
+/obj/structure/chair/comfy/shuttle{
+	dir = 1
+	},
+/turf/open/floor/iron/colony/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"HR" = (
+/obj/structure/railing/eva_handhold/directional/south,
+/obj/structure/railing/eva_handhold/directional/north,
+/obj/structure/marker_beacon/yellow,
+/turf/open/floor/engine/anchor_jack,
+/area/shuttle/salvaged_shuttle)
+"Ii" = (
+/obj/structure/railing/eva_handhold/directional/south,
+/obj/structure/railing/eva_handhold/directional/north,
+/obj/effect/mapping_helpers/salvage_anchor/one,
+/obj/structure/marker_beacon/jade,
+/turf/open/floor/engine/anchor_jack,
+/area/shuttle/salvaged_shuttle)
+"IG" = (
+/obj/machinery/light/cold/directional/north,
+/turf/open/floor/iron/colony/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"IM" = (
+/obj/structure/grille,
+/turf/open/floor/plating/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"IP" = (
+/obj/structure/chair/comfy/shuttle{
+	dir = 4;
+	pixel_x = -5
+	},
+/turf/open/floor/iron/colony/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"IZ" = (
+/obj/effect/spawner/random/salvage/interior_trash_n_debris,
+/turf/open/floor/catwalk_floor/colony_fabricator/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"Jd" = (
+/obj/effect/mapping_helpers/salvage_anchor/end/five,
+/turf/closed/wall/mineral/nanocarbon/black,
+/area/shuttle/salvaged_shuttle)
+"Kk" = (
+/obj/structure/lattice,
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/black{
+	dir = 1
+	},
+/turf/template_noop,
+/area/shuttle/salvaged_shuttle)
+"KV" = (
+/obj/effect/mapping_helpers/salvage_anchor/end/one,
+/obj/structure/shuttle_decoration/landing_engine/directional/south,
+/turf/closed/wall/mineral/nanocarbon/black,
+/area/shuttle/salvaged_shuttle)
+"LH" = (
+/obj/effect/mapping_helpers/salvage_anchor/end/eight,
+/obj/structure/shuttle_decoration/landing_engine/directional/north,
+/turf/closed/wall/mineral/nanocarbon/black,
+/area/shuttle/salvaged_shuttle)
+"LJ" = (
+/obj/effect/mapping_helpers/salvage_anchor/end/three,
+/obj/structure/shuttle_decoration/eva_catwalks/directional/south,
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/black,
+/turf/closed/wall/mineral/nanocarbon/black,
+/area/shuttle/salvaged_shuttle)
+"LV" = (
+/obj/effect/mapping_helpers/salvage_anchor/end/six,
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/black{
+	dir = 1
+	},
+/turf/closed/wall/mineral/nanocarbon/black,
+/area/shuttle/salvaged_shuttle)
+"Md" = (
+/obj/effect/mapping_helpers/salvage_anchor/end/two,
+/obj/structure/shuttle_decoration/eva_catwalks/directional/south,
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/yellow,
+/turf/closed/wall/mineral/nanocarbon/yellow,
+/area/shuttle/salvaged_shuttle)
+"MV" = (
+/obj/docking_port/mobile/salvage,
+/obj/structure/railing/eva_handhold/directional/south,
+/obj/structure/railing/eva_handhold/directional/north,
+/obj/structure/marker_beacon/yellow,
+/turf/open/floor/engine/anchor_jack,
+/area/shuttle/salvaged_shuttle)
+"No" = (
+/obj/structure/shuttle_decoration/eva_catwalks/directional/south,
+/obj/structure/shuttle_decoration/extinguisher/directional/south,
+/turf/closed/wall/mineral/nanocarbon/black,
+/area/shuttle/salvaged_shuttle)
+"NP" = (
+/obj/effect/spawner/random/salvage/interior_trash_n_debris,
+/turf/open/floor/plating/aluminum,
+/area/shuttle/salvaged_shuttle)
+"Oe" = (
+/obj/structure/shuttle_decoration/headlight/directional/east,
+/obj/structure/shuttle_decoration/console/directional/west,
+/turf/closed/wall/mineral/nanocarbon/black,
+/area/shuttle/salvaged_shuttle)
+"Ow" = (
+/obj/machinery/light/blacklight/directional/north,
+/turf/open/floor/iron/colony/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"Pp" = (
+/obj/effect/spawner/random/salvage/interior_trash_n_debris,
+/turf/open/floor/plating/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"Qv" = (
+/obj/structure/shuttle_access_panel,
+/turf/open/floor/plating/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"QT" = (
+/obj/structure/railing/eva_handhold/directional/north,
+/turf/closed/wall/mineral/nanocarbon/yellow,
+/area/shuttle/salvaged_shuttle)
+"RB" = (
+/obj/structure/railing{
+	dir = 1
+	},
+/obj/structure/lattice/catwalk,
+/turf/template_noop,
+/area/shuttle/salvaged_shuttle)
+"RM" = (
+/obj/machinery/light/cold/directional/north,
+/obj/structure/chair/comfy/shuttle,
+/turf/open/floor/iron/colony/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"RS" = (
+/turf/closed/wall/mineral/nanocarbon/black,
+/area/shuttle/salvaged_shuttle)
+"Sv" = (
+/obj/structure/railing/eva_handhold/directional/south,
+/obj/structure/railing/eva_handhold/directional/north,
+/obj/effect/mapping_helpers/salvage_anchor/eight,
+/obj/structure/marker_beacon/jade,
+/turf/open/floor/engine/anchor_jack,
+/area/shuttle/salvaged_shuttle)
+"Tf" = (
+/obj/structure/shuttle_decoration/wall_plate/gold_foil{
+	dir = 1
+	},
+/obj/structure/shuttle_decoration/wall_plate/plastamic,
+/turf/closed/wall/mineral/aluminum,
+/area/shuttle/salvaged_shuttle)
+"Tm" = (
+/obj/structure/lattice,
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/yellow{
+	dir = 1
+	},
+/turf/template_noop,
+/area/shuttle/salvaged_shuttle)
+"UE" = (
+/obj/structure/shuttle_decoration/wall_plate/armor{
+	dir = 1
+	},
+/turf/closed/wall/mineral/aluminum,
+/area/shuttle/salvaged_shuttle)
+"UN" = (
+/obj/structure/shuttle_decoration/eva_catwalks/directional/north,
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/black{
+	dir = 1
+	},
+/turf/closed/wall/mineral/nanocarbon/black,
+/area/shuttle/salvaged_shuttle)
+"UU" = (
+/turf/closed/wall/mineral/aluminum,
+/area/shuttle/salvaged_shuttle)
+"VR" = (
+/obj/structure/shuttle_decoration/eva_catwalks/directional/south,
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/black,
+/turf/closed/wall/mineral/nanocarbon/black,
+/area/shuttle/salvaged_shuttle)
+"Xt" = (
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/black,
+/turf/closed/wall/mineral/nanocarbon/black,
+/area/shuttle/salvaged_shuttle)
+"YC" = (
+/turf/template_noop,
+/area/template_noop)
+"YR" = (
+/obj/effect/mapping_helpers/salvage_anchor/end/four,
+/turf/closed/wall/mineral/nanocarbon/black,
+/area/shuttle/salvaged_shuttle)
+"Zq" = (
+/obj/structure/lattice,
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/diagonal/black{
+	dir = 6
+	},
+/turf/template_noop,
+/area/shuttle/salvaged_shuttle)
+"Zy" = (
+/obj/structure/shuttle_decoration/junction_box/directional/west,
+/obj/structure/shuttle_decoration/junction_box/directional/east,
+/turf/closed/wall/mineral/aluminum,
+/area/shuttle/salvaged_shuttle)
+
+(1,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+"}
+(2,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+"}
+(3,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+"}
+(4,1,1) = {"
+YC
+Sv
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+Ii
+YC
+"}
+(5,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+"}
+(6,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+"}
+(7,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+RS
+md
+tC
+md
+RS
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+"}
+(8,1,1) = {"
+YC
+HR
+YC
+YC
+YC
+UE
+YC
+LH
+CC
+Av
+CC
+KV
+YC
+sj
+YC
+YC
+YC
+HR
+YC
+"}
+(9,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+UE
+YC
+RS
+Ow
+yi
+BW
+RS
+YC
+sj
+YC
+YC
+YC
+YC
+YC
+"}
+(10,1,1) = {"
+YC
+YC
+YC
+YC
+pa
+Ew
+Gu
+CU
+yu
+nP
+yu
+CU
+Gu
+kZ
+km
+YC
+YC
+YC
+YC
+"}
+(11,1,1) = {"
+YC
+YC
+YC
+YC
+Kk
+jv
+Pp
+Tf
+fe
+kO
+jX
+Fz
+yi
+xs
+Du
+YC
+YC
+YC
+YC
+"}
+(12,1,1) = {"
+uk
+YC
+YC
+YC
+iA
+Fg
+yi
+tC
+NP
+rb
+NP
+tC
+yi
+uL
+rL
+YC
+YC
+YC
+vE
+"}
+(13,1,1) = {"
+YC
+YC
+YC
+YC
+iA
+yx
+yi
+Qv
+fI
+NP
+rb
+Qv
+yi
+Md
+oM
+YC
+YC
+YC
+YC
+"}
+(14,1,1) = {"
+YC
+YC
+YC
+YC
+Kk
+UN
+ce
+tC
+fI
+rb
+rb
+tC
+Pp
+No
+Du
+YC
+YC
+YC
+YC
+"}
+(15,1,1) = {"
+YC
+YC
+YC
+YC
+pa
+Gy
+yi
+Tf
+IG
+IZ
+jX
+Fz
+yi
+Xt
+km
+YC
+YC
+YC
+YC
+"}
+(16,1,1) = {"
+HR
+YC
+YC
+YC
+RB
+QT
+ik
+UU
+UU
+BV
+UU
+gM
+IM
+Ex
+rL
+YC
+YC
+YC
+MV
+"}
+(17,1,1) = {"
+YC
+YC
+YC
+YC
+sl
+zm
+pH
+zm
+CC
+IZ
+HG
+Fz
+yi
+iy
+rL
+YC
+YC
+YC
+YC
+"}
+(18,1,1) = {"
+YC
+YC
+YC
+YC
+RB
+zd
+ly
+wC
+fe
+kO
+xx
+Fz
+bo
+VR
+km
+YC
+YC
+YC
+YC
+"}
+(19,1,1) = {"
+YC
+YC
+YC
+YC
+pa
+LV
+yi
+nN
+Zy
+nP
+UU
+gM
+IM
+LJ
+km
+YC
+YC
+YC
+YC
+"}
+(20,1,1) = {"
+Dm
+YC
+YC
+YC
+Tm
+uK
+bo
+Tf
+eB
+kO
+CC
+Fz
+yi
+ym
+rL
+YC
+YC
+YC
+Em
+"}
+(21,1,1) = {"
+YC
+YC
+YC
+YC
+iA
+ez
+ez
+CU
+RM
+IZ
+xx
+CU
+ez
+ez
+oM
+YC
+YC
+YC
+YC
+"}
+(22,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+YC
+nk
+kP
+IP
+CC
+IP
+cP
+km
+YC
+YC
+YC
+YC
+YC
+YC
+"}
+(23,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+YC
+Tm
+Jd
+Oe
+Dx
+vn
+YR
+Du
+YC
+YC
+YC
+YC
+YC
+YC
+"}
+(24,1,1) = {"
+YC
+HR
+YC
+YC
+YC
+YC
+BC
+Dp
+YC
+YC
+YC
+hx
+Zq
+YC
+YC
+YC
+YC
+HR
+YC
+"}
+(25,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+"}
+(26,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+"}
+(27,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+"}
+(28,1,1) = {"
+YC
+dD
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+Ev
+YC
+"}
+(29,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+"}
+(30,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+"}
+(31,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+"}
diff --git a/_maps/shuttles/~doppler_shuttles/salvage/salvage_solestra_probe.dmm b/_maps/shuttles/~doppler_shuttles/salvage/salvage_solestra_probe.dmm
new file mode 100644
index 00000000000000..83b649c0829ef5
--- /dev/null
+++ b/_maps/shuttles/~doppler_shuttles/salvage/salvage_solestra_probe.dmm
@@ -0,0 +1,894 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"bo" = (
+/obj/structure/shuttle_decoration/bullbar/directional/east,
+/turf/open/floor/plating/nanocarbon/exterior/secondary_colour,
+/area/shuttle/salvaged_shuttle)
+"ce" = (
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/secondary_colour,
+/area/shuttle/salvaged_shuttle)
+"ez" = (
+/obj/structure/shuttle_decoration/eva_catwalks/directional/north,
+/obj/machinery/exoscanner/shuttle_part/radio_dish/directional/north,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"eB" = (
+/turf/closed/wall/mineral/nanocarbon/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"fI" = (
+/obj/structure/shuttle_decoration/junction_box/directional/south,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"hx" = (
+/turf/open/floor/plating/nanocarbon/exterior/secondary_colour,
+/area/shuttle/salvaged_shuttle)
+"iy" = (
+/obj/machinery/exoscanner/shuttle_part/sensors_blister/directional/south,
+/turf/open/floor/plating/nanocarbon/exterior/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"jX" = (
+/obj/structure/shuttle_access_panel,
+/obj/structure/shuttle_decoration/eva_catwalks/directional/south,
+/turf/open/floor/plating/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"km" = (
+/obj/effect/spawner/random/salvage/interior_trash_n_debris,
+/turf/open/floor/plating/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"kO" = (
+/turf/open/floor/plating/nanocarbon/exterior/black,
+/area/shuttle/salvaged_shuttle)
+"ly" = (
+/obj/machinery/exoscanner/shuttle_part/radio_dish/directional/east,
+/turf/open/floor/plating/nanocarbon/exterior/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"nP" = (
+/obj/structure/shuttle_decoration/liquid_tank/coolant,
+/turf/open/floor/plating/aluminum,
+/area/shuttle/salvaged_shuttle)
+"oM" = (
+/obj/structure/shuttle_decoration/rcs/directional/north,
+/obj/effect/mapping_helpers/salvage_anchor/end/seven,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/black,
+/area/shuttle/salvaged_shuttle)
+"rb" = (
+/obj/structure/shuttle_decoration/liquid_tank/battery,
+/turf/open/floor/plating/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"tC" = (
+/obj/structure/lattice,
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/secondary_colour{
+	dir = 4
+	},
+/obj/structure/titanium_structure,
+/turf/template_noop,
+/area/shuttle/salvaged_shuttle)
+"uk" = (
+/obj/structure/railing/eva_handhold/directional/south,
+/obj/structure/railing/eva_handhold/directional/north,
+/obj/structure/marker_beacon/jade,
+/turf/open/floor/engine/anchor_jack,
+/area/shuttle/salvaged_shuttle)
+"vn" = (
+/obj/structure/shuttle_decoration/rcs/directional/south,
+/obj/structure/shuttle_decoration/wall_plate/gold_foil{
+	dir = 1
+	},
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"vE" = (
+/obj/structure/railing/eva_handhold/directional/south,
+/obj/structure/railing/eva_handhold/directional/north,
+/obj/structure/marker_beacon/yellow,
+/obj/effect/mapping_helpers/salvage_anchor/three,
+/turf/open/floor/engine/anchor_jack,
+/area/shuttle/salvaged_shuttle)
+"wC" = (
+/obj/structure/shuttle_decoration/bullbar/directional/east,
+/turf/open/floor/plating/nanocarbon/exterior/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"xx" = (
+/obj/structure/shuttle_decoration/extinguisher/directional/south,
+/obj/structure/shuttle_decoration/wall_plate/gold_foil{
+	dir = 1
+	},
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/secondary_colour,
+/area/shuttle/salvaged_shuttle)
+"yi" = (
+/obj/structure/shuttle_decoration/rcs/directional/south,
+/obj/effect/mapping_helpers/salvage_anchor/end/two,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/black,
+/area/shuttle/salvaged_shuttle)
+"zd" = (
+/obj/structure/shuttle_decoration/bullbar/directional/east,
+/obj/effect/mapping_helpers/salvage_anchor/end/six,
+/turf/open/floor/plating/nanocarbon/exterior/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"zm" = (
+/obj/machinery/exoscanner/shuttle_part/open_sensors_blister/directional/north,
+/turf/open/floor/plating/nanocarbon/exterior/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"BV" = (
+/obj/structure/shuttle_access_panel,
+/turf/open/floor/plating/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"CC" = (
+/obj/machinery/exoscanner/shuttle_part/radar_panel/directional/north,
+/obj/structure/shuttle_decoration/wall_plate/gold_foil,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/secondary_colour,
+/area/shuttle/salvaged_shuttle)
+"Ev" = (
+/obj/structure/railing/eva_handhold/directional/south,
+/obj/structure/railing/eva_handhold/directional/north,
+/obj/structure/marker_beacon/yellow,
+/obj/effect/mapping_helpers/salvage_anchor/seven,
+/turf/open/floor/engine/anchor_jack,
+/area/shuttle/salvaged_shuttle)
+"Fz" = (
+/turf/open/floor/plating/nanocarbon/exterior/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"HG" = (
+/obj/machinery/exoscanner/shuttle_part/radar_panel/directional/south,
+/obj/structure/shuttle_decoration/wall_plate/gold_foil{
+	dir = 1
+	},
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/secondary_colour,
+/area/shuttle/salvaged_shuttle)
+"HR" = (
+/obj/structure/railing/eva_handhold/directional/south,
+/obj/structure/railing/eva_handhold/directional/north,
+/obj/structure/marker_beacon/yellow,
+/turf/open/floor/engine/anchor_jack,
+/area/shuttle/salvaged_shuttle)
+"Ii" = (
+/obj/structure/railing/eva_handhold/directional/south,
+/obj/structure/railing/eva_handhold/directional/north,
+/obj/structure/marker_beacon/yellow,
+/obj/effect/mapping_helpers/salvage_anchor/two,
+/turf/open/floor/engine/anchor_jack,
+/area/shuttle/salvaged_shuttle)
+"Im" = (
+/obj/structure/railing/eva_handhold/directional/south,
+/obj/structure/railing/eva_handhold/directional/north,
+/obj/structure/marker_beacon/yellow,
+/obj/effect/mapping_helpers/salvage_anchor/six,
+/turf/open/floor/engine/anchor_jack,
+/area/shuttle/salvaged_shuttle)
+"IG" = (
+/obj/structure/shuttle_decoration/wall_plate/gold_foil,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/secondary_colour,
+/area/shuttle/salvaged_shuttle)
+"IM" = (
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/black,
+/area/shuttle/salvaged_shuttle)
+"IZ" = (
+/obj/structure/shuttle_access_panel,
+/obj/structure/shuttle_decoration/eva_catwalks/directional/north,
+/turf/open/floor/plating/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"Kk" = (
+/obj/structure/shuttle_decoration/liquid_tank/battery/shipmind,
+/turf/open/floor/plating/aluminum,
+/area/shuttle/salvaged_shuttle)
+"LV" = (
+/obj/machinery/exoscanner/shuttle_part/radar_panel/directional/east,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"Md" = (
+/obj/structure/engine_covers/ion_plate{
+	dir = 4
+	},
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"Me" = (
+/obj/effect/spawner/random/salvage/interior_trash_n_debris,
+/turf/open/floor/plating/nanocarbon/exterior/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"Mn" = (
+/obj/structure/shuttle_decoration/wall_plate/armor,
+/turf/closed/wall/mineral/aluminum,
+/area/shuttle/salvaged_shuttle)
+"MV" = (
+/obj/docking_port/mobile/salvage,
+/obj/structure/railing/eva_handhold/directional/south,
+/obj/structure/railing/eva_handhold/directional/north,
+/obj/structure/marker_beacon/yellow,
+/turf/open/floor/engine/anchor_jack,
+/area/shuttle/salvaged_shuttle)
+"NP" = (
+/obj/structure/shuttle_decoration/wall_plate/armor{
+	dir = 1
+	},
+/turf/closed/wall/mineral/aluminum,
+/area/shuttle/salvaged_shuttle)
+"PS" = (
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"Qv" = (
+/obj/structure/lattice,
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/black{
+	dir = 8
+	},
+/obj/structure/titanium_structure,
+/turf/template_noop,
+/area/shuttle/salvaged_shuttle)
+"QB" = (
+/obj/structure/engine_covers/ion_plate{
+	dir = 8
+	},
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/black,
+/area/shuttle/salvaged_shuttle)
+"UU" = (
+/obj/structure/shuttle_decoration/eva_catwalks/directional/south,
+/obj/machinery/exoscanner/shuttle_part/radio_dish/directional/south,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"VR" = (
+/obj/structure/shuttle_decoration/bullbar/directional/east,
+/obj/effect/mapping_helpers/salvage_anchor/end/three,
+/turf/open/floor/plating/nanocarbon/exterior/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"YC" = (
+/turf/template_noop,
+/area/template_noop)
+"Zq" = (
+/obj/effect/spawner/random/salvage/interior_trash_n_debris,
+/obj/effect/spawner/random/salvage/interior_trash_n_debris,
+/turf/open/floor/plating/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"Zy" = (
+/obj/structure/shuttle_decoration/rcs/directional/north,
+/obj/structure/shuttle_decoration/wall_plate/gold_foil,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour,
+/area/shuttle/salvaged_shuttle)
+
+(1,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+"}
+(2,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+"}
+(3,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+"}
+(4,1,1) = {"
+YC
+uk
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+uk
+YC
+"}
+(5,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+"}
+(6,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+"}
+(7,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+"}
+(8,1,1) = {"
+YC
+Ev
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+Ii
+YC
+"}
+(9,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+"}
+(10,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+"}
+(11,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+NP
+kO
+Mn
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+"}
+(12,1,1) = {"
+uk
+YC
+YC
+YC
+YC
+YC
+QB
+YC
+NP
+QB
+Mn
+YC
+QB
+YC
+YC
+YC
+YC
+YC
+uk
+"}
+(13,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+YC
+oM
+Qv
+IM
+IM
+IM
+Qv
+yi
+YC
+YC
+YC
+YC
+YC
+YC
+"}
+(14,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+YC
+ce
+tC
+fI
+rb
+PS
+tC
+ce
+YC
+YC
+YC
+YC
+YC
+YC
+"}
+(15,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+YC
+Md
+YC
+IZ
+km
+jX
+YC
+Md
+YC
+YC
+YC
+YC
+YC
+YC
+"}
+(16,1,1) = {"
+HR
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+ez
+BV
+UU
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+MV
+"}
+(17,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+zm
+Me
+Fz
+CC
+Zq
+HG
+Fz
+hx
+iy
+YC
+YC
+YC
+YC
+YC
+"}
+(18,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+zd
+ly
+wC
+IG
+Kk
+xx
+wC
+bo
+VR
+YC
+YC
+YC
+YC
+YC
+"}
+(19,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+Zy
+nP
+vn
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+"}
+(20,1,1) = {"
+uk
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+eB
+LV
+eB
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+uk
+"}
+(21,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+"}
+(22,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+"}
+(23,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+"}
+(24,1,1) = {"
+YC
+Im
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+vE
+YC
+"}
+(25,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+"}
+(26,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+"}
+(27,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+"}
+(28,1,1) = {"
+YC
+uk
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+uk
+YC
+"}
+(29,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+"}
+(30,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+"}
+(31,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+"}
diff --git a/_maps/shuttles/~doppler_shuttles/salvage/salvage_solestra_probe_mining.dmm b/_maps/shuttles/~doppler_shuttles/salvage/salvage_solestra_probe_mining.dmm
new file mode 100644
index 00000000000000..8daea23f7d4ff3
--- /dev/null
+++ b/_maps/shuttles/~doppler_shuttles/salvage/salvage_solestra_probe_mining.dmm
@@ -0,0 +1,896 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"bo" = (
+/obj/structure/engine_covers/heater_cover{
+	dir = 4
+	},
+/obj/machinery/power/shuttle_engine/heater/salvage{
+	dir = 8
+	},
+/turf/open/floor/plating/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"ce" = (
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/secondary_colour,
+/area/shuttle/salvaged_shuttle)
+"ez" = (
+/obj/machinery/exoscanner/shuttle_part/radio_dish/directional/north,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"eB" = (
+/turf/closed/wall/mineral/nanocarbon/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"fI" = (
+/obj/structure/engine_covers/thruster_nozzle{
+	dir = 8
+	},
+/obj/machinery/power/shuttle_engine/propulsion/salvage{
+	dir = 8
+	},
+/turf/open/floor/plating/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"hx" = (
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/secondary_colour{
+	dir = 1
+	},
+/obj/structure/titanium_structure,
+/turf/open/floor/plating/nanocarbon/exterior/secondary_colour,
+/area/shuttle/salvaged_shuttle)
+"iy" = (
+/obj/machinery/exoscanner/shuttle_part/sensors_blister/directional/south,
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/secondary_colour,
+/turf/open/floor/plating/nanocarbon/exterior/secondary_colour,
+/area/shuttle/salvaged_shuttle)
+"jX" = (
+/obj/effect/mapping_helpers/salvage_anchor/end/six,
+/obj/machinery/exoscanner/shuttle_part/radio_dish/directional/east,
+/turf/open/floor/plating/nanocarbon/exterior/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"km" = (
+/turf/open/floor/plating/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"kO" = (
+/turf/open/floor/plating/nanocarbon/exterior/black,
+/area/shuttle/salvaged_shuttle)
+"nP" = (
+/obj/structure/shuttle_decoration/liquid_tank/battery,
+/turf/open/floor/plating/aluminum,
+/area/shuttle/salvaged_shuttle)
+"oM" = (
+/obj/structure/shuttle_decoration/rcs/directional/north,
+/obj/effect/mapping_helpers/salvage_anchor/end/seven,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/black,
+/area/shuttle/salvaged_shuttle)
+"rb" = (
+/obj/structure/shuttle_decoration/liquid_tank/explosive/hydrazine,
+/turf/open/floor/plating/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"tC" = (
+/obj/structure/lattice,
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/secondary_colour{
+	dir = 4
+	},
+/obj/structure/titanium_structure,
+/turf/template_noop,
+/area/shuttle/salvaged_shuttle)
+"uk" = (
+/obj/structure/railing/eva_handhold/directional/south,
+/obj/structure/railing/eva_handhold/directional/north,
+/obj/structure/marker_beacon/jade,
+/turf/open/floor/engine/anchor_jack,
+/area/shuttle/salvaged_shuttle)
+"vn" = (
+/obj/structure/shuttle_decoration/rcs/directional/south,
+/obj/structure/shuttle_decoration/wall_plate/gold_foil{
+	dir = 1
+	},
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"vE" = (
+/obj/structure/railing/eva_handhold/directional/south,
+/obj/structure/railing/eva_handhold/directional/north,
+/obj/structure/marker_beacon/yellow,
+/obj/effect/mapping_helpers/salvage_anchor/three,
+/turf/open/floor/engine/anchor_jack,
+/area/shuttle/salvaged_shuttle)
+"wC" = (
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/secondary_colour,
+/obj/structure/titanium_structure,
+/turf/open/floor/plating/nanocarbon/exterior/secondary_colour,
+/area/shuttle/salvaged_shuttle)
+"xx" = (
+/obj/structure/shuttle_decoration/wall_plate/gold_foil{
+	dir = 1
+	},
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/secondary_colour,
+/area/shuttle/salvaged_shuttle)
+"yi" = (
+/obj/structure/shuttle_decoration/rcs/directional/south,
+/obj/effect/mapping_helpers/salvage_anchor/end/two,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/black,
+/area/shuttle/salvaged_shuttle)
+"zd" = (
+/obj/machinery/exoscanner/shuttle_part/open_sensors_blister/directional/north,
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/secondary_colour{
+	dir = 1
+	},
+/turf/open/floor/plating/nanocarbon/exterior/secondary_colour,
+/area/shuttle/salvaged_shuttle)
+"zm" = (
+/obj/effect/mapping_helpers/salvage_anchor/end/three,
+/obj/structure/shuttle_decoration/bullbar/directional/east,
+/turf/open/floor/plating/nanocarbon/exterior/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"BV" = (
+/obj/structure/shuttle_access_panel,
+/turf/open/floor/plating/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"CC" = (
+/obj/machinery/exoscanner/shuttle_part/radar_panel/directional/north,
+/obj/structure/shuttle_decoration/wall_plate/gold_foil,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/secondary_colour,
+/area/shuttle/salvaged_shuttle)
+"Ev" = (
+/obj/structure/railing/eva_handhold/directional/south,
+/obj/structure/railing/eva_handhold/directional/north,
+/obj/structure/marker_beacon/yellow,
+/obj/effect/mapping_helpers/salvage_anchor/seven,
+/turf/open/floor/engine/anchor_jack,
+/area/shuttle/salvaged_shuttle)
+"Fz" = (
+/turf/open/floor/plating/nanocarbon/exterior/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"HG" = (
+/obj/machinery/exoscanner/shuttle_part/radar_panel/directional/south,
+/obj/structure/shuttle_decoration/wall_plate/gold_foil{
+	dir = 1
+	},
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/secondary_colour,
+/area/shuttle/salvaged_shuttle)
+"HR" = (
+/obj/structure/railing/eva_handhold/directional/south,
+/obj/structure/railing/eva_handhold/directional/north,
+/obj/structure/marker_beacon/yellow,
+/turf/open/floor/engine/anchor_jack,
+/area/shuttle/salvaged_shuttle)
+"Ii" = (
+/obj/structure/railing/eva_handhold/directional/south,
+/obj/structure/railing/eva_handhold/directional/north,
+/obj/structure/marker_beacon/yellow,
+/obj/effect/mapping_helpers/salvage_anchor/two,
+/turf/open/floor/engine/anchor_jack,
+/area/shuttle/salvaged_shuttle)
+"Im" = (
+/obj/structure/railing/eva_handhold/directional/south,
+/obj/structure/railing/eva_handhold/directional/north,
+/obj/structure/marker_beacon/yellow,
+/obj/effect/mapping_helpers/salvage_anchor/six,
+/turf/open/floor/engine/anchor_jack,
+/area/shuttle/salvaged_shuttle)
+"IG" = (
+/obj/structure/shuttle_decoration/wall_plate/gold_foil,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/secondary_colour,
+/area/shuttle/salvaged_shuttle)
+"IM" = (
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/black,
+/area/shuttle/salvaged_shuttle)
+"Kk" = (
+/obj/structure/shuttle_decoration/liquid_tank/battery/shipmind,
+/turf/open/floor/plating/aluminum,
+/area/shuttle/salvaged_shuttle)
+"LV" = (
+/obj/machinery/exoscanner/shuttle_part/radar_panel/directional/east,
+/obj/structure/shuttle_decoration/junction_box/directional/west,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"Md" = (
+/obj/structure/engine_covers/ion_plate{
+	dir = 4
+	},
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"Mn" = (
+/obj/structure/shuttle_decoration/wall_plate/armor,
+/turf/closed/wall/mineral/aluminum,
+/area/shuttle/salvaged_shuttle)
+"MV" = (
+/obj/docking_port/mobile/salvage,
+/obj/structure/railing/eva_handhold/directional/south,
+/obj/structure/railing/eva_handhold/directional/north,
+/obj/structure/marker_beacon/yellow,
+/turf/open/floor/engine/anchor_jack,
+/area/shuttle/salvaged_shuttle)
+"NP" = (
+/obj/structure/shuttle_decoration/wall_plate/armor{
+	dir = 1
+	},
+/turf/closed/wall/mineral/aluminum,
+/area/shuttle/salvaged_shuttle)
+"NV" = (
+/obj/effect/spawner/random/salvage/interior_trash_n_debris,
+/turf/open/floor/plating/nanocarbon/exterior/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"PS" = (
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"Qv" = (
+/obj/structure/lattice,
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/black{
+	dir = 8
+	},
+/obj/structure/titanium_structure,
+/turf/template_noop,
+/area/shuttle/salvaged_shuttle)
+"QB" = (
+/obj/structure/engine_covers/ion_plate{
+	dir = 8
+	},
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/black,
+/area/shuttle/salvaged_shuttle)
+"UU" = (
+/obj/machinery/exoscanner/shuttle_part/radio_dish/directional/south,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"YC" = (
+/turf/template_noop,
+/area/template_noop)
+"Zq" = (
+/obj/effect/spawner/random/salvage/interior_trash_n_debris,
+/obj/effect/spawner/random/salvage/interior_trash_n_debris,
+/turf/open/floor/plating/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"Zy" = (
+/obj/structure/shuttle_decoration/rcs/directional/north,
+/obj/structure/shuttle_decoration/wall_plate/gold_foil,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour,
+/area/shuttle/salvaged_shuttle)
+
+(1,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+"}
+(2,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+"}
+(3,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+"}
+(4,1,1) = {"
+YC
+uk
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+uk
+YC
+"}
+(5,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+"}
+(6,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+"}
+(7,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+"}
+(8,1,1) = {"
+YC
+Ev
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+Ii
+YC
+"}
+(9,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+"}
+(10,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+NP
+YC
+Mn
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+"}
+(11,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+NP
+kO
+Mn
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+"}
+(12,1,1) = {"
+uk
+YC
+YC
+YC
+YC
+YC
+QB
+YC
+IM
+fI
+IM
+YC
+QB
+YC
+YC
+YC
+YC
+YC
+uk
+"}
+(13,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+YC
+oM
+Qv
+IM
+bo
+IM
+Qv
+yi
+YC
+YC
+YC
+YC
+YC
+YC
+"}
+(14,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+YC
+ce
+tC
+PS
+rb
+PS
+tC
+ce
+YC
+YC
+YC
+YC
+YC
+YC
+"}
+(15,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+YC
+Md
+NV
+BV
+km
+BV
+Fz
+Md
+YC
+YC
+YC
+YC
+YC
+YC
+"}
+(16,1,1) = {"
+HR
+YC
+YC
+YC
+YC
+YC
+YC
+Fz
+ez
+BV
+UU
+NV
+YC
+YC
+YC
+YC
+YC
+YC
+MV
+"}
+(17,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+zd
+CC
+Zq
+HG
+iy
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+"}
+(18,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+hx
+IG
+Kk
+xx
+wC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+"}
+(19,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+jX
+Zy
+nP
+vn
+zm
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+"}
+(20,1,1) = {"
+uk
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+eB
+LV
+eB
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+uk
+"}
+(21,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+"}
+(22,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+"}
+(23,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+"}
+(24,1,1) = {"
+YC
+Im
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+vE
+YC
+"}
+(25,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+"}
+(26,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+"}
+(27,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+"}
+(28,1,1) = {"
+YC
+uk
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+uk
+YC
+"}
+(29,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+"}
+(30,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+"}
+(31,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+"}
diff --git a/_maps/shuttles/~doppler_shuttles/salvage/salvage_vautour_cargo.dmm b/_maps/shuttles/~doppler_shuttles/salvage/salvage_vautour_cargo.dmm
new file mode 100644
index 00000000000000..7dc4dea49ae1ce
--- /dev/null
+++ b/_maps/shuttles/~doppler_shuttles/salvage/salvage_vautour_cargo.dmm
@@ -0,0 +1,1405 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"bo" = (
+/obj/structure/shuttle_decoration/radiator/directional/north,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"by" = (
+/obj/structure/shuttle_decoration/console/directional/south,
+/obj/machinery/exoscanner/shuttle_part/open_sensors_blister/directional/north,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"ce" = (
+/turf/open/floor/plating/nanocarbon/exterior/black,
+/area/shuttle/salvaged_shuttle)
+"cP" = (
+/obj/structure/shuttle_decoration/wall_plate/silver_foil,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/secondary_colour,
+/area/shuttle/salvaged_shuttle)
+"dD" = (
+/obj/structure/railing/eva_handhold/directional/south,
+/obj/structure/railing/eva_handhold/directional/north,
+/obj/effect/mapping_helpers/salvage_anchor/five,
+/obj/structure/marker_beacon/jade,
+/turf/open/floor/engine/anchor_jack,
+/area/shuttle/salvaged_shuttle)
+"er" = (
+/obj/structure/shuttle_decoration/wall_plate/silver_foil{
+	dir = 1
+	},
+/obj/structure/shuttle_decoration/rcs/directional/south,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/secondary_colour,
+/area/shuttle/salvaged_shuttle)
+"ez" = (
+/obj/effect/spawner/random/salvage/crate_only,
+/turf/open/floor/iron/colony/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"eB" = (
+/obj/structure/shuttle_decoration/wall_plate/silver_foil{
+	dir = 1
+	},
+/obj/structure/shuttle_decoration/extinguisher/directional/south,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"eJ" = (
+/obj/effect/mapping_helpers/salvage_anchor/end/three,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"eN" = (
+/obj/structure/shuttle_decoration/wall_plate/silver_foil,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"fe" = (
+/obj/structure/titanium_structure,
+/obj/structure/shuttle_decoration/wall_plate/armor,
+/obj/structure/shuttle_decoration/eva_catwalks/directional/south,
+/obj/structure/railing/eva_handhold/directional/south,
+/turf/open/floor/plating/nanocarbon/exterior/black,
+/area/shuttle/salvaged_shuttle)
+"fg" = (
+/obj/effect/spawner/random/salvage/interior_trash_n_debris,
+/obj/structure/railing{
+	dir = 1
+	},
+/turf/open/floor/plating/nanocarbon/exterior/secondary_colour,
+/area/shuttle/salvaged_shuttle)
+"fI" = (
+/obj/structure/lattice,
+/turf/template_noop,
+/area/shuttle/salvaged_shuttle)
+"gq" = (
+/obj/machinery/light/red/directional/south,
+/turf/open/floor/plating/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"gM" = (
+/obj/effect/spawner/random/salvage/container_or_crate_or_cargo,
+/turf/open/floor/plating/nanocarbon/exterior/black,
+/area/shuttle/salvaged_shuttle)
+"hq" = (
+/obj/structure/railing{
+	dir = 1
+	},
+/turf/open/floor/plating/nanocarbon/exterior/secondary_colour,
+/area/shuttle/salvaged_shuttle)
+"hx" = (
+/obj/structure/shuttle_decoration/wall_plate/silver_foil{
+	dir = 1
+	},
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"ik" = (
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"iy" = (
+/obj/machinery/power/shuttle_engine/propulsion/salvage{
+	dir = 8
+	},
+/obj/structure/engine_covers/thruster_nozzle{
+	dir = 8
+	},
+/turf/open/floor/plating/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"iA" = (
+/obj/machinery/exoscanner/shuttle_part/radar_panel/directional/north,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/secondary_colour,
+/area/shuttle/salvaged_shuttle)
+"je" = (
+/obj/effect/mapping_helpers/salvage_anchor/end/eight,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"jv" = (
+/obj/machinery/power/shuttle_engine/heater/salvage{
+	dir = 8
+	},
+/obj/structure/engine_covers/heater_cover{
+	dir = 4
+	},
+/turf/open/floor/plating/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"jH" = (
+/obj/effect/mapping_helpers/salvage_anchor/end/one,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"jX" = (
+/obj/structure/lattice,
+/obj/structure/titanium_structure,
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/primary_colour{
+	dir = 1
+	},
+/obj/structure/shuttle_decoration/eva_catwalks/directional/north,
+/obj/structure/railing/eva_handhold/directional/north,
+/turf/template_noop,
+/area/shuttle/salvaged_shuttle)
+"km" = (
+/obj/structure/shuttle_decoration/ladder/directional/north,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"kv" = (
+/obj/machinery/exoscanner/shuttle_part/radio_dish/directional/east,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/black,
+/area/shuttle/salvaged_shuttle)
+"kO" = (
+/turf/open/floor/catwalk_floor/colony_fabricator/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"kP" = (
+/obj/effect/spawner/random/salvage/interior_trash_n_debris,
+/turf/open/floor/iron/colony/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"kZ" = (
+/turf/open/floor/plating/nanocarbon/exterior/standard,
+/area/shuttle/salvaged_shuttle)
+"ly" = (
+/obj/structure/shuttle_decoration/wall_plate/silver_foil{
+	dir = 1
+	},
+/obj/structure/shuttle_decoration/rcs/directional/south,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"md" = (
+/obj/structure/shuttle_decoration/extinguisher/directional/east,
+/turf/closed/wall/mineral/aluminum,
+/area/shuttle/salvaged_shuttle)
+"mw" = (
+/obj/structure/lattice,
+/obj/structure/titanium_structure,
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/diagonal/primary_colour,
+/turf/template_noop,
+/area/shuttle/salvaged_shuttle)
+"nk" = (
+/obj/structure/lattice/catwalk,
+/obj/structure/shuttle_decoration/wall_plate/armor{
+	dir = 9
+	},
+/obj/structure/shuttle_decoration/eva_catwalks/directional/north,
+/turf/template_noop,
+/area/shuttle/salvaged_shuttle)
+"nN" = (
+/obj/machinery/computer/old{
+	dir = 8
+	},
+/turf/open/floor/iron/colony/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"nP" = (
+/obj/structure/chair/comfy/shuttle{
+	dir = 1;
+	pixel_y = -5
+	},
+/obj/effect/spawner/random/salvage/interior_trash_n_debris,
+/turf/open/floor/iron/colony/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"oM" = (
+/obj/structure/shuttle_decoration/wall_plate/silver_foil,
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/primary_colour{
+	dir = 1
+	},
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"pa" = (
+/obj/structure/shuttle_decoration/ladder/directional/south,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"po" = (
+/obj/structure/lattice,
+/obj/structure/titanium_structure,
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/diagonal/primary_colour{
+	dir = 1
+	},
+/turf/template_noop,
+/area/shuttle/salvaged_shuttle)
+"pH" = (
+/obj/machinery/light/red/directional/north,
+/turf/open/floor/plating/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"pZ" = (
+/obj/structure/shuttle_decoration/wall_plate/silver_foil,
+/obj/effect/mapping_helpers/salvage_anchor/end/seven,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/secondary_colour,
+/area/shuttle/salvaged_shuttle)
+"qj" = (
+/obj/effect/mapping_helpers/salvage_anchor/end/six,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"rb" = (
+/obj/structure/lattice/catwalk,
+/turf/template_noop,
+/area/shuttle/salvaged_shuttle)
+"rw" = (
+/obj/effect/spawner/random/salvage/interior_trash_n_debris,
+/turf/open/floor/plating/nanocarbon/exterior/secondary_colour,
+/area/shuttle/salvaged_shuttle)
+"rL" = (
+/obj/structure/shuttle_decoration/wall_plate/silver_foil,
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/secondary_colour{
+	dir = 1
+	},
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/secondary_colour,
+/area/shuttle/salvaged_shuttle)
+"sc" = (
+/obj/machinery/light/red/directional/east,
+/obj/effect/spawner/random/salvage/crate_only,
+/turf/open/floor/iron/colony/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"sj" = (
+/obj/structure/chair/comfy/shuttle{
+	dir = 4
+	},
+/obj/machinery/light/red/directional/south,
+/turf/open/floor/plating/nanocarbon/exterior/standard,
+/area/shuttle/salvaged_shuttle)
+"sl" = (
+/obj/structure/shuttle_decoration/wall_plate/silver_foil{
+	dir = 1
+	},
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/secondary_colour,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/secondary_colour,
+/area/shuttle/salvaged_shuttle)
+"su" = (
+/obj/structure/lattice/catwalk,
+/obj/structure/shuttle_decoration/eva_catwalks/directional/south,
+/obj/structure/railing/eva_handhold/directional/south,
+/turf/template_noop,
+/area/shuttle/salvaged_shuttle)
+"sO" = (
+/obj/effect/mapping_helpers/salvage_anchor/end/four,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/black,
+/area/shuttle/salvaged_shuttle)
+"tC" = (
+/obj/structure/lattice,
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/diagonal/primary_colour{
+	dir = 1
+	},
+/turf/template_noop,
+/area/shuttle/salvaged_shuttle)
+"uk" = (
+/obj/structure/railing/eva_handhold/directional/south,
+/obj/structure/railing/eva_handhold/directional/north,
+/obj/effect/mapping_helpers/salvage_anchor/seven,
+/obj/structure/marker_beacon/jade,
+/turf/open/floor/engine/anchor_jack,
+/area/shuttle/salvaged_shuttle)
+"uK" = (
+/obj/structure/shuttle_decoration/liquid_tank/battery,
+/obj/structure/shuttle_decoration/wall_plate/plastamic,
+/obj/machinery/light/red/directional/north,
+/turf/open/floor/plating/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"uL" = (
+/obj/structure/shuttle_decoration/liquid_tank/explosive,
+/turf/open/floor/plating/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"vg" = (
+/obj/machinery/light/red/directional/east,
+/turf/open/floor/plating/nanocarbon/exterior/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"vn" = (
+/obj/machinery/light/red/directional/east,
+/turf/open/floor/catwalk_floor/colony_fabricator/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"vE" = (
+/obj/structure/railing/eva_handhold/directional/south,
+/obj/structure/railing/eva_handhold/directional/north,
+/obj/effect/mapping_helpers/salvage_anchor/two,
+/obj/structure/marker_beacon/jade,
+/turf/open/floor/engine/anchor_jack,
+/area/shuttle/salvaged_shuttle)
+"wC" = (
+/obj/effect/spawner/random/salvage/interior_trash_n_debris,
+/obj/structure/railing{
+	dir = 8
+	},
+/turf/open/floor/plating/nanocarbon/exterior/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"xs" = (
+/obj/structure/shuttle_decoration/wall_plate/silver_foil,
+/obj/structure/shuttle_decoration/rcs/directional/north,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"xv" = (
+/obj/structure/shuttle_decoration/wall_plate/silver_foil{
+	dir = 1
+	},
+/obj/effect/mapping_helpers/salvage_anchor/end/two,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/secondary_colour,
+/area/shuttle/salvaged_shuttle)
+"xx" = (
+/turf/open/floor/iron/colony/texture/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"yi" = (
+/obj/structure/railing,
+/turf/open/floor/plating/nanocarbon/exterior/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"ym" = (
+/obj/structure/chair/comfy/shuttle{
+	pixel_y = 12
+	},
+/turf/open/floor/iron/colony/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"yu" = (
+/obj/structure/lattice,
+/obj/structure/titanium_structure,
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/primary_colour,
+/obj/structure/shuttle_decoration/eva_catwalks/directional/south,
+/obj/structure/railing/eva_handhold/directional/south,
+/turf/template_noop,
+/area/shuttle/salvaged_shuttle)
+"yx" = (
+/obj/structure/titanium_structure,
+/turf/open/floor/plating/nanocarbon/exterior/standard,
+/area/shuttle/salvaged_shuttle)
+"zd" = (
+/turf/open/floor/plating/nanocarbon/exterior/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"zm" = (
+/obj/machinery/computer/old{
+	dir = 8
+	},
+/obj/machinery/light/red/directional/south,
+/turf/open/floor/iron/colony/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"Aq" = (
+/obj/structure/shuttle_decoration/eva_catwalks/directional/east,
+/obj/structure/shuttle_decoration/bullbar/directional/east,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"Av" = (
+/obj/effect/spawner/random/salvage/every_small_tank,
+/turf/open/floor/iron/colony/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"AE" = (
+/obj/structure/lattice/catwalk,
+/obj/structure/shuttle_decoration/eva_catwalks/directional/north,
+/turf/template_noop,
+/area/shuttle/salvaged_shuttle)
+"AS" = (
+/obj/structure/lattice,
+/obj/structure/shuttle_decoration/wall_plate/armor,
+/obj/structure/shuttle_decoration/eva_catwalks/directional/south,
+/turf/template_noop,
+/area/shuttle/salvaged_shuttle)
+"Bz" = (
+/obj/structure/lattice,
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/primary_colour,
+/obj/structure/shuttle_decoration/eva_catwalks/directional/south,
+/turf/template_noop,
+/area/shuttle/salvaged_shuttle)
+"BC" = (
+/obj/structure/shuttle_decoration/wall_plate/silver_foil{
+	dir = 1
+	},
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/secondary_colour,
+/area/shuttle/salvaged_shuttle)
+"BV" = (
+/obj/machinery/power/shuttle_engine/propulsion/salvage{
+	dir = 4
+	},
+/obj/structure/engine_covers/thruster_nozzle{
+	dir = 4
+	},
+/turf/open/floor/plating/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"BW" = (
+/obj/structure/lattice/catwalk,
+/obj/structure/shuttle_decoration/eva_catwalks/directional/north,
+/obj/structure/railing/eva_handhold/directional/north,
+/turf/template_noop,
+/area/shuttle/salvaged_shuttle)
+"CC" = (
+/turf/open/floor/iron/colony/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"CU" = (
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/black,
+/area/shuttle/salvaged_shuttle)
+"Dm" = (
+/obj/structure/railing/eva_handhold/directional/south,
+/obj/structure/railing/eva_handhold/directional/north,
+/obj/effect/mapping_helpers/salvage_anchor/six,
+/obj/structure/marker_beacon/jade,
+/turf/open/floor/engine/anchor_jack,
+/area/shuttle/salvaged_shuttle)
+"Dp" = (
+/obj/structure/chair/comfy/shuttle{
+	dir = 4
+	},
+/turf/open/floor/iron/colony/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"Du" = (
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/secondary_colour,
+/area/shuttle/salvaged_shuttle)
+"Dx" = (
+/obj/structure/window/fulltile/salvage_shuttle,
+/turf/open/floor/plating/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"DB" = (
+/obj/structure/lattice,
+/obj/structure/shuttle_decoration/eva_catwalks/directional/north,
+/turf/template_noop,
+/area/shuttle/salvaged_shuttle)
+"Em" = (
+/obj/structure/railing/eva_handhold/directional/south,
+/obj/structure/railing/eva_handhold/directional/north,
+/obj/effect/mapping_helpers/salvage_anchor/three,
+/obj/structure/marker_beacon/jade,
+/turf/open/floor/engine/anchor_jack,
+/area/shuttle/salvaged_shuttle)
+"Ev" = (
+/obj/structure/railing/eva_handhold/directional/south,
+/obj/structure/railing/eva_handhold/directional/north,
+/obj/effect/mapping_helpers/salvage_anchor/four,
+/obj/structure/marker_beacon/jade,
+/turf/open/floor/engine/anchor_jack,
+/area/shuttle/salvaged_shuttle)
+"Ew" = (
+/obj/structure/shuttle_decoration/liquid_tank/explosive/hydrazine,
+/turf/open/floor/plating/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"Ex" = (
+/obj/structure/shuttle_decoration/wall_plate/armor{
+	dir = 1
+	},
+/obj/structure/shuttle_decoration/wall_plate/armor{
+	dir = 2
+	},
+/turf/closed/wall/mineral/aluminum,
+/area/shuttle/salvaged_shuttle)
+"Ez" = (
+/turf/open/floor/plating/nanocarbon/exterior/secondary_colour,
+/area/shuttle/salvaged_shuttle)
+"Fg" = (
+/obj/structure/lattice/catwalk,
+/obj/structure/shuttle_decoration/wall_plate/armor{
+	dir = 10
+	},
+/obj/structure/shuttle_decoration/eva_catwalks/directional/south,
+/turf/template_noop,
+/area/shuttle/salvaged_shuttle)
+"Fw" = (
+/obj/structure/shuttle_decoration/wall_plate/plastamic{
+	dir = 4
+	},
+/turf/closed/wall/mineral/aluminum,
+/area/shuttle/salvaged_shuttle)
+"Fz" = (
+/obj/effect/spawner/random/salvage/interior_trash_n_debris,
+/turf/open/floor/iron/colony/texture/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"FH" = (
+/obj/structure/lattice,
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/diagonal/primary_colour,
+/turf/template_noop,
+/area/shuttle/salvaged_shuttle)
+"Gu" = (
+/obj/structure/lattice/catwalk,
+/obj/effect/spawner/random/salvage/interior_trash_n_debris,
+/obj/structure/shuttle_decoration/eva_catwalks/directional/south,
+/obj/structure/railing/eva_handhold/directional/south,
+/turf/template_noop,
+/area/shuttle/salvaged_shuttle)
+"Gy" = (
+/obj/structure/shuttle_decoration/wall_plate/plastamic{
+	dir = 8
+	},
+/turf/closed/wall/mineral/aluminum,
+/area/shuttle/salvaged_shuttle)
+"HG" = (
+/obj/structure/lattice,
+/obj/structure/shuttle_decoration/eva_catwalks/directional/south,
+/turf/template_noop,
+/area/shuttle/salvaged_shuttle)
+"HM" = (
+/obj/machinery/exoscanner/shuttle_part/radar_panel/directional/south,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/secondary_colour,
+/area/shuttle/salvaged_shuttle)
+"HR" = (
+/obj/structure/railing/eva_handhold/directional/south,
+/obj/structure/railing/eva_handhold/directional/north,
+/obj/structure/marker_beacon/yellow,
+/turf/open/floor/engine/anchor_jack,
+/area/shuttle/salvaged_shuttle)
+"Ii" = (
+/obj/structure/railing/eva_handhold/directional/south,
+/obj/structure/railing/eva_handhold/directional/north,
+/obj/effect/mapping_helpers/salvage_anchor/one,
+/obj/structure/marker_beacon/jade,
+/turf/open/floor/engine/anchor_jack,
+/area/shuttle/salvaged_shuttle)
+"Im" = (
+/obj/structure/shuttle_decoration/liquid_tank/reactor,
+/turf/open/floor/plating/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"IG" = (
+/obj/structure/shuttle_decoration/junction_box/directional/south,
+/obj/structure/shuttle_decoration/rcs/directional/north,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"IM" = (
+/obj/structure/shuttle_decoration/eva_catwalks/directional/east,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"IP" = (
+/obj/structure/mineral_door/manual_colony_door/shuttle/interior,
+/turf/open/floor/iron/colony/white/texture/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"IZ" = (
+/obj/structure/chair/comfy/shuttle{
+	dir = 1;
+	pixel_y = -5
+	},
+/turf/open/floor/iron/colony/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"Jd" = (
+/obj/effect/spawner/random/salvage/container,
+/turf/open/floor/plating/nanocarbon/exterior/black,
+/area/shuttle/salvaged_shuttle)
+"JD" = (
+/obj/structure/lattice,
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/primary_colour{
+	dir = 1
+	},
+/obj/structure/shuttle_decoration/eva_catwalks/directional/north,
+/turf/template_noop,
+/area/shuttle/salvaged_shuttle)
+"Kk" = (
+/obj/structure/shuttle_decoration/wall_plate/silver_foil{
+	dir = 1
+	},
+/obj/structure/shuttle_decoration/wall_plate/silver_foil{
+	dir = 1
+	},
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/secondary_colour,
+/area/shuttle/salvaged_shuttle)
+"KV" = (
+/obj/structure/shuttle_decoration/wall_plate/silver_foil,
+/obj/structure/shuttle_decoration/rcs/directional/north,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/secondary_colour,
+/area/shuttle/salvaged_shuttle)
+"LH" = (
+/obj/effect/mapping_helpers/salvage_anchor/end/five,
+/turf/closed/wall/mineral/nanocarbon/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"LJ" = (
+/obj/machinery/power/shuttle_engine/heater/salvage{
+	dir = 4
+	},
+/obj/structure/engine_covers/heater_cover{
+	dir = 8
+	},
+/turf/open/floor/plating/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"LV" = (
+/obj/structure/lattice/catwalk,
+/obj/structure/shuttle_decoration/eva_catwalks/directional/south,
+/turf/template_noop,
+/area/shuttle/salvaged_shuttle)
+"Md" = (
+/obj/structure/shuttle_decoration/radiator/directional/south,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"Mn" = (
+/obj/structure/lattice,
+/obj/structure/shuttle_decoration/eva_catwalks/directional/south,
+/obj/structure/railing/eva_handhold/directional/south,
+/turf/template_noop,
+/area/shuttle/salvaged_shuttle)
+"MV" = (
+/obj/docking_port/mobile/salvage,
+/obj/structure/railing/eva_handhold/directional/south,
+/obj/structure/railing/eva_handhold/directional/north,
+/obj/structure/marker_beacon/yellow,
+/turf/open/floor/engine/anchor_jack,
+/area/shuttle/salvaged_shuttle)
+"No" = (
+/obj/structure/shuttle_decoration/wall_plate/armor,
+/obj/structure/shuttle_decoration/wall_plate/armor{
+	dir = 1
+	},
+/turf/closed/wall/mineral/aluminum,
+/area/shuttle/salvaged_shuttle)
+"NP" = (
+/obj/structure/lattice,
+/obj/structure/shuttle_decoration/eva_catwalks/directional/north,
+/obj/structure/railing/eva_handhold/directional/north,
+/turf/template_noop,
+/area/shuttle/salvaged_shuttle)
+"Oe" = (
+/obj/structure/shuttle_decoration/liquid_tank/explosive/lithium,
+/turf/open/floor/plating/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"Ow" = (
+/obj/structure/shuttle_decoration/console/directional/north,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/secondary_colour,
+/area/shuttle/salvaged_shuttle)
+"Pp" = (
+/obj/structure/mineral_door/manual_colony_door/shuttle,
+/turf/open/floor/iron/colony/white/texture/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"PS" = (
+/obj/structure/shuttle_decoration/console/directional/north,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"Qv" = (
+/obj/structure/shuttle_access_panel,
+/turf/open/floor/plating/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"QB" = (
+/obj/structure/titanium_structure,
+/obj/structure/shuttle_decoration/wall_plate/armor{
+	dir = 1
+	},
+/obj/structure/shuttle_decoration/eva_catwalks/directional/north,
+/obj/structure/railing/eva_handhold/directional/north,
+/turf/open/floor/plating/nanocarbon/exterior/black,
+/area/shuttle/salvaged_shuttle)
+"QT" = (
+/obj/structure/railing,
+/turf/open/floor/plating/nanocarbon/exterior/secondary_colour,
+/area/shuttle/salvaged_shuttle)
+"RB" = (
+/obj/structure/shuttle_decoration/wall_plate/silver_foil{
+	dir = 1
+	},
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/primary_colour,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"RM" = (
+/obj/structure/shuttle_decoration/wall_plate/silver_foil,
+/obj/structure/shuttle_decoration/extinguisher/directional/north,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"RS" = (
+/turf/closed/wall/mineral/nanocarbon/black,
+/area/shuttle/salvaged_shuttle)
+"Sv" = (
+/obj/structure/railing/eva_handhold/directional/south,
+/obj/structure/railing/eva_handhold/directional/north,
+/obj/effect/mapping_helpers/salvage_anchor/eight,
+/obj/structure/marker_beacon/jade,
+/turf/open/floor/engine/anchor_jack,
+/area/shuttle/salvaged_shuttle)
+"Tf" = (
+/obj/structure/shuttle_decoration/wall_plate/plastamic{
+	dir = 1
+	},
+/obj/structure/shuttle_decoration/liquid_tank/coolant,
+/turf/open/floor/plating/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"Tm" = (
+/obj/effect/spawner/random/salvage/interior_trash_n_debris,
+/turf/open/floor/catwalk_floor/colony_fabricator/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"TB" = (
+/obj/structure/shuttle_decoration/eva_catwalks/directional/east,
+/obj/machinery/exoscanner/shuttle_part/radar_panel/directional/east,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"UE" = (
+/obj/structure/chair/comfy/shuttle{
+	dir = 4
+	},
+/obj/machinery/light/red/directional/north,
+/turf/open/floor/plating/nanocarbon/exterior/standard,
+/area/shuttle/salvaged_shuttle)
+"UN" = (
+/obj/effect/spawner/random/salvage/interior_trash_n_debris,
+/obj/structure/railing,
+/turf/open/floor/plating/nanocarbon/exterior/secondary_colour,
+/area/shuttle/salvaged_shuttle)
+"UU" = (
+/turf/closed/wall/mineral/aluminum,
+/area/shuttle/salvaged_shuttle)
+"VJ" = (
+/obj/structure/shuttle_decoration/bullbar/directional/east,
+/obj/structure/shuttle_decoration/eva_catwalks/directional/east,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"VR" = (
+/obj/structure/lattice,
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/diagonal/primary_colour{
+	dir = 10
+	},
+/turf/template_noop,
+/area/shuttle/salvaged_shuttle)
+"Wc" = (
+/obj/structure/shuttle_decoration/junction_box/directional/west,
+/turf/closed/wall/mineral/aluminum,
+/area/shuttle/salvaged_shuttle)
+"Xt" = (
+/obj/structure/shuttle_decoration/console/directional/south,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"Yt" = (
+/obj/structure/lattice,
+/obj/structure/shuttle_decoration/wall_plate/armor{
+	dir = 1
+	},
+/obj/structure/shuttle_decoration/eva_catwalks/directional/north,
+/turf/template_noop,
+/area/shuttle/salvaged_shuttle)
+"YC" = (
+/turf/template_noop,
+/area/template_noop)
+"YR" = (
+/obj/structure/lattice,
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/diagonal/primary_colour{
+	dir = 9
+	},
+/turf/template_noop,
+/area/shuttle/salvaged_shuttle)
+"Zq" = (
+/obj/structure/shuttle_decoration/rcs,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"Zy" = (
+/obj/structure/shuttle_decoration/console/directional/south,
+/turf/closed/wall/mineral/aluminum,
+/area/shuttle/salvaged_shuttle)
+
+(1,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+"}
+(2,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+"}
+(3,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+Ex
+YC
+YC
+fI
+YC
+fI
+YC
+YC
+Ex
+YC
+YC
+YC
+YC
+YC
+"}
+(4,1,1) = {"
+YC
+Sv
+YC
+YC
+YR
+Ex
+YC
+YC
+fI
+yx
+fI
+YC
+YC
+Ex
+VR
+YC
+YC
+Ii
+YC
+"}
+(5,1,1) = {"
+YC
+YC
+YC
+YC
+po
+ik
+Fg
+YC
+Jd
+Jd
+Jd
+YC
+nk
+ik
+mw
+YC
+YC
+YC
+YC
+"}
+(6,1,1) = {"
+YC
+YC
+YC
+YC
+tC
+je
+fe
+YC
+Jd
+Jd
+Jd
+YC
+QB
+jH
+FH
+YC
+YC
+YC
+YC
+"}
+(7,1,1) = {"
+YC
+YC
+YC
+YC
+ik
+ik
+AS
+YC
+fI
+yx
+fI
+YC
+Yt
+ik
+ik
+YC
+YC
+YC
+YC
+"}
+(8,1,1) = {"
+YC
+HR
+YC
+YC
+bo
+UU
+yu
+YC
+gM
+gM
+gM
+YC
+jX
+UU
+Md
+YC
+YC
+HR
+YC
+"}
+(9,1,1) = {"
+YC
+YC
+YC
+YC
+bo
+UE
+Bz
+YC
+gM
+gM
+gM
+YC
+JD
+sj
+Md
+YC
+YC
+YC
+YC
+"}
+(10,1,1) = {"
+YC
+YC
+No
+YC
+pa
+kZ
+Gu
+YC
+fI
+yx
+fI
+YC
+BW
+kZ
+km
+YC
+No
+YC
+YC
+"}
+(11,1,1) = {"
+YC
+YC
+No
+ce
+Du
+UU
+LV
+YC
+Jd
+Jd
+Jd
+YC
+AE
+UU
+Du
+ce
+No
+YC
+YC
+"}
+(12,1,1) = {"
+uk
+YC
+KV
+iy
+BC
+UU
+Mn
+YC
+Jd
+Jd
+Jd
+YC
+NP
+UU
+cP
+iy
+er
+YC
+vE
+"}
+(13,1,1) = {"
+YC
+YC
+pZ
+jv
+RB
+zd
+HG
+YC
+fI
+yx
+fI
+YC
+DB
+zd
+oM
+jv
+xv
+YC
+YC
+"}
+(14,1,1) = {"
+YC
+YC
+eN
+uL
+RB
+UN
+su
+YC
+gM
+gM
+gM
+YC
+BW
+fg
+oM
+Ew
+hx
+YC
+YC
+"}
+(15,1,1) = {"
+YC
+YC
+RM
+pH
+Qv
+rw
+LV
+YC
+gM
+gM
+gM
+YC
+AE
+Ez
+Qv
+gq
+eB
+YC
+YC
+"}
+(16,1,1) = {"
+HR
+YC
+cP
+Oe
+sl
+QT
+su
+YC
+fI
+yx
+fI
+YC
+BW
+hq
+rL
+Im
+Kk
+YC
+MV
+"}
+(17,1,1) = {"
+YC
+YC
+cP
+LJ
+sl
+yi
+fI
+fI
+rb
+yx
+rb
+fI
+fI
+zd
+rL
+LJ
+BC
+YC
+YC
+"}
+(18,1,1) = {"
+YC
+YC
+xs
+BV
+RB
+vg
+zd
+wC
+Wc
+md
+Dx
+Dx
+Dx
+UU
+eN
+BV
+ly
+YC
+YC
+"}
+(19,1,1) = {"
+YC
+YC
+qj
+ce
+ik
+UU
+Pp
+UU
+Zy
+nP
+kP
+CC
+kP
+ym
+PS
+ce
+eJ
+YC
+YC
+"}
+(20,1,1) = {"
+Dm
+YC
+YC
+YC
+Du
+uK
+kO
+Tf
+UU
+ez
+xx
+Fz
+xx
+ym
+Ow
+YC
+YC
+YC
+Em
+"}
+(21,1,1) = {"
+YC
+YC
+YC
+YC
+iA
+UU
+Pp
+UU
+UU
+ez
+xx
+sc
+Av
+ez
+HM
+YC
+YC
+YC
+YC
+"}
+(22,1,1) = {"
+YC
+YC
+YC
+YC
+Xt
+IZ
+xx
+kP
+UU
+UU
+IP
+UU
+Wc
+Fw
+ik
+YC
+YC
+YC
+YC
+"}
+(23,1,1) = {"
+YC
+YC
+YC
+YC
+by
+IZ
+Tm
+Fz
+IP
+kO
+vn
+kO
+Pp
+vn
+Pp
+YC
+YC
+YC
+YC
+"}
+(24,1,1) = {"
+YC
+HR
+YC
+YC
+IG
+kP
+kO
+Dp
+ik
+UU
+UU
+UU
+UU
+Gy
+Zq
+YC
+YC
+HR
+YC
+"}
+(25,1,1) = {"
+YC
+YC
+YC
+YC
+Xt
+IZ
+CC
+zm
+ik
+Aq
+TB
+VJ
+IM
+ik
+ik
+YC
+YC
+YC
+YC
+"}
+(26,1,1) = {"
+YC
+YC
+YC
+YC
+LH
+ik
+kP
+Dp
+Dx
+YC
+YC
+YC
+YC
+CU
+sO
+YC
+YC
+YC
+YC
+"}
+(27,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+Dx
+CC
+nN
+Dx
+YC
+YC
+YC
+YC
+kv
+RS
+YC
+YC
+YC
+YC
+"}
+(28,1,1) = {"
+YC
+dD
+YC
+YC
+YC
+ik
+Dx
+Dx
+ik
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+Ev
+YC
+"}
+(29,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+"}
+(30,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+"}
+(31,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+"}
diff --git a/_maps/shuttles/~doppler_shuttles/salvage/salvage_vautour_salvage.dmm b/_maps/shuttles/~doppler_shuttles/salvage/salvage_vautour_salvage.dmm
new file mode 100644
index 00000000000000..7dfa98c03af539
--- /dev/null
+++ b/_maps/shuttles/~doppler_shuttles/salvage/salvage_vautour_salvage.dmm
@@ -0,0 +1,1361 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"bo" = (
+/obj/structure/lattice/catwalk,
+/obj/structure/shuttle_decoration/eva_catwalks/directional/north,
+/obj/structure/railing/eva_handhold/directional/north,
+/turf/template_noop,
+/area/shuttle/salvaged_shuttle)
+"bv" = (
+/obj/structure/shuttle_decoration/console/directional/north,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"ce" = (
+/obj/machinery/power/shuttle_engine/heater/salvage{
+	dir = 4
+	},
+/obj/structure/engine_covers/heater_cover{
+	dir = 8
+	},
+/turf/open/floor/plating/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"cC" = (
+/obj/structure/shuttle_decoration/wall_plate/silver_foil{
+	dir = 1
+	},
+/obj/structure/shuttle_decoration/extinguisher/directional/south,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"cP" = (
+/obj/machinery/power/shuttle_engine/propulsion/salvage{
+	dir = 4
+	},
+/obj/structure/engine_covers/thruster_nozzle{
+	dir = 4
+	},
+/turf/open/floor/plating/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"dD" = (
+/obj/structure/railing/eva_handhold/directional/south,
+/obj/structure/railing/eva_handhold/directional/north,
+/obj/effect/mapping_helpers/salvage_anchor/five,
+/obj/structure/marker_beacon/jade,
+/turf/open/floor/engine/anchor_jack,
+/area/shuttle/salvaged_shuttle)
+"ez" = (
+/obj/effect/spawner/random/salvage/every_small_tank,
+/turf/open/floor/iron/colony/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"eB" = (
+/obj/structure/shuttle_decoration/wall_plate/silver_foil{
+	dir = 1
+	},
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/secondary_colour,
+/area/shuttle/salvaged_shuttle)
+"fe" = (
+/obj/structure/shuttle_decoration/console/directional/south,
+/obj/machinery/exoscanner/shuttle_part/open_sensors_blister/directional/north,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"fI" = (
+/obj/structure/lattice,
+/obj/structure/titanium_structure,
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/primary_colour,
+/obj/structure/shuttle_decoration/eva_catwalks/directional/south,
+/obj/structure/railing/eva_handhold/directional/south,
+/turf/template_noop,
+/area/shuttle/salvaged_shuttle)
+"gM" = (
+/obj/structure/lattice/catwalk,
+/obj/structure/shuttle_decoration/wall_plate/armor{
+	dir = 10
+	},
+/obj/structure/shuttle_decoration/eva_catwalks/directional/south,
+/turf/template_noop,
+/area/shuttle/salvaged_shuttle)
+"gX" = (
+/obj/machinery/light/red/directional/south,
+/turf/open/floor/plating/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"hx" = (
+/obj/structure/shuttle_decoration/radiator/directional/north,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"ik" = (
+/obj/structure/shuttle_decoration/wall_plate/silver_foil,
+/obj/effect/mapping_helpers/salvage_anchor/end/seven,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/secondary_colour,
+/area/shuttle/salvaged_shuttle)
+"iy" = (
+/obj/machinery/light/red/directional/east,
+/turf/open/floor/plating/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"iz" = (
+/obj/structure/shuttle_decoration/wall_plate/silver_foil{
+	dir = 1
+	},
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"iA" = (
+/obj/structure/shuttle_decoration/wall_plate/silver_foil{
+	dir = 1
+	},
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/primary_colour,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"jv" = (
+/obj/structure/shuttle_decoration/wall_plate/silver_foil,
+/obj/structure/shuttle_decoration/rcs/directional/north,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/secondary_colour,
+/area/shuttle/salvaged_shuttle)
+"jX" = (
+/obj/structure/titanium_structure,
+/obj/structure/shuttle_decoration/wall_plate/armor,
+/obj/structure/shuttle_decoration/eva_catwalks/directional/south,
+/obj/structure/railing/eva_handhold/directional/south,
+/turf/open/floor/plating/nanocarbon/exterior/black,
+/area/shuttle/salvaged_shuttle)
+"km" = (
+/obj/structure/shuttle_decoration/ladder/directional/north,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"kO" = (
+/turf/open/floor/catwalk_floor/colony_fabricator/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"kP" = (
+/obj/effect/spawner/random/salvage/interior_trash_n_debris,
+/turf/open/floor/iron/colony/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"kZ" = (
+/obj/structure/shuttle_decoration/wall_plate/armor,
+/obj/structure/shuttle_decoration/wall_plate/armor{
+	dir = 1
+	},
+/turf/closed/wall/mineral/aluminum,
+/area/shuttle/salvaged_shuttle)
+"ly" = (
+/obj/structure/shuttle_decoration/wall_plate/silver_foil,
+/obj/structure/shuttle_decoration/rcs/directional/north,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"lO" = (
+/obj/effect/spawner/random/salvage/crate_only/salvage,
+/obj/machinery/light/red/directional/east,
+/turf/open/floor/iron/colony/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"md" = (
+/obj/structure/lattice,
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/diagonal/primary_colour{
+	dir = 1
+	},
+/turf/template_noop,
+/area/shuttle/salvaged_shuttle)
+"mj" = (
+/obj/structure/lattice,
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/primary_colour{
+	dir = 1
+	},
+/obj/structure/shuttle_decoration/eva_catwalks/directional/north,
+/turf/template_noop,
+/area/shuttle/salvaged_shuttle)
+"nk" = (
+/turf/open/floor/iron/colony/texture/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"nN" = (
+/obj/structure/shuttle_decoration/extinguisher/directional/east,
+/turf/closed/wall/mineral/aluminum,
+/area/shuttle/salvaged_shuttle)
+"nP" = (
+/obj/structure/chair/comfy/shuttle{
+	dir = 1;
+	pixel_y = -5
+	},
+/obj/effect/spawner/random/salvage/interior_trash_n_debris,
+/turf/open/floor/iron/colony/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"oM" = (
+/obj/machinery/exoscanner/shuttle_part/radar_panel/directional/south,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/secondary_colour,
+/area/shuttle/salvaged_shuttle)
+"pa" = (
+/obj/structure/shuttle_decoration/ladder/directional/south,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"pH" = (
+/obj/structure/shuttle_decoration/eva_catwalks/directional/east,
+/obj/machinery/exoscanner/shuttle_part/radar_panel/directional/east,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"qp" = (
+/obj/structure/shuttle_decoration/wall_plate/silver_foil{
+	dir = 1
+	},
+/obj/structure/shuttle_decoration/wall_plate/silver_foil{
+	dir = 1
+	},
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/secondary_colour,
+/area/shuttle/salvaged_shuttle)
+"qY" = (
+/obj/effect/mapping_helpers/salvage_anchor/end/three,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"rb" = (
+/turf/open/floor/plating/aluminum,
+/area/shuttle/salvaged_shuttle)
+"rL" = (
+/obj/structure/shuttle_decoration/wall_plate/silver_foil,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/secondary_colour,
+/area/shuttle/salvaged_shuttle)
+"sj" = (
+/obj/structure/chair/comfy/shuttle{
+	dir = 4
+	},
+/obj/machinery/light/red/directional/south,
+/turf/open/floor/plating/nanocarbon/exterior/standard,
+/area/shuttle/salvaged_shuttle)
+"sl" = (
+/obj/structure/shuttle_decoration/wall_plate/plastamic{
+	dir = 8
+	},
+/turf/closed/wall/mineral/aluminum,
+/area/shuttle/salvaged_shuttle)
+"tC" = (
+/obj/effect/spawner/random/salvage/interior_trash_n_debris,
+/turf/open/floor/plating/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"uk" = (
+/obj/structure/railing/eva_handhold/directional/south,
+/obj/structure/railing/eva_handhold/directional/north,
+/obj/effect/mapping_helpers/salvage_anchor/seven,
+/obj/structure/marker_beacon/jade,
+/turf/open/floor/engine/anchor_jack,
+/area/shuttle/salvaged_shuttle)
+"uK" = (
+/obj/structure/shuttle_decoration/liquid_tank/battery,
+/obj/structure/shuttle_decoration/wall_plate/plastamic,
+/obj/machinery/light/red/directional/north,
+/turf/open/floor/plating/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"uL" = (
+/obj/structure/shuttle_decoration/wall_plate/silver_foil{
+	dir = 1
+	},
+/obj/structure/shuttle_decoration/rcs/directional/south,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/secondary_colour,
+/area/shuttle/salvaged_shuttle)
+"vn" = (
+/obj/machinery/light/red/directional/east,
+/turf/open/floor/catwalk_floor/colony_fabricator/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"vE" = (
+/obj/structure/railing/eva_handhold/directional/south,
+/obj/structure/railing/eva_handhold/directional/north,
+/obj/effect/mapping_helpers/salvage_anchor/two,
+/obj/structure/marker_beacon/jade,
+/turf/open/floor/engine/anchor_jack,
+/area/shuttle/salvaged_shuttle)
+"wC" = (
+/obj/structure/lattice,
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/diagonal/primary_colour{
+	dir = 9
+	},
+/turf/template_noop,
+/area/shuttle/salvaged_shuttle)
+"wJ" = (
+/obj/structure/shuttle_decoration/bullbar/directional/east,
+/obj/structure/shuttle_decoration/eva_catwalks/directional/east,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"xs" = (
+/obj/structure/shuttle_decoration/wall_plate/silver_foil{
+	dir = 1
+	},
+/obj/structure/shuttle_decoration/rcs/directional/south,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"xx" = (
+/obj/machinery/power/shuttle_engine/propulsion/salvage{
+	dir = 8
+	},
+/obj/structure/engine_covers/thruster_nozzle{
+	dir = 8
+	},
+/turf/open/floor/plating/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"yi" = (
+/turf/open/floor/plating/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"ym" = (
+/obj/structure/chair/comfy/shuttle{
+	pixel_y = 12
+	},
+/turf/open/floor/iron/colony/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"yu" = (
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"yx" = (
+/obj/structure/shuttle_decoration/eva_catwalks/directional/east,
+/obj/structure/shuttle_decoration/bullbar/directional/east,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"zd" = (
+/obj/structure/chair/comfy/shuttle{
+	dir = 1;
+	pixel_y = -5
+	},
+/turf/open/floor/iron/colony/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"zl" = (
+/obj/structure/lattice,
+/obj/structure/titanium_structure,
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/diagonal/primary_colour{
+	dir = 1
+	},
+/turf/template_noop,
+/area/shuttle/salvaged_shuttle)
+"zm" = (
+/obj/effect/spawner/random/salvage/container_or_crate_or_cargo/salvage,
+/turf/open/floor/plating/aluminum,
+/area/shuttle/salvaged_shuttle)
+"Aj" = (
+/obj/machinery/computer/old{
+	dir = 8
+	},
+/obj/machinery/light/red/directional/south,
+/turf/open/floor/iron/colony/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"Aq" = (
+/obj/structure/shuttle_decoration/wall_plate/plastamic{
+	dir = 4
+	},
+/turf/closed/wall/mineral/aluminum,
+/area/shuttle/salvaged_shuttle)
+"Av" = (
+/obj/machinery/exoscanner/shuttle_part/radio_dish/directional/east,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/black,
+/area/shuttle/salvaged_shuttle)
+"AC" = (
+/obj/machinery/exoscanner/shuttle_part/radar_panel/directional/north,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/secondary_colour,
+/area/shuttle/salvaged_shuttle)
+"Bw" = (
+/obj/effect/mapping_helpers/salvage_anchor/end/six,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"BC" = (
+/obj/structure/shuttle_decoration/headlight/directional/west,
+/turf/closed/wall/mineral/aluminum,
+/area/shuttle/salvaged_shuttle)
+"BV" = (
+/turf/open/floor/plating/nanocarbon/exterior/black,
+/area/shuttle/salvaged_shuttle)
+"BW" = (
+/obj/structure/lattice/catwalk,
+/obj/structure/shuttle_decoration/wall_plate/armor{
+	dir = 9
+	},
+/obj/structure/shuttle_decoration/eva_catwalks/directional/north,
+/turf/template_noop,
+/area/shuttle/salvaged_shuttle)
+"CC" = (
+/turf/open/floor/iron/colony/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"CU" = (
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/black,
+/area/shuttle/salvaged_shuttle)
+"Dm" = (
+/obj/structure/railing/eva_handhold/directional/south,
+/obj/structure/railing/eva_handhold/directional/north,
+/obj/effect/mapping_helpers/salvage_anchor/six,
+/obj/structure/marker_beacon/jade,
+/turf/open/floor/engine/anchor_jack,
+/area/shuttle/salvaged_shuttle)
+"Dp" = (
+/obj/structure/chair/comfy/shuttle{
+	dir = 4
+	},
+/turf/open/floor/iron/colony/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"Du" = (
+/obj/structure/shuttle_decoration/wall_plate/silver_foil,
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/primary_colour{
+	dir = 1
+	},
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"Dx" = (
+/obj/structure/window/fulltile/salvage_shuttle,
+/turf/open/floor/plating/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"Em" = (
+/obj/structure/railing/eva_handhold/directional/south,
+/obj/structure/railing/eva_handhold/directional/north,
+/obj/effect/mapping_helpers/salvage_anchor/three,
+/obj/structure/marker_beacon/jade,
+/turf/open/floor/engine/anchor_jack,
+/area/shuttle/salvaged_shuttle)
+"Ev" = (
+/obj/structure/railing/eva_handhold/directional/south,
+/obj/structure/railing/eva_handhold/directional/north,
+/obj/effect/mapping_helpers/salvage_anchor/four,
+/obj/structure/marker_beacon/jade,
+/turf/open/floor/engine/anchor_jack,
+/area/shuttle/salvaged_shuttle)
+"Ew" = (
+/turf/open/floor/plating/nanocarbon/exterior/standard,
+/area/shuttle/salvaged_shuttle)
+"Ex" = (
+/obj/structure/lattice,
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/diagonal/primary_colour,
+/turf/template_noop,
+/area/shuttle/salvaged_shuttle)
+"EQ" = (
+/obj/structure/lattice,
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/diagonal/primary_colour{
+	dir = 10
+	},
+/turf/template_noop,
+/area/shuttle/salvaged_shuttle)
+"Fg" = (
+/obj/structure/shuttle_decoration/console/directional/south,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"Fz" = (
+/obj/effect/spawner/random/salvage/interior_trash_n_debris,
+/turf/open/floor/iron/colony/texture/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"Gu" = (
+/obj/structure/lattice/catwalk,
+/obj/effect/spawner/random/salvage/interior_trash_n_debris,
+/obj/structure/shuttle_decoration/eva_catwalks/directional/south,
+/obj/structure/railing/eva_handhold/directional/south,
+/turf/template_noop,
+/area/shuttle/salvaged_shuttle)
+"Gy" = (
+/obj/structure/shuttle_decoration/liquid_tank/reactor,
+/turf/open/floor/plating/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"HG" = (
+/obj/effect/spawner/random/salvage/interior_trash_n_debris,
+/turf/open/floor/plating/aluminum,
+/area/shuttle/salvaged_shuttle)
+"HR" = (
+/obj/structure/railing/eva_handhold/directional/south,
+/obj/structure/railing/eva_handhold/directional/north,
+/obj/structure/marker_beacon/yellow,
+/turf/open/floor/engine/anchor_jack,
+/area/shuttle/salvaged_shuttle)
+"Ii" = (
+/obj/structure/railing/eva_handhold/directional/south,
+/obj/structure/railing/eva_handhold/directional/north,
+/obj/effect/mapping_helpers/salvage_anchor/one,
+/obj/structure/marker_beacon/jade,
+/turf/open/floor/engine/anchor_jack,
+/area/shuttle/salvaged_shuttle)
+"Im" = (
+/obj/structure/titanium_structure,
+/obj/structure/shuttle_decoration/wall_plate/armor{
+	dir = 1
+	},
+/obj/structure/shuttle_decoration/eva_catwalks/directional/north,
+/obj/structure/railing/eva_handhold/directional/north,
+/turf/open/floor/plating/nanocarbon/exterior/black,
+/area/shuttle/salvaged_shuttle)
+"IG" = (
+/obj/structure/shuttle_decoration/junction_box/directional/west,
+/turf/closed/wall/mineral/aluminum,
+/area/shuttle/salvaged_shuttle)
+"IM" = (
+/obj/effect/mapping_helpers/salvage_anchor/end/four,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/black,
+/area/shuttle/salvaged_shuttle)
+"IP" = (
+/obj/structure/shuttle_decoration/wall_plate/silver_foil,
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/secondary_colour{
+	dir = 1
+	},
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/secondary_colour,
+/area/shuttle/salvaged_shuttle)
+"IZ" = (
+/obj/structure/lattice/catwalk,
+/obj/structure/shuttle_decoration/eva_catwalks/directional/south,
+/turf/template_noop,
+/area/shuttle/salvaged_shuttle)
+"Jd" = (
+/obj/structure/shuttle_decoration/radiator/directional/south,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"Kk" = (
+/obj/structure/lattice,
+/obj/structure/shuttle_decoration/wall_plate/armor,
+/obj/structure/shuttle_decoration/eva_catwalks/directional/south,
+/turf/template_noop,
+/area/shuttle/salvaged_shuttle)
+"KV" = (
+/obj/structure/shuttle_decoration/wall_plate/armor{
+	dir = 1
+	},
+/obj/structure/shuttle_decoration/wall_plate/armor{
+	dir = 2
+	},
+/turf/closed/wall/mineral/aluminum,
+/area/shuttle/salvaged_shuttle)
+"LH" = (
+/obj/machinery/light/red/directional/north,
+/turf/open/floor/plating/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"LJ" = (
+/obj/effect/mapping_helpers/salvage_anchor/end/one,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"LV" = (
+/obj/effect/spawner/random/salvage/crate_only/salvage,
+/turf/open/floor/iron/colony/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"Md" = (
+/obj/machinery/light/red/directional/west,
+/turf/open/floor/plating/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"Mn" = (
+/obj/structure/lattice,
+/obj/structure/titanium_structure,
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/primary_colour{
+	dir = 1
+	},
+/obj/structure/shuttle_decoration/eva_catwalks/directional/north,
+/obj/structure/railing/eva_handhold/directional/north,
+/turf/template_noop,
+/area/shuttle/salvaged_shuttle)
+"MV" = (
+/obj/docking_port/mobile/salvage,
+/obj/structure/railing/eva_handhold/directional/south,
+/obj/structure/railing/eva_handhold/directional/north,
+/obj/structure/marker_beacon/yellow,
+/turf/open/floor/engine/anchor_jack,
+/area/shuttle/salvaged_shuttle)
+"No" = (
+/turf/open/floor/iron/colony/bolts/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"Nw" = (
+/obj/structure/lattice/catwalk,
+/obj/structure/shuttle_decoration/eva_catwalks/directional/north,
+/turf/template_noop,
+/area/shuttle/salvaged_shuttle)
+"NP" = (
+/obj/machinery/atmos_shield_gen/active{
+	dir = 1
+	},
+/turf/open/floor/plating/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"Oe" = (
+/obj/structure/mineral_door/manual_colony_door/shuttle/interior,
+/turf/open/floor/iron/colony/white/texture/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"Ow" = (
+/obj/structure/shuttle_decoration/wall_plate/silver_foil,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"Pp" = (
+/obj/structure/mineral_door/manual_colony_door/shuttle,
+/turf/open/floor/iron/colony/white/texture/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"Pq" = (
+/obj/structure/lattice,
+/obj/structure/shuttle_decoration/wall_plate/armor{
+	dir = 1
+	},
+/obj/structure/shuttle_decoration/eva_catwalks/directional/north,
+/turf/template_noop,
+/area/shuttle/salvaged_shuttle)
+"PS" = (
+/obj/structure/shuttle_decoration/wall_plate/silver_foil,
+/obj/structure/shuttle_decoration/extinguisher/directional/north,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"PU" = (
+/obj/structure/shuttle_decoration/liquid_tank/explosive/lithium,
+/turf/open/floor/plating/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"Qv" = (
+/obj/structure/shuttle_access_panel,
+/turf/open/floor/plating/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"Qx" = (
+/obj/structure/shuttle_decoration/liquid_tank/explosive/hydrazine,
+/turf/open/floor/plating/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"QB" = (
+/obj/machinery/atmos_shield_gen/active,
+/turf/open/floor/plating/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"QT" = (
+/obj/effect/spawner/random/salvage/interior_trash_n_debris,
+/turf/open/floor/iron/colony/bolts/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"Rr" = (
+/obj/machinery/computer/old{
+	dir = 8
+	},
+/turf/open/floor/iron/colony/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"RB" = (
+/obj/structure/shuttle_decoration/wall_plate/silver_foil{
+	dir = 1
+	},
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/secondary_colour,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/secondary_colour,
+/area/shuttle/salvaged_shuttle)
+"RM" = (
+/obj/structure/lattice,
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/primary_colour,
+/obj/structure/shuttle_decoration/eva_catwalks/directional/south,
+/turf/template_noop,
+/area/shuttle/salvaged_shuttle)
+"RS" = (
+/turf/closed/wall/mineral/nanocarbon/black,
+/area/shuttle/salvaged_shuttle)
+"Sd" = (
+/obj/effect/mapping_helpers/salvage_anchor/end/eight,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"Sv" = (
+/obj/structure/railing/eva_handhold/directional/south,
+/obj/structure/railing/eva_handhold/directional/north,
+/obj/effect/mapping_helpers/salvage_anchor/eight,
+/obj/structure/marker_beacon/jade,
+/turf/open/floor/engine/anchor_jack,
+/area/shuttle/salvaged_shuttle)
+"Tf" = (
+/obj/structure/shuttle_decoration/wall_plate/plastamic{
+	dir = 1
+	},
+/obj/structure/shuttle_decoration/liquid_tank/coolant,
+/turf/open/floor/plating/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"Tm" = (
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/secondary_colour,
+/area/shuttle/salvaged_shuttle)
+"UE" = (
+/obj/structure/chair/comfy/shuttle{
+	dir = 4
+	},
+/obj/machinery/light/red/directional/north,
+/turf/open/floor/plating/nanocarbon/exterior/standard,
+/area/shuttle/salvaged_shuttle)
+"UN" = (
+/obj/effect/spawner/random/salvage/nanocarbon_shards,
+/turf/open/floor/plating/aluminum,
+/area/shuttle/salvaged_shuttle)
+"UU" = (
+/turf/closed/wall/mineral/aluminum,
+/area/shuttle/salvaged_shuttle)
+"UW" = (
+/obj/structure/shuttle_decoration/rcs,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"VR" = (
+/obj/structure/lattice,
+/obj/structure/titanium_structure,
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/diagonal/primary_colour,
+/turf/template_noop,
+/area/shuttle/salvaged_shuttle)
+"Wc" = (
+/obj/machinery/power/shuttle_engine/heater/salvage{
+	dir = 8
+	},
+/obj/structure/engine_covers/heater_cover{
+	dir = 4
+	},
+/turf/open/floor/plating/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"Wg" = (
+/obj/effect/mapping_helpers/salvage_anchor/end/five,
+/turf/closed/wall/mineral/nanocarbon/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"WE" = (
+/obj/structure/shuttle_decoration/console/directional/north,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/secondary_colour,
+/area/shuttle/salvaged_shuttle)
+"Xt" = (
+/obj/effect/spawner/random/salvage/interior_trash_n_debris,
+/turf/open/floor/catwalk_floor/colony_fabricator/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"Yt" = (
+/obj/structure/shuttle_decoration/eva_catwalks/directional/east,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"YC" = (
+/turf/template_noop,
+/area/template_noop)
+"YJ" = (
+/obj/structure/shuttle_decoration/liquid_tank/explosive,
+/turf/open/floor/plating/nanocarbon,
+/area/shuttle/salvaged_shuttle)
+"YR" = (
+/obj/structure/shuttle_decoration/junction_box/directional/south,
+/obj/structure/shuttle_decoration/rcs/directional/north,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour,
+/area/shuttle/salvaged_shuttle)
+"Zq" = (
+/obj/structure/shuttle_decoration/wall_plate/silver_foil{
+	dir = 1
+	},
+/obj/effect/mapping_helpers/salvage_anchor/end/two,
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/secondary_colour,
+/area/shuttle/salvaged_shuttle)
+"Zy" = (
+/obj/structure/shuttle_decoration/console/directional/south,
+/turf/closed/wall/mineral/aluminum,
+/area/shuttle/salvaged_shuttle)
+
+(1,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+"}
+(2,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+"}
+(3,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+KV
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+KV
+YC
+YC
+YC
+YC
+YC
+"}
+(4,1,1) = {"
+YC
+Sv
+YC
+YC
+wC
+KV
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+KV
+EQ
+YC
+YC
+Ii
+YC
+"}
+(5,1,1) = {"
+YC
+YC
+YC
+YC
+zl
+yu
+gM
+YC
+YC
+YC
+YC
+YC
+BW
+yu
+VR
+YC
+YC
+YC
+YC
+"}
+(6,1,1) = {"
+YC
+YC
+YC
+YC
+md
+Sd
+jX
+YC
+YC
+YC
+YC
+YC
+Im
+LJ
+Ex
+YC
+YC
+YC
+YC
+"}
+(7,1,1) = {"
+YC
+YC
+YC
+YC
+yu
+yu
+Kk
+YC
+YC
+YC
+YC
+YC
+Pq
+yu
+yu
+YC
+YC
+YC
+YC
+"}
+(8,1,1) = {"
+YC
+HR
+YC
+YC
+hx
+UU
+fI
+YC
+YC
+YC
+YC
+YC
+Mn
+UU
+Jd
+YC
+YC
+HR
+YC
+"}
+(9,1,1) = {"
+YC
+YC
+YC
+YC
+hx
+UE
+RM
+YC
+YC
+YC
+YC
+YC
+mj
+sj
+Jd
+YC
+YC
+YC
+YC
+"}
+(10,1,1) = {"
+YC
+YC
+kZ
+YC
+pa
+Ew
+Gu
+YC
+YC
+YC
+YC
+YC
+bo
+Ew
+km
+YC
+kZ
+YC
+YC
+"}
+(11,1,1) = {"
+YC
+YC
+kZ
+BV
+Tm
+UU
+IZ
+YC
+YC
+YC
+YC
+YC
+Nw
+UU
+Tm
+BV
+kZ
+YC
+YC
+"}
+(12,1,1) = {"
+uk
+YC
+jv
+xx
+eB
+UU
+QB
+yi
+NP
+BC
+QB
+tC
+NP
+UU
+rL
+xx
+uL
+YC
+vE
+"}
+(13,1,1) = {"
+YC
+YC
+ik
+Wc
+iA
+Md
+HG
+zm
+rb
+Md
+rb
+UN
+zm
+Md
+Du
+Wc
+Zq
+YC
+YC
+"}
+(14,1,1) = {"
+YC
+YC
+Ow
+YJ
+iA
+No
+rb
+rb
+zm
+No
+UN
+zm
+rb
+No
+Du
+Qx
+iz
+YC
+YC
+"}
+(15,1,1) = {"
+YC
+YC
+PS
+LH
+Qv
+kO
+zm
+rb
+rb
+kO
+rb
+zm
+rb
+Xt
+Qv
+gX
+cC
+YC
+YC
+"}
+(16,1,1) = {"
+HR
+YC
+rL
+PU
+RB
+QT
+rb
+zm
+zm
+No
+zm
+rb
+zm
+No
+IP
+Gy
+qp
+YC
+MV
+"}
+(17,1,1) = {"
+YC
+YC
+rL
+ce
+RB
+yi
+zm
+zm
+rb
+iy
+HG
+rb
+zm
+iy
+IP
+ce
+eB
+YC
+YC
+"}
+(18,1,1) = {"
+YC
+YC
+ly
+cP
+iA
+iy
+yi
+tC
+IG
+nN
+Dx
+Dx
+Dx
+UU
+Ow
+cP
+xs
+YC
+YC
+"}
+(19,1,1) = {"
+YC
+YC
+Bw
+BV
+yu
+UU
+Pp
+UU
+Zy
+nP
+kP
+CC
+kP
+ym
+bv
+BV
+qY
+YC
+YC
+"}
+(20,1,1) = {"
+Dm
+YC
+YC
+YC
+Tm
+uK
+kO
+Tf
+UU
+LV
+nk
+Fz
+nk
+ym
+WE
+YC
+YC
+YC
+Em
+"}
+(21,1,1) = {"
+YC
+YC
+YC
+YC
+AC
+UU
+Pp
+UU
+UU
+LV
+nk
+lO
+ez
+LV
+oM
+YC
+YC
+YC
+YC
+"}
+(22,1,1) = {"
+YC
+YC
+YC
+YC
+Fg
+zd
+nk
+kP
+UU
+UU
+Oe
+UU
+IG
+Aq
+yu
+YC
+YC
+YC
+YC
+"}
+(23,1,1) = {"
+YC
+YC
+YC
+YC
+fe
+zd
+Xt
+Fz
+Oe
+kO
+vn
+kO
+Pp
+vn
+Pp
+YC
+YC
+YC
+YC
+"}
+(24,1,1) = {"
+YC
+HR
+YC
+YC
+YR
+kP
+kO
+Dp
+yu
+UU
+UU
+UU
+UU
+sl
+UW
+YC
+YC
+HR
+YC
+"}
+(25,1,1) = {"
+YC
+YC
+YC
+YC
+Fg
+zd
+CC
+Aj
+yu
+yx
+pH
+wJ
+Yt
+yu
+yu
+YC
+YC
+YC
+YC
+"}
+(26,1,1) = {"
+YC
+YC
+YC
+YC
+Wg
+yu
+kP
+Dp
+Dx
+YC
+YC
+YC
+YC
+CU
+IM
+YC
+YC
+YC
+YC
+"}
+(27,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+Dx
+CC
+Rr
+Dx
+YC
+YC
+YC
+YC
+Av
+RS
+YC
+YC
+YC
+YC
+"}
+(28,1,1) = {"
+YC
+dD
+YC
+YC
+YC
+yu
+Dx
+Dx
+yu
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+Ev
+YC
+"}
+(29,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+"}
+(30,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+"}
+(31,1,1) = {"
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+YC
+"}
diff --git a/code/__DEFINES/~doppler_defines/shipbreaking.dm b/code/__DEFINES/~doppler_defines/shipbreaking.dm
new file mode 100644
index 00000000000000..aef2f867fb7fe0
--- /dev/null
+++ b/code/__DEFINES/~doppler_defines/shipbreaking.dm
@@ -0,0 +1,16 @@
+/// Ship contains electrical hazards
+#define SALVAGE_HAZARD_ELECTRICAL "Electrical Hazards"
+/// Ship contains explosive fuels
+#define SALVAGE_HAZARD_FUEL "Explosive Fuels"
+/// Ship contains radioactive things
+#define SALVAGE_HAZARD_RADIATION "Above-Background Radioactivity"
+/// Ship contains a shipmind or equivalent
+#define SALVAGE_HAZARD_SHIPMIND "Potentially Active Shipmind"
+/// Ship contains coolant canisters
+#define SALVAGE_HAZARD_COOLANT "Superketone Coolant"
+/// Ship contains a reactor
+#define SALVAGE_HAZARD_REACTOR "Active Bloom Reactor"
+/// Ship has nonspecific cargo that might be dangerous
+#define SALVAGE_HAZARD_CARGO "Potentially Volatile Cargo"
+/// Ship has munitions on board
+#define SALVAGE_HAZARD_WEAPONS "Uncleared Weaponry"
diff --git a/code/__DEFINES/~doppler_defines/traits/declarations.dm b/code/__DEFINES/~doppler_defines/traits/declarations.dm
index 9e36c4dfb67d67..ff898fa5388782 100644
--- a/code/__DEFINES/~doppler_defines/traits/declarations.dm
+++ b/code/__DEFINES/~doppler_defines/traits/declarations.dm
@@ -22,3 +22,9 @@
 // makes it so held items float by their head
 #define TRAIT_FLOATING_HELD "held_items_float"
 
+/// Do non-items still get recycled for their custom materials
+#define TRAIT_RECYCLE_LIKE_ITEM "recycle_like_an_item"
+/// Do we get recolored based off of a salvage ship datum's primary colour
+#define TRAIT_SHIP_PRIMARY_COLOUR "salvage_ship_primary_colour"
+/// Do we get recolored based off of a salvage ship datum's secondary colour
+#define TRAIT_SHIP_SECONDARY_COLOUR "salvage_ship_secondary_colour"
diff --git a/code/_globalvars/traits/_traits.dm b/code/_globalvars/traits/_traits.dm
index 5af42aa522d57c..9e94d5a562475d 100644
--- a/code/_globalvars/traits/_traits.dm
+++ b/code/_globalvars/traits/_traits.dm
@@ -37,6 +37,8 @@ GLOBAL_LIST_INIT(traits_by_type, list(
 		"TRAIT_UNHITTABLE_BY_LASERS" = TRAIT_UNHITTABLE_BY_LASERS,
 		"TRAIT_UNLINKABLE_FISHING_SPOT" = TRAIT_UNLINKABLE_FISHING_SPOT,
 		"TRAIT_TETHER_ATTACHED" = TRAIT_TETHER_ATTACHED,
+		"TRAIT_SHIP_PRIMARY_COLOUR" = TRAIT_SHIP_PRIMARY_COLOUR, // DOPPLER EDIT ADDITION
+		"TRAIT_SHIP_SECONDARY_COLOUR" = TRAIT_SHIP_SECONDARY_COLOUR, // DOPPLER EDIT ADDITION
 	),
 	/atom/movable = list(
 		"TRAIT_ACTIVE_STORAGE" = TRAIT_ACTIVE_STORAGE,
@@ -660,7 +662,7 @@ GLOBAL_LIST_INIT(traits_by_type, list(
 		"TRAIT_CARP_GOODTOX" = TRAIT_CARP_GOODTOX, // DOPPLER EDIT ADDITION
 		"TRAIT_CHAMELEON_SKIN" = TRAIT_CHAMELEON_SKIN, // DOPPLER EDIT ADDITION
 		"TRAIT_FLOATING_HELD" = TRAIT_FLOATING_HELD, // DOPPLER EDIT ADDITION
-
+		"TRAIT_RECYCLE_LIKE_ITEM" = TRAIT_RECYCLE_LIKE_ITEM, // DOPPLER EDIT ADDITION
 	),
 	/mob/dead/observer = list(
 		"TRAIT_NO_OBSERVE" = TRAIT_NO_OBSERVE,
diff --git a/code/_globalvars/traits/admin_tooling.dm b/code/_globalvars/traits/admin_tooling.dm
index 4b57720d632130..85dca62c849103 100644
--- a/code/_globalvars/traits/admin_tooling.dm
+++ b/code/_globalvars/traits/admin_tooling.dm
@@ -8,6 +8,8 @@ GLOBAL_LIST_INIT(admin_visible_traits, list(
 		"TRAIT_KEEP_TOGETHER" = TRAIT_KEEP_TOGETHER,
 		"TRAIT_UNHITTABLE_BY_PROJECTILES" = TRAIT_UNHITTABLE_BY_PROJECTILES,
 		"TRAIT_UNHITTABLE_BY_LASERS" = TRAIT_UNHITTABLE_BY_LASERS,
+		"TRAIT_SHIP_PRIMARY_COLOUR" = TRAIT_SHIP_PRIMARY_COLOUR, // DOPPLER EDIT ADDITION
+		"TRAIT_SHIP_SECONDARY_COLOUR" = TRAIT_SHIP_SECONDARY_COLOUR, // DOPPLER EDIT ADDITION
 	),
 	/atom/movable = list(
 		"TRAIT_ASHSTORM_IMMUNE" = TRAIT_ASHSTORM_IMMUNE,
@@ -31,6 +33,7 @@ GLOBAL_LIST_INIT(admin_visible_traits, list(
 		"TRAIT_CONTRABAND" = TRAIT_CONTRABAND,
 		"TRAIT_DUCT_TAPE_UNREPAIRABLE" = TRAIT_DUCT_TAPE_UNREPAIRABLE,
 		"TRAIT_SPEED_POTIONED" = TRAIT_SPEED_POTIONED,
+		"TRAIT_RECYCLE_LIKE_ITEM" = TRAIT_RECYCLE_LIKE_ITEM, // DOPPLER EDIT ADDITION
 	),
 	/mob = list(
 		"TRAIT_ABDUCTOR_HUD" = TRAIT_ABDUCTOR_HUD,
diff --git a/code/game/machinery/recycler.dm b/code/game/machinery/recycler.dm
index dcbc5aa0e41049..1d705ceb90461a 100644
--- a/code/game/machinery/recycler.dm
+++ b/code/game/machinery/recycler.dm
@@ -225,7 +225,7 @@
 			break
 		var/full_power_usage = TRUE
 		var/obj/nom_obj = nom[i]
-		if (isitem(nom_obj))
+		if((isitem(nom_obj)) || (HAS_TRAIT(nom_obj, TRAIT_RECYCLE_LIKE_ITEM))) // DOPPLER EDIT CHANGE - Lets non-items get their custom materials recycled - ORIGINAL: if (isitem(nom_obj))
 			// Whether or not items consume full power depends on if they produced a material when recycled.
 			full_power_usage = recycle_item(nom_obj)
 		else
diff --git a/code/modules/asset_cache/assets/sheetmaterials.dm b/code/modules/asset_cache/assets/sheetmaterials.dm
index 408239edfd04e7..4abdb46d3a6f60 100644
--- a/code/modules/asset_cache/assets/sheetmaterials.dm
+++ b/code/modules/asset_cache/assets/sheetmaterials.dm
@@ -3,4 +3,5 @@
 
 /datum/asset/spritesheet_batched/sheetmaterials/create_spritesheets()
 	insert_all_icons("", 'icons/obj/stack_objects.dmi')
+	insert_all_icons("", 'modular_doppler/shipbreaking/icons/stacks.dmi') // DOPPLER EDIT ADDITION - SHIPBREAKING MATS DONT RENDER RIGHT
 
diff --git a/modular_doppler/colony_fabricator/code/power/rtg.dm b/modular_doppler/colony_fabricator/code/power/rtg.dm
index ddedc450e57de2..002cd7707278e6 100644
--- a/modular_doppler/colony_fabricator/code/power/rtg.dm
+++ b/modular_doppler/colony_fabricator/code/power/rtg.dm
@@ -21,6 +21,11 @@
 	AddElement(/datum/element/radioactive, threshold = RAD_VERY_LIGHT_INSULATION, minimum_exposure_time = NEBULA_RADIATION_MINIMUM_EXPOSURE_TIME)
 	AddElement(/datum/element/manufacturer_examine, COMPANY_FRONTIER)
 
+/obj/machinery/power/rtg/portable/wrench_act(mob/living/user, obj/item/tool)
+	. = ..()
+	default_unfasten_wrench(user, tool, time = 2 SECONDS)
+	return ITEM_INTERACT_SUCCESS
+
 /obj/machinery/power/rtg/portable/RefreshParts()
 	. = ..()
 	power_gen = initial(power_gen)
diff --git a/modular_doppler/epic_loot/code/loot_items/components.dm b/modular_doppler/epic_loot/code/loot_items/components.dm
index 116507d6923e8a..15f88279f23b9a 100644
--- a/modular_doppler/epic_loot/code/loot_items/components.dm
+++ b/modular_doppler/epic_loot/code/loot_items/components.dm
@@ -1,5 +1,5 @@
 /datum/export/epic_loot_components
-	cost = PAYCHECK_COMMAND
+	cost = 50
 	unit_name = "low value salvage"
 	export_types = list(
 		/obj/item/epic_loot/grenade_fuze,
@@ -10,7 +10,7 @@
 	)
 
 /datum/export/epic_loot_components_super
-	cost = PAYCHECK_COMMAND * 2
+	cost = 75
 	unit_name = "salvage"
 	export_types = list(
 		/obj/item/epic_loot/water_filter,
@@ -20,7 +20,7 @@
 	)
 
 /datum/export/epic_loot_components_super_super
-	cost = PAYCHECK_COMMAND * 3
+	cost = 125
 	unit_name = "high value salvage"
 	export_types = list(
 		/obj/item/epic_loot/thermal_camera,
diff --git a/modular_doppler/epic_loot/code/loot_items/electronics.dm b/modular_doppler/epic_loot/code/loot_items/electronics.dm
index c144fa7da23e06..b360f92c413781 100644
--- a/modular_doppler/epic_loot/code/loot_items/electronics.dm
+++ b/modular_doppler/epic_loot/code/loot_items/electronics.dm
@@ -1,5 +1,5 @@
 /datum/export/epic_loot_electronics
-	cost = PAYCHECK_COMMAND
+	cost = 50
 	unit_name = "electronic salvage"
 	export_types = list(
 		/obj/item/epic_loot/device_fan,
@@ -10,7 +10,7 @@
 	)
 
 /datum/export/epic_loot_electronics_super
-	cost = PAYCHECK_COMMAND * 2
+	cost = 75
 	unit_name = "high value electronic salvage"
 	export_types = list(
 		/obj/item/epic_loot/display,
diff --git a/modular_doppler/epic_loot/code/loot_items/medical.dm b/modular_doppler/epic_loot/code/loot_items/medical.dm
index d645cc4160f0a0..e2050c3b3f279d 100644
--- a/modular_doppler/epic_loot/code/loot_items/medical.dm
+++ b/modular_doppler/epic_loot/code/loot_items/medical.dm
@@ -1,5 +1,5 @@
 /datum/export/epic_loot_super_med_tools
-	cost = PAYCHECK_COMMAND * 5
+	cost = 250
 	unit_name = "high value medical salvage"
 	export_types = list(
 		/obj/item/epic_loot/vein_finder,
diff --git a/modular_doppler/epic_loot/code/loot_items/valuables.dm b/modular_doppler/epic_loot/code/loot_items/valuables.dm
index fb209e9a6485e3..2638ebf221961b 100644
--- a/modular_doppler/epic_loot/code/loot_items/valuables.dm
+++ b/modular_doppler/epic_loot/code/loot_items/valuables.dm
@@ -1,5 +1,5 @@
 /datum/export/epic_loot_valuables
-	cost = PAYCHECK_COMMAND * 3
+	cost = 150
 	unit_name = "recovered valuables"
 	export_types = list(
 		/obj/item/epic_loot/press_pass,
@@ -10,7 +10,7 @@
 	)
 
 /datum/export/epic_loot_valuables_super
-	cost = PAYCHECK_COMMAND * 4
+	cost = 200
 	unit_name = "recovered high valuables"
 	export_types = list(
 		/obj/item/epic_loot/ssd,
diff --git a/modular_doppler/shipbreaking/code/docking_clamp.dm b/modular_doppler/shipbreaking/code/docking_clamp.dm
new file mode 100644
index 00000000000000..362f74a7ed36fc
--- /dev/null
+++ b/modular_doppler/shipbreaking/code/docking_clamp.dm
@@ -0,0 +1,151 @@
+/obj/effect/temp_visual/telegraphing/long_duration
+	duration = 15 SECONDS
+
+// Circuit and RND
+
+/obj/item/circuitboard/machine/docking_clamp
+	name = "Salvage Clamp"
+	greyscale_colors = CIRCUIT_COLOR_ENGINEERING
+	build_path = /obj/machinery/docking_clamp
+
+/datum/design/board/salvage_docking_clamp
+	name = "Salvage Clamp"
+	desc = "A large clamp for holding shuttles in place without using their own power."
+	id = "salvage_docking_clamp"
+	build_path = /obj/item/circuitboard/machine/docking_clamp
+	category = list(
+		RND_CATEGORY_COMPUTER + RND_SUBCATEGORY_COMPUTER_ENGINEERING
+	)
+	departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING
+
+/datum/techweb_node/mining/New()
+	design_ids += list(
+		"salvage_docking_clamp",
+	)
+	return ..()
+
+// Everything else
+
+/obj/machinery/docking_clamp
+	name = "salvage clamp"
+	desc = "A large clamp for holding shuttles in place without using their own power."
+	icon = 'icons/obj/machines/floor.dmi'
+	icon_state = "mass_driver"
+	use_power = NO_POWER_USE
+	circuit = /obj/item/circuitboard/machine/docking_clamp
+	/// The docking port we use to connect ships with
+	var/obj/docking_port/stationary/salvage_dock/docking_port
+	/// The computer the clamp is linked to
+	var/obj/machinery/computer/salvage_bay_controller/controller
+
+/obj/machinery/docking_clamp/Initialize(mapload)
+	. = ..()
+	AddComponent(/datum/component/simple_rotation)
+
+/obj/machinery/docking_clamp/Destroy(force)
+	if(controller)
+		controller.delink_clamp()
+	if(docking_port)
+		QDEL_NULL(docking_port)
+	return ..()
+
+/obj/machinery/docking_clamp/examine(mob/user)
+	. = ..()
+	if(!controller)
+		. += span_notice("Use a [EXAMINE_HINT("multitool")] to connect this to a [EXAMINE_HINT("salvage bay control console")] before use.")
+	if(!docking_port)
+		. += span_notice("Interact with the clamp to set it up for docking, otherwise it will not function.")
+		. += span_notice("The clamp requires a large space in front of it, indicated by holograms on setup.")
+		. += span_notice("This space is [EXAMINE_HINT("[floor(/obj/docking_port/stationary/salvage_dock::width / 2)]")] tiles to either side of the clamp, and [EXAMINE_HINT("[/obj/docking_port/stationary/salvage_dock::height]")] tiles straight out.")
+
+/obj/machinery/docking_clamp/multitool_act(mob/living/user, obj/item/multitool/the_tool)
+	if(!panel_open)
+		balloon_alert(user, "panel closed!")
+		return ITEM_INTERACT_BLOCKING
+	the_tool.set_buffer(src)
+	balloon_alert(user, "saved to multitool buffer")
+	return ITEM_INTERACT_SUCCESS
+
+/obj/machinery/docking_clamp/wrench_act(mob/living/user, obj/item/tool)
+	if(!panel_open)
+		balloon_alert(user, "panel closed!")
+		return ITEM_INTERACT_BLOCKING
+	if(!default_unfasten_wrench(user, tool, 4 SECONDS))
+		return ITEM_INTERACT_BLOCKING
+	if(!anchored)
+		QDEL_NULL(docking_port)
+	return ITEM_INTERACT_SUCCESS
+
+/obj/machinery/docking_clamp/screwdriver_act(mob/user, obj/item/tool)
+	if(!default_deconstruction_screwdriver(user, icon_state, icon_state, tool))
+		return ITEM_INTERACT_BLOCKING
+	update_appearance()
+	return ITEM_INTERACT_SUCCESS
+
+/obj/machinery/docking_clamp/crowbar_act(mob/user, obj/item/tool)
+	if(!default_deconstruction_crowbar(tool))
+		return ITEM_INTERACT_BLOCKING
+	return ITEM_INTERACT_SUCCESS
+
+/obj/machinery/docking_clamp/interact(mob/user)
+	if(!can_interact(user))
+		return
+	if(!anchored)
+		balloon_alert(user, "not secured!")
+		return ..()
+	if(docking_port)
+		balloon_alert(user, "unsetting...")
+		if(!do_after(user, 3 SECONDS, src))
+			return ..()
+		QDEL_NULL(docking_port)
+		return ..()
+	balloon_alert(user, "setting clamp")
+	if(!do_after(user, 2 SECONDS, src))
+		return ..()
+	var/turf/dock_location = get_step(src, dir)
+	var/obj/docking_port/stationary/salvage_dock/temp_docking_port = new(dock_location, dir)
+	var/list/docking_turfs = temp_docking_port.return_turfs()
+	var/list/dock_bounds = temp_docking_port.return_coords()
+	var/list/overlappers = SSshuttle.get_dock_overlap(dock_bounds[1], dock_bounds[2], dock_bounds[3], dock_bounds[4], z)
+	if(length(overlappers)) // Overlappers list contains ourself as well
+		for(var/dock as anything in overlappers)
+			if(dock == temp_docking_port)
+				continue
+			balloon_alert(user, "intersecting nearby dock")
+			temp_docking_port.Destroy(TRUE)
+			return ..()
+	for(var/turf/checked_turf as anything in docking_turfs)
+		if(checked_turf.x <= 10 || checked_turf.y <= 10 || checked_turf.x >= world.maxx - 10 || checked_turf.y >= world.maxy - 10)
+			balloon_alert(user, "cannot place here")
+			new /obj/effect/temp_visual/telegraphing/long_duration(checked_turf)
+			temp_docking_port.Destroy(TRUE)
+			return ..()
+		var/area/turf_area = get_area(checked_turf)
+		if(!is_space_or_openspace(checked_turf) || checked_turf.is_blocked_turf(TRUE) || !is_area_nearby_station(turf_area))
+			balloon_alert(user, "dock not clear")
+			new /obj/effect/temp_visual/telegraphing/long_duration(checked_turf)
+			temp_docking_port.Destroy(TRUE)
+			return ..()
+		new /obj/effect/temp_visual/medical_holosign(checked_turf)
+	docking_port = temp_docking_port
+	return ..()
+
+/// Scans the docking port area for if living mobs are present inside, TRUE means a mob is in the way (or we have no port?)
+/obj/machinery/docking_clamp/proc/check_for_clear_bay()
+	if(!docking_port)
+		return TRUE // what ?? No
+	var/list/docking_turfs = docking_port.return_turfs()
+	for(var/turf/checked_turf as anything in docking_turfs)
+		for(var/mob/living/living_mob in checked_turf.contents)
+			return TRUE
+	return FALSE
+
+/obj/docking_port/stationary/salvage_dock
+	name = "Salvage Dock"
+	width = 31
+	height = 19
+	dwidth = 15
+
+/obj/docking_port/stationary/salvage_dock/Initialize(mapload, dock_direction)
+	setDir(dock_direction)
+	. = ..()
diff --git a/modular_doppler/shipbreaking/code/loot/cargo_sales.dm b/modular_doppler/shipbreaking/code/loot/cargo_sales.dm
new file mode 100644
index 00000000000000..03c3a690ee3310
--- /dev/null
+++ b/modular_doppler/shipbreaking/code/loot/cargo_sales.dm
@@ -0,0 +1,131 @@
+/datum/export/material/aluminum
+	cost = 35
+	material_id = /datum/material/aluminum
+	message = "cm3 of aluminum"
+
+/datum/export/material/nanocarbon
+	cost = 55
+	material_id = /datum/material/nanocarbon
+	message = "cm3 of nanocarbon"
+
+/datum/export/salvage_generic
+	cost = 75
+	unit_name = "general salvage"
+	export_types = list(
+		/obj/structure/engine_covers/thruster_nozzle,
+		/obj/structure/engine_covers/heater_cover,
+		/obj/structure/shuttle_decoration/rcs,
+		/obj/structure/shuttle_decoration/ladder,
+		/obj/structure/shuttle_decoration/ladder_black,
+		/obj/structure/shuttle_decoration/eva_catwalks,
+		/obj/structure/shuttle_decoration/radiator,
+		/obj/structure/shuttle_decoration/extinguisher,
+		/obj/structure/shuttle_decoration/bullbar,
+		/obj/structure/shuttle_decoration/headlight,
+		/obj/structure/shuttle_decoration/landing_engine,
+		/obj/structure/shuttle_decoration/aux_engine,
+		/obj/structure/shuttle_decoration/junction_box,
+	)
+
+/datum/export/shipping_containers
+	cost = 300
+	unit_name = "salvaged shipping containers"
+	export_types = list(
+		/obj/structure/closet/shipping_container,
+	)
+
+/datum/export/salvage_scanners
+	cost = 200
+	unit_name = "salvaged sensor equipment"
+	export_types = list(
+		/obj/machinery/exoscanner/shuttle_part/radar_panel,
+		/obj/machinery/exoscanner/shuttle_part/sensors_blister,
+		/obj/machinery/exoscanner/shuttle_part/open_sensors_blister,
+		/obj/machinery/exoscanner/shuttle_part/radio_dish,
+	)
+
+/datum/export/salvage_shipmind
+	cost = 600
+	unit_name = "recovered shipmind"
+	export_types = list(
+		/obj/structure/shuttle_decoration/liquid_tank/battery/shipmind,
+	)
+
+/datum/export/salvage_reactor
+	cost = 1000
+	unit_name = "salvaged bloom reactor"
+	export_types = list(
+		/obj/structure/shuttle_decoration/liquid_tank/reactor,
+	)
+
+/datum/export/salvage_reactor
+	cost = 1500
+	unit_name = "salvaged large bloom reactor"
+	export_types = list(
+		/obj/structure/shuttle_decoration/liquid_tank/reactor/super,
+	)
+
+/datum/export/salvage_engines
+	cost = 300
+	unit_name = "salvaged engines"
+	export_types = list(
+		/obj/machinery/power/shuttle_engine/propulsion/salvage,
+		/obj/machinery/power/shuttle_engine/heater/salvage,
+		/obj/structure/engine_covers/ion_plate,
+	)
+
+/datum/export/salvage_hazard
+	cost = 200
+	unit_name = "hazardous salvage"
+	export_types = list(
+		/obj/structure/shuttle_decoration/liquid_tank/battery,
+		/obj/structure/shuttle_decoration/liquid_tank/coolant,
+	)
+
+/datum/export/salvage_munitions
+	cost = 250
+	unit_name = "salvaged munitions"
+	export_types = list(
+		/obj/structure/shuttle_decoration/munition/missile,
+		/obj/structure/shuttle_decoration/munition/missile/orbital,
+		/obj/structure/shuttle_decoration/munition/missile/extraorbital,
+		/obj/structure/shuttle_decoration/munition/ciws,
+		/obj/structure/shuttle_decoration/munition/autocannon,
+		/obj/structure/shuttle_decoration/munition/chaff_flares,
+	)
+
+/datum/export/salvage_fuel
+	cost = 200
+	unit_name = "salvaged fuel tanks"
+	export_types = list(
+		/obj/structure/shuttle_decoration/liquid_tank/explosive,
+		/obj/structure/shuttle_decoration/liquid_tank/explosive/hydrazine,
+		/obj/structure/shuttle_decoration/liquid_tank/explosive/lithium,
+	)
+
+/datum/export/salvage_fuel_big
+	cost = 400
+	unit_name = "salvaged large tanks"
+	export_types = list(
+		/obj/structure/shuttle_decoration/liquid_tank/explosive/industrial,
+		/obj/structure/shuttle_decoration/liquid_tank/explosive/hydrazine/industrial,
+		/obj/structure/shuttle_decoration/liquid_tank/explosive/lithium/industrial,
+	)
+
+/datum/export/salvage_crates
+	cost = 150
+	unit_name = "salvaged shipping crates"
+	export_types = list(
+		/obj/structure/closet/crate/shuttle,
+		/obj/structure/closet/crate/shuttle/small,
+		/obj/structure/closet/crate/shuttle_hard,
+	)
+
+/datum/export/salvage_airlocks
+	cost = 100
+	unit_name = "salvaged airlocks"
+	export_types = list(
+		/obj/structure/hull_plating/airlock,
+		/obj/structure/hull_plating/airlock/interior,
+		/obj/structure/hull_plating/airlock/access_panel,
+	)
diff --git a/modular_doppler/shipbreaking/code/loot/item_spawners.dm b/modular_doppler/shipbreaking/code/loot/item_spawners.dm
new file mode 100644
index 00000000000000..331d12cb8cfe18
--- /dev/null
+++ b/modular_doppler/shipbreaking/code/loot/item_spawners.dm
@@ -0,0 +1,256 @@
+/obj/effect/spawner/random/salvage
+	abstract_type = /obj/effect/spawner/random/salvage
+	name = "shipbreaking random spawner"
+	icon = 'modular_doppler/shipbreaking/icons/spawners.dmi'
+	icon_state = null
+
+/obj/effect/spawner/random/salvage/munitions
+	name = "random munitions"
+	icon_state = "munitions"
+	loot = list(
+		/obj/structure/shuttle_decoration/munition/missile,
+		/obj/structure/shuttle_decoration/munition/missile/orbital,
+		/obj/structure/shuttle_decoration/munition/missile/extraorbital,
+		/obj/structure/shuttle_decoration/munition/ciws,
+		/obj/structure/shuttle_decoration/munition/autocannon,
+		/obj/structure/shuttle_decoration/munition/chaff_flares,
+	)
+
+/obj/effect/spawner/random/salvage/munitions/only_ammoboxes
+	name = "random ammo crates"
+	icon_state = "ammo"
+	loot = list(
+		/obj/structure/shuttle_decoration/munition/ciws,
+		/obj/structure/shuttle_decoration/munition/autocannon,
+		/obj/structure/shuttle_decoration/munition/chaff_flares,
+	)
+
+/obj/effect/spawner/random/salvage/munitions/only_missiles
+	name = "random missiles"
+	icon_state = "missiles"
+	loot = list(
+		/obj/structure/shuttle_decoration/munition/missile,
+		/obj/structure/shuttle_decoration/munition/missile/orbital,
+		/obj/structure/shuttle_decoration/munition/missile/extraorbital,
+	)
+
+/obj/effect/spawner/random/salvage/interior_trash_n_debris
+	name = "random shuttle interior trash and debris"
+	icon_state = "interior_debris"
+	spawn_random_offset = TRUE
+	loot = list(
+		/obj/effect/spawner/random/salvage/shuttle_maintenance = 2,
+		/obj/effect/spawner/random/trash/deluxe_garbage/no_mobs_ever = 4,
+		/obj/effect/spawner/random/engineering/tool = 2,
+		/obj/effect/spawner/random/bureaucracy/pen = 2,
+		/obj/effect/spawner/random/bureaucracy/paper = 2,
+		/obj/effect/spawner/random/engineering/flashlight = 2,
+		/obj/effect/spawner/random/engineering/toolbox = 1,
+		/obj/effect/spawner/random/contraband = 1,
+		/obj/effect/spawner/random/entertainment/coin = 1,
+		/obj/effect/spawner/random/maintenance/no_decals = 2,
+	)
+
+/obj/effect/spawner/random/salvage/shuttle_maintenance
+	name = "random shuttle maintenance items"
+	icon_state = "maint_loot"
+	loot = list(
+		/obj/item/epic_loot/water_filter = 2,
+		/obj/item/epic_loot/thermometer = 2,
+		/obj/item/epic_loot/nail_box = 2,
+		/obj/item/epic_loot/cold_weld = 2,
+		/obj/item/epic_loot/electric_motor = 2,
+		/obj/item/epic_loot/current_converter = 2,
+		/obj/item/epic_loot/signal_amp = 2,
+		/obj/item/epic_loot/thermal_camera = 2,
+		/obj/item/epic_loot/fuel_conditioner = 2,
+		/obj/item/epic_loot/shuttle_gyro = 1,
+		/obj/item/epic_loot/phased_array = 1,
+		/obj/item/epic_loot/shuttle_battery = 1,
+		/obj/item/epic_loot/device_fan = 2,
+		/obj/item/epic_loot/display = 1,
+		/obj/item/epic_loot/display_broken = 2,
+		/obj/item/epic_loot/graphics = 1,
+		/obj/item/epic_loot/military_circuit = 1,
+		/obj/item/epic_loot/civilian_circuit = 2,
+		/obj/item/epic_loot/processor = 1,
+		/obj/item/epic_loot/power_supply = 2,
+		/obj/item/epic_loot/disk_drive = 2,
+		/obj/item/epic_loot/ssd = 1,
+		/obj/item/epic_loot/hdd = 2,
+	)
+
+/obj/effect/spawner/random/salvage/shuttle_maintenance/random_offset
+	spawn_random_offset = TRUE
+
+/obj/effect/spawner/random/food_or_drink/seed_rare/one
+	spawn_loot_count = 1
+
+/obj/effect/spawner/random/food_or_drink/plant_produce/one
+	spawn_loot_count = 1
+
+/obj/effect/spawner/random/food_or_drink/seed/one
+	spawn_loot_count = 1
+
+/obj/effect/spawner/random/food_or_drink/seed_flowers/one
+	spawn_all_loot = FALSE
+
+/obj/effect/spawner/random/salvage/cargo_machine
+	name = "random cargo machine"
+	icon_state = "machine"
+	loot = list(
+		/obj/machinery/portable_atmospherics/pump,
+		/obj/machinery/portable_atmospherics/scrubber,
+		/obj/machinery/portable_atmospherics/scrubber/huge/movable/cargo,
+		/obj/machinery/power/port_gen/pacman/solid_fuel,
+		/obj/machinery/power/rtg/portable,
+		/obj/machinery/power/portagrav,
+		/obj/machinery/chem_dispenser/big_drink_machine/unanchored,
+		/obj/machinery/chem_dispenser/spice_machine/unanchored,
+		/obj/machinery/chem_dispenser,
+		/obj/machinery/chem_dispenser/mutagensaltpeter,
+		/obj/machinery/coffeemaker/impressa,
+		/obj/machinery/dish_drive,
+		/obj/machinery/electrolyzer,
+		/obj/machinery/electrolyzer/co2_cracker,
+		/obj/machinery/exoscanner,
+		/obj/machinery/fishing_portal_generator,
+		/obj/machinery/fishing_portal_generator/full,
+		/obj/machinery/food_cart,
+		/obj/machinery/icecream_vat,
+		/obj/machinery/hydroponics/constructable,
+		/obj/machinery/hydroponics/constructable/fullupgrade,
+		/obj/machinery/microwave/engineering/cell_included/unanchored,
+		/obj/machinery/photocopier/gratis/prebuilt,
+		/obj/machinery/smesbank/super/full,
+		/obj/machinery/smoke_machine,
+		/obj/machinery/space_heater,
+		/obj/machinery/washing_machine,
+		/obj/effect/spawner/random/engineering/atmospherics_portable,
+		/obj/effect/spawner/random/engineering/canister,
+		/obj/effect/spawner/random/engineering/canister/lots_of_them,
+		/obj/effect/spawner/random/engineering/tank,
+		/obj/effect/spawner/random/structure/tank_holder,
+	)
+
+/obj/effect/spawner/random/salvage/cargo_machine/medical_or_research
+	loot = list(
+		/obj/machinery/power/port_gen/pacman/solid_fuel,
+		/obj/machinery/power/rtg/portable,
+		/obj/machinery/power/portagrav,
+		/obj/machinery/chem_dispenser,
+		/obj/machinery/chem_dispenser/mutagensaltpeter,
+		/obj/machinery/coffeemaker/impressa,
+		/obj/machinery/electrolyzer,
+		/obj/machinery/electrolyzer/co2_cracker,
+		/obj/machinery/exoscanner,
+		/obj/machinery/hydroponics/constructable,
+		/obj/machinery/hydroponics/constructable/fullupgrade,
+		/obj/machinery/chem_master,
+		/obj/machinery/chem_heater/withbuffer,
+		/obj/machinery/chem_mass_spec,
+		/obj/effect/spawner/random/engineering/canister/lots_of_them,
+	)
+
+/obj/effect/spawner/random/salvage/cargo_machine/construction
+	loot = list(
+		/obj/machinery/portable_atmospherics/pump,
+		/obj/machinery/portable_atmospherics/scrubber,
+		/obj/machinery/portable_atmospherics/scrubber/huge/movable/cargo,
+		/obj/machinery/power/rtg/portable,
+		/obj/machinery/electrolyzer,
+		/obj/machinery/electrolyzer/co2_cracker,
+		/obj/machinery/smesbank/super/full,
+		/obj/machinery/smoke_machine,
+		/obj/machinery/space_heater,
+		/obj/structure/girder/displaced,
+		/obj/effect/spawner/random/engineering/atmospherics_portable,
+		/obj/effect/spawner/random/engineering/canister/lots_of_them,
+		/obj/effect/spawner/random/engineering/tank,
+		/obj/effect/spawner/random/structure/tank_holder,
+	)
+
+/obj/effect/spawner/random/salvage/civilian_supply
+	loot = list(
+		/obj/machinery/portable_atmospherics/pump,
+		/obj/machinery/portable_atmospherics/scrubber,
+		/obj/machinery/power/port_gen/pacman/solid_fuel,
+		/obj/machinery/chem_dispenser/big_drink_machine/unanchored,
+		/obj/machinery/chem_dispenser/spice_machine/unanchored,
+		/obj/machinery/coffeemaker/impressa,
+		/obj/machinery/dish_drive,
+		/obj/machinery/electrolyzer/co2_cracker,
+		/obj/machinery/fishing_portal_generator,
+		/obj/machinery/fishing_portal_generator/full,
+		/obj/machinery/food_cart,
+		/obj/machinery/icecream_vat,
+		/obj/machinery/hydroponics/constructable,
+		/obj/machinery/hydroponics/constructable/fullupgrade,
+		/obj/machinery/microwave/engineering/cell_included/unanchored,
+		/obj/machinery/photocopier/gratis/prebuilt,
+		/obj/machinery/space_heater,
+		/obj/machinery/washing_machine,
+		/obj/effect/spawner/random/engineering/tank,
+	)
+
+/obj/effect/spawner/random/salvage/cargo_machine/military
+	loot = list(
+		/obj/machinery/power/port_gen/pacman/solid_fuel = 1,
+		/obj/machinery/power/rtg/portable = 1,
+		/obj/machinery/electrolyzer/co2_cracker = 1,
+		/obj/machinery/exoscanner = 1,
+		/obj/effect/spawner/random/salvage/munitions = 2,
+	)
+
+/obj/effect/spawner/random/salvage/cargo_machine/scrap
+	loot = list(
+		/obj/structure/hull_plating/airlock,
+		/obj/structure/hull_plating/airlock/interior,
+		/obj/structure/hull_plating/airlock/access_panel,
+		/obj/structure/hull_plating/nanocarbon,
+		/obj/structure/hull_plating/nanocarbon/floor,
+		/obj/structure/hull_plating/gold_foil,
+		/obj/structure/hull_plating/silver_foil,
+		/obj/structure/hull_plating/plastamic_sheets,
+		/obj/structure/hull_plating/armor_panels,
+		/obj/structure/hull_plating/aluminum,
+		/obj/structure/hull_plating/aluminum/floor,
+		/obj/effect/spawner/random/salvage/nanocarbon_shards,
+		/obj/structure/girder/displaced,
+		/obj/effect/spawner/random/engineering/canister,
+		/obj/effect/spawner/random/engineering/tank,
+		/obj/effect/spawner/random/engineering/canister/lots_of_them,
+		/obj/effect/spawner/random/structure/tank_holder,
+	)
+
+/obj/effect/spawner/random/salvage/nanocarbon_shards
+	name = "random nanocarbon shards"
+	icon_state = "maint_loot"
+	spawn_loot_count = 5
+	spawn_random_offset = TRUE
+	loot = list(
+		/obj/item/nanocarbon_shard,
+	)
+
+/obj/effect/spawner/random/engineering/canister/lots_of_them
+	loot = list(
+		/obj/machinery/portable_atmospherics/canister/air,
+		/obj/machinery/portable_atmospherics/canister/anesthetic_mix,
+		/obj/machinery/portable_atmospherics/canister/bz,
+		/obj/machinery/portable_atmospherics/canister/carbon_dioxide,
+		/obj/machinery/portable_atmospherics/canister/freon,
+		/obj/machinery/portable_atmospherics/canister/hydrogen,
+		/obj/machinery/portable_atmospherics/canister/helium,
+		/obj/machinery/portable_atmospherics/canister/nitrogen,
+		/obj/machinery/portable_atmospherics/canister/nitrous_oxide,
+		/obj/machinery/portable_atmospherics/canister/oxygen,
+		/obj/machinery/portable_atmospherics/canister/plasma,
+		/obj/machinery/portable_atmospherics/canister/water_vapor,
+	)
+
+/obj/effect/spawner/random/trash/deluxe_garbage/no_mobs_ever
+
+/obj/effect/spawner/random/trash/deluxe_garbage/no_mobs_ever/Initialize(mapload)
+	loot -= /mob/living/basic/mouse
+	loot -= /mob/living/basic/snail
+	return ..()
diff --git a/modular_doppler/shipbreaking/code/loot/military.dm b/modular_doppler/shipbreaking/code/loot/military.dm
new file mode 100644
index 00000000000000..ece311af02b682
--- /dev/null
+++ b/modular_doppler/shipbreaking/code/loot/military.dm
@@ -0,0 +1,16 @@
+/obj/effect/spawner/random/salvage/salvaged_gun
+	name = "random salvage shuttle gun"
+	icon_state = "armory"
+	spawn_random_offset = FALSE
+	loot = list(
+		/obj/item/gun/ballistic/rifle/boltaction/surplus = 2,
+		/obj/item/gun/ballistic/rifle/boltaction = 2,
+		/obj/item/gun/ballistic/rifle/boltaction/prime = 1,
+		/obj/item/gun/ballistic/rifle/osako = 2,
+		/obj/item/gun/ballistic/rifle/crash = 2,
+		/obj/item/gun/ballistic/automatic/marcielle = 2,
+		/obj/item/gun/ballistic/automatic/marcielle/sport = 1,
+	)
+
+/obj/effect/spawner/random/salvage/salvaged_gun/random_offset
+	spawn_random_offset = TRUE
diff --git a/modular_doppler/shipbreaking/code/loot/random_cargo.dm b/modular_doppler/shipbreaking/code/loot/random_cargo.dm
new file mode 100644
index 00000000000000..5ef20538c9796c
--- /dev/null
+++ b/modular_doppler/shipbreaking/code/loot/random_cargo.dm
@@ -0,0 +1,241 @@
+// Only random shipping containers
+
+/obj/effect/spawner/random/salvage/container
+	name = "random shipping container"
+	icon_state = "container"
+	loot = list(
+		/obj/structure/closet/shipping_container/secured/random_loot,
+	)
+
+/obj/effect/spawner/random/salvage/container/medical_or_research
+	loot = list(
+		/obj/structure/closet/shipping_container/secured/random_loot/medical_or_research,
+	)
+
+/obj/effect/spawner/random/salvage/container/construction
+	loot = list(
+		/obj/structure/closet/shipping_container/secured/random_loot/construction,
+	)
+
+/obj/effect/spawner/random/salvage/container/civilian_supply
+	loot = list(
+		/obj/structure/closet/shipping_container/secured/random_loot/civilian_supply,
+	)
+
+/obj/effect/spawner/random/salvage/container/military
+	loot = list(
+		/obj/structure/closet/shipping_container/secured/random_loot/military,
+	)
+
+/obj/effect/spawner/random/salvage/container/salvage
+	loot = list(
+		/obj/structure/closet/shipping_container/secured/random_loot/salvage,
+	)
+
+// Random crates and shipping containers
+
+/obj/effect/spawner/random/salvage/container_or_crate
+	name = "random crate or shipping container"
+	icon_state = "container"
+	loot = list(
+		/obj/structure/closet/shipping_container/secured/random_loot,
+		/obj/structure/closet/crate/shuttle_hard/secured/random_loot,
+		/obj/structure/closet/crate/shuttle/secured/random_loot,
+		/obj/structure/closet/crate/shuttle/small/secured/random_loot,
+	)
+
+/obj/effect/spawner/random/salvage/container_or_crate/medical_or_research
+	loot = list(
+		/obj/structure/closet/shipping_container/secured/random_loot/medical_or_research,
+		/obj/structure/closet/crate/shuttle_hard/secured/random_loot/medical_or_research,
+		/obj/structure/closet/crate/shuttle/secured/random_loot/medical_or_research,
+		/obj/structure/closet/crate/shuttle/small/secured/random_loot/medical_or_research,
+	)
+
+/obj/effect/spawner/random/salvage/container_or_crate/construction
+	loot = list(
+		/obj/structure/closet/shipping_container/secured/random_loot/construction,
+		/obj/structure/closet/crate/shuttle_hard/secured/random_loot/construction,
+		/obj/structure/closet/crate/shuttle/secured/random_loot/construction,
+		/obj/structure/closet/crate/shuttle/small/secured/random_loot/construction,
+	)
+
+/obj/effect/spawner/random/salvage/container_or_crate/civilian_supply
+	loot = list(
+		/obj/structure/closet/shipping_container/secured/random_loot/civilian_supply,
+		/obj/structure/closet/crate/shuttle_hard/secured/random_loot/civilian_supply,
+		/obj/structure/closet/crate/shuttle/secured/random_loot/civilian_supply,
+		/obj/structure/closet/crate/shuttle/small/secured/random_loot/civilian_supply,
+	)
+
+/obj/effect/spawner/random/salvage/container_or_crate/military
+	loot = list(
+		/obj/structure/closet/shipping_container/secured/random_loot/military,
+		/obj/structure/closet/crate/shuttle_hard/secured/random_loot/military,
+		/obj/structure/closet/crate/shuttle/secured/random_loot/military,
+		/obj/structure/closet/crate/shuttle/small/secured/random_loot/military,
+	)
+
+/obj/effect/spawner/random/salvage/container_or_crate/salvage
+	loot = list(
+		/obj/structure/closet/shipping_container/secured/random_loot/salvage,
+		/obj/structure/closet/crate/shuttle_hard/secured/random_loot/salvage,
+		/obj/structure/closet/crate/shuttle/secured/random_loot/salvage,
+		/obj/structure/closet/crate/shuttle/small/secured/random_loot/salvage,
+	)
+
+// Only random crates without shipping containers
+
+/obj/effect/spawner/random/salvage/crate_only
+	name = "random crate"
+	icon_state = "crate"
+	loot = list(
+		/obj/structure/closet/crate/shuttle_hard/secured/random_loot,
+		/obj/structure/closet/crate/shuttle/secured/random_loot,
+		/obj/structure/closet/crate/shuttle/small/secured/random_loot,
+	)
+
+/obj/effect/spawner/random/salvage/crate_only/medical_or_research
+	loot = list(
+		/obj/structure/closet/crate/shuttle_hard/secured/random_loot/medical_or_research,
+		/obj/structure/closet/crate/shuttle/secured/random_loot/medical_or_research,
+		/obj/structure/closet/crate/shuttle/small/secured/random_loot/medical_or_research,
+	)
+
+/obj/effect/spawner/random/salvage/crate_only/construction
+	loot = list(
+		/obj/structure/closet/crate/shuttle_hard/secured/random_loot/construction,
+		/obj/structure/closet/crate/shuttle/secured/random_loot/construction,
+		/obj/structure/closet/crate/shuttle/small/secured/random_loot/construction,
+	)
+
+/obj/effect/spawner/random/salvage/crate_only/civilian_supply
+	loot = list(
+		/obj/structure/closet/crate/shuttle_hard/secured/random_loot/civilian_supply,
+		/obj/structure/closet/crate/shuttle/secured/random_loot/civilian_supply,
+		/obj/structure/closet/crate/shuttle/small/secured/random_loot/civilian_supply,
+	)
+
+/obj/effect/spawner/random/salvage/crate_only/military
+	loot = list(
+		/obj/structure/closet/crate/shuttle_hard/secured/random_loot/military,
+		/obj/structure/closet/crate/shuttle/secured/random_loot/military,
+		/obj/structure/closet/crate/shuttle/small/secured/random_loot/military,
+	)
+
+/obj/effect/spawner/random/salvage/crate_only/salvage
+	loot = list(
+		/obj/structure/closet/crate/shuttle_hard/secured/random_loot/salvage,
+		/obj/structure/closet/crate/shuttle/secured/random_loot/salvage,
+		/obj/structure/closet/crate/shuttle/small/secured/random_loot/salvage,
+	)
+
+// Random crates and shipping containers and misc. cargo
+
+/obj/effect/spawner/random/salvage/container_or_crate_or_cargo
+	name = "random crate or shipping container or cargo"
+	icon_state = "container"
+	loot = list(
+		/obj/structure/closet/shipping_container/secured/random_loot,
+		/obj/structure/closet/crate/shuttle_hard/secured/random_loot,
+		/obj/structure/closet/crate/shuttle/secured/random_loot,
+		/obj/structure/closet/crate/shuttle/small/secured/random_loot,
+		/obj/effect/spawner/random/salvage/cargo_machine,
+	)
+
+/obj/effect/spawner/random/salvage/container_or_crate_or_cargo/medical_or_research
+	loot = list(
+		/obj/structure/closet/shipping_container/secured/random_loot/medical_or_research,
+		/obj/structure/closet/crate/shuttle_hard/secured/random_loot/medical_or_research,
+		/obj/structure/closet/crate/shuttle/secured/random_loot/medical_or_research,
+		/obj/structure/closet/crate/shuttle/small/secured/random_loot/medical_or_research,
+		/obj/effect/spawner/random/salvage/cargo_machine/medical_or_research,
+	)
+
+/obj/effect/spawner/random/salvage/container_or_crate_or_cargo/construction
+	loot = list(
+		/obj/structure/closet/shipping_container/secured/random_loot/construction,
+		/obj/structure/closet/crate/shuttle_hard/secured/random_loot/construction,
+		/obj/structure/closet/crate/shuttle/secured/random_loot/construction,
+		/obj/structure/closet/crate/shuttle/small/secured/random_loot/construction,
+		/obj/effect/spawner/random/salvage/cargo_machine/construction,
+	)
+
+/obj/effect/spawner/random/salvage/container_or_crate_or_cargo/civilian_supply
+	loot = list(
+		/obj/structure/closet/shipping_container/secured/random_loot/civilian_supply,
+		/obj/structure/closet/crate/shuttle_hard/secured/random_loot/civilian_supply,
+		/obj/structure/closet/crate/shuttle/secured/random_loot/civilian_supply,
+		/obj/structure/closet/crate/shuttle/small/secured/random_loot/civilian_supply,
+		/obj/effect/spawner/random/salvage/civilian_supply,
+	)
+
+/obj/effect/spawner/random/salvage/container_or_crate_or_cargo/military
+	loot = list(
+		/obj/structure/closet/shipping_container/secured/random_loot/military,
+		/obj/structure/closet/crate/shuttle_hard/secured/random_loot/military,
+		/obj/structure/closet/crate/shuttle/secured/random_loot/military,
+		/obj/structure/closet/crate/shuttle/small/secured/random_loot/military,
+		/obj/effect/spawner/random/salvage/cargo_machine/military,
+	)
+
+/obj/effect/spawner/random/salvage/container_or_crate_or_cargo/salvage
+	loot = list(
+		/obj/structure/closet/shipping_container/secured/random_loot/salvage,
+		/obj/structure/closet/crate/shuttle_hard/secured/random_loot/salvage,
+		/obj/structure/closet/crate/shuttle/secured/random_loot/salvage,
+		/obj/structure/closet/crate/shuttle/small/secured/random_loot/salvage,
+		/obj/effect/spawner/random/salvage/cargo_machine/scrap,
+	)
+
+// Random crates and misc. cargo, no shipping containers
+
+/obj/effect/spawner/random/salvage/crate_or_cargo
+	name = "random crate or cargo"
+	icon_state = "crate"
+	loot = list(
+		/obj/structure/closet/crate/shuttle_hard/secured/random_loot,
+		/obj/structure/closet/crate/shuttle/secured/random_loot,
+		/obj/structure/closet/crate/shuttle/small/secured/random_loot,
+		/obj/effect/spawner/random/salvage/cargo_machine,
+	)
+
+/obj/effect/spawner/random/salvage/crate_or_cargo/medical_or_research
+	loot = list(
+		/obj/structure/closet/crate/shuttle_hard/secured/random_loot/medical_or_research,
+		/obj/structure/closet/crate/shuttle/secured/random_loot/medical_or_research,
+		/obj/structure/closet/crate/shuttle/small/secured/random_loot/medical_or_research,
+		/obj/effect/spawner/random/salvage/cargo_machine/medical_or_research,
+	)
+
+/obj/effect/spawner/random/salvage/crate_or_cargo/construction
+	loot = list(
+		/obj/structure/closet/crate/shuttle_hard/secured/random_loot/construction,
+		/obj/structure/closet/crate/shuttle/secured/random_loot/construction,
+		/obj/structure/closet/crate/shuttle/small/secured/random_loot/construction,
+		/obj/effect/spawner/random/salvage/cargo_machine/construction,
+	)
+
+/obj/effect/spawner/random/salvage/crate_or_cargo/civilian_supply
+	loot = list(
+		/obj/structure/closet/crate/shuttle_hard/secured/random_loot/civilian_supply,
+		/obj/structure/closet/crate/shuttle/secured/random_loot/civilian_supply,
+		/obj/structure/closet/crate/shuttle/small/secured/random_loot/civilian_supply,
+		/obj/effect/spawner/random/salvage/civilian_supply,
+	)
+
+/obj/effect/spawner/random/salvage/crate_or_cargo/military
+	loot = list(
+		/obj/structure/closet/crate/shuttle_hard/secured/random_loot/military,
+		/obj/structure/closet/crate/shuttle/secured/random_loot/military,
+		/obj/structure/closet/crate/shuttle/small/secured/random_loot/military,
+		/obj/effect/spawner/random/salvage/cargo_machine/military,
+	)
+
+/obj/effect/spawner/random/salvage/crate_or_cargo/salvage
+	loot = list(
+		/obj/structure/closet/crate/shuttle_hard/secured/random_loot/salvage,
+		/obj/structure/closet/crate/shuttle/secured/random_loot/salvage,
+		/obj/structure/closet/crate/shuttle/small/secured/random_loot/salvage,
+		/obj/effect/spawner/random/salvage/cargo_machine/scrap,
+	)
diff --git a/modular_doppler/shipbreaking/code/loot/random_crate_items.dm b/modular_doppler/shipbreaking/code/loot/random_crate_items.dm
new file mode 100644
index 00000000000000..f2712581169edd
--- /dev/null
+++ b/modular_doppler/shipbreaking/code/loot/random_crate_items.dm
@@ -0,0 +1,429 @@
+/// Create subtypes for the different sizes of crate for loot spawners
+#define SALVAGE_CRATE_LOOT_SPAWNER(path) ##path/small {\
+	spawn_loot_count = 3; \
+} \
+##path/medium {\
+	spawn_loot_count = 5; \
+} \
+##path/large {\
+	spawn_loot_count = 7; \
+} \
+##path/shipping {\
+	spawn_loot_count = 10; \
+}
+
+// Crates
+
+/obj/structure/closet/shipping_container/secured/random_loot
+	/// List of spawners we can choose from
+	var/list/loot_spawners = list(
+		/obj/effect/spawner/random/salvage/crate_loot_spawner/bedding/shipping,
+		/obj/effect/spawner/random/salvage/crate_loot_spawner/garbage_day/shipping,
+		/obj/effect/spawner/random/salvage/crate_loot_spawner/food/shipping,
+		/obj/effect/spawner/random/salvage/crate_loot_spawner/produce/shipping,
+		/obj/effect/spawner/random/salvage/crate_loot_spawner/seeds/shipping,
+		/obj/effect/spawner/random/salvage/crate_loot_spawner/booze/shipping,
+		/obj/effect/spawner/random/salvage/crate_loot_spawner/components/shipping,
+		/obj/effect/spawner/random/salvage/crate_loot_spawner/engineering/shipping,
+		/obj/effect/spawner/random/salvage/crate_loot_spawner/military/shipping,
+		/obj/effect/spawner/random/salvage/crate_loot_spawner/safe_loot/shipping,
+		/obj/effect/spawner/random/salvage/crate_loot_spawner/money/shipping,
+		/obj/effect/spawner/random/salvage/crate_loot_spawner/medical_anything/shipping,
+		/obj/effect/spawner/random/salvage/crate_loot_spawner/chemicals/shipping,
+		/obj/effect/spawner/random/salvage/crate_loot_spawner/medical_bulk/shipping,
+		/obj/effect/spawner/random/salvage/crate_loot_spawner/five_hundred_cigarettes/shipping,
+	)
+	/// The chance this crate has to spawn with nothing in it
+	var/empty_chance = 25
+
+/obj/structure/closet/shipping_container/secured/random_loot/PopulateContents()
+	if(prob(empty_chance))
+		return
+	var/obj/effect/spawner/random/loot_spawner = pick(loot_spawners)
+	new loot_spawner(src)
+
+/obj/structure/closet/shipping_container/secured/random_loot/medical_or_research
+	loot_spawners = list(
+		/obj/effect/spawner/random/salvage/crate_loot_spawner/bedding/shipping,
+		/obj/effect/spawner/random/salvage/crate_loot_spawner/garbage_day/shipping,
+		/obj/effect/spawner/random/salvage/crate_loot_spawner/safe_loot/shipping,
+		/obj/effect/spawner/random/salvage/crate_loot_spawner/medical_anything/shipping,
+		/obj/effect/spawner/random/salvage/crate_loot_spawner/chemicals/shipping,
+		/obj/effect/spawner/random/salvage/crate_loot_spawner/medical_bulk/shipping,
+	)
+
+/obj/structure/closet/shipping_container/secured/random_loot/construction
+	loot_spawners = list(
+		/obj/effect/spawner/random/salvage/crate_loot_spawner/garbage_day/shipping,
+		/obj/effect/spawner/random/salvage/crate_loot_spawner/components/shipping,
+		/obj/effect/spawner/random/salvage/crate_loot_spawner/engineering/shipping,
+	)
+
+/obj/structure/closet/shipping_container/secured/random_loot/civilian_supply
+	loot_spawners = list(
+		/obj/effect/spawner/random/salvage/crate_loot_spawner/bedding/shipping,
+		/obj/effect/spawner/random/salvage/crate_loot_spawner/garbage_day/shipping,
+		/obj/effect/spawner/random/salvage/crate_loot_spawner/food/shipping,
+		/obj/effect/spawner/random/salvage/crate_loot_spawner/produce/shipping,
+		/obj/effect/spawner/random/salvage/crate_loot_spawner/seeds/shipping,
+		/obj/effect/spawner/random/salvage/crate_loot_spawner/booze/shipping,
+		/obj/effect/spawner/random/salvage/crate_loot_spawner/five_hundred_cigarettes/shipping,
+	)
+
+/obj/structure/closet/shipping_container/secured/random_loot/military
+	loot_spawners = list(
+		/obj/effect/spawner/random/salvage/crate_loot_spawner/garbage_day/shipping,
+		/obj/effect/spawner/random/salvage/crate_loot_spawner/food/shipping,
+		/obj/effect/spawner/random/salvage/crate_loot_spawner/military/shipping,
+		/obj/effect/spawner/random/salvage/crate_loot_spawner/safe_loot/shipping,
+		/obj/effect/spawner/random/salvage/crate_loot_spawner/medical_anything/shipping,
+	)
+
+/obj/structure/closet/shipping_container/secured/random_loot/salvage
+	loot_spawners = list(
+		/obj/effect/spawner/random/salvage/crate_loot_spawner/garbage_day/shipping,
+		/obj/effect/spawner/random/salvage/crate_loot_spawner/components/shipping,
+		/obj/effect/spawner/random/salvage/crate_loot_spawner/engineering/shipping,
+	)
+
+/obj/structure/closet/crate/shuttle_hard/secured/random_loot
+	/// List of spawners we can choose from
+	var/list/loot_spawners = list(
+		/obj/effect/spawner/random/salvage/crate_loot_spawner/bedding/large,
+		/obj/effect/spawner/random/salvage/crate_loot_spawner/garbage_day/large,
+		/obj/effect/spawner/random/salvage/crate_loot_spawner/food/large,
+		/obj/effect/spawner/random/salvage/crate_loot_spawner/produce/large,
+		/obj/effect/spawner/random/salvage/crate_loot_spawner/seeds/large,
+		/obj/effect/spawner/random/salvage/crate_loot_spawner/booze/large,
+		/obj/effect/spawner/random/salvage/crate_loot_spawner/components/large,
+		/obj/effect/spawner/random/salvage/crate_loot_spawner/engineering/large,
+		/obj/effect/spawner/random/salvage/crate_loot_spawner/military/large,
+		/obj/effect/spawner/random/salvage/crate_loot_spawner/safe_loot/large,
+		/obj/effect/spawner/random/salvage/crate_loot_spawner/money/large,
+		/obj/effect/spawner/random/salvage/crate_loot_spawner/medical_anything/large,
+		/obj/effect/spawner/random/salvage/crate_loot_spawner/chemicals/large,
+		/obj/effect/spawner/random/salvage/crate_loot_spawner/medical_bulk/large,
+		/obj/effect/spawner/random/salvage/crate_loot_spawner/five_hundred_cigarettes/large,
+	)
+	/// The chance this crate has to spawn with nothing in it
+	var/empty_chance = 30
+
+/obj/structure/closet/crate/shuttle_hard/secured/random_loot/PopulateContents()
+	if(prob(empty_chance))
+		return
+	var/obj/effect/spawner/random/loot_spawner = pick(loot_spawners)
+	new loot_spawner(src)
+
+/obj/structure/closet/crate/shuttle_hard/secured/random_loot/medical_or_research
+	loot_spawners = list(
+		/obj/effect/spawner/random/salvage/crate_loot_spawner/bedding/large,
+		/obj/effect/spawner/random/salvage/crate_loot_spawner/garbage_day/large,
+		/obj/effect/spawner/random/salvage/crate_loot_spawner/safe_loot/large,
+		/obj/effect/spawner/random/salvage/crate_loot_spawner/medical_anything/large,
+		/obj/effect/spawner/random/salvage/crate_loot_spawner/chemicals/large,
+		/obj/effect/spawner/random/salvage/crate_loot_spawner/medical_bulk/large,
+	)
+
+/obj/structure/closet/crate/shuttle_hard/secured/random_loot/construction
+	loot_spawners = list(
+		/obj/effect/spawner/random/salvage/crate_loot_spawner/garbage_day/large,
+		/obj/effect/spawner/random/salvage/crate_loot_spawner/components/large,
+		/obj/effect/spawner/random/salvage/crate_loot_spawner/engineering/large,
+	)
+
+/obj/structure/closet/crate/shuttle_hard/secured/random_loot/civilian_supply
+	loot_spawners = list(
+		/obj/effect/spawner/random/salvage/crate_loot_spawner/bedding/large,
+		/obj/effect/spawner/random/salvage/crate_loot_spawner/garbage_day/large,
+		/obj/effect/spawner/random/salvage/crate_loot_spawner/food/large,
+		/obj/effect/spawner/random/salvage/crate_loot_spawner/produce/large,
+		/obj/effect/spawner/random/salvage/crate_loot_spawner/seeds/large,
+		/obj/effect/spawner/random/salvage/crate_loot_spawner/booze/large,
+		/obj/effect/spawner/random/salvage/crate_loot_spawner/five_hundred_cigarettes/large,
+	)
+
+/obj/structure/closet/crate/shuttle_hard/secured/random_loot/military
+	loot_spawners = list(
+		/obj/effect/spawner/random/salvage/crate_loot_spawner/garbage_day/large,
+		/obj/effect/spawner/random/salvage/crate_loot_spawner/food/large,
+		/obj/effect/spawner/random/salvage/crate_loot_spawner/military/large,
+		/obj/effect/spawner/random/salvage/crate_loot_spawner/safe_loot/large,
+		/obj/effect/spawner/random/salvage/crate_loot_spawner/medical_anything/large,
+	)
+
+/obj/structure/closet/crate/shuttle_hard/secured/random_loot/salvage
+	loot_spawners = list(
+		/obj/effect/spawner/random/salvage/crate_loot_spawner/garbage_day/large,
+		/obj/effect/spawner/random/salvage/crate_loot_spawner/components/large,
+		/obj/effect/spawner/random/salvage/crate_loot_spawner/engineering/large,
+	)
+
+/obj/structure/closet/crate/shuttle/secured/random_loot
+	/// List of spawners we can choose from
+	var/list/loot_spawners = list(
+		/obj/effect/spawner/random/salvage/crate_loot_spawner/bedding/medium,
+		/obj/effect/spawner/random/salvage/crate_loot_spawner/garbage_day/medium,
+		/obj/effect/spawner/random/salvage/crate_loot_spawner/food/medium,
+		/obj/effect/spawner/random/salvage/crate_loot_spawner/produce/medium,
+		/obj/effect/spawner/random/salvage/crate_loot_spawner/seeds/medium,
+		/obj/effect/spawner/random/salvage/crate_loot_spawner/booze/medium,
+		/obj/effect/spawner/random/salvage/crate_loot_spawner/components/medium,
+		/obj/effect/spawner/random/salvage/crate_loot_spawner/engineering/medium,
+		/obj/effect/spawner/random/salvage/crate_loot_spawner/military/medium,
+		/obj/effect/spawner/random/salvage/crate_loot_spawner/safe_loot/medium,
+		/obj/effect/spawner/random/salvage/crate_loot_spawner/money/medium,
+		/obj/effect/spawner/random/salvage/crate_loot_spawner/medical_anything/medium,
+		/obj/effect/spawner/random/salvage/crate_loot_spawner/chemicals/medium,
+		/obj/effect/spawner/random/salvage/crate_loot_spawner/medical_bulk/medium,
+		/obj/effect/spawner/random/salvage/crate_loot_spawner/five_hundred_cigarettes/medium,
+	)
+	/// The chance this crate has to spawn with nothing in it
+	var/empty_chance = 40
+
+/obj/structure/closet/crate/shuttle/secured/random_loot/PopulateContents()
+	if(prob(empty_chance))
+		return
+	var/obj/effect/spawner/random/loot_spawner = pick(loot_spawners)
+	new loot_spawner(src)
+
+/obj/structure/closet/crate/shuttle/secured/random_loot/medical_or_research
+	loot_spawners = list(
+		/obj/effect/spawner/random/salvage/crate_loot_spawner/bedding/medium,
+		/obj/effect/spawner/random/salvage/crate_loot_spawner/garbage_day/medium,
+		/obj/effect/spawner/random/salvage/crate_loot_spawner/safe_loot/medium,
+		/obj/effect/spawner/random/salvage/crate_loot_spawner/medical_anything/medium,
+		/obj/effect/spawner/random/salvage/crate_loot_spawner/chemicals/medium,
+		/obj/effect/spawner/random/salvage/crate_loot_spawner/medical_bulk/medium,
+	)
+
+/obj/structure/closet/crate/shuttle/secured/random_loot/construction
+	loot_spawners = list(
+		/obj/effect/spawner/random/salvage/crate_loot_spawner/garbage_day/medium,
+		/obj/effect/spawner/random/salvage/crate_loot_spawner/components/medium,
+		/obj/effect/spawner/random/salvage/crate_loot_spawner/engineering/medium,
+	)
+
+/obj/structure/closet/crate/shuttle/secured/random_loot/civilian_supply
+	loot_spawners = list(
+		/obj/effect/spawner/random/salvage/crate_loot_spawner/bedding/medium,
+		/obj/effect/spawner/random/salvage/crate_loot_spawner/garbage_day/medium,
+		/obj/effect/spawner/random/salvage/crate_loot_spawner/food/medium,
+		/obj/effect/spawner/random/salvage/crate_loot_spawner/produce/medium,
+		/obj/effect/spawner/random/salvage/crate_loot_spawner/seeds/medium,
+		/obj/effect/spawner/random/salvage/crate_loot_spawner/booze/medium,
+		/obj/effect/spawner/random/salvage/crate_loot_spawner/five_hundred_cigarettes/medium,
+	)
+
+/obj/structure/closet/crate/shuttle/secured/random_loot/military
+	loot_spawners = list(
+		/obj/effect/spawner/random/salvage/crate_loot_spawner/garbage_day/medium,
+		/obj/effect/spawner/random/salvage/crate_loot_spawner/food/medium,
+		/obj/effect/spawner/random/salvage/crate_loot_spawner/military/medium,
+		/obj/effect/spawner/random/salvage/crate_loot_spawner/safe_loot/medium,
+		/obj/effect/spawner/random/salvage/crate_loot_spawner/medical_anything/medium,
+	)
+
+/obj/structure/closet/crate/shuttle/secured/random_loot/salvage
+	loot_spawners = list(
+		/obj/effect/spawner/random/salvage/crate_loot_spawner/garbage_day/medium,
+		/obj/effect/spawner/random/salvage/crate_loot_spawner/components/medium,
+		/obj/effect/spawner/random/salvage/crate_loot_spawner/engineering/medium,
+	)
+
+/obj/structure/closet/crate/shuttle/small/secured/random_loot
+	/// List of spawners we can choose from
+	var/list/loot_spawners = list(
+		/obj/effect/spawner/random/salvage/crate_loot_spawner/bedding/small,
+		/obj/effect/spawner/random/salvage/crate_loot_spawner/garbage_day/small,
+		/obj/effect/spawner/random/salvage/crate_loot_spawner/food/small,
+		/obj/effect/spawner/random/salvage/crate_loot_spawner/produce/small,
+		/obj/effect/spawner/random/salvage/crate_loot_spawner/seeds/small,
+		/obj/effect/spawner/random/salvage/crate_loot_spawner/booze/small,
+		/obj/effect/spawner/random/salvage/crate_loot_spawner/components/small,
+		/obj/effect/spawner/random/salvage/crate_loot_spawner/engineering/small,
+		/obj/effect/spawner/random/salvage/crate_loot_spawner/military/small,
+		/obj/effect/spawner/random/salvage/crate_loot_spawner/safe_loot/small,
+		/obj/effect/spawner/random/salvage/crate_loot_spawner/money/small,
+		/obj/effect/spawner/random/salvage/crate_loot_spawner/medical_anything/small,
+		/obj/effect/spawner/random/salvage/crate_loot_spawner/chemicals/small,
+		/obj/effect/spawner/random/salvage/crate_loot_spawner/medical_bulk/small,
+		/obj/effect/spawner/random/salvage/crate_loot_spawner/five_hundred_cigarettes/small,
+	)
+	/// The chance this crate has to spawn with nothing in it
+	var/empty_chance = 40
+
+/obj/structure/closet/crate/shuttle/small/secured/random_loot/PopulateContents()
+	if(prob(empty_chance))
+		return
+	var/obj/effect/spawner/random/loot_spawner = pick(loot_spawners)
+	new loot_spawner(src)
+
+/obj/structure/closet/crate/shuttle/small/secured/random_loot/medical_or_research
+	loot_spawners = list(
+		/obj/effect/spawner/random/salvage/crate_loot_spawner/bedding/small,
+		/obj/effect/spawner/random/salvage/crate_loot_spawner/garbage_day/small,
+		/obj/effect/spawner/random/salvage/crate_loot_spawner/safe_loot/small,
+		/obj/effect/spawner/random/salvage/crate_loot_spawner/medical_anything/small,
+		/obj/effect/spawner/random/salvage/crate_loot_spawner/chemicals/small,
+		/obj/effect/spawner/random/salvage/crate_loot_spawner/medical_bulk/small,
+	)
+
+/obj/structure/closet/crate/shuttle/small/secured/random_loot/construction
+	loot_spawners = list(
+		/obj/effect/spawner/random/salvage/crate_loot_spawner/garbage_day/small,
+		/obj/effect/spawner/random/salvage/crate_loot_spawner/components/small,
+		/obj/effect/spawner/random/salvage/crate_loot_spawner/engineering/small,
+	)
+
+/obj/structure/closet/crate/shuttle/small/secured/random_loot/civilian_supply
+	loot_spawners = list(
+		/obj/effect/spawner/random/salvage/crate_loot_spawner/bedding/small,
+		/obj/effect/spawner/random/salvage/crate_loot_spawner/garbage_day/small,
+		/obj/effect/spawner/random/salvage/crate_loot_spawner/food/small,
+		/obj/effect/spawner/random/salvage/crate_loot_spawner/produce/small,
+		/obj/effect/spawner/random/salvage/crate_loot_spawner/seeds/small,
+		/obj/effect/spawner/random/salvage/crate_loot_spawner/booze/small,
+		/obj/effect/spawner/random/salvage/crate_loot_spawner/five_hundred_cigarettes/small,
+	)
+
+/obj/structure/closet/crate/shuttle/small/secured/random_loot/military
+	loot_spawners = list(
+		/obj/effect/spawner/random/salvage/crate_loot_spawner/garbage_day/small,
+		/obj/effect/spawner/random/salvage/crate_loot_spawner/food/small,
+		/obj/effect/spawner/random/salvage/crate_loot_spawner/military/small,
+		/obj/effect/spawner/random/salvage/crate_loot_spawner/safe_loot/small,
+		/obj/effect/spawner/random/salvage/crate_loot_spawner/medical_anything/small,
+	)
+
+/obj/structure/closet/crate/shuttle/small/secured/random_loot/salvage
+	loot_spawners = list(
+		/obj/effect/spawner/random/salvage/crate_loot_spawner/garbage_day/small,
+		/obj/effect/spawner/random/salvage/crate_loot_spawner/components/small,
+		/obj/effect/spawner/random/salvage/crate_loot_spawner/engineering/small,
+	)
+
+// Spawners
+
+/obj/effect/spawner/random/salvage/crate_loot_spawner
+	abstract_type = /obj/effect/spawner/random/salvage/salvaged_gun
+	name = "crate contents spawner"
+
+/obj/effect/spawner/random/salvage/crate_loot_spawner/bedding
+	loot = list(
+		/obj/effect/spawner/random/bedsheet = 2,
+		/obj/effect/spawner/random/bedsheet/double = 1,
+		/obj/item/pillow/random = 2,
+	)
+
+SALVAGE_CRATE_LOOT_SPAWNER(/obj/effect/spawner/random/salvage/crate_loot_spawner/bedding)
+
+/obj/effect/spawner/random/salvage/crate_loot_spawner/garbage_day
+	loot = list(
+		/obj/effect/spawner/random/trash/deluxe_garbage/no_mobs_ever,
+		/obj/effect/spawner/random/maintenance/no_decals,
+	)
+
+SALVAGE_CRATE_LOOT_SPAWNER(/obj/effect/spawner/random/salvage/crate_loot_spawner/garbage_day)
+
+/obj/effect/spawner/random/salvage/crate_loot_spawner/food
+	loot = list(
+		/obj/effect/spawner/random/food_or_drink/any_snack_or_beverage,
+		/obj/effect/spawner/random/epic_loot/random_provisions,
+	)
+
+SALVAGE_CRATE_LOOT_SPAWNER(/obj/effect/spawner/random/salvage/crate_loot_spawner/food)
+
+/obj/effect/spawner/random/salvage/crate_loot_spawner/produce
+	loot = list(
+		/obj/effect/spawner/random/food_or_drink/plant_produce/one,
+	)
+
+SALVAGE_CRATE_LOOT_SPAWNER(/obj/effect/spawner/random/salvage/crate_loot_spawner/produce)
+
+/obj/effect/spawner/random/salvage/crate_loot_spawner/seeds
+	loot = list(
+		/obj/effect/spawner/random/food_or_drink/seed_rare/one = 1,
+		/obj/effect/spawner/random/food_or_drink/seed/one = 3,
+		/obj/effect/spawner/random/food_or_drink/seed_flowers/one = 1,
+	)
+
+SALVAGE_CRATE_LOOT_SPAWNER(/obj/effect/spawner/random/salvage/crate_loot_spawner/seeds)
+
+/obj/effect/spawner/random/salvage/crate_loot_spawner/booze
+	loot = list(
+		/obj/effect/spawner/random/food_or_drink/booze,
+	)
+
+SALVAGE_CRATE_LOOT_SPAWNER(/obj/effect/spawner/random/salvage/crate_loot_spawner/booze)
+
+/obj/effect/spawner/random/salvage/crate_loot_spawner/components
+	loot = list(
+		/obj/effect/spawner/random/epic_loot/random_components,
+		/obj/effect/spawner/random/epic_loot/random_computer_parts,
+		/obj/effect/spawner/random/epic_loot/random_construction,
+	)
+
+SALVAGE_CRATE_LOOT_SPAWNER(/obj/effect/spawner/random/salvage/crate_loot_spawner/components)
+
+/obj/effect/spawner/random/salvage/crate_loot_spawner/engineering
+	loot = list(
+		/obj/effect/spawner/random/epic_loot/random_engineering,
+	)
+
+SALVAGE_CRATE_LOOT_SPAWNER(/obj/effect/spawner/random/salvage/crate_loot_spawner/engineering)
+
+/obj/effect/spawner/random/salvage/crate_loot_spawner/military
+	loot = list(
+		/obj/effect/spawner/random/epic_loot/random_other_military_loot = 4,
+		/obj/effect/spawner/random/epic_loot/random_documents = 1,
+	)
+
+SALVAGE_CRATE_LOOT_SPAWNER(/obj/effect/spawner/random/salvage/crate_loot_spawner/military)
+
+/obj/effect/spawner/random/salvage/crate_loot_spawner/safe_loot
+	loot = list(
+		/obj/effect/spawner/random/epic_loot/random_strongbox_loot,
+	)
+
+SALVAGE_CRATE_LOOT_SPAWNER(/obj/effect/spawner/random/salvage/crate_loot_spawner/safe_loot)
+
+/obj/effect/spawner/random/salvage/crate_loot_spawner/money
+	loot = list(
+		/obj/effect/spawner/random/entertainment/money_small = 2,
+		/obj/effect/spawner/random/entertainment/money = 1,
+	)
+
+SALVAGE_CRATE_LOOT_SPAWNER(/obj/effect/spawner/random/salvage/crate_loot_spawner/money)
+
+/obj/effect/spawner/random/salvage/crate_loot_spawner/medical_anything
+	loot = list(
+		/obj/effect/spawner/random/epic_loot/medical_everything,
+	)
+
+SALVAGE_CRATE_LOOT_SPAWNER(/obj/effect/spawner/random/salvage/crate_loot_spawner/medical_anything)
+
+/obj/effect/spawner/random/salvage/crate_loot_spawner/chemicals
+	loot = list(
+		/obj/effect/spawner/random/epic_loot/chemical = 2,
+		/obj/effect/spawner/random/epic_loot/medpens = 2,
+		/obj/effect/spawner/random/epic_loot/medpens_combat_based_redpilled = 1,
+	)
+
+SALVAGE_CRATE_LOOT_SPAWNER(/obj/effect/spawner/random/salvage/crate_loot_spawner/chemicals)
+
+/obj/effect/spawner/random/salvage/crate_loot_spawner/medical_bulk
+	loot = list(
+		/obj/effect/spawner/random/medical/minor_healing = 4,
+		/obj/effect/spawner/random/medical/supplies = 3,
+		/obj/effect/spawner/random/medical/medkit = 3,
+		/obj/effect/spawner/random/medical/medkit_rare = 1,
+	)
+
+SALVAGE_CRATE_LOOT_SPAWNER(/obj/effect/spawner/random/salvage/crate_loot_spawner/medical_bulk)
+
+/obj/effect/spawner/random/salvage/crate_loot_spawner/five_hundred_cigarettes
+	loot = list(
+		/obj/effect/spawner/random/entertainment/cigarette_pack,
+	)
+
+SALVAGE_CRATE_LOOT_SPAWNER(/obj/effect/spawner/random/salvage/crate_loot_spawner/five_hundred_cigarettes)
diff --git a/modular_doppler/shipbreaking/code/loot/tanks.dm b/modular_doppler/shipbreaking/code/loot/tanks.dm
new file mode 100644
index 00000000000000..6b1d569ed25cd6
--- /dev/null
+++ b/modular_doppler/shipbreaking/code/loot/tanks.dm
@@ -0,0 +1,38 @@
+/obj/effect/spawner/random/salvage/every_small_tank
+	name = "random small tank"
+	icon_state = "tank"
+	loot = list(
+		/obj/structure/shuttle_decoration/liquid_tank/battery,
+		/obj/structure/shuttle_decoration/liquid_tank/coolant,
+		/obj/structure/shuttle_decoration/liquid_tank/explosive,
+		/obj/structure/shuttle_decoration/liquid_tank/explosive/hydrazine,
+		/obj/structure/shuttle_decoration/liquid_tank/explosive/lithium,
+	)
+
+/obj/effect/spawner/random/salvage/small_fuel_tanks
+	name = "random small fuel tank"
+	icon_state = "fuel"
+	loot = list(
+		/obj/structure/shuttle_decoration/liquid_tank/explosive,
+		/obj/structure/shuttle_decoration/liquid_tank/explosive/hydrazine,
+		/obj/structure/shuttle_decoration/liquid_tank/explosive/lithium,
+	)
+
+/obj/effect/spawner/random/salvage/every_industrial_tank
+	name = "random industrial tank"
+	icon_state = "industrial"
+	loot = list(
+		/obj/structure/shuttle_decoration/liquid_tank/coolant/industrial,
+		/obj/structure/shuttle_decoration/liquid_tank/explosive/industrial,
+		/obj/structure/shuttle_decoration/liquid_tank/explosive/hydrazine/industrial,
+		/obj/structure/shuttle_decoration/liquid_tank/explosive/lithium/industrial,
+	)
+
+/obj/effect/spawner/random/salvage/industrial_fuel_only
+	name = "random industrial fuel tank"
+	icon_state = "industrial"
+	loot = list(
+		/obj/structure/shuttle_decoration/liquid_tank/explosive/industrial,
+		/obj/structure/shuttle_decoration/liquid_tank/explosive/hydrazine/industrial,
+		/obj/structure/shuttle_decoration/liquid_tank/explosive/lithium/industrial,
+	)
diff --git a/modular_doppler/shipbreaking/code/prior_owners/medical.dm b/modular_doppler/shipbreaking/code/prior_owners/medical.dm
new file mode 100644
index 00000000000000..16c4b20623f0f5
--- /dev/null
+++ b/modular_doppler/shipbreaking/code/prior_owners/medical.dm
@@ -0,0 +1,36 @@
+/datum/shipbreaking_owner/medical
+
+/datum/shipbreaking_owner/medical/cybersun
+	owner_name = "Cybersun-Osaka Industries"
+	ship_primary_colour = "#d5d5d5"
+	ship_secondary_colour = "#e12e1d"
+
+/datum/shipbreaking_owner/medical/oms
+	owner_name = "Osaka Medical Systems"
+	ship_primary_colour = "#d5d5d5"
+	ship_secondary_colour = "#5fcde4"
+
+/datum/shipbreaking_owner/medical/deforest
+	owner_name = "Deforest Far Field Team"
+	ship_primary_colour = "#5fcde4"
+	ship_secondary_colour = "#5b975a"
+
+/datum/shipbreaking_owner/medical/venezia
+	owner_name = "Venezia"
+	ship_primary_colour = "#ffbb00"
+	ship_secondary_colour = "#d5d5d5"
+
+/datum/shipbreaking_owner/medical/scalpel
+	owner_name = "Scalpel & Suture Medical"
+	ship_primary_colour = "#a1aeb5"
+	ship_secondary_colour = "#534b6b"
+
+/datum/shipbreaking_owner/medical/stop_n_stitch
+	owner_name = "Breakneck Bandages"
+	ship_primary_colour = "#518997"
+	ship_secondary_colour = "#a43926"
+
+/datum/shipbreaking_owner/medical/gutzpaw
+	owner_name = "Gutzpaw 'n Gory"
+	ship_primary_colour = "#578263"
+	ship_secondary_colour = "#1ac0e5"
diff --git a/modular_doppler/shipbreaking/code/prior_owners/military.dm b/modular_doppler/shipbreaking/code/prior_owners/military.dm
new file mode 100644
index 00000000000000..e893b322aa162a
--- /dev/null
+++ b/modular_doppler/shipbreaking/code/prior_owners/military.dm
@@ -0,0 +1,31 @@
+/datum/shipbreaking_owner/military
+
+/datum/shipbreaking_owner/military/void_corps
+	owner_name = "Void Corps Xth Expeditionary"
+	ship_primary_colour = "#353333"
+	ship_secondary_colour = "#a75b14"
+
+/datum/shipbreaking_owner/military/long_stretch
+	owner_name = "Long Stretch Prisoner Transport"
+	ship_primary_colour = "#a75b14"
+	ship_secondary_colour = "#353333"
+
+/datum/shipbreaking_owner/military/dragons_breath
+	owner_name = "Dragon's Breath Securities"
+	ship_primary_colour = "#3d2e2e"
+	ship_secondary_colour = "#ff912b"
+
+/datum/shipbreaking_owner/military/hearts_n_minds
+	owner_name = "Hearts & Minds Defense Contractors"
+	ship_primary_colour = "#f59de9"
+	ship_secondary_colour = "#f0f0f0"
+
+/datum/shipbreaking_owner/military/corkbern
+	owner_name = "Corkbern & Harkenbrook"
+	ship_primary_colour = "#571f1f"
+	ship_secondary_colour = "#d1bc1c"
+
+/datum/shipbreaking_owner/military/breaker
+	owner_name = "Breaker Independent Company"
+	ship_primary_colour = "#ea7f0c"
+	ship_secondary_colour = "#852020"
diff --git a/modular_doppler/shipbreaking/code/prior_owners/mining.dm b/modular_doppler/shipbreaking/code/prior_owners/mining.dm
new file mode 100644
index 00000000000000..8ce79a5ba9bde4
--- /dev/null
+++ b/modular_doppler/shipbreaking/code/prior_owners/mining.dm
@@ -0,0 +1,41 @@
+/datum/shipbreaking_owner/mining
+
+/datum/shipbreaking_owner/mining/amundsen
+	owner_name = "Amundsen-Scott Mineral Prospecting"
+	ship_primary_colour = "#243f65"
+	ship_secondary_colour = "#c8c8c8"
+
+/datum/shipbreaking_owner/mining/kahraman
+	owner_name = "Kahraman Heavy Industry"
+	ship_primary_colour = "#820a16"
+	ship_secondary_colour = "#e3ddc3"
+
+/datum/shipbreaking_owner/mining/exagon
+	owner_name = "Exagon-Ichikawa Orbital Resourcing"
+	ship_primary_colour = "#d5d5d5"
+	ship_secondary_colour = "#d92d29"
+
+/datum/shipbreaking_owner/mining/honk_mimi
+	owner_name = "Marina's Interstellar Minerals, Incorperated"
+	ship_primary_colour = "#ffe600"
+	ship_secondary_colour = "#ffa291"
+
+/datum/shipbreaking_owner/mining/blackbird_interactive
+	owner_name = "Blackbird Industrial"
+	ship_primary_colour = "#d4d4d4"
+	ship_secondary_colour = "#3b3b3b"
+
+/datum/shipbreaking_owner/mining/crag_jumpers
+	owner_name = "Crag Jumpers"
+	ship_primary_colour = "#9c659b"
+	ship_secondary_colour = "#b17e46"
+
+/datum/shipbreaking_owner/mining/kel_vet
+	owner_name = "Kel'Vet Extraction"
+	ship_primary_colour = "#404040"
+	ship_secondary_colour = "#ca9340"
+
+/datum/shipbreaking_owner/mining/brightstar
+	owner_name = "BrightStar Salvage Group"
+	ship_primary_colour = "#b18aa9"
+	ship_secondary_colour = "#55476e"
diff --git a/modular_doppler/shipbreaking/code/prior_owners/research.dm b/modular_doppler/shipbreaking/code/prior_owners/research.dm
new file mode 100644
index 00000000000000..490b21b9889e66
--- /dev/null
+++ b/modular_doppler/shipbreaking/code/prior_owners/research.dm
@@ -0,0 +1,51 @@
+/datum/shipbreaking_owner/research
+
+/datum/shipbreaking_owner/research/solar_exogeological
+	owner_name = "Solar Exogeological Survey"
+	ship_primary_colour = "#c4dacf"
+	ship_secondary_colour = "#836298"
+
+/datum/shipbreaking_owner/research/terraforming_4ca
+	owner_name = "4CA Terraforming Coalition"
+	ship_primary_colour = "#d08916"
+	ship_secondary_colour = "#cfcfcf"
+
+/datum/shipbreaking_owner/research/great_northern
+	owner_name = "Great Northern Frontier Agriculture"
+	ship_primary_colour = "#2a66b0"
+	ship_secondary_colour = "#ec7828"
+
+/datum/shipbreaking_owner/research/cthon
+	owner_name = "CTHON-Incorporated"
+	ship_primary_colour = "#3e3e3e"
+	ship_secondary_colour = "#836298"
+
+/datum/shipbreaking_owner/research/rocinante
+	owner_name = "Rocinante Expeditions"
+	ship_primary_colour = "#ffbb00"
+	ship_secondary_colour = "#9c9c9c"
+
+/datum/shipbreaking_owner/research/meier_fox
+	owner_name = "Meier-Fox Advanced Synthetics"
+	ship_primary_colour = "#d5d5d5"
+	ship_secondary_colour = "#60416d"
+
+/datum/shipbreaking_owner/research/pathos
+	owner_name = "PATHOS-II"
+	ship_primary_colour = "#5d89ba"
+	ship_secondary_colour = "#efefef"
+
+/datum/shipbreaking_owner/research/fitobiologi
+	owner_name = "Fitobiologi Padan"
+	ship_primary_colour = "#3dd09c"
+	ship_secondary_colour = "#414463"
+
+/datum/shipbreaking_owner/research/fv_cyberware
+	owner_name = "F.V. Cyberware"
+	ship_primary_colour = "#4e1616"
+	ship_secondary_colour = "#f0f0f0"
+
+/datum/shipbreaking_owner/research/veritas_exo
+	owner_name = "Veritas Exosciences"
+	ship_primary_colour = "#1ee9f4"
+	ship_secondary_colour = "#8516a0"
diff --git a/modular_doppler/shipbreaking/code/prior_owners/shipping.dm b/modular_doppler/shipbreaking/code/prior_owners/shipping.dm
new file mode 100644
index 00000000000000..98293468296c8c
--- /dev/null
+++ b/modular_doppler/shipbreaking/code/prior_owners/shipping.dm
@@ -0,0 +1,76 @@
+/datum/shipbreaking_owner/shipping
+
+/datum/shipbreaking_owner/shipping/four_winds
+	owner_name = "Four Winds Freighting Caravan"
+	ship_primary_colour = "#5b5b71"
+	ship_secondary_colour = "#ffdd00"
+
+/datum/shipbreaking_owner/shipping/crusoe_intermodal
+	owner_name = "Crusoe's Intermodal Shipping"
+	ship_primary_colour = "#169b5a"
+	ship_secondary_colour = "#176a96"
+
+/datum/shipbreaking_owner/shipping/crusoe_settlement
+	owner_name = "Crusoe's Rest Settlement Oversight"
+	ship_primary_colour = "#169b5a"
+	ship_secondary_colour = "#8f7930"
+
+/datum/shipbreaking_owner/shipping/conarex
+	owner_name = "Conarex Aeronautics"
+	ship_primary_colour = "#5096e3"
+	ship_secondary_colour = "#cfcfcf"
+
+/datum/shipbreaking_owner/shipping/sunda
+	owner_name = "Sunda Galaksi Near Orbital"
+	ship_primary_colour = "#e3b302"
+	ship_secondary_colour = "#3c3f45"
+
+/datum/shipbreaking_owner/shipping/apa
+	owner_name = "Adriatic Petrochemical Association"
+	ship_primary_colour = "#e3b302"
+	ship_secondary_colour = "#cfcfcf"
+
+/datum/shipbreaking_owner/shipping/orion_spur
+	owner_name = "Orion Spur Logistics"
+	ship_primary_colour = "#e3b302"
+	ship_secondary_colour = "#16d8d2"
+
+/datum/shipbreaking_owner/shipping/li_interstellar
+	owner_name = "Li Interstellar & Industrial"
+	ship_primary_colour = "#d6d6d6"
+	ship_secondary_colour = "#844384"
+
+/datum/shipbreaking_owner/shipping/footpath
+	owner_name = "Footpath Stellar Transit"
+	ship_primary_colour = "#ffe100"
+	ship_secondary_colour = "#87cce2"
+
+/datum/shipbreaking_owner/shipping/ibex
+	owner_name = "Ibex Interstellar"
+	ship_primary_colour = "#acacac"
+	ship_secondary_colour = "#91e6db"
+
+/datum/shipbreaking_owner/shipping/beemster
+	owner_name = "Beemster Consumer Starworks"
+	ship_primary_colour = "#ddc7a4"
+	ship_secondary_colour = "#8c6743"
+
+/datum/shipbreaking_owner/shipping/negative
+	owner_name = "Negative Pressure Shipping Company"
+	ship_primary_colour = "#dab643"
+	ship_secondary_colour = "#94ce82"
+
+/datum/shipbreaking_owner/shipping/red_sun_over_paradise
+	owner_name = "Red Sun Faring"
+	ship_primary_colour = "#d37e1c"
+	ship_secondary_colour = "#722c1e"
+
+/datum/shipbreaking_owner/shipping/princeton
+	owner_name = "Nouveau-Prince Interstellar Freight"
+	ship_primary_colour = "#2e8332"
+	ship_secondary_colour = "#343434"
+
+/datum/shipbreaking_owner/shipping/arrai
+	owner_name = "Arrai-Tistodo Obligate Movers"
+	ship_primary_colour = "#353535"
+	ship_secondary_colour = "#7e2a2a"
diff --git a/modular_doppler/shipbreaking/code/prior_owners/unique.dm b/modular_doppler/shipbreaking/code/prior_owners/unique.dm
new file mode 100644
index 00000000000000..9027939805e3b6
--- /dev/null
+++ b/modular_doppler/shipbreaking/code/prior_owners/unique.dm
@@ -0,0 +1,4 @@
+/datum/shipbreaking_owner/pallas
+	owner_name = "Pallas Cat Authority"
+	ship_primary_colour = COLOR_GOLD
+	ship_secondary_colour = COLOR_DARK
diff --git a/modular_doppler/shipbreaking/code/prior_owners_base.dm b/modular_doppler/shipbreaking/code/prior_owners_base.dm
new file mode 100644
index 00000000000000..6f3e97ab737d63
--- /dev/null
+++ b/modular_doppler/shipbreaking/code/prior_owners_base.dm
@@ -0,0 +1,7 @@
+/datum/shipbreaking_owner
+	/// What is the name of the last owner
+	var/owner_name
+	/// Primary colour of ships with this owner
+	var/ship_primary_colour
+	/// Secondary colour of ships with this owner
+	var/ship_secondary_colour
diff --git a/modular_doppler/shipbreaking/code/salvage_computer.dm b/modular_doppler/shipbreaking/code/salvage_computer.dm
new file mode 100644
index 00000000000000..fe89628ea1930a
--- /dev/null
+++ b/modular_doppler/shipbreaking/code/salvage_computer.dm
@@ -0,0 +1,214 @@
+GLOBAL_LIST_INIT(blacklisted_salvage_removal_types, typecacheof(list(
+		/mob/living,
+		/obj/effect/mob_spawn,
+		/obj/item/disk/nuclear,
+		/obj/item/hilbertshotel,
+		/obj/machinery/nuclearbomb,
+		/obj/narsie,
+		/obj/structure/blob,
+		/obj/structure/guardian_beacon,
+		/obj/tear_in_reality,
+	)))
+
+// Circuit and RND
+
+/obj/item/circuitboard/computer/salvage_computer
+	name = "Salvage Bay Controller"
+	greyscale_colors = CIRCUIT_COLOR_ENGINEERING
+	build_path = /obj/machinery/computer/salvage_bay_controller
+
+/datum/design/board/salvage_computer
+	name = "Salvage Bay Controller"
+	desc = "A bulky and old looking terminal that looks like it was dug straight out of the bottom of the ship's \
+		databanks. Likely to be from the very early concept stages of the Dark Locations type ships, where resources \
+		would be obtained through recycling the many old pioneer vessels scattered through the system."
+	id = "salvage_computer"
+	build_path = /obj/machinery/computer/salvage_bay_controller
+	category = list(
+		RND_CATEGORY_COMPUTER + RND_SUBCATEGORY_COMPUTER_ENGINEERING
+	)
+	departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING
+
+/datum/techweb_node/mining/New()
+	design_ids += list(
+		"salvage_computer",
+	)
+	return ..()
+
+// Everything else
+
+/obj/machinery/computer/salvage_bay_controller
+	name = "salvage bay control console"
+	desc = "A bulky and old looking terminal that looks like it was dug straight out of the bottom of the ship's \
+		databanks. Likely to be from the very early concept stages of the Dark Locations type ships, where resources \
+		would be obtained through recycling the many old pioneer vessels scattered through the system."
+	icon_screen = "supply"
+	circuit = /obj/item/circuitboard/computer/personal_shuttle_order
+	light_color = COLOR_BRIGHT_ORANGE
+	/// Are we currently spawning a shuttle? Prevents multiple shuttles trying to spawn and land on each other at once
+	var/bay_occupied = null
+	/// The docking clamp machine we are linked to
+	var/obj/machinery/docking_clamp/clamp
+	/// The types of shuttle templates we can call
+	var/list/valid_shuttle_templates = list()
+	/// List of the subtypes for map templates we can buy, DO NOT SET DIRECTLY, USE VALID SHUTTLE TEMPLATES FOR DIFFERENT SELECTIONS
+	var/list/valid_shuttle_templates_subtypes = list()
+	/// Assoc list of every shuttle that can be purchased from the choice list, includes name and price and whatnot, filled on init of the console
+	var/list/scrap_list = list()
+	/// The currently selected shuttle map template
+	var/datum/map_template/shuttle/personal_buyable/selected_template
+	/// Message when the shuttle can't be cleared due to an illegal item being present
+	var/blacklist_hit_message = "To prevent equipment loss and accidents: live organisms, human remains, \
+		classified nuclear weaponry, unstable eigenstates, or machinery housing any form of \
+		artificial intelligence cannot be present when salvage is discarded."
+
+/obj/machinery/computer/salvage_bay_controller/post_machine_initialize()
+	. = ..()
+	try_and_fill_shopping_list()
+
+/obj/machinery/computer/salvage_bay_controller/examine(mob/user)
+	. = ..()
+	if(!clamp)
+		. += span_notice("Connect to a [EXAMINE_HINT("salvage clamp")] by using a [EXAMINE_HINT("multitool")] \
+			on the clamp then connecting it to this console.")
+
+/obj/machinery/computer/salvage_bay_controller/multitool_act(mob/living/user, obj/item/multitool/the_tool)
+	if(!the_tool.buffer)
+		return ITEM_INTERACT_FAILURE
+	link_docking_clamp(the_tool.buffer)
+	balloon_alert(user, "linked to clamp")
+	return ITEM_INTERACT_SUCCESS
+
+/// Links a docking clamp to this console
+/obj/machinery/computer/salvage_bay_controller/proc/link_docking_clamp(new_clamp)
+	if(clamp)
+		clamp.controller = null
+	clamp = new_clamp
+	clamp.controller = src
+
+/// Delinks ourselves from the clamp we're linked to
+/obj/machinery/computer/salvage_bay_controller/proc/delink_clamp()
+	if(!clamp)
+		return // ?? how
+	clamp = null
+
+/// Fills the shopping list with names and templates
+/obj/machinery/computer/salvage_bay_controller/proc/try_and_fill_shopping_list()
+	if(!length(valid_shuttle_templates))
+		valid_shuttle_templates = subtypesof(/datum/map_template/shuttle/salvage_scrap)
+	if(length(valid_shuttle_templates_subtypes))
+		message_admins("For some reason, [src] already had a filled valid_shuttle_templates_subtypes, this may or may not be a bug.")
+		return
+	for(var/datum/map_template/shuttle/salvage_scrap/template as anything in valid_shuttle_templates)
+		if(!template.shows_up_as_salvage)
+			continue
+		valid_shuttle_templates_subtypes.Add(template) // This makes the var a lie bog off
+
+/// Loads specifically "Scrappie" the training shuttle
+#define SALVAGE_CONSOLE_TRAINING "Training Ship"
+/// Loads a new shuttle into the linked salvage bay if the bay is clear
+#define SALVAGE_CONSOLE_NEW_SHUTTLE "New Salvage"
+/// Clears the bay of any shuttle currently inside of it
+#define SALVAGE_CONSOLE_CLEAR_BAY "Clear Bay"
+
+/obj/machinery/computer/salvage_bay_controller/interact(mob/user)
+	. = ..()
+	if(!can_interact(user))
+		return
+	if(!clamp)
+		say("No linked docking clamp detected, re-link and try again later.")
+		return
+	if(!clamp?.docking_port)
+		say("Linked salvage clamp currently inactive, please engage before operation.")
+		return
+	if(!length(valid_shuttle_templates_subtypes))
+		say("No salvageable ships are available, please reference your local administrator.")
+		return
+
+	var/menu_option = tgui_input_list(user, "Salvage Bay Action", "Salvage Bay Control Console", list(SALVAGE_CONSOLE_NEW_SHUTTLE, SALVAGE_CONSOLE_CLEAR_BAY))
+	if(!menu_option)
+		balloon_alert(user, "no selection")
+		return
+
+	switch(menu_option)
+		if(SALVAGE_CONSOLE_CLEAR_BAY)
+			if(!bay_occupied)
+				say("No salvage to clear, dock already empty.")
+				return
+			say("You are about to release savage clamps and clear the bay, proceed?")
+			var/clear_bay_confirm = tgui_alert(user, "Bay cannot be cleared if critical equipment or personnel are present, confirm?", "Salvage Bay Clear Confirmation", list("Confirm", "Cancel"))
+			if(!clear_bay_confirm || clear_bay_confirm == "Cancel")
+				say("Cancelling release of salvage clamps, proceed with work.")
+				return
+			var/obj/docking_port/mobile/salvage/docked_salvage = clamp.docking_port.get_docked()
+			if(!docked_salvage.check_blacklist())
+				say(blacklist_hit_message)
+				return
+			docked_salvage.jumpToNullSpace()
+			say("Dock clearing, keep clear of moving clamps to prevent injury.")
+			bay_occupied = FALSE
+		if(SALVAGE_CONSOLE_NEW_SHUTTLE, SALVAGE_CONSOLE_TRAINING)
+			if(!clamp?.docking_port)
+				say("Connection to salvage clamp lost, please check equipment and try again later.")
+				return
+			var/datum/map_template/shuttle/salvage_template
+			if(menu_option == SALVAGE_CONSOLE_NEW_SHUTTLE)
+				salvage_template = pick(valid_shuttle_templates_subtypes)
+			else
+				salvage_template = /datum/map_template/shuttle/salvage_scrap/scrappie
+			if(!salvage_template)
+				say("No salvageable ships are available, please reference your local administrator.")
+				return
+			if(bay_occupied)
+				say("Bay already occupied, or currently retrieving salvage, please wait.")
+				return
+			if(clamp.check_for_clear_bay())
+				say("Please ensure salvage bay is clear of work crew before collecting salvage.")
+				return
+			bay_occupied = TRUE
+			salvage_template = new salvage_template()
+			var/obj/docking_port/mobile/loaded_port = SSshuttle.action_load(salvage_template, clamp.docking_port, FALSE)
+			if(loaded_port)
+				say("Salvage clamps retrieving ship now, please stand clear of the work bay.")
+				make_salvage_ticket(salvage_template)
+			else
+				message_admins("[user] tried to load a salvage template ([salvage_template]) but it failed for some reason, this should not happen!")
+				say("Failed to retrieve ship for salvage, please try again later.")
+				bay_occupied = FALSE
+
+#undef SALVAGE_CONSOLE_TRAINING
+#undef SALVAGE_CONSOLE_NEW_SHUTTLE
+#undef SALVAGE_CONSOLE_CLEAR_BAY
+
+/// Makes a little half-sheet ticket with information about the ship that just got pulled in, scoreboard, scoreboard!
+/obj/machinery/computer/salvage_bay_controller/proc/make_salvage_ticket(datum/map_template/shuttle/salvage_scrap/template)
+	playsound(src, 'sound/machines/printer.ogg', 50, vary = FALSE)
+	var/obj/item/paper/paperslip/new_ticket = new(drop_location())
+	new_ticket.name = "salvage receipt - [template.prior_name]"
+	// Makes the actual text on the paper
+	var/list/ticket_contents
+	ticket_contents += "<h1><table bgcolor=\"darkgoldenrod\" width=\"100%\"><th><div align=\"center\"><font color=\"white\">Salvage Ticket</font></div></th></table></h1>"
+	ticket_contents += "<hr />"
+	ticket_contents += "<p><strong>Ship details:</strong></p>"
+	ticket_contents += "<p>Designation - [template.prior_name]<br>"
+	ticket_contents += "Prior Owner - [template.prior_owner_datum.owner_name]<br>"
+	ticket_contents += "Operation History from [template.prior_date]:<br>"
+	ticket_contents += "[template.prior_usage]</p>"
+	ticket_contents += "<hr />"
+	ticket_contents += "<p>Ship Class - [template.ship_class]</p>"
+	ticket_contents += "<p>Detected Hazards:</p>"
+	if(!length(template.ship_hazards))
+		ticket_contents += "No hazards were detected, continue with caution.<br>"
+	else
+		for(var/hazard as anything in template.ship_hazards)
+			ticket_contents += "- [hazard]<br>"
+	ticket_contents += "<hr />"
+	ticket_contents += "<p><font color=\"grey\">Signature or stamp confirms receipt of salvage ownership, and that any and all contents of the salvage are the direct responsibility of all signees.</font></p>"
+	ticket_contents += "<p>\[___________________________________\]</p>"
+	ticket_contents += "<p>\[___________________________________\]</p>"
+	ticket_contents += "<p>\[___________________________________\]</p>"
+	// Just to break it up a little
+	new_ticket.color = COLOR_BEIGE
+	new_ticket.add_raw_text(ticket_contents)
+	new_ticket.update_appearance()
+
diff --git a/modular_doppler/shipbreaking/code/salvage_shuttle_base.dm b/modular_doppler/shipbreaking/code/salvage_shuttle_base.dm
new file mode 100644
index 00000000000000..497507385a0505
--- /dev/null
+++ b/modular_doppler/shipbreaking/code/salvage_shuttle_base.dm
@@ -0,0 +1,102 @@
+#define SALVAGE_SHUTTLE_STRINGS "~doppler/salvage_shuttle.json"
+
+/datum/map_template/shuttle/salvage_scrap
+	name = "DEBUG: Salvage Shuttle Basetype"
+	description = "Surely there would be a ship here."
+	shuttle_id = "shuttle_salvage_scrap"
+	port_id = "salvage"
+	prefix = "_maps/shuttles/~doppler_shuttles/salvage/"
+	who_can_purchase = null
+	width = 35
+	height = 24
+	/// Is this ship going to show up in the random ships from the salvage controller?
+	var/shows_up_as_salvage = TRUE
+	/// The name of the ship before it got abandoned, randomized if null
+	var/prior_name = null
+	/// A general ship class, similarly shaped ships should have the same class to help players
+	var/ship_class = "UNKNOWN"
+	/// What the ship was doing before it got abandoned, tells players what to expect inside the ship
+	var/prior_usage = "BEING BROKEN"
+	/// DO NOT SET PRIOR_OWNER_DATUM IF YOU SET ANYTHING IN HERE, list of datum owner types this ship will pick from
+	var/list/prior_owner_random_list = list()
+	/// Who owned the ship before it was salvage, randomized if null
+	var/datum/shipbreaking_owner/prior_owner_datum = null
+	/// Operation date, "(year) to (year)", randomized if empty
+	var/prior_date = null
+	/// What kind of hazards the crews could expect to be in the ship, unknown by default
+	var/list/ship_hazards = list()
+
+/datum/map_template/shuttle/salvage_scrap/New()
+	. = ..()
+	if(!prior_name)
+		prior_name = pick_list_replacements(SALVAGE_SHUTTLE_STRINGS, "ship_name")
+	if(!prior_owner_datum)
+		var/list/random_owner_subtypes = list()
+		for(var/datum/shipbreaking_owner/past_owner_type as anything in prior_owner_random_list)
+			random_owner_subtypes += subtypesof(past_owner_type)
+		prior_owner_datum = pick(random_owner_subtypes)
+	if(!prior_date)
+		prior_date = "[rand(2490, 2504)] to [rand(2504, 2525)]"
+
+/datum/map_template/shuttle/salvage_scrap/post_load(obj/docking_port/mobile/shuttle_port)
+	. = ..()
+	var/area/shuttle_area = get_area(shuttle_port)
+	for(var/atom/recolorable_thing as anything in shuttle_area.contents)
+		if(HAS_TRAIT(recolorable_thing, TRAIT_SHIP_PRIMARY_COLOUR))
+			recolorable_thing.color = prior_owner_datum.ship_primary_colour
+		else if(HAS_TRAIT(recolorable_thing, TRAIT_SHIP_SECONDARY_COLOUR))
+			recolorable_thing.color = prior_owner_datum.ship_secondary_colour
+
+/obj/docking_port/mobile/salvage
+	name = "salvaged shuttle"
+	shuttle_id = "shuttle_salvage_scrap"
+	callTime = 15 SECONDS
+	rechargeTime = 30 SECONDS
+	prearrivalTime = 10 SECONDS
+	preferred_direction = EAST
+	dir = NORTH
+	port_direction = EAST
+	movement_force = list(
+		"KNOCKDOWN" = 2,
+		"THROW" = 0,
+	)
+
+/obj/docking_port/mobile/salvage/canDock(obj/docking_port/stationary/stationary_dock)
+	if(!stationary_dock)
+		return SHUTTLE_CAN_DOCK
+	if(!istype(stationary_dock))
+		return SHUTTLE_NOT_A_DOCKING_PORT
+	if(stationary_dock.override_can_dock_checks)
+		return SHUTTLE_CAN_DOCK
+	// check the dock isn't occupied
+	var/currently_docked = stationary_dock.get_docked()
+	if(currently_docked)
+		// by someone other than us
+		if(currently_docked != src)
+			return SHUTTLE_SOMEONE_ELSE_DOCKED
+		else
+		// This isn't an error, per se, but we can't let the shuttle code
+		// attempt to move us where we currently are, it will get weird.
+			return SHUTTLE_ALREADY_DOCKED
+	return SHUTTLE_CAN_DOCK
+
+/// Checks if any items in the areas of the docking port would be blocked by the cargo shuttle, and so shouldn't be deleted here
+/obj/docking_port/mobile/salvage/proc/check_blacklist()
+	for(var/area/shuttle_area as anything in shuttle_areas)
+		for (var/list/zlevel_turfs as anything in shuttle_area.get_zlevel_turf_lists())
+			for(var/turf/shuttle_turf as anything in zlevel_turfs)
+				for(var/atom/passenger in shuttle_turf.get_all_contents())
+					if((is_type_in_typecache(passenger, GLOB.blacklisted_salvage_removal_types) || HAS_TRAIT(passenger, TRAIT_BANNED_FROM_CARGO_SHUTTLE)) && !istype(passenger, /obj/docking_port))
+						return FALSE
+	return TRUE
+
+/area/shuttle/salvaged_shuttle
+	name = "Shuttle Salvage"
+	requires_power = TRUE
+	always_unpowered = FALSE
+	power_equip = FALSE
+	power_light = FALSE
+	power_environ = TRUE
+	power_apc_charge = FALSE
+	default_gravity = ZERO_GRAVITY
+	area_limited_icon_smoothing = /area/shuttle/salvaged_shuttle
diff --git a/modular_doppler/shipbreaking/code/salvage_shuttles/cargo.dm b/modular_doppler/shipbreaking/code/salvage_shuttles/cargo.dm
new file mode 100644
index 00000000000000..3be052dc771ab9
--- /dev/null
+++ b/modular_doppler/shipbreaking/code/salvage_shuttles/cargo.dm
@@ -0,0 +1,65 @@
+/datum/map_template/shuttle/salvage_scrap/meridian_cargo
+	name = "Meridian Cargo Shuttle"
+	suffix = "meridian_cargo"
+	ship_class = "Meridian Cargo Shuttle"
+	prior_usage = "Short range cargo delivery."
+	ship_hazards = list(
+		SALVAGE_HAZARD_ELECTRICAL,
+		SALVAGE_HAZARD_FUEL,
+		SALVAGE_HAZARD_REACTOR,
+		SALVAGE_HAZARD_CARGO,
+	)
+	prior_owner_random_list = list(
+		/datum/shipbreaking_owner/shipping,
+		/datum/shipbreaking_owner/mining,
+	)
+
+/datum/map_template/shuttle/salvage_scrap/ikwa_cargo
+	name = "Ikwa Heavy Cargo"
+	suffix = "ikwa_cargo"
+	ship_class = "Ikwa Heavy Cargo"
+	prior_usage = "Long range cargo hauling."
+	ship_hazards = list(
+		SALVAGE_HAZARD_ELECTRICAL,
+		SALVAGE_HAZARD_COOLANT,
+		SALVAGE_HAZARD_CARGO,
+		SALVAGE_HAZARD_FUEL,
+		SALVAGE_HAZARD_REACTOR,
+	)
+	prior_owner_random_list = list(
+		/datum/shipbreaking_owner/shipping,
+	)
+
+/datum/map_template/shuttle/salvage_scrap/ikwa_tanker
+	name = "Ikwa Fuel Tanker"
+	suffix = "ikwa_tanker"
+	ship_class = "Ikwa Fuel Tanker"
+	prior_usage = "Long range fuel hauling."
+	ship_hazards = list(
+		SALVAGE_HAZARD_ELECTRICAL,
+		SALVAGE_HAZARD_COOLANT,
+		SALVAGE_HAZARD_CARGO,
+		SALVAGE_HAZARD_FUEL,
+		SALVAGE_HAZARD_REACTOR,
+	)
+	prior_owner_random_list = list(
+		/datum/shipbreaking_owner/shipping,
+		/datum/shipbreaking_owner/mining,
+		/datum/shipbreaking_owner/military,
+	)
+
+/datum/map_template/shuttle/salvage_scrap/vautour_cargo
+	name = "Vautour Container Skipper"
+	suffix = "vautour_cargo"
+	ship_class = "Vautour Container Skipper"
+	prior_usage = "Inter-orbital container and large cargo shipping."
+	ship_hazards = list(
+		SALVAGE_HAZARD_ELECTRICAL,
+		SALVAGE_HAZARD_COOLANT,
+		SALVAGE_HAZARD_CARGO,
+		SALVAGE_HAZARD_FUEL,
+		SALVAGE_HAZARD_REACTOR,
+	)
+	prior_owner_random_list = list(
+		/datum/shipbreaking_owner/shipping,
+	)
diff --git a/modular_doppler/shipbreaking/code/salvage_shuttles/example.dm b/modular_doppler/shipbreaking/code/salvage_shuttles/example.dm
new file mode 100644
index 00000000000000..355ac6229dddeb
--- /dev/null
+++ b/modular_doppler/shipbreaking/code/salvage_shuttles/example.dm
@@ -0,0 +1,16 @@
+/datum/map_template/shuttle/salvage_scrap/scrappie
+	name = "Salvage Training Shuttle"
+	description = "Everyone's favourite salvage training ship, nearly clean of danger and excitement \
+		in an effort to teach a new generation of shipbreakers how to do the job safely."
+	suffix = "scrappie"
+	prior_name = "Scrappie"
+	ship_class = "Training Ship"
+	prior_usage = "Shipbreaker training vessel."
+	ship_hazards = list(
+		SALVAGE_HAZARD_COOLANT,
+		SALVAGE_HAZARD_ELECTRICAL,
+		SALVAGE_HAZARD_CARGO,
+	)
+	prior_owner_datum = /datum/shipbreaking_owner/pallas
+	prior_date = "2520 to Present"
+	shows_up_as_salvage = FALSE // scrappie doesn't randomly roll with the other shuttles
diff --git a/modular_doppler/shipbreaking/code/salvage_shuttles/military.dm b/modular_doppler/shipbreaking/code/salvage_shuttles/military.dm
new file mode 100644
index 00000000000000..ea6b7778fa5d61
--- /dev/null
+++ b/modular_doppler/shipbreaking/code/salvage_shuttles/military.dm
@@ -0,0 +1,14 @@
+/datum/map_template/shuttle/salvage_scrap/fengzhou_patrol
+	name = "Fengzhou Short Range Patrol"
+	suffix = "ikwa_cargo"
+	ship_class = "Fengzhou Short Range Patrol"
+	prior_usage = "Local system security patrols."
+	ship_hazards = list(
+		SALVAGE_HAZARD_ELECTRICAL,
+		SALVAGE_HAZARD_FUEL,
+		SALVAGE_HAZARD_REACTOR,
+		SALVAGE_HAZARD_WEAPONS
+	)
+	prior_owner_random_list = list(
+		/datum/shipbreaking_owner/military,
+	)
diff --git a/modular_doppler/shipbreaking/code/salvage_shuttles/passenger.dm b/modular_doppler/shipbreaking/code/salvage_shuttles/passenger.dm
new file mode 100644
index 00000000000000..b666b5ab80c905
--- /dev/null
+++ b/modular_doppler/shipbreaking/code/salvage_shuttles/passenger.dm
@@ -0,0 +1,15 @@
+/datum/map_template/shuttle/salvage_scrap/meridian_passenger
+	name = "Meridian Station Hopper"
+	suffix = "meridian_passenger"
+	ship_class = "Meridian Station Hopper"
+	prior_usage = "Short range passenger transfer."
+	ship_hazards = list(
+		SALVAGE_HAZARD_ELECTRICAL,
+		SALVAGE_HAZARD_FUEL,
+		SALVAGE_HAZARD_REACTOR,
+	)
+	prior_owner_random_list = list(
+		/datum/shipbreaking_owner/shipping,
+		/datum/shipbreaking_owner/medical,
+		/datum/shipbreaking_owner/mining,
+	)
diff --git a/modular_doppler/shipbreaking/code/salvage_shuttles/research.dm b/modular_doppler/shipbreaking/code/salvage_shuttles/research.dm
new file mode 100644
index 00000000000000..57c89f7b92b043
--- /dev/null
+++ b/modular_doppler/shipbreaking/code/salvage_shuttles/research.dm
@@ -0,0 +1,15 @@
+/datum/map_template/shuttle/salvage_scrap/meridian_exolab
+	name = "Meridian Exolab"
+	suffix = "meridian_exolab"
+	ship_class = "Meridian Exolab"
+	prior_usage = "Local system research and surveys."
+	ship_hazards = list(
+		SALVAGE_HAZARD_ELECTRICAL,
+		SALVAGE_HAZARD_FUEL,
+		SALVAGE_HAZARD_REACTOR,
+		SALVAGE_HAZARD_CARGO,
+	)
+	prior_owner_random_list = list(
+		/datum/shipbreaking_owner/research,
+		/datum/shipbreaking_owner/medical,
+	)
diff --git a/modular_doppler/shipbreaking/code/salvage_shuttles/salvage.dm b/modular_doppler/shipbreaking/code/salvage_shuttles/salvage.dm
new file mode 100644
index 00000000000000..e4723e6a08601a
--- /dev/null
+++ b/modular_doppler/shipbreaking/code/salvage_shuttles/salvage.dm
@@ -0,0 +1,16 @@
+/datum/map_template/shuttle/salvage_scrap/vautour_salvage
+	name = "Vautour Salvage Runner"
+	suffix = "vautour_salvage"
+	ship_class = "Vautour Salvage Runner"
+	prior_usage = "In-situ salvage operations."
+	ship_hazards = list(
+		SALVAGE_HAZARD_ELECTRICAL,
+		SALVAGE_HAZARD_COOLANT,
+		SALVAGE_HAZARD_CARGO,
+		SALVAGE_HAZARD_FUEL,
+		SALVAGE_HAZARD_REACTOR,
+	)
+	prior_owner_random_list = list(
+		/datum/shipbreaking_owner/shipping,
+		/datum/shipbreaking_owner/mining,
+	)
diff --git a/modular_doppler/shipbreaking/code/salvage_shuttles/unmanned.dm b/modular_doppler/shipbreaking/code/salvage_shuttles/unmanned.dm
new file mode 100644
index 00000000000000..ec69031ffe3675
--- /dev/null
+++ b/modular_doppler/shipbreaking/code/salvage_shuttles/unmanned.dm
@@ -0,0 +1,28 @@
+/datum/map_template/shuttle/salvage_scrap/solar_probe
+	name = "Solestra Probe (Research)"
+	suffix = "solestra_probe"
+	ship_class = "Solestra Probe"
+	prior_usage = "Unmanned research data collection and observation"
+	ship_hazards = list(
+		SALVAGE_HAZARD_ELECTRICAL,
+		SALVAGE_HAZARD_SHIPMIND,
+		SALVAGE_HAZARD_COOLANT,
+	)
+	prior_owner_random_list = list(
+		/datum/shipbreaking_owner/research,
+	)
+
+/datum/map_template/shuttle/salvage_scrap/mining_probe
+	name = "Solestra Probe (Mining)"
+	suffix = "solestra_probe_mining"
+	ship_class = "Solestra Probe"
+	prior_usage = "Unmanned material and geological surveys."
+	ship_hazards = list(
+		SALVAGE_HAZARD_ELECTRICAL,
+		SALVAGE_HAZARD_SHIPMIND,
+		SALVAGE_HAZARD_COOLANT,
+		SALVAGE_HAZARD_FUEL,
+	)
+	prior_owner_random_list = list(
+		/datum/shipbreaking_owner/mining,
+	)
diff --git a/modular_doppler/shipbreaking/code/shuttle_decoration.dm b/modular_doppler/shipbreaking/code/shuttle_decoration.dm
new file mode 100644
index 00000000000000..fc1c6725f24a53
--- /dev/null
+++ b/modular_doppler/shipbreaking/code/shuttle_decoration.dm
@@ -0,0 +1,59 @@
+/obj/structure/shuttle_decoration
+	abstract_type = /obj/structure/shuttle_decoration
+	icon = 'modular_doppler/shipbreaking/icons/exterior.dmi'
+	obj_flags = CAN_BE_HIT | IGNORE_DENSITY
+	density = FALSE
+	anchored = TRUE
+	pass_flags_self = LETPASSTHROW|PASSSTRUCTURE
+	armor_type = /datum/armor/structure_railing
+	max_integrity = 75
+	layer = LOW_ITEM_LAYER
+	/// How long to either unwrench or unweld
+	var/unfasten_time = 1 SECONDS
+	/// Does this need to be welded off the wall, instead of using a wrench
+	var/requires_welder = FALSE
+
+/obj/structure/shuttle_decoration/Initialize(mapload)
+	. = ..()
+	ADD_TRAIT(src, TRAIT_RECYCLE_LIKE_ITEM, TRAIT_GENERIC)
+	AddComponent(/datum/component/simple_rotation, ROTATION_NEEDS_ROOM)
+	find_and_hang_on_wall()
+	register_context()
+
+/obj/structure/shuttle_decoration/add_context(atom/source, list/context, obj/item/held_item, mob/user)
+	. = ..()
+	if(isnull(held_item))
+		return NONE
+	if(requires_welder)
+		if(held_item.tool_behaviour == TOOL_WELDER)
+			context[SCREENTIP_CONTEXT_LMB] = anchored ? "Unsecure" : "Secure"
+			return CONTEXTUAL_SCREENTIP_SET
+	else
+		if(held_item.tool_behaviour == TOOL_WRENCH)
+			context[SCREENTIP_CONTEXT_LMB] = anchored ? "Unsecure" : "Secure"
+			return CONTEXTUAL_SCREENTIP_SET
+
+/obj/structure/shuttle_decoration/examine(mob/user)
+	. = ..()
+	if(requires_welder)
+		. += span_notice("Can be removed by cutting it off.")
+	else
+		. += span_notice("Can be removed by unfastening it.")
+
+/obj/structure/shuttle_decoration/wrench_act(mob/living/user, obj/item/tool)
+	. = ..()
+	if(requires_welder)
+		return NONE
+	default_unfasten_wrench(user, tool, time = unfasten_time)
+	return ITEM_INTERACT_SUCCESS
+
+/obj/structure/shuttle_decoration/welder_act(mob/living/user, obj/item/tool)
+	if(!requires_welder)
+		return NONE
+	balloon_alert(user, anchored ? "cutting..." : "securing...")
+	if(!tool.use_tool(src, user, unfasten_time, amount = 1, volume=50))
+		return ITEM_INTERACT_BLOCKING
+	set_anchored(!anchored)
+	if(anchored)
+		find_and_hang_on_wall()
+	return ITEM_INTERACT_SUCCESS
diff --git a/modular_doppler/shipbreaking/code/shuttle_parts/airlocks.dm b/modular_doppler/shipbreaking/code/shuttle_parts/airlocks.dm
index bba9c9ad352c6d..8281e4fc6307a0 100644
--- a/modular_doppler/shipbreaking/code/shuttle_parts/airlocks.dm
+++ b/modular_doppler/shipbreaking/code/shuttle_parts/airlocks.dm
@@ -4,6 +4,7 @@
 	icon = 'modular_doppler/shipbreaking/icons/doors.dmi'
 	icon_state = "exterior"
 	pass_flags_self = PASSDOORS
+	smoothing_groups = SMOOTH_GROUP_AIRLOCK
 	armor_type = /datum/armor/machinery_door
 	disassembled_type = /obj/structure/hull_plating/airlock
 
@@ -87,6 +88,7 @@
 	opacity = TRUE
 	density = TRUE
 	pass_flags_self = PASSDOORS
+	smoothing_groups = SMOOTH_GROUP_AIRLOCK + SMOOTH_GROUP_WALLS
 	max_integrity = 150
 	armor_type = /datum/armor/machinery_door
 	/// What does this unweld into
@@ -113,4 +115,4 @@
 	name = "disconnected maintenance panel"
 	desc = "A maintenance panel used for access to crawlspaces and engines in ships, this one has been cut from the frame."
 	icon_state = "access_free"
-	reconnect_type = /obj/structure/mineral_door/manual_colony_door/shuttle/interior
+	reconnect_type = /obj/structure/shuttle_access_panel
diff --git a/modular_doppler/shipbreaking/code/shuttle_parts/crates.dm b/modular_doppler/shipbreaking/code/shuttle_parts/crates.dm
new file mode 100644
index 00000000000000..c2f93bc91ee764
--- /dev/null
+++ b/modular_doppler/shipbreaking/code/shuttle_parts/crates.dm
@@ -0,0 +1,117 @@
+/obj/structure/closet/shipping_container
+	name = "shipping container"
+	desc = "Heavy duty shipping containers, insulated from pressure and temperature changes, and resistant to most impacts."
+	icon = 'modular_doppler/shipbreaking/icons/closet.dmi'
+	icon_state = "shipping"
+	base_icon_state = "shipping"
+	delivery_icon = null
+	sealed = TRUE
+	paint_jobs = null
+	can_weld_shut = TRUE
+	can_install_electronics = FALSE
+	mob_storage_capacity = 5
+	storage_capacity = 50
+	inertia_force_weight = 2
+	drag_slowdown = 3
+	max_integrity = 400
+	door_anim_time = 0 // no animation
+	contents_pressure_protection = 1
+	contents_thermal_insulation = 1
+	material_drop = /obj/item/stack/sheet/plasteel
+	material_drop_amount = 5
+	custom_materials = list(
+		/datum/material/alloy/plasteel = SHEET_MATERIAL_AMOUNT * 5,
+	)
+	/// The chance that this container spawns welded shut
+	var/welded_chance = 15
+
+/obj/structure/closet/shipping_container/secured
+	anchored = TRUE
+
+/obj/structure/closet/shipping_container/Initialize(mapload)
+	. = ..()
+	base_icon_state = pick(
+		"shipping",
+		"shippingyellow",
+		"shippinggreen",
+		"shippingred",
+		"shippingourple",
+	)
+	icon_state = base_icon_state
+	if(prob(welded_chance))
+		welded = TRUE
+	update_appearance(UPDATE_ICON)
+
+/obj/structure/closet/crate/shuttle
+	name = "shipping crate"
+	desc = "A soft, padded crate for shipping things around without denting up your walls, or your skull, when someone hits the brakes."
+	icon = 'modular_doppler/shipbreaking/icons/crates.dmi'
+	icon_state = "soft"
+	base_icon_state = "soft"
+	lid_icon_state = "softopen"
+	delivery_icon = null
+	sealed = FALSE
+	resistance_flags = FLAMMABLE
+	pass_flags_self = PASSSTRUCTURE
+	cutting_tool = /obj/item/wirecutters
+	material_drop = /obj/item/stack/sheet/durathread
+	material_drop_amount = 4
+	open_sound = 'sound/items/poster/poster_ripped.ogg'
+	close_sound = 'sound/machines/cardboard_box.ogg'
+	open_sound_volume = 25
+	close_sound_volume = 25
+	paint_jobs = null
+	can_weld_shut = FALSE
+	can_install_electronics = FALSE
+	dense_when_open = FALSE
+	mob_storage_capacity = 0
+	storage_capacity = 20
+	custom_materials = list(
+		/datum/material/plastic = SHEET_MATERIAL_AMOUNT * 2,
+	)
+	contents_pressure_protection = 0
+	contents_thermal_insulation = 0.1
+
+/obj/structure/closet/crate/shuttle/secured
+	anchored = TRUE
+
+/obj/structure/closet/crate/shuttle/small
+	name = "small shipping crate"
+	desc = "A soft, padded crate for shipping small things around without denting up your walls, or your skull, when someone hits the brakes."
+	icon_state = "softsmall"
+	base_icon_state = "softsmall"
+	lid_icon_state = "softsmallopen"
+	material_drop_amount = 2
+	storage_capacity = 10
+	custom_materials = list(
+		/datum/material/plastic = SHEET_MATERIAL_AMOUNT,
+	)
+
+/obj/structure/closet/crate/shuttle/small/secured
+	anchored = TRUE
+
+/obj/structure/closet/crate/shuttle_hard
+	name = "hard shipping crate"
+	desc = "A hard plastic crate for shipping valuable things that don't like to go bump in the night."
+	icon = 'modular_doppler/shipbreaking/icons/crates.dmi'
+	icon_state = "hard"
+	base_icon_state = "hard"
+	lid_icon_state = "hardopen"
+	delivery_icon = null
+	sealed = TRUE
+	material_drop = /obj/item/stack/sheet/plastic_wall_panel
+	material_drop_amount = 4
+	paint_jobs = null
+	can_weld_shut = FALSE
+	can_install_electronics = FALSE
+	mob_storage_capacity = 1
+	storage_capacity = 30
+	custom_materials = list(
+		/datum/material/plastic = SHEET_MATERIAL_AMOUNT * 2,
+		/datum/material/glass = SHEET_MATERIAL_AMOUNT * 2,
+	)
+	contents_pressure_protection = 1
+	contents_thermal_insulation = 0.75
+
+/obj/structure/closet/crate/shuttle_hard/secured
+	anchored = TRUE
diff --git a/modular_doppler/shipbreaking/code/shuttle_parts/engine_covers.dm b/modular_doppler/shipbreaking/code/shuttle_parts/engine_covers.dm
new file mode 100644
index 00000000000000..5eebf1a9334334
--- /dev/null
+++ b/modular_doppler/shipbreaking/code/shuttle_parts/engine_covers.dm
@@ -0,0 +1,107 @@
+/obj/structure/engine_covers
+	abstract_type = /obj/structure/engine_covers
+	icon = 'modular_doppler/shipbreaking/icons/exterior.dmi'
+	icon_state = null
+	flags_1 = ON_BORDER_1
+	obj_flags = CAN_BE_HIT | IGNORE_DENSITY
+	density = FALSE
+	anchored = TRUE
+	pass_flags_self = LETPASSTHROW|PASSSTRUCTURE
+	armor_type = /datum/armor/nanocarbon_anything
+	max_integrity = 150
+	layer = ABOVE_OBJ_LAYER
+	inertia_force_weight = 2
+	/// How long to unweld
+	var/unfasten_time = 1 SECONDS
+
+/obj/structure/engine_covers/Initialize(mapload)
+	. = ..()
+	ADD_TRAIT(src, TRAIT_RECYCLE_LIKE_ITEM, TRAIT_GENERIC)
+	AddComponent(/datum/component/simple_rotation, ROTATION_NEEDS_ROOM)
+	var/static/list/loc_connections = list(
+		COMSIG_ATOM_EXIT = PROC_REF(on_exit),
+	)
+	AddElement(/datum/element/connect_loc, loc_connections)
+	register_context()
+
+/obj/structure/engine_covers/add_context(atom/source, list/context, obj/item/held_item, mob/user)
+	. = ..()
+	if(isnull(held_item))
+		return NONE
+	if(held_item.tool_behaviour == TOOL_WELDER)
+		context[SCREENTIP_CONTEXT_LMB] = anchored ? "Unsecure" : "Secure"
+		return CONTEXTUAL_SCREENTIP_SET
+
+/obj/structure/engine_covers/examine(mob/user)
+	. = ..()
+	. += span_notice("You can [anchored ? "unsecure" : "secure"] it with a welding tool.")
+
+/obj/structure/engine_covers/welder_act(mob/living/user, obj/item/tool)
+	balloon_alert(user, anchored ? "cutting..." : "securing...")
+	if(!tool.use_tool(src, user, unfasten_time, amount = 1, volume=50))
+		return ITEM_INTERACT_BLOCKING
+	set_anchored(!anchored)
+	return ITEM_INTERACT_SUCCESS
+
+/// Determines what to do when something is leaving our turf
+/obj/structure/engine_covers/proc/on_exit(datum/source, atom/movable/leaving, direction)
+	SIGNAL_HANDLER
+	if(leaving == src)
+		return // Let's not block ourselves.
+	if(!(direction & dir))
+		return
+	if (!density)
+		return
+	if (leaving.movement_type & (PHASING))
+		return
+	if (leaving.move_force >= MOVE_FORCE_EXTREMELY_STRONG)
+		return
+	leaving.Bump(src)
+	return COMPONENT_ATOM_BLOCK_EXIT
+
+/obj/structure/engine_covers/CanAllowThrough(atom/movable/mover, border_dir)
+	. = ..()
+	if(border_dir != dir)
+		return TRUE
+
+/obj/structure/engine_covers/CanPass(atom/movable/mover, border_dir)
+	return (border_dir & dir) ? ..() : TRUE
+
+/obj/structure/engine_covers/CanAStarPass(to_dir, datum/can_pass_info/pass_info)
+	return !density || (dir != to_dir)
+
+/obj/structure/engine_covers/can_atmos_pass(turf/the_turf, vertical = FALSE)
+	if(get_dir(loc, the_turf) == dir)
+		return !density
+	else
+		return TRUE
+
+/obj/structure/engine_covers/thruster_nozzle
+	name = "thruster nozzle"
+	desc = "A protective nozzle for shuttle engines, to keep debris from getting inside the combustion chamber."
+	icon_state = "nozzle"
+	custom_materials = list(
+		/datum/material/iron = SHEET_MATERIAL_AMOUNT * 15,
+		/datum/material/titanium = SHEET_MATERIAL_AMOUNT * 3,
+	)
+
+/obj/structure/engine_covers/heater_cover
+	name = "engine cover"
+	desc = "A protective cover for engine components, as well as a barrier to prevent atmosphere escape."
+	icon_state = "engine_plate"
+	custom_materials = list(
+		/datum/material/iron = SHEET_MATERIAL_AMOUNT * 7.5,
+		/datum/material/titanium = SHEET_MATERIAL_AMOUNT * 3,
+	)
+
+/obj/structure/engine_covers/ion_plate
+	name = "ion plate"
+	desc = "An orbital engine using extremely high voltages and a bit of lead for good luck to propel ships without \
+		needing to use expensive chemical fuels."
+	icon_state = "ion_plate"
+	custom_materials = list(
+		/datum/material/iron = SHEET_MATERIAL_AMOUNT * 7.5,
+		/datum/material/titanium = SHEET_MATERIAL_AMOUNT * 3,
+		/datum/material/plasma = SHEET_MATERIAL_AMOUNT * 4,
+		/datum/material/bluespace = HALF_SHEET_MATERIAL_AMOUNT,
+	)
diff --git a/modular_doppler/shipbreaking/code/shuttle_parts/engines.dm b/modular_doppler/shipbreaking/code/shuttle_parts/engines.dm
new file mode 100644
index 00000000000000..9a84dd4b4aa146
--- /dev/null
+++ b/modular_doppler/shipbreaking/code/shuttle_parts/engines.dm
@@ -0,0 +1,44 @@
+/obj/machinery/power/shuttle_engine/heater/salvage
+	name = "combustion chamber"
+	desc = "Large tanks, turbopumps, valves, pipes, everything you need to combine chemical fuels into just the right \
+		combination to work as a rocket rather than a giant bomb."
+	icon = 'modular_doppler/shipbreaking/icons/exterior.dmi'
+	icon_state = "chamber"
+	circuit = null
+	inertia_force_weight = 2
+	custom_materials = list(
+		/datum/material/iron = SHEET_MATERIAL_AMOUNT * 7,
+		/datum/material/titanium = SHEET_MATERIAL_AMOUNT * 2.5,
+		/datum/material/plasma = SHEET_MATERIAL_AMOUNT * 8,
+	)
+
+/obj/machinery/power/shuttle_engine/heater/salvage/Initialize(mapload)
+	. = ..()
+	ADD_TRAIT(src, TRAIT_RECYCLE_LIKE_ITEM, TRAIT_GENERIC)
+
+// Don't want people accidentally deconstructing these and losing all the resources
+/obj/machinery/power/shuttle_engine/heater/salvage/crowbar_act(mob/living/user, obj/item/tool)
+	return
+
+/obj/machinery/power/shuttle_engine/propulsion/salvage
+	name = "chemical propulsion engine"
+	desc = "The bell of an old type of chemical combustion engine for ship propulsion. Uses a comedically toxic \
+		tri-propellant mix banned from the atmospheres of most inhabited planets with a specific impulse into the thousands of \
+		seconds."
+	icon = 'modular_doppler/shipbreaking/icons/exterior.dmi'
+	icon_state = "engine"
+	circuit = null
+	inertia_force_weight = 2
+	custom_materials = list(
+		/datum/material/iron = SHEET_MATERIAL_AMOUNT * 12,
+		/datum/material/alloy/plasteel = SHEET_MATERIAL_AMOUNT * 5,
+		/datum/material/titanium = SHEET_MATERIAL_AMOUNT * 5,
+	)
+
+/obj/machinery/power/shuttle_engine/propulsion/salvage/Initialize(mapload)
+	. = ..()
+	ADD_TRAIT(src, TRAIT_RECYCLE_LIKE_ITEM, TRAIT_GENERIC)
+
+// Don't want people accidentally deconstructing these and losing all the resources
+/obj/machinery/power/shuttle_engine/propulsion/salvage/crowbar_act(mob/living/user, obj/item/tool)
+	return
diff --git a/modular_doppler/shipbreaking/code/shuttle_parts/exoscanners.dm b/modular_doppler/shipbreaking/code/shuttle_parts/exoscanners.dm
new file mode 100644
index 00000000000000..29a4c3c3f34198
--- /dev/null
+++ b/modular_doppler/shipbreaking/code/shuttle_parts/exoscanners.dm
@@ -0,0 +1,88 @@
+/obj/machinery/exoscanner/shuttle_part
+	abstract_type = /obj/machinery/exoscanner/shuttle_part
+	icon = 'modular_doppler/shipbreaking/icons/exterior.dmi'
+	icon_state = null
+	circuit = null
+	layer = LOW_ITEM_LAYER
+
+/obj/machinery/exoscanner/shuttle_part/Initialize(mapload)
+	. = ..()
+	ADD_TRAIT(src, TRAIT_RECYCLE_LIKE_ITEM, TRAIT_GENERIC)
+	find_and_hang_on_wall()
+
+/obj/machinery/exoscanner/shuttle_part/screwdriver_act(mob/user, obj/item/tool)
+	return
+
+/obj/machinery/exoscanner/shuttle_part/update_icon_state()
+	. = ..()
+	icon_state = base_icon_state
+
+/obj/machinery/exoscanner/shuttle_part/radar_panel
+	name = "radar panel"
+	desc = "A radar panel, made to be mounted flat to the walls of ships for directional scanning."
+	icon_state = "radar_panel"
+	base_icon_state = "radar_panel"
+	custom_materials = list(
+		/datum/material/iron = SHEET_MATERIAL_AMOUNT * 7,
+		/datum/material/glass = SHEET_MATERIAL_AMOUNT * 2,
+		/datum/material/plastic = SHEET_MATERIAL_AMOUNT * 3,
+		/datum/material/gold = HALF_SHEET_MATERIAL_AMOUNT,
+		/datum/material/silver = HALF_SHEET_MATERIAL_AMOUNT,
+	)
+
+MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/exoscanner/shuttle_part/radar_panel, 3)
+
+/obj/machinery/exoscanner/shuttle_part/sensors_blister
+	name = "sensors blister"
+	desc = "A tightly-packed sensors blister holding all manner of receiving and transmitting equipment in a protective \
+		housing. This one was left closed."
+	icon_state = "blister_closed"
+	base_icon_state = "blister_closed"
+	custom_materials = list(
+		/datum/material/iron = SHEET_MATERIAL_AMOUNT * 10,
+		/datum/material/glass = SHEET_MATERIAL_AMOUNT * 5,
+		/datum/material/plastic = SHEET_MATERIAL_AMOUNT * 5,
+		/datum/material/gold = SHEET_MATERIAL_AMOUNT * 2,
+		/datum/material/silver = SHEET_MATERIAL_AMOUNT * 2,
+	)
+
+MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/exoscanner/shuttle_part/sensors_blister, 18)
+
+// The north facing one has to be special due to the antennae
+/obj/machinery/exoscanner/shuttle_part/sensors_blister/directional/north
+	SET_BASE_PIXEL(0, 26)
+
+/obj/machinery/exoscanner/shuttle_part/open_sensors_blister
+	name = "sensors blister"
+	desc = "A tightly-packed sensors blister holding all manner of receiving and transmitting equipment in a protective \
+		housing. This one was left open."
+	icon_state = "blister_open"
+	base_icon_state = "blister_open"
+	custom_materials = list(
+		/datum/material/iron = SHEET_MATERIAL_AMOUNT * 10,
+		/datum/material/glass = SHEET_MATERIAL_AMOUNT * 5,
+		/datum/material/plastic = SHEET_MATERIAL_AMOUNT * 5,
+		/datum/material/gold = SHEET_MATERIAL_AMOUNT * 2,
+		/datum/material/silver = SHEET_MATERIAL_AMOUNT * 2,
+	)
+
+MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/exoscanner/shuttle_part/open_sensors_blister, 18)
+
+// The north facing one has to be special due to the antennae
+/obj/machinery/exoscanner/shuttle_part/open_sensors_blister/directional/north
+	SET_BASE_PIXEL(0, 26)
+
+/obj/machinery/exoscanner/shuttle_part/radio_dish
+	name = "radio dish"
+	desc = "A directional radio dish, for extremely long range communication and sensing."
+	icon_state = "dish"
+	base_icon_state = "dish"
+	custom_materials = list(
+		/datum/material/iron = SHEET_MATERIAL_AMOUNT * 4,
+		/datum/material/glass = SHEET_MATERIAL_AMOUNT * 2,
+		/datum/material/plastic = SHEET_MATERIAL_AMOUNT * 2,
+		/datum/material/gold = HALF_SHEET_MATERIAL_AMOUNT,
+		/datum/material/silver = HALF_SHEET_MATERIAL_AMOUNT,
+	)
+
+MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/exoscanner/shuttle_part/radio_dish, 12)
diff --git a/modular_doppler/shipbreaking/code/shuttle_parts/exterior_pieces.dm b/modular_doppler/shipbreaking/code/shuttle_parts/exterior_pieces.dm
index edc5f7e55cf9cc..86cb2837c8a5f7 100644
--- a/modular_doppler/shipbreaking/code/shuttle_parts/exterior_pieces.dm
+++ b/modular_doppler/shipbreaking/code/shuttle_parts/exterior_pieces.dm
@@ -1,242 +1,3 @@
-// Shuttle engine covers
-
-/obj/structure/engine_covers
-	abstract_type = /obj/structure/engine_covers
-	icon = 'modular_doppler/shipbreaking/icons/exterior.dmi'
-	icon_state = null
-	flags_1 = ON_BORDER_1
-	obj_flags = CAN_BE_HIT | IGNORE_DENSITY
-	density = FALSE
-	anchored = TRUE
-	pass_flags_self = LETPASSTHROW|PASSSTRUCTURE
-	armor_type = /datum/armor/nanocarbon_anything
-	max_integrity = 150
-	layer = ABOVE_OBJ_LAYER
-	/// How long to unweld
-	var/unfasten_time = 1 SECONDS
-
-/obj/structure/engine_covers/Initialize(mapload)
-	. = ..()
-	AddComponent(/datum/component/simple_rotation, ROTATION_NEEDS_ROOM)
-	var/static/list/loc_connections = list(
-		COMSIG_ATOM_EXIT = PROC_REF(on_exit),
-	)
-	AddElement(/datum/element/connect_loc, loc_connections)
-	register_context()
-
-/obj/structure/engine_covers/add_context(atom/source, list/context, obj/item/held_item, mob/user)
-	. = ..()
-	if(isnull(held_item))
-		return NONE
-	if(held_item.tool_behaviour == TOOL_WELDER)
-		context[SCREENTIP_CONTEXT_LMB] = anchored ? "Unsecure" : "Secure"
-		return CONTEXTUAL_SCREENTIP_SET
-
-/obj/structure/engine_covers/examine(mob/user)
-	. = ..()
-	. += span_notice("You can [anchored ? "unsecure" : "secure"] it with a welding tool.")
-
-/obj/structure/engine_covers/welder_act(mob/living/user, obj/item/tool)
-	balloon_alert(user, anchored ? "cutting..." : "securing...")
-	if(!tool.use_tool(src, user, unfasten_time, amount = 1, volume=50))
-		return ITEM_INTERACT_BLOCKING
-	set_anchored(!anchored)
-	return ITEM_INTERACT_SUCCESS
-
-/// Determines what to do when something is leaving our turf
-/obj/structure/engine_covers/proc/on_exit(datum/source, atom/movable/leaving, direction)
-	SIGNAL_HANDLER
-	if(leaving == src)
-		return // Let's not block ourselves.
-	if(!(direction & dir))
-		return
-	if (!density)
-		return
-	if (leaving.movement_type & (PHASING))
-		return
-	if (leaving.move_force >= MOVE_FORCE_EXTREMELY_STRONG)
-		return
-	leaving.Bump(src)
-	return COMPONENT_ATOM_BLOCK_EXIT
-
-/obj/structure/engine_covers/CanAllowThrough(atom/movable/mover, border_dir)
-	. = ..()
-	if(border_dir != dir)
-		return TRUE
-
-/obj/structure/engine_covers/CanPass(atom/movable/mover, border_dir)
-	return (border_dir & dir) ? ..() : TRUE
-
-/obj/structure/engine_covers/CanAStarPass(to_dir, datum/can_pass_info/pass_info)
-	return !density || (dir != to_dir)
-
-/obj/structure/engine_covers/can_atmos_pass(turf/the_turf, vertical = FALSE)
-	if(get_dir(loc, the_turf) == dir)
-		return !density
-	else
-		return TRUE
-
-/obj/structure/engine_covers/thruster_nozzle
-	name = "thruster nozzle"
-	desc = "A protective nozzle for shuttle engines, to keep debris from getting inside the combustion chamber."
-	icon_state = "nozzle"
-
-/obj/structure/engine_covers/heater_cover
-	name = "engine cover"
-	desc = "A protective cover for engine components, as well as a barrier to prevent atmosphere escape."
-	icon_state = "engine_plate"
-
-// Anything that uses an existing machine for function
-
-/obj/machinery/exoscanner/shuttle_part
-	abstract_type = /obj/machinery/exoscanner/shuttle_part
-	icon = 'modular_doppler/shipbreaking/icons/exterior.dmi'
-	icon_state = null
-	circuit = null
-	layer = LOW_ITEM_LAYER
-
-/obj/machinery/exoscanner/shuttle_part/Initialize(mapload)
-	. = ..()
-	find_and_hang_on_wall()
-
-/obj/machinery/exoscanner/shuttle_part/screwdriver_act(mob/user, obj/item/tool)
-	return
-
-/obj/machinery/exoscanner/shuttle_part/update_icon_state()
-	. = ..()
-	icon_state = base_icon_state
-
-/obj/machinery/exoscanner/shuttle_part/radar_panel
-	name = "radar panel"
-	desc = "A radar panel, made to be mounted flat to the walls of ships for directional scanning."
-	icon_state = "radar_panel"
-	base_icon_state = "radar_panel"
-	custom_materials = list(
-		/datum/material/iron = SHEET_MATERIAL_AMOUNT * 7,
-		/datum/material/glass = SHEET_MATERIAL_AMOUNT * 2,
-		/datum/material/plastic = SHEET_MATERIAL_AMOUNT * 3,
-		/datum/material/gold = HALF_SHEET_MATERIAL_AMOUNT,
-		/datum/material/silver = HALF_SHEET_MATERIAL_AMOUNT,
-	)
-
-MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/exoscanner/shuttle_part/radar_panel, 3)
-
-/obj/machinery/exoscanner/shuttle_part/sensors_blister
-	name = "sensors blister"
-	desc = "A tightly-packed sensors blister holding all manner of receiving and transmitting equipment in a protective \
-		housing. This one was left closed."
-	icon_state = "blister_closed"
-	base_icon_state = "blister_closed"
-	custom_materials = list(
-		/datum/material/iron = SHEET_MATERIAL_AMOUNT * 10,
-		/datum/material/glass = SHEET_MATERIAL_AMOUNT * 5,
-		/datum/material/plastic = SHEET_MATERIAL_AMOUNT * 5,
-		/datum/material/gold = SHEET_MATERIAL_AMOUNT * 2,
-		/datum/material/silver = SHEET_MATERIAL_AMOUNT * 2,
-	)
-
-MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/exoscanner/shuttle_part/sensors_blister, 18)
-
-// The north facing one has to be special due to the antennae
-/obj/machinery/exoscanner/shuttle_part/sensors_blister/directional/north
-	SET_BASE_PIXEL(0, 26)
-
-/obj/machinery/exoscanner/shuttle_part/open_sensors_blister
-	name = "sensors blister"
-	desc = "A tightly-packed sensors blister holding all manner of receiving and transmitting equipment in a protective \
-		housing. This one was left open."
-	icon_state = "blister_open"
-	base_icon_state = "blister_open"
-	custom_materials = list(
-		/datum/material/iron = SHEET_MATERIAL_AMOUNT * 10,
-		/datum/material/glass = SHEET_MATERIAL_AMOUNT * 5,
-		/datum/material/plastic = SHEET_MATERIAL_AMOUNT * 5,
-		/datum/material/gold = SHEET_MATERIAL_AMOUNT * 2,
-		/datum/material/silver = SHEET_MATERIAL_AMOUNT * 2,
-	)
-
-MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/exoscanner/shuttle_part/open_sensors_blister, 18)
-
-// The north facing one has to be special due to the antennae
-/obj/machinery/exoscanner/shuttle_part/open_sensors_blister/directional/north
-	SET_BASE_PIXEL(0, 26)
-
-/obj/machinery/exoscanner/shuttle_part/radio_dish
-	name = "radio dish"
-	desc = "A directional radio dish, for extremely long range communication and sensing."
-	icon_state = "dish"
-	base_icon_state = "dish"
-	custom_materials = list(
-		/datum/material/iron = SHEET_MATERIAL_AMOUNT * 4,
-		/datum/material/glass = SHEET_MATERIAL_AMOUNT * 2,
-		/datum/material/plastic = SHEET_MATERIAL_AMOUNT * 2,
-		/datum/material/gold = HALF_SHEET_MATERIAL_AMOUNT,
-		/datum/material/silver = HALF_SHEET_MATERIAL_AMOUNT,
-	)
-
-MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/exoscanner/shuttle_part/radio_dish, 12)
-
-// Special type for inert decorations
-
-/obj/structure/shuttle_decoration
-	abstract_type = /obj/structure/shuttle_decoration
-	icon = 'modular_doppler/shipbreaking/icons/exterior.dmi'
-	obj_flags = CAN_BE_HIT | IGNORE_DENSITY
-	density = FALSE
-	anchored = TRUE
-	pass_flags_self = LETPASSTHROW|PASSSTRUCTURE
-	armor_type = /datum/armor/structure_railing
-	max_integrity = 75
-	layer = LOW_ITEM_LAYER
-	/// How long to either unwrench or unweld
-	var/unfasten_time = 1 SECONDS
-	/// Does this need to be welded off the wall, instead of using a wrench
-	var/requires_welder = FALSE
-
-/obj/structure/shuttle_decoration/Initialize(mapload)
-	. = ..()
-	AddComponent(/datum/component/simple_rotation, ROTATION_NEEDS_ROOM)
-	find_and_hang_on_wall()
-	register_context()
-
-/obj/structure/shuttle_decoration/add_context(atom/source, list/context, obj/item/held_item, mob/user)
-	. = ..()
-	if(isnull(held_item))
-		return NONE
-	if(requires_welder)
-		if(held_item.tool_behaviour == TOOL_WELDER)
-			context[SCREENTIP_CONTEXT_LMB] = anchored ? "Unsecure" : "Secure"
-			return CONTEXTUAL_SCREENTIP_SET
-	else
-		if(held_item.tool_behaviour == TOOL_WRENCH)
-			context[SCREENTIP_CONTEXT_LMB] = anchored ? "Unsecure" : "Secure"
-			return CONTEXTUAL_SCREENTIP_SET
-
-/obj/structure/shuttle_decoration/examine(mob/user)
-	. = ..()
-	if(requires_welder)
-		. += span_notice("Can be removed by cutting it off.")
-	else
-		. += span_notice("Can be removed by unfastening it.")
-
-/obj/structure/shuttle_decoration/wrench_act(mob/living/user, obj/item/tool)
-	. = ..()
-	if(requires_welder)
-		return NONE
-	default_unfasten_wrench(user, tool, time = unfasten_time)
-	return ITEM_INTERACT_SUCCESS
-
-/obj/structure/shuttle_decoration/welder_act(mob/living/user, obj/item/tool)
-	if(!requires_welder)
-		return NONE
-	balloon_alert(user, anchored ? "cutting..." : "securing...")
-	if(!tool.use_tool(src, user, unfasten_time, amount = 1, volume=50))
-		return ITEM_INTERACT_BLOCKING
-	set_anchored(!anchored)
-	if(anchored)
-		find_and_hang_on_wall()
-	return ITEM_INTERACT_SUCCESS
-
 /obj/structure/shuttle_decoration/rcs
 	name = "reaction control thruster"
 	desc = "A small cold gas thruster used to orient the ship in place while in space."
@@ -276,6 +37,8 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/shuttle_decoration/ladder_black, 5)
 	desc = "A narrow catwalk for use on EVA."
 	icon_state = "catwalk"
 	layer = CATWALK_LAYER
+	plane = FLOOR_PLANE
+	obj_flags = CAN_BE_HIT | BLOCK_Z_OUT_DOWN
 	custom_materials = list(
 		/datum/material/iron = SHEET_MATERIAL_AMOUNT,
 		/datum/material/titanium = SHEET_MATERIAL_AMOUNT,
@@ -337,8 +100,8 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/shuttle_decoration/radiator, 4)
 /// Makes a cloud of extinguisher foam at the tile given
 /obj/structure/shuttle_decoration/extinguisher/proc/make_the_foam(turf/target_turf)
 	var/datum/effect_system/fluid_spread/foam/foam = new
-	var/datum/reagents/foamreagent = new /datum/reagents(25)
-	foamreagent.add_reagent(/datum/reagent/firefighting_foam, 25)
+	var/datum/reagents/foamreagent = new /datum/reagents(60)
+	foamreagent.add_reagent(/datum/reagent/firefighting_foam, 60)
 	foam.set_up(4, holder = src, location = target_turf, carry = foamreagent)
 	foam.start()
 
@@ -401,119 +164,25 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/shuttle_decoration/landing_engine, 15
 
 MAPPING_DIRECTIONAL_HELPERS(/obj/structure/shuttle_decoration/aux_engine, 10)
 
-/obj/structure/shuttle_decoration/wall_plate
-	abstract_type = /obj/structure/shuttle_decoration/wall_plate
-	icon = 'modular_doppler/shipbreaking/icons/wall_platings.dmi'
-	max_integrity = 125
-	unfasten_time = 2 SECONDS
-	requires_welder = TRUE
-	/// What type of hull plate object do we spawn when cut off the wall
-	var/obj/structure/hull_plating/cut_plating = /obj/structure/hull_plating
-	/// Do we transfer our color to the cut_plating
-	var/keep_color = FALSE
-
-/obj/structure/shuttle_decoration/wall_plate/welder_act(mob/living/user, obj/item/tool)
-	if(!requires_welder)
-		return NONE
-	balloon_alert(user, "cutting...")
-	if(!tool.use_tool(src, user, 4 SECONDS, amount = 1, volume=50))
-		return ITEM_INTERACT_BLOCKING
-	var/obj/new_plating = new cut_plating(get_turf(src))
-	if(keep_color)
-		new_plating.color = color
-	qdel(src)
-	return ITEM_INTERACT_SUCCESS
-
-/obj/structure/shuttle_decoration/wall_plate/gold_foil
-	name = "gold foil wrapping"
-	desc = "Gold foil insulation to keep the heat in (or out) of a ship or satellite."
-	icon_state = "gold_foil"
-	cut_plating = /obj/structure/hull_plating/gold_foil
-
-/obj/structure/shuttle_decoration/wall_plate/gold_foil/diagonal
-	icon_state = "gold_foil_diag"
-
-/obj/structure/shuttle_decoration/wall_plate/silver_foil
-	name = "silver foil wrapping"
-	desc = "Silver foil insulation to keep the heat in (or out) of a ship or satellite."
-	icon_state = "silver_foil"
-	cut_plating = /obj/structure/hull_plating/silver_foil
-
-/obj/structure/shuttle_decoration/wall_plate/silver_foil/diagonal
-	icon_state = "silver_foil_diag"
-
-/obj/structure/shuttle_decoration/wall_plate/nanocarbon
-	name = "nanocarbon hull screen"
-	desc = "A standoff screen of nanocarbon used typically for in atmosphere aerodynamics, or layered protection."
-	icon_state = "nanocarbon"
-	cut_plating = /obj/structure/hull_plating/nanocarbon/floor
-	keep_color = TRUE
-
-/obj/structure/shuttle_decoration/wall_plate/nanocarbon/diagonal
-	icon_state = "nanocarbon_diag"
-
-/obj/structure/shuttle_decoration/wall_plate/nanocarbon/ex_act(severity, target)
-	. = ..()
-	if(severity >= EXPLODE_HEAVY)
-		nanocarbon_nuke()
-	return TRUE
-
-/// Makes shards of nanocarbon
-/obj/structure/shuttle_decoration/wall_plate/nanocarbon/proc/nanocarbon_nuke()
-	var/random_shards = 2
-	for(var/iteration in 1 to random_shards)
-		var/obj/item/shard = new /obj/item/nanocarbon_shard(src)
-		shard.pixel_x = rand(-6, 6)
-		shard.pixel_y = rand(-6, 6)
-		shard.color = color
-
-/obj/structure/shuttle_decoration/wall_plate/nanocarbon/black
-	color = COLOR_DARK
-
-/obj/structure/shuttle_decoration/wall_plate/nanocarbon/diagonal/black
-	color = COLOR_DARK
-
-/obj/structure/shuttle_decoration/wall_plate/nanocarbon/standard
-	color = COLOR_SILVER
-
-/obj/structure/shuttle_decoration/wall_plate/nanocarbon/diagonal/standard
-	color = COLOR_SILVER
-
-/obj/structure/shuttle_decoration/wall_plate/nanocarbon/red
-	color = COLOR_BUBBLEGUM_RED
-
-/obj/structure/shuttle_decoration/wall_plate/nanocarbon/diagonal/red
-	color = COLOR_BUBBLEGUM_RED
-
-/obj/structure/shuttle_decoration/wall_plate/nanocarbon/green
-	color = COLOR_IRISH_GREEN
-
-/obj/structure/shuttle_decoration/wall_plate/nanocarbon/diagonal/green
-	color = COLOR_IRISH_GREEN
-
-/obj/structure/shuttle_decoration/wall_plate/nanocarbon/blue
-	color = COLOR_COMMAND_BLUE
-
-/obj/structure/shuttle_decoration/wall_plate/nanocarbon/diagonal/blue
-	color = COLOR_COMMAND_BLUE
-
-/obj/structure/shuttle_decoration/wall_plate/nanocarbon/yellow
-	color = COLOR_GOLD
-
-/obj/structure/shuttle_decoration/wall_plate/nanocarbon/diagonal/yellow
-	color = COLOR_GOLD
+/obj/structure/shuttle_decoration/junction_box
+	name = "junction box"
+	desc = "A power junction box for routing high voltage power through a ship's systems."
+	icon_state = "junction"
+	custom_materials = list(
+		/datum/material/iron = SHEET_MATERIAL_AMOUNT * 5,
+		/datum/material/glass = SHEET_MATERIAL_AMOUNT * 3,
+		/datum/material/gold = HALF_SHEET_MATERIAL_AMOUNT,
+	)
 
-/obj/structure/shuttle_decoration/wall_plate/armor
-	name = "armor plating"
-	desc = "Thick armor plating to protect ships from anything between asteroid impacts and weapons fire."
-	icon_state = "armor"
-	cut_plating = /obj/structure/hull_plating/armor_panels
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/shuttle_decoration/junction_box, 4)
 
-/obj/structure/shuttle_decoration/wall_plate/armor/diagonal
-	icon_state = "armor_diag"
+/obj/structure/shuttle_decoration/console
+	name = "computer console"
+	desc = "Controls for the ship, monitoring for the reactor, or even just a screen for watching \"Extremely Large Baseball\" on."
+	icon_state = "console"
+	custom_materials = list(
+		/datum/material/iron = SHEET_MATERIAL_AMOUNT * 3,
+		/datum/material/glass = SHEET_MATERIAL_AMOUNT * 5,
+	)
 
-/obj/structure/shuttle_decoration/wall_plate/plastamic
-	name = "plastamic cladding"
-	desc = "Polymer sheets used to cover a typically much uglier hull plate behind them."
-	icon_state = "plastic"
-	cut_plating = /obj/structure/hull_plating/plastamic_sheets
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/shuttle_decoration/console, 10)
diff --git a/modular_doppler/shipbreaking/code/shuttle_parts/girders.dm b/modular_doppler/shipbreaking/code/shuttle_parts/girders.dm
new file mode 100644
index 00000000000000..dbdc45751405c1
--- /dev/null
+++ b/modular_doppler/shipbreaking/code/shuttle_parts/girders.dm
@@ -0,0 +1,41 @@
+/obj/structure/titanium_structure
+	name = "titanium framing"
+	desc = "A large skeleton made of titanium steel that makes up the outer structure of most ships"
+	icon = 'modular_doppler/shipbreaking/icons/smooth/girder_titan.dmi'
+	icon_state = "girder_titan-0"
+	base_icon_state = "girder_titan"
+	anchored = TRUE
+	density = TRUE
+	max_integrity = 200
+	rad_insulation = RAD_VERY_LIGHT_INSULATION
+	smoothing_flags = SMOOTH_BITMASK
+	smoothing_groups = SMOOTH_GROUP_GIRDER
+	canSmoothWith = SMOOTH_GROUP_GIRDER + SMOOTH_GROUP_WALLS
+	custom_materials = list(
+		/datum/material/iron = SHEET_MATERIAL_AMOUNT * 2,
+		/datum/material/titanium = SHEET_MATERIAL_AMOUNT * 1,
+	)
+
+/obj/structure/titanium_structure/Initialize(mapload)
+	. = ..()
+	ADD_TRAIT(src, TRAIT_RECYCLE_LIKE_ITEM, TRAIT_GENERIC)
+	register_context()
+
+/obj/structure/titanium_structure/add_context(atom/source, list/context, obj/item/held_item, mob/user)
+	. = ..()
+	if(isnull(held_item))
+		return NONE
+	if(held_item.tool_behaviour == TOOL_WELDER)
+		context[SCREENTIP_CONTEXT_LMB] = anchored ? "Unsecure" : "Secure"
+		return CONTEXTUAL_SCREENTIP_SET
+
+/obj/structure/titanium_structure/examine(mob/user)
+	. = ..()
+	. += span_notice("Can be removed by cutting it off.")
+
+/obj/structure/titanium_structure/welder_act(mob/living/user, obj/item/tool)
+	balloon_alert(user, anchored ? "cutting..." : "securing...")
+	if(!tool.use_tool(src, user, 2 SECONDS, amount = 1, volume=50))
+		return ITEM_INTERACT_BLOCKING
+	set_anchored(!anchored)
+	return ITEM_INTERACT_SUCCESS
diff --git a/modular_doppler/shipbreaking/code/shuttle_parts/hazards.dm b/modular_doppler/shipbreaking/code/shuttle_parts/hazards.dm
new file mode 100644
index 00000000000000..85ff8bc73efe2f
--- /dev/null
+++ b/modular_doppler/shipbreaking/code/shuttle_parts/hazards.dm
@@ -0,0 +1,261 @@
+/obj/structure/shuttle_decoration/liquid_tank
+	abstract_type = /obj/structure/shuttle_decoration/liquid_tank
+	name = "liquid tank basetype"
+	desc = "A basetype for liquid tanks that you SHOULD NOT BE SEEING!!"
+	icon_state = "basic_tank"
+	density = TRUE
+	unfasten_time = 3 SECONDS
+	drag_slowdown = 3
+	inertia_force_weight = 2
+	/// What is the range of our rupture effects? Doesn't cover explosions.
+	var/rupture_range = 2
+
+/// When the tank is damaged enough to break, this is what it does
+/obj/structure/shuttle_decoration/liquid_tank/proc/rupture_tank()
+	return
+
+/obj/structure/shuttle_decoration/liquid_tank/battery
+	name = "ship battery"
+	desc = "A large ship's battery for long term storage of power, extremely dangerous when damaged."
+	icon_state = "battery"
+	custom_materials = list(
+		/datum/material/alloy/plastitaniumglass = SHEET_MATERIAL_AMOUNT * 4,
+		/datum/material/plastic = SHEET_MATERIAL_AMOUNT * 3,
+		/datum/material/uranium = SHEET_MATERIAL_AMOUNT * 2,
+		/datum/material/bluespace = HALF_SHEET_MATERIAL_AMOUNT,
+	)
+
+/obj/structure/shuttle_decoration/liquid_tank/battery/rupture_tank()
+	tesla_zap(source = src, zap_range = 5, power = 1e7, cutoff = 1e3, zap_flags = ZAP_MOB_DAMAGE | ZAP_OBJ_DAMAGE | ZAP_MOB_STUN | ZAP_LOW_POWER_GEN | ZAP_ALLOW_DUPLICATES)
+	Destroy()
+
+/obj/structure/shuttle_decoration/liquid_tank/battery/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum)
+	. = ..()
+	tesla_zap(source = src, zap_range = 3, power = 1e4, cutoff = 1e3, zap_flags = ZAP_MOB_DAMAGE | ZAP_OBJ_DAMAGE | ZAP_MOB_STUN | ZAP_LOW_POWER_GEN | ZAP_ALLOW_DUPLICATES)
+
+/obj/structure/shuttle_decoration/liquid_tank/battery/shipmind
+	name = "HECS-2 Shipmind Core"
+	desc = "An automated shipmind core containing everything from flight control, battery storage, and even reaction wheels \
+		for smaller vessels. A probe core suitable for advanced satellites and small ships. You are assured that these are \
+		\"usually\" uninhabited."
+	icon_state = "shipmind"
+	custom_materials = list(
+		/datum/material/alloy/titaniumglass = SHEET_MATERIAL_AMOUNT * 3,
+		/datum/material/plastic = SHEET_MATERIAL_AMOUNT * 2,
+		/datum/material/alloy/plasteel = SHEET_MATERIAL_AMOUNT * 2.5,
+		/datum/material/gold = SHEET_MATERIAL_AMOUNT * 2,
+		/datum/material/uranium = HALF_SHEET_MATERIAL_AMOUNT,
+	)
+	/// Is this shipmind core inhabitable by ghosts with a soulcatcher?
+	var/has_soulcatcher = TRUE
+
+/obj/structure/shuttle_decoration/liquid_tank/battery/shipmind/Initialize(mapload)
+	. = ..()
+	if(has_soulcatcher)
+		var/datum/component/soulcatcher/shipmind = AddComponent(/datum/component/soulcatcher/shipmind_core)
+		shipmind.create_room(target_name = "Shipmind Corespace", target_desc = "An environment of constantly flowing information, data, controls, you should be in control of a ship, and yet your contacts have worn and senses dulled.")
+
+/obj/structure/shuttle_decoration/liquid_tank/battery/shipmind/inert
+	has_soulcatcher = FALSE
+
+/datum/component/soulcatcher/shipmind_core
+	name = "Defunct Shipmind Core"
+	ghost_joinable = TRUE
+	require_approval = FALSE
+	max_souls = 1
+	communicate_as_parent = TRUE
+	removable = FALSE
+
+/obj/structure/shuttle_decoration/liquid_tank/coolant
+	name = "coolant tank"
+	desc = "A tank of semi-radioactive coolant used to keep the interiors of ships habitable. Freezes AND irradiates \
+		everything around it when ruptured!"
+	icon_state = "coolant"
+	custom_materials = list(
+		/datum/material/alloy/plastitaniumglass = SHEET_MATERIAL_AMOUNT * 4,
+		/datum/material/plastic = SHEET_MATERIAL_AMOUNT * 3,
+		/datum/material/plasma = SHEET_MATERIAL_AMOUNT * 2,
+		/datum/material/iron = SHEET_MATERIAL_AMOUNT * 3,
+	)
+	rupture_range = 2
+
+/obj/structure/shuttle_decoration/liquid_tank/coolant/industrial
+	name = "industrial coolant tank"
+	icon = 'modular_doppler/shipbreaking/icons/closet.dmi'
+	icon_state = "coolant_big"
+	custom_materials = list(
+		/datum/material/alloy/plastitaniumglass = SHEET_MATERIAL_AMOUNT * 8,
+		/datum/material/plastic = SHEET_MATERIAL_AMOUNT * 4,
+		/datum/material/plasma = SHEET_MATERIAL_AMOUNT * 3,
+		/datum/material/iron = SHEET_MATERIAL_AMOUNT * 7.5,
+	)
+	rupture_range = 5
+
+// Basically does the same thing as a gluon grenade, radiation and freezing everyone nearby
+/obj/structure/shuttle_decoration/liquid_tank/coolant/rupture_tank()
+	playsound(loc, 'sound/effects/empulse.ogg', 50, TRUE)
+	radiation_pulse(src, max_range = rupture_range, threshold = RAD_HEAVY_INSULATION, chance = 100)
+	for(var/turf/open/floor/floor in view(rupture_range, loc))
+		floor.freeze_turf()
+	Destroy()
+
+/obj/structure/shuttle_decoration/liquid_tank/explosive
+	name = "tank of fuming acid"
+	desc = "One of the three components to standard chemical shuttle fuel of the last century, fuming acid. \
+		Highly explosive if the tank is ruptured."
+	icon_state = "acid"
+	custom_materials = list(
+		/datum/material/alloy/plastitaniumglass = SHEET_MATERIAL_AMOUNT * 4,
+		/datum/material/plastic = SHEET_MATERIAL_AMOUNT * 3,
+		/datum/material/plasma = SHEET_MATERIAL_AMOUNT * 5,
+	)
+	rupture_range = 4
+
+/obj/structure/shuttle_decoration/liquid_tank/explosive/industrial
+	name = "industrial tank of fuming acid"
+	icon = 'modular_doppler/shipbreaking/icons/closet.dmi'
+	icon_state = "acid_big"
+	custom_materials = list(
+		/datum/material/alloy/plastitaniumglass = SHEET_MATERIAL_AMOUNT * 8,
+		/datum/material/plastic = SHEET_MATERIAL_AMOUNT * 4,
+		/datum/material/plasma = SHEET_MATERIAL_AMOUNT * 7,
+		/datum/material/iron = SHEET_MATERIAL_AMOUNT * 7.5,
+	)
+	rupture_range = 7
+
+/obj/structure/shuttle_decoration/liquid_tank/explosive/rupture_tank()
+	playsound(src, 'sound/effects/bamf.ogg', 75, TRUE)
+	var/datum/effect_system/fluid_spread/foam/foam = new
+	var/datum/reagents/foamreagent = new /datum/reagents(100)
+	foamreagent.add_reagent(/datum/reagent/toxin/acid/nitracid, 30)
+	foamreagent.add_reagent(/datum/reagent/toxin/acid, 70)
+	foam.set_up(rupture_range, holder = src, location = get_turf(src), carry = foamreagent)
+	foam.start()
+	Destroy()
+
+/obj/structure/shuttle_decoration/liquid_tank/explosive/hydrazine
+	name = "tank of nitrohydrazine"
+	desc = "One of the three components to standard chemical shuttle fuel of the last century, nitrohydrazine. \
+		Highly explosive if the tank is ruptured, because hydrazine didn't have enough nitrogen already."
+	icon_state = "nitrohydrazine"
+
+/obj/structure/shuttle_decoration/liquid_tank/explosive/hydrazine/rupture_tank()
+	explosion(src, heavy_impact_range = 1, light_impact_range = 2, flame_range = 4, flash_range = 5, smoke = TRUE)
+	Destroy()
+
+/obj/structure/shuttle_decoration/liquid_tank/explosive/hydrazine/industrial
+	name = "industrial tank of nitrohydrazine"
+	icon = 'modular_doppler/shipbreaking/icons/closet.dmi'
+	icon_state = "hydrazine_big"
+
+/obj/structure/shuttle_decoration/liquid_tank/explosive/hydrazine/industrial/rupture_tank()
+	explosion(src, heavy_impact_range = 2, light_impact_range = 4, flame_range = 8, flash_range = 12, smoke = TRUE)
+	Destroy()
+
+/obj/structure/shuttle_decoration/liquid_tank/explosive/lithium
+	name = "tank of lithium"
+	desc = "One of the three components to standard chemical shuttle fuel of the last century, lithium. \
+		Highly explosive if the tank is ruptured."
+	icon_state = "lithium"
+	rupture_range = 2
+
+/obj/structure/shuttle_decoration/liquid_tank/explosive/lithium/industrial
+	name = "industrial tank of lithium"
+	icon = 'modular_doppler/shipbreaking/icons/closet.dmi'
+	icon_state = "lithium_big"
+	rupture_range = 5
+
+/obj/structure/shuttle_decoration/liquid_tank/explosive/lithium/rupture_tank()
+	playsound(src, 'sound/effects/bamf.ogg', 75, TRUE)
+	var/datum/effect_system/fluid_spread/foam/long/foam = new
+	var/datum/reagents/foamreagent = new /datum/reagents(100)
+	foamreagent.add_reagent(/datum/reagent/clf3, 50)
+	foamreagent.add_reagent(/datum/reagent/napalm, 50)
+	foam.set_up(rupture_range, holder = src, location = get_turf(src), carry = foamreagent)
+	foam.start()
+	explosion(src, heavy_impact_range = 0, light_impact_range = 0, flame_range = rupture_range, flash_range = rupture_range * 3, smoke = TRUE)
+	Destroy()
+
+/obj/structure/shuttle_decoration/liquid_tank/reactor
+	name = "ethereal bloom reactor"
+	desc = "Superceded by modern ship reactor designs, this older type of generator can be most accurately described as \
+		a \"Tortured Chrysalid\". Utilizing the same type of core process that powers the ethereal, it recycles energy with nearly \
+		perfect efficiency. Calling it a reactor is a complete misnomer, as these act more closely to a large battery \
+		with a generational lifespan."
+	icon_state = "reactor"
+	custom_materials = list(
+		/datum/material/alloy/alien = SHEET_MATERIAL_AMOUNT * 10,
+		/datum/material/alloy/plastitaniumglass = SHEET_MATERIAL_AMOUNT * 6.5,
+		/datum/material/alloy/plasteel = SHEET_MATERIAL_AMOUNT * 4,
+		/datum/material/uranium = SHEET_MATERIAL_AMOUNT * 5,
+		/datum/material/bluespace = SHEET_MATERIAL_AMOUNT * 3,
+		/datum/material/diamond = SHEET_MATERIAL_AMOUNT * 4,
+	)
+	light_on = TRUE
+	light_power = 2
+	light_range = 3
+	light_color = LIGHT_COLOR_PURPLE
+	rupture_range = 14
+
+/obj/structure/shuttle_decoration/liquid_tank/reactor/rupture_tank()
+	playsound(src, 'modular_doppler/shipbreaking/sound/plasma_bomb.ogg', 100, FALSE, 70, pressure_affected = FALSE, ignore_walls = TRUE)
+	radiation_pulse(src, max_range = rupture_range, threshold = RAD_EXTREME_INSULATION, chance = 100)
+	var/vaporize_that_guy = rand(2, 4)
+	for(var/iterator in 1 to vaporize_that_guy)
+		tesla_zap(source = src, zap_range = rupture_range / 5, power = 1e7, cutoff = 1e3, zap_flags = ZAP_MOB_DAMAGE | ZAP_OBJ_DAMAGE | ZAP_MOB_STUN | ZAP_LOW_POWER_GEN | ZAP_ALLOW_DUPLICATES)
+	goonchem_vortex(get_turf(src), FALSE, 10)
+	explosion(src, heavy_impact_range = 3, light_impact_range = 7, flame_range = 12, flash_range = 23, silent = TRUE, smoke = TRUE)
+	Destroy()
+
+/obj/structure/shuttle_decoration/liquid_tank/reactor/super
+	name = "large ethereal bloom reactor"
+	icon_state = "super_reactor"
+	custom_materials = list(
+		/datum/material/alloy/alien = SHEET_MATERIAL_AMOUNT * 13,
+		/datum/material/alloy/plastitaniumglass = SHEET_MATERIAL_AMOUNT * 8,
+		/datum/material/alloy/plasteel = SHEET_MATERIAL_AMOUNT * 6,
+		/datum/material/uranium = SHEET_MATERIAL_AMOUNT * 8,
+		/datum/material/bluespace = SHEET_MATERIAL_AMOUNT * 5,
+		/datum/material/diamond = SHEET_MATERIAL_AMOUNT * 7,
+	)
+	rupture_range = 25
+
+/obj/structure/shuttle_decoration/liquid_tank/reactor/super/rupture_tank()
+	playsound(src, 'modular_doppler/shipbreaking/sound/plasma_bomb.ogg', 100, FALSE, 100, pressure_affected = FALSE, ignore_walls = TRUE)
+	radiation_pulse(src, max_range = 25, threshold = RAD_EXTREME_INSULATION, chance = 100)
+	var/vaporize_that_guy = rand(3, 6)
+	for(var/iterator in 1 to vaporize_that_guy)
+		tesla_zap(source = src, zap_range = 5, power = 5e7, cutoff = 1e3, zap_flags = ZAP_MOB_DAMAGE | ZAP_OBJ_DAMAGE | ZAP_MOB_STUN | ZAP_LOW_POWER_GEN | ZAP_ALLOW_DUPLICATES)
+	goonchem_vortex(get_turf(src), FALSE, 13)
+	explosion(src, heavy_impact_range = 5, light_impact_range = 10, flame_range = 15, flash_range = 34, silent = TRUE, smoke = TRUE)
+	Destroy()
+
+/obj/structure/shuttle_decoration/liquid_tank/blob_act(obj/structure/blob/blob_bit)
+	rupture_tank()
+
+/obj/structure/shuttle_decoration/liquid_tank/ex_act()
+	rupture_tank()
+	return TRUE
+
+/obj/structure/shuttle_decoration/liquid_tank/fire_act(exposed_temperature, exposed_volume)
+	rupture_tank()
+
+/obj/structure/shuttle_decoration/liquid_tank/zap_act(power, zap_flags)
+	. = ..()
+	if(ZAP_OBJ_DAMAGE & zap_flags)
+		rupture_tank()
+
+/obj/structure/shuttle_decoration/liquid_tank/bullet_act(obj/projectile/hitting_projectile)
+	if(hitting_projectile.damage > 0 && ((hitting_projectile.damage_type == BURN) || (hitting_projectile.damage_type == BRUTE)))
+		log_bomber(hitting_projectile.firer, "ruptured", src, "via projectile")
+		rupture_tank()
+		return hitting_projectile.on_hit(src, 0)
+	return ..()
+
+/obj/structure/shuttle_decoration/liquid_tank/welder_act(mob/living/user, obj/item/tool)
+	user.visible_message(
+		span_danger("[user] cuts into [src]!"),
+		span_userdanger("Is [src] supposed to make that sound?"))
+	log_bomber(user, "ruptured", src, "via [tool.name]")
+	rupture_tank()
+	return ITEM_INTERACT_SUCCESS
diff --git a/modular_doppler/shipbreaking/code/shuttle_parts/hull.dm b/modular_doppler/shipbreaking/code/shuttle_parts/hull.dm
index b9816b5c2df2b8..d4fe353ebe46fd 100644
--- a/modular_doppler/shipbreaking/code/shuttle_parts/hull.dm
+++ b/modular_doppler/shipbreaking/code/shuttle_parts/hull.dm
@@ -4,11 +4,13 @@
 	density = TRUE
 	anchored = FALSE
 	drag_slowdown = 1.5
+	inertia_force_weight = 2
 	/// How much damage we do when we fall on or crash into someone
 	var/crush_damage = 40
 
 /obj/structure/hull_plating/Initialize(mapload)
 	. = ..()
+	ADD_TRAIT(src, TRAIT_RECYCLE_LIKE_ITEM, TRAIT_GENERIC)
 	AddElement(/datum/element/falling_hazard, damage = crush_damage, wound_bonus = 20, hardhat_safety = FALSE, crushes = TRUE, impact_sound = 'sound/effects/bang.ogg')
 
 /obj/structure/hull_plating/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum)
@@ -38,7 +40,7 @@
 					// Femur breaker if you're not lucky
 					carbon_target.take_bodypart_damage(crush_damage, 0, check_armor = TRUE, wound_bonus = 5)
 					carbon_target.take_bodypart_damage(crush_damage, 0, check_armor = TRUE, wound_bonus = 5)
-				carbon_target.AddElement(/datum/element/squish, 80 SECONDS)
+				carbon_target.AddElement(/datum/element/squish, 30 SECONDS)
 			else
 				living_target.apply_damage(crush_damage, BRUTE, blocked = blocked, forced = TRUE, attack_direction = get_dir(src, atom_target))
 			living_target.Paralyze(4 SECONDS)
@@ -52,7 +54,6 @@
 			atom_target.visible_message(span_danger("[atom_target] is crushed by [src]!"), span_userdanger("You are crushed by [src]!"))
 			playsound(src, 'sound/effects/bang.ogg', 40)
 			visible_message(span_danger("[src] crashes into [atom_target]!"))
-	Move(osha_nonworker, get_dir(src, osha_nonworker))
 
 /obj/structure/hull_plating/nanocarbon
 	name = "nanocarbon panels"
@@ -62,6 +63,7 @@
 		/datum/material/nanocarbon = SHEET_MATERIAL_AMOUNT * 3,
 	)
 	crush_damage = 50
+	color = COLOR_SILVER
 
 /obj/structure/hull_plating/nanocarbon/ex_act(severity, target)
 	. = ..()
@@ -77,6 +79,8 @@
 		shard.pixel_x = rand(-6, 6)
 		shard.pixel_y = rand(-6, 6)
 		shard.color = color
+		var/atom/throw_target = get_edge_target_turf(shard, pick(GLOB.alldirs))
+		shard.throw_at(throw_target, 6, 6)
 
 /obj/structure/hull_plating/nanocarbon/floor
 	name = "nanocarbon panel"
@@ -147,166 +151,3 @@
 	custom_materials = list(
 		/datum/material/aluminum = SHEET_MATERIAL_AMOUNT,
 	)
-
-/turf/closed/wall/mineral/nanocarbon
-	name = "nanocarbon hull"
-	desc = "A durable nanocarbon-metal alloy hull used commonly in high endurance ships."
-	icon = 'modular_doppler/shipbreaking/icons/turfs/nanocarbon_wall.dmi'
-	icon_state = "nanocarbon_wall-0"
-	base_icon_state = "nanocarbon_wall"
-	explosive_resistance = 3
-	flags_ricochet = RICOCHET_SHINY | RICOCHET_HARD
-	sheet_type = /obj/item/stack/sheet/nanocarbon
-	hardness = 20
-	smoothing_flags = SMOOTH_BITMASK | SMOOTH_DIAGONAL_CORNERS | SMOOTH_OBJ
-	smoothing_groups = SMOOTH_GROUP_PLASTITANIUM_WALLS + SMOOTH_GROUP_WALLS + SMOOTH_GROUP_CLOSED_TURFS
-	canSmoothWith = SMOOTH_GROUP_SHUTTLE_PARTS + SMOOTH_GROUP_AIRLOCK + SMOOTH_GROUP_PLASTITANIUM_WALLS
-	custom_materials = list(
-		/datum/material/nanocarbon = SHEET_MATERIAL_AMOUNT * 3,
-	)
-	rust_resistance = RUST_RESISTANCE_TITANIUM
-	baseturfs = /turf/baseturf_bottom
-	/// How many shards of nanocarbon the wall will make when exploded, maximum
-	var/number_of_shards = 6
-
-/turf/closed/wall/mineral/nanocarbon/break_wall()
-	var/obj/new_plating = new /obj/structure/hull_plating/nanocarbon(src)
-	new_plating.color = color
-	if(girder_type)
-		return new girder_type(src)
-
-/turf/closed/wall/mineral/nanocarbon/devastate_wall()
-	var/random_shards = rand(2, number_of_shards)
-	for(var/iteration in 1 to random_shards)
-		var/obj/item/shard = new /obj/item/nanocarbon_shard(src)
-		shard.pixel_x = rand(-6, 6)
-		shard.pixel_y = rand(-6, 6)
-		shard.color = color
-	if(girder_type)
-		return new girder_type(src)
-
-/turf/closed/wall/mineral/nanocarbon/nodiagonal
-	icon = MAP_SWITCH('modular_doppler/shipbreaking/icons/turfs/nanocarbon_wall.dmi', 'modular_doppler/shipbreaking/icons/turfs/walls_misc.dmi')
-	icon_state = MAP_SWITCH("nanocarbon_wall-0", "nanocarbon_nd")
-	smoothing_flags = SMOOTH_BITMASK
-
-/turf/closed/wall/mineral/nanocarbon/black
-	color = COLOR_DARK
-
-/turf/closed/wall/mineral/nanocarbon/nodiagonal/black
-	color = COLOR_DARK
-
-/turf/closed/wall/mineral/nanocarbon/standard
-	color = COLOR_SILVER
-
-/turf/closed/wall/mineral/nanocarbon/nodiagonal/standard
-	color = COLOR_SILVER
-
-/turf/closed/wall/mineral/nanocarbon/red
-	color = COLOR_BUBBLEGUM_RED
-
-/turf/closed/wall/mineral/nanocarbon/nodiagonal/red
-	color = COLOR_BUBBLEGUM_RED
-
-/turf/closed/wall/mineral/nanocarbon/green
-	color = COLOR_IRISH_GREEN
-
-/turf/closed/wall/mineral/nanocarbon/nodiagonal/green
-	color = COLOR_IRISH_GREEN
-
-/turf/closed/wall/mineral/nanocarbon/blue
-	color = COLOR_COMMAND_BLUE
-
-/turf/closed/wall/mineral/nanocarbon/nodiagonal/blue
-	color = COLOR_COMMAND_BLUE
-
-/turf/closed/wall/mineral/nanocarbon/yellow
-	color = COLOR_GOLD
-
-/turf/closed/wall/mineral/nanocarbon/nodiagonal/yellow
-	color = COLOR_GOLD
-
-/turf/closed/wall/mineral/aluminum
-	name = "aluminum wall"
-	desc = "A thin aluminum wall, commonly used to plate the interior of ships."
-	icon = 'modular_doppler/shipbreaking/icons/turfs/aluminum_wall.dmi'
-	icon_state = "aluminum_wall-0"
-	base_icon_state = "aluminum_wall"
-	sheet_type = /obj/item/stack/sheet/aluminum
-	hardness = 50
-	explosive_resistance = 0
-	smoothing_flags = SMOOTH_BITMASK | SMOOTH_OBJ
-	smoothing_groups = SMOOTH_GROUP_TITANIUM_WALLS + SMOOTH_GROUP_WALLS + SMOOTH_GROUP_CLOSED_TURFS
-	canSmoothWith = SMOOTH_GROUP_AIRLOCK + SMOOTH_GROUP_PLASTITANIUM_WALLS + SMOOTH_GROUP_TITANIUM_WALLS
-	custom_materials = list(
-		/datum/material/aluminum = SHEET_MATERIAL_AMOUNT * 2,
-	)
-	rust_resistance = RUST_RESISTANCE_TITANIUM
-	baseturfs = /turf/open/floor/plating/nanocarbon
-
-/turf/closed/wall/mineral/aluminum/break_wall()
-	var/obj/new_plating = new /obj/structure/hull_plating/aluminum(src)
-	new_plating.color = color
-	if(girder_type)
-		return new girder_type(src)
-
-/turf/open/floor/plating/nanocarbon
-	name = "nanocarbon hull"
-	desc = "A durable nanocarbon-metal alloy hull used commonly in high endurance ships."
-	icon = 'modular_doppler/shipbreaking/icons/turfs/floors.dmi'
-	icon_state = "nanocarbon"
-	base_icon_state = "nanocarbon"
-	attachment_holes = FALSE
-	upgradable = FALSE
-	rust_resistance = RUST_RESISTANCE_TITANIUM
-	/// What kind of plating we make when cut apart
-	var/obj/cut_plating = /obj/structure/hull_plating/nanocarbon/floor
-
-/turf/open/floor/plating/nanocarbon/Initialize(mapload)
-	. = ..()
-	var/static/list/tool_behaviors = list(
-		TOOL_WELDER = list(
-			SCREENTIP_CONTEXT_LMB = "Cut Hull",
-		),
-	)
-	AddElement(/datum/element/contextual_screentip_tools, tool_behaviors)
-
-/turf/open/floor/plating/nanocarbon/welder_act(mob/living/user, obj/item/tool)
-	balloon_alert(user, "cutting...")
-	if(!tool.use_tool(src, user, 4 SECONDS, amount = 1, volume=50))
-		return ITEM_INTERACT_BLOCKING
-	new cut_plating(get_turf(src))
-	ScrapeAway()
-	return ITEM_INTERACT_SUCCESS
-
-/turf/open/floor/plating/aluminum
-	name = "aluminum hull"
-	desc = "Thin aluminum hull, commonly used to plate the cargo bays of ships."
-	icon = 'modular_doppler/shipbreaking/icons/turfs/aluminum.dmi'
-	icon_state = "aluminum-0"
-	base_icon_state = "aluminum"
-	attachment_holes = FALSE
-	upgradable = FALSE
-	rust_resistance = RUST_RESISTANCE_TITANIUM
-	smoothing_flags = SMOOTH_BITMASK
-	smoothing_groups = SMOOTH_GROUP_TURF_CHASM
-	canSmoothWith = SMOOTH_GROUP_TURF_CHASM
-	/// What kind of plating we make when cut apart
-	var/obj/cut_plating = /obj/structure/hull_plating/aluminum/floor
-
-/turf/open/floor/plating/aluminum/Initialize(mapload)
-	. = ..()
-	var/static/list/tool_behaviors = list(
-		TOOL_WELDER = list(
-			SCREENTIP_CONTEXT_LMB = "Cut Plating",
-		),
-	)
-	AddElement(/datum/element/contextual_screentip_tools, tool_behaviors)
-
-/turf/open/floor/plating/aluminum/welder_act(mob/living/user, obj/item/tool)
-	balloon_alert(user, "cutting...")
-	if(!tool.use_tool(src, user, 4 SECONDS, amount = 1, volume=50))
-		return ITEM_INTERACT_BLOCKING
-	new cut_plating(get_turf(src))
-	ScrapeAway()
-	return ITEM_INTERACT_SUCCESS
diff --git a/modular_doppler/shipbreaking/code/shuttle_parts/hull_turfs.dm b/modular_doppler/shipbreaking/code/shuttle_parts/hull_turfs.dm
new file mode 100644
index 00000000000000..7f97a043c011e9
--- /dev/null
+++ b/modular_doppler/shipbreaking/code/shuttle_parts/hull_turfs.dm
@@ -0,0 +1,244 @@
+/turf/closed/wall/mineral/nanocarbon
+	name = "nanocarbon hull"
+	desc = "A durable nanocarbon-metal alloy hull used commonly in high endurance ships."
+	icon = 'modular_doppler/shipbreaking/icons/turfs/nanocarbon_wall.dmi'
+	icon_state = "nanocarbon_wall-0"
+	base_icon_state = "nanocarbon_wall"
+	explosive_resistance = 3
+	flags_ricochet = RICOCHET_SHINY | RICOCHET_HARD
+	sheet_type = /obj/item/stack/sheet/nanocarbon
+	hardness = 20
+	smoothing_flags = SMOOTH_BITMASK | SMOOTH_DIAGONAL_CORNERS | SMOOTH_OBJ
+	smoothing_groups = SMOOTH_GROUP_PLASTITANIUM_WALLS + SMOOTH_GROUP_WALLS + SMOOTH_GROUP_CLOSED_TURFS
+	canSmoothWith = SMOOTH_GROUP_SHUTTLE_PARTS + SMOOTH_GROUP_AIRLOCK + SMOOTH_GROUP_PLASTITANIUM_WALLS
+	custom_materials = list(
+		/datum/material/nanocarbon = SHEET_MATERIAL_AMOUNT * 3,
+	)
+	rust_resistance = RUST_RESISTANCE_TITANIUM
+	baseturfs = /turf/baseturf_bottom
+	girder_type = /obj/structure/titanium_structure
+	/// How many shards of nanocarbon the wall will make when exploded, maximum
+	var/number_of_shards = 6
+
+/turf/closed/wall/mineral/nanocarbon/break_wall()
+	var/obj/new_plating = new /obj/structure/hull_plating/nanocarbon(src)
+	new_plating.color = color
+	if(girder_type)
+		return new girder_type(src)
+
+/turf/closed/wall/mineral/nanocarbon/devastate_wall()
+	var/random_shards = rand(2, number_of_shards)
+	for(var/iteration in 1 to random_shards)
+		var/obj/item/shard = new /obj/item/nanocarbon_shard(src)
+		shard.pixel_x = rand(-6, 6)
+		shard.pixel_y = rand(-6, 6)
+		shard.color = color
+		var/atom/throw_target = get_edge_target_turf(shard, pick(GLOB.alldirs))
+		shard.throw_at(throw_target, 6, 6)
+	if(girder_type && prob(40))
+		new girder_type(src)
+
+/turf/closed/wall/mineral/nanocarbon/nodiagonal
+	icon = MAP_SWITCH('modular_doppler/shipbreaking/icons/turfs/nanocarbon_wall.dmi', 'modular_doppler/shipbreaking/icons/turfs/walls_misc.dmi')
+	icon_state = MAP_SWITCH("nanocarbon_wall-0", "nanocarbon_nd")
+	smoothing_flags = SMOOTH_BITMASK
+
+/turf/closed/wall/mineral/nanocarbon/primary_colour
+	color = COLOR_AMETHYST
+
+/turf/closed/wall/mineral/nanocarbon/primary_colour/Initialize(mapload)
+	. = ..()
+	ADD_TRAIT(src, TRAIT_SHIP_PRIMARY_COLOUR, TRAIT_GENERIC)
+
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour
+	color = COLOR_AMETHYST
+
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/primary_colour/Initialize(mapload)
+	. = ..()
+	ADD_TRAIT(src, TRAIT_SHIP_PRIMARY_COLOUR, TRAIT_GENERIC)
+
+/turf/closed/wall/mineral/nanocarbon/secondary_colour
+	color = COLOR_BROWN
+
+/turf/closed/wall/mineral/nanocarbon/secondary_colour/Initialize(mapload)
+	. = ..()
+	ADD_TRAIT(src, TRAIT_SHIP_SECONDARY_COLOUR, TRAIT_GENERIC)
+
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/secondary_colour
+	color = COLOR_BROWN
+
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/secondary_colour/Initialize(mapload)
+	. = ..()
+	ADD_TRAIT(src, TRAIT_SHIP_SECONDARY_COLOUR, TRAIT_GENERIC)
+
+/turf/closed/wall/mineral/nanocarbon/black
+	color = COLOR_DARK
+
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/black
+	color = COLOR_DARK
+
+/turf/closed/wall/mineral/nanocarbon/standard
+	color = COLOR_SILVER
+
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/standard
+	color = COLOR_SILVER
+
+/turf/closed/wall/mineral/nanocarbon/red
+	color = COLOR_BUBBLEGUM_RED
+
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/red
+	color = COLOR_BUBBLEGUM_RED
+
+/turf/closed/wall/mineral/nanocarbon/green
+	color = COLOR_IRISH_GREEN
+
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/green
+	color = COLOR_IRISH_GREEN
+
+/turf/closed/wall/mineral/nanocarbon/blue
+	color = COLOR_COMMAND_BLUE
+
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/blue
+	color = COLOR_COMMAND_BLUE
+
+/turf/closed/wall/mineral/nanocarbon/yellow
+	color = COLOR_GOLD
+
+/turf/closed/wall/mineral/nanocarbon/nodiagonal/yellow
+	color = COLOR_GOLD
+
+/turf/closed/wall/mineral/aluminum
+	name = "aluminum wall"
+	desc = "A thin aluminum wall, commonly used to plate the interior of ships."
+	icon = 'modular_doppler/shipbreaking/icons/turfs/aluminum_wall.dmi'
+	icon_state = "aluminum_wall-0"
+	base_icon_state = "aluminum_wall"
+	sheet_type = /obj/item/stack/sheet/aluminum
+	hardness = 50
+	explosive_resistance = 0
+	smoothing_flags = SMOOTH_BITMASK | SMOOTH_OBJ
+	smoothing_groups = SMOOTH_GROUP_TITANIUM_WALLS + SMOOTH_GROUP_WALLS + SMOOTH_GROUP_CLOSED_TURFS
+	canSmoothWith = SMOOTH_GROUP_AIRLOCK + SMOOTH_GROUP_PLASTITANIUM_WALLS + SMOOTH_GROUP_TITANIUM_WALLS
+	custom_materials = list(
+		/datum/material/aluminum = SHEET_MATERIAL_AMOUNT * 2,
+	)
+	rust_resistance = RUST_RESISTANCE_TITANIUM
+	baseturfs = /turf/open/floor/plating/nanocarbon
+
+/turf/closed/wall/mineral/aluminum/break_wall()
+	var/obj/new_plating = new /obj/structure/hull_plating/aluminum(src)
+	new_plating.color = color
+	if(girder_type)
+		return new girder_type(src)
+
+/turf/open/floor/plating/nanocarbon
+	name = "nanocarbon hull"
+	desc = "A durable nanocarbon-metal alloy hull used commonly in high endurance ships."
+	icon = 'modular_doppler/shipbreaking/icons/turfs/floors.dmi'
+	icon_state = "nanocarbon"
+	base_icon_state = "nanocarbon"
+	attachment_holes = FALSE
+	upgradable = FALSE
+	rust_resistance = RUST_RESISTANCE_TITANIUM
+	/// What kind of plating we make when cut apart
+	var/obj/cut_plating = /obj/structure/hull_plating/nanocarbon/floor
+
+/turf/open/floor/plating/nanocarbon/Initialize(mapload)
+	. = ..()
+	var/static/list/tool_behaviors = list(
+		TOOL_WELDER = list(
+			SCREENTIP_CONTEXT_LMB = "Cut Hull",
+		),
+	)
+	AddElement(/datum/element/contextual_screentip_tools, tool_behaviors)
+
+/turf/open/floor/plating/nanocarbon/welder_act(mob/living/user, obj/item/tool)
+	balloon_alert(user, "cutting...")
+	if(!tool.use_tool(src, user, 4 SECONDS, amount = 1, volume=50))
+		return ITEM_INTERACT_BLOCKING
+	new cut_plating(get_turf(src))
+	ScrapeAway()
+	return ITEM_INTERACT_SUCCESS
+
+/turf/open/floor/plating/nanocarbon/ex_act(severity, target)
+	if(severity >= EXPLODE_HEAVY)
+		nanocarbon_nuke()
+	return ..()
+
+/// Makes shards of nanocarbon
+/turf/open/floor/plating/nanocarbon/proc/nanocarbon_nuke()
+	for(var/iteration in 1 to 2)
+		var/obj/item/shard = new /obj/item/nanocarbon_shard(src)
+		shard.pixel_x = rand(-6, 6)
+		shard.pixel_y = rand(-6, 6)
+		shard.color = color
+		var/atom/throw_target = get_edge_target_turf(shard, pick(GLOB.alldirs))
+		shard.throw_at(throw_target, 6, 6)
+
+/turf/open/floor/plating/nanocarbon/exterior
+	icon_state = "nanocarbon_outside"
+	initial_gas_mix = AIRLESS_ATMOS
+
+/turf/open/floor/plating/nanocarbon/exterior/primary_colour
+	color = COLOR_AMETHYST
+
+/turf/open/floor/plating/nanocarbon/exterior/primary_colour/Initialize(mapload)
+	. = ..()
+	ADD_TRAIT(src, TRAIT_SHIP_PRIMARY_COLOUR, TRAIT_GENERIC)
+
+/turf/open/floor/plating/nanocarbon/exterior/secondary_colour
+	color = COLOR_BROWN
+
+/turf/open/floor/plating/nanocarbon/exterior/secondary_colour/Initialize(mapload)
+	. = ..()
+	ADD_TRAIT(src, TRAIT_SHIP_SECONDARY_COLOUR, TRAIT_GENERIC)
+
+/turf/open/floor/plating/nanocarbon/exterior/black
+	color = COLOR_DARK
+
+/turf/open/floor/plating/nanocarbon/exterior/standard
+	color = COLOR_SILVER
+
+/turf/open/floor/plating/nanocarbon/exterior/red
+	color = COLOR_BUBBLEGUM_RED
+
+/turf/open/floor/plating/nanocarbon/exterior/green
+	color = COLOR_IRISH_GREEN
+
+/turf/open/floor/plating/nanocarbon/exterior/blue
+	color = COLOR_COMMAND_BLUE
+
+/turf/open/floor/plating/nanocarbon/exterior/yellow
+	color = COLOR_GOLD
+
+/turf/open/floor/plating/aluminum
+	name = "aluminum hull"
+	desc = "Thin aluminum hull, commonly used to plate the cargo bays of ships."
+	icon = 'modular_doppler/shipbreaking/icons/turfs/aluminum.dmi'
+	icon_state = "aluminum-0"
+	base_icon_state = "aluminum"
+	attachment_holes = FALSE
+	upgradable = FALSE
+	rust_resistance = RUST_RESISTANCE_TITANIUM
+	smoothing_flags = SMOOTH_BITMASK
+	smoothing_groups = SMOOTH_GROUP_TURF_CHASM
+	canSmoothWith = SMOOTH_GROUP_TURF_CHASM
+	/// What kind of plating we make when cut apart
+	var/obj/cut_plating = /obj/structure/hull_plating/aluminum/floor
+
+/turf/open/floor/plating/aluminum/Initialize(mapload)
+	. = ..()
+	var/static/list/tool_behaviors = list(
+		TOOL_WELDER = list(
+			SCREENTIP_CONTEXT_LMB = "Cut Plating",
+		),
+	)
+	AddElement(/datum/element/contextual_screentip_tools, tool_behaviors)
+
+/turf/open/floor/plating/aluminum/welder_act(mob/living/user, obj/item/tool)
+	balloon_alert(user, "cutting...")
+	if(!tool.use_tool(src, user, 4 SECONDS, amount = 1, volume=50))
+		return ITEM_INTERACT_BLOCKING
+	new cut_plating(get_turf(src))
+	ScrapeAway()
+	return ITEM_INTERACT_SUCCESS
diff --git a/modular_doppler/shipbreaking/code/shuttle_parts/materials.dm b/modular_doppler/shipbreaking/code/shuttle_parts/materials.dm
index 72e65e6cad1875..324fecebf1d2d5 100644
--- a/modular_doppler/shipbreaking/code/shuttle_parts/materials.dm
+++ b/modular_doppler/shipbreaking/code/shuttle_parts/materials.dm
@@ -27,11 +27,11 @@
 	sheet_type = /obj/item/stack/sheet/aluminum
 	ore_type = null
 	value_per_unit = 30 / SHEET_MATERIAL_AMOUNT
-	minimum_value_override = 20
+	minimum_value_override = 10
 	mat_rust_resistance = RUST_RESISTANCE_TITANIUM
 	mineral_rarity = 0
 	points_per_unit = 1 / SHEET_MATERIAL_AMOUNT
-	tradable = TRUE
+	tradable = FALSE
 	tradable_base_quantity = MATERIAL_QUANTITY_UNCOMMON
 	fish_weight_modifier = 1.1
 	strength_modifier = 0.8
@@ -70,11 +70,11 @@
 	sheet_type = /obj/item/stack/sheet/nanocarbon
 	ore_type = null
 	value_per_unit = 50 / SHEET_MATERIAL_AMOUNT
-	minimum_value_override = 40
+	minimum_value_override = 25
 	mat_rust_resistance = RUST_RESISTANCE_TITANIUM
 	mineral_rarity = 0
 	points_per_unit = 1 / SHEET_MATERIAL_AMOUNT
-	tradable = TRUE
+	tradable = FALSE
 	tradable_base_quantity = MATERIAL_QUANTITY_UNCOMMON
 	fish_weight_modifier = 0.8
 	strength_modifier = 1.5
diff --git a/modular_doppler/shipbreaking/code/shuttle_parts/munitions.dm b/modular_doppler/shipbreaking/code/shuttle_parts/munitions.dm
new file mode 100644
index 00000000000000..4929a71bbfadd8
--- /dev/null
+++ b/modular_doppler/shipbreaking/code/shuttle_parts/munitions.dm
@@ -0,0 +1,179 @@
+/obj/structure/shuttle_decoration/munition
+	abstract_type = /obj/structure/shuttle_decoration/munition
+	name = "munition basetype"
+	desc = "A basetype for munitions that you SHOULD NOT BE SEEING!!"
+	icon = 'modular_doppler/shipbreaking/icons/64x32.dmi'
+	icon_state = null
+	density = TRUE
+	unfasten_time = 3 SECONDS
+	drag_slowdown = 3
+	inertia_force_weight = 2
+	SET_BASE_PIXEL(-16, 0)
+	/// Has the weapon been armed by mistake?
+	var/armed_and_dangerous = FALSE
+	/// Do we even need to be armed to do our problem effect?
+	var/needs_to_be_armed = TRUE
+	/// Are we currently in the process of exploding?
+	var/currently_cooking_off = FALSE
+	/// Chance to arm on throw impact
+	var/chance_to_arm = 100
+
+/obj/structure/shuttle_decoration/munition/examine(mob/user)
+	. = ..()
+	if(needs_to_be_armed)
+		. += "[span_notice("It will not go off unless under extreme circumstances, unless it is armed. Which, currently,")] [armed_and_dangerous ? span_warning("it is.") : span_nicegreen("it isn't.")]"
+	else
+		. += span_warning("It looks old and unstable, and might go off if handled improperly.")
+
+/// Determines if the weapon should go off or not when non-catastrophic accidents occur to it
+/obj/structure/shuttle_decoration/munition/proc/set_off()
+	if(needs_to_be_armed && !armed_and_dangerous)
+		return FALSE
+	subtle_foreshadowing()
+	return TRUE
+
+/// Makes the munition start sparking and spewing fire as a leadup to exploding, like rimworld
+/obj/structure/shuttle_decoration/munition/proc/subtle_foreshadowing()
+	if(currently_cooking_off)
+		return // We're already exploding, have some patience
+	currently_cooking_off = TRUE
+	visible_message(span_boldwarning("[src] sparks into a violent jet of flame!"), blind_message = span_boldwarning("You hear a violent burning jet of fire!"))
+	playsound(src, 'sound/effects/fuse.ogg', 50, TRUE)
+	set_light(3, 2, LIGHT_COLOR_ELECTRIC_CYAN, l_on = TRUE)
+	addtimer(CALLBACK(src, PROC_REF(disaster_effects)), 5 SECONDS)
+
+/// Makes the munition explode, or do whatever it does
+/obj/structure/shuttle_decoration/munition/proc/disaster_effects()
+	return
+
+/obj/structure/shuttle_decoration/munition/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum)
+	. = ..()
+	if(!armed_and_dangerous && needs_to_be_armed && prob(chance_to_arm))
+		armed_and_dangerous = TRUE
+		playsound(src, 'sound/items/timer.ogg', 50, TRUE)
+		visible_message(span_warning("[src] makes an ominous beep!"), blind_message = span_warning("You hear an ominous beep!"))
+	else if(!needs_to_be_armed && prob(chance_to_arm))
+		subtle_foreshadowing()
+
+/obj/structure/shuttle_decoration/munition/update_overlays()
+	. = ..()
+	if(currently_cooking_off)
+		. += mutable_appearance('icons/effects/welding_effect.dmi', "welding_sparks", GASFIRE_LAYER, src, ABOVE_LIGHTING_PLANE, appearance_flags = RESET_COLOR|KEEP_APART)
+
+/obj/structure/shuttle_decoration/munition/blob_act(obj/structure/blob/blob_bit)
+	set_off()
+
+/obj/structure/shuttle_decoration/munition/ex_act()
+	subtle_foreshadowing() // No chance when you blow up the missiles
+	return TRUE
+
+/obj/structure/shuttle_decoration/munition/fire_act(exposed_temperature, exposed_volume)
+	set_off()
+
+/obj/structure/shuttle_decoration/munition/zap_act(power, zap_flags)
+	. = ..()
+	if(ZAP_OBJ_DAMAGE & zap_flags)
+		set_off()
+
+/obj/structure/shuttle_decoration/munition/bullet_act(obj/projectile/hitting_projectile)
+	if(hitting_projectile.damage > 0 && ((hitting_projectile.damage_type == BURN) || (hitting_projectile.damage_type == BRUTE)))
+		log_bomber(hitting_projectile.firer, "ruptured", src, "via projectile")
+		set_off()
+		return hitting_projectile.on_hit(src, 0)
+	return ..()
+
+/obj/structure/shuttle_decoration/munition/welder_act(mob/living/user, obj/item/tool)
+	if(!set_off())
+		return ITEM_INTERACT_SUCCESS
+	user.visible_message(span_danger("[user] cuts into [src]!"))
+	log_bomber(user, "set off", src, "via [tool.name]")
+	return ITEM_INTERACT_SUCCESS
+
+/obj/structure/shuttle_decoration/munition/missile
+	name = "\improper M-Seira Transorbital Missile"
+	desc = "Considering the choices of your life that brought you before a decade old missile is an important first step. \
+		Every information packet that exists gives only one simple direction for safely handling these: Don't. Failing that, \
+		you could at least try to be gentle with it."
+	icon_state = "mseira"
+	custom_materials = list(
+		/datum/material/alloy/plasteel = SHEET_MATERIAL_AMOUNT * 3,
+		/datum/material/alloy/plastitanium = SHEET_MATERIAL_AMOUNT * 2.5,
+	)
+
+/obj/structure/shuttle_decoration/munition/missile/Initialize(mapload)
+	. = ..()
+	AddElement(/datum/element/noisy_movement)
+
+/obj/structure/shuttle_decoration/munition/missile/disaster_effects()
+	explosion(src, heavy_impact_range = 1, light_impact_range = 2, flame_range = 4, flash_range = 5, smoke = TRUE)
+	Destroy()
+
+/obj/structure/shuttle_decoration/munition/missile/orbital
+	name = "\improper Cha-Seira Orbital Interceptor"
+	icon_state = "chaseira"
+
+/obj/structure/shuttle_decoration/munition/missile/extraorbital
+	name = "\improper Cha-Seira Extra-Orbital Interceptor"
+	icon_state = "chaseira_extended"
+
+/obj/structure/shuttle_decoration/munition/ciws
+	name = "defense cannon shell crate"
+	desc = "A large box of dusty old 26mm point defense cannon shells. While the fuzes for the heads are inert until fired \
+		from their weapon, the shells remain violently flammable if mistreated."
+	icon_state = "autocannon"
+	needs_to_be_armed = FALSE
+	custom_materials = list(
+		/datum/material/alloy/plastitanium = SHEET_MATERIAL_AMOUNT * 2,
+		/datum/material/iron = SHEET_MATERIAL_AMOUNT * 8,
+		/datum/material/plasma = SHEET_MATERIAL_AMOUNT * 1.5,
+	)
+
+/obj/structure/shuttle_decoration/munition/ciws/disaster_effects()
+	explosion(src, heavy_impact_range = 0, light_impact_range = 0, flame_range = 1, flash_range = 2, smoke = TRUE)
+	Destroy()
+
+/obj/structure/shuttle_decoration/munition/autocannon
+	name = "large autocannon shell cart"
+	desc = "A cart laden with large 64mm autocannon shells. While they sit securely in foam inserts on the cart, \
+		severe mistreatment could still set them off."
+	icon_state = "shells"
+	needs_to_be_armed = FALSE
+	custom_materials = list(
+		/datum/material/alloy/plastitanium = SHEET_MATERIAL_AMOUNT * 2,
+		/datum/material/iron = SHEET_MATERIAL_AMOUNT * 8,
+		/datum/material/plasma = SHEET_MATERIAL_AMOUNT * 1.5,
+	)
+
+/obj/structure/shuttle_decoration/munition/autocannon/Initialize(mapload)
+	. = ..()
+	AddElement(/datum/element/noisy_movement)
+
+/obj/structure/shuttle_decoration/munition/autocannon/disaster_effects()
+	explosion(src, heavy_impact_range = 0, light_impact_range = 1, flame_range = 2, flash_range = 5, smoke = TRUE)
+	var/obj/item/grenade/shrapnel_maker = new /obj/item/grenade/c980payload(get_turf(src))
+	shrapnel_maker.detonate()
+	qdel(shrapnel_maker)
+	Destroy()
+
+/obj/structure/shuttle_decoration/munition/chaff_flares
+	name = "large calibre countermeasures cart"
+	desc = "A cart laden with large calibre countermeasure canisters, filled to the brim with metal strips of all flavours \
+		to distract incoming weapons and radar. The explosive launching charge attached to each canister demands respect."
+	icon_state = "flares"
+	needs_to_be_armed = FALSE
+	custom_materials = list(
+		/datum/material/alloy/plastitanium = SHEET_MATERIAL_AMOUNT * 2,
+		/datum/material/iron = SHEET_MATERIAL_AMOUNT * 8,
+		/datum/material/plasma = SHEET_MATERIAL_AMOUNT * 1.5,
+	)
+
+/obj/structure/shuttle_decoration/munition/chaff_flares/Initialize(mapload)
+	. = ..()
+	AddElement(/datum/element/noisy_movement)
+
+/obj/structure/shuttle_decoration/munition/chaff_flares/disaster_effects()
+	explosion(src, heavy_impact_range = 0, light_impact_range = 1, flame_range = 2, flash_range = 5, smoke = TRUE)
+	var/datum/effect_system/fluid_spread/smoke/ecm/smoke = new
+	smoke.set_up(5, holder = src, location = src)
+	smoke.start()
+	Destroy()
diff --git a/modular_doppler/shipbreaking/code/shuttle_parts/wall_plating.dm b/modular_doppler/shipbreaking/code/shuttle_parts/wall_plating.dm
new file mode 100644
index 00000000000000..556ddf9b197b78
--- /dev/null
+++ b/modular_doppler/shipbreaking/code/shuttle_parts/wall_plating.dm
@@ -0,0 +1,185 @@
+/obj/structure/shuttle_decoration/wall_plate
+	abstract_type = /obj/structure/shuttle_decoration/wall_plate
+	icon = 'modular_doppler/shipbreaking/icons/wall_platings.dmi'
+	max_integrity = 125
+	unfasten_time = 2 SECONDS
+	requires_welder = TRUE
+	pass_flags_self = NONE
+	layer = ABOVE_MOB_LAYER
+	flags_1 = ON_BORDER_1
+	density = TRUE
+	obj_flags = CAN_BE_HIT | IGNORE_DENSITY
+	/// What type of hull plate object do we spawn when cut off the wall
+	var/obj/structure/hull_plating/cut_plating = /obj/structure/hull_plating
+	/// Do we transfer our color to the cut_plating
+	var/keep_color = FALSE
+
+/obj/structure/shuttle_decoration/wall_plate/Initialize(mapload)
+	. = ..()
+	var/static/list/loc_connections = list(
+		COMSIG_ATOM_EXIT = PROC_REF(on_exit),
+	)
+	AddElement(/datum/element/connect_loc, loc_connections)
+
+/obj/structure/shuttle_decoration/wall_plate/welder_act(mob/living/user, obj/item/tool)
+	if(!requires_welder)
+		return NONE
+	balloon_alert(user, "cutting...")
+	if(!tool.use_tool(src, user, 4 SECONDS, amount = 1, volume=50))
+		return ITEM_INTERACT_BLOCKING
+	var/obj/new_plating = new cut_plating(get_turf(src))
+	if(keep_color)
+		new_plating.color = color
+	qdel(src)
+	return ITEM_INTERACT_SUCCESS
+
+/// Determines what to do when something is leaving our turf
+/obj/structure/shuttle_decoration/wall_plate/proc/on_exit(datum/source, atom/movable/leaving, direction)
+	SIGNAL_HANDLER
+	if(leaving == src)
+		return // Let's not block ourselves.
+	if(!(direction & dir))
+		return
+	if (!density)
+		return
+	if (leaving.movement_type & (PHASING))
+		return
+	if (leaving.move_force >= MOVE_FORCE_EXTREMELY_STRONG)
+		return
+	leaving.Bump(src)
+	return COMPONENT_ATOM_BLOCK_EXIT
+
+/obj/structure/shuttle_decoration/wall_plate/CanAllowThrough(atom/movable/mover, border_dir)
+	. = ..()
+	if(border_dir != dir)
+		return TRUE
+
+/obj/structure/shuttle_decoration/wall_plate/CanPass(atom/movable/mover, border_dir)
+	return (border_dir & dir) ? ..() : TRUE
+
+/obj/structure/shuttle_decoration/wall_plate/CanAStarPass(to_dir, datum/can_pass_info/pass_info)
+	return !density || (dir != to_dir)
+
+/obj/structure/shuttle_decoration/wall_plate/gold_foil
+	name = "gold foil wrapping"
+	desc = "Gold foil insulation to keep the heat in (or out) of a ship or satellite."
+	icon_state = "gold_foil"
+	cut_plating = /obj/structure/hull_plating/gold_foil
+
+/obj/structure/shuttle_decoration/wall_plate/gold_foil/diagonal
+	icon_state = "gold_foil_diag"
+
+/obj/structure/shuttle_decoration/wall_plate/silver_foil
+	name = "silver foil wrapping"
+	desc = "Silver foil insulation to keep the heat in (or out) of a ship or satellite."
+	icon_state = "silver_foil"
+	cut_plating = /obj/structure/hull_plating/silver_foil
+
+/obj/structure/shuttle_decoration/wall_plate/silver_foil/diagonal
+	icon_state = "silver_foil_diag"
+
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon
+	name = "nanocarbon hull screen"
+	desc = "A standoff screen of nanocarbon used typically for in atmosphere aerodynamics, or layered protection."
+	icon_state = "nanocarbon"
+	armor_type = /datum/armor/nanocarbon_anything
+	max_integrity = 150
+	cut_plating = /obj/structure/hull_plating/nanocarbon/floor
+	keep_color = TRUE
+
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/diagonal
+	icon_state = "nanocarbon_diag"
+
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/ex_act(severity, target)
+	. = ..()
+	if(severity >= EXPLODE_HEAVY)
+		nanocarbon_nuke()
+	return TRUE
+
+/// Makes shards of nanocarbon
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/proc/nanocarbon_nuke()
+	var/random_shards = 2
+	for(var/iteration in 1 to random_shards)
+		var/obj/item/shard = new /obj/item/nanocarbon_shard(src)
+		shard.pixel_x = rand(-6, 6)
+		shard.pixel_y = rand(-6, 6)
+		shard.color = color
+
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/primary_colour
+	color = COLOR_AMETHYST
+
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/primary_colour/Initialize(mapload)
+	. = ..()
+	ADD_TRAIT(src, TRAIT_SHIP_PRIMARY_COLOUR, TRAIT_GENERIC)
+
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/diagonal/primary_colour
+	color = COLOR_AMETHYST
+
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/diagonal/primary_colour/Initialize(mapload)
+	. = ..()
+	ADD_TRAIT(src, TRAIT_SHIP_PRIMARY_COLOUR, TRAIT_GENERIC)
+
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/secondary_colour
+	color = COLOR_BROWN
+
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/secondary_colour/Initialize(mapload)
+	. = ..()
+	ADD_TRAIT(src, TRAIT_SHIP_SECONDARY_COLOUR, TRAIT_GENERIC)
+
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/diagonal/secondary_colour
+	color = COLOR_BROWN
+
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/diagonal/secondary_colour/Initialize(mapload)
+	. = ..()
+	ADD_TRAIT(src, TRAIT_SHIP_SECONDARY_COLOUR, TRAIT_GENERIC)
+
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/black
+	color = COLOR_DARK
+
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/diagonal/black
+	color = COLOR_DARK
+
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/standard
+	color = COLOR_SILVER
+
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/diagonal/standard
+	color = COLOR_SILVER
+
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/red
+	color = COLOR_BUBBLEGUM_RED
+
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/diagonal/red
+	color = COLOR_BUBBLEGUM_RED
+
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/green
+	color = COLOR_IRISH_GREEN
+
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/diagonal/green
+	color = COLOR_IRISH_GREEN
+
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/blue
+	color = COLOR_COMMAND_BLUE
+
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/diagonal/blue
+	color = COLOR_COMMAND_BLUE
+
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/yellow
+	color = COLOR_GOLD
+
+/obj/structure/shuttle_decoration/wall_plate/nanocarbon/diagonal/yellow
+	color = COLOR_GOLD
+
+/obj/structure/shuttle_decoration/wall_plate/armor
+	name = "armor plating"
+	desc = "Thick armor plating to protect ships from anything between asteroid impacts and weapons fire."
+	icon_state = "armor"
+	cut_plating = /obj/structure/hull_plating/armor_panels
+
+/obj/structure/shuttle_decoration/wall_plate/armor/diagonal
+	icon_state = "armor_diag"
+
+/obj/structure/shuttle_decoration/wall_plate/plastamic
+	name = "plastamic cladding"
+	desc = "Polymer sheets used to cover a typically much uglier hull plate behind them."
+	icon_state = "plastic"
+	cut_plating = /obj/structure/hull_plating/plastamic_sheets
diff --git a/modular_doppler/shipbreaking/icons/64x32.dmi b/modular_doppler/shipbreaking/icons/64x32.dmi
new file mode 100644
index 00000000000000..17849e87166536
Binary files /dev/null and b/modular_doppler/shipbreaking/icons/64x32.dmi differ
diff --git a/modular_doppler/shipbreaking/icons/closet.dmi b/modular_doppler/shipbreaking/icons/closet.dmi
new file mode 100644
index 00000000000000..4a238c8a1ba268
Binary files /dev/null and b/modular_doppler/shipbreaking/icons/closet.dmi differ
diff --git a/modular_doppler/shipbreaking/icons/crates.dmi b/modular_doppler/shipbreaking/icons/crates.dmi
new file mode 100644
index 00000000000000..d90e8eac538776
Binary files /dev/null and b/modular_doppler/shipbreaking/icons/crates.dmi differ
diff --git a/modular_doppler/shipbreaking/icons/exterior.dmi b/modular_doppler/shipbreaking/icons/exterior.dmi
index 568a785a7d04d1..c6b4447639cb27 100644
Binary files a/modular_doppler/shipbreaking/icons/exterior.dmi and b/modular_doppler/shipbreaking/icons/exterior.dmi differ
diff --git a/modular_doppler/shipbreaking/icons/smooth/girder_titan.dmi b/modular_doppler/shipbreaking/icons/smooth/girder_titan.dmi
new file mode 100644
index 00000000000000..c403e133fdacee
Binary files /dev/null and b/modular_doppler/shipbreaking/icons/smooth/girder_titan.dmi differ
diff --git a/modular_doppler/shipbreaking/icons/smooth/girder_titan.png b/modular_doppler/shipbreaking/icons/smooth/girder_titan.png
new file mode 100644
index 00000000000000..54e7c354a76145
Binary files /dev/null and b/modular_doppler/shipbreaking/icons/smooth/girder_titan.png differ
diff --git a/modular_doppler/shipbreaking/icons/smooth/girder_titan.png.toml b/modular_doppler/shipbreaking/icons/smooth/girder_titan.png.toml
new file mode 100644
index 00000000000000..ed3973d91f0c23
--- /dev/null
+++ b/modular_doppler/shipbreaking/icons/smooth/girder_titan.png.toml
@@ -0,0 +1,2 @@
+output_name = "girder_titan"
+template = "bitmask/diagonal_32x32.toml"
diff --git a/modular_doppler/shipbreaking/icons/spawners.dmi b/modular_doppler/shipbreaking/icons/spawners.dmi
new file mode 100644
index 00000000000000..de8438ecf29eb9
Binary files /dev/null and b/modular_doppler/shipbreaking/icons/spawners.dmi differ
diff --git a/modular_doppler/shipbreaking/icons/turfs/floors.dmi b/modular_doppler/shipbreaking/icons/turfs/floors.dmi
index 20f26343d13840..8e2dab962dfde8 100644
Binary files a/modular_doppler/shipbreaking/icons/turfs/floors.dmi and b/modular_doppler/shipbreaking/icons/turfs/floors.dmi differ
diff --git a/modular_doppler/shipbreaking/sound/plasma_bomb.ogg b/modular_doppler/shipbreaking/sound/plasma_bomb.ogg
new file mode 100644
index 00000000000000..55cb08171e2d08
Binary files /dev/null and b/modular_doppler/shipbreaking/sound/plasma_bomb.ogg differ
diff --git a/strings/~doppler/salvage_shuttle.json b/strings/~doppler/salvage_shuttle.json
index c2aa6d21a2ff1c..2af183b39d77bc 100644
--- a/strings/~doppler/salvage_shuttle.json
+++ b/strings/~doppler/salvage_shuttle.json
@@ -1,22 +1,4 @@
 {
-	"ship_companies": [
-		"Void Corps Xth Expeditionary",
-		"Crusoe's Intermodal",
-		"Solar Geological Survey",
-		"Unknown Affiliation",
-		"Crusoe's Rest Settlement Oversight",
-		"4CA Terraforming Coalition",
-		"Amundsen-Scott Mineral Prospecting",
-		"Conarex Aeronautics",
-		"Great Northern Frontier Agriculture",
-		"Kahraman Heavy Industry",
-		"Sunda Galaksi Near Orbital",
-		"Cybersun-Osaka Industries",
-		"Exagon-Ichikawa Orbital Resourcing",
-		"Osaka Medical Systems",
-		"Associato Petrochimico dell'Adriatico"
-	],
-
 	"ship_name": [
 		"@pick(designation) @pick(name_word) @pick(digit)",
 		"@pick(designation) @pick(name_word) @pick(name_word)",
diff --git a/tgstation.dme b/tgstation.dme
index ffe01d18a67225..994b9892e8e550 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -458,6 +458,7 @@
 #include "code\__DEFINES\~doppler_defines\reskin_defines.dm"
 #include "code\__DEFINES\~doppler_defines\robot_defines.dm"
 #include "code\__DEFINES\~doppler_defines\say.dm"
+#include "code\__DEFINES\~doppler_defines\shipbreaking.dm"
 #include "code\__DEFINES\~doppler_defines\shuttle_defines.dm"
 #include "code\__DEFINES\~doppler_defines\signals.dm"
 #include "code\__DEFINES\~doppler_defines\sound.dm"
@@ -7754,12 +7755,45 @@
 #include "modular_doppler\ship_captain\code\globals.dm"
 #include "modular_doppler\ship_captain\code\preferences.dm"
 #include "modular_doppler\ship_captain\code\ship_captain.dm"
+#include "modular_doppler\shipbreaking\code\docking_clamp.dm"
+#include "modular_doppler\shipbreaking\code\prior_owners_base.dm"
 #include "modular_doppler\shipbreaking\code\salvage_bay_decoration.dm"
+#include "modular_doppler\shipbreaking\code\salvage_computer.dm"
+#include "modular_doppler\shipbreaking\code\salvage_shuttle_base.dm"
+#include "modular_doppler\shipbreaking\code\shuttle_decoration.dm"
+#include "modular_doppler\shipbreaking\code\loot\cargo_sales.dm"
+#include "modular_doppler\shipbreaking\code\loot\item_spawners.dm"
+#include "modular_doppler\shipbreaking\code\loot\military.dm"
+#include "modular_doppler\shipbreaking\code\loot\random_cargo.dm"
+#include "modular_doppler\shipbreaking\code\loot\random_crate_items.dm"
+#include "modular_doppler\shipbreaking\code\loot\tanks.dm"
+#include "modular_doppler\shipbreaking\code\prior_owners\medical.dm"
+#include "modular_doppler\shipbreaking\code\prior_owners\military.dm"
+#include "modular_doppler\shipbreaking\code\prior_owners\mining.dm"
+#include "modular_doppler\shipbreaking\code\prior_owners\research.dm"
+#include "modular_doppler\shipbreaking\code\prior_owners\shipping.dm"
+#include "modular_doppler\shipbreaking\code\prior_owners\unique.dm"
+#include "modular_doppler\shipbreaking\code\salvage_shuttles\cargo.dm"
+#include "modular_doppler\shipbreaking\code\salvage_shuttles\example.dm"
+#include "modular_doppler\shipbreaking\code\salvage_shuttles\military.dm"
+#include "modular_doppler\shipbreaking\code\salvage_shuttles\passenger.dm"
+#include "modular_doppler\shipbreaking\code\salvage_shuttles\research.dm"
+#include "modular_doppler\shipbreaking\code\salvage_shuttles\salvage.dm"
+#include "modular_doppler\shipbreaking\code\salvage_shuttles\unmanned.dm"
 #include "modular_doppler\shipbreaking\code\shuttle_parts\airlocks.dm"
+#include "modular_doppler\shipbreaking\code\shuttle_parts\crates.dm"
+#include "modular_doppler\shipbreaking\code\shuttle_parts\engine_covers.dm"
+#include "modular_doppler\shipbreaking\code\shuttle_parts\engines.dm"
+#include "modular_doppler\shipbreaking\code\shuttle_parts\exoscanners.dm"
 #include "modular_doppler\shipbreaking\code\shuttle_parts\exterior_pieces.dm"
 #include "modular_doppler\shipbreaking\code\shuttle_parts\floors.dm"
+#include "modular_doppler\shipbreaking\code\shuttle_parts\girders.dm"
+#include "modular_doppler\shipbreaking\code\shuttle_parts\hazards.dm"
 #include "modular_doppler\shipbreaking\code\shuttle_parts\hull.dm"
+#include "modular_doppler\shipbreaking\code\shuttle_parts\hull_turfs.dm"
 #include "modular_doppler\shipbreaking\code\shuttle_parts\materials.dm"
+#include "modular_doppler\shipbreaking\code\shuttle_parts\munitions.dm"
+#include "modular_doppler\shipbreaking\code\shuttle_parts\wall_plating.dm"
 #include "modular_doppler\shipbreaking\code\shuttle_parts\windows.dm"
 #include "modular_doppler\ships_r_us\code\buyable_shuttle_template.dm"
 #include "modular_doppler\ships_r_us\code\machine_flatpacks.dm"
diff --git a/tgui/packages/tgui/interfaces/Fabrication/MaterialAccessBar.tsx b/tgui/packages/tgui/interfaces/Fabrication/MaterialAccessBar.tsx
index 639f6436f39f6e..a6b187eac7b963 100644
--- a/tgui/packages/tgui/interfaces/Fabrication/MaterialAccessBar.tsx
+++ b/tgui/packages/tgui/interfaces/Fabrication/MaterialAccessBar.tsx
@@ -21,6 +21,8 @@ const MATERIAL_RARITY: Record<string, number> = {
   diamond: 8,
   'bluespace crystal': 9,
   bananium: 10,
+  aluminum: 11, // DOPPLER EDIT ADDITION - LETS MATERIALS PROPERLY DISPLAY
+  nanocarbon: 12, // DOPPLER EDIT ADDITION - LETS MATERIALS PROPERLY DISPLAY
 };
 
 export type MaterialAccessBarProps = {
diff --git a/tgui/packages/tgui/interfaces/Fabrication/MaterialIcon.tsx b/tgui/packages/tgui/interfaces/Fabrication/MaterialIcon.tsx
index d770757cb2602a..27883a8cd044a7 100644
--- a/tgui/packages/tgui/interfaces/Fabrication/MaterialIcon.tsx
+++ b/tgui/packages/tgui/interfaces/Fabrication/MaterialIcon.tsx
@@ -53,6 +53,18 @@ const MATERIAL_ICONS: Record<string, [number, string][]> = {
     [17, 'sheet-plastic_2'],
     [34, 'sheet-plastic_3'],
   ],
+  // DOPPLER EDIT ADDITION START - MAKES CUSTOM MATERIALS DISPLAY CORRECTLY
+  aluminum: [
+    [0, 'aluminum'],
+    [17, 'aluminum_2'],
+    [34, 'aluminum_3'],
+  ],
+  nanocarbon: [
+    [0, 'nanocarbon'],
+    [17, 'nanocarbon_2'],
+    [34, 'nanocarbon_3'],
+  ],
+  // DOPPLER EDIT ADDITION END
 };
 
 export type MaterialIconProps = {