initial commit

code/defines/obj/weapon.dm

@@ -51,8 +51,8 @@
 /obj/item/weapon/bananapeel
 	name = "banana peel"
 	desc = "A peel from a banana."
-	icon = 'icons/obj/items.dmi'
-	icon_state = "banana_peel"
+	icon = 'icons/obj/hydroponics/banana.dmi'
+	icon_state = "peel"
 	item_state = "banana_peel"
 	w_class = W_CLASS_TINY
 	throwforce = 0
@@ -67,8 +67,8 @@
 /obj/item/weapon/corncob
 	name = "corn cob"
 	desc = "A reminder of meals gone by."
-	icon = 'icons/obj/harvest.dmi'
-	icon_state = "corncob"
+	icon = 'icons/obj/hydroponics/corn.dmi'
+	icon_state = "cob"
 	item_state = "corncob"
 	w_class = W_CLASS_TINY
 	throwforce = 0

code/game/machinery/bees_apiary.dm

@@ -15,7 +15,7 @@ var/list/apiaries_list = list()
 
 /obj/machinery/apiary
 	name = "apiary tray"
-	icon = 'icons/obj/hydroponics.dmi'
+	icon = 'icons/obj/hydroponics/hydroponics.dmi'
 	icon_state = "hydrotray3"
 	density = 1
 	anchored = 1

code/game/objects/items/stacks/medical.dm

@@ -138,16 +138,16 @@
 	name = "\improper S'rendarr's Hand leaf"
 	singular_name = "S'rendarr's Hand leaf"
 	desc = "A poultice made of soft leaves that is rubbed on bruises."
-	icon = 'icons/obj/harvest.dmi'
-	icon_state = "cabbage"
+	icon = 'icons/obj/hydroponics/shand.dmi'
+	icon_state = "pack"
 	heal_brute = 5
 
 /obj/item/stack/medical/ointment/tajaran
 	name = "\improper Messa's Tear petals"
 	singular_name = "Messa's Tear petals"
 	desc = "A poultice made of cold, blue petals that is rubbed on burns."
-	icon = 'icons/obj/harvest.dmi'
-	icon_state = "ambrosiavulgaris"
+	icon = 'icons/obj/hydroponics/mtear.dmi'
+	icon_state = "pack"
 	heal_burn = 5
 
 

code/game/objects/items/toys.dm

@@ -540,8 +540,8 @@
 /obj/item/toy/waterflower
 	name = "Water Flower"
 	desc = "A seemingly innocent sunflower...with a twist."
-	icon = 'icons/obj/harvest.dmi'
-	icon_state = "sunflower"
+	icon = 'icons/obj/hydroponics/sunflower.dmi'
+	icon_state = "produce"
 	item_state = "sunflower"
 	var/empty = 0
 	flags = OPENCONTAINER

code/game/objects/items/weapons/grenades/clowngrenade.dm

@@ -55,8 +55,8 @@
 /obj/item/weapon/bananapeel/traitorpeel
 	name = "banana peel"
 	desc = "A peel from a banana."
-	icon = 'icons/obj/items.dmi'
-	icon_state = "banana_peel"
+	icon = 'icons/obj/hydroponics/banana.dmi'
+	icon_state = "peel"
 	item_state = "banana_peel"
 	w_class = W_CLASS_TINY
 	throwforce = 0

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

@@ -109,8 +109,8 @@
 	name = "potato battery"
 	desc = "A rechargeable starch based power cell."
 	origin_tech = Tc_POWERSTORAGE + "=1"
-	icon = 'icons/obj/power.dmi' //'icons/obj/harvest.dmi'
-	icon_state = "potato_cell" //"potato_battery"
+	icon = 'icons/obj/power.dmi'
+	icon_state = "potato_cell"
 	charge = 100
 	maxcharge = 300
 	starting_materials = null
@@ -169,8 +169,8 @@
 	name = "charged slime core"
 	desc = "A yellow slime core infused with plasma, it crackles with power."
 	origin_tech = Tc_POWERSTORAGE + "=2;" + Tc_BIOTECH + "=4"
-	icon = 'icons/mob/slimes.dmi' //'icons/obj/harvest.dmi'
-	icon_state = "yellow slime extract" //"potato_battery"
+	icon = 'icons/mob/slimes.dmi'
+	icon_state = "yellow slime extract"
 	maxcharge = 30000
 	starting_materials =  null
 	w_type = RECYK_BIOLOGICAL

code/game/objects/items/weapons/storage/bags.dm

@@ -175,7 +175,7 @@ obj/item/weapon/storage/bag/plasticbag/quick_store(var/obj/item/I)
 // -----------------------------
 
 /obj/item/weapon/storage/bag/plants
-	icon = 'icons/obj/hydroponics.dmi'
+	icon = 'icons/obj/hydroponics/hydroponics.dmi'
 	icon_state = "plantbag"
 	name = "Plant Bag"
 	storage_slots = 50; //the number of plant pieces it can carry.

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

@@ -123,8 +123,8 @@ Frequency:
 /obj/item/weapon/bananapeel/bluespace
 	name = "bluespace banana peel"
 	desc = "A peel from a bluespace banana."
-	icon = 'icons/obj/items.dmi'
-	icon_state = "bluespacebanana_peel"
+	icon = 'icons/obj/hydroponics/bluespacebanana.dmi'
+	icon_state = "peel"
 	item_state = "bluespacebanana_peel"
 
 /obj/item/weapon/bananapeel/bluespace/Crossed(AM as mob|obj)

code/game/objects/structures/flora/flora.dm

@@ -336,7 +336,7 @@
 /obj/structure/flora/pottedplant/claypot
 	name = "clay pot"
 	desc = "Plants placed in those stop aging, but cannot be retrieved either."
-	icon = 'icons/obj/hydroponics2.dmi'
+	icon = 'icons/obj/hydroponics/hydroponics.dmi'
 	icon_state = "claypot"
 	anchored = 0
 	density = FALSE

code/modules/hydroponics/grown_inedible.dm

@@ -4,7 +4,7 @@
 
 /obj/item/weapon/grown // Grown weapons
 	name = "grown_weapon"
-	icon = 'icons/obj/weapons.dmi'
+	icon = 'icons/obj/hydroponics/nettle.dmi'
 	var/plantname
 	var/potency = 1
 	var/fragrance = null
@@ -51,8 +51,8 @@
 /obj/item/weapon/grown/log
 	name = "tower-cap log"
 	desc = "It's better than bad, it's good!"
-	icon = 'icons/obj/harvest.dmi'
-	icon_state = "logs"
+	icon = 'icons/obj/hydroponics/towercap.dmi'
+	icon_state = "produce"
 	force = 5
 	flags = 0
 	throwforce = 5
@@ -82,8 +82,8 @@
 	plantname = "sunflowers"
 	name = "sunflower"
 	desc = "It's beautiful! A certain person might beat you to death if you trample these."
-	icon = 'icons/obj/harvest.dmi'
-	icon_state = "sunflower"
+	icon = 'icons/obj/hydroponics/sunflower.dmi'
+	icon_state = "produce"
 	damtype = "fire"
 	force = 0
 	flags = 0
@@ -102,8 +102,8 @@
 	plantname = "novaflowers"
 	name = "novaflower"
 	desc = "These beautiful flowers have a crisp smokey scent, like a summer bonfire."
-	icon = 'icons/obj/harvest.dmi'
-	icon_state = "novaflower"
+	icon = 'icons/obj/hydroponics/novaflower.dmi'
+	icon_state = "produce"
 	damtype = "fire"
 	force = 0
 	flags = 0
@@ -136,9 +136,9 @@
 /obj/item/weapon/grown/nettle // -- Skie
 	plantname = "nettle"
 	desc = "It's probably <B>not</B> wise to touch it with bare hands..."
-	icon = 'icons/obj/weapons.dmi'
+	icon = 'icons/obj/hydroponics/nettle.dmi'
 	name = "nettle"
-	icon_state = "nettle"
+	icon_state = "produce"
 	damtype = "fire"
 	force = 15
 	flags = 0
@@ -183,9 +183,9 @@
 /obj/item/weapon/grown/deathnettle // -- Skie
 	plantname = "deathnettle"
 	desc = "A glowing red nettle that incites rage in you just from looking at it."
-	icon = 'icons/obj/weapons.dmi'
+	icon = 'icons/obj/hydroponics/deathnettle.dmi'
 	name = "deathnettle"
-	icon_state = "deathnettle"
+	icon_state = "produce"
 	damtype = "fire"
 	force = 30
 	flags = 0
@@ -248,8 +248,8 @@
 /obj/item/weapon/corncob
 	name = "corn cob"
 	desc = "A reminder of meals gone by."
-	icon = 'icons/obj/harvest.dmi'
-	icon_state = "corncob"
+	icon = 'icons/obj/hydroponics/corn.dmi'
+	icon_state = "cob"
 	item_state = "corncob"
 	w_class = W_CLASS_SMALL
 	throwforce = 0

code/modules/hydroponics/hydro_tools.dm

@@ -258,7 +258,7 @@
 // *************************************
 
 /obj/item/weapon/plantspray
-	icon = 'icons/obj/hydroponics.dmi'
+	icon = 'icons/obj/hydroponics/hydroponics.dmi'
 	item_state = "spray"
 	flags = FPRINT | NO_ATTACK_MSG
 	slot_flags = SLOT_BELT
@@ -445,7 +445,7 @@
 /obj/item/claypot
 	name = "clay pot"
 	desc = "Plants placed in those stop aging, but cannot be retrieved either."
-	icon = 'icons/obj/hydroponics2.dmi'
+	icon = 'icons/obj/hydroponics/hydroponics.dmi'
 	icon_state = "claypot-item"
 	item_state = "claypot"
 	inhand_states = list("left_hand" = 'icons/mob/in-hand/left/misc_tools.dmi', "right_hand" = 'icons/mob/in-hand/right/misc_tools.dmi')

code/modules/hydroponics/hydro_tray.dm

@@ -1,6 +1,6 @@
 /obj/machinery/portable_atmospherics/hydroponics
 	name = "hydroponics tray"
-	icon = 'icons/obj/hydroponics.dmi'
+	icon = 'icons/obj/hydroponics/hydroponics.dmi'
 	icon_state = "hydrotray3"
 	anchored = 1
 	flags = OPENCONTAINER | PROXMOVE // PROXMOVE could be added and removed as necessary if it causes lag

code/modules/hydroponics/hydro_tray_process.dm

@@ -296,18 +296,18 @@
 	// Updates the plant overlay.
 	if(!isnull(seed))
 		if(draw_warnings && health <= (seed.endurance / 2))
-			overlays += image(seed.plant_dmi,"over_lowhealth3")
+			overlays += image('icons/obj/hydroponics/hydroponics.dmi',"over_lowhealth3")
 
 		if(dead)
-			overlays += image(seed.plant_dmi,"[seed.plant_icon]-dead")
+			overlays += image(seed.plant_dmi,"dead")
 		else if(harvest)
-			overlays += image(seed.plant_dmi,"[seed.plant_icon]-harvest")
+			overlays += image(seed.plant_dmi,"harvest")
 		else if(age < seed.maturation)
 			var/t_growthstate = max(1,round((age * seed.growth_stages) / seed.maturation))
-			overlays += image(seed.plant_dmi,"[seed.plant_icon]-grow[t_growthstate]")
+			overlays += image(seed.plant_dmi,"stage-[t_growthstate]")
 			lastproduce = age
 		else
-			overlays += image(seed.plant_dmi,"[seed.plant_icon]-grow[seed.growth_stages]")
+			overlays += image(seed.plant_dmi,"stage-[seed.growth_stages]")
 
 	//Draw the cover.
 	if(closed_system)

code/modules/hydroponics/hydroponics_mutations.dm

@@ -355,7 +355,7 @@
 					msg_admin_attack("a random chance hydroponics mutation has spawned space vines ([newseed.display_name]). <A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[T.x];Y=[T.y];Z=[T.z]'>(JMP)</a>")
 
 		if("change_appearance")
-			seed.randomize_icon(change_packet=0)
+			seed.randomize_icon()
 			update_icon()
 			visible_message("<span class='notice'>\The [seed.display_name] suddenly looks a little different.</span>")
 

code/modules/hydroponics/prehistoric_plants.dm

@@ -4,10 +4,9 @@
 	name = "telriis"
 	seed_name = "telriis"
 	display_name = "telriis grass"
+	plant_dmi = 'icons/obj/hydroponics/telriis.dmi'
 	products = list(/obj/item/weapon/reagent_containers/food/snacks/grown/telriis_clump)
 	mutants = null
-	packet_icon = "seed-telriis"
-	plant_icon = "telriis"
 	harvest_repeat = 1
 	chems = list(DIETHYLAMINE = list(0,10))
 
@@ -25,6 +24,7 @@
 /obj/item/weapon/reagent_containers/food/snacks/grown/telriis_clump
 	name = "telriis grass"
 	desc = "A clump of telriis grass, not recommended for consumption by sentients."
+	icon = 'icons/obj/hydroponics/telriis.dmi'
 	icon_state = "telriisclump"
 	plantname = "telriis"
 	hydroflags = HYDRO_PREHISTORIC
@@ -33,10 +33,9 @@
 	name = "thaadra"
 	seed_name = "thaadra"
 	display_name = "thaa'dra grass"
+	plant_dmi = 'icons/obj/hydroponics/thaadra.dmi'
 	products = list(/obj/item/weapon/reagent_containers/food/snacks/grown/thaadrabloom)
 	mutants = null
-	packet_icon = "seed-thaadra"
-	plant_icon = "thaadra"
 	harvest_repeat = 1
 	chems = list(FROSTOIL = list(5,30))
 
@@ -56,6 +55,7 @@
 /obj/item/weapon/reagent_containers/food/snacks/grown/thaadrabloom
 	name = "thaa'dra bloom"
 	desc = "Looks chewy, might be good to eat."
+	icon = 'icons/obj/hydroponics/thaadra.dmi'
 	icon_state = "thaadrabloom"
 	plantname = "thaadra"
 	hydroflags = HYDRO_PREHISTORIC
@@ -64,10 +64,9 @@
 	name = "jurlmah"
 	seed_name = "jurlmah"
 	display_name = "jurl'mah tree"
+	plant_dmi = 'icons/obj/hydroponics/jurlmah.dmi'
 	products = list(/obj/item/weapon/reagent_containers/food/snacks/grown/jurlmah)
 	mutants = null
-	packet_icon = "seed-jurlmah"
-	plant_icon = "jurlmah"
 	chems = list(CLONEXADONE = list(1,10))
 
 	lifespan = 25
@@ -88,6 +87,7 @@
 /obj/item/weapon/reagent_containers/food/snacks/grown/jurlmah
 	name = "jurl'mah pod"
 	desc = "Bulbous and veiny, it appears to pulse slightly as you look at it."
+	icon = 'icons/obj/hydroponics/jurlmah.dmi'
 	icon_state = "jurlmahpod"
 	plantname = "jurlmah"
 	hydroflags = HYDRO_PREHISTORIC
@@ -96,10 +96,9 @@
 	name = "amauri"
 	seed_name = "amauri"
 	display_name = "amauri stalks"
+	plant_dmi = 'icons/obj/hydroponics/amauri.dmi'
 	products = list(/obj/item/weapon/reagent_containers/food/snacks/grown/amauri)
 	mutants = null
-	packet_icon = "seed-amauri"
-	plant_icon = "amauri"
 	chems = list(POTASSIUM = list(0,10),SUGAR = list(0,10),PHOSPHORUS = list(0,10))
 
 	lifespan = 25
@@ -121,6 +120,7 @@
 /obj/item/weapon/reagent_containers/food/snacks/grown/amauri
 	name = "amauri fruit"
 	desc = "It is small, round and hard. Its skin is a thick dark purple."
+	icon = 'icons/obj/hydroponics/amauri.dmi'
 	icon_state = "amaurifruit"
 	plantname = "amauri"
 	flags = NOREACT
@@ -130,10 +130,9 @@
 	name = "gelthi"
 	seed_name = "gelthi"
 	display_name = "gelthi stem"
+	plant_dmi = 'icons/obj/hydroponics/gelthi.dmi'
 	products = list(/obj/item/weapon/reagent_containers/food/snacks/grown/gelthi)
 	mutants = null
-	packet_icon = "seed-gelthi"
-	plant_icon = "gelthi"
 	harvest_repeat = 2
 	chems = list(NUTRIMENT = list(1,10))
 
@@ -153,6 +152,7 @@
 /obj/item/weapon/reagent_containers/food/snacks/grown/gelthi
 	name = "gelthi berries"
 	desc = "They feel fluffy and slightly warm to the touch."
+	icon = 'icons/obj/hydroponics/gelthi.dmi'
 	icon_state = "gelthiberries"
 	gender = PLURAL
 	plantname = "gelthi"
@@ -162,10 +162,9 @@
 	name = "vale"
 	seed_name = "vale"
 	display_name = "vale tree"
+	plant_dmi = 'icons/obj/hydroponics/vale.dmi'
 	products = list(/obj/item/weapon/reagent_containers/food/snacks/grown/vale)
 	mutants = null
-	packet_icon = "seed-vale"
-	plant_icon = "vale"
 	harvest_repeat = 1
 	chems = list(NUTRIMENT = list(1,10),SPORTDRINK = list(0,2),THYMOL = list(0,5))
 
@@ -185,6 +184,7 @@
 /obj/item/weapon/reagent_containers/food/snacks/grown/vale
 	name = "vale leaves"
 	desc = "Small, curly leaves covered in a soft pale fur."
+	icon = 'icons/obj/hydroponics/vale.dmi'
 	icon_state = "valeleaves"
 	plantname = "vale"
 	hydroflags = HYDRO_PREHISTORIC
@@ -194,10 +194,9 @@
 	name = "surik"
 	seed_name = "surik"
 	display_name = "surik stalks"
+	plant_dmi = 'icons/obj/hydroponics/surik.dmi'
 	products = list(/obj/item/weapon/reagent_containers/food/snacks/grown/surik)
 	mutants = null
-	packet_icon = "seed-surik"
-	plant_icon = "surik"
 	harvest_repeat = 1
 	chems = list(KARMOTRINE = list(2,2))
 
@@ -217,6 +216,7 @@
 /obj/item/weapon/reagent_containers/food/snacks/grown/surik
 	name = "surik fruit"
 	desc = "Multiple layers of blue skin peeling away to reveal a spongey core, vaguely resembling an ear."
+	icon = 'icons/obj/hydroponics/surik.dmi'
 	icon_state = "surikfruit"
 	plantname = "surik"
 	hydroflags = HYDRO_PREHISTORIC

code/modules/hydroponics/seed_datums.dm

@@ -58,7 +58,7 @@ var/global/list/gene_tag_masks = list()   // Gene obfuscation for delicious tria
 	var/juicy = 0					// 0 = no, 1 = splatters when thrown, 2 = slips
 
 	// Cosmetics.
-	var/plant_dmi = 'icons/obj/hydroponics.dmi'// DMI  to use for the plant growing in the tray.
+	var/plant_dmi = 'icons/obj/hydroponics/apple.dmi'// DMI  to use for the plant growing in the tray.
 	var/plant_icon                  // Icon to use for the plant growing in the tray.
 	var/packet_icon = "seed"        // Icon to use for physical seed packet item.
 	var/biolum                      // Plant is bioluminescent.
@@ -69,6 +69,9 @@ var/global/list/gene_tag_masks = list()   // Gene obfuscation for delicious tria
 
 	var/large = 1					// Is the plant large? For clay pots.
 
+/datum/seed/New()
+	..()
+
 //Creates a random seed. MAKE SURE THE LINE HAS DIVERGED BEFORE THIS IS CALLED.
 /datum/seed/proc/randomize()
 
@@ -239,75 +242,74 @@ var/global/list/gene_tag_masks = list()   // Gene obfuscation for delicious tria
 	return 1
 
 //Gives the plant a new, random icon from a list, with matching growth stages number.
-/datum/seed/proc/randomize_icon(var/change_packet = 1)
+/datum/seed/proc/randomize_icon()
 	var/list/plant_icons = pick(list(
-		list("seed-chili",              "chili",				6),
-		list("seed-icepepper",          "chiliice",				6),
-		list("seed-berry",              "berry",				6),
-		list("seed-glowberry",          "glowberry",			6),
-		list("seed-poisonberry",        "poisonberry",			6),
-		list("seed-deathberry",         "deathberry",			6),
-		list("seed-nettle",             "nettle",				6),
-		list("seed-deathnettle",        "deathnettle",			6),
-		list("seed-tomato",             "tomato",				6),
-		list("seed-bloodtomato",        "bloodtomato",			6),
-		list("seed-killertomato",       "killertomato",			2),
-		list("seed-bluetomato",         "bluetomato",			6),
-		list("seed-bluespacetomato",    "bluespacetomato",		6),
-		list("seed-eggplant",           "eggplant",				6),
-		list("seed-eggy",               "eggy",					6),
-		list("seed-apple",              "apple",				6),
-		list("seed-goldapple",          "goldapple",			6),
-		list("seed-ambrosiavulgaris",   "ambrosiavulgaris",		6),
-		list("seed-ambrosiadeus",       "ambrosiadeus",			6),
-		list("mycelium-chanter",        "chanter",				3),
-		list("mycelium-plump",          "plump",				3),
-		list("mycelium-reishi",         "reishi",				4),
-		list("mycelium-liberty",        "liberty",				3),
-		list("mycelium-amanita",        "amanita",				3),
-		list("mycelium-angel",          "angel",				3),
-		list("mycelium-tower",          "towercap",				3),
-		list("mycelium-glowshroom",     "glowshroom",			4),
-		list("mycelium-walkingmushroom","walkingmushroom",		3),
-		list("mycelium-plast",          "plastellium",			3),
-		list("seed-harebell",           "harebell",				4),
-		list("seed-poppy",              "poppy",				3),
-		list("seed-sunflower",          "sunflower",			3),
-		list("seed-moonflower",         "moonflower",			3),
-		list("seed-novaflower",         "novaflower",			3),
-		list("seed-grapes",             "grape",				2),
-		list("seed-greengrapes",        "greengrape",			2),
-		list("seed-peanut",             "peanut",				6),
-		list("seed-cabbage",            "cabbage",				1),
-		list("seed-shand",              "shand",				3),
-		list("seed-mtear",              "mtear",				4),
-		list("seed-banana",             "banana",				6),
-		list("seed-corn",               "corn",					3),
-		list("seed-potato",             "potato",				4),
-		list("seed-soybean",            "soybean",				6),
-		list("seed-koibean",            "soybean",				6),
-		list("seed-wheat",              "wheat",				6),
-		list("seed-rice",               "rice",					4),
-		list("seed-carrot",             "carrot",				3),
-		list("seed-ambrosiavulgaris",   "weeds",				4),
-		list("seed-whitebeet",          "whitebeet",			6),
-		list("seed-sugarcane",          "sugarcane",			3),
-		list("seed-watermelon",         "watermelon",			6),
-		list("seed-pumpkin",            "pumpkin",				2),
-		list("seed-lime",               "lime",					6),
-		list("seed-lemon",              "lemon",				6),
-		list("seed-orange",             "orange",				6),
-		list("seed-grass",              "grass",				2),
-		list("seed-cocoapod",           "cocoapod",				5),
-		list("seed-cherry",             "cherry",				5),
-		list("seed-kudzu",              "kudzu",				4),
-		list("seed-pear",               "pear", 				6),
+		list('icons/obj/hydroponics/chili.dmi',				6),
+		list('icons/obj/hydroponics/chiliice.dmi',			6),
+		list('icons/obj/hydroponics/berry.dmi',				6),
+		list('icons/obj/hydroponics/glowberry.dmi',			6),
+		list('icons/obj/hydroponics/poisonberry.dmi',			6),
+		list('icons/obj/hydroponics/deathberry.dmi',			6),
+		list('icons/obj/hydroponics/nettle.dmi',				6),
+		list('icons/obj/hydroponics/deathnettle.dmi',			6),
+		list('icons/obj/hydroponics/tomato.dmi',				6),
+		list('icons/obj/hydroponics/bloodtomato.dmi',			6),
+		list('icons/obj/hydroponics/killertomato.dmi',		2),
+		list('icons/obj/hydroponics/bluetomato.dmi',			6),
+		list('icons/obj/hydroponics/bluespacetomato.dmi',		6),
+		list('icons/obj/hydroponics/eggplant.dmi',			6),
+		list('icons/obj/hydroponics/eggy.dmi',				6),
+		list('icons/obj/hydroponics/apple.dmi',				6),
+		list('icons/obj/hydroponics/goldapple.dmi',			6),
+		list('icons/obj/hydroponics/ambrosiavulgaris.dmi',	6),
+		list('icons/obj/hydroponics/ambrosiadeus.dmi',		6),
+		list('icons/obj/hydroponics/chanter.dmi',				3),
+		list('icons/obj/hydroponics/plump.dmi',				3),
+		list('icons/obj/hydroponics/reishi.dmi',				4),
+		list('icons/obj/hydroponics/liberty.dmi',				3),
+		list('icons/obj/hydroponics/amanita.dmi',				3),
+		list('icons/obj/hydroponics/angel.dmi',				3),
+		list('icons/obj/hydroponics/towercap.dmi',			3),
+		list('icons/obj/hydroponics/glowshroom.dmi',			4),
+		list('icons/obj/hydroponics/walkingmushroom.dmi',		3),
+		list('icons/obj/hydroponics/plastellium.dmi',		3),
+		list('icons/obj/hydroponics/harebell.dmi',				4),
+		list('icons/obj/hydroponics/poppy.dmi',				3),
+		list('icons/obj/hydroponics/sunflower.dmi',			3),
+		list('icons/obj/hydroponics/moonflower.dmi',			3),
+		list('icons/obj/hydroponics/novaflower.dmi',			3),
+		list('icons/obj/hydroponics/grape.dmi',				2),
+		list('icons/obj/hydroponics/greengrape.dmi',			2),
+		list('icons/obj/hydroponics/peanut.dmi',				6),
+		list('icons/obj/hydroponics/cabbage.dmi',				1),
+		list('icons/obj/hydroponics/shand.dmi',				3),
+		list('icons/obj/hydroponics/mtear.dmi',				4),
+		list('icons/obj/hydroponics/banana.dmi',				6),
+		list('icons/obj/hydroponics/corn.dmi',					3),
+		list('icons/obj/hydroponics/potato.dmi',				4),
+		list('icons/obj/hydroponics/soybean.dmi',				6),
+		list('icons/obj/hydroponics/soybean.dmi',				6),
+		list('icons/obj/hydroponics/wheat.dmi',				6),
+		list('icons/obj/hydroponics/rice.dmi',					4),
+		list('icons/obj/hydroponics/carrot.dmi',				3),
+		list('icons/obj/hydroponics/weeds.dmi',				4),
+		list('icons/obj/hydroponics/whitebeet.dmi',			6),
+		list('icons/obj/hydroponics/sugarcane.dmi',			3),
+		list('icons/obj/hydroponics/watermelon.dmi',			6),
+		list('icons/obj/hydroponics/pumpkin.dmi',				2),
+		list('icons/obj/hydroponics/lime.dmi',					6),
+		list('icons/obj/hydroponics/lemon.dmi',				6),
+		list('icons/obj/hydroponics/orange.dmi',				6),
+		list('icons/obj/hydroponics/grass.dmi',				2),
+		list('icons/obj/hydroponics/cocoapod.dmi',				5),
+		list('icons/obj/hydroponics/cherry.dmi',				5),
+		list('icons/obj/hydroponics/kudzu.dmi',				4),
+		list('icons/obj/hydroponics/pear.dmi', 				6),
 		))
+	
+	plant_dmi = plant_icons[1]
+	growth_stages = plant_icons[2]
 
-	if (change_packet)
-		packet_icon = plant_icons[1]
-	plant_icon = plant_icons[2]
-	growth_stages = plant_icons[3]
 
 //Random mutations moved to hydroponics_mutations.dm!
 

code/modules/hydroponics/seed_extractor.dm

@@ -1,7 +1,7 @@
 /obj/machinery/seed_extractor
 	name = "seed extractor"
 	desc = "Extracts and bags seeds from produce."
-	icon = 'icons/obj/hydroponics.dmi'
+	icon = 'icons/obj/hydroponics/hydroponics.dmi'
 	icon_state = "sextractor"
 	density = 1
 	anchored = 1

code/modules/hydroponics/seed_machines.dm

@@ -22,7 +22,7 @@
 			genesource = "unknown"
 
 /obj/machinery/botany
-	icon = 'icons/obj/hydroponics.dmi'
+	icon = 'icons/obj/hydroponics/hydroponics.dmi'
 	icon_state = "hydrotray3"
 	density = 1
 	anchored = 1

code/modules/hydroponics/seeds.dm

@@ -1,7 +1,7 @@
 //Seed packet object/procs.
 /obj/item/seeds
 	name = "packet of seeds"
-	icon = 'icons/obj/seeds.dmi'
+	icon = 'icons/obj/hydroponics/seeds.dmi'
 	icon_state = "seed"
 	flags = FPRINT
 	w_class = W_CLASS_SMALL
@@ -31,7 +31,8 @@
 /obj/item/seeds/proc/update_appearance()
 	if(!seed)
 		return
-	icon_state = seed.packet_icon
+	icon = seed.plant_dmi
+	icon_state = "seed"
 	src.name = "packet of [seed.seed_name] [seed.seed_noun]"
 	src.desc = "It has a picture of [seed.display_name] on the front."
 
@@ -459,12 +460,12 @@
 	desc = "The pit of an avocado."
 	seed_type = "avocado"
 	vending_cat = "fruits"
-	icon_state = "avocado_pit"
+	icon_state = "pit"
 
 /obj/item/seeds/avocadoseed/whole/update_appearance()
 	if(!seed)
 		return
-	icon_state = "avocado_pit"
+	icon_state = "pit"
 
 /obj/item/seeds/pearseed
 	name = "packet of pear seeds"
@@ -484,11 +485,10 @@
 	name = "chili"
 	seed_name = "chili"
 	display_name = "chili plants"
+	plant_dmi = 'icons/obj/hydroponics/chili.dmi'
 	products = list(/obj/item/weapon/reagent_containers/food/snacks/grown/chili)
 	chems = list(CAPSAICIN = list(3,5), NUTRIMENT = list(1,25))
 	mutants = list("icechili", "ghostpepper")
-	packet_icon = "seed-chili"
-	plant_icon = "chili"
 	harvest_repeat = 1
 
 	lifespan = 20
@@ -503,11 +503,10 @@
 	name = "icechili"
 	seed_name = "chilly pepper"
 	display_name = "chilly pepper plants"
+	plant_dmi = 'icons/obj/hydroponics/chiliice.dmi'
 	mutants = null
 	products = list(/obj/item/weapon/reagent_containers/food/snacks/grown/icepepper)
 	chems = list(FROSTOIL = list(3,5), NUTRIMENT = list(1,50))
-	packet_icon = "seed-icepepper"
-	plant_icon = "chiliice"
 
 	maturation = 4
 	production = 4
@@ -516,11 +515,10 @@
 	name = "ghostpepper"
 	seed_name = "ghostpepper"
 	display_name = "ghost pepper plants"
+	plant_dmi = 'icons/obj/hydroponics/chilighost.dmi'
 	mutants = null
 	products = list(/obj/item/weapon/reagent_containers/food/snacks/grown/ghostpepper)
 	chems = list(CONDENSEDCAPSAICIN = list(3,4), CURARE = list(0,40))
-	packet_icon = "seed-ghostpepper"
-	plant_icon = "chilighost"
 
 	production = 3
 
@@ -529,10 +527,9 @@
 	name = "berries"
 	seed_name = "berry"
 	display_name = "berry bush"
+	plant_dmi = 'icons/obj/hydroponics/berry.dmi'
 	products = list(/obj/item/weapon/reagent_containers/food/snacks/grown/berries)
 	mutants = list("glowberries","poisonberries")
-	packet_icon = "seed-berry"
-	plant_icon = "berry"
 	harvest_repeat = 1
 	chems = list(NUTRIMENT = list(1,10))
 
@@ -548,10 +545,9 @@
 	name = "glowberries"
 	seed_name = "glowberry"
 	display_name = "glowberry bush"
+	plant_dmi = 'icons/obj/hydroponics/glowberry.dmi'
 	products = list(/obj/item/weapon/reagent_containers/food/snacks/grown/glowberries)
 	mutants = null
-	packet_icon = "seed-glowberry"
-	plant_icon = "glowberry"
 	chems = list(NUTRIMENT = list(1,10), URANIUM = list(3,5))
 
 	lifespan = 30
@@ -568,20 +564,18 @@
 	name = "poisonberries"
 	seed_name = "poison berry"
 	display_name = "poison berry bush"
+	plant_dmi = 'icons/obj/hydroponics/poisonberry.dmi'
 	products = list(/obj/item/weapon/reagent_containers/food/snacks/grown/poisonberries)
 	mutants = list("deathberries")
-	packet_icon = "seed-poisonberry"
-	plant_icon = "poisonberry"
 	chems = list(NUTRIMENT = list(1), SOLANINE = list(3,5))
 
 /datum/seed/berry/poison/death
 	name = "deathberries"
 	seed_name = "death berry"
 	display_name = "death berry bush"
+	plant_dmi = 'icons/obj/hydroponics/deathberry.dmi'
 	mutants = null
 	products = list(/obj/item/weapon/reagent_containers/food/snacks/grown/deathberries)
-	packet_icon = "seed-deathberry"
-	plant_icon = "deathberry"
 	chems = list(NUTRIMENT = list(1), SOLANINE = list(3,3), CORIAMYRTIN = list(1,5))
 
 	yield = 3
@@ -592,10 +586,9 @@
 	name = "nettle"
 	seed_name = "nettle"
 	display_name = "nettles"
+	plant_dmi = 'icons/obj/hydroponics/nettle.dmi'
 	products = list(/obj/item/weapon/grown/nettle)
 	mutants = list("deathnettle")
-	packet_icon = "seed-nettle"
-	plant_icon = "nettle"
 	harvest_repeat = 1
 	chems = list(NUTRIMENT = list(1,50), FORMIC_ACID = list(0,1))
 	lifespan = 30
@@ -609,10 +602,9 @@
 	name = "deathnettle"
 	seed_name = "death nettle"
 	display_name = "death nettles"
+	plant_dmi = 'icons/obj/hydroponics/deathnettle.dmi'
 	products = list(/obj/item/weapon/grown/deathnettle)
 	mutants = null
-	packet_icon = "seed-deathnettle"
-	plant_icon = "deathnettle"
 	chems = list(NUTRIMENT = list(1,50), PHENOL = list(0,1))
 
 	maturation = 8
@@ -623,10 +615,9 @@
 	name = "tomato"
 	seed_name = "tomato"
 	display_name = "tomato plant"
+	plant_dmi = 'icons/obj/hydroponics/tomato.dmi'
 	products = list(/obj/item/weapon/reagent_containers/food/snacks/grown/tomato)
 	mutants = list("bluetomato","bloodtomato")
-	packet_icon = "seed-tomato"
-	plant_icon = "tomato"
 	harvest_repeat = 1
 	chems = list(NUTRIMENT = list(1,10))
 
@@ -646,10 +637,9 @@
 	name = "bloodtomato"
 	seed_name = "blood tomato"
 	display_name = "blood tomato plant"
+	plant_dmi = 'icons/obj/hydroponics/bloodtomato.dmi'
 	products = list(/obj/item/weapon/reagent_containers/food/snacks/grown/bloodtomato)
 	mutants = list("killertomato")
-	packet_icon = "seed-bloodtomato"
-	plant_icon = "bloodtomato"
 	chems = list(NUTRIMENT = list(1,10), BLOOD = list(10,2))
 	yield = 1
 	splat_type = /obj/effect/decal/cleanable/blood/splatter
@@ -658,10 +648,9 @@
 	name = "killertomato"
 	seed_name = "killer tomato"
 	display_name = "killer tomato plant"
+	plant_dmi = 'icons/obj/hydroponics/killertomato.dmi'
 	products = list(/obj/item/weapon/reagent_containers/food/snacks/grown/killertomato)
 	mutants = null
-	packet_icon = "seed-killertomato"
-	plant_icon = "killertomato"
 
 	yield = 2
 	growth_stages = 2
@@ -671,10 +660,9 @@
 	name = "bluetomato"
 	seed_name = "blue tomato"
 	display_name = "blue tomato plant"
+	plant_dmi = 'icons/obj/hydroponics/bluetomato.dmi'
 	products = list(/obj/item/weapon/reagent_containers/food/snacks/grown/bluetomato)
 	mutants = list("bluespacetomato")
-	packet_icon = "seed-bluetomato"
-	plant_icon = "bluetomato"
 	chems = list(NUTRIMENT = list(1,20), LUBE = list(1,5))
 	splat_type = /obj/effect/decal/cleanable/blood/oil
 
@@ -682,10 +670,9 @@
 	name = "bluespacetomato"
 	seed_name = "bluespace tomato"
 	display_name = "bluespace tomato plant"
+	plant_dmi = 'icons/obj/hydroponics/bluespacetomato.dmi'
 	products = list(/obj/item/weapon/reagent_containers/food/snacks/grown/bluespacetomato)
 	mutants = null
-	packet_icon = "seed-bluespacetomato"
-	plant_icon = "bluespacetomato"
 	chems = list(NUTRIMENT = list(1,20), SINGULO = list(1,5))
 	teleporting = 1
 
@@ -694,10 +681,9 @@
 	name = "eggplant"
 	seed_name = "eggplant"
 	display_name = "eggplants"
+	plant_dmi = 'icons/obj/hydroponics/eggplant.dmi'
 	products = list(/obj/item/weapon/reagent_containers/food/snacks/grown/eggplant)
 	mutants = list("realeggplant")
-	packet_icon = "seed-eggplant"
-	plant_icon = "eggplant"
 	harvest_repeat = 1
 	chems = list(NUTRIMENT = list(1,10))
 
@@ -713,10 +699,9 @@
 	name = "realeggplant"
 	seed_name = "egg-plant"
 	display_name = "egg-plants"
+	plant_dmi = 'icons/obj/hydroponics/eggy.dmi'
 	products = list(/obj/item/weapon/reagent_containers/food/snacks/egg)
 	mutants = null
-	packet_icon = "seed-eggy"
-	plant_icon = "eggy"
 
 	lifespan = 75
 	production = 12
@@ -727,10 +712,9 @@
 	name = "apple"
 	seed_name = "apple"
 	display_name = "apple tree"
+	plant_dmi = 'icons/obj/hydroponics/apple.dmi'
 	products = list(/obj/item/weapon/reagent_containers/food/snacks/grown/apple)
 	mutants = list("poisonapple","goldapple")
-	packet_icon = "seed-apple"
-	plant_icon = "apple"
 	harvest_repeat = 1
 	chems = list(NUTRIMENT = list(1,10))
 
@@ -752,10 +736,9 @@
 	name = "goldapple"
 	seed_name = "golden apple"
 	display_name = "gold apple tree"
+	plant_dmi = 'icons/obj/hydroponics/goldapple.dmi'
 	products = list(/obj/item/weapon/reagent_containers/food/snacks/grown/goldapple)
 	mutants = null
-	packet_icon = "seed-goldapple"
-	plant_icon = "goldapple"
 	chems = list(NUTRIMENT = list(1,10), GOLD = list(1,5))
 
 	maturation = 10
@@ -767,10 +750,9 @@
 	name = "ambrosia"
 	seed_name = "ambrosia vulgaris"
 	display_name = "ambrosia vulgaris"
+	plant_dmi = 'icons/obj/hydroponics/ambrosiavulgaris.dmi'
 	products = list(/obj/item/weapon/reagent_containers/food/snacks/grown/ambrosiavulgaris)
 	mutants = list("ambrosiadeus")
-	packet_icon = "seed-ambrosiavulgaris"
-	plant_icon = "ambrosiavulgaris"
 	harvest_repeat = 1
 	chems = list(NUTRIMENT = list(1), MESCALINE = list(1,8), TANNIC_ACID = list(1,8,1), OPIUM = list(1,10,1), SOLANINE = list(1,5))
 
@@ -786,8 +768,6 @@
 /datum/seed/ambrosia/cruciatus
 	name = "ambrosiacruciatus"
 	seed_name = "ambrosia vulgaris"
-	packet_icon = "seed-ambrosiavulgaris"
-	plant_icon = "ambrosiavulgaris"
 	products = list(/obj/item/weapon/reagent_containers/food/snacks/grown/ambrosiavulgaris/cruciatus)
 	mutants = null
 	lifespan = 60
@@ -803,10 +783,9 @@
 	name = "ambrosiadeus"
 	seed_name = "ambrosia deus"
 	display_name = "ambrosia deus"
+	plant_dmi = 'icons/obj/hydroponics/ambrosiadeus.dmi'
 	products = list(/obj/item/weapon/reagent_containers/food/snacks/grown/ambrosiavulgaris/deus)
 	mutants = null
-	packet_icon = "seed-ambrosiadeus"
-	plant_icon = "ambrosiadeus"
 	chems = list(NUTRIMENT = list(1), OPIUM = list(1,8), CYTISINE = list(1), COCAINE = list(1,10,1), MESCALINE = list(1,10))
 
 //Mushrooms/varieties.
@@ -815,10 +794,9 @@
 	seed_name = "chanterelle"
 	seed_noun = "spores"
 	display_name = "chanterelle mushrooms"
+	plant_dmi = 'icons/obj/hydroponics/chanter.dmi'
 	products = list(/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/chanterelle)
 	mutants = list("reishi","amanita","plumphelmet")
-	packet_icon = "mycelium-chanter"
-	plant_icon = "chanter"
 	chems = list(NUTRIMENT = list(1,25))
 
 	lifespan = 35
@@ -835,10 +813,10 @@
 	name = "mold"
 	seed_name = "brown mold"
 	display_name = "brown mold"
+	plant_dmi = "icons/obj/hydroponics/mold.dmi"
 	products = null
 	mutants = null
 	//mutants = list("wallrot") //TBD.
-	plant_icon = "mold"
 
 	lifespan = 50
 	maturation = 10
@@ -848,10 +826,9 @@
 	name = "plumphelmet"
 	seed_name = "plump helmet"
 	display_name = "plump helmet mushrooms"
+	plant_dmi = 'icons/obj/hydroponics/plump.dmi'
 	products = list(/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/plumphelmet)
 	mutants = list("walkingmushroom","towercap")
-	packet_icon = "mycelium-plump"
-	plant_icon = "plump"
 	chems = list(NUTRIMENT = list(2,10))
 
 	lifespan = 25
@@ -863,10 +840,9 @@
 	name = "reishi"
 	seed_name = "reishi"
 	display_name = "reishi"
+	plant_dmi = 'icons/obj/hydroponics/reishi.dmi'
 	products = list(/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/reishi)
 	mutants = list("libertycap","glowshroom")
-	packet_icon = "mycelium-reishi"
-	plant_icon = "reishi"
 	chems = list(NUTRIMENT = list(1), VALERENIC_ACID = list(3,3), MESCALINE = list(1,25))
 
 	maturation = 10
@@ -879,10 +855,9 @@
 	name = "libertycap"
 	seed_name = "liberty cap"
 	display_name = "liberty cap mushrooms"
+	plant_dmi = 'icons/obj/hydroponics/liberty.dmi'
 	products = list(/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/libertycap)
 	mutants = null
-	packet_icon = "mycelium-liberty"
-	plant_icon = "liberty"
 	chems = list(NUTRIMENT = list(1,50), PSILOCYBIN = list(3,5))
 
 	lifespan = 25
@@ -894,10 +869,9 @@
 	name = "amanita"
 	seed_name = "fly amanita"
 	display_name = "fly amanita mushrooms"
+	plant_dmi = 'icons/obj/hydroponics/amanita.dmi'
 	products = list(/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/amanita)
 	mutants = list("destroyingangel","plastic")
-	packet_icon = "mycelium-amanita"
-	plant_icon = "amanita"
 	chems = list(NUTRIMENT = list(1), AMATOXIN = list(3,3), PSILOCYBIN = list(1,25))
 
 	lifespan = 50
@@ -910,10 +884,9 @@
 	name = "destroyingangel"
 	seed_name = "destroying angel"
 	display_name = "destroying angel mushrooms"
+	plant_dmi = 'icons/obj/hydroponics/angel.dmi'
 	mutants = null
 	products = list(/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/angel)
-	packet_icon = "mycelium-angel"
-	plant_icon = "angel"
 	chems = list(NUTRIMENT = list(1,50), AMANATIN = list(1,3))
 
 	maturation = 12
@@ -924,10 +897,9 @@
 	name = "towercap"
 	seed_name = "tower cap"
 	display_name = "tower caps"
+	plant_dmi = 'icons/obj/hydroponics/towercap.dmi'
 	mutants = null
 	products = list(/obj/item/weapon/grown/log)
-	packet_icon = "mycelium-tower"
-	plant_icon = "towercap"
 
 	lifespan = 80
 	maturation = 15
@@ -937,10 +909,9 @@
 	name = "glowshroom"
 	seed_name = "glowshroom"
 	display_name = "glowshrooms"
+	plant_dmi = 'icons/obj/hydroponics/glowshroom.dmi'
 	products = list(/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/glowshroom)
 	mutants = null
-	packet_icon = "mycelium-glowshroom"
-	plant_icon = "glowshroom"
 	chems = list(RADIUM = list(1,20))
 
 	lifespan = 120
@@ -955,10 +926,9 @@
 	name = "walkingmushroom"
 	seed_name = "walking mushroom"
 	display_name = "walking mushrooms"
+	plant_dmi = 'icons/obj/hydroponics/walkingmushroom.dmi'
 	products = list(/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/walkingmushroom)
 	mutants = null
-	packet_icon = "mycelium-walkingmushroom"
-	plant_icon = "walkingmushroom"
 	chems = list(NUTRIMENT = list(2,10))
 
 	lifespan = 30
@@ -971,10 +941,9 @@
 	name = "plastic"
 	seed_name = "plastellium"
 	display_name = "plastellium"
+	plant_dmi = 'icons/obj/hydroponics/plastellium.dmi'
 	products = list(/obj/item/weapon/reagent_containers/food/snacks/grown/plastellium)
 	mutants = null
-	packet_icon = "mycelium-plast"
-	plant_icon = "plastellium"
 	chems = list(PLASTICIDE = list(3,12))
 
 	lifespan = 15
@@ -988,9 +957,8 @@
 	name = "harebells"
 	seed_name = "harebell"
 	display_name = "harebells"
+	plant_dmi = 'icons/obj/hydroponics/harebell.dmi'
 	products = list(/obj/item/weapon/reagent_containers/food/snacks/grown/harebell)
-	packet_icon = "seed-harebell"
-	plant_icon = "harebell"
 	chems = list(NUTRIMENT = list(1,20))
 
 	lifespan = 100
@@ -1004,9 +972,8 @@
 	name = "poppies"
 	seed_name = "poppy"
 	display_name = "poppies"
-	packet_icon = "seed-poppy"
+	plant_dmi = 'icons/obj/hydroponics/poppy.dmi'
 	products = list(/obj/item/weapon/reagent_containers/food/snacks/grown/poppy)
-	plant_icon = "poppy"
 	chems = list(NUTRIMENT = list(1,20), OPIUM = list(1,10))
 
 	lifespan = 25
@@ -1025,10 +992,9 @@
 	name = "sunflowers"
 	seed_name = "sunflower"
 	display_name = "sunflowers"
-	packet_icon = "seed-sunflower"
+	plant_dmi = 'icons/obj/hydroponics/sunflower.dmi'
 	products = list(/obj/item/weapon/grown/sunflower)
 	mutants = list("moonflowers","novaflowers")
-	plant_icon = "sunflower"
 
 	lifespan = 25
 	maturation = 6
@@ -1042,10 +1008,9 @@
 	name = "moonflowers"
 	seed_name = "moonflower"
 	display_name = "moonflowers"
-	packet_icon = "seed-moonflower"
+	plant_dmi = 'icons/obj/hydroponics/moonflower.dmi'
 	products = list(/obj/item/weapon/reagent_containers/food/snacks/grown/moonflower)
 	mutants = null
-	plant_icon = "moonflower"
 	chems = list(NUTRIMENT = list(1), MOONSHINE = list(1,5))
 
 	lifespan = 25
@@ -1061,11 +1026,9 @@
 	name = "novaflowers"
 	seed_name = "novaflower"
 	display_name = "novaflowers"
-	packet_icon = "seed-novaflower"
+	plant_dmi = 'icons/obj/hydroponics/novaflower.dmi'
 	products = list(/obj/item/weapon/grown/novaflower)
 	mutants = null
-	plant_dmi = 'icons/obj/hydroponics2.dmi'
-	plant_icon = "novaflower"
 	chems = list(NUTRIMENT = list(1), CAPSAICIN = list(1,5))
 
 	lifespan = 25
@@ -1082,10 +1045,9 @@
 	name = "grapes"
 	seed_name = "grape"
 	display_name = "grapevines"
-	packet_icon = "seed-grapes"
+	plant_dmi = 'icons/obj/hydroponics/grape.dmi'
 	mutants = list("greengrapes")
 	products = list(/obj/item/weapon/reagent_containers/food/snacks/grown/grapes)
-	plant_icon = "grape"
 	harvest_repeat = 1
 	chems = list(NUTRIMENT = list(1,10), SUGAR = list(1,5))
 
@@ -1103,10 +1065,9 @@
 	name = "greengrapes"
 	seed_name = "green grape"
 	display_name = "green grapevines"
-	packet_icon = "seed-greengrapes"
+	plant_dmi = 'icons/obj/hydroponics/greengrape.dmi'
 	products = list(/obj/item/weapon/reagent_containers/food/snacks/grown/greengrapes)
 	mutants = null
-	plant_icon = "greengrape"
 	chems = list(NUTRIMENT = list(1,10), TANNIC_ACID = list(3,5))
 
 //Everything else
@@ -1114,9 +1075,8 @@
 	name = "peanut"
 	seed_name = "peanut"
 	display_name = "peanut vines"
-	packet_icon = "seed-peanut"
+	plant_dmi = 'icons/obj/hydroponics/peanut.dmi'
 	products = list(/obj/item/weapon/reagent_containers/food/snacks/grown/peanut)
-	plant_icon = "peanut"
 	harvest_repeat = 1
 	chems = list(NUTRIMENT = list(1,10))
 
@@ -1126,13 +1086,13 @@
 	yield = 6
 	potency = 10
 	ideal_light = 8
+
 /datum/seed/cabbage
 	name = "cabbage"
 	seed_name = "cabbage"
 	display_name = "cabbages"
-	packet_icon = "seed-cabbage"
+	plant_dmi = 'icons/obj/hydroponics/cabbage.dmi'
 	products = list(/obj/item/weapon/reagent_containers/food/snacks/grown/cabbage)
-	plant_icon = "cabbage"
 	harvest_repeat = 1
 	chems = list(NUTRIMENT = list(1,10))
 
@@ -1150,9 +1110,8 @@
 	name = "shand"
 	seed_name = "S'randar's hand"
 	display_name = "S'randar's hand leaves"
-	packet_icon = "seed-shand"
+	plant_dmi = 'icons/obj/hydroponics/shand.dmi'
 	products = list(/obj/item/stack/medical/bruise_pack/tajaran)
-	plant_icon = "shand"
 	chems = list(OPIUM = list(0,10))
 
 	lifespan = 50
@@ -1166,9 +1125,8 @@
 	name = "mtear"
 	seed_name = "Messa's tear"
 	display_name = "Messa's tear leaves"
-	packet_icon = "seed-mtear"
+	plant_dmi = 'icons/obj/hydroponics/mtear.dmi'
 	products = list(/obj/item/stack/medical/ointment/tajaran)
-	plant_icon = "mtear"
 	chems = list(HONEY = list(1,10), TANNIC_ACID = list(3,5))
 
 	lifespan = 50
@@ -1182,9 +1140,8 @@
 	name = "banana"
 	seed_name = "banana"
 	display_name = "banana tree"
-	packet_icon = "seed-banana"
+	plant_dmi = 'icons/obj/hydroponics/banana.dmi'
 	products = list(/obj/item/weapon/reagent_containers/food/snacks/grown/banana)
-	plant_icon = "banana"
 	harvest_repeat = 1
 	chems = list(BANANA = list(1,10), POTASSIUMCARBONATE = list(0.1,30))
 	mutants = list("bluespacebanana")
@@ -1201,18 +1158,16 @@
 	name = "bluespacebanana"
 	seed_name = "bluespacebanana"
 	display_name = "bluespace banana tree"
-	packet_icon = "seed-bluespacebanana"
+	plant_dmi = 'icons/obj/hydroponics/bluespacebanana.dmi'
 	products = list(/obj/item/weapon/reagent_containers/food/snacks/grown/bluespacebanana)
-	plant_icon = "banana"
 	mutants = null
 
 /datum/seed/corn
 	name = "corn"
 	seed_name = "corn"
 	display_name = "ears of corn"
-	packet_icon = "seed-corn"
+	plant_dmi = 'icons/obj/hydroponics/corn.dmi'
 	products = list(/obj/item/weapon/reagent_containers/food/snacks/grown/corn)
-	plant_icon = "corn"
 	chems = list(NUTRIMENT = list(1,10))
 
 	lifespan = 25
@@ -1230,10 +1185,8 @@
 	name = "potato"
 	seed_name = "potato"
 	display_name = "potatoes"
-	packet_icon = "seed-potato"
+	plant_dmi = 'icons/obj/hydroponics/potato.dmi'
 	products = list(/obj/item/weapon/reagent_containers/food/snacks/grown/potato)
-	plant_icon = "potato"
-	plant_icon = POTATO
 	chems = list(NUTRIMENT = list(1,10))
 
 	lifespan = 30
@@ -1248,10 +1201,9 @@
 	name = "soybean"
 	seed_name = "soybean"
 	display_name = "soybeans"
-	packet_icon = "seed-soybean"
+	plant_dmi = 'icons/obj/hydroponics/soybean.dmi'
 	products = list(/obj/item/weapon/reagent_containers/food/snacks/grown/soybeans)
 	mutants = list("koibean")
-	plant_icon = "soybean"
 	harvest_repeat = 1
 	chems = list(NUTRIMENT = list(1,20))
 
@@ -1265,9 +1217,8 @@
 	name = "koibean"
 	seed_name = "koibean"
 	display_name = "koibeans"
-	packet_icon = "seed-koibean"
+	plant_dmi = 'icons/obj/hydroponics/koibean.dmi'
 	products = list(/obj/item/weapon/reagent_containers/food/snacks/grown/koibeans)
-	plant_icon = "soybean"
 	harvest_repeat = 1
 	chems = list(NUTRIMENT = list(1,10),CARPOTOXIN = list(1,25))
 
@@ -1281,9 +1232,8 @@
 	name = "wheat"
 	seed_name = "wheat"
 	display_name = "wheat stalks"
-	packet_icon = "seed-wheat"
+	plant_dmi = 'icons/obj/hydroponics/wheat.dmi'
 	products = list(/obj/item/weapon/reagent_containers/food/snacks/grown/wheat)
-	plant_icon = "wheat"
 	chems = list(NUTRIMENT = list(1,25))
 
 	lifespan = 25
@@ -1298,9 +1248,8 @@
 	name = "rice"
 	seed_name = "rice"
 	display_name = "rice stalks"
-	packet_icon = "seed-rice"
+	plant_dmi = 'icons/obj/hydroponics/rice.dmi'
 	products = list(/obj/item/weapon/reagent_containers/food/snacks/grown/ricestalk)
-	plant_icon = "rice"
 	chems = list(NUTRIMENT = list(1,25))
 
 	lifespan = 25
@@ -1316,9 +1265,8 @@
 	name = "carrot"
 	seed_name = "carrot"
 	display_name = "carrots"
-	packet_icon = "seed-carrot"
+	plant_dmi = 'icons/obj/hydroponics/carrot.dmi'
 	products = list(/obj/item/weapon/reagent_containers/food/snacks/grown/carrot)
-	plant_icon = "carrot"
 	chems = list(NUTRIMENT = list(1,20), ZEAXANTHIN = list(3,5))
 
 	lifespan = 25
@@ -1333,9 +1281,7 @@
 	name = "weeds"
 	seed_name = "weed"
 	display_name = "weeds"
-	packet_icon = "seed-ambrosiavulgaris"
-	plant_icon = "weeds"
-
+	plant_dmi = 'icons/obj/hydroponics/weeds.dmi'
 	lifespan = 100
 	maturation = 5
 	production = 1
@@ -1348,9 +1294,8 @@
 	name = "whitebeet"
 	seed_name = "white-beet"
 	display_name = "white-beets"
-	packet_icon = "seed-whitebeet"
+	plant_dmi = 'icons/obj/hydroponics/whitebeet.dmi'
 	products = list(/obj/item/weapon/reagent_containers/food/snacks/grown/whitebeet)
-	plant_icon = "whitebeet"
 	chems = list(NUTRIMENT = list(0,20), SUGAR = list(1,5))
 
 	lifespan = 60
@@ -1364,9 +1309,8 @@
 	name = "sugarcane"
 	seed_name = "sugarcane"
 	display_name = "sugarcanes"
-	packet_icon = "seed-sugarcane"
+	plant_dmi = 'icons/obj/hydroponics/sugarcane.dmi'
 	products = list(/obj/item/weapon/reagent_containers/food/snacks/grown/sugarcane)
-	plant_icon = "sugarcane"
 	harvest_repeat = 1
 	chems = list(SUGAR = list(4,5))
 
@@ -1382,9 +1326,8 @@
 	name = "watermelon"
 	seed_name = "watermelon"
 	display_name = "watermelon vine"
-	packet_icon = "seed-watermelon"
+	plant_dmi = 'icons/obj/hydroponics/watermelon.dmi'
 	products = list(/obj/item/weapon/reagent_containers/food/snacks/grown/watermelon)
-	plant_icon = "watermelon"
 	harvest_repeat = 1
 	chems = list(NUTRIMENT = list(1,6))
 
@@ -1401,9 +1344,8 @@
 	name = "pumpkin"
 	seed_name = "pumpkin"
 	display_name = "pumpkin vine"
-	packet_icon = "seed-pumpkin"
+	plant_dmi = 'icons/obj/hydroponics/pumpkin.dmi'
 	products = list(/obj/item/weapon/reagent_containers/food/snacks/grown/pumpkin)
-	plant_icon = "pumpkin"
 	harvest_repeat = 1
 	chems = list(NUTRIMENT = list(1,6))
 
@@ -1419,9 +1361,8 @@
 	name = "lime"
 	seed_name = "lime"
 	display_name = "lime trees"
-	packet_icon = "seed-lime"
+	plant_dmi = 'icons/obj/hydroponics/lime.dmi'
 	products = list(/obj/item/weapon/reagent_containers/food/snacks/grown/lime)
-	plant_icon = "lime"
 	harvest_repeat = 1
 	chems = list(NUTRIMENT = list(1,20))
 
@@ -1437,9 +1378,8 @@
 	name = "lemon"
 	seed_name = "lemon"
 	display_name = "lemon trees"
-	packet_icon = "seed-lemon"
+	plant_dmi = 'icons/obj/hydroponics/lemon.dmi'
 	products = list(/obj/item/weapon/reagent_containers/food/snacks/grown/lemon)
-	plant_icon = "lemon"
 	harvest_repeat = 1
 	chems = list(NUTRIMENT = list(1,20))
 
@@ -1455,9 +1395,8 @@
 	name = "orange"
 	seed_name = "orange"
 	display_name = "orange trees"
-	packet_icon = "seed-orange"
+	plant_dmi = 'icons/obj/hydroponics/orange.dmi'
 	products = list(/obj/item/weapon/reagent_containers/food/snacks/grown/orange)
-	plant_icon = "orange"
 	harvest_repeat = 1
 	chems = list(NUTRIMENT = list(1,20))
 
@@ -1473,9 +1412,8 @@
 	name = "grass"
 	seed_name = "grass"
 	display_name = "grass"
-	packet_icon = "seed-grass"
+	plant_dmi = 'icons/obj/hydroponics/grass.dmi'
 	products = list(/obj/item/weapon/reagent_containers/food/snacks/grown/grass)
-	plant_icon = "grass"
 	harvest_repeat = 1
 
 	lifespan = 60
@@ -1490,9 +1428,8 @@
 	name = "cocoa"
 	seed_name = "cacao"
 	display_name = "cacao tree"
-	packet_icon = "seed-cocoapod"
+	plant_dmi = 'icons/obj/hydroponics/cocoapod.dmi'
 	products = list(/obj/item/weapon/reagent_containers/food/snacks/grown/cocoapod)
-	plant_icon = "cocoapod"
 	harvest_repeat = 1
 	chems = list(NUTRIMENT = list(1,10), COCO = list(4,5))
 
@@ -1511,9 +1448,8 @@
 	seed_name = "cherry"
 	seed_noun = "pits"
 	display_name = "cherry tree"
-	packet_icon = "seed-cherry"
+	plant_dmi = 'icons/obj/hydroponics/cherry.dmi'
 	products = list(/obj/item/weapon/reagent_containers/food/snacks/grown/cherries)
-	plant_icon = "cherry"
 	harvest_repeat = 1
 	chems = list(NUTRIMENT = list(1,15))
 
@@ -1530,10 +1466,8 @@
 	name = "cinnamomum"
 	seed_name = "cinnamomum"
 	display_name = "cinnamomum tree"
-	packet_icon = "seed-cinnamomum"
+	plant_dmi = 'icons/obj/hydroponics/cinnamomum.dmi'
 	products = list(/obj/item/weapon/reagent_containers/food/snacks/grown/cinnamon)
-	plant_dmi = 'icons/obj/hydroponics2.dmi'
-	plant_icon = "cinnamomum"
 	chems = list(CINNAMON = list(4,3))
 
 	lifespan = 80
@@ -1550,9 +1484,8 @@
 	name = "kudzu"
 	seed_name = "kudzu"
 	display_name = "kudzu vines"
-	packet_icon = "seed-kudzu"
+	plant_dmi = 'icons/obj/hydroponics/kudzu.dmi'
 	products = list(/obj/item/weapon/reagent_containers/food/snacks/grown/kudzupod)
-	plant_icon = "kudzu"
 	chems = list(NUTRIMENT = list(1,50), ALLICIN = list(2,10))
 
 	lifespan = 20
@@ -1569,10 +1502,8 @@
 	seed_name = "diona"
 	seed_noun = "nodes"
 	display_name = "diona nodes"
-	packet_icon = "seed-dionanode"
+	plant_dmi = 'icons/obj/hydroponics/dionanode.dmi'
 	products = list(/mob/living/carbon/monkey/diona)
-	plant_dmi = 'icons/obj/hydroponics2.dmi'
-	plant_icon = "dionanode"
 	mob_drop = /obj/item/seeds/dionanode
 	product_requires_player = 1
 	product_kill_inactive = FALSE
@@ -1590,9 +1521,8 @@
 	seed_name = "clown"
 	seed_noun = "pods"
 	display_name = "laughing clowns"
-	packet_icon = "seed-replicapod"
+	plant_dmi = 'icons/obj/hydroponics/replicapod.dmi'
 	products = list(/mob/living/simple_animal/hostile/retaliate/clown)
-	plant_icon = "replicapod"
 	product_requires_player = 1
 
 	lifespan = 100
@@ -1607,8 +1537,7 @@
 	seed_name = "moshrum"
 	seed_noun = "nodules"
 	display_name = "moshrum nodes"
-	packet_icon = "mycelium-walkingmushroom"
-	plant_icon = "walkingmushroom"
+	plant_dmi = 'icons/obj/hydroponics/walkingmushroom.dmi'
 	products = list(/mob/living/carbon/monkey/mushroom)
 	mob_drop = /obj/item/seeds/mushroommanspore
 	product_requires_player = TRUE
@@ -1629,9 +1558,7 @@
 	seed_name = "testing"
 	seed_noun = "data"
 	display_name = "runtimes"
-	packet_icon = "seed-replicapod"
 	products = list(/mob/living/simple_animal/cat/Runtime)
-	plant_icon = "replicapod"
 
 	nutrient_consumption = 0
 	water_consumption = 0
@@ -1648,10 +1575,8 @@
 	name = "nofruit"
 	seed_name = "no-fruit"
 	display_name = "no-fruit vine"
+	plant_dmi = 'icons/obj/hydroponics/nofruit.dmi'
 	products = list(/obj/item/weapon/reagent_containers/food/snacks/grown/nofruit)
-	plant_dmi = 'icons/obj/hydroponics2.dmi'
-	packet_icon = "seed-nofruit"
-	plant_icon = "nofruit"
 	chems = list(NOTHING = list(1,20))
 	immutable = 1
 
@@ -1668,10 +1593,8 @@
 	name = "avocado"
 	seed_name = "avocado"
 	display_name = "avocado tree"
-	packet_icon = "seed-avocado"
+	plant_dmi = 'icons/obj/hydroponics/avocado.dmi'
 	products = list(/obj/item/weapon/reagent_containers/food/snacks/grown/avocado)
-	plant_dmi = 'icons/obj/hydroponics2.dmi'
-	plant_icon = "avocado"
 	harvest_repeat = 1
 	chems = list(NUTRIMENT = list(1,20))
 
@@ -1688,11 +1611,9 @@
 	name = "pear"
 	seed_name = "pear"
 	display_name = "pear tree"
+	plant_dmi = 'icons/obj/hydroponics/pear.dmi'
 	products = list(/obj/item/weapon/reagent_containers/food/snacks/grown/pear)
 	mutants = list("silverpear")
-	plant_dmi = 'icons/obj/hydroponics2.dmi'
-	packet_icon = "seed-pear"
-	plant_icon = "pear"
 	harvest_repeat = 1
 	chems = list(NUTRIMENT = list(1,10))
 
@@ -1708,11 +1629,9 @@
 	name = "silverpear"
 	seed_name = "silver pear"
 	display_name = "silver pear tree"
+	plant_dmi = 'icons/obj/hydroponics/silverpear.dmi'
 	products = list(/obj/item/weapon/reagent_containers/food/snacks/grown/silverpear)
 	mutants = null
-	plant_dmi = 'icons/obj/hydroponics2.dmi'
-	packet_icon = "seed-silverpear"
-	plant_icon = "silverpear"
 	chems = list(NUTRIMENT = list(1,10), SILVER = list(1,5))
 
 	maturation = 10
@@ -1725,11 +1644,9 @@
 	name = "chickenshroom"
 	seed_name = "chickenshroom"
 	display_name = "chicken of the stars"
+	plant_dmi = 'icons/obj/hydroponics/chickenshroom.dmi'
 	products = list(/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/chickenshroom)
 	mutants = null
-	packet_icon = "mycelium-chickenshroom"
-	plant_dmi = 'icons/obj/hydroponics2.dmi'
-	plant_icon = "chickenshroom"
 	chems = list(NUTRIMENT = list(2,10))
 	consume_gasses = list(GAS_NITROGEN = 20) //Really likes its nitrogen. Planting on main station may mess with room air mix.
 
@@ -1743,10 +1660,8 @@
 	name = "woodapple"
 	seed_name = "woodapple"
 	display_name = "woodapple tree"
+	plant_dmi = 'icons/obj/hydroponics/woodapple.dmi'
 	products = list(/obj/item/weapon/reagent_containers/food/snacks/grown/woodapple)
-	packet_icon = "seed-woodapple"
-	plant_dmi = 'icons/obj/hydroponics2.dmi'
-	plant_icon = "woodapple"
 	chems = list(SUGAR = list(1,10))
 
 	growth_stages = 3
@@ -1759,10 +1674,8 @@
 	name = "breadfruit"
 	seed_name = "breadfruit"
 	display_name = "breadfruit tree"
-	packet_icon = "seed-breadfruit"
+	plant_dmi = 'icons/obj/hydroponics/breadfruit.dmi'
 	products = list(/obj/item/weapon/reagent_containers/food/snacks/grown/breadfruit)
-	plant_dmi = 'icons/obj/hydroponics2.dmi'
-	plant_icon = "breadfruit"
 	harvest_repeat = 1
 	chems = list(FLOUR = list(2,10))
 
@@ -1780,10 +1693,8 @@
 	name = "garlic"
 	seed_name = "garlic"
 	display_name = "garlic"
-	packet_icon = "seed-garlic"
+	plant_dmi = 'icons/obj/hydroponics/garlic.dmi'
 	products = list(/obj/item/weapon/reagent_containers/food/snacks/grown/garlic)
-	plant_dmi = 'icons/obj/hydroponics2.dmi'
-	plant_icon = "garlic"
 	chems = list(HOLYWATER = list(1,25),NUTRIMENT = list(1,10), ALLICIN = list(5,10))
 
 	potency = 15
@@ -1799,10 +1710,8 @@
 	name = "pitcher" //based on the slippery Nepenthes genus of pitcher plants
 	seed_name = "pitcher"
 	display_name = "pitcher plant" //because these are juicy 2, they automatically get renamed "slippery pitcher"
-	packet_icon = "seed-pitcher"
+	plant_dmi = 'icons/obj/hydroponics/pitcher.dmi'
 	products = list(/obj/item/weapon/reagent_containers/food/snacks/grown/pitcher)
-	plant_dmi = 'icons/obj/hydroponics2.dmi'
-	plant_icon = "pitcher"
 	chems = list(FORMIC_ACID = list(1,25))
 
 	potency = 10
@@ -1822,10 +1731,8 @@
 	name = "aloe"
 	seed_name = "aloe"
 	display_name = "aloe vera"
-	packet_icon = "seed-aloe"
+	plant_dmi = 'icons/obj/hydroponics/aloe.dmi'
 	products = list(/obj/item/weapon/reagent_containers/food/snacks/grown/aloe)
-	plant_dmi = 'icons/obj/hydroponics2.dmi'
-	plant_icon = "aloe"
 	chems = list(KATHALAI = list(1,10)) //Not as good as poppy's opium for speedy heals, but general purpose.
 
 	lifespan = 30
@@ -1841,10 +1748,8 @@
 	name = "vaporsac"
 	seed_name = "vaporsac"
 	display_name = "vapor sac"
-	packet_icon = "seed-vaporsac"
+	plant_dmi = 'icons/obj/hydroponics/vaporsac.dmi'
 	products = list(/obj/item/weapon/reagent_containers/food/snacks/grown/vaporsac)
-	plant_dmi = 'icons/obj/hydroponics2.dmi'
-	plant_icon = "vaporsac"
 	chems = list(VAPORSALT = list(1,2))
 
 	lifespan = 50

code/modules/hydroponics/soil.dm

@@ -1,6 +1,6 @@
 /obj/machinery/portable_atmospherics/hydroponics/soil
 	name = "soil"
-	icon = 'icons/obj/hydroponics.dmi'
+	icon = 'icons/obj/hydroponics/hydroponics.dmi'
 	icon_state = "soil"
 	density = 0
 	use_power = 0

code/modules/projectiles/guns/projectile/revolver.dm

@@ -294,8 +294,8 @@
 /obj/item/weapon/gun/projectile/banana
 	name = "banana"
 	desc = "It's an excellent prop for a comedy."
-	icon = 'icons/obj/items.dmi'
-	icon_state = "banana"
+	icon = 'icons/obj/hydroponics/banana.dmi'
+	icon_state = "produce"
 	item_state = "banana"
 	max_shells = 1
 	gun_flags = 0

code/modules/reagents/reagent_containers/food/snacks/grown.dm

@@ -14,7 +14,8 @@ var/list/special_fruits = list()
 	var/hydroflags = 0
 	var/datum/seed/seed
 	var/fragrance
-	icon = 'icons/obj/harvest.dmi'
+	icon = 'icons/obj/hydroponics/apple.dmi'
+	icon_state = "produce"
 
 /obj/item/weapon/reagent_containers/food/snacks/grown/New(newloc, newpotency)
 	if(!isnull(newpotency))
@@ -25,6 +26,7 @@ var/list/special_fruits = list()
 
 /proc/get_special_fruits(var/filter=HYDRO_PREHISTORIC|HYDRO_VOX)
 	. = list()
+	. += /obj/item/weapon/reagent_containers/food/snacks/grown
 	for(var/T in existing_typesof(/obj/item/weapon/reagent_containers/food/snacks/grown))
 		var/obj/item/weapon/reagent_containers/food/snacks/grown/G = T
 		if(initial(G.hydroflags) & filter)
@@ -34,13 +36,13 @@ var/list/special_fruits = list()
 	..()
 
 	//Handle some post-spawn var stuff.
-	spawn(1)
+	spawn()
 		//Fill the object up with the appropriate reagents.
 		if(!isnull(plantname))
 			seed = SSplant.seeds[plantname]
 			if(!seed)
 				return
-
+			icon = seed.plant_dmi
 			potency = round(seed.potency)
 			force = seed.thorny ? 5+seed.carnivorous*3 : 0
 
@@ -266,7 +268,6 @@ var/list/special_fruits = list()
 	name = "ear of corn"
 	desc = "Needs some butter!"
 	plantname = "corn"
-	icon_state = "corn"
 	potency = 40
 	filling_color = "#FFEE00"
 	trash = /obj/item/weapon/corncob
@@ -275,7 +276,6 @@ var/list/special_fruits = list()
 /obj/item/weapon/reagent_containers/food/snacks/grown/cherries
 	name = "cherries"
 	desc = "Great for toppings!"
-	icon_state = "cherry"
 	filling_color = "#FF0000"
 	gender = PLURAL
 	plantname = "cherry"
@@ -284,7 +284,6 @@ var/list/special_fruits = list()
 /obj/item/weapon/reagent_containers/food/snacks/grown/cinnamon
 	name = "cinnamon sticks"
 	desc = "Straight from the bark!"
-	icon_state = "cinnamon"
 	filling_color = "#D2691E"
 	gender = PLURAL
 	plantname = "cinnamomum"
@@ -292,7 +291,6 @@ var/list/special_fruits = list()
 /obj/item/weapon/reagent_containers/food/snacks/grown/poppy
 	name = "poppy"
 	desc = "Long-used as a symbol of rest, peace, and death."
-	icon_state = "poppy"
 	potency = 30
 	filling_color = "#CC6464"
 	plantname = "poppies"
@@ -301,7 +299,6 @@ var/list/special_fruits = list()
 /obj/item/weapon/reagent_containers/food/snacks/grown/harebell
 	name = "harebell"
 	desc = "\"I'll sweeten thy sad grave: thou shalt not lack the flower that's like thy face, pale primrose, nor the azured hare-bell, like thy veins; no, nor the leaf of eglantine, whom not to slander, out-sweeten’d not thy breath.\""
-	icon_state = "harebell"
 	potency = 1
 	filling_color = "#D4B2C9"
 	plantname = "harebells"
@@ -310,7 +307,6 @@ var/list/special_fruits = list()
 /obj/item/weapon/reagent_containers/food/snacks/grown/moonflower
 	name = "moonflower"
 	desc = "Store in a location at least 50 yards away from werewolves."
-	icon_state = "moonflower"
 	potency = 25
 	filling_color = "#E6E6FA"
 	plantname = "moonflowers"
@@ -319,7 +315,6 @@ var/list/special_fruits = list()
 /obj/item/weapon/reagent_containers/food/snacks/grown/potato
 	name = "potato"
 	desc = "The space Irish starved to death after their potato crops died. Sadly they were unable to fish for space carp due to it being the queen's space. Bringing this up to any space IRA member will drive them insane with anger."
-	icon_state = "potato"
 	potency = 25
 	filling_color = "#E6E8DA"
 	plantname = "potato"
@@ -341,14 +336,12 @@ var/list/special_fruits = list()
 /obj/item/weapon/reagent_containers/food/snacks/grown/grapes
 	name = "bunch of grapes"
 	desc = "Nutritious!"
-	icon_state = "grapes"
 	filling_color = "#A332AD"
 	plantname = "grapes"
 
 /obj/item/weapon/reagent_containers/food/snacks/grown/greengrapes
 	name = "bunch of green grapes"
 	desc = "Nutritious!"
-	icon_state = "greengrapes"
 	potency = 25
 	filling_color = "#A6FFA3"
 	plantname = "greengrapes"
@@ -356,7 +349,6 @@ var/list/special_fruits = list()
 /obj/item/weapon/reagent_containers/food/snacks/grown/peanut
 	name = "peanut"
 	desc = "Nuts!"
-	icon_state = "peanut"
 	filling_color = "857e27"
 	potency = 25
 	plantname = "peanut"
@@ -364,7 +356,6 @@ var/list/special_fruits = list()
 /obj/item/weapon/reagent_containers/food/snacks/grown/cabbage
 	name = "cabbage"
 	desc = "Ewwwwwwwwww. Cabbage."
-	icon_state = "cabbage"
 	potency = 25
 	filling_color = "#A2B5A1"
 	plantname = "cabbage"
@@ -373,14 +364,12 @@ var/list/special_fruits = list()
 /obj/item/weapon/reagent_containers/food/snacks/grown/berries
 	name = "bunch of berries"
 	desc = "Nutritious!"
-	icon_state = "berrypile"
 	filling_color = "#C2C9FF"
 	plantname = "berries"
 
 /obj/item/weapon/reagent_containers/food/snacks/grown/plastellium
 	name = "clump of plastellium"
 	desc = "Hmm, needs some processing"
-	icon_state = "plastellium"
 	filling_color = "#C4C4C4"
 	plantname = "plastic"
 
@@ -388,13 +377,11 @@ var/list/special_fruits = list()
 	name = "bunch of glow-berries"
 	desc = "Nutritious!"
 	filling_color = "#D3FF9E"
-	icon_state = "glowberrypile"
 	plantname = "glowberries"
 
 /obj/item/weapon/reagent_containers/food/snacks/grown/cocoapod
 	name = "cocoa pod"
 	desc = "Can be ground into cocoa powder."
-	icon_state = "cocoapod"
 	potency = 50
 	filling_color = "#9C8E54"
 	plantname = "cocoa"
@@ -402,7 +389,6 @@ var/list/special_fruits = list()
 /obj/item/weapon/reagent_containers/food/snacks/grown/sugarcane
 	name = "sugarcane"
 	desc = "Sickly sweet."
-	icon_state = "sugarcane"
 	potency = 50
 	filling_color = "#C0C9AD"
 	plantname = "sugarcane"
@@ -410,7 +396,6 @@ var/list/special_fruits = list()
 /obj/item/weapon/reagent_containers/food/snacks/grown/poisonberries
 	name = "bunch of poison-berries"
 	desc = "Taste so good, you could die!"
-	icon_state = "poisonberrypile"
 	gender = PLURAL
 	potency = 15
 	filling_color = "#B422C7"
@@ -419,7 +404,6 @@ var/list/special_fruits = list()
 /obj/item/weapon/reagent_containers/food/snacks/grown/deathberries
 	name = "bunch of death-berries"
 	desc = "Taste so good, you could die!"
-	icon_state = "deathberrypile"
 	gender = PLURAL
 	potency = 50
 	filling_color = "#4E0957"
@@ -428,17 +412,15 @@ var/list/special_fruits = list()
 /obj/item/weapon/reagent_containers/food/snacks/grown/ambrosiavulgaris
 	name = "ambrosia vulgaris branch"
 	desc = "This is a plant containing various healing chemicals."
-	icon_state = "ambrosiavulgaris"
 	potency = 10
 	filling_color = "#125709"
 	plantname = "ambrosia"
 
 /obj/item/weapon/reagent_containers/food/snacks/grown/ambrosiavulgaris/cruciatus
-	plantname = "ambrosiacruciatus"
 	name = "ambrosia vulgaris branch"
 	desc = "This is a plant containing various healing chemicals."
-	icon_state = "ambrosiavulgaris"
 	potency = 10
+	plantname = "ambrosiacruciatus"
 
 /obj/item/weapon/reagent_containers/food/snacks/grown/attackby(var/obj/item/weapon/O as obj, var/mob/user as mob)
 	if(istype(O, /obj/item/weapon/paper))
@@ -457,7 +439,6 @@ var/list/special_fruits = list()
 /obj/item/weapon/reagent_containers/food/snacks/grown/ambrosiavulgaris/deus
 	name = "ambrosia deus branch"
 	desc = "Eating this makes you feel immortal!"
-	icon_state = "ambrosiadeus"
 	potency = 10
 	filling_color = "#229E11"
 	plantname = "ambrosiadeus"
@@ -478,7 +459,6 @@ var/list/special_fruits = list()
 /obj/item/weapon/reagent_containers/food/snacks/grown/apple
 	name = "apple"
 	desc = "It's a little piece of Eden."
-	icon_state = "apple"
 	potency = 15
 	filling_color = "#DFE88B"
 	plantname = "apple"
@@ -490,7 +470,6 @@ var/list/special_fruits = list()
 /obj/item/weapon/reagent_containers/food/snacks/grown/goldapple
 	name = "golden apple"
 	desc = "Emblazoned upon the apple is the word 'Kallisti'."
-	icon_state = "goldapple"
 	potency = 15
 	filling_color = "#F5CB42"
 	plantname = "goldapple"
@@ -498,7 +477,6 @@ var/list/special_fruits = list()
 /obj/item/weapon/reagent_containers/food/snacks/grown/watermelon
 	name = "watermelon"
 	desc = "It's full of watery goodness."
-	icon_state = "watermelon"
 	potency = 10
 	filling_color = "#FA2863"
 	slice_path = /obj/item/weapon/reagent_containers/food/snacks/watermelonslice
@@ -509,7 +487,6 @@ var/list/special_fruits = list()
 /obj/item/weapon/reagent_containers/food/snacks/grown/pumpkin
 	name = "pumpkin"
 	desc = "It's large and scary."
-	icon_state = "pumpkin"
 	potency = 10
 	filling_color = "#FAB728"
 	plantname = "pumpkin"
@@ -525,7 +502,6 @@ var/list/special_fruits = list()
 /obj/item/weapon/reagent_containers/food/snacks/grown/lime
 	name = "lime"
 	desc = "It's so sour, your face will twist."
-	icon_state = "lime"
 	potency = 20
 	filling_color = "#28FA59"
 	plantname = "lime"
@@ -533,7 +509,6 @@ var/list/special_fruits = list()
 /obj/item/weapon/reagent_containers/food/snacks/grown/lemon
 	name = "lemon"
 	desc = "When life gives you lemons, be grateful they aren't limes."
-	icon_state = "lemon"
 	potency = 20
 	filling_color = "#FAF328"
 	plantname = "lemon"
@@ -541,7 +516,6 @@ var/list/special_fruits = list()
 /obj/item/weapon/reagent_containers/food/snacks/grown/orange
 	name = "orange"
 	desc = "It's a tangy fruit."
-	icon_state = "orange"
 	potency = 20
 	filling_color = "#FAAD28"
 	plantname = "orange"
@@ -549,7 +523,6 @@ var/list/special_fruits = list()
 /obj/item/weapon/reagent_containers/food/snacks/grown/whitebeet
 	name = "white-beet"
 	desc = "You can't beat white-beet."
-	icon_state = "whitebeet"
 	potency = 15
 	filling_color = "#FFFCCC"
 	plantname = "whitebeet"
@@ -557,9 +530,6 @@ var/list/special_fruits = list()
 /obj/item/weapon/reagent_containers/food/snacks/grown/banana
 	name = "banana"
 	desc = "It's an excellent prop for a comedy."
-	icon = 'icons/obj/items.dmi'
-	icon_state = "banana"
-	item_state = "banana"
 	filling_color = "#FCF695"
 	trash = /obj/item/weapon/bananapeel
 	plantname = "banana"
@@ -571,9 +541,6 @@ var/list/special_fruits = list()
 /obj/item/weapon/reagent_containers/food/snacks/grown/bluespacebanana
 	name = "bluespace banana"
 	desc = "It's an excellent prop for a comedy."
-	icon = 'icons/obj/items.dmi'
-	icon_state = "bluespacebanana"
-	item_state = "bluespacebanana"
 	filling_color = "#FCF695"
 	plantname = "bluespacebanana"
 
@@ -589,14 +556,12 @@ var/list/special_fruits = list()
 /obj/item/weapon/reagent_containers/food/snacks/grown/chili
 	name = "chili"
 	desc = "It's spicy! Wait... IT'S BURNING ME!!"
-	icon_state = "chilipepper"
 	filling_color = "#FF0000"
 	plantname = "chili"
 
 /obj/item/weapon/reagent_containers/food/snacks/grown/eggplant
 	name = "eggplant"
 	desc = "Maybe there's a chicken inside?"
-	icon_state = "eggplant"
 	filling_color = "#550F5C"
 	plantname = "eggplant"
 
@@ -605,21 +570,18 @@ var/list/special_fruits = list()
 	desc = "It's pretty bland, but oh the possibilities..."
 	gender = PLURAL
 	filling_color = "#E6E8B7"
-	icon_state = "soybeans"
 	plantname = "soybean"
 
 /obj/item/weapon/reagent_containers/food/snacks/grown/koibeans
 	name = "koibean"
 	desc = "Something about these seems fishy."
 	gender = PLURAL
-	icon_state = "koibeans"
 	filling_color = "#F0E68C"
 	plantname = "koibean"
 
 /obj/item/weapon/reagent_containers/food/snacks/grown/tomato
 	name = "tomato"
 	desc = "I say to-mah-to, you say tom-mae-to."
-	icon_state = "tomato"
 	filling_color = "#FF0000"
 	potency = 10
 	plantname = "tomato"
@@ -627,7 +589,6 @@ var/list/special_fruits = list()
 /obj/item/weapon/reagent_containers/food/snacks/grown/bluespacetomato
 	name = "tomato" //"blue-space" is applied on new(), provided it's teleporting trait hasn't been removed
 	desc = "Its juices lubricate so well, you might slip through space-time."
-	icon_state = "bluespacetomato"
 	potency = 20
 	origin_tech = Tc_BLUESPACE + "=3"
 	filling_color = "#91F8FF"
@@ -639,7 +600,6 @@ var/list/special_fruits = list()
 /obj/item/weapon/reagent_containers/food/snacks/grown/killertomato
 	name = "killer-tomato"
 	desc = "I say to-mah-to, you say tom-mae-to... OH GOD IT'S EATING MY LEGS!!"
-	icon_state = "killertomato"
 	potency = 10
 	filling_color = "#FF0000"
 	plantname = "killertomato"
@@ -655,7 +615,6 @@ var/list/special_fruits = list()
 /obj/item/weapon/reagent_containers/food/snacks/grown/bloodtomato
 	name = "blood-tomato"
 	desc = "So bloody...so...very...bloody....AHHHH!!!!"
-	icon_state = "bloodtomato"
 	potency = 10
 	filling_color = "#FF0000"
 	plantname = "bloodtomato"
@@ -663,7 +622,6 @@ var/list/special_fruits = list()
 /obj/item/weapon/reagent_containers/food/snacks/grown/bluetomato
 	name = "blue-tomato"
 	desc = "I say blue-mah-to, you say blue-mae-to."
-	icon_state = "bluetomato"
 	potency = 10
 	filling_color = "#586CFC"
 	plantname = "bluetomato"
@@ -672,7 +630,6 @@ var/list/special_fruits = list()
 	name = "wheat"
 	desc = "Sigh... wheat... a-grain?"
 	gender = PLURAL
-	icon_state = "wheat"
 	filling_color = "#F7E186"
 	plantname = "wheat"
 
@@ -680,21 +637,18 @@ var/list/special_fruits = list()
 	name = "rice stalk"
 	desc = "Rice to see you."
 	gender = PLURAL
-	icon_state = "rice"
 	filling_color = "#FFF8DB"
 	plantname = "rice"
 
 /obj/item/weapon/reagent_containers/food/snacks/grown/kudzupod
 	name = "kudzu pod"
 	desc = "<I>Pueraria Virallis</I>: An invasive species with vines that rapidly creep and wrap around whatever they contact."
-	icon_state = "kudzupod"
 	filling_color = "#59691B"
 	plantname = "kudzu"
 
 /obj/item/weapon/reagent_containers/food/snacks/grown/icepepper
 	name = "chilly pepper"
 	desc = "It's a mutant strain of chili pepper, now cold rather than hot."
-	icon_state = "icepepper"
 	potency = 20
 	filling_color = "#66CEED"
 	plantname = "icechili"
@@ -702,7 +656,6 @@ var/list/special_fruits = list()
 /obj/item/weapon/reagent_containers/food/snacks/grown/ghostpepper
 	name = "ghost pepper"
 	desc = "This pepper is haunted. And pretty spicy, too."
-	icon_state = "ghostpepper"
 	potency = 20
 	filling_color = "#66CEED"
 	plantname = "ghostpepper"
@@ -718,7 +671,6 @@ var/list/special_fruits = list()
 /obj/item/weapon/reagent_containers/food/snacks/grown/carrot
 	name = "carrot"
 	desc = "It's good for the eyes!"
-	icon_state = "carrot"
 	potency = 10
 	filling_color = "#FFC400"
 	plantname = "carrot"
@@ -726,7 +678,6 @@ var/list/special_fruits = list()
 /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/reishi
 	name = "reishi"
 	desc = "<I>Ganoderma lucidum</I>: A special fungus believed to help relieve stress."
-	icon_state = "reishi"
 	potency = 10
 	filling_color = "#FF4800"
 	plantname = "reishi"
@@ -734,7 +685,6 @@ var/list/special_fruits = list()
 /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/amanita
 	name = "fly amanita"
 	desc = "<I>Amanita Muscaria</I>: Learn poisonous mushrooms by heart. Only pick mushrooms you know."
-	icon_state = "amanita"
 	potency = 10
 	filling_color = "#FF0000"
 	plantname = "amanita"
@@ -742,7 +692,6 @@ var/list/special_fruits = list()
 /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/angel
 	name = "destroying angel"
 	desc = "<I>Amanita Virosa</I>: Deadly poisonous basidiomycete fungus filled with alpha amatoxins."
-	icon_state = "angel"
 	potency = 35
 	filling_color = "#FFDEDE"
 	plantname = "destroyingangel"
@@ -750,7 +699,6 @@ var/list/special_fruits = list()
 /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/libertycap
 	name = "liberty-cap"
 	desc = "<I>Psilocybe Semilanceata</I>: Liberate yourself!"
-	icon_state = "libertycap"
 	potency = 15
 	filling_color = "#F714BE"
 	plantname = "libertycap"
@@ -758,7 +706,6 @@ var/list/special_fruits = list()
 /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/plumphelmet
 	name = "plump-helmet"
 	desc = "<I>Plumus Hellmus</I>: Plump, soft and s-so inviting~"
-	icon_state = "plumphelmet"
 	filling_color = "#F714BE"
 	plantname = "plumphelmet"
 	fragrance = INCENSE_BOOZE
@@ -766,7 +713,6 @@ var/list/special_fruits = list()
 /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/walkingmushroom
 	name = "walking mushroom"
 	desc = "<I>Plumus Locomotus</I>: The beginning of the great walk."
-	icon_state = "walkingmushroom"
 	filling_color = "#FFBFEF"
 	potency = 30
 	plantname = "walkingmushroom"
@@ -782,14 +728,12 @@ var/list/special_fruits = list()
 /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/chanterelle
 	name = "chanterelle cluster"
 	desc = "<I>Cantharellus Cibarius</I>: These jolly yellow little shrooms sure look tasty!"
-	icon_state = "chanterelle"
 	filling_color = "#FFE991"
 	plantname = "mushrooms"
 
 /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/glowshroom
 	name = "glowshroom cluster"
 	desc = "<I>Mycena Bregprox</I>: This species of mushroom glows in the dark. Or does it?"
-	icon_state = "glowshroom"
 	filling_color = "#DAFF91"
 	potency = 30
 	plantname = "glowshroom"
@@ -810,7 +754,6 @@ var/list/special_fruits = list()
 /obj/item/weapon/reagent_containers/food/snacks/grown/grass
 	name = "grass"
 	desc = "Green and lush."
-	icon_state = "grassclump"
 	filling_color = "#32CD32"
 	plantname = "grass"
 	fragrance = INCENSE_DENSE
@@ -832,7 +775,6 @@ var/list/special_fruits = list()
 /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/chickenshroom
 	name = "chicken-of-the-stars"
 	desc = "A variant of the Earth-native Laetiporus sulphureus, adapted by Vox traders for space. Everything tastes like chicken."
-	icon_state = "chickenshroom"
 	filling_color = "F2E33A"
 	plantname = "chickenshroom"
 	hydroflags = HYDRO_VOX
@@ -840,7 +782,6 @@ var/list/special_fruits = list()
 /obj/item/weapon/reagent_containers/food/snacks/grown/garlic
 	name = "garlic"
 	desc = "Warning: Garlic may send vampires straight to the Dead Zone."
-	icon_state = "garlic"
 	filling_color = "EDEDE1"
 	plantname = "garlic"
 	hydroflags = HYDRO_VOX
@@ -848,7 +789,6 @@ var/list/special_fruits = list()
 /obj/item/weapon/reagent_containers/food/snacks/grown/breadfruit
 	name = "breadfruit"
 	desc = "Starchy. Tastes about the same as biting into a sack of flour."
-	icon_state = "breadfruit"
 	filling_color = "EDEDE1"
 	plantname = "breadfruit"
 	hydroflags = HYDRO_VOX
@@ -859,7 +799,6 @@ var/list/special_fruits = list()
 	slice_path = /obj/item/stack/sheet/wood
 	slices_num = 1
 	storage_slots = 1 //seems less intended and more like an artifact of old code where if something was sliceable, it should also hold items inside, but keeping consistency
-	icon_state = "woodapple"
 	filling_color = "857663"
 	plantname = "woodapple"
 	hydroflags = HYDRO_VOX
@@ -867,7 +806,6 @@ var/list/special_fruits = list()
 /obj/item/weapon/reagent_containers/food/snacks/grown/pitcher
 	name = "pitcher plant" //results in "slippery pitcher plant"
 	desc = "A fragile, but slippery exotic plant from tropical climates. Powerful digestive acid contained within dissolves prey."
-	icon_state = "pitcher"
 	filling_color = "7E8507"
 	plantname = "pitcher"
 	hydroflags = HYDRO_VOX
@@ -875,7 +813,6 @@ var/list/special_fruits = list()
 /obj/item/weapon/reagent_containers/food/snacks/grown/aloe
 	name = "aloe vera"
 	desc = "A thorny, broad-leaf plant believed to be useful for first aid."
-	icon_state = "aloe"
 	filling_color = "77BA9F"
 	plantname = "aloe"
 	hydroflags = HYDRO_VOX
@@ -889,7 +826,6 @@ var/list/special_fruits = list()
 	plantname = "vaporsac"
 	name = "vapor sac fruit"
 	desc = "A thin organic film bearing seeds, held slightly aloft by internal gasses and a reservoir of chemicals."
-	icon_state = "vaporsac"
 	filling_color = "#FFFFFF"
 	fragrance = INCENSE_VAPOR
 
@@ -918,7 +854,6 @@ var/list/special_fruits = list()
 /obj/item/weapon/reagent_containers/food/snacks/grown/nofruit
 	name = "no-fruit"
 	desc = "Any plant you want, at your fingertips."
-	icon_state = "nofruit"
 	potency = 15
 	filling_color = "#FFFCCC"
 	plantname = "nofruit"
@@ -962,7 +897,8 @@ var/list/special_fruits = list()
 		while(switching)
 			current_path = available_fruits[counter]
 			var/obj/item/weapon/reagent_containers/food/snacks/grown/G = current_path
-			icon_state = initial(G.icon_state)
+			if(SSplant.seeds[initial(G.plantname)])
+				icon = SSplant.seeds[initial(G.plantname)].plant_dmi
 			sleep(4)
 			if(counter == available_fruits.len)
 				counter = 0
@@ -998,7 +934,6 @@ var/list/special_fruits = list()
 /obj/item/weapon/reagent_containers/food/snacks/grown/avocado
 	name = "avocado"
 	desc = "An unusually fatty fruit containing a single large seed."
-	icon_state = "avocado"
 	filling_color = "#EAE791"
 	plantname = "avocado"
 	var/cant_eat_msg = "'s skin is much too tough to chew."
@@ -1039,20 +974,19 @@ var/list/special_fruits = list()
 /obj/item/weapon/reagent_containers/food/snacks/grown/avocado/cut
 	name = "avocado half"
 	desc = "This half still has the seed embedded in it."
-	icon_state = "avocado_cut"
+	icon_state = "cut"
 	cant_eat_msg = "'s seed is too large to eat."
 	cut = TRUE
 	plantname = null	//So people can't use the pit as a seed AND feed each half to the seed extractor
 
 /obj/item/weapon/reagent_containers/food/snacks/grown/avocado/cut/pitted
 	desc = "An unusually fatty fruit, it can be used in both savory and sweet dishes."
-	icon_state = "avocado_pitted"
+	icon_state = "pitted"
 	cant_eat_msg = null
 
 /obj/item/weapon/reagent_containers/food/snacks/grown/pear
 	name = "pear"
 	desc = "The inferior alternative to apples."
-	icon_state = "pear"
 	potency = 15
 	filling_color = "#DFE88B"
 	plantname = "pear"
@@ -1060,7 +994,6 @@ var/list/special_fruits = list()
 /obj/item/weapon/reagent_containers/food/snacks/grown/silverpear
 	name = "silver pear"
 	desc = "Silver will always be the inferior alternative to gold."
-	icon_state = "silverpear"
 	potency = 15
 	filling_color = "#DFE88B"
 	plantname = "silverpear"

code/modules/reagents/reagent_containers/spray.dm

@@ -147,7 +147,7 @@
 /obj/item/weapon/reagent_containers/spray/plantbgone // -- Skie
 	name = "Plant-B-Gone"
 	desc = "Kills those pesky weeds!"
-	icon = 'icons/obj/hydroponics2.dmi'
+	icon = 'icons/obj/hydroponics/hydroponics.dmi'
 	icon_state = "plantbgone"
 	item_state = "plantbgone"
 	volume = 100
@@ -159,7 +159,7 @@
 /obj/item/weapon/reagent_containers/spray/bugzapper
 	name = "Bug Zapper"
 	desc = "Kills those pesky bugs!"
-	icon = 'icons/obj/hydroponics2.dmi'
+	icon = 'icons/obj/hydroponics/hydroponics.dmi'
 	icon_state = "plantbgone"
 	item_state = "plantbgone"
 	volume = 100

code/modules/spells/targeted/genetic.dm

@@ -94,8 +94,8 @@ code\game\\dna\genes\goon_powers.dm
 	duration = 0
 	max_targets = 1
 	//mutations = list(M_EATWEEDS) - Some day, maybe, if this is ported to Diona nymphs instead of a verb
-	hud_state = "ambrosiavulgaris"
-	override_icon = 'icons/obj/harvest.dmi'
+	hud_state = "produce"
+	override_icon = 'icons/obj/hydroponics/ambrosiavulgaris.dmi'
 
 /spell/targeted/genetic/eat_weed/cast(list/targets, var/mob/user)
 	..()