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.

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

Tweak: Recolor comfy chairs, fix corp armrest #583

Merged
merged 5 commits into from
Oct 27, 2023
Merged
Changes from all commits
Commits
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
34 changes: 34 additions & 0 deletions modular_ss220/aesthetics/chairs/code/chairs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,43 @@
/obj/structure/chair/comfy/corp
icon = 'icons/obj/chairs.dmi'

/obj/structure/chair/comfy/corp/GetArmrest()
return mutable_appearance('icons/obj/chairs.dmi', "[icon_state]_armrest")

/obj/structure/chair/comfy/shuttle
icon = 'icons/obj/chairs.dmi'

// Recoloring comfy's
/obj/structure/chair/comfy/beige
color = rgb(240, 240, 200)

/obj/structure/chair/comfy/black
color = rgb(60, 60, 55)

/obj/structure/chair/comfy/red
color = rgb(165, 65, 65)

/obj/structure/chair/comfy/brown
color = rgb(141, 70, 0)

/obj/structure/chair/comfy/green
color = rgb(80, 170, 85)

/obj/structure/chair/comfy/lime
color = rgb(185, 210, 115)

/obj/structure/chair/comfy/yellow
color = rgb(225, 215, 125)

/obj/structure/chair/comfy/blue
color = rgb(80, 125, 220)

/obj/structure/chair/comfy/teal
color = rgb(115, 215, 215)

/obj/structure/chair/comfy/purp
color = rgb(100, 65, 120)

/obj/structure/chair/office/dark
icon = 'modular_ss220/aesthetics/chairs/icons/chairs.dmi'

Expand Down
Loading