Merge pull request #77 from shellspeed1/botany-fixes

Botany hotfixes to fix 4 new plants that were completly broken.

code/modules/hydroponics/grown/cocoa_vanilla.dm

@@ -64,7 +64,7 @@
 	production = 7
 	genes = list(/datum/plant_gene/trait/repeated_harvest)
 	mutatelist = list()
-	reagents_add = list(/datum/reagent/consumable/enzyme = 0.1, /datum/reagent/consumable/nutriment = 0.1)
+	reagents_add = list("enzyme" = 0.1, "nutriment" = 0.1)
 	growthstages = 4
 	growing_icon = 'icons/obj/hydroponics/growing_fruits.dmi'
 	icon_grow = "bungotree-grow"
@@ -97,5 +97,5 @@
 /obj/item/reagent_containers/food/snacks/grown/bungopit/Initialize()
 	. =..()
 	reagents.clear_reagents()
-	reagents.add_reagent(/datum/reagent/toxin/bungotoxin, seed.potency * 0.10) //More than this will kill at too low potency
-	reagents.add_reagent(/datum/reagent/consumable/nutriment, seed.potency * 0.04)
+	reagents.add_reagent("bungotoxin", seed.potency * 0.10) //More than this will kill at too low potency
+	reagents.add_reagent("nutriment", seed.potency * 0.04)

code/modules/hydroponics/grown/flowers.dm

@@ -68,8 +68,8 @@
 	icon_grow = "spacemanstrumpet-grow"
 	icon_dead = "spacemanstrumpet-dead"
 	mutatelist = list()
-	genes = list(/datum/plant_gene/reagent/polypyr)
-	reagents_add = list(/datum/reagent/consumable/nutriment = 0.05)
+	genes = list( "Polypyrylium Oligomers")
+	reagents_add = list("nutriment" = 0.05)
 	rarity = 30
 
 /obj/item/seeds/poppy/lily/trumpet/Initialize()

code/modules/hydroponics/grown/misc.dm

@@ -81,7 +81,7 @@
 	growing_icon = 'icons/obj/hydroponics/growing_flowers.dmi'
 	genes = list(/datum/plant_gene/trait/plant_type/weed_hardy, /datum/plant_gene/trait/invasive)
 	mutatelist = list()
-	reagents_add = list(/datum/reagent/consumable/nutriment = 0.05, /datum/reagent/medicine/silibinin = 0.1)
+	reagents_add = list("nutriment" = 0.05, "silibinin" = 0.1)
 
 /obj/item/seeds/galaxythistle/Initialize()
 	..()

code/modules/hydroponics/grown/mushrooms.dm

@@ -212,13 +212,13 @@
 	endurance = 8
 	yield = 4
 	growthstages = 2
-	genes = list(/datum/plant_gene/trait/plant_type/fungal_metabolism, /datum/plant_gene/reagent/liquidelectricity, /datum/plant_gene/trait/plant_type/carnivory)
+	genes = list(/datum/plant_gene/trait/plant_type/fungal_metabolism, /datum/plant_gene/reagent/teslium, /datum/plant_gene/trait/plant_type/carnivory)
 	growing_icon = 'icons/obj/hydroponics/growing_mushrooms.dmi'
-	reagents_add = list(/datum/reagent/consumable/nutriment = 0.1)
+	reagents_add = list("nutriment" = 0.1)
 
 /obj/item/seeds/chanterelle/jupitercup/Initialize()
 	..()
-	unset_mutability(/datum/plant_gene/reagent/liquidelectricity, PLANT_GENE_EXTRACTABLE)
+	unset_mutability(/datum/plant_gene/reagent/teslium, PLANT_GENE_EXTRACTABLE)
 	unset_mutability(/datum/plant_gene/trait/plant_type/carnivory, PLANT_GENE_REMOVABLE)
 
 /obj/item/reagent_containers/food/snacks/grown/mushroom/jupitercup

code/modules/hydroponics/plant_genes.dm

@@ -153,12 +153,12 @@
 
 	/datum/plant_gene/reagent/polypyr
 	name = "Polypyrylium Oligomers"
-	reagent_id = /datum/reagent/medicine/polypyr
+	reagent_id = "polypyrylium_oligomers"
 	rate = 0.15
 
-/datum/plant_gene/reagent/liquidelectricity
-	name = "Liquid Electricity"
-	reagent_id = "liquidelectricity"
+/datum/plant_gene/reagent/teslium
+	name = "Teslium"
+	reagent_id = "teslium"
 	rate = 0.1
 
 // Various traits affecting the product.

code/modules/reagents/chemistry/reagents/medicine_reagents.dm

@@ -1421,6 +1421,7 @@
 
 /datum/reagent/medicine/silibinin
 	name = "Silibinin"
+	id = "silibinin"
 	description = "A thistle derrived hepatoprotective flavolignan mixture that help reverse damage to the liver."
 	reagent_state = SOLID
 	color = "#FFFFD0"
@@ -1433,6 +1434,7 @@
 
 /datum/reagent/medicine/polypyr  //This is intended to be an ingredient in advanced chems.
 	name = "Polypyrylium Oligomers"
+	id = "polypyrylium_oligomers"
 	description = "A?purple mixture of short polyelectrolyte chains not easily synthesized in the laboratory. It is valued as an intermediate in the synthesis of the cutting edge pharmaceuticals."
 	reagent_state = SOLID
 	color = "#9423FF"

code/modules/reagents/chemistry/reagents/toxin_reagents.dm

@@ -903,6 +903,7 @@
 
 /datum/reagent/toxin/bungotoxin
 	name = "Bungotoxin"
+	id = "bungotoxin"
 	description = "A horrible cardiotoxin that protects the humble bungo pit."
 	silent_toxin = TRUE
 	color = "#EBFF8E"