Botany Rework

code/game/objects/effects/decals/Cleanable/misc.dm

@@ -89,15 +89,20 @@
 /obj/effect/decal/cleanable/cobweb/fire_act()
 	qdel(src)
 
-/obj/effect/decal/cleanable/molten_item
+/obj/effect/decal/cleanable/molten_object
 	name = "gooey grey mass"
 	desc = "It looks like a melted... something."
 	density = 0
 	anchored = 1
 	layer = 3
-	icon = 'icons/obj/chemical.dmi'
+	gender = NEUTER
+	icon = 'icons/effects/effects.dmi'
 	icon_state = "molten"
 
+/obj/effect/decal/cleanable/molten_object/large
+	name = "big gooey grey mass"
+	icon_state = "big_molten"
+
 /obj/effect/decal/cleanable/cobweb2
 	name = "cobweb"
 	desc = "Somebody should remove that."
@@ -145,6 +150,15 @@
 	icon = 'icons/effects/tomatodecal.dmi'
 	random_icon_states = list("tomato_floor1", "tomato_floor2", "tomato_floor3")
 
+/obj/effect/decal/cleanable/plant_smudge
+	name = "plant smudge"
+	density = 0
+	anchored = 1
+	layer = 2
+	gender = NEUTER
+	icon = 'icons/effects/tomatodecal.dmi'
+	random_icon_states = list("smashed_plant")
+
 /obj/effect/decal/cleanable/egg_smudge
 	name = "smashed egg"
 	desc = "Seems like this one won't hatch."
@@ -163,16 +177,6 @@
 	icon = 'icons/effects/tomatodecal.dmi'
 	random_icon_states = list("smashed_pie")
 
-/obj/effect/decal/cleanable/fruit_smudge
-	name = "smudge"
-	desc = "Some kind of fruit smear."
-	density = 0
-	anchored = 1
-	layer = 2
-	icon = 'icons/effects/blood.dmi'
-	icon_state = "mfloor1"
-	random_icon_states = list("mfloor1", "mfloor2", "mfloor3", "mfloor4", "mfloor5", "mfloor6", "mfloor7")
-
 /obj/effect/decal/cleanable/fungus
 	name = "space fungus"
 	desc = "A fungal growth. Looks pretty nasty."

code/game/objects/effects/effect_system.dm

@@ -425,21 +425,6 @@ steam.start() -- spawns the effect
 /obj/effect/effect/chem_smoke/Move()
 	..()
 
-	return
-
-// Spores
-/datum/effect/system/chem_smoke_spread/spores
-	var/datum/seed/seed
-
-/datum/effect/system/chem_smoke_spread/spores/New(seed_name)
-	if(seed_name && plant_controller)
-		seed = plant_controller.seeds[seed_name]
-	if(!seed)
-		qdel(src)
-	..()
-
-
-
 /datum/effect/system/chem_smoke_spread/New()
 	..()
 	chemholder = new/obj()
@@ -517,13 +502,6 @@ steam.start() -- spawns the effect
 				var/mob/living/carbon/C = A
 				if(C.can_breathe_gas())
 					chemholder.reagents.copy_to(C, chemholder.reagents.total_volume)
-			if(istype(A, /obj/machinery/portable_atmospherics/hydroponics))
-				var/obj/machinery/portable_atmospherics/hydroponics/tray = A
-				chemholder.reagents.copy_to(tray, chemholder.reagents.total_volume)
-			if(istype(A, /obj/effect/plant))
-				var/obj/effect/plant/plant = A
-				if(chemholder.reagents.has_reagent("atrazine"))
-					plant.die_off()
 		qdel(smokeholder)
 		for(i=0, i<src.number, i++)
 			if(src.total_smoke > 20)

code/game/objects/effects/spawners/lootdrop.dm

@@ -103,8 +103,8 @@
 				/obj/item/weapon/hand_labeler = 10,
 				/obj/item/weapon/paper/crumpled = 10,
 				/obj/item/weapon/pen = 10,
-				 /obj/item/weapon/minihoe = 10,
-				/obj/item/weapon/plantspray/pests = 10,
+				 /obj/item/weapon/cultivator = 10,
+				/obj/item/weapon/reagent_containers/spray/pestspray = 10,
 				/obj/item/weapon/stock_parts/cell = 30,
 				/obj/item/weapon/storage/belt/utility = 20,
 				/obj/item/weapon/storage/box = 20,
@@ -122,8 +122,8 @@
 				/obj/item/weapon/wrench = 40,
 				/obj/item/weapon/relic = 35,
 				/obj/item/clothing/shoes/brown = 30,
-				/obj/item/seeds/ambrosiadeusseed = 10,
-				/obj/item/seeds/ambrosiavulgarisseed = 20,
+				/obj/item/seeds/ambrosia/deus = 10,
+				/obj/item/seeds/ambrosia = 20,
 				/obj/item/clothing/under/color/black = 30,
 				/obj/item/stack/tape_roll = 10,
 				////////////////CONTRABAND STUFF//////////////////