Skip to content

Commit

Permalink
Fixes xeno tacklestrength (#5773)
Browse files Browse the repository at this point in the history
# About the pull request

Fixes #5765.
This was caused by me in #5542 deleting a couple of lines from
`/mob/living/carbon/xenomorph/proc/recalculate_tackle()`, when I should
have only removed the `mutators`/`hive.mutators` part.


![image](https://github.com/cmss13-devs/cmss13/assets/57483089/b54a3e03-03cd-49a3-a093-ab0765059a7b)

# Explain why it's good for the game

Whoops

# Testing Photographs and Procedure
<details>
<summary>Screenshots & Videos</summary>

`tacklestrength_min` and `tacklestrength_max` are being applied
correctly:

![image](https://github.com/cmss13-devs/cmss13/assets/57483089/8404ddf3-17e0-42a5-a3cf-91a85beb1e50)

</details>


# Changelog
:cl:
fix: Fixed Xenomorphs not having their caste's tackle duration values
applied to them.
/:cl:
  • Loading branch information
SabreML authored Feb 22, 2024
1 parent 3a27631 commit 1675e4e
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions code/modules/mob/living/carbon/xenomorph/Xenomorph.dm
Original file line number Diff line number Diff line change
Expand Up @@ -839,6 +839,8 @@
tackle_min = caste.tackle_min
tackle_max = caste.tackle_max
tackle_chance = caste.tackle_chance + tackle_chance_modifier
tacklestrength_min = caste.tacklestrength_min
tacklestrength_max = caste.tacklestrength_max

/mob/living/carbon/xenomorph/proc/recalculate_health()
var/new_max_health = nocrit ? health_modifier + maxHealth : health_modifier + caste.max_health
Expand Down

0 comments on commit 1675e4e

Please sign in to comment.