diff --git a/_maps/shuttles/ferry_fancy.dmm b/_maps/shuttles/ferry_fancy.dmm
index d8f9e7cdf..0d53b2cd0 100644
--- a/_maps/shuttles/ferry_fancy.dmm
+++ b/_maps/shuttles/ferry_fancy.dmm
@@ -1,196 +1,689 @@
 //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
-"a" = (
+"bx" = (
+/turf/closed/wall/mineral/titanium/custom/ferry{
+	icon_state = "ferry14"
+	},
+/area/shuttle/transport)
+"bF" = (
+/obj/structure/window/shuttle/custom/ferry{
+	icon_state = "ferry31"
+	},
 /turf/template_noop,
-/area/template_noop)
-"b" = (
-/turf/closed/wall/mineral/titanium,
 /area/shuttle/transport)
-"c" = (
-/obj/effect/spawner/structure/window/shuttle,
-/turf/open/floor/plating,
-/area/shuttle/transport)
-"d" = (
-/obj/machinery/door/airlock/external,
-/obj/structure/fans/tiny,
-/turf/open/floor/pod/dark,
-/area/shuttle/transport)
-"e" = (
-/obj/structure/shuttle/engine/propulsion/left{
-	dir = 8
+"bY" = (
+/obj/effect/turf_decal/loading_area{
+	color = "#55391A";
+	dir = 4;
+	icon_state = "siding_wood_corner";
+	name = "wood corner"
 	},
-/turf/open/floor/plating/airless,
-/area/shuttle/transport)
-"f" = (
-/obj/structure/shuttle/engine/heater{
-	dir = 8
-	},
-/obj/structure/window/reinforced,
-/turf/open/floor/plating/airless,
-/area/shuttle/transport)
-"g" = (
-/obj/structure/chair/comfy/shuttle,
-/turf/open/floor/pod/dark,
-/area/shuttle/transport)
-"h" = (
-/obj/machinery/light{
+/obj/structure/railing{
 	dir = 1
 	},
-/turf/open/floor/pod/light,
-/area/shuttle/transport)
-"i" = (
-/turf/open/floor/pod/light,
-/area/shuttle/transport)
-"j" = (
-/obj/structure/shuttle/engine/heater{
-	dir = 8
+/turf/open/floor/plasteel/dark{
+	dir = 1;
+	icon_state = "darkfull_plate"
 	},
-/obj/structure/window/reinforced{
+/area/shuttle/transport)
+"cB" = (
+/turf/template_noop,
+/area/shuttle/transport)
+"fd" = (
+/turf/closed/wall/mineral/titanium/custom/ferry{
+	icon_state = "ferry12"
+	},
+/area/shuttle/transport)
+"hh" = (
+/turf/closed/wall/mineral/titanium/custom/ferry{
+	icon_state = "ferry10"
+	},
+/area/shuttle/transport)
+"hC" = (
+/turf/closed/wall/mineral/titanium/custom/ferry{
+	icon_state = "ferry26"
+	},
+/area/shuttle/transport)
+"hF" = (
+/obj/structure/chair/comfy/shuttle,
+/obj/structure/window/reinforced/tinted{
 	dir = 4
 	},
-/turf/open/floor/plating/airless,
+/obj/effect/turf_decal/loading_area{
+	dir = 5;
+	icon_state = "steel_panel";
+	name = "steel pannel"
+	},
+/obj/effect/turf_decal/tile/neutral{
+	dir = 6
+	},
+/obj/effect/turf_decal/loading_area{
+	color = "#55391A";
+	dir = 4;
+	icon_state = "siding_wood_line";
+	name = "wood"
+	},
+/obj/effect/turf_decal/loading_area{
+	dir = 1;
+	icon_state = "steel_decals_central5";
+	name = "maintenance hatch"
+	},
+/turf/open/floor/plasteel/dark,
 /area/shuttle/transport)
-"k" = (
-/obj/machinery/light/small,
-/turf/open/floor/pod/light,
+"hP" = (
+/turf/closed/wall/mineral/titanium/custom/ferry{
+	icon_state = "ferry6"
+	},
 /area/shuttle/transport)
-"l" = (
-/obj/machinery/door/airlock/titanium,
-/turf/open/floor/pod/light,
+"iS" = (
+/turf/closed/wall/mineral/titanium/custom/ferry{
+	icon_state = "ferry5"
+	},
 /area/shuttle/transport)
-"m" = (
-/obj/machinery/computer/shuttle/ferry/request{
+"jH" = (
+/obj/structure/window/shuttle/custom/ferry{
+	icon_state = "ferry36"
+	},
+/turf/template_noop,
+/area/shuttle/transport)
+"jI" = (
+/turf/closed/wall/mineral/titanium/custom/ferry{
+	icon_state = "ferry24"
+	},
+/area/shuttle/transport)
+"li" = (
+/obj/machinery/door/airlock/shuttle{
+	name = "ferry storage";
+	req_access_txt = "101"
+	},
+/obj/effect/turf_decal/loading_area{
+	color = "#55391A";
+	dir = 1;
+	icon_state = "siding_wood_corner";
+	name = "wood corner"
+	},
+/obj/effect/turf_decal/loading_area{
+	dir = 4;
+	icon_state = "steel_decals_central5";
+	name = "maintenance hatch"
+	},
+/obj/effect/turf_decal/loading_area{
+	dir = 8;
+	icon_state = "steel_decals_central5";
+	name = "maintenance hatch"
+	},
+/turf/open/floor/plasteel/dark{
+	icon_state = "darkfull_whole_alt"
+	},
+/area/shuttle/transport)
+"lr" = (
+/obj/effect/turf_decal/loading_area{
+	color = "#55391A";
+	dir = 4;
+	icon_state = "siding_wood_line";
+	name = "wood"
+	},
+/obj/structure/railing{
+	dir = 4
+	},
+/turf/open/floor/mineral/titanium,
+/area/shuttle/transport)
+"mn" = (
+/obj/structure/chair/comfy/shuttle{
 	dir = 8
 	},
-/turf/open/floor/pod/dark,
+/obj/structure/window/reinforced/tinted{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/neutral{
+	dir = 9
+	},
+/obj/effect/turf_decal/loading_area{
+	icon_state = "steel_decals_central5";
+	name = "maintenance hatch"
+	},
+/turf/open/floor/mineral/titanium,
 /area/shuttle/transport)
-"n" = (
-/obj/machinery/door/airlock/titanium,
+"mw" = (
+/obj/structure/window/shuttle/custom/ferry{
+	icon_state = "ferry35"
+	},
+/turf/template_noop,
+/area/shuttle/transport)
+"mA" = (
+/turf/closed/wall/mineral/titanium/custom/ferry{
+	icon_state = "ferry15"
+	},
+/area/shuttle/transport)
+"oc" = (
+/turf/closed/wall/mineral/titanium/custom/ferry{
+	icon_state = "ferry40"
+	},
+/area/shuttle/transport)
+"oN" = (
+/turf/template_noop,
+/area/template_noop)
+"oZ" = (
+/turf/closed/wall/mineral/titanium/custom/ferry{
+	icon_state = "ferry19"
+	},
+/area/shuttle/transport)
+"pc" = (
+/obj/structure/window/shuttle/custom/ferry{
+	icon_state = "ferry3"
+	},
+/turf/template_noop,
+/area/shuttle/transport)
+"po" = (
+/turf/closed/wall/mineral/titanium/custom/ferry{
+	icon_state = "ferry20"
+	},
+/area/shuttle/transport)
+"qw" = (
+/turf/closed/wall/mineral/titanium/custom/ferry{
+	icon_state = "ferry27"
+	},
+/area/shuttle/transport)
+"qx" = (
+/turf/closed/wall/mineral/titanium/custom/ferry{
+	icon_state = "ferry39"
+	},
+/area/shuttle/transport)
+"qC" = (
+/obj/effect/turf_decal/loading_area{
+	dir = 1;
+	icon_state = "trim";
+	name = "trim"
+	},
+/obj/effect/turf_decal/loading_area{
+	color = "#55391A";
+	icon_state = "siding_wood_corner";
+	name = "wood corner"
+	},
+/turf/open/floor/mineral/titanium,
+/area/shuttle/transport)
+"qE" = (
+/obj/structure/window/shuttle/custom/ferry{
+	icon_state = "ferry4"
+	},
+/turf/template_noop,
+/area/shuttle/transport)
+"qF" = (
+/turf/closed/wall/mineral/titanium/custom/ferry{
+	icon_state = "ferry11"
+	},
+/area/shuttle/transport)
+"ry" = (
+/obj/structure/window/shuttle/custom/ferry{
+	icon_state = "ferry0"
+	},
+/turf/template_noop,
+/area/shuttle/transport)
+"rK" = (
+/obj/effect/turf_decal/arrows/white{
+	dir = 8
+	},
+/obj/effect/turf_decal/loading_area{
+	color = "#55391A";
+	dir = 1;
+	icon_state = "siding_wood_line";
+	name = "wood"
+	},
+/turf/open/floor/plasteel/dark{
+	icon_state = "darkfull_whole"
+	},
+/area/shuttle/transport)
+"rU" = (
+/obj/effect/turf_decal/loading_area{
+	icon_state = "trim";
+	name = "trim"
+	},
+/obj/effect/turf_decal/loading_area{
+	color = "#55391A";
+	dir = 4;
+	icon_state = "siding_wood_corner";
+	name = "wood corner"
+	},
+/turf/open/floor/mineral/titanium,
+/area/shuttle/transport)
+"uw" = (
+/turf/closed/wall/mineral/titanium/custom/ferry{
+	icon_state = "ferry13"
+	},
+/area/shuttle/transport)
+"uV" = (
+/obj/effect/turf_decal/tile/neutral{
+	dir = 9
+	},
+/obj/effect/turf_decal/loading_area{
+	icon_state = "half_stairs";
+	name = "steps"
+	},
+/obj/effect/turf_decal/loading_area{
+	icon_state = "steel_decals_central5";
+	name = "maintenance hatch"
+	},
+/turf/open/floor/mineral/titanium,
+/area/shuttle/transport)
+"vp" = (
+/obj/effect/turf_decal/loading_area{
+	dir = 1;
+	icon_state = "trim";
+	name = "trim"
+	},
+/obj/effect/turf_decal/loading_area{
+	color = "#55391A";
+	icon_state = "siding_wood_line";
+	name = "wood"
+	},
+/obj/structure/railing,
+/turf/open/floor/mineral/titanium,
+/area/shuttle/transport)
+"vy" = (
+/obj/structure/window/shuttle/custom/ferry{
+	icon_state = "ferry33"
+	},
+/turf/template_noop,
+/area/shuttle/transport)
+"wO" = (
+/obj/structure/railing{
+	dir = 1
+	},
+/turf/open/floor/plasteel/dark{
+	dir = 1;
+	icon_state = "darkfull_plate"
+	},
+/area/shuttle/transport)
+"wR" = (
+/turf/closed/wall/mineral/titanium/custom/ferry{
+	icon_state = "ferry25"
+	},
+/area/shuttle/transport)
+"xZ" = (
+/obj/structure/window/shuttle/custom/ferry{
+	icon_state = "ferry21"
+	},
+/turf/template_noop,
+/area/shuttle/transport)
+"yR" = (
+/obj/structure/window/shuttle/custom/ferry{
+	icon_state = "ferry2"
+	},
+/turf/template_noop,
+/area/shuttle/transport)
+"Ax" = (
+/obj/structure/window/shuttle/custom/ferry{
+	icon_state = "ferry1"
+	},
+/turf/template_noop,
+/area/shuttle/transport)
+"AD" = (
+/turf/closed/wall/mineral/titanium/custom/ferry{
+	icon_state = "ferry7"
+	},
+/area/shuttle/transport)
+"AS" = (
+/obj/effect/turf_decal/loading_area{
+	icon_state = "half_stairs";
+	name = "steps"
+	},
+/turf/open/floor/plasteel/dark{
+	icon_state = "darkfull_whole"
+	},
+/area/shuttle/transport)
+"Fr" = (
 /obj/docking_port/mobile{
-	dir = 8;
+	dir = 4;
 	dwidth = 2;
 	height = 13;
 	id = "ferry";
 	name = "ferry shuttle";
-	port_direction = 1;
-	preferred_direction = 4;
-	width = 5
+	preferred_direction = 8;
+	width = 7
+	},
+/obj/machinery/door/airlock/shuttle{
+	name = "ferry airlock";
+	req_access_txt = "101"
+	},
+/obj/structure/fans/tiny,
+/obj/effect/turf_decal/loading_area{
+	color = "#55391A";
+	dir = 4;
+	icon_state = "siding_wood_corner";
+	name = "wood corner"
+	},
+/obj/effect/turf_decal/loading_area{
+	dir = 8;
+	icon_state = "steel_decals_central5";
+	name = "maintenance hatch"
+	},
+/obj/effect/turf_decal/loading_area{
+	dir = 4;
+	icon_state = "steel_decals_central5";
+	name = "maintenance hatch"
+	},
+/turf/open/floor/plasteel/dark{
+	icon_state = "darkfull_whole_alt"
 	},
-/turf/open/floor/pod/light,
 /area/shuttle/transport)
-"o" = (
-/obj/structure/shuttle/engine/heater{
-	dir = 8
+"FQ" = (
+/obj/structure/flora/crystal/medium/growth{
+	icon_state = "crystalgrowth2"
 	},
-/obj/structure/window/reinforced{
+/turf/open/floor/plating/asteroid/layenia/garden,
+/area/shuttle/transport)
+"GK" = (
+/turf/closed/wall/mineral/titanium/custom/ferry{
+	icon_state = "ferry18"
+	},
+/area/shuttle/transport)
+"GN" = (
+/turf/closed/wall/mineral/titanium/custom/ferry{
+	icon_state = "ferry17"
+	},
+/area/shuttle/transport)
+"IB" = (
+/obj/structure/window/shuttle/custom/ferry{
+	icon_state = "ferry29"
+	},
+/turf/template_noop,
+/area/shuttle/transport)
+"Je" = (
+/turf/closed/wall/mineral/titanium/custom/ferry{
+	icon_state = "ferry22"
+	},
+/area/shuttle/transport)
+"MI" = (
+/obj/structure/chair/comfy/shuttle,
+/obj/effect/turf_decal/loading_area{
+	dir = 5;
+	icon_state = "steel_panel";
+	name = "steel pannel"
+	},
+/obj/effect/turf_decal/tile/neutral{
+	dir = 6
+	},
+/obj/effect/turf_decal/loading_area{
 	dir = 1;
-	pixel_y = 1
+	icon_state = "steel_decals_central5";
+	name = "maintenance hatch"
 	},
-/turf/open/floor/plating/airless,
+/turf/open/floor/plasteel/dark,
 /area/shuttle/transport)
-"p" = (
-/obj/structure/chair/comfy/shuttle{
+"MY" = (
+/turf/closed/wall/mineral/titanium/custom/ferry{
+	icon_state = "ferry16"
+	},
+/area/shuttle/transport)
+"Na" = (
+/turf/closed/wall/mineral/titanium/custom/ferry{
+	icon_state = "ferry28"
+	},
+/area/shuttle/transport)
+"Qd" = (
+/turf/closed/wall/mineral/titanium/custom/ferry{
+	icon_state = "ferry23"
+	},
+/area/shuttle/transport)
+"Qx" = (
+/obj/structure/window/shuttle/custom/ferry{
+	icon_state = "ferry34"
+	},
+/turf/template_noop,
+/area/shuttle/transport)
+"Rp" = (
+/obj/effect/turf_decal/loading_area{
+	color = "#55391A";
+	dir = 1;
+	icon_state = "siding_wood_corner";
+	name = "wood corner"
+	},
+/obj/structure/railing{
 	dir = 1
 	},
-/turf/open/floor/pod/dark,
+/turf/open/floor/plasteel/dark{
+	dir = 1;
+	icon_state = "darkfull_plate"
+	},
 /area/shuttle/transport)
-"q" = (
-/obj/machinery/light,
-/turf/open/floor/pod/light,
+"Rt" = (
+/turf/closed/wall/mineral/titanium/custom/ferry{
+	icon_state = "ferry9"
+	},
 /area/shuttle/transport)
-"r" = (
-/obj/machinery/door/airlock/external,
-/obj/structure/fans/tiny,
-/turf/open/floor/pod/light,
+"SB" = (
+/obj/effect/turf_decal/arrows/white{
+	dir = 8
+	},
+/obj/effect/turf_decal/loading_area{
+	color = "#55391A";
+	dir = 1;
+	icon_state = "siding_wood_line";
+	name = "wood"
+	},
+/turf/open/floor/plasteel/dark{
+	dir = 8;
+	icon_state = "darkfull_whole"
+	},
+/area/shuttle/transport)
+"Tb" = (
+/obj/structure/window/shuttle/custom/ferry{
+	icon_state = "ferry41"
+	},
+/turf/template_noop,
+/area/shuttle/transport)
+"Tr" = (
+/obj/effect/turf_decal/loading_area{
+	icon_state = "trim";
+	name = "trim"
+	},
+/obj/effect/turf_decal/loading_area{
+	color = "#55391A";
+	dir = 1;
+	icon_state = "siding_wood_line";
+	name = "wood"
+	},
+/obj/structure/railing{
+	dir = 1
+	},
+/turf/open/floor/mineral/titanium,
+/area/shuttle/transport)
+"TT" = (
+/turf/closed/wall/mineral/titanium/custom/ferry{
+	icon_state = "ferry37"
+	},
+/area/shuttle/transport)
+"Uu" = (
+/obj/structure/chair/comfy/shuttle,
+/obj/structure/window/reinforced/tinted{
+	dir = 8
+	},
+/obj/effect/turf_decal/loading_area{
+	dir = 5;
+	icon_state = "steel_panel";
+	name = "steel pannel"
+	},
+/obj/effect/turf_decal/tile/neutral{
+	dir = 6
+	},
+/obj/effect/turf_decal/loading_area{
+	color = "#55391A";
+	dir = 8;
+	icon_state = "siding_wood_line";
+	name = "wood"
+	},
+/obj/effect/turf_decal/loading_area{
+	dir = 1;
+	icon_state = "steel_decals_central5";
+	name = "maintenance hatch"
+	},
+/turf/open/floor/plasteel/dark,
+/area/shuttle/transport)
+"UV" = (
+/turf/closed/wall/mineral/titanium/custom/ferry{
+	icon_state = "ferry38"
+	},
+/area/shuttle/transport)
+"Vq" = (
+/obj/structure/window/shuttle/custom/ferry{
+	icon_state = "ferry30"
+	},
+/turf/template_noop,
+/area/shuttle/transport)
+"VV" = (
+/obj/machinery/computer/shuttle/ferry/request{
+	dir = 4
+	},
+/obj/structure/window/reinforced/tinted{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/neutral{
+	dir = 9
+	},
+/obj/effect/turf_decal/loading_area{
+	dir = 8;
+	icon_state = "steel_decals_central5";
+	name = "maintenance hatch"
+	},
+/obj/effect/turf_decal/loading_area{
+	icon_state = "steel_decals_central5";
+	name = "maintenance hatch"
+	},
+/turf/open/floor/mineral/titanium,
+/area/shuttle/transport)
+"WS" = (
+/obj/structure/flora/ausbushes/brflowers,
+/obj/structure/window/reinforced/fulltile{
+	max_integrity = 5000;
+	name = "hardened window";
+	obj_integrity = 5000
+	},
+/turf/open/floor/grass,
+/area/shuttle/transport)
+"Yi" = (
+/turf/closed/wall/mineral/titanium/custom/ferry{
+	icon_state = "ferry32"
+	},
+/area/shuttle/transport)
+"ZJ" = (
+/turf/closed/wall/mineral/titanium/custom/ferry{
+	icon_state = "ferry8"
+	},
 /area/shuttle/transport)
 
 (1,1,1) = {"
-a
-a
-e
-a
-a
+oN
+qF
+bx
+Fr
+wR
+oN
+oN
 "}
 (2,1,1) = {"
-a
-e
-j
-e
-a
+oN
+hh
+WS
+SB
+jI
+oN
+oN
 "}
 (3,1,1) = {"
-a
-f
-i
-o
-a
+oN
+Rt
+Uu
+Rp
+Qd
+oN
+oN
 "}
 (4,1,1) = {"
-a
-b
-k
-b
-a
+oN
+ZJ
+MI
+wO
+Je
+bF
+oN
 "}
 (5,1,1) = {"
-b
-b
-l
-b
-b
+oN
+AD
+MI
+AS
+xZ
+Vq
+oN
 "}
 (6,1,1) = {"
-c
-g
-i
-p
-c
+oN
+hP
+MI
+wO
+VV
+IB
+cB
 "}
 (7,1,1) = {"
-b
-g
-i
-p
-b
+pc
+iS
+hF
+bY
+mn
+Na
+jH
 "}
 (8,1,1) = {"
-b
-h
-i
-i
-b
+yR
+fd
+WS
+rK
+uV
+Yi
+mw
 "}
 (9,1,1) = {"
-d
-i
-m
-i
-r
+Ax
+GK
+uw
+li
+po
+oc
+Qx
 "}
 (10,1,1) = {"
-b
-i
-i
-q
-b
+ry
+GN
+qC
+lr
+rU
+qx
+vy
 "}
 (11,1,1) = {"
-b
-g
-i
-p
-b
+qE
+MY
+vp
+FQ
+Tr
+UV
+Tb
 "}
 (12,1,1) = {"
-c
-g
-i
-p
-c
+cB
+mA
+oZ
+hC
+qw
+TT
+cB
 "}
 (13,1,1) = {"
-b
-c
-n
-c
-b
+oN
+oN
+oN
+oN
+oN
+oN
+oN
 "}
diff --git a/hyperstation/code/game/turfs/simulated/wall/mineral_walls.dm b/hyperstation/code/game/turfs/simulated/wall/mineral_walls.dm
new file mode 100644
index 000000000..c756305bf
--- /dev/null
+++ b/hyperstation/code/game/turfs/simulated/wall/mineral_walls.dm
@@ -0,0 +1,34 @@
+/turf/closed/wall/mineral/titanium/custom //For spicy custom shuttles
+	name = "whoops!"
+	desc = "Scream at Dahl please!"
+	icon = 'hyperstation/icons/turf/walls/customshuttles.dmi'
+	icon_state = "amogus"
+	explosion_block = 10
+	smooth = SMOOTH_FALSE
+
+/obj/structure/window/shuttle/custom //For custom shuttle windows and parts that are small
+	name = "whoops!"
+	desc = "Scream at Dahl please!"
+	icon = 'hyperstation/icons/turf/walls/customshuttles.dmi'
+	icon_state = "amogus"
+	dir = FULLTILE_WINDOW_DIR
+	max_integrity = 100
+	wtype = "shuttle"
+	fulltile = TRUE
+	flags_1 = PREVENT_CLICK_UNDER_1
+	reinf = TRUE
+	heat_resistance = 1600
+	armor = list("melee" = 50, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 50, "bio" = 100, "rad" = 100, "fire" = 80, "acid" = 100)
+	smooth = SMOOTH_FALSE
+	explosion_block = 10
+	anchored = TRUE
+
+/turf/closed/wall/mineral/titanium/custom/ferry
+	name = "\improper ferry wall"
+	desc = "A low tech hull for Layenia flight."
+	icon_state = "ferry"
+
+/obj/structure/window/shuttle/custom/ferry
+	name = "\improper ferry wall"
+	desc = "A low tech hull for Layenia flight."
+	icon_state = "ferry"
diff --git a/hyperstation/icons/turf/walls/customshuttles.dmi b/hyperstation/icons/turf/walls/customshuttles.dmi
new file mode 100644
index 000000000..d03e6652b
Binary files /dev/null and b/hyperstation/icons/turf/walls/customshuttles.dmi differ
diff --git a/tgstation.dme b/tgstation.dme
index 3a29143fa..cb5a60d4d 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -3107,6 +3107,7 @@
 #include "hyperstation\code\game\objects\structures\bench.dm"
 #include "hyperstation\code\game\objects\structures\ghost_role_spawners.dm"
 #include "hyperstation\code\game\objects\structures\sauna_oven.dm"
+#include "hyperstation\code\game\turfs\simulated\wall\mineral_walls.dm"
 #include "hyperstation\code\gamemode\traitor_lewd.dm"
 #include "hyperstation\code\gamemode\traitor_thief.dm"
 #include "hyperstation\code\gamemode\werewolf\werewolf.dm"