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

Nerfs* passive organ healing, plus some minor stuff
2022-03-13 14:26:00 -07:00
parent 950d0cc489 1e375d86a2
commit fcfde73f5e
3 changed files with 12 additions and 3 deletions
@@ -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