diff --git a/code/game/objects/items/grenades/chem_grenade.dm b/code/game/objects/items/grenades/chem_grenade.dm index c3691b5d376..3bed434bf83 100644 --- a/code/game/objects/items/grenades/chem_grenade.dm +++ b/code/game/objects/items/grenades/chem_grenade.dm @@ -165,15 +165,17 @@ /obj/item/grenade/chem_grenade/log_grenade(mob/user, turf/T) ..() + var/reagent_string = "" + var/beaker_number = 1 for(var/obj/exploded_beaker in beakers) if(!exploded_beaker.reagents) continue - var/reagent_list = pretty_string_from_reagent_list(exploded_beaker.reagents) - var/message = "[src] primed by [user] at [ADMIN_VERBOSEJMP(T)] contained [reagent_list]." - GLOB.bombers += message - message_admins(message) - log_game("[src] primed by [user] at [AREACOORD(T)] contained [reagent_list].") - add_logs(user, src, "primed", addition = "[reagent_list] inside.") + reagent_string += "[exploded_beaker][beaker_number++] :" + pretty_string_from_reagent_list(exploded_beaker.reagents.reagent_list) + ";" + var/message = "[src] primed by [user] at [ADMIN_VERBOSEJMP(T)] contained [reagent_string]." + GLOB.bombers += message + message_admins(message) + log_game("[src] primed by [user] at [AREACOORD(T)] contained [reagent_string].") + add_logs(user, src, "primed", addition = "[reagent_string] inside.") /obj/item/grenade/chem_grenade/prime() if(stage != READY) diff --git a/code/modules/reagents/chemistry/reagents.dm b/code/modules/reagents/chemistry/reagents.dm index 86aaa16cd7b..33437a63fc2 100644 --- a/code/modules/reagents/chemistry/reagents.dm +++ b/code/modules/reagents/chemistry/reagents.dm @@ -115,10 +115,10 @@ to_chat(M, "You're not feeling good at all! You really need some [name].") return -/proc/pretty_string_from_reagent_list(var/list/reagent_list) +/proc/pretty_string_from_reagent_list(list/reagent_list) //Convert reagent list to a printable string for logging etc - var/result = "| " + var/list/rs = list() for (var/datum/reagent/R in reagent_list) - result += "[R.name], [R.volume] | " + rs += "[R.name], [R.volume]" - return result + return rs.Join(" | ")