Sounds no longer go through walls by default.

code/__DEFINES/sound.dm

@@ -26,6 +26,8 @@
 #define SOUND_DEFAULT_FALLOFF_DISTANCE 1 //For a normal sound this would be 1 tile of no falloff
 ///The default exponent of sound falloff
 #define SOUND_FALLOFF_EXPONENT 6
+/// When a sound is from a non-visible source, add this many turfs to the distance between the source and the hearer
+#define SOUND_OCCLUSION_DISTANCE_MODIFIER 3
 
 //#define SOUND_MINIMUM_PRESSURE 10
 

code/__HELPERS/honkerblast.dm

@@ -5,7 +5,7 @@
 	var/list/properly_honked = list()
 	var/list/severely_honked = list()
 
-	playsound(origin_turf, 'sound/items/airhorn.ogg', 100, TRUE)
+	playsound(origin_turf, 'sound/items/airhorn.ogg', 100, TRUE, ignore_walls = 'sound/items/airhorn.ogg')
 
 	for(var/mob/living/carbon/victim as anything in hearers(max(light_range, medium_range, heavy_range), origin_turf))
 		if(!victim.can_hear())

code/_onclick/item_attack.dm

@@ -201,11 +201,12 @@
 
 	user.do_attack_animation(M)
 	var/attack_return = M.attacked_by(src, user)
+	var/hitsound = get_hitsound()
 	switch(attack_return)
 		if(MOB_ATTACKEDBY_NO_DAMAGE)
 			playsound(loc, 'sound/weapons/tap.ogg', get_clamped_volume(), TRUE, -1)
 		if(MOB_ATTACKEDBY_SUCCESS)
-			playsound(loc, get_hitsound(), get_clamped_volume(), TRUE, extrarange = stealthy_audio ? SILENCED_SOUND_EXTRARANGE : -1, falloff_distance = 0)
+			playsound(loc, hitsound, get_clamped_volume(), TRUE, extrarange = stealthy_audio ? SILENCED_SOUND_EXTRARANGE : -1, falloff_distance = 0, ignore_walls = hitsound)
 		if(MOB_ATTACKEDBY_MISS)
 			playsound(loc, get_misssound(), get_clamped_volume(), TRUE, extrarange = stealthy_audio ? SILENCED_SOUND_EXTRARANGE : -1)
 

code/datums/actions/mobs/blood_warp.dm

@@ -50,9 +50,9 @@
 		found_bloodpool = pick(pools)
 	if(found_bloodpool)
 		owner.visible_message("<span class='danger'>[owner] sinks into the blood...</span>")
-		playsound(get_turf(owner), 'sound/magic/enter_blood.ogg', 100, TRUE, -1)
+		playsound(get_turf(owner), 'sound/magic/enter_blood.ogg', 100, TRUE, -1, ignore_walls = 'sound/magic/enter_blood.ogg')
 		owner.forceMove(get_turf(found_bloodpool))
-		playsound(get_turf(owner), 'sound/magic/exit_blood.ogg', 100, TRUE, -1)
+		playsound(get_turf(owner), 'sound/magic/exit_blood.ogg', 100, TRUE, -1, ignore_walls = 'sound/magic/exit_blood.ogg')
 		owner.visible_message("<span class='danger'>And springs back out!</span>")
 		SEND_SIGNAL(owner, COMSIG_BLOOD_WARP)
 		return TRUE

code/datums/actions/mobs/charge.dm

@@ -127,7 +127,7 @@
 
 /datum/action/cooldown/mob_cooldown/charge/proc/on_moved(atom/source)
 	SIGNAL_HANDLER
-	playsound(source, 'sound/effects/meteorimpact.ogg', 200, TRUE, 2, TRUE)
+	playsound(source, 'sound/effects/meteorimpact.ogg', 200, TRUE, 2, TRUE, ignore_walls = 'sound/effects/meteorimpact.ogg')
 	INVOKE_ASYNC(src, PROC_REF(DestroySurroundings), source)
 
 /datum/action/cooldown/mob_cooldown/charge/proc/DestroySurroundings(atom/movable/charger)

code/datums/actions/mobs/projectileattack.dm

@@ -139,7 +139,7 @@
 		if(counter < 1)
 			counter = 16
 		shoot_projectile(firer, target, counter * 22.5, firer, null, null)
-		playsound(get_turf(firer), projectile_sound, 20, TRUE)
+		playsound(get_turf(firer), projectile_sound, 20, TRUE, ignore_walls = projectile_sound)
 		SLEEP_CHECK_DEATH(0.1 SECONDS, firer)
 
 /datum/action/cooldown/mob_cooldown/projectile_attack/random_aoe
@@ -153,7 +153,7 @@
 
 /datum/action/cooldown/mob_cooldown/projectile_attack/random_aoe/attack_sequence(mob/living/firer, atom/target)
 	var/turf/U = get_turf(firer)
-	playsound(U, projectile_sound, 300, TRUE, 5)
+	playsound(U, projectile_sound, 300, TRUE, 5, ignore_walls = projectile_sound)
 	for(var/i in 1 to 32)
 		shoot_projectile(firer, target, rand(0, 360), firer, null, null)
 
@@ -176,7 +176,7 @@
 	fire_shotgun(firer, target, shot_angles)
 
 /datum/action/cooldown/mob_cooldown/projectile_attack/shotgun_blast/proc/fire_shotgun(mob/living/firer, atom/target, list/chosen_angles)
-	playsound(firer, projectile_sound, 200, TRUE, 2)
+	playsound(firer, projectile_sound, 200, TRUE, 2, ignore_walls = projectile_sound)
 	for(var/spread in chosen_angles)
 		shoot_projectile(firer, target, null, firer, spread, null)
 
@@ -217,7 +217,7 @@
 /datum/action/cooldown/mob_cooldown/projectile_attack/dir_shots/proc/fire_in_directions(mob/living/firer, atom/target, list/dirs)
 	if(!islist(dirs))
 		dirs = GLOB.alldirs.Copy()
-	playsound(firer, projectile_sound, 200, TRUE, 2)
+	playsound(firer, projectile_sound, 200, TRUE, 2, ignore_walls = projectile_sound)
 	for(var/d in dirs)
 		var/turf/E = get_step(firer, d)
 		shoot_projectile(firer, E, null, firer, null, null)

code/datums/components/cult_ritual_item.dm

@@ -175,7 +175,7 @@
  * cultist - the mob doing the destroying
  */
 /datum/component/cult_ritual_item/proc/do_destroy_girder(obj/structure/girder/cult/cult_girder, mob/living/cultist)
-	playsound(cult_girder, 'sound/weapons/resonator_blast.ogg', 40, TRUE, ignore_walls = FALSE)
+	playsound(cult_girder, 'sound/weapons/resonator_blast.ogg', 40, TRUE)
 	cultist.visible_message(
 		span_warning("[cultist] strikes [cult_girder] with [parent]!"),
 		span_notice("You demolish [cult_girder].")
@@ -190,7 +190,7 @@
  * cultist - the mob doing the unanchoring.
  */
 /datum/component/cult_ritual_item/proc/do_unanchor_structure(obj/structure/cult_structure, mob/living/cultist)
-	playsound(cult_structure, 'sound/items/deconstruct.ogg', 30, TRUE, ignore_walls = FALSE)
+	playsound(cult_structure, 'sound/items/deconstruct.ogg', 30, TRUE)
 	cult_structure.set_anchored(!cult_structure.anchored)
 	to_chat(cultist, span_notice("You [cult_structure.anchored ? "":"un"]secure \the [cult_structure] [cult_structure.anchored ? "to":"from"] the floor."))
 

code/datums/components/spirit_holding.dm

@@ -103,10 +103,10 @@
 /datum/component/spirit_holding/proc/attempt_exorcism(mob/exorcist)
 	var/atom/movable/exorcised_movable = parent
 	to_chat(exorcist, span_notice("You begin to exorcise [parent]..."))
-	playsound(parent, 'sound/hallucinations/veryfar_noise.ogg',40,TRUE)
+	playsound(parent, 'sound/hallucinations/veryfar_noise.ogg',40,TRUE, ignore_walls = 'sound/hallucinations/veryfar_noise.ogg')
 	if(!do_after(exorcist, exorcised_movable, 4 SECONDS))
 		return
-	playsound(parent, 'sound/effects/pray_chaplain.ogg',60,TRUE)
+	playsound(parent, 'sound/effects/pray_chaplain.ogg',60,TRUE, ignore_walls = 'sound/effects/pray_chaplain.ogg')
 	UnregisterSignal(exorcised_movable, list(COMSIG_ATOM_RELAYMOVE, COMSIG_BIBLE_SMACKED))
 	RegisterSignal(exorcised_movable, COMSIG_ITEM_ATTACK_SELF, PROC_REF(on_attack_self))
 	to_chat(bound_spirit, span_userdanger("You were exorcised!"))

code/datums/components/thermite.dm

@@ -81,7 +81,7 @@
 /datum/component/thermite/proc/thermite_melt(mob/user)
 	var/turf/master = parent
 	master.cut_overlay(overlay)
-	playsound(master, 'sound/items/welder.ogg', 100, TRUE)
+	playsound(master, 'sound/items/welder.ogg', 100, TRUE, ignore_walls = 'sound/items/welder.ogg')
 	fakefire = new(master)
 	burn_timer = addtimer(CALLBACK(src, PROC_REF(burn_parent), user), min(amount * 0.35 SECONDS, 20 SECONDS), TIMER_STOPPABLE)
 	UnregisterFromParent()

code/datums/dash_weapon.dm

@@ -42,7 +42,7 @@
 			return FALSE
 
 		var/obj/spot1 = new phaseout(get_turf(user), user.dir)
-		playsound(target_turf, dash_sound, 25, TRUE)
+		playsound(target_turf, dash_sound, 25, TRUE, ignore_walls = dash_sound)
 		var/obj/spot2 = new phasein(get_turf(user), user.dir)
 		spot1.Beam(spot2,beam_effect,time=2 SECONDS)
 		current_charges--
@@ -55,7 +55,7 @@
 /datum/action/innate/dash/proc/charge()
 	current_charges = clamp(current_charges + 1, 0, max_charges)
 	if(recharge_sound)
-		playsound(dashing_item, recharge_sound, 50, TRUE)
+		playsound(dashing_item, recharge_sound, 50, TRUE, ignore_walls = recharge_sound)
 
 	if(!owner)
 		return

code/datums/elements/footstep.dm

@@ -69,7 +69,7 @@
 
 	if(source.body_position == LYING_DOWN) //play crawling sound if we're lying
 		if(turf.footstep)
-			playsound(turf, 'sound/effects/footstep/crawl1.ogg', 15 * volume, falloff_distance = 1, vary = sound_vary)
+			playsound(turf, 'sound/effects/footstep/crawl1.ogg', 15 * volume, falloff_distance = 1, vary = sound_vary, ignore_walls = 'sound/effects/footstep/crawl1.ogg')
 		return
 
 	if(iscarbon(source))
@@ -115,21 +115,23 @@
 		return
 
 	if(isfile(footstep_sounds) || istext(footstep_sounds))
-		playsound(source.loc, footstep_sounds, volume, falloff_distance = 1, vary = sound_vary)
+		playsound(source.loc, footstep_sounds, volume, falloff_distance = 1, vary = sound_vary, ignore_walls = footstep_sounds)
 		return
 
 	var/turf_footstep = prepared_steps[footstep_type]
 	if(isnull(turf_footstep) || !footstep_sounds[turf_footstep])
 		return
 
+	var/sound_played = pick(footstep_sounds[turf_footstep][1])
 	playsound(
 		source.loc,
-		pick(footstep_sounds[turf_footstep][1]),
+		sound_played,
 		footstep_sounds[turf_footstep][2] * volume,
 		TRUE,
 		footstep_sounds[turf_footstep][3] + e_range,
 		falloff_distance = 1,
-		vary = sound_vary
+		vary = sound_vary,
+		ignore_walls = sound_played,
 	)
 
 /datum/element/footstep/proc/play_humanstep(mob/living/carbon/human/source, atom/oldloc, direction, forced, list/old_locs, momentum_change)
@@ -159,26 +161,30 @@
 
 		var/shoestep_type = prepared_steps[FOOTSTEP_MOB_SHOE]
 		if(!isnull(shoestep_type) && footstep_sounds[shoestep_type]) // shoestep type can be null
+			var/sound_played = pick(footstep_sounds[shoestep_type][1])
 			heard_clients = playsound(
 				source.loc,
-				pick(footstep_sounds[shoestep_type][1]),
+				sound_played,
 				footstep_sounds[shoestep_type][2] * volume * volume_multiplier,
 				TRUE,
 				footstep_sounds[shoestep_type][3] + e_range + range_adjustment,
 				falloff_distance = 1,
-				vary = sound_vary
+				vary = sound_vary,
+				ignore_walls = sound_played,
 			)
 	else
 		// we are barefoot
 
 		if(source.dna.species.special_step_sounds)
+			var/sound_played = pick(source.dna.species.special_step_sounds)
 			heard_clients = playsound(
 				source.loc,
-				pick(source.dna.species.special_step_sounds),
+				sound_played,
 				50,
 				TRUE,
 				falloff_distance = 1,
-				vary = sound_vary
+				vary = sound_vary,
+				ignore_walls = sound_played,
 			)
 		else
 			var/obj/item/bodypart/leg/right_leg = source.get_bodypart(BODY_ZONE_R_LEG)
@@ -200,14 +206,16 @@
 					sound_pool = GLOB.footstep
 
 			if(!isnull(sound_pool) && !isnull(barefoot_type) && sound_pool[turf_sound_type])
+				var/sound_played = pick(sound_pool[turf_sound_type][1])
 				heard_clients = playsound(
 					source.loc,
-					pick(sound_pool[turf_sound_type][1]),
+					sound_played,
 					sound_pool[turf_sound_type][2] * volume * volume_multiplier,
 					TRUE,
 					sound_pool[turf_sound_type][3] + e_range + range_adjustment,
 					falloff_distance = 1,
-					vary = sound_vary
+					vary = sound_vary,
+					ignore_walls = sound_played,
 				)
 
 	if(heard_clients)
@@ -227,6 +235,6 @@
 	if(CHECK_MOVE_LOOP_FLAGS(source, MOVEMENT_LOOP_OUTSIDE_CONTROL))
 		return
 
-	playsound(source_loc, footstep_sounds, 50, falloff_distance = 1, vary = sound_vary)
+	playsound(source_loc, footstep_sounds, 50, falloff_distance = 1, vary = sound_vary, ignore_walls = footstep_sounds)
 
 #undef SHOULD_DISABLE_FOOTSTEPS

code/datums/elements/ranged_attacks.dm

@@ -34,12 +34,12 @@
 
 	if(casingtype)
 		var/obj/item/ammo_casing/casing = new casingtype(startloc)
-		playsound(firer, projectilesound, 100, TRUE)
+		playsound(firer, projectilesound, 100, TRUE, ignore_walls = projectilesound)
 		casing.fire_casing(target, firer, null, null, null, ran_zone(), 0,  firer)
 
 	else if(projectiletype)
 		var/obj/projectile/P = new projectiletype(startloc)
-		playsound(firer, projectilesound, 100, TRUE)
+		playsound(firer, projectilesound, 100, TRUE, ignore_walls = projectilesound)
 		P.starting = startloc
 		P.firer = firer
 		P.fired_from = firer

code/datums/martial/cqc.dm

@@ -45,7 +45,7 @@
 		D.visible_message(span_danger("[A] slams [D] into the ground!"), \
 						span_userdanger("You're slammed into the ground by [A]!"), span_hear("You hear a sickening sound of flesh hitting flesh!"), null, A)
 		to_chat(A, span_danger("You slam [D] into the ground!"))
-		playsound(get_turf(A), 'sound/weapons/slam.ogg', 50, TRUE, -1)
+		playsound(get_turf(A), 'sound/weapons/slam.ogg', 50, TRUE, -1, ignore_walls = 'sound/weapons/slam.ogg')
 		D.apply_damage(10, BRUTE)
 		D.Paralyze(120)
 		log_combat(A, D, "slammed (CQC)")
@@ -58,7 +58,7 @@
 		D.visible_message(span_danger("[A] kicks [D] back!"), \
 						span_userdanger("You're kicked back by [A]!"), span_hear("You hear a sickening sound of flesh hitting flesh!"), COMBAT_MESSAGE_RANGE, A)
 		to_chat(A, span_danger("You kick [D] back!"))
-		playsound(get_turf(A), 'sound/weapons/cqchit1.ogg', 50, TRUE, -1)
+		playsound(get_turf(A), 'sound/weapons/cqchit1.ogg', 50, TRUE, -1, ignore_walls = 'sound/weapons/cqchit1.ogg')
 		var/atom/throw_target = get_edge_target_turf(D, A.dir)
 		D.throw_at(throw_target, 1, 14, A)
 		D.apply_damage(10, A.get_attack_type())
@@ -69,7 +69,7 @@
 		D.visible_message(span_danger("[A] kicks [D]'s head, knocking [D.p_them()] out!"), \
 						span_userdanger("You're knocked unconscious by [A]!"), span_hear("You hear a sickening sound of flesh hitting flesh!"), null, A)
 		to_chat(A, span_danger("You kick [D]'s head, knocking [D.p_them()] out!"))
-		playsound(get_turf(A), SFX_PUNCH, 50, TRUE, -1)
+		playsound(get_turf(A), SFX_PUNCH, 50, TRUE, -1, ignore_walls = SFX_PUNCH)
 		D.SetSleeping(300)
 		D.adjustOrganLoss(ORGAN_SLOT_BRAIN, 15, 150)
 		. = TRUE
@@ -82,7 +82,7 @@
 					span_userdanger("Your neck is punched by [A]!"), span_hear("You hear a sickening sound of flesh hitting flesh!"), COMBAT_MESSAGE_RANGE, A)
 	to_chat(A, span_danger("You punch [D]'s neck!"))
 	D.stamina.adjust(-60)
-	playsound(get_turf(A), 'sound/weapons/cqchit1.ogg', 50, TRUE, -1)
+	playsound(get_turf(A), 'sound/weapons/cqchit1.ogg', 50, TRUE, -1, ignore_walls = 'sound/weapons/cqchit1.ogg')
 	return TRUE
 
 /datum/martial_art/cqc/proc/Restrain(mob/living/A, mob/living/D)
@@ -109,7 +109,7 @@
 		D.visible_message(span_danger("[A] strikes [D]'s abdomen, neck and back consecutively"), \
 						span_userdanger("Your abdomen, neck and back are struck consecutively by [A]!"), span_hear("You hear a sickening sound of flesh hitting flesh!"), COMBAT_MESSAGE_RANGE, A)
 		to_chat(A, span_danger("You strike [D]'s abdomen, neck and back consecutively!"))
-		playsound(get_turf(D), 'sound/weapons/cqchit2.ogg', 50, TRUE, -1)
+		playsound(get_turf(D), 'sound/weapons/cqchit2.ogg', 50, TRUE, -1, ignore_walls = 'sound/weapons/cqchit2.ogg')
 		var/obj/item/I = D.get_active_held_item()
 		if(I && D.temporarilyRemoveItemFromInventory(I))
 			A.put_in_hands(I)
@@ -156,9 +156,9 @@
 		picked_hit_type = "stomp"
 	D.apply_damage(bonus_damage, BRUTE)
 	if(picked_hit_type == "kick" || picked_hit_type == "stomp")
-		playsound(get_turf(D), 'sound/weapons/cqchit2.ogg', 50, TRUE, -1)
+		playsound(get_turf(D), 'sound/weapons/cqchit2.ogg', 50, TRUE, -1, ignore_walls = 'sound/weapons/cqchit2.ogg')
 	else
-		playsound(get_turf(D), 'sound/weapons/cqchit1.ogg', 50, TRUE, -1)
+		playsound(get_turf(D), 'sound/weapons/cqchit1.ogg', 50, TRUE, -1, ignore_walls = 'sound/weapons/cqchit1.ogg')
 	D.visible_message(span_danger("[A] [picked_hit_type]ed [D]!"), \
 					span_userdanger("You're [picked_hit_type]ed by [A]!"), span_hear("You hear a sickening sound of flesh hitting flesh!"), COMBAT_MESSAGE_RANGE, A)
 	to_chat(A, span_danger("You [picked_hit_type] [D]!"))
@@ -167,7 +167,7 @@
 		D.visible_message(span_danger("[A] leg sweeps [D]!"), \
 						span_userdanger("Your legs are sweeped by [A]!"), span_hear("You hear a sickening sound of flesh hitting flesh!"), null, A)
 		to_chat(A, span_danger("You leg sweep [D]!"))
-		playsound(get_turf(A), 'sound/effects/hit_kick.ogg', 50, TRUE, -1)
+		playsound(get_turf(A), 'sound/effects/hit_kick.ogg', 50, TRUE, -1, ignore_walls = 'sound/effects/hit_kick.ogg')
 		D.apply_damage(10, BRUTE)
 		D.Paralyze(60)
 		log_combat(A, D, "sweeped (CQC)")
@@ -186,7 +186,7 @@
 			D.visible_message(span_danger("[A] strikes [D]'s jaw with their hand!"), \
 							span_userdanger("Your jaw is struck by [A], you feel disoriented!"), span_hear("You hear a sickening sound of flesh hitting flesh!"), COMBAT_MESSAGE_RANGE, A)
 			to_chat(A, span_danger("You strike [D]'s jaw, leaving [D.p_them()] disoriented!"))
-			playsound(get_turf(D), 'sound/weapons/cqchit1.ogg', 50, TRUE, -1)
+			playsound(get_turf(D), 'sound/weapons/cqchit1.ogg', 50, TRUE, -1, ignore_walls = 'sound/weapons/cqchit1.ogg')
 			if(I && D.temporarilyRemoveItemFromInventory(I))
 				A.put_in_hands(I)
 			D.set_timed_status_effect(4 SECONDS, /datum/status_effect/jitter, only_if_higher = TRUE)

code/datums/martial/plasma_fist.dm

@@ -48,7 +48,7 @@
 	D.visible_message(span_danger("[A] hits [D] with Plasma Punch!"), \
 					span_userdanger("You're hit with a Plasma Punch by [A]!"), span_hear("You hear a sickening sound of flesh hitting flesh!"), null, A)
 	to_chat(A, span_danger("You hit [D] with Plasma Punch!"))
-	playsound(D.loc, SFX_PUNCH, 50, TRUE, -1)
+	playsound(D.loc, SFX_PUNCH, 50, TRUE, -1, ignore_walls = SFX_PUNCH)
 	var/atom/throw_target = get_edge_target_turf(D, get_dir(D, get_step_away(D, A)))
 	D.throw_at(throw_target, 200, 4,A)
 	A.say("HYAH!", forced="plasma fist")
@@ -59,7 +59,7 @@
 	var/hasclient = D.client ? TRUE : FALSE
 
 	A.do_attack_animation(D, ATTACK_EFFECT_PUNCH)
-	playsound(D.loc, SFX_PUNCH, 50, TRUE, -1)
+	playsound(D.loc, SFX_PUNCH, 50, TRUE, -1, ignore_walls = SFX_PUNCH)
 	A.say("PLASMA FIST!", forced="plasma fist")
 	D.visible_message(span_danger("[A] hits [D] with THE PLASMA FIST TECHNIQUE!"), \
 					span_userdanger("You're suddenly hit with THE PLASMA FIST TECHNIQUE by [A]!"), span_hear("You hear a sickening sound of flesh hitting flesh!"), null, A)
@@ -110,7 +110,7 @@
 	user.apply_damage(rand(50,70), BRUTE)
 
 	addtimer(CALLBACK(src,PROC_REF(Apotheosis_end), user), 6 SECONDS)
-	playsound(boomspot, SFX_PUNCH, 50, TRUE, -1)
+	playsound(boomspot, SFX_PUNCH, 50, TRUE, -1, ignore_walls = SFX_PUNCH)
 	explosion(user, devastation_range = plasma_power, heavy_impact_range = plasma_power*2, light_impact_range = plasma_power*4, ignorecap = TRUE, explosion_cause = src)
 	plasma_power = 1 //just in case there is any clever way to cause it to happen again
 

code/datums/martial/psychotic_brawl.dm

@@ -48,7 +48,7 @@
 			D.visible_message(span_danger("[A] [atk_verb]s [D]!"), \
 							span_userdanger("You're [atk_verb]ed by [A]!"), span_hear("You hear a sickening sound of flesh hitting flesh!"), null, A)
 			to_chat(A, span_danger("You [atk_verb] [D]!"))
-			playsound(get_turf(D), SFX_PUNCH, 40, TRUE, -1)
+			playsound(get_turf(D), SFX_PUNCH, 40, TRUE, -1, ignore_walls = SFX_PUNCH)
 			D.apply_damage(rand(5,10), A.get_attack_type(), BODY_ZONE_HEAD)
 			A.apply_damage(rand(5,10), A.get_attack_type(), BODY_ZONE_HEAD)
 			if (iscarbon(D))

code/datums/martial/sleeping_carp.dm

@@ -33,7 +33,7 @@
 	D.visible_message(span_danger("[A] [atk_verb]s [D]!"), \
 					span_userdanger("[A] [atk_verb]s you!"), null, null, A)
 	to_chat(A, span_danger("You [atk_verb] [D]!"))
-	playsound(get_turf(D), SFX_PUNCH, 25, TRUE, -1)
+	playsound(get_turf(D), SFX_PUNCH, 25, TRUE, -1, ignore_walls = SFX_PUNCH)
 	log_combat(A, D, "strong punched (Sleeping Carp)")
 	D.apply_damage(20, A.get_attack_type(), affecting)
 	return
@@ -87,7 +87,7 @@
 					span_userdanger("[A] [atk_verb]s you!"), null, null, A)
 	to_chat(A, span_danger("You [atk_verb] [D]!"))
 	D.apply_damage(rand(10,15), BRUTE, affecting)
-	playsound(get_turf(D), SFX_PUNCH, 25, TRUE, -1)
+	playsound(get_turf(D), SFX_PUNCH, 25, TRUE, -1, ignore_walls = SFX_PUNCH)
 	log_combat(A, D, "punched (Sleeping Carp)")
 	return TRUE