Sparky's Bugfix Trilogy (#9945)

code/modules/mob/living/carbon/alien/diona/diona_nymph.dm

@@ -12,6 +12,7 @@
 	composition_reagent = /datum/reagent/nutriment //Dionae are plants, so eating them doesn't give animal protein
 	name = "diona nymph"
 	voice_name = "diona nymph"
+	accent = ACCENT_DIONA
 	adult_form = /mob/living/carbon/human
 	speak_emote = list("chirrups")
 	icon = 'icons/mob/diona.dmi'

code/modules/reagents/reagent_containers/food.dm

@@ -28,13 +28,18 @@
 		playsound(user.loc, 'sound/items/eatfood.ogg', rand(10, 50), 1)
 
 /obj/item/reagent_containers/food/proc/on_consume(var/mob/user, var/mob/target)
+	var/slot = target.get_inventory_slot(src)
 	if(!reagents.total_volume)
 		if(bitecount==1)
 			target.visible_message("<b>[target]</b> [is_liquid ? "drinks" : "eats"] \the [src].", SPAN_NOTICE("You [is_liquid ? "drink" : "eat"] \the [src]."))
 		else
 			target.visible_message("<b>[target]</b> finishes [is_liquid ? "drinking" : "eating"] \the [src].", SPAN_NOTICE("You finish [is_liquid ? "drinking" : "eating"] \the [src]."))
 		if(trash)
-			user.drop_from_inventory(src)	//so trash actually stays in the active hand.
-			var/obj/item/TrashItem = new trash(user)
-			user.put_in_hands(TrashItem)
+			if(slot)
+				user.drop_from_inventory(src)	//so trash actually stays in the active hand.
+				var/obj/item/TrashItem = new trash(user)
+				user.put_in_hands(TrashItem)
+			else
+				var/obj/item/TrashItem = new trash(user)
+				TrashItem.forceMove(get_turf(src))
 		qdel(src)