Bugfix: Pumpkins no longer disappear while growing in trays.

Bugfix: Potatoes and Pumpkins can be picked up in plant bags again.
Bugfix: Trying to make one of the new hydroponics items when the object is not on the ground (in-hand, backpack, etc) now works properly.

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

code/defines/obj/hydro.dm

@@ -1027,16 +1027,6 @@
 		reagents.add_reagent("nutriment", 1+round((potency / 10), 1))
 		bitesize = reagents.total_volume
 
-	attackby(obj/item/weapon/W as obj, mob/user as mob)
-		if(istype(W, /obj/item/weapon/cable_coil))
-			if(W:amount >= 5)
-				W:amount -= 5
-				if(!W:amount) del(W)
-				user << "<span class='notice'>You add some cable to the potato and slide it inside the battery encasing.</span>"
-				new /obj/item/weapon/cell/potato(src.loc)
-				del(src)
-
-
 /obj/item/weapon/reagent_containers/food/snacks/grown/grapes
 	seed = "/obj/item/seeds/grapeseed"
 	name = "bunch of grapes"
@@ -1215,15 +1205,6 @@
 		reagents.add_reagent("nutriment", 1+round((potency / 5), 1))
 		bitesize = 1+round(reagents.total_volume / 2, 1)
 
-	attackby(obj/item/weapon/W as obj, mob/user as mob)
-		if(istype(W, /obj/item/weapon/circular_saw) || istype(W, /obj/item/weapon/hatchet) || istype(W, /obj/item/weapon/fireaxe) || istype(W, /obj/item/weapon/fireaxe) || istype(W, /obj/item/weapon/kitchen/utensil/knife) || istype(W, /obj/item/weapon/melee/energy))
-			user.show_message("<span class='notice'>You carve a face into the [src]!</span>", 1)
-			new /obj/item/clothing/head/helmet/hardhat/pumpkinhead (src.loc)
-			del(src)
-			return
-
-
-
 /obj/item/weapon/reagent_containers/food/snacks/grown/lime
 	seed = "/obj/item/seeds/limeseed"
 	name = "lime"

code/game/objects/items/weapons/hydroponics.dm

@@ -4,7 +4,7 @@ CONTAINS:
 Plant-B-Gone
 Nettle
 Deathnettle
-Corn Cob
+Craftables (Cob pipes, potato batteries, pumpkinheads)
 
 */
 
@@ -135,9 +135,31 @@ Corn Cob
 		usr << "All the leaves have fallen off the deathnettle from violent whacking."
 		del(src)
 
+//Crafting
+
 /obj/item/weapon/corncob/attackby(obj/item/weapon/W as obj, mob/user as mob)
+	..()
 	if(istype(W, /obj/item/weapon/circular_saw) || istype(W, /obj/item/weapon/hatchet) || istype(W, /obj/item/weapon/kitchen/utensil/knife))
-		user << "You use [W] to fashion a pipe out of the corn cob!"
+		user << "<span class='notice'>You use [W] to fashion a pipe out of the corn cob!</span>"
-		new /obj/item/clothing/mask/pipe/cobpipe (src.loc)
+		new /obj/item/clothing/mask/pipe/cobpipe (user.loc)
 		del(src)
-		return ..()
+		return
+
+/obj/item/weapon/reagent_containers/food/snacks/grown/pumpkin/attackby(obj/item/weapon/W as obj, mob/user as mob)
+	..()
+	if(istype(W, /obj/item/weapon/circular_saw) || istype(W, /obj/item/weapon/hatchet) || istype(W, /obj/item/weapon/fireaxe) || istype(W, /obj/item/weapon/fireaxe) || istype(W, /obj/item/weapon/kitchen/utensil/knife) || istype(W, /obj/item/weapon/melee/energy))
+		user.show_message("<span class='notice'>You carve a face into the [src]!</span>", 1)
+		new /obj/item/clothing/head/helmet/hardhat/pumpkinhead (user.loc)
+		del(src)
+		return
+
+/obj/item/weapon/reagent_containers/food/snacks/grown/potato/attackby(obj/item/weapon/W as obj, mob/user as mob)
+	..()
+	if(istype(W, /obj/item/weapon/cable_coil))
+		if(W:amount >= 5)
+			W:amount -= 5
+			if(!W:amount) del(W)
+			user << "<span class='notice'>You add some cable to the potato and slide it inside the battery encasing.</span>"
+			new /obj/item/weapon/cell/potato(user.loc)
+			del(src)
+			return