From 037bb7c13eb08ef36c063cd7f6c08938fce6d2c8 Mon Sep 17 00:00:00 2001 From: "LastBattaWolf@hotmail.com" Date: Sun, 28 Aug 2011 19:11:03 +0000 Subject: [PATCH] Hydroponics bugfixed by Rolan7! - Ambrosia Vulgaris is now visible and harvestable - Injecting a plant with an empty syringe now gives a more appropriate message. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2056 316c924e-a436-60f5-8080-3fe189b3f50e --- code/defines/obj/hydro.dm | 4 ++-- code/defines/obj/vending.dm | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/code/defines/obj/hydro.dm b/code/defines/obj/hydro.dm index cb9ea76c39f..bb58da8b2b4 100644 --- a/code/defines/obj/hydro.dm +++ b/code/defines/obj/hydro.dm @@ -670,9 +670,9 @@ desc = "A plant grown by and from medicine." icon_state = "seed-ambrosiavulgaris" mypath = "/obj/item/seeds/ambrosiavulgarisseed" - species = "athelas-ambrosiavulgaris" + species = "ambrosiavulgaris" plantname = "Ambrosia Vulgaris" - productname = "/obj/item/weapon/reagent_containers/food/snacks/grown/Ambrosiavulgaris" + productname = "/obj/item/weapon/reagent_containers/food/snacks/grown/ambrosiavulgaris" lifespan = 60 endurance = 25 maturation = 6 diff --git a/code/defines/obj/vending.dm b/code/defines/obj/vending.dm index e767c84ca6e..2635aa2c4a4 100644 --- a/code/defines/obj/vending.dm +++ b/code/defines/obj/vending.dm @@ -119,8 +119,8 @@ desc = "A plant nutrients vendor" icon_state = "nutri" icon_deny = "nutri-deny" - product_paths = "/obj/item/nutrient/ez;/obj/item/nutrient/l4z;/obj/item/nutrient/rh;/obj/item/weapon/pestspray;/obj/item/weapon/reagent_containers/syringe" - product_amounts = "35;25;15;20;5" + product_paths = "/obj/item/nutrient/ez;/obj/item/nutrient/l4z;/obj/item/nutrient/rh;/obj/item/weapon/pestspray;/obj/item/weapon/reagent_containers/syringe;/obj/item/weapon/plantbag" + product_amounts = "35;25;15;20;5;5" product_slogans = "Aren't you glad you don't have to fertilize the natural way?;Now with 50% less stink!;Plants are people too!" product_hidden = "/obj/item/weapon/reagent_containers/glass/bottle/ammonia;/obj/item/weapon/reagent_containers/glass/bottle/diethylamine" product_hideamt = "10;5"