From d62cb31e9ba1278a32e10f00cfac4822dc99f971 Mon Sep 17 00:00:00 2001
From: CitadelStationBot <citadelstationcommunity@gmail.com>
Date: Sun, 27 May 2018 21:27:56 -0500
Subject: [PATCH] [MIRROR] Shuffles Exited() call to after loc is actually
 changed in forceMove. Fixes storage forcing everything to mouse opacity
 fulltile (#6884)

* Delete some duplicate macro definitions

* sql changelog changes ping the host

* Templates the caravan ambush ruin shuttles

* Update CODEOWNERS

* Update components.dm

* Shuffles Exited() call to after loc is actually changed in forceMove. Fixes storage forcing everything to mouse opacity fulltile

* Initial Placeholder

* Update caravanambush.dmm
---
 .../RandomRuins/SpaceRuins/caravanambush.dmm  | 3452 +++++++----------
 _maps/shuttles/ruin_caravan_victim.dmm        | 1284 ++++++
 _maps/shuttles/ruin_pirate_cutter.dmm         | 1213 ++++++
 _maps/shuttles/ruin_syndicate_dropship.dmm    |   24 +-
 _maps/shuttles/ruin_syndicate_fighter.dmm     |  174 +
 code/__DEFINES/components.dm                  |    2 +-
 code/datums/shuttles.dm                       |   20 +
 code/game/atoms_movable.dm                    |    9 +-
 code/game/mecha/mecha.dm                      |    4 +-
 code/game/objects/items/storage/wallets.dm    |   10 +-
 code/modules/lighting/lighting_turf.dm        |    2 +-
 11 files changed, 4123 insertions(+), 2071 deletions(-)
 create mode 100644 _maps/shuttles/ruin_caravan_victim.dmm
 create mode 100644 _maps/shuttles/ruin_pirate_cutter.dmm
 create mode 100644 _maps/shuttles/ruin_syndicate_fighter.dmm

diff --git a/_maps/RandomRuins/SpaceRuins/caravanambush.dmm b/_maps/RandomRuins/SpaceRuins/caravanambush.dmm
index da34a5bf3b..4a5e30bf6a 100644
--- a/_maps/RandomRuins/SpaceRuins/caravanambush.dmm
+++ b/_maps/RandomRuins/SpaceRuins/caravanambush.dmm
@@ -47,52 +47,22 @@
 /turf/template_noop,
 /area/template_noop)
 "aj" = (
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
-	dir = 2
-	},
-/obj/effect/mapping_helpers/airlock/locked,
-/obj/machinery/door/airlock/external{
-	id_tag = "caravanpirate_bolt_port"
-	},
 /obj/docking_port/stationary{
 	dir = 2;
 	dwidth = 14;
 	height = 13;
 	id = "caravanpirate_ambush";
 	name = "Trade Route";
+	roundstart_template = /datum/map_template/shuttle/ruin/pirate_cutter;
 	width = 22
 	},
-/obj/docking_port/mobile{
-	callTime = 150;
-	dir = 2;
-	dwidth = 14;
-	height = 13;
-	id = "caravanpirate";
-	movement_force = list("KNOCKDOWN" = 0, "THROW" = 0);
-	name = "Pirate Cutter";
-	port_direction = 8;
-	preferred_direction = 4;
-	timid = 0;
-	width = 22
-	},
-/turf/open/floor/plating,
-/area/shuttle/caravan/pirate)
+/turf/template_noop,
+/area/template_noop)
 "ak" = (
 /turf/open/floor/plating/airless{
 	icon_state = "platingdmg2"
 	},
 /area/shuttle/caravan/freighter3)
-"al" = (
-/obj/structure/lattice,
-/obj/structure/fluff/broken_flooring{
-	icon_state = "singular"
-	},
-/turf/template_noop,
-/area/shuttle/caravan/freighter1)
-"am" = (
-/obj/structure/lattice,
-/turf/template_noop,
-/area/shuttle/caravan/freighter1)
 "an" = (
 /obj/structure/lattice,
 /obj/structure/fluff/broken_flooring{
@@ -113,14 +83,6 @@
 	},
 /turf/template_noop,
 /area/template_noop)
-"aq" = (
-/turf/template_noop,
-/area/shuttle/caravan/freighter1)
-"ar" = (
-/obj/structure/lattice,
-/obj/item/stack/sheet/mineral/titanium,
-/turf/template_noop,
-/area/shuttle/caravan/freighter1)
 "as" = (
 /obj/structure/fluff/broken_flooring{
 	dir = 4;
@@ -128,16 +90,6 @@
 	},
 /turf/template_noop,
 /area/template_noop)
-"at" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
-	dir = 1
-	},
-/turf/open/floor/plasteel,
-/area/shuttle/caravan/pirate)
-"au" = (
-/mob/living/simple_animal/hostile/pirate,
-/turf/open/floor/plasteel,
-/area/shuttle/caravan/pirate)
 "av" = (
 /obj/effect/turf_decal/bot_white/right,
 /obj/structure/cable/yellow{
@@ -172,94 +124,6 @@
 	initial_gas_mix = "TEMP=2.7"
 	},
 /area/shuttle/caravan/freighter3)
-"ax" = (
-/obj/machinery/light/small{
-	dir = 4
-	},
-/obj/structure/cable/yellow,
-/obj/machinery/power/apc{
-	dir = 4;
-	name = "Small Freighter APC";
-	pixel_x = 24;
-	req_access = null;
-	start_charge = 0
-	},
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plating/airless,
-/area/shuttle/caravan/freighter1)
-"ay" = (
-/obj/effect/turf_decal/bot,
-/obj/machinery/space_heater,
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
-	dir = 4
-	},
-/turf/open/floor/plating/airless{
-	icon_state = "platingdmg3"
-	},
-/area/shuttle/caravan/freighter1)
-"az" = (
-/obj/machinery/door/airlock{
-	id_tag = "caravantrade1_cabin2";
-	name = "Cabin 2"
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel/vault/airless,
-/area/shuttle/caravan/freighter1)
-"aA" = (
-/obj/machinery/door/airlock{
-	id_tag = "caravantrade1_cabin1";
-	name = "Cabin 1"
-	},
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel/vault/airless,
-/area/shuttle/caravan/freighter1)
-"aB" = (
-/obj/machinery/light/small,
-/obj/structure/bed,
-/obj/item/bedsheet,
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/airalarm/all_access{
-	dir = 8;
-	pixel_x = 24
-	},
-/obj/machinery/button/door{
-	id = "caravantrade1_cabin2";
-	name = "Cabin Bolt Control";
-	normaldoorcontrol = 1;
-	pixel_x = -25;
-	pixel_y = 6;
-	specialfunctions = 4
-	},
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
-	dir = 1
-	},
-/turf/open/floor/plasteel/vault/airless,
-/area/shuttle/caravan/freighter1)
-"aC" = (
-/obj/machinery/light/small,
-/obj/structure/bed,
-/obj/item/bedsheet,
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/airalarm/all_access{
-	dir = 8;
-	pixel_x = 24
-	},
-/obj/machinery/button/door{
-	id = "caravantrade1_cabin1";
-	name = "Cabin Bolt Control";
-	normaldoorcontrol = 1;
-	pixel_x = -25;
-	pixel_y = 6;
-	specialfunctions = 4
-	},
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
-	dir = 1
-	},
-/turf/open/floor/plasteel/vault/airless,
-/area/shuttle/caravan/freighter1)
 "aD" = (
 /obj/item/stack/rods,
 /turf/template_noop,
@@ -271,20 +135,6 @@
 	},
 /turf/template_noop,
 /area/template_noop)
-"aF" = (
-/obj/structure/toilet{
-	dir = 4
-	},
-/obj/structure/sink{
-	pixel_y = 24
-	},
-/obj/machinery/light/small,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel/showroomfloor{
-	initial_gas_mix = "TEMP=2.7"
-	},
-/area/shuttle/caravan/freighter1)
 "aG" = (
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plasteel/darkblue/corner{
@@ -292,15 +142,6 @@
 	initial_gas_mix = "TEMP=2.7"
 	},
 /area/shuttle/caravan/freighter3)
-"aH" = (
-/obj/machinery/door/airlock{
-	name = "Restroom"
-	},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel/showroomfloor{
-	initial_gas_mix = "TEMP=2.7"
-	},
-/area/shuttle/caravan/freighter1)
 "aI" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/frame/computer{
@@ -312,51 +153,6 @@
 	initial_gas_mix = "TEMP=2.7"
 	},
 /area/shuttle/caravan/freighter3)
-"aJ" = (
-/obj/machinery/light/small{
-	dir = 4
-	},
-/obj/machinery/firealarm{
-	dir = 4;
-	pixel_x = 24
-	},
-/obj/effect/decal/cleanable/blood,
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
-	dir = 8
-	},
-/mob/living/simple_animal/hostile/syndicate/ranged/space{
-	environment_smash = 0;
-	name = "Syndicate Salvage Worker"
-	},
-/turf/open/floor/plasteel/yellow/corner{
-	dir = 4;
-	initial_gas_mix = "TEMP=2.7"
-	},
-/area/shuttle/caravan/freighter1)
-"aK" = (
-/obj/machinery/button/door{
-	id = "caravantrade1_bolt";
-	name = "External Bolt Control";
-	normaldoorcontrol = 1;
-	pixel_x = -25;
-	pixel_y = 8;
-	specialfunctions = 4
-	},
-/obj/machinery/atmospherics/components/unary/vent_pump/on,
-/turf/open/floor/plasteel/blue/corner{
-	initial_gas_mix = "TEMP=2.7"
-	},
-/area/shuttle/caravan/freighter1)
-"aL" = (
-/obj/machinery/airalarm/all_access{
-	dir = 4;
-	pixel_x = -24
-	},
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/blood,
-/obj/machinery/atmospherics/components/unary/vent_pump/on,
-/turf/open/floor/plasteel/airless/dark,
-/area/shuttle/caravan/freighter1)
 "aM" = (
 /obj/effect/decal/cleanable/blood,
 /turf/open/floor/plasteel/darkblue/corner{
@@ -403,63 +199,12 @@
 	},
 /turf/open/floor/plasteel/airless,
 /area/shuttle/caravan/freighter3)
-"aS" = (
-/obj/machinery/power/smes{
-	charge = 5e+006
-	},
-/obj/effect/turf_decal/stripes/line{
-	dir = 5
-	},
-/obj/structure/cable/yellow{
-	icon_state = "0-4"
-	},
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating,
-/area/shuttle/caravan/syndicate3)
 "aT" = (
 /obj/structure/fluff/broken_flooring{
 	icon_state = "singular"
 	},
 /turf/template_noop,
 /area/template_noop)
-"aU" = (
-/obj/effect/turf_decal/stripes/line{
-	dir = 4
-	},
-/obj/structure/closet/crate,
-/obj/machinery/power/terminal{
-	dir = 1
-	},
-/obj/structure/cable{
-	icon_state = "0-2"
-	},
-/obj/item/stack/sheet/metal/twenty,
-/obj/item/stack/sheet/glass{
-	amount = 10
-	},
-/obj/item/stack/sheet/mineral/plastitanium{
-	amount = 20
-	},
-/obj/item/storage/box/lights/bulbs,
-/obj/item/storage/toolbox/mechanical,
-/obj/item/stack/sheet/mineral/plasma{
-	amount = 20
-	},
-/turf/open/floor/plating,
-/area/shuttle/caravan/syndicate3)
-"aV" = (
-/obj/effect/turf_decal/stripes/line{
-	dir = 6
-	},
-/obj/structure/cable,
-/obj/machinery/power/port_gen/pacman{
-	anchored = 1
-	},
-/obj/item/wrench,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating,
-/area/shuttle/caravan/syndicate3)
 "aW" = (
 /obj/machinery/door/firedoor,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -473,16 +218,6 @@
 	},
 /turf/open/floor/plasteel/airless/dark,
 /area/shuttle/caravan/freighter3)
-"aX" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/structure/door_assembly/door_assembly_min{
-	anchored = 1;
-	density = 0;
-	name = "broken airlock"
-	},
-/turf/open/floor/plasteel/airless/floorgrime,
-/area/shuttle/caravan/freighter1)
 "aY" = (
 /obj/effect/turf_decal/bot_white/right,
 /obj/effect/decal/cleanable/dirt,
@@ -520,51 +255,11 @@
 	},
 /turf/open/floor/plasteel/airless/dark,
 /area/shuttle/caravan/freighter2)
-"ba" = (
-/obj/machinery/door/airlock/hatch{
-	id_tag = "caravansyndicate3_bolt_starboard";
-	name = "External Airlock";
-	normalspeed = 0;
-	req_access_txt = "150"
-	},
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
-	dir = 1
-	},
-/turf/open/floor/plating,
-/area/shuttle/caravan/syndicate3)
-"bb" = (
-/obj/machinery/porta_turret/syndicate/pod{
-	dir = 5;
-	faction = list("pirate")
-	},
-/turf/closed/wall/mineral/plastitanium,
-/area/shuttle/caravan/pirate)
-"bc" = (
-/obj/machinery/porta_turret/syndicate/pod{
-	dir = 6;
-	faction = list("pirate")
-	},
-/turf/closed/wall/mineral/plastitanium,
-/area/shuttle/caravan/pirate)
 "bd" = (
 /turf/open/floor/plating/airless{
 	icon_state = "platingdmg3"
 	},
 /area/shuttle/caravan/freighter3)
-"be" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
-	dir = 1
-	},
-/turf/open/floor/plasteel/vault/airless,
-/area/shuttle/caravan/freighter1)
-"bf" = (
-/obj/effect/turf_decal/bot_white,
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
-	dir = 1
-	},
-/turf/open/floor/plasteel/vault/airless,
-/area/shuttle/caravan/freighter1)
 "bg" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/airalarm/all_access{
@@ -594,36 +289,6 @@
 	icon_state = "floorscorched1"
 	},
 /area/shuttle/caravan/freighter2)
-"bj" = (
-/obj/machinery/light/small{
-	dir = 8
-	},
-/obj/machinery/button/door{
-	id = "caravansyndicate3_bolt_port";
-	name = "External Bolt Control";
-	normaldoorcontrol = 1;
-	pixel_x = -24;
-	pixel_y = 6;
-	req_access_txt = "150";
-	specialfunctions = 4
-	},
-/turf/open/floor/plasteel/dark,
-/area/shuttle/caravan/syndicate3)
-"bk" = (
-/obj/machinery/light/small{
-	dir = 8
-	},
-/obj/machinery/button/door{
-	id = "caravansyndicate3_bolt_starboard";
-	name = "External Bolt Control";
-	normaldoorcontrol = 1;
-	pixel_x = -24;
-	pixel_y = -6;
-	req_access_txt = "150";
-	specialfunctions = 4
-	},
-/turf/open/floor/plasteel/dark,
-/area/shuttle/caravan/syndicate3)
 "bl" = (
 /mob/living/simple_animal/hostile/carp,
 /turf/template_noop,
@@ -642,16 +307,10 @@
 "bJ" = (
 /turf/closed/wall/mineral/plastitanium,
 /area/ruin/unpowered)
-"ch" = (
-/turf/closed/wall/mineral/plastitanium,
-/area/shuttle/caravan/pirate)
 "dc" = (
 /obj/item/shard,
 /turf/template_noop,
 /area/template_noop)
-"dB" = (
-/turf/closed/wall/mineral/plastitanium/nodiagonal,
-/area/shuttle/caravan/pirate)
 "dD" = (
 /turf/open/floor/plating/asteroid/airless,
 /area/ruin/unpowered)
@@ -665,44 +324,6 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/mineral/plastitanium/airless,
 /area/ruin/unpowered)
-"dG" = (
-/obj/machinery/light/small{
-	dir = 8
-	},
-/obj/structure/sign/warning/vacuum{
-	pixel_x = -32
-	},
-/turf/open/floor/plating,
-/area/shuttle/caravan/pirate)
-"dH" = (
-/obj/structure/grille,
-/obj/structure/window/plastitanium,
-/obj/machinery/door/poddoor{
-	id = "caravanpirate_bridge"
-	},
-/turf/open/floor/plating,
-/area/shuttle/caravan/pirate)
-"dI" = (
-/obj/machinery/atmospherics/components/unary/tank/air,
-/obj/effect/turf_decal/bot,
-/turf/open/floor/plating,
-/area/shuttle/caravan/pirate)
-"dJ" = (
-/obj/machinery/suit_storage_unit/open,
-/turf/open/floor/plasteel/vault{
-	dir = 5
-	},
-/area/shuttle/caravan/pirate)
-"dK" = (
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
-	dir = 1
-	},
-/obj/effect/mapping_helpers/airlock/locked,
-/obj/machinery/door/airlock/external{
-	id_tag = "caravanpirate_bolt_port"
-	},
-/turf/open/floor/plating,
-/area/shuttle/caravan/pirate)
 "dL" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/door_assembly/door_assembly_hatch{
@@ -711,267 +332,6 @@
 	},
 /turf/open/floor/plating/airless,
 /area/ruin/unpowered)
-"dN" = (
-/obj/structure/shuttle/engine/propulsion/burst/left{
-	dir = 8
-	},
-/turf/open/floor/plating/airless,
-/area/shuttle/caravan/pirate)
-"dO" = (
-/obj/structure/shuttle/engine/heater{
-	dir = 8
-	},
-/obj/structure/window/reinforced{
-	dir = 4
-	},
-/turf/open/floor/plating/airless,
-/area/shuttle/caravan/pirate)
-"dP" = (
-/obj/structure/reagent_dispensers/watertank,
-/obj/item/reagent_containers/glass/bucket,
-/obj/item/mop,
-/obj/effect/turf_decal/stripes/line{
-	dir = 5
-	},
-/turf/open/floor/plating,
-/area/shuttle/caravan/pirate)
-"dQ" = (
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
-	dir = 8
-	},
-/obj/machinery/meter,
-/turf/open/floor/plating,
-/area/shuttle/caravan/pirate)
-"dR" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
-	dir = 4
-	},
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/engineering{
-	name = "Engineering"
-	},
-/turf/open/floor/plating,
-/area/shuttle/caravan/pirate)
-"dS" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
-	dir = 4
-	},
-/turf/open/floor/plasteel/white/side{
-	dir = 9
-	},
-/area/shuttle/caravan/pirate)
-"dT" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
-	dir = 4
-	},
-/turf/open/floor/plasteel/white/side{
-	dir = 1
-	},
-/area/shuttle/caravan/pirate)
-"dU" = (
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
-	dir = 1
-	},
-/turf/open/floor/plasteel/white/side{
-	dir = 1
-	},
-/area/shuttle/caravan/pirate)
-"dV" = (
-/obj/machinery/button/door{
-	id = "caravanpirate_bolt_port";
-	name = "External Bolt Control";
-	normaldoorcontrol = 1;
-	pixel_x = -4;
-	pixel_y = 25;
-	specialfunctions = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
-	dir = 4
-	},
-/turf/open/floor/plasteel/white/side{
-	dir = 1
-	},
-/area/shuttle/caravan/pirate)
-"dW" = (
-/obj/machinery/light/small{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
-	dir = 10
-	},
-/turf/open/floor/plasteel/white/side{
-	dir = 1
-	},
-/area/shuttle/caravan/pirate)
-"dX" = (
-/obj/structure/sign/departments/medbay/alt,
-/turf/closed/wall/mineral/plastitanium/nodiagonal,
-/area/shuttle/caravan/pirate)
-"dY" = (
-/obj/structure/closet{
-	name = "pirate outfits"
-	},
-/obj/item/clothing/head/collectable/pirate,
-/obj/item/clothing/suit/pirate,
-/obj/item/clothing/under/pirate,
-/obj/item/clothing/shoes/jackboots,
-/obj/item/clothing/head/bandana,
-/turf/open/floor/plasteel/dark/side{
-	dir = 5
-	},
-/area/shuttle/caravan/pirate)
-"dZ" = (
-/obj/machinery/light/small{
-	dir = 1
-	},
-/obj/structure/bed,
-/obj/item/bedsheet/brown,
-/turf/open/floor/plasteel/dark,
-/area/shuttle/caravan/pirate)
-"ea" = (
-/obj/structure/shuttle/engine/propulsion/burst{
-	dir = 8
-	},
-/turf/open/floor/plating/airless,
-/area/shuttle/caravan/pirate)
-"eb" = (
-/obj/structure/reagent_dispensers/fueltank,
-/obj/effect/turf_decal/stripes/line{
-	dir = 4
-	},
-/turf/open/floor/plating,
-/area/shuttle/caravan/pirate)
-"ec" = (
-/obj/machinery/light/small{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plating,
-/area/shuttle/caravan/pirate)
-"ed" = (
-/obj/structure/sign/departments/engineering,
-/turf/closed/wall/mineral/plastitanium/nodiagonal,
-/area/shuttle/caravan/pirate)
-"ee" = (
-/obj/structure/table,
-/obj/item/circular_saw,
-/obj/item/scalpel{
-	pixel_y = 12
-	},
-/obj/item/cautery{
-	pixel_x = 4
-	},
-/obj/machinery/light/small{
-	dir = 8
-	},
-/turf/open/floor/plasteel/white/side{
-	dir = 8
-	},
-/area/shuttle/caravan/pirate)
-"ef" = (
-/turf/open/floor/plasteel/floorgrime,
-/area/shuttle/caravan/pirate)
-"eh" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
-	dir = 5
-	},
-/turf/open/floor/plasteel/floorgrime,
-/area/shuttle/caravan/pirate)
-"ei" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
-	dir = 4
-	},
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/medical/glass{
-	name = "Medbay"
-	},
-/turf/open/floor/plasteel/floorgrime,
-/area/shuttle/caravan/pirate)
-"ej" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
-	dir = 4
-	},
-/turf/open/floor/plasteel/dark/side{
-	dir = 4
-	},
-/area/shuttle/caravan/pirate)
-"ek" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
-	dir = 10
-	},
-/turf/open/floor/plasteel/vault{
-	dir = 5
-	},
-/area/shuttle/caravan/pirate)
-"el" = (
-/obj/structure/table,
-/obj/machinery/microwave{
-	pixel_y = 5
-	},
-/turf/open/floor/plasteel/dark,
-/area/shuttle/caravan/pirate)
-"em" = (
-/obj/structure/shuttle/engine/propulsion/burst/right{
-	dir = 8
-	},
-/turf/open/floor/plating/airless,
-/area/shuttle/caravan/pirate)
-"en" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
-	dir = 4
-	},
-/obj/machinery/space_heater,
-/obj/effect/turf_decal/stripes/line{
-	dir = 6
-	},
-/turf/open/floor/plating,
-/area/shuttle/caravan/pirate)
-"eo" = (
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
-	dir = 4
-	},
-/turf/open/floor/plating,
-/area/shuttle/caravan/pirate)
-"ep" = (
-/obj/structure/table,
-/obj/item/retractor,
-/obj/item/hemostat,
-/turf/open/floor/plasteel/white,
-/area/shuttle/caravan/pirate)
-"eq" = (
-/obj/structure/table/optable,
-/obj/effect/turf_decal/bot,
-/turf/open/floor/plasteel/white,
-/area/shuttle/caravan/pirate)
-"er" = (
-/obj/structure/table,
-/obj/item/storage/firstaid/brute{
-	pixel_x = 3;
-	pixel_y = 3
-	},
-/obj/item/storage/firstaid/fire,
-/obj/machinery/firealarm{
-	dir = 1;
-	pixel_y = -24
-	},
-/turf/open/floor/plasteel/white,
-/area/shuttle/caravan/pirate)
-"es" = (
-/obj/machinery/sleeper{
-	dir = 1
-	},
-/obj/effect/turf_decal/delivery,
-/obj/machinery/airalarm/all_access{
-	dir = 1;
-	pixel_y = -24
-	},
-/turf/open/floor/plasteel/white,
-/area/shuttle/caravan/pirate)
-"et" = (
-/obj/structure/closet/crate/freezer/surplus_limbs,
-/obj/effect/turf_decal/bot,
-/turf/open/floor/plasteel/white,
-/area/shuttle/caravan/pirate)
 "eu" = (
 /obj/structure/chair{
 	dir = 4
@@ -989,67 +349,6 @@
 /obj/item/stack/sheet/metal,
 /turf/open/floor/plating/asteroid/airless,
 /area/ruin/unpowered)
-"ez" = (
-/obj/structure/bed,
-/obj/item/bedsheet/brown,
-/obj/machinery/firealarm{
-	dir = 8;
-	pixel_x = -26
-	},
-/turf/open/floor/plasteel/dark/side{
-	dir = 6
-	},
-/area/shuttle/caravan/pirate)
-"eB" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plasteel/vault{
-	dir = 5
-	},
-/area/shuttle/caravan/pirate)
-"eC" = (
-/obj/structure/table,
-/obj/item/storage/fancy/donut_box{
-	pixel_y = 18
-	},
-/obj/item/storage/box/donkpockets{
-	pixel_x = -3;
-	pixel_y = 7
-	},
-/obj/item/storage/box/donkpockets{
-	pixel_x = -6
-	},
-/obj/item/reagent_containers/food/drinks/bottle/rum{
-	pixel_x = 8;
-	pixel_y = 3
-	},
-/obj/structure/sign/poster/contraband/red_rum{
-	pixel_x = 32
-	},
-/turf/open/floor/plasteel/dark,
-/area/shuttle/caravan/pirate)
-"eD" = (
-/obj/structure/table,
-/obj/item/reagent_containers/food/drinks/bottle/rum{
-	pixel_x = 3;
-	pixel_y = 6
-	},
-/obj/item/reagent_containers/food/drinks/bottle/rum,
-/turf/open/floor/plasteel/dark,
-/area/shuttle/caravan/pirate)
-"eE" = (
-/obj/structure/table,
-/obj/item/coin/gold,
-/obj/item/coin/silver,
-/obj/item/coin/silver,
-/turf/open/floor/plasteel/dark,
-/area/shuttle/caravan/pirate)
-"eF" = (
-/obj/structure/closet/crate/secure/loot,
-/obj/machinery/airalarm/all_access{
-	pixel_y = 24
-	},
-/turf/open/floor/plasteel/dark,
-/area/shuttle/caravan/pirate)
 "eG" = (
 /obj/item/stack/cable_coil/yellow{
 	amount = 1
@@ -1058,659 +357,6 @@
 	icon_state = "platingdmg3"
 	},
 /area/ruin/unpowered)
-"eI" = (
-/obj/structure/rack,
-/obj/item/storage/toolbox/emergency,
-/obj/item/weldingtool,
-/turf/open/floor/plasteel/darkred/corner{
-	dir = 4
-	},
-/area/shuttle/caravan/pirate)
-"eJ" = (
-/obj/machinery/computer/camera_advanced/shuttle_docker/caravan/pirate,
-/turf/open/floor/plasteel/darkred/side{
-	dir = 1
-	},
-/area/shuttle/caravan/pirate)
-"eK" = (
-/obj/structure/cable/yellow{
-	icon_state = "0-2"
-	},
-/obj/machinery/power/apc{
-	dir = 8;
-	name = "Pirate Cutter APC";
-	pixel_x = -24;
-	req_access = null
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/machinery/airalarm/all_access{
-	dir = 8;
-	pixel_x = 24
-	},
-/turf/open/floor/plating,
-/area/shuttle/caravan/pirate)
-"eL" = (
-/obj/machinery/light/small{
-	dir = 8
-	},
-/obj/structure/closet/crate/secure/loot,
-/obj/machinery/atmospherics/components/unary/vent_pump/on{
-	dir = 4
-	},
-/obj/structure/extinguisher_cabinet{
-	pixel_x = -27
-	},
-/turf/open/floor/plasteel/dark,
-/area/shuttle/caravan/pirate)
-"eM" = (
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
-	dir = 4
-	},
-/turf/open/floor/plasteel/vault{
-	dir = 5
-	},
-/area/shuttle/caravan/pirate)
-"eO" = (
-/obj/item/stack/sheet/mineral/gold{
-	amount = 25
-	},
-/obj/item/stack/sheet/mineral/bananium{
-	amount = 5
-	},
-/obj/item/stack/sheet/mineral/silver{
-	amount = 25
-	},
-/obj/item/stack/sheet/mineral/uranium{
-	amount = 10
-	},
-/obj/item/stack/sheet/mineral/diamond{
-	amount = 5
-	},
-/obj/structure/closet/crate,
-/obj/item/coin/silver,
-/obj/item/coin/silver,
-/obj/item/coin/silver,
-/obj/item/coin/gold,
-/obj/item/coin/gold,
-/turf/open/floor/plasteel/darkblue/corner,
-/area/shuttle/caravan/pirate)
-"eP" = (
-/obj/structure/table,
-/obj/machinery/light/small{
-	brightness = 3;
-	dir = 8
-	},
-/obj/item/stack/spacecash/c200,
-/turf/open/floor/plasteel/dark,
-/area/shuttle/caravan/pirate)
-"eQ" = (
-/obj/structure/chair/office/dark{
-	dir = 8
-	},
-/turf/open/floor/plasteel/vault{
-	dir = 5
-	},
-/area/shuttle/caravan/pirate)
-"eR" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on,
-/turf/open/floor/plasteel/vault{
-	dir = 5
-	},
-/area/shuttle/caravan/pirate)
-"eS" = (
-/turf/open/floor/plasteel/vault{
-	dir = 5
-	},
-/area/shuttle/caravan/pirate)
-"eT" = (
-/obj/structure/chair/office/dark{
-	dir = 4
-	},
-/obj/machinery/turretid{
-	icon_state = "control_kill";
-	lethal = 1;
-	locked = 0;
-	pixel_y = -30;
-	req_access = null
-	},
-/mob/living/simple_animal/hostile/pirate/ranged{
-	environment_smash = 0
-	},
-/turf/open/floor/plasteel/vault{
-	dir = 5
-	},
-/area/shuttle/caravan/pirate)
-"eU" = (
-/obj/machinery/computer/shuttle/caravan/pirate{
-	dir = 8
-	},
-/turf/open/floor/plasteel/darkred/side{
-	dir = 8
-	},
-/area/shuttle/caravan/pirate)
-"eV" = (
-/obj/machinery/power/smes{
-	charge = 5e+006
-	},
-/obj/structure/cable/yellow{
-	icon_state = "0-4"
-	},
-/obj/effect/turf_decal/stripes/line{
-	dir = 5
-	},
-/turf/open/floor/plating,
-/area/shuttle/caravan/pirate)
-"eW" = (
-/obj/structure/cable/yellow{
-	icon_state = "1-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plating,
-/area/shuttle/caravan/pirate)
-"eX" = (
-/obj/structure/table,
-/obj/item/storage/box/lethalshot,
-/turf/open/floor/plasteel/vault{
-	dir = 5
-	},
-/area/shuttle/caravan/pirate)
-"eY" = (
-/obj/structure/table,
-/obj/item/grenade/smokebomb{
-	pixel_x = -4
-	},
-/obj/item/grenade/smokebomb{
-	pixel_x = 2
-	},
-/obj/machinery/airalarm/all_access{
-	pixel_y = 24
-	},
-/turf/open/floor/plasteel/vault{
-	dir = 5
-	},
-/area/shuttle/caravan/pirate)
-"eZ" = (
-/obj/structure/tank_dispenser/oxygen,
-/obj/machinery/firealarm{
-	dir = 2;
-	pixel_y = 24
-	},
-/turf/open/floor/plasteel/vault{
-	dir = 5
-	},
-/area/shuttle/caravan/pirate)
-"fa" = (
-/obj/structure/table,
-/obj/structure/window/reinforced{
-	dir = 8
-	},
-/obj/machinery/door/window/southleft{
-	name = "Weapon Storage"
-	},
-/obj/item/gun/ballistic/shotgun/automatic/combat,
-/turf/open/floor/plasteel/vault{
-	dir = 5
-	},
-/area/shuttle/caravan/pirate)
-"fb" = (
-/obj/structure/table,
-/obj/item/gun/energy/laser{
-	pixel_x = -3;
-	pixel_y = 3
-	},
-/obj/item/gun/energy/laser,
-/obj/machinery/door/window/southleft{
-	base_state = "right";
-	icon_state = "right";
-	name = "Weapon Storage"
-	},
-/turf/open/floor/plasteel/vault{
-	dir = 5
-	},
-/area/shuttle/caravan/pirate)
-"fc" = (
-/obj/structure/bed,
-/obj/item/bedsheet/brown,
-/obj/machinery/airalarm/all_access{
-	dir = 4;
-	pixel_x = -24
-	},
-/turf/open/floor/plasteel/darkred/corner{
-	dir = 8
-	},
-/area/shuttle/caravan/pirate)
-"fd" = (
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
-	dir = 8
-	},
-/turf/open/floor/plasteel/vault{
-	dir = 5
-	},
-/area/shuttle/caravan/pirate)
-"fe" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
-	dir = 4
-	},
-/turf/open/floor/plasteel/darkblue/side{
-	dir = 4
-	},
-/area/shuttle/caravan/pirate)
-"ff" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
-	dir = 4
-	},
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/command{
-	name = "Bridge"
-	},
-/turf/open/floor/plasteel/vault{
-	dir = 5
-	},
-/area/shuttle/caravan/pirate)
-"fg" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
-	dir = 4
-	},
-/turf/open/floor/plasteel/dark,
-/area/shuttle/caravan/pirate)
-"fh" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
-	dir = 9
-	},
-/obj/machinery/firealarm{
-	dir = 1;
-	pixel_y = -24
-	},
-/turf/open/floor/plasteel/dark,
-/area/shuttle/caravan/pirate)
-"fi" = (
-/obj/structure/table/reinforced,
-/obj/machinery/recharger,
-/obj/item/melee/classic_baton,
-/turf/open/floor/plasteel/darkred/corner,
-/area/shuttle/caravan/pirate)
-"fj" = (
-/obj/structure/table/reinforced,
-/obj/machinery/button/door{
-	id = "caravanpirate_bridge";
-	name = "Bridge Blast Door Control";
-	pixel_x = -16
-	},
-/turf/open/floor/plasteel/darkred/side,
-/area/shuttle/caravan/pirate)
-"fk" = (
-/obj/machinery/power/terminal{
-	dir = 1
-	},
-/obj/structure/cable{
-	icon_state = "0-2"
-	},
-/obj/structure/closet/crate,
-/obj/item/stack/sheet/metal/twenty,
-/obj/item/stack/sheet/glass{
-	amount = 10
-	},
-/obj/item/storage/toolbox/mechanical,
-/obj/item/flashlight{
-	pixel_x = 3;
-	pixel_y = 3
-	},
-/obj/item/stack/sheet/mineral/plasma{
-	amount = 20
-	},
-/obj/effect/turf_decal/stripes/line{
-	dir = 4
-	},
-/turf/open/floor/plating,
-/area/shuttle/caravan/pirate)
-"fl" = (
-/obj/machinery/light/small{
-	dir = 8
-	},
-/obj/structure/closet/crate/secure/weapon,
-/obj/item/gun/ballistic/revolver/grenadelauncher/unrestricted,
-/turf/open/floor/plasteel/red/side{
-	dir = 8
-	},
-/area/shuttle/caravan/pirate)
-"fm" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/on,
-/turf/open/floor/plasteel/floorgrime,
-/area/shuttle/caravan/pirate)
-"fo" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
-	dir = 6
-	},
-/turf/open/floor/plasteel/floorgrime,
-/area/shuttle/caravan/pirate)
-"fp" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
-	dir = 4
-	},
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/security,
-/turf/open/floor/plasteel/floorgrime,
-/area/shuttle/caravan/pirate)
-"fq" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
-	dir = 4
-	},
-/turf/open/floor/plasteel/darkred/side{
-	dir = 8
-	},
-/area/shuttle/caravan/pirate)
-"fr" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
-	dir = 9
-	},
-/turf/open/floor/plasteel/vault{
-	dir = 5
-	},
-/area/shuttle/caravan/pirate)
-"fs" = (
-/obj/structure/rack,
-/obj/item/storage/bag/money/vault,
-/mob/living/simple_animal/parrot{
-	faction = list("pirate");
-	name = "Pegwing"
-	},
-/turf/open/floor/plasteel/darkblue/corner{
-	dir = 4
-	},
-/area/shuttle/caravan/pirate)
-"ft" = (
-/obj/structure/cable,
-/obj/machinery/power/port_gen/pacman{
-	anchored = 1
-	},
-/obj/item/wrench,
-/obj/effect/turf_decal/stripes/line{
-	dir = 6
-	},
-/turf/open/floor/plating,
-/area/shuttle/caravan/pirate)
-"fu" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
-	dir = 5
-	},
-/turf/open/floor/plating,
-/area/shuttle/caravan/pirate)
-"fv" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
-	dir = 4
-	},
-/turf/open/floor/plasteel/red/side{
-	dir = 10
-	},
-/area/shuttle/caravan/pirate)
-"fw" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
-	dir = 4
-	},
-/turf/open/floor/plasteel/red/side,
-/area/shuttle/caravan/pirate)
-"fx" = (
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
-/turf/open/floor/plasteel/red/side,
-/area/shuttle/caravan/pirate)
-"fy" = (
-/obj/machinery/button/door{
-	id = "caravanpirate_bolt_starboard";
-	name = "External Bolt Control";
-	normaldoorcontrol = 1;
-	pixel_x = -4;
-	pixel_y = -25;
-	specialfunctions = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
-	dir = 4
-	},
-/turf/open/floor/plasteel/red/side,
-/area/shuttle/caravan/pirate)
-"fz" = (
-/obj/machinery/light/small{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
-	dir = 9
-	},
-/turf/open/floor/plasteel/red/side,
-/area/shuttle/caravan/pirate)
-"fA" = (
-/obj/structure/closet{
-	name = "pirate outfits"
-	},
-/obj/item/clothing/head/collectable/pirate,
-/obj/item/clothing/suit/pirate,
-/obj/item/clothing/under/pirate,
-/obj/item/clothing/shoes/jackboots,
-/obj/item/clothing/head/bandana,
-/turf/open/floor/plasteel/darkred/corner{
-	dir = 1
-	},
-/area/shuttle/caravan/pirate)
-"fB" = (
-/obj/machinery/light/small,
-/obj/structure/bed,
-/obj/item/bedsheet/brown,
-/turf/open/floor/plasteel/dark,
-/area/shuttle/caravan/pirate)
-"fC" = (
-/obj/structure/table,
-/obj/machinery/cell_charger,
-/obj/item/stack/cable_coil/yellow,
-/obj/item/stock_parts/cell/high,
-/obj/effect/turf_decal/bot,
-/turf/open/floor/plating,
-/area/shuttle/caravan/pirate)
-"fD" = (
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
-	dir = 2
-	},
-/obj/effect/mapping_helpers/airlock/locked,
-/obj/machinery/door/airlock/external{
-	id_tag = "caravanpirate_bolt_starboard"
-	},
-/turf/open/floor/plating,
-/area/shuttle/caravan/pirate)
-"fF" = (
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
-	dir = 1
-	},
-/obj/effect/mapping_helpers/airlock/locked,
-/obj/machinery/door/airlock/external{
-	id_tag = "caravanpirate_bolt_starboard"
-	},
-/turf/open/floor/plating,
-/area/shuttle/caravan/pirate)
-"fG" = (
-/turf/closed/wall/mineral/titanium,
-/area/shuttle/caravan/freighter1)
-"fH" = (
-/turf/closed/wall/mineral/titanium/nodiagonal,
-/area/shuttle/caravan/freighter1)
-"fI" = (
-/obj/effect/spawner/structure/window/shuttle,
-/obj/machinery/door/poddoor{
-	id = "caravantrade1_bridge"
-	},
-/turf/open/floor/plating,
-/area/shuttle/caravan/freighter1)
-"fJ" = (
-/obj/structure/chair{
-	dir = 1
-	},
-/obj/machinery/turretid{
-	ailock = 1;
-	control_area = null;
-	desc = "A specially designed set of turret controls. Looks to be covered in protective casing to prevent AI interfacing.";
-	icon_state = "control_kill";
-	lethal = 1;
-	name = "Shuttle turret control";
-	pixel_x = 32;
-	pixel_y = 32;
-	req_access = null;
-	req_access_txt = "150"
-	},
-/obj/structure/cable/yellow{
-	icon_state = "0-4"
-	},
-/mob/living/simple_animal/hostile/syndicate{
-	environment_smash = 0;
-	name = "Syndicate Salvage Pilot"
-	},
-/turf/open/floor/mineral/plastitanium,
-/area/shuttle/caravan/syndicate2)
-"fK" = (
-/obj/structure/shuttle/engine/propulsion/burst/left{
-	dir = 8
-	},
-/turf/open/floor/plating/airless,
-/area/shuttle/caravan/freighter1)
-"fL" = (
-/obj/structure/shuttle/engine/heater{
-	dir = 8
-	},
-/obj/structure/window/reinforced{
-	dir = 4
-	},
-/turf/open/floor/plating/airless,
-/area/shuttle/caravan/freighter1)
-"fN" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
-	dir = 1
-	},
-/turf/open/floor/plating/airless,
-/area/shuttle/caravan/freighter1)
-"fO" = (
-/obj/machinery/door/firedoor,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
-	dir = 4
-	},
-/obj/machinery/door/airlock/engineering{
-	name = "Engine Room"
-	},
-/turf/open/floor/plating/airless,
-/area/shuttle/caravan/freighter1)
-"fP" = (
-/obj/machinery/firealarm{
-	dir = 2;
-	pixel_y = 24
-	},
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
-	dir = 1
-	},
-/turf/open/floor/plasteel/airless,
-/area/shuttle/caravan/freighter1)
-"fQ" = (
-/obj/machinery/light/small,
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
-	dir = 4
-	},
-/turf/open/floor/plasteel/airless,
-/area/shuttle/caravan/freighter1)
-"fR" = (
-/obj/machinery/airalarm/all_access{
-	pixel_y = 24
-	},
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
-	dir = 1
-	},
-/turf/open/floor/plasteel/airless,
-/area/shuttle/caravan/freighter1)
-"fS" = (
-/obj/machinery/door/airlock{
-	name = "Crew Cabins"
-	},
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
-	dir = 4
-	},
-/turf/open/floor/plasteel/airless/floorgrime,
-/area/shuttle/caravan/freighter1)
-"fT" = (
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
-	dir = 4
-	},
-/turf/open/floor/plasteel/yellow/corner{
-	dir = 4;
-	initial_gas_mix = "TEMP=2.7"
-	},
-/area/shuttle/caravan/freighter1)
-"fU" = (
-/obj/machinery/light/small,
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
-	dir = 4
-	},
-/turf/open/floor/plasteel/yellow/side{
-	dir = 1;
-	initial_gas_mix = "TEMP=2.7"
-	},
-/area/shuttle/caravan/freighter1)
-"fV" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
-	dir = 10
-	},
-/obj/effect/decal/cleanable/blood,
-/turf/open/floor/plasteel/yellow/side{
-	dir = 1;
-	initial_gas_mix = "TEMP=2.7"
-	},
-/area/shuttle/caravan/freighter1)
-"fW" = (
-/obj/structure/closet/secure_closet/freezer{
-	locked = 0;
-	name = "fridge"
-	},
-/obj/item/reagent_containers/food/drinks/beer{
-	pixel_x = -3;
-	pixel_y = 3
-	},
-/obj/item/reagent_containers/food/drinks/beer,
-/obj/item/reagent_containers/food/drinks/beer{
-	pixel_x = 3;
-	pixel_y = -3
-	},
-/obj/item/reagent_containers/glass/beaker/waterbottle{
-	pixel_x = -3;
-	pixel_y = 3
-	},
-/obj/item/reagent_containers/glass/beaker/waterbottle,
-/obj/item/reagent_containers/glass/beaker/waterbottle{
-	pixel_x = 3;
-	pixel_y = -3
-	},
-/obj/item/reagent_containers/food/snacks/pizzaslice/margherita{
-	pixel_x = -3;
-	pixel_y = 3
-	},
-/obj/item/reagent_containers/food/snacks/pizzaslice/margherita,
-/obj/item/reagent_containers/food/snacks/chocolatebar,
-/turf/open/floor/plasteel/yellow/side{
-	dir = 5;
-	initial_gas_mix = "TEMP=2.7"
-	},
-/area/shuttle/caravan/freighter1)
-"fX" = (
-/obj/structure/table,
-/obj/machinery/microwave{
-	pixel_y = 5
-	},
-/turf/open/floor/plasteel/vault/airless,
-/area/shuttle/caravan/freighter1)
-"fY" = (
-/obj/machinery/light/small{
-	dir = 8
-	},
-/obj/structure/sign/warning/vacuum{
-	pixel_x = 32
-	},
-/turf/open/floor/plating,
-/area/shuttle/caravan/freighter1)
 "fZ" = (
 /turf/closed/wall/mineral/titanium,
 /area/shuttle/caravan/freighter3)
@@ -1735,45 +381,6 @@
 /obj/effect/spawner/structure/window/shuttle,
 /turf/open/floor/plating,
 /area/shuttle/caravan/freighter3)
-"ge" = (
-/obj/structure/shuttle/engine/propulsion/burst{
-	dir = 8
-	},
-/turf/open/floor/plating/airless,
-/area/shuttle/caravan/freighter1)
-"gf" = (
-/obj/machinery/power/smes{
-	charge = 0
-	},
-/obj/structure/cable/yellow{
-	icon_state = "0-4"
-	},
-/obj/effect/turf_decal/stripes/line{
-	dir = 5
-	},
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating/airless,
-/area/shuttle/caravan/freighter1)
-"gg" = (
-/obj/structure/cable/yellow{
-	icon_state = "2-8"
-	},
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/floor/plating/airless,
-/area/shuttle/caravan/freighter1)
-"gj" = (
-/obj/machinery/airalarm/all_access{
-	dir = 4;
-	pixel_x = -24
-	},
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/effect/mob_spawn/human/corpse/cargo_tech,
-/obj/effect/decal/cleanable/blood,
-/turf/open/floor/plasteel/airless/floorgrime,
-/area/shuttle/caravan/freighter1)
 "gk" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
@@ -1784,51 +391,768 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plating/airless,
 /area/ruin/unpowered)
-"gl" = (
-/obj/structure/chair/stool,
-/turf/open/floor/plasteel/yellow/side{
-	dir = 4;
-	initial_gas_mix = "TEMP=2.7"
-	},
-/area/shuttle/caravan/freighter1)
-"gm" = (
-/obj/structure/table,
-/obj/item/storage/box/donkpockets{
-	pixel_x = 6;
-	pixel_y = 6
-	},
-/obj/item/trash/plate{
-	pixel_x = -5;
-	pixel_y = -3
+"gq" = (
+/obj/structure/shuttle/engine/propulsion/burst/left{
+	dir = 8
 	},
+/turf/open/floor/plating/airless,
+/area/shuttle/caravan/freighter3)
+"gs" = (
+/obj/effect/turf_decal/bot_white,
 /obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel/vault/airless,
-/area/shuttle/caravan/freighter1)
-"gn" = (
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+/turf/open/floor/plasteel/airless/dark,
+/area/shuttle/caravan/freighter3)
+"gt" = (
+/obj/effect/turf_decal/bot_white,
+/turf/open/floor/plasteel/airless/dark,
+/area/shuttle/caravan/freighter3)
+"gv" = (
+/obj/effect/turf_decal/bot_white,
+/obj/structure/closet/crate/secure/engineering,
+/obj/item/storage/toolbox/mechanical,
+/obj/item/storage/toolbox/mechanical,
+/obj/item/storage/toolbox/electrical,
+/obj/item/storage/toolbox/electrical,
+/obj/item/clothing/gloves/color/yellow,
+/obj/item/clothing/gloves/color/yellow,
+/obj/item/multitool,
+/obj/item/multitool,
+/turf/open/floor/plasteel/airless/dark,
+/area/shuttle/caravan/freighter3)
+"gw" = (
+/obj/effect/turf_decal/bot_white,
+/obj/machinery/light/small{
 	dir = 1
 	},
-/obj/effect/mapping_helpers/airlock/locked,
-/obj/machinery/door/airlock/external{
-	id_tag = "caravantrade1_bolt"
+/obj/machinery/button/door{
+	id = "caravantrade3_cargo_port";
+	name = "Cargo Blast Door Control";
+	pixel_y = 24
 	},
-/turf/open/floor/plating,
-/area/shuttle/caravan/freighter1)
-"go" = (
+/turf/open/floor/plasteel/airless/dark,
+/area/shuttle/caravan/freighter3)
+"gy" = (
 /obj/machinery/light/small{
 	dir = 8
 	},
+/obj/structure/sign/warning/vacuum{
+	pixel_x = -32;
+	pixel_y = 32
+	},
 /obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel/airless/dark,
+/area/shuttle/caravan/freighter3)
+"gP" = (
+/obj/structure/shuttle/engine/propulsion/burst{
+	dir = 8
+	},
+/turf/open/floor/plating/airless,
+/area/shuttle/caravan/freighter3)
+"gQ" = (
+/obj/structure/shuttle/engine/heater{
+	dir = 8
+	},
+/obj/structure/window/reinforced{
+	dir = 4
+	},
+/turf/open/floor/plating/airless,
+/area/shuttle/caravan/freighter3)
+"gR" = (
+/obj/machinery/power/smes{
+	charge = 0
+	},
+/obj/structure/cable/yellow,
+/obj/effect/turf_decal/stripes/line{
+	dir = 5
+	},
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plating/airless,
+/area/shuttle/caravan/freighter3)
+"gT" = (
+/mob/living/simple_animal/hostile/syndicate/melee/space{
+	environment_smash = 0;
+	name = "Syndicate Salvage Worker"
+	},
+/turf/open/floor/plasteel/airless/floorgrime,
+/area/shuttle/caravan/freighter3)
+"gU" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 6
+	},
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel/airless,
+/area/shuttle/caravan/freighter3)
+"gV" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel/airless{
+	icon_state = "floorscorched1"
+	},
+/area/shuttle/caravan/freighter3)
+"gW" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
+/turf/open/floor/plasteel/blue/side{
+	dir = 4;
+	initial_gas_mix = "TEMP=2.7"
+	},
+/area/shuttle/caravan/freighter3)
+"gY" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 10
+	},
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel/airless/dark,
+/area/shuttle/caravan/freighter3)
+"ha" = (
+/obj/structure/table/reinforced,
+/obj/item/folder/yellow,
+/obj/item/pen{
+	pixel_x = 6;
+	pixel_y = 6
+	},
+/turf/open/floor/plasteel/darkblue/side{
+	dir = 9;
+	initial_gas_mix = "TEMP=2.7"
+	},
+/area/shuttle/caravan/freighter3)
+"hm" = (
+/turf/closed/wall/mineral/titanium,
+/area/shuttle/caravan/freighter2)
+"hn" = (
+/turf/closed/wall/mineral/titanium/nodiagonal,
+/area/shuttle/caravan/freighter2)
+"ho" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/door/poddoor/preopen{
+	id = "caravantrade2_cargo_port";
+	name = "Cargo Blast Door"
+	},
+/turf/open/floor/plating/airless{
+	icon_state = "platingdmg3"
+	},
+/area/shuttle/caravan/freighter2)
+"hp" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/door/poddoor/preopen{
+	id = "caravantrade2_cargo_port";
+	name = "Cargo Blast Door"
+	},
+/turf/open/floor/plating/airless,
+/area/shuttle/caravan/freighter2)
+"hq" = (
+/obj/machinery/door/poddoor/preopen{
+	id = "caravantrade2_cargo_port";
+	name = "Cargo Blast Door"
+	},
+/turf/open/floor/plating/airless{
+	icon_state = "platingdmg3"
+	},
+/area/shuttle/caravan/freighter2)
+"hr" = (
+/obj/machinery/door/poddoor/preopen{
+	id = "caravantrade2_cargo_port";
+	name = "Cargo Blast Door"
+	},
+/turf/open/floor/plating/airless,
+/area/shuttle/caravan/freighter2)
+"hs" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/door/airlock/external{
+	req_access_txt = "13"
+	},
+/obj/effect/mapping_helpers/airlock/cyclelink_helper,
+/turf/open/floor/plating/airless,
+/area/shuttle/caravan/freighter2)
+"ht" = (
+/obj/effect/spawner/structure/window/shuttle,
+/turf/open/floor/plating,
+/area/shuttle/caravan/freighter2)
+"hu" = (
+/obj/machinery/space_heater,
+/obj/machinery/power/terminal{
+	dir = 1
+	},
+/obj/structure/cable{
+	icon_state = "0-2"
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plating/airless,
+/area/shuttle/caravan/freighter3)
+"hv" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel/airless,
+/area/shuttle/caravan/freighter3)
+"hw" = (
+/obj/effect/turf_decal/box/white/corners{
+	dir = 4
+	},
+/turf/open/floor/plasteel/airless/dark,
+/area/shuttle/caravan/freighter3)
+"hx" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/structure/closet/crate/secure/plasma,
+/obj/item/tank/internals/plasma/full,
+/obj/item/stack/sheet/mineral/plasma{
+	amount = 25
+	},
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel/airless/dark,
+/area/shuttle/caravan/freighter3)
+"hy" = (
+/obj/effect/turf_decal/box/white/corners{
+	dir = 1
+	},
+/turf/open/floor/plasteel/airless/dark,
+/area/shuttle/caravan/freighter3)
+"hz" = (
+/obj/machinery/firealarm{
+	dir = 4;
+	pixel_x = 24
+	},
+/turf/open/floor/plasteel/blue/corner{
+	dir = 4;
+	initial_gas_mix = "TEMP=2.7"
+	},
+/area/shuttle/caravan/freighter3)
+"hB" = (
+/mob/living/simple_animal/hostile/syndicate/ranged/space/stormtrooper{
+	environment_smash = 0;
+	name = "Syndicate Salvage Leader"
+	},
+/turf/open/floor/plasteel/airless{
+	icon_state = "damaged2"
+	},
+/area/shuttle/caravan/freighter3)
+"hQ" = (
+/obj/structure/shuttle/engine/propulsion/burst/left{
+	dir = 8
+	},
+/turf/open/floor/plating/airless,
+/area/shuttle/caravan/freighter2)
+"hS" = (
+/obj/effect/turf_decal/bot_white,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel/airless{
+	icon_state = "damaged5"
+	},
+/area/shuttle/caravan/freighter2)
+"hT" = (
+/obj/effect/turf_decal/bot_white,
+/obj/structure/closet/crate/secure/gear,
+/obj/item/ammo_casing/shotgun/ion,
+/obj/item/ammo_casing/shotgun/pulseslug,
+/obj/item/ammo_casing/shotgun/dragonsbreath,
+/obj/item/ammo_casing/shotgun/techshell,
+/obj/item/ammo_casing/shotgun/techshell,
+/turf/open/floor/plasteel/airless/dark,
+/area/shuttle/caravan/freighter2)
+"hU" = (
+/obj/effect/turf_decal/bot_white,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel/airless{
+	icon_state = "damaged2"
+	},
+/area/shuttle/caravan/freighter2)
+"hV" = (
+/obj/effect/turf_decal/bot_white,
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/closet/crate/secure/gear,
+/obj/item/storage/box/lethalshot,
+/obj/item/ammo_casing/shotgun/frag12,
+/obj/item/ammo_casing/shotgun/frag12,
+/obj/item/ammo_casing/shotgun/frag12,
+/obj/item/ammo_casing/shotgun/frag12,
+/turf/open/floor/plasteel/airless/dark,
+/area/shuttle/caravan/freighter2)
+"hW" = (
+/obj/effect/turf_decal/bot_white,
+/obj/structure/closet/crate/secure/gear,
+/obj/machinery/button/door{
+	id = "caravantrade2_cargo_port";
+	name = "Cargo Blast Door Control";
+	pixel_y = 24
+	},
+/obj/machinery/light/small{
+	dir = 1
+	},
+/obj/item/ammo_box/c10mm,
+/obj/item/ammo_box/magazine/m10mm{
+	pixel_x = -3;
+	pixel_y = 3
+	},
+/obj/item/ammo_box/magazine/m10mm,
+/turf/open/floor/plasteel/airless/dark,
+/area/shuttle/caravan/freighter2)
+"hX" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/light/small{
+	dir = 8
+	},
+/obj/structure/sign/warning/vacuum{
+	pixel_x = -32;
+	pixel_y = 32
+	},
+/turf/open/floor/plating/airless,
+/area/shuttle/caravan/freighter2)
+"hY" = (
 /obj/structure/rack,
-/obj/item/storage/firstaid/regular,
+/obj/item/weldingtool,
+/obj/item/crowbar,
+/obj/item/wirecutters,
+/obj/item/wrench,
+/obj/item/screwdriver{
+	pixel_y = 8
+	},
+/turf/open/floor/plating/airless,
+/area/shuttle/caravan/freighter2)
+"hZ" = (
+/obj/machinery/power/port_gen/pacman{
+	anchored = 1
+	},
+/obj/item/wrench,
+/obj/structure/cable,
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
+/turf/open/floor/plating/airless,
+/area/shuttle/caravan/freighter3)
+"ia" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/turf/open/floor/plasteel/airless{
+	icon_state = "damaged2"
+	},
+/area/shuttle/caravan/freighter3)
+"ib" = (
+/obj/effect/turf_decal/box/white/corners{
+	dir = 8
+	},
+/obj/structure/closet/crate/secure/plasma,
+/obj/item/tank/internals/plasma/full,
+/obj/item/stack/sheet/mineral/plasma{
+	amount = 25
+	},
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plating/airless,
+/area/shuttle/caravan/freighter3)
+"ic" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel/airless{
+	icon_state = "damaged5"
+	},
+/area/shuttle/caravan/freighter3)
+"id" = (
+/obj/effect/turf_decal/box/white/corners,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel/airless/dark,
+/area/shuttle/caravan/freighter3)
+"ie" = (
+/obj/machinery/airalarm/all_access{
+	dir = 8;
+	pixel_x = 24
+	},
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel/airless/floorgrime,
+/area/shuttle/caravan/freighter3)
+"if" = (
+/obj/machinery/firealarm{
+	dir = 8;
+	pixel_x = -26
+	},
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel/airless/dark,
+/area/shuttle/caravan/freighter3)
+"ig" = (
+/obj/structure/chair{
+	dir = 4
+	},
+/obj/effect/mob_spawn/human/corpse/cargo_tech,
+/obj/effect/decal/cleanable/blood,
+/turf/open/floor/plasteel/airless/dark,
+/area/shuttle/caravan/freighter3)
+"ih" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/frame/computer{
+	dir = 8
+	},
+/obj/item/shard,
+/turf/open/floor/plasteel/airless{
+	icon_state = "damaged3"
+	},
+/area/shuttle/caravan/freighter3)
+"io" = (
+/obj/structure/shuttle/engine/propulsion/burst{
+	dir = 8
+	},
+/turf/open/floor/plating/airless,
+/area/shuttle/caravan/freighter2)
+"ip" = (
+/obj/structure/shuttle/engine/heater{
+	dir = 8
+	},
+/obj/structure/window/reinforced{
+	dir = 4
+	},
+/turf/open/floor/plating/airless,
+/area/shuttle/caravan/freighter2)
+"iq" = (
+/obj/machinery/power/smes{
+	charge = 0
+	},
+/obj/structure/cable/yellow,
+/obj/effect/turf_decal/stripes/line{
+	dir = 5
+	},
+/turf/open/floor/plating/airless,
+/area/shuttle/caravan/freighter2)
+"is" = (
+/turf/open/floor/plasteel/airless{
+	icon_state = "damaged2"
+	},
+/area/shuttle/caravan/freighter2)
+"it" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 6
+	},
+/turf/open/floor/plasteel/airless,
+/area/shuttle/caravan/freighter2)
+"iu" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
+/turf/open/floor/plasteel/airless{
+	icon_state = "damaged3"
+	},
+/area/shuttle/caravan/freighter2)
+"iv" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
+/turf/open/floor/plasteel/blue/side{
+	dir = 4;
+	initial_gas_mix = "TEMP=2.7"
+	},
+/area/shuttle/caravan/freighter2)
+"ix" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 10
+	},
+/turf/open/floor/plasteel/airless{
+	icon_state = "floorscorched1"
+	},
+/area/shuttle/caravan/freighter2)
+"iy" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/fluff/broken_flooring{
+	icon_state = "pile"
+	},
+/turf/open/floor/plating/airless{
+	icon_state = "platingdmg1"
+	},
+/area/shuttle/caravan/freighter2)
+"iz" = (
+/obj/item/shard,
+/turf/open/floor/plating/airless{
+	icon_state = "platingdmg3"
+	},
+/area/shuttle/caravan/freighter3)
+"iA" = (
+/obj/machinery/meter,
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
+/turf/open/floor/plating/airless{
+	icon_state = "platingdmg1"
+	},
+/area/shuttle/caravan/freighter3)
+"iB" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plating/airless,
+/area/shuttle/caravan/freighter3)
+"iC" = (
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel/airless{
+	icon_state = "floorscorched1"
+	},
+/area/shuttle/caravan/freighter3)
+"iD" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
+/mob/living/simple_animal/hostile/syndicate/melee/space{
+	environment_smash = 0;
+	name = "Syndicate Salvage Worker"
+	},
+/turf/open/floor/plasteel/airless/floorgrime,
+/area/shuttle/caravan/freighter3)
+"iF" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel/airless/dark,
+/area/shuttle/caravan/freighter3)
+"iH" = (
+/obj/structure/table/reinforced,
+/obj/machinery/cell_charger,
 /turf/open/floor/plasteel/darkblue/side{
 	dir = 10;
 	initial_gas_mix = "TEMP=2.7"
 	},
-/area/shuttle/caravan/freighter1)
-"gp" = (
+/area/shuttle/caravan/freighter3)
+"iT" = (
+/obj/machinery/space_heater,
+/obj/machinery/power/terminal{
+	dir = 1
+	},
+/obj/structure/cable{
+	icon_state = "0-2"
+	},
+<<<<<<< HEAD
+/obj/structure/closet/crate,
+/obj/item/stack/sheet/metal/twenty,
+/obj/item/stack/sheet/glass{
+	amount = 10
+	},
+/obj/item/storage/toolbox/mechanical,
+/obj/item/flashlight{
+	pixel_x = 3;
+	pixel_y = 3
+	},
+/obj/item/stack/sheet/mineral/plasma{
+	amount = 20
+	},
+=======
+>>>>>>> ee3446e... Templates the caravan ambush ruin shuttles (#37474)
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
+/turf/open/floor/plating/airless,
+/area/shuttle/caravan/freighter2)
+"iU" = (
 /obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/turf/open/floor/plasteel/airless,
+/area/shuttle/caravan/freighter2)
+"iV" = (
+/obj/effect/turf_decal/box/white/corners{
+	dir = 4
+	},
+/obj/structure/closet/crate/secure/weapon,
+/obj/item/gun/ballistic/shotgun/riot{
+	pixel_x = -3;
+	pixel_y = 3
+	},
+/obj/item/gun/ballistic/shotgun/riot,
+/turf/open/floor/plasteel/airless/dark,
+/area/shuttle/caravan/freighter2)
+"iW" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/closet/crate/secure/weapon,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/item/gun/syringe/rapidsyringe,
+/obj/item/gun/syringe/syndicate{
+	pixel_x = 3;
+	pixel_y = -3
+	},
+/turf/open/floor/plasteel/airless/dark,
+/area/shuttle/caravan/freighter2)
+"iX" = (
+/obj/effect/turf_decal/box/white/corners{
+	dir = 1
+	},
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel/airless/dark,
+/area/shuttle/caravan/freighter2)
+"iY" = (
+/obj/machinery/firealarm{
+	dir = 4;
+	pixel_x = 24
+	},
+/turf/open/floor/plasteel/blue/corner{
+	dir = 4;
+	initial_gas_mix = "TEMP=2.7"
+	},
+/area/shuttle/caravan/freighter2)
+"ja" = (
+/obj/effect/turf_decal/bot_white,
+/obj/structure/closet/crate/secure/engineering,
+/obj/item/organ/cyberimp/arm/toolset,
+/obj/item/organ/cyberimp/eyes/hud/medical,
+/obj/item/organ/cyberimp/brain/anti_stun,
+/turf/open/floor/plasteel/airless/dark,
+/area/shuttle/caravan/freighter3)
+"jb" = (
+/obj/effect/turf_decal/bot_white,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel/airless{
+	icon_state = "damaged3"
+	},
+/area/shuttle/caravan/freighter3)
+"jc" = (
+/obj/effect/turf_decal/bot_white,
+/obj/structure/closet/crate/secure/plasma,
+/obj/item/mecha_parts/mecha_equipment/weapon/energy/plasma,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel/airless/dark,
+/area/shuttle/caravan/freighter3)
+"jd" = (
+/obj/effect/turf_decal/bot_white,
+/obj/machinery/light/small,
+/obj/machinery/button/door{
+	id = "caravantrade3_cargo_starboard";
+	name = "Cargo Blast Door Control";
+	pixel_y = -24
+	},
+/turf/open/floor/plasteel/airless/dark,
+/area/shuttle/caravan/freighter3)
+"je" = (
+/obj/machinery/light/small{
+	dir = 8
+	},
+/obj/structure/sign/warning/vacuum{
+	pixel_x = -32;
+	pixel_y = -32
+	},
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel/airless/dark,
+/area/shuttle/caravan/freighter3)
+"jp" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/power/port_gen/pacman{
+	anchored = 1
+	},
+/obj/item/wrench,
+/obj/structure/cable,
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
+/turf/open/floor/plating/airless,
+/area/shuttle/caravan/freighter2)
+"jq" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/turf/open/floor/plasteel/airless/floorgrime,
+/area/shuttle/caravan/freighter2)
+"jr" = (
+/obj/effect/turf_decal/box/white/corners{
+	dir = 8
+	},
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel/airless/dark,
+/area/shuttle/caravan/freighter2)
+"js" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/turf/open/floor/plasteel/airless/dark,
+/area/shuttle/caravan/freighter2)
+"jt" = (
+/obj/effect/turf_decal/box/white/corners,
+/obj/structure/closet/crate/secure/weapon,
+/obj/item/gun/energy/e_gun/mini{
+	pixel_x = -3;
+	pixel_y = 3
+	},
+/obj/item/gun/energy/e_gun/mini,
+/turf/open/floor/plasteel/airless/dark,
+/area/shuttle/caravan/freighter2)
+"ju" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/airalarm/all_access{
+	dir = 8;
+	pixel_x = 24
+	},
+/turf/open/floor/plasteel/airless,
+/area/shuttle/caravan/freighter2)
+"jv" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/firealarm{
+	dir = 8;
+	pixel_x = -26
+	},
+/turf/open/floor/plating/airless,
+/area/shuttle/caravan/freighter2)
+"jy" = (
+/obj/machinery/door/poddoor{
+	id = "caravantrade3_cargo_starboard";
+	name = "Cargo Blast Door"
+	},
+/turf/open/floor/plating/airless,
+/area/shuttle/caravan/freighter3)
+"jA" = (
+/obj/effect/turf_decal/bot_white,
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/closet/crate/secure/engineering,
+/obj/item/wrench/caravan,
+/obj/item/wirecutters/caravan,
+/obj/item/crowbar/red/caravan,
+/obj/item/screwdriver/caravan,
+/turf/open/floor/plasteel/airless/dark,
+/area/shuttle/caravan/freighter3)
+"jH" = (
+/obj/machinery/atmospherics/components/unary/tank/air{
+	dir = 4
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 6
+	},
+/turf/open/floor/plating/airless,
+/area/shuttle/caravan/freighter2)
+"jI" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/meter,
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
+/turf/open/floor/plasteel/airless,
+/area/shuttle/caravan/freighter2)
+"jJ" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
+/turf/open/floor/plasteel/airless/floorgrime,
+/area/shuttle/caravan/freighter2)
+"jK" = (
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
+/turf/open/floor/plasteel/airless{
+	icon_state = "floorscorched1"
+	},
+/area/shuttle/caravan/freighter2)
+"jL" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
+/mob/living/simple_animal/hostile/pirate/space/ranged{
+	environment_smash = 0
+	},
+/turf/open/floor/plasteel/airless/floorgrime,
+/area/shuttle/caravan/freighter2)
+"jN" = (
+/turf/open/floor/plasteel/airless{
+	icon_state = "floorscorched1"
+	},
+/area/shuttle/caravan/freighter2)
+"jO" = (
+/obj/effect/decal/cleanable/dirt,
+/mob/living/simple_animal/hostile/pirate/space/ranged{
+	environment_smash = 0
+	},
+/turf/open/floor/plating/airless,
+/area/shuttle/caravan/freighter2)
+"jP" = (
 /obj/structure/table/reinforced,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt,
 /obj/item/paper_bin{
 	pixel_x = 6;
 	pixel_y = 6
@@ -1836,11 +1160,12 @@
 /obj/item/pen{
 	pixel_x = 6;
 	pixel_y = 6
+<<<<<<< HEAD
 	},
 /obj/item/folder/yellow{
 	pixel_x = -6
 	},
-/obj/item/gps{
+/obj/item/device/gps{
 	gpstag = "Distress Signal"
 	},
 /turf/open/floor/plasteel/darkblue/side{
@@ -1872,8 +1197,8 @@
 /obj/item/storage/toolbox/electrical,
 /obj/item/clothing/gloves/color/yellow,
 /obj/item/clothing/gloves/color/yellow,
-/obj/item/multitool,
-/obj/item/multitool,
+/obj/item/device/multitool,
+/obj/item/device/multitool,
 /turf/open/floor/plasteel/airless/dark,
 /area/shuttle/caravan/freighter3)
 "gw" = (
@@ -2305,7 +1630,7 @@
 "hK" = (
 /obj/structure/table,
 /obj/item/storage/toolbox/mechanical,
-/obj/item/multitool,
+/obj/item/device/multitool,
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plasteel/airless,
@@ -2318,7 +1643,7 @@
 "hN" = (
 /obj/structure/rack,
 /obj/item/tank/internals/oxygen,
-/obj/item/radio,
+/obj/item/device/radio,
 /obj/item/clothing/mask/gas,
 /turf/open/floor/plasteel/blue/corner{
 	dir = 4;
@@ -3171,7 +2496,7 @@
 /obj/structure/rack,
 /obj/effect/decal/cleanable/dirt,
 /obj/item/tank/internals/oxygen,
-/obj/item/radio,
+/obj/item/device/radio,
 /obj/item/clothing/mask/gas,
 /turf/open/floor/plasteel/airless{
 	icon_state = "damaged5"
@@ -3786,103 +3111,148 @@
 "lo" = (
 /obj/machinery/computer/crew{
 	dir = 8
+=======
+>>>>>>> ee3446e... Templates the caravan ambush ruin shuttles (#37474)
 	},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel/darkred/side{
-	dir = 9
+/obj/item/folder/yellow{
+	pixel_x = -6
 	},
-/area/shuttle/caravan/syndicate3)
-"lp" = (
+/turf/open/floor/plating/airless,
+/area/shuttle/caravan/freighter2)
+"jV" = (
 /obj/structure/shuttle/engine/propulsion/burst/right{
 	dir = 8
 	},
 /turf/open/floor/plating/airless,
-/area/shuttle/caravan/syndicate3)
-"lq" = (
-/obj/structure/chair{
-	dir = 1
+/area/shuttle/caravan/freighter2)
+"jW" = (
+/obj/effect/turf_decal/bot_white/left,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/button/door{
+	id = "caravantrade2_cargo_starboard";
+	name = "Cargo Blast Door Control";
+	pixel_y = -24
 	},
+/obj/machinery/light/small,
+/turf/open/floor/plasteel/airless/dark,
+/area/shuttle/caravan/freighter2)
+"jX" = (
+/obj/effect/turf_decal/bot_white,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel/airless/dark,
+/area/shuttle/caravan/freighter2)
+"jY" = (
+/obj/effect/turf_decal/bot_white,
+/obj/structure/closet/crate/secure/gear,
+/obj/item/ammo_box/a40mm,
+/obj/item/ammo_box/a40mm,
+/turf/open/floor/plasteel/airless/dark,
+/area/shuttle/caravan/freighter2)
+"jZ" = (
+/obj/effect/turf_decal/bot_white,
+/turf/open/floor/plasteel/airless/dark,
+/area/shuttle/caravan/freighter2)
+"ka" = (
+/obj/effect/turf_decal/bot_white,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/button/door{
+	id = "caravantrade2_cargo_starboard";
+	name = "Cargo Blast Door Control";
+	pixel_y = -24
+	},
+/obj/machinery/light/small,
+/turf/open/floor/plasteel/airless/dark,
+/area/shuttle/caravan/freighter2)
+"kb" = (
+/obj/effect/decal/cleanable/dirt,
 /obj/machinery/light/small{
 	dir = 8
 	},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/pod/dark,
-/area/shuttle/caravan/syndicate3)
-"lr" = (
-/obj/structure/chair{
-	dir = 1
-	},
-/obj/machinery/firealarm{
-	dir = 1;
-	pixel_y = -26
-	},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/pod/dark,
-/area/shuttle/caravan/syndicate3)
-"ls" = (
-/obj/structure/chair{
-	dir = 1
-	},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/pod/dark,
-/area/shuttle/caravan/syndicate3)
-"lt" = (
-/obj/effect/turf_decal/stripes/line{
-	dir = 8
-	},
-/obj/machinery/light/small{
-	dir = 4
-	},
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/closet/syndicate/personal{
-	anchored = 1
-	},
-/turf/open/floor/mineral/plastitanium,
-/area/shuttle/caravan/syndicate3)
-"lv" = (
-/obj/effect/turf_decal/stripes/line{
-	dir = 8
-	},
 /obj/structure/sign/warning/vacuum{
+	pixel_x = -32;
 	pixel_y = -32
 	},
+/turf/open/floor/plasteel/airless/dark,
+/area/shuttle/caravan/freighter2)
+"kc" = (
+/obj/structure/rack,
 /obj/effect/decal/cleanable/dirt,
-/obj/structure/closet/syndicate{
-	anchored = 1
+/obj/item/tank/internals/oxygen,
+/obj/item/radio,
+/obj/item/clothing/mask/gas,
+/turf/open/floor/plasteel/airless{
+	icon_state = "damaged5"
 	},
-/turf/open/floor/mineral/plastitanium,
-/area/shuttle/caravan/syndicate3)
-"lw" = (
-/obj/structure/table/reinforced,
-/obj/item/storage/toolbox/emergency,
-/obj/item/wrench,
-/obj/machinery/light/small{
-	dir = 8
+/area/shuttle/caravan/freighter2)
+"kd" = (
+/obj/structure/grille/broken,
+/turf/open/floor/plating/airless{
+	icon_state = "platingdmg2"
 	},
+/area/shuttle/caravan/freighter2)
+"ke" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel/darkred/side{
-	dir = 9
+/obj/machinery/door/poddoor{
+	id = "caravantrade2_cargo_starboard";
+	name = "Cargo Blast Door"
 	},
+<<<<<<< HEAD
 /area/shuttle/caravan/syndicate3)
 "lx" = (
 /obj/structure/table/reinforced,
 /obj/item/storage/firstaid/regular,
-/obj/item/assembly/flash/handheld,
+/obj/item/device/assembly/flash/handheld,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plasteel/darkred/side{
 	dir = 5
+=======
+/turf/open/floor/plating/airless,
+/area/shuttle/caravan/freighter2)
+"kf" = (
+/obj/machinery/door/poddoor{
+	id = "caravantrade2_cargo_starboard";
+	name = "Cargo Blast Door"
+>>>>>>> ee3446e... Templates the caravan ambush ruin shuttles (#37474)
 	},
-/area/shuttle/caravan/syndicate3)
-"ly" = (
-/obj/machinery/porta_turret/syndicate/energy{
+/turf/open/floor/plating/airless,
+/area/shuttle/caravan/freighter2)
+"kr" = (
+/obj/docking_port/stationary{
 	dir = 2;
-	icon_state = "standard_lethal";
-	mode = 1
+	dwidth = 6;
+	height = 7;
+	id = "caravansyndicate3_ambush";
+	name = "Trade Route";
+	roundstart_template = /datum/map_template/shuttle/ruin/syndicate_dropship;
+	width = 15
 	},
-/turf/closed/wall/mineral/plastitanium/nodiagonal,
-/area/shuttle/caravan/syndicate3)
+/turf/template_noop,
+/area/template_noop)
+"kG" = (
+/obj/docking_port/stationary{
+	dir = 4;
+	dwidth = 4;
+	height = 5;
+	id = "caravansyndicate1_ambush";
+	name = "Trade Route";
+	roundstart_template = /datum/map_template/shuttle/ruin/syndicate_fighter;
+	width = 9
+	},
+/turf/template_noop,
+/area/template_noop)
+"kU" = (
+/obj/docking_port/stationary{
+	dir = 2;
+	dwidth = 11;
+	height = 11;
+	id = "caravantrade1_ambush";
+	name = "Trade Route";
+	roundstart_template = /datum/map_template/shuttle/ruin/caravan_victim;
+	width = 27
+	},
+/turf/template_noop,
+/area/template_noop)
 "lB" = (
 /turf/closed/mineral/random/high_chance,
 /area/ruin/unpowered)
@@ -3892,20 +3262,6 @@
 	icon_state = "platingdmg1"
 	},
 /area/ruin/unpowered)
-"lE" = (
-/obj/machinery/light/small,
-/obj/effect/turf_decal/box/white/corners,
-/obj/machinery/button/door{
-	id = "caravantrade1_cargo";
-	name = "Cargo Blast Door Control";
-	pixel_y = -24
-	},
-/obj/structure/closet/crate,
-/obj/item/stack/sheet/mineral/diamond{
-	amount = 5
-	},
-/turf/open/floor/plasteel/airless/dark,
-/area/shuttle/caravan/freighter1)
 "tH" = (
 /obj/structure/shuttle/engine/propulsion/burst{
 	dir = 8
@@ -4332,11 +3688,11 @@ aa
 aa
 aa
 aa
-kn
-ki
+aa
+aa
 kG
-ki
-kn
+aa
+aa
 aa
 aa
 aa
@@ -4383,13 +3739,13 @@ aa
 aa
 aa
 aa
-kn
-ki
-kI
-kV
-lg
-ki
-kn
+aa
+aa
+aa
+aa
+aa
+aa
+aa
 aa
 aa
 aa
@@ -4434,15 +3790,15 @@ aa
 aa
 aa
 aa
-kh
-ki
-ki
-ki
-kW
-ki
-ki
-ki
-kh
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
 aa
 aa
 aa
@@ -4474,27 +3830,27 @@ aa
 aa
 aa
 aa
-fK
-ge
-ge
-ge
-hD
-fG
 aa
 aa
 aa
 aa
 aa
 aa
-ki
-kh
 aa
-kj
-kX
-kj
 aa
-kh
-ki
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
 aa
 aa
 aa
@@ -4525,20 +3881,6 @@ aa
 aa
 aa
 aa
-fG
-fL
-fL
-fL
-fL
-fL
-fH
-fK
-ge
-hD
-aa
-aa
-aa
-kj
 aa
 aa
 aa
@@ -4546,7 +3888,21 @@ aa
 aa
 aa
 aa
-kj
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
 aa
 aa
 aa
@@ -4577,17 +3933,17 @@ aa
 aa
 aa
 aa
-fH
-ay
-gf
-gD
-hb
-hE
-fH
-fL
-fL
-fL
-fG
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
 aa
 aa
 aa
@@ -4629,17 +3985,17 @@ aa
 aa
 aa
 aa
-fH
-fN
-gg
-ax
-hc
-hF
-fH
-iI
-jg
-jz
-fH
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
 aa
 aa
 aa
@@ -4681,17 +4037,17 @@ aa
 aa
 aa
 aa
-fH
-fO
-fH
-fH
-fH
-fO
-fH
-iJ
-jh
-lE
-fH
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
 aa
 aa
 aa
@@ -4733,17 +4089,17 @@ aa
 aa
 aa
 aa
-fH
-fP
-az
-aB
-fH
-hG
-ii
-be
-ji
-jB
-jQ
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
 aa
 aa
 aa
@@ -4785,17 +4141,17 @@ aa
 aa
 aa
 aa
-fI
-fQ
-fH
-fH
-fH
-hH
-ij
-iL
-jj
-jC
-jR
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
 aa
 aa
 aa
@@ -4837,17 +4193,17 @@ aa
 aa
 aa
 aa
-fH
-fR
-aA
-aC
-fG
-hI
-he
-iM
-jj
-jD
-jS
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
 aa
 aa
 aa
@@ -4889,17 +4245,17 @@ aa
 aa
 aa
 aa
-fH
-fS
-fH
-fH
-fH
-hJ
-ik
-iN
-jk
-jE
-jQ
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
 aa
 aa
 aa
@@ -4941,17 +4297,17 @@ aa
 aa
 aa
 aa
-fH
-fT
-fH
-aF
-fH
-hK
-il
-iO
-jl
-jF
-jS
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
 aa
 aa
 aa
@@ -4993,17 +4349,17 @@ aa
 aa
 aa
 aa
-fI
-fU
-fH
-aH
-fH
-fH
-ij
-iP
-jm
-am
-jT
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
 aa
 aD
 aa
@@ -5045,17 +4401,17 @@ aa
 aa
 aa
 aa
-fI
-fV
-gj
-gJ
-hd
-aX
-im
-bf
-al
-aq
-ar
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
 aa
 aa
 aa
@@ -5097,16 +4453,16 @@ aa
 aa
 aa
 aa
-fI
-fW
-gl
-aJ
-he
-fH
-in
-iR
-am
-aq
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
 aa
 aa
 aa
@@ -5149,14 +4505,14 @@ aa
 aa
 aa
 aa
-fH
-fX
-gm
-fH
-hf
-fH
-fH
-iS
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
 br
 aa
 aD
@@ -5201,13 +4557,13 @@ aa
 aa
 aa
 aa
-fH
-fH
-fH
-fH
-hg
-hM
-fH
+aa
+aa
+aa
+aa
+aa
+aa
+aa
 aa
 aa
 aE
@@ -5254,12 +4610,12 @@ aa
 aa
 aa
 kU
-fY
-gn
-aK
-hh
-hN
-fI
+aa
+aa
+aa
+aa
+aa
+aa
 aa
 aa
 aa
@@ -5305,13 +4661,13 @@ bt
 aa
 aa
 aa
-fG
-fH
-fH
-fH
-hi
-fH
-fH
+aa
+aa
+aa
+aa
+aa
+aa
+aa
 aa
 aa
 aa
@@ -5358,12 +4714,12 @@ aa
 aa
 aa
 aa
-fH
-go
-aL
-hj
-hO
-fH
+aa
+aa
+aa
+aa
+aa
+aa
 aa
 aa
 aa
@@ -5410,12 +4766,12 @@ aa
 aa
 aa
 aa
-fI
-gp
-gN
-hk
-hP
-fI
+aa
+aa
+aa
+aa
+aa
+aa
 aa
 aa
 aa
@@ -5462,12 +4818,12 @@ aa
 aa
 aa
 aa
-fI
-fI
-gO
-hl
-fI
-fI
+aa
+aa
+aa
+aa
+aa
+aa
 aa
 aa
 aa
@@ -5515,10 +4871,10 @@ aa
 aa
 aa
 aa
-fI
-fI
-fI
-fI
+aa
+aa
+aa
+aa
 aa
 aa
 aa
@@ -5967,13 +5323,13 @@ aa
 aa
 aa
 aa
-dN
-ea
-em
 aa
-dN
-ea
-em
+aa
+aa
+aa
+aa
+aa
+aa
 aa
 aa
 aa
@@ -6018,15 +5374,15 @@ aa
 aa
 aa
 aa
-ch
-dO
-dO
-dO
-dB
-dO
-dO
-dO
-ch
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
 aa
 aa
 aa
@@ -6069,17 +5425,17 @@ aa
 aa
 aa
 aa
-ch
-dB
-dP
-eb
-en
-dB
-eV
-fk
-ft
-dB
-ch
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
 aa
 aa
 aa
@@ -6121,17 +5477,17 @@ aa
 aa
 aa
 aa
-dB
-dI
-dQ
-ec
-eo
-eK
-eW
-ec
-fu
-fC
-dB
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
 aa
 aa
 aa
@@ -6173,17 +5529,17 @@ aa
 aa
 aa
 aa
-dB
-dB
-dR
-ed
-dB
-dB
-dB
-ed
-dR
-dB
-dB
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
 aa
 aa
 aa
@@ -6225,17 +5581,17 @@ aa
 aa
 aa
 aa
-dB
-dJ
-dS
-ee
-ep
-dB
-eX
-fl
-fv
-dJ
-dB
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
 aa
 aa
 aa
@@ -6276,19 +5632,19 @@ aa
 aa
 aa
 aa
-ch
-dB
-dB
-dT
-ef
-eq
-dB
-eY
-ef
-fw
-dB
-dB
-ch
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
 bs
 bs
 bs
@@ -6329,18 +5685,18 @@ aa
 aa
 aa
 aj
-dG
-dK
-dU
-at
-er
-dB
-eZ
-fm
-fx
-fD
-dG
-fF
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
 af
 af
 af
@@ -6380,19 +5736,19 @@ aa
 aa
 aa
 aa
-ch
-dB
-dB
-dV
-ef
-es
-dB
-fa
-au
-fy
-dB
-dB
-ch
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
 bs
 bs
 bs
@@ -6433,17 +5789,17 @@ aa
 aa
 aa
 aa
-dH
-dJ
-dW
-eh
-et
-dB
-fb
-fo
-fz
-dJ
-dH
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
 aa
 aa
 aa
@@ -6485,17 +5841,17 @@ aa
 aa
 aa
 aa
-ch
-dB
-dX
-ei
-dB
-dB
-dB
-fp
-dB
-dB
-ch
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
 aa
 aa
 aa
@@ -6538,15 +5894,15 @@ aa
 aa
 aa
 aa
-dB
-dY
-ej
-ez
-eL
-fc
-fq
-fA
-dB
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
 aa
 aa
 aa
@@ -6590,15 +5946,15 @@ aa
 aa
 aa
 aa
-dB
-dZ
-ek
-eB
-eM
-fd
-fr
-fB
-dB
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
 aa
 aa
 aa
@@ -6642,15 +5998,15 @@ aa
 aa
 aa
 aa
-bb
-dB
-el
-eC
-eO
-fe
-fs
-dB
-bc
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
 aa
 aa
 aa
@@ -6695,13 +6051,13 @@ aa
 aa
 aa
 aa
-ch
-dB
-dB
-dB
-ff
-dB
-ch
+aa
+aa
+aa
+aa
+aa
+aa
+aa
 aa
 aa
 aa
@@ -6748,11 +6104,11 @@ aa
 aa
 aa
 aa
-dB
-eD
-eP
-fg
-dB
+aa
+aa
+aa
+aa
+aa
 aa
 aa
 aa
@@ -6800,11 +6156,11 @@ aa
 aa
 aa
 aa
-dB
-eE
-eQ
-fg
-dB
+aa
+aa
+aa
+aa
+aa
 aa
 aa
 aa
@@ -6852,11 +6208,11 @@ aa
 aa
 aa
 aa
-dB
-eF
-eR
-fh
-dB
+aa
+aa
+aa
+aa
+aa
 aa
 aa
 aa
@@ -6904,11 +6260,11 @@ aa
 aa
 aa
 aa
-dB
-eI
-eS
-fi
-dB
+aa
+aa
+aa
+aa
+aa
 aa
 aa
 aa
@@ -6956,11 +6312,11 @@ aa
 aa
 aa
 aa
-dH
-eJ
-eT
-fj
-dH
+aa
+aa
+aa
+aa
+aa
 aa
 aa
 aa
@@ -7008,11 +6364,11 @@ aa
 aa
 aa
 aa
-dH
-dH
-eU
-dH
-dH
+aa
+aa
+aa
+aa
+aa
 aa
 aa
 aa
@@ -7061,9 +6417,9 @@ aa
 aa
 aa
 aa
-dH
-dH
-dH
+aa
+aa
+aa
 aa
 aa
 aa
@@ -7244,11 +6600,11 @@ aa
 aa
 aa
 aa
-ku
-kJ
-kJ
-kJ
-lp
+aa
+aa
+aa
+aa
+aa
 aa
 aa
 aa
@@ -7295,13 +6651,13 @@ aa
 aa
 aa
 aa
-ko
-kv
-kv
-kv
-kv
-kv
-ko
+aa
+aa
+aa
+aa
+aa
+aa
+aa
 aa
 aa
 aa
@@ -7347,13 +6703,13 @@ aa
 aa
 aa
 aa
-kp
-kp
-aS
-aU
-aV
-kp
-kp
+aa
+aa
+aa
+aa
+aa
+aa
+aa
 aa
 aa
 aa
@@ -7399,13 +6755,13 @@ aa
 aa
 aa
 aa
-kp
-kw
-kL
-kZ
-li
-lq
-kp
+aa
+aa
+aa
+aa
+aa
+aa
+aa
 aa
 aa
 aa
@@ -7451,13 +6807,13 @@ aa
 aa
 aa
 aa
-kp
-kx
-kM
-la
-li
-lr
-kp
+aa
+aa
+aa
+aa
+aa
+aa
+aa
 aa
 aa
 aa
@@ -7503,13 +6859,13 @@ aa
 aa
 aa
 aa
-kp
-ky
-kM
-la
-lj
-ls
-kp
+aa
+aa
+aa
+aa
+aa
+aa
+aa
 aa
 aa
 aa
@@ -7555,13 +6911,13 @@ aa
 aa
 aa
 aa
-kp
-kz
-kN
-la
-lk
-lt
-kp
+aa
+aa
+aa
+aa
+aa
+aa
+aa
 aa
 aa
 bt
@@ -7607,13 +6963,13 @@ aa
 aa
 aa
 aa
-kq
-kp
-kp
-lb
-kp
-kp
-ly
+aa
+aa
+aa
+aa
+aa
+aa
+aa
 aa
 aa
 bt
@@ -7660,12 +7016,12 @@ aa
 aa
 aa
 kr
-bj
-kO
-la
-ll
-bk
-ba
+aa
+aa
+aa
+aa
+aa
+aa
 aa
 aa
 bt
@@ -7711,13 +7067,13 @@ aa
 aa
 aa
 aa
-kp
-kB
-kP
-lc
-lk
-lv
-kp
+aa
+aa
+aa
+aa
+aa
+aa
+aa
 aa
 aa
 bt
@@ -7763,13 +7119,13 @@ aT
 aa
 aa
 aa
-kp
-kp
-kp
-ld
-kp
-kp
-kp
+aa
+aa
+aa
+aa
+aa
+aa
+aa
 aa
 aa
 aa
@@ -7815,13 +7171,13 @@ aa
 aa
 aa
 aa
-kp
-kC
-kQ
-la
-lm
-lw
-kp
+aa
+aa
+aa
+aa
+aa
+aa
+aa
 aa
 aa
 aa
@@ -7867,13 +7223,13 @@ aa
 aa
 aa
 aa
-ks
-kD
-kR
-le
-ln
-lx
-ks
+aa
+aa
+aa
+aa
+aa
+aa
+aa
 aa
 aa
 aa
@@ -7919,13 +7275,13 @@ aa
 aa
 aa
 aa
-ks
-ks
-kS
-lf
-lo
-ks
-ks
+aa
+aa
+aa
+aa
+aa
+aa
+aa
 aa
 aa
 aa
@@ -7972,11 +7328,11 @@ br
 aa
 aa
 aa
-ks
-ks
-ks
-ks
-ks
+aa
+aa
+aa
+aa
+aa
 aa
 aa
 aa
@@ -8177,9 +7533,9 @@ ga
 aa
 aa
 aa
-kg
-kk
-kl
+aa
+aa
+aa
 aa
 aa
 aa
@@ -8230,9 +7586,9 @@ aa
 aa
 aa
 aa
-kl
-kk
-kE
+aa
+aa
+aa
 aa
 aa
 aa
@@ -8283,9 +7639,9 @@ aa
 aa
 aa
 aa
-kk
-kk
-kE
+aa
+aa
+aa
 aa
 aa
 aa
@@ -8334,10 +7690,10 @@ aa
 aa
 aa
 aa
-kg
-kk
-kF
-kk
+aa
+aa
+aa
+aa
 aa
 aa
 aa
@@ -8386,10 +7742,10 @@ aa
 aa
 aa
 aa
-km
-kt
-fJ
-kT
+aa
+aa
+aa
+aa
 aa
 aa
 aa
@@ -8438,10 +7794,10 @@ aa
 aa
 aa
 aa
-kg
-kk
-kH
-kk
+aa
+aa
+aa
+aa
 aa
 aa
 aa
@@ -8491,9 +7847,9 @@ aa
 aa
 aa
 aa
-kk
-kk
-kE
+aa
+aa
+aa
 aa
 aa
 aa
@@ -8542,9 +7898,9 @@ aa
 aa
 aa
 aa
-kl
-kk
-kE
+aa
+aa
+aa
 aa
 aa
 aa
@@ -8593,9 +7949,9 @@ aa
 aa
 aa
 aa
-kg
-kk
-kl
+aa
+aa
+aa
 aa
 aa
 aa
diff --git a/_maps/shuttles/ruin_caravan_victim.dmm b/_maps/shuttles/ruin_caravan_victim.dmm
new file mode 100644
index 0000000000..431d5aac61
--- /dev/null
+++ b/_maps/shuttles/ruin_caravan_victim.dmm
@@ -0,0 +1,1284 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"ap" = (
+/obj/structure/table,
+/obj/item/storage/toolbox/mechanical,
+/obj/item/multitool,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel/airless,
+/area/shuttle/caravan/freighter1)
+"ax" = (
+/obj/structure/closet/crate,
+/obj/item/stack/sheet/mineral/silver{
+	amount = 25
+	},
+/obj/item/stack/sheet/mineral/silver{
+	amount = 25
+	},
+/turf/open/floor/plasteel/airless/dark,
+/area/shuttle/caravan/freighter1)
+"aP" = (
+/obj/machinery/door/airlock{
+	name = "Crew Quarters"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
+/turf/open/floor/plasteel/airless/floorgrime,
+/area/shuttle/caravan/freighter1)
+"bg" = (
+/obj/machinery/airalarm/all_access{
+	pixel_y = 24
+	},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
+	dir = 1
+	},
+/turf/open/floor/plasteel/airless,
+/area/shuttle/caravan/freighter1)
+"bu" = (
+/obj/machinery/door/airlock{
+	name = "Crew Cabins"
+	},
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
+/turf/open/floor/plasteel/airless/floorgrime,
+/area/shuttle/caravan/freighter1)
+"bI" = (
+/obj/machinery/light/small,
+/obj/effect/turf_decal/box/white/corners,
+/obj/machinery/button/door{
+	id = "caravantrade1_cargo";
+	name = "Cargo Blast Door Control";
+	pixel_y = -24
+	},
+/obj/structure/closet/crate,
+/obj/item/stack/sheet/mineral/diamond{
+	amount = 5
+	},
+/turf/open/floor/plasteel/airless/dark,
+/area/shuttle/caravan/freighter1)
+"bR" = (
+/obj/structure/toilet{
+	dir = 4
+	},
+/obj/structure/sink{
+	pixel_y = 24
+	},
+/obj/machinery/light/small,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel/showroomfloor{
+	initial_gas_mix = "TEMP=2.7"
+	},
+/area/shuttle/caravan/freighter1)
+"ct" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
+	dir = 8
+	},
+/turf/open/floor/plasteel/airless/floorgrime,
+/area/shuttle/caravan/freighter1)
+"cx" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
+/turf/open/floor/plasteel/yellow/corner{
+	dir = 4;
+	initial_gas_mix = "TEMP=2.7"
+	},
+/area/shuttle/caravan/freighter1)
+"cX" = (
+/obj/structure/chair/stool,
+/turf/open/floor/plasteel/yellow/side{
+	dir = 4;
+	initial_gas_mix = "TEMP=2.7"
+	},
+/area/shuttle/caravan/freighter1)
+"ec" = (
+/obj/structure/cable/yellow{
+	icon_state = "2-8"
+	},
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/turf/open/floor/plating/airless,
+/area/shuttle/caravan/freighter1)
+"eP" = (
+/obj/machinery/door/poddoor{
+	id = "caravantrade1_cargo";
+	name = "Cargo Blast Door"
+	},
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plating/airless,
+/area/shuttle/caravan/freighter1)
+"fk" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
+/obj/machinery/meter,
+/turf/open/floor/plating/airless,
+/area/shuttle/caravan/freighter1)
+"fD" = (
+/turf/template_noop,
+/area/shuttle/caravan/freighter1)
+"gs" = (
+/obj/structure/closet/secure_closet/freezer{
+	locked = 0;
+	name = "fridge"
+	},
+/obj/item/reagent_containers/food/drinks/beer{
+	pixel_x = -3;
+	pixel_y = 3
+	},
+/obj/item/reagent_containers/food/drinks/beer,
+/obj/item/reagent_containers/food/drinks/beer{
+	pixel_x = 3;
+	pixel_y = -3
+	},
+/obj/item/reagent_containers/glass/beaker/waterbottle{
+	pixel_x = -3;
+	pixel_y = 3
+	},
+/obj/item/reagent_containers/glass/beaker/waterbottle,
+/obj/item/reagent_containers/glass/beaker/waterbottle{
+	pixel_x = 3;
+	pixel_y = -3
+	},
+/obj/item/reagent_containers/food/snacks/pizzaslice/margherita{
+	pixel_x = -3;
+	pixel_y = 3
+	},
+/obj/item/reagent_containers/food/snacks/pizzaslice/margherita,
+/obj/item/reagent_containers/food/snacks/chocolatebar,
+/turf/open/floor/plasteel/yellow/side{
+	dir = 5;
+	initial_gas_mix = "TEMP=2.7"
+	},
+/area/shuttle/caravan/freighter1)
+"gw" = (
+/obj/structure/chair{
+	dir = 4
+	},
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/mob_spawn/human/corpse/cargo_tech,
+/obj/effect/decal/cleanable/blood,
+/turf/open/floor/plasteel/darkblue/corner{
+	initial_gas_mix = "TEMP=2.7"
+	},
+/area/shuttle/caravan/freighter1)
+"hk" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel/airless/dark,
+/area/shuttle/caravan/freighter1)
+"if" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
+/mob/living/simple_animal/hostile/syndicate/ranged/space{
+	environment_smash = 0;
+	name = "Syndicate Salvage Worker"
+	},
+/turf/open/floor/plasteel/airless,
+/area/shuttle/caravan/freighter1)
+"jg" = (
+/obj/machinery/door/airlock{
+	name = "Restroom"
+	},
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel/showroomfloor{
+	initial_gas_mix = "TEMP=2.7"
+	},
+/area/shuttle/caravan/freighter1)
+"lt" = (
+/obj/structure/cable,
+/obj/machinery/power/port_gen/pacman{
+	anchored = 1
+	},
+/obj/item/wrench,
+/obj/effect/turf_decal/stripes/line{
+	dir = 6
+	},
+/turf/open/floor/plating/airless,
+/area/shuttle/caravan/freighter1)
+"lx" = (
+/obj/effect/turf_decal/box/white/corners{
+	dir = 4
+	},
+/turf/open/floor/plasteel/airless{
+	icon_state = "damaged4"
+	},
+/area/shuttle/caravan/freighter1)
+"lC" = (
+/obj/machinery/power/smes{
+	charge = 0
+	},
+/obj/structure/cable/yellow{
+	icon_state = "0-4"
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 5
+	},
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plating/airless,
+/area/shuttle/caravan/freighter1)
+"lM" = (
+/obj/machinery/light/small{
+	dir = 8
+	},
+/obj/structure/sign/warning/vacuum{
+	pixel_x = 32
+	},
+/turf/open/floor/plating,
+/area/shuttle/caravan/freighter1)
+"mo" = (
+/obj/structure/shuttle/engine/heater{
+	dir = 8
+	},
+/obj/structure/window/reinforced{
+	dir = 4
+	},
+/turf/open/floor/plating/airless,
+/area/shuttle/caravan/freighter1)
+"mw" = (
+/obj/machinery/light/small{
+	dir = 8
+	},
+/obj/machinery/firealarm{
+	dir = 8;
+	pixel_x = -24
+	},
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/rack,
+/obj/item/storage/toolbox/emergency,
+/obj/item/wrench,
+/turf/open/floor/plasteel/darkblue/side{
+	dir = 9;
+	initial_gas_mix = "TEMP=2.7"
+	},
+/area/shuttle/caravan/freighter1)
+"mZ" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/computer/camera_advanced/shuttle_docker/caravan/trade1{
+	dir = 8
+	},
+/turf/open/floor/plasteel/darkblue/side{
+	dir = 9;
+	initial_gas_mix = "TEMP=2.7"
+	},
+/area/shuttle/caravan/freighter1)
+"oj" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
+	dir = 1
+	},
+/turf/open/floor/plating/airless,
+/area/shuttle/caravan/freighter1)
+"oS" = (
+/turf/open/floor/plasteel/airless/dark,
+/area/shuttle/caravan/freighter1)
+"pR" = (
+/obj/machinery/light/small,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
+/turf/open/floor/plasteel/yellow/side{
+	dir = 1;
+	initial_gas_mix = "TEMP=2.7"
+	},
+/area/shuttle/caravan/freighter1)
+"qp" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
+/turf/open/floor/plasteel/blue/side{
+	dir = 4;
+	initial_gas_mix = "TEMP=2.7"
+	},
+/area/shuttle/caravan/freighter1)
+"qM" = (
+/obj/machinery/airalarm/all_access{
+	dir = 4;
+	pixel_x = -24
+	},
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/blood,
+/obj/machinery/atmospherics/components/unary/vent_pump/on,
+/turf/open/floor/plasteel/airless/dark,
+/area/shuttle/caravan/freighter1)
+"rF" = (
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
+	dir = 8
+	},
+/turf/open/floor/plasteel/airless/floorgrime,
+/area/shuttle/caravan/freighter1)
+"sf" = (
+/obj/machinery/light{
+	dir = 1
+	},
+/obj/structure/table,
+/obj/item/stack/packageWrap,
+/obj/item/crowbar,
+/obj/item/flashlight{
+	pixel_x = 1;
+	pixel_y = 5
+	},
+/obj/machinery/airalarm/all_access{
+	pixel_y = 24
+	},
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel/airless,
+/area/shuttle/caravan/freighter1)
+"si" = (
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+	dir = 1
+	},
+/obj/effect/mapping_helpers/airlock/locked,
+/obj/machinery/door/airlock/external{
+	id_tag = "caravantrade1_bolt"
+	},
+/turf/open/floor/plating,
+/area/shuttle/caravan/freighter1)
+"ss" = (
+/obj/structure/rack,
+/obj/item/storage/belt/utility,
+/obj/structure/extinguisher_cabinet{
+	pixel_y = 29
+	},
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel/airless/floorgrime,
+/area/shuttle/caravan/freighter1)
+"tg" = (
+/obj/effect/turf_decal/box/white/corners{
+	dir = 8
+	},
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel/airless/dark,
+/area/shuttle/caravan/freighter1)
+"ur" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plating/airless{
+	icon_state = "platingdmg3"
+	},
+/area/shuttle/caravan/freighter1)
+"uA" = (
+/obj/machinery/light/small,
+/obj/structure/bed,
+/obj/item/bedsheet,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/airalarm/all_access{
+	dir = 8;
+	pixel_x = 24
+	},
+/obj/machinery/button/door{
+	id = "caravantrade1_cabin1";
+	name = "Cabin Bolt Control";
+	normaldoorcontrol = 1;
+	pixel_x = -25;
+	pixel_y = 6;
+	specialfunctions = 4
+	},
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+	dir = 1
+	},
+/turf/open/floor/plasteel/vault/airless,
+/area/shuttle/caravan/freighter1)
+"uS" = (
+/mob/living/simple_animal/hostile/syndicate/melee/space{
+	environment_smash = 0;
+	name = "Syndicate Salvage Worker"
+	},
+/turf/open/floor/plasteel/vault/airless,
+/area/shuttle/caravan/freighter1)
+"vt" = (
+/obj/structure/shuttle/engine/propulsion/burst{
+	dir = 8
+	},
+/turf/open/floor/plating/airless,
+/area/shuttle/caravan/freighter1)
+"xz" = (
+/obj/effect/turf_decal/box/white/corners{
+	dir = 1
+	},
+/turf/open/floor/plasteel/airless{
+	icon_state = "damaged5"
+	},
+/area/shuttle/caravan/freighter1)
+"yn" = (
+/obj/structure/closet/crate,
+/obj/item/stack/sheet/mineral/titanium{
+	amount = 20
+	},
+/obj/item/stack/sheet/mineral/titanium{
+	amount = 20
+	},
+/turf/open/floor/plasteel/vault/airless,
+/area/shuttle/caravan/freighter1)
+"yC" = (
+/obj/machinery/button/door{
+	id = "caravantrade1_bolt";
+	name = "External Bolt Control";
+	normaldoorcontrol = 1;
+	pixel_x = -25;
+	pixel_y = 8;
+	specialfunctions = 4
+	},
+/obj/machinery/atmospherics/components/unary/vent_pump/on,
+/turf/open/floor/plasteel/blue/corner{
+	initial_gas_mix = "TEMP=2.7"
+	},
+/area/shuttle/caravan/freighter1)
+"zd" = (
+/obj/effect/turf_decal/bot,
+/obj/machinery/atmospherics/components/unary/tank/air{
+	dir = 4
+	},
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plating/airless,
+/area/shuttle/caravan/freighter1)
+"zy" = (
+/obj/structure/girder,
+/turf/open/floor/plating/airless{
+	icon_state = "platingdmg1"
+	},
+/area/shuttle/caravan/freighter1)
+"Ax" = (
+/obj/item/stack/sheet/metal/fifty,
+/turf/open/floor/plasteel/airless{
+	icon_state = "floorscorched2"
+	},
+/area/shuttle/caravan/freighter1)
+"AM" = (
+/obj/machinery/door/firedoor,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
+/obj/machinery/door/airlock/command{
+	name = "Bridge"
+	},
+/turf/open/floor/plasteel/airless/dark,
+/area/shuttle/caravan/freighter1)
+"AX" = (
+/obj/effect/turf_decal/box/white/corners,
+/obj/structure/closet/crate,
+/obj/item/stack/sheet/glass/fifty,
+/obj/item/stack/sheet/glass/fifty,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel/airless/dark,
+/area/shuttle/caravan/freighter1)
+"Bu" = (
+/obj/item/stack/sheet/mineral/titanium,
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
+	dir = 4
+	},
+/turf/open/floor/plasteel/airless{
+	icon_state = "damaged1"
+	},
+/area/shuttle/caravan/freighter1)
+"Bx" = (
+/obj/structure/table,
+/obj/item/storage/box/donkpockets{
+	pixel_x = 6;
+	pixel_y = 6
+	},
+/obj/item/trash/plate{
+	pixel_x = -5;
+	pixel_y = -3
+	},
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel/vault/airless,
+/area/shuttle/caravan/freighter1)
+"BN" = (
+/obj/machinery/door/firedoor,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
+/obj/machinery/door/airlock/engineering{
+	name = "Engine Room"
+	},
+/turf/open/floor/plating/airless,
+/area/shuttle/caravan/freighter1)
+"CR" = (
+/obj/effect/turf_decal/bot_white,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+	dir = 1
+	},
+/turf/open/floor/plasteel/vault/airless,
+/area/shuttle/caravan/freighter1)
+"CU" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
+/turf/open/floor/plasteel/airless{
+	icon_state = "floorscorched1"
+	},
+/area/shuttle/caravan/freighter1)
+"Dt" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 10
+	},
+/obj/effect/decal/cleanable/blood,
+/turf/open/floor/plasteel/yellow/side{
+	dir = 1;
+	initial_gas_mix = "TEMP=2.7"
+	},
+/area/shuttle/caravan/freighter1)
+"DQ" = (
+/obj/effect/turf_decal/box/white/corners{
+	dir = 1
+	},
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/closet/crate,
+/obj/item/stack/sheet/mineral/gold{
+	amount = 25
+	},
+/turf/open/floor/plasteel/airless/dark,
+/area/shuttle/caravan/freighter1)
+"El" = (
+/turf/closed/wall/mineral/titanium/nodiagonal,
+/area/shuttle/caravan/freighter1)
+"Eo" = (
+/obj/structure/lattice,
+/obj/item/stack/sheet/mineral/titanium,
+/turf/template_noop,
+/area/shuttle/caravan/freighter1)
+"EI" = (
+/obj/effect/decal/cleanable/blood,
+/mob/living/simple_animal/hostile/syndicate/melee/space/stormtrooper{
+	environment_smash = 0;
+	name = "Syndicate Salvage Leader"
+	},
+/turf/open/floor/plasteel/darkblue/corner{
+	dir = 4;
+	initial_gas_mix = "TEMP=2.7"
+	},
+/area/shuttle/caravan/freighter1)
+"EQ" = (
+/obj/machinery/light/small{
+	dir = 4
+	},
+/obj/machinery/firealarm{
+	dir = 4;
+	pixel_x = 24
+	},
+/obj/effect/decal/cleanable/blood,
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+	dir = 8
+	},
+/mob/living/simple_animal/hostile/syndicate/ranged/space{
+	environment_smash = 0;
+	name = "Syndicate Salvage Worker"
+	},
+/turf/open/floor/plasteel/yellow/corner{
+	dir = 4;
+	initial_gas_mix = "TEMP=2.7"
+	},
+/area/shuttle/caravan/freighter1)
+"EW" = (
+/obj/structure/table/reinforced,
+/obj/machinery/button/door{
+	id = "caravantrade1_bridge";
+	name = "Ship Blast Door Control"
+	},
+/turf/open/floor/plasteel/darkblue/side{
+	dir = 5;
+	initial_gas_mix = "TEMP=2.7"
+	},
+/area/shuttle/caravan/freighter1)
+"EZ" = (
+/turf/open/floor/plasteel/vault/airless,
+/area/shuttle/caravan/freighter1)
+"Fv" = (
+/turf/closed/wall/mineral/titanium,
+/area/shuttle/caravan/freighter1)
+"Fx" = (
+/obj/structure/lattice,
+/obj/structure/fluff/broken_flooring{
+	icon_state = "singular"
+	},
+/turf/template_noop,
+/area/shuttle/caravan/freighter1)
+"GJ" = (
+/obj/machinery/firealarm{
+	dir = 2;
+	pixel_y = 24
+	},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
+	dir = 1
+	},
+/turf/open/floor/plasteel/airless,
+/area/shuttle/caravan/freighter1)
+"Hv" = (
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
+	dir = 8
+	},
+/turf/open/floor/plasteel/airless,
+/area/shuttle/caravan/freighter1)
+"Ib" = (
+/obj/machinery/light/small{
+	dir = 1
+	},
+/obj/machinery/airalarm/all_access{
+	pixel_y = 24
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
+/turf/open/floor/plasteel/airless,
+/area/shuttle/caravan/freighter1)
+"Ja" = (
+/obj/machinery/light/small{
+	dir = 8
+	},
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/rack,
+/obj/item/storage/firstaid/regular,
+/turf/open/floor/plasteel/darkblue/side{
+	dir = 10;
+	initial_gas_mix = "TEMP=2.7"
+	},
+/area/shuttle/caravan/freighter1)
+"Jv" = (
+/turf/template_noop,
+/area/template_noop)
+"Ko" = (
+/obj/structure/rack,
+/obj/item/tank/internals/oxygen,
+/obj/item/radio,
+/obj/item/clothing/mask/gas,
+/turf/open/floor/plasteel/blue/corner{
+	dir = 4;
+	initial_gas_mix = "TEMP=2.7"
+	},
+/area/shuttle/caravan/freighter1)
+"KC" = (
+/obj/structure/shuttle/engine/propulsion/burst/right{
+	dir = 8
+	},
+/turf/open/floor/plating/airless,
+/area/shuttle/caravan/freighter1)
+"KX" = (
+/obj/structure/shuttle/engine/propulsion/burst/left{
+	dir = 8
+	},
+/turf/open/floor/plating/airless,
+/area/shuttle/caravan/freighter1)
+"LK" = (
+/obj/machinery/suit_storage_unit/standard_unit,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel/airless,
+/area/shuttle/caravan/freighter1)
+"LM" = (
+/obj/effect/spawner/structure/window/shuttle,
+/obj/machinery/door/poddoor{
+	id = "caravantrade1_bridge"
+	},
+/turf/open/floor/plating,
+/area/shuttle/caravan/freighter1)
+"LX" = (
+/obj/machinery/door/firedoor,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/structure/door_assembly/door_assembly_min{
+	anchored = 1;
+	density = 0;
+	name = "broken airlock"
+	},
+/turf/open/floor/plasteel/airless/floorgrime,
+/area/shuttle/caravan/freighter1)
+"Mb" = (
+/obj/machinery/light/small,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
+/turf/open/floor/plasteel/airless,
+/area/shuttle/caravan/freighter1)
+"NL" = (
+/obj/structure/table,
+/obj/machinery/microwave{
+	pixel_y = 5
+	},
+/turf/open/floor/plasteel/vault/airless,
+/area/shuttle/caravan/freighter1)
+"NY" = (
+/obj/machinery/door/poddoor{
+	id = "caravantrade1_cargo";
+	name = "Cargo Blast Door"
+	},
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plating/airless{
+	icon_state = "platingdmg3"
+	},
+/area/shuttle/caravan/freighter1)
+"Od" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/table/reinforced,
+/obj/item/paper_bin{
+	pixel_x = 6;
+	pixel_y = 6
+	},
+/obj/item/pen{
+	pixel_x = 6;
+	pixel_y = 6
+	},
+/obj/item/folder/yellow{
+	pixel_x = -6
+	},
+/obj/item/gps{
+	gpstag = "Distress Signal"
+	},
+/turf/open/floor/plasteel/darkblue/side{
+	dir = 6;
+	initial_gas_mix = "TEMP=2.7"
+	},
+/area/shuttle/caravan/freighter1)
+"Ov" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel/airless{
+	icon_state = "damaged2"
+	},
+/area/shuttle/caravan/freighter1)
+"Ow" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/computer/shuttle/caravan/trade1{
+	dir = 8
+	},
+/turf/open/floor/plasteel/darkblue/side{
+	dir = 10;
+	initial_gas_mix = "TEMP=2.7"
+	},
+/area/shuttle/caravan/freighter1)
+"OK" = (
+/obj/effect/turf_decal/box/white/corners{
+	dir = 4
+	},
+/obj/structure/closet/crate,
+/obj/item/stack/sheet/mineral/uranium{
+	amount = 10
+	},
+/obj/item/stack/sheet/mineral/uranium{
+	amount = 10
+	},
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel/airless/dark,
+/area/shuttle/caravan/freighter1)
+"PM" = (
+/obj/machinery/light/small,
+/obj/structure/bed,
+/obj/item/bedsheet,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/airalarm/all_access{
+	dir = 8;
+	pixel_x = 24
+	},
+/obj/machinery/button/door{
+	id = "caravantrade1_cabin2";
+	name = "Cabin Bolt Control";
+	normaldoorcontrol = 1;
+	pixel_x = -25;
+	pixel_y = 6;
+	specialfunctions = 4
+	},
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+	dir = 1
+	},
+/turf/open/floor/plasteel/vault/airless,
+/area/shuttle/caravan/freighter1)
+"Qk" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 10
+	},
+/turf/open/floor/plasteel/airless/floorgrime,
+/area/shuttle/caravan/freighter1)
+"Qs" = (
+/obj/machinery/light/small{
+	dir = 4
+	},
+/obj/structure/cable/yellow,
+/obj/machinery/power/apc{
+	dir = 4;
+	name = "Small Freighter APC";
+	pixel_x = 24;
+	req_access = null;
+	start_charge = 0
+	},
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/turf/open/floor/plating/airless,
+/area/shuttle/caravan/freighter1)
+"QY" = (
+/obj/structure/table,
+/obj/machinery/cell_charger,
+/obj/machinery/firealarm{
+	dir = 2;
+	pixel_y = 24
+	},
+/obj/item/stack/cable_coil/yellow{
+	pixel_x = 12;
+	pixel_y = 4
+	},
+/turf/open/floor/plasteel/airless,
+/area/shuttle/caravan/freighter1)
+"Rw" = (
+/obj/machinery/door/airlock{
+	id_tag = "caravantrade1_cabin2";
+	name = "Cabin 2"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/turf/open/floor/plasteel/vault/airless,
+/area/shuttle/caravan/freighter1)
+"RI" = (
+/obj/effect/turf_decal/box/white/corners{
+	dir = 8
+	},
+/turf/open/floor/plasteel/airless/dark,
+/area/shuttle/caravan/freighter1)
+"RN" = (
+/obj/effect/turf_decal/bot,
+/obj/machinery/space_heater,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+	dir = 4
+	},
+/turf/open/floor/plating/airless{
+	icon_state = "platingdmg3"
+	},
+/area/shuttle/caravan/freighter1)
+"Sn" = (
+/obj/effect/turf_decal/box/white/corners{
+	dir = 1
+	},
+/turf/open/floor/plasteel/airless/dark,
+/area/shuttle/caravan/freighter1)
+"Su" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel/airless{
+	icon_state = "damaged3"
+	},
+/area/shuttle/caravan/freighter1)
+"Td" = (
+/obj/structure/lattice,
+/turf/template_noop,
+/area/shuttle/caravan/freighter1)
+"TP" = (
+/obj/structure/closet/crate{
+	icon_state = "crateopen"
+	},
+/obj/item/stack/sheet/metal/fifty,
+/turf/open/floor/plasteel/airless/dark,
+/area/shuttle/caravan/freighter1)
+"Ut" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plating/airless,
+/area/shuttle/caravan/freighter1)
+"UW" = (
+/obj/machinery/airalarm/all_access{
+	dir = 8;
+	pixel_x = 24
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/turf/open/floor/plating/airless{
+	icon_state = "platingdmg1"
+	},
+/area/shuttle/caravan/freighter1)
+"VD" = (
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+	dir = 2
+	},
+/obj/effect/mapping_helpers/airlock/locked,
+/obj/machinery/door/airlock/external{
+	id_tag = "caravantrade1_bolt"
+	},
+/obj/docking_port/mobile{
+	callTime = 250;
+	dir = 2;
+	dwidth = 5;
+	height = 11;
+	id = "caravantrade1";
+	movement_force = list("KNOCKDOWN" = 0, "THROW" = 0);
+	name = "Small Freighter";
+	port_direction = 8;
+	preferred_direction = 4;
+	timid = 1;
+	width = 21
+	},
+/turf/open/floor/plating,
+/area/shuttle/caravan/freighter1)
+"VN" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
+/turf/open/floor/plasteel/airless/floorgrime,
+/area/shuttle/caravan/freighter1)
+"VT" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
+/turf/open/floor/plasteel/airless,
+/area/shuttle/caravan/freighter1)
+"Wm" = (
+/obj/machinery/door/airlock{
+	id_tag = "caravantrade1_cabin1";
+	name = "Cabin 1"
+	},
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/turf/open/floor/plasteel/vault/airless,
+/area/shuttle/caravan/freighter1)
+"WU" = (
+/obj/machinery/airalarm/all_access{
+	dir = 4;
+	pixel_x = -24
+	},
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/effect/mob_spawn/human/corpse/cargo_tech,
+/obj/effect/decal/cleanable/blood,
+/turf/open/floor/plasteel/airless/floorgrime,
+/area/shuttle/caravan/freighter1)
+"WX" = (
+/obj/effect/turf_decal/box/white/corners{
+	dir = 8
+	},
+/obj/structure/closet/crate,
+/obj/item/stack/sheet/plasteel/twenty,
+/obj/item/stack/sheet/plasteel/twenty,
+/turf/open/floor/plasteel/airless{
+	icon_state = "damaged5"
+	},
+/area/shuttle/caravan/freighter1)
+"WZ" = (
+/obj/machinery/power/terminal{
+	dir = 1
+	},
+/obj/structure/cable{
+	icon_state = "0-2"
+	},
+/obj/structure/closet/crate,
+/obj/item/stack/sheet/metal/twenty,
+/obj/item/stack/sheet/glass{
+	amount = 10
+	},
+/obj/item/stack/rods/ten,
+/obj/item/storage/box/lights/bulbs,
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plating/airless,
+/area/shuttle/caravan/freighter1)
+"Xh" = (
+/obj/machinery/door/poddoor{
+	id = "caravantrade1_cargo";
+	name = "Cargo Blast Door"
+	},
+/turf/open/floor/plating/airless,
+/area/shuttle/caravan/freighter1)
+"Xt" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 9
+	},
+/turf/open/floor/plasteel/airless/dark,
+/area/shuttle/caravan/freighter1)
+"XI" = (
+/obj/effect/turf_decal/bot_white,
+/obj/structure/closet/emcloset,
+/turf/open/floor/plasteel/vault/airless,
+/area/shuttle/caravan/freighter1)
+"Zk" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+	dir = 1
+	},
+/turf/open/floor/plasteel/vault/airless,
+/area/shuttle/caravan/freighter1)
+"ZZ" = (
+/obj/effect/turf_decal/box/white/corners{
+	dir = 4
+	},
+/obj/structure/closet/crate,
+/obj/item/stack/sheet/rglass{
+	amount = 20
+	},
+/obj/item/stack/sheet/rglass{
+	amount = 20
+	},
+/turf/open/floor/plasteel/airless/dark,
+/area/shuttle/caravan/freighter1)
+
+(1,1,1) = {"
+Jv
+KX
+vt
+vt
+vt
+KC
+Fv
+Jv
+Jv
+Jv
+Jv
+"}
+(2,1,1) = {"
+Fv
+mo
+mo
+mo
+mo
+mo
+El
+KX
+vt
+KC
+Jv
+"}
+(3,1,1) = {"
+El
+RN
+lC
+WZ
+lt
+zd
+El
+mo
+mo
+mo
+Fv
+"}
+(4,1,1) = {"
+El
+oj
+ec
+Qs
+UW
+fk
+El
+OK
+ax
+tg
+El
+"}
+(5,1,1) = {"
+El
+BN
+El
+El
+El
+BN
+El
+DQ
+oS
+bI
+El
+"}
+(6,1,1) = {"
+El
+GJ
+Rw
+PM
+El
+Qk
+ct
+Zk
+uS
+EZ
+eP
+"}
+(7,1,1) = {"
+LM
+Mb
+El
+El
+El
+ss
+CU
+ZZ
+hk
+RI
+NY
+"}
+(8,1,1) = {"
+El
+bg
+Wm
+uA
+Fv
+sf
+VT
+Sn
+hk
+AX
+Xh
+"}
+(9,1,1) = {"
+El
+bu
+El
+El
+El
+QY
+if
+Ax
+yn
+Su
+eP
+"}
+(10,1,1) = {"
+El
+cx
+El
+bR
+El
+ap
+VN
+lx
+TP
+WX
+Xh
+"}
+(11,1,1) = {"
+LM
+pR
+El
+jg
+El
+El
+CU
+xz
+Ov
+Td
+ur
+"}
+(12,1,1) = {"
+LM
+Dt
+WU
+Hv
+rF
+LX
+Bu
+CR
+Fx
+fD
+Eo
+"}
+(13,1,1) = {"
+LM
+gs
+cX
+EQ
+VT
+El
+XI
+Ut
+Td
+fD
+fD
+"}
+(14,1,1) = {"
+El
+NL
+Bx
+El
+aP
+El
+El
+zy
+fD
+fD
+fD
+"}
+(15,1,1) = {"
+El
+El
+El
+El
+Ib
+LK
+El
+Jv
+Jv
+Jv
+Jv
+"}
+(16,1,1) = {"
+VD
+lM
+si
+yC
+qp
+Ko
+LM
+Jv
+Jv
+Jv
+Jv
+"}
+(17,1,1) = {"
+Fv
+El
+El
+El
+AM
+El
+El
+Jv
+Jv
+Jv
+Jv
+"}
+(18,1,1) = {"
+Jv
+El
+Ja
+qM
+Xt
+mw
+El
+Jv
+Jv
+Jv
+Jv
+"}
+(19,1,1) = {"
+Jv
+LM
+Od
+EI
+gw
+EW
+LM
+Jv
+Jv
+Jv
+Jv
+"}
+(20,1,1) = {"
+Jv
+LM
+LM
+mZ
+Ow
+LM
+LM
+Jv
+Jv
+Jv
+Jv
+"}
+(21,1,1) = {"
+Jv
+Jv
+LM
+LM
+LM
+LM
+Jv
+Jv
+Jv
+Jv
+Jv
+"}
diff --git a/_maps/shuttles/ruin_pirate_cutter.dmm b/_maps/shuttles/ruin_pirate_cutter.dmm
new file mode 100644
index 0000000000..8bcddfb680
--- /dev/null
+++ b/_maps/shuttles/ruin_pirate_cutter.dmm
@@ -0,0 +1,1213 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"af" = (
+/turf/closed/wall/mineral/plastitanium/nodiagonal,
+/area/shuttle/caravan/pirate)
+"aE" = (
+/obj/structure/closet{
+	name = "pirate outfits"
+	},
+/obj/item/clothing/head/collectable/pirate,
+/obj/item/clothing/suit/pirate,
+/obj/item/clothing/under/pirate,
+/obj/item/clothing/shoes/jackboots,
+/obj/item/clothing/head/bandana,
+/turf/open/floor/plasteel/dark/side{
+	dir = 5
+	},
+/area/shuttle/caravan/pirate)
+"bd" = (
+/obj/structure/table/reinforced,
+/obj/machinery/button/door{
+	id = "caravanpirate_bridge";
+	name = "Bridge Blast Door Control";
+	pixel_x = -16
+	},
+/turf/open/floor/plasteel/darkred/side,
+/area/shuttle/caravan/pirate)
+"bH" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 5
+	},
+/turf/open/floor/plasteel/floorgrime,
+/area/shuttle/caravan/pirate)
+"de" = (
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
+	dir = 8
+	},
+/turf/open/floor/plasteel/vault{
+	dir = 5
+	},
+/area/shuttle/caravan/pirate)
+"dE" = (
+/turf/open/floor/plasteel/vault{
+	dir = 5
+	},
+/area/shuttle/caravan/pirate)
+"fh" = (
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
+	dir = 4
+	},
+/turf/open/floor/plating,
+/area/shuttle/caravan/pirate)
+"fL" = (
+/obj/machinery/computer/shuttle/caravan/pirate{
+	dir = 8
+	},
+/turf/open/floor/plasteel/darkred/side{
+	dir = 8
+	},
+/area/shuttle/caravan/pirate)
+"fS" = (
+/obj/structure/bed,
+/obj/item/bedsheet/brown,
+/obj/machinery/airalarm/all_access{
+	dir = 4;
+	pixel_x = -24
+	},
+/turf/open/floor/plasteel/darkred/corner{
+	dir = 8
+	},
+/area/shuttle/caravan/pirate)
+"fU" = (
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
+/turf/open/floor/plasteel/red/side,
+/area/shuttle/caravan/pirate)
+"hh" = (
+/mob/living/simple_animal/hostile/pirate,
+/turf/open/floor/plasteel,
+/area/shuttle/caravan/pirate)
+"hI" = (
+/obj/structure/cable/yellow{
+	icon_state = "1-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/turf/open/floor/plating,
+/area/shuttle/caravan/pirate)
+"hT" = (
+/obj/machinery/light/small{
+	dir = 1
+	},
+/obj/structure/bed,
+/obj/item/bedsheet/brown,
+/turf/open/floor/plasteel/dark,
+/area/shuttle/caravan/pirate)
+"hZ" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/turf/open/floor/plasteel/vault{
+	dir = 5
+	},
+/area/shuttle/caravan/pirate)
+"iF" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 9
+	},
+/turf/open/floor/plasteel/vault{
+	dir = 5
+	},
+/area/shuttle/caravan/pirate)
+"iX" = (
+/obj/structure/table,
+/obj/item/gun/energy/laser{
+	pixel_x = -3;
+	pixel_y = 3
+	},
+/obj/item/gun/energy/laser,
+/obj/machinery/door/window/southleft{
+	base_state = "right";
+	icon_state = "right";
+	name = "Weapon Storage"
+	},
+/turf/open/floor/plasteel/vault{
+	dir = 5
+	},
+/area/shuttle/caravan/pirate)
+"jh" = (
+/obj/structure/cable,
+/obj/machinery/power/port_gen/pacman{
+	anchored = 1
+	},
+/obj/item/wrench,
+/obj/effect/turf_decal/stripes/line{
+	dir = 6
+	},
+/turf/open/floor/plating,
+/area/shuttle/caravan/pirate)
+"jo" = (
+/obj/structure/table,
+/obj/item/grenade/smokebomb{
+	pixel_x = -4
+	},
+/obj/item/grenade/smokebomb{
+	pixel_x = 2
+	},
+/obj/machinery/airalarm/all_access{
+	pixel_y = 24
+	},
+/turf/open/floor/plasteel/vault{
+	dir = 5
+	},
+/area/shuttle/caravan/pirate)
+"jU" = (
+/obj/structure/shuttle/engine/propulsion/burst{
+	dir = 8
+	},
+/turf/open/floor/plating/airless,
+/area/shuttle/caravan/pirate)
+"kl" = (
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
+	dir = 1
+	},
+/turf/open/floor/plasteel/white/side{
+	dir = 1
+	},
+/area/shuttle/caravan/pirate)
+"ku" = (
+/obj/structure/rack,
+/obj/item/storage/bag/money/vault,
+/mob/living/simple_animal/parrot{
+	faction = list("pirate");
+	name = "Pegwing"
+	},
+/turf/open/floor/plasteel/darkblue/corner{
+	dir = 4
+	},
+/area/shuttle/caravan/pirate)
+"kY" = (
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
+	dir = 8
+	},
+/obj/machinery/meter,
+/turf/open/floor/plating,
+/area/shuttle/caravan/pirate)
+"le" = (
+/obj/machinery/porta_turret/syndicate/pod{
+	dir = 5;
+	faction = list("pirate")
+	},
+/turf/closed/wall/mineral/plastitanium,
+/area/shuttle/caravan/pirate)
+"lG" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on,
+/turf/open/floor/plasteel/vault{
+	dir = 5
+	},
+/area/shuttle/caravan/pirate)
+"mr" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/command{
+	name = "Bridge"
+	},
+/turf/open/floor/plasteel/vault{
+	dir = 5
+	},
+/area/shuttle/caravan/pirate)
+"mI" = (
+/obj/structure/table,
+/obj/item/storage/firstaid/brute{
+	pixel_x = 3;
+	pixel_y = 3
+	},
+/obj/item/storage/firstaid/fire,
+/obj/machinery/firealarm{
+	dir = 1;
+	pixel_y = -24
+	},
+/turf/open/floor/plasteel/white,
+/area/shuttle/caravan/pirate)
+"na" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
+/turf/open/floor/plasteel/white/side{
+	dir = 1
+	},
+/area/shuttle/caravan/pirate)
+"nD" = (
+/obj/machinery/light/small{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 10
+	},
+/turf/open/floor/plasteel/white/side{
+	dir = 1
+	},
+/area/shuttle/caravan/pirate)
+"oe" = (
+/obj/structure/table,
+/obj/item/circular_saw,
+/obj/item/scalpel{
+	pixel_y = 12
+	},
+/obj/item/cautery{
+	pixel_x = 4
+	},
+/obj/machinery/light/small{
+	dir = 8
+	},
+/turf/open/floor/plasteel/white/side{
+	dir = 8
+	},
+/area/shuttle/caravan/pirate)
+"oF" = (
+/obj/structure/closet{
+	name = "pirate outfits"
+	},
+/obj/item/clothing/head/collectable/pirate,
+/obj/item/clothing/suit/pirate,
+/obj/item/clothing/under/pirate,
+/obj/item/clothing/shoes/jackboots,
+/obj/item/clothing/head/bandana,
+/turf/open/floor/plasteel/darkred/corner{
+	dir = 1
+	},
+/area/shuttle/caravan/pirate)
+"oL" = (
+/turf/closed/wall/mineral/plastitanium,
+/area/shuttle/caravan/pirate)
+"oO" = (
+/obj/machinery/computer/camera_advanced/shuttle_docker/caravan/pirate,
+/turf/open/floor/plasteel/darkred/side{
+	dir = 1
+	},
+/area/shuttle/caravan/pirate)
+"oT" = (
+/obj/structure/table,
+/obj/structure/window/reinforced{
+	dir = 8
+	},
+/obj/machinery/door/window/southleft{
+	name = "Weapon Storage"
+	},
+/obj/item/gun/ballistic/shotgun/automatic/combat,
+/turf/open/floor/plasteel/vault{
+	dir = 5
+	},
+/area/shuttle/caravan/pirate)
+"pK" = (
+/obj/item/stack/sheet/mineral/gold{
+	amount = 25
+	},
+/obj/item/stack/sheet/mineral/bananium{
+	amount = 5
+	},
+/obj/item/stack/sheet/mineral/silver{
+	amount = 25
+	},
+/obj/item/stack/sheet/mineral/uranium{
+	amount = 10
+	},
+/obj/item/stack/sheet/mineral/diamond{
+	amount = 5
+	},
+/obj/structure/closet/crate,
+/obj/item/coin/silver,
+/obj/item/coin/silver,
+/obj/item/coin/silver,
+/obj/item/coin/gold,
+/obj/item/coin/gold,
+/turf/open/floor/plasteel/darkblue/corner,
+/area/shuttle/caravan/pirate)
+"pS" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on,
+/turf/open/floor/plasteel/floorgrime,
+/area/shuttle/caravan/pirate)
+"pZ" = (
+/obj/structure/tank_dispenser/oxygen,
+/obj/machinery/firealarm{
+	dir = 2;
+	pixel_y = 24
+	},
+/turf/open/floor/plasteel/vault{
+	dir = 5
+	},
+/area/shuttle/caravan/pirate)
+"qo" = (
+/obj/machinery/porta_turret/syndicate/pod{
+	dir = 6;
+	faction = list("pirate")
+	},
+/turf/closed/wall/mineral/plastitanium,
+/area/shuttle/caravan/pirate)
+"qC" = (
+/obj/structure/table,
+/obj/item/storage/fancy/donut_box{
+	pixel_y = 18
+	},
+/obj/item/storage/box/donkpockets{
+	pixel_x = -3;
+	pixel_y = 7
+	},
+/obj/item/storage/box/donkpockets{
+	pixel_x = -6
+	},
+/obj/item/reagent_containers/food/drinks/bottle/rum{
+	pixel_x = 8;
+	pixel_y = 3
+	},
+/obj/structure/sign/poster/contraband/red_rum{
+	pixel_x = 32
+	},
+/turf/open/floor/plasteel/dark,
+/area/shuttle/caravan/pirate)
+"qX" = (
+/obj/structure/reagent_dispensers/watertank,
+/obj/item/reagent_containers/glass/bucket,
+/obj/item/mop,
+/obj/effect/turf_decal/stripes/line{
+	dir = 5
+	},
+/turf/open/floor/plating,
+/area/shuttle/caravan/pirate)
+"sr" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
+/turf/open/floor/plasteel/red/side,
+/area/shuttle/caravan/pirate)
+"su" = (
+/turf/open/floor/plasteel/floorgrime,
+/area/shuttle/caravan/pirate)
+"th" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/engineering{
+	name = "Engineering"
+	},
+/turf/open/floor/plating,
+/area/shuttle/caravan/pirate)
+"to" = (
+/obj/structure/table,
+/obj/item/reagent_containers/food/drinks/bottle/rum{
+	pixel_x = 3;
+	pixel_y = 6
+	},
+/obj/item/reagent_containers/food/drinks/bottle/rum,
+/turf/open/floor/plasteel/dark,
+/area/shuttle/caravan/pirate)
+"ul" = (
+/obj/structure/table,
+/obj/item/retractor,
+/obj/item/hemostat,
+/turf/open/floor/plasteel/white,
+/area/shuttle/caravan/pirate)
+"un" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
+/turf/open/floor/plasteel/red/side{
+	dir = 10
+	},
+/area/shuttle/caravan/pirate)
+"vd" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 6
+	},
+/turf/open/floor/plasteel/floorgrime,
+/area/shuttle/caravan/pirate)
+"vq" = (
+/obj/structure/bed,
+/obj/item/bedsheet/brown,
+/obj/machinery/firealarm{
+	dir = 8;
+	pixel_x = -26
+	},
+/turf/open/floor/plasteel/dark/side{
+	dir = 6
+	},
+/area/shuttle/caravan/pirate)
+"vW" = (
+/obj/machinery/light/small{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/turf/open/floor/plating,
+/area/shuttle/caravan/pirate)
+"wL" = (
+/obj/machinery/button/door{
+	id = "caravanpirate_bolt_port";
+	name = "External Bolt Control";
+	normaldoorcontrol = 1;
+	pixel_x = -4;
+	pixel_y = 25;
+	specialfunctions = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
+/turf/open/floor/plasteel/white/side{
+	dir = 1
+	},
+/area/shuttle/caravan/pirate)
+"wX" = (
+/obj/machinery/light/small{
+	dir = 8
+	},
+/obj/structure/closet/crate/secure/weapon,
+/obj/item/gun/ballistic/revolver/grenadelauncher/unrestricted,
+/turf/open/floor/plasteel/red/side{
+	dir = 8
+	},
+/area/shuttle/caravan/pirate)
+"wZ" = (
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
+	dir = 4
+	},
+/turf/open/floor/plasteel/vault{
+	dir = 5
+	},
+/area/shuttle/caravan/pirate)
+"xg" = (
+/obj/structure/table,
+/obj/machinery/microwave{
+	pixel_y = 5
+	},
+/turf/open/floor/plasteel/dark,
+/area/shuttle/caravan/pirate)
+"yt" = (
+/obj/structure/reagent_dispensers/fueltank,
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
+/turf/open/floor/plating,
+/area/shuttle/caravan/pirate)
+"yu" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 10
+	},
+/turf/open/floor/plasteel/vault{
+	dir = 5
+	},
+/area/shuttle/caravan/pirate)
+"yW" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+	dir = 4
+	},
+/obj/machinery/space_heater,
+/obj/effect/turf_decal/stripes/line{
+	dir = 6
+	},
+/turf/open/floor/plating,
+/area/shuttle/caravan/pirate)
+"zB" = (
+/obj/machinery/button/door{
+	id = "caravanpirate_bolt_starboard";
+	name = "External Bolt Control";
+	normaldoorcontrol = 1;
+	pixel_x = -4;
+	pixel_y = -25;
+	specialfunctions = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
+/turf/open/floor/plasteel/red/side,
+/area/shuttle/caravan/pirate)
+"Ag" = (
+/obj/structure/table/optable,
+/obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel/white,
+/area/shuttle/caravan/pirate)
+"Ah" = (
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+	dir = 1
+	},
+/obj/effect/mapping_helpers/airlock/locked,
+/obj/machinery/door/airlock/external{
+	id_tag = "caravanpirate_bolt_starboard"
+	},
+/turf/open/floor/plating,
+/area/shuttle/caravan/pirate)
+"Av" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/medical/glass{
+	name = "Medbay"
+	},
+/turf/open/floor/plasteel/floorgrime,
+/area/shuttle/caravan/pirate)
+"AP" = (
+/obj/structure/sign/departments/medbay/alt,
+/turf/closed/wall/mineral/plastitanium/nodiagonal,
+/area/shuttle/caravan/pirate)
+"Bi" = (
+/obj/structure/grille,
+/obj/structure/window/plastitanium,
+/obj/machinery/door/poddoor{
+	id = "caravanpirate_bridge"
+	},
+/turf/open/floor/plating,
+/area/shuttle/caravan/pirate)
+"BI" = (
+/obj/structure/table,
+/obj/machinery/light/small{
+	brightness = 3;
+	dir = 8
+	},
+/obj/item/stack/spacecash/c200,
+/turf/open/floor/plasteel/dark,
+/area/shuttle/caravan/pirate)
+"BL" = (
+/obj/structure/table,
+/obj/machinery/cell_charger,
+/obj/item/stack/cable_coil/yellow,
+/obj/item/stock_parts/cell/high,
+/obj/effect/turf_decal/bot,
+/turf/open/floor/plating,
+/area/shuttle/caravan/pirate)
+"Cb" = (
+/obj/structure/cable/yellow{
+	icon_state = "0-2"
+	},
+/obj/machinery/power/apc{
+	dir = 8;
+	name = "Pirate Cutter APC";
+	pixel_x = -24;
+	req_access = null
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/machinery/airalarm/all_access{
+	dir = 8;
+	pixel_x = 24
+	},
+/turf/open/floor/plating,
+/area/shuttle/caravan/pirate)
+"DY" = (
+/obj/structure/closet/crate/secure/loot,
+/obj/machinery/airalarm/all_access{
+	pixel_y = 24
+	},
+/turf/open/floor/plasteel/dark,
+/area/shuttle/caravan/pirate)
+"EB" = (
+/obj/structure/chair/office/dark{
+	dir = 4
+	},
+/obj/machinery/turretid{
+	icon_state = "control_kill";
+	lethal = 1;
+	locked = 0;
+	pixel_y = -30;
+	req_access = null
+	},
+/mob/living/simple_animal/hostile/pirate/ranged{
+	environment_smash = 0
+	},
+/turf/open/floor/plasteel/vault{
+	dir = 5
+	},
+/area/shuttle/caravan/pirate)
+"EK" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+	dir = 1
+	},
+/turf/open/floor/plasteel,
+/area/shuttle/caravan/pirate)
+"FM" = (
+/obj/machinery/power/terminal{
+	dir = 1
+	},
+/obj/structure/cable{
+	icon_state = "0-2"
+	},
+/obj/structure/closet/crate,
+/obj/item/stack/sheet/metal/twenty,
+/obj/item/stack/sheet/glass{
+	amount = 10
+	},
+/obj/item/storage/toolbox/mechanical,
+/obj/item/flashlight{
+	pixel_x = 3;
+	pixel_y = 3
+	},
+/obj/item/stack/sheet/mineral/plasma{
+	amount = 20
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
+/turf/open/floor/plating,
+/area/shuttle/caravan/pirate)
+"Gh" = (
+/obj/machinery/atmospherics/components/unary/tank/air,
+/obj/effect/turf_decal/bot,
+/turf/open/floor/plating,
+/area/shuttle/caravan/pirate)
+"GQ" = (
+/obj/machinery/light/small{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 9
+	},
+/turf/open/floor/plasteel/red/side,
+/area/shuttle/caravan/pirate)
+"GR" = (
+/obj/structure/table,
+/obj/item/coin/gold,
+/obj/item/coin/silver,
+/obj/item/coin/silver,
+/turf/open/floor/plasteel/dark,
+/area/shuttle/caravan/pirate)
+"HD" = (
+/obj/structure/shuttle/engine/heater{
+	dir = 8
+	},
+/obj/structure/window/reinforced{
+	dir = 4
+	},
+/turf/open/floor/plating/airless,
+/area/shuttle/caravan/pirate)
+"HO" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/security,
+/turf/open/floor/plasteel/floorgrime,
+/area/shuttle/caravan/pirate)
+"II" = (
+/obj/structure/closet/crate/freezer/surplus_limbs,
+/obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel/white,
+/area/shuttle/caravan/pirate)
+"Jb" = (
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+	dir = 2
+	},
+/obj/effect/mapping_helpers/airlock/locked,
+/obj/machinery/door/airlock/external{
+	id_tag = "caravanpirate_bolt_port"
+	},
+/obj/docking_port/mobile{
+	callTime = 150;
+	dir = 2;
+	dwidth = 14;
+	height = 13;
+	id = "caravanpirate";
+	movement_force = list("KNOCKDOWN" = 0, "THROW" = 0);
+	name = "Pirate Cutter";
+	port_direction = 8;
+	preferred_direction = 4;
+	timid = 1;
+	width = 22
+	},
+/turf/open/floor/plating,
+/area/shuttle/caravan/pirate)
+"Jv" = (
+/turf/template_noop,
+/area/template_noop)
+"Kd" = (
+/obj/machinery/sleeper{
+	dir = 1
+	},
+/obj/effect/turf_decal/delivery,
+/obj/machinery/airalarm/all_access{
+	dir = 1;
+	pixel_y = -24
+	},
+/turf/open/floor/plasteel/white,
+/area/shuttle/caravan/pirate)
+"Ku" = (
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+	dir = 2
+	},
+/obj/effect/mapping_helpers/airlock/locked,
+/obj/machinery/door/airlock/external{
+	id_tag = "caravanpirate_bolt_starboard"
+	},
+/turf/open/floor/plating,
+/area/shuttle/caravan/pirate)
+"Ld" = (
+/obj/machinery/suit_storage_unit/open,
+/turf/open/floor/plasteel/vault{
+	dir = 5
+	},
+/area/shuttle/caravan/pirate)
+"Nx" = (
+/obj/structure/shuttle/engine/propulsion/burst/right{
+	dir = 8
+	},
+/turf/open/floor/plating/airless,
+/area/shuttle/caravan/pirate)
+"NM" = (
+/obj/machinery/light/small{
+	dir = 8
+	},
+/obj/structure/closet/crate/secure/loot,
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+	dir = 4
+	},
+/obj/structure/extinguisher_cabinet{
+	pixel_x = -27
+	},
+/turf/open/floor/plasteel/dark,
+/area/shuttle/caravan/pirate)
+"Pc" = (
+/obj/structure/sign/departments/engineering,
+/turf/closed/wall/mineral/plastitanium/nodiagonal,
+/area/shuttle/caravan/pirate)
+"Pn" = (
+/obj/structure/shuttle/engine/propulsion/burst/left{
+	dir = 8
+	},
+/turf/open/floor/plating/airless,
+/area/shuttle/caravan/pirate)
+"Rq" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
+/turf/open/floor/plasteel/white/side{
+	dir = 9
+	},
+/area/shuttle/caravan/pirate)
+"Rz" = (
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+	dir = 1
+	},
+/obj/effect/mapping_helpers/airlock/locked,
+/obj/machinery/door/airlock/external{
+	id_tag = "caravanpirate_bolt_port"
+	},
+/turf/open/floor/plating,
+/area/shuttle/caravan/pirate)
+"RC" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
+/turf/open/floor/plasteel/darkred/side{
+	dir = 8
+	},
+/area/shuttle/caravan/pirate)
+"RK" = (
+/obj/machinery/power/smes{
+	charge = 5e+006
+	},
+/obj/structure/cable/yellow{
+	icon_state = "0-4"
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 5
+	},
+/turf/open/floor/plating,
+/area/shuttle/caravan/pirate)
+"Sd" = (
+/obj/machinery/light/small{
+	dir = 8
+	},
+/obj/structure/sign/warning/vacuum{
+	pixel_x = -32
+	},
+/turf/open/floor/plating,
+/area/shuttle/caravan/pirate)
+"Sk" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
+/turf/open/floor/plasteel/darkblue/side{
+	dir = 4
+	},
+/area/shuttle/caravan/pirate)
+"SF" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
+/turf/open/floor/plasteel/dark/side{
+	dir = 4
+	},
+/area/shuttle/caravan/pirate)
+"SR" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 9
+	},
+/obj/machinery/firealarm{
+	dir = 1;
+	pixel_y = -24
+	},
+/turf/open/floor/plasteel/dark,
+/area/shuttle/caravan/pirate)
+"UP" = (
+/obj/structure/rack,
+/obj/item/storage/toolbox/emergency,
+/obj/item/weldingtool,
+/turf/open/floor/plasteel/darkred/corner{
+	dir = 4
+	},
+/area/shuttle/caravan/pirate)
+"Wb" = (
+/obj/machinery/light/small,
+/obj/structure/bed,
+/obj/item/bedsheet/brown,
+/turf/open/floor/plasteel/dark,
+/area/shuttle/caravan/pirate)
+"Xq" = (
+/obj/structure/table/reinforced,
+/obj/machinery/recharger,
+/obj/item/melee/classic_baton,
+/turf/open/floor/plasteel/darkred/corner,
+/area/shuttle/caravan/pirate)
+"Yo" = (
+/obj/structure/table,
+/obj/item/storage/box/lethalshot,
+/turf/open/floor/plasteel/vault{
+	dir = 5
+	},
+/area/shuttle/caravan/pirate)
+"Yw" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 4
+	},
+/turf/open/floor/plasteel/dark,
+/area/shuttle/caravan/pirate)
+"Zo" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 5
+	},
+/turf/open/floor/plating,
+/area/shuttle/caravan/pirate)
+"ZY" = (
+/obj/structure/chair/office/dark{
+	dir = 8
+	},
+/turf/open/floor/plasteel/vault{
+	dir = 5
+	},
+/area/shuttle/caravan/pirate)
+
+(1,1,1) = {"
+Jv
+Jv
+Jv
+Pn
+jU
+Nx
+Jv
+Pn
+jU
+Nx
+Jv
+Jv
+Jv
+"}
+(2,1,1) = {"
+Jv
+Jv
+oL
+HD
+HD
+HD
+af
+HD
+HD
+HD
+oL
+Jv
+Jv
+"}
+(3,1,1) = {"
+Jv
+oL
+af
+qX
+yt
+yW
+af
+RK
+FM
+jh
+af
+oL
+Jv
+"}
+(4,1,1) = {"
+Jv
+af
+Gh
+kY
+vW
+fh
+Cb
+hI
+vW
+Zo
+BL
+af
+Jv
+"}
+(5,1,1) = {"
+Jv
+af
+af
+th
+Pc
+af
+af
+af
+Pc
+th
+af
+af
+Jv
+"}
+(6,1,1) = {"
+Jv
+af
+Ld
+Rq
+oe
+ul
+af
+Yo
+wX
+un
+Ld
+af
+Jv
+"}
+(7,1,1) = {"
+oL
+af
+af
+na
+su
+Ag
+af
+jo
+su
+sr
+af
+af
+oL
+"}
+(8,1,1) = {"
+Jb
+Sd
+Rz
+kl
+EK
+mI
+af
+pZ
+pS
+fU
+Ku
+Sd
+Ah
+"}
+(9,1,1) = {"
+oL
+af
+af
+wL
+su
+Kd
+af
+oT
+hh
+zB
+af
+af
+oL
+"}
+(10,1,1) = {"
+Jv
+Bi
+Ld
+nD
+bH
+II
+af
+iX
+vd
+GQ
+Ld
+Bi
+Jv
+"}
+(11,1,1) = {"
+Jv
+oL
+af
+AP
+Av
+af
+af
+af
+HO
+af
+af
+oL
+Jv
+"}
+(12,1,1) = {"
+Jv
+Jv
+af
+aE
+SF
+vq
+NM
+fS
+RC
+oF
+af
+Jv
+Jv
+"}
+(13,1,1) = {"
+Jv
+Jv
+af
+hT
+yu
+hZ
+wZ
+de
+iF
+Wb
+af
+Jv
+Jv
+"}
+(14,1,1) = {"
+Jv
+Jv
+le
+af
+xg
+qC
+pK
+Sk
+ku
+af
+qo
+Jv
+Jv
+"}
+(15,1,1) = {"
+Jv
+Jv
+Jv
+oL
+af
+af
+af
+mr
+af
+oL
+Jv
+Jv
+Jv
+"}
+(16,1,1) = {"
+Jv
+Jv
+Jv
+Jv
+af
+to
+BI
+Yw
+af
+Jv
+Jv
+Jv
+Jv
+"}
+(17,1,1) = {"
+Jv
+Jv
+Jv
+Jv
+af
+GR
+ZY
+Yw
+af
+Jv
+Jv
+Jv
+Jv
+"}
+(18,1,1) = {"
+Jv
+Jv
+Jv
+Jv
+af
+DY
+lG
+SR
+af
+Jv
+Jv
+Jv
+Jv
+"}
+(19,1,1) = {"
+Jv
+Jv
+Jv
+Jv
+af
+UP
+dE
+Xq
+af
+Jv
+Jv
+Jv
+Jv
+"}
+(20,1,1) = {"
+Jv
+Jv
+Jv
+Jv
+Bi
+oO
+EB
+bd
+Bi
+Jv
+Jv
+Jv
+Jv
+"}
+(21,1,1) = {"
+Jv
+Jv
+Jv
+Jv
+Bi
+Bi
+fL
+Bi
+Bi
+Jv
+Jv
+Jv
+Jv
+"}
+(22,1,1) = {"
+Jv
+Jv
+Jv
+Jv
+Jv
+Bi
+Bi
+Bi
+Jv
+Jv
+Jv
+Jv
+Jv
+"}
diff --git a/_maps/shuttles/ruin_syndicate_dropship.dmm b/_maps/shuttles/ruin_syndicate_dropship.dmm
index d635953737..47c28d1500 100644
--- a/_maps/shuttles/ruin_syndicate_dropship.dmm
+++ b/_maps/shuttles/ruin_syndicate_dropship.dmm
@@ -1,8 +1,10 @@
 //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
 "al" = (
-/obj/machinery/airalarm/syndicate{
+/obj/machinery/airalarm{
 	dir = 4;
-	pixel_x = -24
+	pixel_x = -24;
+	req_access = null;
+	req_access_txt = "150"
 	},
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plasteel/dark,
@@ -95,10 +97,12 @@
 /obj/structure/cable/yellow{
 	icon_state = "0-2"
 	},
-/obj/machinery/power/apc/syndicate{
+/obj/machinery/power/apc{
 	dir = 8;
 	name = "Syndicate Drop Ship APC";
-	pixel_x = -24
+	pixel_x = -24;
+	req_access = null;
+	req_access_txt = "150"
 	},
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/pod/dark,
@@ -279,8 +283,10 @@
 /area/shuttle/caravan/syndicate3)
 "EO" = (
 /obj/structure/chair,
-/obj/machinery/airalarm/syndicate{
-	pixel_y = 24
+/obj/machinery/airalarm{
+	pixel_y = 24;
+	req_access = null;
+	req_access_txt = "150"
 	},
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/pod/dark,
@@ -296,9 +302,11 @@
 /turf/open/floor/mineral/plastitanium,
 /area/shuttle/caravan/syndicate3)
 "Gx" = (
-/obj/machinery/airalarm/syndicate{
+/obj/machinery/airalarm{
 	dir = 4;
-	pixel_x = -24
+	pixel_x = -24;
+	req_access = null;
+	req_access_txt = "150"
 	},
 /turf/open/floor/plasteel/dark,
 /area/shuttle/caravan/syndicate3)
diff --git a/_maps/shuttles/ruin_syndicate_fighter.dmm b/_maps/shuttles/ruin_syndicate_fighter.dmm
new file mode 100644
index 0000000000..116448f4d6
--- /dev/null
+++ b/_maps/shuttles/ruin_syndicate_fighter.dmm
@@ -0,0 +1,174 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"aA" = (
+/obj/structure/chair{
+	dir = 4
+	},
+/obj/machinery/turretid{
+	ailock = 1;
+	control_area = null;
+	desc = "A specially designed set of turret controls. Looks to be covered in protective casing to prevent AI interfacing.";
+	icon_state = "control_kill";
+	lethal = 1;
+	name = "Shuttle turret control";
+	pixel_x = 32;
+	pixel_y = -28;
+	req_access = null;
+	req_access_txt = "150"
+	},
+/obj/structure/cable/yellow{
+	icon_state = "0-2"
+	},
+/mob/living/simple_animal/hostile/syndicate{
+	environment_smash = 0;
+	name = "Syndicate Salvage Pilot"
+	},
+/turf/open/floor/mineral/plastitanium,
+/area/shuttle/caravan/syndicate1)
+"fh" = (
+/obj/machinery/camera/xray{
+	c_tag = "External View";
+	dir = 4;
+	network = list("caravansyndicate1");
+	pixel_x = 32
+	},
+/turf/closed/wall/mineral/plastitanium/nodiagonal,
+/area/shuttle/caravan/syndicate1)
+"fp" = (
+/turf/closed/wall/mineral/plastitanium/nodiagonal,
+/area/shuttle/caravan/syndicate1)
+"qx" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/computer/shuttle/caravan/syndicate1{
+	dir = 8
+	},
+/turf/open/floor/mineral/plastitanium,
+/area/shuttle/caravan/syndicate1)
+"uW" = (
+/obj/machinery/button/door{
+	id = "caravansyndicate1_bolt";
+	name = "External Bolt Control";
+	normaldoorcontrol = 1;
+	pixel_x = -25;
+	req_access_txt = "150";
+	specialfunctions = 4
+	},
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/computer/camera_advanced/shuttle_docker/caravan/syndicate1,
+/turf/open/floor/mineral/plastitanium,
+/area/shuttle/caravan/syndicate1)
+"vD" = (
+/obj/machinery/porta_turret/syndicate/energy{
+	dir = 4;
+	icon_state = "standard_lethal";
+	mode = 1
+	},
+/turf/closed/wall/mineral/plastitanium,
+/area/shuttle/caravan/syndicate1)
+"vK" = (
+/obj/machinery/power/apc/highcap/fifteen_k{
+	dir = 8;
+	name = "Syndicate Fighter APC";
+	pixel_x = -24;
+	req_access = null;
+	req_access_txt = "150"
+	},
+/obj/machinery/computer/security{
+	dir = 1;
+	network = list("caravansyndicate1")
+	},
+/obj/structure/cable/yellow,
+/turf/open/floor/mineral/plastitanium,
+/area/shuttle/caravan/syndicate1)
+"wV" = (
+/obj/effect/mapping_helpers/airlock/locked,
+/obj/machinery/door/airlock/hatch{
+	id_tag = "caravansyndicate1_bolt";
+	name = "External Airlock";
+	normalspeed = 0;
+	req_access_txt = "150"
+	},
+/obj/effect/decal/cleanable/dirt,
+/obj/docking_port/mobile{
+	callTime = 50;
+	dir = 4;
+	dwidth = 4;
+	height = 5;
+	id = "caravansyndicate1";
+	ignitionTime = 25;
+	name = "Syndicate Fighter";
+	port_direction = 2;
+	preferred_direction = 4;
+	timid = 1;
+	width = 9
+	},
+/turf/open/floor/plating,
+/area/shuttle/caravan/syndicate1)
+"Jv" = (
+/turf/template_noop,
+/area/template_noop)
+"YP" = (
+/obj/structure/shuttle/engine/propulsion/burst{
+	dir = 8
+	},
+/turf/closed/wall/mineral/plastitanium,
+/area/shuttle/caravan/syndicate1)
+"YX" = (
+/turf/closed/wall/mineral/plastitanium,
+/area/shuttle/caravan/syndicate1)
+
+(1,1,1) = {"
+Jv
+Jv
+YP
+fp
+wV
+fp
+YP
+Jv
+Jv
+"}
+(2,1,1) = {"
+Jv
+YP
+fp
+uW
+aA
+vK
+fp
+YP
+Jv
+"}
+(3,1,1) = {"
+YX
+fp
+fp
+fp
+qx
+fp
+fp
+fp
+YX
+"}
+(4,1,1) = {"
+fp
+YX
+Jv
+vD
+fh
+vD
+Jv
+YX
+fp
+"}
+(5,1,1) = {"
+vD
+Jv
+Jv
+Jv
+Jv
+Jv
+Jv
+Jv
+vD
+"}
diff --git a/code/__DEFINES/components.dm b/code/__DEFINES/components.dm
index 1cf27a8c68..cd01b92717 100644
--- a/code/__DEFINES/components.dm
+++ b/code/__DEFINES/components.dm
@@ -156,4 +156,4 @@
 
 //Ouch my toes!
 #define CALTROP_BYPASS_SHOES 1
-#define CALTROP_IGNORE_WALKERS 2
+#define CALTROP_IGNORE_WALKERS 2
\ No newline at end of file
diff --git a/code/datums/shuttles.dm b/code/datums/shuttles.dm
index fe18071cf8..07af9e0e12 100644
--- a/code/datums/shuttles.dm
+++ b/code/datums/shuttles.dm
@@ -90,6 +90,10 @@
 	port_id = "pirate"
 	can_be_bought = FALSE
 
+/datum/map_template/shuttle/ruin //For random shuttles in ruins
+	port_id = "ruin"
+	can_be_bought = FALSE
+
 // Shuttles start here:
 
 /datum/map_template/shuttle/emergency/airless
@@ -407,3 +411,19 @@
 /datum/map_template/shuttle/pirate/default
 	suffix = "default"
 	name = "pirate ship (Default)"
+
+/datum/map_template/shuttle/ruin/caravan_victim
+	suffix = "caravan_victim"
+	name = "Small Freighter"
+
+/datum/map_template/shuttle/ruin/pirate_cutter
+	suffix = "pirate_cutter"
+	name = "Pirate Cutter"
+
+/datum/map_template/shuttle/ruin/syndicate_dropship
+	suffix = "syndicate_dropship"
+	name = "Syndicate Dropship"
+
+/datum/map_template/shuttle/ruin/syndicate_fighter
+	suffix = "syndicate_fighter"
+	name = "Syndicate Fighter"
\ No newline at end of file
diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm
index eac5a1768d..3efb449c49 100644
--- a/code/game/atoms_movable.dm
+++ b/code/game/atoms_movable.dm
@@ -314,14 +314,14 @@
 		var/area/old_area = get_area(oldloc)
 		var/area/destarea = get_area(destination)
 
-		if(oldloc && !same_loc)
-			oldloc.Exited(src, destination)
-			if(old_area)
-				old_area.Exited(src, destination)
 
 		loc = destination
 
 		if(!same_loc)
+			if(oldloc)
+				oldloc.Exited(src, destination)
+				if(old_area)
+					old_area.Exited(src, destination)
 			var/turf/oldturf = get_turf(oldloc)
 			var/turf/destturf = get_turf(destination)
 			var/old_z = (oldturf ? oldturf.z : null)
@@ -336,6 +336,7 @@
 				if(AM == src)
 					continue
 				AM.Crossed(src, oldloc)
+
 		Moved(oldloc, NONE, TRUE)
 		. = TRUE
 
diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm
index b00212b0de..438c5fdb39 100644
--- a/code/game/mecha/mecha.dm
+++ b/code/game/mecha/mecha.dm
@@ -927,9 +927,9 @@
 
 /obj/mecha/Exited(atom/movable/M, atom/newloc)
 	if(occupant && occupant == M) // The occupant exited the mech without calling go_out()
-		go_out(1, newloc)
+		go_out(TRUE, newloc)
 
-/obj/mecha/proc/go_out(var/forced, var/atom/newloc = loc)
+/obj/mecha/proc/go_out(forced, atom/newloc = loc)
 	if(!occupant)
 		return
 	var/atom/movable/mob_container
diff --git a/code/game/objects/items/storage/wallets.dm b/code/game/objects/items/storage/wallets.dm
index 4b14388336..d74d18ad6e 100644
--- a/code/game/objects/items/storage/wallets.dm
+++ b/code/game/objects/items/storage/wallets.dm
@@ -38,17 +38,13 @@
 
 /obj/item/storage/wallet/Exited(atom/movable/AM)
 	. = ..()
-	// The loc has not actually changed yet when this proc is called, so call
-	// refreshID and have it ignore the outgoing atom.
-	refreshID(AM)
+	refreshID()
 
-/obj/item/storage/wallet/proc/refreshID(atom/movable/removed)
+/obj/item/storage/wallet/proc/refreshID()
 	LAZYCLEARLIST(combined_access)
-	if(!(front_id in src) || front_id == removed)
+	if(!(front_id in src))
 		front_id = null
 	for(var/obj/item/card/id/I in contents)
-		if(I == removed)
-			continue
 		if(!front_id)
 			front_id = I
 		LAZYINITLIST(combined_access)
diff --git a/code/modules/lighting/lighting_turf.dm b/code/modules/lighting/lighting_turf.dm
index 8372d21a5f..fdd581a292 100644
--- a/code/modules/lighting/lighting_turf.dm
+++ b/code/modules/lighting/lighting_turf.dm
@@ -95,7 +95,7 @@
 				has_opaque_atom = TRUE
 				break
 
-/turf/Exited(var/atom/movable/Obj, var/atom/newloc)
+/turf/Exited(atom/movable/Obj, atom/newloc)
 	. = ..()
 
 	if (Obj && Obj.opacity)