diff --git a/GainStation13/code/modules/mob/living/emote.dm b/GainStation13/code/modules/mob/living/emote.dm index f95c92c0..5a7ff82e 100644 --- a/GainStation13/code/modules/mob/living/emote.dm +++ b/GainStation13/code/modules/mob/living/emote.dm @@ -6,7 +6,7 @@ var/sound/noise = sound(gs13_get_sfx(noise_name)) for(var/mob/living/M in get_hearers_in_view(3, source)) if ((pref_toggle == 0) || (M.client && M.client.prefs.cit_toggles & pref_toggle)) - SEND_SOUND(M, noise) + M.playsound_local(source, noise_name, 50, 1, S = noise) /datum/emote/living/belch key = "belch" diff --git a/modular_citadel/code/modules/vore/eating/belly_obj_vr.dm b/modular_citadel/code/modules/vore/eating/belly_obj_vr.dm index dbd831f2..5a8c4001 100644 --- a/modular_citadel/code/modules/vore/eating/belly_obj_vr.dm +++ b/modular_citadel/code/modules/vore/eating/belly_obj_vr.dm @@ -171,10 +171,10 @@ //Sound w/ antispam flag setting if(is_wet && (world.time > recent_sound)) var/turf/source = get_turf(owner) - var/sound/eating = GLOB.vore_sounds[vore_sound] + var/sound/eating = sound(GLOB.vore_sounds[vore_sound]) for(var/mob/living/M in get_hearers_in_view(3, source)) if(M.client && M.client.prefs.cit_toggles & EATING_NOISES) - SEND_SOUND(M, eating) + M.playsound_local(source, vore_sound, 50, 1, S = eating) recent_sound = (world.time + 20 SECONDS) //Messages if it's a mob @@ -209,10 +209,12 @@ SEND_SIGNAL(L, COMSIG_ADD_MOOD_EVENT, "emptyprey", /datum/mood_event/emptyprey) AM.forceMove(destination) // Move the belly contents into the same location as belly's owner. count++ - for(var/mob/living/M in get_hearers_in_view(2, get_turf(owner))) + + var/turf/source = get_turf(owner) + var/sound/releasement = sound(GLOB.release_sounds[release_sound]) + for(var/mob/living/M in get_hearers_in_view(2, source)) if(M.client && (M.client.prefs.cit_toggles & EATING_NOISES)) - var/sound/releasement = GLOB.release_sounds[release_sound] - SEND_SOUND(M, releasement) + M.playsound_local(source, release_sound, 50, 1, S = releasement) //Clean up our own business items_preserved.Cut() @@ -236,10 +238,11 @@ M.forceMove(drop_location()) // Move the belly contents into the same location as belly's owner. items_preserved -= M if(!silent) - for(var/mob/living/H in get_hearers_in_view(2, get_turf(owner))) + var/turf/source = get_turf(owner) + var/sound/releasement = sound(GLOB.release_sounds[release_sound]) + for(var/mob/living/H in get_hearers_in_view(2, source)) if(H.client && (H.client.prefs.cit_toggles & EATING_NOISES)) - var/sound/releasement = GLOB.release_sounds[release_sound] - SEND_SOUND(H, releasement) + H.playsound_local(source, release_sound, 50, 1, S = releasement) if(istype(M,/mob/living)) var/mob/living/ML = M @@ -317,10 +320,10 @@ target.nom_mob(content, target.owner) if(!silent) var/turf/source = get_turf(owner) - var/sound/eating = GLOB.vore_sounds[vore_sound] + var/sound/eating = sound(GLOB.vore_sounds[vore_sound]) for(var/mob/living/M in get_hearers_in_view(3, source)) if(M.client && M.client.prefs.cit_toggles & EATING_NOISES) - SEND_SOUND(M, eating) + M.playsound_local(source, vore_sound, 50, 1, S = eating) owner.updateVRPanel() for(var/mob/living/M in contents) @@ -532,12 +535,12 @@ if(is_wet) for(var/mob/living/M in get_hearers_in_view(3, source)) if(M.client && M.client.prefs.cit_toggles & EATING_NOISES) - SEND_SOUND(M, struggle_snuggle) + M.playsound_local(source, "struggle_sound", 50, 1, S = struggle_snuggle) else for(var/mob/living/M in get_hearers_in_view(3, source)) if(M.client && M.client.prefs.cit_toggles & EATING_NOISES) - SEND_SOUND(M, struggle_rustle) + M.playsound_local(source, "rustle", 50, 1, S = struggle_rustle) var/list/watching = hearers(3, owner) for(var/mob/living/M in watching) diff --git a/modular_citadel/code/modules/vore/eating/living_vr.dm b/modular_citadel/code/modules/vore/eating/living_vr.dm index d9adde04..cef40860 100644 --- a/modular_citadel/code/modules/vore/eating/living_vr.dm +++ b/modular_citadel/code/modules/vore/eating/living_vr.dm @@ -162,13 +162,6 @@ // If we got this far, nom successful! Announce it! user.visible_message(success_msg) - // incredibly contentious eating noises time - var/turf/source = get_turf(user) - var/sound/eating = GLOB.vore_sounds[belly.vore_sound] - for(var/mob/living/M in get_hearers_in_view(3, source)) - if(M.client && M.client.prefs.cit_toggles & EATING_NOISES) - SEND_SOUND(M, eating) - // Actually shove prey into the belly. belly.nom_mob(prey, user) stop_pulling()