From 19abfe194308c7f3759c1b080fe5f392f8919798 Mon Sep 17 00:00:00 2001
From: someone543 <95106800+someone543@users.noreply.github.com>
Date: Mon, 19 Feb 2024 17:57:17 +0800
Subject: [PATCH] [UPSTREAM] Certain chairs are no longer pickupable & office
 chair spin (#2594)

---
 code/game/objects/structures/beds_chairs/chair.dm | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/code/game/objects/structures/beds_chairs/chair.dm b/code/game/objects/structures/beds_chairs/chair.dm
index 9367975245d..3d1555de944 100644
--- a/code/game/objects/structures/beds_chairs/chair.dm
+++ b/code/game/objects/structures/beds_chairs/chair.dm
@@ -231,11 +231,15 @@
 	name = "corporate chair"
 	desc = "It looks professional."
 	icon_state = "comfychair_corp"
+	buildstackamount = 1
+	item_chair = null
 
 /obj/structure/chair/fancy/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 = 1
+	item_chair = null
 
 /obj/structure/chair/fancy/plastic
 	name = "plastic chair"
@@ -334,6 +338,14 @@
 	item_chair = null
 	icon_state = "officechair_dark"
 
+/obj/structure/chair/office/relaymove(mob/user, direction)
+	if(!direction)
+		return FALSE
+	if(direction == dir)
+		return
+	setDir(direction)
+	return FALSE
+
 /obj/structure/chair/office/Moved()
 	. = ..()
 	if(has_gravity())