[MIRROR] Fixes tesla zaps. #367
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
* [NO GBP]Fixes tesla zaps. (#79398) ## About The Pull Request Closes #79297 Closes #79312 Due to the new cutoff parameter being added to tesla_zap() (from #78310), and most callers used positional arguments instead of keywords, the zap flags was getting fed the shocked_targets list and maybe other junk. This caused a bunch of unusual phenomena. This is fixed by using keyword arguments. Tesla zaps that use the grid were significantly weaker in terms of damage than they're supposed to be. This was a byproduct of trying to convert everything to joules and removing unnecessary power multipliers. This is fixed by reverting the damage scaling and zap power of zap sources that aren't based on grid. Technically this will cause the zaps from other sources to have less power, but these tend to not be able to put power on grid, so this wouldn't have any change other than what a grounding rod displays. Doesn't really matter. Logs machine explosions from zap_act. Not the most helpful log (would take a lot of effort to add an extra parameter to pass the source), but better than nothing. Probably other stuff I did, lol. ## Why It's Good For The Game Stops zap fuckery. Admins can now find the explosions when a 9GeV engine decides to go haywire or whatever. ## Changelog :cl: fix: Fixes tesla zaps being weird. admin: Logs explosions from explosive zaps. /:cl: * [NO GBP]Fixes tesla zaps. --------- Co-authored-by: Pickle-Coding <[email protected]>
AnywayFarus
added a commit
that referenced
this pull request
Oct 31, 2023
Iajret
pushed a commit
that referenced
this pull request
Jan 26, 2024
…ebalancing (it's better now... usually) (#367) * Night vision uses eye color to determine overlay hue + photophobia scaling * Use correct restoration proc for eye sensitivity * Allow direct selection of night vision color tinting, default to left eye color if not available * Modularization formatting improvements Co-authored-by: Bloop <[email protected]> * Further modularization & readability improvements, and refresh eyes after photophobia flash_protect adjustment * Use correct var name * Apply suggestions from code review Co-authored-by: Bloop <[email protected]> * Apply suggestions from code review Co-authored-by: Bloop <[email protected]> * Apply suggestions from code review Co-authored-by: Bloop <[email protected]> --------- Co-authored-by: Bloop <[email protected]>
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.
Mirrored on Skyrat: Skyrat-SS13/Skyrat-tg#24698
Original PR: tgstation/tgstation#79398
About The Pull Request
Closes #79297
Closes #79312
Due to the new cutoff parameter being added to tesla_zap() (from #78310), and most callers used positional arguments instead of keywords, the zap flags was getting fed the shocked_targets list and maybe other junk. This caused a bunch of unusual phenomena. This is fixed by using keyword arguments.
Tesla zaps that use the grid were significantly weaker in terms of damage than they're supposed to be. This was a byproduct of trying to convert everything to joules and removing unnecessary power multipliers. This is fixed by reverting the damage scaling and zap power of zap sources that aren't based on grid. Technically this will cause the zaps from other sources to have less power, but these tend to not be able to put power on grid, so this wouldn't have any change other than what a grounding rod displays. Doesn't really matter.
Logs machine explosions from zap_act. Not the most helpful log (would take a lot of effort to add an extra parameter to pass the source), but better than nothing.
Probably other stuff I did, lol.
Why It's Good For The Game
Stops zap fuckery. Admins can now find the explosions when a 9GeV engine decides to go haywire or whatever.
Changelog
🆑 Pickle-Coding
fix: Fixes tesla zaps being weird.
admin: Logs explosions from explosive zaps.
/:cl: