From f95da1aae57b703bf094d22776235393610659cd Mon Sep 17 00:00:00 2001 From: Poojawa Date: Fri, 17 May 2019 05:59:28 -0500 Subject: [PATCH] Heart Attacks will murder you now Also sanity check for cursed heart overlay --- code/datums/diseases/heart_failure.dm | 2 +- code/modules/surgery/organs/heart.dm | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/code/datums/diseases/heart_failure.dm b/code/datums/diseases/heart_failure.dm index 3fbf6ef177..2389052a54 100644 --- a/code/datums/diseases/heart_failure.dm +++ b/code/datums/diseases/heart_failure.dm @@ -57,8 +57,8 @@ if(H.stat == CONSCIOUS) H.visible_message("[H] clutches at [H.p_their()] chest as if [H.p_their()] heart is stopping!") H.adjustStaminaLoss(60) - H.reagents.add_reagent("corazone", 3) // To give the victim a final chance to shock their heart before losing consciousness H.set_heartattack(TRUE) + H.reagents.add_reagent("corazone", 3) // To give the victim a final chance to shock their heart before losing consciousness cure() else diff --git a/code/modules/surgery/organs/heart.dm b/code/modules/surgery/organs/heart.dm index 52904b8af1..5852cba0c9 100644 --- a/code/modules/surgery/organs/heart.dm +++ b/code/modules/surgery/organs/heart.dm @@ -113,6 +113,10 @@ if(owner) to_chat(owner, "Your heart has been replaced with a cursed one, you have to pump this one manually otherwise you'll die!") +/obj/item/organ/heart/cursed/Remove(mob/living/carbon/M, special = 0) + ..() + M.remove_client_colour(/datum/client_colour/cursed_heart_blood) + /datum/action/item_action/organ_action/cursed_heart name = "Pump your blood"