Баги потребления веществ

ss220club · Nov 3, 2024 · a33fd5f · a33fd5f
1 parent 805ae3f
commit a33fd5f
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/modular_ss220/species/_components/organs/heart_defib_hunger.dm b/modular_ss220/species/_components/organs/heart_defib_hunger.dm
@@ -25,8 +25,8 @@
 	if(owner?.nutrition < NUTRITION_LEVEL_FED || owner.stat != DEAD || owner.get_damage_amount() > AUTO_DEFIBRILATION_THRESHOLD)
 		return
 	var/defib_chance = owner.nutrition - NUTRITION_LEVEL_FED
+	owner.adjust_nutrition(-defib_chance)
 	if(prob(defib_chance))
-		owner.adjust_nutrition(defib_chance)
 		owner.setOxyLoss(0)
 		owner.set_heartattack(FALSE)
 		owner.update_revive()

diff --git a/modular_ss220/species/_components/organs/organ_decay.dm b/modular_ss220/species/_components/organs/organ_decay.dm
@@ -30,7 +30,7 @@
 
 	var/is_no_owner = isnull(organ.owner)
 	var/is_dead = (is_no_owner ? FALSE : organ.owner.stat == DEAD)
-	var/formaldehyde_found = owner?.get_chemical_value("formaldehyde") > 0
+	var/formaldehyde_found = organ.owner?.get_chemical_value("formaldehyde") > 0
 	var/is_destroying = (is_dead || (is_no_owner && !organ.is_in_freezer))
 	if(is_destroying && !formaldehyde_found)
 		organ.receive_damage(decay_rate, 1)

diff --git a/modular_ss220/species/_components/organs/organ_hunger.dm b/modular_ss220/species/_components/organs/organ_hunger.dm
@@ -27,7 +27,7 @@
 		organ.switch_mode(force_off = TRUE)
 	else
 		if(consuption_count)
-			organ.owner.adjust_nutrition(consuption_count)
+			organ.owner.adjust_nutrition(-consuption_count)
 
 /datum/component/hunger_organ/proc/hunger_change_consuption(holder, new_consuption_count)
 	SIGNAL_HANDLER