mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-22 20:48:56 +01:00
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 <details> <summary>Screenshots/Videos</summary> </details> ## Changelog 🆑 fix: changelings can no longer make zombies out of DNR victims /🆑
This commit is contained in:
@@ -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()
|
||||
|
||||
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user