[MIRROR] Fixes tram plate electrocution #629
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
* Fixes tram plate electrocution [NO GBP] (#79717) ## About The Pull Request When tram electrocution was turned into a component instead of on the turf, the bad luck omen stopped having a chance of electrocuting the mob. Fixes the toast proc to check for the cursed trait, now also applied by the omen. Splits the toast probability into one value for a normal plate, and one for a broken plate or people with omen. Narrows the window of a potential shock with adjusted probability, no chance of electrocution on green. Adds a missing early return for when the tram isn't moving. ## Changelog :cl: LT3 fix: Bad luck omen again raises your chance of getting shocked by the tram plate fix: Tram plate checks and energizes when the tram is moving code: Omen component now applies the cursed trait /:cl: * Fixes tram plate electrocution [NO GBP] --------- Co-authored-by: lessthanthree <[email protected]>
AnywayFarus
added a commit
that referenced
this pull request
Nov 15, 2023
Iajret
pushed a commit
that referenced
this pull request
Jan 26, 2024
* Fixes a decal hard del (#81093) ## About The Pull Request Attempting to fix this hard del here:  I think the cause is from the turf changing, which `/datum/elements/connect_loc` does not seem to take into consideration. Now it should. Also cleans up the signals in `/datum/component/infective/` which may be another potential cause of issues. ## Why It's Good For The Game Code that cleans up after itself is nice. ## Changelog :cl: fix: fixes a hard del with decals /:cl: * Fixes a decal hard del --------- 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#25016
Original PR: tgstation/tgstation#79717
About The Pull Request
When tram electrocution was turned into a component instead of on the turf, the bad luck omen stopped having a chance of electrocuting the mob. Fixes the toast proc to check for the cursed trait, now also applied by the omen.
Splits the toast probability into one value for a normal plate, and one for a broken plate or people with omen. Narrows the window of a potential shock with adjusted probability, no chance of electrocution on green.
Adds a missing early return for when the tram isn't moving.
Changelog
🆑 LT3
fix: Bad luck omen again raises your chance of getting shocked by the tram plate
fix: Tram plate checks and energizes when the tram is moving
code: Omen component now applies the cursed trait
/:cl: