From 96d006f551e78e5118da2bac4bc9fe379ce74df0 Mon Sep 17 00:00:00 2001 From: raspy-on-osu Date: Thu, 27 Aug 2020 23:48:19 -0400 Subject: [PATCH] oops --- code/datums/explosion.dm | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/code/datums/explosion.dm b/code/datums/explosion.dm index 2de7d2da7d..8c8906a95d 100644 --- a/code/datums/explosion.dm +++ b/code/datums/explosion.dm @@ -106,21 +106,20 @@ GLOBAL_LIST_EMPTY(explosions) far_dist += heavy_impact_range * 15 //from skyrat13/pull/3295; carry further far_dist += devastation_range * 20 - // skyrat-ss13/skyrat13/pull/3295 - var/sound/creaking_explosion_sound = sound(get_sfx("explosion_creaking")) - var/sound/hull_creaking_sound = sound(get_sfx("hull_creaking")) - var/sound/explosion_echo_sound = sound('sound/effects/explosion_distant.ogg') - var/on_station = SSmapping.level_trait(epicenter.z, ZTRAIT_STATION) - var/creaking_explosion = FALSE - - if(prob(devastation_range*30+heavy_impact_range*5) && on_station) // Huge explosions are near guaranteed to make the station creak and whine, smaller ones might. - creaking_explosion = TRUE // prob over 100 always returns true - // end port - if(!silent) var/frequency = get_rand_frequency() var/sound/explosion_sound = sound(get_sfx("explosion")) var/sound/far_explosion_sound = sound('sound/effects/explosionfar.ogg') + // skyrat-ss13/skyrat13/pull/3295 + var/sound/creaking_explosion_sound = sound(get_sfx("explosion_creaking")) + var/sound/hull_creaking_sound = sound(get_sfx("hull_creaking")) + var/sound/explosion_echo_sound = sound('sound/effects/explosion_distant.ogg') + var/on_station = SSmapping.level_trait(epicenter.z, ZTRAIT_STATION) + var/creaking_explosion = FALSE + + if(prob(devastation_range*30+heavy_impact_range*5) && on_station) // Huge explosions are near guaranteed to make the station creak and whine, smaller ones might. + creaking_explosion = TRUE // prob over 100 always returns true + // end port for(var/mob/M in GLOB.player_list) // Double check for client