diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm
index 5ddd6d8fe06..fe20e16c4ba 100644
--- a/_maps/map_files/Deltastation/DeltaStation2.dmm
+++ b/_maps/map_files/Deltastation/DeltaStation2.dmm
@@ -4156,13 +4156,7 @@
 /turf/open/floor/plating,
 /area/station/engineering/supermatter/room)
 "aXU" = (
-/obj/docking_port/stationary{
-	dwidth = 1;
-	height = 4;
-	name = "escape pod loader";
-	roundstart_template = /datum/map_template/shuttle/escape_pod/default;
-	width = 3
-	},
+/obj/docking_port/stationary/escape_pod,
 /turf/open/space/basic,
 /area/space)
 "aXV" = (
@@ -98619,13 +98613,8 @@
 /turf/open/floor/iron,
 /area/station/command/heads_quarters/qm)
 "xZM" = (
-/obj/docking_port/stationary{
-	dir = 4;
-	dwidth = 1;
-	height = 4;
-	name = "escape pod loader";
-	roundstart_template = /datum/map_template/shuttle/escape_pod/default;
-	width = 3
+/obj/docking_port/stationary/escape_pod{
+	dir = 4
 	},
 /turf/open/space/basic,
 /area/space)
diff --git a/_maps/map_files/IceBoxStation/IceBoxStation.dmm b/_maps/map_files/IceBoxStation/IceBoxStation.dmm
index 33015f408ae..e6c6208011d 100644
--- a/_maps/map_files/IceBoxStation/IceBoxStation.dmm
+++ b/_maps/map_files/IceBoxStation/IceBoxStation.dmm
@@ -37083,13 +37083,7 @@
 /turf/open/floor/iron/dark,
 /area/station/command/heads_quarters/cmo)
 "lmR" = (
-/obj/docking_port/stationary{
-	dwidth = 1;
-	height = 4;
-	name = "escape pod loader";
-	roundstart_template = /datum/map_template/shuttle/escape_pod/default;
-	width = 3
-	},
+/obj/docking_port/stationary/escape_pod,
 /turf/open/floor/plating/snowed/icemoon,
 /area/icemoon/surface/outdoors/nospawn)
 "lnc" = (
@@ -58944,13 +58938,8 @@
 /turf/open/floor/iron,
 /area/station/engineering/atmos)
 "shl" = (
-/obj/docking_port/stationary{
-	dir = 4;
-	dwidth = 1;
-	height = 4;
-	name = "escape pod loader";
-	roundstart_template = /datum/map_template/shuttle/escape_pod/default;
-	width = 3
+/obj/docking_port/stationary/escape_pod{
+	dir = 4
 	},
 /turf/open/floor/plating/snowed/icemoon,
 /area/icemoon/surface/outdoors/nospawn)
@@ -69070,13 +69059,8 @@
 /turf/open/floor/wood/parquet,
 /area/station/commons/lounge)
 "vpI" = (
-/obj/docking_port/stationary{
-	dir = 8;
-	dwidth = 1;
-	height = 4;
-	name = "escape pod loader";
-	roundstart_template = /datum/map_template/shuttle/escape_pod/default;
-	width = 3
+/obj/docking_port/stationary/escape_pod{
+	dir = 8
 	},
 /turf/open/floor/plating/snowed/icemoon,
 /area/icemoon/surface/outdoors/nospawn)
diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm
index cf6118ae77c..6b8f9bf8f1d 100644
--- a/_maps/map_files/KiloStation/KiloStation.dmm
+++ b/_maps/map_files/KiloStation/KiloStation.dmm
@@ -5423,12 +5423,7 @@
 /turf/open/floor/plating/airless,
 /area/space/nearstation)
 "bFQ" = (
-/obj/docking_port/stationary{
-	dwidth = 1;
-	height = 4;
-	roundstart_template = /datum/map_template/shuttle/escape_pod/default;
-	width = 3
-	},
+/obj/docking_port/stationary/escape_pod,
 /turf/open/space/basic,
 /area/space)
 "bGx" = (
@@ -6608,12 +6603,8 @@
 /turf/open/floor/plating,
 /area/station/maintenance/port/lesser)
 "ccg" = (
-/obj/docking_port/stationary{
-	dir = 4;
-	dwidth = 1;
-	height = 4;
-	roundstart_template = /datum/map_template/shuttle/escape_pod/default;
-	width = 3
+/obj/docking_port/stationary/escape_pod{
+	dir = 4
 	},
 /turf/open/space/basic,
 /area/space)
@@ -9166,12 +9157,8 @@
 /turf/open/floor/plating/lowpressure,
 /area/space/nearstation)
 "cOd" = (
-/obj/docking_port/stationary{
-	dir = 8;
-	dwidth = 1;
-	height = 4;
-	roundstart_template = /datum/map_template/shuttle/escape_pod/default;
-	width = 3
+/obj/docking_port/stationary/escape_pod{
+	dir = 8
 	},
 /turf/open/space/basic,
 /area/space)
@@ -16193,6 +16180,10 @@
 "ePm" = (
 /turf/open/floor/iron,
 /area/station/maintenance/disposal/incinerator)
+"ePI" = (
+/obj/effect/turf_decal/stripes/line,
+/turf/open/space/basic,
+/area/space/nearstation)
 "ePU" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -22838,6 +22829,12 @@
 	},
 /turf/open/floor/iron,
 /area/station/hallway/primary/starboard)
+"gCs" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 8
+	},
+/turf/open/space/basic,
+/area/space/nearstation)
 "gCu" = (
 /obj/structure/chair{
 	dir = 8
@@ -23495,13 +23492,8 @@
 /turf/open/floor/iron/dark,
 /area/station/engineering/supermatter/room)
 "gKV" = (
-/obj/docking_port/stationary{
-	dir = 2;
-	dwidth = 1;
-	height = 4;
-	name = "escape pod loader";
-	roundstart_template = /datum/map_template/shuttle/escape_pod/default;
-	width = 3
+/obj/docking_port/stationary/escape_pod{
+	dir = 2
 	},
 /turf/open/space/basic,
 /area/space)
@@ -31686,6 +31678,10 @@
 /obj/structure/cable,
 /turf/open/floor/iron/dark,
 /area/station/hallway/secondary/exit/departure_lounge)
+"iSY" = (
+/obj/structure/lattice,
+/turf/open/space/basic,
+/area/space)
 "iTj" = (
 /obj/effect/spawner/structure/window/reinforced,
 /obj/machinery/door/poddoor/shutters{
@@ -54269,6 +54265,12 @@
 /obj/effect/mapping_helpers/burnt_floor,
 /turf/open/floor/plating,
 /area/station/maintenance/port/greater)
+"pzk" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 1
+	},
+/turf/open/space/basic,
+/area/space/nearstation)
 "pzm" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -64593,6 +64595,10 @@
 /obj/structure/cable,
 /turf/open/floor/iron/showroomfloor,
 /area/station/medical/surgery/aft)
+"svA" = (
+/obj/structure/lattice/catwalk,
+/turf/open/space/basic,
+/area/space)
 "svC" = (
 /obj/effect/turf_decal/stripes/corner{
 	dir = 8
@@ -79326,7 +79332,6 @@
 	name = "lavaland";
 	shuttle_id = "pod_4_lavaland"
 	},
-/obj/structure/lattice,
 /turf/open/space,
 /area/space/nearstation)
 "wxF" = (
@@ -96665,9 +96670,9 @@ wDI
 aeu
 aeu
 aDT
-beK
+gCs
 lHD
-beK
+gCs
 sRm
 aeu
 ycx
@@ -102626,7 +102631,7 @@ aaa
 aaa
 aaa
 cry
-aoe
+ePI
 acK
 aaa
 aaa
@@ -103140,7 +103145,7 @@ aaa
 aaa
 aaa
 cry
-aoe
+ePI
 acK
 aaa
 aaa
@@ -126173,7 +126178,7 @@ aaa
 aaa
 aaa
 acK
-aDU
+pzk
 cry
 aaa
 aaa
@@ -126687,7 +126692,7 @@ aaB
 aaa
 aaa
 acK
-aDU
+pzk
 cry
 aaa
 aaa
@@ -131088,9 +131093,9 @@ cmU
 aeU
 aof
 qJs
-acK
+cry
 wxy
-acK
+cry
 qJs
 aeu
 aeU
@@ -131345,9 +131350,9 @@ cmU
 aeU
 aeU
 aaQ
-aaa
-aaa
-aaa
+svA
+iSY
+svA
 acm
 aeu
 aeu
diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm
index bc38cdb10dd..0126e453209 100644
--- a/_maps/map_files/MetaStation/MetaStation.dmm
+++ b/_maps/map_files/MetaStation/MetaStation.dmm
@@ -48100,12 +48100,7 @@
 /turf/open/floor/engine,
 /area/station/science/cytology)
 "rec" = (
-/obj/docking_port/stationary{
-	dwidth = 1;
-	height = 4;
-	roundstart_template = /datum/map_template/shuttle/escape_pod/default;
-	width = 3
-	},
+/obj/docking_port/stationary/escape_pod,
 /turf/open/space/basic,
 /area/space)
 "ret" = (
@@ -62620,12 +62615,8 @@
 /turf/open/floor/plating,
 /area/station/maintenance/starboard/greater)
 "waq" = (
-/obj/docking_port/stationary{
-	dir = 4;
-	dwidth = 1;
-	height = 4;
-	roundstart_template = /datum/map_template/shuttle/escape_pod/default;
-	width = 3
+/obj/docking_port/stationary/escape_pod{
+	dir = 4
 	},
 /turf/open/space/basic,
 /area/space)
diff --git a/_maps/map_files/VoidRaptor/VoidRaptor.dmm b/_maps/map_files/VoidRaptor/VoidRaptor.dmm
index 38b6fa00cce..a159be1db05 100644
--- a/_maps/map_files/VoidRaptor/VoidRaptor.dmm
+++ b/_maps/map_files/VoidRaptor/VoidRaptor.dmm
@@ -22747,12 +22747,8 @@
 /turf/open/floor/carpet/stellar,
 /area/station/service/chapel/funeral)
 "gCb" = (
-/obj/docking_port/stationary{
-	dir = 2;
-	dwidth = 1;
-	height = 4;
-	roundstart_template = /datum/map_template/shuttle/escape_pod/default;
-	width = 3
+/obj/docking_port/stationary/escape_pod{
+	dir = 2
 	},
 /turf/open/space/basic,
 /area/space/nearstation)
@@ -30331,13 +30327,7 @@
 	},
 /area/station/science/xenobiology)
 "iIv" = (
-/obj/docking_port/stationary{
-	dwidth = 1;
-	height = 4;
-	name = "escape pod loader";
-	roundstart_template = /datum/map_template/shuttle/escape_pod/default;
-	width = 3
-	},
+/obj/docking_port/stationary/escape_pod,
 /turf/open/space/basic,
 /area/space/nearstation)
 "iIy" = (
@@ -58874,15 +58864,6 @@
 	},
 /turf/open/floor/wood/parquet,
 /area/station/common/night_club)
-"qwg" = (
-/obj/docking_port/stationary{
-	dwidth = 1;
-	height = 4;
-	roundstart_template = /datum/map_template/shuttle/escape_pod/default;
-	width = 3
-	},
-/turf/open/space/basic,
-/area/space/nearstation)
 "qwy" = (
 /obj/machinery/holopad,
 /obj/effect/turf_decal/bot,
@@ -109239,7 +109220,7 @@ gMQ
 ttw
 ttw
 ttw
-qwg
+iIv
 dMY
 icP
 rBo
@@ -112257,7 +112238,7 @@ cLN
 ttw
 ttw
 ttw
-qwg
+iIv
 peN
 rOA
 rOA
diff --git a/_maps/map_files/debug/runtimestation.dmm b/_maps/map_files/debug/runtimestation.dmm
index 4880cbfa0bb..dde8edbc9a0 100644
--- a/_maps/map_files/debug/runtimestation.dmm
+++ b/_maps/map_files/debug/runtimestation.dmm
@@ -1887,13 +1887,6 @@
 /obj/structure/cable,
 /turf/open/floor/iron,
 /area/station/science)
-"hj" = (
-/obj/effect/turf_decal/stripes/line{
-	dir = 1
-	},
-/obj/machinery/camera/autoname/directional/south,
-/turf/open/floor/iron,
-/area/station/cargo/miningoffice)
 "hD" = (
 /obj/structure/closet/secure_closet/chemical/heisenberg{
 	locked = 0
@@ -2009,13 +2002,6 @@
 /obj/effect/spawner/structure/window/reinforced,
 /turf/open/floor/iron,
 /area/station/medical/chemistry)
-"ph" = (
-/obj/structure/cable,
-/obj/effect/turf_decal/stripes/corner{
-	dir = 1
-	},
-/turf/open/floor/iron,
-/area/station/cargo/miningoffice)
 "pv" = (
 /obj/machinery/light/directional/north,
 /turf/open/floor/iron,
@@ -2180,6 +2166,10 @@
 "wU" = (
 /turf/closed/wall/r_wall,
 /area/station/science/explab)
+"yn" = (
+/obj/docking_port/stationary/escape_pod,
+/turf/open/floor/plating,
+/area/station/hallway/secondary/entry)
 "yA" = (
 /obj/docking_port/stationary/laborcamp_home{
 	dir = 8
@@ -2198,6 +2188,13 @@
 /obj/machinery/power/rtg/debug,
 /turf/open/floor/plating/airless,
 /area/space/nearstation)
+"yZ" = (
+/obj/structure/cable,
+/obj/effect/turf_decal/stripes/corner{
+	dir = 1
+	},
+/turf/open/floor/iron,
+/area/station/cargo/miningoffice)
 "zo" = (
 /obj/machinery/power/apc/auto_name/directional/south,
 /obj/structure/cable,
@@ -2255,6 +2252,13 @@
 /obj/structure/cable,
 /turf/open/floor/iron,
 /area/station/medical/chemistry)
+"Dc" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 1
+	},
+/obj/machinery/camera/autoname/directional/south,
+/turf/open/floor/iron,
+/area/station/cargo/miningoffice)
 "Df" = (
 /obj/machinery/light/directional/east,
 /obj/item/integrated_circuit/loaded/hello_world,
@@ -2311,15 +2315,6 @@
 	},
 /turf/open/floor/iron,
 /area/station/medical/chemistry)
-"FK" = (
-/obj/docking_port/stationary{
-	dwidth = 1;
-	height = 4;
-	roundstart_template = /datum/map_template/shuttle/escape_pod/default;
-	width = 3
-	},
-/turf/open/floor/plating,
-/area/station/hallway/secondary/entry)
 "If" = (
 /obj/machinery/rnd/production/techfab/department,
 /turf/open/floor/iron,
@@ -4136,7 +4131,7 @@ Qu
 qQ
 qQ
 qQ
-hj
+Dc
 em
 eh
 eh
@@ -4228,7 +4223,7 @@ Td
 II
 II
 gl
-ph
+yZ
 kj
 wM
 wM
@@ -4595,7 +4590,7 @@ el
 dV
 dV
 dV
-FK
+yn
 dP
 ex
 eh
diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm
index 65ae7667932..f1e78ba7dfd 100644
--- a/_maps/map_files/generic/CentCom.dmm
+++ b/_maps/map_files/generic/CentCom.dmm
@@ -3749,7 +3749,7 @@
 "sj" = (
 /obj/docking_port/stationary{
 	dwidth = 1;
-	height = 4;
+	height = 5;
 	name = "recovery ship";
 	shuttle_id = "pod_4_away";
 	width = 3
@@ -8078,7 +8078,7 @@
 "Qt" = (
 /obj/docking_port/stationary{
 	dwidth = 1;
-	height = 4;
+	height = 5;
 	name = "recovery ship";
 	shuttle_id = "pod_3_away";
 	width = 3
@@ -9781,7 +9781,7 @@
 /obj/docking_port/stationary{
 	dir = 4;
 	dwidth = 1;
-	height = 4;
+	height = 5;
 	name = "recovery ship";
 	shuttle_id = "pod_2_away";
 	width = 3
diff --git a/_maps/map_files/tramstation/tramstation.dmm b/_maps/map_files/tramstation/tramstation.dmm
index 39ef7297de8..a1d401ec808 100644
--- a/_maps/map_files/tramstation/tramstation.dmm
+++ b/_maps/map_files/tramstation/tramstation.dmm
@@ -20177,13 +20177,8 @@
 /turf/open/floor/iron,
 /area/station/security/office)
 "hpz" = (
-/obj/docking_port/stationary{
-	dir = 8;
-	dwidth = 1;
-	height = 4;
-	name = "escape pod loader";
-	roundstart_template = /datum/map_template/shuttle/escape_pod/default;
-	width = 3
+/obj/docking_port/stationary/escape_pod{
+	dir = 8
 	},
 /turf/open/space/openspace,
 /area/space)
@@ -66782,13 +66777,8 @@
 /turf/open/floor/catwalk_floor,
 /area/station/hallway/primary/tram/left)
 "xXs" = (
-/obj/docking_port/stationary{
-	dir = 4;
-	dwidth = 1;
-	height = 4;
-	name = "escape pod loader";
-	roundstart_template = /datum/map_template/shuttle/escape_pod/default;
-	width = 3
+/obj/docking_port/stationary/escape_pod{
+	dir = 4
 	},
 /obj/effect/turf_decal/sand/plating,
 /turf/open/floor/plating/airless,
diff --git a/_maps/shuttles/escape_pod_cramped.dmm b/_maps/shuttles/escape_pod_cramped.dmm
new file mode 100644
index 00000000000..36bb72a1765
--- /dev/null
+++ b/_maps/shuttles/escape_pod_cramped.dmm
@@ -0,0 +1,45 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"B" = (
+/turf/closed/wall/mineral/titanium/survival,
+/area/shuttle/pod_1)
+"N" = (
+/obj/docking_port/mobile/pod{
+	port_direction = 2
+	},
+/obj/machinery/door/airlock/external{
+	name = "Escape Pod Airlock"
+	},
+/turf/open/floor/plating,
+/area/shuttle/pod_1)
+"U" = (
+/obj/structure/chair/comfy/shuttle{
+	dir = 1
+	},
+/obj/item/radio/intercom/directional/east,
+/obj/machinery/light/small/directional/west,
+/obj/machinery/computer/shuttle/pod{
+	pixel_x = -32
+	},
+/obj/machinery/status_display/evac/directional/north,
+/turf/open/floor/plating,
+/area/shuttle/pod_1)
+"Z" = (
+/obj/machinery/power/shuttle_engine/propulsion/burst,
+/turf/closed/wall/mineral/titanium/survival,
+/area/shuttle/pod_1)
+
+(1,1,1) = {"
+B
+B
+Z
+"}
+(2,1,1) = {"
+B
+U
+N
+"}
+(3,1,1) = {"
+B
+B
+Z
+"}
diff --git a/_maps/shuttles/escape_pod_luxury.dmm b/_maps/shuttles/escape_pod_luxury.dmm
new file mode 100644
index 00000000000..397b93fbf24
--- /dev/null
+++ b/_maps/shuttles/escape_pod_luxury.dmm
@@ -0,0 +1,68 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"t" = (
+/obj/structure/chair/comfy/shuttle{
+	dir = 1
+	},
+/obj/machinery/computer/shuttle/pod{
+	pixel_x = -32
+	},
+/obj/machinery/status_display/evac/directional/east,
+/turf/open/floor/carpet/executive,
+/area/shuttle/pod_1)
+"B" = (
+/turf/closed/wall/mineral/titanium,
+/area/shuttle/pod_1)
+"G" = (
+/obj/structure/chair/comfy/shuttle{
+	dir = 1
+	},
+/turf/open/floor/carpet/executive,
+/area/shuttle/pod_1)
+"N" = (
+/obj/docking_port/mobile/pod{
+	port_direction = 2
+	},
+/obj/machinery/door/airlock/titanium/glass{
+	name = "Escape Pod Airlock"
+	},
+/turf/open/floor/carpet/executive,
+/area/shuttle/pod_1)
+"Q" = (
+/obj/effect/spawner/structure/window/reinforced/shuttle,
+/turf/open/floor/plating,
+/area/shuttle/pod_1)
+"U" = (
+/obj/structure/chair/comfy/shuttle{
+	dir = 1
+	},
+/obj/item/radio/intercom/directional/east,
+/obj/item/storage/pod/directional/west,
+/obj/machinery/light/small/directional/west,
+/turf/open/floor/carpet/executive,
+/area/shuttle/pod_1)
+"Z" = (
+/obj/machinery/power/shuttle_engine/propulsion/burst,
+/turf/closed/wall/mineral/titanium,
+/area/shuttle/pod_1)
+
+(1,1,1) = {"
+B
+B
+Q
+B
+Z
+"}
+(2,1,1) = {"
+Q
+t
+G
+U
+N
+"}
+(3,1,1) = {"
+B
+B
+Q
+B
+Z
+"}
diff --git a/_maps/shuttles/skyrat/escape_pod_default_skyrat.dmm b/_maps/shuttles/skyrat/escape_pod_default_skyrat.dmm
deleted file mode 100644
index 5669f354894..00000000000
--- a/_maps/shuttles/skyrat/escape_pod_default_skyrat.dmm
+++ /dev/null
@@ -1,83 +0,0 @@
-//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
-"p" = (
-/obj/structure/marker_beacon/olive,
-/turf/closed/wall/mineral/titanium,
-/area/shuttle/pod_1)
-"B" = (
-/obj/structure/marker_beacon/burgundy,
-/turf/closed/wall/mineral/titanium,
-/area/shuttle/pod_1)
-"G" = (
-/obj/structure/chair/comfy/shuttle{
-	dir = 8;
-	pixel_x = 9
-	},
-/obj/effect/turf_decal/stripes/white/line{
-	dir = 4
-	},
-/obj/effect/turf_decal/stripes/white/line{
-	dir = 8
-	},
-/turf/open/floor/mineral/plastitanium,
-/area/shuttle/pod_1)
-"L" = (
-/turf/closed/wall/mineral/titanium/nodiagonal,
-/area/shuttle/pod_1)
-"N" = (
-/obj/docking_port/mobile/pod{
-	port_direction = 2
-	},
-/obj/effect/turf_decal/delivery/white,
-/obj/machinery/door/airlock/survival_pod,
-/turf/open/floor/iron/dark/textured_large,
-/area/shuttle/pod_1)
-"Q" = (
-/obj/effect/spawner/structure/window/reinforced/shuttle,
-/turf/open/floor/plating,
-/area/shuttle/pod_1)
-"U" = (
-/obj/item/storage/pod{
-	pixel_x = -20
-	},
-/obj/structure/chair/comfy/shuttle{
-	dir = 8;
-	pixel_x = 9
-	},
-/obj/machinery/light/red/dim/directional/west,
-/obj/effect/turf_decal/stripes/white/line{
-	dir = 4
-	},
-/obj/effect/turf_decal/stripes/white/line{
-	dir = 8
-	},
-/turf/open/floor/mineral/plastitanium,
-/area/shuttle/pod_1)
-"X" = (
-/obj/machinery/computer/shuttle/pod/advanced{
-	dir = 4
-	},
-/turf/closed/wall/mineral/titanium/nodiagonal,
-/area/shuttle/pod_1)
-"Z" = (
-/obj/machinery/power/shuttle_engine/propulsion/burst,
-/turf/closed/wall/mineral/titanium/spaceship/nodiagonal,
-/area/shuttle/pod_1)
-
-(1,1,1) = {"
-B
-X
-L
-Z
-"}
-(2,1,1) = {"
-Q
-G
-U
-N
-"}
-(3,1,1) = {"
-p
-L
-L
-Z
-"}
diff --git a/_maps/skyrat/automapper/templates/deltastation/deltastation_arrivals.dmm b/_maps/skyrat/automapper/templates/deltastation/deltastation_arrivals.dmm
index 1728cdc0770..73122c6c4fb 100644
--- a/_maps/skyrat/automapper/templates/deltastation/deltastation_arrivals.dmm
+++ b/_maps/skyrat/automapper/templates/deltastation/deltastation_arrivals.dmm
@@ -124,13 +124,7 @@
 /turf/open/space,
 /area/space/nearstation)
 "fy" = (
-/obj/docking_port/stationary{
-	dwidth = 1;
-	height = 4;
-	name = "escape pod loader";
-	roundstart_template = /datum/map_template/shuttle/escape_pod/default;
-	width = 3
-	},
+/obj/docking_port/stationary/escape_pod,
 /turf/open/space/basic,
 /area/space)
 "fV" = (
@@ -624,14 +618,7 @@
 	},
 /area/station/hallway/secondary/entry)
 "zX" = (
-/obj/docking_port/stationary{
-	dwidth = 3;
-	height = 5;
-	shuttle_id = "commonmining_home";
-	name = "SS13: Common Mining Dock";
-	roundstart_template = /datum/map_template/shuttle/mining_common/meta;
-	width = 7
-	},
+/obj/docking_port/stationary/public_mining_dock,
 /turf/open/space/basic,
 /area/space)
 "Af" = (
@@ -878,7 +865,6 @@
 	height = 13;
 	shuttle_id = "arrivals_stationary";
 	name = "arrivals";
-	roundstart_template = null;
 	width = 5
 	},
 /turf/open/space/basic,
diff --git a/_maps/skyrat/automapper/templates/icebox/icebox_arrivals.dmm b/_maps/skyrat/automapper/templates/icebox/icebox_arrivals.dmm
index b3ef285d06f..6fa682ec4d4 100644
--- a/_maps/skyrat/automapper/templates/icebox/icebox_arrivals.dmm
+++ b/_maps/skyrat/automapper/templates/icebox/icebox_arrivals.dmm
@@ -753,13 +753,8 @@
 /turf/open/floor/iron,
 /area/station/hallway/secondary/entry)
 "Nt" = (
-/obj/docking_port/stationary{
-	dir = 8;
-	dwidth = 1;
-	height = 4;
-	name = "escape pod loader";
-	roundstart_template = /datum/map_template/shuttle/escape_pod/default;
-	width = 3
+/obj/docking_port/stationary/escape_pod{
+	dir = 8
 	},
 /turf/open/floor/plating/snowed/icemoon,
 /area/icemoon/surface/outdoors/nospawn)
@@ -1639,7 +1634,7 @@ ej
 ej
 ej
 ej
-ej
+HQ
 ej
 ej
 ej
@@ -1671,7 +1666,7 @@ ej
 ej
 ej
 ej
-HQ
+ej
 ej
 ej
 ej
diff --git a/code/__DEFINES/traits.dm b/code/__DEFINES/traits.dm
index 16c0a907ba2..ed1458617b3 100644
--- a/code/__DEFINES/traits.dm
+++ b/code/__DEFINES/traits.dm
@@ -922,6 +922,8 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
 #define STATION_TRAIT_PDA_GLITCHED "station_trait_pda_glitched"
 #define STATION_TRAIT_BOTS_GLITCHED "station_trait_bot_glitch"
 #define STATION_TRAIT_CYBERNETIC_REVOLUTION "station_trait_cybernetic_revolution"
+#define STATION_TRAIT_BIGGER_PODS "station_trait_bigger_pods"
+#define STATION_TRAIT_SMALLER_PODS "station_trait_smaller_pods"
 
 ///From the market_crash event
 #define MARKET_CRASH_EVENT_TRAIT "crashed_market_event"
diff --git a/code/datums/shuttles.dm b/code/datums/shuttles.dm
index da616164e08..ad81a784951 100644
--- a/code/datums/shuttles.dm
+++ b/code/datums/shuttles.dm
@@ -668,16 +668,22 @@
 	suffix = "small"
 	name = "auxilliary base (Small)"
 
-/* SKYRAT EDIT REMOVAL
 /datum/map_template/shuttle/escape_pod/default
 	suffix = "default"
 	name = "escape pod (Default)"
-*/
 
 /datum/map_template/shuttle/escape_pod/large
 	suffix = "large"
 	name = "escape pod (Large)"
 
+/datum/map_template/shuttle/escape_pod/luxury
+	suffix = "luxury"
+	name = "escape pod (Luxury)"
+
+/datum/map_template/shuttle/escape_pod/cramped
+	suffix = "cramped"
+	name = "escape pod (Cramped)"
+
 /datum/map_template/shuttle/assault_pod/default
 	suffix = "default"
 	name = "assault pod (Default)"
diff --git a/code/datums/station_traits/negative_traits.dm b/code/datums/station_traits/negative_traits.dm
index fdcffd5fb69..86c1b409007 100644
--- a/code/datums/station_traits/negative_traits.dm
+++ b/code/datums/station_traits/negative_traits.dm
@@ -282,7 +282,16 @@
 	report_message = "A radioactive stormfront is passing through your station's system. Expect an increased likelihood of radiation storms passing over your station, as well the potential for multiple radiation storms to occur during your shift."
 	trait_type = STATION_TRAIT_NEGATIVE
 	trait_flags = NONE
-	weight = 0
+	weight = 0 //SKYRAT EDIT CHANGE - ORIGINAL: weight = 0
 	event_control_path = /datum/round_event_control/radiation_storm
 	weight_multiplier = 1.5
-	max_occurrences_modifier = 0
+	max_occurrences_modifier = 0 //SKYRAT EDIT CHANGE - ORIGINAL: max_occurrences_modifier = 0
+
+/datum/station_trait/cramped_escape_pods
+	name = "Cramped Escape Pods"
+	trait_type = STATION_TRAIT_NEGATIVE
+	weight = 5
+	show_in_report = TRUE
+	report_message = "Due to budget cuts, we have downsized your escape pods."
+	trait_to_give = STATION_TRAIT_SMALLER_PODS
+	blacklist = list(/datum/station_trait/luxury_escape_pods)
diff --git a/code/datums/station_traits/positive_traits.dm b/code/datums/station_traits/positive_traits.dm
index 685145eafbf..12c4f102b15 100644
--- a/code/datums/station_traits/positive_traits.dm
+++ b/code/datums/station_traits/positive_traits.dm
@@ -349,3 +349,12 @@
 		return
 	var/obj/item/organ/internal/cybernetic = new cybernetic_type()
 	cybernetic.Insert(spawned, special = TRUE, drop_if_replaced = FALSE)
+
+/datum/station_trait/luxury_escape_pods
+	name = "Luxury Escape Pods"
+	trait_type = STATION_TRAIT_POSITIVE
+	weight = 5
+	show_in_report = TRUE
+	report_message = "Due to good performance, we've provided your station with luxury escape pods."
+	trait_to_give = STATION_TRAIT_BIGGER_PODS
+	blacklist = list(/datum/station_trait/cramped_escape_pods)
diff --git a/code/modules/shuttle/shuttle.dm b/code/modules/shuttle/shuttle.dm
index da484b481c2..c94c5996c0a 100644
--- a/code/modules/shuttle/shuttle.dm
+++ b/code/modules/shuttle/shuttle.dm
@@ -275,6 +275,27 @@
 /obj/docking_port/stationary/get_docked()
 	. = locate(/obj/docking_port/mobile) in loc
 
+/// Subtype for escape pod ports so that we can give them trait behaviour
+/obj/docking_port/stationary/escape_pod
+	name = "escape pod loader"
+	height = 5
+	width = 3
+	dwidth = 1
+	roundstart_template = /datum/map_template/shuttle/escape_pod/default
+	/// Set to true if you have a snowflake escape pod dock which needs to always have the normal pod or some other one
+	var/enforce_specific_pod = FALSE
+
+/obj/docking_port/stationary/escape_pod/Initialize(mapload)
+	. = ..()
+	if (enforce_specific_pod)
+		return
+
+	if (HAS_TRAIT(SSstation, STATION_TRAIT_SMALLER_PODS))
+		roundstart_template = /datum/map_template/shuttle/escape_pod/cramped
+		return
+	if (HAS_TRAIT(SSstation, STATION_TRAIT_BIGGER_PODS))
+		roundstart_template = /datum/map_template/shuttle/escape_pod/luxury
+
 /obj/docking_port/stationary/transit
 	name = "In Transit"
 	var/datum/turf_reservation/reserved_area
diff --git a/modular_skyrat/modules/advanced_shuttles/code/shuttles.dm b/modular_skyrat/modules/advanced_shuttles/code/shuttles.dm
index 4210865c993..fdf51b89933 100644
--- a/modular_skyrat/modules/advanced_shuttles/code/shuttles.dm
+++ b/modular_skyrat/modules/advanced_shuttles/code/shuttles.dm
@@ -56,12 +56,6 @@
 	suffix = "skyrat"
 	who_can_purchase = null
 
-/datum/map_template/shuttle/escape_pod/default
-	name = "escape pod (Default)"
-	prefix = "_maps/shuttles/skyrat/"
-	port_id = "escape_pod"
-	suffix = "default_skyrat"
-
 /datum/map_template/shuttle/emergency/default
 	prefix = "_maps/shuttles/skyrat/"
 	suffix = "skyrat"
diff --git a/tools/UpdatePaths/Scripts/72076_escapepodports.txt b/tools/UpdatePaths/Scripts/72076_escapepodports.txt
new file mode 100644
index 00000000000..81c6ca7c146
--- /dev/null
+++ b/tools/UpdatePaths/Scripts/72076_escapepodports.txt
@@ -0,0 +1 @@
+/obj/docking_port/stationary{roundstart_template=/datum/map_template/shuttle/escape_pod/default} : /obj/docking_port/stationary/escape_pod{dir=@OLD}