From 7906e668719f64c993aac48546cf3e781cfa42e1 Mon Sep 17 00:00:00 2001 From: hal9000PR <69320440+hal9000PR@users.noreply.github.com> Date: Mon, 26 Jul 2021 18:08:37 +0100 Subject: [PATCH] Adds feedback for defibbing and scanning husked people (#16357) * husk * extra space Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com> Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com> --- code/game/objects/items/devices/scanners.dm | 3 +++ code/game/objects/items/weapons/defib.dm | 2 ++ 2 files changed, 5 insertions(+) diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm index 5d447675c49..15c913c2794 100644 --- a/code/game/objects/items/devices/scanners.dm +++ b/code/game/objects/items/devices/scanners.dm @@ -264,6 +264,9 @@ REAGENT SCANNER else to_chat(user, "Subject's genes are stable.") + if(HAS_TRAIT(H, TRAIT_HUSK)) + to_chat(user, "Subject is husked. Application of synthflesh is recommended.") + /obj/item/healthanalyzer/attack_self(mob/user) toggle_mode() diff --git a/code/game/objects/items/weapons/defib.dm b/code/game/objects/items/weapons/defib.dm index 2169a05d3f0..6f2f6e1ff0f 100644 --- a/code/game/objects/items/weapons/defib.dm +++ b/code/game/objects/items/weapons/defib.dm @@ -445,6 +445,8 @@ user.visible_message("[defib] buzzes: Resuscitation failed - Heart tissue damage beyond point of no return for defibrillation.") else if(total_burn >= 180 || total_brute >= 180) user.visible_message("[defib] buzzes: Resuscitation failed - Severe tissue damage detected.") + else if(HAS_TRAIT(H, TRAIT_HUSK)) + user.visible_message("[defib] buzzes: Resucitation failed: Subject is husked.") else if(ghost) if(!ghost.can_reenter_corpse) // DNR or AntagHUD user.visible_message("[defib] buzzes: Resucitation failed: No electrical brain activity detected.")