Merge branch '13124'

code/modules/hydroponics/grown/cannabis.dm

@@ -14,9 +14,7 @@
 	icon_dead = "cannabis-dead" // Same for the dead icon
 	genes = list(/datum/plant_gene/trait/repeated_harvest)
 	mutatelist = list(/obj/item/seeds/cannabis/rainbow,
-						/obj/item/seeds/cannabis/death,
+						/obj/item/seeds/cannabis/death)
-						/obj/item/seeds/cannabis/white,
-						/obj/item/seeds/cannabis/ultimate)
 	reagents_add = list(/datum/reagent/drug/space_drugs = 0.15, /datum/reagent/toxin/lipolicide = 0.35) // gives u the munchies
 
 
@@ -27,7 +25,7 @@
 	species = "megacannabis"
 	plantname = "Rainbow Weed"
 	product = /obj/item/reagent_containers/food/snacks/grown/cannabis/rainbow
-	mutatelist = list()
+	mutatelist = list(/obj/item/seeds/cannabis/ultimate)
 	reagents_add = list(/datum/reagent/toxin/mindbreaker = 0.15, /datum/reagent/toxin/lipolicide = 0.35)
 	rarity = 40
 
@@ -38,7 +36,7 @@
 	species = "blackcannabis"
 	plantname = "Deathweed"
 	product = /obj/item/reagent_containers/food/snacks/grown/cannabis/death
-	mutatelist = list()
+	mutatelist = list(/obj/item/seeds/cannabis/white)
 	reagents_add = list(/datum/reagent/toxin/cyanide = 0.35, /datum/reagent/drug/space_drugs = 0.15, /datum/reagent/toxin/lipolicide = 0.15)
 	rarity = 40
 

code/modules/hydroponics/grown/citrus.dm

@@ -33,26 +33,6 @@
 	filling_color = "#00FF00"
 	juice_results = list(/datum/reagent/consumable/limejuice = 0)
 
-// Electric Lime
-/obj/item/seeds/lime/electric
-	name = "pack of electric lime seeds"
-	desc = "Electrically sour seeds."
-	icon_state = "seed-electriclime"
-	species = "electric lime"
-	plantname = "Electric Lime Tree"
-	growing_icon = 'icons/obj/hydroponics/growing_fruits.dmi'
-	icon_grow = "lime-grow"
-	icon_dead = "lime-dead"
-	icon_harvest = "lime-harvest"
-	product = /obj/item/reagent_containers/food/snacks/grown/citrus/lime/electric
-	genes = list(/datum/plant_gene/trait/repeated_harvest, /datum/plant_gene/trait/cell_charge, /datum/plant_gene/trait/glow/green)
-
-/obj/item/reagent_containers/food/snacks/grown/citrus/lime/electric
-	seed = /obj/item/seeds/lime/electric
-	name = "electric lime"
-	desc = "It's so sour, you'll be shocked!"
-	icon_state = "electriclime"
-
 // Orange
 /obj/item/seeds/orange
 	name = "pack of orange seeds"

code/modules/hydroponics/grown/garlic.dm

@@ -9,6 +9,9 @@
 	potency = 25
 	growthstages = 3
 	growing_icon = 'icons/obj/hydroponics/growing_vegetables.dmi'
+	icon_grow = "garlic-grow" 
+	icon_harvest = "garlic-harvest"
+	icon_dead = "garlic-dead"
 	reagents_add = list(/datum/reagent/consumable/garlic = 0.15, /datum/reagent/consumable/nutriment = 0.1)
 
 /obj/item/reagent_containers/food/snacks/grown/garlic

code/modules/hydroponics/grown/grass_carpet.dm

@@ -51,6 +51,7 @@
 	icon_grow = "fairygrass-grow"
 	icon_dead = "fairygrass-dead"
 	genes = list(/datum/plant_gene/trait/repeated_harvest, /datum/plant_gene/trait/glow/blue)
+	mutatelist = list (/obj/item/seeds/grass/carpet)
 	reagents_add = list(/datum/reagent/consumable/nutriment = 0.02, /datum/reagent/hydrogen = 0.05, /datum/reagent/drug/space_drugs = 0.15)
 
 /obj/item/reagent_containers/food/snacks/grown/grass/fairy
@@ -99,7 +100,7 @@
 	species = "carpet"
 	plantname = "Carpet"
 	product = /obj/item/reagent_containers/food/snacks/grown/grass/carpet
-	mutatelist = list()
+	mutatelist = list(/obj/item/seeds/grass/fairy)
 	rarity = 10
 
 /obj/item/reagent_containers/food/snacks/grown/grass/carpet

code/modules/hydroponics/grown/tea_coffee.dm

@@ -44,7 +44,7 @@
 	filling_color = "#4582B4"
 	grind_results = list(/datum/reagent/toxin/teapowder = 0, /datum/reagent/medicine/salglu_solution = 0)
 
-// Kitty drugs
+// Catnip
 /obj/item/seeds/tea/catnip
 	name = "pack of catnip seeds"
 	icon_state = "seed-catnip"
@@ -52,6 +52,9 @@
 	species = "catnip"
 	plantname = "Catnip Plant"
 	growthstages = 3
+	icon_grow = "catnip-grow"
+	icon_harvest = "catnip-harvest"
+	icon_dead = "tea-dead"
 	product = /obj/item/reagent_containers/food/snacks/grown/tea/catnip
 	reagents_add = list(/datum/reagent/pax/catnip = 0.1, /datum/reagent/consumable/nutriment/vitamin = 0.06, /datum/reagent/toxin/teapowder = 0.3)
 	rarity = 50