From 23275c710c1ae1dd810bb17a4a37fdbfe43fdbb2 Mon Sep 17 00:00:00 2001 From: nevimer <77420409+nevimer@users.noreply.github.com> Date: Thu, 2 Oct 2025 14:45:56 -0400 Subject: [PATCH] fix some unintentional DNR bugs (#4769) ## About The Pull Request Changeling Zombie and Medical Revival techniques should no longer bypass DNR a future PR should be made to make changeling zombies offer to ghosts, when the zombie dies the mob is fully finished ## Why It's Good For The Game bug fix ## Proof Of Testing
Screenshots/Videos
## Changelog :cl: fix: changelings can no longer make zombies out of DNR victims /:cl: --- code/modules/mob/living/living.dm | 4 ++++ modular_zubbers/code/modules/changeling_zombies/infection.dm | 3 +++ 2 files changed, 7 insertions(+) diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index f6fb71bd1d0..74ab707d464 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -1075,6 +1075,10 @@ /mob/living/proc/can_be_revived() if(health <= HEALTH_THRESHOLD_DEAD) return FALSE + // BUBBER EDIT BEGIN - DNR FAILS REVIVE CHECK + if(HAS_TRAIT(src, TRAIT_DNR)) + return FALSE + // BUBBER EDIT END return TRUE /mob/living/proc/update_damage_overlays() diff --git a/modular_zubbers/code/modules/changeling_zombies/infection.dm b/modular_zubbers/code/modules/changeling_zombies/infection.dm index c04af7a8799..ec1168fb42b 100644 --- a/modular_zubbers/code/modules/changeling_zombies/infection.dm +++ b/modular_zubbers/code/modules/changeling_zombies/infection.dm @@ -13,6 +13,9 @@ GLOBAL_VAR_INIT(changeling_zombies_detected,FALSE) if(!host.dna) return FALSE + if(HAS_TRAIT(host, TRAIT_DNR)) + return FALSE + var/datum/species/host_species = host.dna.species if(host_species.no_equip_flags & ITEM_SLOT_OCLOTHING)