From cf0344d0597ba5483097f8d63fd8a41f9f606463 Mon Sep 17 00:00:00 2001 From: Schnayy Date: Tue, 12 Nov 2019 15:17:08 -0600 Subject: [PATCH] Merge pull request #6522 from Mechoid/BotanyAgain2 Botany Fix, again? [Why] --- code/modules/hydroponics/grown.dm | 65 ++++++++++++++++--------------- 1 file changed, 33 insertions(+), 32 deletions(-) diff --git a/code/modules/hydroponics/grown.dm b/code/modules/hydroponics/grown.dm index 5a40ce3e0e..966645f7f9 100644 --- a/code/modules/hydroponics/grown.dm +++ b/code/modules/hydroponics/grown.dm @@ -26,47 +26,48 @@ /obj/item/weapon/reagent_containers/food/snacks/grown/Initialize() ..() - if(!plantname) - return + spawn() + if(!plantname) + return - if(!plant_controller) - sleep(250) // ugly hack, should mean roundstart plants are fine. - if(!plant_controller) - world << "Plant controller does not exist and [src] requires it. Aborting." - qdel(src) - return + if(!plant_controller) + sleep(250) // ugly hack, should mean roundstart plants are fine. + if(!plant_controller) + world << "Plant controller does not exist and [src] requires it. Aborting." + qdel(src) + return - seed = plant_controller.seeds[plantname] + seed = plant_controller.seeds[plantname] - if(!seed) - return + if(!seed) + return - name = "[seed.seed_name]" - trash = seed.get_trash_type() + name = "[seed.seed_name]" + trash = seed.get_trash_type() - update_icon() + update_icon() - if(!seed.chems) - return + if(!seed.chems) + return - potency = seed.get_trait(TRAIT_POTENCY) + potency = seed.get_trait(TRAIT_POTENCY) - for(var/rid in seed.chems) - var/list/reagent_data = seed.chems[rid] - if(reagent_data && reagent_data.len) - var/rtotal = reagent_data[1] - var/list/data = list() - if(reagent_data.len > 1 && potency > 0) - rtotal += round(potency/reagent_data[2]) - if(rid == "nutriment") - data[seed.seed_name] = max(1,rtotal) + for(var/rid in seed.chems) + var/list/reagent_data = seed.chems[rid] + if(reagent_data && reagent_data.len) + var/rtotal = reagent_data[1] + var/list/data = list() + if(reagent_data.len > 1 && potency > 0) + rtotal += round(potency/reagent_data[2]) + if(rid == "nutriment") + data[seed.seed_name] = max(1,rtotal) - reagents.add_reagent(rid,max(1,rtotal),data) - update_desc() - if(reagents.total_volume > 0) - bitesize = 1+round(reagents.total_volume / 2, 1) - if(seed.get_trait(TRAIT_STINGS)) - force = 1 + reagents.add_reagent(rid,max(1,rtotal),data) + update_desc() + if(reagents.total_volume > 0) + bitesize = 1+round(reagents.total_volume / 2, 1) + if(seed.get_trait(TRAIT_STINGS)) + force = 1 /obj/item/weapon/reagent_containers/food/snacks/grown/proc/update_desc()