diff --git a/code/datums/components/species/shadekin/helpers/comp_helpers.dm b/code/datums/components/species/shadekin/helpers/comp_helpers.dm index 19ea560b281..7664a4e4989 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 b1020607589..f3ed99ac3ea 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)