Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[MIRROR] Fixes recharge stations charge rates #2602

Merged
merged 2 commits into from
Mar 28, 2024
Merged

Conversation

Steals-The-PRs
Copy link
Collaborator

Mirrored on Nova: NovaSector/NovaSector#1631
Original PR: tgstation/tgstation#82191

About The Pull Request

  • Fixes #82190

Have to now use the assigned constants and not magic number 10000. Also stuff will take the exact charge needed without any wastage.

Changelog

🆑 SyncIt21
fix: recharge stations draw the same amount of power as before but directly from grid(without using apc cell power) and won't waste any excess power
/:cl:

* Fixes recharge stations charge rates

* Prepare for merge master

* restore mirror

---------

Co-authored-by: SyncIt21 <[email protected]>
Co-authored-by: SomeRandomOwl <[email protected]>
@Steals-The-PRs Steals-The-PRs added Mirroring conflict git cherry-pick во что-то уткнулся. Не ставить вручную, только для бота TG Mirror labels Mar 27, 2024
@Iajret Iajret merged commit 8229ca6 into master Mar 28, 2024
23 checks passed
@Iajret Iajret deleted the upstream-mirror-1631 branch March 28, 2024 13:05
AnywayFarus added a commit that referenced this pull request Mar 28, 2024
Iajret pushed a commit that referenced this pull request May 21, 2024
* Adds a new deathmatch modifier that enables quirks (#83338)

## About The Pull Request

Title.
## Why It's Good For The Game

Quirks can be pretty silly, especially the negative ones, and its kinda
a shame we dont apply them in deathmatch. This fixes that! You can now
finally play DM in a wheelchair to show off how robust you are to your
friends.
## Changelog
:cl:
add: Adds a new deathmatch modifier that enables quirks
/:cl:

* Adds a new deathmatch modifier that enables quirks

---------

Co-authored-by: nikothedude <[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
Labels
Mirroring conflict git cherry-pick во что-то уткнулся. Не ставить вручную, только для бота TG Mirror
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants