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] Fixing cell power usage (Part 4) #2604

Merged
merged 2 commits into from
Mar 28, 2024
Merged

Conversation

Steals-The-PRs
Copy link
Collaborator

Mirrored on Nova: NovaSector/NovaSector#1669
Original PR: tgstation/tgstation#82227

About The Pull Request

Continuation of #82204

Fixes these issues in #82196

  • Cyborg Electroadaptive Pseudocircuit
  • Defib EMP
  • Cell EMP
  • /datum/action/cooldown/mob_cooldown/charge_apc stuff
  • Mecha movement, melee, light ,weapon & tool energy drains
  • Ninja drain

Changelog

🆑 SyncIt21
fix: Fixed more energy usages for cells(Part 4). See PR 82227 for details
/:cl:

* Fixing cell power usage (Part 4)

* 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 56afc59 into master Mar 28, 2024
23 checks passed
@Iajret Iajret deleted the upstream-mirror-1669 branch March 28, 2024 13:09
AnywayFarus added a commit that referenced this pull request Mar 28, 2024
Iajret pushed a commit that referenced this pull request May 21, 2024
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