From a0cfc31eaaef9a163abd5beb1a47d5d144df1ce8 Mon Sep 17 00:00:00 2001
From: CHOMPStation2StaffMirrorBot
 <94713762+CHOMPStation2StaffMirrorBot@users.noreply.github.com>
Date: Thu, 16 Oct 2025 21:09:13 -0700
Subject: [PATCH] [MIRROR] fix shadekin nutrition gains (#11835)

Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
---
 .../species/shadekin/helpers/comp_helpers.dm      | 15 +++++++++------
 .../components/species/shadekin/shadekin.dm       |  2 +-
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/code/datums/components/species/shadekin/helpers/comp_helpers.dm b/code/datums/components/species/shadekin/helpers/comp_helpers.dm
index 19ea560b28..7664a4e498 100644
--- a/code/datums/components/species/shadekin/helpers/comp_helpers.dm
+++ b/code/datums/components/species/shadekin/helpers/comp_helpers.dm
@@ -212,14 +212,17 @@
 		return //No
 	shadekin_set_energy(dark_energy + amount)
 
-/datum/component/shadekin/proc/handle_nutrition_conversion(dark_gains)
+/datum/component/shadekin/proc/handle_nutrition_conversion(current_gains)
 	if(!nutrition_energy_conversion)
-		return
-	if(shadekin_get_energy() == 100 && dark_gains > 0)
-		owner.nutrition += dark_gains * 5 * nutrition_conversion_scaling
-	else if(shadekin_get_energy() < 50 && owner.nutrition > 500)
+		return current_gains
+	if(shadekin_get_energy() == 100 && current_gains > 0)
+		owner.nutrition += current_gains * 5 * nutrition_conversion_scaling
+		return current_gains
+
+	if(shadekin_get_energy() < 50 && owner.nutrition > 500)
 		owner.nutrition -= nutrition_conversion_scaling * 50
-		dark_gains += nutrition_conversion_scaling
+		current_gains += nutrition_conversion_scaling
+	return current_gains
 
 /datum/component/shadekin/proc/attack_dephase(var/turf/T = null, atom/dephaser)
 	// no assigned dephase-target, just use our own
diff --git a/code/datums/components/species/shadekin/shadekin.dm b/code/datums/components/species/shadekin/shadekin.dm
index b102060758..f3ed99ac3e 100644
--- a/code/datums/components/species/shadekin/shadekin.dm
+++ b/code/datums/components/species/shadekin/shadekin.dm
@@ -191,7 +191,7 @@
 		else
 			dark_gains = energy_light
 
-	handle_nutrition_conversion(dark_gains)
+	dark_gains = handle_nutrition_conversion(dark_gains)
 
 	shadekin_adjust_energy(dark_gains)