diff --git a/_maps/map_files/Delta/delta.dmm b/_maps/map_files/Delta/delta.dmm
index bac17c5a2ad..447889d17a1 100644
--- a/_maps/map_files/Delta/delta.dmm
+++ b/_maps/map_files/Delta/delta.dmm
@@ -208,7 +208,7 @@
 /turf/simulated/shuttle/plating,
 /area/shuttle/abandoned)
 "aaC" = (
-/obj/structure/chair{
+/obj/structure/chair/comfy/shuttle{
 	dir = 1
 	},
 /turf/simulated/shuttle/floor{
@@ -383,10 +383,10 @@
 	},
 /area/shuttle/abandoned)
 "abb" = (
-/obj/structure/chair{
+/obj/effect/decal/remains/human,
+/obj/structure/chair/comfy/shuttle{
 	dir = 8
 	},
-/obj/effect/decal/remains/human,
 /turf/simulated/shuttle/floor{
 	icon_state = "floor3"
 	},
@@ -598,13 +598,13 @@
 /area/shuttle/abandoned)
 "abx" = (
 /obj/item/shard,
-/obj/structure/chair,
+/obj/structure/chair/comfy/shuttle,
 /turf/simulated/shuttle/floor{
 	icon_state = "floor3"
 	},
 /area/shuttle/abandoned)
 "aby" = (
-/obj/structure/chair,
+/obj/structure/chair/comfy/shuttle,
 /turf/simulated/shuttle/floor{
 	icon_state = "floor3"
 	},
@@ -667,8 +667,8 @@
 	icon_state = "1-2";
 	pixel_y = 0
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/maintenance/auxsolarstarboard)
 "abH" = (
 /obj/structure/computerframe{
@@ -728,7 +728,7 @@
 	},
 /area/shuttle/syndicate)
 "abO" = (
-/obj/structure/chair/comfy/black{
+/obj/structure/chair/comfy/shuttle{
 	dir = 1
 	},
 /turf/simulated/shuttle/floor{
@@ -859,8 +859,8 @@
 	icon_state = "2-4";
 	tag = ""
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/maintenance/auxsolarstarboard)
 "acf" = (
 /obj/structure/cable{
@@ -880,29 +880,29 @@
 	d2 = 8;
 	icon_state = "4-8"
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/maintenance/auxsolarstarboard)
 "acg" = (
 /obj/structure/cable{
 	d2 = 8;
 	icon_state = "0-8"
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/maintenance/auxsolarstarboard)
 "ach" = (
 /obj/structure/cable,
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/maintenance/auxsolarstarboard)
 "aci" = (
 /obj/structure/cable{
 	icon_state = "0-4";
 	d2 = 4
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/maintenance/auxsolarstarboard)
 "acj" = (
 /obj/structure/cable{
@@ -921,8 +921,8 @@
 	d2 = 8;
 	icon_state = "4-8"
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/maintenance/auxsolarstarboard)
 "ack" = (
 /obj/structure/spacepoddoor,
@@ -967,8 +967,8 @@
 	},
 /area/maintenance/auxsolarstarboard)
 "acp" = (
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/maintenance/auxsolarstarboard)
 "acq" = (
 /obj/structure/table,
@@ -986,7 +986,7 @@
 	},
 /area/shuttle/abandoned)
 "acs" = (
-/obj/structure/chair{
+/obj/structure/chair/comfy/shuttle{
 	dir = 4
 	},
 /turf/simulated/shuttle/floor{
@@ -994,7 +994,7 @@
 	},
 /area/shuttle/syndicate)
 "act" = (
-/obj/structure/chair{
+/obj/structure/chair/comfy/shuttle{
 	dir = 8
 	},
 /turf/simulated/shuttle/floor{
@@ -1081,20 +1081,20 @@
 	d2 = 8;
 	icon_state = "0-8"
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/space/nearstation)
 "acF" = (
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/space/nearstation)
 "acG" = (
 /obj/structure/cable{
 	icon_state = "0-4";
 	d2 = 4
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/space/nearstation)
 "acH" = (
 /obj/structure/chair/stool,
@@ -1502,9 +1502,6 @@
 	},
 /area/shuttle/pod_1)
 "adx" = (
-/obj/structure/chair{
-	dir = 1
-	},
 /obj/machinery/status_display{
 	density = 0;
 	layer = 4;
@@ -1515,6 +1512,9 @@
 	dir = 4;
 	icon_state = "tube1"
 	},
+/obj/structure/chair/comfy/shuttle{
+	dir = 1
+	},
 /turf/simulated/shuttle/floor,
 /area/shuttle/pod_1)
 "ady" = (
@@ -1524,9 +1524,6 @@
 	},
 /area/shuttle/pod_2)
 "adz" = (
-/obj/structure/chair{
-	dir = 1
-	},
 /obj/machinery/status_display{
 	density = 0;
 	layer = 4;
@@ -1537,6 +1534,9 @@
 	dir = 4;
 	icon_state = "tube1"
 	},
+/obj/structure/chair/comfy/shuttle{
+	dir = 1
+	},
 /turf/simulated/shuttle/floor,
 /area/shuttle/pod_2)
 "adA" = (
@@ -1663,25 +1663,25 @@
 /turf/simulated/wall/r_wall,
 /area/hallway/secondary/entry)
 "adO" = (
-/obj/structure/chair{
-	dir = 1
-	},
 /obj/item/radio/intercom{
 	dir = 4;
 	name = "station intercom (General)";
 	pixel_x = 28
 	},
+/obj/structure/chair/comfy/shuttle{
+	dir = 1
+	},
 /turf/simulated/shuttle/floor,
 /area/shuttle/pod_1)
 "adP" = (
-/obj/structure/chair{
-	dir = 1
-	},
 /obj/item/radio/intercom{
 	dir = 4;
 	name = "station intercom (General)";
 	pixel_x = 28
 	},
+/obj/structure/chair/comfy/shuttle{
+	dir = 1
+	},
 /turf/simulated/shuttle/floor,
 /area/shuttle/pod_2)
 "adQ" = (
@@ -1775,8 +1775,8 @@
 	pixel_y = -25;
 	req_access_txt = "10;13"
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/maintenance/auxsolarstarboard)
 "aed" = (
 /obj/docking_port/mobile/pod{
@@ -3034,7 +3034,7 @@
 	},
 /area/shuttle/administration)
 "agw" = (
-/obj/structure/chair/comfy/black,
+/obj/structure/chair/comfy/shuttle,
 /turf/simulated/shuttle/floor{
 	icon_state = "floor4"
 	},
@@ -3382,13 +3382,13 @@
 	},
 /area/shuttle/administration)
 "ahn" = (
-/obj/structure/chair{
-	dir = 4
-	},
 /obj/structure/window/plasmareinforced{
 	color = "#d70000";
 	dir = 1
 	},
+/obj/structure/chair/comfy/shuttle{
+	dir = 4
+	},
 /turf/simulated/shuttle/floor{
 	icon_state = "floor4"
 	},
@@ -3615,7 +3615,7 @@
 /turf/simulated/floor/engine/vacuum,
 /area/engine/mechanic_workshop/hanger)
 "ahN" = (
-/obj/structure/chair{
+/obj/structure/chair/comfy/shuttle{
 	dir = 4
 	},
 /turf/simulated/shuttle/floor{
@@ -3737,7 +3737,7 @@
 	},
 /area/security/podbay)
 "aic" = (
-/obj/structure/chair{
+/obj/structure/chair/comfy/shuttle{
 	dir = 1
 	},
 /turf/simulated/shuttle/floor{
@@ -3745,10 +3745,10 @@
 	},
 /area/shuttle/administration)
 "aid" = (
-/obj/structure/chair{
+/obj/machinery/light/spot,
+/obj/structure/chair/comfy/shuttle{
 	dir = 1
 	},
-/obj/machinery/light/spot,
 /turf/simulated/shuttle/floor{
 	icon_state = "floor4"
 	},
@@ -3798,7 +3798,7 @@
 	icon_state = "tube1";
 	dir = 4
 	},
-/obj/structure/chair,
+/obj/structure/chair/comfy/shuttle,
 /turf/simulated/shuttle/floor,
 /area/shuttle/transport)
 "aik" = (
@@ -3810,21 +3810,21 @@
 /turf/simulated/floor/plasteel,
 /area/hallway/secondary/entry)
 "ail" = (
-/obj/structure/chair{
-	dir = 4
-	},
 /obj/effect/landmark{
 	name = "JoinLate"
 	},
+/obj/structure/chair/comfy/shuttle{
+	dir = 4
+	},
 /turf/simulated/shuttle/floor,
 /area/shuttle/arrival/station)
 "aim" = (
-/obj/structure/chair{
-	dir = 8
-	},
 /obj/effect/landmark{
 	name = "JoinLate"
 	},
+/obj/structure/chair/comfy/shuttle{
+	dir = 8
+	},
 /turf/simulated/shuttle/floor,
 /area/shuttle/arrival/station)
 "ain" = (
@@ -4073,13 +4073,13 @@
 /turf/simulated/shuttle/plating,
 /area/shuttle/transport)
 "aiR" = (
-/obj/structure/chair{
+/obj/structure/chair/comfy/shuttle{
 	dir = 4
 	},
 /turf/simulated/shuttle/floor,
 /area/shuttle/transport)
 "aiS" = (
-/obj/structure/chair{
+/obj/structure/chair/comfy/shuttle{
 	dir = 8
 	},
 /turf/simulated/shuttle/floor,
@@ -4094,21 +4094,21 @@
 /turf/simulated/floor/plasteel,
 /area/hallway/secondary/entry)
 "aiU" = (
-/obj/structure/chair{
-	dir = 4
-	},
 /obj/effect/landmark{
 	name = "HONKsquad"
 	},
+/obj/structure/chair/comfy/shuttle{
+	dir = 4
+	},
 /turf/simulated/shuttle/floor,
 /area/shuttle/arrival/station)
 "aiV" = (
-/obj/structure/chair{
-	dir = 8
-	},
 /obj/effect/landmark{
 	name = "HONKsquad"
 	},
+/obj/structure/chair/comfy/shuttle{
+	dir = 8
+	},
 /turf/simulated/shuttle/floor,
 /area/shuttle/arrival/station)
 "aiW" = (
@@ -4343,7 +4343,7 @@
 	},
 /area/shuttle/specops)
 "ajs" = (
-/obj/structure/chair,
+/obj/structure/chair/comfy/shuttle,
 /turf/simulated/shuttle/floor{
 	icon_state = "floor4"
 	},
@@ -4354,7 +4354,7 @@
 	dir = 2;
 	network = list("ERT","CentComm")
 	},
-/obj/structure/chair,
+/obj/structure/chair/comfy/shuttle,
 /turf/simulated/shuttle/floor{
 	icon_state = "floor4"
 	},
@@ -4407,7 +4407,7 @@
 	icon_state = "tube1";
 	dir = 8
 	},
-/obj/structure/chair{
+/obj/structure/chair/comfy/shuttle{
 	dir = 4
 	},
 /turf/simulated/shuttle/floor,
@@ -4418,7 +4418,7 @@
 	icon_state = "tube1";
 	dir = 4
 	},
-/obj/structure/chair{
+/obj/structure/chair/comfy/shuttle{
 	dir = 8
 	},
 /turf/simulated/shuttle/floor,
@@ -4601,14 +4601,14 @@
 /turf/simulated/shuttle/plating/vox,
 /area/shuttle/vox)
 "ajW" = (
-/obj/structure/chair{
-	dir = 4
-	},
 /obj/machinery/light/spot{
 	tag = "icon-tube1 (WEST)";
 	icon_state = "tube1";
 	dir = 8
 	},
+/obj/structure/chair/comfy/shuttle{
+	dir = 4
+	},
 /turf/simulated/shuttle/floor{
 	icon_state = "floor4"
 	},
@@ -4866,7 +4866,7 @@
 	},
 /area/shuttle/specops)
 "aku" = (
-/obj/structure/chair{
+/obj/structure/chair/comfy/shuttle{
 	dir = 1
 	},
 /turf/simulated/shuttle/floor{
@@ -5036,11 +5036,13 @@
 /turf/simulated/shuttle/plating/vox,
 /area/shuttle/vox)
 "akN" = (
-/obj/structure/chair/stool,
+/obj/structure/chair/comfy/shuttle{
+	dir = 4
+	},
 /turf/simulated/shuttle/floor4/vox,
 /area/shuttle/vox)
 "akO" = (
-/obj/structure/chair{
+/obj/structure/chair/comfy/shuttle{
 	dir = 1
 	},
 /turf/simulated/shuttle/floor4/vox,
@@ -5380,7 +5382,7 @@
 /turf/simulated/shuttle/floor,
 /area/shuttle/arrival/station)
 "alw" = (
-/obj/structure/chair/office/dark,
+/obj/structure/chair/comfy/shuttle,
 /turf/simulated/shuttle/floor,
 /area/shuttle/arrival/station)
 "alx" = (
@@ -5692,9 +5694,6 @@
 /obj/effect/spawner/window/reinforced,
 /turf/simulated/floor/plating,
 /area/maintenance/fsmaint)
-"ami" = (
-/obj/structure/lattice/catwalk,
-/area/space/nearstation)
 "amj" = (
 /obj/machinery/door/poddoor/shutters{
 	density = 0;
@@ -8074,7 +8073,7 @@
 /area/shuttle/vox)
 "arn" = (
 /obj/item/stack/spacecash/c50,
-/obj/structure/chair{
+/obj/structure/chair/comfy/shuttle{
 	dir = 8
 	},
 /turf/simulated/shuttle/floor4/vox,
@@ -8544,10 +8543,10 @@
 "asf" = (
 /obj/item/stack/spacecash/c200,
 /obj/item/stack/spacecash/c50,
-/obj/structure/chair{
+/obj/machinery/light/spot,
+/obj/structure/chair/comfy/shuttle{
 	dir = 1
 	},
-/obj/machinery/light/spot,
 /turf/simulated/shuttle/floor4/vox,
 /area/shuttle/vox)
 "asg" = (
@@ -8927,8 +8926,8 @@
 	icon_state = "1-2";
 	pixel_y = 0
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/maintenance/auxsolarport)
 "asV" = (
 /obj/structure/cable{
@@ -8943,8 +8942,8 @@
 	icon_state = "1-4";
 	tag = ""
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/maintenance/auxsolarport)
 "asW" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -9001,21 +9000,21 @@
 	d2 = 8;
 	icon_state = "4-8"
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/maintenance/auxsolarport)
 "atb" = (
 /obj/structure/cable{
 	d2 = 8;
 	icon_state = "0-8"
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/maintenance/auxsolarport)
 "atc" = (
 /obj/structure/cable,
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/maintenance/auxsolarport)
 "atd" = (
 /turf/simulated/wall/r_wall,
@@ -9354,8 +9353,8 @@
 	icon_state = "0-4";
 	d2 = 4
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/maintenance/auxsolarport)
 "atL" = (
 /obj/structure/cable{
@@ -9374,8 +9373,8 @@
 	d2 = 8;
 	icon_state = "4-8"
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/maintenance/auxsolarport)
 "atM" = (
 /obj/structure/cable{
@@ -9495,8 +9494,8 @@
 	d2 = 8;
 	icon_state = "2-8"
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/maintenance/auxsolarport)
 "atV" = (
 /obj/structure/disposalpipe/segment{
@@ -9546,8 +9545,8 @@
 	},
 /area/maintenance/auxsolarport)
 "atZ" = (
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/maintenance/auxsolarport)
 "aua" = (
 /obj/effect/decal/cleanable/dirt,
@@ -12858,8 +12857,8 @@
 /obj/machinery/atmospherics/pipe/simple/heat_exchanging{
 	dir = 6
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/space/nearstation)
 "aAf" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -12907,8 +12906,8 @@
 /obj/machinery/atmospherics/pipe/simple/heat_exchanging{
 	dir = 4
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/space/nearstation)
 "aAj" = (
 /obj/structure/cable{
@@ -13822,8 +13821,8 @@
 /obj/machinery/atmospherics/pipe/simple/heat_exchanging{
 	dir = 5
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/space/nearstation)
 "aBW" = (
 /obj/structure/cable{
@@ -14708,8 +14707,8 @@
 /obj/machinery/atmospherics/pipe/simple/heat_exchanging{
 	dir = 10
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/space/nearstation)
 "aDD" = (
 /obj/structure/cable{
@@ -14982,23 +14981,23 @@
 /obj/machinery/atmospherics/unary/outlet_injector/on{
 	dir = 8
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/engine/controlroom)
 "aEa" = (
 /obj/machinery/atmospherics/pipe/simple/heat_exchanging{
 	dir = 9
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/space/nearstation)
 "aEb" = (
 /obj/structure/cable{
 	icon_state = "0-2";
 	d2 = 2
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/maintenance/auxsolarport)
 "aEc" = (
 /obj/structure/cable{
@@ -15006,8 +15005,8 @@
 	d2 = 2;
 	icon_state = "1-2"
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/maintenance/auxsolarport)
 "aEd" = (
 /obj/machinery/atmospherics/trinary/filter{
@@ -15772,8 +15771,8 @@
 /obj/machinery/atmospherics/pipe/simple/visible/yellow{
 	dir = 10
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/space/nearstation)
 "aFA" = (
 /turf/simulated/wall,
@@ -18103,13 +18102,13 @@
 /area/security/prison)
 "aJy" = (
 /obj/machinery/atmospherics/pipe/simple/heat_exchanging,
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/space)
 "aJz" = (
 /obj/machinery/atmospherics/pipe/simple/visible/yellow,
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/space/nearstation)
 "aJA" = (
 /obj/structure/cable{
@@ -19474,8 +19473,8 @@
 	d2 = 4;
 	icon_state = "0-4"
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/maintenance/auxsolarport)
 "aLR" = (
 /obj/structure/chair/stool,
@@ -19494,8 +19493,8 @@
 /area/crew_quarters/bar/atrium)
 "aLT" = (
 /obj/item/wrench,
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/space/nearstation)
 "aLU" = (
 /turf/simulated/wall,
@@ -21046,8 +21045,8 @@
 /obj/machinery/atmospherics/pipe/simple/visible/yellow{
 	dir = 5
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/space/nearstation)
 "aOV" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -21060,8 +21059,8 @@
 /obj/machinery/atmospherics/pipe/simple/visible/yellow{
 	dir = 4
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/space/nearstation)
 "aOX" = (
 /obj/effect/decal/cleanable/dirt,
@@ -25713,8 +25712,8 @@
 /obj/structure/disposaloutlet{
 	dir = 8
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/maintenance/incinerator)
 "aWS" = (
 /obj/structure/table/reinforced,
@@ -27674,8 +27673,8 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/space/nearstation)
 "aZZ" = (
 /obj/item/radio/intercom{
@@ -27696,8 +27695,8 @@
 	dir = 8;
 	icon_state = "pipe-c"
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/space/nearstation)
 "bab" = (
 /obj/effect/spawner/window/reinforced,
@@ -28072,8 +28071,8 @@
 	dir = 4;
 	level = 2
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/atmos)
 "baO" = (
 /obj/machinery/access_button{
@@ -28605,8 +28604,8 @@
 	dir = 4;
 	level = 2
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/atmos)
 "bbG" = (
 /turf/simulated/floor/plating,
@@ -28632,21 +28631,18 @@
 /turf/simulated/shuttle/floor,
 /area/shuttle/pod_3)
 "bbJ" = (
-/obj/structure/chair{
-	dir = 4
-	},
 /obj/item/radio/intercom{
 	broadcasting = 0;
 	listening = 1;
 	name = "station intercom (General)";
 	pixel_y = 25
 	},
+/obj/structure/chair/comfy/shuttle{
+	dir = 4
+	},
 /turf/simulated/shuttle/floor,
 /area/shuttle/pod_3)
 "bbK" = (
-/obj/structure/chair{
-	dir = 4
-	},
 /obj/machinery/status_display{
 	density = 0;
 	layer = 4;
@@ -28654,6 +28650,9 @@
 	pixel_y = 32
 	},
 /obj/machinery/light,
+/obj/structure/chair/comfy/shuttle{
+	dir = 4
+	},
 /turf/simulated/shuttle/floor,
 /area/shuttle/pod_3)
 "bbL" = (
@@ -30759,7 +30758,7 @@
 /turf/simulated/shuttle/floor,
 /area/shuttle/mining)
 "bfQ" = (
-/obj/structure/chair{
+/obj/structure/chair/comfy/shuttle{
 	dir = 1
 	},
 /turf/simulated/shuttle/floor,
@@ -33621,8 +33620,8 @@
 	},
 /area/atmos)
 "bkQ" = (
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/atmos)
 "bkR" = (
 /obj/structure/reagent_dispensers/fueltank,
@@ -37929,7 +37928,7 @@
 	},
 /area/shuttle/siberia)
 "bsy" = (
-/obj/structure/chair/office/dark{
+/obj/structure/chair/comfy/shuttle{
 	dir = 1
 	},
 /turf/simulated/shuttle/floor{
@@ -39468,8 +39467,8 @@
 	dir = 4;
 	level = 2
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/atmos)
 "buY" = (
 /obj/structure/cable{
@@ -41012,15 +41011,12 @@
 	},
 /area/security/nuke_storage)
 "bxH" = (
-/obj/structure/chair{
+/obj/structure/chair/comfy/shuttle{
 	dir = 4
 	},
 /turf/simulated/shuttle/floor,
 /area/shuttle/siberia)
 "bxI" = (
-/obj/structure/chair{
-	dir = 8
-	},
 /obj/machinery/flasher{
 	id = "gulagshuttleflasher";
 	pixel_x = 25
@@ -41029,6 +41025,9 @@
 	dir = 4;
 	icon_state = "tube1"
 	},
+/obj/structure/chair/comfy/shuttle{
+	dir = 8
+	},
 /turf/simulated/shuttle/floor,
 /area/shuttle/siberia)
 "bxJ" = (
@@ -52886,8 +52885,8 @@
 /obj/machinery/atmospherics/pipe/simple/visible/yellow{
 	dir = 9
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/space/nearstation)
 "bRn" = (
 /obj/structure/rack,
@@ -53123,8 +53122,8 @@
 	dir = 1;
 	layer = 2.9
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/space/nearstation)
 "bRH" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -54793,8 +54792,8 @@
 	pixel_y = -20;
 	req_access_txt = "32"
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/space/nearstation)
 "bUc" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -55187,8 +55186,8 @@
 	dir = 4;
 	level = 1
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/space/nearstation)
 "bUK" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -55445,8 +55444,8 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 10
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/space/nearstation)
 "bVg" = (
 /obj/structure/cable{
@@ -55662,8 +55661,8 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 6
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/space/nearstation)
 "bVt" = (
 /obj/structure/sign/vacuum{
@@ -57177,8 +57176,8 @@
 	pixel_y = 20;
 	req_access_txt = "10;13"
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/space/nearstation)
 "bXG" = (
 /obj/structure/cable{
@@ -57187,8 +57186,8 @@
 	icon_state = "1-2"
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/space/nearstation)
 "bXH" = (
 /obj/item/twohanded/required/kirbyplants,
@@ -57380,8 +57379,8 @@
 	tag = ""
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/space/nearstation)
 "bYb" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -57463,8 +57462,8 @@
 	dir = 5;
 	level = 1
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/space/nearstation)
 "bYm" = (
 /obj/structure/cable{
@@ -57477,8 +57476,8 @@
 	dir = 4;
 	level = 1
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/space/nearstation)
 "bYn" = (
 /obj/structure/sign/directions/evac{
@@ -57686,8 +57685,8 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 9
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/space/nearstation)
 "bYK" = (
 /obj/effect/spawner/window/reinforced,
@@ -57907,8 +57906,8 @@
 /obj/structure/window/reinforced{
 	dir = 4
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/space/nearstation)
 "bZg" = (
 /obj/structure/table/reinforced,
@@ -58082,8 +58081,8 @@
 	dir = 4;
 	level = 1
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/space/nearstation)
 "bZx" = (
 /obj/structure/disposalpipe/segment{
@@ -62768,8 +62767,8 @@
 	dir = 4;
 	level = 1
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/space/nearstation)
 "chx" = (
 /obj/structure/cable{
@@ -63819,8 +63818,8 @@
 	tag = "icon-D-SE";
 	icon_state = "D-SE"
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/space/nearstation)
 "cjm" = (
 /obj/structure/closet/crate,
@@ -66332,8 +66331,8 @@
 	tag = "icon-E-SW-NW";
 	icon_state = "E-SW-NW"
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/space/nearstation)
 "cnI" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -66555,8 +66554,8 @@
 /obj/structure/transit_tube{
 	icon_state = "E-W-Pass"
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/space/nearstation)
 "coj" = (
 /obj/structure/cable/yellow{
@@ -69022,8 +69021,8 @@
 	level = 1
 	},
 /obj/structure/transit_tube,
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/space/nearstation)
 "css" = (
 /obj/structure/table/reinforced,
@@ -69083,8 +69082,8 @@
 	tag = "icon-W-SE";
 	icon_state = "W-SE"
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/space/nearstation)
 "csz" = (
 /obj/structure/closet/crate{
@@ -69730,8 +69729,8 @@
 /obj/structure/window/reinforced{
 	dir = 4
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/space/nearstation)
 "ctJ" = (
 /obj/structure/transit_tube{
@@ -69741,8 +69740,8 @@
 /obj/structure/window/reinforced{
 	dir = 4
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/space/nearstation)
 "ctK" = (
 /obj/structure/table/wood,
@@ -69890,8 +69889,8 @@
 	d2 = 4;
 	icon_state = "2-4"
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/space/nearstation)
 "ctZ" = (
 /obj/effect/spawner/window/reinforced,
@@ -72989,8 +72988,8 @@
 	d2 = 8;
 	icon_state = "4-8"
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/space/nearstation)
 "czx" = (
 /obj/structure/cable{
@@ -74431,8 +74430,8 @@
 	d2 = 8;
 	icon_state = "4-8"
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/space/nearstation)
 "cBV" = (
 /obj/structure/chair/office/dark,
@@ -77524,8 +77523,8 @@
 	d2 = 8;
 	icon_state = "2-8"
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/space/nearstation)
 "cHu" = (
 /obj/effect/decal/cleanable/cobweb,
@@ -78371,8 +78370,8 @@
 	d2 = 2;
 	icon_state = "1-2"
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/space/nearstation)
 "cJf" = (
 /obj/structure/sign/directions/evac{
@@ -78818,8 +78817,8 @@
 	d2 = 4;
 	icon_state = "1-4"
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/space/nearstation)
 "cKk" = (
 /obj/structure/cable{
@@ -78833,8 +78832,8 @@
 /area/toxins/xenobiology)
 "cKl" = (
 /obj/structure/window/reinforced,
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/space/nearstation)
 "cKm" = (
 /obj/structure/cable{
@@ -80269,8 +80268,8 @@
 	d2 = 4;
 	icon_state = "1-4"
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/space/nearstation)
 "cNo" = (
 /obj/structure/cable{
@@ -80738,8 +80737,8 @@
 	d2 = 4;
 	icon_state = "2-4"
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/space/nearstation)
 "cOa" = (
 /obj/structure/table/reinforced,
@@ -80914,8 +80913,8 @@
 	d2 = 4;
 	icon_state = "1-4"
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/space/nearstation)
 "cOn" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -81673,8 +81672,8 @@
 	d2 = 8;
 	icon_state = "4-8"
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/space/nearstation)
 "cPL" = (
 /obj/structure/disposalpipe/segment{
@@ -81841,8 +81840,8 @@
 	d2 = 8;
 	icon_state = "1-8"
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/space/nearstation)
 "cPY" = (
 /obj/machinery/access_button{
@@ -81854,8 +81853,8 @@
 	pixel_y = 24;
 	req_access_txt = "0"
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/space/nearstation)
 "cPZ" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -107526,8 +107525,8 @@
 	pixel_y = 25;
 	req_access_txt = "13"
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/maintenance/auxsolarstarboard)
 "dKy" = (
 /obj/structure/grille,
@@ -109774,17 +109773,17 @@
 	},
 /area/hallway/secondary/exit)
 "dOy" = (
-/obj/structure/chair{
+/obj/effect/decal/warning_stripes/yellow/hollow,
+/obj/structure/chair/comfy/shuttle{
 	dir = 4
 	},
-/obj/effect/decal/warning_stripes/yellow/hollow,
 /turf/simulated/floor/plasteel,
 /area/shuttle/escape)
 "dOz" = (
-/obj/structure/chair{
+/obj/effect/decal/warning_stripes/yellow/hollow,
+/obj/structure/chair/comfy/shuttle{
 	dir = 8
 	},
-/obj/effect/decal/warning_stripes/yellow/hollow,
 /turf/simulated/floor/plasteel,
 /area/shuttle/escape)
 "dOA" = (
@@ -110232,8 +110231,8 @@
 	icon_state = "0-2";
 	pixel_y = 0
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/maintenance/auxsolarstarboard)
 "dPo" = (
 /obj/structure/bed/roller,
@@ -110919,8 +110918,8 @@
 	},
 /area/medical/virology)
 "dQB" = (
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/maintenance/portsolar)
 "dQC" = (
 /obj/machinery/field/generator{
@@ -112646,7 +112645,7 @@
 /turf/simulated/shuttle/floor4,
 /area/shuttle/escape)
 "dTN" = (
-/obj/structure/chair,
+/obj/structure/chair/comfy/shuttle,
 /turf/simulated/shuttle/floor4,
 /area/shuttle/escape)
 "dTO" = (
@@ -112669,16 +112668,16 @@
 	},
 /area/shuttle/escape)
 "dTR" = (
-/obj/structure/chair,
 /obj/effect/decal/warning_stripes/yellow/hollow,
+/obj/structure/chair/comfy/shuttle,
 /turf/simulated/floor/plasteel,
 /area/shuttle/escape)
 "dTS" = (
-/obj/structure/chair,
 /obj/machinery/status_display{
 	pixel_y = 32
 	},
 /obj/effect/decal/warning_stripes/yellow/hollow,
+/obj/structure/chair/comfy/shuttle,
 /turf/simulated/floor/plasteel,
 /area/shuttle/escape)
 "dTT" = (
@@ -113013,7 +113012,7 @@
 /turf/simulated/floor/plating,
 /area/security/checkpoint)
 "dUw" = (
-/obj/structure/chair{
+/obj/structure/chair/comfy/shuttle{
 	dir = 4
 	},
 /turf/simulated/shuttle/floor4,
@@ -113429,7 +113428,7 @@
 /turf/simulated/floor/plating,
 /area/security/checkpoint)
 "dVf" = (
-/obj/structure/chair{
+/obj/structure/chair/comfy/shuttle{
 	dir = 8
 	},
 /turf/simulated/shuttle/floor4,
@@ -113515,16 +113514,16 @@
 /turf/simulated/floor/plating,
 /area/security/checkpoint)
 "dVr" = (
-/obj/structure/chair{
+/obj/structure/chair/comfy/shuttle{
 	dir = 1
 	},
 /turf/simulated/shuttle/floor4,
 /area/shuttle/escape)
 "dVs" = (
-/obj/structure/chair{
+/obj/machinery/light,
+/obj/structure/chair/comfy/shuttle{
 	dir = 1
 	},
-/obj/machinery/light,
 /turf/simulated/shuttle/floor4,
 /area/shuttle/escape)
 "dVt" = (
@@ -113661,7 +113660,7 @@
 	},
 /area/shuttle/escape)
 "dVJ" = (
-/obj/structure/chair/office/dark{
+/obj/structure/chair/comfy/shuttle{
 	dir = 8
 	},
 /turf/simulated/floor/plasteel{
@@ -113680,7 +113679,7 @@
 	},
 /area/shuttle/escape)
 "dVL" = (
-/obj/structure/chair/office/dark{
+/obj/structure/chair/comfy/shuttle{
 	dir = 4
 	},
 /turf/simulated/floor/plasteel{
@@ -113706,7 +113705,7 @@
 	},
 /area/shuttle/escape)
 "dVO" = (
-/obj/structure/chair/office/dark,
+/obj/structure/chair/comfy/shuttle,
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
 	},
@@ -114147,14 +114146,14 @@
 	},
 /area/security/checkpoint)
 "dWB" = (
-/obj/structure/chair{
-	dir = 8
-	},
 /obj/machinery/light{
 	icon_state = "tube1";
 	dir = 4
 	},
 /obj/effect/decal/warning_stripes/yellow/hollow,
+/obj/structure/chair/comfy/shuttle{
+	dir = 8
+	},
 /turf/simulated/floor/plasteel,
 /area/shuttle/escape)
 "dWC" = (
@@ -114990,8 +114989,8 @@
 	pixel_y = 24;
 	req_access_txt = "0"
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/space/nearstation)
 "dXY" = (
 /obj/structure/table/reinforced,
@@ -115328,8 +115327,8 @@
 	icon_state = "0-4";
 	d2 = 4
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/maintenance/portsolar)
 "dYJ" = (
 /obj/structure/cable{
@@ -115337,8 +115336,8 @@
 	d2 = 8;
 	icon_state = "4-8"
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/maintenance/portsolar)
 "dYK" = (
 /obj/structure/cable{
@@ -115355,8 +115354,8 @@
 	pixel_y = 25;
 	req_access_txt = "13"
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/maintenance/portsolar)
 "dYL" = (
 /obj/structure/cable{
@@ -115371,8 +115370,8 @@
 	icon_state = "1-4";
 	tag = ""
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/maintenance/portsolar)
 "dYM" = (
 /obj/structure/cable{
@@ -115392,16 +115391,16 @@
 	d2 = 8;
 	icon_state = "4-8"
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/maintenance/portsolar)
 "dYN" = (
 /obj/structure/cable{
 	d2 = 8;
 	icon_state = "0-8"
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/maintenance/portsolar)
 "dYO" = (
 /obj/structure/cable{
@@ -115420,8 +115419,8 @@
 	d2 = 8;
 	icon_state = "4-8"
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/maintenance/portsolar)
 "dYP" = (
 /obj/structure/cable{
@@ -115435,8 +115434,8 @@
 	d2 = 8;
 	icon_state = "2-8"
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/maintenance/portsolar)
 "dYQ" = (
 /obj/machinery/access_button{
@@ -115448,8 +115447,8 @@
 	pixel_y = 24;
 	req_access_txt = "10;13"
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/space/nearstation)
 "dYR" = (
 /obj/structure/cable{
@@ -115457,8 +115456,8 @@
 	icon_state = "0-2";
 	pixel_y = 0
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/maintenance/portsolar)
 "dYS" = (
 /obj/structure/cable{
@@ -115467,8 +115466,8 @@
 	icon_state = "1-2";
 	pixel_y = 0
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/maintenance/portsolar)
 "dYT" = (
 /turf/simulated/floor/carpet,
@@ -115565,20 +115564,20 @@
 	},
 /area/shuttle/syndicate_elite)
 "dZc" = (
-/obj/structure/chair{
-	dir = 4
-	},
 /obj/machinery/light/spot{
 	tag = "icon-tube1 (WEST)";
 	icon_state = "tube1";
 	dir = 8
 	},
+/obj/structure/chair/comfy/shuttle{
+	dir = 4
+	},
 /turf/simulated/shuttle/floor{
 	icon_state = "floor4"
 	},
 /area/shuttle/syndicate_elite)
 "dZd" = (
-/obj/structure/chair{
+/obj/structure/chair/comfy/shuttle{
 	dir = 8
 	},
 /turf/simulated/shuttle/floor{
@@ -115586,7 +115585,7 @@
 	},
 /area/shuttle/syndicate_elite)
 "dZe" = (
-/obj/structure/chair{
+/obj/structure/chair/comfy/shuttle{
 	dir = 4
 	},
 /turf/simulated/shuttle/floor{
@@ -115655,7 +115654,7 @@
 /turf/simulated/shuttle/plating,
 /area/shuttle/syndicate_elite)
 "dZj" = (
-/obj/structure/chair,
+/obj/structure/chair/comfy/shuttle,
 /turf/simulated/shuttle/floor{
 	icon_state = "floor4"
 	},
@@ -115782,15 +115781,15 @@
 	},
 /area/shuttle/syndicate_sit)
 "dZA" = (
-/obj/structure/chair{
-	dir = 4
-	},
 /obj/machinery/light/spot{
 	tag = "icon-tube1 (WEST)";
 	icon_state = "tube1";
 	dir = 8
 	},
 /obj/structure/window/reinforced,
+/obj/structure/chair/comfy/shuttle{
+	dir = 4
+	},
 /turf/simulated/shuttle/floor{
 	icon_state = "floor4"
 	},
@@ -115812,7 +115811,7 @@
 	},
 /area/shuttle/syndicate_sit)
 "dZD" = (
-/obj/structure/chair{
+/obj/structure/chair/comfy/shuttle{
 	dir = 4
 	},
 /turf/simulated/shuttle/floor{
@@ -115820,7 +115819,7 @@
 	},
 /area/shuttle/syndicate_sit)
 "dZE" = (
-/obj/structure/chair{
+/obj/structure/chair/comfy/shuttle{
 	dir = 8
 	},
 /turf/simulated/shuttle/floor{
@@ -115833,7 +115832,7 @@
 	icon_state = "tube1";
 	dir = 8
 	},
-/obj/structure/chair{
+/obj/structure/chair/comfy/shuttle{
 	dir = 4
 	},
 /turf/simulated/shuttle/floor{
@@ -115891,7 +115890,7 @@
 	},
 /area/shuttle/syndicate_sit)
 "dZI" = (
-/obj/structure/chair,
+/obj/structure/chair/comfy/shuttle,
 /turf/simulated/shuttle/floor{
 	icon_state = "floor4"
 	},
@@ -116010,6 +116009,12 @@
 	},
 /turf/space,
 /area/space)
+"udT" = (
+/obj/structure/chair/comfy/shuttle{
+	dir = 8
+	},
+/turf/simulated/shuttle/floor4/vox,
+/area/shuttle/vox)
 
 (1,1,1) = {"
 aaa
@@ -129823,7 +129828,7 @@ dyn
 dyn
 abj
 abj
-ami
+acF
 aaa
 aaa
 aaa
@@ -130337,7 +130342,7 @@ dyn
 dyn
 abj
 abj
-ami
+acF
 aaa
 aaa
 aaa
@@ -175945,8 +175950,8 @@ aaa
 aaa
 ajm
 akm
-akN
-akN
+udT
+udT
 akm
 alU
 ajO
diff --git a/_maps/map_files/MetaStation/MetaStation.v41A.II.dmm b/_maps/map_files/MetaStation/MetaStation.v41A.II.dmm
index 63c912e11d7..8bf89da81b2 100644
--- a/_maps/map_files/MetaStation/MetaStation.v41A.II.dmm
+++ b/_maps/map_files/MetaStation/MetaStation.v41A.II.dmm
@@ -148,7 +148,7 @@
 	},
 /area/shuttle/syndicate)
 "aaq" = (
-/obj/structure/chair/comfy/black{
+/obj/structure/chair/comfy/shuttle{
 	dir = 1
 	},
 /turf/simulated/shuttle/floor{
@@ -234,7 +234,7 @@
 	},
 /area/shuttle/syndicate)
 "aaB" = (
-/obj/structure/chair{
+/obj/structure/chair/comfy/shuttle{
 	dir = 4
 	},
 /turf/simulated/shuttle/floor{
@@ -242,7 +242,7 @@
 	},
 /area/shuttle/syndicate)
 "aaC" = (
-/obj/structure/chair{
+/obj/structure/chair/comfy/shuttle{
 	dir = 8
 	},
 /turf/simulated/shuttle/floor{
@@ -765,8 +765,8 @@
 	d2 = 2;
 	icon_state = "1-2"
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/solar/auxport)
 "abB" = (
 /turf/simulated/wall/r_wall,
@@ -868,8 +868,8 @@
 /area/shuttle/syndicate)
 "abL" = (
 /obj/structure/cable,
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/solar/auxport)
 "abM" = (
 /obj/structure/cable{
@@ -882,8 +882,8 @@
 	d2 = 4;
 	icon_state = "2-4"
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/solar/auxport)
 "abN" = (
 /obj/structure/table,
@@ -958,28 +958,28 @@
 	d2 = 4;
 	icon_state = "2-4"
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/solar/auxport)
 "abV" = (
 /obj/structure/cable{
 	d2 = 8;
 	icon_state = "0-8"
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/solar/auxport)
 "abW" = (
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/solar/auxport)
 "abX" = (
 /obj/structure/cable{
 	icon_state = "0-4";
 	d2 = 4
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/solar/auxport)
 "abY" = (
 /obj/structure/cable{
@@ -997,8 +997,8 @@
 	d2 = 8;
 	icon_state = "1-8"
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/solar/auxport)
 "abZ" = (
 /obj/structure/cable{
@@ -1011,8 +1011,8 @@
 	d2 = 8;
 	icon_state = "1-8"
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/solar/auxport)
 "aca" = (
 /obj/structure/cable/yellow{
@@ -1055,8 +1055,8 @@
 /area/solar/auxport)
 "acf" = (
 /obj/item/stack/cable_coil,
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/solar/auxport)
 "acg" = (
 /obj/effect/spawner/window/reinforced,
@@ -1269,8 +1269,8 @@
 	name = "xeno_spawn";
 	pixel_x = -1
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/solar/auxport)
 "acA" = (
 /turf/simulated/floor/plasteel,
@@ -1333,9 +1333,6 @@
 	},
 /area/shuttle/pod_2)
 "acI" = (
-/obj/structure/chair{
-	dir = 1
-	},
 /obj/machinery/status_display{
 	density = 0;
 	layer = 4;
@@ -1344,6 +1341,9 @@
 /obj/machinery/light{
 	dir = 8
 	},
+/obj/structure/chair/comfy/shuttle{
+	dir = 1
+	},
 /turf/simulated/shuttle/floor,
 /area/shuttle/pod_2)
 "acJ" = (
@@ -1394,12 +1394,12 @@
 /turf/simulated/floor/plating,
 /area/security/permabrig)
 "acP" = (
-/obj/structure/chair{
-	dir = 1
-	},
 /obj/item/radio/intercom{
 	pixel_x = 25
 	},
+/obj/structure/chair/comfy/shuttle{
+	dir = 1
+	},
 /turf/simulated/shuttle/floor,
 /area/shuttle/pod_2)
 "acQ" = (
@@ -1627,8 +1627,8 @@
 	icon_state = "0-2";
 	d2 = 2
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/solar/auxport)
 "adj" = (
 /obj/structure/cable{
@@ -1636,8 +1636,8 @@
 	d2 = 2;
 	icon_state = "1-2"
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/solar/auxstarboard)
 "adk" = (
 /obj/machinery/light/small{
@@ -1990,8 +1990,8 @@
 /area/shuttle/vox)
 "adP" = (
 /obj/structure/cable,
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/solar/auxstarboard)
 "adQ" = (
 /obj/structure/table,
@@ -2117,8 +2117,8 @@
 	},
 /area/security/permabrig)
 "aee" = (
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/solar/auxstarboard)
 "aef" = (
 /obj/structure/lattice/catwalk,
@@ -2135,8 +2135,8 @@
 	d2 = 4;
 	icon_state = "2-4"
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/solar/auxstarboard)
 "aeh" = (
 /turf/simulated/shuttle/wall{
@@ -2419,8 +2419,8 @@
 	d2 = 4;
 	icon_state = "2-4"
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/solar/auxstarboard)
 "aeB" = (
 /obj/machinery/atmospherics/unary/vent_scrubber{
@@ -2831,11 +2831,13 @@
 /turf/simulated/shuttle/plating/vox,
 /area/shuttle/vox)
 "afi" = (
-/obj/structure/chair/stool,
+/obj/structure/chair/comfy/shuttle{
+	dir = 4
+	},
 /turf/simulated/shuttle/floor4/vox,
 /area/shuttle/vox)
 "afj" = (
-/obj/structure/chair{
+/obj/structure/chair/comfy/shuttle{
 	dir = 1
 	},
 /turf/simulated/shuttle/floor4/vox,
@@ -2893,8 +2895,8 @@
 	d2 = 8;
 	icon_state = "0-8"
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/solar/auxstarboard)
 "afp" = (
 /obj/structure/chair/stool,
@@ -2918,8 +2920,8 @@
 	icon_state = "0-4";
 	d2 = 4
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/solar/auxstarboard)
 "afr" = (
 /obj/effect/spawner/window/reinforced,
@@ -3124,8 +3126,8 @@
 	d2 = 8;
 	icon_state = "2-8"
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/solar/auxstarboard)
 "afH" = (
 /turf/simulated/shuttle/wall{
@@ -3385,8 +3387,8 @@
 	d2 = 8;
 	icon_state = "2-8"
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/solar/auxstarboard)
 "agf" = (
 /obj/machinery/atmospherics/pipe/simple/hidden,
@@ -3411,12 +3413,12 @@
 /turf/simulated/shuttle/floor,
 /area/shuttle/pod_3)
 "agi" = (
-/obj/structure/chair{
-	dir = 4
-	},
 /obj/item/radio/intercom{
 	pixel_y = 25
 	},
+/obj/structure/chair/comfy/shuttle{
+	dir = 4
+	},
 /turf/simulated/shuttle/floor,
 /area/shuttle/pod_3)
 "agj" = (
@@ -3451,8 +3453,8 @@
 	pixel_y = 1;
 	d2 = 2
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/solar/auxport)
 "ago" = (
 /obj/structure/cable,
@@ -3654,8 +3656,8 @@
 	})
 "agH" = (
 /obj/item/stack/cable_coil,
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/solar/auxstarboard)
 "agI" = (
 /turf/space,
@@ -3699,8 +3701,8 @@
 	d2 = 4;
 	icon_state = "1-4"
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/solar/auxport)
 "agN" = (
 /obj/machinery/atmospherics/unary/portables_connector{
@@ -5105,8 +5107,8 @@
 	d2 = 8;
 	icon_state = "4-8"
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/solar/auxport)
 "aiR" = (
 /obj/structure/cable{
@@ -5114,8 +5116,8 @@
 	d2 = 8;
 	icon_state = "2-8"
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/solar/auxport)
 "aiS" = (
 /obj/structure/closet/secure_closet/brig{
@@ -5522,15 +5524,15 @@
 /turf/simulated/floor/plating,
 /area/maintenance/auxsolarport)
 "ajD" = (
-/obj/structure/chair{
-	dir = 4
-	},
 /obj/machinery/status_display{
 	density = 0;
 	layer = 4;
 	pixel_y = 32
 	},
 /obj/machinery/light,
+/obj/structure/chair/comfy/shuttle{
+	dir = 4
+	},
 /turf/simulated/shuttle/floor,
 /area/shuttle/pod_3)
 "ajE" = (
@@ -6296,8 +6298,8 @@
 	name = "xeno_spawn";
 	pixel_x = -1
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/solar/auxstarboard)
 "akY" = (
 /obj/effect/spawner/window/reinforced,
@@ -9245,7 +9247,7 @@
 /area/shuttle/vox)
 "aqo" = (
 /obj/item/stack/spacecash/c50,
-/obj/structure/chair{
+/obj/structure/chair/comfy/shuttle{
 	dir = 8
 	},
 /turf/simulated/shuttle/floor4/vox,
@@ -9916,10 +9918,10 @@
 "ary" = (
 /obj/item/stack/spacecash/c200,
 /obj/item/stack/spacecash/c50,
-/obj/structure/chair{
+/obj/machinery/light/spot,
+/obj/structure/chair/comfy/shuttle{
 	dir = 1
 	},
-/obj/machinery/light/spot,
 /turf/simulated/shuttle/floor4/vox,
 /area/shuttle/vox)
 "arz" = (
@@ -11430,9 +11432,6 @@
 /turf/simulated/floor/plating,
 /area/maintenance/starboard)
 "auc" = (
-/obj/structure/chair{
-	dir = 8
-	},
 /obj/machinery/flasher{
 	id = "gulagshuttleflasher";
 	pixel_x = 25
@@ -11440,6 +11439,9 @@
 /obj/machinery/light{
 	dir = 4
 	},
+/obj/structure/chair/comfy/shuttle{
+	dir = 8
+	},
 /turf/simulated/shuttle/floor,
 /area/shuttle/siberia)
 "aud" = (
@@ -11642,8 +11644,8 @@
 	icon_state = "0-2";
 	d2 = 2
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/maintenance/auxsolarstarboard)
 "auw" = (
 /obj/structure/disposalpipe/segment,
@@ -12827,10 +12829,10 @@
 	layer = 4;
 	pixel_y = 32
 	},
-/obj/structure/chair{
+/obj/machinery/light,
+/obj/structure/chair/comfy/shuttle{
 	dir = 4
 	},
-/obj/machinery/light,
 /turf/simulated/shuttle/floor,
 /area/shuttle/pod_4)
 "awE" = (
@@ -14058,7 +14060,7 @@
 /turf/simulated/floor/plasteel,
 /area/engine/gravitygenerator)
 "ayO" = (
-/obj/structure/chair/office/dark{
+/obj/structure/chair/comfy/shuttle{
 	dir = 1
 	},
 /turf/simulated/shuttle/floor{
@@ -16682,7 +16684,7 @@
 /turf/simulated/shuttle/floor,
 /area/shuttle/mining)
 "aDr" = (
-/obj/structure/chair{
+/obj/structure/chair/comfy/shuttle{
 	dir = 1
 	},
 /turf/simulated/shuttle/floor,
@@ -16910,7 +16912,7 @@
 	},
 /area/security/nuke_storage)
 "aDJ" = (
-/obj/structure/chair{
+/obj/structure/chair/comfy/shuttle{
 	dir = 4
 	},
 /turf/simulated/shuttle/floor,
@@ -26731,12 +26733,12 @@
 /turf/space,
 /area/space/nearstation)
 "aUW" = (
-/obj/structure/chair{
-	dir = 1
-	},
 /obj/item/radio/intercom{
 	pixel_x = 25
 	},
+/obj/structure/chair/comfy/shuttle{
+	dir = 1
+	},
 /turf/simulated/shuttle/floor,
 /area/shuttle/pod_1)
 "aUX" = (
@@ -27588,9 +27590,6 @@
 	name = "Port Maintenance"
 	})
 "aWr" = (
-/obj/structure/chair{
-	dir = 1
-	},
 /obj/machinery/status_display{
 	density = 0;
 	layer = 4;
@@ -27599,6 +27598,9 @@
 /obj/machinery/light{
 	dir = 8
 	},
+/obj/structure/chair/comfy/shuttle{
+	dir = 1
+	},
 /turf/simulated/shuttle/floor,
 /area/shuttle/pod_1)
 "aWs" = (
@@ -27654,10 +27656,6 @@
 /obj/effect/decal/cleanable/fungus,
 /turf/simulated/wall,
 /area/maintenance/fore)
-"aWw" = (
-/turf/space,
-/obj/structure/lattice/catwalk,
-/area/space/nearstation)
 "aWx" = (
 /obj/machinery/door/airlock/maintenance{
 	name = "Storage Room";
@@ -31844,8 +31842,8 @@
 	})
 "bdO" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/construction/hallway{
 	name = "\improper MiniSat Exterior"
 	})
@@ -36496,7 +36494,7 @@
 /obj/item/radio/intercom{
 	pixel_y = 25
 	},
-/obj/structure/chair{
+/obj/structure/chair/comfy/shuttle{
 	dir = 4
 	},
 /turf/simulated/shuttle/floor,
@@ -36689,15 +36687,15 @@
 	},
 /area/shuttle/arrival/station)
 "blP" = (
-/obj/structure/chair,
 /obj/machinery/light{
 	dir = 1;
 	in_use = 1
 	},
+/obj/structure/chair/comfy/shuttle,
 /turf/simulated/shuttle/floor,
 /area/shuttle/arrival/station)
 "blQ" = (
-/obj/structure/chair,
+/obj/structure/chair/comfy/shuttle,
 /turf/simulated/shuttle/floor,
 /area/shuttle/arrival/station)
 "blR" = (
@@ -36708,12 +36706,12 @@
 	},
 /area/shuttle/arrival/station)
 "blS" = (
-/obj/structure/chair{
-	dir = 8
-	},
 /obj/effect/landmark{
 	name = "JoinLate"
 	},
+/obj/structure/chair/comfy/shuttle{
+	dir = 8
+	},
 /turf/simulated/shuttle/floor,
 /area/shuttle/arrival/station)
 "blT" = (
@@ -38981,14 +38979,14 @@
 	name = "\improper MiniSat Exterior"
 	})
 "bpw" = (
-/obj/structure/chair{
+/obj/machinery/light,
+/obj/structure/chair/comfy/shuttle{
 	dir = 1
 	},
-/obj/machinery/light,
 /turf/simulated/shuttle/floor,
 /area/shuttle/arrival/station)
 "bpx" = (
-/obj/structure/chair{
+/obj/structure/chair/comfy/shuttle{
 	dir = 1
 	},
 /turf/simulated/shuttle/floor,
@@ -43950,8 +43948,8 @@
 	d2 = 8;
 	icon_state = "4-8"
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/space/nearstation)
 "bxn" = (
 /obj/structure/transit_tube{
@@ -43971,8 +43969,8 @@
 	d2 = 8;
 	icon_state = "4-8"
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/space/nearstation)
 "bxo" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -43984,10 +43982,11 @@
 	d2 = 8;
 	icon_state = "4-8"
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/space/nearstation)
-"bxp" = (/obj/structure/transit_tube_pod,
+"bxp" = (
+/obj/structure/transit_tube_pod,
 /obj/structure/window/reinforced{
 	dir = 8
 	},
@@ -44020,8 +44019,8 @@
 	d2 = 8;
 	icon_state = "4-8"
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/space/nearstation)
 "bxr" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -50737,14 +50736,14 @@
 	},
 /area/shuttle/transport)
 "bIH" = (
-/obj/structure/chair{
-	dir = 4
-	},
 /obj/machinery/light/spot{
 	tag = "icon-tube1 (NORTH)";
 	icon_state = "tube1";
 	dir = 1
 	},
+/obj/structure/chair/comfy/shuttle{
+	dir = 4
+	},
 /turf/simulated/shuttle/floor,
 /area/shuttle/transport)
 "bII" = (
@@ -50752,16 +50751,16 @@
 /turf/simulated/shuttle/floor,
 /area/shuttle/transport)
 "bIJ" = (
-/obj/structure/chair,
+/obj/structure/chair/comfy/shuttle,
 /turf/simulated/shuttle/floor,
 /area/shuttle/transport)
 "bIK" = (
-/obj/structure/chair,
 /obj/machinery/light/spot{
 	tag = "icon-tube1 (NORTH)";
 	icon_state = "tube1";
 	dir = 1
 	},
+/obj/structure/chair/comfy/shuttle,
 /turf/simulated/shuttle/floor,
 /area/shuttle/transport)
 "bIL" = (
@@ -53206,16 +53205,16 @@
 /turf/simulated/shuttle/floor,
 /area/shuttle/transport)
 "bMz" = (
-/obj/structure/chair{
+/obj/structure/chair/comfy/shuttle{
 	dir = 1
 	},
 /turf/simulated/shuttle/floor,
 /area/shuttle/transport)
 "bMA" = (
-/obj/structure/chair{
+/obj/machinery/light/spot,
+/obj/structure/chair/comfy/shuttle{
 	dir = 1
 	},
-/obj/machinery/light/spot,
 /turf/simulated/shuttle/floor,
 /area/shuttle/transport)
 "bMB" = (
@@ -65908,8 +65907,8 @@
 /area/hydroponics)
 "ciB" = (
 /obj/structure/cable,
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/solar/port)
 "ciC" = (
 /obj/effect/decal/warning_stripes/northeast,
@@ -66269,8 +66268,8 @@
 /turf/simulated/floor/plating,
 /area/atmos)
 "cjc" = (
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/solar/port)
 "cjd" = (
 /obj/effect/spawner/window/reinforced,
@@ -67031,8 +67030,8 @@
 	icon_state = "0-2";
 	d2 = 2
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/solar/port)
 "cks" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -68466,8 +68465,8 @@
 	d2 = 2;
 	icon_state = "1-2"
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/solar/port)
 "cmI" = (
 /obj/machinery/vending/wallmed1{
@@ -74375,8 +74374,8 @@
 	d2 = 4;
 	icon_state = "1-4"
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/solar/port)
 "cvR" = (
 /obj/structure/chair/office/light,
@@ -76930,8 +76929,8 @@
 	d2 = 8;
 	icon_state = "4-8"
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/solar/port)
 "cAg" = (
 /obj/structure/closet,
@@ -77549,8 +77548,8 @@
 	d2 = 8;
 	icon_state = "0-8"
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/solar/port)
 "cBf" = (
 /obj/machinery/computer/security/telescreen{
@@ -77572,8 +77571,8 @@
 	icon_state = "0-4";
 	d2 = 4
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/solar/port)
 "cBh" = (
 /obj/item/storage/secure/safe{
@@ -78222,8 +78221,8 @@
 	d2 = 8;
 	icon_state = "4-8"
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/solar/port)
 "cCg" = (
 /obj/item/reagent_containers/glass/beaker/large,
@@ -78305,8 +78304,8 @@
 	d2 = 8;
 	icon_state = "2-8"
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/solar/port)
 "cCk" = (
 /obj/structure/table,
@@ -78456,8 +78455,8 @@
 /area/medical/surgeryobs)
 "cCw" = (
 /obj/item/stack/cable_coil,
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/solar/port)
 "cCx" = (
 /obj/structure/cable/yellow{
@@ -78490,8 +78489,8 @@
 	d2 = 4;
 	icon_state = "0-4"
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/space/nearstation)
 "cCA" = (
 /turf/simulated/floor/plasteel{
@@ -78807,8 +78806,8 @@
 	d2 = 8;
 	icon_state = "4-8"
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/space/nearstation)
 "cDa" = (
 /obj/machinery/door/airlock/maintenance{
@@ -82329,8 +82328,8 @@
 	pixel_x = -1
 	},
 /obj/structure/cable,
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/solar/port)
 "cIO" = (
 /obj/item/flashlight/lamp,
@@ -86865,8 +86864,8 @@
 	d2 = 8;
 	icon_state = "0-8"
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/space/nearstation)
 "cPV" = (
 /obj/structure/closet/wardrobe/robotics_black{
@@ -91756,8 +91755,8 @@
 	d2 = 8;
 	icon_state = "4-8"
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/solar/starboard)
 "cXO" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -92022,8 +92021,8 @@
 	d2 = 8;
 	icon_state = "2-8"
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/solar/starboard)
 "cYj" = (
 /obj/structure/chair,
@@ -92219,8 +92218,8 @@
 	d2 = 2;
 	icon_state = "1-2"
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/solar/starboard)
 "cYB" = (
 /obj/machinery/light/small{
@@ -92476,12 +92475,12 @@
 	})
 "cYY" = (
 /obj/structure/cable,
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/solar/starboard)
 "cYZ" = (
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/solar/starboard)
 "cZa" = (
 /obj/machinery/light_switch{
@@ -92526,8 +92525,8 @@
 	d2 = 4;
 	icon_state = "1-4"
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/solar/starboard)
 "cZd" = (
 /obj/structure/cable{
@@ -92545,8 +92544,8 @@
 	d2 = 8;
 	icon_state = "4-8"
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/solar/starboard)
 "cZe" = (
 /turf/simulated/shuttle/wall{
@@ -92593,8 +92592,8 @@
 	d2 = 8;
 	icon_state = "0-8"
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/solar/starboard)
 "cZk" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -92801,8 +92800,8 @@
 	})
 "cZA" = (
 /obj/item/stack/cable_coil,
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/solar/starboard)
 "cZB" = (
 /turf/simulated/shuttle/floor,
@@ -92999,8 +92998,8 @@
 	icon_state = "0-4";
 	d2 = 4
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/solar/starboard)
 "cZX" = (
 /obj/machinery/light{
@@ -93368,17 +93367,17 @@
 /turf/simulated/shuttle/floor,
 /area/shuttle/escape)
 "daC" = (
-/obj/structure/chair,
+/obj/structure/chair/comfy/shuttle,
 /turf/simulated/shuttle/floor{
 	icon_state = "floor3"
 	},
 /area/shuttle/escape)
 "daD" = (
-/obj/structure/chair,
 /obj/machinery/light{
 	dir = 1;
 	on = 1
 	},
+/obj/structure/chair/comfy/shuttle,
 /turf/simulated/shuttle/floor{
 	icon_state = "floor3"
 	},
@@ -94194,7 +94193,7 @@
 /turf/simulated/shuttle/floor,
 /area/shuttle/escape)
 "dbQ" = (
-/obj/structure/chair{
+/obj/structure/chair/comfy/shuttle{
 	dir = 1
 	},
 /turf/simulated/shuttle/floor{
@@ -94333,10 +94332,10 @@
 	},
 /area/chapel/main)
 "dbY" = (
-/obj/structure/chair{
+/obj/machinery/light,
+/obj/structure/chair/comfy/shuttle{
 	dir = 1
 	},
-/obj/machinery/light,
 /turf/simulated/shuttle/floor{
 	icon_state = "floor3"
 	},
@@ -94567,10 +94566,10 @@
 	},
 /area/shuttle/escape)
 "dcp" = (
-/obj/structure/chair,
 /obj/machinery/light{
 	dir = 1
 	},
+/obj/structure/chair/comfy/shuttle,
 /turf/simulated/shuttle/floor{
 	icon_state = "floor3"
 	},
@@ -94640,8 +94639,8 @@
 	d2 = 8;
 	icon_state = "4-8"
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/solar/starboard)
 "dcw" = (
 /obj/structure/window/reinforced,
@@ -94848,8 +94847,8 @@
 	d2 = 8;
 	icon_state = "2-8"
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/solar/starboard)
 "dcO" = (
 /obj/docking_port/stationary{
@@ -94868,9 +94867,6 @@
 /turf/simulated/shuttle/floor,
 /area/shuttle/escape)
 "dcQ" = (
-/obj/structure/chair{
-	dir = 1
-	},
 /obj/item/radio/intercom{
 	broadcasting = 0;
 	listening = 1;
@@ -94878,6 +94874,9 @@
 	pixel_y = -28
 	},
 /obj/machinery/light,
+/obj/structure/chair/comfy/shuttle{
+	dir = 1
+	},
 /turf/simulated/shuttle/floor{
 	icon_state = "floor3"
 	},
@@ -94958,13 +94957,13 @@
 	name = "\improper Secure Lab"
 	})
 "dda" = (
-/obj/structure/chair/office/dark{
+/obj/structure/chair/comfy/shuttle{
 	dir = 1
 	},
 /turf/simulated/shuttle/floor,
 /area/shuttle/escape)
 "ddb" = (
-/obj/structure/chair{
+/obj/structure/chair/comfy/shuttle{
 	dir = 4
 	},
 /turf/simulated/shuttle/plating{
@@ -94972,11 +94971,11 @@
 	},
 /area/shuttle/escape)
 "ddc" = (
-/obj/structure/chair/office/dark,
+/obj/structure/chair/comfy/shuttle,
 /turf/simulated/shuttle/floor,
 /area/shuttle/escape)
 "ddd" = (
-/obj/structure/chair/office/dark{
+/obj/structure/chair/comfy/shuttle{
 	dir = 8
 	},
 /turf/simulated/shuttle/floor,
@@ -95013,7 +95012,7 @@
 	name = "\improper Secure Lab"
 	})
 "ddi" = (
-/obj/structure/chair{
+/obj/structure/chair/comfy/shuttle{
 	dir = 4
 	},
 /turf/simulated/shuttle/floor{
@@ -95021,7 +95020,7 @@
 	},
 /area/shuttle/escape)
 "ddj" = (
-/obj/structure/chair,
+/obj/structure/chair/comfy/shuttle,
 /turf/simulated/shuttle/floor{
 	icon_state = "floor4"
 	},
@@ -95125,8 +95124,8 @@
 	name = "xeno_spawn";
 	pixel_x = -1
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/solar/starboard)
 "ddx" = (
 /turf/simulated/shuttle/wall{
@@ -95197,8 +95196,8 @@
 	icon_state = "0-2";
 	d2 = 2
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/solar/starboard)
 "ddE" = (
 /turf/simulated/shuttle/wall{
@@ -95213,12 +95212,12 @@
 	},
 /area/shuttle/escape)
 "ddG" = (
-/obj/structure/chair{
-	dir = 8
-	},
 /obj/structure/reagent_dispensers/peppertank{
 	pixel_x = 31
 	},
+/obj/structure/chair/comfy/shuttle{
+	dir = 8
+	},
 /turf/simulated/shuttle/floor{
 	icon_state = "floor4"
 	},
@@ -95230,12 +95229,12 @@
 	},
 /area/shuttle/escape)
 "ddI" = (
-/obj/structure/chair{
-	dir = 4
-	},
 /obj/machinery/light{
 	dir = 8
 	},
+/obj/structure/chair/comfy/shuttle{
+	dir = 4
+	},
 /turf/simulated/shuttle/plating{
 	icon_state = "floorgrime"
 	},
@@ -95381,12 +95380,12 @@
 	name = "\improper Secure Lab"
 	})
 "ddV" = (
-/obj/structure/chair,
 /obj/item/radio/intercom{
 	dir = 4;
 	name = "Station Intercom (General)";
 	pixel_y = 27
 	},
+/obj/structure/chair/comfy/shuttle,
 /turf/simulated/shuttle/floor{
 	icon_state = "floor3"
 	},
@@ -95419,12 +95418,12 @@
 	name = "\improper Secure Lab"
 	})
 "ddY" = (
-/obj/structure/chair{
-	dir = 4
-	},
 /obj/machinery/light{
 	dir = 8
 	},
+/obj/structure/chair/comfy/shuttle{
+	dir = 4
+	},
 /turf/simulated/shuttle/floor{
 	icon_state = "floor4"
 	},
@@ -95651,7 +95650,7 @@
 /turf/simulated/wall/r_wall,
 /area/medical/virology)
 "dev" = (
-/obj/structure/chair{
+/obj/structure/chair/comfy/shuttle{
 	dir = 8
 	},
 /turf/simulated/shuttle/floor{
@@ -97507,6 +97506,12 @@
 	},
 /turf/simulated/floor/plating,
 /area/maintenance/fore)
+"tXL" = (
+/obj/structure/chair/comfy/shuttle{
+	dir = 8
+	},
+/turf/simulated/shuttle/floor4/vox,
+/area/shuttle/vox)
 
 (1,1,1) = {"
 aaa
@@ -112048,7 +112053,7 @@ apf
 abq
 aaa
 abq
-aWw
+aef
 abq
 aaa
 aaa
@@ -112305,7 +112310,7 @@ apf
 aaa
 aaa
 aaa
-aWw
+aef
 aaa
 bZU
 bZU
@@ -134177,9 +134182,9 @@ cHf
 abq
 aaa
 aaa
-aWw
+aef
 cPU
-aWw
+aef
 aaa
 abq
 aaa
@@ -134937,7 +134942,7 @@ aaa
 abq
 aaa
 abq
-aWw
+aef
 abq
 abq
 aaa
@@ -135194,7 +135199,7 @@ abq
 abq
 abq
 abq
-aWw
+aef
 aaa
 aaa
 aaa
@@ -143627,8 +143632,8 @@ aCg
 bjT
 aTR
 bgL
-aWw
-aWw
+aef
+aef
 abq
 abq
 aaa
@@ -144114,7 +144119,7 @@ aaa
 aaa
 aaa
 abq
-aWw
+aef
 aCj
 aDm
 aFm
@@ -144371,7 +144376,7 @@ aaa
 abq
 abq
 abq
-aWw
+aef
 bre
 aCg
 aDn
@@ -147693,8 +147698,8 @@ aaa
 aaa
 adM
 aeF
-afi
-afi
+tXL
+tXL
 aeF
 agJ
 aeh
@@ -148510,8 +148515,8 @@ abq
 aaa
 aaa
 abq
-aWw
-aWw
+aef
+aef
 abq
 bsQ
 abq
diff --git a/_maps/map_files/MetaStation/z2.dmm b/_maps/map_files/MetaStation/z2.dmm
index bed554f54f2..f27926e04f9 100644
--- a/_maps/map_files/MetaStation/z2.dmm
+++ b/_maps/map_files/MetaStation/z2.dmm
@@ -1771,13 +1771,6 @@
 /obj/structure/grille,
 /turf/simulated/shuttle/plating,
 /area/centcom/evac)
-"eP" = (
-/obj/structure/chair{
-	dir = 4;
-	name = "Prosecution"
-	},
-/turf/simulated/shuttle/floor,
-/area/centcom/evac)
 "eQ" = (
 /obj/structure/closet/secure_closet/cargotech,
 /turf/unsimulated/floor{
@@ -5049,27 +5042,27 @@
 	},
 /area/tdome/tdomeobserve)
 "nK" = (
-/obj/structure/chair{
-	dir = 8
-	},
 /obj/machinery/light/small{
 	tag = "icon-bulb1 (EAST)";
 	icon_state = "bulb1";
 	dir = 4
 	},
+/obj/structure/chair/comfy/shuttle{
+	dir = 8
+	},
 /turf/simulated/shuttle/floor{
 	icon_state = "floor4"
 	},
 /area/shuttle/assault_pod)
 "nL" = (
-/obj/structure/chair{
-	dir = 4
-	},
 /obj/machinery/light/small{
 	tag = "icon-bulb1 (WEST)";
 	icon_state = "bulb1";
 	dir = 8
 	},
+/obj/structure/chair/comfy/shuttle{
+	dir = 4
+	},
 /turf/simulated/shuttle/floor{
 	icon_state = "floor4"
 	},
@@ -6113,7 +6106,7 @@
 /turf/space,
 /area/shuttle/escape_pod5/centcom)
 "xF" = (
-/obj/structure/chair{
+/obj/structure/chair/comfy/shuttle{
 	dir = 1
 	},
 /turf/simulated/shuttle/floor{
@@ -6121,7 +6114,7 @@
 	},
 /area/centcom/evac)
 "xG" = (
-/obj/structure/chair{
+/obj/structure/chair/comfy/shuttle{
 	dir = 4
 	},
 /turf/simulated/shuttle/floor{
@@ -6129,7 +6122,7 @@
 	},
 /area/centcom/evac)
 "xW" = (
-/obj/structure/chair{
+/obj/structure/chair/comfy/shuttle{
 	dir = 4
 	},
 /turf/simulated/shuttle/floor,
@@ -6139,13 +6132,13 @@
 /turf/simulated/shuttle/floor,
 /area/centcom/evac)
 "yd" = (
-/obj/structure/chair{
+/obj/structure/chair/comfy/shuttle{
 	dir = 8
 	},
 /turf/simulated/shuttle/floor,
 /area/centcom/evac)
 "yf" = (
-/obj/structure/chair,
+/obj/structure/chair/comfy/shuttle,
 /turf/simulated/shuttle/floor,
 /area/centcom/evac)
 "yg" = (
@@ -6160,12 +6153,6 @@
 	icon_state = "floor4"
 	},
 /area/shuttle/escape)
-"yl" = (
-/obj/structure/chair/sofa/corner,
-/turf/simulated/shuttle/floor{
-	icon_state = "floor4"
-	},
-/area/shuttle/escape)
 "ym" = (
 /obj/structure/chair/office/dark,
 /turf/unsimulated/floor{
@@ -6265,25 +6252,25 @@
 /turf/unsimulated/ai_visible,
 /area/ai_multicam_room)
 "EE" = (
-/obj/structure/chair{
+/obj/machinery/light/small,
+/obj/structure/chair/comfy/shuttle{
 	dir = 1
 	},
-/obj/machinery/light/small,
 /turf/simulated/shuttle/floor{
 	icon_state = "floor4"
 	},
 /area/shuttle/assault_pod)
 "Fz" = (
-/obj/structure/chair,
 /obj/machinery/light/small{
 	dir = 1
 	},
+/obj/structure/chair/comfy/shuttle,
 /turf/simulated/shuttle/floor{
 	icon_state = "floor4"
 	},
 /area/shuttle/assault_pod)
 "FV" = (
-/obj/structure/chair{
+/obj/structure/chair/comfy/shuttle{
 	dir = 4
 	},
 /turf/simulated/shuttle/floor{
@@ -6291,13 +6278,19 @@
 	},
 /area/shuttle/assault_pod)
 "FW" = (
-/obj/structure/chair{
+/obj/structure/chair/comfy/shuttle{
 	dir = 8
 	},
 /turf/simulated/shuttle/floor{
 	icon_state = "floor4"
 	},
 /area/shuttle/assault_pod)
+"Gw" = (
+/obj/structure/chair/sofa/left,
+/turf/simulated/shuttle/floor{
+	icon_state = "floor4"
+	},
+/area/shuttle/escape)
 "HX" = (
 /turf/unsimulated/ai_visible,
 /area/ai_multicam_room)
@@ -27558,7 +27551,7 @@ fe
 fd
 fG
 eh
-eP
+xW
 fd
 fT
 fC
@@ -47108,7 +47101,7 @@ ab
 ab
 ab
 fi
-yk
+Gw
 jE
 jE
 jE
@@ -47365,7 +47358,7 @@ ab
 ab
 ab
 fi
-yl
+jE
 jE
 jE
 jE
diff --git a/_maps/map_files/MetaStation/z4.dmm b/_maps/map_files/MetaStation/z4.dmm
index d73e5d2d490..6b7523f801d 100644
--- a/_maps/map_files/MetaStation/z4.dmm
+++ b/_maps/map_files/MetaStation/z4.dmm
@@ -4864,8 +4864,8 @@
 /area/derelict/se_solar)
 "nv" = (
 /obj/structure/cable,
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/solar/derelict_aft)
 "nw" = (
 /obj/structure/grille,
@@ -4900,8 +4900,8 @@
 	icon_state = "0-2";
 	d2 = 2
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/solar/derelict_aft)
 "nB" = (
 /obj/structure/cable{
@@ -4921,8 +4921,8 @@
 	icon_state = "1-2";
 	pixel_y = 0
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/solar/derelict_aft)
 "nD" = (
 /obj/structure/cable{
@@ -4956,8 +4956,8 @@
 	d2 = 4;
 	icon_state = "2-4"
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/solar/derelict_aft)
 "nG" = (
 /obj/structure/cable{
@@ -4970,8 +4970,8 @@
 	d2 = 4;
 	icon_state = "1-4"
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/solar/derelict_aft)
 "nH" = (
 /obj/structure/cable{
@@ -4979,8 +4979,8 @@
 	d2 = 8;
 	icon_state = "4-8"
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/solar/derelict_aft)
 "nI" = (
 /obj/structure/cable{
@@ -4999,8 +4999,8 @@
 	icon_state = "1-2";
 	pixel_y = 0
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/solar/derelict_aft)
 "nJ" = (
 /obj/structure/cable{
@@ -5013,8 +5013,8 @@
 	d2 = 8;
 	icon_state = "1-8"
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/solar/derelict_aft)
 "nK" = (
 /obj/structure/cable{
@@ -5032,13 +5032,13 @@
 	d2 = 8;
 	icon_state = "1-8"
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/solar/derelict_aft)
 "nL" = (
 /obj/item/stack/cable_coil/cut,
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/space/nearstation)
 "nM" = (
 /turf/simulated/floor/plating/airless{
@@ -5120,8 +5120,8 @@
 /turf/simulated/wall/r_wall,
 /area/derelict/se_solar)
 "oa" = (
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/solar/derelict_aft)
 "ob" = (
 /obj/machinery/door/airlock/external{
@@ -5156,8 +5156,8 @@
 	d2 = 4;
 	icon_state = "2-4"
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/solar/derelict_aft)
 "og" = (
 /obj/structure/closet/emcloset,
@@ -5185,8 +5185,8 @@
 	d2 = 8;
 	icon_state = "2-8"
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/solar/derelict_aft)
 "ok" = (
 /obj/effect/landmark/damageturf,
diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_hermit.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_hermit.dmm
index 74aa1875f96..b6785a746f3 100644
--- a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_hermit.dmm
+++ b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_hermit.dmm
@@ -162,7 +162,7 @@
 /turf/simulated/floor/mineral/titanium/blue,
 /area/ruin/powered)
 "I" = (
-/obj/structure/chair{
+/obj/structure/chair/comfy/shuttle{
 	dir = 4
 	},
 /turf/simulated/floor/mineral/titanium/blue,
diff --git a/_maps/map_files/RandomRuins/SpaceRuins/derelict4.dmm b/_maps/map_files/RandomRuins/SpaceRuins/derelict4.dmm
index 9c29f154adb..1c7d14bd6fa 100644
--- a/_maps/map_files/RandomRuins/SpaceRuins/derelict4.dmm
+++ b/_maps/map_files/RandomRuins/SpaceRuins/derelict4.dmm
@@ -25,16 +25,16 @@
 /turf/simulated/floor/mineral/titanium/blue,
 /area/ruin/unpowered)
 "i" = (
-/obj/structure/chair,
 /obj/structure/window/reinforced{
 	tag = "icon-rwindow (WEST)";
 	icon_state = "rwindow";
 	dir = 8
 	},
+/obj/structure/chair/comfy/shuttle,
 /turf/simulated/floor/mineral/titanium/blue,
 /area/ruin/unpowered)
 "j" = (
-/obj/structure/chair,
+/obj/structure/chair/comfy/shuttle,
 /turf/simulated/floor/mineral/titanium/blue,
 /area/ruin/unpowered)
 "k" = (
@@ -54,9 +54,7 @@
 /turf/simulated/floor/plating/airless,
 /area/ruin/unpowered)
 "n" = (
-/obj/structure/chair{
-	tag = "icon-chair (WEST)";
-	icon_state = "chair";
+/obj/structure/chair/comfy/shuttle{
 	dir = 8
 	},
 /turf/simulated/floor/plating/airless,
@@ -71,26 +69,24 @@
 /area/ruin/unpowered)
 "q" = (
 /obj/item/shard,
-/obj/structure/chair{
-	tag = "icon-chair (WEST)";
-	icon_state = "chair";
+/obj/structure/chair/comfy/shuttle{
 	dir = 8
 	},
 /turf/simulated/floor/mineral/titanium/blue,
 /area/ruin/unpowered)
 "r" = (
-/obj/structure/chair{
-	dir = 1
-	},
 /obj/structure/window/reinforced{
 	tag = "icon-rwindow (WEST)";
 	icon_state = "rwindow";
 	dir = 8
 	},
+/obj/structure/chair/comfy/shuttle{
+	dir = 1
+	},
 /turf/simulated/floor/mineral/titanium/blue,
 /area/ruin/unpowered)
 "s" = (
-/obj/structure/chair{
+/obj/structure/chair/comfy/shuttle{
 	dir = 1
 	},
 /turf/simulated/floor/plating/airless,
diff --git a/_maps/map_files/RandomRuins/SpaceRuins/intactemptyship.dmm b/_maps/map_files/RandomRuins/SpaceRuins/intactemptyship.dmm
index fd6bd8d85fe..a993ab96190 100644
--- a/_maps/map_files/RandomRuins/SpaceRuins/intactemptyship.dmm
+++ b/_maps/map_files/RandomRuins/SpaceRuins/intactemptyship.dmm
@@ -155,7 +155,7 @@
 	},
 /area/ruin/powered)
 "v" = (
-/obj/structure/chair{
+/obj/structure/chair/comfy/shuttle{
 	dir = 4
 	},
 /turf/simulated/shuttle/floor{
@@ -205,7 +205,7 @@
 	},
 /area/ruin/powered)
 "B" = (
-/obj/structure/chair,
+/obj/structure/chair/comfy/shuttle,
 /turf/simulated/shuttle/floor{
 	tag = "icon-floor5";
 	icon_state = "floor5"
diff --git a/_maps/map_files/RandomRuins/SpaceRuins/mechtransport.dmm b/_maps/map_files/RandomRuins/SpaceRuins/mechtransport.dmm
index 02ee81bf42d..ae055f8bc63 100644
--- a/_maps/map_files/RandomRuins/SpaceRuins/mechtransport.dmm
+++ b/_maps/map_files/RandomRuins/SpaceRuins/mechtransport.dmm
@@ -56,9 +56,7 @@
 /turf/simulated/shuttle/floor,
 /area/ruin/powered)
 "m" = (
-/obj/structure/chair/office/dark{
-	tag = "icon-officechair_dark (NORTH)";
-	icon_state = "officechair_dark";
+/obj/structure/chair/comfy/shuttle{
 	dir = 1
 	},
 /turf/simulated/shuttle/floor,
diff --git a/_maps/map_files/RandomRuins/SpaceRuins/oldstation.dmm b/_maps/map_files/RandomRuins/SpaceRuins/oldstation.dmm
index a59e8dad0a9..3ba27975660 100644
--- a/_maps/map_files/RandomRuins/SpaceRuins/oldstation.dmm
+++ b/_maps/map_files/RandomRuins/SpaceRuins/oldstation.dmm
@@ -781,8 +781,8 @@
 /turf/simulated/floor/plating,
 /area/ruin/space/ancientstation/deltacorridor)
 "ck" = (
-/turf/simulated/floor/plating/airless,
 /obj/structure/lattice/catwalk,
+/turf/simulated/floor/plating/airless,
 /area/template_noop)
 "cl" = (
 /obj/structure/transit_tube/station/reverse,
@@ -1819,8 +1819,8 @@
 	d2 = 8;
 	icon_state = "2-8"
 	},
-/turf/simulated/floor/plating/airless,
 /obj/structure/lattice/catwalk,
+/turf/simulated/floor/plating/airless,
 /area/template_noop)
 "eL" = (
 /obj/machinery/light{
@@ -3002,8 +3002,8 @@
 	d2 = 2;
 	icon_state = "1-2"
 	},
-/turf/simulated/floor/plating/airless,
 /obj/structure/lattice/catwalk,
+/turf/simulated/floor/plating/airless,
 /area/template_noop)
 "hg" = (
 /obj/effect/decal/cleanable/dirt,
@@ -3130,8 +3130,8 @@
 	d2 = 4;
 	icon_state = "2-4"
 	},
-/turf/simulated/floor/plating/airless,
 /obj/structure/lattice/catwalk,
+/turf/simulated/floor/plating/airless,
 /area/template_noop)
 "ht" = (
 /obj/structure/cable{
@@ -3310,8 +3310,8 @@
 	d2 = 8;
 	icon_state = "4-8"
 	},
-/turf/simulated/floor/plating/airless,
 /obj/structure/lattice/catwalk,
+/turf/simulated/floor/plating/airless,
 /area/template_noop)
 "hK" = (
 /obj/machinery/atmospherics/pipe/manifold/hidden/supply{
@@ -3722,8 +3722,8 @@
 	d2 = 4;
 	icon_state = "1-4"
 	},
-/turf/simulated/floor/plating/airless,
 /obj/structure/lattice/catwalk,
+/turf/simulated/floor/plating/airless,
 /area/template_noop)
 "iC" = (
 /obj/structure/cable{
@@ -3831,8 +3831,8 @@
 	d2 = 2;
 	icon_state = "1-2"
 	},
-/turf/simulated/floor/plating,
 /obj/structure/lattice/catwalk,
+/turf/simulated/floor/plating,
 /area/template_noop)
 "iP" = (
 /obj/structure/cable/yellow{
@@ -3840,8 +3840,8 @@
 	d2 = 8;
 	icon_state = "1-8"
 	},
-/turf/simulated/floor/plating,
 /obj/structure/lattice/catwalk,
+/turf/simulated/floor/plating,
 /area/template_noop)
 "iQ" = (
 /obj/machinery/light/small,
@@ -4135,8 +4135,8 @@
 	d2 = 8;
 	icon_state = "1-8"
 	},
-/turf/simulated/floor/plating/airless,
 /obj/structure/lattice/catwalk,
+/turf/simulated/floor/plating/airless,
 /area/template_noop)
 "jx" = (
 /obj/effect/decal/cleanable/cobweb,
@@ -4488,8 +4488,8 @@
 	d2 = 4;
 	icon_state = "1-4"
 	},
-/turf/simulated/floor/plating/airless,
 /obj/structure/lattice/catwalk,
+/turf/simulated/floor/plating/airless,
 /area/template_noop)
 "km" = (
 /obj/structure/cable{
@@ -4584,8 +4584,8 @@
 	d2 = 4;
 	icon_state = "1-4"
 	},
-/turf/simulated/floor/plating,
 /obj/structure/lattice/catwalk,
+/turf/simulated/floor/plating,
 /area/template_noop)
 "kw" = (
 /obj/machinery/atmospherics/unary/vent_pump{
@@ -4816,8 +4816,8 @@
 /turf/simulated/floor/plating,
 /area/ruin/space/ancientstation/deltacorridor)
 "kZ" = (
-/turf/simulated/floor/plating,
 /obj/structure/lattice/catwalk,
+/turf/simulated/floor/plating,
 /area/template_noop)
 "la" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
diff --git a/_maps/map_files/RandomRuins/SpaceRuins/spacebar.dmm b/_maps/map_files/RandomRuins/SpaceRuins/spacebar.dmm
index 846ac5068d9..108c8103975 100644
--- a/_maps/map_files/RandomRuins/SpaceRuins/spacebar.dmm
+++ b/_maps/map_files/RandomRuins/SpaceRuins/spacebar.dmm
@@ -64,7 +64,7 @@
 	},
 /area/ruin/powered)
 "ao" = (
-/obj/structure/chair{
+/obj/structure/chair/comfy/shuttle{
 	dir = 1
 	},
 /turf/simulated/shuttle/floor,
diff --git a/_maps/map_files/RandomRuins/SpaceRuins/wizardcrash.dmm b/_maps/map_files/RandomRuins/SpaceRuins/wizardcrash.dmm
index e3d578503f8..67adb3e7467 100644
--- a/_maps/map_files/RandomRuins/SpaceRuins/wizardcrash.dmm
+++ b/_maps/map_files/RandomRuins/SpaceRuins/wizardcrash.dmm
@@ -55,7 +55,7 @@
 	},
 /area/ruin/unpowered)
 "aj" = (
-/obj/structure/chair{
+/obj/structure/chair/comfy/shuttle{
 	dir = 1
 	},
 /turf/simulated/floor/wood,
@@ -314,7 +314,7 @@
 	},
 /area/ruin/unpowered)
 "bb" = (
-/obj/structure/chair,
+/obj/structure/chair/comfy/shuttle,
 /turf/simulated/floor/plasteel{
 	dir = 4;
 	icon_state = "chapel"
diff --git a/_maps/map_files/RandomZLevels/academy.dmm b/_maps/map_files/RandomZLevels/academy.dmm
index 24f93b0a6ce..5d22afc5fcd 100644
--- a/_maps/map_files/RandomZLevels/academy.dmm
+++ b/_maps/map_files/RandomZLevels/academy.dmm
@@ -36,7 +36,7 @@
 /turf/simulated/floor/carpet,
 /area/awaymission/academy/headmaster)
 "ai" = (
-/obj/structure/chair/office/light{
+/obj/structure/chair/comfy/shuttle{
 	dir = 1
 	},
 /turf/simulated/floor/carpet,
@@ -152,7 +152,9 @@
 /turf/simulated/floor/carpet,
 /area/awaymission/academy/headmaster)
 "ax" = (
-/obj/structure/chair/stool,
+/obj/structure/chair/comfy/shuttle{
+	dir = 8
+	},
 /turf/simulated/floor/carpet,
 /area/awaymission/academy/headmaster)
 "ay" = (
@@ -4558,6 +4560,12 @@
 	},
 /turf/simulated/floor/plating,
 /area/awaymission/academy/academygate)
+"vq" = (
+/obj/structure/chair/comfy/shuttle{
+	dir = 4
+	},
+/turf/simulated/floor/carpet,
+/area/awaymission/academy/headmaster)
 
 (1,1,1) = {"
 aa
@@ -13944,9 +13952,9 @@ ab
 aj
 ao
 au
-ax
+vq
 ah
-ax
+vq
 ah
 ah
 ah
diff --git a/_maps/map_files/RandomZLevels/beach.dmm b/_maps/map_files/RandomZLevels/beach.dmm
index 4544e3830d8..2931d7175b7 100644
--- a/_maps/map_files/RandomZLevels/beach.dmm
+++ b/_maps/map_files/RandomZLevels/beach.dmm
@@ -1265,7 +1265,7 @@
 	icon_state = "tube1";
 	dir = 8
 	},
-/obj/structure/chair{
+/obj/structure/chair/comfy/shuttle{
 	dir = 4
 	},
 /turf/simulated/shuttle/floor,
@@ -1275,7 +1275,7 @@
 	dir = 4;
 	icon_state = "tube1"
 	},
-/obj/structure/chair{
+/obj/structure/chair/comfy/shuttle{
 	dir = 8
 	},
 /turf/simulated/shuttle/floor,
@@ -1323,7 +1323,7 @@
 	},
 /area/awaymission/beach)
 "dZ" = (
-/obj/structure/chair{
+/obj/structure/chair/comfy/shuttle{
 	dir = 4
 	},
 /turf/simulated/shuttle/floor,
@@ -1336,7 +1336,7 @@
 	},
 /area/awaymission/beach)
 "eb" = (
-/obj/structure/chair{
+/obj/structure/chair/comfy/shuttle{
 	dir = 8
 	},
 /turf/simulated/shuttle/floor,
@@ -1371,7 +1371,7 @@
 /turf/simulated/shuttle/floor,
 /area/awaymission/beach)
 "ei" = (
-/obj/structure/chair{
+/obj/structure/chair/comfy/shuttle{
 	dir = 1
 	},
 /turf/simulated/shuttle/floor,
diff --git a/_maps/map_files/RandomZLevels/blackmarketpackers.dmm b/_maps/map_files/RandomZLevels/blackmarketpackers.dmm
index 4938088d57f..77e09164224 100644
--- a/_maps/map_files/RandomZLevels/blackmarketpackers.dmm
+++ b/_maps/map_files/RandomZLevels/blackmarketpackers.dmm
@@ -1934,7 +1934,7 @@
 /turf/simulated/floor/plating,
 /area/awaymission/BMPship/Aft)
 "eV" = (
-/obj/structure/chair/office{
+/obj/structure/chair/comfy/shuttle{
 	dir = 8
 	},
 /turf/simulated/floor/plasteel{
diff --git a/_maps/map_files/RandomZLevels/centcomAway.dmm b/_maps/map_files/RandomZLevels/centcomAway.dmm
index 98288fe54da..e64c25da157 100644
--- a/_maps/map_files/RandomZLevels/centcomAway.dmm
+++ b/_maps/map_files/RandomZLevels/centcomAway.dmm
@@ -1059,8 +1059,8 @@
 	pixel_x = 0;
 	tag = ""
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/awaymission/centcomAway/maint)
 "cO" = (
 /obj/structure/cable{
@@ -1082,8 +1082,8 @@
 	pixel_x = 0;
 	tag = ""
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/awaymission/centcomAway/maint)
 "cP" = (
 /obj/structure/table/reinforced,
@@ -1105,7 +1105,7 @@
 	},
 /area/awaymission/centcomAway/hangar)
 "cS" = (
-/obj/structure/chair{
+/obj/structure/chair/comfy/shuttle{
 	dir = 8
 	},
 /turf/simulated/shuttle/floor,
@@ -1166,7 +1166,7 @@
 	},
 /area/awaymission/centcomAway/cafe)
 "da" = (
-/obj/structure/chair{
+/obj/structure/chair/comfy/shuttle{
 	dir = 4
 	},
 /turf/simulated/shuttle/floor{
@@ -1215,7 +1215,7 @@
 	},
 /area/awaymission/centcomAway/hangar)
 "dg" = (
-/obj/structure/chair{
+/obj/structure/chair/comfy/shuttle{
 	dir = 4
 	},
 /turf/simulated/shuttle/floor,
@@ -1310,13 +1310,13 @@
 	},
 /area/awaymission/centcomAway/hangar)
 "dr" = (
-/obj/structure/chair{
-	dir = 8
-	},
 /obj/machinery/light{
 	icon_state = "tube1";
 	dir = 4
 	},
+/obj/structure/chair/comfy/shuttle{
+	dir = 8
+	},
 /turf/simulated/shuttle/floor,
 /area/awaymission/centcomAway/hangar)
 "ds" = (
@@ -1551,8 +1551,8 @@
 	pixel_x = 0;
 	tag = ""
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/awaymission/centcomAway/maint)
 "dV" = (
 /obj/structure/closet/crate,
@@ -1646,8 +1646,8 @@
 	pixel_y = 0;
 	tag = ""
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/awaymission/centcomAway/maint)
 "ei" = (
 /obj/structure/table,
@@ -1694,8 +1694,8 @@
 "eo" = (
 /obj/structure/cable,
 /obj/machinery/power/tracker,
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/awaymission/centcomAway/maint)
 "ep" = (
 /obj/structure/table,
@@ -1972,7 +1972,7 @@
 /turf/simulated/shuttle/floor,
 /area/awaymission/centcomAway/hangar)
 "fc" = (
-/obj/structure/chair,
+/obj/structure/chair/comfy/shuttle,
 /turf/simulated/shuttle/floor,
 /area/awaymission/centcomAway/hangar)
 "fd" = (
@@ -2368,13 +2368,6 @@
 	dir = 5
 	},
 /area/awaymission/centcomAway/general)
-"gb" = (
-/obj/structure/chair{
-	dir = 4;
-	name = "Prosecution"
-	},
-/turf/simulated/shuttle/floor,
-/area/awaymission/centcomAway/hangar)
 "gc" = (
 /turf/simulated/floor/plasteel{
 	dir = 9;
@@ -2967,6 +2960,9 @@
 /obj/item/radio/intercom{
 	pixel_y = 25
 	},
+/obj/structure/chair/comfy/shuttle{
+	dir = 4
+	},
 /turf/simulated/shuttle/floor,
 /area/awaymission/centcomAway/hangar)
 "hF" = (
@@ -4076,7 +4072,7 @@
 /turf/simulated/floor/plating,
 /area/awaymission/centcomAway/hangar)
 "kb" = (
-/obj/structure/chair{
+/obj/structure/chair/comfy/shuttle{
 	dir = 1
 	},
 /mob/living/simple_animal/hostile/russian/ranged{
@@ -6814,6 +6810,15 @@
 	icon_state = "dark"
 	},
 /area/awaymission/centcomAway/thunderdome)
+"Di" = (
+/obj/structure/chair{
+	dir = 4
+	},
+/obj/structure/chair/comfy/shuttle{
+	dir = 4
+	},
+/turf/simulated/shuttle/floor,
+/area/awaymission/centcomAway/hangar)
 
 (1,1,1) = {"
 aa
@@ -11426,7 +11431,7 @@ gX
 gX
 gX
 bP
-dg
+Di
 bP
 oc
 aW
@@ -12205,7 +12210,7 @@ jz
 gX
 gX
 bP
-dg
+Di
 bP
 gX
 gX
@@ -12324,7 +12329,7 @@ bY
 cq
 ei
 bO
-gb
+dg
 cq
 hH
 fA
diff --git a/_maps/map_files/RandomZLevels/moonoutpost19.dmm b/_maps/map_files/RandomZLevels/moonoutpost19.dmm
index bb8fd4406c9..fe5445dc8c3 100644
--- a/_maps/map_files/RandomZLevels/moonoutpost19.dmm
+++ b/_maps/map_files/RandomZLevels/moonoutpost19.dmm
@@ -8413,12 +8413,12 @@
 	name = "MO19 Arrivals"
 	})
 "mb" = (
-/obj/structure/chair{
-	dir = 8
-	},
 /obj/machinery/light/small{
 	dir = 1
 	},
+/obj/structure/chair/comfy/shuttle{
+	dir = 8
+	},
 /turf/simulated/shuttle/floor,
 /area/awaycontent/a1{
 	has_gravity = 1;
@@ -8431,7 +8431,7 @@
 	name = "MO19 Arrivals"
 	})
 "md" = (
-/obj/structure/chair{
+/obj/structure/chair/comfy/shuttle{
 	dir = 8
 	},
 /turf/simulated/shuttle/floor,
@@ -8592,12 +8592,12 @@
 	name = "MO19 Arrivals"
 	})
 "mr" = (
-/obj/structure/chair{
-	dir = 1
-	},
 /obj/machinery/light/small{
 	dir = 4
 	},
+/obj/structure/chair/comfy/shuttle{
+	dir = 1
+	},
 /turf/simulated/shuttle/floor{
 	icon_state = "floor2"
 	},
@@ -8623,12 +8623,12 @@
 	name = "MO19 Arrivals"
 	})
 "mu" = (
-/obj/structure/chair{
-	dir = 8
-	},
 /obj/effect/landmark{
 	name = "awaystart"
 	},
+/obj/structure/chair/comfy/shuttle{
+	dir = 8
+	},
 /turf/simulated/shuttle/floor,
 /area/awaycontent/a1{
 	has_gravity = 1;
@@ -8965,10 +8965,10 @@
 	name = "MO19 Arrivals"
 	})
 "mX" = (
-/obj/structure/chair,
 /obj/machinery/light/small{
 	dir = 4
 	},
+/obj/structure/chair/comfy/shuttle,
 /turf/simulated/shuttle/floor{
 	icon_state = "floor2"
 	},
@@ -9070,10 +9070,10 @@
 	name = "MO19 Arrivals"
 	})
 "nh" = (
-/obj/structure/chair{
+/obj/machinery/light/small,
+/obj/structure/chair/comfy/shuttle{
 	dir = 8
 	},
-/obj/machinery/light/small,
 /turf/simulated/shuttle/floor,
 /area/awaycontent/a1{
 	has_gravity = 1;
diff --git a/_maps/map_files/RandomZLevels/spacebattle.dmm b/_maps/map_files/RandomZLevels/spacebattle.dmm
index ca68a7bb5b5..17341581c9a 100644
--- a/_maps/map_files/RandomZLevels/spacebattle.dmm
+++ b/_maps/map_files/RandomZLevels/spacebattle.dmm
@@ -219,7 +219,7 @@
 	},
 /area/awaymission/spacebattle/syndicate2)
 "aH" = (
-/obj/structure/chair,
+/obj/structure/chair/comfy/shuttle,
 /mob/living/simple_animal/hostile/syndicate,
 /turf/simulated/shuttle/floor{
 	icon_state = "floor4"
@@ -361,7 +361,7 @@
 	},
 /area/awaymission/spacebattle/syndicate1)
 "ba" = (
-/obj/structure/chair{
+/obj/structure/chair/comfy/shuttle{
 	dir = 4
 	},
 /turf/simulated/shuttle/floor{
@@ -369,7 +369,7 @@
 	},
 /area/awaymission/spacebattle/syndicate2)
 "bb" = (
-/obj/structure/chair{
+/obj/structure/chair/comfy/shuttle{
 	dir = 8
 	},
 /turf/simulated/shuttle/floor{
@@ -475,7 +475,7 @@
 	},
 /area/awaymission/spacebattle/syndicate3)
 "bq" = (
-/obj/structure/chair,
+/obj/structure/chair/comfy/shuttle,
 /mob/living/simple_animal/hostile/syndicate,
 /turf/simulated/shuttle/floor{
 	icon_state = "floor4"
@@ -534,7 +534,7 @@
 	},
 /area/awaymission/spacebattle/syndicate1)
 "by" = (
-/obj/structure/chair,
+/obj/structure/chair/comfy/shuttle,
 /mob/living/simple_animal/hostile/syndicate,
 /turf/simulated/shuttle/floor{
 	icon_state = "floor4"
@@ -648,7 +648,7 @@
 /turf/simulated/floor/plating/airless,
 /area/awaymission/spacebattle/cruiser)
 "bN" = (
-/obj/structure/chair{
+/obj/structure/chair/comfy/shuttle{
 	dir = 4
 	},
 /turf/simulated/shuttle/floor{
@@ -656,7 +656,7 @@
 	},
 /area/awaymission/spacebattle/cruiser)
 "bO" = (
-/obj/structure/chair{
+/obj/structure/chair/comfy/shuttle{
 	dir = 8
 	},
 /turf/simulated/shuttle/floor{
@@ -1640,7 +1640,7 @@
 	},
 /area/awaymission/spacebattle/syndicate4)
 "eQ" = (
-/obj/structure/chair{
+/obj/structure/chair/comfy/shuttle{
 	dir = 1
 	},
 /mob/living/simple_animal/hostile/syndicate,
@@ -2421,7 +2421,7 @@
 	},
 /area/awaymission/spacebattle/syndicate7)
 "hM" = (
-/obj/structure/chair{
+/obj/structure/chair/comfy/shuttle{
 	dir = 8
 	},
 /mob/living/simple_animal/hostile/syndicate,
@@ -2729,7 +2729,7 @@
 	},
 /area/awaymission/spacebattle/syndicate5)
 "iI" = (
-/obj/structure/chair{
+/obj/structure/chair/comfy/shuttle{
 	dir = 1
 	},
 /mob/living/simple_animal/hostile/syndicate,
@@ -2815,7 +2815,7 @@
 	},
 /area/awaymission/spacebattle/syndicate6)
 "iW" = (
-/obj/structure/chair{
+/obj/structure/chair/comfy/shuttle{
 	dir = 1
 	},
 /mob/living/simple_animal/hostile/syndicate,
diff --git a/_maps/map_files/RandomZLevels/spacehotel.dmm b/_maps/map_files/RandomZLevels/spacehotel.dmm
index 541156ddc57..8394ca1b635 100644
--- a/_maps/map_files/RandomZLevels/spacehotel.dmm
+++ b/_maps/map_files/RandomZLevels/spacehotel.dmm
@@ -4652,16 +4652,16 @@
 /turf/simulated/shuttle/floor,
 /area/awaymission)
 "kQ" = (
-/obj/structure/chair{
+/obj/structure/chair/comfy/shuttle{
 	dir = 8
 	},
 /turf/simulated/shuttle/floor,
 /area/awaymission)
 "kR" = (
-/obj/structure/chair{
+/obj/item/paper/hotel_scrap_4,
+/obj/structure/chair/comfy/shuttle{
 	dir = 8
 	},
-/obj/item/paper/hotel_scrap_4,
 /turf/simulated/shuttle/floor,
 /area/awaymission)
 "kS" = (
@@ -4709,11 +4709,11 @@
 /turf/simulated/shuttle/plating,
 /area/space/nearstation)
 "la" = (
-/obj/structure/chair{
-	dir = 8
-	},
 /obj/effect/decal/remains/human,
 /obj/effect/decal/cleanable/blood/old,
+/obj/structure/chair/comfy/shuttle{
+	dir = 8
+	},
 /turf/simulated/shuttle/floor,
 /area/awaymission)
 "lb" = (
@@ -4741,17 +4741,17 @@
 	},
 /area/awaymission)
 "lf" = (
-/obj/structure/chair{
+/obj/effect/decal/remains/human,
+/obj/structure/chair/comfy/shuttle{
 	dir = 8
 	},
-/obj/effect/decal/remains/human,
 /turf/simulated/shuttle/floor,
 /area/awaymission)
 "lg" = (
-/obj/structure/chair{
+/obj/effect/decal/cleanable/blood/old,
+/obj/structure/chair/comfy/shuttle{
 	dir = 8
 	},
-/obj/effect/decal/cleanable/blood/old,
 /turf/simulated/shuttle/floor,
 /area/awaymission)
 "lh" = (
diff --git a/_maps/map_files/RandomZLevels/stationCollision.dmm b/_maps/map_files/RandomZLevels/stationCollision.dmm
index 2f225fea612..8910fa36aaa 100644
--- a/_maps/map_files/RandomZLevels/stationCollision.dmm
+++ b/_maps/map_files/RandomZLevels/stationCollision.dmm
@@ -1941,7 +1941,7 @@
 	},
 /area/awaymission/research)
 "ff" = (
-/obj/structure/chair{
+/obj/structure/chair/comfy/shuttle{
 	dir = 4
 	},
 /turf/simulated/shuttle/floor{
@@ -1952,7 +1952,7 @@
 	},
 /area/awaymission/syndishuttle)
 "fg" = (
-/obj/structure/chair{
+/obj/structure/chair/comfy/shuttle{
 	dir = 8
 	},
 /turf/simulated/shuttle/floor{
@@ -2381,7 +2381,7 @@
 	},
 /area/awaymission/arrivalblock)
 "gc" = (
-/obj/structure/chair{
+/obj/structure/chair/comfy/shuttle{
 	dir = 1
 	},
 /turf/simulated/shuttle/floor{
@@ -4196,7 +4196,7 @@
 /turf/simulated/floor/plasteel,
 /area/awaymission/southblock)
 "kO" = (
-/obj/structure/chair{
+/obj/structure/chair/comfy/shuttle{
 	dir = 4
 	},
 /turf/simulated/shuttle/floor{
@@ -4204,13 +4204,13 @@
 	},
 /area/awaymission/arrivalblock)
 "kP" = (
-/obj/structure/chair,
+/obj/structure/chair/comfy/shuttle,
 /turf/simulated/shuttle/floor{
 	icon_state = "floor3"
 	},
 /area/awaymission/arrivalblock)
 "kQ" = (
-/obj/structure/chair{
+/obj/structure/chair/comfy/shuttle{
 	dir = 8
 	},
 /turf/simulated/shuttle/floor{
diff --git a/_maps/map_files/RandomZLevels/wildwest.dmm b/_maps/map_files/RandomZLevels/wildwest.dmm
index f5f7d96e4ea..ca6d20a6eba 100644
--- a/_maps/map_files/RandomZLevels/wildwest.dmm
+++ b/_maps/map_files/RandomZLevels/wildwest.dmm
@@ -2612,7 +2612,7 @@
 	},
 /area/awaymission/wwrefine)
 "ho" = (
-/obj/structure/chair,
+/obj/structure/chair/comfy/shuttle,
 /turf/simulated/shuttle{
 	tag = "icon-floor2";
 	icon_state = "floor2"
diff --git a/_maps/map_files/cyberiad/cyberiad.dmm b/_maps/map_files/cyberiad/cyberiad.dmm
index bed79c4f587..bd37f2193e5 100644
--- a/_maps/map_files/cyberiad/cyberiad.dmm
+++ b/_maps/map_files/cyberiad/cyberiad.dmm
@@ -225,7 +225,7 @@
 /turf/simulated/shuttle/plating,
 /area/shuttle/abandoned)
 "aaF" = (
-/obj/structure/chair{
+/obj/structure/chair/comfy/shuttle{
 	dir = 1
 	},
 /turf/simulated/shuttle/floor{
@@ -413,10 +413,10 @@
 	},
 /area/shuttle/abandoned)
 "abe" = (
-/obj/structure/chair{
+/obj/effect/decal/remains/human,
+/obj/structure/chair/comfy/shuttle{
 	dir = 8
 	},
-/obj/effect/decal/remains/human,
 /turf/simulated/shuttle/floor{
 	icon_state = "floor3"
 	},
@@ -512,13 +512,13 @@
 /area/shuttle/abandoned)
 "abr" = (
 /obj/item/shard,
-/obj/structure/chair,
+/obj/structure/chair/comfy/shuttle,
 /turf/simulated/shuttle/floor{
 	icon_state = "floor3"
 	},
 /area/shuttle/abandoned)
 "abs" = (
-/obj/structure/chair,
+/obj/structure/chair/comfy/shuttle,
 /turf/simulated/shuttle/floor{
 	icon_state = "floor3"
 	},
@@ -811,7 +811,7 @@
 	},
 /area/shuttle/syndicate)
 "ace" = (
-/obj/structure/chair/comfy/black{
+/obj/structure/chair/comfy/shuttle{
 	dir = 1
 	},
 /turf/simulated/shuttle/floor{
@@ -1060,7 +1060,7 @@
 	},
 /area/security/armoury)
 "acI" = (
-/obj/structure/chair{
+/obj/structure/chair/comfy/shuttle{
 	dir = 4
 	},
 /turf/simulated/shuttle/floor{
@@ -1068,7 +1068,7 @@
 	},
 /area/shuttle/syndicate)
 "acJ" = (
-/obj/structure/chair{
+/obj/structure/chair/comfy/shuttle{
 	dir = 8
 	},
 /turf/simulated/shuttle/floor{
@@ -3880,11 +3880,13 @@
 /turf/simulated/shuttle/plating/vox,
 /area/shuttle/vox)
 "ahp" = (
-/obj/structure/chair/stool,
+/obj/structure/chair/comfy/shuttle{
+	dir = 4
+	},
 /turf/simulated/shuttle/floor4/vox,
 /area/shuttle/vox)
 "ahq" = (
-/obj/structure/chair{
+/obj/structure/chair/comfy/shuttle{
 	dir = 1
 	},
 /turf/simulated/shuttle/floor4/vox,
@@ -6976,7 +6978,7 @@
 /area/shuttle/vox)
 "aml" = (
 /obj/item/stack/spacecash/c50,
-/obj/structure/chair{
+/obj/structure/chair/comfy/shuttle{
 	dir = 8
 	},
 /turf/simulated/shuttle/floor4/vox,
@@ -7419,12 +7421,9 @@
 /turf/simulated/shuttle/floor4/vox,
 /area/shuttle/vox)
 "amZ" = (
-/obj/item/stack/spacecash/c200,
-/obj/item/stack/spacecash/c50,
-/obj/structure/chair{
-	dir = 1
+/obj/structure/chair/comfy/shuttle{
+	dir = 8
 	},
-/obj/machinery/light/spot,
 /turf/simulated/shuttle/floor4/vox,
 /area/shuttle/vox)
 "ana" = (
@@ -10422,11 +10421,13 @@
 /turf/simulated/shuttle/plating,
 /area/shuttle/trade/sol)
 "arW" = (
-/obj/structure/chair{
-	dir = 4
+/obj/structure/chair/comfy/shuttle{
+	dir = 1
 	},
-/turf/simulated/shuttle/floor,
-/area/shuttle/trade/sol)
+/turf/simulated/shuttle/floor{
+	icon_state = "floor4"
+	},
+/area/shuttle/siberia)
 "arX" = (
 /obj/structure/cable{
 	icon_state = "0-2";
@@ -10445,15 +10446,14 @@
 /turf/simulated/shuttle/floor,
 /area/shuttle/trade/sol)
 "arZ" = (
-/obj/machinery/atm{
-	pixel_x = 0;
-	pixel_y = 32
+/obj/item/stack/spacecash/c200,
+/obj/item/stack/spacecash/c50,
+/obj/machinery/light/spot,
+/obj/structure/chair/comfy/shuttle{
+	dir = 1
 	},
-/obj/structure/chair{
-	dir = 8
-	},
-/turf/simulated/shuttle/floor,
-/area/shuttle/trade/sol)
+/turf/simulated/shuttle/floor4/vox,
+/area/shuttle/vox)
 "asa" = (
 /obj/effect/spawner/window/reinforced,
 /obj/machinery/door/poddoor/shutters{
@@ -11637,12 +11637,10 @@
 	},
 /area/shuttle/siberia)
 "atL" = (
-/obj/structure/chair/office/dark{
-	dir = 1
-	},
-/turf/simulated/shuttle/floor{
-	icon_state = "floor4"
+/obj/structure/chair/comfy/shuttle{
+	dir = 4
 	},
+/turf/simulated/shuttle/floor,
 /area/shuttle/siberia)
 "atM" = (
 /obj/effect/spawner/window/reinforced,
@@ -12787,17 +12785,19 @@
 /turf/simulated/floor/plasteel,
 /area/security/permabrig)
 "avp" = (
-/obj/structure/chair{
-	dir = 4
+/obj/machinery/flasher{
+	id = "gulagshuttleflasher";
+	pixel_x = 25
 	},
-/obj/item/radio/intercom{
-	broadcasting = 0;
-	listening = 1;
-	name = "station intercom (General)";
-	pixel_y = 25
+/obj/machinery/light{
+	dir = 4;
+	icon_state = "tube1"
+	},
+/obj/structure/chair/comfy/shuttle{
+	dir = 8
 	},
 /turf/simulated/shuttle/floor,
-/area/shuttle/pod_3)
+/area/shuttle/siberia)
 "avq" = (
 /turf/simulated/floor/plating,
 /area/maintenance/fsmaint)
@@ -12840,18 +12840,19 @@
 /turf/simulated/shuttle/floor,
 /area/shuttle/pod_3)
 "avu" = (
-/obj/structure/chair{
+/obj/machinery/light/spot{
+	tag = "icon-tube1 (WEST)";
+	icon_state = "tube1";
+	dir = 8
+	},
+/obj/structure/window/reinforced,
+/obj/structure/chair/comfy/shuttle{
 	dir = 4
 	},
-/obj/machinery/status_display{
-	density = 0;
-	layer = 4;
-	pixel_x = 0;
-	pixel_y = 32
+/turf/simulated/shuttle/floor{
+	icon_state = "floor4"
 	},
-/obj/machinery/light,
-/turf/simulated/shuttle/floor,
-/area/shuttle/pod_3)
+/area/shuttle/syndicate_sit)
 "avv" = (
 /obj/machinery/door/airlock/external{
 	name = "Labor Shuttle Airlock";
@@ -13713,16 +13714,13 @@
 	},
 /area/security/permabrig)
 "awP" = (
-/obj/structure/shuttle/engine/propulsion/burst{
+/obj/structure/chair/comfy/shuttle{
 	dir = 8
 	},
-/turf/simulated/floor/plating,
-/turf/simulated/shuttle/wall{
-	tag = "icon-swall_f6";
-	icon_state = "swall_f6";
-	dir = 2
+/turf/simulated/shuttle/floor{
+	icon_state = "floor4"
 	},
-/area/shuttle/pod_3)
+/area/shuttle/syndicate_sit)
 "awQ" = (
 /obj/structure/cable{
 	d1 = 2;
@@ -13956,30 +13954,31 @@
 /turf/simulated/shuttle/plating,
 /area/shuttle/syndicate_sit)
 "axm" = (
-/obj/structure/chair{
-	dir = 8
+/obj/structure/chair/comfy/shuttle{
+	dir = 4
 	},
-/obj/machinery/flasher{
-	id = "gulagshuttleflasher";
-	pixel_x = 25
+/turf/simulated/shuttle/floor{
+	icon_state = "floor4"
 	},
-/obj/machinery/light{
-	dir = 4;
-	icon_state = "tube1"
-	},
-/turf/simulated/shuttle/floor,
-/area/shuttle/siberia)
+/area/shuttle/syndicate_sit)
 "axn" = (
 /obj/structure/lattice,
 /obj/item/stack/cable_coil,
 /turf/space,
 /area/space/nearstation)
 "axo" = (
-/obj/structure/chair{
+/obj/machinery/light/spot{
+	tag = "icon-tube1 (WEST)";
+	icon_state = "tube1";
+	dir = 8
+	},
+/obj/structure/chair/comfy/shuttle{
 	dir = 4
 	},
-/turf/simulated/shuttle/floor,
-/area/shuttle/siberia)
+/turf/simulated/shuttle/floor{
+	icon_state = "floor4"
+	},
+/area/shuttle/syndicate_elite)
 "axp" = (
 /obj/structure/bookcase,
 /obj/item/book/manual/sop_engineering,
@@ -14332,16 +14331,13 @@
 	},
 /area/security/prison/cell_block/A)
 "axN" = (
-/obj/structure/shuttle/engine/propulsion/burst{
+/obj/structure/chair/comfy/shuttle{
 	dir = 8
 	},
-/turf/simulated/floor/plating,
-/turf/simulated/shuttle/wall{
-	tag = "icon-swall_f5";
-	icon_state = "swall_f5";
-	dir = 2
+/turf/simulated/shuttle/floor{
+	icon_state = "floor4"
 	},
-/area/shuttle/pod_3)
+/area/shuttle/syndicate_elite)
 "axO" = (
 /obj/structure/cable{
 	d1 = 1;
@@ -15206,9 +15202,6 @@
 	},
 /area/security/interrogation)
 "aze" = (
-/obj/structure/chair{
-	dir = 4
-	},
 /obj/machinery/light/spot{
 	tag = "icon-tube1 (WEST)";
 	icon_state = "tube1";
@@ -15217,34 +15210,26 @@
 /turf/simulated/shuttle/floor{
 	icon_state = "floor4"
 	},
+/area/shuttle/syndicate_sit)
+"azf" = (
+/obj/structure/chair/comfy/shuttle{
+	dir = 4
+	},
+/turf/simulated/shuttle/floor{
+	icon_state = "floor4"
+	},
 /area/shuttle/syndicate_elite)
-"azf" = (
-/obj/structure/chair{
-	dir = 4
-	},
-/obj/machinery/light/spot{
-	tag = "icon-tube1 (WEST)";
-	icon_state = "tube1";
-	dir = 8
-	},
-/obj/structure/window/reinforced,
-/turf/simulated/shuttle/floor{
-	icon_state = "floor4"
-	},
-/area/shuttle/syndicate_sit)
 "azg" = (
 /turf/simulated/shuttle/floor{
 	icon_state = "floor4"
 	},
 /area/shuttle/syndicate_elite)
 "azh" = (
-/obj/structure/chair{
-	dir = 8
-	},
+/obj/structure/chair/comfy/shuttle,
 /turf/simulated/shuttle/floor{
 	icon_state = "floor4"
 	},
-/area/shuttle/syndicate_elite)
+/area/shuttle/syndicate_sit)
 "azi" = (
 /obj/machinery/door/window/brigdoor{
 	dir = 2;
@@ -15824,13 +15809,16 @@
 /turf/simulated/floor/plating,
 /area/maintenance/abandonedbar)
 "aAh" = (
-/obj/structure/chair{
-	dir = 4
+/obj/structure/shuttle/engine/propulsion/burst{
+	dir = 8
 	},
-/turf/simulated/shuttle/floor{
-	icon_state = "floor4"
+/turf/simulated/floor/plating,
+/turf/simulated/shuttle/wall{
+	tag = "icon-swall_f6";
+	icon_state = "swall_f6";
+	dir = 2
 	},
-/area/shuttle/syndicate_elite)
+/area/shuttle/pod_3)
 "aAi" = (
 /obj/machinery/computer/camera_advanced/shuttle_docker/ert,
 /turf/simulated/shuttle/floor{
@@ -16433,21 +16421,30 @@
 /turf/simulated/floor/plating,
 /area/maintenance/abandonedbar)
 "aBk" = (
-/obj/structure/chair{
+/obj/item/radio/intercom{
+	broadcasting = 0;
+	listening = 1;
+	name = "station intercom (General)";
+	pixel_y = 25
+	},
+/obj/structure/chair/comfy/shuttle{
 	dir = 4
 	},
-/turf/simulated/shuttle/floor{
-	icon_state = "floor4"
-	},
-/area/shuttle/syndicate_sit)
+/turf/simulated/shuttle/floor,
+/area/shuttle/pod_3)
 "aBl" = (
-/obj/structure/chair{
-	dir = 8
+/obj/machinery/status_display{
+	density = 0;
+	layer = 4;
+	pixel_x = 0;
+	pixel_y = 32
 	},
-/turf/simulated/shuttle/floor{
-	icon_state = "floor4"
+/obj/machinery/light,
+/obj/structure/chair/comfy/shuttle{
+	dir = 4
 	},
-/area/shuttle/syndicate_sit)
+/turf/simulated/shuttle/floor,
+/area/shuttle/pod_3)
 "aBm" = (
 /obj/item/stack/rods,
 /turf/space,
@@ -17326,24 +17323,22 @@
 /turf/simulated/floor/plating,
 /area/maintenance/abandonedbar)
 "aCX" = (
-/obj/structure/chair,
+/obj/structure/shuttle/engine/propulsion/burst{
+	dir = 8
+	},
+/turf/simulated/floor/plating,
+/turf/simulated/shuttle/wall{
+	tag = "icon-swall_f5";
+	icon_state = "swall_f5";
+	dir = 2
+	},
+/area/shuttle/pod_3)
+"aCY" = (
+/obj/structure/chair/comfy/shuttle,
 /turf/simulated/shuttle/floor{
 	icon_state = "floor4"
 	},
 /area/shuttle/syndicate_elite)
-"aCY" = (
-/obj/machinery/light/spot{
-	tag = "icon-tube1 (WEST)";
-	icon_state = "tube1";
-	dir = 8
-	},
-/obj/structure/chair{
-	dir = 4
-	},
-/turf/simulated/shuttle/floor{
-	icon_state = "floor4"
-	},
-/area/shuttle/syndicate_sit)
 "aCZ" = (
 /obj/structure/disposalpipe/segment,
 /obj/machinery/light{
@@ -21081,9 +21076,6 @@
 	},
 /area/shuttle/pod_1)
 "aLb" = (
-/obj/structure/chair{
-	dir = 1
-	},
 /obj/machinery/status_display{
 	density = 0;
 	layer = 4;
@@ -21094,6 +21086,9 @@
 	dir = 4;
 	icon_state = "tube1"
 	},
+/obj/structure/chair/comfy/shuttle{
+	dir = 1
+	},
 /turf/simulated/shuttle/floor,
 /area/shuttle/pod_1)
 "aLc" = (
@@ -21111,9 +21106,6 @@
 	},
 /area/shuttle/pod_2)
 "aLf" = (
-/obj/structure/chair{
-	dir = 1
-	},
 /obj/machinery/status_display{
 	density = 0;
 	layer = 4;
@@ -21124,6 +21116,9 @@
 	dir = 4;
 	icon_state = "tube1"
 	},
+/obj/structure/chair/comfy/shuttle{
+	dir = 1
+	},
 /turf/simulated/shuttle/floor,
 /area/shuttle/pod_2)
 "aLg" = (
@@ -21759,14 +21754,14 @@
 /turf/simulated/floor/plating,
 /area/maintenance/fsmaint2)
 "aMp" = (
-/obj/structure/chair{
-	dir = 1
-	},
 /obj/item/radio/intercom{
 	dir = 4;
 	name = "station intercom (General)";
 	pixel_x = 28
 	},
+/obj/structure/chair/comfy/shuttle{
+	dir = 1
+	},
 /turf/simulated/shuttle/floor,
 /area/shuttle/pod_1)
 "aMq" = (
@@ -21779,14 +21774,14 @@
 /turf/simulated/wall,
 /area/hallway/secondary/entry)
 "aMt" = (
-/obj/structure/chair{
-	dir = 1
-	},
 /obj/item/radio/intercom{
 	dir = 4;
 	name = "station intercom (General)";
 	pixel_x = 28
 	},
+/obj/structure/chair/comfy/shuttle{
+	dir = 1
+	},
 /turf/simulated/shuttle/floor,
 /area/shuttle/pod_2)
 "aMu" = (
@@ -23414,8 +23409,8 @@
 	},
 /area/shuttle/pod_2)
 "aPV" = (
-/obj/structure/chair{
-	dir = 8
+/obj/structure/chair/comfy/shuttle{
+	dir = 4
 	},
 /turf/simulated/shuttle/floor,
 /area/shuttle/trade/sol)
@@ -28110,13 +28105,13 @@
 /turf/simulated/floor/plating,
 /area/maintenance/fsmaint2)
 "aYL" = (
-/obj/structure/chair{
-	dir = 8
-	},
 /obj/machinery/light{
 	dir = 1;
 	on = 1
 	},
+/obj/structure/chair/comfy/shuttle{
+	dir = 8
+	},
 /turf/simulated/shuttle/floor,
 /area/shuttle/arrival/station)
 "aYM" = (
@@ -28228,12 +28223,12 @@
 /turf/simulated/floor/plating,
 /area/maintenance/fsmaint2)
 "aYZ" = (
-/obj/structure/chair{
-	dir = 8
-	},
 /obj/effect/landmark{
 	name = "JoinLate"
 	},
+/obj/structure/chair/comfy/shuttle{
+	dir = 8
+	},
 /turf/simulated/shuttle/floor,
 /area/shuttle/arrival/station)
 "aZa" = (
@@ -30143,11 +30138,15 @@
 /turf/simulated/shuttle/floor,
 /area/shuttle/escape)
 "bcK" = (
-/obj/structure/chair/comfy/black{
-	dir = 1
+/obj/machinery/atm{
+	pixel_x = 0;
+	pixel_y = 32
+	},
+/obj/structure/chair/comfy/shuttle{
+	dir = 8
 	},
 /turf/simulated/shuttle/floor,
-/area/shuttle/escape)
+/area/shuttle/trade/sol)
 "bcL" = (
 /obj/machinery/computer/communications,
 /turf/simulated/shuttle/floor,
@@ -30160,10 +30159,10 @@
 /turf/simulated/floor/plasteel,
 /area/hallway/secondary/entry)
 "bcN" = (
-/obj/structure/chair{
+/obj/machinery/light,
+/obj/structure/chair/comfy/shuttle{
 	dir = 8
 	},
-/obj/machinery/light,
 /turf/simulated/shuttle/floor,
 /area/shuttle/arrival/station)
 "bcO" = (
@@ -31176,11 +31175,11 @@
 /turf/simulated/shuttle/floor,
 /area/shuttle/escape)
 "beB" = (
-/obj/structure/chair{
-	dir = 1
+/obj/structure/chair/comfy/shuttle{
+	dir = 8
 	},
 /turf/simulated/shuttle/floor,
-/area/shuttle/escape)
+/area/shuttle/trade/sol)
 "beC" = (
 /turf/simulated/shuttle/floor,
 /area/shuttle/escape)
@@ -32203,23 +32202,39 @@
 /turf/simulated/floor/plasteel,
 /area/hallway/secondary/entry)
 "bgo" = (
-/obj/structure/chair{
-	dir = 1
+/obj/machinery/flasher{
+	id = "soltraderflash";
+	pixel_y = -28
 	},
-/obj/structure/closet/walllocker/emerglocker{
-	pixel_x = -28
+/obj/structure/chair/comfy/shuttle{
+	dir = 8
 	},
 /turf/simulated/shuttle/floor,
-/area/shuttle/escape)
+/area/shuttle/trade/sol)
 "bgp" = (
-/obj/structure/chair{
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 6
+	},
+/turf/simulated/floor/plasteel{
+	dir = 2;
+	icon_state = "asteroid";
+	tag = "icon-asteroid (NORTH)"
+	},
+/turf/simulated/floor/plasteel{
+	tag = "icon-siding2 (NORTH)";
+	icon_state = "siding2";
 	dir = 1
 	},
-/obj/structure/closet/walllocker/emerglocker{
-	pixel_x = 28
+/turf/simulated/floor/plasteel{
+	tag = "icon-siding1 (NORTH)";
+	icon_state = "siding1";
+	dir = 1
 	},
-/turf/simulated/shuttle/floor,
-/area/shuttle/escape)
+/area/hydroponics)
 "bgq" = (
 /obj/machinery/power/apc{
 	dir = 1;
@@ -33193,21 +33208,56 @@
 /turf/simulated/shuttle/floor,
 /area/shuttle/escape)
 "bil" = (
-/obj/structure/chair{
-	dir = 8
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
 	},
-/turf/simulated/shuttle/floor,
-/area/shuttle/escape)
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/mob/living/simple_animal/pig,
+/turf/simulated/floor/plasteel{
+	dir = 2;
+	icon_state = "asteroid";
+	tag = "icon-asteroid (NORTH)"
+	},
+/turf/simulated/floor/plasteel{
+	tag = "icon-siding1 (NORTH)";
+	icon_state = "siding1";
+	dir = 1
+	},
+/turf/simulated/floor/plasteel{
+	tag = "icon-siding2 (NORTH)";
+	icon_state = "siding2";
+	dir = 1
+	},
+/area/hydroponics)
 "bim" = (
 /obj/machinery/light/spot,
 /turf/simulated/shuttle/floor,
 /area/shuttle/escape)
 "bin" = (
-/obj/structure/chair{
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
-/turf/simulated/shuttle/floor,
-/area/shuttle/escape)
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/turf/simulated/floor/plasteel{
+	dir = 2;
+	icon_state = "asteroid";
+	tag = "icon-asteroid (NORTH)"
+	},
+/turf/simulated/floor/plasteel{
+	tag = "icon-siding1 (NORTH)";
+	icon_state = "siding1";
+	dir = 1
+	},
+/turf/simulated/floor/plasteel{
+	tag = "icon-siding2 (NORTH)";
+	icon_state = "siding2";
+	dir = 1
+	},
+/area/hydroponics)
 "bio" = (
 /obj/effect/spawner/lootdrop/maintenance,
 /obj/structure/cable{
@@ -33755,80 +33805,33 @@
 	},
 /area/hydroponics)
 "bje" = (
-/obj/structure/disposalpipe/segment,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 6
-	},
-/turf/simulated/floor/plasteel{
-	dir = 2;
-	icon_state = "asteroid";
-	tag = "icon-asteroid (NORTH)"
-	},
-/turf/simulated/floor/plasteel{
-	tag = "icon-siding2 (NORTH)";
-	icon_state = "siding2";
+/obj/structure/chair/comfy/shuttle{
 	dir = 1
 	},
-/turf/simulated/floor/plasteel{
-	tag = "icon-siding1 (NORTH)";
-	icon_state = "siding1";
-	dir = 1
-	},
-/area/hydroponics)
+/turf/simulated/shuttle/floor,
+/area/shuttle/escape)
 "bjf" = (
 /obj/structure/reagent_dispensers/beerkeg,
 /turf/simulated/floor/wood,
 /area/crew_quarters/bar)
 "bjg" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
+/obj/structure/closet/walllocker/emerglocker{
+	pixel_x = -28
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
-/mob/living/simple_animal/pig,
-/turf/simulated/floor/plasteel{
-	dir = 2;
-	icon_state = "asteroid";
-	tag = "icon-asteroid (NORTH)"
-	},
-/turf/simulated/floor/plasteel{
-	tag = "icon-siding1 (NORTH)";
-	icon_state = "siding1";
+/obj/structure/chair/comfy/shuttle{
 	dir = 1
 	},
-/turf/simulated/floor/plasteel{
-	tag = "icon-siding2 (NORTH)";
-	icon_state = "siding2";
-	dir = 1
-	},
-/area/hydroponics)
+/turf/simulated/shuttle/floor,
+/area/shuttle/escape)
 "bjh" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 4
+/obj/structure/closet/walllocker/emerglocker{
+	pixel_x = 28
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
-/turf/simulated/floor/plasteel{
-	dir = 2;
-	icon_state = "asteroid";
-	tag = "icon-asteroid (NORTH)"
-	},
-/turf/simulated/floor/plasteel{
-	tag = "icon-siding1 (NORTH)";
-	icon_state = "siding1";
+/obj/structure/chair/comfy/shuttle{
 	dir = 1
 	},
-/turf/simulated/floor/plasteel{
-	tag = "icon-siding2 (NORTH)";
-	icon_state = "siding2";
-	dir = 1
-	},
-/area/hydroponics)
+/turf/simulated/shuttle/floor,
+/area/shuttle/escape)
 "bji" = (
 /obj/item/radio/beacon,
 /turf/simulated/floor/plasteel,
@@ -34947,16 +34950,10 @@
 /turf/simulated/floor/carpet,
 /area/crew_quarters/bar)
 "blu" = (
-/obj/machinery/status_display{
-	pixel_y = 30
+/obj/structure/chair/comfy/shuttle{
+	dir = 8
 	},
-/obj/machinery/light/spot{
-	tag = "icon-tube1 (NORTH)";
-	icon_state = "tube1";
-	dir = 1
-	},
-/obj/structure/chair,
-/turf/simulated/shuttle/floor4,
+/turf/simulated/shuttle/floor,
 /area/shuttle/escape)
 "blv" = (
 /obj/machinery/status_display{
@@ -35005,12 +35002,10 @@
 /turf/simulated/floor/carpet,
 /area/chapel/main)
 "blA" = (
-/obj/structure/chair{
+/obj/structure/chair/comfy/shuttle{
 	dir = 4
 	},
-/turf/simulated/shuttle/floor{
-	icon_state = "floor3"
-	},
+/turf/simulated/shuttle/floor,
 /area/shuttle/escape)
 "blB" = (
 /obj/structure/sign/securearea{
@@ -35025,12 +35020,10 @@
 /turf/simulated/floor/plasteel,
 /area/hallway/secondary/entry)
 "blC" = (
-/obj/structure/chair{
-	dir = 8
-	},
-/turf/simulated/shuttle/floor{
-	icon_state = "floor3"
+/obj/structure/chair/comfy/shuttle{
+	dir = 4
 	},
+/turf/simulated/shuttle/floor4,
 /area/shuttle/escape)
 "blD" = (
 /obj/structure/grille,
@@ -35780,13 +35773,19 @@
 /turf/simulated/floor/plasteel,
 /area/hallway/primary/central/nw)
 "bmX" = (
-/obj/structure/chair{
-	dir = 4
+/obj/machinery/status_display{
+	pixel_y = 30
 	},
+/obj/machinery/light/spot{
+	tag = "icon-tube1 (NORTH)";
+	icon_state = "tube1";
+	dir = 1
+	},
+/obj/structure/chair/comfy/shuttle,
 /turf/simulated/shuttle/floor4,
 /area/shuttle/escape)
 "bmY" = (
-/obj/structure/chair,
+/obj/structure/chair/comfy/shuttle,
 /turf/simulated/shuttle/floor4,
 /area/shuttle/escape)
 "bmZ" = (
@@ -35815,12 +35814,9 @@
 /turf/simulated/floor/plating,
 /area/shuttle/escape)
 "bnc" = (
-/obj/structure/chair{
+/obj/structure/chair/comfy/shuttle{
 	dir = 8
 	},
-/obj/structure/closet/walllocker/emerglocker{
-	pixel_x = 28
-	},
 /turf/simulated/shuttle/floor{
 	icon_state = "floor3"
 	},
@@ -38803,39 +38799,25 @@
 	},
 /area/maintenance/asmaint2)
 "btt" = (
-/obj/structure/chair{
+/obj/structure/chair/comfy/shuttle{
 	dir = 4
 	},
-/obj/item/radio/intercom{
-	dir = 8;
-	name = "station intercom (General)";
-	pixel_x = -28
-	},
-/obj/machinery/light/spot{
-	tag = "icon-tube1 (WEST)";
-	icon_state = "tube1";
-	dir = 8
-	},
 /turf/simulated/shuttle/floor{
 	icon_state = "floor3"
 	},
 /area/shuttle/escape)
 "btu" = (
-/obj/structure/chair{
-	dir = 8
+/obj/structure/shuttle/engine/propulsion{
+	dir = 8;
+	icon_state = "propulsion";
+	tag = "icon-propulsion (EAST)"
 	},
-/obj/structure/closet/walllocker/emerglocker{
-	pixel_x = 28
+/turf/space,
+/turf/simulated/shuttle/wall{
+	icon_state = "swall_f6";
+	dir = 2
 	},
-/obj/machinery/light/spot{
-	tag = "icon-tube1 (EAST)";
-	icon_state = "tube1";
-	dir = 4
-	},
-/turf/simulated/shuttle/floor{
-	icon_state = "floor3"
-	},
-/area/shuttle/escape)
+/area/shuttle/transport)
 "btv" = (
 /turf/simulated/shuttle/floor,
 /turf/simulated/shuttle/wall/interior{
@@ -38864,23 +38846,18 @@
 /turf/simulated/floor/wood,
 /area/crew_quarters/bar)
 "bty" = (
-/obj/structure/chair{
-	dir = 4
-	},
 /obj/machinery/light/spot{
 	tag = "icon-tube1 (NORTH)";
 	icon_state = "tube1";
 	dir = 1
 	},
+/obj/structure/chair/comfy/shuttle{
+	dir = 4
+	},
 /turf/simulated/shuttle/floor,
 /area/shuttle/transport)
 "btz" = (
-/obj/structure/chair,
-/obj/machinery/light/spot{
-	tag = "icon-tube1 (NORTH)";
-	icon_state = "tube1";
-	dir = 1
-	},
+/obj/structure/chair/comfy/shuttle,
 /turf/simulated/shuttle/floor,
 /area/shuttle/transport)
 "btA" = (
@@ -38906,7 +38883,12 @@
 /turf/simulated/shuttle/floor,
 /area/shuttle/transport)
 "btD" = (
-/obj/structure/chair,
+/obj/machinery/light/spot{
+	tag = "icon-tube1 (NORTH)";
+	icon_state = "tube1";
+	dir = 1
+	},
+/obj/structure/chair/comfy/shuttle,
 /turf/simulated/shuttle/floor,
 /area/shuttle/transport)
 "btE" = (
@@ -40463,16 +40445,21 @@
 /turf/simulated/shuttle/floor,
 /area/shuttle/transport)
 "bwI" = (
-/obj/structure/chair{
-	dir = 1
+/obj/structure/shuttle/engine/propulsion{
+	dir = 8;
+	icon_state = "propulsion";
+	tag = "icon-propulsion (EAST)"
+	},
+/turf/space,
+/turf/simulated/shuttle/wall{
+	icon_state = "swall_f5";
+	dir = 2
 	},
-/turf/simulated/shuttle/floor,
 /area/shuttle/transport)
 "bwJ" = (
-/obj/structure/chair{
+/obj/structure/chair/comfy/shuttle{
 	dir = 1
 	},
-/obj/machinery/light/spot,
 /turf/simulated/shuttle/floor,
 /area/shuttle/transport)
 "bwK" = (
@@ -40655,17 +40642,14 @@
 /turf/simulated/floor/plasteel,
 /area/hallway/secondary/exit)
 "bwX" = (
-/obj/structure/shuttle/engine/propulsion{
-	dir = 8;
-	icon_state = "propulsion";
-	tag = "icon-propulsion (EAST)"
+/obj/structure/closet/walllocker/emerglocker{
+	pixel_x = -28
 	},
-/turf/space,
-/turf/simulated/shuttle/wall{
-	icon_state = "swall_f6";
-	dir = 2
+/obj/structure/chair/comfy/shuttle{
+	dir = 4
 	},
-/area/shuttle/transport)
+/turf/simulated/shuttle/floor4,
+/area/shuttle/escape)
 "bwY" = (
 /obj/machinery/power/apc{
 	dir = 4;
@@ -41451,17 +41435,16 @@
 	},
 /area/hallway/primary/central/ne)
 "bys" = (
-/obj/structure/shuttle/engine/propulsion{
-	dir = 8;
-	icon_state = "propulsion";
-	tag = "icon-propulsion (EAST)"
+/obj/structure/closet/walllocker/emerglocker{
+	pixel_x = 28
 	},
-/turf/space,
-/turf/simulated/shuttle/wall{
-	icon_state = "swall_f5";
-	dir = 2
+/obj/structure/chair/comfy/shuttle{
+	dir = 8
 	},
-/area/shuttle/transport)
+/turf/simulated/shuttle/floor{
+	icon_state = "floor3"
+	},
+/area/shuttle/escape)
 "byt" = (
 /obj/machinery/door/airlock/command/glass{
 	name = "Bridge";
@@ -42700,20 +42683,12 @@
 	},
 /area/shuttle/specops)
 "bAS" = (
-/obj/machinery/recharger/wallcharger{
-	pixel_x = 4;
-	pixel_y = 32
-	},
-/obj/machinery/light/spot{
-	tag = "icon-tube1 (NORTH)";
-	icon_state = "tube1";
+/obj/machinery/light/spot,
+/obj/structure/chair/comfy/shuttle{
 	dir = 1
 	},
-/obj/structure/chair,
-/turf/simulated/shuttle/floor{
-	icon_state = "floor4"
-	},
-/area/shuttle/specops)
+/turf/simulated/shuttle/floor,
+/area/shuttle/transport)
 "bAT" = (
 /turf/space,
 /turf/simulated/shuttle/wall{
@@ -43168,11 +43143,8 @@
 /turf/simulated/floor/plating,
 /area/shuttle/escape)
 "bBT" = (
-/obj/structure/chair{
-	dir = 4
-	},
-/obj/structure/closet/walllocker/emerglocker{
-	pixel_x = -28
+/obj/structure/chair/comfy/shuttle{
+	dir = 1
 	},
 /turf/simulated/shuttle/floor4,
 /area/shuttle/escape)
@@ -43222,11 +43194,12 @@
 	},
 /area/shuttle/escape)
 "bBZ" = (
-/obj/machinery/recharger/wallcharger{
-	pixel_x = 4;
-	pixel_y = 32
+/obj/machinery/camera{
+	c_tag = "CentComm Special Ops. Shuttle";
+	dir = 2;
+	network = list("ERT","CentComm")
 	},
-/obj/structure/chair,
+/obj/structure/chair/comfy/shuttle,
 /turf/simulated/shuttle/floor{
 	icon_state = "floor4"
 	},
@@ -43266,12 +43239,11 @@
 /turf/unsimulated/floor,
 /area/shuttle/specops)
 "bCe" = (
-/obj/machinery/camera{
-	c_tag = "CentComm Special Ops. Shuttle";
-	dir = 2;
-	network = list("ERT","CentComm")
+/obj/machinery/recharger/wallcharger{
+	pixel_x = 4;
+	pixel_y = 32
 	},
-/obj/structure/chair,
+/obj/structure/chair/comfy/shuttle,
 /turf/simulated/shuttle/floor{
 	icon_state = "floor4"
 	},
@@ -44022,14 +43994,16 @@
 	},
 /area/shuttle/escape)
 "bDG" = (
-/obj/structure/chair{
-	dir = 4
+/obj/machinery/recharger/wallcharger{
+	pixel_x = 4;
+	pixel_y = 32
 	},
 /obj/machinery/light/spot{
-	tag = "icon-tube1 (WEST)";
+	tag = "icon-tube1 (NORTH)";
 	icon_state = "tube1";
-	dir = 8
+	dir = 1
 	},
+/obj/structure/chair/comfy/shuttle,
 /turf/simulated/shuttle/floor{
 	icon_state = "floor4"
 	},
@@ -44514,8 +44488,10 @@
 	},
 /area/shuttle/specops)
 "bEL" = (
-/obj/structure/chair{
-	dir = 1
+/obj/machinery/light/spot{
+	tag = "icon-tube1 (WEST)";
+	icon_state = "tube1";
+	dir = 8
 	},
 /turf/simulated/shuttle/floor{
 	icon_state = "floor4"
@@ -45607,11 +45583,13 @@
 /turf/simulated/floor/plasteel,
 /area/hallway/secondary/exit)
 "bGJ" = (
-/obj/structure/chair{
+/obj/structure/chair/comfy/shuttle{
 	dir = 1
 	},
-/turf/simulated/shuttle/floor4,
-/area/shuttle/escape)
+/turf/simulated/shuttle/floor{
+	icon_state = "floor4"
+	},
+/area/shuttle/specops)
 "bGK" = (
 /obj/effect/spawner/window/reinforced,
 /obj/machinery/door/poddoor{
@@ -50861,6 +50839,24 @@
 	icon_state = "diagonalWall3"
 	},
 /area/shuttle/administration)
+"bPM" = (
+/obj/item/radio/intercom{
+	dir = 8;
+	name = "station intercom (General)";
+	pixel_x = -28
+	},
+/obj/machinery/light/spot{
+	tag = "icon-tube1 (WEST)";
+	icon_state = "tube1";
+	dir = 8
+	},
+/obj/structure/chair/comfy/shuttle{
+	dir = 4
+	},
+/turf/simulated/shuttle/floor{
+	icon_state = "floor3"
+	},
+/area/shuttle/escape)
 "bPN" = (
 /obj/machinery/door/airlock/external{
 	id_tag = "s_docking_airlock";
@@ -52059,6 +52055,22 @@
 	icon_state = "wall3"
 	},
 /area/shuttle/administration)
+"bRH" = (
+/obj/structure/closet/walllocker/emerglocker{
+	pixel_x = 28
+	},
+/obj/machinery/light/spot{
+	tag = "icon-tube1 (EAST)";
+	icon_state = "tube1";
+	dir = 4
+	},
+/obj/structure/chair/comfy/shuttle{
+	dir = 8
+	},
+/turf/simulated/shuttle/floor{
+	icon_state = "floor3"
+	},
+/area/shuttle/escape)
 "bRI" = (
 /obj/structure/plasticflaps/mining,
 /obj/machinery/conveyor/east{
@@ -54136,6 +54148,20 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /turf/simulated/floor/plasteel,
 /area/engine/gravitygenerator)
+"bVk" = (
+/obj/structure/chair/comfy/shuttle{
+	dir = 4
+	},
+/turf/simulated/shuttle/floor{
+	icon_state = "floor2"
+	},
+/area/shuttle/constructionsite)
+"bVl" = (
+/obj/machinery/light,
+/turf/simulated/shuttle/floor{
+	icon_state = "floor2"
+	},
+/area/shuttle/constructionsite)
 "bVm" = (
 /obj/machinery/light/spot{
 	tag = "icon-tube1 (WEST)";
@@ -55105,6 +55131,35 @@
 	icon_state = "floor4"
 	},
 /area/shuttle/administration)
+"bWO" = (
+/obj/machinery/light/spot{
+	tag = "icon-tube1 (NORTH)";
+	icon_state = "tube1";
+	dir = 1
+	},
+/obj/machinery/door_control{
+	id = "adminshuttleblast";
+	name = "Blast door control";
+	pixel_x = -5;
+	pixel_y = 35;
+	req_access = list(101);
+	req_access_txt = "0"
+	},
+/obj/machinery/door_control{
+	id = "adminshuttleshutters";
+	name = "Shutter control";
+	pixel_x = 5;
+	pixel_y = 35;
+	req_access = list(101);
+	req_access_txt = "0"
+	},
+/obj/structure/chair/comfy/shuttle{
+	dir = 4
+	},
+/turf/simulated/shuttle/floor{
+	icon_state = "floor4"
+	},
+/area/shuttle/administration)
 "bWP" = (
 /obj/machinery/door/airlock/external{
 	id_tag = "s_docking_airlock";
@@ -56079,6 +56134,18 @@
 	icon_state = "floor4"
 	},
 /area/shuttle/administration)
+"bYu" = (
+/obj/item/radio/intercom{
+	broadcasting = 0;
+	listening = 1;
+	name = "station intercom (General)";
+	pixel_y = 25
+	},
+/obj/structure/chair/comfy/shuttle{
+	dir = 4
+	},
+/turf/simulated/shuttle/floor,
+/area/shuttle/pod_4)
 "bYv" = (
 /turf/space,
 /turf/simulated/shuttle/wall{
@@ -57361,6 +57428,19 @@
 "cam" = (
 /turf/simulated/wall,
 /area/quartermaster/miningdock)
+"can" = (
+/obj/machinery/status_display{
+	density = 0;
+	layer = 4;
+	pixel_x = 0;
+	pixel_y = 32
+	},
+/obj/machinery/light,
+/obj/structure/chair/comfy/shuttle{
+	dir = 4
+	},
+/turf/simulated/shuttle/floor,
+/area/shuttle/pod_4)
 "cao" = (
 /obj/structure/filingcabinet,
 /turf/simulated/floor/plasteel,
@@ -58157,13 +58237,34 @@
 /turf/simulated/floor/plasteel/airless,
 /area/toxins/test_area)
 "cbx" = (
-/obj/structure/chair/comfy/black{
+/obj/structure/chair/comfy/shuttle{
 	dir = 4
 	},
 /turf/simulated/shuttle/floor{
 	icon_state = "floor4"
 	},
 /area/shuttle/administration)
+"cby" = (
+/obj/machinery/light/spot{
+	tag = "icon-tube1 (EAST)";
+	icon_state = "tube1";
+	dir = 4
+	},
+/obj/structure/chair/comfy/shuttle{
+	dir = 8
+	},
+/turf/simulated/shuttle/floor{
+	icon_state = "floor4"
+	},
+/area/shuttle/administration)
+"cbz" = (
+/obj/structure/chair/comfy/shuttle{
+	dir = 8
+	},
+/turf/simulated/shuttle/floor{
+	icon_state = "floor4"
+	},
+/area/shuttle/administration)
 "cbA" = (
 /obj/machinery/door/poddoor/shutters{
 	density = 0;
@@ -58234,9 +58335,6 @@
 	d2 = 4;
 	icon_state = "0-4"
 	},
-/obj/effect/landmark/start{
-	name = "Shaft Miner"
-	},
 /turf/simulated/floor/plasteel,
 /area/quartermaster/miningdock)
 "cbI" = (
@@ -59419,6 +59517,12 @@
 	icon_state = "floor3"
 	},
 /area/shuttle/administration)
+"cdq" = (
+/obj/structure/chair/comfy/shuttle{
+	dir = 1
+	},
+/turf/simulated/shuttle/floor,
+/area/shuttle/mining)
 "cdr" = (
 /obj/machinery/computer/camera_advanced/shuttle_docker/admin{
 	name = "NTV Argos shuttle navigation computer"
@@ -60195,6 +60299,18 @@
 	tag = "icon-cafeteria (NORTHEAST)"
 	},
 /area/crew_quarters/hor)
+"ceT" = (
+/obj/structure/window/plasmareinforced{
+	color = "#FF0000";
+	dir = 8
+	},
+/obj/structure/chair/comfy/shuttle{
+	dir = 1
+	},
+/turf/simulated/shuttle/floor{
+	icon_state = "floor4"
+	},
+/area/shuttle/administration)
 "ceU" = (
 /obj/structure/shuttle/engine/propulsion,
 /turf/simulated/shuttle/plating,
@@ -61155,13 +61271,8 @@
 	},
 /area/shuttle/administration)
 "cgA" = (
-/obj/structure/chair{
-	dir = 8
-	},
-/obj/machinery/light/spot{
-	tag = "icon-tube1 (EAST)";
-	icon_state = "tube1";
-	dir = 4
+/obj/structure/chair/comfy/shuttle{
+	dir = 1
 	},
 /turf/simulated/shuttle/floor{
 	icon_state = "floor4"
@@ -62167,22 +62278,30 @@
 	},
 /area/shuttle/administration)
 "cil" = (
-/obj/structure/chair{
+/obj/structure/shuttle/engine/propulsion/burst{
 	dir = 8
 	},
-/turf/simulated/shuttle/floor{
-	icon_state = "floor4"
+/turf/simulated/floor/plating,
+/turf/simulated/shuttle/wall{
+	tag = "icon-swall_f6";
+	icon_state = "swall_f6";
+	dir = 2
 	},
-/area/shuttle/administration)
+/area/shuttle/pod_4)
 "cim" = (
 /turf/simulated/shuttle/floor,
 /area/shuttle/mining)
 "cin" = (
-/obj/structure/chair{
-	dir = 1
+/obj/structure/shuttle/engine/propulsion/burst{
+	dir = 8
 	},
-/turf/simulated/shuttle/floor,
-/area/shuttle/mining)
+/turf/simulated/floor/plating,
+/turf/simulated/shuttle/wall{
+	tag = "icon-swall_f5";
+	icon_state = "swall_f5";
+	dir = 2
+	},
+/area/shuttle/pod_4)
 "cio" = (
 /obj/machinery/door/window/brigdoor/westleft{
 	color = "#d70000";
@@ -62230,6 +62349,9 @@
 /obj/machinery/light{
 	dir = 8
 	},
+/obj/effect/landmark/start{
+	name = "Shaft Miner"
+	},
 /turf/simulated/floor/plasteel{
 	dir = 8;
 	icon_state = "brown"
@@ -63394,32 +63516,12 @@
 	icon_state = "floor4"
 	},
 /area/shuttle/administration)
-"ckh" = (
-/obj/structure/chair{
-	dir = 1
-	},
-/turf/simulated/shuttle/floor{
-	icon_state = "floor4"
-	},
-/area/shuttle/administration)
 "cki" = (
 /obj/machinery/light/small{
 	dir = 8
 	},
 /turf/simulated/shuttle/floor,
 /area/shuttle/mining)
-"ckj" = (
-/obj/structure/window/plasmareinforced{
-	color = "#FF0000";
-	dir = 8
-	},
-/obj/structure/chair{
-	dir = 1
-	},
-/turf/simulated/shuttle/floor{
-	icon_state = "floor4"
-	},
-/area/shuttle/administration)
 "ckk" = (
 /obj/machinery/door/airlock/shuttle{
 	id_tag = "s_docking_airlock";
@@ -63473,9 +63575,6 @@
 	pixel_x = 24
 	},
 /obj/structure/disposalpipe/segment,
-/obj/effect/landmark/start{
-	name = "Shaft Miner"
-	},
 /turf/simulated/floor/plasteel,
 /area/quartermaster/miningdock)
 "ckp" = (
@@ -64847,21 +64946,6 @@
 	},
 /turf/simulated/floor/plating,
 /area/maintenance/asmaint)
-"cmI" = (
-/obj/structure/disposalpipe/segment,
-/obj/effect/landmark/start{
-	name = "Shaft Miner"
-	},
-/obj/structure/cable{
-	d1 = 1;
-	d2 = 2;
-	icon_state = "1-2";
-	tag = ""
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/turf/simulated/floor/plasteel,
-/area/quartermaster/miningdock)
 "cmJ" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -65489,6 +65573,9 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
 	},
+/obj/effect/landmark/start{
+	name = "Shaft Miner"
+	},
 /turf/simulated/floor/plasteel,
 /area/quartermaster/miningdock)
 "cnT" = (
@@ -65529,6 +65616,9 @@
 	dir = 5;
 	level = 1
 	},
+/obj/effect/landmark/start{
+	name = "Shaft Miner"
+	},
 /turf/simulated/floor/plasteel,
 /area/quartermaster/miningdock)
 "cnV" = (
@@ -89541,17 +89631,6 @@
 /obj/structure/lattice/catwalk,
 /turf/space,
 /area/solar/starboard)
-"ddW" = (
-/obj/structure/shuttle/engine/propulsion/burst{
-	dir = 8
-	},
-/turf/simulated/floor/plating,
-/turf/simulated/shuttle/wall{
-	tag = "icon-swall_f6";
-	icon_state = "swall_f6";
-	dir = 2
-	},
-/area/shuttle/pod_4)
 "ddX" = (
 /obj/machinery/access_button{
 	command = "cycle_exterior";
@@ -89565,17 +89644,6 @@
 /obj/structure/lattice/catwalk,
 /turf/space,
 /area/space/nearstation)
-"ddY" = (
-/obj/structure/shuttle/engine/propulsion/burst{
-	dir = 8
-	},
-/turf/simulated/floor/plating,
-/turf/simulated/shuttle/wall{
-	tag = "icon-swall_f5";
-	icon_state = "swall_f5";
-	dir = 2
-	},
-/area/shuttle/pod_4)
 "ddZ" = (
 /obj/structure/reagent_dispensers/watertank,
 /obj/structure/cable{
@@ -90760,14 +90828,6 @@
 	icon_state = "floor2"
 	},
 /area/shuttle/constructionsite)
-"dgw" = (
-/obj/structure/chair{
-	dir = 4
-	},
-/turf/simulated/shuttle/floor{
-	icon_state = "floor2"
-	},
-/area/shuttle/constructionsite)
 "dgx" = (
 /obj/machinery/computer/station_alert,
 /turf/simulated/shuttle/floor{
@@ -90983,16 +91043,6 @@
 /obj/item/caution,
 /turf/simulated/floor/plating,
 /area/maintenance/asmaint)
-"dhb" = (
-/obj/machinery/flasher{
-	id = "soltraderflash";
-	pixel_y = -28
-	},
-/obj/structure/chair{
-	dir = 8
-	},
-/turf/simulated/shuttle/floor,
-/area/shuttle/trade/sol)
 "dhc" = (
 /obj/structure/lattice,
 /obj/structure/lattice,
@@ -91448,15 +91498,6 @@
 	icon_state = "showroomfloor"
 	},
 /area/crew_quarters/kitchen)
-"dhW" = (
-/obj/structure/chair{
-	dir = 4
-	},
-/obj/machinery/light,
-/turf/simulated/shuttle/floor{
-	icon_state = "floor2"
-	},
-/area/shuttle/constructionsite)
 "dhX" = (
 /obj/machinery/computer/atmos_alert,
 /turf/simulated/shuttle/floor{
@@ -91714,12 +91755,6 @@
 	icon_state = "blue"
 	},
 /area/hallway/primary/central/north)
-"diy" = (
-/obj/structure/chair,
-/turf/simulated/shuttle/floor{
-	icon_state = "floor4"
-	},
-/area/shuttle/syndicate_sit)
 "diz" = (
 /obj/machinery/light/small,
 /obj/machinery/camera/motion{
@@ -93823,10 +93858,6 @@
 /obj/effect/spawner/lootdrop/maintenance,
 /turf/simulated/floor/plating,
 /area/maintenance/asmaint2)
-"dmo" = (
-/obj/structure/lattice/catwalk,
-/turf/space,
-/area/space/nearstation)
 "dmp" = (
 /obj/structure/table,
 /obj/item/weldingtool,
@@ -95149,6 +95180,10 @@
 /obj/item/crowbar,
 /turf/simulated/floor/wood,
 /area/crew_quarters/captain)
+"doE" = (
+/obj/structure/lattice/catwalk,
+/turf/space,
+/area/space/nearstation)
 "doF" = (
 /turf/simulated/floor/plating,
 /area/toxins/launch{
@@ -95168,18 +95203,6 @@
 /obj/machinery/teleport/hub,
 /turf/simulated/floor/plating,
 /area/turret_protected/aisat_interior)
-"doI" = (
-/obj/structure/chair{
-	dir = 4
-	},
-/obj/item/radio/intercom{
-	broadcasting = 0;
-	listening = 1;
-	name = "station intercom (General)";
-	pixel_y = 25
-	},
-/turf/simulated/shuttle/floor,
-/area/shuttle/pod_4)
 "doK" = (
 /obj/machinery/light,
 /turf/simulated/floor/plating,
@@ -95198,19 +95221,6 @@
 	},
 /turf/simulated/shuttle/floor,
 /area/shuttle/pod_4)
-"doM" = (
-/obj/structure/chair{
-	dir = 4
-	},
-/obj/machinery/status_display{
-	density = 0;
-	layer = 4;
-	pixel_x = 0;
-	pixel_y = 32
-	},
-/obj/machinery/light,
-/turf/simulated/shuttle/floor,
-/area/shuttle/pod_4)
 "doN" = (
 /obj/machinery/computer/station_alert,
 /obj/machinery/alarm{
@@ -96519,35 +96529,6 @@
 /area/toxins/launch{
 	name = "Toxins Launch Room"
 	})
-"jnJ" = (
-/obj/machinery/light/spot{
-	tag = "icon-tube1 (NORTH)";
-	icon_state = "tube1";
-	dir = 1
-	},
-/obj/machinery/door_control{
-	id = "adminshuttleblast";
-	name = "Blast door control";
-	pixel_x = -5;
-	pixel_y = 35;
-	req_access = list(101);
-	req_access_txt = "0"
-	},
-/obj/machinery/door_control{
-	id = "adminshuttleshutters";
-	name = "Shutter control";
-	pixel_x = 5;
-	pixel_y = 35;
-	req_access = list(101);
-	req_access_txt = "0"
-	},
-/obj/structure/chair/comfy/black{
-	dir = 4
-	},
-/turf/simulated/shuttle/floor{
-	icon_state = "floor4"
-	},
-/area/shuttle/administration)
 "kOE" = (
 /obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction{
 	dir = 4
@@ -96561,6 +96542,15 @@
 	},
 /turf/space,
 /area/space/nearstation)
+"opK" = (
+/obj/effect/landmark/start{
+	name = "Shaft Miner"
+	},
+/turf/simulated/floor/plasteel{
+	dir = 8;
+	icon_state = "brown"
+	},
+/area/quartermaster/miningdock)
 "oZV" = (
 /obj/machinery/door/airlock/centcom{
 	id_tag = "adminshuttle";
@@ -96600,15 +96590,6 @@
 	icon_state = "floor4"
 	},
 /area/shuttle/administration)
-"qnV" = (
-/obj/effect/landmark/start{
-	name = "Shaft Miner"
-	},
-/turf/simulated/floor/plasteel{
-	dir = 8;
-	icon_state = "brown"
-	},
-/area/quartermaster/miningdock)
 "qUv" = (
 /obj/machinery/atmospherics/pipe/simple/heat_exchanging,
 /turf/space,
@@ -103755,7 +103736,7 @@ arh
 arh
 arh
 arh
-arW
+aPV
 arh
 apr
 aaa
@@ -104009,9 +103990,9 @@ aaa
 apr
 arh
 aqk
-arW
-arW
-arW
+aPV
+aPV
+aPV
 dhe
 arh
 apr
@@ -104523,9 +104504,9 @@ aaa
 apr
 arh
 aql
-arZ
-aPV
-dhb
+bcK
+beB
+bgo
 aql
 arh
 apr
@@ -105314,9 +105295,9 @@ aaa
 aaa
 aaa
 aaa
-bwX
+btu
 bvi
-bys
+bwI
 aaa
 aaa
 aaa
@@ -105570,11 +105551,11 @@ aab
 aaa
 aaa
 aaa
-bwX
+btu
 btv
 bvj
 bwE
-bys
+bwI
 aaa
 bAQ
 bCa
@@ -106092,7 +106073,7 @@ brO
 aaa
 bAR
 bCc
-bDG
+bEL
 bEK
 bAR
 aLd
@@ -106342,9 +106323,9 @@ aSf
 boP
 aSd
 brQ
-btD
+btz
 bvj
-bwI
+bwJ
 brQ
 bjQ
 bAR
@@ -106599,15 +106580,15 @@ blE
 boL
 aSd
 brO
-btD
+btz
 bvj
-bwI
+bwJ
 brO
 aLd
 bAR
-bCe
+bBZ
 bCb
-bEL
+bGJ
 bAR
 aSd
 aaa
@@ -106856,15 +106837,15 @@ bmS
 boL
 aSd
 brO
-btz
+btD
 bvj
-bwJ
+bAS
 brO
 aSd
 ahb
 bCb
 bCb
-bEL
+bGJ
 bAR
 aSd
 aSd
@@ -107113,15 +107094,15 @@ aSf
 bsd
 aSd
 brO
-btD
+btz
 bvj
-bwI
+bwJ
 brO
 aSd
 ahb
 bCb
 bCb
-bEL
+bGJ
 bAR
 aSd
 bGm
@@ -107370,15 +107351,15 @@ aSf
 bsh
 aSd
 brR
-btD
+btz
 bvj
-bwI
+bwJ
 brR
 aSd
 bAR
-bBZ
+bCe
 bCb
-bEL
+bGJ
 bAR
 aSd
 bGl
@@ -107627,15 +107608,15 @@ brc
 bsh
 aSd
 brO
-btD
+btz
 bvj
-bwI
+bwJ
 brO
 aMs
 bAR
-bAS
+bDG
 bCb
-bEL
+bGJ
 bAR
 aSd
 bKp
@@ -107848,11 +107829,11 @@ aaa
 awq
 axj
 awM
-aze
-aAh
-aAh
+axo
+azf
+azf
 aCT
-aCX
+aCY
 afy
 aFf
 aFe
@@ -107884,9 +107865,9 @@ blE
 bsh
 aSd
 brO
-btz
+btD
 bvj
-bwJ
+bAS
 brO
 aMs
 bAT
@@ -108161,7 +108142,7 @@ bRA
 bRA
 bWJ
 bPI
-jnJ
+bWO
 cbx
 cbx
 bPI
@@ -108362,16 +108343,16 @@ aaa
 aws
 axj
 awN
-azh
-azh
-azh
+axN
+axN
+axN
 aBD
-aCX
+aCY
 aEe
 aFf
 aFg
 aaa
-dmo
+doE
 aII
 aII
 aII
@@ -108681,7 +108662,7 @@ cds
 bPI
 cgz
 cio
-ckj
+ceT
 bPI
 bYv
 aaa
@@ -108885,7 +108866,7 @@ aaa
 aaa
 aaa
 aaa
-dmo
+doE
 aII
 aII
 aLw
@@ -108938,7 +108919,7 @@ aaa
 bPI
 bRA
 bRA
-ckh
+cgA
 bPI
 aaa
 aaa
@@ -109193,8 +109174,8 @@ aaa
 aaa
 aaa
 bPI
-cgA
-cil
+cby
+cbz
 bPI
 bYv
 aaa
@@ -113498,12 +113479,12 @@ aaa
 awv
 axl
 ayk
-azf
+avu
 aEf
-aBk
-aBk
-aCY
-diy
+axm
+axm
+aze
+azh
 aFk
 aFi
 aGn
@@ -114013,11 +113994,11 @@ awx
 axl
 ayk
 azi
+awP
+awP
+awP
 ayk
-aBl
-aBl
-ayk
-diy
+azh
 aex
 aFi
 aGn
@@ -114534,9 +114515,9 @@ aaa
 aaa
 aaa
 aaa
-dmo
-dmo
-dmo
+doE
+doE
+doE
 aFY
 aEb
 aIf
@@ -116135,7 +116116,7 @@ ceZ
 cgB
 cim
 cki
-cin
+cdq
 cnh
 ceZ
 aab
@@ -116390,9 +116371,9 @@ aaa
 aaa
 ceY
 cgC
-cin
+cdq
 cim
-cin
+cdq
 cni
 coN
 aab
@@ -116649,7 +116630,7 @@ ceZ
 cgD
 cim
 cim
-cin
+cdq
 cnj
 ceZ
 aab
@@ -118191,7 +118172,7 @@ cam
 cgH
 cit
 ckn
-qnV
+opK
 cnm
 cam
 cgQ
@@ -118370,7 +118351,7 @@ atK
 auw
 avv
 awz
-axo
+atL
 aym
 azk
 aAk
@@ -118446,7 +118427,7 @@ cam
 cam
 cam
 cgG
-cir
+cfb
 cfb
 cnG
 cnl
@@ -118623,7 +118604,7 @@ aaa
 aaa
 aaa
 asT
-atL
+arW
 aux
 avy
 awz
@@ -118702,9 +118683,9 @@ cam
 cbI
 cdy
 cff
-cfb
 cir
 cfb
+cfb
 cnS
 cno
 cam
@@ -118884,7 +118865,7 @@ atJ
 auu
 avx
 awy
-axm
+avp
 awz
 azk
 aAk
@@ -119218,7 +119199,7 @@ cdA
 cis
 ckq
 cls
-cmI
+cls
 cnU
 cno
 cam
@@ -120030,9 +120011,9 @@ cZu
 cZu
 dcM
 dfY
-dgv
-dgv
-dgv
+bVk
+bVk
+bVk
 dfY
 aaa
 aaa
@@ -120287,9 +120268,9 @@ cZu
 cZu
 dcU
 dfZ
-dgw
-dgw
-dhW
+dgv
+dgv
+bVl
 dfY
 aaa
 aaa
@@ -120545,7 +120526,7 @@ dcM
 dfd
 dfY
 dgv
-dgw
+bVk
 dgv
 dfY
 aaa
@@ -129042,9 +129023,9 @@ dfR
 dcq
 dcq
 dcq
-ddW
+cil
 doL
-ddY
+cin
 dcq
 aaa
 aaa
@@ -129300,7 +129281,7 @@ dcq
 aaa
 dcq
 dou
-doI
+bYu
 dou
 dcq
 aaa
@@ -129557,7 +129538,7 @@ dcq
 aaa
 dcq
 dou
-doM
+can
 dou
 dcq
 aaa
@@ -130063,7 +130044,7 @@ dkO
 dkO
 cQZ
 cYz
-dmo
+doE
 dcq
 dfE
 dgd
@@ -130319,7 +130300,7 @@ cQZ
 cQZ
 cQZ
 cQZ
-dmo
+doE
 aab
 dcq
 dfD
@@ -130576,7 +130557,7 @@ dkq
 dkT
 dkT
 cQZ
-dmo
+doE
 aab
 aaa
 dmW
@@ -130833,7 +130814,7 @@ dkp
 bbO
 dlw
 cQZ
-dmo
+doE
 aab
 aaa
 dmW
@@ -131090,7 +131071,7 @@ dks
 dkT
 dkT
 cQZ
-dmo
+doE
 aab
 aab
 dmX
@@ -131347,7 +131328,7 @@ cQZ
 cQZ
 cQZ
 cQZ
-dmo
+doE
 aab
 aaa
 dmW
@@ -131604,7 +131585,7 @@ dkw
 dkV
 dkV
 cQZ
-dmo
+doE
 aab
 aaa
 dmW
@@ -131861,7 +131842,7 @@ dku
 bdG
 dlx
 cQZ
-dmo
+doE
 aab
 aaa
 dmW
@@ -132118,11 +132099,11 @@ dkx
 dkV
 dkV
 cQZ
-dmo
-dmo
-dmo
+doE
+doE
+doE
 ddC
-dmo
+doE
 ddM
 ddO
 cPw
@@ -132375,7 +132356,7 @@ cQZ
 cQZ
 cQZ
 cQZ
-dmo
+doE
 aab
 aaa
 dmW
@@ -132632,7 +132613,7 @@ aab
 aab
 aab
 aab
-dmo
+doE
 aab
 aaa
 dmW
@@ -132880,16 +132861,16 @@ cSn
 cTo
 cSn
 cQZ
-dmo
-dmo
-dmo
-dmo
-dmo
-dmo
-dmo
-dmo
-dmo
-dmo
+doE
+doE
+doE
+doE
+doE
+doE
+doE
+doE
+doE
+doE
 aab
 dmB
 dmZ
@@ -133137,7 +133118,7 @@ den
 deX
 dfO
 cQZ
-dmo
+doE
 aaa
 aaa
 aaa
@@ -133394,7 +133375,7 @@ dem
 cRi
 dem
 cQZ
-dmo
+doE
 aab
 alw
 alw
@@ -133651,7 +133632,7 @@ dem
 deY
 dem
 cQZ
-dmo
+doE
 aab
 alw
 aab
@@ -133908,7 +133889,7 @@ cQZ
 cQZ
 cQZ
 cQZ
-dmo
+doE
 aaa
 diu
 djd
@@ -135118,7 +135099,7 @@ bbC
 aGY
 beb
 djw
-bje
+bgp
 boX
 bpH
 bqH
@@ -135205,10 +135186,10 @@ dlm
 dlm
 dlm
 dmD
-dmo
-dmo
-dmo
-dmo
+doE
+doE
+doE
+doE
 aab
 aab
 aab
@@ -135375,7 +135356,7 @@ bbh
 aGY
 beb
 dju
-bjg
+bil
 bjv
 dnD
 bmy
@@ -135465,7 +135446,7 @@ dlm
 dlm
 dnx
 aaa
-dmo
+doE
 aaa
 aaa
 aaa
@@ -135632,7 +135613,7 @@ bbh
 aGY
 beb
 djx
-bjh
+bin
 bjv
 dnE
 bmy
@@ -135722,7 +135703,7 @@ dmO
 dne
 dnI
 aaa
-dmo
+doE
 aaa
 aaa
 aaa
@@ -135862,9 +135843,9 @@ atG
 auA
 axg
 axh
-awP
+aAh
 avt
-axN
+aCX
 atG
 aaa
 aFK
@@ -135889,7 +135870,7 @@ bbI
 aGY
 beb
 bfH
-bjh
+bin
 bjx
 bfH
 bmy
@@ -135979,7 +135960,7 @@ dlm
 dlm
 dnx
 aaa
-dmo
+doE
 aaa
 aaa
 aaa
@@ -136120,7 +136101,7 @@ axf
 dgk
 axh
 auq
-avp
+aBk
 auq
 atG
 aab
@@ -136146,7 +136127,7 @@ bbV
 aGY
 beb
 bfJ
-bjh
+bin
 bjy
 bkY
 bmy
@@ -136234,9 +136215,9 @@ dlm
 dmE
 dlm
 ddD
-dmo
-dmo
-dmo
+doE
+doE
+doE
 aaa
 aaa
 aaa
@@ -136377,7 +136358,7 @@ azT
 azT
 axh
 auq
-avu
+aBl
 auq
 aaa
 aaa
@@ -136630,9 +136611,9 @@ aaa
 aaa
 aaa
 awl
-dmo
+doE
 avM
-dmo
+doE
 aus
 avw
 awm
@@ -139719,7 +139700,7 @@ aab
 aqZ
 aaa
 aab
-dmo
+doE
 aHN
 aHN
 aHN
@@ -139824,8 +139805,8 @@ dia
 dcW
 bZZ
 aaa
-dmo
-dmo
+doE
+doE
 cTR
 aaa
 aaa
@@ -140233,7 +140214,7 @@ aab
 aqZ
 aaa
 aaa
-dmo
+doE
 aHN
 dof
 dog
@@ -142406,7 +142387,7 @@ dnR
 dnS
 dnX
 dom
-dmo
+doE
 aab
 aaa
 aaa
@@ -142663,7 +142644,7 @@ bZZ
 bZZ
 bZZ
 bZZ
-dmo
+doE
 aab
 aaa
 aaa
@@ -149062,7 +149043,7 @@ aaa
 aab
 aaa
 aaa
-dmo
+doE
 aab
 aaa
 aaa
@@ -149319,7 +149300,7 @@ aaa
 aab
 aaa
 aaa
-dmo
+doE
 aab
 aaa
 aaa
@@ -149827,7 +149808,7 @@ aaa
 aaa
 aaa
 aaa
-dmo
+doE
 aaa
 aaa
 aaa
@@ -150084,7 +150065,7 @@ aaa
 aaa
 aaa
 aaa
-dmo
+doE
 aaa
 aaa
 aaa
@@ -150287,15 +150268,15 @@ aaa
 aaa
 aaa
 bjC
-bmX
-bBT
+blC
+bwX
 bDz
 bjC
 beC
+bPM
+btt
+btt
 btt
-blA
-blA
-blA
 bzq
 beC
 bjC
@@ -150341,7 +150322,7 @@ aaa
 aaa
 aaa
 aaa
-dmo
+doE
 aaa
 aaa
 aaa
@@ -150544,7 +150525,7 @@ aaa
 aYD
 bic
 bjG
-blu
+bmX
 bDz
 bDz
 bjC
@@ -150598,7 +150579,7 @@ aaa
 aaa
 aaa
 aaa
-dmo
+doE
 aaa
 aaa
 aaa
@@ -150803,13 +150784,13 @@ bik
 bjC
 bmY
 bDz
-bGJ
+bBT
 bjC
 beC
-blC
-blC
-blC
-blC
+bnc
+bnc
+bnc
+bnc
 beC
 beC
 bBV
@@ -150855,7 +150836,7 @@ aaa
 aaa
 aaa
 aaa
-dmo
+doE
 aaa
 aaa
 aaa
@@ -151055,12 +151036,12 @@ aaa
 aYD
 baW
 beA
-bgo
-bil
+bjg
+blu
 bjC
 bmY
 bDz
-bGJ
+bBT
 bjC
 beC
 blD
@@ -151112,7 +151093,7 @@ aaa
 aaa
 aaa
 aaa
-dmo
+doE
 aaa
 aaa
 aaa
@@ -151311,7 +151292,7 @@ aaa
 aYD
 baW
 bcJ
-beB
+bje
 beC
 beC
 bjC
@@ -151320,10 +151301,10 @@ bmQ
 bnb
 bqo
 beC
-blA
-blA
-blA
-blA
+btt
+btt
+btt
+btt
 beC
 bAP
 bBX
@@ -151567,7 +151548,7 @@ aaa
 aaa
 aYU
 baX
-bcK
+bje
 beC
 beC
 beC
@@ -151825,19 +151806,19 @@ aaa
 aYH
 baY
 bcL
-beB
+bje
 beC
 bim
 bjC
-blC
-blC
-blC
-blC
+bnc
+bnc
+bnc
+bnc
 beC
-blC
-blC
-blC
-blC
+bnc
+bnc
+bnc
+bnc
 beC
 bAP
 bBX
@@ -152083,8 +152064,8 @@ aaa
 aYH
 baY
 beD
-bgp
-bin
+bjh
+blA
 bjJ
 blD
 bnb
@@ -152343,15 +152324,15 @@ aYU
 baY
 beC
 bjC
-blA
-blA
-blA
-blA
+btt
+btt
+btt
+btt
 beC
-blA
-blA
-blA
-blA
+btt
+btt
+btt
+btt
 beC
 beC
 bBY
@@ -152857,15 +152838,15 @@ aaa
 aaa
 aaa
 bjC
-blC
 bnc
-blC
-blC
-blC
-btu
-blC
-blC
-blC
+bys
+bnc
+bnc
+bnc
+bRH
+bnc
+bnc
+bnc
 beC
 beC
 bBS
@@ -153064,7 +153045,7 @@ aha
 ahZ
 aha
 aha
-amZ
+arZ
 agZ
 aaa
 aaa
@@ -153822,8 +153803,8 @@ aaa
 aaa
 agc
 agZ
-ahp
-ahp
+amZ
+amZ
 agZ
 ail
 agw
diff --git a/_maps/map_files/cyberiad/z2.dmm b/_maps/map_files/cyberiad/z2.dmm
index 7a43bfc098b..d04bf394f26 100644
--- a/_maps/map_files/cyberiad/z2.dmm
+++ b/_maps/map_files/cyberiad/z2.dmm
@@ -3643,14 +3643,14 @@
 	},
 /area/syndicate_mothership)
 "jt" = (
-/obj/structure/chair{
-	dir = 8
-	},
 /obj/machinery/light/small{
 	tag = "icon-bulb1 (EAST)";
 	icon_state = "bulb1";
 	dir = 4
 	},
+/obj/structure/chair/comfy/shuttle{
+	dir = 8
+	},
 /turf/simulated/shuttle/floor{
 	icon_state = "floor4"
 	},
@@ -3664,14 +3664,14 @@
 /turf/simulated/floor/plating/airless,
 /area/syndicate_mothership)
 "jw" = (
-/obj/structure/chair{
-	dir = 4
-	},
 /obj/machinery/light/small{
 	tag = "icon-bulb1 (WEST)";
 	icon_state = "bulb1";
 	dir = 8
 	},
+/obj/structure/chair/comfy/shuttle{
+	dir = 4
+	},
 /turf/simulated/shuttle/floor{
 	icon_state = "floor4"
 	},
@@ -7380,9 +7380,8 @@
 	},
 /area/centcom/evac)
 "sn" = (
-/obj/structure/chair{
-	dir = 4;
-	name = "Defense"
+/obj/structure/chair/comfy/shuttle{
+	dir = 4
 	},
 /turf/simulated/shuttle/floor,
 /area/centcom/evac)
@@ -12454,26 +12453,32 @@
 	},
 /turf/unsimulated/floor/vox,
 /area/vox_station)
+"KA" = (
+/obj/structure/chair/sofa/left,
+/turf/simulated/shuttle/floor{
+	icon_state = "floor4"
+	},
+/area/shuttle/escape)
 "KR" = (
-/obj/structure/chair{
+/obj/machinery/light/small,
+/obj/structure/chair/comfy/shuttle{
 	dir = 1
 	},
-/obj/machinery/light/small,
 /turf/simulated/shuttle/floor{
 	icon_state = "floor4"
 	},
 /area/shuttle/assault_pod)
 "KW" = (
-/obj/structure/chair,
 /obj/machinery/light/small{
 	dir = 1
 	},
+/obj/structure/chair/comfy/shuttle,
 /turf/simulated/shuttle/floor{
 	icon_state = "floor4"
 	},
 /area/shuttle/assault_pod)
 "KX" = (
-/obj/structure/chair{
+/obj/structure/chair/comfy/shuttle{
 	dir = 4
 	},
 /turf/simulated/shuttle/floor{
@@ -12481,7 +12486,7 @@
 	},
 /area/shuttle/assault_pod)
 "KY" = (
-/obj/structure/chair{
+/obj/structure/chair/comfy/shuttle{
 	dir = 8
 	},
 /turf/simulated/shuttle/floor{
@@ -12582,12 +12587,6 @@
 	icon_state = "floor4"
 	},
 /area/shuttle/escape)
-"QJ" = (
-/obj/structure/chair/sofa/corner,
-/turf/simulated/shuttle/floor{
-	icon_state = "floor4"
-	},
-/area/shuttle/escape)
 "Rf" = (
 /obj/structure/chair{
 	dir = 1
@@ -12740,7 +12739,7 @@
 /turf/simulated/shuttle/floor,
 /area/centcom/evac)
 "Wk" = (
-/obj/structure/chair{
+/obj/structure/chair/comfy/shuttle{
 	dir = 1
 	},
 /turf/simulated/shuttle/floor{
@@ -12748,7 +12747,7 @@
 	},
 /area/centcom/evac)
 "Wl" = (
-/obj/structure/chair{
+/obj/structure/chair/comfy/shuttle{
 	dir = 4
 	},
 /turf/simulated/shuttle/floor{
@@ -12756,13 +12755,13 @@
 	},
 /area/centcom/evac)
 "WI" = (
-/obj/structure/chair{
+/obj/structure/chair/comfy/shuttle{
 	dir = 8
 	},
 /turf/simulated/shuttle/floor,
 /area/centcom/evac)
 "WU" = (
-/obj/structure/chair,
+/obj/structure/chair/comfy/shuttle,
 /turf/simulated/shuttle/floor,
 /area/centcom/evac)
 "Xj" = (
@@ -41460,7 +41459,7 @@ sq
 aN
 aN
 nV
-QI
+KA
 og
 og
 og
@@ -41717,7 +41716,7 @@ sq
 aN
 aN
 nV
-QJ
+og
 og
 og
 og
diff --git a/_maps/map_files/cyberiad/z3.dmm b/_maps/map_files/cyberiad/z3.dmm
index be3d4769341..7e8d296ba7d 100644
--- a/_maps/map_files/cyberiad/z3.dmm
+++ b/_maps/map_files/cyberiad/z3.dmm
@@ -764,8 +764,7 @@
 /area/shuttle/freegolem)
 "bS" = (
 /obj/machinery/light,
-/obj/structure/chair/comfy/purp{
-	icon_state = "comfychair";
+/obj/structure/chair/comfy/shuttle{
 	dir = 1
 	},
 /turf/simulated/floor/mineral/titanium/purple,
diff --git a/_maps/map_files/cyberiad/z4.dmm b/_maps/map_files/cyberiad/z4.dmm
index 531ef1f4dfb..1d4f0c698ea 100644
--- a/_maps/map_files/cyberiad/z4.dmm
+++ b/_maps/map_files/cyberiad/z4.dmm
@@ -845,37 +845,17 @@
 /turf/simulated/floor/plating/airless,
 /area/constructionsite/hallway/center)
 "cl" = (
-/turf/simulated/floor/plating/airless,
 /obj/structure/lattice/catwalk,
-/area/space/nearstation)
-"cm" = (
 /turf/simulated/floor/plating/airless,
-/obj/structure/lattice/catwalk,
 /area/space/nearstation)
 "cn" = (
-/turf/simulated/floor/plating/airless,
 /obj/structure/lattice/catwalk,
+/turf/simulated/floor/plating/airless,
 /area/engiestation/solars)
-"co" = (
-/turf/simulated/floor/plating/airless,
-/obj/structure/lattice/catwalk,
-/area/engiestation/solars)
-"cp" = (
-/turf/simulated/floor/plating/airless,
-/obj/structure/lattice/catwalk,
-/area/space/nearstation)
 "cq" = (
 /obj/structure/inflatable/door,
 /turf/simulated/floor/plasteel/airless,
 /area/constructionsite/hallway/center)
-"cr" = (
-/turf/simulated/floor/plating/airless,
-/obj/structure/lattice/catwalk,
-/area/space/nearstation)
-"cs" = (
-/turf/simulated/floor/plating/airless,
-/obj/structure/lattice/catwalk,
-/area/engiestation/solars)
 "ct" = (
 /obj/machinery/power/solar,
 /obj/structure/cable{
@@ -892,8 +872,8 @@
 	d2 = 8;
 	icon_state = "2-8"
 	},
-/turf/simulated/floor/plating/airless,
 /obj/structure/lattice/catwalk,
+/turf/simulated/floor/plating/airless,
 /area/engiestation/solars)
 "cv" = (
 /obj/machinery/power/tracker,
@@ -916,8 +896,8 @@
 	d2 = 4;
 	icon_state = "2-4"
 	},
-/turf/simulated/floor/plating/airless,
 /obj/structure/lattice/catwalk,
+/turf/simulated/floor/plating/airless,
 /area/engiestation/solars)
 "cx" = (
 /obj/machinery/power/solar,
@@ -955,8 +935,8 @@
 	d2 = 8;
 	icon_state = "2-8"
 	},
-/turf/simulated/floor/plating/airless,
 /obj/structure/lattice/catwalk,
+/turf/simulated/floor/plating/airless,
 /area/engiestation/solars)
 "cB" = (
 /obj/structure/cable{
@@ -974,8 +954,8 @@
 	d2 = 4;
 	icon_state = "2-4"
 	},
-/turf/simulated/floor/plating/airless,
 /obj/structure/lattice/catwalk,
+/turf/simulated/floor/plating/airless,
 /area/engiestation/solars)
 "cC" = (
 /turf/simulated/wall/r_wall,
@@ -1045,55 +1025,6 @@
 	icon_state = "bcircuit"
 	},
 /area/constructionsite/ai)
-"cL" = (
-/turf/simulated/floor/plating/airless,
-/obj/structure/lattice/catwalk,
-/area/engiestation/solars)
-"cM" = (
-/turf/simulated/floor/plating/airless,
-/obj/structure/lattice/catwalk,
-/area/engiestation/solars)
-"cN" = (
-/obj/structure/cable{
-	d1 = 1;
-	d2 = 2;
-	icon_state = "1-2"
-	},
-/obj/structure/cable{
-	d1 = 2;
-	d2 = 8;
-	icon_state = "2-8"
-	},
-/turf/simulated/floor/plating/airless,
-/obj/structure/lattice/catwalk,
-/area/engiestation/solars)
-"cO" = (
-/obj/structure/cable{
-	d1 = 1;
-	d2 = 2;
-	icon_state = "1-2"
-	},
-/obj/structure/cable{
-	d1 = 2;
-	d2 = 8;
-	icon_state = "2-8"
-	},
-/obj/structure/cable{
-	d1 = 2;
-	d2 = 4;
-	icon_state = "2-4"
-	},
-/turf/simulated/floor/plating/airless,
-/obj/structure/lattice/catwalk,
-/area/engiestation/solars)
-"cP" = (
-/turf/simulated/floor/plating/airless,
-/obj/structure/lattice/catwalk,
-/area/engiestation/solars)
-"cQ" = (
-/turf/simulated/floor/plating/airless,
-/obj/structure/lattice/catwalk,
-/area/engiestation/solars)
 "cR" = (
 /obj/machinery/light_switch{
 	pixel_y = -28
@@ -1107,10 +1038,6 @@
 	icon_state = "dark"
 	},
 /area/engiestation)
-"cT" = (
-/turf/simulated/floor/plating/airless,
-/obj/structure/lattice/catwalk,
-/area/space/nearstation)
 "cU" = (
 /obj/structure/lattice,
 /turf/space,
@@ -1270,10 +1197,6 @@
 /obj/structure/grille,
 /turf/simulated/floor/plating/airless,
 /area/constructionsite/ai)
-"do" = (
-/turf/simulated/floor/plating/airless,
-/obj/structure/lattice/catwalk,
-/area/engiestation/solars)
 "dp" = (
 /obj/structure/cable{
 	d1 = 2;
@@ -1285,8 +1208,8 @@
 	d2 = 4;
 	icon_state = "1-4"
 	},
-/turf/simulated/floor/plating/airless,
 /obj/structure/lattice/catwalk,
+/turf/simulated/floor/plating/airless,
 /area/engiestation/solars)
 "dq" = (
 /obj/structure/cable{
@@ -1305,28 +1228,8 @@
 	d2 = 4;
 	icon_state = "1-4"
 	},
-/turf/simulated/floor/plating/airless,
 /obj/structure/lattice/catwalk,
-/area/engiestation/solars)
-"dr" = (
-/obj/structure/cable{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8";
-	pixel_x = 0
-	},
-/obj/structure/cable{
-	d1 = 2;
-	d2 = 4;
-	icon_state = "2-4"
-	},
-/obj/structure/cable{
-	d1 = 1;
-	d2 = 4;
-	icon_state = "1-4"
-	},
 /turf/simulated/floor/plating/airless,
-/obj/structure/lattice/catwalk,
 /area/engiestation/solars)
 "ds" = (
 /obj/effect/spawner/window/reinforced,
@@ -1437,28 +1340,8 @@
 	icon_state = "4-8";
 	pixel_x = 0
 	},
-/turf/simulated/floor/plating/airless,
 /obj/structure/lattice/catwalk,
-/area/engiestation/solars)
-"dz" = (
-/obj/structure/cable{
-	d1 = 1;
-	d2 = 8;
-	icon_state = "1-8"
-	},
-/obj/structure/cable{
-	d1 = 2;
-	d2 = 8;
-	icon_state = "2-8"
-	},
-/obj/structure/cable{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8";
-	pixel_x = 0
-	},
 /turf/simulated/floor/plating/airless,
-/obj/structure/lattice/catwalk,
 /area/engiestation/solars)
 "dA" = (
 /obj/structure/cable{
@@ -1471,12 +1354,8 @@
 	d2 = 8;
 	icon_state = "2-8"
 	},
-/turf/simulated/floor/plating/airless,
 /obj/structure/lattice/catwalk,
-/area/engiestation/solars)
-"dB" = (
 /turf/simulated/floor/plating/airless,
-/obj/structure/lattice/catwalk,
 /area/engiestation/solars)
 "dC" = (
 /obj/machinery/recharge_station,
@@ -1629,8 +1508,8 @@
 	d2 = 4;
 	icon_state = "2-4"
 	},
-/turf/simulated/floor/plating/airless,
 /obj/structure/lattice/catwalk,
+/turf/simulated/floor/plating/airless,
 /area/engiestation/solars)
 "dT" = (
 /obj/structure/cable{
@@ -1644,23 +1523,8 @@
 	d2 = 4;
 	icon_state = "2-4"
 	},
-/turf/simulated/floor/plating/airless,
 /obj/structure/lattice/catwalk,
-/area/engiestation/solars)
-"dU" = (
-/obj/structure/cable{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8";
-	pixel_x = 0
-	},
-/obj/structure/cable{
-	d1 = 2;
-	d2 = 4;
-	icon_state = "2-4"
-	},
 /turf/simulated/floor/plating/airless,
-/obj/structure/lattice/catwalk,
 /area/engiestation/solars)
 "dV" = (
 /obj/structure/cable{
@@ -1716,32 +1580,8 @@
 	icon_state = "4-8";
 	pixel_x = 0
 	},
-/turf/simulated/floor/plating/airless,
 /obj/structure/lattice/catwalk,
-/area/engiestation/solars)
-"eb" = (
-/obj/structure/cable{
-	d1 = 2;
-	d2 = 8;
-	icon_state = "2-8"
-	},
-/obj/structure/cable{
-	d1 = 4;
-	d2 = 8;
-	icon_state = "4-8";
-	pixel_x = 0
-	},
 /turf/simulated/floor/plating/airless,
-/obj/structure/lattice/catwalk,
-/area/engiestation/solars)
-"ec" = (
-/obj/structure/cable{
-	d1 = 2;
-	d2 = 8;
-	icon_state = "2-8"
-	},
-/turf/simulated/floor/plating/airless,
-/obj/structure/lattice/catwalk,
 /area/engiestation/solars)
 "ed" = (
 /obj/item/stack/sheet/metal{
@@ -1880,10 +1720,6 @@
 	icon_state = "dark"
 	},
 /area/engiestation)
-"em" = (
-/turf/simulated/floor/plating/airless,
-/obj/structure/lattice/catwalk,
-/area/engiestation/solars)
 "en" = (
 /obj/machinery/vending/tool,
 /turf/simulated/floor/plasteel{
@@ -1919,10 +1755,6 @@
 	},
 /turf/simulated/floor/plating/airless,
 /area/constructionsite/ai)
-"es" = (
-/turf/simulated/floor/plating/airless,
-/obj/structure/lattice/catwalk,
-/area/space/nearstation)
 "et" = (
 /obj/machinery/door/airlock/maintenance{
 	req_access_txt = "0";
@@ -2228,10 +2060,6 @@
 	icon_state = "carpet"
 	},
 /area/engiestation)
-"fi" = (
-/turf/simulated/floor/plating/airless,
-/obj/structure/lattice/catwalk,
-/area/space/nearstation)
 "fj" = (
 /obj/machinery/vending/cola,
 /turf/simulated/floor/plasteel{
@@ -2530,13 +2358,13 @@
 	},
 /area/engiestation)
 "fQ" = (
-/turf/simulated/floor/plating/airless,
 /obj/structure/lattice/catwalk,
+/turf/simulated/floor/plating/airless,
 /area/space)
 "fR" = (
 /obj/item/lighter/zippo,
-/turf/simulated/floor/plating/airless,
 /obj/structure/lattice/catwalk,
+/turf/simulated/floor/plating/airless,
 /area/space/nearstation)
 "fS" = (
 /obj/machinery/shower{
@@ -2629,10 +2457,6 @@
 	icon_state = "delivery"
 	},
 /area/engiestation)
-"gc" = (
-/turf/simulated/floor/plating/airless,
-/obj/structure/lattice/catwalk,
-/area/space/nearstation)
 "gd" = (
 /obj/structure/lattice,
 /obj/structure/disposaloutlet{
@@ -14393,14 +14217,14 @@ aa
 aa
 ab
 cl
-cr
-cr
-cr
-cr
-cr
-cr
-cr
-cr
+cl
+cl
+cl
+cl
+cl
+cl
+cl
+cl
 fQ
 bC
 aa
@@ -14649,7 +14473,7 @@ aa
 aa
 ab
 cl
-es
+cl
 ab
 ab
 ab
@@ -14658,7 +14482,7 @@ ab
 ab
 aa
 aa
-cm
+cl
 ab
 aa
 aa
@@ -14896,16 +14720,16 @@ aa
 aa
 ab
 cl
-cr
-cr
-cr
-cr
-cP
-cs
-do
-cs
-do
-cM
+cl
+cl
+cl
+cl
+cn
+cn
+cn
+cn
+cn
+cn
 cC
 cF
 cF
@@ -14915,7 +14739,7 @@ cF
 cC
 aa
 aa
-cm
+cl
 ab
 aa
 aa
@@ -15152,12 +14976,12 @@ aa
 aa
 aa
 ab
-cm
+cl
 ab
 ab
 aa
 ab
-co
+cn
 dd
 dp
 dK
@@ -15409,12 +15233,12 @@ aa
 aa
 aa
 aa
-cm
+cl
 ab
 ab
 ab
 ab
-co
+cn
 dd
 dq
 dK
@@ -15666,12 +15490,12 @@ aa
 aa
 aa
 aa
-cm
+cl
 aa
 ab
 ab
 ab
-co
+cn
 dd
 dq
 dK
@@ -15923,16 +15747,16 @@ aa
 aa
 aa
 aa
-cm
+cl
 ab
 ab
 ab
-cL
-cM
+cn
+cn
 dd
-dr
+dq
 dK
-dU
+dT
 dK
 da
 eB
@@ -16181,10 +16005,10 @@ aa
 aa
 ab
 cn
-cs
-cs
-cs
-cM
+cn
+cn
+cn
+cn
 cW
 cX
 ds
@@ -16437,7 +16261,7 @@ aa
 aa
 aa
 ab
-co
+cn
 ct
 ct
 ct
@@ -16698,7 +16522,7 @@ cn
 cu
 cA
 cA
-cN
+cA
 cY
 df
 du
@@ -16951,7 +16775,7 @@ aa
 aa
 aa
 ab
-co
+cn
 cv
 ct
 ct
@@ -17212,7 +17036,7 @@ cn
 cw
 cB
 cB
-cO
+cB
 cY
 df
 dw
@@ -17465,7 +17289,7 @@ aa
 aa
 aa
 ab
-co
+cn
 cx
 cx
 cx
@@ -17723,10 +17547,10 @@ aa
 aa
 ab
 cn
-cs
-cs
-cs
-cP
+cn
+cn
+cn
+cn
 cW
 cX
 ds
@@ -17979,12 +17803,12 @@ aa
 aa
 aa
 aa
-cm
+cl
 aa
 aa
 ab
-cQ
-cP
+cn
+cn
 dd
 dy
 dK
@@ -18236,16 +18060,16 @@ aa
 aa
 aa
 aa
-cm
+cl
 aa
 ab
 ab
 ab
-co
+cn
 dd
-dz
+dy
 dK
-eb
+ea
 dK
 da
 eI
@@ -18493,16 +18317,16 @@ aa
 aa
 aa
 aa
-cm
+cl
 ab
 ab
 ab
 ab
-co
+cn
 dd
-dz
+dy
 dK
-eb
+ea
 dK
 da
 dj
@@ -18750,16 +18574,16 @@ aa
 aa
 aa
 aa
-cm
+cl
 ab
 ab
 aa
 ab
-co
+cn
 dd
 dA
 dK
-ec
+cu
 dK
 da
 dj
@@ -19007,17 +18831,17 @@ aa
 aa
 aa
 aa
-cm
+cl
 aa
 aa
 aa
 aa
-cQ
-cs
-dB
-cs
-dB
-em
+cn
+cn
+cn
+cn
+cn
+cn
 da
 eI
 da
@@ -19264,7 +19088,7 @@ aa
 aa
 aa
 aa
-cm
+cl
 aa
 cC
 cF
@@ -19285,7 +19109,7 @@ cF
 cF
 cF
 cC
-gc
+cl
 aa
 aa
 aa
@@ -19521,7 +19345,7 @@ aa
 aa
 aa
 aa
-cm
+cl
 aa
 cC
 cG
@@ -19542,7 +19366,7 @@ ab
 ab
 aa
 aa
-cm
+cl
 aa
 aa
 aa
@@ -19778,7 +19602,7 @@ aa
 aa
 aa
 aa
-cm
+cl
 aa
 cC
 cH
@@ -19799,7 +19623,7 @@ aa
 ab
 ab
 aa
-cm
+cl
 aa
 aa
 aa
@@ -20035,7 +19859,7 @@ aa
 aa
 aa
 aa
-cm
+cl
 aa
 cC
 cI
@@ -20056,7 +19880,7 @@ aa
 aa
 ab
 ab
-cm
+cl
 ab
 aa
 aa
@@ -20292,7 +20116,7 @@ aa
 aa
 aa
 ab
-cm
+cl
 aa
 cC
 cF
@@ -20307,13 +20131,13 @@ dE
 dj
 dE
 cC
-fi
-cr
-cr
-cr
-cr
-cr
-es
+cl
+cl
+cl
+cl
+cl
+cl
+cl
 bC
 aa
 aa
@@ -20549,11 +20373,11 @@ aa
 aa
 aa
 ab
-cp
-cr
-cr
-cr
-cT
+cl
+cl
+cl
+cl
+cl
 dc
 cC
 dD
diff --git a/_maps/map_files/cyberiad/z6.dmm b/_maps/map_files/cyberiad/z6.dmm
index 86b1bb9cc7f..e51ec171e34 100644
--- a/_maps/map_files/cyberiad/z6.dmm
+++ b/_maps/map_files/cyberiad/z6.dmm
@@ -15,8 +15,8 @@
 	},
 /area/djstation/solars)
 "ad" = (
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/space/nearstation)
 "ae" = (
 /obj/structure/lattice,
@@ -76,8 +76,8 @@
 	d2 = 8;
 	icon_state = "2-8"
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/djstation/solars)
 "ao" = (
 /obj/structure/grille{
@@ -93,8 +93,8 @@
 	d2 = 2;
 	icon_state = "1-2"
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/djstation/solars)
 "aq" = (
 /obj/structure/cable{
@@ -125,8 +125,8 @@
 	d2 = 2;
 	icon_state = "1-2"
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/djstation)
 "at" = (
 /obj/structure/lattice,
@@ -312,8 +312,8 @@
 	d2 = 4;
 	icon_state = "1-4"
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/djstation)
 "aR" = (
 /obj/structure/cable{
@@ -331,8 +331,8 @@
 	d2 = 4;
 	icon_state = "1-4"
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/djstation/solars)
 "aS" = (
 /obj/structure/cable{
@@ -340,8 +340,8 @@
 	d2 = 8;
 	icon_state = "4-8"
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/djstation/solars)
 "aT" = (
 /obj/structure/cable{
@@ -359,8 +359,8 @@
 	d2 = 8;
 	icon_state = "2-8"
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/djstation/solars)
 "aU" = (
 /obj/item/storage/toolbox/mechanical{
@@ -386,8 +386,8 @@
 	d2 = 8;
 	icon_state = "2-8"
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/djstation)
 "aW" = (
 /turf/simulated/floor/plasteel{
@@ -4602,8 +4602,8 @@
 	d2 = 8;
 	icon_state = "2-8"
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/derelict/solar_control)
 "jL" = (
 /obj/structure/table/wood,
@@ -6021,7 +6021,7 @@
 /area/space/nearstation)
 "nh" = (
 /obj/item/shard,
-/obj/structure/chair{
+/obj/structure/chair/comfy/shuttle{
 	dir = 8
 	},
 /turf/simulated/floor/plasteel/airless,
@@ -6263,7 +6263,7 @@
 /obj/item/shard{
 	icon_state = "medium"
 	},
-/obj/structure/chair{
+/obj/structure/chair/comfy/shuttle{
 	dir = 8
 	},
 /turf/simulated/floor/plating/asteroid/airless,
@@ -6693,8 +6693,8 @@
 	d2 = 2;
 	icon_state = "1-2"
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/derelict/solar_control)
 "oT" = (
 /obj/machinery/atmospherics/pipe/simple/hidden{
@@ -7118,14 +7118,14 @@
 	},
 /area/derelict/arrival)
 "pV" = (
-/obj/structure/chair{
-	dir = 8
-	},
 /obj/effect/decal/remains/human{
 	desc = "This guy seemed to have died in terrible way! Half his remains are dust.";
 	icon_state = "remains";
 	name = "Human remains"
 	},
+/obj/structure/chair/comfy/shuttle{
+	dir = 8
+	},
 /turf/simulated/shuttle/floor{
 	icon_state = "floor4"
 	},
@@ -7569,7 +7569,7 @@
 	},
 /area/derelict/arrival)
 "qT" = (
-/obj/structure/chair{
+/obj/structure/chair/comfy/shuttle{
 	dir = 4
 	},
 /turf/simulated/shuttle/floor{
@@ -7577,7 +7577,7 @@
 	},
 /area/derelict/arrival)
 "qU" = (
-/obj/structure/chair{
+/obj/structure/chair/comfy/shuttle{
 	dir = 8
 	},
 /turf/simulated/shuttle/floor{
@@ -7751,8 +7751,8 @@
 	d2 = 8;
 	icon_state = "4-8"
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/derelict/solar_control)
 "rn" = (
 /obj/structure/cable{
@@ -7765,8 +7765,8 @@
 	d2 = 8;
 	icon_state = "1-8"
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/derelict/solar_control)
 "ro" = (
 /obj/structure/window/reinforced,
@@ -7817,9 +7817,7 @@
 	dir = 1
 	},
 /obj/structure/shuttle/engine/propulsion,
-/turf/simulated/floor/plasteel/airless{
-	icon_state = "floorscorched2"
-	},
+/turf/simulated/shuttle/plating,
 /area/derelict/arrival)
 "rt" = (
 /obj/structure/window/reinforced,
@@ -7993,8 +7991,8 @@
 	d2 = 8;
 	icon_state = "1-8"
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/derelict/solar_control)
 "rG" = (
 /obj/structure/closet/crate/secure/loot,
@@ -8029,8 +8027,8 @@
 /turf/space,
 /area/derelict/crew_quarters)
 "rJ" = (
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/derelict/solar_control)
 "rK" = (
 /obj/machinery/power/tracker,
@@ -8272,8 +8270,8 @@
 	d2 = 4;
 	icon_state = "2-4"
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/derelict/solar_control)
 "si" = (
 /obj/structure/cable{
@@ -8333,12 +8331,12 @@
 	},
 /area/derelict/crew_quarters)
 "sl" = (
-/obj/structure/chair{
-	dir = 4
-	},
 /obj/machinery/light/small{
 	dir = 8
 	},
+/obj/structure/chair/comfy/shuttle{
+	dir = 4
+	},
 /turf/simulated/shuttle/floor{
 	icon_state = "floor4"
 	},
@@ -9006,8 +9004,8 @@
 	d2 = 8;
 	icon_state = "2-8"
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/derelict/solar_control)
 "tF" = (
 /obj/structure/sign/greencross,
@@ -9040,8 +9038,8 @@
 	d2 = 8;
 	icon_state = "2-8"
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/derelict/solar_control)
 "tI" = (
 /obj/structure/cable{
@@ -9563,8 +9561,8 @@
 	d2 = 8;
 	icon_state = "1-8"
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/derelict/solar_control)
 "uJ" = (
 /turf/space,
@@ -9895,8 +9893,8 @@
 	d2 = 4;
 	icon_state = "1-4"
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/derelict/solar_control)
 "vn" = (
 /obj/item/shard{
@@ -10462,8 +10460,8 @@
 	d2 = 8;
 	icon_state = "1-8"
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/derelict/solar_control)
 "wm" = (
 /obj/structure/cable{
@@ -10476,8 +10474,8 @@
 	d2 = 4;
 	icon_state = "1-4"
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/derelict/solar_control)
 "wn" = (
 /obj/structure/closet/jcloset,
@@ -10502,8 +10500,8 @@
 	d2 = 8;
 	icon_state = "2-8"
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/derelict/solar_control)
 "wp" = (
 /obj/structure/cable{
@@ -10521,8 +10519,8 @@
 	d2 = 4;
 	icon_state = "1-4"
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/derelict/solar_control)
 "wq" = (
 /obj/structure/cable{
@@ -10540,8 +10538,8 @@
 	d2 = 8;
 	icon_state = "1-8"
 	},
-/turf/space,
 /obj/structure/lattice/catwalk,
+/turf/space,
 /area/derelict/solar_control)
 "wr" = (
 /obj/docking_port/stationary{
diff --git a/_maps/map_files/shuttles/admin_admin.dmm b/_maps/map_files/shuttles/admin_admin.dmm
index fda5ff55056..bad43283b9b 100644
--- a/_maps/map_files/shuttles/admin_admin.dmm
+++ b/_maps/map_files/shuttles/admin_admin.dmm
@@ -408,6 +408,9 @@
 /obj/structure/chair/comfy/black{
 	dir = 4
 	},
+/obj/structure/chair/comfy/shuttle{
+	dir = 4
+	},
 /turf/simulated/shuttle/floor{
 	icon_state = "floor4"
 	},
@@ -416,6 +419,9 @@
 /obj/structure/chair/comfy/black{
 	dir = 4
 	},
+/obj/structure/chair/comfy/shuttle{
+	dir = 4
+	},
 /turf/simulated/shuttle/floor{
 	icon_state = "floor4"
 	},
@@ -550,14 +556,14 @@
 	},
 /area/shuttle/administration)
 "bl" = (
-/obj/structure/chair{
-	dir = 8
-	},
 /obj/machinery/light/spot{
 	tag = "icon-tube1 (EAST)";
 	icon_state = "tube1";
 	dir = 4
 	},
+/obj/structure/chair/comfy/shuttle{
+	dir = 8
+	},
 /turf/simulated/shuttle/floor{
 	icon_state = "floor4"
 	},
@@ -603,7 +609,7 @@
 	},
 /area/shuttle/administration)
 "br" = (
-/obj/structure/chair{
+/obj/structure/chair/comfy/shuttle{
 	dir = 8
 	},
 /turf/simulated/shuttle/floor{
@@ -643,7 +649,7 @@
 	color = "#FF0000";
 	dir = 8
 	},
-/obj/structure/chair{
+/obj/structure/chair/comfy/shuttle{
 	dir = 1
 	},
 /turf/simulated/shuttle/floor{
@@ -651,7 +657,7 @@
 	},
 /area/shuttle/administration)
 "bw" = (
-/obj/structure/chair{
+/obj/structure/chair/comfy/shuttle{
 	dir = 1
 	},
 /turf/simulated/shuttle/floor{
diff --git a/_maps/map_files/shuttles/admin_hospital.dmm b/_maps/map_files/shuttles/admin_hospital.dmm
index de3cacaf413..c9a41d69463 100644
--- a/_maps/map_files/shuttles/admin_hospital.dmm
+++ b/_maps/map_files/shuttles/admin_hospital.dmm
@@ -237,6 +237,9 @@
 	icon_state = "chair";
 	dir = 4
 	},
+/obj/structure/chair/comfy/shuttle{
+	dir = 4
+	},
 /turf/simulated/shuttle/floor{
 	icon_state = "floor3"
 	},
@@ -256,6 +259,9 @@
 	name = "NHV Asclepius Lobby";
 	network = list("NHV Asclepius")
 	},
+/obj/structure/chair/comfy/shuttle{
+	dir = 8
+	},
 /turf/simulated/shuttle/floor{
 	icon_state = "floor3"
 	},
@@ -319,7 +325,7 @@
 	},
 /area/shuttle/administration)
 "aG" = (
-/obj/structure/chair/office/light{
+/obj/structure/chair/comfy/shuttle{
 	dir = 1
 	},
 /turf/simulated/shuttle/floor{
@@ -412,6 +418,9 @@
 /obj/structure/chair{
 	dir = 4
 	},
+/obj/structure/chair/comfy/shuttle{
+	dir = 4
+	},
 /turf/simulated/shuttle/floor{
 	icon_state = "floor3"
 	},
@@ -420,6 +429,9 @@
 /obj/structure/chair{
 	dir = 8
 	},
+/obj/structure/chair/comfy/shuttle{
+	dir = 8
+	},
 /turf/simulated/shuttle/floor{
 	icon_state = "floor3"
 	},
@@ -483,7 +495,7 @@
 	},
 /area/shuttle/administration)
 "aY" = (
-/obj/structure/chair/office/light,
+/obj/structure/chair/comfy/shuttle,
 /turf/simulated/shuttle/floor{
 	icon_state = "floor3"
 	},
@@ -664,6 +676,9 @@
 	req_access = list(101);
 	req_access_txt = "0"
 	},
+/obj/structure/chair/comfy/shuttle{
+	dir = 8
+	},
 /turf/simulated/shuttle/floor{
 	icon_state = "floor3"
 	},
@@ -890,6 +905,9 @@
 	dir = 8
 	},
 /obj/machinery/light,
+/obj/structure/chair/comfy/shuttle{
+	dir = 8
+	},
 /turf/simulated/shuttle/floor{
 	icon_state = "floor3"
 	},
diff --git a/_maps/map_files/shuttles/emergency_bar.dmm b/_maps/map_files/shuttles/emergency_bar.dmm
index 0cfb856e28d..4dd07825738 100644
--- a/_maps/map_files/shuttles/emergency_bar.dmm
+++ b/_maps/map_files/shuttles/emergency_bar.dmm
@@ -43,7 +43,7 @@
 /turf/simulated/floor/carpet,
 /area/shuttle/escape)
 "ai" = (
-/obj/structure/chair/comfy/black{
+/obj/structure/chair/comfy/shuttle{
 	dir = 1
 	},
 /turf/simulated/floor/carpet,
@@ -75,7 +75,7 @@
 /obj/structure/closet/walllocker/emerglocker{
 	pixel_x = 28
 	},
-/obj/structure/chair/comfy/black{
+/obj/structure/chair/comfy/shuttle{
 	dir = 1
 	},
 /turf/simulated/floor/carpet,
@@ -91,7 +91,7 @@
 /turf/simulated/floor/carpet,
 /area/shuttle/escape)
 "ar" = (
-/obj/structure/chair/comfy/black{
+/obj/structure/chair/comfy/shuttle{
 	dir = 8
 	},
 /turf/simulated/floor/carpet,
@@ -123,6 +123,9 @@
 /obj/structure/chair{
 	dir = 4
 	},
+/obj/structure/chair/comfy/shuttle{
+	dir = 4
+	},
 /turf/simulated/shuttle/floor4,
 /area/shuttle/escape)
 "ax" = (
@@ -135,6 +138,7 @@
 	dir = 1
 	},
 /obj/structure/chair,
+/obj/structure/chair/comfy/shuttle,
 /turf/simulated/shuttle/floor4,
 /area/shuttle/escape)
 "ay" = (
@@ -194,6 +198,9 @@
 /obj/structure/closet/walllocker/emerglocker{
 	pixel_x = -28
 	},
+/obj/structure/chair/comfy/shuttle{
+	dir = 4
+	},
 /turf/simulated/shuttle/floor4,
 /area/shuttle/escape)
 "aF" = (
@@ -224,10 +231,14 @@
 /obj/structure/chair{
 	dir = 1
 	},
+/obj/structure/chair/comfy/shuttle{
+	dir = 1
+	},
 /turf/simulated/shuttle/floor4,
 /area/shuttle/escape)
 "aK" = (
 /obj/structure/chair,
+/obj/structure/chair/comfy/shuttle,
 /turf/simulated/shuttle/floor4,
 /area/shuttle/escape)
 "aL" = (
diff --git a/_maps/map_files/shuttles/emergency_clown.dmm b/_maps/map_files/shuttles/emergency_clown.dmm
index 1207e8a09ff..5942ed33b76 100644
--- a/_maps/map_files/shuttles/emergency_clown.dmm
+++ b/_maps/map_files/shuttles/emergency_clown.dmm
@@ -43,7 +43,7 @@
 /turf/simulated/floor/noslip,
 /area/shuttle/escape)
 "ai" = (
-/obj/structure/chair/comfy/black{
+/obj/structure/chair/comfy/shuttle{
 	dir = 1
 	},
 /turf/simulated/floor/plasteel{
@@ -58,14 +58,6 @@
 /obj/machinery/computer/station_alert,
 /turf/simulated/floor/noslip,
 /area/shuttle/escape)
-"al" = (
-/obj/structure/chair{
-	dir = 1
-	},
-/turf/simulated/floor/plasteel{
-	icon_state = "white"
-	},
-/area/shuttle/escape)
 "am" = (
 /obj/item/toy/snappop/phoenix,
 /turf/simulated/floor/plasteel{
@@ -80,12 +72,12 @@
 /turf/simulated/floor/noslip,
 /area/shuttle/escape)
 "ao" = (
-/obj/structure/chair{
-	dir = 1
-	},
 /obj/structure/closet/walllocker/emerglocker{
 	pixel_x = -28
 	},
+/obj/structure/chair/comfy/shuttle{
+	dir = 1
+	},
 /turf/simulated/floor/noslip,
 /area/shuttle/escape)
 "ap" = (
@@ -95,12 +87,12 @@
 	},
 /area/shuttle/escape)
 "aq" = (
-/obj/structure/chair{
-	dir = 1
-	},
 /obj/structure/closet/walllocker/emerglocker{
 	pixel_x = 28
 	},
+/obj/structure/chair/comfy/shuttle{
+	dir = 1
+	},
 /turf/simulated/floor/noslip,
 /area/shuttle/escape)
 "ar" = (
@@ -114,7 +106,7 @@
 /turf/simulated/floor/noslip,
 /area/shuttle/escape)
 "at" = (
-/obj/structure/chair{
+/obj/structure/chair/comfy/shuttle{
 	dir = 8
 	},
 /turf/simulated/floor/plasteel{
@@ -129,7 +121,7 @@
 	},
 /area/shuttle/escape)
 "av" = (
-/obj/structure/chair{
+/obj/structure/chair/comfy/shuttle{
 	dir = 4
 	},
 /turf/simulated/floor/plasteel{
@@ -675,7 +667,7 @@ bt
 ab
 ae
 ah
-al
+ai
 am
 au
 ax
@@ -727,7 +719,7 @@ aa
 ad
 ag
 aj
-al
+ai
 ap
 au
 ax
diff --git a/_maps/map_files/shuttles/emergency_cramped.dmm b/_maps/map_files/shuttles/emergency_cramped.dmm
index de7bb67bb6b..5cd443121dc 100644
--- a/_maps/map_files/shuttles/emergency_cramped.dmm
+++ b/_maps/map_files/shuttles/emergency_cramped.dmm
@@ -46,7 +46,7 @@
 /turf/simulated/floor/plating,
 /area/shuttle/escape)
 "j" = (
-/obj/structure/chair{
+/obj/structure/chair/comfy/shuttle{
 	dir = 1
 	},
 /turf/simulated/floor/plating,
@@ -114,7 +114,7 @@
 /turf/simulated/floor/plating,
 /area/shuttle/escape)
 "s" = (
-/obj/structure/chair{
+/obj/structure/chair/comfy/shuttle{
 	dir = 4
 	},
 /turf/simulated/floor/plating,
diff --git a/_maps/map_files/shuttles/emergency_cyb.dmm b/_maps/map_files/shuttles/emergency_cyb.dmm
index 3be4c293b80..5f35a77e455 100644
--- a/_maps/map_files/shuttles/emergency_cyb.dmm
+++ b/_maps/map_files/shuttles/emergency_cyb.dmm
@@ -43,7 +43,7 @@
 /turf/simulated/shuttle/floor,
 /area/shuttle/escape)
 "ai" = (
-/obj/structure/chair/comfy/black{
+/obj/structure/chair/comfy/shuttle{
 	dir = 1
 	},
 /turf/simulated/shuttle/floor,
@@ -56,12 +56,6 @@
 /obj/machinery/computer/station_alert,
 /turf/simulated/shuttle/floor,
 /area/shuttle/escape)
-"al" = (
-/obj/structure/chair{
-	dir = 1
-	},
-/turf/simulated/shuttle/floor,
-/area/shuttle/escape)
 "am" = (
 /turf/simulated/shuttle/floor,
 /area/shuttle/escape)
@@ -73,21 +67,21 @@
 /turf/simulated/shuttle/floor,
 /area/shuttle/escape)
 "ao" = (
-/obj/structure/chair{
-	dir = 1
-	},
 /obj/structure/closet/walllocker/emerglocker{
 	pixel_x = -28
 	},
+/obj/structure/chair/comfy/shuttle{
+	dir = 1
+	},
 /turf/simulated/shuttle/floor,
 /area/shuttle/escape)
 "ap" = (
-/obj/structure/chair{
-	dir = 1
-	},
 /obj/structure/closet/walllocker/emerglocker{
 	pixel_x = 28
 	},
+/obj/structure/chair/comfy/shuttle{
+	dir = 1
+	},
 /turf/simulated/shuttle/floor,
 /area/shuttle/escape)
 "aq" = (
@@ -101,7 +95,7 @@
 /turf/simulated/shuttle/floor,
 /area/shuttle/escape)
 "as" = (
-/obj/structure/chair{
+/obj/structure/chair/comfy/shuttle{
 	dir = 8
 	},
 /turf/simulated/shuttle/floor,
@@ -111,7 +105,7 @@
 /turf/simulated/shuttle/floor,
 /area/shuttle/escape)
 "au" = (
-/obj/structure/chair{
+/obj/structure/chair/comfy/shuttle{
 	dir = 4
 	},
 /turf/simulated/shuttle/floor,
@@ -142,7 +136,7 @@
 	},
 /area/shuttle/escape)
 "az" = (
-/obj/structure/chair{
+/obj/structure/chair/comfy/shuttle{
 	dir = 4
 	},
 /turf/simulated/shuttle/floor4,
@@ -156,7 +150,7 @@
 	icon_state = "tube1";
 	dir = 1
 	},
-/obj/structure/chair,
+/obj/structure/chair/comfy/shuttle,
 /turf/simulated/shuttle/floor4,
 /area/shuttle/escape)
 "aB" = (
@@ -171,7 +165,7 @@
 	},
 /area/shuttle/escape)
 "aC" = (
-/obj/structure/chair{
+/obj/structure/chair/comfy/shuttle{
 	dir = 4
 	},
 /turf/simulated/shuttle/floor{
@@ -179,7 +173,7 @@
 	},
 /area/shuttle/escape)
 "aD" = (
-/obj/structure/chair{
+/obj/structure/chair/comfy/shuttle{
 	dir = 8
 	},
 /turf/simulated/shuttle/floor{
@@ -205,12 +199,12 @@
 /turf/simulated/shuttle/floor,
 /area/shuttle/escape)
 "aG" = (
-/obj/structure/chair{
-	dir = 4
-	},
 /obj/structure/closet/walllocker/emerglocker{
 	pixel_x = -28
 	},
+/obj/structure/chair/comfy/shuttle{
+	dir = 4
+	},
 /turf/simulated/shuttle/floor4,
 /area/shuttle/escape)
 "aH" = (
@@ -236,12 +230,12 @@
 /turf/simulated/floor/plating,
 /area/shuttle/escape)
 "aL" = (
-/obj/structure/chair{
-	dir = 8
-	},
 /obj/structure/closet/walllocker/emerglocker{
 	pixel_x = 28
 	},
+/obj/structure/chair/comfy/shuttle{
+	dir = 8
+	},
 /turf/simulated/shuttle/floor{
 	icon_state = "floor3"
 	},
@@ -256,13 +250,13 @@
 /turf/simulated/floor/plating,
 /area/shuttle/escape)
 "aN" = (
-/obj/structure/chair{
+/obj/structure/chair/comfy/shuttle{
 	dir = 1
 	},
 /turf/simulated/shuttle/floor4,
 /area/shuttle/escape)
 "aO" = (
-/obj/structure/chair,
+/obj/structure/chair/comfy/shuttle,
 /turf/simulated/shuttle/floor4,
 /area/shuttle/escape)
 "aP" = (
@@ -296,9 +290,6 @@
 /turf/simulated/shuttle/floor,
 /area/shuttle/escape)
 "aS" = (
-/obj/structure/chair{
-	dir = 4
-	},
 /obj/item/radio/intercom{
 	dir = 8;
 	name = "station intercom (General)";
@@ -309,14 +300,14 @@
 	icon_state = "tube1";
 	dir = 8
 	},
+/obj/structure/chair/comfy/shuttle{
+	dir = 4
+	},
 /turf/simulated/shuttle/floor{
 	icon_state = "floor3"
 	},
 /area/shuttle/escape)
 "aT" = (
-/obj/structure/chair{
-	dir = 8
-	},
 /obj/structure/closet/walllocker/emerglocker{
 	pixel_x = 28
 	},
@@ -325,6 +316,9 @@
 	icon_state = "tube1";
 	dir = 4
 	},
+/obj/structure/chair/comfy/shuttle{
+	dir = 8
+	},
 /turf/simulated/shuttle/floor{
 	icon_state = "floor3"
 	},
@@ -710,7 +704,7 @@ bw
 ab
 ae
 ah
-al
+ai
 am
 am
 av
@@ -762,7 +756,7 @@ aa
 ad
 ag
 aj
-al
+ai
 am
 at
 av
diff --git a/_maps/map_files/shuttles/emergency_dept.dmm b/_maps/map_files/shuttles/emergency_dept.dmm
index 45acf04e012..32b14270d05 100644
--- a/_maps/map_files/shuttles/emergency_dept.dmm
+++ b/_maps/map_files/shuttles/emergency_dept.dmm
@@ -62,7 +62,7 @@
 /turf/simulated/shuttle/floor,
 /area/shuttle/escape)
 "al" = (
-/obj/structure/chair/comfy/blue{
+/obj/structure/chair/comfy/shuttle{
 	dir = 1
 	},
 /turf/simulated/shuttle/floor,
@@ -93,36 +93,6 @@
 "aq" = (
 /turf/simulated/shuttle/floor,
 /area/shuttle/escape)
-"ar" = (
-/obj/structure/chair/comfy/beige{
-	dir = 1
-	},
-/turf/simulated/shuttle/floor,
-/area/shuttle/escape)
-"as" = (
-/obj/structure/chair/comfy/brown{
-	dir = 1
-	},
-/turf/simulated/shuttle/floor,
-/area/shuttle/escape)
-"at" = (
-/obj/structure/chair/comfy/red{
-	dir = 1
-	},
-/turf/simulated/shuttle/floor,
-/area/shuttle/escape)
-"au" = (
-/obj/structure/chair/comfy/teal{
-	dir = 1
-	},
-/turf/simulated/shuttle/floor,
-/area/shuttle/escape)
-"av" = (
-/obj/structure/chair/comfy/purp{
-	dir = 1
-	},
-/turf/simulated/shuttle/floor,
-/area/shuttle/escape)
 "aw" = (
 /turf/simulated/shuttle/wall{
 	icon_state = "swall13";
@@ -143,7 +113,7 @@
 /turf/simulated/shuttle/floor,
 /area/shuttle/escape)
 "az" = (
-/obj/structure/chair,
+/obj/structure/chair/comfy/shuttle,
 /turf/simulated/shuttle/floor4,
 /area/shuttle/escape)
 "aA" = (
@@ -155,7 +125,7 @@
 	icon_state = "tube1";
 	dir = 1
 	},
-/obj/structure/chair,
+/obj/structure/chair/comfy/shuttle,
 /turf/simulated/shuttle/floor4,
 /area/shuttle/escape)
 "aB" = (
@@ -172,7 +142,7 @@
 	},
 /area/shuttle/escape)
 "aD" = (
-/obj/structure/chair{
+/obj/structure/chair/comfy/shuttle{
 	dir = 4
 	},
 /turf/simulated/floor/plasteel{
@@ -227,7 +197,7 @@
 /turf/simulated/floor/plating,
 /area/shuttle/escape)
 "aK" = (
-/obj/structure/chair,
+/obj/structure/chair/comfy/shuttle,
 /turf/simulated/floor/plasteel{
 	icon_state = "cafeteria";
 	dir = 2
@@ -276,13 +246,13 @@
 /turf/simulated/floor/plating,
 /area/shuttle/escape)
 "aQ" = (
-/obj/structure/chair{
+/obj/structure/chair/comfy/shuttle{
 	dir = 1
 	},
 /turf/simulated/shuttle/floor4,
 /area/shuttle/escape)
 "aR" = (
-/obj/structure/chair{
+/obj/structure/chair/comfy/shuttle{
 	dir = 1
 	},
 /turf/simulated/floor/plasteel{
@@ -327,53 +297,53 @@
 	},
 /area/shuttle/escape)
 "aW" = (
-/obj/structure/chair{
+/obj/structure/chair/comfy/shuttle{
 	dir = 4
 	},
 /turf/simulated/shuttle/floor4,
 /area/shuttle/escape)
 "aX" = (
-/obj/structure/chair{
-	dir = 8
-	},
 /obj/structure/window/reinforced{
 	dir = 1
 	},
+/obj/structure/chair/comfy/shuttle{
+	dir = 8
+	},
 /turf/simulated/shuttle/floor{
 	icon_state = "floor2"
 	},
 /area/shuttle/escape)
 "aY" = (
-/obj/structure/chair{
-	dir = 4
-	},
 /obj/structure/window/reinforced{
 	dir = 1
 	},
+/obj/structure/chair/comfy/shuttle{
+	dir = 4
+	},
 /turf/simulated/floor/plasteel,
 /area/shuttle/escape)
 "aZ" = (
-/obj/structure/chair{
-	dir = 8
-	},
 /obj/structure/window/reinforced{
 	dir = 1
 	},
+/obj/structure/chair/comfy/shuttle{
+	dir = 8
+	},
 /turf/simulated/floor/plasteel,
 /area/shuttle/escape)
 "ba" = (
-/obj/structure/chair{
-	dir = 4
-	},
 /obj/structure/window/reinforced{
 	dir = 1
 	},
+/obj/structure/chair/comfy/shuttle{
+	dir = 4
+	},
 /turf/simulated/shuttle/floor{
 	icon_state = "floor5"
 	},
 /area/shuttle/escape)
 "bb" = (
-/obj/structure/chair{
+/obj/structure/chair/comfy/shuttle{
 	dir = 8
 	},
 /turf/simulated/shuttle/floor4,
@@ -405,9 +375,6 @@
 	},
 /area/shuttle/escape)
 "bf" = (
-/obj/structure/chair{
-	dir = 4
-	},
 /obj/item/radio/intercom{
 	dir = 8;
 	name = "station intercom (General)";
@@ -421,6 +388,9 @@
 /obj/structure/window/reinforced{
 	dir = 1
 	},
+/obj/structure/chair/comfy/shuttle{
+	dir = 4
+	},
 /turf/simulated/shuttle/floor4,
 /area/shuttle/escape)
 "bg" = (
@@ -431,35 +401,35 @@
 /turf/simulated/floor/plating,
 /area/shuttle/escape)
 "bh" = (
-/obj/structure/chair{
+/obj/structure/chair/comfy/shuttle{
 	dir = 4
 	},
 /turf/simulated/floor/plasteel,
 /area/shuttle/escape)
 "bi" = (
-/obj/structure/chair{
+/obj/structure/chair/comfy/shuttle{
 	dir = 8
 	},
 /turf/simulated/floor/plasteel,
 /area/shuttle/escape)
 "bj" = (
-/obj/structure/chair{
-	dir = 4
-	},
 /obj/structure/window/reinforced{
 	dir = 1
 	},
+/obj/structure/chair/comfy/shuttle{
+	dir = 4
+	},
 /turf/simulated/shuttle/floor{
 	icon_state = "floor2"
 	},
 /area/shuttle/escape)
 "bk" = (
-/obj/structure/chair{
-	dir = 8
-	},
 /obj/structure/window/reinforced{
 	dir = 1
 	},
+/obj/structure/chair/comfy/shuttle{
+	dir = 8
+	},
 /turf/simulated/shuttle/floor4,
 /area/shuttle/escape)
 "bl" = (
@@ -473,10 +443,10 @@
 	},
 /area/shuttle/escape)
 "bm" = (
-/obj/structure/chair{
+/obj/structure/window/reinforced,
+/obj/structure/chair/comfy/shuttle{
 	dir = 4
 	},
-/obj/structure/window/reinforced,
 /turf/simulated/shuttle/floor{
 	icon_state = "floor2"
 	},
@@ -490,41 +460,38 @@
 	},
 /area/shuttle/escape)
 "bo" = (
-/obj/structure/chair{
+/obj/structure/window/reinforced,
+/obj/structure/chair/comfy/shuttle{
 	dir = 8
 	},
-/obj/structure/window/reinforced,
 /turf/simulated/shuttle/floor{
 	icon_state = "floor2"
 	},
 /area/shuttle/escape)
 "bp" = (
 /obj/structure/window/reinforced,
-/obj/structure/chair{
+/obj/structure/chair/comfy/shuttle{
 	dir = 4
 	},
 /turf/simulated/floor/plasteel,
 /area/shuttle/escape)
 "bq" = (
 /obj/structure/window/reinforced,
-/obj/structure/chair{
+/obj/structure/chair/comfy/shuttle{
 	dir = 8
 	},
 /turf/simulated/floor/plasteel,
 /area/shuttle/escape)
 "br" = (
-/obj/structure/chair{
+/obj/structure/window/reinforced,
+/obj/structure/chair/comfy/shuttle{
 	dir = 4
 	},
-/obj/structure/window/reinforced,
 /turf/simulated/shuttle/floor{
 	icon_state = "floor5"
 	},
 /area/shuttle/escape)
 "bs" = (
-/obj/structure/chair{
-	dir = 8
-	},
 /obj/structure/closet/walllocker/emerglocker{
 	pixel_x = 28
 	},
@@ -536,15 +503,18 @@
 /obj/structure/window/reinforced{
 	dir = 1
 	},
+/obj/structure/chair/comfy/shuttle{
+	dir = 8
+	},
 /turf/simulated/shuttle/floor{
 	icon_state = "floor3"
 	},
 /area/shuttle/escape)
 "bt" = (
-/obj/structure/chair{
+/obj/structure/window/reinforced,
+/obj/structure/chair/comfy/shuttle{
 	dir = 8
 	},
-/obj/structure/window/reinforced,
 /turf/simulated/shuttle/floor{
 	icon_state = "floor5"
 	},
@@ -593,23 +563,23 @@
 	},
 /area/shuttle/escape)
 "bz" = (
-/obj/structure/chair{
-	dir = 4
-	},
 /obj/structure/window/reinforced{
 	dir = 1
 	},
+/obj/structure/chair/comfy/shuttle{
+	dir = 4
+	},
 /turf/simulated/shuttle/floor{
 	icon_state = "floor3"
 	},
 /area/shuttle/escape)
 "bA" = (
-/obj/structure/chair{
-	dir = 8
-	},
 /obj/structure/window/reinforced{
 	dir = 1
 	},
+/obj/structure/chair/comfy/shuttle{
+	dir = 8
+	},
 /turf/simulated/shuttle/floor{
 	icon_state = "floor5"
 	},
@@ -665,7 +635,7 @@
 	},
 /area/shuttle/escape)
 "bF" = (
-/obj/structure/chair{
+/obj/structure/chair/comfy/shuttle{
 	dir = 4
 	},
 /turf/simulated/shuttle/floor{
@@ -678,7 +648,7 @@
 	},
 /area/shuttle/escape)
 "bH" = (
-/obj/structure/chair{
+/obj/structure/chair/comfy/shuttle{
 	dir = 8
 	},
 /turf/simulated/shuttle/floor{
@@ -849,7 +819,7 @@ bT
 aa
 ae
 ai
-ar
+al
 aq
 ae
 az
@@ -875,7 +845,7 @@ bT
 aa
 ae
 aj
-as
+al
 aq
 ae
 az
@@ -901,7 +871,7 @@ bS
 ab
 af
 ak
-at
+al
 aq
 ax
 aB
@@ -979,7 +949,7 @@ bU
 aa
 ae
 an
-au
+al
 aq
 ae
 aE
@@ -1005,7 +975,7 @@ bP
 aa
 ae
 ao
-av
+al
 aq
 ae
 aC
diff --git a/_maps/map_files/shuttles/emergency_meta.dmm b/_maps/map_files/shuttles/emergency_meta.dmm
index 60b96451ecb..c711de199e7 100644
--- a/_maps/map_files/shuttles/emergency_meta.dmm
+++ b/_maps/map_files/shuttles/emergency_meta.dmm
@@ -138,29 +138,29 @@
 /turf/simulated/shuttle/floor,
 /area/shuttle/escape)
 "av" = (
-/obj/structure/chair,
+/obj/structure/chair/comfy/shuttle,
 /turf/simulated/shuttle/floor{
 	icon_state = "floor3"
 	},
 /area/shuttle/escape)
 "aw" = (
-/obj/structure/chair,
 /obj/machinery/light{
 	dir = 1;
 	on = 1
 	},
+/obj/structure/chair/comfy/shuttle,
 /turf/simulated/shuttle/floor{
 	icon_state = "floor3"
 	},
 /area/shuttle/escape)
 "ax" = (
-/obj/structure/chair,
 /obj/item/radio/intercom{
 	dir = 4;
 	name = "Station Intercom (General)";
 	pixel_x = 0;
 	pixel_y = 27
 	},
+/obj/structure/chair/comfy/shuttle,
 /turf/simulated/shuttle/floor{
 	icon_state = "floor3"
 	},
@@ -239,7 +239,7 @@
 /turf/simulated/shuttle/floor,
 /area/shuttle/escape)
 "aD" = (
-/obj/structure/chair/office/dark{
+/obj/structure/chair/comfy/shuttle{
 	dir = 1
 	},
 /turf/simulated/shuttle/floor,
@@ -295,11 +295,11 @@
 /turf/simulated/shuttle/floor,
 /area/shuttle/escape)
 "aK" = (
-/obj/structure/chair/office/dark,
+/obj/structure/chair/comfy/shuttle,
 /turf/simulated/shuttle/floor,
 /area/shuttle/escape)
 "aL" = (
-/obj/structure/chair{
+/obj/structure/chair/comfy/shuttle{
 	dir = 1
 	},
 /turf/simulated/shuttle/floor{
@@ -307,10 +307,10 @@
 	},
 /area/shuttle/escape)
 "aM" = (
-/obj/structure/chair{
+/obj/machinery/light,
+/obj/structure/chair/comfy/shuttle{
 	dir = 1
 	},
-/obj/machinery/light,
 /turf/simulated/shuttle/floor{
 	icon_state = "floor3"
 	},
@@ -377,7 +377,7 @@
 /turf/simulated/shuttle/floor,
 /area/shuttle/escape)
 "aQ" = (
-/obj/structure/chair/office/dark{
+/obj/structure/chair/comfy/shuttle{
 	dir = 8
 	},
 /turf/simulated/shuttle/floor,
@@ -420,10 +420,10 @@
 	},
 /area/shuttle/escape)
 "aW" = (
-/obj/structure/chair,
 /obj/machinery/light{
 	dir = 1
 	},
+/obj/structure/chair/comfy/shuttle,
 /turf/simulated/shuttle/floor{
 	icon_state = "floor3"
 	},
@@ -482,9 +482,6 @@
 /turf/simulated/shuttle/floor,
 /area/shuttle/escape)
 "bd" = (
-/obj/structure/chair{
-	dir = 1
-	},
 /obj/item/radio/intercom{
 	broadcasting = 0;
 	listening = 1;
@@ -492,6 +489,9 @@
 	pixel_y = -28
 	},
 /obj/machinery/light,
+/obj/structure/chair/comfy/shuttle{
+	dir = 1
+	},
 /turf/simulated/shuttle/floor{
 	icon_state = "floor3"
 	},
@@ -581,7 +581,7 @@
 /turf/simulated/shuttle/floor,
 /area/shuttle/escape)
 "bo" = (
-/obj/structure/chair{
+/obj/structure/chair/comfy/shuttle{
 	dir = 4
 	},
 /turf/simulated/shuttle/plating{
@@ -607,7 +607,7 @@
 	},
 /area/shuttle/escape)
 "bs" = (
-/obj/structure/chair{
+/obj/structure/chair/comfy/shuttle{
 	dir = 4
 	},
 /turf/simulated/shuttle/floor{
@@ -615,7 +615,7 @@
 	},
 /area/shuttle/escape)
 "bt" = (
-/obj/structure/chair,
+/obj/structure/chair/comfy/shuttle,
 /turf/simulated/shuttle/floor{
 	icon_state = "floor4"
 	},
@@ -693,12 +693,12 @@
 	},
 /area/shuttle/escape)
 "bE" = (
-/obj/structure/chair{
-	dir = 8
-	},
 /obj/structure/reagent_dispensers/peppertank{
 	pixel_x = 31
 	},
+/obj/structure/chair/comfy/shuttle{
+	dir = 8
+	},
 /turf/simulated/shuttle/floor{
 	icon_state = "floor4"
 	},
@@ -762,12 +762,12 @@
 	},
 /area/shuttle/escape)
 "bI" = (
-/obj/structure/chair{
-	dir = 4
-	},
 /obj/machinery/light{
 	dir = 8
 	},
+/obj/structure/chair/comfy/shuttle{
+	dir = 4
+	},
 /turf/simulated/shuttle/plating{
 	icon_state = "floorgrime"
 	},
@@ -779,18 +779,18 @@
 	},
 /area/shuttle/escape)
 "bK" = (
-/obj/structure/chair{
-	dir = 4
-	},
 /obj/machinery/light{
 	dir = 8
 	},
+/obj/structure/chair/comfy/shuttle{
+	dir = 4
+	},
 /turf/simulated/shuttle/floor{
 	icon_state = "floor4"
 	},
 /area/shuttle/escape)
 "bL" = (
-/obj/structure/chair{
+/obj/structure/chair/comfy/shuttle{
 	dir = 8
 	},
 /turf/simulated/shuttle/floor{
diff --git a/_maps/map_files/shuttles/emergency_mil.dmm b/_maps/map_files/shuttles/emergency_mil.dmm
index de4bba7254b..3741f06c673 100644
--- a/_maps/map_files/shuttles/emergency_mil.dmm
+++ b/_maps/map_files/shuttles/emergency_mil.dmm
@@ -115,25 +115,7 @@
 /turf/simulated/shuttle/floor,
 /area/shuttle/escape)
 "au" = (
-/obj/structure/chair/comfy/brown{
-	dir = 1
-	},
-/turf/simulated/shuttle/floor,
-/area/shuttle/escape)
-"av" = (
-/obj/structure/chair/comfy/teal{
-	dir = 1
-	},
-/turf/simulated/shuttle/floor,
-/area/shuttle/escape)
-"aw" = (
-/obj/structure/chair/comfy/red{
-	dir = 1
-	},
-/turf/simulated/shuttle/floor,
-/area/shuttle/escape)
-"ax" = (
-/obj/structure/chair/comfy/blue{
+/obj/structure/chair/comfy/shuttle{
 	dir = 1
 	},
 /turf/simulated/shuttle/floor,
@@ -142,18 +124,6 @@
 /obj/machinery/computer/robotics,
 /turf/simulated/shuttle/floor,
 /area/shuttle/escape)
-"az" = (
-/obj/structure/chair/comfy/beige{
-	dir = 1
-	},
-/turf/simulated/shuttle/floor,
-/area/shuttle/escape)
-"aA" = (
-/obj/structure/chair/comfy/purp{
-	dir = 1
-	},
-/turf/simulated/shuttle/floor,
-/area/shuttle/escape)
 "aB" = (
 /turf/simulated/shuttle/wall{
 	tag = "icon-swall7";
@@ -181,7 +151,7 @@
 	},
 /area/shuttle/escape)
 "aF" = (
-/obj/structure/chair,
+/obj/structure/chair/comfy/shuttle,
 /turf/simulated/shuttle/floor4,
 /area/shuttle/escape)
 "aG" = (
@@ -193,7 +163,7 @@
 	icon_state = "tube1";
 	dir = 1
 	},
-/obj/structure/chair,
+/obj/structure/chair/comfy/shuttle,
 /turf/simulated/shuttle/floor4,
 /area/shuttle/escape)
 "aH" = (
@@ -335,7 +305,7 @@
 /turf/simulated/floor/plating,
 /area/shuttle/escape)
 "aX" = (
-/obj/structure/chair{
+/obj/structure/chair/comfy/shuttle{
 	dir = 1
 	},
 /turf/simulated/shuttle/floor4,
@@ -469,32 +439,32 @@
 	icon_state = "tube1";
 	dir = 8
 	},
-/obj/structure/chair{
+/obj/structure/chair/comfy/shuttle{
 	dir = 4
 	},
 /turf/simulated/floor/plating,
 /area/shuttle/escape)
 "bk" = (
-/obj/structure/chair{
+/obj/structure/chair/comfy/shuttle{
 	dir = 8
 	},
 /turf/simulated/floor/plating,
 /area/shuttle/escape)
 "bl" = (
-/obj/structure/chair{
+/obj/structure/chair/comfy/shuttle{
 	dir = 4
 	},
 /turf/simulated/floor/plating,
 /area/shuttle/escape)
 "bm" = (
-/obj/structure/chair{
-	dir = 8
-	},
 /obj/machinery/light/spot{
 	tag = "icon-tube1 (EAST)";
 	icon_state = "tube1";
 	dir = 4
 	},
+/obj/structure/chair/comfy/shuttle{
+	dir = 8
+	},
 /turf/simulated/floor/plating,
 /area/shuttle/escape)
 "bn" = (
@@ -503,22 +473,11 @@
 	icon_state = "tube1";
 	dir = 8
 	},
-/obj/structure/chair{
+/obj/structure/chair/comfy/shuttle{
 	dir = 4
 	},
 /turf/simulated/floor/plating,
 /area/shuttle/escape)
-"bo" = (
-/obj/machinery/light/spot{
-	tag = "icon-tube1 (EAST)";
-	icon_state = "tube1";
-	dir = 4
-	},
-/obj/structure/chair{
-	dir = 8
-	},
-/turf/simulated/floor/plating,
-/area/shuttle/escape)
 "bp" = (
 /obj/machinery/door/airlock/shuttle{
 	aiControlDisabled = 1;
@@ -629,7 +588,7 @@ aa
 ab
 af
 as
-az
+au
 af
 aF
 aN
@@ -732,7 +691,7 @@ aj
 ac
 af
 al
-av
+au
 at
 aC
 aH
@@ -784,7 +743,7 @@ bz
 ac
 af
 an
-aw
+au
 at
 aC
 aH
@@ -810,7 +769,7 @@ by
 ab
 af
 ao
-ax
+au
 at
 af
 aJ
@@ -889,7 +848,7 @@ aa
 ab
 af
 ay
-aA
+au
 af
 aM
 aT
@@ -901,12 +860,12 @@ bm
 bk
 bk
 bk
-bo
+bm
 bi
 aI
 br
 bk
-bo
+bm
 aC
 bw
 "}
diff --git a/_maps/map_files/shuttles/emergency_narnar.dmm b/_maps/map_files/shuttles/emergency_narnar.dmm
index 8d36106c3da..59111b3eeae 100644
--- a/_maps/map_files/shuttles/emergency_narnar.dmm
+++ b/_maps/map_files/shuttles/emergency_narnar.dmm
@@ -22,7 +22,7 @@
 /turf/simulated/floor/engine/cult,
 /area/shuttle/escape)
 "af" = (
-/obj/structure/chair/comfy/black{
+/obj/structure/chair/comfy/shuttle{
 	dir = 1
 	},
 /turf/simulated/floor/engine/cult,
@@ -35,12 +35,6 @@
 /obj/machinery/computer/station_alert,
 /turf/simulated/floor/engine/cult,
 /area/shuttle/escape)
-"ai" = (
-/obj/structure/chair{
-	dir = 1
-	},
-/turf/simulated/floor/engine/cult,
-/area/shuttle/escape)
 "aj" = (
 /turf/simulated/floor/engine/cult,
 /area/shuttle/escape)
@@ -52,21 +46,21 @@
 /turf/simulated/floor/engine/cult,
 /area/shuttle/escape)
 "al" = (
-/obj/structure/chair{
-	dir = 1
-	},
 /obj/structure/closet/walllocker/emerglocker{
 	pixel_x = -28
 	},
+/obj/structure/chair/comfy/shuttle{
+	dir = 1
+	},
 /turf/simulated/floor/engine/cult,
 /area/shuttle/escape)
 "am" = (
-/obj/structure/chair{
-	dir = 1
-	},
 /obj/structure/closet/walllocker/emerglocker{
 	pixel_x = 28
 	},
+/obj/structure/chair/comfy/shuttle{
+	dir = 1
+	},
 /turf/simulated/floor/engine/cult,
 /area/shuttle/escape)
 "an" = (
@@ -74,7 +68,7 @@
 /turf/simulated/floor/engine/cult,
 /area/shuttle/escape)
 "ao" = (
-/obj/structure/chair{
+/obj/structure/chair/comfy/shuttle{
 	dir = 8
 	},
 /turf/simulated/floor/engine/cult,
@@ -84,7 +78,7 @@
 /turf/simulated/floor/engine/cult,
 /area/shuttle/escape)
 "aq" = (
-/obj/structure/chair{
+/obj/structure/chair/comfy/shuttle{
 	dir = 4
 	},
 /turf/simulated/floor/engine/cult,
@@ -94,14 +88,14 @@
 /turf/simulated/floor/engine/cult,
 /area/shuttle/escape)
 "as" = (
-/obj/structure/chair{
-	dir = 4
-	},
 /obj/effect/decal/remains/human{
 	desc = "This guy seemed to have died in terrible way! Half his remains are dust.";
 	icon_state = "remains";
 	name = "Human remains"
 	},
+/obj/structure/chair/comfy/shuttle{
+	dir = 4
+	},
 /turf/simulated/floor/engine/cult,
 /area/shuttle/escape)
 "at" = (
@@ -113,23 +107,23 @@
 	icon_state = "tube1";
 	dir = 1
 	},
-/obj/structure/chair,
 /obj/effect/decal/remains/human{
 	desc = "This guy seemed to have died in terrible way! Half his remains are dust.";
 	icon_state = "remains";
 	name = "Human remains"
 	},
+/obj/structure/chair/comfy/shuttle,
 /turf/simulated/floor/engine/cult,
 /area/shuttle/escape)
 "au" = (
-/obj/structure/chair{
-	dir = 8
-	},
 /obj/effect/decal/remains/human{
 	desc = "This guy seemed to have died in terrible way! Half his remains are dust.";
 	icon_state = "remains";
 	name = "Human remains"
 	},
+/obj/structure/chair/comfy/shuttle{
+	dir = 8
+	},
 /turf/simulated/floor/engine/cult,
 /area/shuttle/escape)
 "av" = (
@@ -148,9 +142,6 @@
 /turf/simulated/floor/engine/cult,
 /area/shuttle/escape)
 "ax" = (
-/obj/structure/chair{
-	dir = 4
-	},
 /obj/structure/closet/walllocker/emerglocker{
 	pixel_x = -28
 	},
@@ -159,6 +150,9 @@
 	icon_state = "remains";
 	name = "Human remains"
 	},
+/obj/structure/chair/comfy/shuttle{
+	dir = 4
+	},
 /turf/simulated/floor/engine/cult,
 /area/shuttle/escape)
 "ay" = (
@@ -176,20 +170,17 @@
 /turf/simulated/floor/engine/cult,
 /area/shuttle/escape)
 "aB" = (
-/obj/structure/chair{
-	dir = 1
-	},
 /obj/effect/decal/remains/human{
 	desc = "This guy seemed to have died in terrible way! Half his remains are dust.";
 	icon_state = "remains";
 	name = "Human remains"
 	},
+/obj/structure/chair/comfy/shuttle{
+	dir = 1
+	},
 /turf/simulated/floor/engine/cult,
 /area/shuttle/escape)
 "aC" = (
-/obj/structure/chair{
-	dir = 8
-	},
 /obj/item/radio/intercom{
 	dir = 4;
 	name = "station intercom (General)";
@@ -200,6 +191,9 @@
 	icon_state = "remains";
 	name = "Human remains"
 	},
+/obj/structure/chair/comfy/shuttle{
+	dir = 8
+	},
 /turf/simulated/floor/engine/cult,
 /area/shuttle/escape)
 "aD" = (
@@ -559,7 +553,7 @@ bj
 ab
 ab
 ae
-ai
+af
 aj
 aj
 ab
@@ -611,7 +605,7 @@ aa
 ab
 ab
 ag
-ai
+af
 aj
 ap
 ab
diff --git a/_maps/map_files/shuttles/emergency_old.dmm b/_maps/map_files/shuttles/emergency_old.dmm
index 823d6f36a4f..6956613e0b8 100644
--- a/_maps/map_files/shuttles/emergency_old.dmm
+++ b/_maps/map_files/shuttles/emergency_old.dmm
@@ -43,7 +43,7 @@
 /turf/simulated/shuttle/floor,
 /area/shuttle/escape)
 "ai" = (
-/obj/structure/chair/comfy/black{
+/obj/structure/chair/comfy/shuttle{
 	dir = 1
 	},
 /turf/simulated/shuttle/floor,
@@ -72,12 +72,6 @@
 /obj/machinery/computer/station_alert,
 /turf/simulated/shuttle/floor,
 /area/shuttle/escape)
-"am" = (
-/obj/structure/chair{
-	dir = 1
-	},
-/turf/simulated/shuttle/floor,
-/area/shuttle/escape)
 "an" = (
 /turf/simulated/shuttle/floor,
 /area/shuttle/escape)
@@ -89,21 +83,21 @@
 /turf/simulated/shuttle/floor,
 /area/shuttle/escape)
 "ap" = (
-/obj/structure/chair{
-	dir = 1
-	},
 /obj/structure/closet/walllocker/emerglocker{
 	pixel_x = -28
 	},
+/obj/structure/chair/comfy/shuttle{
+	dir = 1
+	},
 /turf/simulated/shuttle/floor,
 /area/shuttle/escape)
 "aq" = (
-/obj/structure/chair{
-	dir = 1
-	},
 /obj/structure/closet/walllocker/emerglocker{
 	pixel_x = 28
 	},
+/obj/structure/chair/comfy/shuttle{
+	dir = 1
+	},
 /turf/simulated/shuttle/floor,
 /area/shuttle/escape)
 "ar" = (
@@ -117,7 +111,7 @@
 /turf/simulated/shuttle/floor,
 /area/shuttle/escape)
 "at" = (
-/obj/structure/chair{
+/obj/structure/chair/comfy/shuttle{
 	dir = 8
 	},
 /turf/simulated/shuttle/floor,
@@ -127,7 +121,7 @@
 /turf/simulated/shuttle/floor,
 /area/shuttle/escape)
 "av" = (
-/obj/structure/chair{
+/obj/structure/chair/comfy/shuttle{
 	dir = 4
 	},
 /turf/simulated/shuttle/floor,
@@ -158,7 +152,7 @@
 	},
 /area/shuttle/escape)
 "aA" = (
-/obj/structure/chair{
+/obj/structure/chair/comfy/shuttle{
 	dir = 4
 	},
 /turf/simulated/shuttle/floor{
@@ -177,7 +171,7 @@
 /turf/simulated/shuttle/floor,
 /area/shuttle/escape)
 "aC" = (
-/obj/structure/chair{
+/obj/structure/chair/comfy/shuttle{
 	dir = 8
 	},
 /turf/simulated/shuttle/floor{
@@ -192,12 +186,12 @@
 /turf/simulated/floor/plating,
 /area/shuttle/escape)
 "aE" = (
-/obj/structure/chair{
-	dir = 4
-	},
 /obj/structure/closet/walllocker/emerglocker{
 	pixel_x = -28
 	},
+/obj/structure/chair/comfy/shuttle{
+	dir = 4
+	},
 /turf/simulated/shuttle/floor{
 	icon_state = "floor3"
 	},
@@ -210,12 +204,12 @@
 /turf/simulated/floor/plating,
 /area/shuttle/escape)
 "aG" = (
-/obj/structure/chair{
-	dir = 8
-	},
 /obj/structure/closet/walllocker/emerglocker{
 	pixel_x = 28
 	},
+/obj/structure/chair/comfy/shuttle{
+	dir = 8
+	},
 /turf/simulated/shuttle/floor{
 	icon_state = "floor3"
 	},
@@ -266,9 +260,6 @@
 	},
 /area/shuttle/escape)
 "aL" = (
-/obj/structure/chair{
-	dir = 4
-	},
 /obj/item/radio/intercom{
 	dir = 8;
 	name = "station intercom (General)";
@@ -279,14 +270,14 @@
 	icon_state = "tube1";
 	dir = 8
 	},
+/obj/structure/chair/comfy/shuttle{
+	dir = 4
+	},
 /turf/simulated/shuttle/floor{
 	icon_state = "floor3"
 	},
 /area/shuttle/escape)
 "aM" = (
-/obj/structure/chair{
-	dir = 8
-	},
 /obj/structure/closet/walllocker/emerglocker{
 	pixel_x = 28
 	},
@@ -295,6 +286,9 @@
 	icon_state = "tube1";
 	dir = 4
 	},
+/obj/structure/chair/comfy/shuttle{
+	dir = 8
+	},
 /turf/simulated/shuttle/floor{
 	icon_state = "floor3"
 	},
@@ -393,7 +387,7 @@
 	},
 /area/shuttle/escape)
 "aZ" = (
-/obj/structure/chair,
+/obj/structure/chair/comfy/shuttle,
 /turf/simulated/shuttle/floor4,
 /area/shuttle/escape)
 "ba" = (
@@ -455,7 +449,7 @@
 	},
 /area/shuttle/escape)
 "bh" = (
-/obj/structure/chair{
+/obj/structure/chair/comfy/shuttle{
 	dir = 1
 	},
 /turf/simulated/shuttle/floor4,
@@ -633,7 +627,7 @@ bo
 ab
 ae
 ah
-am
+ai
 an
 an
 aw
@@ -685,7 +679,7 @@ aa
 ad
 ag
 aj
-am
+ai
 an
 au
 aw
diff --git a/_maps/map_files/shuttles/ferry_base.dmm b/_maps/map_files/shuttles/ferry_base.dmm
index a5e2d5aef05..658633d421a 100644
--- a/_maps/map_files/shuttles/ferry_base.dmm
+++ b/_maps/map_files/shuttles/ferry_base.dmm
@@ -45,14 +45,14 @@
 	},
 /area/shuttle/transport)
 "h" = (
-/obj/structure/chair{
-	dir = 4
-	},
 /obj/machinery/light/spot{
 	tag = "icon-tube1 (NORTH)";
 	icon_state = "tube1";
 	dir = 1
 	},
+/obj/structure/chair/comfy/shuttle{
+	dir = 4
+	},
 /turf/simulated/shuttle/floor,
 /area/shuttle/transport)
 "i" = (
@@ -60,16 +60,16 @@
 /turf/simulated/shuttle/floor,
 /area/shuttle/transport)
 "j" = (
-/obj/structure/chair,
+/obj/structure/chair/comfy/shuttle,
 /turf/simulated/shuttle/floor,
 /area/shuttle/transport)
 "k" = (
-/obj/structure/chair,
 /obj/machinery/light/spot{
 	tag = "icon-tube1 (NORTH)";
 	icon_state = "tube1";
 	dir = 1
 	},
+/obj/structure/chair/comfy/shuttle,
 /turf/simulated/shuttle/floor,
 /area/shuttle/transport)
 "l" = (
@@ -126,16 +126,16 @@
 /turf/simulated/shuttle/floor,
 /area/shuttle/transport)
 "s" = (
-/obj/structure/chair{
+/obj/structure/chair/comfy/shuttle{
 	dir = 1
 	},
 /turf/simulated/shuttle/floor,
 /area/shuttle/transport)
 "t" = (
-/obj/structure/chair{
+/obj/machinery/light/spot,
+/obj/structure/chair/comfy/shuttle{
 	dir = 1
 	},
-/obj/machinery/light/spot,
 /turf/simulated/shuttle/floor,
 /area/shuttle/transport)
 "u" = (
diff --git a/_maps/map_files/shuttles/ferry_meat.dmm b/_maps/map_files/shuttles/ferry_meat.dmm
index a4008980d4a..a0935fb04d3 100644
--- a/_maps/map_files/shuttles/ferry_meat.dmm
+++ b/_maps/map_files/shuttles/ferry_meat.dmm
@@ -47,14 +47,14 @@
 	},
 /area/shuttle/transport)
 "h" = (
-/obj/structure/chair{
-	dir = 4
-	},
 /obj/machinery/light/spot{
 	tag = "icon-tube1 (NORTH)";
 	icon_state = "tube1";
 	dir = 1
 	},
+/obj/structure/chair/comfy/shuttle{
+	dir = 4
+	},
 /turf/simulated/floor/plasteel{
 	icon_state = "freezerfloor"
 	},
@@ -103,7 +103,7 @@
 	},
 /area/shuttle/transport)
 "n" = (
-/obj/structure/chair,
+/obj/structure/chair/comfy/shuttle,
 /turf/simulated/floor/plasteel{
 	icon_state = "freezerfloor"
 	},
@@ -114,7 +114,7 @@
 	icon_state = "tube1";
 	dir = 1
 	},
-/obj/structure/chair,
+/obj/structure/chair/comfy/shuttle,
 /turf/simulated/floor/plasteel{
 	icon_state = "freezerfloor"
 	},
diff --git a/_maps/map_files/templates/medium_shuttle1.dmm b/_maps/map_files/templates/medium_shuttle1.dmm
index 109f921ed60..90acb3211a1 100644
--- a/_maps/map_files/templates/medium_shuttle1.dmm
+++ b/_maps/map_files/templates/medium_shuttle1.dmm
@@ -332,7 +332,7 @@
 	name = "Shuttle"
 	})
 "L" = (
-/obj/structure/chair/comfy/black{
+/obj/structure/chair/comfy/shuttle{
 	dir = 4
 	},
 /turf/simulated/floor/plasteel{
diff --git a/_maps/map_files/templates/medium_shuttle2.dmm b/_maps/map_files/templates/medium_shuttle2.dmm
index 4a0e2e5e031..8966fc3ac7a 100644
--- a/_maps/map_files/templates/medium_shuttle2.dmm
+++ b/_maps/map_files/templates/medium_shuttle2.dmm
@@ -222,9 +222,7 @@
 	name = "Shuttle"
 	})
 "B" = (
-/obj/structure/chair/comfy{
-	tag = "icon-comfychair (EAST)";
-	icon_state = "comfychair";
+/obj/structure/chair/comfy/shuttle{
 	dir = 4
 	},
 /turf/simulated/floor/plasteel{
diff --git a/_maps/map_files/templates/medium_shuttle3.dmm b/_maps/map_files/templates/medium_shuttle3.dmm
index 382a3a3e18d..e87eec1f66b 100644
--- a/_maps/map_files/templates/medium_shuttle3.dmm
+++ b/_maps/map_files/templates/medium_shuttle3.dmm
@@ -187,9 +187,7 @@
 	name = "Shuttle"
 	})
 "x" = (
-/obj/structure/chair/comfy{
-	tag = "icon-comfychair (WEST)";
-	icon_state = "comfychair";
+/obj/structure/chair/comfy/shuttle{
 	dir = 8
 	},
 /turf/simulated/floor/plasteel{
diff --git a/_maps/map_files/templates/small_shuttle_1.dmm b/_maps/map_files/templates/small_shuttle_1.dmm
index 92066f62880..a1fae43e707 100644
--- a/_maps/map_files/templates/small_shuttle_1.dmm
+++ b/_maps/map_files/templates/small_shuttle_1.dmm
@@ -59,7 +59,7 @@
 	},
 /area/ruin/powered)
 "m" = (
-/obj/structure/chair{
+/obj/structure/chair/comfy/shuttle{
 	dir = 4
 	},
 /turf/simulated/shuttle/floor,
@@ -88,7 +88,7 @@
 /turf/simulated/shuttle/floor,
 /area/ruin/powered)
 "r" = (
-/obj/structure/chair{
+/obj/structure/chair/comfy/shuttle{
 	dir = 1
 	},
 /turf/simulated/shuttle/floor,
@@ -108,7 +108,7 @@
 	},
 /area/ruin/powered)
 "u" = (
-/obj/structure/chair{
+/obj/structure/chair/comfy/shuttle{
 	dir = 8
 	},
 /turf/simulated/shuttle/floor,
diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm
index 26cef56e880..9ec921fef92 100644
--- a/code/game/objects/items/stacks/sheets/sheet_types.dm
+++ b/code/game/objects/items/stacks/sheets/sheet_types.dm
@@ -16,6 +16,7 @@
 var/global/list/datum/stack_recipe/metal_recipes = list(
 	new /datum/stack_recipe("stool", /obj/structure/chair/stool, one_per_turf = 1, on_floor = 1),
 	new /datum/stack_recipe("chair", /obj/structure/chair, one_per_turf = 1, on_floor = 1),
+	new /datum/stack_recipe("shuttle seat", /obj/structure/chair/comfy/shuttle, 2, one_per_turf = 1, on_floor = 1),
 	new /datum/stack_recipe("sofa (middle)", /obj/structure/chair/sofa, one_per_turf = 1, on_floor = 1),
 	new /datum/stack_recipe("sofa (left)", /obj/structure/chair/sofa/left, one_per_turf = 1, on_floor = 1),
 	new /datum/stack_recipe("sofa (right)", /obj/structure/chair/sofa/right, one_per_turf = 1, on_floor = 1),
diff --git a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm
index b9b72c04455..005f0e721fb 100644
--- a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm
+++ b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm
@@ -151,35 +151,38 @@
 	name = "comfy chair"
 	desc = "It looks comfy."
 	icon_state = "comfychair"
-	color = rgb(255,255,255)
+	color = rgb(255, 255, 255)
 	burn_state = FLAMMABLE
 	burntime = 30
 	buildstackamount = 2
 	item_chair = null
 	var/image/armrest = null
 
-/obj/structure/chair/comfy/New()
-	armrest = image("icons/obj/chairs.dmi", "comfychair_armrest")
+/obj/structure/chair/comfy/Initialize(mapload)
+	armrest = GetArmrest()
 	armrest.layer = ABOVE_MOB_LAYER
 	return ..()
 
+/obj/structure/chair/comfy/proc/GetArmrest()
+	return mutable_appearance('icons/obj/chairs.dmi', "comfychair_armrest")
+
 /obj/structure/chair/comfy/Destroy()
 	QDEL_NULL(armrest)
 	return ..()
 
 /obj/structure/chair/comfy/post_buckle_mob(mob/living/M)
-	..()
-	if(buckled_mob)
-		overlays += armrest
-	else
-		overlays -= armrest
+	. = ..()
+	update_armrest()
 
 /obj/structure/chair/comfy/post_unbuckle_mob(mob/living/M)
-	..()
-	if(buckled_mob)
-		overlays -= armrest
+	. = ..()
+	update_armrest()
+
+/obj/structure/chair/comfy/proc/update_armrest()
+	if(has_buckled_mobs())
+		add_overlay(armrest)
 	else
-		overlays += armrest
+		cut_overlay(armrest)
 
 /obj/structure/chair/comfy/brown
 	color = rgb(141,70,0)
@@ -214,6 +217,14 @@
 	item_chair = null
 	buildstackamount = 5
 
+/obj/structure/chair/comfy/shuttle
+	name = "shuttle seat"
+	desc = "A comfortable, secure seat. It has a more sturdy looking buckling system, for smoother flights."
+	icon_state = "shuttle_chair"
+
+/obj/structure/chair/comfy/shuttle/GetArmrest()
+	return mutable_appearance('icons/obj/chairs.dmi', "shuttle_chair_armrest")
+
 /obj/structure/chair/office/Bump(atom/A)
 	..()
 	if(!buckled_mob)
diff --git a/code/modules/awaymissions/mission_code/stationCollision.dm b/code/modules/awaymissions/mission_code/stationCollision.dm
index ed888d65465..6d647c8ff1b 100644
--- a/code/modules/awaymissions/mission_code/stationCollision.dm
+++ b/code/modules/awaymissions/mission_code/stationCollision.dm
@@ -19,22 +19,22 @@
  * Areas
  */
  //Gateroom gets its own APC specifically for the gate
- /area/awaymission/gateroom
+/area/awaymission/gateroom
 
  //Library, medbay, storage room
- /area/awaymission/southblock
+/area/awaymission/southblock
 
  //Arrivals, security, hydroponics, shuttles (since they dont move, they dont need specific areas)
- /area/awaymission/arrivalblock
+/area/awaymission/arrivalblock
 
  //Crew quarters, cafeteria, chapel
- /area/awaymission/midblock
+/area/awaymission/midblock
 
  //engineering, bridge (not really north but it doesnt really need its own APC)
- /area/awaymission/northblock
+/area/awaymission/northblock
 
  //That massive research room
- /area/awaymission/research
+/area/awaymission/research
 
 //Syndicate shuttle
 /area/awaymission/syndishuttle
diff --git a/icons/obj/chairs.dmi b/icons/obj/chairs.dmi
index cc19efc4900..dba239a064f 100644
Binary files a/icons/obj/chairs.dmi and b/icons/obj/chairs.dmi differ