From 2ff17530f1f01ff5b94cdf6cb80de2c91c90d89b Mon Sep 17 00:00:00 2001
From: mentgah <52985409+mentgah@users.noreply.github.com>
Date: Thu, 29 May 2025 19:31:50 +0200
Subject: [PATCH] Some footsteps fixes (#37648)

* Some footsteps fixes

* Not an override anymore
---
 code/modules/clothing/clothing.dm                      | 1 +
 code/modules/clothing/shoes/miscellaneous.dm           | 1 +
 code/modules/mob/living/carbon/human/human_movement.dm | 8 ++++++--
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm
index 4dff2b4bd80..6df94041666 100644
--- a/code/modules/clothing/clothing.dm
+++ b/code/modules/clothing/clothing.dm
@@ -942,6 +942,7 @@ var/global/maxStackDepth = 10
 	var/step_sound = ""
 	var/stepstaken = 1
 	var/modulo_steps = 2 //if stepstaken is a multiplier of modulo_steps, play the sound. Does not work if modulo_steps < 1
+	var/footsteps_range = -4
 	cloth_layer = SHOES_LAYER
 	cloth_icon = 'icons/mob/feet.dmi'
 	starting_materials = list(MAT_FABRIC = 1250)
diff --git a/code/modules/clothing/shoes/miscellaneous.dm b/code/modules/clothing/shoes/miscellaneous.dm
index 050d68b720d..1b19927a0da 100644
--- a/code/modules/clothing/shoes/miscellaneous.dm
+++ b/code/modules/clothing/shoes/miscellaneous.dm
@@ -160,6 +160,7 @@
 	footprint_type = /obj/effect/decal/cleanable/blood/tracks/footprints/clown
 
 	step_sound = "clownstep"
+	footsteps_range = 0
 
 /obj/item/clothing/shoes/clown_shoes/New()
 	..()
diff --git a/code/modules/mob/living/carbon/human/human_movement.dm b/code/modules/mob/living/carbon/human/human_movement.dm
index 2e9deb72147..baf9f946ca8 100644
--- a/code/modules/mob/living/carbon/human/human_movement.dm
+++ b/code/modules/mob/living/carbon/human/human_movement.dm
@@ -177,18 +177,22 @@
 			modulo = S.modulo_steps<modulo? S.modulo_steps : modulo
 		if (stepstaken % modulo == 0) //once every other step by default, so that it doesn't spam too much (shoes override)
 			var/step_volume = 50
+			var/range = -4
 			var/list/sounds_to_play
 			
 			var/turf/T = get_turf(src)
 			if (!T || !T.footstep_sound || istype(T, /turf/space))
 				return
+			if (locate(/obj/machinery/conveyor) in T.contents)
+				return
 
 			if(shoes && istype(shoes, /obj/item/clothing/shoes)) //shoes
 				var/obj/item/clothing/shoes/S = shoes
 				if (S.step_sound) //shoes override
 					sounds_to_play = S.step_sound
+					range = S.footsteps_range
 				else //otherwise just use the turf's sound
-					sounds_to_play = T.footstep_sound 
+					sounds_to_play = T.footstep_sound
 			else
 				var/datum/organ/external/foot = has_vulnerable_foot()
 				if (foot)
@@ -203,7 +207,7 @@
 			stepstaken = 0
 			if (!sounds_to_play)
 				return
-			playsound(src, pick(sounds_to_play), step_volume, 1, -4)
+			playsound(src, pick(sounds_to_play), step_volume, 1, range)