Merge pull request #5286 from Fox-McCloud/sound-defines

Sound Defines
This commit is contained in:
TheDZD
2016-08-02 13:34:42 -04:00
committed by GitHub
3 changed files with 6 additions and 7 deletions
+1 -4
View File
@@ -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
#define MAX_TRANSFER_RATE 200 // (L/s) Maximum speed powered equipment can work at.
+5 -1
View File
@@ -278,4 +278,8 @@
#define LAVA_PROOF -2
#define FIRE_PROOF -1
#define FLAMMABLE 0
#define ON_FIRE 1
#define ON_FIRE 1
// Sound
#define SOUND_MINIMUM_PRESSURE 10
#define FALLOFF_SOUNDS 0.5
-2
View File
@@ -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