cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-26 06:29:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Ports echoes, makes thrown items always do sound, with volume being a difference if a force is present (#1235)

Browse Source 
* weh

* this maybe
This commit is contained in:
Azarak
2020-10-11 05:45:47 +01:00
committed by GitHub
parent a33e3fecf7
commit e628382e6b
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/sound.dm
+5 -1
View File
@@ -44,7 +44,8 @@
if(get_dist(M, turf_source) <= maxdistance)
M.playsound_local(turf_source, soundin, vol, vary, frequency, falloff, channel, pressure_affected, S)
/mob/proc/playsound_local(turf/turf_source, soundin, vol as num, vary, frequency, falloff, channel = 0, pressure_affected = TRUE, sound/S, distance_multiplier = 1)
///mob/proc/playsound_local(turf/turf_source, soundin, vol as num, vary, frequency, falloff, channel = 0, pressure_affected = TRUE, sound/S, distance_multiplier = 1) //ORIGINAL
/mob/proc/playsound_local(turf/turf_source, soundin, vol as num, vary, frequency, falloff, channel = 0, pressure_affected = TRUE, sound/S, distance_multiplier = 1 ,envwet = -10000, envdry = 0) //SKYRAT EDIT CHANGE - SOUND ECHO
if(!client || !can_hear())
return
@@ -54,6 +55,7 @@
S.wait = 0 //No queue
S.channel = channel || SSsounds.random_available_channel()
S.volume = vol
S.environment = 7 //SKYRAT CHANGE ADDITION - SOUND ECHO
if(vary)
if(frequency)
@@ -84,6 +86,8 @@
else //space
pressure_factor = 0
S.echo = list(envdry, null, envwet, null, null, null, null, null, null, null, null, null, null, 1, 1, 1, null, null) //SKYRAT CHANGE ADDITION - SOUND ECHO
if(distance <= 1)
pressure_factor = max(pressure_factor, 0.15) //touching the source of the sound
modular_skyrat/master_files/code/game/objects/items.dm
+1 -2
View File
@@ -1,4 +1,3 @@
/obj/item/after_throw()
. = ..()
if(throwforce)
playsound(loc, 'sound/weapons/punchmiss.ogg', 50, TRUE, -1)
playsound(loc, 'sound/weapons/punchmiss.ogg', (throwforce ? 50 : 25), TRUE, -1)