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

Removes firing pins and clumsy checks on guns #2702

Merged
merged 23 commits into from
Apr 20, 2024

Conversation

FalloutFalcon
Copy link
Member

About The Pull Request

Removes firing pins and clumsy checks from guns

Why It's Good For The Game

Firing pins and clumsy checks are huge cruft.
Both are designed to limit around things we don't care about anymore

Changelog

🆑
del: Removed firing pins
del: Removed clumsy checks on guns
/:cl:

@github-actions github-actions bot added the Merge Conflict Use Git Hooks, you're welcome. label Feb 6, 2024
Copy link
Contributor

github-actions bot commented Feb 6, 2024

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

@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 Feb 6, 2024
@github-actions github-actions bot removed the Merge Conflict Use Git Hooks, you're welcome. label Feb 6, 2024
@Cadunkus
Copy link
Contributor

Cadunkus commented Feb 6, 2024

Does this mean you can't have guns without firing pins (that are therefore useless)?

@github-actions github-actions bot added the Merge Conflict Use Git Hooks, you're welcome. label Feb 10, 2024
Copy link
Contributor

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

@FalloutFalcon
Copy link
Member Author

Does this mean you can't have guns without firing pins (that are therefore useless)?

No its a in depth removal of every pin and and check for it. This means every gun will fire regardless. Also simplifies paths for many weapons which were just gun/normalfiringpin basically

currently it crashes the game. Haven't had time to look into it

@github-actions github-actions bot added Merge Conflict Use Git Hooks, you're welcome. and removed Merge Conflict Use Git Hooks, you're welcome. labels Feb 24, 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 Mar 5, 2024
@FalloutFalcon FalloutFalcon marked this pull request as ready for review March 5, 2024 02:54
@FalloutFalcon FalloutFalcon requested a review from a team as a code owner March 5, 2024 02:54
@github-actions github-actions bot added the Merge Conflict Use Git Hooks, you're welcome. label Mar 9, 2024
Copy link
Contributor

github-actions bot commented Mar 9, 2024

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 Apr 1, 2024
Copy link
Contributor

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

@github-actions github-actions bot added the Merge Conflict Use Git Hooks, you're welcome. label Apr 11, 2024
@github-actions github-actions bot removed the Merge Conflict Use Git Hooks, you're welcome. label Apr 11, 2024
@thgvr thgvr added the Test Merge Required They'll have to do it for free. label Apr 11, 2024
Copy link
Member

@thgvr thgvr left a comment

Choose a reason for hiding this comment

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

Get the sprites as well please

code/game/machinery/computer/arcade.dm Outdated Show resolved Hide resolved
@FalloutFalcon FalloutFalcon requested a review from a team as a code owner April 20, 2024 05:59
@github-actions github-actions bot added the Sprites A bikeshed full of soulless bikes. label Apr 20, 2024
@thgvr thgvr added this pull request to the merge queue Apr 20, 2024
Merged via the queue into shiptest-ss13:master with commit 29dae13 Apr 20, 2024
14 checks passed
MysticalFaceLesS pushed a commit to CeladonSS13/Shiptest that referenced this pull request Apr 23, 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. -->

## About The Pull Request

Removes firing pins and clumsy checks from guns
<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

## Why It's Good For The Game

Firing pins and clumsy checks are huge cruft.
Both are designed to limit around things we don't care about anymore
<!-- 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. -->

## Changelog

:cl:
del: Removed firing pins
del: Removed clumsy checks on guns
/: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]>
@FalloutFalcon FalloutFalcon deleted the kills-magic branch May 6, 2024 23:11
github-merge-queue bot pushed a commit that referenced this pull request Jun 7, 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. -->

## About The Pull Request
This was MEANT to be a pr were i was tackling gun cruft but magic
accounts for a large portion of the line count.

Pulls from #2664 (minus the actual gun crafting) and #2702 

<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

## Why It's Good For The Game
Cruft

<!-- 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. -->

## Changelog

:cl:
del: Removed alot of magic cruft
code: Sorts gun defines into there own file
/: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: Sun-Soaked <[email protected]>
MrCat15352 pushed a commit to MrCat15352/MrCat that referenced this pull request Jun 22, 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. -->

This was MEANT to be a pr were i was tackling gun cruft but magic
accounts for a large portion of the line count.

Pulls from shiptest-ss13#2664 (minus the actual gun crafting) and shiptest-ss13#2702

<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

Cruft

<!-- 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:
del: Removed alot of magic cruft
code: Sorts gun defines into there own file
/: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: Sun-Soaked <[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. Sprites A bikeshed full of soulless bikes. Test Merge Required They'll have to do it for free.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants