From 1f8af98389390d21fb02a2f31cbf78f1795e7d53 Mon Sep 17 00:00:00 2001 From: Chemlight Date: Wed, 27 Jan 2021 00:49:15 -0800 Subject: [PATCH] Plants and reagents Fixed Pink peppers and milkmelon reagents, along with all special xenobotany plants from xenoarch. --- code/modules/hydroponics/grown/chili.dm | 2 +- code/modules/hydroponics/grown/melon.dm | 2 +- code/modules/research/xenoarch/xenobotany/grown/amauri.dm | 4 ++-- code/modules/research/xenoarch/xenobotany/grown/gelthi.dm | 4 ++-- code/modules/research/xenoarch/xenobotany/grown/jurlmah.dm | 4 ++-- code/modules/research/xenoarch/xenobotany/grown/nofruit.dm | 4 ++-- code/modules/research/xenoarch/xenobotany/grown/shand.dm | 4 ++-- code/modules/research/xenoarch/xenobotany/grown/surik.dm | 4 ++-- code/modules/research/xenoarch/xenobotany/grown/telriis.dm | 4 ++-- code/modules/research/xenoarch/xenobotany/grown/thaadra.dm | 4 ++-- code/modules/research/xenoarch/xenobotany/grown/vale.dm | 4 ++-- code/modules/research/xenoarch/xenobotany/grown/vaporsac.dm | 4 ++-- 12 files changed, 22 insertions(+), 22 deletions(-) diff --git a/code/modules/hydroponics/grown/chili.dm b/code/modules/hydroponics/grown/chili.dm index d48c5c10..d288aaa9 100644 --- a/code/modules/hydroponics/grown/chili.dm +++ b/code/modules/hydroponics/grown/chili.dm @@ -93,7 +93,7 @@ yield = 3 rarity = 20 mutatelist = list() - reagents_add = list("aphro" = 0.2, "penis_enlarger" = 0.08, "vitamin" = 0.04, "nutriment" = 0.04) + reagents_add = list(/datum/reagent/drug/aphrodisiac = 0.2, /datum/reagent/fermi/penis_enlarger = 0.08, /datum/reagent/consumable/nutriment/vitamin = 0.04, /datum/reagent/consumable/nutriment = 0.04) /obj/item/reagent_containers/food/snacks/grown/pink_chili seed = /obj/item/seeds/chili/pink diff --git a/code/modules/hydroponics/grown/melon.dm b/code/modules/hydroponics/grown/melon.dm index 001997a7..0effcc29 100644 --- a/code/modules/hydroponics/grown/melon.dm +++ b/code/modules/hydroponics/grown/melon.dm @@ -72,7 +72,7 @@ plantname = "Milk Melon Vines" product = /obj/item/reagent_containers/food/snacks/grown/milkmelon mutatelist = list() - reagents_add = list("milk" = 0.2, "breast_enlarger" = 0.08, "vitamin" = 0.04, "nutriment" = 0.1) + reagents_add = list(/datum/reagent/consumable/milk = 0.2, /datum/reagent/fermi/breast_enlarger = 0.08, /datum/reagent/consumable/nutriment/vitamin = 0.04, /datum/reagent/consumable/nutriment = 0.1) rarity = 20 /obj/item/reagent_containers/food/snacks/grown/milkmelon diff --git a/code/modules/research/xenoarch/xenobotany/grown/amauri.dm b/code/modules/research/xenoarch/xenobotany/grown/amauri.dm index 9900c1d0..fb07a056 100644 --- a/code/modules/research/xenoarch/xenobotany/grown/amauri.dm +++ b/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) diff --git a/code/modules/research/xenoarch/xenobotany/grown/gelthi.dm b/code/modules/research/xenoarch/xenobotany/grown/gelthi.dm index bc0eee30..c8347031 100644 --- a/code/modules/research/xenoarch/xenobotany/grown/gelthi.dm +++ b/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) diff --git a/code/modules/research/xenoarch/xenobotany/grown/jurlmah.dm b/code/modules/research/xenoarch/xenobotany/grown/jurlmah.dm index dc482ae3..d7449a06 100644 --- a/code/modules/research/xenoarch/xenobotany/grown/jurlmah.dm +++ b/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) diff --git a/code/modules/research/xenoarch/xenobotany/grown/nofruit.dm b/code/modules/research/xenoarch/xenobotany/grown/nofruit.dm index c7d2eaa6..30f34554 100644 --- a/code/modules/research/xenoarch/xenobotany/grown/nofruit.dm +++ b/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) diff --git a/code/modules/research/xenoarch/xenobotany/grown/shand.dm b/code/modules/research/xenoarch/xenobotany/grown/shand.dm index fd0850d6..524da545 100644 --- a/code/modules/research/xenoarch/xenobotany/grown/shand.dm +++ b/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) diff --git a/code/modules/research/xenoarch/xenobotany/grown/surik.dm b/code/modules/research/xenoarch/xenobotany/grown/surik.dm index 3548762a..baaaebb7 100644 --- a/code/modules/research/xenoarch/xenobotany/grown/surik.dm +++ b/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) diff --git a/code/modules/research/xenoarch/xenobotany/grown/telriis.dm b/code/modules/research/xenoarch/xenobotany/grown/telriis.dm index d12bc080..2c2e47c5 100644 --- a/code/modules/research/xenoarch/xenobotany/grown/telriis.dm +++ b/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) diff --git a/code/modules/research/xenoarch/xenobotany/grown/thaadra.dm b/code/modules/research/xenoarch/xenobotany/grown/thaadra.dm index 8929ea5a..33e26683 100644 --- a/code/modules/research/xenoarch/xenobotany/grown/thaadra.dm +++ b/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) diff --git a/code/modules/research/xenoarch/xenobotany/grown/vale.dm b/code/modules/research/xenoarch/xenobotany/grown/vale.dm index df504112..ca9eec82 100644 --- a/code/modules/research/xenoarch/xenobotany/grown/vale.dm +++ b/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) diff --git a/code/modules/research/xenoarch/xenobotany/grown/vaporsac.dm b/code/modules/research/xenoarch/xenobotany/grown/vaporsac.dm index 3434ffab..9ea11644 100644 --- a/code/modules/research/xenoarch/xenobotany/grown/vaporsac.dm +++ b/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)