mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-30 00:29:02 +01:00
Merge pull request #38609 from AnturK/missedthatinreviewwhoops
Fixes chemnade logging and cleans up the reagent stringify helper
This commit is contained in:
@@ -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)
|
||||
|
||||
@@ -115,10 +115,10 @@
|
||||
to_chat(M, "<span class='boldannounce'>You're not feeling good at all! You really need some [name].</span>")
|
||||
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(" | ")
|
||||
|
||||
Reference in New Issue
Block a user