diff --git a/code/game/machinery/dance_machine.dm b/code/game/machinery/dance_machine.dm
index cf18a99875..3e36776773 100644
--- a/code/game/machinery/dance_machine.dm
+++ b/code/game/machinery/dance_machine.dm
@@ -85,7 +85,7 @@
 		return
 	if(!allowed(user))
 		to_chat(user,"<span class='warning'>Error: Access Denied - Message: Only the engineering department can be trusted with this kind of power.</span>")
-		playsound_local(src,'sound/misc/compiler-failure.ogg', 25, 1)
+		user.playsound_local(src,'sound/misc/compiler-failure.ogg', 25, 1)
 		return
 	if(!Adjacent(user) && !isAI(user))
 		return
diff --git a/code/game/objects/effects/step_triggers.dm b/code/game/objects/effects/step_triggers.dm
index 63b5075cc7..6bd4db9a8d 100644
--- a/code/game/objects/effects/step_triggers.dm
+++ b/code/game/objects/effects/step_triggers.dm
@@ -183,8 +183,9 @@
 	if(!T)
 		return
 
-	if(triggerer_only)
-		A.playsound_local(T, sound, volume, freq_vary)
+	if(triggerer_only && ismob(A))
+		var/mob/B = A
+		B.playsound_local(T, sound, volume, freq_vary)
 	else
 		playsound(T, sound, volume, freq_vary, extra_range)
 
diff --git a/code/game/sound.dm b/code/game/sound.dm
index 448f3cd85b..af5394ea2a 100644
--- a/code/game/sound.dm
+++ b/code/game/sound.dm
@@ -23,10 +23,10 @@
 			if(T && T.z == turf_source.z)
 				M.playsound_local(turf_source, soundin, vol, vary, frequency, falloff, surround, channel, pressure_affected)
 
-/atom/proc/playsound_direct(soundin, vol as num, vary,  frequency, falloff, surround = TRUE, channel = 0, pressure_affected = FALSE)
-	playsound_local(get_turf(src), soundin, vol, vary, frequency, falloff, surround, channel)
+/mob/proc/playsound_local(turf/turf_source, soundin, vol as num, vary, frequency, falloff, surround = 1, channel = 0, pressure_affected = TRUE)
+	if(!client || !can_hear())
+		return
 
-/atom/proc/playsound_local(turf/turf_source, soundin, vol as num, vary, frequency, falloff, surround = 1, channel = 0, pressure_affected = TRUE)
 	soundin = get_sfx(soundin)
 
 	var/sound/S = sound(soundin)
@@ -76,15 +76,10 @@
 
 		// The y value is for above your head, but there is no ceiling in 2d spessmens.
 		S.y = 1
-		S.falloff = (falloff ? falloff : FALLOFF_SOUNDS)
+		S.falloff = falloff || FALLOFF_SOUNDS
 
 	src << S
 
-/mob/playsound_local(turf/turf_source, soundin, vol as num, vary, frequency, falloff, surround = 1, channel = 0, pressure_affected = TRUE)
-	if(!client || !can_hear())
-		return
-	..()
-
 /proc/open_sound_channel()
 	var/static/next_channel = 1	//loop through the available 1024 - (the ones we reserve) channels and pray that its not still being used
 	. = ++next_channel
diff --git a/code/modules/flufftext/Hallucination.dm b/code/modules/flufftext/Hallucination.dm
index 4c1328a38b..9710098c5f 100644
--- a/code/modules/flufftext/Hallucination.dm
+++ b/code/modules/flufftext/Hallucination.dm
@@ -356,9 +356,9 @@ Gunshots/explosions/opening doors/less rare audio (done)
 			for(var/i=0,i<hits,i++)
 				target.playsound_local(null, 'sound/weapons/Laser.ogg', 25, 1)
 				if(prob(75))
-					addtimer(CALLBACK(target, /atom/.proc/playsound_local, null, 'sound/weapons/sear.ogg', 25, 1), rand(10,20))
+					addtimer(CALLBACK(target, /mob/.proc/playsound_local, null, 'sound/weapons/sear.ogg', 25, 1), rand(10,20))
 				else
-					addtimer(CALLBACK(target, /atom/.proc/playsound_local, null, 'sound/weapons/effects/searwall.ogg', 25, 1), rand(10,20))
+					addtimer(CALLBACK(target, /mob/.proc/playsound_local, null, 'sound/weapons/effects/searwall.ogg', 25, 1), rand(10,20))
 				sleep(rand(CLICK_CD_RANGE, CLICK_CD_RANGE + 8))
 			target.playsound_local(null, get_sfx("bodyfall"), 25, 1)
 		if(2) //Esword fight
@@ -372,9 +372,9 @@ Gunshots/explosions/opening doors/less rare audio (done)
 			for(var/i=0,i<hits,i++)
 				target.playsound_local(null, get_sfx("gunshot"), 25)
 				if(prob(75))
-					addtimer(CALLBACK(target, /atom/.proc/playsound_local, null, 'sound/weapons/pierce.ogg', 25, 1), rand(10,20))
+					addtimer(CALLBACK(target, /mob/.proc/playsound_local, null, 'sound/weapons/pierce.ogg', 25, 1), rand(10,20))
 				else
-					addtimer(CALLBACK(target, /atom/.proc/playsound_local, null, "ricochet", 25, 1), rand(10,20))
+					addtimer(CALLBACK(target, /mob/.proc/playsound_local, null, "ricochet", 25, 1), rand(10,20))
 				sleep(rand(CLICK_CD_RANGE, CLICK_CD_RANGE + 8))
 			target.playsound_local(null, get_sfx("bodyfall"), 25, 1)
 		if(4) //Stunprod + cablecuff
diff --git a/code/modules/vore/eating/belly_vr.dm b/code/modules/vore/eating/belly_vr.dm
index 54088ad226..d5c484d387 100644
--- a/code/modules/vore/eating/belly_vr.dm
+++ b/code/modules/vore/eating/belly_vr.dm
@@ -290,7 +290,7 @@
 	R.visible_message( "<span class='alert'>[struggle_outer_message]</span>", "<span class='alert'>[struggle_user_message]</span>")
 	playsound(get_turf(owner),"struggle_sound",75,0,-5,1,channel=51)
 	R.stop_sound_channel(51)
-	R.playsound_direct("prey_struggle_sound",60)
+	R.playsound_local("prey_struggle_sound",60)
 
 	if(escapable && R.a_intent != "help") //If the stomach has escapable enabled and the person is actually trying to kick out
 		to_chat(R, "<span class='warning'>You attempt to climb out of \the [name].</span>")
diff --git a/code/modules/vore/eating/bellymodes_vr.dm b/code/modules/vore/eating/bellymodes_vr.dm
index 12dd76a3fd..1438f5b027 100644
--- a/code/modules/vore/eating/bellymodes_vr.dm
+++ b/code/modules/vore/eating/bellymodes_vr.dm
@@ -23,7 +23,7 @@
 				M.stop_sound_channel(CHANNEL_PRED)
 				playsound(get_turf(owner),"digest_pred",75,0,-6,1,channel=CHANNEL_PRED)
 				M.stop_sound_channel(CHANNEL_PRED)
-				M.playsound_direct("digest_prey",60)
+				M.playsound_local("digest_prey",60)
 
 			//Pref protection!
 			if (!M.digestable)
@@ -51,7 +51,7 @@
 				M.stop_sound_channel(CHANNEL_PRED)
 				playsound(get_turf(owner),"death_pred",50,0,-6,1,channel=CHANNEL_PRED)
 				M.stop_sound_channel(CHANNEL_PRED)
-				M.playsound_direct("death_prey",60)
+				M.playsound_local("death_prey",60)
 				digestion_death(M)
 				owner.update_icons()
 				continue
@@ -70,7 +70,7 @@
 				M.stop_sound_channel(CHANNEL_PRED)
 				playsound(get_turf(owner),"digest_pred",50,0,-6,1,channel=CHANNEL_PRED)
 				M.stop_sound_channel(CHANNEL_PRED)
-				M.playsound_direct("digest_prey",60)
+				M.playsound_local("digest_prey",60)
 
 			if(M.stat != DEAD)
 				if(owner.nutrition >= NUTRITION_LEVEL_STARVING && (M.health < M.maxHealth))