diff --git a/_maps/RandomRuins/IceRuins/icemoon_underground_icecropolis.dmm b/_maps/RandomRuins/IceRuins/icemoon_underground_icecropolis.dmm
index d2d296cc1d8c..529c6f52abcf 100644
--- a/_maps/RandomRuins/IceRuins/icemoon_underground_icecropolis.dmm
+++ b/_maps/RandomRuins/IceRuins/icemoon_underground_icecropolis.dmm
@@ -2062,7 +2062,7 @@
 /area/ruin/unpowered/icecropolis/gold)
 "LQ" = (
 /obj/structure/stone_tile/slab,
-/obj/structure/chair/bronze{
+/obj/structure/chair/comfy/shuttle/bronze{
 	dir = 8
 	},
 /turf/open/indestructible/boss/air,
@@ -2178,7 +2178,7 @@
 /turf/open/indestructible/boss/air,
 /area/ruin/unpowered/icecropolis/gold)
 "Os" = (
-/obj/structure/chair/bronze{
+/obj/structure/chair/comfy/shuttle/bronze{
 	dir = 8
 	},
 /turf/open/floor/wood/icecropolis,
diff --git a/_maps/RandomRuins/ReebeRuins/reebe_arena.dmm b/_maps/RandomRuins/ReebeRuins/reebe_arena.dmm
index 54d5adb49d9f..448690c0e77a 100644
--- a/_maps/RandomRuins/ReebeRuins/reebe_arena.dmm
+++ b/_maps/RandomRuins/ReebeRuins/reebe_arena.dmm
@@ -27,7 +27,7 @@
 /turf/open/floor/bronze,
 /area/ruin/reebe)
 "hO" = (
-/obj/structure/chair/bronze{
+/obj/structure/chair/comfy/shuttle/bronze{
 	dir = 4
 	},
 /turf/open/floor/bronze,
@@ -55,7 +55,7 @@
 /turf/open/floor/bronze,
 /area/ruin/reebe)
 "qC" = (
-/obj/structure/chair/bronze,
+/obj/structure/chair/comfy/shuttle/bronze,
 /obj/item/nullrod/spear,
 /turf/open/floor/bronze,
 /area/ruin/reebe)
@@ -84,7 +84,7 @@
 /turf/open/chasm/reebe_void,
 /area/ruin/reebe)
 "zu" = (
-/obj/structure/chair/bronze{
+/obj/structure/chair/comfy/shuttle/bronze{
 	dir = 8
 	},
 /turf/open/floor/bronze,
@@ -170,7 +170,7 @@
 /turf/open/floor/bronze,
 /area/ruin/reebe)
 "JC" = (
-/obj/structure/chair/bronze{
+/obj/structure/chair/comfy/shuttle/bronze{
 	dir = 1
 	},
 /turf/open/floor/bronze,
diff --git a/_maps/RandomRuins/RockRuins/rockplanet_clock.dmm b/_maps/RandomRuins/RockRuins/rockplanet_clock.dmm
index f332a4a4d32e..3a8da9995006 100644
--- a/_maps/RandomRuins/RockRuins/rockplanet_clock.dmm
+++ b/_maps/RandomRuins/RockRuins/rockplanet_clock.dmm
@@ -75,7 +75,7 @@
 /area/ruin/powered)
 "kd" = (
 /obj/structure/fluff/clockwork/alloy_shards/medium_gearbit,
-/obj/structure/chair/bronze{
+/obj/structure/chair/comfy/shuttle/bronze{
 	dir = 4
 	},
 /turf/open/floor/bronze,
@@ -90,7 +90,7 @@
 /turf/open/floor/bronze,
 /area/ruin/powered)
 "mG" = (
-/obj/structure/chair/bronze,
+/obj/structure/chair/comfy/shuttle/bronze,
 /turf/open/floor/bronze,
 /area/ruin/powered)
 "nM" = (
@@ -177,7 +177,7 @@
 /turf/open/floor/plating/asteroid/rockplanet/lit,
 /area/overmap_encounter/planetoid/rockplanet/explored)
 "xV" = (
-/obj/structure/chair/bronze{
+/obj/structure/chair/comfy/shuttle/bronze{
 	dir = 4
 	},
 /obj/effect/decal/cleanable/blood/old,
@@ -188,7 +188,7 @@
 /turf/open/floor/bronze,
 /area/ruin/powered)
 "zz" = (
-/obj/structure/chair/bronze,
+/obj/structure/chair/comfy/shuttle/bronze,
 /obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/bronze,
 /area/ruin/powered)
@@ -297,7 +297,7 @@
 /turf/closed/wall/mineral/bronze,
 /area/ruin/powered)
 "Rt" = (
-/obj/structure/chair/bronze{
+/obj/structure/chair/comfy/shuttle/bronze{
 	dir = 4
 	},
 /turf/open/floor/bronze,
@@ -365,7 +365,7 @@
 /turf/open/floor/plating/asteroid/rockplanet/lit,
 /area/overmap_encounter/planetoid/rockplanet/explored)
 "ZY" = (
-/obj/structure/chair/bronze{
+/obj/structure/chair/comfy/shuttle/bronze{
 	dir = 8
 	},
 /turf/open/floor/bronze,
diff --git a/_maps/shuttles/shiptest/independent_rube_goldberg.dmm b/_maps/shuttles/shiptest/independent_rube_goldberg.dmm
index 6fd38fb13759..aa60cb0daf33 100644
--- a/_maps/shuttles/shiptest/independent_rube_goldberg.dmm
+++ b/_maps/shuttles/shiptest/independent_rube_goldberg.dmm
@@ -2114,7 +2114,7 @@
 /turf/open/floor/plating/airless,
 /area/ship/hallway)
 "vw" = (
-/obj/structure/chair/bronze,
+/obj/structure/chair/comfy/shuttle/bronze,
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
 /turf/open/floor/mineral/titanium,
 /area/ship/bridge)
diff --git a/_maps/shuttles/shiptest/radio_funny.dmm b/_maps/shuttles/shiptest/radio_funny.dmm
index 6b27d4fb9d75..bd9c294b972d 100644
--- a/_maps/shuttles/shiptest/radio_funny.dmm
+++ b/_maps/shuttles/shiptest/radio_funny.dmm
@@ -40,7 +40,7 @@
 /turf/open/floor/carpet/nanoweave/red,
 /area/ship/bridge)
 "cS" = (
-/obj/structure/chair/bronze{
+/obj/structure/chair/comfy/shuttle/bronze{
 	dir = 1
 	},
 /turf/open/floor/carpet/nanoweave/blue,
@@ -67,7 +67,7 @@
 /turf/open/floor/carpet/nanoweave/blue,
 /area/ship/bridge)
 "io" = (
-/obj/structure/chair/bronze,
+/obj/structure/chair/comfy/shuttle/bronze,
 /obj/machinery/door/window{
 	dir = 1
 	},
diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm
index d7c65e2e14ba..4e0994174b25 100644
--- a/code/game/objects/items/stacks/sheets/sheet_types.dm
+++ b/code/game/objects/items/stacks/sheets/sheet_types.dm
@@ -601,7 +601,7 @@ GLOBAL_LIST_INIT(bronze_recipes, list ( \
 	new/datum/stack_recipe("bronze suit", /obj/item/clothing/suit/bronze), \
 	new/datum/stack_recipe("bronze boots", /obj/item/clothing/shoes/bronze), \
 	null,
-	new/datum/stack_recipe("bronze chair", /obj/structure/chair/bronze, 1, time = 0, one_per_turf = TRUE, on_floor = TRUE), \
+	new/datum/stack_recipe("bronze chair", /obj/structure/chair/comfy/shuttle/bronze, 1, time = 0, one_per_turf = TRUE, on_floor = TRUE), \
 	new/datum/stack_recipe("Marx Bust", /obj/structure/statue/bronze/marx, 15, one_per_turf = 1, on_floor = 1), \
 ))
 
diff --git a/code/game/objects/structures/beds_chairs/chair.dm b/code/game/objects/structures/beds_chairs/chair.dm
index a920c6f26760..6aabc8f770ed 100644
--- a/code/game/objects/structures/beds_chairs/chair.dm
+++ b/code/game/objects/structures/beds_chairs/chair.dm
@@ -376,7 +376,7 @@
 	icon_state = "chairold"
 	item_chair = null
 
-/obj/structure/chair/bronze
+/obj/structure/chair/comfy/shuttle/bronze
 	name = "brass chair"
 	desc = "A spinny chair made of bronze. It has little cogs for wheels!"
 	anchored = FALSE
@@ -386,23 +386,26 @@
 	item_chair = null
 	var/turns = 0
 
-/obj/structure/chair/bronze/Destroy()
+/obj/structure/chair/comfy/shuttle/bronze/GetArmrest()
+	return mutable_appearance('icons/obj/chairs.dmi', "brass_chair_armrest")
+
+/obj/structure/chair/comfy/shuttle/bronze/Destroy()
 	STOP_PROCESSING(SSfastprocess, src)
 	. = ..()
 
-/obj/structure/chair/bronze/process()
+/obj/structure/chair/comfy/shuttle/bronze/process()
 	setDir(turn(dir,-90))
 	playsound(src, 'sound/effects/servostep.ogg', 50, FALSE)
 	turns++
 	if(turns >= 8)
 		STOP_PROCESSING(SSfastprocess, src)
 
-/obj/structure/chair/bronze/Moved()
+/obj/structure/chair/comfy/shuttle/bronze/Moved()
 	. = ..()
 	if(has_gravity())
 		playsound(src, 'sound/machines/clockcult/integration_cog_install.ogg', 50, TRUE)
 
-/obj/structure/chair/bronze/AltClick(mob/living/user)
+/obj/structure/chair/comfy/shuttle/bronze/AltClick(mob/living/user)
 	turns = 0
 	if(!istype(user) || !user.canUseTopic(src, BE_CLOSE, ismonkey(user)))
 		return
diff --git a/icons/obj/chairs.dmi b/icons/obj/chairs.dmi
index 7a26c4b5751e..19b49a6d34da 100644
Binary files a/icons/obj/chairs.dmi and b/icons/obj/chairs.dmi differ