Merge remote-tracking branch 'upstream/master'

This commit is contained in:
BongaTheProto
2022-05-24 09:35:48 -05:00
3 changed files with 5 additions and 0 deletions
@@ -252,6 +252,7 @@
name = "shuttle seat"
desc = "A comfortable, secure seat. It has a more sturdy looking buckling system, for smoother flights."
icon_state = "shuttle_chair"
buildstacktype = /obj/item/stack/sheet/mineral/titanium
/obj/structure/chair/comfy/shuttle/GetArmrest()
return mutable_appearance('icons/obj/chairs.dmi', "shuttle_chair_armrest")