Skip to content

Commit

Permalink
Xenos holding on warding don't lose it while on weeds (#6282)
Browse files Browse the repository at this point in the history
# About the pull request
Xeno who is below crit health (i.e. holding on health provided by
warding) doesn't lose warding as long as xeno is on weeds.

# Explain why it's good for the game
Exploding on weeds from losing warding is extremely confusing for all
parties involved. You cannot bleed out while on weeds, so this is a bit
more consistent.

# Testing Photographs and Procedure
<details>


https://github.com/cmss13-devs/cmss13/assets/115417687/b8996a56-b1fa-4bda-9155-6b73f7a42639

</details>


# Changelog
:cl: ihatethisengine
balance: xenos holding on warding don't lose it while on weeds
/:cl:
  • Loading branch information
ihatethisengine authored May 14, 2024
1 parent c83ab1e commit 018e442
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion code/modules/mob/living/carbon/xenomorph/life.dm
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,8 @@

if(frenzy_aura != frenzy_new || warding_aura != warding_new || recovery_aura != recovery_new)
frenzy_aura = frenzy_new
warding_aura = warding_new
if(health > crit_health || warding_new > warding_aura || !check_weeds_for_healing())
warding_aura = warding_new
recovery_aura = recovery_new
recalculate_move_delay = TRUE
hud_set_pheromone()
Expand Down

0 comments on commit 018e442

Please sign in to comment.