Merge pull request #1328 from FalseIncarnate/master

[Fix] Diona Nymph runtime and Fruit Attack fixes

code/modules/hydroponics/grown.dm

@@ -284,7 +284,7 @@
 	if(user == M)
 		return ..()
 
-	if(user.a_intent == "hurt")
+	if(user.a_intent == "harm")
 
 		// This is being copypasted here because reagent_containers (WHY DOES FOOD DESCEND FROM THAT) overrides it completely.
 		// TODO: refactor all food paths to be less horrible and difficult to work with in this respect. ~Z
@@ -349,7 +349,7 @@
 	if(istype(user.loc,/turf/space))
 		return
 
-	if(user.a_intent == "hurt")
+	if(user.a_intent == "harm")
 		user.visible_message("<span class='danger'>\The [user] squashes \the [src]!</span>")
 		seed.thrown_at(src,user)
 		sleep(-1)

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

@@ -146,7 +146,7 @@
 
 	if(!src || !target || target.weedlevel == 0) return //Sanity check.
 
-	src.reagents.add_reagent("nutriment", target.weedlevel)
+	src.nutrition += target.weedlevel * 15
 	target.weedlevel = 0
 	src.visible_message("\red [src] begins rooting through [target], ripping out weeds and eating them noisily.","\red You begin rooting through [target], ripping out weeds and eating them noisily.")