Skip to content

Commit

Permalink
Unholy water double parent call fix (tgstation#80641)
Browse files Browse the repository at this point in the history
## About The Pull Request

Unholy water now only calls parent in on_mob_life() once, instead of
twice.

The parent call would give you a small shot of toxin damage. Now you'll
only get hit by it once, instead of twice. Neat!

The linked issue mentions the double parent call on holy water too, but
that seems to have been removed at some point.
## Why It's Good For The Game

Closes tgstation#80511.
## Changelog
:cl: Rhials
code: Unholy water no longer calls parent twice in on_mob_life().
/:cl:
  • Loading branch information
Rhials authored Dec 30, 2023
1 parent f341744 commit 6c5601d
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion code/modules/reagents/chemistry/reagents/other_reagents.dm
Original file line number Diff line number Diff line change
Expand Up @@ -488,7 +488,7 @@

/datum/reagent/fuel/unholywater/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired)
. = ..()
. = ..()

var/need_mob_update = FALSE
if(IS_CULTIST(affected_mob))
affected_mob.adjust_drowsiness(-10 SECONDS * REM * seconds_per_tick)
Expand Down

0 comments on commit 6c5601d

Please sign in to comment.