From 824ae6c65b9ee8f7c5791180d5a727d59f5c061b Mon Sep 17 00:00:00 2001 From: Iajret Creature <122297233+Steals-The-PRs@users.noreply.github.com> Date: Tue, 28 Nov 2023 08:17:55 +0300 Subject: [PATCH] [MIRROR] Romerol tumors in living non-zombies don't delete on death [MDB IGNORE] (#25278) (#845) * Romerol tumors in living non-zombies don't delete on death (#79945) ## About The Pull Request Romerol tumors have been broken for over a month because Melbert made them delete on host death, without realizing that people without `TRAIT_NODEATH` can have them (namely, non-zombies). This simply puts the self-deletion behind an `iszombie` check. ## Why It's Good For The Game This was an oversight that went under the radar until I saw someone get denied a zombie outbreak because of it. ## Changelog :cl: fix: People exposed to romerol while alive will once again revive as zombies on death. /:cl: * Romerol tumors in living non-zombies don't delete on death --------- Co-authored-by: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Co-authored-by: Y0SH1M4S73R Co-authored-by: Mothblocks <35135081+Mothblocks@ users.noreply.github.com> --- code/modules/zombie/organs.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/modules/zombie/organs.dm b/code/modules/zombie/organs.dm index 43a6130c773..94ace7e6c7f 100644 --- a/code/modules/zombie/organs.dm +++ b/code/modules/zombie/organs.dm @@ -47,7 +47,8 @@ /obj/item/organ/internal/zombie_infection/proc/organ_owner_died(mob/living/carbon/source, gibbed) SIGNAL_HANDLER - qdel(src) // Congrats you somehow died so hard you stopped being a zombie + if(iszombie(source)) + qdel(src) // Congrats you somehow died so hard you stopped being a zombie /obj/item/organ/internal/zombie_infection/on_find(mob/living/finder) to_chat(finder, span_warning("Inside the head is a disgusting black \