From ffb685b2f112ef15bb9a775d9479f4b956f6f1a6 Mon Sep 17 00:00:00 2001 From: Fox-McCloud Date: Mon, 1 Aug 2016 22:28:37 -0400 Subject: [PATCH] Sound Defines --- code/__DEFINES/atmospherics.dm | 5 +---- code/__DEFINES/misc.dm | 6 +++++- code/game/sound.dm | 2 -- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/code/__DEFINES/atmospherics.dm b/code/__DEFINES/atmospherics.dm index 339b00714f7..d2988a6474f 100644 --- a/code/__DEFINES/atmospherics.dm +++ b/code/__DEFINES/atmospherics.dm @@ -114,7 +114,4 @@ // Atmos pipe limits #define MAX_OUTPUT_PRESSURE 4500 // (kPa) What pressure pumps and powered equipment max out at. -#define MAX_TRANSFER_RATE 200 // (L/s) Maximum speed powered equipment can work at. - -// Sound Limits -#define SOUND_MINIMUM_PRESSURE 10 \ No newline at end of file +#define MAX_TRANSFER_RATE 200 // (L/s) Maximum speed powered equipment can work at. \ No newline at end of file diff --git a/code/__DEFINES/misc.dm b/code/__DEFINES/misc.dm index ff0b5bf72fa..122c0a041e7 100644 --- a/code/__DEFINES/misc.dm +++ b/code/__DEFINES/misc.dm @@ -278,4 +278,8 @@ #define LAVA_PROOF -2 #define FIRE_PROOF -1 #define FLAMMABLE 0 -#define ON_FIRE 1 \ No newline at end of file +#define ON_FIRE 1 + +// Sound +#define SOUND_MINIMUM_PRESSURE 10 +#define FALLOFF_SOUNDS 0.5 \ No newline at end of file diff --git a/code/game/sound.dm b/code/game/sound.dm index 915bc60f509..fe5e361f16a 100644 --- a/code/game/sound.dm +++ b/code/game/sound.dm @@ -39,8 +39,6 @@ var/list/ricochet = list('sound/weapons/effects/ric1.ogg', 'sound/weapons/effect if(T && T.z == turf_source.z) M.playsound_local(turf_source, soundin, vol, vary, frequency, falloff, is_global, S) -var/const/FALLOFF_SOUNDS = 0.5 - /mob/proc/playsound_local(var/turf/turf_source, soundin, vol as num, vary, frequency, falloff, is_global, sound/S) if(!src.client || ear_deaf > 0) return