cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-07-18 02:25:06 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6522 from Mechoid/BotanyAgain2

Browse Source 
Botany Fix, again? [Why]
This commit is contained in:
Schnayy
2019-11-12 15:17:08 -06:00
committed by VirgoBot
parent d3e1710674
commit cf0344d059
1 changed files with 33 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/hydroponics/grown.dm
+33 -32
View File
@@ -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 << "<span class='danger'>Plant controller does not exist and [src] requires it. Aborting.</span>"
qdel(src)
return
if(!plant_controller)
sleep(250) // ugly hack, should mean roundstart plants are fine.
if(!plant_controller)
world << "<span class='danger'>Plant controller does not exist and [src] requires it. Aborting.</span>"
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()