From ca18f4e9c444ffa2e43cdc091b5c6cdd72fe1845 Mon Sep 17 00:00:00 2001 From: Jared-Fogle <35135081+Jared-Fogle@users.noreply.github.com> Date: Sat, 6 Jun 2020 15:02:04 -0700 Subject: [PATCH] Fix defib nanite and husk text --- code/game/objects/items/defib.dm | 4 ++-- code/modules/research/nanites/nanite_programs/healing.dm | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/game/objects/items/defib.dm b/code/game/objects/items/defib.dm index 70eddb2357e..357a450627d 100644 --- a/code/game/objects/items/defib.dm +++ b/code/game/objects/items/defib.dm @@ -571,9 +571,9 @@ fail_reason = "Patient's soul appears to be on another plane of existence. Further attempts futile." if (DEFIB_FAIL_NO_HEART) fail_reason = "Patient's heart is missing." - if (DEFIB_FAIL_FAILING_HEART, DEFIB_FAIL_HUSK) + if (DEFIB_FAIL_FAILING_HEART) fail_reason = "Patient's heart too damaged, replace or repair and try again." - if (DEFIB_FAIL_TISSUE_DAMAGE) + if (DEFIB_FAIL_TISSUE_DAMAGE, DEFIB_FAIL_HUSK) fail_reason = "Tissue damage too severe, repair and try again." if (DEFIB_FAIL_FAILING_BRAIN) fail_reason = "Patient's brain is too damaged, repair and try again." diff --git a/code/modules/research/nanites/nanite_programs/healing.dm b/code/modules/research/nanites/nanite_programs/healing.dm index bb53fd3963c..54ac2734fbc 100644 --- a/code/modules/research/nanites/nanite_programs/healing.dm +++ b/code/modules/research/nanites/nanite_programs/healing.dm @@ -224,7 +224,7 @@ return FALSE var/mob/living/carbon/C = host_mob if(C.get_ghost()) - return DEFIB_POSSIBLE + return FALSE return C.can_defib() == DEFIB_POSSIBLE /datum/nanite_program/defib/proc/zap()