From cbc20d33d5cf75aff2ea1541bc0007456a0d9cac Mon Sep 17 00:00:00 2001 From: Thalpy <48600475+ThalpySci@users.noreply.github.com> Date: Sat, 12 Oct 2019 15:13:18 +0100 Subject: [PATCH] Phew --- code/modules/surgery/organs/heart.dm | 1 + code/modules/surgery/organs/lungs.dm | 4 +++- code/modules/surgery/organs/stomach.dm | 1 + code/modules/surgery/organs/tongue.dm | 2 ++ 4 files changed, 7 insertions(+), 1 deletion(-) diff --git a/code/modules/surgery/organs/heart.dm b/code/modules/surgery/organs/heart.dm index 5fea801ba0..0f9017fbc6 100644 --- a/code/modules/surgery/organs/heart.dm +++ b/code/modules/surgery/organs/heart.dm @@ -61,6 +61,7 @@ return S /obj/item/organ/heart/on_life() + ..() if(owner.client && beating) failed = FALSE var/sound/slowbeat = sound('sound/health/slowbeat.ogg', repeat = TRUE) diff --git a/code/modules/surgery/organs/lungs.dm b/code/modules/surgery/organs/lungs.dm index f3eaba1a1b..681c0d0a59 100644 --- a/code/modules/surgery/organs/lungs.dm +++ b/code/modules/surgery/organs/lungs.dm @@ -12,10 +12,12 @@ var/operated = FALSE //whether we can still have our damages fixed through surgery //health - maxHealth = LUNGS_MAX_HEALTH + maxHealth = 3 * STANDARD_ORGAN_THRESHOLD healing_factor = STANDARD_ORGAN_HEALING decay_factor = STANDARD_ORGAN_DECAY + high_threshold = 0.6 * LUNGS_MAX_HEALTH //threshold at 30 + low_threshold = 0.3 * LUNGS_MAX_HEALTH //threshold at 15 high_threshold_passed = "You feel some sort of constriction around your chest as your breathing becomes shallow and rapid." now_fixed = "Your lungs seem to once again be able to hold air." diff --git a/code/modules/surgery/organs/stomach.dm b/code/modules/surgery/organs/stomach.dm index 8ddaa951d8..a1624efd61 100755 --- a/code/modules/surgery/organs/stomach.dm +++ b/code/modules/surgery/organs/stomach.dm @@ -17,6 +17,7 @@ low_threshold_cleared = "The last bouts of pain in your stomach have died out." /obj/item/organ/stomach/on_life() + ..() var/datum/reagent/consumable/nutriment/Nutri if(ishuman(owner)) var/mob/living/carbon/human/H = owner diff --git a/code/modules/surgery/organs/tongue.dm b/code/modules/surgery/organs/tongue.dm index 3dd5c7b2b7..966a9253bf 100644 --- a/code/modules/surgery/organs/tongue.dm +++ b/code/modules/surgery/organs/tongue.dm @@ -23,6 +23,8 @@ /datum/language/aphasia, /datum/language/slime, )) + healing_factor = STANDARD_ORGAN_HEALING*5 //Fast!! + decay_factor = STANDARD_ORGAN_DECAY /obj/item/organ/tongue/Initialize(mapload) . = ..()