Brings back old gun suicide_act behavior #2784
Merged
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
Brings back old suicide_act on handle_suicide proc of guns.
code/modules/projectiles/gun.dm
Outdated
| var/turf/splat_target = get_ranged_target_turf(target, REVERSE_DIR(target.dir), BRAINS_BLOWN_THROW_RANGE) | ||
| chambered.BB.damage *= 4 | ||
| process_fire(target, user, TRUE, params, BODY_ZONE_HEAD) | ||
| if(shotbrain && chambered.BB.damage > 0) |
There was a problem hiding this comment.
Damage requirement/type check should exist or some really funny cases could emerge
There was a problem hiding this comment.
chambered.BB.damage > 0
BB in this case is the current chambered round in the firearm
There was a problem hiding this comment.
And in the case the gun has a primary damage type of stamina and/or extremely low damage? Concern is stuff like disablers and loaded foam darts counting for brain removal
There was a problem hiding this comment.
Old suicide code worked using the same check, I tried with basic foam but i'll work on it more and test more scenarios.
| //Sort of reimplements old suicide behavior just for guns. | ||
| if(chambered?.BB) | ||
| chambered.BB.damage *= 4 | ||
| process_fire(target, user, TRUE, params, BODY_ZONE_HEAD) |
There was a problem hiding this comment.
process_fire should be done after saving/using any important bullet info otherwise it'll take information from the next bullet in the gun, which could be nothing
Closed
|
Check should be a bit better now and cleaned up, as well as actually accounting for damage type |
shiptest-server
pushed a commit
that referenced
this pull request
Apr 11, 2024
MysticalFaceLesS
pushed a commit
to CeladonSS13/Shiptest
that referenced
this pull request
Apr 12, 2024
## About The Pull Request Brings back old suicide_act on handle_suicide proc of guns. <!-- 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. --> https://github.com/shiptest-ss13/Shiptest/assets/81882910/a5363807-0b49-46fc-aae6-cc1253cc1dbf ## Changelog :cl: add: Suicide & Execution with a damaging firearm is now more deadly and gruesome. /: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. -->
MysticalFaceLesS
pushed a commit
to CeladonSS13/Shiptest
that referenced
this pull request
Apr 15, 2024
## About The Pull Request Brings back old suicide_act on handle_suicide proc of guns. <!-- 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. --> https://github.com/shiptest-ss13/Shiptest/assets/81882910/a5363807-0b49-46fc-aae6-cc1253cc1dbf ## Changelog :cl: add: Suicide & Execution with a damaging firearm is now more deadly and gruesome. /: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. -->
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
About The Pull Request
Brings back old suicide_act on handle_suicide proc of guns.
2024-02-29_02-15-07.mp4
Changelog
🆑
add: Suicide & Execution with a damaging firearm is now more deadly and gruesome.
/:cl: