[MIRROR] Fix vending machine shocking you twice when you pulse high voltage wire #2479
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
…oltage wire (#1528) * Fix vending machine shocking you twice when you pulse high voltage wire (#82077) ## About The Pull Request Vending machine no longer shocks you twice when you pulse high voltage wire. as a bonus fixed a bug in airlock wires code - wires window closes when you get shocked ## Changelog :cl: fix: Vending machine no longer shocks you twice when you pulse high voltage wire. fix: Airlock wires window closes when you get shocked /:cl: * Fix vending machine shocking you twice when you pulse high voltage wire --------- Co-authored-by: antropod <[email protected]>
AnywayFarus
added a commit
that referenced
this pull request
Mar 20, 2024
Iajret
pushed a commit
that referenced
this pull request
May 15, 2024
…ls (#2479) * The Shovellening: Coroner and Miner Coats can now hold Shovels (#83139) <!-- 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 The Shovel, Serrated Bone Shovel, and the Entrenching Tooll can now be worn on the Coroner/Miner Winter Coats, as well as upon the Coroner's labcoat. Normally, shovels worn on the belt slot are displayed on your sprite at your back, and allowing them to go on the suit slot initially mirrored them to the front on side-facing mobs. I've changed the mirrored sprites for side-facing in the belt_mirror.dmi in order to _not_ be mirrored, so they display properly on the back. Not a very elegant way to do it, but this hasn't caused issues with double-equipping shovels in testing.  <!-- 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 Miner Winter Coats should be able to hold shovels as they're mining tools to begin with, and Coroners should be able to do the same in order to dig or dig up graves. The Serrated Shovel, as well, is the only Morbid Bone Saw equivalent in the game as far as I know, so this would allow Coroners to carry that Morbid equivalent without taking up bag space. This encourages Coroners to lean further into the flavor of their role as Morbid or Occultic Medbay personnel. <!-- Argue for the merits of your changes and how they benefit the game, especially if they are controversial and/or far reaching. If you can't actually explain WHY what you are doing will improve the game, then it probably isn't good for the game in the first place. --> ## Changelog <!-- If your PR modifies aspects of the game that can be concretely observed by players or admins you should add a changelog. If your change does NOT meet this description, remove this section. Be sure to properly mark your PRs to prevent unnecessary GBP loss. You can read up on GBP and it's effects on PRs in the tgstation guides for contributors. Please note that maintainers freely reserve the right to remove and add tags should they deem it appropriate. You can attempt to finagle the system all you want, but it's best to shoot for clear communication right off the bat. --> :cl: Jane qol: Shovels, Serrated Bone Shovels, and Entrenching Tools can now be hung upon Miner and Coroner Winter Coats, as well as the Coroner's Labcoat! image: Mirrored the mirrored sprites to display Shovels in the suit slot properly. /: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. --> --------- Co-authored-by: Ghom <[email protected]> * The Shovellening: Coroner and Miner Coats can now hold Shovels --------- Co-authored-by: DrAmazing343 <[email protected]> Co-authored-by: Ghom <[email protected]> Co-authored-by: NovaBot13 <[email protected]>
ReezeBL
pushed a commit
that referenced
this pull request
May 16, 2024
…ls (#2479) (#3316) * The Shovellening: Coroner and Miner Coats can now hold Shovels (#83139) <!-- 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 The Shovel, Serrated Bone Shovel, and the Entrenching Tooll can now be worn on the Coroner/Miner Winter Coats, as well as upon the Coroner's labcoat. Normally, shovels worn on the belt slot are displayed on your sprite at your back, and allowing them to go on the suit slot initially mirrored them to the front on side-facing mobs. I've changed the mirrored sprites for side-facing in the belt_mirror.dmi in order to _not_ be mirrored, so they display properly on the back. Not a very elegant way to do it, but this hasn't caused issues with double-equipping shovels in testing.  <!-- 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 Miner Winter Coats should be able to hold shovels as they're mining tools to begin with, and Coroners should be able to do the same in order to dig or dig up graves. The Serrated Shovel, as well, is the only Morbid Bone Saw equivalent in the game as far as I know, so this would allow Coroners to carry that Morbid equivalent without taking up bag space. This encourages Coroners to lean further into the flavor of their role as Morbid or Occultic Medbay personnel. <!-- Argue for the merits of your changes and how they benefit the game, especially if they are controversial and/or far reaching. If you can't actually explain WHY what you are doing will improve the game, then it probably isn't good for the game in the first place. --> ## Changelog <!-- If your PR modifies aspects of the game that can be concretely observed by players or admins you should add a changelog. If your change does NOT meet this description, remove this section. Be sure to properly mark your PRs to prevent unnecessary GBP loss. You can read up on GBP and it's effects on PRs in the tgstation guides for contributors. Please note that maintainers freely reserve the right to remove and add tags should they deem it appropriate. You can attempt to finagle the system all you want, but it's best to shoot for clear communication right off the bat. --> :cl: Jane qol: Shovels, Serrated Bone Shovels, and Entrenching Tools can now be hung upon Miner and Coroner Winter Coats, as well as the Coroner's Labcoat! image: Mirrored the mirrored sprites to display Shovels in the suit slot properly. /: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. --> --------- * The Shovellening: Coroner and Miner Coats can now hold Shovels --------- Co-authored-by: NovaBot <[email protected]> Co-authored-by: DrAmazing343 <[email protected]> Co-authored-by: Ghom <[email protected]> Co-authored-by: NovaBot13 <[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 Nova: NovaSector/NovaSector#1528
Original PR: tgstation/tgstation#82077
About The Pull Request
Vending machine no longer shocks you twice when you pulse high voltage wire.
as a bonus fixed a bug in airlock wires code - wires window closes when you get shocked
Changelog
🆑 antropod
fix: Vending machine no longer shocks you twice when you pulse high voltage wire.
fix: Airlock wires window closes when you get shocked
/:cl: