From a8608ccee174f5c8ac5afe61cba67f899764e165 Mon Sep 17 00:00:00 2001 From: Dragonkiller93 <82484852+Dragonkiller93@users.noreply.github.com> Date: Sat, 29 May 2021 13:17:25 -0700 Subject: [PATCH] Stethoscope now checks whether the target is dead. (#16062) * Stethoscope now checks whether the target is dead. * Update code/modules/clothing/under/accessories/accessory.dm Removes unnecessary parentheses. Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com> Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com> --- code/modules/clothing/under/accessories/accessory.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/clothing/under/accessories/accessory.dm b/code/modules/clothing/under/accessories/accessory.dm index 33563eabe29..53b53f54f48 100644 --- a/code/modules/clothing/under/accessories/accessory.dm +++ b/code/modules/clothing/under/accessories/accessory.dm @@ -141,7 +141,7 @@ user.visible_message("[user] places \the [src] against [M]'s chest and listens attentively.", "You place \the [src] against [M]'s chest...") var/obj/item/organ/internal/H = M.get_int_organ(/obj/item/organ/internal/heart) var/obj/item/organ/internal/L = M.get_int_organ(/obj/item/organ/internal/lungs) - if((H && M.pulse) || (L && !HAS_TRAIT(M, TRAIT_NOBREATH))) + if(M.pulse && (H || (L && !HAS_TRAIT(M, TRAIT_NOBREATH)))) var/color = "notice" if(H) var/heart_sound