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
TobleroneSwordfish
merged 8 commits into
goonstation:master
from
Glamurio:industrial_chair
Sep 2, 2023
Merged
Adds industrial chair & parts #15536
TobleroneSwordfish
merged 8 commits into
goonstation:master
from
Glamurio:industrial_chair
Sep 2, 2023
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
boring-cyborg
bot
added
the
C-Sprites
Automatically applied on any .dmi or icons folder change
label
Aug 27, 2023
github-actions
bot
added
the
size/S
Denotes a PR that changes 10-29 lines, ignoring generated files.
label
Aug 27, 2023
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
TobleroneSwordfish
requested changes
Aug 31, 2023
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
@TobleroneSwordfish I hope you're satisfied now, you made me do this |
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
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
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.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
[Objects] [Feature]
About the PR
Adds an industrial chair in the same visual style as the existing industrial table.
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