From 8faebbddfdf30a3d96a090392ac5d67738b46231 Mon Sep 17 00:00:00 2001
From: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>
Date: Fri, 22 Apr 2022 10:17:35 -0400
Subject: [PATCH] Ensures that a few sounds that shouldn't go through walls,
 don't go through walls (#12995)

---
 .../modules/indicators/code/combat_indicator.dm           | 2 +-
 .../modular_items/lewd_items/code/lewd_items/vibrator.dm  | 8 ++++----
 .../lewd_items/code/technical_stuff_for_lewd.dm           | 1 +
 modular_skyrat/modules/reagent_forging/code/anvil.dm      | 2 +-
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/modular_skyrat/modules/indicators/code/combat_indicator.dm b/modular_skyrat/modules/indicators/code/combat_indicator.dm
index 8ef11242620..7ff3d2f6440 100644
--- a/modular_skyrat/modules/indicators/code/combat_indicator.dm
+++ b/modular_skyrat/modules/indicators/code/combat_indicator.dm
@@ -29,7 +29,7 @@ GLOBAL_VAR_INIT(combat_indicator_overlay, GenerateCombatOverlay())
 	if (combat_indicator_vehicle)
 		if(world.time > vehicle_next_combat_popup) // As of the time of writing, COMBAT_NOTICE_COOLDOWN is 10 secs, so this is asking "has 10 secs past between last activation of CI?"
 			vehicle_next_combat_popup = world.time + COMBAT_NOTICE_COOLDOWN
-			playsound(src, 'sound/machines/chime.ogg', 10, TRUE)
+			playsound(src, 'sound/machines/chime.ogg', 10, TRUE, ignore_walls = FALSE)
 			flick_emote_popup_on_obj("combat", 20)
 			visible_message(span_boldwarning("[src] prepares for combat!"))
 		combat_indicator_vehicle = TRUE
diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/vibrator.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/vibrator.dm
index 67c2952b37c..1336e2b196b 100644
--- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/vibrator.dm
+++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/vibrator.dm
@@ -185,21 +185,21 @@
 	switch(vibration_mode)
 		if("low")
 			toy_on = TRUE
-			playsound(loc, 'sound/weapons/magin.ogg', 20, TRUE)
+			playsound(loc, 'sound/weapons/magin.ogg', 20, TRUE, ignore_walls = FALSE)
 			soundloop1.start()
 		if("medium")
 			toy_on = TRUE
-			playsound(loc, 'sound/weapons/magin.ogg', 20, TRUE)
+			playsound(loc, 'sound/weapons/magin.ogg', 20, TRUE, ignore_walls = FALSE)
 			soundloop1.stop()
 			soundloop2.start()
 		if("hard")
 			toy_on = TRUE
-			playsound(loc, 'sound/weapons/magin.ogg', 20, TRUE)
+			playsound(loc, 'sound/weapons/magin.ogg', 20, TRUE, ignore_walls = FALSE)
 			soundloop2.stop()
 			soundloop3.start()
 		if("off")
 			toy_on = FALSE
-			playsound(loc, 'sound/weapons/magout.ogg', 20, TRUE)
+			playsound(loc, 'sound/weapons/magout.ogg', 20, TRUE, ignore_walls = FALSE)
 			soundloop3.stop()
 
 #undef DEFAULT_AROUSAL_INCREASE
diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/technical_stuff_for_lewd.dm b/modular_skyrat/modules/modular_items/lewd_items/code/technical_stuff_for_lewd.dm
index 511ef40a2de..33d99110a70 100644
--- a/modular_skyrat/modules/modular_items/lewd_items/code/technical_stuff_for_lewd.dm
+++ b/modular_skyrat/modules/modular_items/lewd_items/code/technical_stuff_for_lewd.dm
@@ -29,6 +29,7 @@
 	falloff_distance = 1
 	falloff_exponent = 5
 	extra_range = SILENCED_SOUND_EXTRARANGE
+	ignore_walls = FALSE
 
 /datum/looping_sound/vibrator/low
 	volume = 80
diff --git a/modular_skyrat/modules/reagent_forging/code/anvil.dm b/modular_skyrat/modules/reagent_forging/code/anvil.dm
index 256bb26a20a..d8b532ec9cc 100644
--- a/modular_skyrat/modules/reagent_forging/code/anvil.dm
+++ b/modular_skyrat/modules/reagent_forging/code/anvil.dm
@@ -49,7 +49,7 @@
 		return FALSE
 
 /obj/structure/reagent_anvil/hammer_act(mob/living/user, obj/item/tool)
-	playsound(src, 'modular_skyrat/modules/reagent_forging/sound/forge.ogg', 50, TRUE)
+	playsound(src, 'modular_skyrat/modules/reagent_forging/sound/forge.ogg', 50, TRUE, ignore_walls = FALSE)
 	var/obj/item/forging/incomplete/search_incomplete_src = locate(/obj/item/forging/incomplete) in contents
 	if(!search_incomplete_src)
 		return FALSE