From e92dec4e4cc7387e6f2950ef7f0fdebd369d4b69 Mon Sep 17 00:00:00 2001 From: ShizCalev Date: Thu, 26 Oct 2017 00:41:50 -0400 Subject: [PATCH] Fixes defib ghost prompt (#32019) * Fixes #32013 * proc instead. --- code/game/objects/items/defib.dm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/defib.dm b/code/game/objects/items/defib.dm index aa54f9ca36..c3ccd1a144 100644 --- a/code/game/objects/items/defib.dm +++ b/code/game/objects/items/defib.dm @@ -286,6 +286,7 @@ var/req_defib = 1 var/combat = 0 //If it penetrates armor and gives additional functionality var/grab_ghost = FALSE + var/tlimit = DEFIB_TIME_LIMIT * 10 /obj/item/twohanded/shockpaddles/proc/recharge(var/time) if(req_defib || !time) @@ -387,11 +388,14 @@ if((!req_defib && grab_ghost) || (req_defib && defib.grab_ghost)) H.notify_ghost_cloning("Your heart is being defibrillated!") H.grab_ghost() // Shove them back in their body. - else if(!H.suiciding && !(H.disabilities & NOCLONE)&& !H.hellbound) + else if(can_defib(H)) H.notify_ghost_cloning("Your heart is being defibrillated. Re-enter your corpse if you want to be revived!", source = src) do_help(H, user) +/obj/item/twohanded/shockpaddles/proc/can_defib(mob/living/carbon/human/H) + var/obj/item/organ/brain/BR = H.getorgan(/obj/item/organ/brain) + return (!H.suiciding && !(H.disabilities & NOCLONE) && !H.hellbound && ((world.time - H.timeofdeath) < tlimit) && (H.getBruteLoss() < 180) && (H.getFireLoss() < 180) && H.getorgan(/obj/item/organ/heart) && BR && !BR.damaged_brain) /obj/item/twohanded/shockpaddles/proc/do_disarm(mob/living/M, mob/living/user) if(req_defib && defib.safety) @@ -481,7 +485,6 @@ var/tplus = world.time - H.timeofdeath // past this much time the patient is unrecoverable // (in deciseconds) - var/tlimit = DEFIB_TIME_LIMIT * 10 // brain damage starts setting in on the patient after // some time left rotting var/tloss = DEFIB_TIME_LOSS * 10