Skip to content

Commit

Permalink
[MIRROR] Adds missing default biotypes to some damage procs [MDB IGNO…
Browse files Browse the repository at this point in the history
…RE] (#24461) (#182)

* Adds missing default biotypes to some damage procs (#79102)

## About The Pull Request

I noticed by complete coincidence because I happened to glance at the
channel a bunch of people complaining about blobbernauts not taking any
damage when leaving the blob in manuel round end chat.
Did anyone report this bug, even after prompting? No. Not even the game
admin who was playing as the blob.

Makes you wonder how many other bugs people are perfectly willing to
spend 15 minutes posting "i fucking hate coders" about without actually
telling anyone they exist. Sucks to be them I guess.

Anyone the cause is that some of these procs didn't have a default
biotype, so they would never take the toxin damage they were being
assigned. Now they will.

## Changelog

:cl:
fix: Blobbernauts will once again take damage when not on blob tiles.
/:cl:

* Adds missing default biotypes to some damage procs

---------

Co-authored-by: SkyratBot <[email protected]>
Co-authored-by: Jacquerel <[email protected]>
  • Loading branch information
3 people authored Oct 20, 2023
1 parent 0811073 commit d684e16
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions code/modules/mob/living/damage_procs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@
/mob/living/proc/getToxLoss()
return toxloss

/mob/living/proc/can_adjust_tox_loss(amount, forced, required_biotype)
/mob/living/proc/can_adjust_tox_loss(amount, forced, required_biotype = ALL)
if(!forced && ((status_flags & GODMODE) || !(mob_biotypes & required_biotype)))
return FALSE
if(SEND_SIGNAL(src, COMSIG_LIVING_ADJUST_TOX_DAMAGE, TOX, amount, forced) & COMPONENT_IGNORE_CHANGE)
Expand Down Expand Up @@ -312,7 +312,7 @@
/mob/living/proc/getCloneLoss()
return cloneloss

/mob/living/proc/can_adjust_clone_loss(amount, forced, required_biotype)
/mob/living/proc/can_adjust_clone_loss(amount, forced, required_biotype = ALL)
if(!forced && (!(mob_biotypes & required_biotype) || status_flags & GODMODE || HAS_TRAIT(src, TRAIT_NOCLONELOSS)))
return FALSE
if(SEND_SIGNAL(src, COMSIG_LIVING_ADJUST_CLONE_DAMAGE, CLONE, amount, forced) & COMPONENT_IGNORE_CHANGE)
Expand Down Expand Up @@ -355,7 +355,7 @@
/mob/living/proc/getStaminaLoss()
return staminaloss

/mob/living/proc/can_adjust_stamina_loss(amount, forced, required_biotype)
/mob/living/proc/can_adjust_stamina_loss(amount, forced, required_biotype = ALL)
if(!forced && (!(mob_biotypes & required_biotype) || status_flags & GODMODE))
return FALSE
if(SEND_SIGNAL(src, COMSIG_LIVING_ADJUST_STAMINA_DAMAGE, STAMINA, amount, forced) & COMPONENT_IGNORE_CHANGE)
Expand Down

0 comments on commit d684e16

Please sign in to comment.