From d3a61542b3397374f15a2d8cfcaa387bb91ad962 Mon Sep 17 00:00:00 2001
From: spockye <79304582+spockye@users.noreply.github.com>
Date: Wed, 2 Nov 2022 09:58:44 +0100
Subject: [PATCH 01/19] the ship itself

---
 .../shuttles/shiptest/pirate_mechcarrier.dmm  | 5666 +++++++++++++++++
 1 file changed, 5666 insertions(+)
 create mode 100644 _maps/shuttles/shiptest/pirate_mechcarrier.dmm

diff --git a/_maps/shuttles/shiptest/pirate_mechcarrier.dmm b/_maps/shuttles/shiptest/pirate_mechcarrier.dmm
new file mode 100644
index 000000000000..53bbd1195ea5
--- /dev/null
+++ b/_maps/shuttles/shiptest/pirate_mechcarrier.dmm
@@ -0,0 +1,5666 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"af" = (
+/obj/effect/turf_decal/corner/opaque/yellow/half{
+	dir = 8
+	},
+/obj/effect/turf_decal/industrial/loading{
+	dir = 4
+	},
+/obj/machinery/status_display/shuttle{
+	pixel_y = 32
+	},
+/turf/open/floor/plasteel/patterned,
+/area/ship/cargo)
+"ar" = (
+/turf/closed/wall/mineral/plastitanium/nodiagonal,
+/area/ship/bridge)
+"aK" = (
+/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
+/obj/structure/curtain/bounty,
+/turf/open/floor/plating,
+/area/ship/crew/dorm)
+"aL" = (
+/obj/effect/turf_decal/siding/wood,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/closet/wall/blue{
+	dir = 1;
+	pixel_y = -28;
+	name = "Captains Locker"
+	},
+/obj/item/clothing/shoes/jackboots,
+/obj/item/clothing/shoes/workboots,
+/obj/item/clothing/under/misc/bouncer,
+/obj/item/clothing/under/costume/russian_officer,
+/obj/item/clothing/gloves/combat,
+/obj/item/clothing/suit/pirate/captain,
+/obj/item/clothing/suit/armor/frontier,
+/obj/item/clothing/neck/scarf/red,
+/obj/item/clothing/neck/necklace/dope,
+/obj/item/clothing/neck/cloak/qm,
+/obj/item/clothing/head/flatcap,
+/obj/item/clothing/head/helmet/r_trapper,
+/obj/item/clothing/head/beret/sec/frontier/officer,
+/obj/item/clothing/glasses/hud/security/sunglasses/eyepatch,
+/obj/item/clothing/accessory/holster,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 5
+	},
+/turf/open/floor/wood,
+/area/ship/bridge)
+"aQ" = (
+/obj/structure/catwalk/over,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 1
+	},
+/obj/machinery/advanced_airlock_controller{
+	dir = 4;
+	pixel_x = -24
+	},
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plating,
+/area/ship/crew/canteen)
+"aT" = (
+/obj/structure/railing/corner,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 10
+	},
+/turf/open/floor/plating{
+	icon_state = "platingdmg3"
+	},
+/area/ship/cargo)
+"ba" = (
+/obj/structure/catwalk/over,
+/obj/structure/cable/yellow{
+	icon_state = "1-4"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 5
+	},
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+	dir = 5
+	},
+/obj/machinery/button/door{
+	id = "cargopirate_thrusters";
+	name = "Pod Door Control";
+	pixel_x = -22;
+	dir = 4
+	},
+/turf/open/floor/plating,
+/area/ship/engineering)
+"bb" = (
+/obj/effect/turf_decal/corner/opaque/yellow/half{
+	dir = 1
+	},
+/obj/effect/turf_decal/industrial/caution,
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable/yellow{
+	icon_state = "4-6"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/turf/open/floor/plasteel,
+/area/ship/cargo)
+"be" = (
+/obj/effect/turf_decal/techfloor/corner{
+	dir = 4
+	},
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
+/obj/machinery/door/firedoor,
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/bridge)
+"bg" = (
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+	dir = 9
+	},
+/obj/machinery/mech_bay_recharge_port,
+/obj/effect/turf_decal/techfloor{
+	dir = 10
+	},
+/turf/open/floor/plasteel/telecomms_floor,
+/area/ship/cargo/office)
+"bh" = (
+/obj/effect/turf_decal/siding/thinplating/dark{
+	dir = 5
+	},
+/obj/effect/turf_decal/techfloor/corner{
+	dir = 8
+	},
+/obj/effect/turf_decal/steeldecal/steel_decals9{
+	dir = 8
+	},
+/turf/open/floor/plasteel/tech{
+	initial_gas_mix = "TEMP=2.7"
+	},
+/area/ship/cargo/office)
+"bo" = (
+/obj/machinery/computer/arcade/orion_trail,
+/obj/effect/turf_decal/techfloor{
+	dir = 5
+	},
+/obj/item/radio/intercom{
+	dir = 8;
+	pixel_x = 22;
+	pixel_y = -1
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/engineering)
+"br" = (
+/obj/effect/turf_decal/industrial/hatch/yellow,
+/obj/effect/turf_decal/industrial/warning{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 8
+	},
+/turf/open/floor/plasteel/patterned,
+/area/ship/cargo)
+"bt" = (
+/obj/effect/turf_decal/industrial/traffic{
+	dir = 4
+	},
+/turf/open/floor/plasteel/patterned/ridged,
+/area/ship/cargo/office)
+"bv" = (
+/obj/effect/turf_decal/techfloor{
+	dir = 4
+	},
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/obj/structure/closet/wall{
+	dir = 8;
+	icon_door = "red_wall";
+	name = "Roboticists Locker";
+	pixel_x = 28
+	},
+/obj/item/clothing/under/rank/rnd/roboticist/mech_engineer,
+/obj/item/clothing/under/rank/rnd/roboticist/mech_engineer/skirt,
+/obj/item/clothing/under/rank/rnd/roboticist/biomech_engineer,
+/obj/item/clothing/under/suit/senior_roboticist/skirt,
+/obj/item/clothing/suit/toggle/labcoat/science,
+/obj/item/clothing/suit/longcoat/roboblack,
+/obj/item/clothing/suit/longcoat/robowhite,
+/obj/item/clothing/gloves/color/latex,
+/obj/item/clothing/head/beret/sci,
+/obj/item/clothing/head/welding{
+	pixel_x = 1;
+	pixel_y = 5
+	},
+/obj/item/clothing/glasses/hud/diagnostic,
+/obj/item/storage/belt/utility/full{
+	pixel_y = 6
+	},
+/obj/effect/turf_decal/steeldecal/steel_decals7{
+	dir = 4
+	},
+/obj/item/book/manual/wiki/robotics_cyborgs{
+	pixel_y = 3;
+	pixel_x = -3
+	},
+/turf/open/floor/plasteel/telecomms_floor,
+/area/ship/science/robotics)
+"bE" = (
+/obj/effect/turf_decal/industrial/warning{
+	dir = 6;
+	color = "#808080"
+	},
+/obj/structure/closet/wall/red{
+	dir = 1;
+	name = "Ammo locker";
+	pixel_y = -29
+	},
+/obj/item/storage/box/lethalshot{
+	pixel_y = -4
+	},
+/obj/item/storage/box/lethalshot{
+	pixel_x = -3
+	},
+/obj/item/ammo_box/c38_box/hunting,
+/obj/item/ammo_box/c38_box/hunting{
+	pixel_x = -7;
+	pixel_y = -4
+	},
+/obj/item/ammo_box/c38,
+/obj/item/ammo_box/c38{
+	pixel_y = -8;
+	pixel_x = -5
+	},
+/obj/item/ammo_box/c38{
+	pixel_y = -6;
+	pixel_x = 1
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/mineral/plastitanium,
+/area/ship/security)
+"bO" = (
+/obj/effect/turf_decal/industrial/warning{
+	dir = 4;
+	color = "#808080"
+	},
+/obj/structure/table/reinforced{
+	color = "#c1b6a5"
+	},
+/obj/machinery/button/door{
+	id = "Syndie_warship_lockdown";
+	name = "Lockdown Control";
+	pixel_x = -6;
+	pixel_y = 6;
+	dir = 8
+	},
+/obj/machinery/button/door{
+	id = "syndie_warship_cargo";
+	name = "cargohold shutters";
+	pixel_x = 3;
+	pixel_y = 6;
+	dir = 8
+	},
+/obj/item/spacepod_key{
+	pixel_x = -7;
+	pixel_y = -9
+	},
+/obj/machinery/light/small{
+	dir = 4
+	},
+/obj/machinery/airalarm/directional/east,
+/turf/open/floor/plasteel/patterned/grid,
+/area/ship/cargo/office)
+"cn" = (
+/obj/structure/table/wood,
+/obj/item/storage/pill_bottle/dice{
+	pixel_x = 6;
+	pixel_y = 6
+	},
+/obj/item/reagent_containers/food/drinks/britcup{
+	pixel_x = -6
+	},
+/obj/item/reagent_containers/food/drinks/bottle/moonshine{
+	pixel_x = 4;
+	pixel_y = 3
+	},
+/turf/open/floor/plasteel,
+/area/ship/crew/canteen)
+"cE" = (
+/obj/effect/turf_decal/steeldecal/steel_decals10{
+	dir = 9
+	},
+/obj/effect/turf_decal/steeldecal/steel_decals10{
+	dir = 10
+	},
+/obj/structure/cable/yellow{
+	icon_state = "1-8"
+	},
+/obj/effect/turf_decal/steeldecal/steel_decals7{
+	dir = 9
+	},
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/bridge)
+"cG" = (
+/obj/structure/table/wood/reinforced,
+/obj/item/storage/photo_album{
+	pixel_x = -5;
+	pixel_y = 12
+	},
+/obj/item/storage/fancy/cigarettes{
+	pixel_x = -7
+	},
+/obj/item/storage/fancy/cigarettes/cigpack_carp{
+	pixel_y = 3;
+	pixel_x = -5
+	},
+/obj/item/paicard{
+	pixel_x = 2;
+	pixel_y = 4
+	},
+/obj/machinery/firealarm{
+	dir = 4;
+	pixel_x = -23;
+	pixel_y = 10
+	},
+/turf/open/floor/carpet/nanoweave/beige,
+/area/ship/crew/dorm)
+"cQ" = (
+/obj/effect/turf_decal/corner/opaque/yellow/half{
+	dir = 1
+	},
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/cable/yellow{
+	icon_state = "6-10"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+	dir = 1
+	},
+/turf/open/floor/plasteel,
+/area/ship/cargo)
+"cR" = (
+/obj/machinery/door/airlock/hatch,
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/door/firedoor,
+/turf/open/floor/plasteel,
+/area/ship/crew/dorm)
+"dc" = (
+/obj/effect/turf_decal/industrial/warning{
+	dir = 5;
+	color = "#808080"
+	},
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable/yellow{
+	icon_state = "2-4"
+	},
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
+/turf/open/floor/mineral/plastitanium,
+/area/ship/security)
+"de" = (
+/obj/effect/turf_decal/techfloor{
+	dir = 4
+	},
+/obj/effect/turf_decal/techfloor{
+	dir = 8
+	},
+/obj/structure/closet/firecloset/wall{
+	dir = 8;
+	pixel_x = 28
+	},
+/turf/open/floor/plasteel/tech/techmaint,
+/area/ship/engineering)
+"df" = (
+/obj/structure/catwalk/over,
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/layer_manifold{
+	dir = 1
+	},
+/obj/machinery/door/airlock/external,
+/turf/open/floor/plating,
+/area/ship/crew/canteen)
+"do" = (
+/obj/structure/railing/corner{
+	dir = 4
+	},
+/obj/effect/turf_decal/industrial/loading{
+	dir = 8
+	},
+/obj/machinery/power/terminal{
+	dir = 1
+	},
+/obj/structure/cable{
+	icon_state = "0-2"
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/engineering)
+"dy" = (
+/obj/machinery/shower{
+	dir = 8
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/light/small,
+/turf/open/floor/plating/catwalk_floor,
+/area/ship/crew/canteen)
+"dE" = (
+/obj/effect/turf_decal/corner/opaque/yellow/half{
+	dir = 1
+	},
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/turf/open/floor/plasteel,
+/area/ship/cargo)
+"dF" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 8
+	},
+/turf/open/floor/plasteel,
+/area/ship/crew/canteen)
+"dI" = (
+/obj/structure/catwalk/over,
+/obj/structure/cable/yellow{
+	icon_state = "2-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden,
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/turf/open/floor/plating,
+/area/ship/engineering)
+"dP" = (
+/obj/effect/turf_decal/industrial/traffic{
+	dir = 8
+	},
+/obj/effect/turf_decal/industrial/traffic{
+	dir = 4
+	},
+/turf/open/floor/plasteel/patterned/cargo_one,
+/area/ship/cargo)
+"dR" = (
+/obj/effect/turf_decal/siding/thinplating/dark{
+	dir = 1
+	},
+/obj/effect/turf_decal/techfloor,
+/turf/open/floor/plasteel/tech{
+	initial_gas_mix = "TEMP=2.7"
+	},
+/area/ship/cargo/office)
+"dU" = (
+/obj/machinery/vending/cigarette/syndicate,
+/obj/effect/turf_decal/industrial/hatch/yellow,
+/turf/open/floor/plasteel,
+/area/ship/crew/canteen)
+"ec" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 10
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 10
+	},
+/obj/effect/turf_decal/steeldecal/steel_decals_central4{
+	dir = 1
+	},
+/obj/effect/turf_decal/arrows{
+	pixel_y = 15;
+	pixel_x = -10
+	},
+/obj/effect/turf_decal/arrows{
+	pixel_y = 15;
+	pixel_x = 10
+	},
+/turf/open/floor/plasteel/telecomms_floor,
+/area/ship/science/robotics)
+"er" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable/yellow{
+	icon_state = "1-5"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/turf/open/floor/plasteel,
+/area/ship/crew/canteen)
+"ez" = (
+/obj/machinery/power/smes/shuttle/precharged{
+	dir = 4
+	},
+/obj/structure/window/plasma/reinforced/spawner/west,
+/obj/structure/cable{
+	icon_state = "0-8"
+	},
+/obj/machinery/door/window/eastleft{
+	name = "Engine Access"
+	},
+/obj/machinery/door/poddoor{
+	id = "cargopirate_thrusters";
+	name = "thruster blast door"
+	},
+/turf/open/floor/plating,
+/area/ship/engineering)
+"eK" = (
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/turf/open/floor/plating/rust,
+/area/ship/cargo)
+"eW" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
+/turf/open/floor/plasteel/patterned/cargo_one,
+/area/ship/cargo)
+"ft" = (
+/obj/effect/turf_decal/siding/thinplating/dark/corner{
+	dir = 4
+	},
+/obj/effect/turf_decal/techfloor{
+	dir = 10
+	},
+/turf/open/floor/plasteel/tech{
+	initial_gas_mix = "TEMP=2.7"
+	},
+/area/ship/cargo/office)
+"fB" = (
+/obj/effect/turf_decal/siding/thinplating/dark{
+	dir = 4
+	},
+/obj/effect/turf_decal/techfloor{
+	dir = 8
+	},
+/turf/open/floor/plasteel/tech{
+	initial_gas_mix = "TEMP=2.7"
+	},
+/area/ship/cargo/office)
+"fC" = (
+/obj/structure/table/reinforced{
+	color = "#c1b6a5"
+	},
+/obj/machinery/cell_charger,
+/obj/item/stock_parts/cell/high,
+/obj/item/stock_parts/cell/high,
+/obj/effect/turf_decal/techfloor{
+	dir = 9
+	},
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+	dir = 10
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/engineering)
+"fT" = (
+/obj/effect/turf_decal/industrial/outline/yellow,
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/closet/cardboard,
+/obj/item/storage/cans/sixbeer{
+	pixel_y = -3;
+	pixel_x = 3
+	},
+/obj/machinery/light{
+	dir = 1
+	},
+/obj/structure/sign/departments/cargo{
+	pixel_y = 32
+	},
+/obj/item/stack/sheet/mineral/wood/fifty,
+/obj/item/rack_parts{
+	pixel_x = -5;
+	pixel_y = -6
+	},
+/obj/item/hatchet/wooden,
+/turf/open/floor/plasteel/patterned/cargo_one,
+/area/ship/cargo)
+"fU" = (
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 10
+	},
+/turf/open/floor/plasteel,
+/area/ship/crew/canteen)
+"fY" = (
+/obj/effect/turf_decal/siding/wood/corner{
+	dir = 8
+	},
+/obj/effect/turf_decal/siding/wood/corner{
+	dir = 4
+	},
+/obj/effect/turf_decal/siding/wood/corner,
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 9
+	},
+/turf/open/floor/wood{
+	icon_state = "wood-broken2"
+	},
+/area/ship/crew/dorm)
+"fZ" = (
+/obj/item/radio/intercom{
+	pixel_y = 23
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 8
+	},
+/turf/open/floor/plasteel/patterned/cargo_one,
+/area/ship/cargo)
+"ga" = (
+/obj/structure/table,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel,
+/area/ship/crew/canteen)
+"ge" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/obj/structure/cable/yellow{
+	icon_state = "2-6"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/turf/open/floor/plasteel,
+/area/ship/crew/canteen)
+"gj" = (
+/obj/effect/turf_decal/industrial/outline/yellow,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+	dir = 8
+	},
+/obj/machinery/light/dim,
+/turf/open/floor/plasteel/patterned/cargo_one,
+/area/ship/cargo/office)
+"gp" = (
+/obj/effect/turf_decal/industrial/outline/yellow,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/garbage,
+/obj/structure/closet/crate/secure/science,
+/obj/item/storage/box/stockparts/t2,
+/obj/item/circuitboard/computer/rdconsole{
+	pixel_y = 4
+	},
+/obj/item/circuitboard/machine/protolathe/department/cargo{
+	pixel_y = -4;
+	pixel_x = -3
+	},
+/turf/open/floor/plasteel/patterned/cargo_one,
+/area/ship/cargo)
+"gt" = (
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/turf/open/floor/plasteel/stairs,
+/area/ship/crew/canteen)
+"gA" = (
+/obj/effect/turf_decal/industrial/outline/yellow,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/closet/crate/freezer{
+	name = "kitchen supplies"
+	},
+/obj/item/storage/box/ingredients/vegetarian,
+/obj/item/storage/box/ingredients/carnivore{
+	pixel_x = -4;
+	pixel_y = 6
+	},
+/turf/open/floor/plasteel/patterned/cargo_one,
+/area/ship/cargo)
+"gB" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 8
+	},
+/turf/open/floor/plasteel,
+/area/ship/crew/canteen)
+"gJ" = (
+/obj/effect/turf_decal/siding/thinplating/dark{
+	dir = 10
+	},
+/obj/effect/turf_decal/techfloor/corner{
+	dir = 4
+	},
+/obj/effect/turf_decal/industrial/stand_clear,
+/obj/machinery/button/door{
+	id = "cargopirate_podbay";
+	name = "Pod Door Control";
+	pixel_y = 22
+	},
+/turf/open/floor/plasteel/tech{
+	initial_gas_mix = "TEMP=2.7"
+	},
+/area/ship/cargo/office)
+"gP" = (
+/obj/effect/turf_decal/industrial/outline/yellow,
+/turf/open/floor/plasteel/patterned/cargo_one,
+/area/ship/cargo)
+"gS" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+	dir = 1
+	},
+/turf/open/floor/plasteel/patterned/grid,
+/area/ship/cargo/office)
+"gT" = (
+/obj/effect/turf_decal/atmos/air{
+	dir = 8
+	},
+/turf/open/floor/engine/air,
+/area/ship/engineering)
+"gW" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/obj/structure/cable/yellow{
+	icon_state = "1-10"
+	},
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+	dir = 8
+	},
+/turf/open/floor/plasteel,
+/area/ship/crew/canteen)
+"hj" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 8
+	},
+/turf/open/floor/plasteel/patterned/cargo_one,
+/area/ship/cargo)
+"hk" = (
+/obj/effect/turf_decal/corner/opaque/yellow/half{
+	dir = 1
+	},
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/cable/yellow{
+	icon_state = "2-8"
+	},
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+	dir = 1
+	},
+/turf/open/floor/plasteel,
+/area/ship/cargo)
+"hp" = (
+/obj/effect/turf_decal/siding/thinplating/dark{
+	dir = 8
+	},
+/obj/effect/turf_decal/techfloor/corner{
+	dir = 4
+	},
+/obj/effect/turf_decal/techfloor/corner,
+/obj/effect/turf_decal/steeldecal/steel_decals9,
+/turf/open/floor/plasteel/tech{
+	initial_gas_mix = "TEMP=2.7"
+	},
+/area/ship/cargo/office)
+"hr" = (
+/obj/effect/turf_decal/industrial/warning{
+	dir = 9;
+	color = "#808080"
+	},
+/obj/structure/rack,
+/obj/item/clothing/shoes/magboots{
+	pixel_y = -3;
+	pixel_x = -2
+	},
+/obj/item/storage/belt/utility/full/engi{
+	pixel_x = -1;
+	pixel_y = 2
+	},
+/obj/item/clothing/glasses/meson/engine{
+	pixel_x = 2;
+	pixel_y = 4
+	},
+/obj/structure/railing{
+	dir = 10;
+	layer = 4.1
+	},
+/obj/item/radio/intercom{
+	pixel_y = 23
+	},
+/turf/open/floor/plasteel/patterned/grid,
+/area/ship/cargo/office)
+"hu" = (
+/obj/effect/turf_decal/industrial/warning{
+	dir = 8;
+	color = "#808080"
+	},
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 6
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/turf/open/floor/mineral/plastitanium,
+/area/ship/security)
+"hA" = (
+/obj/effect/turf_decal/techfloor{
+	dir = 1
+	},
+/obj/structure/sign/warning/electricshock{
+	pixel_y = 31
+	},
+/obj/mecha/combat/gygax/dark,
+/turf/open/floor/plasteel/telecomms_floor,
+/area/ship/science/robotics)
+"hI" = (
+/obj/machinery/vending/wardrobe/jani_wardrobe,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/light/small{
+	dir = 8
+	},
+/turf/open/floor/plasteel,
+/area/ship/crew/canteen)
+"hM" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/industrial/warning{
+	dir = 8;
+	color = "#808080"
+	},
+/obj/effect/turf_decal/industrial/warning/corner{
+	color = "#808080"
+	},
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/turf/open/floor/mineral/plastitanium,
+/area/ship/security)
+"hN" = (
+/obj/effect/turf_decal/industrial/traffic{
+	dir = 4
+	},
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/door/poddoor/shutters{
+	id = "cargopirate_sub_hatch";
+	name = "Blast Shutters"
+	},
+/turf/open/floor/plasteel/patterned/ridged,
+/area/ship/cargo/office)
+"hP" = (
+/obj/effect/turf_decal/industrial/traffic{
+	dir = 4
+	},
+/obj/effect/turf_decal/industrial/stand_clear{
+	dir = 4
+	},
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/turf/open/floor/plasteel/patterned/ridged,
+/area/ship/cargo)
+"hR" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+	dir = 4
+	},
+/obj/structure/catwalk/over,
+/turf/open/floor/plating,
+/area/ship/engineering)
+"hU" = (
+/obj/effect/turf_decal/industrial/traffic{
+	dir = 8
+	},
+/obj/machinery/door/firedoor/border_only,
+/obj/machinery/door/firedoor/border_only{
+	dir = 1
+	},
+/obj/machinery/door/poddoor/shutters{
+	id = "cargopirate_podbay";
+	name = "Pod Bay Shutters"
+	},
+/turf/open/floor/plasteel/patterned/ridged,
+/area/ship/cargo/office)
+"hV" = (
+/obj/structure/catwalk/over,
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden,
+/turf/open/floor/plating,
+/area/ship/engineering)
+"im" = (
+/obj/effect/turf_decal/industrial/warning{
+	dir = 5;
+	color = "#808080"
+	},
+/obj/structure/closet/wall/orange{
+	dir = 8;
+	pixel_x = 29;
+	name = "Pilot's Locker"
+	},
+/obj/item/kirbyplants{
+	icon_state = "plant-25"
+	},
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+	dir = 8
+	},
+/turf/open/floor/plasteel/patterned/grid,
+/area/ship/cargo/office)
+"is" = (
+/obj/effect/turf_decal/industrial/warning{
+	dir = 9;
+	color = "#808080"
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/cable/yellow{
+	icon_state = "2-6"
+	},
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
+/turf/open/floor/mineral/plastitanium,
+/area/ship/security)
+"iB" = (
+/obj/effect/turf_decal/industrial/warning/corner{
+	color = "#808080";
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 5
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/turf/open/floor/plasteel/patterned/grid,
+/area/ship/cargo/office)
+"iI" = (
+/obj/effect/turf_decal/industrial/outline/yellow,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/oil/streak,
+/obj/effect/decal/cleanable/xenoblood{
+	pixel_x = -3;
+	pixel_y = 5
+	},
+/turf/open/floor/plasteel/patterned/cargo_one,
+/area/ship/cargo)
+"iL" = (
+/obj/structure/chair/office{
+	dir = 4;
+	name = "tactical swivel chair"
+	},
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+	dir = 9
+	},
+/obj/effect/turf_decal/steeldecal/steel_decals6,
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/engineering)
+"iO" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable/yellow{
+	icon_state = "2-6"
+	},
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 6
+	},
+/obj/machinery/vending/sovietsoda,
+/turf/open/floor/plasteel/patterned/cargo_one,
+/area/ship/cargo)
+"iZ" = (
+/obj/structure/window/reinforced{
+	dir = 4
+	},
+/obj/item/soap,
+/obj/structure/curtain/bounty,
+/obj/machinery/shower{
+	pixel_y = 19
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plating/catwalk_floor,
+/area/ship/security)
+"jd" = (
+/obj/machinery/door/airlock/hatch,
+/obj/machinery/door/firedoor,
+/turf/open/floor/plasteel,
+/area/ship/crew/canteen)
+"je" = (
+/obj/effect/turf_decal/siding/thinplating/dark,
+/obj/effect/turf_decal/techfloor{
+	dir = 1
+	},
+/obj/effect/turf_decal/techfloor/hole{
+	dir = 1
+	},
+/turf/open/floor/plasteel/tech{
+	initial_gas_mix = "TEMP=2.7"
+	},
+/area/ship/cargo/office)
+"jk" = (
+/obj/effect/turf_decal/techfloor{
+	dir = 1
+	},
+/obj/effect/turf_decal/steeldecal/steel_decals6,
+/obj/machinery/recharger{
+	pixel_x = 12
+	},
+/obj/item/desk_flag{
+	pixel_x = 10;
+	pixel_y = 14
+	},
+/obj/structure/table/reinforced{
+	color = "#c1b6a5"
+	},
+/obj/machinery/light{
+	dir = 1
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/power/apc/auto_name/north,
+/obj/structure/cable/yellow{
+	icon_state = "0-2"
+	},
+/obj/machinery/airalarm/directional/west,
+/turf/open/floor/plasteel/tech,
+/area/ship/bridge)
+"jM" = (
+/obj/structure/table/wood/reinforced,
+/obj/item/modular_computer/laptop/preset/civilian{
+	pixel_x = 2;
+	pixel_y = 4
+	},
+/obj/item/trash/can/food{
+	pixel_x = -9;
+	pixel_y = 4
+	},
+/obj/effect/decal/cleanable/cobweb/cobweb2,
+/obj/machinery/power/apc/auto_name/north,
+/obj/structure/cable/yellow{
+	icon_state = "0-2"
+	},
+/turf/open/floor/carpet/nanoweave/beige,
+/area/ship/crew/dorm)
+"jU" = (
+/obj/machinery/light,
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/obj/machinery/door/firedoor,
+/obj/machinery/button/door{
+	id = "cargopirate_podbay";
+	name = "Pod Door Control";
+	pixel_y = -22;
+	dir = 1
+	},
+/turf/open/floor/plasteel,
+/area/ship/cargo)
+"ka" = (
+/turf/closed/wall/mineral/plastitanium/nodiagonal,
+/area/ship/crew/canteen)
+"kf" = (
+/obj/effect/turf_decal/industrial/warning/corner{
+	dir = 1
+	},
+/obj/effect/turf_decal/industrial/warning/corner{
+	dir = 4
+	},
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/door/firedoor/border_only{
+	dir = 1
+	},
+/obj/machinery/door/firedoor/border_only,
+/turf/open/floor/plasteel/patterned/ridged,
+/area/ship/cargo)
+"ko" = (
+/obj/structure/dresser,
+/obj/effect/turf_decal/siding/wood/end{
+	dir = 1
+	},
+/turf/open/floor/wood{
+	icon_state = "wood-broken4"
+	},
+/area/ship/crew/dorm)
+"kv" = (
+/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
+/turf/open/floor/plating,
+/area/ship/cargo/office)
+"kw" = (
+/obj/effect/turf_decal/number/zero,
+/turf/closed/wall/mineral/plastitanium/nodiagonal,
+/area/ship/cargo/office)
+"kE" = (
+/obj/effect/turf_decal/techfloor/orange{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/orange/hidden,
+/obj/structure/cable/yellow{
+	icon_state = "1-8"
+	},
+/obj/effect/turf_decal/steeldecal/steel_decals_central4,
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/engineering)
+"kX" = (
+/obj/structure/rack,
+/obj/item/stack/sheet/plasteel/twenty{
+	pixel_x = -3;
+	pixel_y = 6
+	},
+/obj/item/stack/sheet/glass/fifty{
+	pixel_x = 6
+	},
+/obj/item/stack/sheet/metal/fifty,
+/turf/open/floor/plasteel/tech/techmaint,
+/area/ship/engineering)
+"lf" = (
+/obj/effect/turf_decal/industrial/traffic{
+	dir = 8
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/patterned/ridged,
+/area/ship/cargo/office)
+"lj" = (
+/obj/machinery/atmospherics/components/unary/shuttle/heater{
+	dir = 4
+	},
+/obj/structure/window/plasma/reinforced/spawner/west,
+/obj/structure/window/plasma/reinforced/spawner/east,
+/obj/machinery/door/poddoor{
+	id = "cargopirate_thrusters";
+	name = "thruster blast door"
+	},
+/turf/open/floor/plating,
+/area/ship/engineering)
+"lm" = (
+/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
+/turf/open/floor/plating,
+/area/ship/bridge)
+"lq" = (
+/obj/effect/turf_decal/atmos/plasma{
+	dir = 8
+	},
+/turf/open/floor/engine/plasma,
+/area/ship/engineering)
+"lx" = (
+/obj/machinery/power/port_gen/pacman,
+/obj/effect/turf_decal/industrial/warning{
+	dir = 1
+	},
+/obj/structure/railing{
+	dir = 8;
+	layer = 4.1
+	},
+/obj/structure/cable,
+/obj/machinery/firealarm{
+	dir = 4;
+	pixel_x = -23;
+	pixel_y = 10
+	},
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/engineering)
+"lD" = (
+/obj/machinery/power/shuttle/engine/fueled/plasma{
+	dir = 4
+	},
+/turf/open/floor/plating,
+/area/ship/cargo/office)
+"mb" = (
+/obj/structure/closet/wall/orange{
+	dir = 1;
+	name = "Engineering locker";
+	pixel_y = -28
+	},
+/obj/machinery/atmospherics/components/binary/pump{
+	name = "engine fuel pump";
+	dir = 8
+	},
+/obj/item/clothing/head/welding,
+/obj/item/analyzer{
+	pixel_x = 3;
+	pixel_y = -4
+	},
+/obj/item/clothing/mask/gas/atmos,
+/obj/item/clothing/glasses/meson/engine/tray,
+/obj/item/multitool,
+/obj/item/storage/belt/utility/atmostech,
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/engineering)
+"mf" = (
+/turf/open/floor/engine/plasma,
+/area/ship/engineering)
+"mm" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+	dir = 4
+	},
+/turf/open/floor/plasteel,
+/area/ship/crew/canteen)
+"mp" = (
+/turf/closed/wall/mineral/plastitanium,
+/area/ship/security)
+"mB" = (
+/obj/structure/tank_dispenser/oxygen,
+/obj/effect/turf_decal/industrial/hatch/yellow,
+/obj/machinery/light/small{
+	dir = 4
+	},
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/crew/canteen)
+"mL" = (
+/obj/effect/turf_decal/corner/opaque/yellow/half{
+	dir = 1
+	},
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/cable/yellow{
+	icon_state = "8-10"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/turf/open/floor/plating{
+	icon_state = "panelscorched"
+	},
+/area/ship/cargo)
+"mP" = (
+/obj/effect/turf_decal/industrial/warning{
+	dir = 8;
+	color = "#808080"
+	},
+/obj/effect/turf_decal/industrial/warning{
+	dir = 4;
+	color = "#808080"
+	},
+/obj/machinery/door/airlock/hatch,
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/door/firedoor,
+/turf/open/floor/mineral/plastitanium,
+/area/ship/security)
+"mU" = (
+/obj/effect/turf_decal/siding/thinplating/dark/corner,
+/obj/effect/turf_decal/techfloor{
+	dir = 1
+	},
+/turf/open/floor/plasteel/tech{
+	initial_gas_mix = "TEMP=2.7"
+	},
+/area/ship/cargo/office)
+"nh" = (
+/obj/effect/turf_decal/siding/thinplating/dark/corner{
+	dir = 8
+	},
+/obj/effect/turf_decal/siding/thinplating/dark/corner,
+/obj/machinery/light/dim{
+	dir = 1
+	},
+/obj/effect/turf_decal/techfloor{
+	dir = 1
+	},
+/turf/open/floor/plasteel/tech{
+	initial_gas_mix = "TEMP=2.7"
+	},
+/area/ship/cargo/office)
+"nj" = (
+/obj/effect/turf_decal/industrial/hatch/yellow,
+/obj/structure/reagent_dispensers/watertank,
+/turf/open/floor/plasteel/patterned/cargo_one,
+/area/ship/cargo)
+"nn" = (
+/obj/structure/railing{
+	dir = 2;
+	layer = 4.1
+	},
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 9
+	},
+/turf/open/floor/plasteel/patterned/cargo_one,
+/area/ship/cargo)
+"nv" = (
+/obj/machinery/door/airlock/hatch,
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/door/firedoor,
+/turf/open/floor/plasteel,
+/area/ship/cargo/office)
+"nB" = (
+/obj/machinery/door/window/survival_pod{
+	dir = 8
+	},
+/turf/open/floor/plasteel/stairs{
+	dir = 4
+	},
+/area/ship/cargo/office)
+"nE" = (
+/obj/structure/railing/corner{
+	dir = 8
+	},
+/obj/structure/cable{
+	icon_state = "1-2"
+	},
+/obj/structure/cable{
+	icon_state = "1-4"
+	},
+/obj/effect/turf_decal/steeldecal/steel_decals10{
+	dir = 5
+	},
+/obj/effect/turf_decal/steeldecal/steel_decals10{
+	dir = 6
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/engineering)
+"nM" = (
+/obj/effect/turf_decal/siding/wood{
+	dir = 8
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/turf/open/floor/wood{
+	icon_state = "wood-broken3"
+	},
+/area/ship/crew/dorm)
+"nN" = (
+/obj/effect/turf_decal/siding/thinplating/dark{
+	dir = 6
+	},
+/obj/effect/turf_decal/steeldecal/steel_decals2{
+	dir = 1
+	},
+/turf/open/floor/plasteel/tech{
+	initial_gas_mix = "TEMP=2.7"
+	},
+/area/ship/cargo/office)
+"oc" = (
+/obj/machinery/door/airlock/hatch,
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/door/firedoor,
+/turf/open/floor/plasteel/patterned/cargo_one,
+/area/ship/engineering)
+"of" = (
+/obj/machinery/atmospherics/components/unary/shuttle/heater{
+	dir = 4
+	},
+/obj/structure/window/reinforced{
+	dir = 1;
+	pixel_y = 1
+	},
+/obj/structure/window/reinforced,
+/obj/structure/window/reinforced{
+	dir = 8
+	},
+/turf/open/floor/plating,
+/area/ship/cargo/office)
+"or" = (
+/obj/machinery/vending/wallmed{
+	pixel_y = -28
+	},
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/obj/structure/cable/yellow{
+	icon_state = "1-9"
+	},
+/turf/open/floor/plating/rust,
+/area/ship/cargo)
+"ov" = (
+/obj/structure/catwalk/over,
+/obj/effect/mapping_helpers/airlock/cyclelink_helper,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 1
+	},
+/obj/machinery/door/airlock/external/glass,
+/turf/open/floor/plating,
+/area/ship/crew/canteen)
+"ox" = (
+/obj/machinery/atmospherics/components/unary/outlet_injector/layer4{
+	dir = 4
+	},
+/turf/open/floor/plating/airless,
+/area/ship/external)
+"oy" = (
+/turf/closed/wall/mineral/plastitanium/nodiagonal,
+/area/ship/crew/dorm)
+"oC" = (
+/obj/effect/turf_decal/siding/thinplating/dark{
+	dir = 4
+	},
+/obj/machinery/light/dim{
+	dir = 8
+	},
+/obj/effect/turf_decal/techfloor{
+	dir = 8
+	},
+/obj/effect/turf_decal/techfloor/hole{
+	dir = 8
+	},
+/turf/open/floor/plasteel/tech{
+	initial_gas_mix = "TEMP=2.7"
+	},
+/area/ship/cargo/office)
+"oJ" = (
+/obj/effect/turf_decal/siding/thinplating/dark,
+/obj/effect/turf_decal/techfloor{
+	dir = 1
+	},
+/turf/open/floor/plasteel/tech{
+	initial_gas_mix = "TEMP=2.7"
+	},
+/area/ship/cargo/office)
+"oK" = (
+/obj/machinery/autolathe/hacked,
+/obj/effect/turf_decal/industrial/warning{
+	dir = 6;
+	color = "#808080"
+	},
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/turf/open/floor/plasteel/tech/techmaint,
+/area/ship/engineering)
+"pc" = (
+/obj/structure/closet/crate/engineering,
+/obj/effect/decal/cleanable/oil,
+/obj/item/rcl/pre_loaded,
+/obj/item/reagent_containers/spray/weedspray,
+/obj/item/sparkler{
+	pixel_x = -9
+	},
+/obj/item/stack/cable_coil,
+/obj/item/stack/circuit_stack,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/industrial/outline/yellow,
+/obj/machinery/airalarm/directional/north,
+/turf/open/floor/plasteel/patterned/cargo_one,
+/area/ship/cargo)
+"ps" = (
+/obj/structure/table/wood,
+/obj/item/paper_bin{
+	pixel_x = -5;
+	pixel_y = 4
+	},
+/obj/item/pen/charcoal{
+	pixel_x = -4;
+	pixel_y = 3
+	},
+/obj/item/toy/cards/deck/syndicate{
+	pixel_y = 2;
+	pixel_x = 8
+	},
+/obj/item/reagent_containers/food/drinks/beer/light{
+	pixel_x = 3;
+	pixel_y = 9
+	},
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel,
+/area/ship/crew/canteen)
+"px" = (
+/obj/effect/turf_decal/industrial/warning,
+/turf/open/floor/pod/dark,
+/area/ship/cargo/office)
+"py" = (
+/obj/effect/turf_decal/industrial/warning{
+	dir = 2;
+	color = "#808080"
+	},
+/obj/structure/table/reinforced{
+	color = "#c1b6a5"
+	},
+/obj/item/paper_bin{
+	pixel_x = -5
+	},
+/obj/item/stamp/qm{
+	pixel_x = 8;
+	pixel_y = 9
+	},
+/obj/item/stamp{
+	pixel_x = 8;
+	pixel_y = 4
+	},
+/obj/item/stamp/denied{
+	pixel_x = 8;
+	pixel_y = -1
+	},
+/obj/item/instrument/piano_synth/headphones/spacepods{
+	pixel_x = -5;
+	pixel_y = -1
+	},
+/turf/open/floor/plasteel/patterned/grid,
+/area/ship/cargo/office)
+"pM" = (
+/obj/structure/rack,
+/obj/structure/railing{
+	dir = 1;
+	layer = 4.1
+	},
+/obj/item/storage/toolbox/electrical,
+/obj/item/storage/belt/utility/full/engi,
+/obj/item/clothing/glasses/welding{
+	pixel_y = 5
+	},
+/obj/item/multitool{
+	pixel_x = 9
+	},
+/obj/machinery/airalarm/directional/east,
+/turf/open/floor/plasteel/tech/techmaint,
+/area/ship/engineering)
+"pU" = (
+/obj/effect/turf_decal/industrial/outline/yellow,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/light{
+	dir = 8
+	},
+/obj/structure/railing/corner{
+	dir = 1
+	},
+/obj/effect/decal/cleanable/robot_debris/gib,
+/obj/effect/turf_decal/arrows{
+	pixel_y = 15
+	},
+/turf/open/floor/plasteel/telecomms_floor,
+/area/ship/science/robotics)
+"pZ" = (
+/obj/structure/table/wood/reinforced,
+/obj/effect/turf_decal/siding/wood{
+	dir = 8
+	},
+/obj/item/table_bell{
+	pixel_x = 9;
+	pixel_y = -1
+	},
+/obj/item/paper_bin{
+	pixel_x = -4;
+	pixel_y = 4
+	},
+/obj/item/clipboard{
+	pixel_x = -2;
+	pixel_y = 8
+	},
+/obj/item/pen{
+	pixel_y = 4;
+	pixel_x = -4
+	},
+/obj/item/megaphone/sec{
+	name = "syndicate megaphone";
+	pixel_x = 1;
+	pixel_y = -4
+	},
+/turf/open/floor/wood,
+/area/ship/bridge)
+"qr" = (
+/obj/structure/table/wood,
+/obj/item/storage/pill_bottle/dice{
+	pixel_x = 6;
+	pixel_y = 6
+	},
+/obj/effect/turf_decal/siding/wood{
+	dir = 5
+	},
+/obj/structure/bedsheetbin,
+/obj/machinery/airalarm/directional/east,
+/turf/open/floor/wood,
+/area/ship/crew/dorm)
+"qy" = (
+/obj/structure/chair/comfy/shuttle{
+	dir = 4
+	},
+/obj/structure/railing{
+	dir = 8;
+	layer = 4.1
+	},
+/obj/machinery/button/door{
+	id = "cargopirate_sub_hatch";
+	name = "Pod Door Control";
+	pixel_y = 22
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/cargo/office)
+"qD" = (
+/obj/structure/table,
+/obj/effect/decal/cleanable/dirt,
+/obj/item/reagent_containers/food/condiment/enzyme{
+	pixel_x = 13;
+	pixel_y = 10
+	},
+/obj/item/reagent_containers/food/condiment/saltshaker{
+	pixel_y = 15
+	},
+/obj/item/reagent_containers/food/condiment/peppermill{
+	pixel_y = 15;
+	pixel_x = -6
+	},
+/obj/effect/decal/cleanable/dirt,
+/obj/item/reagent_containers/glass/beaker/large{
+	pixel_x = 6;
+	pixel_y = 2
+	},
+/obj/machinery/airalarm/directional/north,
+/turf/open/floor/plasteel,
+/area/ship/crew/canteen)
+"qE" = (
+/obj/effect/turf_decal/techfloor{
+	dir = 6
+	},
+/obj/machinery/computer/security{
+	dir = 8
+	},
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel/tech,
+/area/ship/bridge)
+"qN" = (
+/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+	dir = 4
+	},
+/turf/open/floor/plating,
+/area/ship/engineering)
+"qS" = (
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+	dir = 8
+	},
+/obj/machinery/button/door{
+	id = "cargopirate_sub_hatch";
+	name = "Pod Door Control";
+	pixel_y = 22
+	},
+/turf/open/floor/pod/light,
+/area/ship/cargo/office)
+"qT" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/item/reagent_containers/food/condiment/rice,
+/obj/item/reagent_containers/food/condiment/rice,
+/obj/item/reagent_containers/food/condiment/sugar,
+/obj/item/reagent_containers/food/condiment/sugar,
+/obj/effect/spawner/lootdrop/donkpockets{
+	pixel_y = 2;
+	pixel_x = 3
+	},
+/obj/item/reagent_containers/food/condiment/flour,
+/obj/item/reagent_containers/food/condiment/flour,
+/obj/item/reagent_containers/food/condiment/soymilk,
+/obj/item/reagent_containers/food/condiment/soymilk,
+/obj/item/reagent_containers/food/condiment/milk,
+/obj/item/reagent_containers/food/condiment/milk,
+/obj/item/reagent_containers/food/snacks/dough,
+/obj/item/reagent_containers/food/snacks/dough,
+/obj/item/storage/box/ingredients/wildcard{
+	pixel_y = 3;
+	pixel_x = -1
+	},
+/obj/item/reagent_containers/food/snacks/meat/slab{
+	pixel_x = 4;
+	pixel_y = 10
+	},
+/obj/item/reagent_containers/food/snacks/meat/slab{
+	pixel_x = 5;
+	pixel_y = 1
+	},
+/obj/effect/decal/cleanable/food/flour,
+/obj/structure/closet/secure_closet/freezer/kitchen/wall{
+	pixel_y = -28;
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 8
+	},
+/turf/open/floor/plasteel,
+/area/ship/crew/canteen)
+"rf" = (
+/obj/machinery/atmospherics/components/unary/shuttle/heater{
+	dir = 4
+	},
+/obj/structure/window/reinforced,
+/obj/structure/window/reinforced{
+	dir = 1
+	},
+/obj/structure/window/reinforced{
+	dir = 8
+	},
+/turf/open/floor/plating,
+/area/ship/cargo/office)
+"rh" = (
+/obj/effect/turf_decal/siding/thinplating/dark{
+	dir = 1
+	},
+/obj/effect/turf_decal/techfloor,
+/obj/effect/turf_decal/techfloor/hole,
+/turf/open/floor/plasteel/tech{
+	initial_gas_mix = "TEMP=2.7"
+	},
+/area/ship/cargo/office)
+"rk" = (
+/obj/machinery/power/shuttle/engine/fueled/plasma{
+	dir = 4
+	},
+/turf/open/floor/plating/airless,
+/area/ship/external)
+"rm" = (
+/obj/effect/turf_decal/corner/opaque/yellow/bordercorner{
+	dir = 1
+	},
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
+/turf/open/floor/plasteel,
+/area/ship/cargo)
+"rt" = (
+/obj/machinery/power/shieldwallgen/atmos/roundstart{
+	dir = 8;
+	id = "cargopirate_holo";
+	locked = 1
+	},
+/obj/machinery/door/poddoor/shutters{
+	id = "cargopirate_cargo";
+	name = "Cargo Shutters"
+	},
+/turf/open/floor/plating,
+/area/ship/cargo)
+"ry" = (
+/obj/structure/table/reinforced,
+/obj/machinery/button/door{
+	id = "ospreywindows";
+	name = "Window Shutters";
+	pixel_y = -3;
+	pixel_x = -3;
+	dir = 1
+	},
+/obj/machinery/button/door{
+	id = "cargopirate_bridge";
+	name = "Bridge Shutters";
+	pixel_x = 7;
+	pixel_y = 6;
+	dir = 1
+	},
+/obj/machinery/button/door{
+	id = "cargopirate_windows";
+	name = "Window Shutters";
+	pixel_x = 7;
+	pixel_y = -3;
+	dir = 1
+	},
+/obj/item/gps,
+/obj/item/areaeditor/shuttle{
+	pixel_x = -3
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/bridge)
+"rS" = (
+/turf/closed/wall/mineral/plastitanium,
+/area/ship/engineering)
+"rT" = (
+/obj/machinery/suit_storage_unit/inherit,
+/obj/effect/turf_decal/industrial/warning{
+	dir = 9
+	},
+/obj/item/clothing/suit/space/orange,
+/obj/item/clothing/head/helmet/space/orange,
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/crew/canteen)
+"rX" = (
+/obj/structure/closet/wall/white/med{
+	name = "medical locker";
+	pixel_y = -28;
+	dir = 1
+	},
+/obj/item/healthanalyzer,
+/obj/item/sensor_device{
+	pixel_x = -5;
+	pixel_y = -4
+	},
+/obj/item/roller,
+/obj/item/storage/firstaid/medical{
+	pixel_x = 3;
+	pixel_y = -5
+	},
+/obj/item/clothing/gloves/color/latex/nitrile/evil,
+/obj/item/storage/pill_bottle/happy{
+	pixel_x = 8;
+	pixel_y = -2
+	},
+/obj/item/reagent_containers/syringe/contraband{
+	pixel_x = 5
+	},
+/obj/item/reagent_containers/syringe/contraband/fentanyl,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 9
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 9
+	},
+/turf/open/floor/plating/rust,
+/area/ship/crew/canteen)
+"sa" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable/yellow{
+	icon_state = "2-4"
+	},
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/turf/open/floor/plasteel/patterned/cargo_one,
+/area/ship/cargo)
+"sh" = (
+/obj/effect/turf_decal/industrial/warning{
+	dir = 5;
+	color = "#808080"
+	},
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+	dir = 4
+	},
+/obj/structure/closet/secure_closet/engineering_welding{
+	req_access = null;
+	anchored = 1
+	},
+/turf/open/floor/plasteel/tech/techmaint,
+/area/ship/engineering)
+"sy" = (
+/obj/machinery/power/port_gen/pacman/super,
+/obj/effect/turf_decal/industrial/warning{
+	dir = 1
+	},
+/obj/structure/railing{
+	dir = 4;
+	layer = 4.1
+	},
+/obj/structure/cable,
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/engineering)
+"sz" = (
+/obj/effect/turf_decal/siding/wood{
+	dir = 4
+	},
+/obj/effect/decal/cleanable/dirt,
+/obj/item/cigbutt/cigarbutt{
+	pixel_x = -5;
+	pixel_y = 10
+	},
+/obj/structure/cable/yellow{
+	icon_state = "2-4"
+	},
+/turf/open/floor/wood,
+/area/ship/bridge)
+"sC" = (
+/obj/structure/window/reinforced,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+	dir = 1
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/science/robotics)
+"sH" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/oil,
+/obj/structure/cable/yellow{
+	icon_state = "5-9"
+	},
+/obj/structure/cable/yellow{
+	icon_state = "0-9"
+	},
+/obj/machinery/power/apc/auto_name/south,
+/turf/open/floor/plating/foam,
+/area/ship/cargo)
+"sU" = (
+/obj/machinery/vending/tool,
+/obj/effect/turf_decal/techfloor{
+	dir = 4
+	},
+/obj/effect/turf_decal/techfloor{
+	dir = 8
+	},
+/turf/open/floor/plasteel/tech/techmaint,
+/area/ship/engineering)
+"sV" = (
+/obj/machinery/holopad/emergency/command,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/extinguisher_cabinet{
+	pixel_y = -29
+	},
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/bridge)
+"sX" = (
+/obj/effect/turf_decal/industrial/warning{
+	dir = 4;
+	color = "#808080"
+	},
+/turf/open/floor/plasteel/tech/techmaint,
+/area/ship/engineering)
+"ti" = (
+/obj/machinery/door/window/northright{
+	dir = 2
+	},
+/obj/effect/turf_decal/industrial/outline/yellow,
+/obj/structure/railing{
+	dir = 1;
+	layer = 4.1
+	},
+/obj/machinery/suit_storage_unit/inherit,
+/obj/item/clothing/suit/space/hardsuit/security/independent/frontier,
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/security)
+"tr" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/turf_decal/industrial/stand_clear,
+/turf/open/floor/plasteel,
+/area/ship/cargo/office)
+"tx" = (
+/obj/effect/turf_decal/industrial/outline/yellow,
+/obj/structure/closet/crate/coffin,
+/obj/effect/mob_spawn/human/corpse/cargo_tech,
+/obj/machinery/light{
+	dir = 1
+	},
+/turf/open/floor/plasteel/patterned/cargo_one,
+/area/ship/cargo)
+"ty" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/extinguisher_cabinet{
+	pixel_x = -25;
+	pixel_y = 1
+	},
+/obj/structure/cable/yellow{
+	icon_state = "1-6"
+	},
+/turf/open/floor/plasteel,
+/area/ship/crew/canteen)
+"tC" = (
+/turf/closed/wall/mineral/plastitanium,
+/area/ship/cargo)
+"tK" = (
+/obj/effect/turf_decal/siding/thinplating/dark{
+	dir = 1
+	},
+/obj/machinery/light/dim,
+/turf/open/floor/plasteel/tech{
+	initial_gas_mix = "TEMP=2.7"
+	},
+/area/ship/cargo/office)
+"tW" = (
+/obj/machinery/door/window/northleft{
+	dir = 2
+	},
+/obj/effect/turf_decal/industrial/outline/yellow,
+/obj/structure/railing{
+	dir = 1;
+	layer = 4.1
+	},
+/obj/machinery/suit_storage_unit/inherit,
+/obj/item/clothing/suit/space/hardsuit/mining,
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/security)
+"ub" = (
+/obj/effect/turf_decal/siding/wood{
+	dir = 5
+	},
+/obj/item/radio/intercom/wideband{
+	pixel_x = 24;
+	dir = 8
+	},
+/obj/machinery/light{
+	dir = 1
+	},
+/obj/structure/plaque/static_plaque/golden/captain{
+	pixel_y = 29
+	},
+/obj/machinery/computer/cargo/express,
+/turf/open/floor/wood,
+/area/ship/bridge)
+"uo" = (
+/obj/machinery/power/terminal{
+	dir = 1
+	},
+/obj/structure/cable{
+	icon_state = "0-2"
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/engineering)
+"ur" = (
+/obj/machinery/door/window/brigdoor/southright{
+	dir = 4;
+	req_access_txt = "1"
+	},
+/obj/effect/turf_decal/industrial/warning{
+	dir = 1;
+	color = "#808080"
+	},
+/turf/open/floor/plating/rust,
+/area/ship/security)
+"uA" = (
+/obj/structure/chair/office/light{
+	dir = 8
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/turf/open/floor/carpet/nanoweave/beige,
+/area/ship/crew/dorm)
+"uK" = (
+/obj/structure/closet/wall{
+	icon_door = "yellow_wall";
+	name = "engineering closet";
+	pixel_y = 28
+	},
+/obj/item/clothing/suit/hooded/wintercoat/engineering,
+/obj/item/clothing/suit/hooded/wintercoat/engineering/atmos{
+	pixel_x = -2;
+	pixel_y = 3
+	},
+/obj/item/clothing/suit/toggle/hazard,
+/obj/item/clothing/under/utility,
+/obj/item/clothing/under/utility/skirt,
+/obj/item/clothing/under/rank/engineering/engineer,
+/obj/item/clothing/under/rank/engineering/engineer/junior{
+	pixel_x = 3;
+	pixel_y = -4
+	},
+/obj/item/clothing/under/rank/engineering/engineer/maintenance_tech,
+/obj/item/clothing/head/hardhat/weldhat/orange{
+	pixel_x = 7;
+	pixel_y = 2
+	},
+/obj/item/clothing/head/hardhat/red,
+/obj/item/clothing/shoes/workboots,
+/turf/open/floor/plasteel/tech/techmaint,
+/area/ship/engineering)
+"uS" = (
+/obj/structure/railing/corner{
+	dir = 1
+	},
+/obj/effect/turf_decal/steeldecal/steel_decals1,
+/obj/effect/turf_decal/steeldecal/steel_decals10{
+	dir = 10
+	},
+/obj/effect/turf_decal/steeldecal/steel_decals10{
+	dir = 9
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel/dark,
+/area/ship/bridge)
+"uW" = (
+/obj/effect/turf_decal/industrial/loading,
+/obj/effect/turf_decal/industrial/warning{
+	dir = 5
+	},
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/door/firedoor/border_only{
+	dir = 1
+	},
+/obj/machinery/door/firedoor/border_only,
+/turf/open/floor/plasteel/patterned/ridged,
+/area/ship/cargo)
+"vs" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
+/turf/open/floor/plasteel,
+/area/ship/cargo)
+"vt" = (
+/turf/open/floor/pod/dark,
+/area/ship/cargo/office)
+"vv" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/cable/yellow{
+	icon_state = "1-10"
+	},
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
+/turf/open/floor/plasteel/patterned/cargo_one,
+/area/ship/cargo)
+"vH" = (
+/obj/structure/railing/corner,
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 5
+	},
+/turf/open/floor/plasteel,
+/area/ship/cargo)
+"vI" = (
+/obj/effect/turf_decal/techfloor{
+	dir = 6
+	},
+/obj/item/paper_bin{
+	pixel_x = 5
+	},
+/obj/item/pen/fountain/captain{
+	pixel_x = 4
+	},
+/obj/item/stamp/captain{
+	pixel_x = -6;
+	pixel_y = 3
+	},
+/obj/item/stamp/head_of_personnel{
+	pixel_x = -6;
+	pixel_y = -2
+	},
+/obj/item/desk_flag{
+	pixel_x = -6;
+	pixel_y = 17
+	},
+/obj/structure/table/reinforced{
+	color = "#c1b6a5"
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/bridge)
+"vT" = (
+/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
+/obj/machinery/door/poddoor/shutters/preopen{
+	id = "cargopirate_windows";
+	name = "Blast Shutters"
+	},
+/turf/open/floor/plating,
+/area/ship/cargo)
+"vZ" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/toxin_output{
+	dir = 8
+	},
+/turf/open/floor/engine/plasma,
+/area/ship/engineering)
+"wj" = (
+/obj/effect/turf_decal/industrial/traffic{
+	dir = 8
+	},
+/obj/effect/turf_decal/industrial/traffic{
+	dir = 4
+	},
+/obj/structure/extinguisher_cabinet{
+	pixel_y = 30
+	},
+/turf/open/floor/plasteel/patterned/cargo_one,
+/area/ship/cargo)
+"wm" = (
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/structure/catwalk/over,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/item/radio/intercom{
+	dir = 4;
+	pixel_x = -22;
+	pixel_y = 1
+	},
+/turf/open/floor/plating,
+/area/ship/engineering)
+"wn" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/oil/slippery,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+	dir = 8
+	},
+/turf/open/floor/plasteel/patterned,
+/area/ship/cargo)
+"wB" = (
+/obj/structure/railing/corner{
+	dir = 8
+	},
+/obj/machinery/door/airlock/hatch,
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/door/firedoor,
+/turf/open/floor/plasteel,
+/area/ship/crew/canteen)
+"wD" = (
+/obj/effect/turf_decal/siding/thinplating/dark,
+/obj/machinery/light/dim{
+	dir = 1
+	},
+/obj/effect/turf_decal/techfloor{
+	dir = 1
+	},
+/turf/open/floor/plasteel/tech{
+	initial_gas_mix = "TEMP=2.7"
+	},
+/area/ship/cargo/office)
+"wN" = (
+/obj/structure/railing{
+	dir = 2;
+	layer = 4.1
+	},
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/obj/machinery/firealarm{
+	dir = 1;
+	pixel_y = -23
+	},
+/turf/open/floor/plasteel/stairs{
+	dir = 4
+	},
+/area/ship/cargo)
+"wV" = (
+/obj/structure/railing{
+	dir = 8;
+	layer = 4.1
+	},
+/obj/effect/turf_decal/borderfloorblack{
+	dir = 8
+	},
+/obj/effect/turf_decal/spline/fancy/opaque/black{
+	dir = 8
+	},
+/obj/machinery/computer/card/minor/cmo,
+/turf/open/floor/plasteel/tech,
+/area/ship/bridge)
+"wY" = (
+/obj/structure/table/wood/reinforced,
+/obj/effect/turf_decal/siding/wood{
+	dir = 9
+	},
+/obj/item/phone{
+	pixel_x = 8;
+	pixel_y = 1
+	},
+/obj/item/flashlight/lamp/green{
+	pixel_y = 13;
+	pixel_x = -5
+	},
+/obj/item/reagent_containers/food/drinks/mug{
+	pixel_y = -9;
+	pixel_x = 6
+	},
+/obj/item/trash/chips{
+	pixel_x = -5;
+	pixel_y = 2
+	},
+/turf/open/floor/wood,
+/area/ship/bridge)
+"xk" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 10
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/turf/open/floor/plasteel,
+/area/ship/cargo)
+"xx" = (
+/turf/open/floor/plasteel/stairs{
+	icon = 'icons/obj/stairs.dmi';
+	dir = 8
+	},
+/area/ship/bridge)
+"xD" = (
+/obj/structure/table/reinforced{
+	color = "#c1b6a5"
+	},
+/obj/item/paper_bin{
+	pixel_x = -6
+	},
+/obj/item/pen{
+	pixel_x = -6;
+	pixel_y = 1
+	},
+/obj/item/clipboard{
+	pixel_x = 5
+	},
+/obj/item/folder/red{
+	pixel_x = 6;
+	pixel_y = -3
+	},
+/obj/machinery/firealarm{
+	pixel_y = -22;
+	dir = 1
+	},
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/engineering)
+"xJ" = (
+/obj/effect/turf_decal/industrial/outline/yellow,
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/easel,
+/turf/open/floor/plasteel/patterned/cargo_one,
+/area/ship/cargo)
+"xR" = (
+/obj/structure/table/reinforced{
+	color = "#c1b6a5"
+	},
+/obj/item/newspaper{
+	pixel_x = -4;
+	pixel_y = -1
+	},
+/obj/item/trash/can{
+	pixel_x = -8;
+	pixel_y = -2
+	},
+/obj/effect/turf_decal/techfloor/orange{
+	dir = 4
+	},
+/obj/structure/railing{
+	dir = 4;
+	layer = 3.1
+	},
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/engineering)
+"xY" = (
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/obj/machinery/firealarm{
+	dir = 1;
+	pixel_y = -23
+	},
+/turf/open/floor/plasteel,
+/area/ship/cargo)
+"yi" = (
+/obj/machinery/mecha_part_fabricator,
+/obj/effect/decal/cleanable/cobweb,
+/obj/structure/extinguisher_cabinet{
+	pixel_x = -25;
+	pixel_y = 1
+	},
+/obj/structure/railing{
+	dir = 8;
+	layer = 4.1
+	},
+/turf/open/floor/plasteel/telecomms_floor,
+/area/ship/science/robotics)
+"yk" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable/yellow{
+	icon_state = "1-9"
+	},
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+	dir = 1
+	},
+/turf/open/floor/plasteel,
+/area/ship/cargo)
+"yq" = (
+/obj/effect/turf_decal/techfloor{
+	dir = 5
+	},
+/obj/machinery/computer/mech_bay_power_console,
+/obj/structure/cable/yellow{
+	icon_state = "0-2"
+	},
+/obj/machinery/power/apc/auto_name/east,
+/obj/machinery/airalarm/directional/north,
+/turf/open/floor/plasteel/telecomms_floor,
+/area/ship/science/robotics)
+"yO" = (
+/obj/effect/turf_decal/industrial/traffic{
+	dir = 8
+	},
+/obj/effect/turf_decal/industrial/stand_clear{
+	dir = 8
+	},
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/turf/open/floor/plasteel/patterned/ridged,
+/area/ship/cargo)
+"zc" = (
+/obj/structure/closet/wall{
+	name = "Utility Closet";
+	dir = 4;
+	pixel_x = -28
+	},
+/obj/item/radio{
+	desc = "An old handheld radio. You could use it, if you really wanted to.";
+	icon_state = "radio";
+	name = "old radio";
+	pixel_x = -5;
+	pixel_y = 2
+	},
+/obj/item/radio{
+	desc = "An old handheld radio. You could use it, if you really wanted to.";
+	icon_state = "radio";
+	name = "old radio";
+	pixel_x = -5;
+	pixel_y = 2
+	},
+/obj/item/radio{
+	desc = "An old handheld radio. You could use it, if you really wanted to.";
+	icon_state = "radio";
+	name = "old radio";
+	pixel_x = -5;
+	pixel_y = 2
+	},
+/obj/item/radio{
+	desc = "An old handheld radio. You could use it, if you really wanted to.";
+	icon_state = "radio";
+	name = "old radio";
+	pixel_x = -5;
+	pixel_y = 2
+	},
+/obj/item/radio{
+	desc = "An old handheld radio. You could use it, if you really wanted to.";
+	icon_state = "radio";
+	name = "old radio";
+	pixel_x = -5;
+	pixel_y = 2
+	},
+/obj/item/flashlight,
+/obj/item/flashlight,
+/obj/item/flashlight,
+/obj/item/flashlight,
+/obj/item/flashlight,
+/obj/effect/turf_decal/siding/wood{
+	dir = 10
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/cable/yellow{
+	icon_state = "1-4"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 5
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 5
+	},
+/turf/open/floor/wood,
+/area/ship/crew/dorm)
+"zf" = (
+/obj/effect/turf_decal/corner/opaque/yellow/half{
+	dir = 8
+	},
+/obj/effect/turf_decal/industrial/loading{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 6
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/turf/open/floor/plasteel/patterned,
+/area/ship/cargo)
+"zk" = (
+/obj/effect/turf_decal/techfloor{
+	dir = 10
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 10
+	},
+/obj/machinery/atmospherics/components/binary/pump{
+	name = "engine fuel pump";
+	dir = 1
+	},
+/obj/machinery/power/terminal{
+	dir = 8
+	},
+/obj/structure/cable/yellow{
+	icon_state = "0-2"
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/engineering)
+"zl" = (
+/obj/effect/turf_decal/industrial/hatch/yellow,
+/turf/open/floor/plasteel/patterned/cargo_one,
+/area/ship/cargo)
+"zo" = (
+/obj/structure/catwalk/over,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 5
+	},
+/turf/open/floor/plating,
+/area/ship/engineering)
+"zA" = (
+/obj/structure/railing{
+	dir = 8;
+	layer = 3.1
+	},
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/power/apc/auto_name/north,
+/obj/structure/cable/yellow{
+	icon_state = "0-2"
+	},
+/obj/machinery/firealarm{
+	dir = 2;
+	pixel_y = 24;
+	pixel_x = 14
+	},
+/turf/open/floor/plasteel,
+/area/ship/crew/canteen)
+"zH" = (
+/obj/machinery/suit_storage_unit/atmos,
+/obj/effect/turf_decal/industrial/warning{
+	dir = 9
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 9
+	},
+/obj/machinery/airalarm/directional/south,
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/engineering)
+"zL" = (
+/obj/effect/turf_decal/siding/thinplating/dark{
+	dir = 8
+	},
+/obj/effect/turf_decal/techfloor{
+	dir = 4
+	},
+/turf/open/floor/plasteel/tech{
+	initial_gas_mix = "TEMP=2.7"
+	},
+/area/ship/cargo/office)
+"zO" = (
+/obj/machinery/power/smes/engineering,
+/obj/structure/railing{
+	dir = 4
+	},
+/obj/effect/turf_decal/industrial/warning{
+	dir = 6
+	},
+/obj/structure/cable/yellow{
+	icon_state = "0-4"
+	},
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/engineering)
+"zY" = (
+/turf/open/floor/plasteel/stairs{
+	dir = 8
+	},
+/area/ship/cargo/office)
+"Aa" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/obj/machinery/firealarm{
+	pixel_y = -22;
+	dir = 1
+	},
+/turf/open/floor/plasteel/patterned/cargo_one,
+/area/ship/cargo)
+"Ao" = (
+/obj/structure/railing{
+	dir = 8;
+	layer = 4.1
+	},
+/obj/effect/turf_decal/techfloor{
+	dir = 1
+	},
+/obj/effect/turf_decal/borderfloorblack{
+	dir = 8
+	},
+/obj/effect/turf_decal/spline/fancy/opaque/black{
+	dir = 8
+	},
+/obj/structure/chair/office{
+	dir = 4;
+	name = "tactical swivel chair"
+	},
+/obj/effect/turf_decal/steeldecal/steel_decals9,
+/turf/open/floor/plasteel/tech,
+/area/ship/bridge)
+"AM" = (
+/obj/machinery/power/shuttle/engine/electric{
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "0-4"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 4
+	},
+/turf/open/floor/plating/airless,
+/area/ship/external)
+"Be" = (
+/obj/effect/turf_decal/industrial/traffic{
+	dir = 8
+	},
+/obj/machinery/door/poddoor/shutters{
+	id = "cargopirate_sub_hatch";
+	name = "Blast Shutters"
+	},
+/turf/open/floor/plasteel/patterned/ridged,
+/area/ship/cargo/office)
+"Bh" = (
+/obj/structure/cable/yellow{
+	icon_state = "1-4"
+	},
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/turf/open/floor/plating,
+/area/ship/cargo)
+"Bn" = (
+/obj/structure/chair/plastic{
+	dir = 8
+	},
+/obj/effect/turf_decal/siding/wood{
+	dir = 4
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/decal/cleanable/vomit/old,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
+/turf/open/floor/wood,
+/area/ship/crew/dorm)
+"BG" = (
+/obj/effect/turf_decal/corner/opaque/yellow/half{
+	dir = 8
+	},
+/obj/effect/turf_decal/industrial/loading{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 6
+	},
+/turf/open/floor/plasteel/patterned,
+/area/ship/cargo)
+"BI" = (
+/turf/closed/wall/mineral/plastitanium/nodiagonal,
+/area/ship/science/robotics)
+"BV" = (
+/obj/effect/turf_decal/techfloor{
+	dir = 10
+	},
+/turf/open/floor/plasteel/telecomms_floor,
+/area/ship/science/robotics)
+"BX" = (
+/obj/machinery/rnd/production/circuit_imprinter/department/science,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
+/turf/open/floor/plasteel/tech,
+/area/ship/science/robotics)
+"BY" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/obj/machinery/airalarm/directional/south,
+/turf/open/floor/plasteel/patterned/cargo_one,
+/area/ship/cargo)
+"Ce" = (
+/obj/effect/turf_decal/industrial/warning,
+/turf/open/floor/pod,
+/area/ship/cargo/office)
+"Cg" = (
+/obj/structure/catwalk/over,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden,
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/turf/open/floor/plating,
+/area/ship/engineering)
+"Ct" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 6
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 5
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/science/robotics)
+"Cx" = (
+/obj/structure/railing{
+	dir = 1;
+	layer = 4.1
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 6
+	},
+/turf/open/floor/plasteel/patterned/cargo_one,
+/area/ship/cargo)
+"CD" = (
+/obj/machinery/medical_kiosk,
+/obj/machinery/light,
+/turf/open/floor/plasteel,
+/area/ship/crew/canteen)
+"CF" = (
+/obj/structure/railing/corner,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/light,
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/door/firedoor,
+/turf/open/floor/plasteel/patterned/cargo_one,
+/area/ship/cargo)
+"CH" = (
+/turf/closed/wall/mineral/plastitanium/nodiagonal,
+/area/ship/engineering)
+"CK" = (
+/obj/structure/railing{
+	dir = 8
+	},
+/obj/effect/turf_decal/industrial/warning{
+	dir = 10;
+	color = "#808080"
+	},
+/obj/structure/closet/toolcloset,
+/obj/item/clothing/head/welding,
+/obj/machinery/firealarm{
+	dir = 1;
+	pixel_y = -23;
+	pixel_x = 9
+	},
+/turf/open/floor/plasteel/patterned/grid,
+/area/ship/cargo/office)
+"CO" = (
+/obj/structure/chair/comfy/shuttle{
+	dir = 1;
+	name = "tactical chair"
+	},
+/obj/effect/turf_decal/steeldecal/steel_decals7{
+	dir = 9
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/cargo/office)
+"Dj" = (
+/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
+/turf/open/floor/plating,
+/area/ship/engineering)
+"Ds" = (
+/obj/effect/turf_decal/industrial/warning{
+	dir = 5;
+	color = "#808080"
+	},
+/obj/structure/cable/yellow{
+	icon_state = "1-4"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/turf/open/floor/plasteel/patterned/grid,
+/area/ship/cargo/office)
+"DD" = (
+/obj/structure/chair{
+	dir = 1
+	},
+/turf/open/floor/plating/rust,
+/area/ship/crew/canteen)
+"DH" = (
+/obj/structure/window/reinforced{
+	dir = 4
+	},
+/obj/machinery/processor,
+/obj/machinery/light/small{
+	dir = 1
+	},
+/turf/open/floor/plasteel,
+/area/ship/crew/canteen)
+"DL" = (
+/obj/effect/turf_decal/techfloor{
+	dir = 9
+	},
+/obj/effect/turf_decal/steeldecal/steel_decals4,
+/turf/open/floor/plasteel/tech{
+	initial_gas_mix = "TEMP=2.7"
+	},
+/area/ship/cargo/office)
+"DT" = (
+/obj/effect/turf_decal/corner/opaque/yellow/bordercorner{
+	dir = 4
+	},
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable/yellow{
+	icon_state = "6-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/obj/machinery/door/firedoor,
+/turf/open/floor/plating/rust,
+/area/ship/cargo)
+"DY" = (
+/turf/closed/wall/mineral/plastitanium,
+/area/ship/bridge)
+"Ea" = (
+/obj/effect/turf_decal/industrial/loading,
+/obj/effect/turf_decal/industrial/warning{
+	dir = 9
+	},
+/obj/effect/decal/cleanable/vomit/old,
+/obj/machinery/light{
+	dir = 8
+	},
+/obj/machinery/door/firedoor/border_only{
+	dir = 1
+	},
+/obj/machinery/door/firedoor/border_only,
+/obj/machinery/button/shieldwallgen{
+	id = "cargopirate_holo";
+	pixel_x = -31;
+	pixel_y = 21
+	},
+/obj/machinery/button/door{
+	id = "cargopirate_cargo";
+	name = "Cargo Shutters Control";
+	pixel_y = 22;
+	pixel_x = -23
+	},
+/turf/open/floor/plasteel/patterned/ridged,
+/area/ship/cargo)
+"Ed" = (
+/obj/effect/turf_decal/techfloor{
+	dir = 9
+	},
+/obj/machinery/mech_bay_recharge_port,
+/obj/structure/window/reinforced{
+	dir = 8
+	},
+/obj/item/radio/intercom{
+	pixel_y = 23
+	},
+/turf/open/floor/plasteel/telecomms_floor,
+/area/ship/science/robotics)
+"EI" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+	dir = 8
+	},
+/turf/open/floor/plasteel/patterned,
+/area/ship/cargo)
+"EW" = (
+/obj/effect/turf_decal/industrial/warning{
+	dir = 6;
+	color = "#808080"
+	},
+/obj/structure/table/reinforced{
+	color = "#c1b6a5"
+	},
+/obj/item/clothing/head/helmet/space/pilot/random{
+	pixel_x = 8;
+	pixel_y = -3
+	},
+/obj/item/gun/ballistic/automatic/pistol/m1911/no_mag{
+	pixel_x = -5
+	},
+/obj/item/holosign_creator/security{
+	pixel_y = 6;
+	pixel_x = -6
+	},
+/turf/open/floor/plasteel/patterned/grid,
+/area/ship/cargo/office)
+"EY" = (
+/obj/structure/table/reinforced{
+	color = "#c1b6a5"
+	},
+/obj/item/reagent_containers/food/drinks/mug{
+	pixel_x = -7;
+	pixel_y = -2
+	},
+/obj/item/storage/fancy/nugget_box{
+	pixel_y = 6;
+	pixel_x = 4
+	},
+/obj/effect/turf_decal/techfloor/orange{
+	dir = 4
+	},
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/engineering)
+"Fd" = (
+/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/turf/open/floor/plating,
+/area/ship/engineering)
+"Fj" = (
+/obj/effect/turf_decal/siding/wood{
+	dir = 6
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 10
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 6
+	},
+/turf/open/floor/wood{
+	icon_state = "wood-broken6"
+	},
+/area/ship/bridge)
+"Fm" = (
+/obj/effect/turf_decal/siding/thinplating/dark{
+	dir = 6
+	},
+/obj/effect/turf_decal/techfloor/corner{
+	dir = 1
+	},
+/obj/effect/turf_decal/industrial/stand_clear,
+/turf/open/floor/plasteel/tech{
+	initial_gas_mix = "TEMP=2.7"
+	},
+/area/ship/cargo/office)
+"Fp" = (
+/obj/effect/turf_decal/industrial/warning{
+	dir = 6;
+	color = "#808080"
+	},
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+	dir = 4
+	},
+/obj/structure/tank_dispenser/oxygen,
+/obj/structure/grille/broken,
+/turf/open/floor/plasteel/tech/techmaint,
+/area/ship/engineering)
+"Fw" = (
+/obj/structure/catwalk/over,
+/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 1
+	},
+/turf/open/floor/plating,
+/area/ship/crew/canteen)
+"Gc" = (
+/obj/machinery/power/shuttle/engine/electric{
+	dir = 4
+	},
+/obj/structure/cable{
+	icon_state = "0-4"
+	},
+/turf/open/floor/plating/airless,
+/area/ship/external)
+"Go" = (
+/obj/effect/turf_decal/industrial/traffic{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/turf/open/floor/plasteel/patterned/ridged,
+/area/ship/cargo)
+"Gw" = (
+/obj/structure/janitorialcart,
+/obj/effect/turf_decal/box,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/item/mop,
+/obj/item/pushbroom,
+/obj/item/reagent_containers/glass/bucket,
+/obj/structure/extinguisher_cabinet{
+	pixel_y = -29
+	},
+/turf/open/floor/plasteel,
+/area/ship/crew/canteen)
+"GJ" = (
+/obj/structure/railing{
+	dir = 1;
+	layer = 4.1
+	},
+/turf/open/floor/plasteel/stairs{
+	dir = 4
+	},
+/area/ship/engineering)
+"GO" = (
+/obj/effect/mapping_helpers/airlock/cyclelink_helper,
+/obj/machinery/atmospherics/pipe/layer_manifold{
+	dir = 1
+	},
+/obj/structure/catwalk/over,
+/obj/machinery/door/airlock/external{
+	welded = 1
+	},
+/turf/open/floor/plating,
+/area/ship/cargo)
+"GV" = (
+/obj/structure/cable/yellow{
+	icon_state = "1-9"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2,
+/turf/open/floor/plasteel,
+/area/ship/crew/canteen)
+"Hk" = (
+/obj/structure/closet/secure_closet/personal/cabinet,
+/obj/effect/turf_decal/siding/wood{
+	dir = 6
+	},
+/obj/effect/turf_decal/siding/wood/corner{
+	dir = 1
+	},
+/obj/machinery/light/small,
+/obj/item/clothing/under/costume/pirate,
+/obj/item/clothing/under/costume/pirate,
+/obj/item/clothing/under/costume/pirate,
+/obj/item/clothing/suit/pirate,
+/obj/item/clothing/suit/pirate,
+/obj/item/clothing/suit/pirate/captain,
+/obj/item/clothing/head/pirate/captain,
+/obj/item/clothing/head/pirate,
+/obj/item/clothing/head/pirate,
+/obj/item/clothing/head/bandana,
+/obj/item/clothing/head/bandana,
+/obj/item/clothing/head/bandana,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+	dir = 8
+	},
+/turf/open/floor/wood,
+/area/ship/crew/dorm)
+"HC" = (
+/obj/structure/catwalk/over,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/flippedtable,
+/obj/item/documents/nanotrasen{
+	pixel_y = 13
+	},
+/obj/item/weldingtool,
+/turf/open/floor/plating,
+/area/ship/cargo)
+"Ic" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable/yellow{
+	icon_state = "1-10"
+	},
+/obj/structure/cable/yellow{
+	icon_state = "1-4"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 4
+	},
+/turf/open/floor/plasteel,
+/area/ship/crew/canteen)
+"If" = (
+/turf/closed/wall/mineral/plastitanium,
+/area/ship/cargo/office)
+"Ih" = (
+/obj/effect/turf_decal/techfloor/corner,
+/obj/effect/turf_decal/techfloor/corner{
+	dir = 8
+	},
+/obj/effect/turf_decal/industrial/stand_clear,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/turf/open/floor/plasteel/telecomms_floor,
+/area/ship/science/robotics)
+"Im" = (
+/obj/effect/turf_decal/steeldecal/steel_decals10{
+	dir = 9
+	},
+/obj/effect/turf_decal/steeldecal/steel_decals10{
+	dir = 10
+	},
+/obj/machinery/computer/crew/syndie{
+	dir = 8
+	},
+/obj/effect/turf_decal/techfloor{
+	dir = 4
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/bridge)
+"Iq" = (
+/obj/effect/turf_decal/industrial/traffic{
+	dir = 4
+	},
+/obj/structure/cable/yellow{
+	icon_state = "1-4"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/turf/open/floor/plasteel/patterned/ridged,
+/area/ship/cargo)
+"Ir" = (
+/obj/item/bedsheet/dorms,
+/obj/structure/curtain/cloth/grey,
+/obj/structure/bed{
+	icon_state = "dirty_mattress"
+	},
+/obj/effect/turf_decal/siding/wood{
+	dir = 6
+	},
+/obj/effect/decal/cleanable/glass,
+/turf/open/floor/wood,
+/area/ship/crew/dorm)
+"Iu" = (
+/obj/effect/turf_decal/industrial/hatch/yellow,
+/obj/structure/closet/crate/radiation,
+/obj/item/stack/sheet/mineral/uranium,
+/obj/item/radio/intercom{
+	dir = 4;
+	pixel_x = -22;
+	pixel_y = 1
+	},
+/turf/open/floor/plasteel/patterned/cargo_one,
+/area/ship/cargo)
+"IF" = (
+/obj/effect/turf_decal/number/five,
+/turf/closed/wall/mineral/plastitanium/nodiagonal,
+/area/ship/cargo/office)
+"IK" = (
+/obj/effect/turf_decal/industrial/traffic{
+	dir = 8
+	},
+/obj/effect/turf_decal/industrial/traffic{
+	dir = 4
+	},
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel/patterned/cargo_one,
+/area/ship/cargo)
+"IQ" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 10
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 10
+	},
+/obj/structure/catwalk/over,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+	dir = 4
+	},
+/turf/open/floor/plating,
+/area/ship/engineering)
+"IR" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+	dir = 1
+	},
+/turf/open/floor/plasteel/patterned/cargo_one,
+/area/ship/cargo)
+"IS" = (
+/obj/effect/turf_decal/techfloor{
+	dir = 5
+	},
+/obj/item/radio/intercom{
+	pixel_y = 23
+	},
+/obj/machinery/computer/secure_data/laptop{
+	pixel_x = -35;
+	pixel_y = 1
+	},
+/obj/item/paper_bin{
+	pixel_x = -8;
+	pixel_y = 4
+	},
+/obj/item/door_seal{
+	pixel_x = 6
+	},
+/obj/item/pen/red{
+	pixel_x = -8;
+	pixel_y = 6
+	},
+/obj/item/camera_bug{
+	pixel_x = 2;
+	pixel_y = 10
+	},
+/obj/item/door_seal{
+	pixel_y = -1;
+	pixel_x = 2
+	},
+/obj/structure/table/reinforced{
+	color = "#c1b6a5"
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/bridge)
+"Jc" = (
+/obj/effect/turf_decal/siding/wood/corner{
+	dir = 8
+	},
+/obj/effect/turf_decal/siding/wood{
+	dir = 1
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 4
+	},
+/turf/open/floor/wood{
+	icon_state = "wood-broken5"
+	},
+/area/ship/crew/dorm)
+"Je" = (
+/obj/structure/cable/yellow{
+	icon_state = "1-8"
+	},
+/obj/structure/cable/yellow{
+	icon_state = "1-9"
+	},
+/turf/open/floor/plating,
+/area/ship/cargo)
+"Jh" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 8
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 8
+	},
+/turf/open/floor/plasteel,
+/area/ship/crew/canteen)
+"Jo" = (
+/obj/item/radio/intercom{
+	dir = 1;
+	pixel_x = -5;
+	pixel_y = -22
+	},
+/obj/structure/curtain/bounty,
+/obj/effect/turf_decal/siding/wood,
+/obj/effect/turf_decal/siding/wood{
+	dir = 1
+	},
+/obj/effect/decal/cleanable/garbage,
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 4
+	},
+/obj/machinery/door/firedoor,
+/turf/open/floor/wood,
+/area/ship/crew/dorm)
+"Jp" = (
+/obj/effect/turf_decal/industrial/warning,
+/obj/machinery/atmospherics/components/binary/pump{
+	dir = 4
+	},
+/turf/open/floor/pod/dark,
+/area/ship/cargo/office)
+"JD" = (
+/obj/machinery/computer/helm{
+	dir = 8
+	},
+/obj/effect/turf_decal/techfloor{
+	dir = 4
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/bridge)
+"JN" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/extinguisher_cabinet{
+	pixel_y = -29
+	},
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/turf/open/floor/plasteel/patterned/cargo_one,
+/area/ship/cargo)
+"JU" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/door/firedoor/border_only,
+/obj/machinery/door/firedoor/border_only{
+	dir = 1
+	},
+/obj/machinery/door/poddoor/shutters{
+	id = "cargopirate_podbay";
+	name = "Pod Bay Shutters"
+	},
+/turf/open/floor/plasteel,
+/area/ship/cargo/office)
+"JW" = (
+/obj/structure/railing/corner{
+	dir = 8
+	},
+/turf/closed/wall/mineral/plastitanium/nodiagonal,
+/area/ship/crew/canteen)
+"Kd" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 1
+	},
+/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{
+	dir = 1
+	},
+/obj/structure/catwalk/over,
+/obj/machinery/advanced_airlock_controller{
+	dir = 4;
+	pixel_x = -24
+	},
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/light/small{
+	dir = 4
+	},
+/obj/effect/mob_spawn/human/corpse/cargo_tech,
+/obj/effect/decal/cleanable/vomit/old,
+/obj/effect/decal/cleanable/blood/old,
+/obj/effect/decal/cleanable/blood/old{
+	pixel_x = -2;
+	pixel_y = -3;
+	icon_state = "gib2-old"
+	},
+/obj/item/destTagger,
+/turf/open/floor/plating,
+/area/ship/cargo)
+"KK" = (
+/obj/structure/railing{
+	dir = 2;
+	layer = 4.1
+	},
+/turf/open/floor/plasteel/stairs{
+	dir = 4
+	},
+/area/ship/engineering)
+"KN" = (
+/obj/machinery/power/shieldwallgen/atmos/roundstart{
+	dir = 4;
+	id = "cargopirate_holo";
+	locked = 1
+	},
+/obj/machinery/door/poddoor/shutters{
+	id = "cargopirate_cargo";
+	name = "Cargo Shutters"
+	},
+/turf/open/floor/plating,
+/area/ship/cargo)
+"KT" = (
+/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
+/obj/machinery/door/poddoor/shutters/preopen{
+	id = "cargopirate_windows";
+	name = "Blast Shutters"
+	},
+/turf/open/floor/plating,
+/area/ship/cargo/office)
+"KU" = (
+/obj/effect/turf_decal/corner/opaque/yellow/half{
+	dir = 1
+	},
+/obj/effect/turf_decal/industrial/caution,
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable/yellow{
+	icon_state = "2-4"
+	},
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/turf/open/floor/plating/rust,
+/area/ship/cargo)
+"KW" = (
+/obj/effect/turf_decal/industrial/warning/corner{
+	dir = 4
+	},
+/obj/effect/turf_decal/industrial/warning/corner,
+/turf/open/floor/plasteel/tech/techmaint,
+/area/ship/cargo/office)
+"La" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 9
+	},
+/turf/open/floor/plasteel,
+/area/ship/crew/canteen)
+"Ll" = (
+/turf/closed/wall/mineral/plastitanium/nodiagonal,
+/area/ship/cargo)
+"Lm" = (
+/obj/machinery/power/smes/engineering,
+/obj/effect/turf_decal/industrial/warning,
+/obj/structure/cable/yellow{
+	icon_state = "0-4"
+	},
+/obj/machinery/light/small{
+	dir = 8
+	},
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/engineering)
+"Lq" = (
+/obj/structure/table/reinforced,
+/obj/item/storage/backpack/duffelbag/syndie/c4{
+	pixel_y = 12
+	},
+/obj/machinery/recharger{
+	pixel_x = -5
+	},
+/obj/item/storage/box/zipties{
+	pixel_y = 7;
+	pixel_x = 4
+	},
+/obj/item/storage/box/syndie_kit/cutouts{
+	pixel_x = 8;
+	pixel_y = 3
+	},
+/obj/effect/turf_decal/spline/fancy/opaque/black{
+	dir = 9
+	},
+/obj/machinery/light{
+	dir = 4
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/security)
+"Lv" = (
+/obj/structure/bed{
+	icon_state = "dirty_mattress"
+	},
+/obj/item/bedsheet/grey,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/item/kitchen/knife/shiv,
+/turf/open/floor/plasteel,
+/area/ship/security)
+"Lw" = (
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/obj/machinery/power/apc/auto_name/north,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/manifold/orange/hidden{
+	dir = 1
+	},
+/obj/structure/cable/yellow{
+	icon_state = "2-4"
+	},
+/obj/structure/catwalk/over,
+/obj/structure/cable/yellow{
+	icon_state = "0-4"
+	},
+/turf/open/floor/plating,
+/area/ship/engineering)
+"LO" = (
+/obj/effect/turf_decal/industrial/warning{
+	dir = 4
+	},
+/obj/structure/bed/roller,
+/obj/machinery/airalarm/directional/south,
+/turf/open/floor/plasteel/tech/techmaint,
+/area/ship/cargo/office)
+"LX" = (
+/obj/structure/window/reinforced{
+	dir = 4
+	},
+/obj/structure/bed{
+	icon_state = "dirty_mattress"
+	},
+/obj/item/bedsheet/grey,
+/obj/effect/decal/cleanable/blood/bubblegum,
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/dark,
+/area/ship/security)
+"Mk" = (
+/obj/effect/turf_decal/industrial/outline/yellow,
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/closet/crate/solarpanel_small,
+/obj/item/solar_assembly,
+/obj/item/solar_assembly,
+/obj/item/solar_assembly,
+/obj/item/solar_assembly,
+/obj/item/solar_assembly,
+/obj/item/circuitboard/computer/solar_control,
+/obj/item/paper/guides/jobs/engi/solars,
+/turf/open/floor/plasteel/patterned/cargo_one,
+/area/ship/cargo)
+"Mp" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/light,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+	dir = 1
+	},
+/turf/open/floor/plasteel,
+/area/ship/cargo)
+"MI" = (
+/obj/effect/turf_decal/industrial/hatch/yellow,
+/obj/effect/turf_decal/industrial/warning{
+	dir = 4
+	},
+/obj/structure/reagent_dispensers/beerkeg,
+/turf/open/floor/plasteel/patterned,
+/area/ship/cargo)
+"Nk" = (
+/obj/structure/closet/secure_closet{
+	icon_state = "armory";
+	name = "armor locker";
+	req_access_txt = "1"
+	},
+/obj/item/clothing/suit/hooded/cloak/goliath/polar,
+/obj/item/clothing/suit/hooded/cloak/goliath,
+/obj/item/storage/belt/military,
+/obj/item/storage/belt/military,
+/obj/item/storage/belt/military/army,
+/obj/item/clothing/suit/armor/vest/bulletproof/frontier,
+/obj/item/clothing/head/helmet/bulletproof/x11/frontier,
+/obj/effect/turf_decal/industrial/outline/yellow,
+/obj/item/clothing/head/helmet/swat,
+/obj/item/clothing/head/bearpelt,
+/obj/item/clothing/mask/russian_balaclava,
+/obj/item/clothing/mask/russian_balaclava,
+/obj/item/clothing/mask/bandana/red,
+/obj/item/clothing/mask/bandana/black{
+	pixel_x = 1;
+	pixel_y = -4
+	},
+/obj/effect/decal/cleanable/cobweb/cobweb2,
+/obj/machinery/power/apc/auto_name/north,
+/obj/structure/cable/yellow{
+	icon_state = "0-8"
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/security)
+"Nn" = (
+/obj/structure/chair/stool/bar{
+	dir = 1;
+	pixel_y = 8;
+	pixel_x = 3
+	},
+/obj/effect/turf_decal/techfloor{
+	dir = 4
+	},
+/obj/effect/turf_decal/corner_techfloor_grid{
+	dir = 8
+	},
+/obj/effect/turf_decal/techfloor/corner{
+	dir = 8
+	},
+/obj/machinery/light/small{
+	dir = 4
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/engineering)
+"Nq" = (
+/turf/open/floor/engine/air,
+/area/ship/engineering)
+"Nw" = (
+/obj/structure/window/reinforced/survival_pod/spawner/west,
+/obj/machinery/power/port_gen/pacman{
+	anchored = 1
+	},
+/turf/open/floor/plasteel/tech/techmaint,
+/area/ship/cargo/office)
+"Nx" = (
+/obj/machinery/door/poddoor/shutters{
+	id = "cargopirate_cargo";
+	name = "Cargo Shutters"
+	},
+/turf/open/floor/plating,
+/area/ship/cargo)
+"NB" = (
+/obj/effect/turf_decal/techfloor/corner,
+/obj/effect/turf_decal/techfloor/corner{
+	dir = 8
+	},
+/obj/effect/turf_decal/steeldecal/steel_decals3{
+	dir = 1
+	},
+/obj/effect/turf_decal/steeldecal/steel_decals3{
+	dir = 10
+	},
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/cargo/office)
+"NE" = (
+/obj/structure/catwalk/over,
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+	dir = 4
+	},
+/obj/machinery/light{
+	dir = 1
+	},
+/turf/open/floor/plating,
+/area/ship/engineering)
+"NJ" = (
+/obj/effect/turf_decal/industrial/warning{
+	dir = 1
+	},
+/obj/effect/turf_decal/industrial/warning,
+/turf/open/floor/plasteel/tech/techmaint,
+/area/ship/cargo/office)
+"NQ" = (
+/obj/effect/turf_decal/industrial/warning{
+	dir = 4
+	},
+/turf/open/floor/plasteel/tech/techmaint,
+/area/ship/cargo/office)
+"NR" = (
+/obj/effect/turf_decal/corner/opaque/yellow/half{
+	dir = 1
+	},
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable/yellow{
+	icon_state = "2-6"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/turf/open/floor/plasteel,
+/area/ship/cargo)
+"NS" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable/yellow{
+	icon_state = "2-8"
+	},
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+	dir = 1
+	},
+/turf/open/floor/plasteel,
+/area/ship/crew/canteen)
+"NX" = (
+/obj/structure/chair{
+	dir = 1
+	},
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/cable/yellow{
+	icon_state = "2-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 10
+	},
+/turf/open/floor/plasteel,
+/area/ship/crew/canteen)
+"Of" = (
+/turf/open/floor/plasteel/patterned,
+/area/ship/cargo)
+"Os" = (
+/obj/structure/chair/comfy/black{
+	dir = 8
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
+/turf/open/floor/wood{
+	icon_state = "wood-broken4"
+	},
+/area/ship/bridge)
+"Ow" = (
+/obj/structure/railing{
+	dir = 8;
+	layer = 4.1
+	},
+/obj/effect/turf_decal/techfloor,
+/obj/effect/turf_decal/borderfloorblack{
+	dir = 8
+	},
+/obj/effect/turf_decal/spline/fancy/opaque/black{
+	dir = 8
+	},
+/obj/effect/turf_decal/steeldecal/steel_decals4{
+	dir = 4
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/bridge)
+"Oy" = (
+/obj/machinery/suit_storage_unit/independent/pilot,
+/obj/effect/turf_decal/industrial/outline/yellow,
+/obj/machinery/power/apc/auto_name/north,
+/obj/structure/cable/yellow{
+	icon_state = "0-8"
+	},
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/cargo/office)
+"OD" = (
+/obj/effect/turf_decal/industrial/hatch/yellow,
+/obj/structure/reagent_dispensers/fueltank,
+/turf/open/floor/plasteel/patterned/cargo_one,
+/area/ship/cargo)
+"OJ" = (
+/obj/machinery/cryopod{
+	dir = 1
+	},
+/obj/machinery/computer/cryopod{
+	pixel_x = -23;
+	dir = 4
+	},
+/obj/effect/turf_decal/industrial/warning{
+	dir = 5
+	},
+/obj/effect/decal/cleanable/greenglow,
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/crew/dorm)
+"ON" = (
+/obj/item/radio/intercom{
+	dir = 1;
+	pixel_x = -5;
+	pixel_y = -22
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 9
+	},
+/obj/machinery/door/firedoor,
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/bridge)
+"OO" = (
+/obj/machinery/requests_console{
+	pixel_y = -33
+	},
+/obj/effect/turf_decal/steeldecal/steel_decals2,
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/bridge)
+"Pi" = (
+/obj/structure/railing/corner{
+	dir = 4
+	},
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 4
+	},
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+	dir = 8
+	},
+/obj/machinery/door/firedoor,
+/turf/open/floor/plasteel/patterned/cargo_one,
+/area/ship/cargo)
+"Pm" = (
+/obj/effect/turf_decal/industrial/hatch/yellow,
+/obj/effect/turf_decal/industrial/warning{
+	dir = 8
+	},
+/turf/open/floor/plasteel/patterned,
+/area/ship/cargo)
+"Pv" = (
+/obj/structure/railing/corner,
+/obj/structure/cable{
+	icon_state = "2-8"
+	},
+/obj/structure/cable{
+	icon_state = "1-8"
+	},
+/obj/effect/turf_decal/steeldecal/steel_decals10{
+	dir = 5
+	},
+/obj/effect/turf_decal/steeldecal/steel_decals10{
+	dir = 6
+	},
+/obj/effect/turf_decal/industrial/loading{
+	dir = 8
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/engineering)
+"PE" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 6
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 6
+	},
+/obj/machinery/light{
+	dir = 8
+	},
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel,
+/area/ship/crew/canteen)
+"PN" = (
+/obj/effect/turf_decal/siding/thinplating/dark/corner{
+	dir = 8
+	},
+/obj/machinery/light/small{
+	dir = 1
+	},
+/obj/effect/turf_decal/techfloor{
+	dir = 5
+	},
+/turf/open/floor/plasteel/tech{
+	initial_gas_mix = "TEMP=2.7"
+	},
+/area/ship/cargo/office)
+"PP" = (
+/obj/structure/table/wood/reinforced,
+/obj/effect/turf_decal/siding/wood{
+	dir = 1
+	},
+/obj/item/modular_computer/laptop/preset/civilian{
+	pixel_x = -1;
+	pixel_y = 3
+	},
+/obj/item/newspaper{
+	pixel_x = 6;
+	pixel_y = 10
+	},
+/turf/open/floor/wood,
+/area/ship/bridge)
+"PR" = (
+/obj/structure/chair/comfy/shuttle{
+	dir = 1;
+	name = "tactical chair"
+	},
+/obj/structure/railing{
+	dir = 8;
+	layer = 4.1
+	},
+/obj/machinery/light/dim,
+/turf/open/floor/plasteel/tech,
+/area/ship/cargo/office)
+"PW" = (
+/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
+/obj/machinery/door/poddoor/shutters/preopen{
+	id = "cargopirate_windows";
+	name = "Blast Shutters"
+	},
+/turf/open/floor/plating,
+/area/ship/crew/canteen)
+"Qg" = (
+/obj/effect/turf_decal/industrial/warning{
+	dir = 4;
+	color = "#808080"
+	},
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/cable/yellow{
+	icon_state = "1-9"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 9
+	},
+/turf/open/floor/mineral/plastitanium,
+/area/ship/security)
+"Qn" = (
+/obj/effect/turf_decal/industrial/hatch/yellow,
+/obj/effect/turf_decal/industrial/warning{
+	dir = 4
+	},
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/fermenting_barrel,
+/turf/open/floor/plasteel/patterned,
+/area/ship/cargo)
+"Qw" = (
+/obj/structure/toilet{
+	dir = 4;
+	pixel_x = -1;
+	pixel_y = 5
+	},
+/obj/structure/sink{
+	pixel_y = 22;
+	pixel_x = 6
+	},
+/obj/structure/mirror{
+	pixel_y = 32
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/decal/cleanable/cobweb,
+/turf/open/floor/plasteel/showroomfloor,
+/area/ship/crew/canteen)
+"QC" = (
+/obj/item/flashlight/lamp{
+	pixel_x = -6;
+	pixel_y = 8
+	},
+/obj/item/paper_bin{
+	pixel_x = 5;
+	pixel_y = 1
+	},
+/obj/item/pen/fountain{
+	pixel_x = 4;
+	pixel_y = 2
+	},
+/obj/structure/table/wood/reinforced,
+/obj/item/pen{
+	pixel_y = 4;
+	pixel_x = 8
+	},
+/turf/open/floor/carpet/nanoweave/beige,
+/area/ship/crew/dorm)
+"QH" = (
+/obj/structure/toilet{
+	dir = 4;
+	pixel_x = -1;
+	pixel_y = 5
+	},
+/obj/structure/sink{
+	pixel_y = 23;
+	pixel_x = 9
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plating/foam,
+/area/ship/security)
+"QP" = (
+/obj/effect/decal/cleanable/cobweb,
+/obj/structure/table,
+/obj/machinery/microwave{
+	pixel_y = 5
+	},
+/obj/item/kitchen/knife{
+	pixel_x = -6
+	},
+/obj/item/kitchen/rollingpin,
+/obj/structure/sign/poster/contraband/random{
+	pixel_x = -32
+	},
+/obj/item/radio/intercom{
+	pixel_y = 23
+	},
+/turf/open/floor/plasteel,
+/area/ship/crew/canteen)
+"QR" = (
+/obj/effect/turf_decal/techfloor/orange{
+	dir = 1
+	},
+/obj/structure/railing{
+	dir = 1;
+	layer = 4.1
+	},
+/obj/machinery/power/terminal{
+	dir = 8
+	},
+/obj/structure/cable/yellow{
+	icon_state = "0-4"
+	},
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/engineering)
+"QX" = (
+/obj/effect/turf_decal/industrial/outline/yellow,
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/closet/crate/critter,
+/obj/item/paicard{
+	pixel_x = -5
+	},
+/obj/item/stack/sheet/animalhide/monkey,
+/obj/item/reagent_containers/food/snacks/monkeycube,
+/obj/item/reagent_containers/food/snacks/monkeycube{
+	pixel_y = -1;
+	pixel_x = 6
+	},
+/obj/item/reagent_containers/food/snacks/monkeycube{
+	pixel_y = 5;
+	pixel_x = 3
+	},
+/turf/open/floor/plating/rust,
+/area/ship/cargo)
+"QZ" = (
+/obj/effect/turf_decal/industrial/warning{
+	dir = 1;
+	color = "#808080"
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/light/small{
+	dir = 8
+	},
+/turf/open/floor/plasteel/dark,
+/area/ship/security)
+"Rf" = (
+/obj/structure/railing{
+	dir = 1;
+	layer = 4.1
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/turf/open/floor/plasteel/stairs{
+	dir = 4
+	},
+/area/ship/cargo)
+"Ro" = (
+/obj/machinery/computer/helm{
+	dir = 8
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/cargo/office)
+"RG" = (
+/obj/item/gun/ballistic/shotgun/winchester{
+	pixel_x = -4;
+	pixel_y = -4
+	},
+/obj/item/gun/ballistic/shotgun/winchester{
+	pixel_x = -4
+	},
+/obj/item/gun/ballistic/shotgun/doublebarrel{
+	pixel_y = 4
+	},
+/obj/effect/turf_decal/spline/fancy/opaque/black{
+	dir = 10
+	},
+/obj/item/gun/ballistic/derringer,
+/obj/structure/guncase,
+/obj/item/radio/intercom{
+	dir = 1;
+	pixel_x = -5;
+	pixel_y = -22
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/security)
+"RH" = (
+/obj/machinery/power/smes/shuttle/precharged{
+	dir = 4
+	},
+/obj/structure/window/plasma/reinforced/spawner/west,
+/obj/structure/cable{
+	icon_state = "0-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 4
+	},
+/obj/machinery/door/poddoor{
+	id = "cargopirate_thrusters";
+	name = "thruster blast door"
+	},
+/obj/machinery/door/window/eastright{
+	name = "Engine Access"
+	},
+/turf/open/floor/plating,
+/area/ship/engineering)
+"RI" = (
+/obj/effect/turf_decal/siding/thinplating/dark{
+	dir = 1
+	},
+/obj/machinery/light/dim,
+/obj/effect/turf_decal/techfloor,
+/turf/open/floor/plasteel/tech{
+	initial_gas_mix = "TEMP=2.7"
+	},
+/area/ship/cargo/office)
+"RN" = (
+/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
+/obj/structure/curtain/bounty,
+/turf/open/floor/plating,
+/area/ship/crew/canteen)
+"RX" = (
+/turf/closed/wall/mineral/plastitanium/nodiagonal,
+/area/ship/security)
+"RZ" = (
+/obj/effect/turf_decal/number/eight,
+/turf/closed/wall/mineral/plastitanium/nodiagonal,
+/area/ship/cargo/office)
+"Sc" = (
+/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
+/obj/machinery/door/poddoor/shutters/preopen{
+	id = "cargopirate_windows";
+	name = "Blast Shutters"
+	},
+/turf/open/floor/plating,
+/area/ship/engineering)
+"Sk" = (
+/obj/effect/turf_decal/techfloor{
+	dir = 5
+	},
+/obj/machinery/photocopier/faxmachine/longrange{
+	department = "Internal Affairs"
+	},
+/obj/structure/table/reinforced{
+	color = "#c1b6a5"
+	},
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel/tech,
+/area/ship/bridge)
+"Ss" = (
+/obj/effect/turf_decal/techfloor/corner,
+/obj/structure/rack,
+/obj/structure/window/reinforced,
+/obj/effect/turf_decal/industrial/hatch/yellow,
+/obj/item/mmi,
+/obj/item/storage/toolbox/electrical{
+	pixel_x = -1;
+	pixel_y = -4
+	},
+/obj/item/clothing/glasses/welding{
+	pixel_y = -5;
+	pixel_x = 6
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/science/robotics)
+"SD" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/cable/yellow{
+	icon_state = "1-9"
+	},
+/obj/structure/cable/yellow{
+	icon_state = "2-4"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+	dir = 8
+	},
+/turf/open/floor/plating{
+	icon_state = "platingdmg3"
+	},
+/area/ship/crew/canteen)
+"SH" = (
+/obj/machinery/jukebox,
+/obj/effect/turf_decal/siding/wood/end,
+/turf/open/floor/wood,
+/area/ship/crew/dorm)
+"SJ" = (
+/obj/machinery/light,
+/obj/machinery/firealarm{
+	dir = 1;
+	pixel_y = -23;
+	pixel_x = 10
+	},
+/turf/open/floor/plasteel/stairs{
+	icon = 'icons/obj/stairs.dmi';
+	dir = 8
+	},
+/area/ship/bridge)
+"Tb" = (
+/obj/structure/table,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/decal/cleanable/blood/old,
+/obj/item/storage/box/mousetraps{
+	pixel_x = 4;
+	pixel_y = 4
+	},
+/obj/item/toy/figure/janitor{
+	pixel_x = -8;
+	pixel_y = 6
+	},
+/obj/item/restraints/legcuffs/beartrap{
+	pixel_y = 8
+	},
+/obj/item/restraints/legcuffs/beartrap{
+	pixel_y = 8
+	},
+/obj/item/reagent_containers/food/drinks/bottle/pineapplejuice{
+	pixel_x = -7;
+	pixel_y = 1
+	},
+/obj/item/grenade/chem_grenade/cleaner{
+	pixel_x = 10;
+	pixel_y = 6
+	},
+/turf/open/floor/plasteel,
+/area/ship/crew/canteen)
+"Tl" = (
+/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
+/obj/machinery/door/poddoor/shutters/preopen{
+	id = "cargopirate_windows";
+	name = "Blast Shutters"
+	},
+/turf/open/floor/plating,
+/area/ship/crew/dorm)
+"Tn" = (
+/obj/structure/railing{
+	dir = 4;
+	layer = 3.1
+	},
+/obj/structure/reagent_dispensers/water_cooler,
+/turf/open/floor/plasteel,
+/area/ship/crew/canteen)
+"Tx" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable/yellow{
+	icon_state = "5-9"
+	},
+/obj/machinery/airalarm/directional/south,
+/turf/open/floor/plating/foam,
+/area/ship/cargo)
+"TC" = (
+/turf/open/floor/pod,
+/area/ship/cargo/office)
+"TF" = (
+/obj/structure/chair,
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/sign/poster/contraband/random{
+	pixel_y = 32
+	},
+/obj/item/radio/intercom{
+	dir = 8;
+	pixel_x = 22
+	},
+/turf/open/floor/plasteel,
+/area/ship/crew/canteen)
+"TK" = (
+/obj/structure/railing{
+	dir = 1;
+	layer = 4.1
+	},
+/obj/effect/turf_decal/spline/fancy/opaque/black{
+	dir = 1
+	},
+/turf/open/floor/plasteel/stairs{
+	icon = 'icons/obj/stairs.dmi';
+	dir = 8
+	},
+/area/ship/bridge)
+"TQ" = (
+/obj/structure/window/reinforced/survival_pod/spawner/west,
+/obj/structure/table/reinforced,
+/obj/item/storage/firstaid{
+	pixel_y = -3;
+	pixel_x = -3
+	},
+/obj/item/reagent_containers/glass/bottle/charcoal{
+	pixel_x = -4;
+	pixel_y = 12
+	},
+/obj/item/reagent_containers/glass/bottle/epinephrine{
+	pixel_y = 8;
+	pixel_x = 2
+	},
+/obj/item/reagent_containers/syringe,
+/turf/open/floor/plasteel/tech/techmaint,
+/area/ship/cargo/office)
+"TV" = (
+/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
+/obj/machinery/door/poddoor/shutters/preopen{
+	id = "cargopirate_windows";
+	name = "Blast Shutters"
+	},
+/turf/open/floor/plating,
+/area/ship/science/robotics)
+"Ud" = (
+/obj/machinery/light,
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 5
+	},
+/turf/open/floor/plating{
+	icon_state = "platingdmg3"
+	},
+/area/ship/cargo)
+"Ur" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/light,
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/turf/open/floor/plasteel/patterned/cargo_one,
+/area/ship/cargo)
+"UE" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 6
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 8
+	},
+/turf/open/floor/plasteel/patterned/cargo_one,
+/area/ship/cargo)
+"UL" = (
+/obj/effect/turf_decal/industrial/hatch/yellow,
+/obj/effect/turf_decal/industrial/warning{
+	dir = 4
+	},
+/obj/structure/reagent_dispensers/beerkeg,
+/obj/item/radio/intercom{
+	dir = 8;
+	pixel_x = 22
+	},
+/turf/open/floor/plasteel/patterned,
+/area/ship/cargo)
+"Ve" = (
+/turf/closed/wall/mineral/plastitanium/nodiagonal,
+/area/ship/cargo/office)
+"Vh" = (
+/obj/effect/turf_decal/siding/wood{
+	dir = 9
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/light/small{
+	dir = 8
+	},
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/turf/open/floor/wood{
+	icon_state = "wood-broken6"
+	},
+/area/ship/crew/dorm)
+"Vi" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable/yellow{
+	icon_state = "2-8"
+	},
+/obj/structure/cable/yellow{
+	icon_state = "1-5"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 4
+	},
+/turf/open/floor/plasteel,
+/area/ship/crew/canteen)
+"Vm" = (
+/obj/structure/railing{
+	dir = 2;
+	layer = 4.1
+	},
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/turf/open/floor/plasteel/stairs{
+	dir = 8
+	},
+/area/ship/cargo)
+"Vn" = (
+/obj/effect/turf_decal/techfloor{
+	dir = 6
+	},
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/turf/open/floor/plasteel/telecomms_floor,
+/area/ship/science/robotics)
+"Vt" = (
+/obj/machinery/door/airlock/hatch,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/door/firedoor,
+/turf/open/floor/plasteel/showroomfloor,
+/area/ship/crew/dorm)
+"VF" = (
+/obj/effect/turf_decal/industrial/hatch/yellow,
+/obj/structure/rack,
+/obj/item/storage/bag/ore,
+/obj/item/storage/bag/ore,
+/obj/item/pickaxe/rusted,
+/obj/item/pickaxe/rusted,
+/obj/item/pickaxe/drill,
+/obj/item/gps/mining,
+/obj/item/gps/mining,
+/turf/open/floor/plasteel/patterned/cargo_one,
+/area/ship/cargo)
+"VX" = (
+/obj/structure/railing/corner{
+	dir = 1
+	},
+/obj/effect/turf_decal/steeldecal/steel_decals10{
+	dir = 9
+	},
+/obj/effect/turf_decal/steeldecal/steel_decals10{
+	dir = 10
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/bridge)
+"Wb" = (
+/obj/effect/turf_decal/techfloor,
+/obj/structure/chair/office{
+	dir = 4;
+	name = "tactical swivel chair"
+	},
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/bridge)
+"We" = (
+/obj/structure/chair,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/light{
+	dir = 1
+	},
+/turf/open/floor/plating{
+	icon_state = "panelscorched"
+	},
+/area/ship/crew/canteen)
+"Wh" = (
+/obj/structure/sign/departments/cargo{
+	pixel_y = 32
+	},
+/turf/open/floor/plating/rust,
+/area/ship/cargo)
+"Wk" = (
+/obj/machinery/door/airlock/highsecurity,
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/door/firedoor,
+/turf/open/floor/wood,
+/area/ship/bridge)
+"Wy" = (
+/obj/effect/turf_decal/techfloor{
+	dir = 8
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/turf/open/floor/plasteel/telecomms_floor,
+/area/ship/science/robotics)
+"WK" = (
+/obj/effect/turf_decal/siding/thinplating/dark/corner,
+/obj/effect/turf_decal/techfloor{
+	dir = 8
+	},
+/turf/open/floor/plasteel/tech{
+	initial_gas_mix = "TEMP=2.7"
+	},
+/area/ship/cargo/office)
+"WQ" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/high_volume/siphon/atmos/air_output{
+	piping_layer = 2;
+	dir = 8
+	},
+/turf/open/floor/engine/air,
+/area/ship/engineering)
+"WT" = (
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/obj/structure/cable/yellow{
+	icon_state = "5-9"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 9
+	},
+/turf/open/floor/plasteel/patterned/cargo_one,
+/area/ship/cargo)
+"WX" = (
+/obj/structure/cable/yellow{
+	icon_state = "1-8"
+	},
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 5
+	},
+/obj/structure/catwalk/over,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+	dir = 4
+	},
+/turf/open/floor/plating,
+/area/ship/engineering)
+"WY" = (
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden,
+/obj/machinery/door/firedoor,
+/turf/open/floor/plasteel/stairs{
+	dir = 1
+	},
+/area/ship/engineering)
+"Xb" = (
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+	dir = 10
+	},
+/turf/open/floor/pod,
+/area/ship/cargo/office)
+"Xc" = (
+/obj/effect/turf_decal/industrial/warning,
+/obj/machinery/atmospherics/pipe/manifold/orange/hidden{
+	dir = 4
+	},
+/turf/open/floor/pod/light,
+/area/ship/cargo/office)
+"Xe" = (
+/obj/effect/turf_decal/industrial/warning/corner,
+/obj/machinery/atmospherics/components/unary/tank/toxins,
+/turf/open/floor/pod,
+/area/ship/cargo/office)
+"Xp" = (
+/turf/closed/wall/mineral/plastitanium,
+/area/ship/crew/dorm)
+"Xs" = (
+/obj/effect/turf_decal/industrial/outline/yellow,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/closet/crate{
+	name = "spare softsuits"
+	},
+/obj/item/clothing/suit/space/nasavoid/old,
+/obj/item/clothing/suit/space/nasavoid/old,
+/obj/item/clothing/head/helmet/space/nasavoid/old,
+/obj/item/clothing/head/helmet/space/nasavoid/old,
+/obj/item/clothing/mask/gas,
+/obj/item/clothing/mask/gas,
+/turf/open/floor/plasteel/patterned/cargo_one,
+/area/ship/cargo)
+"Xx" = (
+/obj/structure/railing{
+	dir = 2;
+	layer = 4.1
+	},
+/obj/structure/noticeboard{
+	dir = 8;
+	pixel_x = 31
+	},
+/obj/machinery/mineral/ore_redemption{
+	dir = 8
+	},
+/turf/open/floor/plasteel,
+/area/ship/cargo)
+"Xz" = (
+/obj/structure/railing{
+	dir = 8;
+	layer = 4.1
+	},
+/obj/effect/turf_decal/borderfloorblack{
+	dir = 8
+	},
+/obj/effect/turf_decal/spline/fancy/opaque/black{
+	dir = 8
+	},
+/obj/structure/chair/office{
+	dir = 4;
+	name = "tactical swivel chair"
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/plasteel/tech,
+/area/ship/bridge)
+"XD" = (
+/obj/structure/bed,
+/obj/item/bedsheet/dorms,
+/obj/structure/curtain/cloth/grey,
+/obj/effect/turf_decal/siding/wood{
+	dir = 10
+	},
+/turf/open/floor/wood,
+/area/ship/crew/dorm)
+"XG" = (
+/turf/template_noop,
+/area/template_noop)
+"XS" = (
+/obj/effect/turf_decal/siding/wood/corner,
+/obj/effect/turf_decal/siding/wood{
+	dir = 1
+	},
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/cable/yellow{
+	icon_state = "1-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 4
+	},
+/turf/open/floor/wood,
+/area/ship/crew/dorm)
+"XT" = (
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+	dir = 1
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+	dir = 1
+	},
+/obj/structure/catwalk/over,
+/obj/machinery/door/airlock/external/glass,
+/obj/structure/barricade/wooden/crude,
+/turf/open/floor/plating,
+/area/ship/cargo)
+"XV" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/decal/cleanable/oil,
+/turf/open/floor/plasteel,
+/area/ship/crew/canteen)
+"XW" = (
+/obj/structure/closet/crate/bin,
+/obj/item/trash/pistachios{
+	pixel_x = 6
+	},
+/obj/item/trash/can/food/beans{
+	pixel_x = 4;
+	pixel_y = -1
+	},
+/obj/item/trash/pistachios{
+	pixel_x = 6
+	},
+/obj/item/trash/chips,
+/obj/structure/extinguisher_cabinet{
+	pixel_x = 26
+	},
+/obj/machinery/status_display/shuttle{
+	pixel_y = -32
+	},
+/turf/open/floor/plasteel,
+/area/ship/crew/canteen)
+"XY" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/sign/poster/contraband/random{
+	pixel_y = -32
+	},
+/obj/item/kirbyplants{
+	icon_state = "plant-25"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/turf/open/floor/plating{
+	icon_state = "platingdmg1"
+	},
+/area/ship/crew/canteen)
+"Yb" = (
+/obj/machinery/computer/mech_bay_power_console{
+	dir = 1
+	},
+/obj/effect/turf_decal/techfloor{
+	dir = 6
+	},
+/turf/open/floor/plasteel/telecomms_floor,
+/area/ship/cargo/office)
+"Yh" = (
+/obj/machinery/door/airlock/hatch,
+/turf/open/floor/plasteel/tech/techmaint,
+/area/ship/cargo/office)
+"Yj" = (
+/obj/effect/turf_decal/industrial/warning{
+	dir = 8;
+	color = "#808080"
+	},
+/obj/structure/railing{
+	dir = 9;
+	layer = 3.1
+	},
+/obj/machinery/holopad/emergency,
+/turf/open/floor/plasteel/patterned/grid,
+/area/ship/cargo/office)
+"Yw" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/door/poddoor/shutters{
+	id = "cargopirate_sub_hatch";
+	name = "Blast Shutters"
+	},
+/turf/open/floor/plasteel/patterned/ridged,
+/area/ship/cargo/office)
+"YV" = (
+/obj/effect/turf_decal/siding/thinplating/dark/corner{
+	dir = 1
+	},
+/obj/effect/turf_decal/techfloor{
+	dir = 6
+	},
+/turf/open/floor/plasteel/tech{
+	initial_gas_mix = "TEMP=2.7"
+	},
+/area/ship/cargo/office)
+"YZ" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/turf/open/floor/plasteel,
+/area/ship/cargo)
+"Zc" = (
+/obj/effect/turf_decal/industrial/traffic{
+	dir = 4
+	},
+/obj/machinery/door/firedoor/border_only,
+/obj/machinery/door/firedoor/border_only{
+	dir = 1
+	},
+/obj/machinery/door/poddoor/shutters{
+	id = "cargopirate_podbay";
+	name = "Pod Bay Shutters"
+	},
+/turf/open/floor/plasteel/patterned/ridged,
+/area/ship/cargo/office)
+"Zg" = (
+/obj/machinery/door/poddoor/shutters/preopen{
+	id = "cargopirate_bridge";
+	name = "Blast Shutters"
+	},
+/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
+/turf/open/floor/plating,
+/area/ship/bridge)
+"Zh" = (
+/obj/effect/turf_decal/industrial/hatch/yellow,
+/obj/effect/turf_decal/industrial/warning{
+	dir = 8
+	},
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 4
+	},
+/turf/open/floor/plasteel/patterned,
+/area/ship/cargo)
+"Zj" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 5
+	},
+/turf/open/floor/plasteel/patterned/cargo_one,
+/area/ship/cargo)
+"ZL" = (
+/obj/effect/turf_decal/siding/wood{
+	dir = 10
+	},
+/obj/structure/filingcabinet/chestdrawer,
+/obj/structure/sign/poster/official/random{
+	pixel_y = -32
+	},
+/turf/open/floor/wood,
+/area/ship/bridge)
+"ZP" = (
+/obj/machinery/computer/monitor{
+	dir = 8
+	},
+/obj/effect/turf_decal/techfloor/orange{
+	dir = 5
+	},
+/obj/structure/railing{
+	dir = 5;
+	layer = 4.1
+	},
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/engineering)
+
+(1,1,1) = {"
+XG
+XG
+XG
+XG
+XG
+rS
+CH
+Sc
+Sc
+CH
+rS
+XG
+XG
+XG
+XG
+XG
+XG
+"}
+(2,1,1) = {"
+XG
+XG
+XG
+XG
+ox
+CH
+Lm
+uo
+nE
+lx
+CH
+XG
+XG
+XG
+XG
+XG
+XG
+"}
+(3,1,1) = {"
+XG
+XG
+CH
+rk
+AM
+CH
+zO
+do
+Pv
+sy
+CH
+Gc
+rk
+CH
+XG
+XG
+XG
+"}
+(4,1,1) = {"
+XG
+XG
+CH
+lj
+RH
+CH
+oK
+GJ
+KK
+CH
+CH
+ez
+lj
+CH
+XG
+XG
+XG
+"}
+(5,1,1) = {"
+XG
+rS
+CH
+fC
+zk
+Cg
+dI
+hV
+hV
+WY
+ba
+QR
+mb
+CH
+rS
+XG
+XG
+"}
+(6,1,1) = {"
+XG
+CH
+CH
+bo
+Nn
+de
+sU
+pM
+kX
+CH
+Lw
+kE
+iL
+xD
+CH
+XG
+XG
+"}
+(7,1,1) = {"
+XG
+CH
+CH
+CH
+CH
+CH
+CH
+CH
+CH
+CH
+NE
+ZP
+EY
+xR
+CH
+XG
+XG
+"}
+(8,1,1) = {"
+XG
+RX
+QH
+QZ
+Lv
+RX
+iO
+sa
+oc
+wm
+WX
+sh
+sX
+Fp
+Sc
+XG
+XG
+"}
+(9,1,1) = {"
+mp
+RX
+iZ
+ur
+LX
+RX
+UE
+WT
+CH
+uK
+IQ
+hR
+zo
+zH
+CH
+XG
+XG
+"}
+(10,1,1) = {"
+RX
+tW
+is
+hu
+hM
+mP
+vv
+Ur
+CH
+Dj
+qN
+CH
+Fd
+Dj
+CH
+XG
+XG
+"}
+(11,1,1) = {"
+RX
+ti
+dc
+Qg
+bE
+RX
+hj
+Aa
+CH
+mf
+vZ
+CH
+WQ
+Nq
+CH
+XG
+XG
+"}
+(12,1,1) = {"
+mp
+RX
+Nk
+Lq
+RG
+RX
+fZ
+BY
+CH
+mf
+lq
+CH
+Nq
+gT
+CH
+XG
+XG
+"}
+(13,1,1) = {"
+XG
+mp
+RX
+RX
+RX
+RX
+IR
+Zj
+CH
+CH
+CH
+CH
+CH
+CH
+CH
+rS
+XG
+"}
+(14,1,1) = {"
+XG
+XG
+GO
+Kd
+HC
+XT
+eW
+JN
+Ve
+DL
+WK
+fB
+oC
+fB
+ft
+Ve
+If
+"}
+(15,1,1) = {"
+XG
+XG
+BI
+BI
+BI
+BI
+Pi
+CF
+Ve
+mU
+nN
+lD
+Ve
+lD
+bh
+ft
+Ve
+"}
+(16,1,1) = {"
+XG
+XG
+BI
+yi
+pU
+Ss
+Cx
+nn
+Ve
+wD
+Ve
+rf
+Xe
+of
+Ve
+dR
+Ve
+"}
+(17,1,1) = {"
+XG
+XG
+TV
+BX
+Ct
+sC
+Rf
+wN
+Ve
+Fm
+Ve
+qS
+Jp
+gj
+Ve
+RI
+Ve
+"}
+(18,1,1) = {"
+XG
+XG
+BI
+Ed
+Wy
+BV
+Go
+yO
+hU
+lf
+Be
+Xb
+Xc
+bg
+Ve
+dR
+RZ
+"}
+(19,1,1) = {"
+XG
+XG
+BI
+hA
+ec
+Ih
+vs
+YZ
+JU
+tr
+Yw
+vt
+Ce
+NB
+Ve
+dR
+kw
+"}
+(20,1,1) = {"
+XG
+XG
+BI
+yq
+bv
+Vn
+Iq
+hP
+Zc
+bt
+hN
+TC
+px
+Yb
+Ve
+rh
+kw
+"}
+(21,1,1) = {"
+XG
+XG
+BI
+BI
+BI
+BI
+DT
+jU
+Ve
+gJ
+Ve
+Nw
+nB
+TQ
+Ve
+RI
+RZ
+"}
+(22,1,1) = {"
+XG
+XG
+Ll
+gp
+Xs
+Iu
+NR
+or
+Ve
+nh
+Yh
+NQ
+KW
+LO
+Ve
+dR
+IF
+"}
+(23,1,1) = {"
+XG
+XG
+Ll
+fT
+gA
+zl
+NR
+Je
+Ve
+oJ
+Ve
+qy
+NJ
+PR
+Ve
+rh
+Ve
+"}
+(24,1,1) = {"
+XG
+XG
+vT
+IK
+IK
+dP
+bb
+sH
+Ve
+je
+kv
+Ro
+NJ
+CO
+Ve
+dR
+Ve
+"}
+(25,1,1) = {"
+XG
+XG
+vT
+xJ
+Mk
+VF
+mL
+Tx
+Ve
+oJ
+kv
+kv
+kv
+Ve
+Ve
+tK
+Ve
+"}
+(26,1,1) = {"
+XG
+XG
+Ll
+pc
+gP
+zl
+cQ
+Mp
+Ve
+PN
+hp
+zL
+zL
+zL
+zL
+YV
+Ve
+"}
+(27,1,1) = {"
+XG
+XG
+Ll
+wj
+dP
+dP
+KU
+yk
+Ve
+hr
+zY
+Yj
+CK
+Ve
+Ve
+Ve
+If
+"}
+(28,1,1) = {"
+XG
+XG
+Ll
+Wh
+QX
+nj
+hk
+Bh
+nv
+Ds
+iB
+gS
+py
+Ve
+XG
+XG
+XG
+"}
+(29,1,1) = {"
+XG
+XG
+Ll
+tx
+iI
+OD
+dE
+eK
+Ve
+Oy
+im
+bO
+EW
+KT
+XG
+XG
+XG
+"}
+(30,1,1) = {"
+XG
+tC
+Ll
+af
+BG
+zf
+rm
+xY
+ka
+ka
+ka
+ka
+ka
+ka
+ka
+XG
+XG
+"}
+(31,1,1) = {"
+XG
+KN
+Ea
+Pm
+Zh
+br
+xk
+Ud
+ka
+QP
+PE
+ov
+aQ
+Fw
+df
+XG
+XG
+"}
+(32,1,1) = {"
+XG
+Nx
+kf
+Of
+EI
+wn
+aT
+vH
+RN
+ga
+qT
+ka
+mB
+rT
+ka
+XG
+XG
+"}
+(33,1,1) = {"
+XG
+rt
+uW
+Qn
+MI
+UL
+Xx
+Vm
+ka
+qD
+Jh
+ka
+ka
+ka
+ka
+XG
+XG
+"}
+(34,1,1) = {"
+XG
+ar
+lm
+lm
+lm
+ar
+JW
+wB
+ka
+DH
+dF
+ka
+Tb
+hI
+ka
+XG
+XG
+"}
+(35,1,1) = {"
+XG
+ar
+wY
+pZ
+ZL
+ar
+dU
+ge
+ty
+mm
+gB
+jd
+XV
+Gw
+ka
+XG
+XG
+"}
+(36,1,1) = {"
+XG
+lm
+PP
+Os
+aL
+ar
+Tn
+NS
+SD
+GV
+rX
+ka
+ka
+ka
+ka
+XG
+XG
+"}
+(37,1,1) = {"
+XG
+ar
+ub
+sz
+Fj
+Wk
+gt
+La
+Vi
+er
+CD
+ka
+Qw
+dy
+ka
+XG
+XG
+"}
+(38,1,1) = {"
+DY
+ar
+ar
+be
+ON
+ar
+zA
+gW
+Ic
+XY
+oy
+oy
+Vt
+oy
+oy
+Xp
+XG
+"}
+(39,1,1) = {"
+ar
+jk
+Wb
+cE
+sV
+ar
+We
+ps
+NX
+fU
+cR
+Vh
+nM
+zc
+OJ
+oy
+XG
+"}
+(40,1,1) = {"
+ar
+IS
+qE
+TK
+xx
+ar
+TF
+cn
+DD
+XW
+oy
+qr
+Bn
+fY
+SH
+Tl
+XG
+"}
+(41,1,1) = {"
+Zg
+Ao
+Ow
+VX
+OO
+ar
+ka
+PW
+PW
+ka
+oy
+oy
+oy
+Jo
+oy
+oy
+XG
+"}
+(42,1,1) = {"
+Zg
+Sk
+vI
+TK
+SJ
+ar
+XG
+XG
+XG
+XG
+oy
+QC
+cG
+Jc
+XD
+aK
+XG
+"}
+(43,1,1) = {"
+Zg
+wV
+Xz
+uS
+ry
+Zg
+XG
+XG
+XG
+XG
+oy
+jM
+uA
+XS
+Ir
+aK
+XG
+"}
+(44,1,1) = {"
+Zg
+Zg
+JD
+Im
+Zg
+Zg
+XG
+XG
+XG
+XG
+Xp
+oy
+ko
+Hk
+oy
+Xp
+XG
+"}
+(45,1,1) = {"
+XG
+Zg
+Zg
+Zg
+Zg
+XG
+XG
+XG
+XG
+XG
+XG
+oy
+oy
+oy
+oy
+XG
+XG
+"}

From 2e07afe653dd5b980a05fbc6609d54d98ea8a713 Mon Sep 17 00:00:00 2001
From: spockye <79304582+spockye@users.noreply.github.com>
Date: Thu, 3 Nov 2022 18:06:33 +0100
Subject: [PATCH 02/19] adds the rest of the files

---
 _maps/configs/Pirate_mechcarrier.json         |  39 ++
 .../shuttles/shiptest/pirate_mechcarrier.dmm  | 453 +++++-------------
 .../shiptest/pirate_mechcarrier_subship.dmm   | 431 +++++++++++++++++
 .../jobs/job_types/cargo_technician.dm        |  17 +
 code/modules/jobs/job_types/roboticist.dm     |  10 +
 5 files changed, 628 insertions(+), 322 deletions(-)
 create mode 100644 _maps/configs/Pirate_mechcarrier.json
 create mode 100644 _maps/shuttles/shiptest/pirate_mechcarrier_subship.dmm

diff --git a/_maps/configs/Pirate_mechcarrier.json b/_maps/configs/Pirate_mechcarrier.json
new file mode 100644
index 000000000000..c7e4821fd34b
--- /dev/null
+++ b/_maps/configs/Pirate_mechcarrier.json
@@ -0,0 +1,39 @@
+	{
+		"$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json",
+	"map_name": "Malta-class Freighter",
+	"prefix": "ISV",
+	"namelists": ["BEASTS", "PIRATES", "MERCANTILE"],
+	"map_short_name": "Malta-class",
+	"map_path": "_maps/shuttles/shiptest/pirate_mechcarrier.dmm",
+	"limit": 1,
+	"job_slots": {
+		"Captain":{
+			"outfit": "/datum/outfit/job/captain/pirate",
+			"officer": true,
+			"slots": 1
+		},
+		"Marauder":{
+			"outfit": "/datum/outfit/job/cargo_tech/pilot/pirate",
+			"officer": true,
+			"slots": 1
+		},
+		"Warcasket Pilot":{
+			"outfit": "/datum/outfit/job/cargo_tech/pilot/piratemech",
+			"officer": true,
+			"slots": 1
+		},
+		"Tinkerer":{
+			"outfit": "/datum/outfit/job/roboticist/technician/pirate",
+			"slots": 1
+		},
+		"Motorman":{
+			"outfit": "/datum/outfit/job/engineer/pirate",
+			"slots": 1
+		},
+		"Buccaneer": {
+			"outfit": "/datum/outfit/job/security/pirate",
+			"slots": 2
+		}
+	},
+	"enabled": true
+	}
diff --git a/_maps/shuttles/shiptest/pirate_mechcarrier.dmm b/_maps/shuttles/shiptest/pirate_mechcarrier.dmm
index 53bbd1195ea5..b678784cb2d1 100644
--- a/_maps/shuttles/shiptest/pirate_mechcarrier.dmm
+++ b/_maps/shuttles/shiptest/pirate_mechcarrier.dmm
@@ -9,6 +9,9 @@
 /obj/machinery/status_display/shuttle{
 	pixel_y = 32
 	},
+/obj/structure/cable/yellow{
+	icon_state = "2-8"
+	},
 /turf/open/floor/plasteel/patterned,
 /area/ship/cargo)
 "ar" = (
@@ -118,16 +121,6 @@
 /obj/machinery/door/firedoor,
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/bridge)
-"bg" = (
-/obj/machinery/atmospherics/pipe/simple/orange/hidden{
-	dir = 9
-	},
-/obj/machinery/mech_bay_recharge_port,
-/obj/effect/turf_decal/techfloor{
-	dir = 10
-	},
-/turf/open/floor/plasteel/telecomms_floor,
-/area/ship/cargo/office)
 "bh" = (
 /obj/effect/turf_decal/siding/thinplating/dark{
 	dir = 5
@@ -425,6 +418,9 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 4
 	},
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
 /turf/open/floor/plasteel,
 /area/ship/cargo)
 "dF" = (
@@ -524,6 +520,9 @@
 /obj/structure/cable/yellow{
 	icon_state = "4-8"
 	},
+/obj/structure/cable/yellow{
+	icon_state = "1-4"
+	},
 /turf/open/floor/plating/rust,
 /area/ship/cargo)
 "eW" = (
@@ -657,14 +656,6 @@
 	},
 /turf/open/floor/plasteel,
 /area/ship/crew/canteen)
-"gj" = (
-/obj/effect/turf_decal/industrial/outline/yellow,
-/obj/machinery/atmospherics/pipe/simple/orange/hidden{
-	dir = 8
-	},
-/obj/machinery/light/dim,
-/turf/open/floor/plasteel/patterned/cargo_one,
-/area/ship/cargo/office)
 "gp" = (
 /obj/effect/turf_decal/industrial/outline/yellow,
 /obj/effect/decal/cleanable/dirt,
@@ -878,15 +869,7 @@
 /turf/open/floor/mineral/plastitanium,
 /area/ship/security)
 "hN" = (
-/obj/effect/turf_decal/industrial/traffic{
-	dir = 4
-	},
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/door/poddoor/shutters{
-	id = "cargopirate_sub_hatch";
-	name = "Blast Shutters"
-	},
-/turf/open/floor/plasteel/patterned/ridged,
+/turf/open/floor/engine/hull/interior,
 /area/ship/cargo/office)
 "hP" = (
 /obj/effect/turf_decal/industrial/traffic{
@@ -941,12 +924,17 @@
 	pixel_x = 29;
 	name = "Pilot's Locker"
 	},
-/obj/item/kirbyplants{
-	icon_state = "plant-25"
-	},
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
 	dir = 8
 	},
+/obj/item/clothing/suit/jacket/leather/duster,
+/obj/item/clothing/suit/jacket/miljacket,
+/obj/item/clothing/suit/armor/vest,
+/obj/item/clothing/under/rank/security/officer/military/eng,
+/obj/item/clothing/under/rank/security/officer/camo,
+/obj/item/clothing/mask/bandana/skull,
+/obj/item/clothing/head/bandana,
+/obj/item/clothing/head/beret/black,
 /turf/open/floor/plasteel/patterned/grid,
 /area/ship/cargo/office)
 "is" = (
@@ -980,6 +968,9 @@
 	pixel_x = -3;
 	pixel_y = 5
 	},
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
 /turf/open/floor/plasteel/patterned/cargo_one,
 /area/ship/cargo)
 "iL" = (
@@ -1107,6 +1098,9 @@
 	dir = 1
 	},
 /obj/machinery/door/firedoor/border_only,
+/obj/structure/cable/yellow{
+	icon_state = "2-8"
+	},
 /turf/open/floor/plasteel/patterned/ridged,
 /area/ship/cargo)
 "ko" = (
@@ -1118,10 +1112,6 @@
 	icon_state = "wood-broken4"
 	},
 /area/ship/crew/dorm)
-"kv" = (
-/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
-/turf/open/floor/plating,
-/area/ship/cargo/office)
 "kw" = (
 /obj/effect/turf_decal/number/zero,
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
@@ -1195,12 +1185,6 @@
 	},
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/engineering)
-"lD" = (
-/obj/machinery/power/shuttle/engine/fueled/plasma{
-	dir = 4
-	},
-/turf/open/floor/plating,
-/area/ship/cargo/office)
 "mb" = (
 /obj/structure/closet/wall/orange{
 	dir = 1;
@@ -1333,14 +1317,6 @@
 /obj/machinery/door/firedoor,
 /turf/open/floor/plasteel,
 /area/ship/cargo/office)
-"nB" = (
-/obj/machinery/door/window/survival_pod{
-	dir = 8
-	},
-/turf/open/floor/plasteel/stairs{
-	dir = 4
-	},
-/area/ship/cargo/office)
 "nE" = (
 /obj/structure/railing/corner{
 	dir = 8
@@ -1394,20 +1370,6 @@
 /obj/machinery/door/firedoor,
 /turf/open/floor/plasteel/patterned/cargo_one,
 /area/ship/engineering)
-"of" = (
-/obj/machinery/atmospherics/components/unary/shuttle/heater{
-	dir = 4
-	},
-/obj/structure/window/reinforced{
-	dir = 1;
-	pixel_y = 1
-	},
-/obj/structure/window/reinforced,
-/obj/structure/window/reinforced{
-	dir = 8
-	},
-/turf/open/floor/plating,
-/area/ship/cargo/office)
 "or" = (
 /obj/machinery/vending/wallmed{
 	pixel_y = -28
@@ -1514,10 +1476,6 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plasteel,
 /area/ship/crew/canteen)
-"px" = (
-/obj/effect/turf_decal/industrial/warning,
-/turf/open/floor/pod/dark,
-/area/ship/cargo/office)
 "py" = (
 /obj/effect/turf_decal/industrial/warning{
 	dir = 2;
@@ -1621,21 +1579,6 @@
 /obj/machinery/airalarm/directional/east,
 /turf/open/floor/wood,
 /area/ship/crew/dorm)
-"qy" = (
-/obj/structure/chair/comfy/shuttle{
-	dir = 4
-	},
-/obj/structure/railing{
-	dir = 8;
-	layer = 4.1
-	},
-/obj/machinery/button/door{
-	id = "cargopirate_sub_hatch";
-	name = "Pod Door Control";
-	pixel_y = 22
-	},
-/turf/open/floor/plasteel/tech,
-/area/ship/cargo/office)
 "qD" = (
 /obj/structure/table,
 /obj/effect/decal/cleanable/dirt,
@@ -1675,17 +1618,6 @@
 	},
 /turf/open/floor/plating,
 /area/ship/engineering)
-"qS" = (
-/obj/machinery/atmospherics/pipe/simple/orange/hidden{
-	dir = 8
-	},
-/obj/machinery/button/door{
-	id = "cargopirate_sub_hatch";
-	name = "Pod Door Control";
-	pixel_y = 22
-	},
-/turf/open/floor/pod/light,
-/area/ship/cargo/office)
 "qT" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/item/reagent_containers/food/condiment/rice,
@@ -1729,19 +1661,6 @@
 	},
 /turf/open/floor/plasteel,
 /area/ship/crew/canteen)
-"rf" = (
-/obj/machinery/atmospherics/components/unary/shuttle/heater{
-	dir = 4
-	},
-/obj/structure/window/reinforced,
-/obj/structure/window/reinforced{
-	dir = 1
-	},
-/obj/structure/window/reinforced{
-	dir = 8
-	},
-/turf/open/floor/plating,
-/area/ship/cargo/office)
 "rh" = (
 /obj/effect/turf_decal/siding/thinplating/dark{
 	dir = 1
@@ -1777,6 +1696,9 @@
 	id = "cargopirate_cargo";
 	name = "Cargo Shutters"
 	},
+/obj/structure/cable/yellow{
+	icon_state = "0-2"
+	},
 /turf/open/floor/plating,
 /area/ship/cargo)
 "ry" = (
@@ -1979,6 +1901,9 @@
 /obj/machinery/light{
 	dir = 1
 	},
+/obj/structure/cable/yellow{
+	icon_state = "2-4"
+	},
 /turf/open/floor/plasteel/patterned/cargo_one,
 /area/ship/cargo)
 "ty" = (
@@ -2117,6 +2042,9 @@
 	dir = 1
 	},
 /obj/machinery/door/firedoor/border_only,
+/obj/structure/cable/yellow{
+	icon_state = "1-10"
+	},
 /turf/open/floor/plasteel/patterned/ridged,
 /area/ship/cargo)
 "vs" = (
@@ -2125,9 +2053,6 @@
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
 /turf/open/floor/plasteel,
 /area/ship/cargo)
-"vt" = (
-/turf/open/floor/pod/dark,
-/area/ship/cargo/office)
 "vv" = (
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/structure/cable/yellow{
@@ -2641,16 +2566,6 @@
 	},
 /turf/open/floor/plating/airless,
 /area/ship/external)
-"Be" = (
-/obj/effect/turf_decal/industrial/traffic{
-	dir = 8
-	},
-/obj/machinery/door/poddoor/shutters{
-	id = "cargopirate_sub_hatch";
-	name = "Blast Shutters"
-	},
-/turf/open/floor/plasteel/patterned/ridged,
-/area/ship/cargo/office)
 "Bh" = (
 /obj/structure/cable/yellow{
 	icon_state = "1-4"
@@ -2684,6 +2599,9 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 6
 	},
+/obj/structure/cable/yellow{
+	icon_state = "1-5"
+	},
 /turf/open/floor/plasteel/patterned,
 /area/ship/cargo)
 "BI" = (
@@ -2708,10 +2626,6 @@
 /obj/machinery/airalarm/directional/south,
 /turf/open/floor/plasteel/patterned/cargo_one,
 /area/ship/cargo)
-"Ce" = (
-/obj/effect/turf_decal/industrial/warning,
-/turf/open/floor/pod,
-/area/ship/cargo/office)
 "Cg" = (
 /obj/structure/catwalk/over,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
@@ -2782,16 +2696,6 @@
 	},
 /turf/open/floor/plasteel/patterned/grid,
 /area/ship/cargo/office)
-"CO" = (
-/obj/structure/chair/comfy/shuttle{
-	dir = 1;
-	name = "tactical chair"
-	},
-/obj/effect/turf_decal/steeldecal/steel_decals7{
-	dir = 9
-	},
-/turf/open/floor/plasteel/tech,
-/area/ship/cargo/office)
 "Dj" = (
 /obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
 /turf/open/floor/plating,
@@ -2877,6 +2781,12 @@
 	pixel_y = 22;
 	pixel_x = -23
 	},
+/obj/structure/cable/yellow{
+	icon_state = "1-6"
+	},
+/obj/structure/cable/yellow{
+	icon_state = "2-4"
+	},
 /turf/open/floor/plasteel/patterned/ridged,
 /area/ship/cargo)
 "Ed" = (
@@ -3168,11 +3078,6 @@
 /obj/effect/turf_decal/industrial/hatch/yellow,
 /obj/structure/closet/crate/radiation,
 /obj/item/stack/sheet/mineral/uranium,
-/obj/item/radio/intercom{
-	dir = 4;
-	pixel_x = -22;
-	pixel_y = 1
-	},
 /turf/open/floor/plasteel/patterned/cargo_one,
 /area/ship/cargo)
 "IF" = (
@@ -3271,6 +3176,11 @@
 /obj/structure/cable/yellow{
 	icon_state = "1-9"
 	},
+/obj/item/radio/intercom{
+	dir = 1;
+	pixel_x = -5;
+	pixel_y = -22
+	},
 /turf/open/floor/plating,
 /area/ship/cargo)
 "Jh" = (
@@ -3305,13 +3215,6 @@
 /obj/machinery/door/firedoor,
 /turf/open/floor/wood,
 /area/ship/crew/dorm)
-"Jp" = (
-/obj/effect/turf_decal/industrial/warning,
-/obj/machinery/atmospherics/components/binary/pump{
-	dir = 4
-	},
-/turf/open/floor/pod/dark,
-/area/ship/cargo/office)
 "JD" = (
 /obj/machinery/computer/helm{
 	dir = 8
@@ -3399,6 +3302,9 @@
 	id = "cargopirate_cargo";
 	name = "Cargo Shutters"
 	},
+/obj/structure/cable/yellow{
+	icon_state = "0-2"
+	},
 /turf/open/floor/plating,
 /area/ship/cargo)
 "KT" = (
@@ -3426,13 +3332,6 @@
 	},
 /turf/open/floor/plating/rust,
 /area/ship/cargo)
-"KW" = (
-/obj/effect/turf_decal/industrial/warning/corner{
-	dir = 4
-	},
-/obj/effect/turf_decal/industrial/warning/corner,
-/turf/open/floor/plasteel/tech/techmaint,
-/area/ship/cargo/office)
 "La" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt/dust,
@@ -3512,14 +3411,6 @@
 	},
 /turf/open/floor/plating,
 /area/ship/engineering)
-"LO" = (
-/obj/effect/turf_decal/industrial/warning{
-	dir = 4
-	},
-/obj/structure/bed/roller,
-/obj/machinery/airalarm/directional/south,
-/turf/open/floor/plasteel/tech/techmaint,
-/area/ship/cargo/office)
 "LX" = (
 /obj/structure/window/reinforced{
 	dir = 4
@@ -3614,33 +3505,14 @@
 "Nq" = (
 /turf/open/floor/engine/air,
 /area/ship/engineering)
-"Nw" = (
-/obj/structure/window/reinforced/survival_pod/spawner/west,
-/obj/machinery/power/port_gen/pacman{
-	anchored = 1
-	},
-/turf/open/floor/plasteel/tech/techmaint,
-/area/ship/cargo/office)
 "Nx" = (
 /obj/machinery/door/poddoor/shutters{
 	id = "cargopirate_cargo";
 	name = "Cargo Shutters"
 	},
+/obj/docking_port/mobile,
 /turf/open/floor/plating,
 /area/ship/cargo)
-"NB" = (
-/obj/effect/turf_decal/techfloor/corner,
-/obj/effect/turf_decal/techfloor/corner{
-	dir = 8
-	},
-/obj/effect/turf_decal/steeldecal/steel_decals3{
-	dir = 1
-	},
-/obj/effect/turf_decal/steeldecal/steel_decals3{
-	dir = 10
-	},
-/turf/open/floor/plasteel/tech/grid,
-/area/ship/cargo/office)
 "NE" = (
 /obj/structure/catwalk/over,
 /obj/structure/cable/yellow{
@@ -3657,19 +3529,6 @@
 	},
 /turf/open/floor/plating,
 /area/ship/engineering)
-"NJ" = (
-/obj/effect/turf_decal/industrial/warning{
-	dir = 1
-	},
-/obj/effect/turf_decal/industrial/warning,
-/turf/open/floor/plasteel/tech/techmaint,
-/area/ship/cargo/office)
-"NQ" = (
-/obj/effect/turf_decal/industrial/warning{
-	dir = 4
-	},
-/turf/open/floor/plasteel/tech/techmaint,
-/area/ship/cargo/office)
 "NR" = (
 /obj/effect/turf_decal/corner/opaque/yellow/half{
 	dir = 1
@@ -3714,6 +3573,12 @@
 /turf/open/floor/plasteel,
 /area/ship/crew/canteen)
 "Of" = (
+/obj/structure/cable/yellow{
+	icon_state = "1-5"
+	},
+/obj/structure/cable/yellow{
+	icon_state = "1-9"
+	},
 /turf/open/floor/plasteel/patterned,
 /area/ship/cargo)
 "Os" = (
@@ -3756,6 +3621,9 @@
 "OD" = (
 /obj/effect/turf_decal/industrial/hatch/yellow,
 /obj/structure/reagent_dispensers/fueltank,
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
 /turf/open/floor/plasteel/patterned/cargo_one,
 /area/ship/cargo)
 "OJ" = (
@@ -3811,6 +3679,9 @@
 /obj/effect/turf_decal/industrial/warning{
 	dir = 8
 	},
+/obj/structure/cable/yellow{
+	icon_state = "1-10"
+	},
 /turf/open/floor/plasteel/patterned,
 /area/ship/cargo)
 "Pv" = (
@@ -3876,18 +3747,6 @@
 	},
 /turf/open/floor/wood,
 /area/ship/bridge)
-"PR" = (
-/obj/structure/chair/comfy/shuttle{
-	dir = 1;
-	name = "tactical chair"
-	},
-/obj/structure/railing{
-	dir = 8;
-	layer = 4.1
-	},
-/obj/machinery/light/dim,
-/turf/open/floor/plasteel/tech,
-/area/ship/cargo/office)
 "PW" = (
 /obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
 /obj/machinery/door/poddoor/shutters/preopen{
@@ -4053,12 +3912,6 @@
 	dir = 4
 	},
 /area/ship/cargo)
-"Ro" = (
-/obj/machinery/computer/helm{
-	dir = 8
-	},
-/turf/open/floor/plasteel/tech,
-/area/ship/cargo/office)
 "RG" = (
 /obj/item/gun/ballistic/shotgun/winchester{
 	pixel_x = -4;
@@ -4248,9 +4101,6 @@
 /obj/machinery/airalarm/directional/south,
 /turf/open/floor/plating/foam,
 /area/ship/cargo)
-"TC" = (
-/turf/open/floor/pod,
-/area/ship/cargo/office)
 "TF" = (
 /obj/structure/chair,
 /obj/effect/decal/cleanable/dirt,
@@ -4276,24 +4126,6 @@
 	dir = 8
 	},
 /area/ship/bridge)
-"TQ" = (
-/obj/structure/window/reinforced/survival_pod/spawner/west,
-/obj/structure/table/reinforced,
-/obj/item/storage/firstaid{
-	pixel_y = -3;
-	pixel_x = -3
-	},
-/obj/item/reagent_containers/glass/bottle/charcoal{
-	pixel_x = -4;
-	pixel_y = 12
-	},
-/obj/item/reagent_containers/glass/bottle/epinephrine{
-	pixel_y = 8;
-	pixel_x = 2
-	},
-/obj/item/reagent_containers/syringe,
-/turf/open/floor/plasteel/tech/techmaint,
-/area/ship/cargo/office)
 "TV" = (
 /obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
 /obj/machinery/door/poddoor/shutters/preopen{
@@ -4402,6 +4234,19 @@
 /obj/structure/cable/yellow{
 	icon_state = "1-2"
 	},
+/obj/structure/closet/wall{
+	dir = 8;
+	icon_door = "red_wall";
+	name = "Warcasket's Locker";
+	pixel_x = 28
+	},
+/obj/item/clothing/under/costume/mech_suit,
+/obj/item/clothing/under/costume/yakuza,
+/obj/item/clothing/under/costume/pirate,
+/obj/item/clothing/under/utility/skirt,
+/obj/item/clothing/head/helmet/space/pilot/random,
+/obj/item/clothing/mask/gas/sechailer,
+/obj/item/clothing/mask/gas/sechailer/swat,
 /turf/open/floor/plasteel/telecomms_floor,
 /area/ship/science/robotics)
 "Vt" = (
@@ -4541,24 +4386,6 @@
 	dir = 1
 	},
 /area/ship/engineering)
-"Xb" = (
-/obj/machinery/atmospherics/pipe/simple/orange/hidden{
-	dir = 10
-	},
-/turf/open/floor/pod,
-/area/ship/cargo/office)
-"Xc" = (
-/obj/effect/turf_decal/industrial/warning,
-/obj/machinery/atmospherics/pipe/manifold/orange/hidden{
-	dir = 4
-	},
-/turf/open/floor/pod/light,
-/area/ship/cargo/office)
-"Xe" = (
-/obj/effect/turf_decal/industrial/warning/corner,
-/obj/machinery/atmospherics/components/unary/tank/toxins,
-/turf/open/floor/pod,
-/area/ship/cargo/office)
 "Xp" = (
 /turf/closed/wall/mineral/plastitanium,
 /area/ship/crew/dorm)
@@ -4689,19 +4516,6 @@
 	icon_state = "platingdmg1"
 	},
 /area/ship/crew/canteen)
-"Yb" = (
-/obj/machinery/computer/mech_bay_power_console{
-	dir = 1
-	},
-/obj/effect/turf_decal/techfloor{
-	dir = 6
-	},
-/turf/open/floor/plasteel/telecomms_floor,
-/area/ship/cargo/office)
-"Yh" = (
-/obj/machinery/door/airlock/hatch,
-/turf/open/floor/plasteel/tech/techmaint,
-/area/ship/cargo/office)
 "Yj" = (
 /obj/effect/turf_decal/industrial/warning{
 	dir = 8;
@@ -4712,15 +4526,10 @@
 	layer = 3.1
 	},
 /obj/machinery/holopad/emergency,
-/turf/open/floor/plasteel/patterned/grid,
-/area/ship/cargo/office)
-"Yw" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/door/poddoor/shutters{
-	id = "cargopirate_sub_hatch";
-	name = "Blast Shutters"
+/obj/item/kirbyplants{
+	icon_state = "plant-25"
 	},
-/turf/open/floor/plasteel/patterned/ridged,
+/turf/open/floor/plasteel/patterned/grid,
 /area/ship/cargo/office)
 "YV" = (
 /obj/effect/turf_decal/siding/thinplating/dark/corner{
@@ -5087,9 +4896,9 @@ CF
 Ve
 mU
 nN
-lD
-Ve
-lD
+hN
+hN
+hN
 bh
 ft
 Ve
@@ -5105,11 +4914,11 @@ Cx
 nn
 Ve
 wD
-Ve
-rf
-Xe
-of
-Ve
+hN
+hN
+hN
+hN
+hN
 dR
 Ve
 "}
@@ -5124,11 +4933,11 @@ Rf
 wN
 Ve
 Fm
-Ve
-qS
-Jp
-gj
-Ve
+hN
+hN
+hN
+hN
+hN
 RI
 Ve
 "}
@@ -5143,11 +4952,11 @@ Go
 yO
 hU
 lf
-Be
-Xb
-Xc
-bg
-Ve
+hN
+hN
+hN
+hN
+hN
 dR
 RZ
 "}
@@ -5162,11 +4971,11 @@ vs
 YZ
 JU
 tr
-Yw
-vt
-Ce
-NB
-Ve
+hN
+hN
+hN
+hN
+hN
 dR
 kw
 "}
@@ -5182,10 +4991,10 @@ hP
 Zc
 bt
 hN
-TC
-px
-Yb
-Ve
+hN
+hN
+hN
+hN
 rh
 kw
 "}
@@ -5200,11 +5009,11 @@ DT
 jU
 Ve
 gJ
-Ve
-Nw
-nB
-TQ
-Ve
+hN
+hN
+hN
+hN
+hN
 RI
 RZ
 "}
@@ -5219,11 +5028,11 @@ NR
 or
 Ve
 nh
-Yh
-NQ
-KW
-LO
-Ve
+hN
+hN
+hN
+hN
+hN
 dR
 IF
 "}
@@ -5238,11 +5047,11 @@ NR
 Je
 Ve
 oJ
-Ve
-qy
-NJ
-PR
-Ve
+hN
+hN
+hN
+hN
+hN
 rh
 Ve
 "}
@@ -5257,11 +5066,11 @@ bb
 sH
 Ve
 je
-kv
-Ro
-NJ
-CO
-Ve
+hN
+hN
+hN
+hN
+hN
 dR
 Ve
 "}
@@ -5276,11 +5085,11 @@ mL
 Tx
 Ve
 oJ
-kv
-kv
-kv
-Ve
-Ve
+hN
+hN
+hN
+hN
+hN
 tK
 Ve
 "}
diff --git a/_maps/shuttles/shiptest/pirate_mechcarrier_subship.dmm b/_maps/shuttles/shiptest/pirate_mechcarrier_subship.dmm
new file mode 100644
index 000000000000..eb7e4ec52909
--- /dev/null
+++ b/_maps/shuttles/shiptest/pirate_mechcarrier_subship.dmm
@@ -0,0 +1,431 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"a" = (
+/turf/closed/wall/mineral/plastitanium/nodiagonal,
+/area/ship/storage)
+"c" = (
+/obj/machinery/door/airlock/hatch,
+/obj/machinery/door/firedoor,
+/obj/docking_port/mobile,
+/turf/open/floor/plasteel/tech/techmaint,
+/area/ship/storage)
+"d" = (
+/obj/effect/turf_decal/industrial/warning,
+/obj/machinery/atmospherics/pipe/manifold/orange/hidden{
+	dir = 4
+	},
+/obj/structure/cable/yellow{
+	icon_state = "1-4"
+	},
+/turf/open/floor/pod/light,
+/area/ship/storage)
+"e" = (
+/obj/machinery/atmospherics/components/unary/shuttle/heater{
+	dir = 4
+	},
+/obj/structure/window/reinforced,
+/obj/structure/window/reinforced{
+	dir = 1
+	},
+/obj/structure/window/reinforced{
+	dir = 8
+	},
+/turf/open/floor/plating,
+/area/ship/storage)
+"f" = (
+/obj/effect/turf_decal/industrial/warning,
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/turf/open/floor/pod,
+/area/ship/storage)
+"g" = (
+/obj/structure/chair/comfy/shuttle{
+	dir = 1;
+	name = "tactical chair"
+	},
+/obj/structure/railing{
+	dir = 8;
+	layer = 4.1
+	},
+/obj/machinery/light/dim,
+/obj/structure/cable/yellow{
+	icon_state = "1-4"
+	},
+/obj/structure/extinguisher_cabinet{
+	pixel_y = -29
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/storage)
+"h" = (
+/obj/effect/turf_decal/industrial/warning,
+/obj/machinery/atmospherics/components/binary/pump{
+	dir = 4
+	},
+/turf/open/floor/pod/dark,
+/area/ship/storage)
+"k" = (
+/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
+/turf/open/floor/plating,
+/area/ship/storage)
+"n" = (
+/obj/structure/chair/comfy/shuttle{
+	dir = 1;
+	name = "tactical chair"
+	},
+/obj/effect/turf_decal/steeldecal/steel_decals7{
+	dir = 9
+	},
+/obj/machinery/power/apc/auto_name/south,
+/obj/structure/cable/yellow{
+	icon_state = "0-8"
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/storage)
+"q" = (
+/obj/machinery/computer/helm{
+	dir = 8
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/storage)
+"s" = (
+/obj/effect/turf_decal/industrial/warning/corner{
+	dir = 4
+	},
+/obj/effect/turf_decal/industrial/warning/corner,
+/obj/structure/cable/yellow{
+	icon_state = "1-8"
+	},
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/turf/open/floor/plasteel/tech/techmaint,
+/area/ship/storage)
+"t" = (
+/obj/effect/turf_decal/industrial/warning{
+	dir = 1
+	},
+/obj/effect/turf_decal/industrial/warning,
+/obj/structure/cable/yellow{
+	icon_state = "2-8"
+	},
+/turf/open/floor/plasteel/tech/techmaint,
+/area/ship/storage)
+"v" = (
+/obj/effect/turf_decal/industrial/warning,
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/obj/structure/cable/yellow{
+	icon_state = "1-4"
+	},
+/turf/open/floor/pod/dark,
+/area/ship/storage)
+"w" = (
+/obj/effect/turf_decal/industrial/traffic{
+	dir = 4
+	},
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/door/poddoor/shutters{
+	id = "cargopirate_sub_hatch";
+	name = "Blast Shutters"
+	},
+/obj/machinery/power/shieldwallgen/atmos{
+	anchored = 1;
+	dir = 8;
+	id = "cargopirate_sub";
+	locked = 1
+	},
+/obj/structure/cable/yellow{
+	icon_state = "0-2"
+	},
+/turf/open/floor/plasteel/patterned/ridged,
+/area/ship/storage)
+"x" = (
+/obj/effect/turf_decal/industrial/warning{
+	dir = 4
+	},
+/obj/structure/cable/yellow{
+	icon_state = "2-8"
+	},
+/turf/open/floor/plasteel/tech/techmaint,
+/area/ship/storage)
+"y" = (
+/turf/template_noop,
+/area/template_noop)
+"z" = (
+/obj/machinery/computer/mech_bay_power_console{
+	dir = 1
+	},
+/obj/effect/turf_decal/techfloor{
+	dir = 6
+	},
+/turf/open/floor/plasteel/telecomms_floor,
+/area/ship/storage)
+"A" = (
+/obj/structure/window/reinforced/survival_pod/spawner/west,
+/obj/machinery/power/port_gen/pacman{
+	anchored = 1
+	},
+/obj/structure/cable/yellow{
+	icon_state = "0-4"
+	},
+/obj/machinery/airalarm/directional/north,
+/turf/open/floor/plasteel/tech/techmaint,
+/area/ship/storage)
+"B" = (
+/obj/machinery/atmospherics/components/unary/shuttle/heater{
+	dir = 4
+	},
+/obj/structure/window/reinforced{
+	dir = 1;
+	pixel_y = 1
+	},
+/obj/structure/window/reinforced,
+/obj/structure/window/reinforced{
+	dir = 8
+	},
+/turf/open/floor/plating,
+/area/ship/storage)
+"E" = (
+/obj/structure/chair/comfy/shuttle{
+	dir = 4
+	},
+/obj/structure/railing{
+	dir = 8;
+	layer = 4.1
+	},
+/obj/machinery/button/door{
+	id = "cargopirate_sub_hatch";
+	name = "Pod Door Control";
+	pixel_y = 22
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/storage)
+"F" = (
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+	dir = 9
+	},
+/obj/machinery/mech_bay_recharge_port,
+/obj/effect/turf_decal/techfloor{
+	dir = 10
+	},
+/turf/open/floor/plasteel/telecomms_floor,
+/area/ship/storage)
+"H" = (
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+	dir = 10
+	},
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/turf/open/floor/pod,
+/area/ship/storage)
+"I" = (
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
+/turf/open/floor/pod/dark,
+/area/ship/storage)
+"J" = (
+/obj/structure/window/reinforced/survival_pod/spawner/west,
+/obj/structure/table/reinforced,
+/obj/item/storage/firstaid{
+	pixel_y = -3;
+	pixel_x = -3
+	},
+/obj/item/reagent_containers/glass/bottle/charcoal{
+	pixel_x = -4;
+	pixel_y = 12
+	},
+/obj/item/reagent_containers/glass/bottle/epinephrine{
+	pixel_y = 8;
+	pixel_x = 2
+	},
+/obj/item/reagent_containers/syringe,
+/turf/open/floor/plasteel/tech/techmaint,
+/area/ship/storage)
+"L" = (
+/obj/effect/turf_decal/industrial/warning{
+	dir = 1
+	},
+/obj/effect/turf_decal/industrial/warning,
+/turf/open/floor/plasteel/tech/techmaint,
+/area/ship/storage)
+"N" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/door/poddoor/shutters{
+	id = "cargopirate_sub_hatch";
+	name = "Blast Shutters"
+	},
+/turf/open/floor/plasteel/patterned/ridged,
+/area/ship/storage)
+"O" = (
+/turf/open/floor/pod/dark,
+/area/ship/storage)
+"Q" = (
+/obj/machinery/door/window/survival_pod{
+	dir = 8
+	},
+/obj/structure/cable/yellow{
+	icon_state = "4-8"
+	},
+/turf/open/floor/plasteel/stairs{
+	dir = 4
+	},
+/area/ship/storage)
+"S" = (
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+	dir = 8
+	},
+/obj/machinery/button/door{
+	id = "cargopirate_sub_hatch";
+	name = "Pod Door Control";
+	pixel_y = 22
+	},
+/obj/machinery/button/shieldwallgen{
+	id = "cargopirate_sub";
+	pixel_x = 8;
+	pixel_y = 21
+	},
+/turf/open/floor/pod/light,
+/area/ship/storage)
+"T" = (
+/obj/effect/turf_decal/industrial/warning/corner,
+/obj/machinery/atmospherics/components/unary/tank/toxins,
+/obj/structure/window/reinforced{
+	dir = 8
+	},
+/turf/open/floor/pod,
+/area/ship/storage)
+"U" = (
+/obj/effect/turf_decal/industrial/traffic{
+	dir = 8
+	},
+/obj/machinery/door/poddoor/shutters{
+	id = "cargopirate_sub_hatch";
+	name = "Blast Shutters"
+	},
+/obj/machinery/power/shieldwallgen/atmos{
+	anchored = 1;
+	dir = 4;
+	id = "cargopirate_sub";
+	locked = 1
+	},
+/obj/structure/cable/yellow{
+	icon_state = "0-2"
+	},
+/turf/open/floor/plasteel/patterned/ridged,
+/area/ship/storage)
+"V" = (
+/obj/machinery/power/shuttle/engine/fueled/plasma{
+	dir = 4
+	},
+/turf/open/floor/plating,
+/area/ship/storage)
+"W" = (
+/obj/effect/turf_decal/techfloor/corner,
+/obj/effect/turf_decal/techfloor/corner{
+	dir = 8
+	},
+/obj/effect/turf_decal/steeldecal/steel_decals3{
+	dir = 1
+	},
+/obj/effect/turf_decal/steeldecal/steel_decals3{
+	dir = 10
+	},
+/turf/open/floor/plasteel/tech/grid,
+/area/ship/storage)
+"X" = (
+/obj/effect/turf_decal/industrial/outline/yellow,
+/obj/machinery/atmospherics/pipe/simple/orange/hidden{
+	dir = 8
+	},
+/obj/machinery/light/dim,
+/turf/open/floor/plasteel/patterned/cargo_one,
+/area/ship/storage)
+"Z" = (
+/obj/effect/turf_decal/industrial/warning{
+	dir = 4
+	},
+/obj/structure/bed/roller,
+/obj/machinery/airalarm/directional/south,
+/turf/open/floor/plasteel/tech/techmaint,
+/area/ship/storage)
+
+(1,1,1) = {"
+y
+V
+a
+V
+y
+"}
+(2,1,1) = {"
+a
+e
+T
+B
+a
+"}
+(3,1,1) = {"
+a
+S
+h
+X
+a
+"}
+(4,1,1) = {"
+U
+H
+d
+F
+a
+"}
+(5,1,1) = {"
+N
+O
+f
+W
+a
+"}
+(6,1,1) = {"
+w
+I
+v
+z
+a
+"}
+(7,1,1) = {"
+a
+A
+Q
+J
+a
+"}
+(8,1,1) = {"
+c
+x
+s
+Z
+a
+"}
+(9,1,1) = {"
+a
+E
+t
+g
+a
+"}
+(10,1,1) = {"
+k
+q
+L
+n
+a
+"}
+(11,1,1) = {"
+k
+k
+k
+a
+a
+"}
diff --git a/code/modules/jobs/job_types/cargo_technician.dm b/code/modules/jobs/job_types/cargo_technician.dm
index cf7582b66b58..408ffd37c3e9 100644
--- a/code/modules/jobs/job_types/cargo_technician.dm
+++ b/code/modules/jobs/job_types/cargo_technician.dm
@@ -65,6 +65,23 @@
 	gloves = /obj/item/clothing/gloves/fingerless
 	glasses = /obj/item/clothing/glasses/sunglasses/big
 
+/datum/outfit/job/cargo_tech/pilot/pirate
+	name = "Marauder"
+
+	uniform = /obj/item/clothing/under/pants/camo
+	suit = /obj/item/clothing/suit/jacket/leather/duster/command
+	shoes = /obj/item/clothing/shoes/workboots
+	gloves = /obj/item/clothing/gloves/fingerless
+	mask = /obj/item/clothing/mask/bandana/skull
+
+/datum/outfit/job/cargo_tech/pilot/piratemech
+	name = "Warcasket Pilot"
+
+	uniform = /obj/item/clothing/under/utility
+	suit = /obj/item/clothing/suit/jacket/miljacket
+	mask = /obj/item/clothing/mask/gas/sechailer
+	shoes = /obj/item/clothing/shoes/jackboots
+
 /datum/outfit/job/cargo_tech/donk
 	name = "Customer Associate (Donk! Co.)"
 	id = /obj/item/card/id/syndicate_command/crew_id
diff --git a/code/modules/jobs/job_types/roboticist.dm b/code/modules/jobs/job_types/roboticist.dm
index 29dbbbef46a9..47501e8e97b2 100644
--- a/code/modules/jobs/job_types/roboticist.dm
+++ b/code/modules/jobs/job_types/roboticist.dm
@@ -96,3 +96,13 @@
 	satchel = /obj/item/storage/backpack/satchel/eng
 	duffelbag = /obj/item/storage/backpack/duffelbag/engineering
 	courierbag = /obj/item/storage/backpack/messenger/engi
+
+/datum/outfit/job/roboticist/technician/pirate
+	name = "Tinkerer"
+
+	uniform = /obj/item/clothing/under/costume/pirate
+	suit = /obj/item/clothing/suit/longcoat/roboblack
+	mask = /obj/item/clothing/mask/infiltrator
+	glasses = /obj/item/clothing/glasses/hud/diagnostic
+	shoes = /obj/item/clothing/shoes/workboots
+

From 5824117da5297dcbbb37b2cdb757517291da06bb Mon Sep 17 00:00:00 2001
From: spockye <79304582+spockye@users.noreply.github.com>
Date: Fri, 4 Nov 2022 00:30:43 +0100
Subject: [PATCH 03/19] misc updates

---
 .../shuttles/shiptest/pirate_mechcarrier.dmm  | 140 +++++++++++-------
 1 file changed, 83 insertions(+), 57 deletions(-)

diff --git a/_maps/shuttles/shiptest/pirate_mechcarrier.dmm b/_maps/shuttles/shiptest/pirate_mechcarrier.dmm
index b678784cb2d1..8b3a62d07636 100644
--- a/_maps/shuttles/shiptest/pirate_mechcarrier.dmm
+++ b/_maps/shuttles/shiptest/pirate_mechcarrier.dmm
@@ -265,6 +265,7 @@
 	dir = 4
 	},
 /obj/machinery/airalarm/directional/east,
+/obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/plasteel/patterned/grid,
 /area/ship/cargo/office)
 "cn" = (
@@ -371,6 +372,7 @@
 	dir = 8;
 	pixel_x = 28
 	},
+/obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/plasteel/tech/techmaint,
 /area/ship/engineering)
 "df" = (
@@ -397,6 +399,7 @@
 /obj/structure/cable{
 	icon_state = "0-2"
 	},
+/obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/plasteel/tech,
 /area/ship/engineering)
 "dy" = (
@@ -443,6 +446,7 @@
 /obj/structure/cable/yellow{
 	icon_state = "1-2"
 	},
+/obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/plating,
 /area/ship/engineering)
 "dP" = (
@@ -841,7 +845,9 @@
 /obj/structure/sign/warning/electricshock{
 	pixel_y = 31
 	},
-/obj/mecha/combat/gygax/dark,
+/obj/mecha/combat/gygax/dark{
+	name = "Vulcan"
+	},
 /turf/open/floor/plasteel/telecomms_floor,
 /area/ship/science/robotics)
 "hI" = (
@@ -868,9 +874,6 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /turf/open/floor/mineral/plastitanium,
 /area/ship/security)
-"hN" = (
-/turf/open/floor/engine/hull/interior,
-/area/ship/cargo/office)
 "hP" = (
 /obj/effect/turf_decal/industrial/traffic{
 	dir = 4
@@ -935,6 +938,7 @@
 /obj/item/clothing/mask/bandana/skull,
 /obj/item/clothing/head/bandana,
 /obj/item/clothing/head/beret/black,
+/obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/plasteel/patterned/grid,
 /area/ship/cargo/office)
 "is" = (
@@ -982,6 +986,7 @@
 	dir = 9
 	},
 /obj/effect/turf_decal/steeldecal/steel_decals6,
+/obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/engineering)
 "iO" = (
@@ -1125,6 +1130,8 @@
 	icon_state = "1-8"
 	},
 /obj/effect/turf_decal/steeldecal/steel_decals_central4,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/engineering)
 "kX" = (
@@ -1204,6 +1211,7 @@
 /obj/item/clothing/glasses/meson/engine/tray,
 /obj/item/multitool,
 /obj/item/storage/belt/utility/atmostech,
+/obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/engineering)
 "mf" = (
@@ -1873,6 +1881,7 @@
 	dir = 4;
 	color = "#808080"
 	},
+/obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/plasteel/tech/techmaint,
 /area/ship/engineering)
 "ti" = (
@@ -1966,6 +1975,7 @@
 /obj/structure/cable{
 	icon_state = "0-2"
 	},
+/obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/plasteel/tech,
 /area/ship/engineering)
 "ur" = (
@@ -2015,6 +2025,7 @@
 	},
 /obj/item/clothing/head/hardhat/red,
 /obj/item/clothing/shoes/workboots,
+/obj/effect/decal/cleanable/cobweb/cobweb2,
 /turf/open/floor/plasteel/tech/techmaint,
 /area/ship/engineering)
 "uS" = (
@@ -2633,6 +2644,7 @@
 /obj/structure/cable/yellow{
 	icon_state = "1-2"
 	},
+/obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/plating,
 /area/ship/engineering)
 "Ct" = (
@@ -2828,6 +2840,7 @@
 	pixel_y = 6;
 	pixel_x = -6
 	},
+/obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/plasteel/patterned/grid,
 /area/ship/cargo/office)
 "EY" = (
@@ -2845,6 +2858,7 @@
 /obj/effect/turf_decal/techfloor/orange{
 	dir = 4
 	},
+/obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/engineering)
 "Fd" = (
@@ -3105,6 +3119,7 @@
 /obj/machinery/atmospherics/pipe/simple/orange/hidden{
 	dir = 4
 	},
+/obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/plating,
 /area/ship/engineering)
 "IR" = (
@@ -3500,6 +3515,7 @@
 /obj/machinery/light/small{
 	dir = 4
 	},
+/obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/plasteel/tech,
 /area/ship/engineering)
 "Nq" = (
@@ -4126,6 +4142,9 @@
 	dir = 8
 	},
 /area/ship/bridge)
+"TQ" = (
+/turf/open/floor/engine/hull/interior,
+/area/ship/cargo/office)
 "TV" = (
 /obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
 /obj/machinery/door/poddoor/shutters/preopen{
@@ -4162,6 +4181,9 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 8
 	},
+/obj/item/kirbyplants{
+	icon_state = "plant-21"
+	},
 /turf/open/floor/plasteel/patterned/cargo_one,
 /area/ship/cargo)
 "UL" = (
@@ -4373,6 +4395,7 @@
 /obj/machinery/atmospherics/pipe/simple/orange/hidden{
 	dir = 4
 	},
+/obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/plating,
 /area/ship/engineering)
 "WY" = (
@@ -4529,6 +4552,7 @@
 /obj/item/kirbyplants{
 	icon_state = "plant-25"
 	},
+/obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/plasteel/patterned/grid,
 /area/ship/cargo/office)
 "YV" = (
@@ -4615,6 +4639,8 @@
 	dir = 5;
 	layer = 4.1
 	},
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/engineering)
 
@@ -4896,9 +4922,9 @@ CF
 Ve
 mU
 nN
-hN
-hN
-hN
+TQ
+TQ
+TQ
 bh
 ft
 Ve
@@ -4914,11 +4940,11 @@ Cx
 nn
 Ve
 wD
-hN
-hN
-hN
-hN
-hN
+TQ
+TQ
+TQ
+TQ
+TQ
 dR
 Ve
 "}
@@ -4933,11 +4959,11 @@ Rf
 wN
 Ve
 Fm
-hN
-hN
-hN
-hN
-hN
+TQ
+TQ
+TQ
+TQ
+TQ
 RI
 Ve
 "}
@@ -4952,11 +4978,11 @@ Go
 yO
 hU
 lf
-hN
-hN
-hN
-hN
-hN
+TQ
+TQ
+TQ
+TQ
+TQ
 dR
 RZ
 "}
@@ -4971,11 +4997,11 @@ vs
 YZ
 JU
 tr
-hN
-hN
-hN
-hN
-hN
+TQ
+TQ
+TQ
+TQ
+TQ
 dR
 kw
 "}
@@ -4990,11 +5016,11 @@ Iq
 hP
 Zc
 bt
-hN
-hN
-hN
-hN
-hN
+TQ
+TQ
+TQ
+TQ
+TQ
 rh
 kw
 "}
@@ -5009,11 +5035,11 @@ DT
 jU
 Ve
 gJ
-hN
-hN
-hN
-hN
-hN
+TQ
+TQ
+TQ
+TQ
+TQ
 RI
 RZ
 "}
@@ -5028,11 +5054,11 @@ NR
 or
 Ve
 nh
-hN
-hN
-hN
-hN
-hN
+TQ
+TQ
+TQ
+TQ
+TQ
 dR
 IF
 "}
@@ -5047,11 +5073,11 @@ NR
 Je
 Ve
 oJ
-hN
-hN
-hN
-hN
-hN
+TQ
+TQ
+TQ
+TQ
+TQ
 rh
 Ve
 "}
@@ -5066,11 +5092,11 @@ bb
 sH
 Ve
 je
-hN
-hN
-hN
-hN
-hN
+TQ
+TQ
+TQ
+TQ
+TQ
 dR
 Ve
 "}
@@ -5085,11 +5111,11 @@ mL
 Tx
 Ve
 oJ
-hN
-hN
-hN
-hN
-hN
+TQ
+TQ
+TQ
+TQ
+TQ
 tK
 Ve
 "}

From 2b944ce10b1c9cec71ab11f4917d9c0cbf1ee60e Mon Sep 17 00:00:00 2001
From: spockye <79304582+spockye@users.noreply.github.com>
Date: Fri, 4 Nov 2022 00:38:51 +0100
Subject: [PATCH 04/19] fixes lowercase blastdoors

---
 .../shuttles/shiptest/pirate_mechcarrier.dmm  | 118 +++++++++---------
 1 file changed, 59 insertions(+), 59 deletions(-)

diff --git a/_maps/shuttles/shiptest/pirate_mechcarrier.dmm b/_maps/shuttles/shiptest/pirate_mechcarrier.dmm
index 8b3a62d07636..b1b2d49db987 100644
--- a/_maps/shuttles/shiptest/pirate_mechcarrier.dmm
+++ b/_maps/shuttles/shiptest/pirate_mechcarrier.dmm
@@ -516,7 +516,7 @@
 	},
 /obj/machinery/door/poddoor{
 	id = "cargopirate_thrusters";
-	name = "thruster blast door"
+	name = "Thruster Blast Door"
 	},
 /turf/open/floor/plating,
 /area/ship/engineering)
@@ -1161,7 +1161,7 @@
 /obj/structure/window/plasma/reinforced/spawner/east,
 /obj/machinery/door/poddoor{
 	id = "cargopirate_thrusters";
-	name = "thruster blast door"
+	name = "Thruster Blast Door"
 	},
 /turf/open/floor/plating,
 /area/ship/engineering)
@@ -3347,6 +3347,9 @@
 	},
 /turf/open/floor/plating/rust,
 /area/ship/cargo)
+"KW" = (
+/turf/open/floor/engine/hull/interior,
+/area/ship/cargo/office)
 "La" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt/dust,
@@ -3964,7 +3967,7 @@
 	},
 /obj/machinery/door/poddoor{
 	id = "cargopirate_thrusters";
-	name = "thruster blast door"
+	name = "Thruster Blast Door"
 	},
 /obj/machinery/door/window/eastright{
 	name = "Engine Access"
@@ -4142,9 +4145,6 @@
 	dir = 8
 	},
 /area/ship/bridge)
-"TQ" = (
-/turf/open/floor/engine/hull/interior,
-/area/ship/cargo/office)
 "TV" = (
 /obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
 /obj/machinery/door/poddoor/shutters/preopen{
@@ -4922,9 +4922,9 @@ CF
 Ve
 mU
 nN
-TQ
-TQ
-TQ
+KW
+KW
+KW
 bh
 ft
 Ve
@@ -4940,11 +4940,11 @@ Cx
 nn
 Ve
 wD
-TQ
-TQ
-TQ
-TQ
-TQ
+KW
+KW
+KW
+KW
+KW
 dR
 Ve
 "}
@@ -4959,11 +4959,11 @@ Rf
 wN
 Ve
 Fm
-TQ
-TQ
-TQ
-TQ
-TQ
+KW
+KW
+KW
+KW
+KW
 RI
 Ve
 "}
@@ -4978,11 +4978,11 @@ Go
 yO
 hU
 lf
-TQ
-TQ
-TQ
-TQ
-TQ
+KW
+KW
+KW
+KW
+KW
 dR
 RZ
 "}
@@ -4997,11 +4997,11 @@ vs
 YZ
 JU
 tr
-TQ
-TQ
-TQ
-TQ
-TQ
+KW
+KW
+KW
+KW
+KW
 dR
 kw
 "}
@@ -5016,11 +5016,11 @@ Iq
 hP
 Zc
 bt
-TQ
-TQ
-TQ
-TQ
-TQ
+KW
+KW
+KW
+KW
+KW
 rh
 kw
 "}
@@ -5035,11 +5035,11 @@ DT
 jU
 Ve
 gJ
-TQ
-TQ
-TQ
-TQ
-TQ
+KW
+KW
+KW
+KW
+KW
 RI
 RZ
 "}
@@ -5054,11 +5054,11 @@ NR
 or
 Ve
 nh
-TQ
-TQ
-TQ
-TQ
-TQ
+KW
+KW
+KW
+KW
+KW
 dR
 IF
 "}
@@ -5073,11 +5073,11 @@ NR
 Je
 Ve
 oJ
-TQ
-TQ
-TQ
-TQ
-TQ
+KW
+KW
+KW
+KW
+KW
 rh
 Ve
 "}
@@ -5092,11 +5092,11 @@ bb
 sH
 Ve
 je
-TQ
-TQ
-TQ
-TQ
-TQ
+KW
+KW
+KW
+KW
+KW
 dR
 Ve
 "}
@@ -5111,11 +5111,11 @@ mL
 Tx
 Ve
 oJ
-TQ
-TQ
-TQ
-TQ
-TQ
+KW
+KW
+KW
+KW
+KW
 tK
 Ve
 "}

From e8f3e1f14bafdae310a5dd2105892154384f9fdc Mon Sep 17 00:00:00 2001
From: spockye <79304582+spockye@users.noreply.github.com>
Date: Fri, 4 Nov 2022 13:14:41 +0100
Subject: [PATCH 05/19] attempts to fix atmos fuckery

---
 .../shuttles/shiptest/pirate_mechcarrier.dmm  | 130 ++++++------------
 1 file changed, 39 insertions(+), 91 deletions(-)

diff --git a/_maps/shuttles/shiptest/pirate_mechcarrier.dmm b/_maps/shuttles/shiptest/pirate_mechcarrier.dmm
index b1b2d49db987..bc5832671823 100644
--- a/_maps/shuttles/shiptest/pirate_mechcarrier.dmm
+++ b/_maps/shuttles/shiptest/pirate_mechcarrier.dmm
@@ -131,9 +131,7 @@
 /obj/effect/turf_decal/steeldecal/steel_decals9{
 	dir = 8
 	},
-/turf/open/floor/plasteel/tech{
-	initial_gas_mix = "TEMP=2.7"
-	},
+/turf/open/floor/plasteel/tech,
 /area/ship/cargo/office)
 "bo" = (
 /obj/machinery/computer/arcade/orion_trail,
@@ -244,16 +242,9 @@
 	color = "#c1b6a5"
 	},
 /obj/machinery/button/door{
-	id = "Syndie_warship_lockdown";
-	name = "Lockdown Control";
-	pixel_x = -6;
-	pixel_y = 6;
-	dir = 8
-	},
-/obj/machinery/button/door{
-	id = "syndie_warship_cargo";
+	id = "cargopirate_podbay";
 	name = "cargohold shutters";
-	pixel_x = 3;
+	pixel_x = 7;
 	pixel_y = 6;
 	dir = 8
 	},
@@ -296,6 +287,7 @@
 /obj/effect/turf_decal/steeldecal/steel_decals7{
 	dir = 9
 	},
+/mob/living/simple_animal/chicken,
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/bridge)
 "cG" = (
@@ -373,7 +365,7 @@
 	pixel_x = 28
 	},
 /obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/plasteel/tech/techmaint,
+/turf/open/floor/plasteel/tech,
 /area/ship/engineering)
 "df" = (
 /obj/structure/catwalk/over,
@@ -463,9 +455,7 @@
 	dir = 1
 	},
 /obj/effect/turf_decal/techfloor,
-/turf/open/floor/plasteel/tech{
-	initial_gas_mix = "TEMP=2.7"
-	},
+/turf/open/floor/plasteel/tech,
 /area/ship/cargo/office)
 "dU" = (
 /obj/machinery/vending/cigarette/syndicate,
@@ -543,9 +533,7 @@
 /obj/effect/turf_decal/techfloor{
 	dir = 10
 	},
-/turf/open/floor/plasteel/tech{
-	initial_gas_mix = "TEMP=2.7"
-	},
+/turf/open/floor/plasteel/tech,
 /area/ship/cargo/office)
 "fB" = (
 /obj/effect/turf_decal/siding/thinplating/dark{
@@ -554,9 +542,7 @@
 /obj/effect/turf_decal/techfloor{
 	dir = 8
 	},
-/turf/open/floor/plasteel/tech{
-	initial_gas_mix = "TEMP=2.7"
-	},
+/turf/open/floor/plasteel/tech,
 /area/ship/cargo/office)
 "fC" = (
 /obj/structure/table/reinforced{
@@ -577,10 +563,6 @@
 /obj/effect/turf_decal/industrial/outline/yellow,
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/closet/cardboard,
-/obj/item/storage/cans/sixbeer{
-	pixel_y = -3;
-	pixel_x = 3
-	},
 /obj/machinery/light{
 	dir = 1
 	},
@@ -588,11 +570,16 @@
 	pixel_y = 32
 	},
 /obj/item/stack/sheet/mineral/wood/fifty,
+/obj/item/hatchet/wooden,
+/obj/item/toy/plush/beeplushie,
 /obj/item/rack_parts{
 	pixel_x = -5;
 	pixel_y = -6
 	},
-/obj/item/hatchet/wooden,
+/obj/item/storage/cans/sixbeer{
+	pixel_y = -3;
+	pixel_x = 3
+	},
 /turf/open/floor/plasteel/patterned/cargo_one,
 /area/ship/cargo)
 "fU" = (
@@ -722,9 +709,7 @@
 	name = "Pod Door Control";
 	pixel_y = 22
 	},
-/turf/open/floor/plasteel/tech{
-	initial_gas_mix = "TEMP=2.7"
-	},
+/turf/open/floor/plasteel/tech,
 /area/ship/cargo/office)
 "gP" = (
 /obj/effect/turf_decal/industrial/outline/yellow,
@@ -792,9 +777,7 @@
 	},
 /obj/effect/turf_decal/techfloor/corner,
 /obj/effect/turf_decal/steeldecal/steel_decals9,
-/turf/open/floor/plasteel/tech{
-	initial_gas_mix = "TEMP=2.7"
-	},
+/turf/open/floor/plasteel/tech,
 /area/ship/cargo/office)
 "hr" = (
 /obj/effect/turf_decal/industrial/warning{
@@ -846,7 +829,9 @@
 	pixel_y = 31
 	},
 /obj/mecha/combat/gygax/dark{
-	name = "Vulcan"
+	name = "Vulcan";
+	operation_req_access = 0;
+	internals_req_access = 0
 	},
 /turf/open/floor/plasteel/telecomms_floor,
 /area/ship/science/robotics)
@@ -1026,9 +1011,7 @@
 /obj/effect/turf_decal/techfloor/hole{
 	dir = 1
 	},
-/turf/open/floor/plasteel/tech{
-	initial_gas_mix = "TEMP=2.7"
-	},
+/turf/open/floor/plasteel/tech,
 /area/ship/cargo/office)
 "jk" = (
 /obj/effect/turf_decal/techfloor{
@@ -1277,9 +1260,7 @@
 /obj/effect/turf_decal/techfloor{
 	dir = 1
 	},
-/turf/open/floor/plasteel/tech{
-	initial_gas_mix = "TEMP=2.7"
-	},
+/turf/open/floor/plasteel/tech,
 /area/ship/cargo/office)
 "nh" = (
 /obj/effect/turf_decal/siding/thinplating/dark/corner{
@@ -1292,9 +1273,7 @@
 /obj/effect/turf_decal/techfloor{
 	dir = 1
 	},
-/turf/open/floor/plasteel/tech{
-	initial_gas_mix = "TEMP=2.7"
-	},
+/turf/open/floor/plasteel/tech,
 /area/ship/cargo/office)
 "nj" = (
 /obj/effect/turf_decal/industrial/hatch/yellow,
@@ -1364,9 +1343,7 @@
 /obj/effect/turf_decal/steeldecal/steel_decals2{
 	dir = 1
 	},
-/turf/open/floor/plasteel/tech{
-	initial_gas_mix = "TEMP=2.7"
-	},
+/turf/open/floor/plasteel/tech,
 /area/ship/cargo/office)
 "oc" = (
 /obj/machinery/door/airlock/hatch,
@@ -1424,18 +1401,14 @@
 /obj/effect/turf_decal/techfloor/hole{
 	dir = 8
 	},
-/turf/open/floor/plasteel/tech{
-	initial_gas_mix = "TEMP=2.7"
-	},
+/turf/open/floor/plasteel/tech,
 /area/ship/cargo/office)
 "oJ" = (
 /obj/effect/turf_decal/siding/thinplating/dark,
 /obj/effect/turf_decal/techfloor{
 	dir = 1
 	},
-/turf/open/floor/plasteel/tech{
-	initial_gas_mix = "TEMP=2.7"
-	},
+/turf/open/floor/plasteel/tech,
 /area/ship/cargo/office)
 "oK" = (
 /obj/machinery/autolathe/hacked,
@@ -1675,9 +1648,7 @@
 	},
 /obj/effect/turf_decal/techfloor,
 /obj/effect/turf_decal/techfloor/hole,
-/turf/open/floor/plasteel/tech{
-	initial_gas_mix = "TEMP=2.7"
-	},
+/turf/open/floor/plasteel/tech,
 /area/ship/cargo/office)
 "rk" = (
 /obj/machinery/power/shuttle/engine/fueled/plasma{
@@ -1865,7 +1836,7 @@
 /obj/effect/turf_decal/techfloor{
 	dir = 8
 	},
-/turf/open/floor/plasteel/tech/techmaint,
+/turf/open/floor/plasteel/tech,
 /area/ship/engineering)
 "sV" = (
 /obj/machinery/holopad/emergency/command,
@@ -1929,15 +1900,6 @@
 "tC" = (
 /turf/closed/wall/mineral/plastitanium,
 /area/ship/cargo)
-"tK" = (
-/obj/effect/turf_decal/siding/thinplating/dark{
-	dir = 1
-	},
-/obj/machinery/light/dim,
-/turf/open/floor/plasteel/tech{
-	initial_gas_mix = "TEMP=2.7"
-	},
-/area/ship/cargo/office)
 "tW" = (
 /obj/machinery/door/window/northleft{
 	dir = 2
@@ -2186,9 +2148,7 @@
 /obj/effect/turf_decal/techfloor{
 	dir = 1
 	},
-/turf/open/floor/plasteel/tech{
-	initial_gas_mix = "TEMP=2.7"
-	},
+/turf/open/floor/plasteel/tech,
 /area/ship/cargo/office)
 "wN" = (
 /obj/structure/railing{
@@ -2507,9 +2467,7 @@
 /obj/effect/turf_decal/techfloor{
 	dir = 4
 	},
-/turf/open/floor/plasteel/tech{
-	initial_gas_mix = "TEMP=2.7"
-	},
+/turf/open/floor/plasteel/tech,
 /area/ship/cargo/office)
 "zO" = (
 /obj/machinery/power/smes/engineering,
@@ -2745,9 +2703,7 @@
 	dir = 9
 	},
 /obj/effect/turf_decal/steeldecal/steel_decals4,
-/turf/open/floor/plasteel/tech{
-	initial_gas_mix = "TEMP=2.7"
-	},
+/turf/open/floor/plasteel/tech,
 /area/ship/cargo/office)
 "DT" = (
 /obj/effect/turf_decal/corner/opaque/yellow/bordercorner{
@@ -2894,9 +2850,7 @@
 	dir = 1
 	},
 /obj/effect/turf_decal/industrial/stand_clear,
-/turf/open/floor/plasteel/tech{
-	initial_gas_mix = "TEMP=2.7"
-	},
+/turf/open/floor/plasteel/tech,
 /area/ship/cargo/office)
 "Fp" = (
 /obj/effect/turf_decal/industrial/warning{
@@ -3525,11 +3479,13 @@
 /turf/open/floor/engine/air,
 /area/ship/engineering)
 "Nx" = (
+/obj/docking_port/mobile{
+	dir = 2
+	},
 /obj/machinery/door/poddoor/shutters{
 	id = "cargopirate_cargo";
 	name = "Cargo Shutters"
 	},
-/obj/docking_port/mobile,
 /turf/open/floor/plating,
 /area/ship/cargo)
 "NE" = (
@@ -3747,9 +3703,7 @@
 /obj/effect/turf_decal/techfloor{
 	dir = 5
 	},
-/turf/open/floor/plasteel/tech{
-	initial_gas_mix = "TEMP=2.7"
-	},
+/turf/open/floor/plasteel/tech,
 /area/ship/cargo/office)
 "PP" = (
 /obj/structure/table/wood/reinforced,
@@ -3980,9 +3934,7 @@
 	},
 /obj/machinery/light/dim,
 /obj/effect/turf_decal/techfloor,
-/turf/open/floor/plasteel/tech{
-	initial_gas_mix = "TEMP=2.7"
-	},
+/turf/open/floor/plasteel/tech,
 /area/ship/cargo/office)
 "RN" = (
 /obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
@@ -4360,9 +4312,7 @@
 /obj/effect/turf_decal/techfloor{
 	dir = 8
 	},
-/turf/open/floor/plasteel/tech{
-	initial_gas_mix = "TEMP=2.7"
-	},
+/turf/open/floor/plasteel/tech,
 /area/ship/cargo/office)
 "WQ" = (
 /obj/machinery/atmospherics/components/unary/vent_pump/high_volume/siphon/atmos/air_output{
@@ -4562,9 +4512,7 @@
 /obj/effect/turf_decal/techfloor{
 	dir = 6
 	},
-/turf/open/floor/plasteel/tech{
-	initial_gas_mix = "TEMP=2.7"
-	},
+/turf/open/floor/plasteel/tech,
 /area/ship/cargo/office)
 "YZ" = (
 /obj/effect/decal/cleanable/dirt,
@@ -5116,7 +5064,7 @@ KW
 KW
 KW
 KW
-tK
+RI
 Ve
 "}
 (26,1,1) = {"

From 69f4178ca48e50d151e1ad53fd31e608db719ef8 Mon Sep 17 00:00:00 2001
From: spockye <79304582+spockye@users.noreply.github.com>
Date: Wed, 7 Dec 2022 23:50:02 +0100
Subject: [PATCH 06/19] misc fixes

changed floortiles
removed pacman from subship(replaced with battery)
pixelshifted misc items
folder for subshuttles
docking ports
---
 .../shuttles/shiptest/pirate_mechcarrier.dmm  |  48 ++++---
 .../pirate_mechcarrier_subship.dmm            | 117 ++++++++----------
 code/datums/shuttles.dm                       |   9 ++
 3 files changed, 92 insertions(+), 82 deletions(-)
 rename _maps/shuttles/{shiptest => subshuttles}/pirate_mechcarrier_subship.dmm (85%)

diff --git a/_maps/shuttles/shiptest/pirate_mechcarrier.dmm b/_maps/shuttles/shiptest/pirate_mechcarrier.dmm
index bc5832671823..1532fef415eb 100644
--- a/_maps/shuttles/shiptest/pirate_mechcarrier.dmm
+++ b/_maps/shuttles/shiptest/pirate_mechcarrier.dmm
@@ -550,7 +550,10 @@
 	},
 /obj/machinery/cell_charger,
 /obj/item/stock_parts/cell/high,
-/obj/item/stock_parts/cell/high,
+/obj/item/stock_parts/cell/high{
+	pixel_x = 3;
+	pixel_y = 5
+	},
 /obj/effect/turf_decal/techfloor{
 	dir = 9
 	},
@@ -703,7 +706,6 @@
 /obj/effect/turf_decal/techfloor/corner{
 	dir = 4
 	},
-/obj/effect/turf_decal/industrial/stand_clear,
 /obj/machinery/button/door{
 	id = "cargopirate_podbay";
 	name = "Pod Door Control";
@@ -1384,7 +1386,7 @@
 	dir = 4
 	},
 /turf/open/floor/plating/airless,
-/area/ship/external)
+/area/ship/engineering)
 "oy" = (
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
 /area/ship/crew/dorm)
@@ -1655,7 +1657,7 @@
 	dir = 4
 	},
 /turf/open/floor/plating/airless,
-/area/ship/external)
+/area/ship/engineering)
 "rm" = (
 /obj/effect/turf_decal/corner/opaque/yellow/bordercorner{
 	dir = 1
@@ -1826,7 +1828,9 @@
 	icon_state = "0-9"
 	},
 /obj/machinery/power/apc/auto_name/south,
-/turf/open/floor/plating/foam,
+/turf/open/floor/plating{
+	icon_state = "foam_plating"
+	},
 /area/ship/cargo)
 "sU" = (
 /obj/machinery/vending/tool,
@@ -2177,7 +2181,7 @@
 /obj/effect/turf_decal/spline/fancy/opaque/black{
 	dir = 8
 	},
-/obj/machinery/computer/card/minor/cmo,
+/obj/machinery/computer/card/minor,
 /turf/open/floor/plasteel/tech,
 /area/ship/bridge)
 "wY" = (
@@ -2534,7 +2538,7 @@
 	dir = 4
 	},
 /turf/open/floor/plating/airless,
-/area/ship/external)
+/area/ship/engineering)
 "Bh" = (
 /obj/structure/cable/yellow{
 	icon_state = "1-4"
@@ -2849,7 +2853,6 @@
 /obj/effect/turf_decal/techfloor/corner{
 	dir = 1
 	},
-/obj/effect/turf_decal/industrial/stand_clear,
 /turf/open/floor/plasteel/tech,
 /area/ship/cargo/office)
 "Fp" = (
@@ -2880,7 +2883,7 @@
 	icon_state = "0-4"
 	},
 /turf/open/floor/plating/airless,
-/area/ship/external)
+/area/ship/engineering)
 "Go" = (
 /obj/effect/turf_decal/industrial/traffic{
 	dir = 8
@@ -2994,7 +2997,9 @@
 /obj/effect/turf_decal/techfloor/corner{
 	dir = 8
 	},
-/obj/effect/turf_decal/industrial/stand_clear,
+/obj/effect/turf_decal/industrial/stand_clear{
+	dir = 1
+	},
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
@@ -3802,9 +3807,9 @@
 	pixel_y = 23;
 	pixel_x = 9
 	},
-/obj/effect/decal/cleanable/dirt/dust,
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/plating/foam,
+/turf/open/floor/plating{
+	icon_state = "foam_plating"
+	},
 /area/ship/security)
 "QP" = (
 /obj/effect/decal/cleanable/cobweb,
@@ -4070,7 +4075,9 @@
 	icon_state = "5-9"
 	},
 /obj/machinery/airalarm/directional/south,
-/turf/open/floor/plating/foam,
+/turf/open/floor/plating{
+	icon_state = "foam_plating"
+	},
 /area/ship/cargo)
 "TF" = (
 /obj/structure/chair,
@@ -4125,6 +4132,17 @@
 	},
 /turf/open/floor/plasteel/patterned/cargo_one,
 /area/ship/cargo)
+"Uu" = (
+/obj/docking_port/stationary{
+	roundstart_template = "/datum/map_template/shuttle/subshuttles/minimalta";
+	dheight = 4;
+	dwidth = 7;
+	height = 5;
+	width = 11
+	load_template_on_initialize = "false"
+	},
+/turf/open/floor/engine/hull/interior,
+/area/ship/cargo/office)
 "UE" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
@@ -5002,7 +5020,7 @@ NR
 or
 Ve
 nh
-KW
+Uu
 KW
 KW
 KW
diff --git a/_maps/shuttles/shiptest/pirate_mechcarrier_subship.dmm b/_maps/shuttles/subshuttles/pirate_mechcarrier_subship.dmm
similarity index 85%
rename from _maps/shuttles/shiptest/pirate_mechcarrier_subship.dmm
rename to _maps/shuttles/subshuttles/pirate_mechcarrier_subship.dmm
index eb7e4ec52909..da360da21d95 100644
--- a/_maps/shuttles/shiptest/pirate_mechcarrier_subship.dmm
+++ b/_maps/shuttles/subshuttles/pirate_mechcarrier_subship.dmm
@@ -5,7 +5,12 @@
 "c" = (
 /obj/machinery/door/airlock/hatch,
 /obj/machinery/door/firedoor,
-/obj/docking_port/mobile,
+/obj/docking_port/mobile{
+	dir = 2
+	},
+/obj/structure/cable/yellow{
+	icon_state = "1-2"
+	},
 /turf/open/floor/plasteel/tech/techmaint,
 /area/ship/storage)
 "d" = (
@@ -13,9 +18,6 @@
 /obj/machinery/atmospherics/pipe/manifold/orange/hidden{
 	dir = 4
 	},
-/obj/structure/cable/yellow{
-	icon_state = "1-4"
-	},
 /turf/open/floor/pod/light,
 /area/ship/storage)
 "e" = (
@@ -33,9 +35,6 @@
 /area/ship/storage)
 "f" = (
 /obj/effect/turf_decal/industrial/warning,
-/obj/structure/cable/yellow{
-	icon_state = "4-8"
-	},
 /turf/open/floor/pod,
 /area/ship/storage)
 "g" = (
@@ -48,12 +47,12 @@
 	layer = 4.1
 	},
 /obj/machinery/light/dim,
-/obj/structure/cable/yellow{
-	icon_state = "1-4"
-	},
 /obj/structure/extinguisher_cabinet{
 	pixel_y = -29
 	},
+/obj/structure/cable{
+	icon_state = "4-9"
+	},
 /turf/open/floor/plasteel/tech,
 /area/ship/storage)
 "h" = (
@@ -76,7 +75,7 @@
 	dir = 9
 	},
 /obj/machinery/power/apc/auto_name/south,
-/obj/structure/cable/yellow{
+/obj/structure/cable{
 	icon_state = "0-8"
 	},
 /turf/open/floor/plasteel/tech,
@@ -92,32 +91,13 @@
 	dir = 4
 	},
 /obj/effect/turf_decal/industrial/warning/corner,
-/obj/structure/cable/yellow{
-	icon_state = "1-8"
-	},
-/obj/structure/cable/yellow{
-	icon_state = "4-8"
-	},
-/turf/open/floor/plasteel/tech/techmaint,
-/area/ship/storage)
-"t" = (
-/obj/effect/turf_decal/industrial/warning{
-	dir = 1
-	},
-/obj/effect/turf_decal/industrial/warning,
-/obj/structure/cable/yellow{
-	icon_state = "2-8"
+/obj/structure/cable{
+	icon_state = "6-9"
 	},
 /turf/open/floor/plasteel/tech/techmaint,
 /area/ship/storage)
 "v" = (
 /obj/effect/turf_decal/industrial/warning,
-/obj/structure/cable/yellow{
-	icon_state = "4-8"
-	},
-/obj/structure/cable/yellow{
-	icon_state = "1-4"
-	},
 /turf/open/floor/pod/dark,
 /area/ship/storage)
 "w" = (
@@ -125,18 +105,18 @@
 	dir = 4
 	},
 /obj/effect/decal/cleanable/dirt,
-/obj/machinery/door/poddoor/shutters{
-	id = "cargopirate_sub_hatch";
-	name = "Blast Shutters"
-	},
 /obj/machinery/power/shieldwallgen/atmos{
 	anchored = 1;
 	dir = 8;
 	id = "cargopirate_sub";
 	locked = 1
 	},
-/obj/structure/cable/yellow{
-	icon_state = "0-2"
+/obj/structure/cable{
+	icon_state = "0-10"
+	},
+/obj/machinery/door/poddoor/shutters{
+	id = "cargopirate_sub_hatch";
+	name = "Blast Shutters"
 	},
 /turf/open/floor/plasteel/patterned/ridged,
 /area/ship/storage)
@@ -144,9 +124,10 @@
 /obj/effect/turf_decal/industrial/warning{
 	dir = 4
 	},
-/obj/structure/cable/yellow{
-	icon_state = "2-8"
+/obj/machinery/power/terminal{
+	dir = 8
 	},
+/obj/structure/cable/yellow,
 /turf/open/floor/plasteel/tech/techmaint,
 /area/ship/storage)
 "y" = (
@@ -163,13 +144,11 @@
 /area/ship/storage)
 "A" = (
 /obj/structure/window/reinforced/survival_pod/spawner/west,
-/obj/machinery/power/port_gen/pacman{
-	anchored = 1
-	},
-/obj/structure/cable/yellow{
-	icon_state = "0-4"
-	},
 /obj/machinery/airalarm/directional/north,
+/obj/machinery/power/smes/engineering,
+/obj/structure/cable{
+	icon_state = "0-6"
+	},
 /turf/open/floor/plasteel/tech/techmaint,
 /area/ship/storage)
 "B" = (
@@ -215,33 +194,29 @@
 /obj/machinery/atmospherics/pipe/simple/orange/hidden{
 	dir = 10
 	},
-/obj/structure/cable/yellow{
-	icon_state = "1-2"
-	},
 /turf/open/floor/pod,
 /area/ship/storage)
 "I" = (
-/obj/structure/cable/yellow{
-	icon_state = "1-2"
+/obj/structure/cable{
+	icon_state = "6-8"
 	},
 /turf/open/floor/pod/dark,
 /area/ship/storage)
 "J" = (
 /obj/structure/window/reinforced/survival_pod/spawner/west,
 /obj/structure/table/reinforced,
-/obj/item/storage/firstaid{
-	pixel_y = -3;
-	pixel_x = -3
+/obj/item/storage/firstaid/regular{
+	pixel_x = 6
 	},
+/obj/item/reagent_containers/syringe,
 /obj/item/reagent_containers/glass/bottle/charcoal{
 	pixel_x = -4;
 	pixel_y = 12
 	},
 /obj/item/reagent_containers/glass/bottle/epinephrine{
-	pixel_y = 8;
-	pixel_x = 2
+	pixel_y = 5;
+	pixel_x = -3
 	},
-/obj/item/reagent_containers/syringe,
 /turf/open/floor/plasteel/tech/techmaint,
 /area/ship/storage)
 "L" = (
@@ -260,14 +235,20 @@
 /turf/open/floor/plasteel/patterned/ridged,
 /area/ship/storage)
 "O" = (
+/obj/structure/cable{
+	icon_state = "4-5"
+	},
+/obj/structure/cable{
+	icon_state = "4-9"
+	},
 /turf/open/floor/pod/dark,
 /area/ship/storage)
 "Q" = (
 /obj/machinery/door/window/survival_pod{
 	dir = 8
 	},
-/obj/structure/cable/yellow{
-	icon_state = "4-8"
+/obj/structure/cable{
+	icon_state = "5-9"
 	},
 /turf/open/floor/plasteel/stairs{
 	dir = 4
@@ -291,7 +272,9 @@
 /area/ship/storage)
 "T" = (
 /obj/effect/turf_decal/industrial/warning/corner,
-/obj/machinery/atmospherics/components/unary/tank/toxins,
+/obj/machinery/atmospherics/components/unary/tank/toxins{
+	dir = 4
+	},
 /obj/structure/window/reinforced{
 	dir = 8
 	},
@@ -301,18 +284,18 @@
 /obj/effect/turf_decal/industrial/traffic{
 	dir = 8
 	},
-/obj/machinery/door/poddoor/shutters{
-	id = "cargopirate_sub_hatch";
-	name = "Blast Shutters"
-	},
 /obj/machinery/power/shieldwallgen/atmos{
 	anchored = 1;
 	dir = 4;
 	id = "cargopirate_sub";
 	locked = 1
 	},
-/obj/structure/cable/yellow{
-	icon_state = "0-2"
+/obj/structure/cable{
+	icon_state = "0-6"
+	},
+/obj/machinery/door/poddoor/shutters{
+	id = "cargopirate_sub_hatch";
+	name = "Blast Shutters"
 	},
 /turf/open/floor/plasteel/patterned/ridged,
 /area/ship/storage)
@@ -411,7 +394,7 @@ a
 (9,1,1) = {"
 a
 E
-t
+L
 g
 a
 "}
diff --git a/code/datums/shuttles.dm b/code/datums/shuttles.dm
index f851257a861a..1efd7ad39eda 100644
--- a/code/datums/shuttles.dm
+++ b/code/datums/shuttles.dm
@@ -271,3 +271,12 @@
 	file_name = "ruin_solgov_exploration_pod"
 	name = "SolGov Exploration Pod"
 
+/datum/map_template/shuttle/subshuttles
+	category = "subshuttles"
+
+/datum/map_template/shuttle/subshuttles/minimalta
+	file_name = "pirate_mechcarrier_subship"
+	name = "Malta Dropship"
+	prefix = "ISV"
+	name_categories = list("PIRATES","BEASTS",)
+

From 7f632916ea4134a1899d66da87dfc219acdecf1b Mon Sep 17 00:00:00 2001
From: spockye <79304582+spockye@users.noreply.github.com>
Date: Tue, 13 Dec 2022 21:42:23 +0100
Subject: [PATCH 07/19] Update pirate_mechcarrier.dmm

---
 .../shuttles/shiptest/pirate_mechcarrier.dmm  | 79 ++++++++++++++++++-
 1 file changed, 75 insertions(+), 4 deletions(-)

diff --git a/_maps/shuttles/shiptest/pirate_mechcarrier.dmm b/_maps/shuttles/shiptest/pirate_mechcarrier.dmm
index 1532fef415eb..37dd3fa7433a 100644
--- a/_maps/shuttles/shiptest/pirate_mechcarrier.dmm
+++ b/_maps/shuttles/shiptest/pirate_mechcarrier.dmm
@@ -426,6 +426,9 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 8
 	},
+/obj/effect/turf_decal/industrial/warning{
+	dir = 4
+	},
 /turf/open/floor/plasteel,
 /area/ship/crew/canteen)
 "dI" = (
@@ -524,6 +527,9 @@
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
+/obj/effect/turf_decal/spline/fancy/opaque/brown{
+	dir = 1
+	},
 /turf/open/floor/plasteel/patterned/cargo_one,
 /area/ship/cargo)
 "ft" = (
@@ -593,6 +599,7 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 10
 	},
+/obj/effect/turf_decal/trimline/opaque/brown/line,
 /turf/open/floor/plasteel,
 /area/ship/crew/canteen)
 "fY" = (
@@ -626,6 +633,9 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 8
 	},
+/obj/effect/turf_decal/spline/fancy/opaque/brown{
+	dir = 1
+	},
 /turf/open/floor/plasteel/patterned/cargo_one,
 /area/ship/cargo)
 "ga" = (
@@ -741,6 +751,9 @@
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
 	dir = 8
 	},
+/obj/effect/turf_decal/trimline/opaque/brown/warning{
+	dir = 8
+	},
 /turf/open/floor/plasteel,
 /area/ship/crew/canteen)
 "hj" = (
@@ -751,6 +764,9 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 8
 	},
+/obj/effect/turf_decal/spline/fancy/opaque/brown{
+	dir = 1
+	},
 /turf/open/floor/plasteel/patterned/cargo_one,
 /area/ship/cargo)
 "hk" = (
@@ -986,6 +1002,9 @@
 	dir = 6
 	},
 /obj/machinery/vending/sovietsoda,
+/obj/effect/turf_decal/spline/fancy/opaque/brown{
+	dir = 1
+	},
 /turf/open/floor/plasteel/patterned/cargo_one,
 /area/ship/cargo)
 "iZ" = (
@@ -1294,6 +1313,7 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 9
 	},
+/obj/effect/turf_decal/spline/fancy/opaque/brown,
 /turf/open/floor/plasteel/patterned/cargo_one,
 /area/ship/cargo)
 "nv" = (
@@ -1642,6 +1662,9 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 8
 	},
+/obj/effect/turf_decal/industrial/warning/corner{
+	dir = 8
+	},
 /turf/open/floor/plasteel,
 /area/ship/crew/canteen)
 "rh" = (
@@ -1769,6 +1792,7 @@
 	dir = 8
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/effect/turf_decal/spline/fancy/opaque/brown,
 /turf/open/floor/plasteel/patterned/cargo_one,
 /area/ship/cargo)
 "sh" = (
@@ -2037,6 +2061,9 @@
 	},
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
+/obj/effect/turf_decal/spline/fancy/opaque/brown{
+	dir = 1
+	},
 /turf/open/floor/plasteel/patterned/cargo_one,
 /area/ship/cargo)
 "vH" = (
@@ -2451,6 +2478,9 @@
 	pixel_y = 24;
 	pixel_x = 14
 	},
+/obj/effect/turf_decal/trimline/opaque/brown/line{
+	dir = 8
+	},
 /turf/open/floor/plasteel,
 /area/ship/crew/canteen)
 "zH" = (
@@ -2504,6 +2534,7 @@
 	pixel_y = -22;
 	dir = 1
 	},
+/obj/effect/turf_decal/spline/fancy/opaque/brown,
 /turf/open/floor/plasteel/patterned/cargo_one,
 /area/ship/cargo)
 "Ao" = (
@@ -2597,6 +2628,7 @@
 	icon_state = "4-8"
 	},
 /obj/machinery/airalarm/directional/south,
+/obj/effect/turf_decal/spline/fancy/opaque/brown,
 /turf/open/floor/plasteel/patterned/cargo_one,
 /area/ship/cargo)
 "Cg" = (
@@ -2630,6 +2662,9 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 6
 	},
+/obj/effect/turf_decal/spline/fancy/opaque/brown{
+	dir = 1
+	},
 /turf/open/floor/plasteel/patterned/cargo_one,
 /area/ship/cargo)
 "CD" = (
@@ -2648,6 +2683,7 @@
 	dir = 4
 	},
 /obj/machinery/door/firedoor,
+/obj/effect/turf_decal/spline/fancy/opaque/brown,
 /turf/open/floor/plasteel/patterned/cargo_one,
 /area/ship/cargo)
 "CH" = (
@@ -2700,6 +2736,9 @@
 /obj/machinery/light/small{
 	dir = 1
 	},
+/obj/effect/turf_decal/industrial/warning{
+	dir = 4
+	},
 /turf/open/floor/plasteel,
 /area/ship/crew/canteen)
 "DL" = (
@@ -2987,6 +3026,9 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 4
 	},
+/obj/effect/turf_decal/trimline/opaque/brown/warning{
+	dir = 8
+	},
 /turf/open/floor/plasteel,
 /area/ship/crew/canteen)
 "If" = (
@@ -3088,6 +3130,9 @@
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
 	dir = 1
 	},
+/obj/effect/turf_decal/spline/fancy/opaque/brown{
+	dir = 1
+	},
 /turf/open/floor/plasteel/patterned/cargo_one,
 /area/ship/cargo)
 "IS" = (
@@ -3209,6 +3254,7 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 4
 	},
+/obj/effect/turf_decal/spline/fancy/opaque/brown,
 /turf/open/floor/plasteel/patterned/cargo_one,
 /area/ship/cargo)
 "JU" = (
@@ -3478,6 +3524,9 @@
 	dir = 4
 	},
 /obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/sign/poster/contraband/lusty_xenomorph{
+	pixel_x = 32
+	},
 /turf/open/floor/plasteel/tech,
 /area/ship/engineering)
 "Nq" = (
@@ -3618,6 +3667,9 @@
 	dir = 5
 	},
 /obj/effect/decal/cleanable/greenglow,
+/obj/structure/sign/poster/contraband/random{
+	pixel_y = -32
+	},
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/crew/dorm)
 "ON" = (
@@ -3652,6 +3704,9 @@
 	dir = 8
 	},
 /obj/machinery/door/firedoor,
+/obj/effect/turf_decal/spline/fancy/opaque/brown{
+	dir = 1
+	},
 /turf/open/floor/plasteel/patterned/cargo_one,
 /area/ship/cargo)
 "Pm" = (
@@ -3696,6 +3751,7 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/industrial/warning,
 /turf/open/floor/plasteel,
 /area/ship/crew/canteen)
 "PN" = (
@@ -3795,6 +3851,9 @@
 	pixel_y = 4;
 	pixel_x = 8
 	},
+/obj/structure/sign/poster/contraband/random{
+	pixel_y = 32
+	},
 /turf/open/floor/carpet/nanoweave/beige,
 /area/ship/crew/dorm)
 "QH" = (
@@ -4130,16 +4189,16 @@
 /obj/structure/cable/yellow{
 	icon_state = "4-8"
 	},
+/obj/effect/turf_decal/spline/fancy/opaque/brown,
 /turf/open/floor/plasteel/patterned/cargo_one,
 /area/ship/cargo)
 "Uu" = (
 /obj/docking_port/stationary{
 	roundstart_template = "/datum/map_template/shuttle/subshuttles/minimalta";
-	dheight = 4;
-	dwidth = 7;
+	dwidth = 3;
 	height = 5;
-	width = 11
-	load_template_on_initialize = "false"
+	width = 11;
+	dir = 2
 	},
 /turf/open/floor/engine/hull/interior,
 /area/ship/cargo/office)
@@ -4154,6 +4213,12 @@
 /obj/item/kirbyplants{
 	icon_state = "plant-21"
 	},
+/obj/structure/sign/poster/contraband/rebels_unite{
+	pixel_y = 32
+	},
+/obj/effect/turf_decal/spline/fancy/opaque/brown{
+	dir = 1
+	},
 /turf/open/floor/plasteel/patterned/cargo_one,
 /area/ship/cargo)
 "UL" = (
@@ -4349,6 +4414,7 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 9
 	},
+/obj/effect/turf_decal/spline/fancy/opaque/brown,
 /turf/open/floor/plasteel/patterned/cargo_one,
 /area/ship/cargo)
 "WX" = (
@@ -4490,6 +4556,7 @@
 /obj/machinery/status_display/shuttle{
 	pixel_y = -32
 	},
+/obj/effect/turf_decal/trimline/opaque/brown/line,
 /turf/open/floor/plasteel,
 /area/ship/crew/canteen)
 "XY" = (
@@ -4582,6 +4649,10 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 5
 	},
+/obj/structure/sign/poster/official/random{
+	pixel_y = -32
+	},
+/obj/effect/turf_decal/spline/fancy/opaque/brown,
 /turf/open/floor/plasteel/patterned/cargo_one,
 /area/ship/cargo)
 "ZL" = (

From 1cab92e8a63507cfa5f227c3b38984a18bf09a3a Mon Sep 17 00:00:00 2001
From: spockye <79304582+spockye@users.noreply.github.com>
Date: Sun, 23 Jul 2023 22:45:46 +0200
Subject: [PATCH 08/19] Update pirate_mechcarrier_subship.dmm

---
 _maps/shuttles/subshuttles/pirate_mechcarrier_subship.dmm | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/_maps/shuttles/subshuttles/pirate_mechcarrier_subship.dmm b/_maps/shuttles/subshuttles/pirate_mechcarrier_subship.dmm
index da360da21d95..d04981a9f571 100644
--- a/_maps/shuttles/subshuttles/pirate_mechcarrier_subship.dmm
+++ b/_maps/shuttles/subshuttles/pirate_mechcarrier_subship.dmm
@@ -11,6 +11,10 @@
 /obj/structure/cable/yellow{
 	icon_state = "1-2"
 	},
+/obj/machinery/door/poddoor/shutters/preopen{
+	id = "minimalta_bridgedoor";
+	name = "Safety Shutter"
+	},
 /turf/open/floor/plasteel/tech/techmaint,
 /area/ship/storage)
 "d" = (
@@ -174,8 +178,8 @@
 	layer = 4.1
 	},
 /obj/machinery/button/door{
-	id = "cargopirate_sub_hatch";
-	name = "Pod Door Control";
+	id = "minimalta_bridgedoor";
+	name = "Bridge Shutter";
 	pixel_y = 22
 	},
 /turf/open/floor/plasteel/tech,

From 9fd7f17338d77a986a3aa1dc0aff7518dd98507a Mon Sep 17 00:00:00 2001
From: spockye <79304582+spockye@users.noreply.github.com>
Date: Sun, 23 Jul 2023 22:49:09 +0200
Subject: [PATCH 09/19] Update pirate_mechcarrier.dmm

---
 .../shuttles/shiptest/pirate_mechcarrier.dmm  | 274 +++++-------------
 1 file changed, 72 insertions(+), 202 deletions(-)

diff --git a/_maps/shuttles/shiptest/pirate_mechcarrier.dmm b/_maps/shuttles/shiptest/pirate_mechcarrier.dmm
index 37dd3fa7433a..6039998024f4 100644
--- a/_maps/shuttles/shiptest/pirate_mechcarrier.dmm
+++ b/_maps/shuttles/shiptest/pirate_mechcarrier.dmm
@@ -138,11 +138,7 @@
 /obj/effect/turf_decal/techfloor{
 	dir = 5
 	},
-/obj/item/radio/intercom{
-	dir = 8;
-	pixel_x = 22;
-	pixel_y = -1
-	},
+/obj/item/radio/intercom/directional/east,
 /turf/open/floor/plasteel/tech,
 /area/ship/engineering)
 "br" = (
@@ -252,9 +248,7 @@
 	pixel_x = -7;
 	pixel_y = -9
 	},
-/obj/machinery/light/small{
-	dir = 4
-	},
+/obj/machinery/light/small/directional/east,
 /obj/machinery/airalarm/directional/east,
 /obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/plasteel/patterned/grid,
@@ -307,11 +301,7 @@
 	pixel_x = 2;
 	pixel_y = 4
 	},
-/obj/machinery/firealarm{
-	dir = 4;
-	pixel_x = -23;
-	pixel_y = 10
-	},
+/obj/machinery/firealarm/directional/west,
 /turf/open/floor/carpet/nanoweave/beige,
 /area/ship/crew/dorm)
 "cQ" = (
@@ -399,7 +389,7 @@
 	dir = 8
 	},
 /obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/light/small,
+/obj/machinery/light/small/directional/south,
 /turf/open/floor/plating/catwalk_floor,
 /area/ship/crew/canteen)
 "dE" = (
@@ -572,9 +562,7 @@
 /obj/effect/turf_decal/industrial/outline/yellow,
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/closet/cardboard,
-/obj/machinery/light{
-	dir = 1
-	},
+/obj/machinery/light/directional/north,
 /obj/structure/sign/departments/cargo{
 	pixel_y = 32
 	},
@@ -624,7 +612,7 @@
 	},
 /area/ship/crew/dorm)
 "fZ" = (
-/obj/item/radio/intercom{
+/obj/item/radio/intercom/directional/north{
 	pixel_y = 23
 	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
@@ -819,7 +807,7 @@
 	dir = 10;
 	layer = 4.1
 	},
-/obj/item/radio/intercom{
+/obj/item/radio/intercom/directional/north{
 	pixel_y = 23
 	},
 /turf/open/floor/plasteel/patterned/grid,
@@ -856,9 +844,7 @@
 "hI" = (
 /obj/machinery/vending/wardrobe/jani_wardrobe,
 /obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/light/small{
-	dir = 8
-	},
+/obj/machinery/light/small/directional/west,
 /turf/open/floor/plasteel,
 /area/ship/crew/canteen)
 "hM" = (
@@ -1049,12 +1035,10 @@
 /obj/structure/table/reinforced{
 	color = "#c1b6a5"
 	},
-/obj/machinery/light{
-	dir = 1
-	},
+/obj/machinery/light/directional/north,
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/effect/decal/cleanable/dirt,
-/obj/machinery/power/apc/auto_name/north,
+/obj/machinery/power/apc/auto_name/directional/north,
 /obj/structure/cable/yellow{
 	icon_state = "0-2"
 	},
@@ -1072,14 +1056,14 @@
 	pixel_y = 4
 	},
 /obj/effect/decal/cleanable/cobweb/cobweb2,
-/obj/machinery/power/apc/auto_name/north,
+/obj/machinery/power/apc/auto_name/directional/north,
 /obj/structure/cable/yellow{
 	icon_state = "0-2"
 	},
 /turf/open/floor/carpet/nanoweave/beige,
 /area/ship/crew/dorm)
 "jU" = (
-/obj/machinery/light,
+/obj/machinery/light/directional/south,
 /obj/structure/cable/yellow{
 	icon_state = "4-8"
 	},
@@ -1189,11 +1173,7 @@
 	layer = 4.1
 	},
 /obj/structure/cable,
-/obj/machinery/firealarm{
-	dir = 4;
-	pixel_x = -23;
-	pixel_y = 10
-	},
+/obj/machinery/firealarm/directional/west,
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/engineering)
 "mb" = (
@@ -1234,9 +1214,7 @@
 "mB" = (
 /obj/structure/tank_dispenser/oxygen,
 /obj/effect/turf_decal/industrial/hatch/yellow,
-/obj/machinery/light/small{
-	dir = 4
-	},
+/obj/machinery/light/small/directional/east,
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/crew/canteen)
 "mL" = (
@@ -1288,9 +1266,7 @@
 	dir = 8
 	},
 /obj/effect/turf_decal/siding/thinplating/dark/corner,
-/obj/machinery/light/dim{
-	dir = 1
-	},
+/obj/machinery/light/dim/directional/north,
 /obj/effect/turf_decal/techfloor{
 	dir = 1
 	},
@@ -1414,9 +1390,7 @@
 /obj/effect/turf_decal/siding/thinplating/dark{
 	dir = 4
 	},
-/obj/machinery/light/dim{
-	dir = 8
-	},
+/obj/machinery/light/dim/directional/west,
 /obj/effect/turf_decal/techfloor{
 	dir = 8
 	},
@@ -1529,9 +1503,7 @@
 /obj/effect/turf_decal/industrial/outline/yellow,
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/effect/decal/cleanable/dirt,
-/obj/machinery/light{
-	dir = 8
-	},
+/obj/machinery/light/directional/west,
 /obj/structure/railing/corner{
 	dir = 1
 	},
@@ -1851,7 +1823,7 @@
 /obj/structure/cable/yellow{
 	icon_state = "0-9"
 	},
-/obj/machinery/power/apc/auto_name/south,
+/obj/machinery/power/apc/auto_name/directional/south,
 /turf/open/floor/plating{
 	icon_state = "foam_plating"
 	},
@@ -1870,9 +1842,7 @@
 /obj/machinery/holopad/emergency/command,
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/effect/decal/cleanable/dirt,
-/obj/structure/extinguisher_cabinet{
-	pixel_y = -29
-	},
+/obj/structure/extinguisher_cabinet/directional/north,
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/bridge)
 "sX" = (
@@ -1906,9 +1876,7 @@
 /obj/effect/turf_decal/industrial/outline/yellow,
 /obj/structure/closet/crate/coffin,
 /obj/effect/mob_spawn/human/corpse/cargo_tech,
-/obj/machinery/light{
-	dir = 1
-	},
+/obj/machinery/light/directional/north,
 /obj/structure/cable/yellow{
 	icon_state = "2-4"
 	},
@@ -1916,10 +1884,7 @@
 /area/ship/cargo)
 "ty" = (
 /obj/effect/decal/cleanable/dirt/dust,
-/obj/structure/extinguisher_cabinet{
-	pixel_x = -25;
-	pixel_y = 1
-	},
+/obj/structure/extinguisher_cabinet/directional/north,
 /obj/structure/cable/yellow{
 	icon_state = "1-6"
 	},
@@ -1945,13 +1910,8 @@
 /obj/effect/turf_decal/siding/wood{
 	dir = 5
 	},
-/obj/item/radio/intercom/wideband{
-	pixel_x = 24;
-	dir = 8
-	},
-/obj/machinery/light{
-	dir = 1
-	},
+/obj/item/radio/intercom/wideband/directional/east,
+/obj/machinery/light/directional/north,
 /obj/structure/plaque/static_plaque/golden/captain{
 	pixel_y = 29
 	},
@@ -2127,9 +2087,7 @@
 /obj/effect/turf_decal/industrial/traffic{
 	dir = 4
 	},
-/obj/structure/extinguisher_cabinet{
-	pixel_y = 30
-	},
+/obj/structure/extinguisher_cabinet/directional/north,
 /turf/open/floor/plasteel/patterned/cargo_one,
 /area/ship/cargo)
 "wm" = (
@@ -2139,11 +2097,7 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /obj/structure/catwalk/over,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/item/radio/intercom{
-	dir = 4;
-	pixel_x = -22;
-	pixel_y = 1
-	},
+/obj/item/radio/intercom/directional/west,
 /turf/open/floor/plating,
 /area/ship/engineering)
 "wn" = (
@@ -2173,9 +2127,7 @@
 /area/ship/crew/canteen)
 "wD" = (
 /obj/effect/turf_decal/siding/thinplating/dark,
-/obj/machinery/light/dim{
-	dir = 1
-	},
+/obj/machinery/light/dim/directional/north,
 /obj/effect/turf_decal/techfloor{
 	dir = 1
 	},
@@ -2189,10 +2141,7 @@
 /obj/structure/cable/yellow{
 	icon_state = "4-8"
 	},
-/obj/machinery/firealarm{
-	dir = 1;
-	pixel_y = -23
-	},
+/obj/machinery/firealarm/directional/south,
 /turf/open/floor/plasteel/stairs{
 	dir = 4
 	},
@@ -2268,10 +2217,7 @@
 	pixel_x = 6;
 	pixel_y = -3
 	},
-/obj/machinery/firealarm{
-	pixel_y = -22;
-	dir = 1
-	},
+/obj/machinery/firealarm/directional/south,
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/engineering)
 "xJ" = (
@@ -2305,19 +2251,13 @@
 /obj/structure/cable/yellow{
 	icon_state = "4-8"
 	},
-/obj/machinery/firealarm{
-	dir = 1;
-	pixel_y = -23
-	},
+/obj/machinery/firealarm/directional/south,
 /turf/open/floor/plasteel,
 /area/ship/cargo)
 "yi" = (
 /obj/machinery/mecha_part_fabricator,
 /obj/effect/decal/cleanable/cobweb,
-/obj/structure/extinguisher_cabinet{
-	pixel_x = -25;
-	pixel_y = 1
-	},
+/obj/structure/extinguisher_cabinet/directional/north,
 /obj/structure/railing{
 	dir = 8;
 	layer = 4.1
@@ -2342,7 +2282,7 @@
 /obj/structure/cable/yellow{
 	icon_state = "0-2"
 	},
-/obj/machinery/power/apc/auto_name/east,
+/obj/machinery/power/apc/auto_name/directional/east,
 /obj/machinery/airalarm/directional/north,
 /turf/open/floor/plasteel/telecomms_floor,
 /area/ship/science/robotics)
@@ -2469,15 +2409,11 @@
 	layer = 3.1
 	},
 /obj/effect/decal/cleanable/dirt,
-/obj/machinery/power/apc/auto_name/north,
+/obj/machinery/power/apc/auto_name/directional/north,
 /obj/structure/cable/yellow{
 	icon_state = "0-2"
 	},
-/obj/machinery/firealarm{
-	dir = 2;
-	pixel_y = 24;
-	pixel_x = 14
-	},
+/obj/machinery/firealarm/directional/north,
 /obj/effect/turf_decal/trimline/opaque/brown/line{
 	dir = 8
 	},
@@ -2530,10 +2466,7 @@
 /obj/structure/cable/yellow{
 	icon_state = "4-8"
 	},
-/obj/machinery/firealarm{
-	pixel_y = -22;
-	dir = 1
-	},
+/obj/machinery/firealarm/directional/south,
 /obj/effect/turf_decal/spline/fancy/opaque/brown,
 /turf/open/floor/plasteel/patterned/cargo_one,
 /area/ship/cargo)
@@ -2669,13 +2602,13 @@
 /area/ship/cargo)
 "CD" = (
 /obj/machinery/medical_kiosk,
-/obj/machinery/light,
+/obj/machinery/light/directional/south,
 /turf/open/floor/plasteel,
 /area/ship/crew/canteen)
 "CF" = (
 /obj/structure/railing/corner,
 /obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/light,
+/obj/machinery/light/directional/south,
 /obj/structure/cable/yellow{
 	icon_state = "4-8"
 	},
@@ -2699,11 +2632,7 @@
 	},
 /obj/structure/closet/toolcloset,
 /obj/item/clothing/head/welding,
-/obj/machinery/firealarm{
-	dir = 1;
-	pixel_y = -23;
-	pixel_x = 9
-	},
+/obj/machinery/firealarm/directional/south,
 /turf/open/floor/plasteel/patterned/grid,
 /area/ship/cargo/office)
 "Dj" = (
@@ -2733,9 +2662,7 @@
 	dir = 4
 	},
 /obj/machinery/processor,
-/obj/machinery/light/small{
-	dir = 1
-	},
+/obj/machinery/light/small/directional/north,
 /obj/effect/turf_decal/industrial/warning{
 	dir = 4
 	},
@@ -2774,9 +2701,7 @@
 	dir = 9
 	},
 /obj/effect/decal/cleanable/vomit/old,
-/obj/machinery/light{
-	dir = 8
-	},
+/obj/machinery/light/directional/west,
 /obj/machinery/door/firedoor/border_only{
 	dir = 1
 	},
@@ -2808,7 +2733,7 @@
 /obj/structure/window/reinforced{
 	dir = 8
 	},
-/obj/item/radio/intercom{
+/obj/item/radio/intercom/directional/north{
 	pixel_y = 23
 	},
 /turf/open/floor/plasteel/telecomms_floor,
@@ -2942,9 +2867,7 @@
 /obj/item/mop,
 /obj/item/pushbroom,
 /obj/item/reagent_containers/glass/bucket,
-/obj/structure/extinguisher_cabinet{
-	pixel_y = -29
-	},
+/obj/structure/extinguisher_cabinet/directional/north,
 /turf/open/floor/plasteel,
 /area/ship/crew/canteen)
 "GJ" = (
@@ -2983,7 +2906,7 @@
 /obj/effect/turf_decal/siding/wood/corner{
 	dir = 1
 	},
-/obj/machinery/light/small,
+/obj/machinery/light/small/directional/south,
 /obj/item/clothing/under/costume/pirate,
 /obj/item/clothing/under/costume/pirate,
 /obj/item/clothing/under/costume/pirate,
@@ -3139,7 +3062,7 @@
 /obj/effect/turf_decal/techfloor{
 	dir = 5
 	},
-/obj/item/radio/intercom{
+/obj/item/radio/intercom/directional/north{
 	pixel_y = 23
 	},
 /obj/machinery/computer/secure_data/laptop{
@@ -3195,11 +3118,7 @@
 /obj/structure/cable/yellow{
 	icon_state = "1-9"
 	},
-/obj/item/radio/intercom{
-	dir = 1;
-	pixel_x = -5;
-	pixel_y = -22
-	},
+/obj/item/radio/intercom/directional/south,
 /turf/open/floor/plating,
 /area/ship/cargo)
 "Jh" = (
@@ -3214,11 +3133,7 @@
 /turf/open/floor/plasteel,
 /area/ship/crew/canteen)
 "Jo" = (
-/obj/item/radio/intercom{
-	dir = 1;
-	pixel_x = -5;
-	pixel_y = -22
-	},
+/obj/item/radio/intercom/directional/south,
 /obj/structure/curtain/bounty,
 /obj/effect/turf_decal/siding/wood,
 /obj/effect/turf_decal/siding/wood{
@@ -3245,9 +3160,7 @@
 /area/ship/bridge)
 "JN" = (
 /obj/effect/decal/cleanable/dirt/dust,
-/obj/structure/extinguisher_cabinet{
-	pixel_y = -29
-	},
+/obj/structure/extinguisher_cabinet/directional/north,
 /obj/structure/cable/yellow{
 	icon_state = "4-8"
 	},
@@ -3289,9 +3202,7 @@
 	},
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
-/obj/machinery/light/small{
-	dir = 4
-	},
+/obj/machinery/light/small/directional/east,
 /obj/effect/mob_spawn/human/corpse/cargo_tech,
 /obj/effect/decal/cleanable/vomit/old,
 /obj/effect/decal/cleanable/blood/old,
@@ -3376,9 +3287,7 @@
 /obj/structure/cable/yellow{
 	icon_state = "0-4"
 	},
-/obj/machinery/light/small{
-	dir = 8
-	},
+/obj/machinery/light/small/directional/west,
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/engineering)
 "Lq" = (
@@ -3400,9 +3309,7 @@
 /obj/effect/turf_decal/spline/fancy/opaque/black{
 	dir = 9
 	},
-/obj/machinery/light{
-	dir = 4
-	},
+/obj/machinery/light/directional/east,
 /turf/open/floor/plasteel/tech,
 /area/ship/security)
 "Lv" = (
@@ -3418,7 +3325,7 @@
 /obj/structure/cable/yellow{
 	icon_state = "4-8"
 	},
-/obj/machinery/power/apc/auto_name/north,
+/obj/machinery/power/apc/auto_name/directional/north,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 4
 	},
@@ -3461,7 +3368,7 @@
 /area/ship/cargo)
 "Mp" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/machinery/light,
+/obj/machinery/light/directional/south,
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
 	dir = 1
 	},
@@ -3499,7 +3406,7 @@
 	pixel_y = -4
 	},
 /obj/effect/decal/cleanable/cobweb/cobweb2,
-/obj/machinery/power/apc/auto_name/north,
+/obj/machinery/power/apc/auto_name/directional/north,
 /obj/structure/cable/yellow{
 	icon_state = "0-8"
 	},
@@ -3520,9 +3427,7 @@
 /obj/effect/turf_decal/techfloor/corner{
 	dir = 8
 	},
-/obj/machinery/light/small{
-	dir = 4
-	},
+/obj/machinery/light/small/directional/east,
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/structure/sign/poster/contraband/lusty_xenomorph{
 	pixel_x = 32
@@ -3553,9 +3458,7 @@
 /obj/machinery/atmospherics/pipe/simple/orange/hidden{
 	dir = 4
 	},
-/obj/machinery/light{
-	dir = 1
-	},
+/obj/machinery/light/directional/north,
 /turf/open/floor/plating,
 /area/ship/engineering)
 "NR" = (
@@ -3641,7 +3544,7 @@
 "Oy" = (
 /obj/machinery/suit_storage_unit/independent/pilot,
 /obj/effect/turf_decal/industrial/outline/yellow,
-/obj/machinery/power/apc/auto_name/north,
+/obj/machinery/power/apc/auto_name/directional/north,
 /obj/structure/cable/yellow{
 	icon_state = "0-8"
 	},
@@ -3659,10 +3562,7 @@
 /obj/machinery/cryopod{
 	dir = 1
 	},
-/obj/machinery/computer/cryopod{
-	pixel_x = -23;
-	dir = 4
-	},
+/obj/machinery/computer/cryopod/directional/west,
 /obj/effect/turf_decal/industrial/warning{
 	dir = 5
 	},
@@ -3673,11 +3573,7 @@
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/crew/dorm)
 "ON" = (
-/obj/item/radio/intercom{
-	dir = 1;
-	pixel_x = -5;
-	pixel_y = -22
-	},
+/obj/item/radio/intercom/directional/south,
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 9
@@ -3745,9 +3641,7 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 6
 	},
-/obj/machinery/light{
-	dir = 8
-	},
+/obj/machinery/light/directional/west,
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
@@ -3758,9 +3652,7 @@
 /obj/effect/turf_decal/siding/thinplating/dark/corner{
 	dir = 8
 	},
-/obj/machinery/light/small{
-	dir = 1
-	},
+/obj/machinery/light/small/directional/north,
 /obj/effect/turf_decal/techfloor{
 	dir = 5
 	},
@@ -3883,7 +3775,7 @@
 /obj/structure/sign/poster/contraband/random{
 	pixel_x = -32
 	},
-/obj/item/radio/intercom{
+/obj/item/radio/intercom/directional/north{
 	pixel_y = 23
 	},
 /turf/open/floor/plasteel,
@@ -3929,9 +3821,7 @@
 	color = "#808080"
 	},
 /obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/light/small{
-	dir = 8
-	},
+/obj/machinery/light/small/directional/west,
 /turf/open/floor/plasteel/dark,
 /area/ship/security)
 "Rf" = (
@@ -3965,11 +3855,7 @@
 	},
 /obj/item/gun/ballistic/derringer,
 /obj/structure/guncase,
-/obj/item/radio/intercom{
-	dir = 1;
-	pixel_x = -5;
-	pixel_y = -22
-	},
+/obj/item/radio/intercom/directional/south,
 /turf/open/floor/plasteel/tech,
 /area/ship/security)
 "RH" = (
@@ -3996,7 +3882,7 @@
 /obj/effect/turf_decal/siding/thinplating/dark{
 	dir = 1
 	},
-/obj/machinery/light/dim,
+/obj/machinery/light/dim/directional/south,
 /obj/effect/turf_decal/techfloor,
 /turf/open/floor/plasteel/tech,
 /area/ship/cargo/office)
@@ -4072,12 +3958,8 @@
 /turf/open/floor/wood,
 /area/ship/crew/dorm)
 "SJ" = (
-/obj/machinery/light,
-/obj/machinery/firealarm{
-	dir = 1;
-	pixel_y = -23;
-	pixel_x = 10
-	},
+/obj/machinery/light/directional/south,
+/obj/machinery/firealarm/directional/south,
 /turf/open/floor/plasteel/stairs{
 	icon = 'icons/obj/stairs.dmi';
 	dir = 8
@@ -4144,10 +4026,7 @@
 /obj/structure/sign/poster/contraband/random{
 	pixel_y = 32
 	},
-/obj/item/radio/intercom{
-	dir = 8;
-	pixel_x = 22
-	},
+/obj/item/radio/intercom/directional/east,
 /turf/open/floor/plasteel,
 /area/ship/crew/canteen)
 "TK" = (
@@ -4172,7 +4051,7 @@
 /turf/open/floor/plating,
 /area/ship/science/robotics)
 "Ud" = (
-/obj/machinery/light,
+/obj/machinery/light/directional/south,
 /obj/structure/cable/yellow{
 	icon_state = "4-8"
 	},
@@ -4185,7 +4064,7 @@
 /area/ship/cargo)
 "Ur" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/machinery/light,
+/obj/machinery/light/directional/south,
 /obj/structure/cable/yellow{
 	icon_state = "4-8"
 	},
@@ -4227,10 +4106,7 @@
 	dir = 4
 	},
 /obj/structure/reagent_dispensers/beerkeg,
-/obj/item/radio/intercom{
-	dir = 8;
-	pixel_x = 22
-	},
+/obj/item/radio/intercom/directional/east,
 /turf/open/floor/plasteel/patterned,
 /area/ship/cargo)
 "Ve" = (
@@ -4241,9 +4117,7 @@
 	dir = 9
 	},
 /obj/effect/decal/cleanable/dirt/dust,
-/obj/machinery/light/small{
-	dir = 8
-	},
+/obj/machinery/light/small/directional/west,
 /obj/structure/cable/yellow{
 	icon_state = "1-2"
 	},
@@ -4352,9 +4226,7 @@
 "We" = (
 /obj/structure/chair,
 /obj/effect/decal/cleanable/dirt,
-/obj/machinery/light{
-	dir = 1
-	},
+/obj/machinery/light/directional/north,
 /turf/open/floor/plating{
 	icon_state = "panelscorched"
 	},
@@ -4550,9 +4422,7 @@
 	pixel_x = 6
 	},
 /obj/item/trash/chips,
-/obj/structure/extinguisher_cabinet{
-	pixel_x = 26
-	},
+/obj/structure/extinguisher_cabinet/directional/north,
 /obj/machinery/status_display/shuttle{
 	pixel_y = -32
 	},

From 51c09390c6dd8f12d2e65842db2ade311cb1645f Mon Sep 17 00:00:00 2001
From: spockye <79304582+spockye@users.noreply.github.com>
Date: Sun, 23 Jul 2023 22:49:47 +0200
Subject: [PATCH 10/19] Update pirate_mechcarrier_subship.dmm

---
 .../subshuttles/pirate_mechcarrier_subship.dmm         | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/_maps/shuttles/subshuttles/pirate_mechcarrier_subship.dmm b/_maps/shuttles/subshuttles/pirate_mechcarrier_subship.dmm
index d04981a9f571..8a484ac35634 100644
--- a/_maps/shuttles/subshuttles/pirate_mechcarrier_subship.dmm
+++ b/_maps/shuttles/subshuttles/pirate_mechcarrier_subship.dmm
@@ -50,10 +50,8 @@
 	dir = 8;
 	layer = 4.1
 	},
-/obj/machinery/light/dim,
-/obj/structure/extinguisher_cabinet{
-	pixel_y = -29
-	},
+/obj/machinery/light/dim/directional/south,
+/obj/structure/extinguisher_cabinet/directional/north,
 /obj/structure/cable{
 	icon_state = "4-9"
 	},
@@ -78,7 +76,7 @@
 /obj/effect/turf_decal/steeldecal/steel_decals7{
 	dir = 9
 	},
-/obj/machinery/power/apc/auto_name/south,
+/obj/machinery/power/apc/auto_name/directional/south,
 /obj/structure/cable{
 	icon_state = "0-8"
 	},
@@ -327,7 +325,7 @@
 /obj/machinery/atmospherics/pipe/simple/orange/hidden{
 	dir = 8
 	},
-/obj/machinery/light/dim,
+/obj/machinery/light/dim/directional/south,
 /turf/open/floor/plasteel/patterned/cargo_one,
 /area/ship/storage)
 "Z" = (

From 76b48c9ae3cc5101db37f20ec5661e5e3c1beaf9 Mon Sep 17 00:00:00 2001
From: spockye <79304582+spockye@users.noreply.github.com>
Date: Sun, 23 Jul 2023 22:59:47 +0200
Subject: [PATCH 11/19] fixes up past and new mistakes

---
 .../shuttles/shiptest/pirate_mechcarrier.dmm  | 168 +++++++-----------
 .../pirate_mechcarrier_subship.dmm            |   3 +-
 2 files changed, 71 insertions(+), 100 deletions(-)

diff --git a/_maps/shuttles/shiptest/pirate_mechcarrier.dmm b/_maps/shuttles/shiptest/pirate_mechcarrier.dmm
index 6039998024f4..86c0f3a22f7b 100644
--- a/_maps/shuttles/shiptest/pirate_mechcarrier.dmm
+++ b/_maps/shuttles/shiptest/pirate_mechcarrier.dmm
@@ -244,10 +244,6 @@
 	pixel_y = 6;
 	dir = 8
 	},
-/obj/item/spacepod_key{
-	pixel_x = -7;
-	pixel_y = -9
-	},
 /obj/machinery/light/small/directional/east,
 /obj/machinery/airalarm/directional/east,
 /obj/effect/decal/cleanable/dirt/dust,
@@ -369,9 +365,6 @@
 /turf/open/floor/plating,
 /area/ship/crew/canteen)
 "do" = (
-/obj/structure/railing/corner{
-	dir = 4
-	},
 /obj/effect/turf_decal/industrial/loading{
 	dir = 8
 	},
@@ -391,7 +384,7 @@
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/machinery/light/small/directional/south,
 /turf/open/floor/plating/catwalk_floor,
-/area/ship/crew/canteen)
+/area/ship/crew/dorm)
 "dE" = (
 /obj/effect/turf_decal/corner/opaque/yellow/half{
 	dir = 1
@@ -499,7 +492,8 @@
 	},
 /obj/machinery/door/poddoor{
 	id = "cargopirate_thrusters";
-	name = "Thruster Blast Door"
+	name = "Thruster Blast Door";
+	dir = 4
 	},
 /turf/open/floor/plating,
 /area/ship/engineering)
@@ -612,9 +606,6 @@
 	},
 /area/ship/crew/dorm)
 "fZ" = (
-/obj/item/radio/intercom/directional/north{
-	pixel_y = 23
-	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 4
 	},
@@ -624,6 +615,7 @@
 /obj/effect/turf_decal/spline/fancy/opaque/brown{
 	dir = 1
 	},
+/obj/item/radio/intercom/directional/north,
 /turf/open/floor/plasteel/patterned/cargo_one,
 /area/ship/cargo)
 "ga" = (
@@ -1063,7 +1055,6 @@
 /turf/open/floor/carpet/nanoweave/beige,
 /area/ship/crew/dorm)
 "jU" = (
-/obj/machinery/light/directional/south,
 /obj/structure/cable/yellow{
 	icon_state = "4-8"
 	},
@@ -1149,7 +1140,8 @@
 /obj/structure/window/plasma/reinforced/spawner/east,
 /obj/machinery/door/poddoor{
 	id = "cargopirate_thrusters";
-	name = "Thruster Blast Door"
+	name = "Thruster Blast Door";
+	dir = 4
 	},
 /turf/open/floor/plating,
 /area/ship/engineering)
@@ -1484,10 +1476,6 @@
 /area/ship/cargo/office)
 "pM" = (
 /obj/structure/rack,
-/obj/structure/railing{
-	dir = 1;
-	layer = 4.1
-	},
 /obj/item/storage/toolbox/electrical,
 /obj/item/storage/belt/utility/full/engi,
 /obj/item/clothing/glasses/welding{
@@ -1584,6 +1572,10 @@
 	dir = 8
 	},
 /obj/effect/decal/cleanable/dirt,
+/obj/structure/railing{
+	dir = 6;
+	layer = 3.1
+	},
 /turf/open/floor/plasteel/tech,
 /area/ship/bridge)
 "qN" = (
@@ -1836,6 +1828,7 @@
 /obj/effect/turf_decal/techfloor{
 	dir = 8
 	},
+/obj/structure/railing,
 /turf/open/floor/plasteel/tech,
 /area/ship/engineering)
 "sV" = (
@@ -1858,12 +1851,12 @@
 	dir = 2
 	},
 /obj/effect/turf_decal/industrial/outline/yellow,
+/obj/item/clothing/suit/space/hardsuit/security/independent/frontier,
 /obj/structure/railing{
 	dir = 1;
-	layer = 4.1
+	layer = 2.8
 	},
 /obj/machinery/suit_storage_unit/inherit,
-/obj/item/clothing/suit/space/hardsuit/security/independent/frontier,
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/security)
 "tr" = (
@@ -1898,12 +1891,12 @@
 	dir = 2
 	},
 /obj/effect/turf_decal/industrial/outline/yellow,
+/obj/item/clothing/suit/space/hardsuit/mining,
 /obj/structure/railing{
 	dir = 1;
-	layer = 4.1
+	layer = 2.8
 	},
 /obj/machinery/suit_storage_unit/inherit,
-/obj/item/clothing/suit/space/hardsuit/mining,
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/security)
 "ub" = (
@@ -1911,13 +1904,21 @@
 	dir = 5
 	},
 /obj/item/radio/intercom/wideband/directional/east,
-/obj/machinery/light/directional/north,
 /obj/structure/plaque/static_plaque/golden/captain{
 	pixel_y = 29
 	},
 /obj/machinery/computer/cargo/express,
 /turf/open/floor/wood,
 /area/ship/bridge)
+"uj" = (
+/obj/machinery/door/poddoor/shutters/preopen{
+	id = "cargopirate_bridge";
+	name = "Blast Shutters";
+	dir = 4
+	},
+/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
+/turf/open/floor/plating,
+/area/ship/bridge)
 "uo" = (
 /obj/machinery/power/terminal{
 	dir = 1
@@ -1979,9 +1980,6 @@
 /turf/open/floor/plasteel/tech/techmaint,
 /area/ship/engineering)
 "uS" = (
-/obj/structure/railing/corner{
-	dir = 1
-	},
 /obj/effect/turf_decal/steeldecal/steel_decals1,
 /obj/effect/turf_decal/steeldecal/steel_decals10{
 	dir = 10
@@ -2064,6 +2062,10 @@
 /obj/structure/table/reinforced{
 	color = "#c1b6a5"
 	},
+/obj/structure/railing{
+	dir = 6;
+	layer = 3.1
+	},
 /turf/open/floor/plasteel/tech,
 /area/ship/bridge)
 "vT" = (
@@ -2112,7 +2114,9 @@
 /obj/structure/railing/corner{
 	dir = 8
 	},
-/obj/machinery/door/airlock/hatch,
+/obj/machinery/door/airlock/hatch{
+	dir = 4
+	},
 /obj/structure/cable/yellow{
 	icon_state = "4-8"
 	},
@@ -2147,10 +2151,6 @@
 	},
 /area/ship/cargo)
 "wV" = (
-/obj/structure/railing{
-	dir = 8;
-	layer = 4.1
-	},
 /obj/effect/turf_decal/borderfloorblack{
 	dir = 8
 	},
@@ -2181,6 +2181,7 @@
 	pixel_x = -5;
 	pixel_y = 2
 	},
+/obj/machinery/light/directional/north,
 /turf/open/floor/wood,
 /area/ship/bridge)
 "xk" = (
@@ -2471,10 +2472,6 @@
 /turf/open/floor/plasteel/patterned/cargo_one,
 /area/ship/cargo)
 "Ao" = (
-/obj/structure/railing{
-	dir = 8;
-	layer = 4.1
-	},
 /obj/effect/turf_decal/techfloor{
 	dir = 1
 	},
@@ -2585,10 +2582,6 @@
 /turf/open/floor/plasteel/tech,
 /area/ship/science/robotics)
 "Cx" = (
-/obj/structure/railing{
-	dir = 1;
-	layer = 4.1
-	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 4
 	},
@@ -2733,9 +2726,7 @@
 /obj/structure/window/reinforced{
 	dir = 8
 	},
-/obj/item/radio/intercom/directional/north{
-	pixel_y = 23
-	},
+/obj/item/radio/intercom/directional/north,
 /turf/open/floor/plasteel/telecomms_floor,
 /area/ship/science/robotics)
 "EI" = (
@@ -2871,14 +2862,14 @@
 /turf/open/floor/plasteel,
 /area/ship/crew/canteen)
 "GJ" = (
-/obj/structure/railing{
-	dir = 1;
-	layer = 4.1
-	},
-/turf/open/floor/plasteel/stairs{
+/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
+/obj/machinery/door/poddoor/shutters/preopen{
+	id = "cargopirate_bridge";
+	name = "Blast Shutters";
 	dir = 4
 	},
-/area/ship/engineering)
+/turf/open/floor/plating,
+/area/ship/bridge)
 "GO" = (
 /obj/effect/mapping_helpers/airlock/cyclelink_helper,
 /obj/machinery/atmospherics/pipe/layer_manifold{
@@ -3016,6 +3007,7 @@
 /obj/effect/turf_decal/industrial/hatch/yellow,
 /obj/structure/closet/crate/radiation,
 /obj/item/stack/sheet/mineral/uranium,
+/obj/machinery/light/directional/west,
 /turf/open/floor/plasteel/patterned/cargo_one,
 /area/ship/cargo)
 "IF" = (
@@ -3062,9 +3054,6 @@
 /obj/effect/turf_decal/techfloor{
 	dir = 5
 	},
-/obj/item/radio/intercom/directional/north{
-	pixel_y = 23
-	},
 /obj/machinery/computer/secure_data/laptop{
 	pixel_x = -35;
 	pixel_y = 1
@@ -3091,6 +3080,11 @@
 /obj/structure/table/reinforced{
 	color = "#c1b6a5"
 	},
+/obj/item/radio/intercom/directional/north,
+/obj/structure/railing{
+	dir = 4;
+	layer = 3.1
+	},
 /turf/open/floor/plasteel/tech,
 /area/ship/bridge)
 "Jc" = (
@@ -3160,7 +3154,6 @@
 /area/ship/bridge)
 "JN" = (
 /obj/effect/decal/cleanable/dirt/dust,
-/obj/structure/extinguisher_cabinet/directional/north,
 /obj/structure/cable/yellow{
 	icon_state = "4-8"
 	},
@@ -3168,6 +3161,7 @@
 	dir = 4
 	},
 /obj/effect/turf_decal/spline/fancy/opaque/brown,
+/obj/structure/extinguisher_cabinet/directional/south,
 /turf/open/floor/plasteel/patterned/cargo_one,
 /area/ship/cargo)
 "JU" = (
@@ -3215,10 +3209,6 @@
 /turf/open/floor/plating,
 /area/ship/cargo)
 "KK" = (
-/obj/structure/railing{
-	dir = 2;
-	layer = 4.1
-	},
 /turf/open/floor/plasteel/stairs{
 	dir = 4
 	},
@@ -3525,10 +3515,6 @@
 	},
 /area/ship/bridge)
 "Ow" = (
-/obj/structure/railing{
-	dir = 8;
-	layer = 4.1
-	},
 /obj/effect/turf_decal/techfloor,
 /obj/effect/turf_decal/borderfloorblack{
 	dir = 8
@@ -3589,9 +3575,6 @@
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/bridge)
 "Pi" = (
-/obj/structure/railing/corner{
-	dir = 4
-	},
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 4
@@ -3603,6 +3586,7 @@
 /obj/effect/turf_decal/spline/fancy/opaque/brown{
 	dir = 1
 	},
+/obj/machinery/light/directional/north,
 /turf/open/floor/plasteel/patterned/cargo_one,
 /area/ship/cargo)
 "Pm" = (
@@ -3616,7 +3600,6 @@
 /turf/open/floor/plasteel/patterned,
 /area/ship/cargo)
 "Pv" = (
-/obj/structure/railing/corner,
 /obj/structure/cable{
 	icon_state = "2-8"
 	},
@@ -3724,7 +3707,7 @@
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/effect/decal/cleanable/cobweb,
 /turf/open/floor/plasteel/showroomfloor,
-/area/ship/crew/canteen)
+/area/ship/crew/dorm)
 "QC" = (
 /obj/item/flashlight/lamp{
 	pixel_x = -6;
@@ -3775,9 +3758,7 @@
 /obj/structure/sign/poster/contraband/random{
 	pixel_x = -32
 	},
-/obj/item/radio/intercom/directional/north{
-	pixel_y = 23
-	},
+/obj/item/radio/intercom/directional/north,
 /turf/open/floor/plasteel,
 /area/ship/crew/canteen)
 "QR" = (
@@ -3825,10 +3806,6 @@
 /turf/open/floor/plasteel/dark,
 /area/ship/security)
 "Rf" = (
-/obj/structure/railing{
-	dir = 1;
-	layer = 4.1
-	},
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 4
 	},
@@ -3871,7 +3848,8 @@
 	},
 /obj/machinery/door/poddoor{
 	id = "cargopirate_thrusters";
-	name = "Thruster Blast Door"
+	name = "Thruster Blast Door";
+	dir = 4
 	},
 /obj/machinery/door/window/eastright{
 	name = "Engine Access"
@@ -3917,6 +3895,10 @@
 	color = "#c1b6a5"
 	},
 /obj/effect/decal/cleanable/dirt,
+/obj/structure/railing{
+	dir = 4;
+	layer = 3.1
+	},
 /turf/open/floor/plasteel/tech,
 /area/ship/bridge)
 "Ss" = (
@@ -4030,10 +4012,6 @@
 /turf/open/floor/plasteel,
 /area/ship/crew/canteen)
 "TK" = (
-/obj/structure/railing{
-	dir = 1;
-	layer = 4.1
-	},
 /obj/effect/turf_decal/spline/fancy/opaque/black{
 	dir = 1
 	},
@@ -4092,9 +4070,6 @@
 /obj/item/kirbyplants{
 	icon_state = "plant-21"
 	},
-/obj/structure/sign/poster/contraband/rebels_unite{
-	pixel_y = 32
-	},
 /obj/effect/turf_decal/spline/fancy/opaque/brown{
 	dir = 1
 	},
@@ -4181,7 +4156,9 @@
 /turf/open/floor/plasteel/telecomms_floor,
 /area/ship/science/robotics)
 "Vt" = (
-/obj/machinery/door/airlock/hatch,
+/obj/machinery/door/airlock/hatch{
+	dir = 4
+	},
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/machinery/door/firedoor,
 /turf/open/floor/plasteel/showroomfloor,
@@ -4199,9 +4176,6 @@
 /turf/open/floor/plasteel/patterned/cargo_one,
 /area/ship/cargo)
 "VX" = (
-/obj/structure/railing/corner{
-	dir = 1
-	},
 /obj/effect/turf_decal/steeldecal/steel_decals10{
 	dir = 9
 	},
@@ -4347,10 +4321,6 @@
 /turf/open/floor/plasteel,
 /area/ship/cargo)
 "Xz" = (
-/obj/structure/railing{
-	dir = 8;
-	layer = 4.1
-	},
 /obj/effect/turf_decal/borderfloorblack{
 	dir = 8
 	},
@@ -4616,7 +4586,7 @@ lj
 RH
 CH
 oK
-GJ
+KK
 KK
 CH
 CH
@@ -5228,10 +5198,10 @@ NS
 SD
 GV
 rX
-ka
-ka
-ka
-ka
+oy
+oy
+oy
+oy
 XG
 XG
 "}
@@ -5247,10 +5217,10 @@ La
 Vi
 er
 CD
-ka
+oy
 Qw
 dy
-ka
+oy
 XG
 XG
 "}
@@ -5389,10 +5359,10 @@ XG
 "}
 (45,1,1) = {"
 XG
-Zg
-Zg
-Zg
-Zg
+GJ
+GJ
+uj
+GJ
 XG
 XG
 XG
diff --git a/_maps/shuttles/subshuttles/pirate_mechcarrier_subship.dmm b/_maps/shuttles/subshuttles/pirate_mechcarrier_subship.dmm
index 8a484ac35634..a60df6ba9aa1 100644
--- a/_maps/shuttles/subshuttles/pirate_mechcarrier_subship.dmm
+++ b/_maps/shuttles/subshuttles/pirate_mechcarrier_subship.dmm
@@ -51,7 +51,6 @@
 	layer = 4.1
 	},
 /obj/machinery/light/dim/directional/south,
-/obj/structure/extinguisher_cabinet/directional/north,
 /obj/structure/cable{
 	icon_state = "4-9"
 	},
@@ -190,6 +189,7 @@
 /obj/effect/turf_decal/techfloor{
 	dir = 10
 	},
+/obj/structure/extinguisher_cabinet/directional/south,
 /turf/open/floor/plasteel/telecomms_floor,
 /area/ship/storage)
 "H" = (
@@ -219,6 +219,7 @@
 	pixel_y = 5;
 	pixel_x = -3
 	},
+/obj/structure/extinguisher_cabinet/directional/south,
 /turf/open/floor/plasteel/tech/techmaint,
 /area/ship/storage)
 "L" = (

From ad548b910a94c4c0c8787d7a78c08117e83aa02a Mon Sep 17 00:00:00 2001
From: spockye <79304582+spockye@users.noreply.github.com>
Date: Mon, 24 Jul 2023 14:48:13 +0200
Subject: [PATCH 12/19] more fixes / desc / tags

---
 _maps/configs/Pirate_mechcarrier.json         |   7 ++
 .../shuttles/shiptest/pirate_mechcarrier.dmm  | 101 ++++++++++--------
 2 files changed, 63 insertions(+), 45 deletions(-)

diff --git a/_maps/configs/Pirate_mechcarrier.json b/_maps/configs/Pirate_mechcarrier.json
index c7e4821fd34b..da7f6ed57f9b 100644
--- a/_maps/configs/Pirate_mechcarrier.json
+++ b/_maps/configs/Pirate_mechcarrier.json
@@ -5,6 +5,13 @@
 	"namelists": ["BEASTS", "PIRATES", "MERCANTILE"],
 	"map_short_name": "Malta-class",
 	"map_path": "_maps/shuttles/shiptest/pirate_mechcarrier.dmm",
+	"description": "A former cargo hauler redesigned as a pirate strike craft and troop carrier, the Malta-class features a speedy dropship, a large armory and a well-appointed mech bay complete with an assault mech. This Miskilamo ship is well-suited to smash-and-grabs against unsuspecting vessels, as well as for raiding ruins for loot in between boarding actions.",
+	"tags": [
+		"Robotics",
+		"Specialist",
+		"Riot",
+		"Combat"
+	],
 	"limit": 1,
 	"job_slots": {
 		"Captain":{
diff --git a/_maps/shuttles/shiptest/pirate_mechcarrier.dmm b/_maps/shuttles/shiptest/pirate_mechcarrier.dmm
index 86c0f3a22f7b..39c393794e31 100644
--- a/_maps/shuttles/shiptest/pirate_mechcarrier.dmm
+++ b/_maps/shuttles/shiptest/pirate_mechcarrier.dmm
@@ -146,9 +146,6 @@
 /obj/effect/turf_decal/industrial/warning{
 	dir = 8
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 8
-	},
 /turf/open/floor/plasteel/patterned,
 /area/ship/cargo)
 "bt" = (
@@ -244,7 +241,6 @@
 	pixel_y = 6;
 	dir = 8
 	},
-/obj/machinery/light/small/directional/east,
 /obj/machinery/airalarm/directional/east,
 /obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/plasteel/patterned/grid,
@@ -556,7 +552,6 @@
 /obj/effect/turf_decal/industrial/outline/yellow,
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/closet/cardboard,
-/obj/machinery/light/directional/north,
 /obj/structure/sign/departments/cargo{
 	pixel_y = 32
 	},
@@ -653,6 +648,7 @@
 	pixel_y = -4;
 	pixel_x = -3
 	},
+/obj/machinery/light/directional/north,
 /turf/open/floor/plasteel/patterned/cargo_one,
 /area/ship/cargo)
 "gt" = (
@@ -956,6 +952,9 @@
 /obj/structure/cable/yellow{
 	icon_state = "1-2"
 	},
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+	dir = 4
+	},
 /turf/open/floor/plasteel/patterned/cargo_one,
 /area/ship/cargo)
 "iL" = (
@@ -1085,6 +1084,7 @@
 /obj/structure/cable/yellow{
 	icon_state = "2-8"
 	},
+/obj/machinery/light/floor,
 /turf/open/floor/plasteel/patterned/ridged,
 /area/ship/cargo)
 "ko" = (
@@ -1650,8 +1650,10 @@
 	dir = 1
 	},
 /obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+	dir = 1
+	},
 /turf/open/floor/plasteel,
 /area/ship/cargo)
 "rt" = (
@@ -1910,15 +1912,6 @@
 /obj/machinery/computer/cargo/express,
 /turf/open/floor/wood,
 /area/ship/bridge)
-"uj" = (
-/obj/machinery/door/poddoor/shutters/preopen{
-	id = "cargopirate_bridge";
-	name = "Blast Shutters";
-	dir = 4
-	},
-/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
-/turf/open/floor/plating,
-/area/ship/bridge)
 "uo" = (
 /obj/machinery/power/terminal{
 	dir = 1
@@ -2105,8 +2098,8 @@
 "wn" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/oil/slippery,
-/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
-	dir = 8
+/obj/effect/turf_decal/miskilamo_small/left{
+	dir = 4
 	},
 /turf/open/floor/plasteel/patterned,
 /area/ship/cargo)
@@ -2253,6 +2246,9 @@
 	icon_state = "4-8"
 	},
 /obj/machinery/firealarm/directional/south,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+	dir = 1
+	},
 /turf/open/floor/plasteel,
 /area/ship/cargo)
 "yi" = (
@@ -2367,9 +2363,6 @@
 /obj/effect/turf_decal/industrial/loading{
 	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
-	dir = 6
-	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /turf/open/floor/plasteel/patterned,
 /area/ship/cargo)
@@ -2530,12 +2523,12 @@
 /obj/effect/turf_decal/industrial/loading{
 	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 6
-	},
 /obj/structure/cable/yellow{
 	icon_state = "1-5"
 	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+	dir = 10
+	},
 /turf/open/floor/plasteel/patterned,
 /area/ship/cargo)
 "BI" = (
@@ -2694,7 +2687,6 @@
 	dir = 9
 	},
 /obj/effect/decal/cleanable/vomit/old,
-/obj/machinery/light/directional/west,
 /obj/machinery/door/firedoor/border_only{
 	dir = 1
 	},
@@ -2731,8 +2723,8 @@
 /area/ship/science/robotics)
 "EI" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
-	dir = 8
+/obj/effect/turf_decal/miskilamo_small{
+	dir = 4
 	},
 /turf/open/floor/plasteel/patterned,
 /area/ship/cargo)
@@ -2756,6 +2748,7 @@
 	pixel_x = -6
 	},
 /obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/light/small/directional/east,
 /turf/open/floor/plasteel/patterned/grid,
 /area/ship/cargo/office)
 "EY" = (
@@ -2862,14 +2855,10 @@
 /turf/open/floor/plasteel,
 /area/ship/crew/canteen)
 "GJ" = (
-/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
-/obj/machinery/door/poddoor/shutters/preopen{
-	id = "cargopirate_bridge";
-	name = "Blast Shutters";
+/turf/open/floor/plasteel/stairs{
 	dir = 4
 	},
-/turf/open/floor/plating,
-/area/ship/bridge)
+/area/ship/engineering)
 "GO" = (
 /obj/effect/mapping_helpers/airlock/cyclelink_helper,
 /obj/machinery/atmospherics/pipe/layer_manifold{
@@ -3208,11 +3197,24 @@
 /obj/item/destTagger,
 /turf/open/floor/plating,
 /area/ship/cargo)
+"Kt" = (
+/obj/machinery/door/poddoor/shutters/preopen{
+	id = "cargopirate_bridge";
+	name = "Blast Shutters";
+	dir = 4
+	},
+/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
+/turf/open/floor/plating,
+/area/ship/bridge)
 "KK" = (
-/turf/open/floor/plasteel/stairs{
+/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
+/obj/machinery/door/poddoor/shutters/preopen{
+	id = "cargopirate_bridge";
+	name = "Blast Shutters";
 	dir = 4
 	},
-/area/ship/engineering)
+/turf/open/floor/plating,
+/area/ship/bridge)
 "KN" = (
 /obj/machinery/power/shieldwallgen/atmos/roundstart{
 	dir = 4;
@@ -3501,6 +3503,9 @@
 /obj/structure/cable/yellow{
 	icon_state = "1-9"
 	},
+/obj/effect/turf_decal/miskilamo_small/right{
+	dir = 4
+	},
 /turf/open/floor/plasteel/patterned,
 /area/ship/cargo)
 "Os" = (
@@ -3816,6 +3821,15 @@
 	dir = 4
 	},
 /area/ship/cargo)
+"RB" = (
+/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
+/obj/machinery/door/poddoor/shutters/preopen{
+	id = "cargopirate_windows";
+	name = "Blast Shutters";
+	dir = 4
+	},
+/turf/open/floor/plating,
+/area/ship/engineering)
 "RG" = (
 /obj/item/gun/ballistic/shotgun/winchester{
 	pixel_x = -4;
@@ -4475,9 +4489,6 @@
 	dir = 8
 	},
 /obj/effect/decal/cleanable/dirt,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
-	dir = 4
-	},
 /turf/open/floor/plasteel/patterned,
 /area/ship/cargo)
 "Zj" = (
@@ -4529,8 +4540,8 @@ XG
 XG
 rS
 CH
-Sc
-Sc
+RB
+RB
 CH
 rS
 XG
@@ -4586,8 +4597,8 @@ lj
 RH
 CH
 oK
-KK
-KK
+GJ
+GJ
 CH
 CH
 ez
@@ -5359,10 +5370,10 @@ XG
 "}
 (45,1,1) = {"
 XG
-GJ
-GJ
-uj
-GJ
+KK
+KK
+Kt
+KK
 XG
 XG
 XG

From 7ff30277e3cfc0005b1dc9cd4e21823049728b99 Mon Sep 17 00:00:00 2001
From: spockye <79304582+spockye@users.noreply.github.com>
Date: Mon, 24 Jul 2023 21:40:24 +0200
Subject: [PATCH 13/19] attempts to fixy

---
 _maps/shuttles/shiptest/pirate_mechcarrier.dmm | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/_maps/shuttles/shiptest/pirate_mechcarrier.dmm b/_maps/shuttles/shiptest/pirate_mechcarrier.dmm
index 39c393794e31..86e5799cc2fa 100644
--- a/_maps/shuttles/shiptest/pirate_mechcarrier.dmm
+++ b/_maps/shuttles/shiptest/pirate_mechcarrier.dmm
@@ -3431,6 +3431,10 @@
 /area/ship/engineering)
 "Nx" = (
 /obj/docking_port/mobile{
+	can_move_docking_ports = 1;
+	name = "Malta Bay";
+	port_direction = 8;
+	preferred_direction = 4;
 	dir = 2
 	},
 /obj/machinery/door/poddoor/shutters{

From 670105fe163ea764e181aa512226d86073bc190a Mon Sep 17 00:00:00 2001
From: spockye <79304582+spockye@users.noreply.github.com>
Date: Wed, 26 Jul 2023 15:19:33 +0200
Subject: [PATCH 14/19] attempts to fix subshuttle

---
 _maps/shuttles/shiptest/pirate_mechcarrier.dmm    | 15 ++++-----------
 .../subshuttles/pirate_mechcarrier_subship.dmm    |  8 +++++---
 2 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/_maps/shuttles/shiptest/pirate_mechcarrier.dmm b/_maps/shuttles/shiptest/pirate_mechcarrier.dmm
index 86e5799cc2fa..e2d97a3358d2 100644
--- a/_maps/shuttles/shiptest/pirate_mechcarrier.dmm
+++ b/_maps/shuttles/shiptest/pirate_mechcarrier.dmm
@@ -131,6 +131,9 @@
 /obj/effect/turf_decal/steeldecal/steel_decals9{
 	dir = 8
 	},
+/obj/effect/landmark/subship{
+	subship_template = /datum/map_template/shuttle/subshuttles/pirate_mechcarrier_subship
+	},
 /turf/open/floor/plasteel/tech,
 /area/ship/cargo/office)
 "bo" = (
@@ -4067,16 +4070,6 @@
 /obj/effect/turf_decal/spline/fancy/opaque/brown,
 /turf/open/floor/plasteel/patterned/cargo_one,
 /area/ship/cargo)
-"Uu" = (
-/obj/docking_port/stationary{
-	roundstart_template = "/datum/map_template/shuttle/subshuttles/minimalta";
-	dwidth = 3;
-	height = 5;
-	width = 11;
-	dir = 2
-	},
-/turf/open/floor/engine/hull/interior,
-/area/ship/cargo/office)
 "UE" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
@@ -4946,7 +4939,7 @@ NR
 or
 Ve
 nh
-Uu
+KW
 KW
 KW
 KW
diff --git a/_maps/shuttles/subshuttles/pirate_mechcarrier_subship.dmm b/_maps/shuttles/subshuttles/pirate_mechcarrier_subship.dmm
index a60df6ba9aa1..33161d8ca4bc 100644
--- a/_maps/shuttles/subshuttles/pirate_mechcarrier_subship.dmm
+++ b/_maps/shuttles/subshuttles/pirate_mechcarrier_subship.dmm
@@ -5,9 +5,6 @@
 "c" = (
 /obj/machinery/door/airlock/hatch,
 /obj/machinery/door/firedoor,
-/obj/docking_port/mobile{
-	dir = 2
-	},
 /obj/structure/cable/yellow{
 	icon_state = "1-2"
 	},
@@ -15,6 +12,11 @@
 	id = "minimalta_bridgedoor";
 	name = "Safety Shutter"
 	},
+/obj/docking_port/mobile{
+	dir = 2;
+	port_direction = 8;
+	preferred_direction = 4
+	},
 /turf/open/floor/plasteel/tech/techmaint,
 /area/ship/storage)
 "d" = (

From 839b728f1ecf7788df5e29b9675c09bfaa8dc99c Mon Sep 17 00:00:00 2001
From: spockye <79304582+spockye@users.noreply.github.com>
Date: Wed, 26 Jul 2023 15:39:17 +0200
Subject: [PATCH 15/19] adds needed sidestuff for subshuttles

---
 _maps/shuttles/subshuttles/Subshuttle Catalog.txt      |  5 +++++
 .../subshuttles/pirate_mechcarrier_subship.dmm         | 10 +++++-----
 code/datums/shuttles.dm                                |  5 +++++
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/_maps/shuttles/subshuttles/Subshuttle Catalog.txt b/_maps/shuttles/subshuttles/Subshuttle Catalog.txt
index 210d55b3228d..04c27b6ac019 100644
--- a/_maps/shuttles/subshuttles/Subshuttle Catalog.txt	
+++ b/_maps/shuttles/subshuttles/Subshuttle Catalog.txt	
@@ -27,3 +27,8 @@ Name = "Superpill"
 Size = "1x3"
 Purpose = "A horrid merger of engineering platform and pill"
 File Path = "_maps\shuttles\subshuttles\independant_pill.dmm"
+
+Name = "Galley Dropship"
+Size = "11x5"
+Purpose = "A pirate dropship, capable of carrying and supplying a mech"
+File Path = "_maps\shuttles\subshuttles\pirate_mechcarrier_subship.dmm"
diff --git a/_maps/shuttles/subshuttles/pirate_mechcarrier_subship.dmm b/_maps/shuttles/subshuttles/pirate_mechcarrier_subship.dmm
index 33161d8ca4bc..43b6c8e293f8 100644
--- a/_maps/shuttles/subshuttles/pirate_mechcarrier_subship.dmm
+++ b/_maps/shuttles/subshuttles/pirate_mechcarrier_subship.dmm
@@ -12,11 +12,6 @@
 	id = "minimalta_bridgedoor";
 	name = "Safety Shutter"
 	},
-/obj/docking_port/mobile{
-	dir = 2;
-	port_direction = 8;
-	preferred_direction = 4
-	},
 /turf/open/floor/plasteel/tech/techmaint,
 /area/ship/storage)
 "d" = (
@@ -237,6 +232,11 @@
 	id = "cargopirate_sub_hatch";
 	name = "Blast Shutters"
 	},
+/obj/docking_port/mobile{
+	dir = 2;
+	port_direction = 8;
+	preferred_direction = 4
+	},
 /turf/open/floor/plasteel/patterned/ridged,
 /area/ship/storage)
 "O" = (
diff --git a/code/datums/shuttles.dm b/code/datums/shuttles.dm
index e4255541911d..7e018ff7e3b2 100644
--- a/code/datums/shuttles.dm
+++ b/code/datums/shuttles.dm
@@ -405,3 +405,8 @@
 	file_name = "independent_sugarcube"
 	name = "Sugarcube Transport"
 	prefix = "ISV"
+
+/datum/map_template/shuttle/subshuttles/Galley
+	file_name = "pirate_mechcarrier_subship"
+	name = "Galley Dropship"
+	prefix = "ISV"

From 8a132c34769ddb701ff8978567e6070efed4b342 Mon Sep 17 00:00:00 2001
From: spockye <79304582+spockye@users.noreply.github.com>
Date: Wed, 26 Jul 2023 15:45:07 +0200
Subject: [PATCH 16/19] hopefully fixes

switches to the right template
---
 _maps/shuttles/shiptest/pirate_mechcarrier.dmm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/_maps/shuttles/shiptest/pirate_mechcarrier.dmm b/_maps/shuttles/shiptest/pirate_mechcarrier.dmm
index e2d97a3358d2..636a1d1b0979 100644
--- a/_maps/shuttles/shiptest/pirate_mechcarrier.dmm
+++ b/_maps/shuttles/shiptest/pirate_mechcarrier.dmm
@@ -132,7 +132,7 @@
 	dir = 8
 	},
 /obj/effect/landmark/subship{
-	subship_template = /datum/map_template/shuttle/subshuttles/pirate_mechcarrier_subship
+	subship_template = /datum/map_template/shuttle/subshuttles/Galley
 	},
 /turf/open/floor/plasteel/tech,
 /area/ship/cargo/office)

From acda0c52e12aebddc2acfe0ed534cc665184a429 Mon Sep 17 00:00:00 2001
From: spockye <79304582+spockye@users.noreply.github.com>
Date: Wed, 30 Aug 2023 22:15:10 +0200
Subject: [PATCH 17/19] misc Compile error fixes

fixes robotics roles
fixes outfit errors
re-adds the fax machine
---
 .../shuttles/shiptest/pirate_mechcarrier.dmm  | 29 +++++++------------
 code/modules/jobs/job_types/roboticist.dm     |  1 +
 2 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/_maps/shuttles/shiptest/pirate_mechcarrier.dmm b/_maps/shuttles/shiptest/pirate_mechcarrier.dmm
index 636a1d1b0979..c3b471744990 100644
--- a/_maps/shuttles/shiptest/pirate_mechcarrier.dmm
+++ b/_maps/shuttles/shiptest/pirate_mechcarrier.dmm
@@ -32,7 +32,6 @@
 	},
 /obj/item/clothing/shoes/jackboots,
 /obj/item/clothing/shoes/workboots,
-/obj/item/clothing/under/misc/bouncer,
 /obj/item/clothing/under/costume/russian_officer,
 /obj/item/clothing/gloves/combat,
 /obj/item/clothing/suit/pirate/captain,
@@ -170,10 +169,6 @@
 	name = "Roboticists Locker";
 	pixel_x = 28
 	},
-/obj/item/clothing/under/rank/rnd/roboticist/mech_engineer,
-/obj/item/clothing/under/rank/rnd/roboticist/mech_engineer/skirt,
-/obj/item/clothing/under/rank/rnd/roboticist/biomech_engineer,
-/obj/item/clothing/under/suit/senior_roboticist/skirt,
 /obj/item/clothing/suit/toggle/labcoat/science,
 /obj/item/clothing/suit/longcoat/roboblack,
 /obj/item/clothing/suit/longcoat/robowhite,
@@ -212,11 +207,6 @@
 /obj/item/storage/box/lethalshot{
 	pixel_x = -3
 	},
-/obj/item/ammo_box/c38_box/hunting,
-/obj/item/ammo_box/c38_box/hunting{
-	pixel_x = -7;
-	pixel_y = -4
-	},
 /obj/item/ammo_box/c38,
 /obj/item/ammo_box/c38{
 	pixel_y = -8;
@@ -1961,11 +1951,6 @@
 /obj/item/clothing/under/utility,
 /obj/item/clothing/under/utility/skirt,
 /obj/item/clothing/under/rank/engineering/engineer,
-/obj/item/clothing/under/rank/engineering/engineer/junior{
-	pixel_x = 3;
-	pixel_y = -4
-	},
-/obj/item/clothing/under/rank/engineering/engineer/maintenance_tech,
 /obj/item/clothing/head/hardhat/weldhat/orange{
 	pixel_x = 7;
 	pixel_y = 2
@@ -3909,9 +3894,6 @@
 /obj/effect/turf_decal/techfloor{
 	dir = 5
 	},
-/obj/machinery/photocopier/faxmachine/longrange{
-	department = "Internal Affairs"
-	},
 /obj/structure/table/reinforced{
 	color = "#c1b6a5"
 	},
@@ -3920,6 +3902,7 @@
 	dir = 4;
 	layer = 3.1
 	},
+/obj/machinery/fax/hacked,
 /turf/open/floor/plasteel/tech,
 /area/ship/bridge)
 "Ss" = (
@@ -4070,6 +4053,14 @@
 /obj/effect/turf_decal/spline/fancy/opaque/brown,
 /turf/open/floor/plasteel/patterned/cargo_one,
 /area/ship/cargo)
+"UB" = (
+/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
+/obj/machinery/door/poddoor/shutters/preopen{
+	id = "cargopirate_bridge";
+	name = "Blast Shutters"
+	},
+/turf/open/floor/plating,
+/area/ship/bridge)
 "UE" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
@@ -5196,7 +5187,7 @@ XG
 "}
 (36,1,1) = {"
 XG
-lm
+UB
 PP
 Os
 aL
diff --git a/code/modules/jobs/job_types/roboticist.dm b/code/modules/jobs/job_types/roboticist.dm
index 1c82518e4eba..d0a8098ee554 100644
--- a/code/modules/jobs/job_types/roboticist.dm
+++ b/code/modules/jobs/job_types/roboticist.dm
@@ -40,6 +40,7 @@
 	mask = /obj/item/clothing/mask/infiltrator
 	glasses = /obj/item/clothing/glasses/hud/diagnostic
 	shoes = /obj/item/clothing/shoes/workboots
+
 /datum/outfit/job/roboticist/technician/minutemen
 	name = "Mech Technician (Minutemen)"
 

From e1bc7e0dcc37a24e6b1238eb63fed99263fec3f4 Mon Sep 17 00:00:00 2001
From: spockye <79304582+spockye@users.noreply.github.com>
Date: Mon, 16 Oct 2023 18:22:10 +0200
Subject: [PATCH 18/19] fixes misc issues

windows
light switches
closets
---
 .../shuttles/shiptest/pirate_mechcarrier.dmm  | 325 +++++++++++++-----
 .../pirate_mechcarrier_subship.dmm            |   8 +-
 2 files changed, 240 insertions(+), 93 deletions(-)

diff --git a/_maps/shuttles/shiptest/pirate_mechcarrier.dmm b/_maps/shuttles/shiptest/pirate_mechcarrier.dmm
index c3b471744990..fce2aeff3579 100644
--- a/_maps/shuttles/shiptest/pirate_mechcarrier.dmm
+++ b/_maps/shuttles/shiptest/pirate_mechcarrier.dmm
@@ -18,8 +18,9 @@
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
 /area/ship/bridge)
 "aK" = (
-/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
 /obj/structure/curtain/bounty,
+/obj/structure/grille,
+/obj/structure/window/plasma/reinforced/plastitanium,
 /turf/open/floor/plating,
 /area/ship/crew/dorm)
 "aL" = (
@@ -134,7 +135,8 @@
 	subship_template = /datum/map_template/shuttle/subshuttles/Galley
 	},
 /turf/open/floor/plasteel/tech,
-/area/ship/cargo/office)
+/area/ship/cargo/office,
+/area/ship/hangar)
 "bo" = (
 /obj/machinery/computer/arcade/orion_trail,
 /obj/effect/turf_decal/techfloor{
@@ -155,7 +157,8 @@
 	dir = 4
 	},
 /turf/open/floor/plasteel/patterned/ridged,
-/area/ship/cargo/office)
+/area/ship/cargo/office,
+/area/ship/hangar)
 "bv" = (
 /obj/effect/turf_decal/techfloor{
 	dir = 4
@@ -237,7 +240,8 @@
 /obj/machinery/airalarm/directional/east,
 /obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/plasteel/patterned/grid,
-/area/ship/cargo/office)
+/area/ship/cargo/office,
+/area/ship/hangar)
 "cn" = (
 /obj/structure/table/wood,
 /obj/item/storage/pill_bottle/dice{
@@ -431,10 +435,12 @@
 	},
 /obj/effect/turf_decal/techfloor,
 /turf/open/floor/plasteel/tech,
-/area/ship/cargo/office)
+/area/ship/cargo/office,
+/area/ship/hangar)
 "dU" = (
 /obj/machinery/vending/cigarette/syndicate,
 /obj/effect/turf_decal/industrial/hatch/yellow,
+/obj/structure/extinguisher_cabinet/directional/west,
 /turf/open/floor/plasteel,
 /area/ship/crew/canteen)
 "ec" = (
@@ -513,7 +519,8 @@
 	dir = 10
 	},
 /turf/open/floor/plasteel/tech,
-/area/ship/cargo/office)
+/area/ship/cargo/office,
+/area/ship/hangar)
 "fB" = (
 /obj/effect/turf_decal/siding/thinplating/dark{
 	dir = 4
@@ -522,7 +529,9 @@
 	dir = 8
 	},
 /turf/open/floor/plasteel/tech,
-/area/ship/cargo/office)
+/area/ship/cargo/office,
+/area/ship/hangar,
+/area/ship/hangar)
 "fC" = (
 /obj/structure/table/reinforced{
 	color = "#c1b6a5"
@@ -691,7 +700,8 @@
 	pixel_y = 22
 	},
 /turf/open/floor/plasteel/tech,
-/area/ship/cargo/office)
+/area/ship/cargo/office,
+/area/ship/hangar)
 "gP" = (
 /obj/effect/turf_decal/industrial/outline/yellow,
 /turf/open/floor/plasteel/patterned/cargo_one,
@@ -701,7 +711,8 @@
 	dir = 1
 	},
 /turf/open/floor/plasteel/patterned/grid,
-/area/ship/cargo/office)
+/area/ship/cargo/office,
+/area/ship/hangar)
 "gT" = (
 /obj/effect/turf_decal/atmos/air{
 	dir = 8
@@ -765,7 +776,8 @@
 /obj/effect/turf_decal/techfloor/corner,
 /obj/effect/turf_decal/steeldecal/steel_decals9,
 /turf/open/floor/plasteel/tech,
-/area/ship/cargo/office)
+/area/ship/cargo/office,
+/area/ship/hangar)
 "hr" = (
 /obj/effect/turf_decal/industrial/warning{
 	dir = 9;
@@ -792,7 +804,8 @@
 	pixel_y = 23
 	},
 /turf/open/floor/plasteel/patterned/grid,
-/area/ship/cargo/office)
+/area/ship/cargo/office,
+/area/ship/hangar)
 "hu" = (
 /obj/effect/turf_decal/industrial/warning{
 	dir = 8;
@@ -862,6 +875,11 @@
 	dir = 4
 	},
 /obj/structure/catwalk/over,
+/obj/machinery/light_switch{
+	dir = 8;
+	pixel_x = 21;
+	pixel_y = -8
+	},
 /turf/open/floor/plating,
 /area/ship/engineering)
 "hU" = (
@@ -877,7 +895,8 @@
 	name = "Pod Bay Shutters"
 	},
 /turf/open/floor/plasteel/patterned/ridged,
-/area/ship/cargo/office)
+/area/ship/cargo/office,
+/area/ship/hangar)
 "hV" = (
 /obj/structure/catwalk/over,
 /obj/structure/cable/yellow{
@@ -910,7 +929,8 @@
 /obj/item/clothing/head/beret/black,
 /obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/plasteel/patterned/grid,
-/area/ship/cargo/office)
+/area/ship/cargo/office,
+/area/ship/hangar)
 "is" = (
 /obj/effect/turf_decal/industrial/warning{
 	dir = 9;
@@ -933,7 +953,8 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /turf/open/floor/plasteel/patterned/grid,
-/area/ship/cargo/office)
+/area/ship/cargo/office,
+/area/ship/hangar)
 "iI" = (
 /obj/effect/turf_decal/industrial/outline/yellow,
 /obj/effect/decal/cleanable/dirt,
@@ -1003,7 +1024,8 @@
 	dir = 1
 	},
 /turf/open/floor/plasteel/tech,
-/area/ship/cargo/office)
+/area/ship/cargo/office,
+/area/ship/hangar)
 "jk" = (
 /obj/effect/turf_decal/techfloor{
 	dir = 1
@@ -1029,6 +1051,16 @@
 /obj/machinery/airalarm/directional/west,
 /turf/open/floor/plasteel/tech,
 /area/ship/bridge)
+"jJ" = (
+/obj/effect/turf_decal/siding/thinplating/dark{
+	dir = 4
+	},
+/obj/effect/turf_decal/techfloor{
+	dir = 8
+	},
+/turf/open/floor/plasteel/tech,
+/area/ship/cargo/office,
+/area/ship/hangar)
 "jM" = (
 /obj/structure/table/wood/reinforced,
 /obj/item/modular_computer/laptop/preset/civilian{
@@ -1044,6 +1076,7 @@
 /obj/structure/cable/yellow{
 	icon_state = "0-2"
 	},
+/obj/structure/extinguisher_cabinet/directional/east,
 /turf/open/floor/carpet/nanoweave/beige,
 /area/ship/crew/dorm)
 "jU" = (
@@ -1085,6 +1118,11 @@
 /obj/effect/turf_decal/siding/wood/end{
 	dir = 1
 	},
+/obj/machinery/light_switch{
+	dir = 8;
+	pixel_x = 21;
+	pixel_y = -8
+	},
 /turf/open/floor/wood{
 	icon_state = "wood-broken4"
 	},
@@ -1092,7 +1130,8 @@
 "kw" = (
 /obj/effect/turf_decal/number/zero,
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
-/area/ship/cargo/office)
+/area/ship/cargo/office,
+/area/ship/hangar)
 "kE" = (
 /obj/effect/turf_decal/techfloor/orange{
 	dir = 1
@@ -1124,7 +1163,8 @@
 	},
 /obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/plasteel/patterned/ridged,
-/area/ship/cargo/office)
+/area/ship/cargo/office,
+/area/ship/hangar)
 "lj" = (
 /obj/machinery/atmospherics/components/unary/shuttle/heater{
 	dir = 4
@@ -1245,7 +1285,9 @@
 	dir = 1
 	},
 /turf/open/floor/plasteel/tech,
-/area/ship/cargo/office)
+/area/ship/cargo/office,
+/area/ship/hangar,
+/area/ship/hangar)
 "nh" = (
 /obj/effect/turf_decal/siding/thinplating/dark/corner{
 	dir = 8
@@ -1256,7 +1298,8 @@
 	dir = 1
 	},
 /turf/open/floor/plasteel/tech,
-/area/ship/cargo/office)
+/area/ship/cargo/office,
+/area/ship/hangar)
 "nj" = (
 /obj/effect/turf_decal/industrial/hatch/yellow,
 /obj/structure/reagent_dispensers/watertank,
@@ -1286,7 +1329,8 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /obj/machinery/door/firedoor,
 /turf/open/floor/plasteel,
-/area/ship/cargo/office)
+/area/ship/cargo/office,
+/area/ship/hangar)
 "nE" = (
 /obj/structure/railing/corner{
 	dir = 8
@@ -1327,7 +1371,9 @@
 	dir = 1
 	},
 /turf/open/floor/plasteel/tech,
-/area/ship/cargo/office)
+/area/ship/cargo/office,
+/area/ship/hangar,
+/area/ship/hangar)
 "oc" = (
 /obj/machinery/door/airlock/hatch,
 /obj/structure/cable/yellow{
@@ -1383,14 +1429,16 @@
 	dir = 8
 	},
 /turf/open/floor/plasteel/tech,
-/area/ship/cargo/office)
+/area/ship/cargo/office,
+/area/ship/hangar)
 "oJ" = (
 /obj/effect/turf_decal/siding/thinplating/dark,
 /obj/effect/turf_decal/techfloor{
 	dir = 1
 	},
 /turf/open/floor/plasteel/tech,
-/area/ship/cargo/office)
+/area/ship/cargo/office,
+/area/ship/hangar)
 "oK" = (
 /obj/machinery/autolathe/hacked,
 /obj/effect/turf_decal/industrial/warning{
@@ -1465,8 +1513,14 @@
 	pixel_x = -5;
 	pixel_y = -1
 	},
+/obj/machinery/light_switch{
+	pixel_x = -8;
+	pixel_y = -20;
+	dir = 1
+	},
 /turf/open/floor/plasteel/patterned/grid,
-/area/ship/cargo/office)
+/area/ship/cargo/office,
+/area/ship/hangar)
 "pM" = (
 /obj/structure/rack,
 /obj/item/storage/toolbox/electrical,
@@ -1572,10 +1626,11 @@
 /turf/open/floor/plasteel/tech,
 /area/ship/bridge)
 "qN" = (
-/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
 /obj/machinery/atmospherics/pipe/simple/orange/hidden{
 	dir = 4
 	},
+/obj/structure/window/plasma/reinforced/plastitanium,
+/obj/structure/grille,
 /turf/open/floor/plating,
 /area/ship/engineering)
 "qT" = (
@@ -1631,7 +1686,8 @@
 /obj/effect/turf_decal/techfloor,
 /obj/effect/turf_decal/techfloor/hole,
 /turf/open/floor/plasteel/tech,
-/area/ship/cargo/office)
+/area/ship/cargo/office,
+/area/ship/hangar)
 "rk" = (
 /obj/machinery/power/shuttle/engine/fueled/plasma{
 	dir = 4
@@ -1824,13 +1880,19 @@
 	dir = 8
 	},
 /obj/structure/railing,
+/obj/structure/extinguisher_cabinet/directional/east,
 /turf/open/floor/plasteel/tech,
 /area/ship/engineering)
 "sV" = (
 /obj/machinery/holopad/emergency/command,
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/effect/decal/cleanable/dirt,
-/obj/structure/extinguisher_cabinet/directional/north,
+/obj/machinery/light_switch{
+	pixel_x = -12;
+	pixel_y = -20;
+	dir = 1
+	},
+/obj/structure/extinguisher_cabinet/directional/south,
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/bridge)
 "sX" = (
@@ -1859,7 +1921,8 @@
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/effect/turf_decal/industrial/stand_clear,
 /turf/open/floor/plasteel,
-/area/ship/cargo/office)
+/area/ship/cargo/office,
+/area/ship/hangar)
 "tx" = (
 /obj/effect/turf_decal/industrial/outline/yellow,
 /obj/structure/closet/crate/coffin,
@@ -1872,10 +1935,14 @@
 /area/ship/cargo)
 "ty" = (
 /obj/effect/decal/cleanable/dirt/dust,
-/obj/structure/extinguisher_cabinet/directional/north,
 /obj/structure/cable/yellow{
 	icon_state = "1-6"
 	},
+/obj/machinery/light_switch{
+	dir = 4;
+	pixel_x = -20;
+	pixel_y = 0
+	},
 /turf/open/floor/plasteel,
 /area/ship/crew/canteen)
 "tC" = (
@@ -2050,11 +2117,12 @@
 /turf/open/floor/plasteel/tech,
 /area/ship/bridge)
 "vT" = (
-/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
 /obj/machinery/door/poddoor/shutters/preopen{
 	id = "cargopirate_windows";
 	name = "Blast Shutters"
 	},
+/obj/structure/grille,
+/obj/structure/window/plasma/reinforced/plastitanium,
 /turf/open/floor/plating,
 /area/ship/cargo)
 "vZ" = (
@@ -2117,7 +2185,9 @@
 	dir = 1
 	},
 /turf/open/floor/plasteel/tech,
-/area/ship/cargo/office)
+/area/ship/cargo/office,
+/area/ship/hangar,
+/area/ship/hangar)
 "wN" = (
 /obj/structure/railing{
 	dir = 2;
@@ -2257,6 +2327,11 @@
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
 	dir = 1
 	},
+/obj/machinery/light_switch{
+	pixel_x = -12;
+	pixel_y = -20;
+	dir = 1
+	},
 /turf/open/floor/plasteel,
 /area/ship/cargo)
 "yq" = (
@@ -2420,7 +2495,8 @@
 	dir = 4
 	},
 /turf/open/floor/plasteel/tech,
-/area/ship/cargo/office)
+/area/ship/cargo/office,
+/area/ship/hangar)
 "zO" = (
 /obj/machinery/power/smes/engineering,
 /obj/structure/railing{
@@ -2441,7 +2517,8 @@
 /turf/open/floor/plasteel/stairs{
 	dir = 8
 	},
-/area/ship/cargo/office)
+/area/ship/cargo/office,
+/area/ship/hangar)
 "Aa" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
@@ -2550,6 +2627,11 @@
 	icon_state = "1-2"
 	},
 /obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/light_switch{
+	dir = 4;
+	pixel_x = -20;
+	pixel_y = 0
+	},
 /turf/open/floor/plating,
 /area/ship/engineering)
 "Ct" = (
@@ -2608,9 +2690,11 @@
 /obj/item/clothing/head/welding,
 /obj/machinery/firealarm/directional/south,
 /turf/open/floor/plasteel/patterned/grid,
-/area/ship/cargo/office)
+/area/ship/cargo/office,
+/area/ship/hangar)
 "Dj" = (
-/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
+/obj/structure/window/plasma/reinforced/plastitanium,
+/obj/structure/grille,
 /turf/open/floor/plating,
 /area/ship/engineering)
 "Ds" = (
@@ -2624,7 +2708,8 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /turf/open/floor/plasteel/patterned/grid,
-/area/ship/cargo/office)
+/area/ship/cargo/office,
+/area/ship/hangar)
 "DD" = (
 /obj/structure/chair{
 	dir = 1
@@ -2648,7 +2733,9 @@
 	},
 /obj/effect/turf_decal/steeldecal/steel_decals4,
 /turf/open/floor/plasteel/tech,
-/area/ship/cargo/office)
+/area/ship/cargo/office,
+/area/ship/hangar,
+/area/ship/hangar)
 "DT" = (
 /obj/effect/turf_decal/corner/opaque/yellow/bordercorner{
 	dir = 4
@@ -2738,7 +2825,8 @@
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/machinery/light/small/directional/east,
 /turf/open/floor/plasteel/patterned/grid,
-/area/ship/cargo/office)
+/area/ship/cargo/office,
+/area/ship/hangar)
 "EY" = (
 /obj/structure/table/reinforced{
 	color = "#c1b6a5"
@@ -2758,10 +2846,11 @@
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/engineering)
 "Fd" = (
-/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 4
 	},
+/obj/structure/window/plasma/reinforced/plastitanium,
+/obj/structure/grille,
 /turf/open/floor/plating,
 /area/ship/engineering)
 "Fj" = (
@@ -2790,7 +2879,9 @@
 	dir = 1
 	},
 /turf/open/floor/plasteel/tech,
-/area/ship/cargo/office)
+/area/ship/cargo/office,
+/area/ship/hangar,
+/area/ship/hangar)
 "Fp" = (
 /obj/effect/turf_decal/industrial/warning{
 	dir = 6;
@@ -2839,7 +2930,11 @@
 /obj/item/mop,
 /obj/item/pushbroom,
 /obj/item/reagent_containers/glass/bucket,
-/obj/structure/extinguisher_cabinet/directional/north,
+/obj/machinery/light_switch{
+	pixel_x = -8;
+	pixel_y = -20;
+	dir = 1
+	},
 /turf/open/floor/plasteel,
 /area/ship/crew/canteen)
 "GJ" = (
@@ -2924,7 +3019,8 @@
 /area/ship/crew/canteen)
 "If" = (
 /turf/closed/wall/mineral/plastitanium,
-/area/ship/cargo/office)
+/area/ship/cargo/office,
+/area/ship/hangar)
 "Ih" = (
 /obj/effect/turf_decal/techfloor/corner,
 /obj/effect/turf_decal/techfloor/corner{
@@ -2990,7 +3086,8 @@
 "IF" = (
 /obj/effect/turf_decal/number/five,
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
-/area/ship/cargo/office)
+/area/ship/cargo/office,
+/area/ship/hangar)
 "IK" = (
 /obj/effect/turf_decal/industrial/traffic{
 	dir = 8
@@ -3152,7 +3249,8 @@
 	name = "Pod Bay Shutters"
 	},
 /turf/open/floor/plasteel,
-/area/ship/cargo/office)
+/area/ship/cargo/office,
+/area/ship/hangar)
 "JW" = (
 /obj/structure/railing/corner{
 	dir = 8
@@ -3186,21 +3284,18 @@
 /turf/open/floor/plating,
 /area/ship/cargo)
 "Kt" = (
-/obj/machinery/door/poddoor/shutters/preopen{
-	id = "cargopirate_bridge";
-	name = "Blast Shutters";
-	dir = 4
-	},
-/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
-/turf/open/floor/plating,
-/area/ship/bridge)
+/turf/closed/wall/mineral/plastitanium/nodiagonal,
+/area/ship/cargo/office,
+/area/ship/hangar,
+/area/ship/hangar)
 "KK" = (
-/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
 /obj/machinery/door/poddoor/shutters/preopen{
 	id = "cargopirate_bridge";
 	name = "Blast Shutters";
 	dir = 4
 	},
+/obj/structure/window/plasma/reinforced/plastitanium,
+/obj/structure/grille,
 /turf/open/floor/plating,
 /area/ship/bridge)
 "KN" = (
@@ -3219,13 +3314,15 @@
 /turf/open/floor/plating,
 /area/ship/cargo)
 "KT" = (
-/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
 /obj/machinery/door/poddoor/shutters/preopen{
 	id = "cargopirate_windows";
 	name = "Blast Shutters"
 	},
+/obj/structure/grille,
+/obj/structure/window/plasma/reinforced/plastitanium,
 /turf/open/floor/plating,
-/area/ship/cargo/office)
+/area/ship/cargo/office,
+/area/ship/hangar)
 "KU" = (
 /obj/effect/turf_decal/corner/opaque/yellow/half{
 	dir = 1
@@ -3245,7 +3342,8 @@
 /area/ship/cargo)
 "KW" = (
 /turf/open/floor/engine/hull/interior,
-/area/ship/cargo/office)
+/area/ship/cargo/office,
+/area/ship/hangar)
 "La" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt/dust,
@@ -3390,6 +3488,11 @@
 /obj/structure/cable/yellow{
 	icon_state = "0-8"
 	},
+/obj/machinery/light_switch{
+	dir = 8;
+	pixel_x = 21;
+	pixel_y = -8
+	},
 /turf/open/floor/plasteel/tech,
 /area/ship/security)
 "Nn" = (
@@ -3532,7 +3635,8 @@
 	icon_state = "0-8"
 	},
 /turf/open/floor/plasteel/tech/grid,
-/area/ship/cargo/office)
+/area/ship/cargo/office,
+/area/ship/hangar)
 "OD" = (
 /obj/effect/turf_decal/industrial/hatch/yellow,
 /obj/structure/reagent_dispensers/fueltank,
@@ -3637,7 +3741,8 @@
 	dir = 5
 	},
 /turf/open/floor/plasteel/tech,
-/area/ship/cargo/office)
+/area/ship/cargo/office,
+/area/ship/hangar)
 "PP" = (
 /obj/structure/table/wood/reinforced,
 /obj/effect/turf_decal/siding/wood{
@@ -3654,11 +3759,13 @@
 /turf/open/floor/wood,
 /area/ship/bridge)
 "PW" = (
-/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
 /obj/machinery/door/poddoor/shutters/preopen{
 	id = "cargopirate_windows";
-	name = "Blast Shutters"
+	name = "Blast Shutters";
+	dir = 8
 	},
+/obj/structure/window/plasma/reinforced/plastitanium,
+/obj/structure/grille,
 /turf/open/floor/plating,
 /area/ship/crew/canteen)
 "Qg" = (
@@ -3742,6 +3849,16 @@
 	icon_state = "foam_plating"
 	},
 /area/ship/security)
+"QL" = (
+/obj/machinery/door/poddoor/shutters/preopen{
+	id = "cargopirate_windows";
+	name = "Blast Shutters";
+	dir = 4
+	},
+/obj/structure/window/plasma/reinforced/plastitanium,
+/obj/structure/grille,
+/turf/open/floor/plating,
+/area/ship/crew/canteen)
 "QP" = (
 /obj/effect/decal/cleanable/cobweb,
 /obj/structure/table,
@@ -3814,12 +3931,13 @@
 	},
 /area/ship/cargo)
 "RB" = (
-/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
 /obj/machinery/door/poddoor/shutters/preopen{
 	id = "cargopirate_windows";
 	name = "Blast Shutters";
 	dir = 4
 	},
+/obj/structure/grille,
+/obj/structure/window/plasma/reinforced/plastitanium,
 /turf/open/floor/plating,
 /area/ship/engineering)
 "RG" = (
@@ -3869,7 +3987,8 @@
 /obj/machinery/light/dim/directional/south,
 /obj/effect/turf_decal/techfloor,
 /turf/open/floor/plasteel/tech,
-/area/ship/cargo/office)
+/area/ship/cargo/office,
+/area/ship/hangar)
 "RN" = (
 /obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
 /obj/structure/curtain/bounty,
@@ -3881,13 +4000,15 @@
 "RZ" = (
 /obj/effect/turf_decal/number/eight,
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
-/area/ship/cargo/office)
+/area/ship/cargo/office,
+/area/ship/hangar)
 "Sc" = (
-/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
 /obj/machinery/door/poddoor/shutters/preopen{
 	id = "cargopirate_windows";
 	name = "Blast Shutters"
 	},
+/obj/structure/grille,
+/obj/structure/window/plasma/reinforced/plastitanium,
 /turf/open/floor/plating,
 /area/ship/engineering)
 "Sk" = (
@@ -3919,6 +4040,11 @@
 	pixel_y = -5;
 	pixel_x = 6
 	},
+/obj/machinery/light_switch{
+	dir = 4;
+	pixel_x = -20;
+	pixel_y = 5
+	},
 /turf/open/floor/plasteel/tech,
 /area/ship/science/robotics)
 "SD" = (
@@ -3977,14 +4103,16 @@
 	pixel_x = 10;
 	pixel_y = 6
 	},
+/obj/structure/extinguisher_cabinet/directional/west,
 /turf/open/floor/plasteel,
 /area/ship/crew/canteen)
 "Tl" = (
-/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
 /obj/machinery/door/poddoor/shutters/preopen{
 	id = "cargopirate_windows";
 	name = "Blast Shutters"
 	},
+/obj/structure/grille,
+/obj/structure/window/plasma/reinforced/plastitanium,
 /turf/open/floor/plating,
 /area/ship/crew/dorm)
 "Tn" = (
@@ -4025,11 +4153,15 @@
 	},
 /area/ship/bridge)
 "TV" = (
-/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
 /obj/machinery/door/poddoor/shutters/preopen{
 	id = "cargopirate_windows";
 	name = "Blast Shutters"
 	},
+/obj/structure/grille,
+/obj/structure/grille,
+/obj/structure/grille,
+/obj/structure/grille,
+/obj/structure/window/plasma/reinforced/plastitanium,
 /turf/open/floor/plating,
 /area/ship/science/robotics)
 "Ud" = (
@@ -4054,13 +4186,10 @@
 /turf/open/floor/plasteel/patterned/cargo_one,
 /area/ship/cargo)
 "UB" = (
-/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
-/obj/machinery/door/poddoor/shutters/preopen{
-	id = "cargopirate_bridge";
-	name = "Blast Shutters"
-	},
-/turf/open/floor/plating,
-/area/ship/bridge)
+/turf/open/floor/engine/hull/interior,
+/area/ship/cargo/office,
+/area/ship/hangar,
+/area/ship/hangar)
 "UE" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
@@ -4088,7 +4217,8 @@
 /area/ship/cargo)
 "Ve" = (
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
-/area/ship/cargo/office)
+/area/ship/cargo/office,
+/area/ship/hangar)
 "Vh" = (
 /obj/effect/turf_decal/siding/wood{
 	dir = 9
@@ -4244,7 +4374,9 @@
 	dir = 8
 	},
 /turf/open/floor/plasteel/tech,
-/area/ship/cargo/office)
+/area/ship/cargo/office,
+/area/ship/hangar,
+/area/ship/hangar)
 "WQ" = (
 /obj/machinery/atmospherics/components/unary/vent_pump/high_volume/siphon/atmos/air_output{
 	piping_layer = 2;
@@ -4399,6 +4531,11 @@
 	pixel_y = -32
 	},
 /obj/effect/turf_decal/trimline/opaque/brown/line,
+/obj/machinery/light_switch{
+	dir = 8;
+	pixel_x = 23;
+	pixel_y = 8
+	},
 /turf/open/floor/plasteel,
 /area/ship/crew/canteen)
 "XY" = (
@@ -4431,7 +4568,8 @@
 	},
 /obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/plasteel/patterned/grid,
-/area/ship/cargo/office)
+/area/ship/cargo/office,
+/area/ship/hangar)
 "YV" = (
 /obj/effect/turf_decal/siding/thinplating/dark/corner{
 	dir = 1
@@ -4440,7 +4578,8 @@
 	dir = 6
 	},
 /turf/open/floor/plasteel/tech,
-/area/ship/cargo/office)
+/area/ship/cargo/office,
+/area/ship/hangar)
 "YZ" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt/dust,
@@ -4462,13 +4601,15 @@
 	name = "Pod Bay Shutters"
 	},
 /turf/open/floor/plasteel/patterned/ridged,
-/area/ship/cargo/office)
+/area/ship/cargo/office,
+/area/ship/hangar)
 "Zg" = (
 /obj/machinery/door/poddoor/shutters/preopen{
 	id = "cargopirate_bridge";
 	name = "Blast Shutters"
 	},
-/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
+/obj/structure/window/plasma/reinforced/plastitanium,
+/obj/structure/grille,
 /turf/open/floor/plating,
 /area/ship/bridge)
 "Zh" = (
@@ -4776,12 +4917,12 @@ HC
 XT
 eW
 JN
-Ve
+Kt
 DL
 WK
 fB
 oC
-fB
+jJ
 ft
 Ve
 If
@@ -4795,10 +4936,10 @@ BI
 BI
 Pi
 CF
-Ve
+Kt
 mU
 nN
-KW
+UB
 KW
 KW
 bh
@@ -4814,10 +4955,10 @@ pU
 Ss
 Cx
 nn
-Ve
+Kt
 wD
-KW
-KW
+UB
+UB
 KW
 KW
 KW
@@ -4833,10 +4974,10 @@ Ct
 sC
 Rf
 wN
-Ve
+Kt
 Fm
-KW
-KW
+UB
+UB
 KW
 KW
 KW
@@ -5187,7 +5328,7 @@ XG
 "}
 (36,1,1) = {"
 XG
-UB
+Zg
 PP
 Os
 aL
@@ -5288,7 +5429,7 @@ VX
 OO
 ar
 ka
-PW
+QL
 PW
 ka
 oy
@@ -5360,7 +5501,7 @@ XG
 XG
 KK
 KK
-Kt
+KK
 KK
 XG
 XG
diff --git a/_maps/shuttles/subshuttles/pirate_mechcarrier_subship.dmm b/_maps/shuttles/subshuttles/pirate_mechcarrier_subship.dmm
index 43b6c8e293f8..cd9df68efa3c 100644
--- a/_maps/shuttles/subshuttles/pirate_mechcarrier_subship.dmm
+++ b/_maps/shuttles/subshuttles/pirate_mechcarrier_subship.dmm
@@ -61,7 +61,8 @@
 /turf/open/floor/pod/dark,
 /area/ship/storage)
 "k" = (
-/obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
+/obj/structure/window/plasma/reinforced/plastitanium,
+/obj/structure/grille,
 /turf/open/floor/plating,
 /area/ship/storage)
 "n" = (
@@ -76,6 +77,11 @@
 /obj/structure/cable{
 	icon_state = "0-8"
 	},
+/obj/machinery/light_switch{
+	dir = 8;
+	pixel_x = 21;
+	pixel_y = -8
+	},
 /turf/open/floor/plasteel/tech,
 /area/ship/storage)
 "q" = (

From 907fd105cfc3381ec986032f5d0b605093cb5a65 Mon Sep 17 00:00:00 2001
From: spockye <79304582+spockye@users.noreply.github.com>
Date: Mon, 23 Oct 2023 11:40:59 +0200
Subject: [PATCH 19/19] Update pirate_mechcarrier.dmm

---
 .../shuttles/shiptest/pirate_mechcarrier.dmm  | 309 +++++++-----------
 1 file changed, 116 insertions(+), 193 deletions(-)

diff --git a/_maps/shuttles/shiptest/pirate_mechcarrier.dmm b/_maps/shuttles/shiptest/pirate_mechcarrier.dmm
index fce2aeff3579..34d7468089f9 100644
--- a/_maps/shuttles/shiptest/pirate_mechcarrier.dmm
+++ b/_maps/shuttles/shiptest/pirate_mechcarrier.dmm
@@ -33,7 +33,6 @@
 	},
 /obj/item/clothing/shoes/jackboots,
 /obj/item/clothing/shoes/workboots,
-/obj/item/clothing/under/costume/russian_officer,
 /obj/item/clothing/gloves/combat,
 /obj/item/clothing/suit/pirate/captain,
 /obj/item/clothing/suit/armor/frontier,
@@ -135,8 +134,7 @@
 	subship_template = /datum/map_template/shuttle/subshuttles/Galley
 	},
 /turf/open/floor/plasteel/tech,
-/area/ship/cargo/office,
-/area/ship/hangar)
+/area/ship/hangar/starboard)
 "bo" = (
 /obj/machinery/computer/arcade/orion_trail,
 /obj/effect/turf_decal/techfloor{
@@ -157,8 +155,7 @@
 	dir = 4
 	},
 /turf/open/floor/plasteel/patterned/ridged,
-/area/ship/cargo/office,
-/area/ship/hangar)
+/area/ship/hangar/starboard)
 "bv" = (
 /obj/effect/turf_decal/techfloor{
 	dir = 4
@@ -240,8 +237,7 @@
 /obj/machinery/airalarm/directional/east,
 /obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/plasteel/patterned/grid,
-/area/ship/cargo/office,
-/area/ship/hangar)
+/area/ship/hangar/starboard)
 "cn" = (
 /obj/structure/table/wood,
 /obj/item/storage/pill_bottle/dice{
@@ -435,8 +431,7 @@
 	},
 /obj/effect/turf_decal/techfloor,
 /turf/open/floor/plasteel/tech,
-/area/ship/cargo/office,
-/area/ship/hangar)
+/area/ship/hangar/starboard)
 "dU" = (
 /obj/machinery/vending/cigarette/syndicate,
 /obj/effect/turf_decal/industrial/hatch/yellow,
@@ -519,8 +514,7 @@
 	dir = 10
 	},
 /turf/open/floor/plasteel/tech,
-/area/ship/cargo/office,
-/area/ship/hangar)
+/area/ship/hangar/starboard)
 "fB" = (
 /obj/effect/turf_decal/siding/thinplating/dark{
 	dir = 4
@@ -529,9 +523,7 @@
 	dir = 8
 	},
 /turf/open/floor/plasteel/tech,
-/area/ship/cargo/office,
-/area/ship/hangar,
-/area/ship/hangar)
+/area/ship/hangar/starboard)
 "fC" = (
 /obj/structure/table/reinforced{
 	color = "#c1b6a5"
@@ -700,8 +692,7 @@
 	pixel_y = 22
 	},
 /turf/open/floor/plasteel/tech,
-/area/ship/cargo/office,
-/area/ship/hangar)
+/area/ship/hangar/starboard)
 "gP" = (
 /obj/effect/turf_decal/industrial/outline/yellow,
 /turf/open/floor/plasteel/patterned/cargo_one,
@@ -711,8 +702,7 @@
 	dir = 1
 	},
 /turf/open/floor/plasteel/patterned/grid,
-/area/ship/cargo/office,
-/area/ship/hangar)
+/area/ship/hangar/starboard)
 "gT" = (
 /obj/effect/turf_decal/atmos/air{
 	dir = 8
@@ -776,8 +766,7 @@
 /obj/effect/turf_decal/techfloor/corner,
 /obj/effect/turf_decal/steeldecal/steel_decals9,
 /turf/open/floor/plasteel/tech,
-/area/ship/cargo/office,
-/area/ship/hangar)
+/area/ship/hangar/starboard)
 "hr" = (
 /obj/effect/turf_decal/industrial/warning{
 	dir = 9;
@@ -804,8 +793,7 @@
 	pixel_y = 23
 	},
 /turf/open/floor/plasteel/patterned/grid,
-/area/ship/cargo/office,
-/area/ship/hangar)
+/area/ship/hangar/starboard)
 "hu" = (
 /obj/effect/turf_decal/industrial/warning{
 	dir = 8;
@@ -895,8 +883,7 @@
 	name = "Pod Bay Shutters"
 	},
 /turf/open/floor/plasteel/patterned/ridged,
-/area/ship/cargo/office,
-/area/ship/hangar)
+/area/ship/hangar/starboard)
 "hV" = (
 /obj/structure/catwalk/over,
 /obj/structure/cable/yellow{
@@ -929,8 +916,7 @@
 /obj/item/clothing/head/beret/black,
 /obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/plasteel/patterned/grid,
-/area/ship/cargo/office,
-/area/ship/hangar)
+/area/ship/hangar/starboard)
 "is" = (
 /obj/effect/turf_decal/industrial/warning{
 	dir = 9;
@@ -953,8 +939,7 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /turf/open/floor/plasteel/patterned/grid,
-/area/ship/cargo/office,
-/area/ship/hangar)
+/area/ship/hangar/starboard)
 "iI" = (
 /obj/effect/turf_decal/industrial/outline/yellow,
 /obj/effect/decal/cleanable/dirt,
@@ -1024,8 +1009,7 @@
 	dir = 1
 	},
 /turf/open/floor/plasteel/tech,
-/area/ship/cargo/office,
-/area/ship/hangar)
+/area/ship/hangar/starboard)
 "jk" = (
 /obj/effect/turf_decal/techfloor{
 	dir = 1
@@ -1051,16 +1035,6 @@
 /obj/machinery/airalarm/directional/west,
 /turf/open/floor/plasteel/tech,
 /area/ship/bridge)
-"jJ" = (
-/obj/effect/turf_decal/siding/thinplating/dark{
-	dir = 4
-	},
-/obj/effect/turf_decal/techfloor{
-	dir = 8
-	},
-/turf/open/floor/plasteel/tech,
-/area/ship/cargo/office,
-/area/ship/hangar)
 "jM" = (
 /obj/structure/table/wood/reinforced,
 /obj/item/modular_computer/laptop/preset/civilian{
@@ -1130,8 +1104,7 @@
 "kw" = (
 /obj/effect/turf_decal/number/zero,
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
-/area/ship/cargo/office,
-/area/ship/hangar)
+/area/ship/hangar/starboard)
 "kE" = (
 /obj/effect/turf_decal/techfloor/orange{
 	dir = 1
@@ -1163,8 +1136,7 @@
 	},
 /obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/plasteel/patterned/ridged,
-/area/ship/cargo/office,
-/area/ship/hangar)
+/area/ship/hangar/starboard)
 "lj" = (
 /obj/machinery/atmospherics/components/unary/shuttle/heater{
 	dir = 4
@@ -1285,9 +1257,7 @@
 	dir = 1
 	},
 /turf/open/floor/plasteel/tech,
-/area/ship/cargo/office,
-/area/ship/hangar,
-/area/ship/hangar)
+/area/ship/hangar/starboard)
 "nh" = (
 /obj/effect/turf_decal/siding/thinplating/dark/corner{
 	dir = 8
@@ -1298,8 +1268,7 @@
 	dir = 1
 	},
 /turf/open/floor/plasteel/tech,
-/area/ship/cargo/office,
-/area/ship/hangar)
+/area/ship/hangar/starboard)
 "nj" = (
 /obj/effect/turf_decal/industrial/hatch/yellow,
 /obj/structure/reagent_dispensers/watertank,
@@ -1329,8 +1298,7 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /obj/machinery/door/firedoor,
 /turf/open/floor/plasteel,
-/area/ship/cargo/office,
-/area/ship/hangar)
+/area/ship/hangar/starboard)
 "nE" = (
 /obj/structure/railing/corner{
 	dir = 8
@@ -1371,9 +1339,7 @@
 	dir = 1
 	},
 /turf/open/floor/plasteel/tech,
-/area/ship/cargo/office,
-/area/ship/hangar,
-/area/ship/hangar)
+/area/ship/hangar/starboard)
 "oc" = (
 /obj/machinery/door/airlock/hatch,
 /obj/structure/cable/yellow{
@@ -1429,16 +1395,14 @@
 	dir = 8
 	},
 /turf/open/floor/plasteel/tech,
-/area/ship/cargo/office,
-/area/ship/hangar)
+/area/ship/hangar/starboard)
 "oJ" = (
 /obj/effect/turf_decal/siding/thinplating/dark,
 /obj/effect/turf_decal/techfloor{
 	dir = 1
 	},
 /turf/open/floor/plasteel/tech,
-/area/ship/cargo/office,
-/area/ship/hangar)
+/area/ship/hangar/starboard)
 "oK" = (
 /obj/machinery/autolathe/hacked,
 /obj/effect/turf_decal/industrial/warning{
@@ -1519,8 +1483,7 @@
 	dir = 1
 	},
 /turf/open/floor/plasteel/patterned/grid,
-/area/ship/cargo/office,
-/area/ship/hangar)
+/area/ship/hangar/starboard)
 "pM" = (
 /obj/structure/rack,
 /obj/item/storage/toolbox/electrical,
@@ -1686,8 +1649,7 @@
 /obj/effect/turf_decal/techfloor,
 /obj/effect/turf_decal/techfloor/hole,
 /turf/open/floor/plasteel/tech,
-/area/ship/cargo/office,
-/area/ship/hangar)
+/area/ship/hangar/starboard)
 "rk" = (
 /obj/machinery/power/shuttle/engine/fueled/plasma{
 	dir = 4
@@ -1921,8 +1883,7 @@
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/effect/turf_decal/industrial/stand_clear,
 /turf/open/floor/plasteel,
-/area/ship/cargo/office,
-/area/ship/hangar)
+/area/ship/hangar/starboard)
 "tx" = (
 /obj/effect/turf_decal/industrial/outline/yellow,
 /obj/structure/closet/crate/coffin,
@@ -2185,9 +2146,7 @@
 	dir = 1
 	},
 /turf/open/floor/plasteel/tech,
-/area/ship/cargo/office,
-/area/ship/hangar,
-/area/ship/hangar)
+/area/ship/hangar/starboard)
 "wN" = (
 /obj/structure/railing{
 	dir = 2;
@@ -2495,8 +2454,7 @@
 	dir = 4
 	},
 /turf/open/floor/plasteel/tech,
-/area/ship/cargo/office,
-/area/ship/hangar)
+/area/ship/hangar/starboard)
 "zO" = (
 /obj/machinery/power/smes/engineering,
 /obj/structure/railing{
@@ -2517,8 +2475,7 @@
 /turf/open/floor/plasteel/stairs{
 	dir = 8
 	},
-/area/ship/cargo/office,
-/area/ship/hangar)
+/area/ship/hangar/starboard)
 "Aa" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
@@ -2690,8 +2647,7 @@
 /obj/item/clothing/head/welding,
 /obj/machinery/firealarm/directional/south,
 /turf/open/floor/plasteel/patterned/grid,
-/area/ship/cargo/office,
-/area/ship/hangar)
+/area/ship/hangar/starboard)
 "Dj" = (
 /obj/structure/window/plasma/reinforced/plastitanium,
 /obj/structure/grille,
@@ -2708,8 +2664,7 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
 /turf/open/floor/plasteel/patterned/grid,
-/area/ship/cargo/office,
-/area/ship/hangar)
+/area/ship/hangar/starboard)
 "DD" = (
 /obj/structure/chair{
 	dir = 1
@@ -2733,9 +2688,7 @@
 	},
 /obj/effect/turf_decal/steeldecal/steel_decals4,
 /turf/open/floor/plasteel/tech,
-/area/ship/cargo/office,
-/area/ship/hangar,
-/area/ship/hangar)
+/area/ship/hangar/starboard)
 "DT" = (
 /obj/effect/turf_decal/corner/opaque/yellow/bordercorner{
 	dir = 4
@@ -2825,8 +2778,7 @@
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/machinery/light/small/directional/east,
 /turf/open/floor/plasteel/patterned/grid,
-/area/ship/cargo/office,
-/area/ship/hangar)
+/area/ship/hangar/starboard)
 "EY" = (
 /obj/structure/table/reinforced{
 	color = "#c1b6a5"
@@ -2879,9 +2831,7 @@
 	dir = 1
 	},
 /turf/open/floor/plasteel/tech,
-/area/ship/cargo/office,
-/area/ship/hangar,
-/area/ship/hangar)
+/area/ship/hangar/starboard)
 "Fp" = (
 /obj/effect/turf_decal/industrial/warning{
 	dir = 6;
@@ -3019,8 +2969,7 @@
 /area/ship/crew/canteen)
 "If" = (
 /turf/closed/wall/mineral/plastitanium,
-/area/ship/cargo/office,
-/area/ship/hangar)
+/area/ship/hangar/starboard)
 "Ih" = (
 /obj/effect/turf_decal/techfloor/corner,
 /obj/effect/turf_decal/techfloor/corner{
@@ -3086,8 +3035,7 @@
 "IF" = (
 /obj/effect/turf_decal/number/five,
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
-/area/ship/cargo/office,
-/area/ship/hangar)
+/area/ship/hangar/starboard)
 "IK" = (
 /obj/effect/turf_decal/industrial/traffic{
 	dir = 8
@@ -3249,8 +3197,7 @@
 	name = "Pod Bay Shutters"
 	},
 /turf/open/floor/plasteel,
-/area/ship/cargo/office,
-/area/ship/hangar)
+/area/ship/hangar/starboard)
 "JW" = (
 /obj/structure/railing/corner{
 	dir = 8
@@ -3285,9 +3232,7 @@
 /area/ship/cargo)
 "Kt" = (
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
-/area/ship/cargo/office,
-/area/ship/hangar,
-/area/ship/hangar)
+/area/ship/hangar/starboard)
 "KK" = (
 /obj/machinery/door/poddoor/shutters/preopen{
 	id = "cargopirate_bridge";
@@ -3321,8 +3266,7 @@
 /obj/structure/grille,
 /obj/structure/window/plasma/reinforced/plastitanium,
 /turf/open/floor/plating,
-/area/ship/cargo/office,
-/area/ship/hangar)
+/area/ship/hangar/starboard)
 "KU" = (
 /obj/effect/turf_decal/corner/opaque/yellow/half{
 	dir = 1
@@ -3340,10 +3284,6 @@
 	},
 /turf/open/floor/plating/rust,
 /area/ship/cargo)
-"KW" = (
-/turf/open/floor/engine/hull/interior,
-/area/ship/cargo/office,
-/area/ship/hangar)
 "La" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt/dust,
@@ -3476,8 +3416,6 @@
 /obj/effect/turf_decal/industrial/outline/yellow,
 /obj/item/clothing/head/helmet/swat,
 /obj/item/clothing/head/bearpelt,
-/obj/item/clothing/mask/russian_balaclava,
-/obj/item/clothing/mask/russian_balaclava,
 /obj/item/clothing/mask/bandana/red,
 /obj/item/clothing/mask/bandana/black{
 	pixel_x = 1;
@@ -3635,8 +3573,7 @@
 	icon_state = "0-8"
 	},
 /turf/open/floor/plasteel/tech/grid,
-/area/ship/cargo/office,
-/area/ship/hangar)
+/area/ship/hangar/starboard)
 "OD" = (
 /obj/effect/turf_decal/industrial/hatch/yellow,
 /obj/structure/reagent_dispensers/fueltank,
@@ -3741,8 +3678,7 @@
 	dir = 5
 	},
 /turf/open/floor/plasteel/tech,
-/area/ship/cargo/office,
-/area/ship/hangar)
+/area/ship/hangar/starboard)
 "PP" = (
 /obj/structure/table/wood/reinforced,
 /obj/effect/turf_decal/siding/wood{
@@ -3987,8 +3923,7 @@
 /obj/machinery/light/dim/directional/south,
 /obj/effect/turf_decal/techfloor,
 /turf/open/floor/plasteel/tech,
-/area/ship/cargo/office,
-/area/ship/hangar)
+/area/ship/hangar/starboard)
 "RN" = (
 /obj/effect/spawner/structure/window/plasma/reinforced/plastitanium,
 /obj/structure/curtain/bounty,
@@ -4000,8 +3935,7 @@
 "RZ" = (
 /obj/effect/turf_decal/number/eight,
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
-/area/ship/cargo/office,
-/area/ship/hangar)
+/area/ship/hangar/starboard)
 "Sc" = (
 /obj/machinery/door/poddoor/shutters/preopen{
 	id = "cargopirate_windows";
@@ -4187,9 +4121,7 @@
 /area/ship/cargo)
 "UB" = (
 /turf/open/floor/engine/hull/interior,
-/area/ship/cargo/office,
-/area/ship/hangar,
-/area/ship/hangar)
+/area/ship/hangar/starboard)
 "UE" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
@@ -4215,10 +4147,6 @@
 /obj/item/radio/intercom/directional/east,
 /turf/open/floor/plasteel/patterned,
 /area/ship/cargo)
-"Ve" = (
-/turf/closed/wall/mineral/plastitanium/nodiagonal,
-/area/ship/cargo/office,
-/area/ship/hangar)
 "Vh" = (
 /obj/effect/turf_decal/siding/wood{
 	dir = 9
@@ -4374,9 +4302,7 @@
 	dir = 8
 	},
 /turf/open/floor/plasteel/tech,
-/area/ship/cargo/office,
-/area/ship/hangar,
-/area/ship/hangar)
+/area/ship/hangar/starboard)
 "WQ" = (
 /obj/machinery/atmospherics/components/unary/vent_pump/high_volume/siphon/atmos/air_output{
 	piping_layer = 2;
@@ -4568,8 +4494,7 @@
 	},
 /obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/plasteel/patterned/grid,
-/area/ship/cargo/office,
-/area/ship/hangar)
+/area/ship/hangar/starboard)
 "YV" = (
 /obj/effect/turf_decal/siding/thinplating/dark/corner{
 	dir = 1
@@ -4578,8 +4503,7 @@
 	dir = 6
 	},
 /turf/open/floor/plasteel/tech,
-/area/ship/cargo/office,
-/area/ship/hangar)
+/area/ship/hangar/starboard)
 "YZ" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt/dust,
@@ -4601,8 +4525,7 @@
 	name = "Pod Bay Shutters"
 	},
 /turf/open/floor/plasteel/patterned/ridged,
-/area/ship/cargo/office,
-/area/ship/hangar)
+/area/ship/hangar/starboard)
 "Zg" = (
 /obj/machinery/door/poddoor/shutters/preopen{
 	id = "cargopirate_bridge";
@@ -4922,9 +4845,9 @@ DL
 WK
 fB
 oC
-jJ
+fB
 ft
-Ve
+Kt
 If
 "}
 (15,1,1) = {"
@@ -4940,11 +4863,11 @@ Kt
 mU
 nN
 UB
-KW
-KW
+UB
+UB
 bh
 ft
-Ve
+Kt
 "}
 (16,1,1) = {"
 XG
@@ -4959,11 +4882,11 @@ Kt
 wD
 UB
 UB
-KW
-KW
-KW
+UB
+UB
+UB
 dR
-Ve
+Kt
 "}
 (17,1,1) = {"
 XG
@@ -4978,11 +4901,11 @@ Kt
 Fm
 UB
 UB
-KW
-KW
-KW
+UB
+UB
+UB
 RI
-Ve
+Kt
 "}
 (18,1,1) = {"
 XG
@@ -4995,11 +4918,11 @@ Go
 yO
 hU
 lf
-KW
-KW
-KW
-KW
-KW
+UB
+UB
+UB
+UB
+UB
 dR
 RZ
 "}
@@ -5014,11 +4937,11 @@ vs
 YZ
 JU
 tr
-KW
-KW
-KW
-KW
-KW
+UB
+UB
+UB
+UB
+UB
 dR
 kw
 "}
@@ -5033,11 +4956,11 @@ Iq
 hP
 Zc
 bt
-KW
-KW
-KW
-KW
-KW
+UB
+UB
+UB
+UB
+UB
 rh
 kw
 "}
@@ -5050,13 +4973,13 @@ BI
 BI
 DT
 jU
-Ve
+Kt
 gJ
-KW
-KW
-KW
-KW
-KW
+UB
+UB
+UB
+UB
+UB
 RI
 RZ
 "}
@@ -5069,13 +4992,13 @@ Xs
 Iu
 NR
 or
-Ve
+Kt
 nh
-KW
-KW
-KW
-KW
-KW
+UB
+UB
+UB
+UB
+UB
 dR
 IF
 "}
@@ -5088,15 +5011,15 @@ gA
 zl
 NR
 Je
-Ve
+Kt
 oJ
-KW
-KW
-KW
-KW
-KW
+UB
+UB
+UB
+UB
+UB
 rh
-Ve
+Kt
 "}
 (24,1,1) = {"
 XG
@@ -5107,15 +5030,15 @@ IK
 dP
 bb
 sH
-Ve
+Kt
 je
-KW
-KW
-KW
-KW
-KW
+UB
+UB
+UB
+UB
+UB
 dR
-Ve
+Kt
 "}
 (25,1,1) = {"
 XG
@@ -5126,15 +5049,15 @@ Mk
 VF
 mL
 Tx
-Ve
+Kt
 oJ
-KW
-KW
-KW
-KW
-KW
+UB
+UB
+UB
+UB
+UB
 RI
-Ve
+Kt
 "}
 (26,1,1) = {"
 XG
@@ -5145,7 +5068,7 @@ gP
 zl
 cQ
 Mp
-Ve
+Kt
 PN
 hp
 zL
@@ -5153,7 +5076,7 @@ zL
 zL
 zL
 YV
-Ve
+Kt
 "}
 (27,1,1) = {"
 XG
@@ -5164,14 +5087,14 @@ dP
 dP
 KU
 yk
-Ve
+Kt
 hr
 zY
 Yj
 CK
-Ve
-Ve
-Ve
+Kt
+Kt
+Kt
 If
 "}
 (28,1,1) = {"
@@ -5188,7 +5111,7 @@ Ds
 iB
 gS
 py
-Ve
+Kt
 XG
 XG
 XG
@@ -5202,7 +5125,7 @@ iI
 OD
 dE
 eK
-Ve
+Kt
 Oy
 im
 bO