diff --git a/code/game/objects/items/grenades/chem_grenade.dm b/code/game/objects/items/grenades/chem_grenade.dm
index 7a0c5fd8dfc..634178b3648 100644
--- a/code/game/objects/items/grenades/chem_grenade.dm
+++ b/code/game/objects/items/grenades/chem_grenade.dm
@@ -29,18 +29,21 @@
display_timer = (stage == READY && !nadeassembly) //show/hide the timer based on assembly state
..()
if(user.can_see_reagents())
- var/count = 0
if(beakers.len)
to_chat(user, "You scan the grenade and detect the following reagents:")
for(var/obj/item/reagent_containers/glass/G in beakers)
- var/textcount = thtotext(++count)
for(var/datum/reagent/R in G.reagents.reagent_list)
- to_chat(user, "[R.volume] units of [R.name] in the [textcount] beaker.")
+ to_chat(user, "[R.volume] units of [R.name] in the [G.name].")
if(beakers.len == 1)
to_chat(user, "You detect no second beaker in the grenade.")
else
to_chat(user, "You scan the grenade, but detect nothing.")
-
+ else if(stage != READY && beakers.len)
+ if(beakers.len == 2 && beakers[1].name == beakers[2].name)
+ to_chat(user, "You see two [beakers[1].name]s inside the grenade.")
+ else
+ for(var/obj/item/reagent_containers/glass/G in beakers)
+ to_chat(user, "You see a [G.name] inside the grenade.")
/obj/item/grenade/chem_grenade/attack_self(mob/user)
if(stage == READY && !active)
@@ -49,7 +52,6 @@
else
..()
-
/obj/item/grenade/chem_grenade/attackby(obj/item/I, mob/user, params)
if(istype(I, /obj/item/screwdriver))
if(stage == WIRED)