Hydroponics + ect Update:

* Hydroponics area re-arranged to require less running around.
* Both Nettles and Death Nettles now can be used in a blender to extact their reagents.
* Seeds Crates can now be ordered by the QM. Contains a packet of all the basic seeds available from the seed vendor.
* Exotic Seeds Crates can now be ordered by the QM. Contains one packet of the following each: Egg Plant, Nettle, Fly Amanita Mycelium, Liberty Cap Mycelium, Plump Helmet Mycelium
* "Egg Plant" added (not a typo). Eggs may not be used on Seed Extractor to make Egg Seeds (that would just be silly). The only way to get an Egg Plant is through mutating an Eggplant or an Exotic Seeds crate.
* Plant-b-gone spray bottles now kill weeds and pests better then before. Also slightly less toxic.
* Weed spray and Pest Spray both removed since they're redundant.
* Potatos added. Can be used to make Fries (Potato + Processor), Cheesy Fries (Microwave: Fries + 1 cheese), Loaded Baked Potato (Microwave: 1 Potato + 1 Cheese)
* Beaker I intended to add in previous update finally got added (in kitchen).
* AI can no longer pick plants in hydroponics. The Cybernetic Horticulturalist Society has filed a complaint.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@499 316c924e-a436-60f5-8080-3fe189b3f50e

code/WorkInProgress/Chemistry-Reagents.dm

@@ -1057,7 +1057,7 @@ datum
 
 
 /////////////////////////Food Reagents////////////////////////////
-// Part of the food code. It is used instead of the old "heal_amt" code. Also is where all the food
+// Part of the food code. Nutriment is used instead of the old "heal_amt" code. Also is where all the food
 // 	condiments, additives, and such go.
 		nutriment
 			name = "Nutriment"

code/WorkInProgress/Chemistry-Tools.dm

@@ -1722,6 +1722,34 @@
 		reagents.add_reagent("nutriment", 8)
 		bitesize = 2
 
+/obj/item/weapon/reagent_containers/food/snacks/loadedbakedpotato
+	name = "Loaded Baked Potato"
+	desc = "Totally baked."
+	icon_state = "loadedbakedpotato"
+	New()
+		..()
+		reagents.add_reagent("nutriment", 6)
+		bitesize = 3
+
+/obj/item/weapon/reagent_containers/food/snacks/fries
+	name = "Space Fries"
+	desc = "AKA: French Fries, Freedom Fries, etc"
+	icon_state = "fries"
+	New()
+		..()
+		reagents.add_reagent("nutriment", 4)
+
+/obj/item/weapon/reagent_containers/food/snacks/cheesyfries
+	name = "Cheesy Fries"
+	desc = "Fries. Covered in cheese. Duh."
+	icon_state = "cheesyfries"
+	New()
+		..()
+		reagents.add_reagent("nutriment", 6)
+		bitesize = 2
+
+
+
 
 ///////////////////////////////////////////////Condiments
 //Notes by Darem: The condiments food-subtype is for stuff you don't actually eat but you use to modify existing food. They all

code/defines/obj/hydro.dm

@@ -15,7 +15,7 @@
 
 /obj/item/seeds
 	name = "seed"
-	icon = 'hydroponics.dmi'
+	icon = 'seeds.dmi'
 	icon_state = "seed" // unknown plant seed - these shouldn't exist in-game
 	flags = FPRINT | TABLEPASS
 	w_class = 1.0 // Makes them pocketable
@@ -80,6 +80,21 @@
 	plant_type = 0
 	growthstages = 6
 
+/obj/item/seeds/eggyseed
+	name = "Egg Plant seeds"
+	icon_state = "seed-eggy"
+	mypath = "/obj/item/seeds/eggy"
+	species = "eggy"
+	plantname = "Egg Plant plant"
+	productname = "/obj/item/weapon/reagent_containers/food/snacks/egg"
+	lifespan = 75
+	endurance = 15
+	maturation = 6
+	production = 6
+	yield = 2
+	plant_type = 0
+	growthstages = 6
+
 /obj/item/seeds/tomatoseed
 	name = "Tomato seeds"
 	icon_state = "seed-tomato"
@@ -95,6 +110,23 @@
 	plant_type = 0
 	growthstages = 6
 
+/obj/item/seeds/potatoseed
+	name = "Potato Seeds"
+	icon_state = "seed-potato"
+	mypath = "/obj/item/seeds/potatoseed"
+	species = "potato"
+	plantname = "Potato Plant"
+	productname = "/obj/item/weapon/reagent_containers/food/snacks/grown/potato"
+	lifespan = 30
+	endurance = 15
+	maturation = 10
+	production = 1
+	yield = 2
+	plant_type = 0
+	oneharvest = 1
+	potency = 10
+	growthstages = 4
+
 /obj/item/seeds/icepepperseed
 	name = "Ice pepper seeds"
 	icon_state = "seed-icepepper"
@@ -398,6 +430,10 @@
 	var/poison_amt = 0
 	var/drug_amt = 0
 	var/heat_amt = 0
+	New()
+		..()
+		src.pixel_x = rand(-5.0, 5)
+		src.pixel_y = rand(-5.0, 5)
 
 /obj/item/weapon/reagent_containers/food/snacks/grown/attackby(var/obj/item/O as obj, var/mob/user as mob)
 	if (istype(O, /obj/item/device/analyzer/plant_analyzer))
@@ -441,6 +477,14 @@
 
 		return
 
+/obj/item/weapon/reagent_containers/food/snacks/grown/potato
+	seed = "/obj/item/seeds/potatoseed"
+	name = "Potato"
+	desc = "Starchy!"
+	icon_state = "potato"
+	New()
+		..()
+		reagents.add_reagent("nutriment", max(round((potency / 5), 1), 2))
 
 /obj/item/weapon/reagent_containers/food/snacks/grown/berries
 	seed = "/obj/item/seeds/berryseed"
@@ -450,8 +494,6 @@
 	New()
 		..()
 		reagents.add_reagent("nutriment", 2)
-		src.pixel_x = rand(-5.0, 5)
-		src.pixel_y = rand(-5.0, 5)
 
 /obj/item/weapon/reagent_containers/food/snacks/grown/chili
 	seed = "/obj/item/seeds/chiliseed"
@@ -463,8 +505,6 @@
 		reagents.add_reagent("nutriment", 2)
 		reagents.add_reagent("capsaicin", max(round(heat_amt / 5, 1), 4))
 		bitesize = max(round(reagents.total_volume / 2, 1), 1)
-		src.pixel_x = rand(-5.0, 5)
-		src.pixel_y = rand(-5.0, 5)
 
 /obj/item/weapon/reagent_containers/food/snacks/grown/eggplant
 	seed = "/obj/item/seeds/eggplantseed"
@@ -474,8 +514,6 @@
 	New()
 		..()
 		reagents.add_reagent("nutriment", 2)
-		src.pixel_x = rand(-5.0, 5)
-		src.pixel_y = rand(-5.0, 5)
 
 /obj/item/weapon/reagent_containers/food/snacks/grown/soybeans
 	seed = "/obj/item/seeds/soyaseed"
@@ -485,8 +523,6 @@
 	New()
 		..()
 		reagents.add_reagent("nutriment", 2)
-		src.pixel_x = rand(-5.0, 5)
-		src.pixel_y = rand(-5.0, 5)
 
 /obj/item/weapon/reagent_containers/food/snacks/grown/tomato
 	seed = "/obj/item/seeds/tomatoseed"
@@ -496,8 +532,6 @@
 	New()
 		..()
 		reagents.add_reagent("nutriment", 2)
-		src.pixel_x = rand(-5.0, 5)
-		src.pixel_y = rand(-5.0, 5)
 
 /obj/item/weapon/reagent_containers/food/snacks/grown/wheat
 	seed = "/obj/item/seeds/wheatseed"
@@ -507,8 +541,6 @@
 	New()
 		..()
 		reagents.add_reagent("nutriment", 2)
-		src.pixel_x = rand(-5.0, 5)
-		src.pixel_y = rand(-5.0, 5)
 
 /obj/item/weapon/reagent_containers/food/snacks/grown/icepepper
 	seed = "/obj/item/seeds/icepepperseed"
@@ -521,8 +553,6 @@
 		reagents.add_reagent("nutriment", 2)
 		reagents.add_reagent("frostoil", max(round(heat_amt / 5, 1), 4))
 		bitesize = max(round(reagents.total_volume / 2, 1), 1)
-		src.pixel_x = rand(-5.0, 5)
-		src.pixel_y = rand(-5.0, 5)
 
 /obj/item/weapon/reagent_containers/food/snacks/grown/carrot
 	seed = "/obj/item/seeds/carrotseed"
@@ -532,8 +562,6 @@
 	New()
 		..()
 		reagents.add_reagent("nutriment", 2)
-		src.pixel_x = rand(-5.0, 5)
-		src.pixel_y = rand(-5.0, 5)
 
 /obj/item/weapon/reagent_containers/food/snacks/grown/amanita
 	seed = "/obj/item/seeds/amanitamycelium"
@@ -547,8 +575,6 @@
 		reagents.add_reagent("amatoxin", max(poison_amt, 4))
 		reagents.add_reagent("psilocybin", max(drug_amt, 1))
 		bitesize = max(round(reagents.total_volume / 2, 1), 1)
-		src.pixel_x = rand(-5.0, 5)
-		src.pixel_y = rand(-5.0, 5)
 
 /obj/item/weapon/reagent_containers/food/snacks/grown/angel
 	seed = "/obj/item/seeds/angelmycelium"
@@ -562,8 +588,6 @@
 		reagents.add_reagent("amatoxin", max(poison_amt, 14))
 		reagents.add_reagent("psilocybin", max(drug_amt, 1))
 		bitesize = max(round(reagents.total_volume / 2, 1), 1)
-		src.pixel_x = rand(-5.0, 5)
-		src.pixel_y = rand(-5.0, 5)
 
 /obj/item/weapon/reagent_containers/food/snacks/grown/libertycap
 	seed = "/obj/item/seeds/libertymycelium"
@@ -576,8 +600,6 @@
 		reagents.add_reagent("nutriment", 2)
 		reagents.add_reagent("psilocybin", max(drug_amt, 4))
 		bitesize = max(round(reagents.total_volume / 2), 1)
-		src.pixel_x = rand(-5.0, 5)
-		src.pixel_y = rand(-5.0, 5)
 
 /obj/item/weapon/reagent_containers/food/snacks/grown/plumphelmet
 	seed = "/obj/item/seeds/plumpmycelium"
@@ -588,8 +610,6 @@
 		..()
 		reagents.add_reagent("nutriment", 4)
 		bitesize = 2
-		src.pixel_x = rand(-5.0, 5)
-		src.pixel_y = rand(-5.0, 5)
 
 /obj/item/weapon/reagent_containers/food/snacks/grown/chanterelle
 	seed = "/obj/item/seeds/chantermycelium"
@@ -599,8 +619,6 @@
 	New()
 		..()
 		reagents.add_reagent("nutriment", 2)
-		src.pixel_x = rand(-5.0, 5)
-		src.pixel_y = rand(-5.0, 5)
 
 
 

code/defines/obj/machinery.dm

@@ -648,8 +648,8 @@
 	name = "MegaSeed Servitor"
 	desc = "When you need seeds fast!"
 	icon_state = "seeds"
-	product_paths = "/obj/item/seeds/chiliseed;/obj/item/seeds/berryseed;/obj/item/seeds/eggplantseed;/obj/item/seeds/tomatoseed;/obj/item/seeds/wheatseed;/obj/item/seeds/soyaseed;/obj/item/seeds/carrotseed;/obj/item/seeds/chantermycelium"
-	product_amounts = "2;2;2;2;2;2;2;2"
+	product_paths = "/obj/item/seeds/chiliseed;/obj/item/seeds/berryseed;/obj/item/seeds/eggplantseed;/obj/item/seeds/tomatoseed;/obj/item/seeds/wheatseed;/obj/item/seeds/soyaseed;/obj/item/seeds/carrotseed;/obj/item/seeds/potatoseed;/obj/item/seeds/chantermycelium"
+	product_amounts = "2;2;2;2;2;2;2;2;2"
 	product_slogans = "THIS'S WHERE TH' SEEDS LIVE! GIT YOU SOME!;Hands down the best seed selection on the station!;Also certain mushroom varieties available, more for experts! Get certified today!"
 	product_hidden = "/obj/item/seeds/amanitamycelium;/obj/item/seeds/libertymycelium;/obj/item/seeds/nettleseed;/obj/item/seeds/plumpmycelium"
 	product_hideamt = "1;2;2;2"

code/defines/obj/weapon.dm

@@ -1544,6 +1544,10 @@ Total SMES charging rate should not exceed total power generation rate, or an ov
 	var/yield = 2
 	var/potency = -1
 	var/plant_type = 0
+	New()
+		var/datum/reagents/R = new/datum/reagents(50)
+		reagents = R
+		R.my_atom = src
 
 
 /obj/item/weapon/grown/nettle // -- Skie
@@ -1560,6 +1564,10 @@ Total SMES charging rate should not exceed total power generation rate, or an ov
 	throw_range = 3
 	plant_type = 1
 	seed = "/obj/item/seeds/nettleseed"
+	New()
+		..()
+		reagents.add_reagent("nutriment", 1)
+		reagents.add_reagent("acid", round(potency, 1))
 
 /obj/item/weapon/grown/deathnettle // -- Skie
 	desc = "The \red glowing \black nettle incites \red<B>rage</B>\black in you just from looking at it!"
@@ -1575,6 +1583,10 @@ Total SMES charging rate should not exceed total power generation rate, or an ov
 	throw_range = 3
 	plant_type = 1
 	seed = "/obj/item/seeds/deathnettleseed"
+	New()
+		..()
+		reagents.add_reagent("nutriment", 1)
+		reagents.add_reagent("pacid", round(potency, 1))
 
 /obj/item/weapon/plantbgone // -- Skie
 	desc = "Plant-B-Gone! Kill those pesky weeds!"
@@ -1589,6 +1601,7 @@ Total SMES charging rate should not exceed total power generation rate, or an ov
 	throw_range = 10
 	var/empty = 0
 
+/*			Commented out due to being redundant. - Darem
 /obj/item/weapon/weedspray // -- Skie
 	desc = "Toxic mixture in spray form to kill small weeds."
 	icon = 'hydroponics.dmi'
@@ -1616,6 +1629,7 @@ Total SMES charging rate should not exceed total power generation rate, or an ov
 	throw_range = 10
 	var/toxicity = 4
 	var/PestKillStr = 2
+*/
 
 /obj/item/weapon/minihoe // -- Numbers
 	name = "Mini hoe"

code/game/machinery/hydroponics.dm

@@ -104,8 +104,8 @@ obj/machinery/hydroponics/process()
 					src.lastproduce = src.age
 			if(prob(5))  // On each tick, there's a 5 percent chance the pest population will increase
 				src.pestlevel += 1
-			if(prob(5) && src.waterlevel > 10 && src.nutrilevel > 0)  // On each tick, there's a 5 percent chance the weed population will increase, but there needs to be water/nuts for that!
-				src.weedlevel += 1
+			if(prob(5) && src.waterlevel > 10 && src.nutrilevel > 0)  // On each tick, there's a 5 percent chance the weed
+				src.weedlevel += 1					//population will increase, but there needs to be water/nuts for that!
 		else
 			if(prob(10) && src.waterlevel > 10 && src.nutrilevel > 0)  // If there's no plant, the percentage chance is 10%
 				src.weedlevel += 1
@@ -293,6 +293,10 @@ obj/machinery/hydroponics/proc/mutatespecie() // Mutagent produced a new plant!
 		del(src.myseed)
 		src.myseed = new /obj/item/seeds/icepepperseed
 
+	else if ( istype(src.myseed, /obj/item/seeds/eggplantseed ))
+		del(src.myseed)
+		src.myseed = new /obj/item/seeds/eggyseed
+
 	else
 		return
 
@@ -391,33 +395,7 @@ obj/machinery/hydroponics/attackby(var/obj/item/O as obj, var/mob/user as mob)
 		del(O)
 		src.updateicon()
 
-	else if ( istype(O, /obj/item/weapon/weedspray) )
-		var/obj/item/weedkiller/myWKiller = O
-		user.u_equip(O)
-		src.toxic += myWKiller.toxicity
-		src.weedlevel -= myWKiller.WeedKillStr
-		if (src.weedlevel < 0 ) // Make sure it won't go overoboard
-			src.weedlevel = 0
-		if (src.toxic > 100 ) // Make sure it won't go overoboard
-			src.toxic = 100
-		user << "You apply the weedkiller solution into the tray"
-		playsound(src.loc, 'spray3.ogg', 50, 1, -6)
-		del(O)
-		src.updateicon()
 
-	else if ( istype(O, /obj/item/weapon/pestspray) )
-		var/obj/item/pestkiller/myPKiller = O
-		user.u_equip(O)
-		src.toxic += myPKiller.toxicity
-		src.pestlevel -= myPKiller.PestKillStr
-		if (src.pestlevel < 0 ) // Make sure it won't go overoboard
-			src.pestlevel = 0
-		if (src.toxic > 100 ) // Make sure it won't go overoboard
-			src.toxic = 100
-		user << "You apply the pestkiller solution into the tray"
-		playsound(src.loc, 'spray3.ogg', 50, 1, -6)
-		del(O)
-		src.updateicon()
 
 	else if ( istype(O, /obj/item/weapon/reagent_containers/syringe))  // Syringe stuff
 		var/obj/item/weapon/reagent_containers/syringe/S = O
@@ -614,16 +592,15 @@ obj/machinery/hydroponics/attackby(var/obj/item/O as obj, var/mob/user as mob)
 			src.health -= rand(5,20)
 
 			if(src.pestlevel > 0)
-				src.pestlevel -= 1 // Kill kill kill
+				src.pestlevel -= 2 // Kill kill kill
 			else
 				src.pestlevel = 0
 
-			if(src.weedlevel > 1)
-				src.weedlevel -= 2 // Kill kill kill
+			if(src.weedlevel > 0)
+				src.weedlevel -= 3 // Kill kill kill
 			else
 				src.weedlevel = 0
-
-			src.toxic += 5 // Oops
+			src.toxic += 4 // Oops
 			src.visible_message("\red <B>\The [src] has been sprayed with \the [O][(user ? " by [user]." : ".")]")
 			playsound(src.loc, 'spray3.ogg', 50, 1, -6)
 
@@ -639,19 +616,50 @@ obj/machinery/hydroponics/attackby(var/obj/item/O as obj, var/mob/user as mob)
 			user << "Success!"
 		else
 			user << "\red This plot is completely devoid of weeds. It doesn't need uprooting."
-	return
 
+/*				Commented out due to being redundant -Darem
+	else if ( istype(O, /obj/item/weapon/weedspray) )
+		var/obj/item/weedkiller/myWKiller = O
+		user.u_equip(O)
+		src.toxic += myWKiller.toxicity
+		src.weedlevel -= myWKiller.WeedKillStr
+		if (src.weedlevel < 0 ) // Make sure it won't go overoboard
+			src.weedlevel = 0
+		if (src.toxic > 100 ) // Make sure it won't go overoboard
+			src.toxic = 100
+		user << "You apply the weedkiller solution into the tray"
+		playsound(src.loc, 'spray3.ogg', 50, 1, -6)
+		del(O)
+		src.updateicon()
+
+	else if ( istype(O, /obj/item/weapon/pestspray) )
+		var/obj/item/pestkiller/myPKiller = O
+		user.u_equip(O)
+		src.toxic += myPKiller.toxicity
+		src.pestlevel -= myPKiller.PestKillStr
+		if (src.pestlevel < 0 ) // Make sure it won't go overoboard
+			src.pestlevel = 0
+		if (src.toxic > 100 ) // Make sure it won't go overoboard
+			src.toxic = 100
+		user << "You apply the pestkiller solution into the tray"
+		playsound(src.loc, 'spray3.ogg', 50, 1, -6)
+		del(O)
+		src.updateicon()
+	return
+*/
 
 
 /obj/machinery/hydroponics/attack_hand(mob/user as mob)
+	if(istype(usr,/mob/living/silicon))		//How does AI know what plant is?
+		return
 	if(src.harvest)
 		if(!user in range(1,src))
 			return
 		var/item = text2path(src.myseed.productname)
 		var/t_amount = 0
 
-		while ( t_amount < (src.myseed.yield * src.yieldmod ))
-			if(src.myseed.species == "nettle" || src.myseed.species == "deathnettle") // User gets a WEPON
+		while ( t_amount < (src.myseed.yield * src.yieldmod ))		//Yay for egg plants who need their own handling!
+			if(src.myseed.species == "nettle" || src.myseed.species == "deathnettle") // User gets a WEAPON
 				var/obj/item/weapon/grown/t_prod = new item(user.loc)
 				t_prod.seed = src.myseed.mypath
 				t_prod.species = src.myseed.species
@@ -666,6 +674,9 @@ obj/machinery/hydroponics/attackby(var/obj/item/O as obj, var/mob/user as mob)
 				t_amount++
 			//else if(src.myseed.species == "towercap")
 				//var/obj/item/wood/t_prod = new item(user.loc) - User gets wood (heh) - not implemented yet
+			else if(src.myseed.species == "eggy")		//User gets an item that can't be re-planted.
+				new item(user.loc)
+				t_amount++
 			else
 				var/obj/item/weapon/reagent_containers/food/snacks/grown/t_prod = new item(user.loc) // User gets a consumable
 				t_prod.seed = src.myseed.mypath
@@ -691,9 +702,9 @@ obj/machinery/hydroponics/attackby(var/obj/item/O as obj, var/mob/user as mob)
 			usr << text("\red You fail to harvest anything useful")
 		else
 			usr << text("You harvest from the [src.myseed.plantname]")
-			if(src.myseed.oneharvest)
-				src.planted = 0
-				src.dead = 0
+		if(src.myseed.oneharvest)
+			src.planted = 0
+			src.dead = 0
 		src.updateicon()
 	else if(src.dead)
 		src.planted = 0

code/game/machinery/microwave.dm

@@ -180,6 +180,16 @@
 	flour_amount = 3
 	creates = "/obj/item/weapon/reagent_containers/food/snacks/tofubread"
 
+/datum/recipe/loadedbakedpotato
+	extra_item = /obj/item/weapon/reagent_containers/food/snacks/grown/potato
+	cheese_amount = 1
+	creates = "/obj/item/weapon/reagent_containers/food/snacks/loadedbakedpotato"
+
+/datum/recipe/cheesyfries
+	extra_item = /obj/item/weapon/reagent_containers/food/snacks/fries
+	cheese_amount = 1
+	creates = "/obj/item/weapon/reagent_containers/food/snacks/cheesyfries"
+
 
 
 // *** After making the recipe above, add it in here! ***
@@ -218,6 +228,8 @@
 	src.available_recipes += new /datum/recipe/wingfangchu(src)
 	src.available_recipes += new /datum/recipe/chaosdonut(src)
 	src.available_recipes += new /datum/recipe/tofubread(src)
+	src.available_recipes += new /datum/recipe/loadedbakedpotato(src)
+	src.available_recipes += new /datum/recipe/cheesyfries(src)
 
 
 

code/game/machinery/processor.dm

@@ -3,7 +3,7 @@
 		user << "Something is already in the processing chamber."
 		return 0
 	else
-		if(istype(O, /obj/item/weapon/reagent_containers/food/snacks/grown/wheat) || istype(O, /obj/item/weapon/reagent_containers/food/snacks/humanmeat) || istype(O, /obj/item/weapon/reagent_containers/food/snacks/monkeymeat))
+		if(istype(O, /obj/item/weapon/reagent_containers/food/snacks/grown/potato) || istype(O, /obj/item/weapon/reagent_containers/food/snacks/grown/wheat) || istype(O, /obj/item/weapon/reagent_containers/food/snacks/humanmeat) || istype(O, /obj/item/weapon/reagent_containers/food/snacks/monkeymeat))
 			user.drop_item()
 			O.loc = src
 		else if(istype(O,/obj/item/weapon/grab))
@@ -55,6 +55,18 @@
 			processing = 0
 			return
 
+		if (istype(O, /obj/item/weapon/reagent_containers/food/snacks/grown/potato))
+			src.processing = 1
+			sleep(40)
+			playsound(src.loc, 'blender.ogg', 50, 1)
+			for(var/mob/V in viewers(src, null))
+				V.show_message(text("\blue [user] turns on \a [src]."))
+			del(O)
+			new /obj/item/weapon/reagent_containers/food/snacks/fries(src.loc)
+			processing = 0
+			return
+
+
 	for(var/mob/O in src.contents)
 		if(istype(O, /mob/living/carbon/alien/larva/metroid))
 			src.processing = 1

code/game/objects/storage/crates.dm

@@ -144,11 +144,11 @@
 		new /obj/item/weapon/plantbgone(src)
 		new /obj/item/weapon/plantbgone(src)
 		new /obj/item/weapon/minihoe(src)
-		new /obj/item/weapon/weedspray(src)
-		new /obj/item/weapon/weedspray(src)
-		new /obj/item/weapon/pestspray(src)
-		new /obj/item/weapon/pestspray(src)
-		new /obj/item/weapon/pestspray(src)
+//		new /obj/item/weapon/weedspray(src)
+//		new /obj/item/weapon/weedspray(src)
+//		new /obj/item/weapon/pestspray(src)
+//		new /obj/item/weapon/pestspray(src)
+//		new /obj/item/weapon/pestspray(src)
 
 /obj/crate/New()
 	..()

code/game/supplyshuttle.dm

@@ -337,12 +337,11 @@ var/ordernum=0
 	contains = list("/obj/item/weapon/plantbgone",
 	"/obj/item/weapon/plantbgone",
 	"/obj/item/weapon/plantbgone",
-	"/obj/item/weapon/weedspray",
-	"/obj/item/weapon/weedspray",
-	"/obj/item/weapon/weedspray",
-	"/obj/item/weapon/pestspray",
-	"/obj/item/weapon/pestspray",
-	"/obj/item/weapon/pestspray",
+	"/obj/item/weapon/plantbgone",
+//	"/obj/item/weapon/weedspray",
+//	"/obj/item/weapon/weedspray",
+//	"/obj/item/weapon/pestspray",
+//	"/obj/item/weapon/pestspray",
 	"/obj/item/weapon/minihoe",
 	"/obj/item/device/analyzer/plant_analyzer",
 	"/obj/item/clothing/gloves/latex",
@@ -352,6 +351,36 @@ var/ordernum=0
 	containername = "Hydroponics crate"
 	access = access_hydroponics
 
+/datum/supply_packs/seeds
+	name = "Seeds Crate"
+	contains = list("/obj/item/seeds/chiliseed",
+	"/obj/item/seeds/berryseed",
+	"/obj/item/seeds/eggplantseed",
+	"/obj/item/seeds/tomatoseed",
+	"/obj/item/seeds/soyaseed",
+	"/obj/item/seeds/wheatseed",
+	"/obj/item/seeds/carrotseed",
+	"/obj/item/seeds/chantermycelium",
+	"/obj/item/seeds/potatoseed")
+	cost = 10
+	containertype = /obj/crate/hydroponics
+	containername = "Seeds crate"
+	access = access_hydroponics
+
+
+/datum/supply_packs/exoticseeds
+	name = "Exotic Seeds Crate"
+	contains = list("/obj/item/seeds/nettleseed",
+	"/obj/item/seeds/plumpmycelium",
+	"/obj/item/seeds/libertymycelium",
+	"/obj/item/seeds/amanitamycelium",
+	"/obj/item/seeds/eggyseed")
+	cost = 15
+	containertype = /obj/crate/hydroponics
+	containername = "Exotic Seeds crate"
+	access = access_hydroponics
+
+
 //SUPPLY PACKS
 
 /obj/plasticflaps //HOW DO YOU CALL THOSE THINGS ANYWAY