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)