Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13

code/modules/hydroponics/grown/apple.dm

@@ -15,7 +15,6 @@
 	genes = list(/datum/plant_gene/trait/repeated_harvest)
 	mutatelist = list(/obj/item/seeds/apple/gold)
 	reagents_add = list("vitamin" = 0.04, "nutriment" = 0.1)
-	juice_results = list("applejuice" = 0)
 
 /obj/item/reagent_containers/food/snacks/grown/apple
 	seed = /obj/item/seeds/apple
@@ -25,6 +24,7 @@
 	filling_color = "#FF4500"
 	bitesize = 100 // Always eat the apple in one bite
 	foodtype = FRUIT
+	juice_results = list("applejuice" = 0)
 
 // Posioned Apple
 /obj/item/seeds/apple/poisoned

code/modules/hydroponics/grown/banana.dm

@@ -13,7 +13,6 @@
 	genes = list(/datum/plant_gene/trait/slip, /datum/plant_gene/trait/repeated_harvest)
 	mutatelist = list(/obj/item/seeds/banana/mime, /obj/item/seeds/banana/bluespace)
 	reagents_add = list("banana" = 0.1, "potassium" = 0.1, "vitamin" = 0.04, "nutriment" = 0.02)
-	juice_results = list("banana" = 0)
 
 /obj/item/reagent_containers/food/snacks/grown/banana
 	seed = /obj/item/seeds/banana
@@ -25,6 +24,7 @@
 	filling_color = "#FFFF00"
 	bitesize = 5
 	foodtype = FRUIT
+	juice_results = list("banana" = 0)
 
 /obj/item/reagent_containers/food/snacks/grown/banana/suicide_act(mob/user)
 	user.visible_message("<span class='suicide'>[user] is aiming [src] at [user.p_them()]self! It looks like [user.p_theyre()] trying to commit suicide!</span>")

code/modules/hydroponics/grown/potato.dm

@@ -17,7 +17,6 @@
 	genes = list(/datum/plant_gene/trait/battery)
 	mutatelist = list(/obj/item/seeds/potato/sweet)
 	reagents_add = list("vitamin" = 0.04, "nutriment" = 0.1)
-	juice_results = list("potato" = 0)
 
 /obj/item/reagent_containers/food/snacks/grown/potato
 	seed = /obj/item/seeds/potato
@@ -27,6 +26,7 @@
 	filling_color = "#E9967A"
 	bitesize = 100
 	foodtype = VEGETABLES
+	juice_results = list("potato" = 0)
 
 
 /obj/item/reagent_containers/food/snacks/grown/potato/wedges