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

fix shrike healing & crit healing and properly addresses regen delays #16607

Merged
merged 2 commits into from
Oct 3, 2024

Conversation

Arturlang
Copy link
Contributor

@Arturlang Arturlang commented Sep 29, 2024

About The Pull Request

Didn't realize heal_wounds was used in other places, this gives it a default arg of expected seco

Why It's Good For The Game

Fixes bad bugs and hopefully makes the revert PR not needed

Changelog

🆑
fix: shrike healing and crit healing should now work
add: regen delays now properly are handled by seconds_per_tick
/:cl:

@tgstation-server tgstation-server added Fix Fixes an issue with the game. Feature New interesting mechanics with new interesting bugs labels Sep 29, 2024
@Arturlang
Copy link
Contributor Author

The previous PR really should not have been fullmerged, but TM'd instead, but it's my fault since i didn't ask for it

@@ -84,22 +84,23 @@

/mob/living/carbon/xenomorph/proc/handle_critical_health_updates(seconds_per_tick)
if(loc_weeds_type)
heal_wounds(XENO_RESTING_HEAL, seconds_per_tick)
heal_wounds(XENO_RESTING_HEAL, seconds_per_tick = seconds_per_tick) // healing in critical while on weeds ignores scaling
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

uh, why this change

Copy link
Contributor Author

@Arturlang Arturlang Oct 2, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

to just absolutely make sure that it's very obvious what arg this is touching, preventing mistakes, if you don't want it i can remove it, comment doesn't mean i'm actually changing functionality in removing scaling, it already did that before, I'm just documenting it

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you can already see what its doing because its an arg, literally jut hover over and it will say.

Copy link
Contributor Author

@Arturlang Arturlang Oct 3, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

changed it to positional args as it seemed what was seemingly requested.
Anyway, to specify, heal_wounds has 3 args, multiplier, scaling, and now seconds_per_tick, I was using a named arg to bypass the scaling boolean, so it wouldn't erroniously give 2 to a boolean

@Lumipharon Lumipharon merged commit 1f35db7 into tgstation:master Oct 3, 2024
39 checks passed
github-actions bot added a commit that referenced this pull request Oct 3, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Feature New interesting mechanics with new interesting bugs Fix Fixes an issue with the game.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants