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

Adds industrial chair & parts #15536

Merged
merged 8 commits into from Sep 2, 2023

Conversation

Glamurio
Copy link
Contributor

@Glamurio Glamurio commented Aug 27, 2023

[Objects] [Feature]

About the PR

Adds an industrial chair in the same visual style as the existing industrial table.
image

Industrial chair parts are crafted with a sheet of reinforced metal, and constructed the same as any other chair out of parts.

Also changes /obj/stool/chair/wooden/ to /obj/stool/chair/dining/ and instead makes it inherit from that. The same is done for /obj/item/furniture_parts/wood_chair to /obj/item/furniture_parts/dining_chair.

Why's this needed?

It's always bugged me that there's no fitting chairs for industrial tables, because I love how they look.

Changelog

(u)Glamurio (Ryou)
(+)Added industrial chairs. You can craft them out of reinforced metal.

@boring-cyborg boring-cyborg bot added the C-Sprites Automatically applied on any .dmi or icons folder change label Aug 27, 2023
@github-actions github-actions bot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Aug 27, 2023
@keywordlabeler keywordlabeler bot added A-Game-Objects The point of this PR is to deal with a specific game object C-Feature A new feature or enhancements to existing features labels Aug 27, 2023
@boring-cyborg boring-cyborg bot added the A-Mapping A mapping change label Aug 31, 2023
@github-actions github-actions bot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Aug 31, 2023
@Glamurio
Copy link
Contributor Author

Glamurio commented Aug 31, 2023

@TobleroneSwordfish I hope you're satisfied now, you made me do this

@github-actions github-actions bot added the S-Merge-Conflict Applied and removed when a PR has or no longer has a merge conflict label Sep 1, 2023
@github-actions github-actions bot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Sep 2, 2023
@TobleroneSwordfish TobleroneSwordfish merged commit ce2aeb6 into goonstation:master Sep 2, 2023
21 checks passed
github-actions bot pushed a commit that referenced this pull request Sep 2, 2023
@Glamurio Glamurio deleted the industrial_chair branch September 9, 2023 03:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-Game-Objects The point of this PR is to deal with a specific game object A-Mapping A mapping change C-Feature A new feature or enhancements to existing features C-Sprites Automatically applied on any .dmi or icons folder change S-Merge-Conflict Applied and removed when a PR has or no longer has a merge conflict size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants