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] Fix some attack effects not playing / Fix apply_damage returning innacurate values #2111

Merged
merged 1 commit into from
Feb 24, 2024

Conversation

Steals-The-PRs
Copy link
Collaborator

Mirrored on Nova: NovaSector/NovaSector#1114
Original PR: tgstation/tgstation#81635

About The Pull Request

Seems to have been a merge skew between #78657 and #79207 .

When my PR was written they returned the damage being done, when their PR was written they returned the change in health?

So apply damage was returning -10 when it should've been returning 10 for some cases.

Changelog

🆑 Melbert
fix: Cyborgs spark and spit out oil when smacked again. Among other things.
/:cl:

…urning innacurate values (#1114)

* Fix some attack effects not playing / Fix `apply_damage` returning innacurate values

* Update damage_procs.dm

---------

Co-authored-by: MrMelbert <[email protected]>
Co-authored-by: Mal <[email protected]>
@Iajret Iajret enabled auto-merge (squash) February 24, 2024 22:56
@Iajret Iajret merged commit aa48b5c into master Feb 24, 2024
24 checks passed
AnywayFarus added a commit that referenced this pull request Feb 25, 2024
@Iajret Iajret deleted the upstream-mirror-1114 branch February 28, 2024 18:55
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