diff --git a/code/modules/mob/living/carbon/human/human_attackhand.dm b/code/modules/mob/living/carbon/human/human_attackhand.dm index 4d3fb1229245..da65c9169e68 100644 --- a/code/modules/mob/living/carbon/human/human_attackhand.dm +++ b/code/modules/mob/living/carbon/human/human_attackhand.dm @@ -55,6 +55,10 @@ SPAN_HELPFUL("You feel a breath of fresh air enter your lungs. It feels good."), SPAN_HELPFUL("You perform CPR on [src]. Repeat at least every 7 seconds."), SPAN_NOTICE("[attacking_mob] performs CPR on [src].")) + if((!is_revivable() || !check_tod()) && stat == DEAD) + attacking_mob.visible_message(SPAN_NOTICE("[attacking_mob] performs CPR on [src]."), + SPAN_HELPFUL("You perform CPR on [src]. You feel it may be a lost cause.")) + balloon_alert(attacking_mob, "you perform cpr, but feel it may be a lost cause") if(is_revivable() && stat == DEAD) if(cpr_cooldown < world.time) revive_grace_period += 7 SECONDS @@ -66,10 +70,6 @@ SPAN_HELPFUL("You fail to perform CPR on [src]. Incorrect rhythm. Do it slower.")) balloon_alert(attacking_mob, "incorrect rhythm. do it slower") cpr_cooldown = world.time + 7 SECONDS - else if(!is_revivable() || !check_tod()) - attacking_mob.visible_message(SPAN_NOTICE("[attacking_mob] performs CPR on [src]."), - SPAN_HELPFUL("You perform CPR on [src]. You feel it may be a lost cause.")) - balloon_alert(attacking_mob, "you perform cpr, but feel it may be a lost cause") cpr_attempt_timer = 0 return 1