From 9a0f662dc66bce06ac4b8044572fad837f881d2c Mon Sep 17 00:00:00 2001 From: GDN <96800819+GDNgit@users.noreply.github.com> Date: Wed, 29 Nov 2023 11:08:44 -0600 Subject: [PATCH] fixes ipcs not dying in crit (#23406) --- code/modules/mob/living/carbon/human/species/_species.dm | 1 + code/modules/mob/living/carbon/human/species/golem.dm | 1 + code/modules/mob/living/carbon/human/species/machine.dm | 1 + 3 files changed, 3 insertions(+) diff --git a/code/modules/mob/living/carbon/human/species/_species.dm b/code/modules/mob/living/carbon/human/species/_species.dm index b4a36695805..1ce648e41bf 100644 --- a/code/modules/mob/living/carbon/human/species/_species.dm +++ b/code/modules/mob/living/carbon/human/species/_species.dm @@ -401,6 +401,7 @@ // For special snowflake species effects // (Slime People changing color based on the reagents they consume) /datum/species/proc/handle_life(mob/living/carbon/human/H) + SHOULD_CALL_PARENT(TRUE) if(HAS_TRAIT(H, TRAIT_NOBREATH)) var/takes_crit_damage = (!HAS_TRAIT(H, TRAIT_NOCRITDAMAGE)) if((H.health <= HEALTH_THRESHOLD_CRIT) && takes_crit_damage) diff --git a/code/modules/mob/living/carbon/human/species/golem.dm b/code/modules/mob/living/carbon/human/species/golem.dm index 709012df947..55d7083777a 100644 --- a/code/modules/mob/living/carbon/human/species/golem.dm +++ b/code/modules/mob/living/carbon/human/species/golem.dm @@ -268,6 +268,7 @@ //Regenerates because self-repairing super-advanced alien tech /datum/species/golem/alloy/handle_life(mob/living/carbon/human/H) + SHOULD_CALL_PARENT(FALSE) if(H.stat == DEAD) return H.adjustBruteLoss(-2) diff --git a/code/modules/mob/living/carbon/human/species/machine.dm b/code/modules/mob/living/carbon/human/species/machine.dm index da2d70dc4e2..78773c3bedb 100644 --- a/code/modules/mob/living/carbon/human/species/machine.dm +++ b/code/modules/mob/living/carbon/human/species/machine.dm @@ -126,6 +126,7 @@ H.update_fhair() /datum/species/machine/handle_life(mob/living/carbon/human/H) // Handles IPC starvation + ..() if(isLivingSSD(H)) // We don't want AFK people dying from this return if(H.nutrition >= NUTRITION_LEVEL_HYPOGLYCEMIA)