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

RPG Fixes #3480

Merged
merged 6 commits into from
Oct 26, 2024
Merged

RPG Fixes #3480

merged 6 commits into from
Oct 26, 2024

Conversation

Erikafox
Copy link
Contributor

@Erikafox Erikafox commented Oct 5, 2024

About The Pull Request

Balances the HEDP round to be more anti-armor, less Fuck You Get Gibbed

Makes the Hammer have no safety.

Makes weapons with no bolt un-rackable. Hides the rack text so you don't get a prompt to do it
Restores old "use hand on boltless weapon" behavior to weapons with no bolt

Why It's Good For The Game

Balance + Usability Change

Changelog

🆑

balance: Hammer RPGs should no longer annihilate you completely. Just partially.
fix: Weapons with no bolt can no longer be racked. Use your hand on them instead

/:cl:

@github-actions github-actions bot added the Code change Watch something violently break. label Oct 5, 2024
@rye-rice rye-rice added this pull request to the merge queue Oct 7, 2024
@rye-rice rye-rice removed this pull request from the merge queue due to a manual request Oct 7, 2024
@rye-rice rye-rice added the Test Merge Required They'll have to do it for free. label Oct 7, 2024
Copy link
Contributor

@SomeguyManperson SomeguyManperson left a comment

Choose a reason for hiding this comment

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

quick span macro check

code/modules/projectiles/guns/ballistic.dm Outdated Show resolved Hide resolved
code/modules/projectiles/guns/ballistic.dm Outdated Show resolved Hide resolved
Co-authored-by: Theos <[email protected]>
Signed-off-by: Erika Fox <[email protected]>
@rye-rice
Copy link
Member

update this pr in case its missing something before i merge it tommorow at 3am

@thgvr thgvr added this pull request to the merge queue Oct 26, 2024
@FalloutFalcon FalloutFalcon removed this pull request from the merge queue due to a manual request Oct 26, 2024
@SomeguyManperson SomeguyManperson added this pull request to the merge queue Oct 26, 2024
Merged via the queue into shiptest-ss13:master with commit bb7995f Oct 26, 2024
16 checks passed
zimon9 pushed a commit to zimon9/Shiptest-PR-testing that referenced this pull request Oct 29, 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

Balances the HEDP round to be more anti-armor, less Fuck You Get Gibbed

Makes the Hammer have no safety.

Makes weapons with no bolt un-rackable. Hides the rack text so you don't
get a prompt to do it
Restores old "use hand on boltless weapon" behavior to weapons with no
bolt

<!-- 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
Balance + Usability Change

## Changelog

:cl:

balance: Hammer RPGs should no longer annihilate you completely. Just
partially.
fix: Weapons with no bolt can no longer be racked. Use your hand on them
instead

/: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: Erika Fox <[email protected]>
Co-authored-by: Erika Fox <[email protected]>
Co-authored-by: Theos <[email protected]>
zimon9 pushed a commit to zimon9/Shiptest-PR-testing that referenced this pull request Oct 29, 2024
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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants