Skip to content

Commit

Permalink
[UPSTREAM] Certain chairs are no longer pickupable & office chair spin (
Browse files Browse the repository at this point in the history
  • Loading branch information
someone543 authored Feb 19, 2024
1 parent f521e93 commit 19abfe1
Showing 1 changed file with 12 additions and 0 deletions.
12 changes: 12 additions & 0 deletions code/game/objects/structures/beds_chairs/chair.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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())
Expand Down

0 comments on commit 19abfe1

Please sign in to comment.