Merge branch 'master' into plant-adding

code/modules/research/xenoarch/xenobotany/grown/amauri.dm

@@ -13,7 +13,7 @@
 	icon_grow = "amauri-stage"
 	growthstages = 3
 	genes = list(/datum/plant_gene/trait/repeated_harvest)
-	reagents_add = list("shadowmutationtoxin" = 0.1)
+	reagents_add = list(/datum/reagent/mutationtoxin/shadow = 0.1)
 
 /obj/item/reagent_containers/food/snacks/grown/amauri
 	seed = /obj/item/seeds/amauri
@@ -24,5 +24,5 @@
 	filling_color = "#FF4500"
 	bitesize = 100
 	foodtype = FRUIT
-	juice_results = list("shadowmutationtoxin" = 0.1)
+	juice_results = list(/datum/reagent/mutationtoxin/shadow = 0.1)
 	tastes = list("shadow" = 1)

code/modules/research/xenoarch/xenobotany/grown/gelthi.dm

@@ -13,7 +13,7 @@
 	icon_grow = "gelthi-stage"
 	growthstages = 3
 	genes = list(/datum/plant_gene/trait/repeated_harvest)
-	reagents_add = list("gold" = 0.1)
+	reagents_add = list(/datum/reagent/gold = 0.1)
 
 /obj/item/reagent_containers/food/snacks/grown/gelthi
 	seed = /obj/item/seeds/gelthi
@@ -24,5 +24,5 @@
 	filling_color = "#FF4500"
 	bitesize = 100
 	foodtype = FRUIT
-	juice_results = list("gold" = 0.1)
+	juice_results = list(/datum/reagent/gold = 0.1)
 	tastes = list("gold" = 1)

code/modules/research/xenoarch/xenobotany/grown/jurlmah.dm

@@ -13,7 +13,7 @@
 	icon_grow = "jurlmah-stage"
 	growthstages = 5
 	genes = list(/datum/plant_gene/trait/repeated_harvest)
-	reagents_add = list("cryoxadone" = 0.1)
+	reagents_add = list(/datum/reagent/medicine/cryoxadone = 0.1)
 
 /obj/item/reagent_containers/food/snacks/grown/jurlmah
 	seed = /obj/item/seeds/jurlmah
@@ -24,5 +24,5 @@
 	filling_color = "#FF4500"
 	bitesize = 100
 	foodtype = FRUIT
-	juice_results = list("cryoxadone" = 0.1)
+	juice_results = list(/datum/reagent/medicine/cryoxadone = 0.1)
 	tastes = list("cold" = 1)

code/modules/research/xenoarch/xenobotany/grown/nofruit.dm

@@ -13,7 +13,7 @@
 	icon_grow = "nofruit-stage"
 	growthstages = 4
 	genes = list(/datum/plant_gene/trait/repeated_harvest)
-	reagents_add = list("nothing" = 0.1, "laughter" = 0.1)
+	reagents_add = list(/datum/reagent/consumable/nothing = 0.1, /datum/reagent/consumable/laughter = 0.1)
 
 /obj/item/reagent_containers/food/snacks/grown/nofruit
 	seed = /obj/item/seeds/nofruit
@@ -24,5 +24,5 @@
 	filling_color = "#FF4500"
 	bitesize = 100
 	foodtype = FRUIT
-	juice_results = list("nothing" = 0.1, "laughter" = 0.1)
+	juice_results = list(/datum/reagent/consumable/nothing = 0.1, /datum/reagent/consumable/laughter = 0.1)
 	tastes = list("entertainment" = 1)

code/modules/research/xenoarch/xenobotany/grown/shand.dm

@@ -13,7 +13,7 @@
 	icon_grow = "shand-stage"
 	growthstages = 3
 	genes = list(/datum/plant_gene/trait/repeated_harvest)
-	reagents_add = list("pax" = 0.1)
+	reagents_add = list(/datum/reagent/pax = 0.1)
 
 /obj/item/reagent_containers/food/snacks/grown/shand
 	seed = /obj/item/seeds/shand
@@ -24,5 +24,5 @@
 	filling_color = "#FF4500"
 	bitesize = 100
 	foodtype = FRUIT
-	juice_results = list("pax" = 0.1)
+	juice_results = list(/datum/reagent/pax = 0.1)
 	tastes = list("peace" = 1)

code/modules/research/xenoarch/xenobotany/grown/surik.dm

@@ -13,7 +13,7 @@
 	icon_grow = "surik-stage"
 	growthstages = 4
 	genes = list(/datum/plant_gene/trait/repeated_harvest)
-	reagents_add = list("frostoil" = 0.1)
+	reagents_add = list(/datum/reagent/consumable/frostoil = 0.1)
 
 /obj/item/reagent_containers/food/snacks/grown/surik
 	seed = /obj/item/seeds/surik
@@ -24,5 +24,5 @@
 	filling_color = "#FF4500"
 	bitesize = 100
 	foodtype = FRUIT
-	juice_results = list("frostoil" = 0.1)
+	juice_results = list(/datum/reagent/consumable/frostoil = 0.1)
 	tastes = list("snow" = 1)

code/modules/research/xenoarch/xenobotany/grown/telriis.dm

@@ -13,7 +13,7 @@
 	icon_grow = "telriis-stage"
 	growthstages = 4
 	genes = list(/datum/plant_gene/trait/repeated_harvest)
-	reagents_add = list("podmutationtoxin" = 0.1)
+	reagents_add = list(/datum/reagent/mutationtoxin/pod = 0.1)
 
 /obj/item/reagent_containers/food/snacks/grown/telriis
 	seed = /obj/item/seeds/telriis
@@ -24,5 +24,5 @@
 	filling_color = "#FF4500"
 	bitesize = 100
 	foodtype = FRUIT
-	juice_results = list("podmutationtoxin" = 0.1)
+	juice_results = list(/datum/reagent/mutationtoxin/pod = 0.1)
 	tastes = list("plant" = 1)

code/modules/research/xenoarch/xenobotany/grown/thaadra.dm

@@ -13,7 +13,7 @@
 	icon_grow = "thaadra-stage"
 	growthstages = 4
 	genes = list(/datum/plant_gene/trait/repeated_harvest)
-	reagents_add = list("silver" = 0.1)
+	reagents_add = list(/datum/reagent/silver = 0.1)
 
 /obj/item/reagent_containers/food/snacks/grown/thaadra
 	seed = /obj/item/seeds/thaadra
@@ -24,5 +24,5 @@
 	filling_color = "#FF4500"
 	bitesize = 100
 	foodtype = FRUIT
-	juice_results = list("silver" = 0.1)
+	juice_results = list(/datum/reagent/silver = 0.1)
 	tastes = list("silver" = 1)

code/modules/research/xenoarch/xenobotany/grown/vale.dm

@@ -13,7 +13,7 @@
 	icon_grow = "vale-stage"
 	growthstages = 4
 	genes = list(/datum/plant_gene/trait/repeated_harvest)
-	reagents_add = list("slime_toxin" = 0.1)
+	reagents_add = list(/datum/reagent/slime_toxin = 0.1)
 
 /obj/item/reagent_containers/food/snacks/grown/vale
 	seed = /obj/item/seeds/vale
@@ -24,5 +24,5 @@
 	filling_color = "#FF4500"
 	bitesize = 100
 	foodtype = FRUIT
-	juice_results = list("slime_toxin" = 0.1)
+	juice_results = list(/datum/reagent/slime_toxin = 0.1)
 	tastes = list("slime" = 1)

code/modules/research/xenoarch/xenobotany/grown/vaporsac.dm

@@ -13,7 +13,7 @@
 	icon_grow = "vaporsac-stage"
 	growthstages = 3
 	genes = list(/datum/plant_gene/trait/repeated_harvest)
-	reagents_add = list("nitrous_oxide" = 0.1)
+	reagents_add = list(/datum/reagent/nitrous_oxide = 0.1)
 
 /obj/item/reagent_containers/food/snacks/grown/vaporsac
 	seed = /obj/item/seeds/vaporsac
@@ -24,5 +24,5 @@
 	filling_color = "#FF4500"
 	bitesize = 100
 	foodtype = FRUIT
-	juice_results = list("nitrous_oxide" = 0.1)
+	juice_results = list(/datum/reagent/nitrous_oxide = 0.1)
 	tastes = list("sleep" = 1)