Merge pull request #15425 from DeltaFire15/slower-organ-healing

Nerfs* passive organ healing, plus some minor stuff
This commit is contained in:
silicons
2022-03-13 14:26:00 -07:00
committed by GitHub
3 changed files with 12 additions and 3 deletions

View File

@@ -156,12 +156,14 @@
return FALSE
if(organ_flags & ORGAN_SYNTHETIC_EMP) //Synthetic organ has been emped, is now failing.
applyOrganDamage(maxHealth * decay_factor)
return
return FALSE
if(organ_flags & ORGAN_SYNTHETIC)
return TRUE
if(!is_cold() && damage)
///Damage decrements by a percent of its maxhealth
var/healing_amount = -(maxHealth * healing_factor)
///Damage decrements again by a percent of its maxhealth, up to a total of 4 extra times depending on the owner's satiety
healing_amount -= owner.satiety > 0 ? 4 * healing_factor * owner.satiety / MAX_SATIETY : 0
healing_amount -= owner.satiety > 0 ? 4 * (maxHealth * healing_factor) * (owner.satiety / MAX_SATIETY) : 0
if(healing_amount)
applyOrganDamage(healing_amount) //to FERMI_TWEAK
return TRUE

View File

@@ -131,6 +131,13 @@
name = "ipc cell"
icon_state = "stomach-ipc"
/obj/item/organ/stomach/ipc/on_life()
. = ..()
if(!.)
return
if(HAS_TRAIT(owner, TRAIT_ROBOTIC_ORGANISM) && owner.nutrition >= NUTRITION_LEVEL_FED)
owner.satiety += 5 //We don't need to cap the value as it's already automatically capped during nutrition level handling. Also effectively only +4 as you lose 1 per life tick. 300 seconds of sufficient charge to reach full satiety.
/obj/item/organ/stomach/ipc/emp_act(severity)
. = ..()
if(!owner || . & EMP_PROTECT_SELF)