cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-25 06:00:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #38609 from AnturK/missedthatinreviewwhoops

Browse Source 
Fixes chemnade logging and cleans up the reagent stringify helper
This commit is contained in:
Jordan Brown
2018-06-20 10:26:18 -04:00
committed by GitHub
parent afbfaf4649 4dcfded622
commit cb0f3a8a6f
2 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/grenades/chem_grenade.dm
+8 -6
View File
@@ -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)