From ed4f07ec657eb843c4cfc7ed84918f5b753441f7 Mon Sep 17 00:00:00 2001 From: Cameron Lennox Date: Mon, 7 Apr 2025 19:46:42 -0400 Subject: [PATCH] Put out corpses before CPR (#17489) * Put out corpses before CPR * Update human_attackhand.dm --- code/modules/mob/living/carbon/human/human_attackhand.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/carbon/human/human_attackhand.dm b/code/modules/mob/living/carbon/human/human_attackhand.dm index df29fedc425..39ef8959378 100644 --- a/code/modules/mob/living/carbon/human/human_attackhand.dm +++ b/code/modules/mob/living/carbon/human/human_attackhand.dm @@ -112,11 +112,11 @@ return FALSE if(!has_hands) //This is here so if you WANT to do special code for 'if we don't have hands, do stuff' it can be done here! return FALSE - if(istype(M) && attempt_to_scoop(M)) + if(istype(M) && attempt_to_scoop(M) && !on_fire) return FALSE; //todo: make this whole CPR check into it's own individual proc instead of hogging up attack_hand_help_intent - if(istype(H) && health < CONFIG_GET(number/health_threshold_crit)) //Only humans can do CPR. + if((istype(H) && (health < CONFIG_GET(number/health_threshold_crit)) || stat == DEAD) && !on_fire) //Only humans can do CPR. if(!H.check_has_mouth()) to_chat(H, span_danger("You don't have a mouth, you cannot perform CPR!")) return FALSE