From 67e7ebdfaa2529cba4875e1c0dd16dbf9ce7b122 Mon Sep 17 00:00:00 2001
From: OrionTheFox <76465278+OrionTheFox@users.noreply.github.com>
Date: Mon, 13 Dec 2021 04:08:42 -0700
Subject: [PATCH] [Semi-Modular] Advanced Shuttles Revamp, and new Advanced
Shuttles! (#9951)
* clean up closets
* add new closets back
* it didnt use dir lights!?!?!
* bye bye
* name can be shorter reee
* com press
* HERE THEY COMEEEEE
* largemine/labor
* consign my love
* h
* tweakingsies
* better miining
* these look nice
* oops
* fix the evac shuttle tiles a bit (i still hate it)
* hngh
* i coulda sworn..
* exodus
* apostraphe
* area
* name
* clozet
* color consistency
* backwards ship moment
* fix my oops with the vents
SUS??
* this is cleaner
* typo moment
* note
* note, no-sell in cockpit, wall lockers
* jsons for crago
* oh hey thats broken cool
* map moment
* totally unrelated fix that I just wanna do here bc no one remembers it
* this doesnt actually work. Yet.
* ferry and readme fixes
* this doesnt work and I cant be bothered to fix it this second. Dunno how
* double period moment
* dir was wrong, oops
* map conversion moment
* CI fail moment
* h
* pain
---
_maps/deltastation.json | 2 +-
_maps/icebox.json | 2 +-
_maps/map_files/Blueshift/BlueShift_lower.dmm | 4 +-
.../map_files/Blueshift/BlueShift_middle.dmm | 2 +-
.../Deltastation/DeltaStation2_skyrat.dmm | 6 +-
.../IceBoxStation/IceBoxStation_skyrat.dmm | 2 +-
.../MetaStation/MetaStation_skyrat.dmm | 6 +-
_maps/map_files/Mining/Rockplanet.dmm | 2 +-
_maps/map_files/generic/CentCom_skyrat.dmm | 42 +-
_maps/metastation.json | 2 +-
_maps/nssjourney.json | 2 +-
_maps/readme.md | 1 +
_maps/shuttles/cargo_skyrat.dmm | 235 ----
_maps/shuttles/emergency_skyrat.dmm | 126 +-
_maps/skyrat/shuttles/arrivals_skyrat.dmm | 27 +-
_maps/skyrat/shuttles/cargo_delta_skyrat.dmm | 531 ++++++++
_maps/skyrat/shuttles/cargo_skyrat.dmm | 453 +++++++
.../shuttles/escape_pod_default_skyrat.dmm | 8 +-
_maps/{ => skyrat}/shuttles/ferry_skyrat.dmm | 106 +-
_maps/skyrat/shuttles/labour_skyrat.dmm | 419 ++++++
.../skyrat/shuttles/mining_common_skyrat.dmm | 336 +++++
_maps/skyrat/shuttles/mining_large_skyrat.dmm | 545 ++++++++
_maps/skyrat/shuttles/mining_skyrat.dmm | 334 +++++
_maps/templates/ferry_skyrat.dmm | 92 +-
_maps/tramstation.json | 2 +-
code/modules/shuttle/supply.dm | 4 +
.../master_files/icons/obj/closet.dmi | Bin 63963 -> 61476 bytes
.../modules/advanced_shuttles/code/areas.dm | 24 +-
.../modules/advanced_shuttles/code/closet.dm | 85 +-
.../modules/advanced_shuttles/code/decals.dm | 36 +-
.../modules/advanced_shuttles/code/floor.dm | 84 --
.../advanced_shuttles/code/shuttles.dm | 53 +-
.../modules/advanced_shuttles/code/turfs.dm | 186 +++
.../modules/advanced_shuttles/code/wall.dm | 62 -
.../modules/advanced_shuttles/icons/cargo.dmi | Bin 8104 -> 60348 bytes
.../advanced_shuttles/icons/cargofloor.dmi | Bin 15984 -> 0 bytes
.../icons/computer_shuttle_mining.dmi | Bin 78395 -> 0 bytes
.../icons/computer_shuttle_white.dmi | Bin 79936 -> 0 bytes
.../advanced_shuttles/icons/erokez.dmi | Bin 37873 -> 38109 bytes
.../advanced_shuttles/icons/evac_shuttle.dmi | Bin 56918 -> 56511 bytes
.../icons/exploration_floor.dmi | Bin 0 -> 3567 bytes
.../advanced_shuttles/icons/mining.dmi | Bin 0 -> 11384 bytes
.../advanced_shuttles/icons/mining_labor.dmi | Bin 0 -> 14232 bytes
.../advanced_shuttles/icons/mining_large.dmi | Bin 0 -> 20856 bytes
.../modules/advanced_shuttles/icons/pod.dmi | Bin 3909 -> 3911 bytes
.../advanced_shuttles/icons/shuttle.dmi | Bin 117167 -> 0 bytes
.../icons/shuttle_mining.dmi | Bin 3247 -> 0 bytes
.../advanced_shuttles/icons/trusters.dmi | Bin 7019 -> 0 bytes
.../modules/advanced_shuttles/icons/wagon.dmi | Bin 20484 -> 13294 bytes
...kplanet_surface_syndicate_base1_skyrat.dmm | 1198 ++++++++---------
tgstation.dme | 3 +-
51 files changed, 3789 insertions(+), 1233 deletions(-)
delete mode 100644 _maps/shuttles/cargo_skyrat.dmm
create mode 100644 _maps/skyrat/shuttles/cargo_delta_skyrat.dmm
create mode 100644 _maps/skyrat/shuttles/cargo_skyrat.dmm
rename _maps/{ => skyrat}/shuttles/ferry_skyrat.dmm (92%)
create mode 100644 _maps/skyrat/shuttles/labour_skyrat.dmm
create mode 100644 _maps/skyrat/shuttles/mining_common_skyrat.dmm
create mode 100644 _maps/skyrat/shuttles/mining_large_skyrat.dmm
create mode 100644 _maps/skyrat/shuttles/mining_skyrat.dmm
delete mode 100644 modular_skyrat/modules/advanced_shuttles/code/floor.dm
create mode 100644 modular_skyrat/modules/advanced_shuttles/code/turfs.dm
delete mode 100644 modular_skyrat/modules/advanced_shuttles/code/wall.dm
delete mode 100644 modular_skyrat/modules/advanced_shuttles/icons/cargofloor.dmi
delete mode 100644 modular_skyrat/modules/advanced_shuttles/icons/computer_shuttle_mining.dmi
delete mode 100644 modular_skyrat/modules/advanced_shuttles/icons/computer_shuttle_white.dmi
create mode 100644 modular_skyrat/modules/advanced_shuttles/icons/exploration_floor.dmi
create mode 100644 modular_skyrat/modules/advanced_shuttles/icons/mining.dmi
create mode 100644 modular_skyrat/modules/advanced_shuttles/icons/mining_labor.dmi
create mode 100644 modular_skyrat/modules/advanced_shuttles/icons/mining_large.dmi
delete mode 100644 modular_skyrat/modules/advanced_shuttles/icons/shuttle.dmi
delete mode 100644 modular_skyrat/modules/advanced_shuttles/icons/shuttle_mining.dmi
delete mode 100644 modular_skyrat/modules/advanced_shuttles/icons/trusters.dmi
diff --git a/_maps/deltastation.json b/_maps/deltastation.json
index 53c7b5beeef..8aca5246f11 100644
--- a/_maps/deltastation.json
+++ b/_maps/deltastation.json
@@ -6,7 +6,7 @@
"shuttles": {
"emergency": "emergency_delta",
"ferry": "ferry_fancy",
- "cargo": "cargo_delta",
+ "cargo": "cargo_delta_skyrat",
"whiteship": "whiteship_delta"
},
"job_changes": {
diff --git a/_maps/icebox.json b/_maps/icebox.json
index a709ca8889b..c8c2c019c08 100644
--- a/_maps/icebox.json
+++ b/_maps/icebox.json
@@ -10,7 +10,7 @@
"space_ruin_levels": 0,
"space_empty_levels": 0,
"shuttles": {
- "cargo": "cargo_box",
+ "cargo": "cargo_skyrat",
"ferry": "ferry_fancy",
"whiteship": "whiteship_box",
"emergency": "emergency_box"
diff --git a/_maps/map_files/Blueshift/BlueShift_lower.dmm b/_maps/map_files/Blueshift/BlueShift_lower.dmm
index abf94dea17b..a6e2cfd5068 100644
--- a/_maps/map_files/Blueshift/BlueShift_lower.dmm
+++ b/_maps/map_files/Blueshift/BlueShift_lower.dmm
@@ -24089,7 +24089,7 @@
height = 5;
id = "mining_home";
name = "mining shuttle bay";
- roundstart_template = /datum/map_template/shuttle/mining/box;
+ roundstart_template = /datum/map_template/shuttle/mining/skyrat;
width = 7
},
/turf/open/floor/plating,
@@ -25337,7 +25337,7 @@
height = 5;
id = "commonmining_home";
name = "SS13: Common Mining Dock";
- roundstart_template = /datum/map_template/shuttle/mining_common/meta;
+ roundstart_template = /datum/map_template/shuttle/mining_common/skyrat;
width = 7
},
/turf/open/space/basic,
diff --git a/_maps/map_files/Blueshift/BlueShift_middle.dmm b/_maps/map_files/Blueshift/BlueShift_middle.dmm
index 0a5fc56e942..53a531f2417 100644
--- a/_maps/map_files/Blueshift/BlueShift_middle.dmm
+++ b/_maps/map_files/Blueshift/BlueShift_middle.dmm
@@ -38328,7 +38328,7 @@
height = 5;
id = "laborcamp_home";
name = "fore bay 1";
- roundstart_template = /datum/map_template/shuttle/labour/box;
+ roundstart_template = /datum/map_template/shuttle/labour/skyrat;
width = 9
},
/turf/open/floor/plating,
diff --git a/_maps/map_files/Deltastation/DeltaStation2_skyrat.dmm b/_maps/map_files/Deltastation/DeltaStation2_skyrat.dmm
index cc3920cdb4a..2b82d9c3123 100644
--- a/_maps/map_files/Deltastation/DeltaStation2_skyrat.dmm
+++ b/_maps/map_files/Deltastation/DeltaStation2_skyrat.dmm
@@ -239,7 +239,7 @@
height = 5;
id = "commonmining_home";
name = "SS13: Common Mining Dock";
- roundstart_template = /datum/map_template/shuttle/mining_common/meta;
+ roundstart_template = /datum/map_template/shuttle/mining_common/skyrat;
width = 7
},
/turf/open/space/basic,
@@ -9043,7 +9043,7 @@
height = 5;
id = "laborcamp_home";
name = "fore bay 1";
- roundstart_template = /datum/map_template/shuttle/labour/delta;
+ roundstart_template = /datum/map_template/shuttle/labour/skyrat;
width = 9
},
/turf/open/space/basic,
@@ -51435,7 +51435,7 @@
height = 5;
id = "mining_home";
name = "mining shuttle bay";
- roundstart_template = /datum/map_template/shuttle/mining/delta;
+ roundstart_template = /datum/map_template/shuttle/mining/skyrat;
width = 7
},
/turf/open/space/basic,
diff --git a/_maps/map_files/IceBoxStation/IceBoxStation_skyrat.dmm b/_maps/map_files/IceBoxStation/IceBoxStation_skyrat.dmm
index db487957625..b6f93cd6375 100644
--- a/_maps/map_files/IceBoxStation/IceBoxStation_skyrat.dmm
+++ b/_maps/map_files/IceBoxStation/IceBoxStation_skyrat.dmm
@@ -36234,7 +36234,7 @@
height = 5;
id = "laborcamp_home";
name = "fore bay 1";
- roundstart_template = /datum/map_template/shuttle/labour/box;
+ roundstart_template = /datum/map_template/shuttle/labour/skyrat;
width = 9
},
/turf/open/floor/plating/snowed,
diff --git a/_maps/map_files/MetaStation/MetaStation_skyrat.dmm b/_maps/map_files/MetaStation/MetaStation_skyrat.dmm
index 0ee426f8753..a4475ed1813 100644
--- a/_maps/map_files/MetaStation/MetaStation_skyrat.dmm
+++ b/_maps/map_files/MetaStation/MetaStation_skyrat.dmm
@@ -3148,7 +3148,7 @@
height = 5;
id = "mining_home";
name = "mining shuttle bay";
- roundstart_template = /datum/map_template/shuttle/mining/box;
+ roundstart_template = /datum/map_template/shuttle/mining/skyrat;
width = 7
},
/turf/open/space/basic,
@@ -3895,7 +3895,7 @@
height = 5;
id = "laborcamp_home";
name = "fore bay 1";
- roundstart_template = /datum/map_template/shuttle/labour/box;
+ roundstart_template = /datum/map_template/shuttle/labour/skyrat;
width = 9
},
/turf/open/space/basic,
@@ -7226,7 +7226,7 @@
height = 5;
id = "commonmining_home";
name = "SS13: Common Mining Dock";
- roundstart_template = /datum/map_template/shuttle/mining_common/meta;
+ roundstart_template = /datum/map_template/shuttle/mining_common/skyrat;
width = 7
},
/turf/open/floor/plating,
diff --git a/_maps/map_files/Mining/Rockplanet.dmm b/_maps/map_files/Mining/Rockplanet.dmm
index 5220c97e935..177627c2e02 100644
--- a/_maps/map_files/Mining/Rockplanet.dmm
+++ b/_maps/map_files/Mining/Rockplanet.dmm
@@ -176,7 +176,7 @@
dir = 8;
dwidth = 3;
height = 10;
- id = "mining_common_away";
+ id = "lavaland_common_away";
name = "public dock";
width = 7
},
diff --git a/_maps/map_files/generic/CentCom_skyrat.dmm b/_maps/map_files/generic/CentCom_skyrat.dmm
index acf1e036763..7660ce92e41 100644
--- a/_maps/map_files/generic/CentCom_skyrat.dmm
+++ b/_maps/map_files/generic/CentCom_skyrat.dmm
@@ -207,9 +207,19 @@
/turf/open/floor/iron/grimy,
/area/centcom/control)
"dx" = (
-/obj/effect/spawner/structure/window/reinforced,
-/turf/open/space/basic,
-/area/centcom/ferry)
+/obj/docking_port/stationary{
+ dheight = 3;
+ dir = 8;
+ dwidth = 8;
+ height = 11;
+ id = "ferry_away";
+ json_key = null;
+ name = "CentCom Ferry Dock";
+ roundstart_template = /datum/map_template/shuttle/ferry;
+ width = 20
+ },
+/turf/open/space,
+/area/space)
"dy" = (
/obj/machinery/door/airlock/centcom{
name = "Administrative Office";
@@ -6697,20 +6707,6 @@
/obj/effect/turf_decal/delivery,
/turf/open/floor/iron,
/area/centcom/ferry)
-"vB" = (
-/obj/docking_port/stationary{
- dheight = 3;
- dir = 8;
- dwidth = 8;
- height = 11;
- id = "ferry_away";
- json_key = null;
- name = "CentCom Ferry Dock";
- roundstart_template = /datum/map_template/shuttle/ferry;
- width = 20
- },
-/turf/open/space/basic,
-/area/space)
"vC" = (
/obj/machinery/door/airlock/external{
name = "Ferry Airlock"
@@ -48117,8 +48113,8 @@ aa
aa
aa
aa
-vB
-ad
+aa
+dx
aa
aa
aa
@@ -48376,7 +48372,7 @@ aa
oe
vC
DK
-dx
+oe
aa
aa
aa
@@ -48633,7 +48629,7 @@ aa
oe
yn
yn
-dx
+oe
aa
aa
aa
@@ -48890,7 +48886,7 @@ aa
oe
Xy
Xy
-dx
+oe
aa
aa
aa
@@ -49147,7 +49143,7 @@ aa
oe
yn
yn
-dx
+oe
aa
aa
aa
diff --git a/_maps/metastation.json b/_maps/metastation.json
index 451f1793c4b..ab218d8696b 100644
--- a/_maps/metastation.json
+++ b/_maps/metastation.json
@@ -4,7 +4,7 @@
"map_path": "map_files/MetaStation",
"map_file": "MetaStation_skyrat.dmm",
"shuttles": {
- "cargo": "cargo_box",
+ "cargo": "cargo_skyrat",
"ferry": "ferry_fancy",
"whiteship": "whiteship_meta",
"emergency": "emergency_meta"
diff --git a/_maps/nssjourney.json b/_maps/nssjourney.json
index 7d58d06886b..d74f4355da7 100644
--- a/_maps/nssjourney.json
+++ b/_maps/nssjourney.json
@@ -6,7 +6,7 @@
"shuttles": {
"emergency": "emergency_box",
"ferry": "ferry_fancy",
- "cargo": "cargo_box",
+ "cargo": "cargo_skyrat",
"whiteship": "whiteship_box"
},
"job_changes": {
diff --git a/_maps/readme.md b/_maps/readme.md
index e104b07c5ba..3826b70a6d2 100644
--- a/_maps/readme.md
+++ b/_maps/readme.md
@@ -17,6 +17,7 @@ The list of items that are modular requiring adding/modifying to /tg/ maps:
- Security Medical Room
- Arrival Tram and Console (inside Arrival area)
- Central Command Ferry Hangar (inside Arrival area)
+- Update roundstart_template variable on mining/public/labour stationary docks: mining/x > mining/skyrat, mining_common/x > mining_common/skyrat, labour/x > labour/skyrat , mining/large > mining/large/skyrat
## Rules
diff --git a/_maps/shuttles/cargo_skyrat.dmm b/_maps/shuttles/cargo_skyrat.dmm
deleted file mode 100644
index 2649059a8d1..00000000000
--- a/_maps/shuttles/cargo_skyrat.dmm
+++ /dev/null
@@ -1,235 +0,0 @@
-//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
-"a" = (
-/turf/template_noop,
-/area/template_noop)
-"c" = (
-/obj/structure/table/reinforced,
-/turf/open/floor/iron/dark/blue/side{
- dir = 5
- },
-/area/shuttle/supply/cockpit)
-"d" = (
-/obj/machinery/light/directional/west,
-/turf/open/floor/mineral/titanium/blue,
-/area/shuttle/supply)
-"e" = (
-/obj/machinery/light/directional/west,
-/turf/open/floor/iron/dark/blue/side{
- dir = 9
- },
-/area/shuttle/supply/cockpit)
-"f" = (
-/obj/machinery/light/directional/north,
-/turf/open/floor/mineral/titanium/blue,
-/area/shuttle/supply)
-"h" = (
-/obj/structure/chair/comfy/shuttle{
- dir = 1
- },
-/turf/open/floor/iron/dark/blue/side{
- dir = 6
- },
-/area/shuttle/supply/cockpit)
-"i" = (
-/obj/structure/shuttle/engine/propulsion/burst/right,
-/turf/open/floor/plating/airless,
-/area/shuttle/supply)
-"l" = (
-/obj/structure/window/reinforced{
- dir = 1
- },
-/obj/structure/shuttle/engine/heater,
-/turf/open/floor/plating/airless,
-/area/shuttle/supply)
-"m" = (
-/obj/effect/spawner/structure/window/reinforced/shuttle,
-/turf/open/floor/plating,
-/area/shuttle/supply/cockpit)
-"q" = (
-/turf/closed/wall/mineral/titanium,
-/area/shuttle/supply)
-"r" = (
-/obj/machinery/button/door/directional/east{
- id = "QMLoaddoor2";
- name = "Loading Doors";
- pixel_y = 8
- },
-/obj/machinery/button/door/directional/east{
- id = "QMLoaddoor";
- name = "Loading Doors";
- pixel_y = -8
- },
-/obj/machinery/light/directional/east,
-/turf/open/floor/mineral/titanium/blue,
-/area/shuttle/supply)
-"t" = (
-/obj/structure/shuttle/engine/propulsion,
-/turf/open/floor/plating/airless,
-/area/shuttle/supply)
-"u" = (
-/turf/open/floor/mineral/titanium/blue,
-/area/shuttle/supply)
-"w" = (
-/obj/machinery/door/airlock/titanium{
- name = "Supply Shuttle Airlock";
- req_access_txt = "31"
- },
-/obj/docking_port/mobile/supply,
-/turf/open/floor/plating,
-/area/shuttle/supply)
-"z" = (
-/obj/structure/shuttle/engine/propulsion/burst/left,
-/turf/open/floor/plating/airless,
-/area/shuttle/supply)
-"C" = (
-/obj/machinery/door/airlock/grunge{
- name = "cockpit";
- req_access_txt = "101"
- },
-/turf/open/floor/mineral/titanium/blue,
-/area/shuttle/supply/cockpit)
-"G" = (
-/obj/machinery/door/airlock/titanium{
- name = "Supply Shuttle Airlock";
- req_access_txt = "31"
- },
-/turf/open/floor/plating,
-/area/shuttle/supply)
-"K" = (
-/obj/structure/chair/comfy/shuttle{
- dir = 1
- },
-/obj/structure/closet/emcloset/wall{
- pixel_x = -28
- },
-/turf/open/floor/iron/dark/blue/side{
- dir = 10
- },
-/area/shuttle/supply/cockpit)
-"S" = (
-/obj/machinery/conveyor{
- dir = 8;
- id = "QMLoad"
- },
-/obj/machinery/door/poddoor{
- id = "QMLoaddoor";
- name = "supply dock loading door"
- },
-/turf/open/floor/plating,
-/area/shuttle/supply)
-"T" = (
-/turf/closed/wall/mineral/titanium/interior,
-/area/shuttle/supply)
-"U" = (
-/obj/machinery/conveyor{
- dir = 4;
- id = "QMLoad2"
- },
-/obj/machinery/door/poddoor{
- id = "QMLoaddoor2";
- name = "supply dock loading door"
- },
-/turf/open/floor/plating,
-/area/shuttle/supply)
-"Z" = (
-/turf/closed/wall/mineral/titanium,
-/area/shuttle/supply/cockpit)
-
-(1,1,1) = {"
-Z
-Z
-Z
-Z
-q
-q
-q
-q
-q
-q
-q
-a
-"}
-(2,1,1) = {"
-m
-e
-K
-Z
-u
-d
-u
-u
-u
-T
-q
-z
-"}
-(3,1,1) = {"
-m
-c
-h
-Z
-u
-u
-u
-u
-u
-u
-l
-t
-"}
-(4,1,1) = {"
-Z
-Z
-C
-Z
-u
-u
-u
-u
-u
-u
-l
-t
-"}
-(5,1,1) = {"
-a
-q
-f
-u
-u
-u
-u
-u
-u
-u
-l
-t
-"}
-(6,1,1) = {"
-a
-q
-u
-u
-u
-r
-u
-u
-u
-T
-q
-i
-"}
-(7,1,1) = {"
-a
-q
-q
-U
-G
-q
-w
-S
-q
-q
-q
-a
-"}
diff --git a/_maps/shuttles/emergency_skyrat.dmm b/_maps/shuttles/emergency_skyrat.dmm
index a60680c51d2..2d744df50a4 100644
--- a/_maps/shuttles/emergency_skyrat.dmm
+++ b/_maps/shuttles/emergency_skyrat.dmm
@@ -3,7 +3,7 @@
/obj/structure/chair/comfy/shuttle{
dir = 1
},
-/obj/machinery/light,
+/obj/machinery/light/directional/south,
/turf/open/floor/iron/shuttle/evac{
icon_state = "floorsec2"
},
@@ -27,9 +27,7 @@
},
/area/shuttle/escape)
"aY" = (
-/obj/machinery/light{
- dir = 8
- },
+/obj/machinery/light/directional/west,
/turf/open/floor/iron/shuttle/evac{
icon_state = "floorplace"
},
@@ -50,9 +48,7 @@
},
/area/shuttle/escape)
"bR" = (
-/obj/machinery/light{
- dir = 4
- },
+/obj/machinery/light/directional/east,
/turf/open/floor/iron/shuttle/evac{
icon_state = "floormed"
},
@@ -358,6 +354,13 @@
icon_state = "13,4"
},
/area/shuttle/escape)
+"nF" = (
+/obj/structure/chair/comfy/shuttle{
+ dir = 1
+ },
+/obj/machinery/light/directional/west,
+/turf/open/floor/iron/shuttle/evac,
+/area/shuttle/escape)
"nH" = (
/obj/structure/extinguisher_cabinet/directional/north,
/obj/structure/table/reinforced,
@@ -373,9 +376,7 @@
/obj/structure/chair/comfy/shuttle{
dir = 8
},
-/obj/machinery/light{
- dir = 4
- },
+/obj/machinery/light/directional/east,
/turf/open/floor/iron/shuttle/evac{
icon_state = "floorsec2"
},
@@ -388,13 +389,12 @@
},
/area/shuttle/escape)
"ov" = (
-/obj/structure/closet/shuttle/evacvent,
/turf/closed/wall/mineral/titanium/shuttle_wall/window/evac{
icon_state = "8,1"
},
/area/shuttle/escape)
"oT" = (
-/obj/machinery/light,
+/obj/machinery/light/directional/south,
/turf/open/floor/iron/shuttle/evac,
/area/shuttle/escape)
"oV" = (
@@ -460,9 +460,6 @@
},
/area/shuttle/escape)
"rh" = (
-/obj/machinery/light{
- dir = 8
- },
/obj/machinery/flasher{
id = "shuttle_flasher";
pixel_x = -24;
@@ -491,6 +488,9 @@
},
/area/shuttle/escape)
"sh" = (
+/obj/structure/closet/shuttle/engivent{
+ pixel_y = 32
+ },
/turf/closed/wall/mineral/titanium/shuttle_wall/window/evac{
icon_state = "8,0"
},
@@ -546,12 +546,12 @@
/area/shuttle/escape)
"tV" = (
/obj/machinery/computer/emergency_shuttle/advanced,
-/turf/open/floor/iron/shuttle/evac,
+/turf/open/floor/iron/shuttle/evac{
+ icon_state = "floorplace2"
+ },
/area/shuttle/escape)
"ua" = (
-/obj/machinery/light{
- dir = 8
- },
+/obj/machinery/light/directional/east,
/turf/open/floor/iron/shuttle/evac{
icon_state = "flooreng1"
},
@@ -571,6 +571,13 @@
icon_state = "13,20"
},
/area/shuttle/escape)
+"vn" = (
+/obj/structure/chair/comfy/shuttle,
+/obj/machinery/light/directional/east,
+/turf/open/floor/iron/shuttle/evac{
+ icon_state = "floorplace"
+ },
+/area/shuttle/escape)
"vu" = (
/turf/closed/wall/mineral/titanium/shuttle_wall/window/evac{
icon_state = "7,24"
@@ -586,12 +593,10 @@
/area/shuttle/escape)
"vF" = (
/obj/structure/chair/comfy/shuttle,
-/obj/machinery/light{
- dir = 4
- },
/obj/machinery/door/window{
dir = 8
},
+/obj/machinery/light/directional/east,
/turf/open/floor/carpet/executive,
/area/shuttle/escape)
"vS" = (
@@ -605,20 +610,16 @@
},
/area/shuttle/escape)
"wl" = (
-/obj/machinery/light{
- dir = 4
- },
+/obj/machinery/light/directional/west,
/turf/open/floor/iron/shuttle/evac{
icon_state = "flooreng1"
},
/area/shuttle/escape)
"wr" = (
-/obj/structure/table,
-/obj/item/storage/toolbox/emergency,
-/obj/item/wrench,
/obj/machinery/light{
dir = 1
},
+/obj/structure/closet/shuttle/medical/white,
/turf/open/floor/iron/shuttle/evac{
icon_state = "floorplace2"
},
@@ -686,9 +687,7 @@
},
/area/shuttle/escape)
"zC" = (
-/obj/machinery/light{
- dir = 4
- },
+/obj/machinery/light/directional/east,
/turf/open/floor/iron/shuttle/evac,
/area/shuttle/escape)
"Ao" = (
@@ -718,9 +717,7 @@
/obj/machinery/sleeper{
dir = 8
},
-/obj/machinery/light{
- dir = 4
- },
+/obj/machinery/light/directional/east,
/turf/open/floor/iron/shuttle/evac{
icon_state = "floormed"
},
@@ -817,7 +814,9 @@
/area/shuttle/escape)
"EH" = (
/obj/machinery/computer/crew/shuttle,
-/turf/open/floor/iron/shuttle/evac,
+/turf/open/floor/iron/shuttle/evac{
+ icon_state = "floorplace2"
+ },
/area/shuttle/escape)
"EU" = (
/turf/closed/wall/mineral/titanium/shuttle_wall/evac{
@@ -882,9 +881,7 @@
/obj/machinery/vending/wallmed{
pixel_x = -32
},
-/obj/machinery/light{
- dir = 8
- },
+/obj/machinery/light/directional/west,
/turf/open/floor/iron/shuttle/evac{
icon_state = "floormed"
},
@@ -962,9 +959,7 @@
/obj/machinery/sleeper{
dir = 4
},
-/obj/machinery/light{
- dir = 8
- },
+/obj/machinery/light/directional/west,
/turf/open/floor/iron/shuttle/evac{
icon_state = "floormed"
},
@@ -1053,7 +1048,7 @@
/obj/structure/chair/comfy/shuttle{
dir = 1
},
-/obj/machinery/light,
+/obj/machinery/light/directional/south,
/turf/open/floor/iron/shuttle/evac{
icon_state = "floormed"
},
@@ -1096,6 +1091,13 @@
icon_state = "floorsec2"
},
/area/shuttle/escape/brig)
+"Pa" = (
+/obj/structure/chair/comfy/shuttle,
+/obj/machinery/light/directional/west,
+/turf/open/floor/iron/shuttle/evac{
+ icon_state = "floorplace"
+ },
+/area/shuttle/escape)
"Pd" = (
/turf/closed/wall/mineral/titanium/shuttle_wall/evac{
icon_state = "5,2"
@@ -1129,8 +1131,7 @@
/turf/open/floor/iron/shuttle/evac,
/area/shuttle/escape)
"QD" = (
-/obj/structure/closet/shuttle/wagon,
-/obj/effect/spawner/random/maintenance,
+/obj/structure/closet/shuttle/emergency/white,
/turf/open/floor/iron/shuttle/evac{
icon_state = "floorplace2"
},
@@ -1186,10 +1187,9 @@
/area/shuttle/escape)
"SR" = (
/obj/machinery/computer/communications,
-/obj/machinery/light{
- dir = 8
+/turf/open/floor/iron/shuttle/evac{
+ icon_state = "floorplace2"
},
-/turf/open/floor/iron/shuttle/evac,
/area/shuttle/escape)
"ST" = (
/turf/closed/wall/mineral/titanium/shuttle_wall/evac{
@@ -1253,24 +1253,21 @@
/obj/structure/chair/comfy/shuttle{
dir = 4
},
-/obj/machinery/light{
- dir = 8
- },
/obj/machinery/button/flasher{
id = "shuttle_flasher";
pixel_x = -25;
pixel_y = -6
},
+/obj/machinery/light/directional/west,
/turf/open/floor/iron/shuttle/evac{
icon_state = "floorsec2"
},
/area/shuttle/escape/brig)
"Ws" = (
/obj/machinery/computer/atmos_alert,
-/obj/machinery/light{
- dir = 4
+/turf/open/floor/iron/shuttle/evac{
+ icon_state = "floorplace2"
},
-/turf/open/floor/iron/shuttle/evac,
/area/shuttle/escape)
"Wt" = (
/turf/closed/wall/mineral/titanium/shuttle_wall/evac{
@@ -1333,6 +1330,13 @@
icon_state = "15,16"
},
/area/shuttle/escape)
+"YN" = (
+/obj/structure/chair/comfy/shuttle{
+ dir = 1
+ },
+/obj/machinery/light/directional/east,
+/turf/open/floor/iron/shuttle/evac,
+/area/shuttle/escape)
"YW" = (
/turf/closed/wall/mineral/titanium/shuttle_wall/window/evac{
icon_state = "15,13"
@@ -1358,7 +1362,9 @@
/area/shuttle/escape)
"ZA" = (
/obj/machinery/computer/security/shuttle,
-/turf/open/floor/iron/shuttle/evac,
+/turf/open/floor/iron/shuttle/evac{
+ icon_state = "floorplace2"
+ },
/area/shuttle/escape)
"ZF" = (
/turf/template_noop,
@@ -1520,11 +1526,11 @@ lq
en
sJ
SR
-Pu
+nF
qp
JR
eL
-XT
+Pa
Rc
Rc
Li
@@ -1532,7 +1538,7 @@ XT
Sv
eL
AG
-XT
+Pa
eL
eL
Ow
@@ -1636,11 +1642,11 @@ my
dY
KI
Ws
-Pu
+YN
Qz
mI
Ue
-Ev
+vn
Rc
Rc
eL
@@ -1648,7 +1654,7 @@ Ev
dZ
eL
kH
-Ev
+vn
eL
eL
mI
diff --git a/_maps/skyrat/shuttles/arrivals_skyrat.dmm b/_maps/skyrat/shuttles/arrivals_skyrat.dmm
index 0ee926abb19..07c0084890b 100644
--- a/_maps/skyrat/shuttles/arrivals_skyrat.dmm
+++ b/_maps/skyrat/shuttles/arrivals_skyrat.dmm
@@ -6,9 +6,7 @@
/area/shuttle/arrival)
"b" = (
/obj/machinery/computer/shuttle/arrivals,
-/obj/machinery/light{
- dir = 1
- },
+/obj/machinery/light/directional/north,
/turf/open/floor/iron/shuttle/arrivals,
/area/shuttle/arrival)
"c" = (
@@ -107,9 +105,7 @@
},
/area/shuttle/arrival)
"v" = (
-/obj/machinery/light{
- dir = 8
- },
+/obj/machinery/light/directional/west,
/turf/open/floor/iron/shuttle/arrivals{
icon_state = "sign_2"
},
@@ -130,10 +126,6 @@
icon_state = "8,4"
},
/area/shuttle/arrival)
-"A" = (
-/obj/structure/closet/shuttle/wagon,
-/turf/open/floor/iron/shuttle/arrivals,
-/area/shuttle/arrival)
"B" = (
/turf/closed/wall/mineral/titanium/shuttle_wall/arrivals{
icon_state = "3,0"
@@ -181,13 +173,12 @@
/area/shuttle/arrival)
"M" = (
/obj/structure/closet/crate/bin,
-/obj/item/flashlight/seclite,
/turf/open/floor/iron/shuttle/arrivals{
icon_state = "sign_1"
},
/area/shuttle/arrival)
"N" = (
-/obj/machinery/light,
+/obj/machinery/light/directional/south,
/turf/open/floor/iron/shuttle/arrivals{
icon_state = "sign_3"
},
@@ -226,15 +217,17 @@
/obj/machinery/door/airlock/external,
/turf/open/floor/iron/shuttle/arrivals,
/area/shuttle/arrival)
+"V" = (
+/obj/structure/closet/shuttle/emergency/white,
+/turf/open/floor/iron/shuttle/arrivals,
+/area/shuttle/arrival)
"W" = (
/turf/closed/wall/mineral/titanium/shuttle_wall/arrivals{
icon_state = "12,3"
},
/area/shuttle/arrival)
"X" = (
-/obj/machinery/light{
- dir = 4
- },
+/obj/machinery/light/directional/east,
/turf/open/floor/iron/shuttle/arrivals{
icon_state = "sign_2"
},
@@ -266,7 +259,7 @@ G
"}
(3,1,1) = {"
T
-A
+V
x
X
U
@@ -322,7 +315,7 @@ f
"}
(11,1,1) = {"
j
-A
+V
x
v
U
diff --git a/_maps/skyrat/shuttles/cargo_delta_skyrat.dmm b/_maps/skyrat/shuttles/cargo_delta_skyrat.dmm
new file mode 100644
index 00000000000..61aa4b19899
--- /dev/null
+++ b/_maps/skyrat/shuttles/cargo_delta_skyrat.dmm
@@ -0,0 +1,531 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"aK" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/window/cargo{
+ dir = 1;
+ icon_state = "0,2"
+ },
+/area/shuttle/supply)
+"bh" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/window/cargo{
+ dir = 1;
+ icon_state = "4,10"
+ },
+/area/shuttle/supply)
+"fh" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/window/cargo{
+ dir = 1;
+ icon_state = "3,0"
+ },
+/area/shuttle/supply)
+"gz" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/window/cargo{
+ dir = 1;
+ icon_state = "4,11"
+ },
+/area/shuttle/supply)
+"hv" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/window/cargo{
+ dir = 1;
+ icon_state = "2,11"
+ },
+/area/shuttle/supply/cockpit)
+"hC" = (
+/turf/open/floor/iron/shuttle/cargo{
+ dir = 1
+ },
+/area/shuttle/supply)
+"hV" = (
+/turf/open/floor/iron/shuttle/cargo{
+ dir = 1;
+ icon_state = "floor_box"
+ },
+/area/shuttle/supply)
+"ib" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/window/cargo{
+ dir = 1;
+ icon_state = "5,0"
+ },
+/area/shuttle/supply)
+"iz" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/window/cargo{
+ dir = 1;
+ icon_state = "6,10"
+ },
+/area/shuttle/supply)
+"jI" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/window/cargo{
+ dir = 1;
+ icon_state = "0,7"
+ },
+/area/shuttle/supply)
+"kh" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/window/cargo{
+ dir = 1;
+ icon_state = "6,0"
+ },
+/area/shuttle/supply)
+"ku" = (
+/obj/effect/decal/cleanable/oil/streak,
+/turf/open/floor/iron/shuttle/cargo{
+ dir = 1
+ },
+/area/shuttle/supply)
+"lb" = (
+/obj/docking_port/mobile/supply{
+ dir = 4;
+ dwidth = 4
+ },
+/obj/machinery/door/airlock/grunge{
+ name = "Supply Shuttle Airlock";
+ req_access_txt = "31"
+ },
+/turf/open/floor/iron/shuttle/cargo{
+ dir = 1
+ },
+/area/shuttle/supply)
+"mX" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/window/cargo{
+ dir = 1;
+ icon_state = "2,1"
+ },
+/area/shuttle/supply)
+"nk" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/window/cargo{
+ dir = 1;
+ icon_state = "3,10"
+ },
+/area/shuttle/supply/cockpit)
+"nr" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/window/cargo{
+ dir = 1;
+ icon_state = "4,0"
+ },
+/area/shuttle/supply)
+"oA" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/window/cargo{
+ dir = 1;
+ icon_state = "0,10"
+ },
+/area/shuttle/supply/cockpit)
+"oU" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/window/cargo{
+ dir = 1;
+ icon_state = "5,1"
+ },
+/area/shuttle/supply)
+"pD" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/chair/comfy/shuttle,
+/obj/structure/closet/emcloset/wall{
+ pixel_x = 28
+ },
+/obj/item/radio/intercom/directional/north,
+/turf/open/floor/iron/shuttle/cargo{
+ dir = 1
+ },
+/area/shuttle/supply/cockpit)
+"rU" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/window/cargo{
+ dir = 1;
+ icon_state = "2,0"
+ },
+/area/shuttle/supply)
+"sz" = (
+/obj/machinery/door/airlock/grunge{
+ name = "Supply Shuttle Cockpit";
+ req_access_txt = "31"
+ },
+/turf/open/floor/iron/shuttle/cargo{
+ dir = 1
+ },
+/area/shuttle/supply/cockpit)
+"sN" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/iron/shuttle/cargo{
+ dir = 1;
+ icon_state = "floor_maintb"
+ },
+/area/shuttle/supply)
+"sR" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/iron/shuttle/cargo{
+ dir = 1
+ },
+/area/shuttle/supply)
+"tG" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/window/cargo{
+ dir = 1;
+ icon_state = "6,8_Delta"
+ },
+/area/shuttle/supply)
+"uB" = (
+/obj/structure/table/reinforced,
+/obj/item/paper/crumpled/muddy{
+ info = "Toddy spilled his damn coffee all over the console, don't expect to manually pilot the Consign until we can get a repair guy. Which, uh, might be a while...
Oh, by the way, I'm using this note now to complain about the fact we had to build a whole replica Consign for this station specifically? They could have just adjusted the docking parameters but noooo, 'wah the door is an inch off!' God, those corpos can suck my wrench."
+ },
+/turf/open/floor/iron/shuttle/cargo{
+ dir = 1
+ },
+/area/shuttle/supply/cockpit)
+"uI" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/window/cargo{
+ dir = 1;
+ icon_state = "1,1"
+ },
+/area/shuttle/supply)
+"vd" = (
+/obj/machinery/conveyor{
+ dir = 8;
+ id = "cargounload"
+ },
+/obj/machinery/door/poddoor{
+ id = "cargounload";
+ name = "supply dock unloading door"
+ },
+/turf/open/floor/plating,
+/area/shuttle/supply)
+"ws" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/window/cargo{
+ dir = 1
+ },
+/area/shuttle/supply)
+"ww" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/iron/shuttle/cargo{
+ dir = 1;
+ icon_state = "floor_mainta"
+ },
+/area/shuttle/supply)
+"wI" = (
+/turf/open/floor/iron/shuttle/cargo{
+ dir = 1;
+ icon_state = "floor_in"
+ },
+/area/shuttle/supply)
+"xI" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/window/cargo{
+ dir = 1;
+ icon_state = "3,11"
+ },
+/area/shuttle/supply/cockpit)
+"xV" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/window/cargo{
+ dir = 1;
+ icon_state = "1,11"
+ },
+/area/shuttle/supply/cockpit)
+"zx" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/window/cargo{
+ dir = 1;
+ icon_state = "0,1"
+ },
+/area/shuttle/supply)
+"zP" = (
+/turf/template_noop,
+/area/template_noop)
+"Ay" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/window/cargo{
+ dir = 1;
+ icon_state = "3,8"
+ },
+/area/shuttle/supply/cockpit)
+"AU" = (
+/obj/machinery/light/directional/south,
+/turf/open/floor/iron/shuttle/cargo{
+ dir = 1
+ },
+/area/shuttle/supply)
+"CR" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/window/cargo{
+ dir = 1;
+ icon_state = "1,0"
+ },
+/area/shuttle/supply)
+"Ff" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/window/cargo{
+ dir = 1;
+ icon_state = "0,8"
+ },
+/area/shuttle/supply/cockpit)
+"FG" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/cargo{
+ dir = 1;
+ icon_state = "6,6"
+ },
+/area/shuttle/supply)
+"FR" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/window/cargo{
+ dir = 1;
+ icon_state = "1,8"
+ },
+/area/shuttle/supply/cockpit)
+"Gf" = (
+/obj/machinery/door/poddoor{
+ id = "cargoload";
+ name = "supply dock loading door"
+ },
+/obj/machinery/conveyor{
+ dir = 4;
+ id = "cargoload"
+ },
+/turf/open/floor/plating,
+/area/shuttle/supply)
+"Hz" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/window/cargo{
+ dir = 1;
+ icon_state = "6,1"
+ },
+/area/shuttle/supply)
+"KM" = (
+/obj/machinery/computer{
+ desc = "This WAS a helmsman's console, before it became a coffee's console.";
+ dir = 1
+ },
+/obj/machinery/light/directional/east,
+/turf/open/floor/iron/shuttle/cargo{
+ dir = 1
+ },
+/area/shuttle/supply/cockpit)
+"Lh" = (
+/obj/machinery/light/directional/east,
+/turf/open/floor/iron/shuttle/cargo{
+ dir = 1;
+ icon_state = "floor_box"
+ },
+/area/shuttle/supply)
+"MA" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/window/cargo{
+ dir = 1;
+ icon_state = "0,0"
+ },
+/area/shuttle/supply)
+"Oi" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/window/cargo{
+ dir = 1;
+ icon_state = "0,3"
+ },
+/area/shuttle/supply)
+"Ow" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/iron/shuttle/cargo{
+ dir = 1;
+ icon_state = "floor_box"
+ },
+/area/shuttle/supply)
+"PH" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/window/cargo{
+ dir = 1;
+ icon_state = "2,8"
+ },
+/area/shuttle/supply/cockpit)
+"PS" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/chair/comfy/shuttle,
+/turf/open/floor/iron/shuttle/cargo{
+ dir = 1
+ },
+/area/shuttle/supply/cockpit)
+"Qm" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/window/cargo{
+ dir = 1;
+ icon_state = "0,9"
+ },
+/area/shuttle/supply/cockpit)
+"Qx" = (
+/obj/structure/closet/shuttle/engivent{
+ pixel_y = 33
+ },
+/turf/open/floor/iron/shuttle/cargo{
+ dir = 1
+ },
+/area/shuttle/supply)
+"QJ" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/window/cargo{
+ dir = 1;
+ icon_state = "0,4"
+ },
+/area/shuttle/supply)
+"Sz" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/window/cargo{
+ dir = 1;
+ icon_state = "5,10"
+ },
+/area/shuttle/supply)
+"To" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/window/cargo{
+ dir = 1;
+ icon_state = "0,11"
+ },
+/area/shuttle/supply/cockpit)
+"TO" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/window/cargo{
+ dir = 1;
+ icon_state = "6,9_Delta"
+ },
+/area/shuttle/supply)
+"Uj" = (
+/turf/open/floor/iron/shuttle/cargo{
+ dir = 1;
+ icon_state = "floor_out"
+ },
+/area/shuttle/supply)
+"UC" = (
+/obj/machinery/button/door/directional/west{
+ id = "cargoload";
+ name = "Loading Doors";
+ pixel_y = -8
+ },
+/obj/machinery/button/door/directional/west{
+ id = "cargounload";
+ name = "Loading Doors";
+ pixel_y = 8
+ },
+/obj/machinery/light/directional/west,
+/turf/open/floor/iron/shuttle/cargo{
+ dir = 1
+ },
+/area/shuttle/supply)
+"UX" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/window/cargo{
+ dir = 1;
+ icon_state = "6,2_Delta"
+ },
+/area/shuttle/supply)
+"VP" = (
+/obj/effect/decal/cleanable/oil/slippery,
+/turf/open/floor/iron/shuttle/cargo{
+ dir = 1
+ },
+/area/shuttle/supply)
+"Xb" = (
+/obj/machinery/door/airlock/grunge{
+ name = "Supply Shuttle Airlock";
+ req_access_txt = "31"
+ },
+/turf/open/floor/iron/shuttle/cargo{
+ dir = 1
+ },
+/area/shuttle/supply)
+"Xe" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/window/cargo{
+ dir = 1;
+ icon_state = "4,1"
+ },
+/area/shuttle/supply)
+"Xp" = (
+/obj/structure/extinguisher_cabinet/directional/south,
+/turf/open/floor/iron/shuttle/cargo{
+ dir = 1
+ },
+/area/shuttle/supply)
+"Ye" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/window/cargo{
+ dir = 1;
+ icon_state = "0,5"
+ },
+/area/shuttle/supply)
+"ZB" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/window/cargo{
+ dir = 1;
+ icon_state = "0,6"
+ },
+/area/shuttle/supply)
+
+(1,1,1) = {"
+kh
+Hz
+UX
+vd
+lb
+FG
+Xb
+Gf
+tG
+TO
+iz
+zP
+"}
+(2,1,1) = {"
+ib
+oU
+hC
+Uj
+hV
+UC
+hV
+wI
+hC
+hC
+Sz
+zP
+"}
+(3,1,1) = {"
+nr
+Xe
+hC
+sR
+hC
+hC
+hC
+sR
+hC
+AU
+bh
+gz
+"}
+(4,1,1) = {"
+fh
+ws
+Qx
+hC
+ku
+VP
+hC
+Xp
+Ay
+sz
+nk
+xI
+"}
+(5,1,1) = {"
+rU
+mX
+hV
+hV
+hV
+hV
+sR
+hC
+PH
+PS
+uB
+hv
+"}
+(6,1,1) = {"
+CR
+uI
+Ow
+Ow
+hV
+Lh
+ww
+sN
+FR
+pD
+KM
+xV
+"}
+(7,1,1) = {"
+MA
+zx
+aK
+Oi
+QJ
+Ye
+ZB
+jI
+Ff
+Qm
+oA
+To
+"}
diff --git a/_maps/skyrat/shuttles/cargo_skyrat.dmm b/_maps/skyrat/shuttles/cargo_skyrat.dmm
new file mode 100644
index 00000000000..31b670bb6f7
--- /dev/null
+++ b/_maps/skyrat/shuttles/cargo_skyrat.dmm
@@ -0,0 +1,453 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"bm" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/window/cargo{
+ icon_state = "1,11"
+ },
+/area/shuttle/supply/cockpit)
+"bT" = (
+/obj/machinery/light/directional/west,
+/obj/machinery/computer{
+ desc = "This WAS a helmsman's console, before it became a coffee's console."
+ },
+/turf/open/floor/iron/shuttle/cargo,
+/area/shuttle/supply/cockpit)
+"cE" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/window/cargo{
+ icon_state = "0,0"
+ },
+/area/shuttle/supply)
+"dg" = (
+/obj/effect/decal/cleanable/oil/slippery,
+/turf/open/floor/iron/shuttle/cargo,
+/area/shuttle/supply)
+"do" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/cargo{
+ icon_state = "3,10"
+ },
+/area/shuttle/supply/cockpit)
+"ds" = (
+/obj/docking_port/mobile/supply,
+/obj/machinery/door/airlock/grunge{
+ name = "Supply Shuttle Airlock";
+ req_access_txt = "31"
+ },
+/turf/open/floor/iron/shuttle/cargo{
+ icon_state = "floor_box"
+ },
+/area/shuttle/supply)
+"dv" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/cargo{
+ icon_state = "1,1"
+ },
+/area/shuttle/supply)
+"eb" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/cargo{
+ icon_state = "0,6"
+ },
+/area/shuttle/supply)
+"fr" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/cargo{
+ icon_state = "4,1"
+ },
+/area/shuttle/supply)
+"go" = (
+/obj/machinery/button/door/directional/east{
+ id = "QMLoaddoor2";
+ name = "Loading Doors";
+ pixel_y = 8
+ },
+/obj/machinery/button/door/directional/east{
+ id = "QMLoaddoor";
+ name = "Loading Doors";
+ pixel_y = -8
+ },
+/obj/machinery/light/directional/east,
+/turf/open/floor/iron/shuttle/cargo,
+/area/shuttle/supply)
+"jn" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/cargo{
+ icon_state = "1,8"
+ },
+/area/shuttle/supply/cockpit)
+"kb" = (
+/obj/effect/decal/cleanable/oil/streak,
+/turf/open/floor/iron/shuttle/cargo,
+/area/shuttle/supply)
+"kz" = (
+/obj/machinery/light/directional/west,
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/iron/shuttle/cargo{
+ icon_state = "floor_mainta"
+ },
+/area/shuttle/supply)
+"lq" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/window/cargo{
+ icon_state = "4,0"
+ },
+/area/shuttle/supply)
+"lz" = (
+/obj/machinery/light/directional/north,
+/turf/open/floor/iron/shuttle/cargo,
+/area/shuttle/supply)
+"me" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/cargo{
+ icon_state = "0,11"
+ },
+/area/shuttle/supply/cockpit)
+"mp" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/cargo,
+/area/shuttle/supply)
+"mH" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/cargo{
+ icon_state = "6,6"
+ },
+/area/shuttle/supply)
+"mP" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/iron/shuttle/cargo{
+ icon_state = "floor_box"
+ },
+/area/shuttle/supply)
+"ob" = (
+/turf/open/floor/iron/shuttle/cargo{
+ icon_state = "floor_box"
+ },
+/area/shuttle/supply)
+"qx" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/cargo{
+ icon_state = "6,3"
+ },
+/area/shuttle/supply)
+"qN" = (
+/obj/structure/chair/comfy/shuttle{
+ dir = 1
+ },
+/obj/structure/closet/emcloset/wall{
+ pixel_x = -28
+ },
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/item/radio/intercom/directional/south,
+/turf/open/floor/iron/shuttle/cargo,
+/area/shuttle/supply/cockpit)
+"rY" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/iron/shuttle/cargo{
+ icon_state = "floor_maintb"
+ },
+/area/shuttle/supply)
+"rZ" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/cargo{
+ icon_state = "6,10"
+ },
+/area/shuttle/supply)
+"sa" = (
+/obj/structure/table/reinforced,
+/obj/item/paper/crumpled/muddy{
+ info = "Toddy spilled his damn coffee all over the console, don't expect to manually pilot the Consign until we can get a repair guy. Which, uh, might be a while..."
+ },
+/turf/open/floor/iron/shuttle/cargo,
+/area/shuttle/supply/cockpit)
+"tp" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/window/cargo{
+ icon_state = "2,0"
+ },
+/area/shuttle/supply)
+"uk" = (
+/obj/machinery/conveyor{
+ dir = 8;
+ id = "QMLoad"
+ },
+/obj/machinery/door/poddoor{
+ id = "QMLoaddoor";
+ name = "supply dock loading door"
+ },
+/turf/open/floor/plating,
+/area/shuttle/supply)
+"uI" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/window/cargo{
+ icon_state = "2,11"
+ },
+/area/shuttle/supply/cockpit)
+"vy" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/cargo{
+ icon_state = "0,5"
+ },
+/area/shuttle/supply)
+"vF" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/window/cargo{
+ icon_state = "5,0"
+ },
+/area/shuttle/supply)
+"wR" = (
+/obj/machinery/door/airlock/grunge{
+ name = "Supply Shuttle Airlock";
+ req_access_txt = "31"
+ },
+/turf/open/floor/iron/shuttle/cargo{
+ icon_state = "floor_box"
+ },
+/area/shuttle/supply)
+"zx" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/window/cargo{
+ icon_state = "4,11"
+ },
+/area/shuttle/supply)
+"zQ" = (
+/turf/open/floor/iron/shuttle/cargo{
+ icon_state = "floor_out"
+ },
+/area/shuttle/supply)
+"FF" = (
+/obj/structure/extinguisher_cabinet/directional/north,
+/turf/open/floor/iron/shuttle/cargo,
+/area/shuttle/supply)
+"GD" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/cargo{
+ icon_state = "5,1"
+ },
+/area/shuttle/supply)
+"Hd" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/cargo{
+ icon_state = "5,10"
+ },
+/area/shuttle/supply)
+"Ho" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/window/cargo{
+ icon_state = "3,0"
+ },
+/area/shuttle/supply)
+"Is" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/window/cargo{
+ icon_state = "1,0"
+ },
+/area/shuttle/supply)
+"Iw" = (
+/obj/structure/closet/shuttle/engivent{
+ pixel_y = -33
+ },
+/turf/open/floor/iron/shuttle/cargo,
+/area/shuttle/supply)
+"IQ" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/cargo{
+ icon_state = "0,4"
+ },
+/area/shuttle/supply)
+"Jp" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/cargo{
+ icon_state = "4,10"
+ },
+/area/shuttle/supply)
+"MI" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/cargo{
+ icon_state = "3,11"
+ },
+/area/shuttle/supply/cockpit)
+"MU" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/cargo{
+ icon_state = "0,9"
+ },
+/area/shuttle/supply/cockpit)
+"OI" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/cargo{
+ icon_state = "6,9"
+ },
+/area/shuttle/supply)
+"OZ" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/cargo{
+ icon_state = "2,1"
+ },
+/area/shuttle/supply)
+"PA" = (
+/obj/structure/chair/comfy/shuttle{
+ dir = 1
+ },
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/iron/shuttle/cargo,
+/area/shuttle/supply/cockpit)
+"Ro" = (
+/obj/machinery/door/airlock/grunge{
+ name = "Supply Shuttle Cockpit";
+ req_access_txt = "31"
+ },
+/turf/open/floor/iron/shuttle/cargo,
+/area/shuttle/supply/cockpit)
+"Rr" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/cargo{
+ icon_state = "0,2"
+ },
+/area/shuttle/supply)
+"RT" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/iron/shuttle/cargo,
+/area/shuttle/supply)
+"Tj" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/cargo{
+ icon_state = "0,8"
+ },
+/area/shuttle/supply/cockpit)
+"TR" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/cargo{
+ icon_state = "6,2"
+ },
+/area/shuttle/supply)
+"Uz" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/window/cargo{
+ icon_state = "6,0"
+ },
+/area/shuttle/supply)
+"UP" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/cargo{
+ icon_state = "0,1"
+ },
+/area/shuttle/supply)
+"Vv" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/cargo{
+ icon_state = "0,10"
+ },
+/area/shuttle/supply/cockpit)
+"VT" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/cargo{
+ icon_state = "6,1"
+ },
+/area/shuttle/supply)
+"WL" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/cargo{
+ icon_state = "2,8"
+ },
+/area/shuttle/supply/cockpit)
+"Xq" = (
+/turf/open/floor/iron/shuttle/cargo,
+/area/shuttle/supply)
+"Xz" = (
+/obj/machinery/conveyor{
+ dir = 4;
+ id = "QMLoad2"
+ },
+/obj/machinery/door/poddoor{
+ id = "QMLoaddoor2";
+ name = "supply dock loading door"
+ },
+/turf/open/floor/plating,
+/area/shuttle/supply)
+"XT" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/cargo{
+ icon_state = "0,3"
+ },
+/area/shuttle/supply)
+"Ys" = (
+/turf/template_noop,
+/area/template_noop)
+"YV" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/cargo{
+ icon_state = "0,7"
+ },
+/area/shuttle/supply)
+"Zv" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/cargo{
+ icon_state = "3,8"
+ },
+/area/shuttle/supply/cockpit)
+"Zz" = (
+/turf/open/floor/iron/shuttle/cargo{
+ icon_state = "floor_in"
+ },
+/area/shuttle/supply)
+
+(1,1,1) = {"
+me
+Vv
+MU
+Tj
+YV
+eb
+vy
+IQ
+XT
+Rr
+UP
+cE
+"}
+(2,1,1) = {"
+bm
+bT
+qN
+jn
+rY
+kz
+ob
+ob
+mP
+mP
+dv
+Is
+"}
+(3,1,1) = {"
+uI
+sa
+PA
+WL
+Xq
+RT
+ob
+ob
+ob
+ob
+OZ
+tp
+"}
+(4,1,1) = {"
+MI
+do
+Ro
+Zv
+FF
+Xq
+Xq
+Xq
+Xq
+Iw
+mp
+Ho
+"}
+(5,1,1) = {"
+zx
+Jp
+lz
+RT
+Xq
+dg
+kb
+RT
+Xq
+Xq
+fr
+lq
+"}
+(6,1,1) = {"
+Ys
+Hd
+Xq
+Zz
+ob
+go
+ob
+zQ
+Xq
+Xq
+GD
+vF
+"}
+(7,1,1) = {"
+Ys
+rZ
+OI
+Xz
+wR
+mH
+ds
+uk
+qx
+TR
+VT
+Uz
+"}
diff --git a/_maps/skyrat/shuttles/escape_pod_default_skyrat.dmm b/_maps/skyrat/shuttles/escape_pod_default_skyrat.dmm
index bc1a000a974..1abf7739f78 100644
--- a/_maps/skyrat/shuttles/escape_pod_default_skyrat.dmm
+++ b/_maps/skyrat/shuttles/escape_pod_default_skyrat.dmm
@@ -49,7 +49,9 @@
/obj/docking_port/mobile/pod{
port_direction = 2
},
-/obj/machinery/door/airlock/silver,
+/obj/machinery/door/airlock/silver{
+ name = "Escape Pod Airlock"
+ },
/turf/open/floor/mineral/titanium,
/area/shuttle/pod_1)
"Q" = (
@@ -69,9 +71,7 @@
pixel_x = -20;
pixel_y = 12
},
-/obj/machinery/light/small{
- dir = 8
- },
+/obj/machinery/light/small/directional/west,
/turf/open/floor/mineral/titanium,
/area/shuttle/pod_1)
"X" = (
diff --git a/_maps/shuttles/ferry_skyrat.dmm b/_maps/skyrat/shuttles/ferry_skyrat.dmm
similarity index 92%
rename from _maps/shuttles/ferry_skyrat.dmm
rename to _maps/skyrat/shuttles/ferry_skyrat.dmm
index 2b3633e5ac7..0cc079733d8 100644
--- a/_maps/shuttles/ferry_skyrat.dmm
+++ b/_maps/skyrat/shuttles/ferry_skyrat.dmm
@@ -69,7 +69,9 @@
},
/area/shuttle/transport)
"hw" = (
-/turf/open/floor/iron/shuttle/ferry,
+/turf/open/floor/iron/shuttle/ferry{
+ dir = 8
+ },
/area/shuttle/transport)
"hY" = (
/turf/closed/wall/mineral/titanium/shuttle_wall/window/ferry{
@@ -103,7 +105,9 @@
/area/shuttle/transport)
"jE" = (
/obj/machinery/computer/security/shuttle,
-/turf/open/floor/iron/shuttle/ferry,
+/turf/open/floor/iron/shuttle/ferry{
+ dir = 8
+ },
/area/shuttle/transport)
"jG" = (
/turf/closed/wall/mineral/titanium/shuttle_wall/ferry{
@@ -191,18 +195,8 @@
/area/shuttle/transport)
"rT" = (
/obj/machinery/computer/crew/shuttle,
-/turf/open/floor/iron/shuttle/ferry,
-/area/shuttle/transport)
-"rZ" = (
-/obj/structure/fans/tiny/forcefield{
- dir = 8
- },
-/obj/machinery/door/airlock/highsecurity{
- external = 1
- },
/turf/open/floor/iron/shuttle/ferry{
- dir = 8;
- icon_state = "floor"
+ dir = 8
},
/area/shuttle/transport)
"sk" = (
@@ -251,7 +245,9 @@
/obj/structure/chair/comfy/shuttle{
dir = 4
},
-/turf/open/floor/iron/shuttle/ferry,
+/turf/open/floor/iron/shuttle/ferry{
+ dir = 8
+ },
/area/shuttle/transport)
"uI" = (
/turf/closed/wall/mineral/titanium/shuttle_wall/window/ferry{
@@ -302,7 +298,9 @@
/obj/machinery/light/no_nightlight{
dir = 8
},
-/turf/open/floor/iron/shuttle/ferry,
+/turf/open/floor/iron/shuttle/ferry{
+ dir = 8
+ },
/area/shuttle/transport)
"zN" = (
/turf/closed/wall/mineral/titanium/shuttle_wall/window/ferry{
@@ -311,20 +309,34 @@
},
/area/shuttle/transport)
"AB" = (
-/obj/structure/closet/shuttle/erokez{
+/obj/structure/closet/shuttle{
dir = 4
},
/obj/item/clothing/suit/space/hardsuit/ert/sec,
-/turf/open/floor/iron/shuttle/ferry,
+/turf/open/floor/iron/shuttle/ferry{
+ dir = 8
+ },
/area/shuttle/transport)
"AW" = (
/obj/structure/chair/comfy/shuttle{
dir = 1
},
-/turf/open/floor/iron/shuttle/ferry,
+/turf/open/floor/iron/shuttle/ferry{
+ dir = 8
+ },
+/area/shuttle/transport)
+"By" = (
+/obj/structure/fans/tiny/forcefield{
+ dir = 8
+ },
+/obj/machinery/door/airlock/grunge,
+/turf/open/floor/iron/shuttle/ferry{
+ dir = 8;
+ icon_state = "floor"
+ },
/area/shuttle/transport)
"Co" = (
-/obj/structure/closet/shuttle/erokez{
+/obj/structure/closet/shuttle{
dir = 8
},
/obj/item/clothing/head/helmet/alt,
@@ -334,7 +346,9 @@
/obj/machinery/light/no_nightlight{
dir = 4
},
-/turf/open/floor/iron/shuttle/ferry,
+/turf/open/floor/iron/shuttle/ferry{
+ dir = 8
+ },
/area/shuttle/transport)
"Cz" = (
/turf/closed/wall/mineral/titanium/shuttle_wall/ferry{
@@ -358,7 +372,9 @@
/obj/machinery/computer/security/shuttle{
dir = 8
},
-/turf/open/floor/iron/shuttle/ferry,
+/turf/open/floor/iron/shuttle/ferry{
+ dir = 8
+ },
/area/shuttle/transport)
"CM" = (
/turf/open/floor/iron/shuttle/ferry{
@@ -402,7 +418,9 @@
/obj/machinery/light/no_nightlight{
dir = 8
},
-/turf/open/floor/iron/shuttle/ferry,
+/turf/open/floor/iron/shuttle/ferry{
+ dir = 8
+ },
/area/shuttle/transport)
"Ew" = (
/obj/structure/chair/comfy/shuttle{
@@ -411,7 +429,9 @@
/obj/machinery/light/no_nightlight{
dir = 8
},
-/turf/open/floor/iron/shuttle/ferry,
+/turf/open/floor/iron/shuttle/ferry{
+ dir = 8
+ },
/area/shuttle/transport)
"Fk" = (
/turf/closed/wall/mineral/titanium/shuttle_wall/window/ferry{
@@ -528,7 +548,9 @@
/obj/machinery/light/no_nightlight{
dir = 4
},
-/turf/open/floor/iron/shuttle/ferry,
+/turf/open/floor/iron/shuttle/ferry{
+ dir = 8
+ },
/area/shuttle/transport)
"ON" = (
/turf/template_noop,
@@ -540,21 +562,20 @@
},
/area/shuttle/transport)
"Pz" = (
-/obj/structure/closet/shuttle/erokez{
+/obj/structure/closet/shuttle{
dir = 8
},
/obj/item/gun/energy/e_gun/nuclear,
/obj/item/gun/energy/e_gun/stun,
/obj/item/gun/energy/e_gun/old,
-/turf/open/floor/iron/shuttle/ferry,
+/turf/open/floor/iron/shuttle/ferry{
+ dir = 8
+ },
/area/shuttle/transport)
"Qg" = (
/obj/structure/fans/tiny/forcefield{
dir = 8
},
-/obj/machinery/door/airlock/highsecurity{
- external = 1
- },
/obj/docking_port/mobile{
dheight = 3;
dir = 8;
@@ -565,6 +586,7 @@
port_direction = 4;
width = 20
},
+/obj/machinery/door/airlock/grunge,
/turf/open/floor/iron/shuttle/ferry{
dir = 8;
icon_state = "floor"
@@ -595,13 +617,17 @@
/obj/machinery/light/no_nightlight{
dir = 4
},
-/turf/open/floor/iron/shuttle/ferry,
+/turf/open/floor/iron/shuttle/ferry{
+ dir = 8
+ },
/area/shuttle/transport)
"RL" = (
/obj/machinery/computer/crew/shuttle{
dir = 8
},
-/turf/open/floor/iron/shuttle/ferry,
+/turf/open/floor/iron/shuttle/ferry{
+ dir = 8
+ },
/area/shuttle/transport)
"Ss" = (
/turf/closed/wall/mineral/titanium/shuttle_wall/ferry{
@@ -622,11 +648,13 @@
},
/area/shuttle/transport)
"Tk" = (
-/obj/structure/closet/shuttle/wagon{
+/obj/structure/closet/shuttle/emergency{
dir = 1
},
/obj/machinery/light/no_nightlight,
-/turf/open/floor/iron/shuttle/ferry,
+/turf/open/floor/iron/shuttle/ferry{
+ dir = 8
+ },
/area/shuttle/transport)
"Tm" = (
/turf/closed/wall/mineral/titanium/shuttle_wall/window/ferry{
@@ -641,10 +669,12 @@
},
/area/shuttle/transport)
"Ud" = (
-/obj/structure/closet/shuttle/medical_wall/erokez{
+/obj/structure/closet/shuttle/medical{
dir = 4
},
-/turf/open/floor/iron/shuttle/ferry,
+/turf/open/floor/iron/shuttle/ferry{
+ dir = 8
+ },
/area/shuttle/transport)
"UD" = (
/turf/closed/wall/mineral/titanium/shuttle_wall/window/ferry{
@@ -763,8 +793,8 @@ AW
Ew
Vc
YJ
-rZ
-rZ
+By
+By
jP
Cz
ON
@@ -851,7 +881,7 @@ Pz
Co
Ss
jG
-rZ
+By
Qg
Dt
tu
diff --git a/_maps/skyrat/shuttles/labour_skyrat.dmm b/_maps/skyrat/shuttles/labour_skyrat.dmm
new file mode 100644
index 00000000000..b611be4af75
--- /dev/null
+++ b/_maps/skyrat/shuttles/labour_skyrat.dmm
@@ -0,0 +1,419 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"a" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/window/mining_labor{
+ icon_state = "4,0"
+ },
+/area/shuttle/labor/advanced)
+"c" = (
+/obj/structure/cable,
+/turf/closed/wall/mineral/titanium/shuttle_wall/window/mining_labor{
+ icon_state = "0,4"
+ },
+/area/shuttle/labor/advanced)
+"d" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/mining_labor{
+ icon_state = "4,8"
+ },
+/area/shuttle/labor/advanced)
+"e" = (
+/obj/structure/chair/comfy/shuttle{
+ dir = 4
+ },
+/turf/open/floor/iron/shuttle/exploration/corner{
+ dir = 4
+ },
+/area/shuttle/labor/advanced)
+"f" = (
+/obj/machinery/mineral/labor_claim_console{
+ machinedir = 1;
+ pixel_x = 30
+ },
+/turf/open/floor/iron/shuttle/exploration/side{
+ dir = 8
+ },
+/area/shuttle/labor/advanced)
+"g" = (
+/obj/docking_port/mobile{
+ dir = 8;
+ dwidth = 2;
+ height = 5;
+ id = "laborcamp";
+ name = "labor camp shuttle";
+ port_direction = 4;
+ width = 9
+ },
+/obj/machinery/door/airlock/grunge{
+ id_tag = "prisonshuttle";
+ name = "Labour Shuttle Airlock"
+ },
+/turf/open/floor/iron/shuttle/exploration/textured_flat{
+ dir = 4
+ },
+/area/shuttle/labor/advanced)
+"h" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/window/mining_labor{
+ icon_state = "1,8"
+ },
+/area/shuttle/labor/advanced)
+"i" = (
+/obj/effect/turf_decal/shuttle/exploration/hazardstripe{
+ dir = 1
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/iron/shuttle/exploration/invertcorner_side{
+ dir = 8
+ },
+/area/shuttle/labor/advanced)
+"j" = (
+/obj/effect/turf_decal/shuttle/exploration/hazardstripe{
+ dir = 4
+ },
+/obj/structure/closet/emcloset/wall{
+ pixel_y = -32
+ },
+/obj/item/clothing/mask/breath{
+ pixel_x = -3;
+ pixel_y = -3
+ },
+/obj/item/clothing/mask/breath{
+ pixel_x = -3;
+ pixel_y = -3
+ },
+/obj/item/tank/internals/emergency_oxygen{
+ pixel_x = 3
+ },
+/obj/item/tank/internals/emergency_oxygen{
+ pixel_x = 3
+ },
+/obj/item/clothing/suit/hazardvest{
+ desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks.";
+ name = "emergency lifejacket"
+ },
+/obj/item/clothing/suit/hazardvest{
+ desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks.";
+ name = "emergency lifejacket"
+ },
+/obj/item/clothing/suit/hazardvest{
+ desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks.";
+ name = "emergency lifejacket"
+ },
+/obj/item/clothing/suit/hazardvest{
+ desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks.";
+ name = "emergency lifejacket"
+ },
+/obj/item/clothing/head/hardhat/orange{
+ name = "protective hat";
+ pixel_y = 9
+ },
+/obj/item/clothing/head/hardhat/orange{
+ name = "protective hat";
+ pixel_y = 9
+ },
+/obj/item/clothing/head/hardhat/orange{
+ name = "protective hat";
+ pixel_y = 9
+ },
+/obj/item/clothing/head/hardhat/orange{
+ name = "protective hat";
+ pixel_y = 9
+ },
+/turf/open/floor/iron/shuttle/exploration/invertcorner_side{
+ dir = 1
+ },
+/area/shuttle/labor/advanced)
+"k" = (
+/obj/effect/turf_decal/shuttle/exploration/hazardstripe,
+/obj/effect/turf_decal/shuttle/exploration/hazardstripe{
+ dir = 4
+ },
+/obj/machinery/mineral/stacking_unit_console{
+ machinedir = 2;
+ pixel_x = 27;
+ pixel_y = 22
+ },
+/turf/open/floor/iron/shuttle/exploration/tripleinvertcorner{
+ dir = 8
+ },
+/area/shuttle/labor/advanced)
+"l" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/mining_labor,
+/area/shuttle/labor/advanced)
+"m" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/mining_labor{
+ icon_state = "2,8"
+ },
+/area/shuttle/labor/advanced)
+"o" = (
+/obj/effect/turf_decal/shuttle/exploration/hazardstripe{
+ dir = 1
+ },
+/turf/open/floor/iron/shuttle/exploration/invertcorner_side_flipped{
+ dir = 4
+ },
+/area/shuttle/labor/advanced)
+"p" = (
+/obj/machinery/computer/shuttle/labor{
+ dir = 4
+ },
+/obj/effect/turf_decal/shuttle/exploration/hazardstripe{
+ dir = 4
+ },
+/turf/open/floor/iron/shuttle/exploration/corner_invcorner,
+/area/shuttle/labor/advanced)
+"q" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/mining_labor{
+ icon_state = "2,5"
+ },
+/area/shuttle/labor/advanced)
+"r" = (
+/obj/structure/cable,
+/turf/closed/wall/mineral/titanium/shuttle_wall/window/mining_labor,
+/area/shuttle/labor/advanced)
+"s" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/mining_labor{
+ icon_state = "0,3"
+ },
+/area/shuttle/labor/advanced)
+"t" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/window/mining_labor{
+ icon_state = "3,8"
+ },
+/area/shuttle/labor/advanced)
+"u" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/mining_labor{
+ icon_state = "4,3"
+ },
+/area/shuttle/labor/advanced)
+"x" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/mining_labor{
+ icon_state = "4,1"
+ },
+/area/shuttle/labor/advanced)
+"y" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/mining_labor{
+ icon_state = "2,1"
+ },
+/area/shuttle/labor/advanced)
+"z" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/mining_labor{
+ icon_state = "1,1"
+ },
+/area/shuttle/labor/advanced)
+"A" = (
+/obj/effect/turf_decal/shuttle/exploration/bot,
+/obj/structure/chair/comfy/shuttle{
+ dir = 8
+ },
+/turf/open/floor/iron/shuttle/exploration/side,
+/area/shuttle/labor/advanced)
+"B" = (
+/obj/structure/chair/comfy/shuttle{
+ dir = 8
+ },
+/turf/open/floor/iron/shuttle/exploration/side{
+ dir = 1
+ },
+/area/shuttle/labor/advanced)
+"C" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/mining_labor{
+ icon_state = "4,2"
+ },
+/area/shuttle/labor/advanced)
+"D" = (
+/obj/machinery/flasher/directional/north{
+ id = "gulagshuttleflasher";
+ pixel_x = 8
+ },
+/obj/machinery/light/small/directional/north,
+/turf/open/floor/iron/shuttle/exploration/side,
+/area/shuttle/labor/advanced)
+"E" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/mining_labor{
+ icon_state = "0,5"
+ },
+/area/shuttle/labor/advanced)
+"F" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/mining_labor{
+ icon_state = "4,5"
+ },
+/area/shuttle/labor/advanced)
+"H" = (
+/obj/structure/chair/comfy/shuttle{
+ dir = 4
+ },
+/turf/open/floor/iron/shuttle/exploration/side{
+ dir = 4
+ },
+/area/shuttle/labor/advanced)
+"I" = (
+/obj/machinery/door/airlock/grunge{
+ name = "Labour Shuttle Airlock";
+ req_access_txt = "2"
+ },
+/turf/open/floor/iron/shuttle/exploration/textured_flat{
+ dir = 4
+ },
+/area/shuttle/labor/advanced)
+"J" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/window/mining_labor{
+ icon_state = "0,0"
+ },
+/area/shuttle/labor/advanced)
+"K" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/chair/comfy/shuttle{
+ dir = 8
+ },
+/turf/open/floor/iron/shuttle/exploration/blanktile,
+/area/shuttle/labor/advanced)
+"L" = (
+/obj/effect/turf_decal/shuttle/exploration/hazardstripe{
+ dir = 1
+ },
+/obj/effect/turf_decal/shuttle/exploration/hazardstripe,
+/obj/effect/turf_decal/shuttle/exploration/hazardstripe{
+ dir = 4
+ },
+/obj/effect/turf_decal/shuttle/exploration/hazardstripe{
+ dir = 8
+ },
+/obj/machinery/mineral/stacking_machine/laborstacker{
+ input_dir = 2;
+ output_dir = 1
+ },
+/turf/open/floor/iron/shuttle/exploration/flat,
+/area/shuttle/labor/advanced)
+"M" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/mining_labor{
+ icon_state = "4,7"
+ },
+/area/shuttle/labor/advanced)
+"N" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/mining_labor{
+ icon_state = "0,8"
+ },
+/area/shuttle/labor/advanced)
+"O" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/mining_labor{
+ icon_state = "0,1"
+ },
+/area/shuttle/labor/advanced)
+"P" = (
+/obj/machinery/button/flasher{
+ id = "gulagshuttleflasher";
+ name = "Flash Control";
+ pixel_x = -3;
+ pixel_y = -27;
+ req_access_txt = "1"
+ },
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/light/small/directional/south,
+/turf/open/floor/iron/shuttle/exploration/side{
+ dir = 1
+ },
+/area/shuttle/labor/advanced)
+"Q" = (
+/obj/structure/table/reinforced,
+/obj/item/folder/red,
+/obj/item/restraints/handcuffs,
+/turf/open/floor/iron/shuttle/exploration/corner{
+ dir = 8
+ },
+/area/shuttle/labor/advanced)
+"R" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/window/mining_labor{
+ icon_state = "1,0"
+ },
+/area/shuttle/labor/advanced)
+"T" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/window/mining_labor{
+ icon_state = "2,0"
+ },
+/area/shuttle/labor/advanced)
+"U" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/mining_labor{
+ icon_state = "0,7"
+ },
+/area/shuttle/labor/advanced)
+"V" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/window/mining_labor{
+ icon_state = "3,0"
+ },
+/area/shuttle/labor/advanced)
+"W" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/mining_labor{
+ icon_state = "3,1"
+ },
+/area/shuttle/labor/advanced)
+"Y" = (
+/obj/machinery/door/airlock/grunge{
+ name = "Labour Shuttle Airlock";
+ req_access_txt = "2"
+ },
+/turf/open/floor/iron/shuttle/exploration/textured_flat,
+/area/shuttle/labor/advanced)
+"Z" = (
+/obj/effect/turf_decal/shuttle/exploration/hazardstripe,
+/obj/item/radio/intercom/directional/west{
+ pixel_x = -21
+ },
+/turf/open/floor/iron/shuttle/exploration/invertcorner_side{
+ dir = 4
+ },
+/area/shuttle/labor/advanced)
+
+(1,1,1) = {"
+d
+M
+l
+F
+r
+u
+C
+x
+a
+"}
+(2,1,1) = {"
+t
+p
+Z
+Y
+o
+H
+e
+W
+V
+"}
+(3,1,1) = {"
+m
+A
+P
+q
+D
+K
+B
+y
+T
+"}
+(4,1,1) = {"
+h
+Q
+k
+L
+i
+f
+j
+z
+R
+"}
+(5,1,1) = {"
+N
+U
+I
+E
+c
+s
+g
+O
+J
+"}
diff --git a/_maps/skyrat/shuttles/mining_common_skyrat.dmm b/_maps/skyrat/shuttles/mining_common_skyrat.dmm
new file mode 100644
index 00000000000..7ff7dd11898
--- /dev/null
+++ b/_maps/skyrat/shuttles/mining_common_skyrat.dmm
@@ -0,0 +1,336 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"a" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/window/mining{
+ icon_state = "0,6"
+ },
+/area/shuttle/mining/advanced/public)
+"c" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/mining{
+ icon_state = "1,6"
+ },
+/area/shuttle/mining/advanced/public)
+"d" = (
+/obj/effect/turf_decal/shuttle/exploration/hazardstripe{
+ dir = 4
+ },
+/turf/open/floor/iron/shuttle/exploration/doubleinvertcorner{
+ dir = 8
+ },
+/area/shuttle/mining/advanced/public)
+"f" = (
+/obj/structure/ore_box,
+/obj/machinery/light/small/directional/east,
+/turf/open/floor/iron/shuttle/exploration/flat,
+/area/shuttle/mining/advanced/public)
+"g" = (
+/obj/structure/chair/comfy/shuttle{
+ dir = 1
+ },
+/turf/open/floor/iron/shuttle/exploration/side{
+ dir = 1
+ },
+/area/shuttle/mining/advanced/public)
+"h" = (
+/obj/item/clothing/suit/hazardvest{
+ desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks.";
+ name = "emergency lifejacket"
+ },
+/obj/item/clothing/suit/hazardvest{
+ desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks.";
+ name = "emergency lifejacket"
+ },
+/obj/item/clothing/suit/hazardvest{
+ desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks.";
+ name = "emergency lifejacket"
+ },
+/obj/item/clothing/suit/hazardvest{
+ desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks.";
+ name = "emergency lifejacket"
+ },
+/obj/item/clothing/suit/hazardvest{
+ desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks.";
+ name = "emergency lifejacket"
+ },
+/obj/item/tank/internals/emergency_oxygen{
+ pixel_x = 3
+ },
+/obj/item/tank/internals/emergency_oxygen{
+ pixel_x = 3
+ },
+/obj/item/tank/internals/emergency_oxygen{
+ pixel_x = 3
+ },
+/obj/item/tank/internals/emergency_oxygen{
+ pixel_x = 3
+ },
+/obj/item/tank/internals/emergency_oxygen{
+ pixel_x = 3
+ },
+/obj/item/clothing/mask/breath{
+ pixel_x = -3;
+ pixel_y = -3
+ },
+/obj/item/clothing/mask/breath{
+ pixel_x = -3;
+ pixel_y = -3
+ },
+/obj/item/clothing/mask/breath{
+ pixel_x = -3;
+ pixel_y = -3
+ },
+/obj/item/clothing/mask/breath{
+ pixel_x = -3;
+ pixel_y = -3
+ },
+/obj/item/clothing/mask/breath{
+ pixel_x = -3;
+ pixel_y = -3
+ },
+/obj/item/clothing/head/hardhat/orange{
+ name = "protective hat";
+ pixel_y = 9
+ },
+/obj/item/clothing/head/hardhat/orange{
+ name = "protective hat";
+ pixel_y = 9
+ },
+/obj/item/clothing/head/hardhat/orange{
+ name = "protective hat";
+ pixel_y = 9
+ },
+/obj/item/clothing/head/hardhat/orange{
+ name = "protective hat";
+ pixel_y = 9
+ },
+/obj/item/clothing/head/hardhat/orange{
+ name = "protective hat";
+ pixel_y = 9
+ },
+/obj/structure/closet/crate/internals,
+/obj/item/pickaxe/emergency,
+/obj/item/pickaxe/emergency,
+/obj/machinery/light/small/directional/west,
+/turf/open/floor/iron/shuttle/exploration/flat,
+/area/shuttle/mining/advanced/public)
+"i" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/mining{
+ icon_state = "0,0"
+ },
+/area/shuttle/mining/advanced/public)
+"j" = (
+/obj/structure/table/reinforced,
+/obj/item/storage/toolbox/emergency,
+/obj/machinery/light/small/directional/west,
+/obj/item/radio/intercom/directional/north{
+ pixel_y = 15
+ },
+/turf/open/floor/iron/shuttle/exploration/corner,
+/area/shuttle/mining/advanced/public)
+"k" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/mining{
+ icon_state = "0,4"
+ },
+/area/shuttle/mining/advanced/public)
+"l" = (
+/obj/structure/chair/comfy/shuttle{
+ dir = 1
+ },
+/turf/open/floor/iron/shuttle/exploration/corner{
+ dir = 1
+ },
+/area/shuttle/mining/advanced/public)
+"m" = (
+/obj/structure/table/reinforced,
+/obj/item/crowbar/red,
+/obj/item/wrench,
+/obj/item/tank/internals/emergency_oxygen,
+/obj/item/clothing/mask/gas,
+/obj/machinery/light/small/directional/east,
+/turf/open/floor/iron/shuttle/exploration/corner{
+ dir = 8
+ },
+/area/shuttle/mining/advanced/public)
+"o" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/window/mining{
+ icon_state = "4,6"
+ },
+/area/shuttle/mining/advanced/public)
+"p" = (
+/turf/open/floor/iron/shuttle/exploration/side{
+ dir = 4
+ },
+/area/shuttle/mining/advanced/public)
+"q" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/mining{
+ icon_state = "1,0"
+ },
+/area/shuttle/mining/advanced/public)
+"v" = (
+/turf/open/floor/iron/shuttle/exploration/blanktile,
+/area/shuttle/mining/advanced/public)
+"y" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/mining{
+ icon_state = "4,5C"
+ },
+/area/shuttle/mining/advanced/public)
+"B" = (
+/obj/docking_port/mobile{
+ dir = 8;
+ dwidth = 3;
+ height = 5;
+ id = "mining_common";
+ name = "lavaland shuttle";
+ port_direction = 4;
+ width = 7
+ },
+/obj/machinery/door/airlock/grunge{
+ name = "Public Shuttle Airlock"
+ },
+/turf/open/floor/iron/shuttle/exploration/textured_flat{
+ dir = 4
+ },
+/area/shuttle/mining/advanced/public)
+"D" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/window/mining{
+ icon_state = "4,2"
+ },
+/area/shuttle/mining/advanced/public)
+"F" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/mining{
+ icon_state = "4,1C"
+ },
+/area/shuttle/mining/advanced/public)
+"H" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/mining{
+ icon_state = "0,5"
+ },
+/area/shuttle/mining/advanced/public)
+"I" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/mining{
+ icon_state = "0,3"
+ },
+/area/shuttle/mining/advanced/public)
+"J" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/window/mining{
+ icon_state = "0,2"
+ },
+/area/shuttle/mining/advanced/public)
+"K" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/mining{
+ icon_state = "3,6"
+ },
+/area/shuttle/mining/advanced/public)
+"L" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/mining{
+ icon_state = "3,0"
+ },
+/area/shuttle/mining/advanced/public)
+"M" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/mining{
+ icon_state = "3,5"
+ },
+/area/shuttle/mining/advanced/public)
+"O" = (
+/obj/structure/chair/comfy/shuttle{
+ dir = 1
+ },
+/turf/open/floor/iron/shuttle/exploration/corner{
+ dir = 4
+ },
+/area/shuttle/mining/advanced/public)
+"Q" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/mining{
+ icon_state = "4,4"
+ },
+/area/shuttle/mining/advanced/public)
+"R" = (
+/obj/machinery/computer/shuttle/mining/common{
+ name = "public shuttle console"
+ },
+/obj/effect/turf_decal/shuttle/exploration/hazardstripe,
+/turf/open/floor/iron/shuttle/exploration/uside,
+/area/shuttle/mining/advanced/public)
+"S" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/mining{
+ icon_state = "4,0"
+ },
+/area/shuttle/mining/advanced/public)
+"T" = (
+/obj/structure/chair/comfy/shuttle{
+ dir = 1
+ },
+/obj/effect/turf_decal/shuttle/exploration/hazardstripe{
+ dir = 1
+ },
+/turf/open/floor/iron/shuttle/exploration/doubleinvertcorner,
+/area/shuttle/mining/advanced/public)
+"U" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/mining{
+ icon_state = "0,1"
+ },
+/area/shuttle/mining/advanced/public)
+"W" = (
+/obj/effect/turf_decal/shuttle/exploration/cargostore,
+/turf/open/floor/iron/shuttle/exploration/flat,
+/area/shuttle/mining/advanced/public)
+"X" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/window/mining{
+ icon_state = "2,0"
+ },
+/area/shuttle/mining/advanced/public)
+"Y" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/window/mining{
+ icon_state = "2,6"
+ },
+/area/shuttle/mining/advanced/public)
+"Z" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/mining{
+ icon_state = "1,5"
+ },
+/area/shuttle/mining/advanced/public)
+
+(1,1,1) = {"
+a
+H
+k
+I
+J
+U
+i
+"}
+(2,1,1) = {"
+c
+Z
+j
+p
+O
+h
+q
+"}
+(3,1,1) = {"
+Y
+R
+T
+v
+g
+W
+X
+"}
+(4,1,1) = {"
+K
+M
+m
+d
+l
+f
+L
+"}
+(5,1,1) = {"
+o
+y
+Q
+B
+D
+F
+S
+"}
diff --git a/_maps/skyrat/shuttles/mining_large_skyrat.dmm b/_maps/skyrat/shuttles/mining_large_skyrat.dmm
new file mode 100644
index 00000000000..d677245fb5e
--- /dev/null
+++ b/_maps/skyrat/shuttles/mining_large_skyrat.dmm
@@ -0,0 +1,545 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"dl" = (
+/obj/structure/cable,
+/obj/machinery/door/airlock/external/ruin{
+ name = "Mining Shuttle External Airlock"
+ },
+/obj/effect/mapping_helpers/airlock/cyclelink_helper,
+/turf/open/floor/iron/shuttle/exploration/textured_flat,
+/area/shuttle/mining/large/advanced)
+"dN" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/mining_large{
+ icon_state = "2,1"
+ },
+/area/shuttle/mining/large/advanced)
+"eI" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/mining_large,
+/area/shuttle/mining/large/advanced)
+"gl" = (
+/obj/effect/turf_decal/shuttle/exploration/hazardstripe,
+/obj/effect/turf_decal/shuttle/exploration/hazardstripe{
+ dir = 1
+ },
+/obj/effect/turf_decal/shuttle/exploration/airlock,
+/obj/structure/cable,
+/turf/open/floor/iron/shuttle/exploration,
+/area/shuttle/mining/large/advanced)
+"hn" = (
+/obj/machinery/computer/shuttle/mining,
+/obj/effect/turf_decal/shuttle/exploration/hazardstripe,
+/turf/open/floor/iron/shuttle/exploration/side,
+/area/shuttle/mining/large/advanced)
+"iL" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/mining_large{
+ icon_state = "6,4"
+ },
+/area/shuttle/mining/large/advanced)
+"iN" = (
+/obj/effect/turf_decal/shuttle/exploration/hazardstripe,
+/obj/structure/cable,
+/turf/open/floor/iron/shuttle/exploration/doubleinvertcorner{
+ dir = 1
+ },
+/area/shuttle/mining/large/advanced)
+"jP" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/mining_large{
+ icon_state = "4,1"
+ },
+/area/shuttle/mining/large/advanced)
+"kU" = (
+/obj/structure/table/reinforced,
+/turf/open/floor/iron/shuttle/exploration/side,
+/area/shuttle/mining/large/advanced)
+"mX" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/mining_large{
+ icon_state = "1,1"
+ },
+/area/shuttle/mining/large/advanced)
+"ne" = (
+/turf/open/floor/iron/shuttle/exploration/corner{
+ dir = 1
+ },
+/area/shuttle/mining/large/advanced)
+"nE" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/mining_large{
+ icon_state = "0,6"
+ },
+/area/shuttle/mining/large/advanced)
+"nQ" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/mining_large{
+ icon_state = "4,5"
+ },
+/area/shuttle/mining/large/advanced)
+"pa" = (
+/obj/machinery/light/small/directional/south,
+/obj/item/radio/intercom{
+ pixel_y = -29
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/iron/shuttle/exploration/side{
+ dir = 1
+ },
+/area/shuttle/mining/large/advanced)
+"pe" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/window/mining_large{
+ icon_state = "1,0"
+ },
+/area/shuttle/mining/large/advanced)
+"pA" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/window/mining_large,
+/area/shuttle/mining/large/advanced)
+"qb" = (
+/turf/open/floor/iron/shuttle/exploration/side,
+/area/shuttle/mining/large/advanced)
+"rw" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/mining_large{
+ icon_state = "1,9"
+ },
+/area/shuttle/mining/large/advanced)
+"rM" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/mining_large{
+ icon_state = "6,1"
+ },
+/area/shuttle/mining/large/advanced)
+"sG" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/mining_large{
+ icon_state = "0,9"
+ },
+/area/shuttle/mining/large/advanced)
+"sM" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/mining_large{
+ icon_state = "4,0"
+ },
+/area/shuttle/mining/large/advanced)
+"sQ" = (
+/obj/structure/cable,
+/turf/open/floor/iron/shuttle/exploration/invertcorner_side_flipped{
+ dir = 8
+ },
+/area/shuttle/mining/large/advanced)
+"ts" = (
+/obj/structure/cable,
+/obj/machinery/door/airlock/external/ruin{
+ name = "Mining Shuttle External Airlock"
+ },
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+ dir = 1
+ },
+/obj/docking_port/mobile{
+ dwidth = 3;
+ height = 10;
+ id = "mining";
+ name = "mining shuttle";
+ port_direction = 2;
+ width = 7
+ },
+/turf/open/floor/iron/shuttle/exploration/flat,
+/area/shuttle/mining/large/advanced)
+"xn" = (
+/obj/machinery/status_display/evac,
+/turf/closed/wall/mineral/titanium/shuttle_wall/mining_large{
+ icon_state = "2,5"
+ },
+/area/shuttle/mining/large/advanced)
+"xr" = (
+/obj/structure/table/reinforced,
+/obj/item/stack/ore/iron{
+ pixel_x = -2;
+ pixel_y = -8
+ },
+/obj/item/stack/ore/iron{
+ pixel_x = 6;
+ pixel_y = 4
+ },
+/turf/open/floor/iron/shuttle/exploration/corner{
+ dir = 8
+ },
+/area/shuttle/mining/large/advanced)
+"yQ" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/mining_large{
+ icon_state = "5,1"
+ },
+/area/shuttle/mining/large/advanced)
+"zb" = (
+/obj/structure/cable,
+/obj/machinery/light/small/directional/south,
+/turf/open/floor/iron/shuttle/exploration/side{
+ dir = 1
+ },
+/area/shuttle/mining/large/advanced)
+"zQ" = (
+/obj/machinery/door/airlock/mining{
+ name = "Mining Shuttle Cockpit"
+ },
+/turf/open/floor/iron/shuttle/exploration/textured_flat,
+/area/shuttle/mining/large/advanced)
+"Aq" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/window/mining_large{
+ icon_state = "4-2,9"
+ },
+/area/shuttle/mining/large/advanced)
+"Cq" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/window/mining_large{
+ icon_state = "6,0"
+ },
+/area/shuttle/mining/large/advanced)
+"Dt" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/mining_large{
+ icon_state = "2,0"
+ },
+/area/shuttle/mining/large/advanced)
+"ER" = (
+/obj/structure/table/reinforced,
+/obj/item/screwdriver{
+ pixel_y = 18
+ },
+/obj/item/stock_parts/cell/high,
+/turf/open/floor/iron/shuttle/exploration/side{
+ dir = 8
+ },
+/area/shuttle/mining/large/advanced)
+"ET" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/window/mining_large{
+ icon_state = "0,3"
+ },
+/area/shuttle/mining/large/advanced)
+"Gl" = (
+/obj/structure/ore_box,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/iron/shuttle/exploration/corner{
+ dir = 8
+ },
+/area/shuttle/mining/large/advanced)
+"Gv" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/mining_large{
+ icon_state = "1,5"
+ },
+/area/shuttle/mining/large/advanced)
+"Ir" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/mining_large{
+ icon_state = "5,5"
+ },
+/area/shuttle/mining/large/advanced)
+"Iv" = (
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/iron/shuttle/exploration/invertcorner_side{
+ dir = 4
+ },
+/area/shuttle/mining/large/advanced)
+"ID" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/mining_large{
+ icon_state = "6,5"
+ },
+/area/shuttle/mining/large/advanced)
+"IG" = (
+/obj/structure/table/reinforced,
+/obj/item/storage/toolbox/emergency,
+/turf/open/floor/iron/shuttle/exploration/side,
+/area/shuttle/mining/large/advanced)
+"IX" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/mining_large{
+ icon_state = "6,6"
+ },
+/area/shuttle/mining/large/advanced)
+"IY" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/window/mining_large{
+ icon_state = "0,0"
+ },
+/area/shuttle/mining/large/advanced)
+"Jw" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/mining_large{
+ icon_state = "6,7"
+ },
+/area/shuttle/mining/large/advanced)
+"KF" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/mining_large{
+ icon_state = "0,4"
+ },
+/area/shuttle/mining/large/advanced)
+"KR" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/mining_large{
+ icon_state = "6,9"
+ },
+/area/shuttle/mining/large/advanced)
+"LL" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/mining_large{
+ icon_state = "0,5"
+ },
+/area/shuttle/mining/large/advanced)
+"LO" = (
+/obj/effect/turf_decal/shuttle/exploration/bot,
+/obj/machinery/power/apc/auto_name/directional/east,
+/obj/structure/cable,
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/iron/shuttle/exploration/uside{
+ dir = 1
+ },
+/area/shuttle/mining/large/advanced)
+"Nr" = (
+/obj/item/clothing/suit/hazardvest{
+ desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks.";
+ name = "emergency lifejacket"
+ },
+/obj/item/clothing/suit/hazardvest{
+ desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks.";
+ name = "emergency lifejacket"
+ },
+/obj/item/clothing/suit/hazardvest{
+ desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks.";
+ name = "emergency lifejacket"
+ },
+/obj/item/clothing/suit/hazardvest{
+ desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks.";
+ name = "emergency lifejacket"
+ },
+/obj/item/clothing/suit/hazardvest{
+ desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks.";
+ name = "emergency lifejacket"
+ },
+/obj/item/tank/internals/emergency_oxygen{
+ pixel_x = 3
+ },
+/obj/item/tank/internals/emergency_oxygen{
+ pixel_x = 3
+ },
+/obj/item/tank/internals/emergency_oxygen{
+ pixel_x = 3
+ },
+/obj/item/tank/internals/emergency_oxygen{
+ pixel_x = 3
+ },
+/obj/item/tank/internals/emergency_oxygen{
+ pixel_x = 3
+ },
+/obj/item/clothing/mask/breath{
+ pixel_x = -3;
+ pixel_y = -3
+ },
+/obj/item/clothing/mask/breath{
+ pixel_x = -3;
+ pixel_y = -3
+ },
+/obj/item/clothing/mask/breath{
+ pixel_x = -3;
+ pixel_y = -3
+ },
+/obj/item/clothing/mask/breath{
+ pixel_x = -3;
+ pixel_y = -3
+ },
+/obj/item/clothing/mask/breath{
+ pixel_x = -3;
+ pixel_y = -3
+ },
+/obj/item/clothing/head/hardhat/orange{
+ name = "protective hat";
+ pixel_y = 9
+ },
+/obj/item/clothing/head/hardhat/orange{
+ name = "protective hat";
+ pixel_y = 9
+ },
+/obj/item/clothing/head/hardhat/orange{
+ name = "protective hat";
+ pixel_y = 9
+ },
+/obj/item/clothing/head/hardhat/orange{
+ name = "protective hat";
+ pixel_y = 9
+ },
+/obj/item/clothing/head/hardhat/orange{
+ name = "protective hat";
+ pixel_y = 9
+ },
+/obj/structure/closet/crate/internals,
+/obj/item/pickaxe/emergency,
+/obj/item/pickaxe/emergency,
+/turf/open/floor/iron/shuttle/exploration/corner,
+/area/shuttle/mining/large/advanced)
+"NL" = (
+/obj/structure/table/reinforced,
+/obj/item/storage/firstaid/regular,
+/turf/open/floor/iron/shuttle/exploration/corner,
+/area/shuttle/mining/large/advanced)
+"Oa" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/mining_large{
+ icon_state = "4,2"
+ },
+/area/shuttle/mining/large/advanced)
+"Of" = (
+/obj/machinery/light/small/directional/south,
+/turf/open/floor/iron/shuttle/exploration/side{
+ dir = 1
+ },
+/area/shuttle/mining/large/advanced)
+"Pw" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/mining_large{
+ icon_state = "3,9"
+ },
+/area/shuttle/mining/large/advanced)
+"Qw" = (
+/obj/effect/turf_decal/shuttle/exploration/hazardstripe{
+ dir = 1
+ },
+/turf/open/floor/iron/shuttle/exploration/doubleinvertcorner,
+/area/shuttle/mining/large/advanced)
+"QT" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/mining_large{
+ icon_state = "6,8"
+ },
+/area/shuttle/mining/large/advanced)
+"Rb" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/mining_large{
+ icon_state = "0,7"
+ },
+/area/shuttle/mining/large/advanced)
+"Rj" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/mining_large{
+ icon_state = "0,1"
+ },
+/area/shuttle/mining/large/advanced)
+"Rx" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/mining_large{
+ icon_state = "6,2"
+ },
+/area/shuttle/mining/large/advanced)
+"TL" = (
+/obj/effect/turf_decal/shuttle/exploration/bot,
+/obj/structure/closet/shuttle/mining{
+ dir = 1
+ },
+/turf/open/floor/iron/shuttle/exploration/uside{
+ dir = 1
+ },
+/area/shuttle/mining/large/advanced)
+"Ur" = (
+/obj/structure/chair/comfy/shuttle{
+ dir = 1
+ },
+/obj/effect/turf_decal/shuttle/exploration/bot,
+/turf/open/floor/iron/shuttle/exploration/blanktile,
+/area/shuttle/mining/large/advanced)
+"UF" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/mining_large{
+ icon_state = "0,8"
+ },
+/area/shuttle/mining/large/advanced)
+"US" = (
+/obj/structure/table/reinforced,
+/obj/item/folder/yellow,
+/obj/item/pen,
+/turf/open/floor/iron/shuttle/exploration/side{
+ dir = 4
+ },
+/area/shuttle/mining/large/advanced)
+"Wv" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/mining_large{
+ icon_state = "0,2"
+ },
+/area/shuttle/mining/large/advanced)
+"WR" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/mining_large{
+ icon_state = "5,9"
+ },
+/area/shuttle/mining/large/advanced)
+"YH" = (
+/obj/effect/turf_decal/shuttle/exploration/hazardstripe,
+/turf/open/floor/iron/shuttle/exploration/doubleinvertcorner{
+ dir = 1
+ },
+/area/shuttle/mining/large/advanced)
+"YL" = (
+/turf/open/floor/iron/shuttle/exploration/corner{
+ dir = 4
+ },
+/area/shuttle/mining/large/advanced)
+"ZS" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/window/mining_large{
+ icon_state = "5,0"
+ },
+/area/shuttle/mining/large/advanced)
+
+(1,1,1) = {"
+sG
+UF
+Rb
+nE
+LL
+KF
+ET
+Wv
+Rj
+IY
+"}
+(2,1,1) = {"
+rw
+NL
+US
+YL
+Gv
+Nr
+Iv
+TL
+mX
+pe
+"}
+(3,1,1) = {"
+Aq
+IG
+Ur
+Of
+xn
+qb
+Of
+eI
+dN
+Dt
+"}
+(4,1,1) = {"
+Pw
+hn
+Ur
+YH
+zQ
+Qw
+iN
+dl
+gl
+ts
+"}
+(5,1,1) = {"
+Aq
+kU
+Ur
+pa
+nQ
+qb
+zb
+Oa
+jP
+sM
+"}
+(6,1,1) = {"
+WR
+xr
+ER
+ne
+Ir
+Gl
+sQ
+LO
+yQ
+ZS
+"}
+(7,1,1) = {"
+KR
+QT
+Jw
+IX
+ID
+iL
+pA
+Rx
+rM
+Cq
+"}
diff --git a/_maps/skyrat/shuttles/mining_skyrat.dmm b/_maps/skyrat/shuttles/mining_skyrat.dmm
new file mode 100644
index 00000000000..7b155ee7046
--- /dev/null
+++ b/_maps/skyrat/shuttles/mining_skyrat.dmm
@@ -0,0 +1,334 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"a" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/window/mining{
+ icon_state = "0,2"
+ },
+/area/shuttle/mining/advanced)
+"b" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/window/mining{
+ icon_state = "2,0"
+ },
+/area/shuttle/mining/advanced)
+"c" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/mining{
+ icon_state = "3,5"
+ },
+/area/shuttle/mining/advanced)
+"g" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/mining{
+ icon_state = "0,4"
+ },
+/area/shuttle/mining/advanced)
+"l" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/mining{
+ icon_state = "0,1"
+ },
+/area/shuttle/mining/advanced)
+"m" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/window/mining{
+ icon_state = "4,6"
+ },
+/area/shuttle/mining/advanced)
+"n" = (
+/obj/machinery/computer/shuttle/mining,
+/obj/effect/turf_decal/shuttle/exploration/hazardstripe,
+/turf/open/floor/iron/shuttle/exploration/uside,
+/area/shuttle/mining/advanced)
+"o" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/mining{
+ icon_state = "0,3"
+ },
+/area/shuttle/mining/advanced)
+"p" = (
+/turf/open/floor/iron/shuttle/exploration/side{
+ dir = 4
+ },
+/area/shuttle/mining/advanced)
+"q" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/mining{
+ icon_state = "3,6"
+ },
+/area/shuttle/mining/advanced)
+"r" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/mining{
+ icon_state = "1,5"
+ },
+/area/shuttle/mining/advanced)
+"u" = (
+/obj/structure/chair/comfy/shuttle{
+ dir = 1
+ },
+/turf/open/floor/iron/shuttle/exploration/corner{
+ dir = 1
+ },
+/area/shuttle/mining/advanced)
+"v" = (
+/obj/structure/chair/comfy/shuttle{
+ dir = 1
+ },
+/obj/effect/turf_decal/shuttle/exploration/hazardstripe{
+ dir = 1
+ },
+/turf/open/floor/iron/shuttle/exploration/doubleinvertcorner,
+/area/shuttle/mining/advanced)
+"w" = (
+/obj/effect/turf_decal/shuttle/exploration/cargostore,
+/turf/open/floor/iron/shuttle/exploration/flat,
+/area/shuttle/mining/advanced)
+"x" = (
+/obj/structure/chair/comfy/shuttle{
+ dir = 1
+ },
+/turf/open/floor/iron/shuttle/exploration/side{
+ dir = 1
+ },
+/area/shuttle/mining/advanced)
+"y" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/mining{
+ icon_state = "0,0"
+ },
+/area/shuttle/mining/advanced)
+"z" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/window/mining{
+ icon_state = "2,6"
+ },
+/area/shuttle/mining/advanced)
+"A" = (
+/turf/open/floor/iron/shuttle/exploration/blanktile,
+/area/shuttle/mining/advanced)
+"B" = (
+/obj/effect/turf_decal/shuttle/exploration/hazardstripe{
+ dir = 4
+ },
+/turf/open/floor/iron/shuttle/exploration/doubleinvertcorner{
+ dir = 8
+ },
+/area/shuttle/mining/advanced)
+"C" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/mining{
+ icon_state = "1,0"
+ },
+/area/shuttle/mining/advanced)
+"D" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/mining{
+ icon_state = "3,0"
+ },
+/area/shuttle/mining/advanced)
+"F" = (
+/obj/structure/table/reinforced,
+/obj/item/storage/toolbox/emergency,
+/obj/machinery/light/small/directional/west,
+/obj/item/radio/intercom/directional/north{
+ pixel_y = 15
+ },
+/turf/open/floor/iron/shuttle/exploration/corner,
+/area/shuttle/mining/advanced)
+"H" = (
+/obj/structure/table/reinforced,
+/obj/item/crowbar/red,
+/obj/item/wrench,
+/obj/item/tank/internals/emergency_oxygen,
+/obj/item/clothing/mask/gas,
+/obj/machinery/light/small/directional/east,
+/turf/open/floor/iron/shuttle/exploration/corner{
+ dir = 8
+ },
+/area/shuttle/mining/advanced)
+"I" = (
+/obj/docking_port/mobile{
+ dir = 8;
+ dwidth = 3;
+ height = 5;
+ id = "mining";
+ name = "mining shuttle";
+ port_direction = 4;
+ width = 7
+ },
+/obj/machinery/door/airlock/grunge{
+ name = "Mining Shuttle Airlock"
+ },
+/turf/open/floor/iron/shuttle/exploration/textured_flat{
+ dir = 4
+ },
+/area/shuttle/mining/advanced)
+"J" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/mining{
+ icon_state = "4,1P"
+ },
+/area/shuttle/mining/advanced)
+"K" = (
+/obj/structure/ore_box,
+/obj/machinery/light/small/directional/east,
+/turf/open/floor/iron/shuttle/exploration/flat,
+/area/shuttle/mining/advanced)
+"M" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/mining{
+ icon_state = "0,5"
+ },
+/area/shuttle/mining/advanced)
+"N" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/mining{
+ icon_state = "4,0"
+ },
+/area/shuttle/mining/advanced)
+"O" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/mining{
+ icon_state = "4,4"
+ },
+/area/shuttle/mining/advanced)
+"Q" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/window/mining{
+ icon_state = "4,2"
+ },
+/area/shuttle/mining/advanced)
+"S" = (
+/obj/item/clothing/suit/hazardvest{
+ desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks.";
+ name = "emergency lifejacket"
+ },
+/obj/item/clothing/suit/hazardvest{
+ desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks.";
+ name = "emergency lifejacket"
+ },
+/obj/item/clothing/suit/hazardvest{
+ desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks.";
+ name = "emergency lifejacket"
+ },
+/obj/item/clothing/suit/hazardvest{
+ desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks.";
+ name = "emergency lifejacket"
+ },
+/obj/item/clothing/suit/hazardvest{
+ desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks.";
+ name = "emergency lifejacket"
+ },
+/obj/item/tank/internals/emergency_oxygen{
+ pixel_x = 3
+ },
+/obj/item/tank/internals/emergency_oxygen{
+ pixel_x = 3
+ },
+/obj/item/tank/internals/emergency_oxygen{
+ pixel_x = 3
+ },
+/obj/item/tank/internals/emergency_oxygen{
+ pixel_x = 3
+ },
+/obj/item/tank/internals/emergency_oxygen{
+ pixel_x = 3
+ },
+/obj/item/clothing/mask/breath{
+ pixel_x = -3;
+ pixel_y = -3
+ },
+/obj/item/clothing/mask/breath{
+ pixel_x = -3;
+ pixel_y = -3
+ },
+/obj/item/clothing/mask/breath{
+ pixel_x = -3;
+ pixel_y = -3
+ },
+/obj/item/clothing/mask/breath{
+ pixel_x = -3;
+ pixel_y = -3
+ },
+/obj/item/clothing/mask/breath{
+ pixel_x = -3;
+ pixel_y = -3
+ },
+/obj/item/clothing/head/hardhat/orange{
+ name = "protective hat";
+ pixel_y = 9
+ },
+/obj/item/clothing/head/hardhat/orange{
+ name = "protective hat";
+ pixel_y = 9
+ },
+/obj/item/clothing/head/hardhat/orange{
+ name = "protective hat";
+ pixel_y = 9
+ },
+/obj/item/clothing/head/hardhat/orange{
+ name = "protective hat";
+ pixel_y = 9
+ },
+/obj/item/clothing/head/hardhat/orange{
+ name = "protective hat";
+ pixel_y = 9
+ },
+/obj/structure/closet/crate/internals,
+/obj/item/pickaxe/emergency,
+/obj/item/pickaxe/emergency,
+/obj/machinery/light/small/directional/west,
+/turf/open/floor/iron/shuttle/exploration/flat,
+/area/shuttle/mining/advanced)
+"T" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/mining{
+ icon_state = "4,5P"
+ },
+/area/shuttle/mining/advanced)
+"U" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/mining{
+ icon_state = "1,6"
+ },
+/area/shuttle/mining/advanced)
+"V" = (
+/turf/closed/wall/mineral/titanium/shuttle_wall/window/mining{
+ icon_state = "0,6"
+ },
+/area/shuttle/mining/advanced)
+"Y" = (
+/obj/structure/chair/comfy/shuttle{
+ dir = 1
+ },
+/turf/open/floor/iron/shuttle/exploration/corner{
+ dir = 4
+ },
+/area/shuttle/mining/advanced)
+
+(1,1,1) = {"
+V
+M
+g
+o
+a
+l
+y
+"}
+(2,1,1) = {"
+U
+r
+F
+p
+Y
+S
+C
+"}
+(3,1,1) = {"
+z
+n
+v
+A
+x
+w
+b
+"}
+(4,1,1) = {"
+q
+c
+H
+B
+u
+K
+D
+"}
+(5,1,1) = {"
+m
+T
+O
+I
+Q
+J
+N
+"}
diff --git a/_maps/templates/ferry_skyrat.dmm b/_maps/templates/ferry_skyrat.dmm
index a64a71a1416..315c6a72db3 100644
--- a/_maps/templates/ferry_skyrat.dmm
+++ b/_maps/templates/ferry_skyrat.dmm
@@ -19,11 +19,19 @@
},
/area/shuttle/transport)
"bI" = (
-/obj/machinery/door/airlock/command/glass,
+/obj/machinery/door/airlock/command/glass{
+ name = "Cockpit";
+ req_access_txt = "101"
+ },
/turf/open/floor/iron/stairs{
dir = 4
},
/area/shuttle/transport)
+"cb" = (
+/obj/machinery/light/red/directional/north,
+/obj/effect/turf_decal/caution,
+/turf/open/floor/iron/shuttle/ferry,
+/area/shuttle/transport)
"cp" = (
/turf/closed/wall/mineral/titanium/shuttle_wall/ferry{
icon_state = "17,6"
@@ -92,6 +100,12 @@
icon_state = "7,2"
},
/area/shuttle/transport)
+"hP" = (
+/obj/structure/closet/shuttle/emergency{
+ dir = 8
+ },
+/turf/open/floor/iron/shuttle/ferry,
+/area/shuttle/transport)
"iG" = (
/turf/open/floor/iron/shuttle/ferry{
icon_state = "sign_2"
@@ -141,9 +155,7 @@
},
/area/shuttle/transport)
"lz" = (
-/obj/effect/turf_decal/caution/blue{
- dir = 1
- },
+/obj/effect/turf_decal/caution,
/turf/open/floor/iron/shuttle/ferry,
/area/shuttle/transport)
"mB" = (
@@ -195,6 +207,13 @@
icon_state = "13,6"
},
/area/shuttle/transport)
+"tp" = (
+/obj/structure/chair/comfy/shuttle{
+ dir = 8
+ },
+/obj/machinery/light/directional/south,
+/turf/open/floor/iron/shuttle/ferry,
+/area/shuttle/transport)
"ul" = (
/turf/closed/wall/mineral/titanium/shuttle_wall/ferry{
icon_state = "12,7"
@@ -229,7 +248,9 @@
},
/area/shuttle/transport)
"yz" = (
-/obj/effect/turf_decal/caution/blue,
+/obj/effect/turf_decal/caution{
+ dir = 1
+ },
/turf/open/floor/iron/shuttle/ferry,
/area/shuttle/transport)
"yF" = (
@@ -311,13 +332,6 @@
icon_state = "17,8"
},
/area/shuttle/transport)
-"EY" = (
-/obj/machinery/door/airlock/multi_tile/metal,
-/obj/structure/fans/tiny/invisible,
-/turf/open/floor/iron/shuttle/ferry{
- icon_state = "floor"
- },
-/area/shuttle/transport)
"Fg" = (
/turf/closed/wall/mineral/titanium/shuttle_wall/ferry{
icon_state = "8,6"
@@ -329,7 +343,6 @@
},
/area/shuttle/transport)
"Gy" = (
-/obj/structure/fans/tiny/invisible,
/obj/docking_port/mobile{
dheight = 7;
dir = 2;
@@ -341,6 +354,8 @@
preferred_direction = 8;
width = 20
},
+/obj/structure/fans/tiny/forcefield,
+/obj/machinery/door/airlock/grunge,
/turf/open/floor/iron/shuttle/ferry{
icon_state = "floor"
},
@@ -361,13 +376,13 @@
},
/area/shuttle/transport)
"IR" = (
-/obj/structure/closet/shuttle/erokez,
/obj/item/clothing/suit/armor/bulletproof,
/obj/item/clothing/suit/armor/bulletproof,
/obj/item/clothing/suit/armor/bulletproof,
/obj/item/clothing/head/helmet/alt,
/obj/item/clothing/head/helmet/alt,
/obj/item/clothing/head/helmet/alt,
+/obj/structure/closet/shuttle,
/turf/open/floor/iron/shuttle/ferry,
/area/shuttle/transport)
"Jc" = (
@@ -469,7 +484,8 @@
},
/area/shuttle/transport)
"Qg" = (
-/obj/structure/fans/tiny/invisible,
+/obj/structure/fans/tiny/forcefield,
+/obj/machinery/door/airlock/grunge,
/turf/open/floor/iron/shuttle/ferry{
icon_state = "floor"
},
@@ -494,6 +510,12 @@
icon_state = "17,7"
},
/area/shuttle/transport)
+"Se" = (
+/obj/structure/closet/shuttle/medical{
+ dir = 1
+ },
+/turf/open/floor/iron/shuttle/ferry,
+/area/shuttle/transport)
"Tg" = (
/turf/closed/wall/mineral/titanium/shuttle_wall/ferry{
icon_state = "6,9"
@@ -509,10 +531,6 @@
icon_state = "2,6"
},
/area/shuttle/transport)
-"TC" = (
-/obj/structure/closet/shuttle/wagon,
-/turf/open/floor/iron/shuttle/ferry,
-/area/shuttle/transport)
"Ui" = (
/turf/closed/wall/mineral/titanium/shuttle_wall/window/ferry{
icon_state = "1,6"
@@ -528,26 +546,32 @@
icon_state = "4,9"
},
/area/shuttle/transport)
-"WY" = (
-/obj/structure/closet/shuttle/medical_wall/erokez,
+"Xl" = (
+/obj/item/clothing/suit/space/hardsuit/ert/sec,
+/obj/structure/closet/shuttle{
+ dir = 1
+ },
/turf/open/floor/iron/shuttle/ferry,
/area/shuttle/transport)
-"Xl" = (
-/obj/structure/closet/shuttle/erokez,
-/obj/item/clothing/suit/space/hardsuit/ert/sec,
+"Yd" = (
+/obj/machinery/light/red/directional/south,
+/obj/effect/turf_decal/caution{
+ dir = 1
+ },
/turf/open/floor/iron/shuttle/ferry,
/area/shuttle/transport)
"Ym" = (
-/obj/machinery/computer/shuttle/ferry/request{
+/obj/machinery/computer/shuttle/ferry/shuttle{
dir = 4
},
/turf/open/floor/iron/shuttle/ferry,
/area/shuttle/transport)
"Yz" = (
-/obj/structure/closet/shuttle/erokez,
/obj/item/gun/energy/e_gun/stun,
/obj/item/gun/energy/e_gun/stun,
/obj/item/gun/energy/e_gun/stun,
+/obj/structure/closet/shuttle,
+/obj/machinery/light/directional/north,
/turf/open/floor/iron/shuttle/ferry,
/area/shuttle/transport)
@@ -612,7 +636,7 @@ Dy
iN
Dy
Mf
-WY
+Se
xQ
wX
"}
@@ -637,7 +661,7 @@ Yz
Mf
Ti
Lf
-Lf
+tp
NJ
JS
wX
@@ -650,7 +674,7 @@ IR
Mf
Ti
Lf
-iN
+Lf
hd
wX
wX
@@ -685,11 +709,11 @@ wX
wX
wX
wX
-EY
+Qg
iG
Ti
iG
-EY
+Qg
wX
wX
wX
@@ -712,9 +736,9 @@ wX
wX
wX
ul
-lz
+cb
Ti
-yz
+Yd
DO
wX
wX
@@ -726,7 +750,7 @@ wX
wX
kR
td
-TC
+hP
Ia
el
wX
diff --git a/_maps/tramstation.json b/_maps/tramstation.json
index 9bd60e72861..2a6f383fca0 100644
--- a/_maps/tramstation.json
+++ b/_maps/tramstation.json
@@ -4,7 +4,7 @@
"map_path": "map_files/tramstation",
"map_file": "tramstation_skyrat.dmm",
"shuttles": {
- "cargo": "cargo_box",
+ "cargo": "cargo_skyrat",
"ferry": "ferry_fancy",
"whiteship": "whiteship_tram",
"emergency": "emergency_tram"
diff --git a/code/modules/shuttle/supply.dm b/code/modules/shuttle/supply.dm
index b16d0962e4b..d5f6bf4e06a 100644
--- a/code/modules/shuttle/supply.dm
+++ b/code/modules/shuttle/supply.dm
@@ -225,6 +225,10 @@ GLOBAL_LIST_INIT(blacklisted_cargo_types, typecacheof(list(
for(var/place in shuttle_areas)
var/area/shuttle/shuttle_area = place
for(var/atom/movable/AM in shuttle_area)
+ //SKYRAT EDIT ADDITION - cant sell stuff in the cockpit, even if its out of order (dont sell out of my emergency locker...)
+ if(istype(place, /area/shuttle/supply/cockpit))
+ continue
+ //SKYRAT EDIT ADDITION END
if(iscameramob(AM))
continue
if(!AM.anchored)
diff --git a/modular_skyrat/master_files/icons/obj/closet.dmi b/modular_skyrat/master_files/icons/obj/closet.dmi
index 4faaa3a260aaf238cd843a031b314a828a339200..788f566a935314c1f61b22d337dd9e3237a5ff2e 100644
GIT binary patch
literal 61476
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