Merge pull request #7162 from Citadel-Station-13/upstream-merge-38539

[MIRROR] Adds New Shuttle Chairs

code/game/objects/structures/beds_chairs/chair.dm

@@ -407,3 +407,16 @@
 	. = ..()
 	if(has_gravity())
 		playsound(src, 'sound/machines/clockcult/integration_cog_install.ogg', 50, TRUE)
+
+/obj/structure/chair/shuttle
+	name = "shuttle seat"
+	desc = "A comfortable, secure seat. It has a more sturdy looking buckling system, for smoother flights."
+	icon_state = "shuttle_chair"
+	buildstackamount = 2
+	var/mutable_appearance/armrest
+	item_chair = null
+
+/obj/structure/chair/shuttle/Initialize()
+	armrest = mutable_appearance('icons/obj/chairs.dmi', "shuttle_chair_armrest")
+	armrest.layer = ABOVE_MOB_LAYER
+	return ..()