From fe84e9679704e6f0a0315eaf61baee8d871f6631 Mon Sep 17 00:00:00 2001 From: cadyn <35672377+cadyn@users.noreply.github.com> Date: Sun, 24 Jan 2021 22:48:39 -0800 Subject: [PATCH] Revert "Delete defib timer" --- code/game/objects/items/devices/defib.dm | 2 +- code/modules/organs/organ.dm | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/code/game/objects/items/devices/defib.dm b/code/game/objects/items/devices/defib.dm index 1e549c23c0..8e5fa683c9 100644 --- a/code/game/objects/items/devices/defib.dm +++ b/code/game/objects/items/devices/defib.dm @@ -288,7 +288,7 @@ /obj/item/weapon/shockpaddles/proc/can_revive(mob/living/carbon/human/H) //This is checked right before attempting to revive var/obj/item/organ/internal/brain/brain = H.internal_organs_by_name[O_BRAIN] - if(H.should_have_organ(O_BRAIN) && (!brain) ) //CHOMPEdit Defib Timer Removal + if(H.should_have_organ(O_BRAIN) && (!brain || brain.defib_timer <= 0 ) ) return "buzzes, \"Resuscitation failed - Excessive neural degeneration. Further attempts futile.\"" H.updatehealth() diff --git a/code/modules/organs/organ.dm b/code/modules/organs/organ.dm index 7e11c71c77..9047eb2665 100644 --- a/code/modules/organs/organ.dm +++ b/code/modules/organs/organ.dm @@ -145,7 +145,8 @@ var/list/organ_cache = list() STOP_PROCESSING(SSobj, src) handle_organ_mod_special(TRUE) if(owner && vital) - owner.death() //CHOMPEdit Defib Timer Removal + owner.can_defib = 0 + owner.death() /obj/item/organ/proc/adjust_germ_level(var/amount) // Unless you're setting germ level directly to 0, use this proc instead germ_level = CLAMP(germ_level + amount, 0, INFECTION_LEVEL_MAX) @@ -404,7 +405,8 @@ var/list/organ_cache = list() if(user) add_attack_logs(user, owner, "Removed vital organ [src.name]") if(owner.stat != DEAD) - owner.death() //CHOMPEdit Defib Timer Removal + owner.can_defib = 0 + owner.death() handle_organ_mod_special(TRUE)