[MIRROR] Fixes ethereal charging and recharge station charge speed. #2788
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
…speed. (#1872) * [NO GBP]Fixes ethereal charging and recharge station charge speed. (#82483) ## About The Pull Request Fixes many instances of things not charging ethereals properly. Scales all things that are meant for charging/taking from the ethereal stomach by STANDARD_CELL_CHARGE, so we never run into this issue again. Ethereal stomachs now store a cell inside them, and uses that for the charge instead of tracking a variable. Fixes recharging stations not being able to charge ethereal stomachs. The ethereal signal proc attempted to feed a callback datum to adjust_charge(), which caused a runtime. Changes that by invoking the charge_cell callback instead. Also fixes recharge station charging speed. They weren't converted correctly. Also formats their charging speed in their description, and displays power rather than referencing cycles. ## Why It's Good For The Game So ethereals charge properly. Closes #82470 ## Changelog :cl: fix: Fixes many instances of energy sources for ethereals supplying a thousand times less energy than intended. fix: Fixes recharging stations not being able to charge ethereals. fix: Fixes recharge stations charging too fast. qol: Recharge stations display their recharging speed in formatted power, rather than unformatted energy per cycle. /:cl: --------- Co-authored-by: san7890 <[email protected]> * [NO GBP]Fixes ethereal charging and recharge station charge speed. --------- Co-authored-by: Pickle-Coding <[email protected]> Co-authored-by: san7890 <[email protected]>
AnywayFarus
added a commit
that referenced
this pull request
Apr 9, 2024
Iajret
pushed a commit
that referenced
this pull request
Jun 1, 2024
* Toilet and urinal updates (flushing dead fish included) (#83490) ## About The Pull Request I split the water closets file into a folder for all the different structures and also did a few other things 1. Remakes tgstation/tgstation#81914 2. Reworks toilets, it’s now Alt Click to open/close the cover, left click takes things out of the toilet and cistern, right click flushes 3. You can now put dead fish in the toilet to flush it 4. Adds context tips to toilets. ## Why It's Good For The Game When I was a 7 year old boy, I had a friend goldfish named Jeremy. He was my greatest friend until one day when my brother told me it’s for babies and flushed him alive down the toilet, and I’ve never seen it again. Closes tgstation/tgstation#81903 Lets you flush down people’s fish in the toilet, and re-experience their loss. This was inspired by my lawyer fish PR, to add things more on the non-fishing side of fish. ## Changelog :cl: add: You can now flush toilets. You can also put fish in the toilet. And flush them. fix: Urinals can no longer be used to delete items. fix: Urinals no longer grant infinite urinal cakes. /:cl: --------- Co-authored-by: Jacquerel <[email protected]> Co-authored-by: GoldenAlpharex <[email protected]> * Toilet and urinal updates (flushing dead fish included) --------- Co-authored-by: John Willard <[email protected]> Co-authored-by: Jacquerel <[email protected]> Co-authored-by: GoldenAlpharex <[email protected]> Co-authored-by: NovaBot13 <[email protected]>
AnywayFarus
pushed a commit
that referenced
this pull request
Jun 2, 2024
…) (#3592) * Toilet and urinal updates (flushing dead fish included) (#83490) ## About The Pull Request I split the water closets file into a folder for all the different structures and also did a few other things 1. Remakes tgstation/tgstation#81914 2. Reworks toilets, it’s now Alt Click to open/close the cover, left click takes things out of the toilet and cistern, right click flushes 3. You can now put dead fish in the toilet to flush it 4. Adds context tips to toilets. ## Why It's Good For The Game When I was a 7 year old boy, I had a friend goldfish named Jeremy. He was my greatest friend until one day when my brother told me it’s for babies and flushed him alive down the toilet, and I’ve never seen it again. Closes tgstation/tgstation#81903 Lets you flush down people’s fish in the toilet, and re-experience their loss. This was inspired by my lawyer fish PR, to add things more on the non-fishing side of fish. ## Changelog :cl: add: You can now flush toilets. You can also put fish in the toilet. And flush them. fix: Urinals can no longer be used to delete items. fix: Urinals no longer grant infinite urinal cakes. /:cl: --------- * Toilet and urinal updates (flushing dead fish included) --------- Co-authored-by: NovaBot <[email protected]> Co-authored-by: John Willard <[email protected]> Co-authored-by: Jacquerel <[email protected]> Co-authored-by: GoldenAlpharex <[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#1872
Original PR: tgstation/tgstation#82483
About The Pull Request
Fixes many instances of things not charging ethereals properly. Scales all things that are meant for charging/taking from the ethereal stomach by STANDARD_CELL_CHARGE, so we never run into this issue again. Ethereal stomachs now store a cell inside them, and uses that for the charge instead of tracking a variable. Fixes recharging stations not being able to charge ethereal stomachs. The ethereal signal proc attempted to feed a callback datum to adjust_charge(), which caused a runtime. Changes that by invoking the charge_cell callback instead.
Also fixes recharge station charging speed. They weren't converted correctly. Also formats their charging speed in their description, and displays power rather than referencing cycles.
Why It's Good For The Game
So ethereals charge properly.
Closes #82470
Changelog
🆑 Pickle-Coding
fix: Fixes many instances of energy sources for ethereals supplying a thousand times less energy than intended.
fix: Fixes recharging stations not being able to charge ethereals.
fix: Fixes recharge stations charging too fast.
qol: Recharge stations display their recharging speed in formatted power, rather than unformatted energy per cycle.
/:cl: