From 7f997a6a6d6cafee36b0bf5771cd6bf9305dc943 Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Thu, 14 Dec 2017 15:00:23 -0500 Subject: [PATCH 1/2] Adds feedback for explosions (#33511) * Adds feedback for explosions * Remove stray quote * Fixes + flash and flame --- code/datums/explosion.dm | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/code/datums/explosion.dm b/code/datums/explosion.dm index 51844567cc..b71c560193 100644 --- a/code/datums/explosion.dm +++ b/code/datums/explosion.dm @@ -85,9 +85,16 @@ GLOBAL_LIST_EMPTY(explosions) var/max_range = max(devastation_range, heavy_impact_range, light_impact_range, flame_range) + var/area/epi_area = get_area(epicenter) if(adminlog) - message_admins("Explosion with size ([devastation_range], [heavy_impact_range], [light_impact_range], [flame_range]) in area: [get_area(epicenter)] [ADMIN_COORDJMP(epicenter)]") + message_admins("Explosion with size ([devastation_range], [heavy_impact_range], [light_impact_range], [flame_range]) in area: [epi_area] [ADMIN_COORDJMP(epicenter)]") log_game("Explosion with size ([devastation_range], [heavy_impact_range], [light_impact_range], [flame_range]) in area [epicenter.loc.name] ([epicenter.x],[epicenter.y],[epicenter.z])") + + var/x0 = epicenter.x + var/y0 = epicenter.y + var/z0 = epicenter.z + + SSblackbox.record_feedback("associative", "explosion", 1, list("dev" = devastation_range, "heavy" = heavy_impact_range, "light" = light_impact_range, "flash" = flash_range, "flame" = flame_range, "orig_dev" = orig_dev_range, "orig_heavy" = orig_heavy_range, "orig_light" = orig_light_range, "x" = x0, "y" = y0, "z" = z0, "area" = epi_area.type)) // Play sounds; we want sounds to be different depending on distance so we will manually do it ourselves. // Stereo users will also hear the direction of the explosion! @@ -99,10 +106,6 @@ GLOBAL_LIST_EMPTY(explosions) far_dist += heavy_impact_range * 5 far_dist += devastation_range * 20 - var/x0 = epicenter.x - var/y0 = epicenter.y - var/z0 = epicenter.z - if(!silent) var/frequency = get_rand_frequency() var/sound/explosion_sound = sound(get_sfx("explosion"))