From de19bc1b4e471035efa3d43a09bcb842163f261e Mon Sep 17 00:00:00 2001 From: BurgerLUA Date: Sat, 17 Mar 2018 10:13:14 -0700 Subject: [PATCH] Fixed Diona Nymphs being unable to do a full merge. (#4424) --- code/modules/mob/living/carbon/alien/diona/progression.dm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/code/modules/mob/living/carbon/alien/diona/progression.dm b/code/modules/mob/living/carbon/alien/diona/progression.dm index 53a6a8fde3f..f86e50b2761 100644 --- a/code/modules/mob/living/carbon/alien/diona/progression.dm +++ b/code/modules/mob/living/carbon/alien/diona/progression.dm @@ -25,7 +25,7 @@ if(stat != CONSCIOUS) return - var/limbs_can_grow = round((nutrition / evolve_nutrition) * 6) + var/limbs_can_grow = round((nutrition / evolve_nutrition) * 6,1) if(limbs_can_grow <= 3) //Head, Trunk, Fork src << "You do not have enough biomass to grow yet. Currently you can only grow [limbs_can_grow]/6 limbs. ([nutrition]/[evolve_nutrition] biomass)." return @@ -92,12 +92,12 @@ var/list/organ_removal_priorities = list("l_arm","r_arm","l_leg","r_leg") var/limbs_to_remove = (6 - limbs_can_grow) for(var/organ_name in organ_removal_priorities) + if(limbs_to_remove <= 0) + break var/obj/item/organ/external/O = adult.organs_by_name[organ_name] src << "You didn't have enough biomass to grow your [O.name]!" //adult.organs -= O O.droplimb(1,DROPLIMB_EDGE) qdel(O) limbs_to_remove -= 1 - if(limbs_to_remove <= 0) - break - //Matt \ No newline at end of file + //Matt