Skip to content

Commit

Permalink
upd
Browse files Browse the repository at this point in the history
  • Loading branch information
definitelynotspaghetti committed Dec 9, 2024
1 parent 608b402 commit 51d85e6
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
8 changes: 4 additions & 4 deletions code/datums/autocells/explosion.dm
Original file line number Diff line number Diff line change
Expand Up @@ -285,16 +285,16 @@ as having entered the turf.
if(mob_turf?.z == epicenter.z)
var/dist = get_dist(mob_turf, epicenter)
if(dist <= max(round(power, 1)))
our_mob.playsound_local(epicenter, null, 75, 1, frequency, falloff = 5, S = explosion_sound)
our_mob.playsound_local(epicenter, null, 75, 1, frequency, falloff = 5, sound_to_use = explosion_sound)
if(is_mainship_level(epicenter.z))
our_mob.playsound_local(epicenter, null, 40, 1, frequency, falloff = 5, S = creak_sound)//ship groaning under explosion effect
our_mob.playsound_local(epicenter, null, 40, 1, frequency, falloff = 5, sound_to_use = creak_sound)//ship groaning under explosion effect
// You hear a far explosion if you're outside the blast radius. Small bombs shouldn't be heard all over the station.
else if(dist <= far_dist)
var/far_volume = clamp(far_dist, 30, 60) // 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
our_mob.playsound_local(epicenter, null, far_volume, 1, frequency, falloff = 5, S = far_explosion_sound)
our_mob.playsound_local(epicenter, null, far_volume, 1, frequency, falloff = 5, sound_to_use = far_explosion_sound)
if(is_mainship_level(epicenter.z))
our_mob.playsound_local(epicenter, null, far_volume * 3, 1, frequency, falloff = 5, S = creak_sound)//ship groaning under explosion effect
our_mob.playsound_local(epicenter, null, far_volume * 3, 1, frequency, falloff = 5, sound_to_use = creak_sound)//ship groaning under explosion effect
if(!orig_range)
orig_range = round(power / falloff)
new /obj/effect/temp_visual/explosion(epicenter, orig_range, color, power)
Expand Down
2 changes: 1 addition & 1 deletion code/modules/instruments/songs/play_legacy.dm
Original file line number Diff line number Diff line change
Expand Up @@ -84,5 +84,5 @@
var/mob/M = i
if(M?.client?.prefs?.toggles_sound & SOUND_INSTRUMENTS_OFF)
continue
M.playsound_local(source, null, volume * using_instrument.volume_multiplier, S = music_played)
M.playsound_local(source, null, volume * using_instrument.volume_multiplier, sound_to_use = music_played)
// Could do environment and echo later but not for now
4 changes: 2 additions & 2 deletions code/modules/mob/living/silicon/ai/freelook/eye.dm
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@
/mob/camera/aiEye/proc/unregister_facedir_signals(mob/user)
UnregisterSignal(user, list(COMSIG_KB_MOB_FACENORTH_DOWN, COMSIG_KB_MOB_FACEEAST_DOWN, COMSIG_KB_MOB_FACESOUTH_DOWN, COMSIG_KB_MOB_FACEWEST_DOWN))

/mob/camera/aiEye/playsound_local(turf/turf_source, soundin, vol, vary, frequency, falloff, is_global, channel, sound/S, distance_multiplier, mob/sound_reciever)
/mob/camera/aiEye/playsound_local(turf/turf_source, soundin, vol, vary, frequency, falloff, is_global, channel, sound/sound_to_use, distance_multiplier, mob/sound_reciever)
if(istype(parent_cameranet) && !parent_cameranet.checkTurfVis(get_turf(src)))
return
return ..(turf_source, soundin, vol, vary, frequency, falloff, is_global, channel, S, distance_multiplier, ai)
return ..(turf_source, soundin, vol, vary, frequency, falloff, is_global, channel, sound_to_use, distance_multiplier, ai)

0 comments on commit 51d85e6

Please sign in to comment.