fixes, comfrey, and aloe

code/modules/fish/fish_items.dm

@@ -1,6 +1,6 @@
 
 var/global/list/fish_items_list = list("goldfish" = /obj/item/weapon/fish/goldfish,
-									"clownfish" = /obj/item/weapon/bananapeel/clownfish,
+									"clownfish" = /obj/item/weapon/grown/bananapeel/clownfish,
 									"shark" = /obj/item/weapon/fish/shark,
 									"baby space carp" = /obj/item/weapon/fish/babycarp,
 									"catfish" = /obj/item/weapon/fish/catfish,
@@ -208,7 +208,7 @@ var/global/list/fish_items_list = list("goldfish" = /obj/item/weapon/fish/goldfi
 	..()
 
 
-/obj/item/weapon/bananapeel/clownfish
+/obj/item/weapon/grown/bananapeel/clownfish
 	name = "clown fish"
 	desc = "Even underwater, you cannot escape HONKing."
 	icon = 'icons/obj/fish_items.dmi'

code/modules/hydroponics/grown/banana.dm

@@ -117,5 +117,5 @@
 /obj/item/weapon/grown/bananapeel/specialpeel/Crossed(AM)
 	if(iscarbon(AM))
 		var/mob/living/carbon/carbon = AM
-		if(carbon.slip(2, 2, src, FALSE))
+		if(carbon.slip("[src]", 2, 2))
 			qdel(src)

code/modules/hydroponics/grown/herbals.dm

@@ -0,0 +1,34 @@
+/obj/item/seeds/comfrey
+	name = "pack of comfrey seeds"
+	desc = "These seeds grow into comfrey."
+	icon_state = "seed-cabbage"
+	species = "cabbage"
+	plantname = "comfrey"
+	product = /obj/item/weapon/grown/holder_spawner/comfrey
+	yield = 4
+	maturation = 3
+	growthstages = 1
+	growing_icon = 'icons/obj/hydroponics/growing_vegetables.dmi'
+
+/obj/item/weapon/grown/holder_spawner/comfrey
+	spawned_thing = /obj/item/stack/medical/bruise_pack/comfrey
+
+/obj/item/weapon/grown/holder_spawner/comfrey/alter_stats(obj/item/stack/medical/bruise_pack/comfrey/C)
+	C.heal_brute = seed.potency
+
+
+/obj/item/seeds/aloe
+	name = "pack of aloe seeds"
+	desc = "These seeds grow into aloe vera plant."
+	icon_state = "seed-ambrosiavulgaris"
+	species = "ambrosiavulgaris"
+	plantname = "Aloe Vera Plant"
+	product = /obj/item/weapon/grown/holder_spawner/aloe
+	yield = 4
+	icon_dead = "ambrosia-dead"
+
+/obj/item/weapon/grown/holder_spawner/aloe
+	spawned_thing = /obj/item/stack/medical/ointment/aloe
+
+/obj/item/weapon/grown/holder_spawner/aloe/alter_stats(obj/item/stack/medical/ointment/aloe/A)
+	A.heal_burn = seed.potency

code/modules/hydroponics/growninedible.dm

@@ -58,4 +58,19 @@
 	if(!..()) //was it caught by a mob?
 		if(seed)
 			for(var/datum/plant_gene/trait/T in seed.genes)
-				T.on_throw_impact(src, hit_atom)
+				T.on_throw_impact(src, hit_atom)
+
+
+//For if You want to spawn something that is a non-grown and alter it stats
+
+/obj/item/weapon/grown/holder_spawner
+	var/obj/item/spawned_thing = null
+
+/obj/item/weapon/grown/holder_spawner/proc/alter_stats(obj/item/I)
+	return
+
+/obj/item/weapon/grown/holder_spawner/New()
+	..()
+	new spawned_thing(loc)
+	alter_stats(spawned_thing)
+	qdel(src)

code/modules/hydroponics/plant_genes.dm

@@ -219,7 +219,7 @@
 		var/stun = min(stun_len, 7)
 		var/weaken = min(stun_len, 7)
 
-		if(M.slip(stun, weaken, G))
+		if(M.slip("[G]", stun, weaken))
 			for(var/datum/plant_gene/trait/T in seed.genes)
 				T.on_slip(G, M)
 
@@ -386,10 +386,10 @@
 /datum/plant_gene/trait/smoke/on_squash(obj/item/weapon/reagent_containers/food/snacks/grown/G, atom/target)
 	var/datum/effect/system/chem_smoke_spread/S = new
 	var/splat_location = get_turf(target)
-	var/smoke_amount = round(sqrt(G.seed.potency * 0.1), 1) //FOX CHANGE THIS FORMULA FOR PARA.
+	var/smoke_amount = round(sqrt(G.seed.potency * 0.1), 1)
 	S.attach(splat_location)
-	S.set_up(G.reagents, smoke_amount, splat_location, 0)
-	S.start()
+	S.set_up(G.reagents, 2, 0, splat_location)
+	S.start(smoke_amount)
 	G.reagents.clear_reagents()
 
 /datum/plant_gene/trait/plant_type // Parent type

code/modules/mob/living/carbon/carbon.dm

@@ -914,14 +914,14 @@ var/list/ventcrawl_machinery = list(/obj/machinery/atmospherics/unary/vent_pump,
 
 /mob/living/carbon/proc/slip(var/description, var/stun, var/weaken, var/tilesSlipped, var/walkSafely, var/slipAny)
 	if(flying || buckled || (walkSafely && m_intent == "walk"))
-		return
+		return 0
 	if((lying) && (!(tilesSlipped)))
-		return
+		return 0
 	if(!(slipAny))
 		if(istype(src, /mob/living/carbon/human))
 			var/mob/living/carbon/human/H = src
 			if((isobj(H.shoes) && H.shoes.flags & NOSLIP) || H.species.bodyflags & FEET_NOSLIP)
-				return
+				return 0
 	if(tilesSlipped)
 		for(var/t = 0, t<=tilesSlipped, t++)
 			spawn (t) step(src, src.dir)

code/modules/mob/living/carbon/human/interactive/functions.dm

@@ -261,7 +261,7 @@
 		var/pranksNearby = 100
 		for(var/turf/simulated/T in orange(1, C))
 			for(var/obj/item/A in T)
-				if(istype(A,/obj/item/weapon/soap) || istype(A,/obj/item/weapon/reagent_containers/food/snacks/grown/banana) || istype(A,/obj/item/weapon/bananapeel))
+				if(istype(A,/obj/item/weapon/soap) || istype(A,/obj/item/weapon/reagent_containers/food/snacks/grown/banana) || istype(A,/obj/item/weapon/grown/bananapeel))
 					pranksNearby--
 			if(T.wet)
 				pranksNearby -= 10
@@ -287,7 +287,7 @@
 					if(istype(A,/obj/item/weapon/reagent_containers/food/snacks/grown/banana))
 						var/obj/item/weapon/reagent_containers/food/snacks/B = A
 						B.attack(src, src)
-					if(istype(A,/obj/item/weapon/bananapeel))
+					if(istype(A,/obj/item/weapon/grown/bananapeel))
 						npcDrop(A)
 						hasPranked = 1
 			if(!hasPranked)

code/modules/mob/living/carbon/human/interactive/interactive.dm

@@ -349,7 +349,7 @@
 			favoured_types = list(/obj/item/weapon/mop, /obj/item/weapon/reagent_containers/glass/bucket, /obj/item/weapon/reagent_containers/spray/cleaner, /obj/effect/decal/cleanable)
 			functions += "dojanitor"
 		if("Clown")
-			favoured_types = list(/obj/item/weapon/soap, /obj/item/weapon/reagent_containers/food/snacks/grown/banana, /obj/item/weapon/bananapeel)
+			favoured_types = list(/obj/item/weapon/soap, /obj/item/weapon/reagent_containers/food/snacks/grown/banana, /obj/item/weapon/grown/bananapeel)
 			functions += "clowning"
 		if("Botanist")
 			favoured_types = list(/obj/machinery/hydroponics,  /obj/item/weapon/reagent_containers, /obj/item/weapon)

code/modules/surgery/organs/organ_internal.dm

@@ -526,7 +526,7 @@
 /obj/item/organ/internal/honktumor/process()
 	if(isturf(loc))
 		visible_message("<span class='warning'>[src] honks in on itself!</span>")
-		new /obj/item/weapon/bananapeel(get_turf(loc))
+		new /obj/item/weapon/grown/bananapeel(get_turf(loc))
 		qdel(src)