From ea3d4b35c4658765c80ebb14cb49f5bbdc2203cc Mon Sep 17 00:00:00 2001 From: Cheridan Date: Wed, 14 May 2014 10:01:29 -0500 Subject: [PATCH] fixing conflict --- code/modules/hydroponics/hydroitemdefines.dm | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/code/modules/hydroponics/hydroitemdefines.dm b/code/modules/hydroponics/hydroitemdefines.dm index 8a35bd8ec9b..ad113e110ba 100644 --- a/code/modules/hydroponics/hydroitemdefines.dm +++ b/code/modules/hydroponics/hydroitemdefines.dm @@ -78,11 +78,13 @@ /obj/item/weapon/reagent_containers/glass/bottle/nutrient - name = "bottle of nutrient" icon = 'icons/obj/chemical.dmi' icon_state = "bottle16" + volume = 50 w_class = 1.0 + amount_per_transfer_from_this = 10 + possible_transfer_amounts = list(1,2,5,10,15,25,50) /obj/item/weapon/reagent_containers/glass/bottle/nutrient/New() ..() @@ -94,22 +96,25 @@ name = "bottle of E-Z-Nutrient" icon = 'icons/obj/chemical.dmi' icon_state = "bottle16" + /obj/item/weapon/reagent_containers/glass/bottle/nutrient/ez/New() ..() - reagents.add_reagent("eznutriment", 30) + reagents.add_reagent("eznutriment", 50) /obj/item/weapon/reagent_containers/glass/bottle/nutrient/l4z name = "bottle of Left 4 Zed" icon = 'icons/obj/chemical.dmi' icon_state = "bottle18" + /obj/item/weapon/reagent_containers/glass/bottle/nutrient/l4z/New() ..() - reagents.add_reagent("left4zednutriment", 30) + reagents.add_reagent("left4zednutriment", 50) /obj/item/weapon/reagent_containers/glass/bottle/nutrient/rh name = "bottle of Robust Harvest" icon = 'icons/obj/chemical.dmi' icon_state = "bottle15" + /obj/item/weapon/reagent_containers/glass/bottle/nutrient/rh/New() ..() - reagents.add_reagent("robustharvestnutriment", 30) + reagents.add_reagent("robustharvestnutriment", 50)