From e769858a731790db15b6515f443258952497f13c Mon Sep 17 00:00:00 2001 From: unusualcrow Date: Wed, 28 Dec 2016 11:08:28 -0500 Subject: [PATCH 1/4] aaaaaa --- code/game/objects/explosion.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/objects/explosion.dm b/code/game/objects/explosion.dm index a3b79f41a1..179d223dd7 100644 --- a/code/game/objects/explosion.dm +++ b/code/game/objects/explosion.dm @@ -64,14 +64,14 @@ else if(dist <= far_dist) var/far_volume = Clamp(far_dist, 30, 50) // Volume is based on explosion size and dist far_volume += (dist <= far_dist * 0.5 ? 50 : 0) // add 50 volume if the mob is pretty close to the explosion - if(devastation_range > 0) + if(devastation_range > 2) M.playsound_local(epicenter, 'sound/effects/explosionfar.ogg', far_volume, 1, frequency, falloff = 5) shake_camera(M, 3, 1) else M.playsound_local(epicenter, 'sound/effects/explosionsmallfar.ogg', far_volume, 1, frequency, falloff = 5) skip_shake = 1 - if(!explosion_shake_message_cooldown && devastation_range > 0 && !skip_shake) + if(!explosion_shake_message_cooldown && devastation_range > 2 && !skip_shake) M << "You feel the station's structure shaking all around you." explosion_shake_message_cooldown = 1 spawn(50) From d188a67dd936d3cfcd13fbfea802b8922f34c680 Mon Sep 17 00:00:00 2001 From: unusualcrow Date: Thu, 29 Dec 2016 14:43:00 -0500 Subject: [PATCH 2/4] rhwrswrhw --- code/game/objects/explosion.dm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/code/game/objects/explosion.dm b/code/game/objects/explosion.dm index 179d223dd7..d63bd6c5d8 100644 --- a/code/game/objects/explosion.dm +++ b/code/game/objects/explosion.dm @@ -71,8 +71,11 @@ M.playsound_local(epicenter, 'sound/effects/explosionsmallfar.ogg', far_volume, 1, frequency, falloff = 5) skip_shake = 1 - if(!explosion_shake_message_cooldown && devastation_range > 2 && !skip_shake) - M << "You feel the station's structure shaking all around you." + if(!explosion_shake_message_cooldown && devastation_range > 1 && !skip_shake && M.stat == CONSCIOUS && !istype(get_turf(M), /turf/open/space)) + if(istype(get_turf(M), /turf/open/floor/plasteel/asteroid)) + M << "You feel the ground shaking below you." + else + M << "You feel the station's structure shaking all around you." explosion_shake_message_cooldown = 1 spawn(50) explosion_shake_message_cooldown = 0 From 925f918e9bf2214e52df02da8e59add4572c5239 Mon Sep 17 00:00:00 2001 From: unusualcrow Date: Thu, 29 Dec 2016 14:43:51 -0500 Subject: [PATCH 3/4] aaaaa --- code/game/objects/explosion.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/explosion.dm b/code/game/objects/explosion.dm index d63bd6c5d8..1e1eebda34 100644 --- a/code/game/objects/explosion.dm +++ b/code/game/objects/explosion.dm @@ -64,7 +64,7 @@ else if(dist <= far_dist) var/far_volume = Clamp(far_dist, 30, 50) // Volume is based on explosion size and dist far_volume += (dist <= far_dist * 0.5 ? 50 : 0) // add 50 volume if the mob is pretty close to the explosion - if(devastation_range > 2) + if(devastation_range > 1) M.playsound_local(epicenter, 'sound/effects/explosionfar.ogg', far_volume, 1, frequency, falloff = 5) shake_camera(M, 3, 1) else From e3d39e7ccba135eef34a8cb7f803cd30298a80c4 Mon Sep 17 00:00:00 2001 From: unusualcrow Date: Thu, 29 Dec 2016 14:48:55 -0500 Subject: [PATCH 4/4] nice --- code/game/objects/explosion.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/explosion.dm b/code/game/objects/explosion.dm index 1e1eebda34..c44563cf95 100644 --- a/code/game/objects/explosion.dm +++ b/code/game/objects/explosion.dm @@ -72,7 +72,7 @@ skip_shake = 1 if(!explosion_shake_message_cooldown && devastation_range > 1 && !skip_shake && M.stat == CONSCIOUS && !istype(get_turf(M), /turf/open/space)) - if(istype(get_turf(M), /turf/open/floor/plasteel/asteroid)) + if(istype(get_turf(M), /turf/open/floor/plasteel/asteroid | /turf/open/floor/plating/ash)) M << "You feel the ground shaking below you." else M << "You feel the station's structure shaking all around you."