Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[UPSTREAM] Certain chairs are no longer pickupable & office chair spin #2594

Merged
merged 1 commit into from
Feb 19, 2024
Merged

[UPSTREAM] Certain chairs are no longer pickupable & office chair spin #2594

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions code/game/objects/structures/beds_chairs/chair.dm
View file
Open in desktop
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
Loading