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

Cabinet Refactor #3378

Merged
merged 18 commits into from
Sep 30, 2024
Merged

Cabinet Refactor #3378

merged 18 commits into from
Sep 30, 2024

Conversation

Erikafox
Copy link
Contributor

About The Pull Request

Mildly refactors fireaxe cabinets to allow them to be subtyped with different items. Also adds an is_wielded proc to most weapons that can be wielded to prevent potential weirdness with this down the line.

Why It's Good For The Game

Cabinets are soulful

Changelog

🆑 Erika Fox
code: Fireaxe cabinets have been repathed, and now function as a more general cabinet object. please report any inconsistencies with behavior
/:cl:

@Erikafox Erikafox requested review from FalloutFalcon and a team as code owners September 16, 2024 20:07
@github-actions github-actions bot added Map Change Tile placing is hard. Thank you for your service. DME Edit Code change Watch something violently break. labels Sep 16, 2024
code/game/objects/structures/cabinet.dm Outdated Show resolved Hide resolved
code/game/objects/structures/cabinet.dm Outdated Show resolved Hide resolved
code/game/objects/structures/cabinet.dm Outdated Show resolved Hide resolved
code/game/objects/structures/cabinet.dm Outdated Show resolved Hide resolved
Copy link
Member

@FalloutFalcon FalloutFalcon left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good work so far!

code/game/objects/items/spear.dm Outdated Show resolved Hide resolved
code/game/objects/items/spear.dm Outdated Show resolved Hide resolved
code/modules/projectiles/gun.dm Show resolved Hide resolved
@github-actions github-actions bot added the Merge Conflict Use Git Hooks, you're welcome. label Sep 23, 2024
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions github-actions bot removed the Merge Conflict Use Git Hooks, you're welcome. label Sep 23, 2024
code/datums/components/twohanded.dm Outdated Show resolved Hide resolved
code/game/objects/structures/cabinet.dm Show resolved Hide resolved
code/game/objects/structures/cabinet_types.dm Outdated Show resolved Hide resolved
@FalloutFalcon FalloutFalcon added this pull request to the merge queue Sep 30, 2024
Merged via the queue into shiptest-ss13:master with commit c170620 Sep 30, 2024
14 checks passed
rye-rice added a commit that referenced this pull request Oct 2, 2024
MysticalFaceLesS pushed a commit to CeladonSS13/Shiptest that referenced this pull request Oct 6, 2024
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->
Mildly refactors fireaxe cabinets to allow them to be subtyped with
different items. Also adds an is_wielded proc to most weapons that can
be wielded to prevent potential weirdness with this down the line.
<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->
Cabinets are soulful
<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

:cl: Erika Fox
code: Fireaxe cabinets have been repathed, and now function as a more
general cabinet object. please report any inconsistencies with behavior
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->

---------

Signed-off-by: FalloutFalcon <[email protected]>
Co-authored-by: FalloutFalcon <[email protected]>
Co-authored-by: FalloutFalcon <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Code change Watch something violently break. DME Edit Map Change Tile placing is hard. Thank you for your service.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants