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 5) #2669

Merged
merged 1 commit into from
Mar 30, 2024
Merged

Conversation

Steals-The-PRs
Copy link
Collaborator

Mirrored on Nova: NovaSector/NovaSector#1723
Original PR: tgstation/tgstation#82296

About The Pull Request

Continuation of #82227

Fixes these issues in tgstation/tgstation#82196 and others that weren't noticed.

  • Batton emp protection
  • Cyborg stun arm
  • Cyborg energy sword
  • Cyborg hug attack
  • Mechanical god religious sect charge check
  • Mecha fixes
    • Phasing energy drain
    • Short circuit energy drain
    • Durand shield damage energy drain
    • Plasma engine recharge rate
  • Mechbay recharge power rate
  • Recharge station charge rate

Stuff that was already working & didn't require fixing.

  • Plasma cutter energy shots
  • Botany cell charging

Changelog

🆑 SyncIt21
fix: Fixed cell energy usage for a bunch of stuff(Part 5). See PR 82296 for details
/:cl:

* Fixing cell power usage (Part 5) (#82296)

## About The Pull Request
Continuation of #82227

Fixes these issues in
tgstation/tgstation#82196 and others that
weren't noticed.
- Batton emp protection
- Cyborg stun arm
- Cyborg energy sword
- Cyborg hug attack
- Mechanical god religious sect charge check
- Mecha fixes
  - Phasing energy drain
  - Short circuit energy drain
  - Durand shield damage energy drain
  - Plasma engine recharge rate
- Mechbay recharge power rate
- Recharge station charge rate

Stuff that was already working & didn't require fixing.
- Plasma cutter energy shots
- Botany cell charging

## Changelog
:cl:
fix: Fixed cell energy usage for a bunch of stuff(Part 5). See PR 82296
for details
/:cl:

---------

Co-authored-by: Pickle-Coding <[email protected]>

* Fixing cell power usage (Part 5)

---------

Co-authored-by: SyncIt21 <[email protected]>
Co-authored-by: Pickle-Coding <[email protected]>
@Iajret Iajret merged commit 1b00e1c into master Mar 30, 2024
24 checks passed
@Iajret Iajret deleted the upstream-mirror-1723 branch March 30, 2024 17:40
AnywayFarus added a commit that referenced this pull request Mar 30, 2024
Iajret pushed a commit that referenced this pull request Jun 6, 2024
* /icons/ folder cleansing crusade part 3

* Conflicts

* Path updates

* Update bm_mode.dm

---------

Co-authored-by: YesterdaysPromise <[email protected]>
Co-authored-by: Mal <[email protected]>
Iajret added a commit that referenced this pull request Jun 6, 2024
* [MIRROR] /icons/ folder cleansing crusade part 3 (#2669)

* /icons/ folder cleansing crusade part 3

* Conflicts

* Path updates

* Update bm_mode.dm

---------

Co-authored-by: YesterdaysPromise <[email protected]>
Co-authored-by: Mal <[email protected]>

* Update ooc.dm

---------

Co-authored-by: NovaBot <[email protected]>
Co-authored-by: YesterdaysPromise <[email protected]>
Co-authored-by: Mal <[email protected]>
Co-authored-by: Iajret <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants