diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm
index 6a95380db4c..c4ffae25ca8 100644
--- a/code/game/objects/items/devices/scanners.dm
+++ b/code/game/objects/items/devices/scanners.dm
@@ -379,10 +379,11 @@ BREATH ANALYZER
break
var/dat = "Trace Chemicals Found: "
for(var/R in blood_traces)
+ var/datum/reagent/C = new R()
if(details)
- dat += "[R] ([blood_traces[R]] units) "
+ dat += "[C] ([blood_traces[R]] units) "
else
- dat += "[R] "
+ dat += "[C] "
to_chat(user, "[dat]")
reagents.clear_reagents()
return
diff --git a/code/modules/mob/living/carbon/alien/diona/diona_nymph.dm b/code/modules/mob/living/carbon/alien/diona/diona_nymph.dm
index db84c75aba0..4b502d5502d 100644
--- a/code/modules/mob/living/carbon/alien/diona/diona_nymph.dm
+++ b/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'
diff --git a/code/modules/reagents/reagent_containers/food.dm b/code/modules/reagents/reagent_containers/food.dm
index 253c163b7cf..7f369edd2e5 100644
--- a/code/modules/reagents/reagent_containers/food.dm
+++ b/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("[target] [is_liquid ? "drinks" : "eats"] \the [src].", SPAN_NOTICE("You [is_liquid ? "drink" : "eat"] \the [src]."))
else
target.visible_message("[target] 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)
diff --git a/html/changelogs/annoiances_fix.yml b/html/changelogs/annoiances_fix.yml
new file mode 100644
index 00000000000..ac322e182eb
--- /dev/null
+++ b/html/changelogs/annoiances_fix.yml
@@ -0,0 +1,8 @@
+author: Sparky_Hotdog
+
+delete-after: True
+
+changes:
+ - bugfix: "You no longer pick up or drop plates and bowls when you finish them with cutlery."
+ - bugfix: "Mass spectrometers now show the IC name for any reagents, not their object path."
+ - bugfix: "Diona nymphs now have the default diona accent."