[MIRROR] DCS Update + Footstep element (#10125)

Co-authored-by: Guti <32563288+TheCaramelion@users.noreply.github.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>

code/__defines/footsteps.dm

@@ -26,7 +26,7 @@
 #define FOOTSTEP_MOB_BAREFOOT "footstep_barefoot"
 #define FOOTSTEP_MOB_HEAVY "footstep_heavy"
 #define FOOTSTEP_MOB_SHOE "footstep_shoe"
-#define FOOTSTEP_MOB_HUMAN "footstep_human" //Warning: Only works on /mob/living/carbon/human
+#define FOOTSTEP_MOB_HUMAN "footstep_human"
 #define FOOTSTEP_MOB_SLIME "footstep_slime"
 #define FOOTSTEP_MOB_SLITHER "footstep_slither"
 #define FOOTSTEP_OBJ_MACHINE "footstep_machine"
@@ -96,7 +96,7 @@ GLOBAL_LIST_INIT(footstep, list(
 		'sound/effects/footstep/lava2.ogg',
 		'sound/effects/footstep/lava3.ogg'), 100, 0),
 	FOOTSTEP_MEAT = list(list(
-		'modular_chomp/sound/effects/meatslap.ogg'), 100, 0),
+		'sound/effects/meatslap.ogg'), 100, 0),
 	FOOTSTEP_CATWALK = list(list(
 		'sound/effects/footstep/catwalk1.ogg',
 		'sound/effects/footstep/catwalk2.ogg',
@@ -108,23 +108,23 @@ GLOBAL_LIST_INIT(footstep, list(
 //bare footsteps lists
 GLOBAL_LIST_INIT(barefootstep, list(
 	FOOTSTEP_WOOD_BAREFOOT = list(list(
-		'modular_chomp/sound/effects/footstep/woodbarefoot1.ogg',
-		'modular_chomp/sound/effects/footstep/woodbarefoot2.ogg',
-		'modular_chomp/sound/effects/footstep/woodbarefoot3.ogg',
-		'modular_chomp/sound/effects/footstep/woodbarefoot4.ogg',
-		'modular_chomp/sound/effects/footstep/woodbarefoot5.ogg'), 80, -1),
+		'sound/effects/footstep/woodbarefoot1.ogg',
+		'sound/effects/footstep/woodbarefoot2.ogg',
+		'sound/effects/footstep/woodbarefoot3.ogg',
+		'sound/effects/footstep/woodbarefoot4.ogg',
+		'sound/effects/footstep/woodbarefoot5.ogg'), 80, -1),
 	FOOTSTEP_HARD_BAREFOOT = list(list(
-		'modular_chomp/sound/effects/footstep/hardbarefoot1.ogg',
-		'modular_chomp/sound/effects/footstep/hardbarefoot2.ogg',
-		'modular_chomp/sound/effects/footstep/hardbarefoot3.ogg',
-		'modular_chomp/sound/effects/footstep/hardbarefoot4.ogg',
-		'modular_chomp/sound/effects/footstep/hardbarefoot5.ogg'), 80, -1),
+		'sound/effects/footstep/hardbarefoot1.ogg',
+		'sound/effects/footstep/hardbarefoot2.ogg',
+		'sound/effects/footstep/hardbarefoot3.ogg',
+		'sound/effects/footstep/hardbarefoot4.ogg',
+		'sound/effects/footstep/hardbarefoot5.ogg'), 80, -1),
 	FOOTSTEP_CARPET_BAREFOOT = list(list(
-		'modular_chomp/sound/effects/footstep/carpetbarefoot1.ogg',
-		'modular_chomp/sound/effects/footstep/carpetbarefoot2.ogg',
-		'modular_chomp/sound/effects/footstep/carpetbarefoot3.ogg',
-		'modular_chomp/sound/effects/footstep/carpetbarefoot4.ogg',
-		'modular_chomp/sound/effects/footstep/carpetbarefoot5.ogg'), 75, -1),
+		'sound/effects/footstep/carpetbarefoot1.ogg',
+		'sound/effects/footstep/carpetbarefoot2.ogg',
+		'sound/effects/footstep/carpetbarefoot3.ogg',
+		'sound/effects/footstep/carpetbarefoot4.ogg',
+		'sound/effects/footstep/carpetbarefoot5.ogg'), 75, -1),
 	FOOTSTEP_SAND = list(list(
 		'sound/effects/footstep/asteroid1.ogg',
 		'sound/effects/footstep/asteroid2.ogg',
@@ -146,29 +146,29 @@ GLOBAL_LIST_INIT(barefootstep, list(
 		'sound/effects/footstep/lava2.ogg',
 		'sound/effects/footstep/lava3.ogg'), 100, 0),
 	FOOTSTEP_MEAT = list(list(
-		'modular_chomp/sound/effects/meatslap.ogg'), 100, 0),
+		'sound/effects/meatslap.ogg'), 100, 0),
 ))
 
 //claw footsteps lists
 GLOBAL_LIST_INIT(clawfootstep, list(
 	FOOTSTEP_WOOD_BAREFOOT = list(list(
-		'modular_chomp/sound/effects/footstep/woodclaw1.ogg',
-		'modular_chomp/sound/effects/footstep/woodclaw2.ogg',
-		'modular_chomp/sound/effects/footstep/woodclaw3.ogg',
-		'modular_chomp/sound/effects/footstep/woodclaw2.ogg',
-		'modular_chomp/sound/effects/footstep/woodclaw1.ogg'), 90, 1),
+		'sound/effects/footstep/woodclaw1.ogg',
+		'sound/effects/footstep/woodclaw2.ogg',
+		'sound/effects/footstep/woodclaw3.ogg',
+		'sound/effects/footstep/woodclaw2.ogg',
+		'sound/effects/footstep/woodclaw1.ogg'), 90, 1),
 	FOOTSTEP_HARD_BAREFOOT = list(list(
-		'modular_chomp/sound/effects/footstep/hardclaw1.ogg',
-		'modular_chomp/sound/effects/footstep/hardclaw2.ogg',
-		'modular_chomp/sound/effects/footstep/hardclaw3.ogg',
-		'modular_chomp/sound/effects/footstep/hardclaw4.ogg',
-		'modular_chomp/sound/effects/footstep/hardclaw1.ogg'), 90, 1),
+		'sound/effects/footstep/hardclaw1.ogg',
+		'sound/effects/footstep/hardclaw2.ogg',
+		'sound/effects/footstep/hardclaw3.ogg',
+		'sound/effects/footstep/hardclaw4.ogg',
+		'sound/effects/footstep/hardclaw1.ogg'), 90, 1),
 	FOOTSTEP_CARPET_BAREFOOT = list(list(
-		'modular_chomp/sound/effects/footstep/carpetbarefoot1.ogg',
-		'modular_chomp/sound/effects/footstep/carpetbarefoot2.ogg',
-		'modular_chomp/sound/effects/footstep/carpetbarefoot3.ogg',
-		'modular_chomp/sound/effects/footstep/carpetbarefoot4.ogg',
-		'modular_chomp/sound/effects/footstep/carpetbarefoot5.ogg'), 75, -2),
+		'sound/effects/footstep/carpetbarefoot1.ogg',
+		'sound/effects/footstep/carpetbarefoot2.ogg',
+		'sound/effects/footstep/carpetbarefoot3.ogg',
+		'sound/effects/footstep/carpetbarefoot4.ogg',
+		'sound/effects/footstep/carpetbarefoot5.ogg'), 75, -2),
 	FOOTSTEP_SAND = list(list(
 		'sound/effects/footstep/asteroid1.ogg',
 		'sound/effects/footstep/asteroid2.ogg',
@@ -190,7 +190,7 @@ GLOBAL_LIST_INIT(clawfootstep, list(
 		'sound/effects/footstep/lava2.ogg',
 		'sound/effects/footstep/lava3.ogg'), 100, 0),
 	FOOTSTEP_MEAT = list(list(
-		'modular_chomp/sound/effects/meatslap.ogg'), 100, 0),
+		'sound/effects/meatslap.ogg'), 100, 0),
 ))
 
 //light claw footsteps list
@@ -230,14 +230,14 @@ GLOBAL_LIST_INIT(lightclawfootstep, list(
 		'sound/effects/footstep/lava2.ogg',
 		'sound/effects/footstep/lava3.ogg'), 100, 0),
 	FOOTSTEP_MEAT = list(list(
-		'modular_chomp/sound/effects/meatslap.ogg'), 100, 0),
+		'sound/effects/meatslap.ogg'), 100, 0),
 ))
 
 //heavy footsteps list
 GLOBAL_LIST_INIT(heavyfootstep, list(
 	FOOTSTEP_GENERIC_HEAVY = list(list(
-		'modular_chomp/sound/effects/footstep/heavy1.ogg',
-		'modular_chomp/sound/effects/footstep/heavy2.ogg'), 100, 2),
+		'sound/effects/footstep/heavy1.ogg',
+		'sound/effects/footstep/heavy2.ogg'), 100, 2),
 	FOOTSTEP_WATER = list(list(
 		'sound/effects/footstep/water1.ogg',
 		'sound/effects/footstep/water2.ogg',
@@ -248,5 +248,5 @@ GLOBAL_LIST_INIT(heavyfootstep, list(
 		'sound/effects/footstep/lava2.ogg',
 		'sound/effects/footstep/lava3.ogg'), 100, 0),
 	FOOTSTEP_MEAT = list(list(
-		'modular_chomp/sound/effects/meatslap.ogg'), 100, 0),
+		'sound/effects/meatslap.ogg'), 100, 0),
 ))

code/__defines/slosh.dm

@@ -0,0 +1,11 @@
+GLOBAL_LIST_INIT(slosh, list(
+	'sound/vore/walkslosh2.ogg',
+	'sound/vore/walkslosh3.ogg',
+	'sound/vore/walkslosh4.ogg',
+	'sound/vore/walkslosh5.ogg',
+	'sound/vore/walkslosh6.ogg',
+	'sound/vore/walkslosh7.ogg',
+	'sound/vore/walkslosh8.ogg',
+	'sound/vore/walkslosh9.ogg',
+	'sound/vore/walkslosh10.ogg'
+))

code/__defines/traits.dm

@@ -1,4 +1,3 @@
-//CHOMPAdd Start
 /*
 Remember to update _globalvars/traits.dm if you're adding/removing/renaming traits.
 */
@@ -7,7 +6,7 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
 //mob traits
 #define TRAIT_BLIND 			"blind"
 */
-#define TRAIT_DREAMING			"currently_dreaming"
+#define TRAIT_DREAMING			"currently_dreaming" // CHOMPAdd
 #define TRAIT_MUTE				"mute"
 /*
 #define TRAIT_EMOTEMUTE			"emotemute"
@@ -210,7 +209,6 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
 #define FROGENITE_TRAIT "frogenite"
 #define FERVEATIUM_TRAIT "ferveatium"
 */
-//CHOMPAdd End
 
 #define ORGANICS	1
 #define SYNTHETICS	2

code/__defines/traits/sources.dm

@@ -2,6 +2,6 @@
 // Several things such as `type` or `REF(src)` may be used in the ADD_TRAIT() macro as the "source", but this file contains all of the defines for immutable static strings.
 
 /// cannot be removed without admin intervention
-// #define ROUNDSTART_TRAIT "roundstart" //CHOMPRemove, already exists in traits
+// #define ROUNDSTART_TRAIT "roundstart"
 /// This trait comes from when a mob is currently typing.
 #define CURRENTLY_TYPING_TRAIT "currently_typing"

code/_helpers/global_lists.dm

@@ -361,3 +361,10 @@ GLOBAL_LIST_EMPTY(legacy_globals)
 	GLOB.legacy_globals["item_tf_spawnpoints"] = item_tf_spawnpoints
 	GLOB.legacy_globals["existing_solargrubs"] = existing_solargrubs
 	*/
+
+var/global/list/selectable_footstep = list(
+	"Default" = FOOTSTEP_MOB_HUMAN,
+	"Claw" = FOOTSTEP_MOB_CLAW,
+	"Light Claw" = FOOTSTEP_MOB_TESHARI,
+	"Slither" = FOOTSTEP_MOB_SLITHER,
+)

code/_helpers/global_lists_ch.dm

@@ -1,18 +1,3 @@
-
-//Reagent Vore belly Sounds
-GLOBAL_LIST_INIT(slosh, list(
-	'sound/vore/walkslosh1.ogg',
-	'sound/vore/walkslosh2.ogg',
-	'sound/vore/walkslosh3.ogg',
-	'sound/vore/walkslosh4.ogg',
-	'sound/vore/walkslosh5.ogg',
-	'sound/vore/walkslosh6.ogg',
-	'sound/vore/walkslosh7.ogg',
-	'sound/vore/walkslosh8.ogg',
-	'sound/vore/walkslosh9.ogg',
-	'sound/vore/walkslosh10.ogg'
-))
-
 var/global/list/item_tf_spawnpoints = list() // Global variable tracking which items are item tf spawnpoints
 
 //stuff that only synths can eat
@@ -197,10 +182,3 @@ var/global/list/vr_mob_spawner_options = list(
 	"Stok" = /mob/living/carbon/human/stok,
 	//"Gryphon" = /mob/living/simple_mob/vore/gryphon // Disabled until tested
 	)
-
-var/global/list/selectable_footstep = list(
-	"Default" = FOOTSTEP_MOB_HUMAN,
-	"Claw" = FOOTSTEP_MOB_CLAW,
-	"Light Claw" = FOOTSTEP_MOB_TESHARI,
-	"Slither" = FOOTSTEP_MOB_SLITHER,
-)

code/_helpers/sorts/comparators.dm

@@ -99,7 +99,6 @@
 /proc/cmp_stored_item_name(datum/stored_item/A, datum/stored_item/B)
 	return sorttext(B.item_name, A.item_name)
 
-// CHOMPEdit Start - More text compares
 /proc/cmp_embed_text_asc(a,b)
 	if(isdatum(a))
 		a = REF(a)
@@ -113,4 +112,3 @@
 	if(isdatum(b))
 		b = REF(b)
 	return sorttext("[a]", "[b]")
-// CHOMPEdit End

code/_onclick/hud/action/action_item_overlay.dm

@@ -22,7 +22,7 @@
 	src.item_ref = WEAKREF(item)
 	src.item_callback = item_callback
 
-/datum/component/action_item_overlay/Destroy(force, silent)
+/datum/component/action_item_overlay/Destroy(force)
 	item_ref = null
 	QDEL_NULL(item_callback)
 	item_appearance = null

code/datums/components/material_container.dm

@@ -60,7 +60,7 @@
 			mat_amt = 0
 		materials[mat_ref] += mat_amt
 
-/datum/component/material_container/Destroy(force, silent)
+/datum/component/material_container/Destroy(force)
 	materials = null
 	allowed_materials = null
 	if(insertion_check)

code/datums/datum.dm

@@ -19,7 +19,7 @@
 
 	/// Open uis owned by this datum
 	/// Lazy, since this case is semi rare
-	var/list/open_tguis // CHOMPEdit: FIXME: open_uis
+	var/list/open_tguis // FIXME: open_uis
 
 	/// Active timers with this datum as the target
 	var/list/_active_timers
@@ -43,8 +43,8 @@
 
 	/// Datum level flags
 	var/datum_flags = NONE
-	var/trigger_uid //CHOMPEdit
-	var/status_traits //CHOMPEdit
+	var/trigger_uid
+	var/status_traits
 
 	/// A weak reference to another datum
 	var/datum/weakref/weak_reference

code/datums/elements/footstep.dm

@@ -48,9 +48,9 @@
 		if(FOOTSTEP_MOB_SHOE)
 			footstep_ret = GLOB.footstep
 		if(FOOTSTEP_MOB_SLIME)
-			footstep_ret = 'modular_chomp/sound/effects/footstep/slime1.ogg'
+			footstep_ret = 'sound/effects/footstep/slime1.ogg'
 		if(FOOTSTEP_MOB_SLITHER)
-			footstep_ret = 'modular_chomp/sound/effects/footstep/crawl1.ogg'
+			footstep_ret = 'sound/effects/footstep/crawl1.ogg'
 		else
 			footstep_ret = GLOB.barefootstep
 	return footstep_ret
@@ -74,7 +74,7 @@
 
 	if(source.lying) //play crawling sound if we're lying
 		if(turf.footstep)
-			playsound(turf, 'modular_chomp/sound/effects/footstep/crawl1.ogg', 15 * volume, falloff = 1, vary = sound_vary)
+			playsound(turf, 'sound/effects/footstep/crawl1.ogg', 15 * volume, falloff = 1, vary = sound_vary)
 		return
 
 	if(iscarbon(source))
@@ -159,9 +159,9 @@
 		if(source.species.special_step_sounds)
 			playsound(source.loc, pick(source.species.special_step_sounds), volume, TRUE, falloff = 1, vary = sound_vary)
 		else if (istype(source.species, /datum/species/shapeshifter/promethean))
-			playsound(source.loc, 'modular_chomp/sound/effects/footstep/slime1.ogg', volume, TRUE, falloff = 1)
+			playsound(source.loc, 'sound/effects/footstep/slime1.ogg', volume, TRUE, falloff = 1)
 		else if (source.custom_footstep == FOOTSTEP_MOB_SLITHER)
-			playsound(source.loc, 'modular_chomp/sound/effects/footstep/crawl1.ogg', 15 * volume, falloff = 1, vary = sound_vary)
+			playsound(source.loc, 'sound/effects/footstep/crawl1.ogg', 15 * volume, falloff = 1, vary = sound_vary)
 		else
 			var/barefoot_type = prepared_steps[FOOTSTEP_MOB_BAREFOOT]
 			var/bare_footstep_sounds

code/game/turfs/flooring/flooring_premade.dm

@@ -187,11 +187,9 @@
 	icon_state = "grass0"
 	can_dirty = FALSE //VOREStation Edit
 	initial_flooring = /decl/flooring/grass
-	// CHOMPAdd - Grass has grass footsteps
 	footstep = FOOTSTEP_GRASS
 	barefootstep = FOOTSTEP_GRASS
 	clawfootstep = FOOTSTEP_GRASS
-	// CHOMPEnd
 
 /turf/simulated/floor/tiled
 	name = "floor"

code/game/turfs/simulated/floor.dm

@@ -13,20 +13,6 @@
 	var/base_desc = "The naked hull."
 	var/base_icon = 'icons/turf/flooring/plating_vr.dmi'
 	var/base_icon_state = "plating"
-	/* var/static/list/base_footstep_sounds = list("human" = list(
-		'sound/effects/footstep/plating1.ogg',
-		'sound/effects/footstep/plating2.ogg',
-		'sound/effects/footstep/plating3.ogg',
-		'sound/effects/footstep/plating4.ogg',
-		'sound/effects/footstep/plating5.ogg'),
-		SPECIES_TESHARI = list(
-		'sound/effects/footstep/BudgieStep1.ogg',
-		'sound/effects/footstep/BudgieStep2.ogg',
-		'sound/effects/footstep/BudgieStep3.ogg',
-		'sound/effects/footstep/BudgieStep4.ogg',
-		'sound/effects/footstep/BudgieStep5.ogg',
-		'sound/effects/footstep/BudgieStep6.ogg',
-		))*/ // CHOMPedit: tesh steps CHOMPEdit - Better footsteps
 
 	var/list/old_decals = null
 
@@ -50,9 +36,6 @@
 	if(floortype)
 		set_flooring(get_flooring_data(floortype), TRUE)
 		. = INITIALIZE_HINT_LATELOAD // We'll update our icons after everyone is ready
-	// else
-		// vorefootstep_sounds = base_vorefootstep_sounds //CHOMPstation edit
-		// footstep_sounds = base_footstep_sounds CHOMPEdit - Better footsteps
 	if(can_dirty && can_start_dirty)
 		if(prob(dirty_prob))
 			dirt += rand(50,100)
@@ -72,8 +55,6 @@
 	if(is_plating() && !initializing) // Plating -> Flooring
 		swap_decals()
 	flooring = newflooring
-	// vorefootstep_sounds = newflooring.vorefootstep_sounds //CHOMPstation edit
-	// footstep_sounds = newflooring.footstep_sounds CHOMPEdit - Better footsteps
 	if(!initializing)
 		update_icon(1)
 	levelupdate()
@@ -90,8 +71,6 @@
 	desc = base_desc
 	icon = base_icon
 	icon_state = base_icon_state
-	// vorefootstep_sounds = base_vorefootstep_sounds	 //CHOMPstation edit
-	// footstep_sounds = base_footstep_sounds CHOMPEdit - Better footsteps
 
 	if(!is_plating()) // Flooring -> Plating
 		swap_decals()

code/game/turfs/simulated/outdoors/outdoors.dm

@@ -222,16 +222,6 @@ CHOMP Removal End */
 	desc = "Looks dirty."
 	icon = 'icons/turf/outdoors_vr.dmi'
 	icon_base = "dirt0"
-	footstep_sounds = list("human" = list(
-		'sound/effects/footstep/asteroid1.ogg',
-		'sound/effects/footstep/asteroid2.ogg',
-		'sound/effects/footstep/asteroid3.ogg',
-		'sound/effects/footstep/asteroid4.ogg',
-		'sound/effects/footstep/asteroid5.ogg',
-		'sound/effects/footstep/MedDirt1.ogg',
-		'sound/effects/footstep/MedDirt2.ogg',
-		'sound/effects/footstep/MedDirt3.ogg',
-		'sound/effects/footstep/MedDirt4.ogg'))
 
 /turf/simulated/floor/outdoors/newdirt/Initialize(mapload)
 	var/possibledirts = list(
@@ -291,12 +281,6 @@ CHOMP Removal End */
 	can_paint = 1
 	can_engrave = FALSE
 
-	footstep_sounds = list("human" = list(
-		'sound/effects/footstep/LightStone1.ogg',
-		'sound/effects/footstep/LightStone2.ogg',
-		'sound/effects/footstep/LightStone3.ogg',
-		'sound/effects/footstep/LightStone4.ogg',))
-
 /obj/item/stack/tile/floor/sidewalk
 	name = "sidewalk tile"
 	singular_name = "floor tile"

code/game/turfs/simulated/water.dm

@@ -24,8 +24,6 @@
 
 /turf/simulated/floor/water/Initialize()
 	. = ..()
-	// var/decl/flooring/F = get_flooring_data(/decl/flooring/water) - CHOMPEdit
-	// footstep_sounds = F?.footstep_sounds CHOMPEdit - Footsteps
 	update_icon()
 	handle_fish()
 	// soundloop = new(list(src), FALSE) // CHOMPEdit: Removing soundloop for now.

code/game/turfs/turf.dm

@@ -41,14 +41,63 @@
 
 	var/movement_cost = 0       // How much the turf slows down movement, if any.
 
-	// var/list/footstep_sounds = null CHOMPEdit - Better footstep sounds
-	// var/list/vorefootstep_sounds = null	//CHOMPstation edit
-
 	var/block_tele = FALSE      // If true, most forms of teleporting to or from this turf tile will fail.
 	var/can_build_into_floor = FALSE // Used for things like RCDs (and maybe lattices/floor tiles in the future), to see if a floor should replace it.
 	var/list/dangerous_objects // List of 'dangerous' objs that the turf holds that can cause something bad to happen when stepped on, used for AI mobs.
 	var/tmp/changing_turf
 
+	var/blocks_nonghost_incorporeal = FALSE
+	var/footstep
+	var/barefootstep
+	var/heavyfootstep
+	var/clawfootstep
+
+/turf/simulated/floor
+	footstep = FOOTSTEP_FLOOR
+	barefootstep = FOOTSTEP_HARD_BAREFOOT
+	heavyfootstep = FOOTSTEP_GENERIC_HEAVY
+	clawfootstep = FOOTSTEP_HARD_CLAW
+
+/turf/simulated/floor/wood
+	footstep = FOOTSTEP_WOOD
+	barefootstep = FOOTSTEP_WOOD_BAREFOOT
+	clawfootstep = FOOTSTEP_WOOD_CLAW
+
+/turf/simulated/floor/carpet
+	footstep = FOOTSTEP_CARPET
+	barefootstep = FOOTSTEP_CARPET_BAREFOOT
+	clawfootstep = FOOTSTEP_CARPET_BAREFOOT
+
+/turf/simulated/floor/plating
+	footstep = FOOTSTEP_PLATING
+	barefootstep = FOOTSTEP_HARD_BAREFOOT
+	clawfootstep = FOOTSTEP_HARD_CLAW
+
+/turf/simulated/mineral
+	footstep = FOOTSTEP_SAND
+	barefootstep = FOOTSTEP_SAND
+	clawfootstep = FOOTSTEP_SAND
+
+/turf/simulated/floor/outdoors
+	footstep = FOOTSTEP_SAND
+	barefootstep = FOOTSTEP_SAND
+	clawfootstep = FOOTSTEP_SAND
+
+/turf/simulated/floor/outdoors/grass
+	footstep = FOOTSTEP_GRASS
+	barefootstep = FOOTSTEP_GRASS
+	clawfootstep = FOOTSTEP_GRASS
+
+/turf/simulated/floor/water
+	footstep = FOOTSTEP_WATER
+	barefootstep = FOOTSTEP_WATER
+	clawfootstep = FOOTSTEP_WATER
+
+/turf/simulated/floor/lava
+	footstep = FOOTSTEP_LAVA
+	barefootstep = FOOTSTEP_LAVA
+	clawfootstep = FOOTSTEP_LAVA
+
 /turf/Initialize(mapload)
 	. = ..()
 	for(var/atom/movable/AM in src)

code/modules/client/preference_setup/vore/02_size.dm

@@ -14,7 +14,7 @@
 	var/voice_freq = 42500	//CHOMPEdit - Why was the default 0
 	var/voice_sound = "goon speak 1"	//CHOMPEdit - Changed the default voice to one less jarring
 	var/custom_speech_bubble = "default"
-	var/custom_footstep = "Default"	// CHOMPAdd
+	var/custom_footstep = "Default"
 	var/species_sound = "Unset"		// CHOMPEdit: Use default species pain/scream sounds based off icon base if none set, override otherwise
 
 // Definition of the stuff for Sizing
@@ -32,8 +32,8 @@
 	pref.voice_freq			= save_data["voice_freq"]
 	pref.voice_sound		= save_data["voice_sound"]
 	pref.custom_speech_bubble	= save_data["custom_speech_bubble"]
-	//CHOMPAdd Start
 	pref.custom_footstep	= save_data["custom_footstep"]
+	//CHOMPAdd Start
 	pref.species_sound		= save_data["species_sound"]
 	//CHOMPAdd End
 
@@ -47,8 +47,8 @@
 	save_data["voice_freq"]			= pref.voice_freq
 	save_data["voice_sound"]		= pref.voice_sound
 	save_data["custom_speech_bubble"]		= pref.custom_speech_bubble
-	//CHOMPAdd Start
 	save_data["custom_footstep"]	= pref.custom_footstep
+	//CHOMPAdd Start
 	save_data["species_sound"]		= pref.species_sound
 	//CHOMPAdd End
 
@@ -64,7 +64,7 @@
 		pref.size_multiplier = initial(pref.size_multiplier)
 	if(!(pref.custom_speech_bubble in selectable_speech_bubbles))
 		pref.custom_speech_bubble = "default"
-	if(!(pref.custom_footstep))	// CHOMPAdd
+	if(!(pref.custom_footstep))
 		pref.custom_footstep = "Default"
 	// var/datum/species/selected_species = GLOB.all_species[pref.species] // CHOMPEdit
 	if(!(pref.species_sound)) // CHOMPEdit // && selected_species.selects_bodytype
@@ -214,14 +214,6 @@
 		else
 			pref.voice_sound = choice
 		return TOPIC_REFRESH
-	// CHOMPAdd Start
-	else if(href_list["customize_footsteps"])
-		var/list/footstep_choice = selectable_footstep
-		var/choice = tgui_input_list(user, "What footstep sounds would your character make?", "Custom Foostep Sounds", footstep_choice)
-		if(choice)
-			pref.custom_footstep = footstep_choice[choice]
-			return TOPIC_REFRESH
-	// CHOMPAdd End
 	else if(href_list["customize_speech_bubble"])
 		var/choice = tgui_input_list(user, "What speech bubble style do you want to use? (default for automatic selection)", "Custom Speech Bubble", selectable_speech_bubbles)
 		if(!choice)
@@ -230,6 +222,13 @@
 			pref.custom_speech_bubble = choice
 		return TOPIC_REFRESH
 
+	else if(href_list["customize_footsteps"])
+		var/list/footstep_choice = selectable_footstep
+		var/choice = tgui_input_list(user, "What footstep sounds would your character make?", "Custom Foostep Sounds", footstep_choice)
+		if(choice)
+			pref.custom_footstep = footstep_choice[choice]
+			return TOPIC_REFRESH
+
 	else if(href_list["voice_test"])
 		var/sound/S
 		switch(pref.voice_sound)

code/modules/mining/mine_turfs.dm

@@ -214,8 +214,6 @@ var/list/mining_overlay_cache = list()
 	if(random_icon)
 		dir = pick(alldirs)
 		. = INITIALIZE_HINT_LATELOAD
-	// var/decl/flooring/F = get_flooring_data(/decl/flooring/sand) - CHOMPEdit
-	// footstep_sounds = F?.footstep_sounds CHOMPEdit footsteps
 
 /turf/simulated/mineral/LateInitialize()
 	if(density && mineral)

code/modules/mob/living/carbon/carbon.dm

@@ -8,7 +8,7 @@
 	if (!default_language && species_language)
 		default_language = GLOB.all_languages[species_language]
 
-	AddElement(/datum/element/footstep, custom_footstep, 1, -6) // CHOMPAdd
+	AddElement(/datum/element/footstep, custom_footstep, 1, -6)
 
 /mob/living/carbon/Life()
 	..()

code/modules/mob/living/carbon/human/human_movement.dm

@@ -300,54 +300,9 @@
 
 // Handle footstep sounds
 /mob/living/carbon/human/handle_footstep(var/turf/T)
-	/*CHOMPEdit - This is an Element now
-	if(!istype(T) || is_incorporeal() || !CONFIG_GET(number/footstep_volume) || !T.footstep_sounds || !T.footstep_sounds.len) // CHOMPEdit
-		return	//CHOMPEdit - Condensed some return checks
-	// CHOMPedit start: Future Upgrades - Multi species support
-	var/list/footstep_sounds = T.footstep_sounds[src.get_species()]
-	if(!LAZYLEN(footstep_sounds))
-		footstep_sounds = T.footstep_sounds["human"] // Probably doesn't have species sounds, use the default // TODO: replace this with a define, unfortunately SPECIES_HUMAN is "Human" instead of "human"
-		if(!footstep_sounds)
-			return // CHOMPedit end
-	var/S = pick(footstep_sounds)
-	GLOB.step_taken_shift_roundstat++
-	if(!S) return
-
-	// Play every 20 steps while walking, for the sneak
-	if(m_intent == I_WALK && step_count++ % 20 != 0)
-		check_vorefootstep(m_intent, T) //CHOMPstation edit: sloshing reagent belly walk system
-	// Play every other step while running
-	if(m_intent == I_RUN && step_count++ % 2 != 0)
-		check_vorefootstep(m_intent, T) //CHOMPstation edit: sloshing reagent belly walk system
-	*/
 	if(shoes && loc == T && get_gravity(loc) && !flying)
-		if(SEND_SIGNAL(shoes, COMSIG_SHOES_STEP_ACTION, m_intent))	//CHOMPEdit - Shoe step comsig
+		if(SEND_SIGNAL(shoes, COMSIG_SHOES_STEP_ACTION, m_intent))
 			return
-	/*
-	if(step_count % 2 == 0)	//CHOMPAdd, since I removed the returns up above, need this to track each odd step.
-		return
-
-	var/volume = CONFIG_GET(number/footstep_volume)
-
-	// Reduce volume while walking or barefoot
-	if(!shoes || m_intent == I_WALK)
-		volume *= 0.5
-	else if(shoes)
-		var/obj/item/clothing/shoes/feet = shoes
-		if(istype(feet))
-			volume *= feet.step_volume_mod
-
-	if(!has_organ(BP_L_FOOT) && !has_organ(BP_R_FOOT))
-		return // no feet = no footsteps
-
-	if(buckled || lying || throwing)
-		return // people flying, lying down or sitting do not step
-
-	if(!get_gravity(src) && prob(75))
-		return // Far less likely to make noise in no gravity
-
-	playsound(T, S, volume, FALSE)
-	*/
 	return
 
 /mob/living/carbon/human/set_dir(var/new_dir)

code/modules/mob/living/carbon/human/species/species.dm

@@ -109,9 +109,10 @@
 	var/gasp_volume = 50 // Self-explanatory, define this separately on your species if the sound files are louder.
 	var/death_volume = 50 // Self-explanatory, define this separately on your species if the sound files are louder.
 	// var/species_sounds_herm // If you want a custom sound played for other genders, just add them like so
+	// CHOMPEdit End
+
 	var/footstep = FOOTSTEP_MOB_HUMAN
 	var/list/special_step_sounds = null
-	// CHOMPEdit End
 
 	// Combat/health/chem/etc. vars.
 	var/total_health = 100								// How much damage the mob can take before entering crit.
@@ -361,8 +362,8 @@
 		inherent_verbs |= /mob/living/carbon/human/proc/regurgitate
 
 	update_sort_hint()
-// CHOMPadd
-/datum/species/proc/get_footstep_sounds()
+
+/datum/species/proc/get_footsep_sounds()
 	return footstep
 
 /datum/species/proc/update_sort_hint()

code/modules/mob/living/carbon/human/species/station/prometheans.dm

@@ -137,7 +137,7 @@ var/datum/species/shapeshifter/promethean/prometheans
 		/decl/emote/visible/vibrate
 	)
 
-	footstep = FOOTSTEP_MOB_SLIME // CHOMPEdit
+	footstep = FOOTSTEP_MOB_SLIME
 
 /datum/species/shapeshifter/promethean/New()
 	..()

code/modules/mob/living/carbon/human/species/station/station.dm

@@ -90,7 +90,6 @@
 	// CHOMPEdit: Reverted these back to Polaris, but commented them out. We're using species-specific sounds instead.
 	// male_scream_sound = list ('sound/effects/mob_effects/una_scream1.ogg','sound/effects/mob_effects/una_scream2.ogg')
 	// female_scream_sound = list ('sound/effects/mob_effects/una_scream1.ogg','sound/effects/mob_effects/una_scream2.ogg')
-	footstep = FOOTSTEP_MOB_CLAW // CHOMPEdit
 	species_sounds = "Lizard" // Species sounds
 
 	pain_verb_1p = list("hiss", "growl") // CHOMPEdit: Unathi pain emotes
@@ -189,6 +188,8 @@
 		/decl/emote/human/stopsway
 	)
 
+	footstep = FOOTSTEP_MOB_CLAW
+
 /datum/species/unathi/equip_survival_gear(var/mob/living/carbon/human/H)
 	..()
 	H.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(H),slot_shoes)

code/modules/mob/living/carbon/human/species/station/teshari.dm

@@ -21,7 +21,6 @@
 
 	// CHOMPEdit Start: Species Sounds
 	species_sounds = "Teshari"
-	footstep = FOOTSTEP_MOB_TESHARI // CHOMPEdit
 	// male_cough_sounds = list('sound/effects/mob_effects/tesharicougha.ogg','sound/effects/mob_effects/tesharicoughb.ogg')
 	// female_cough_sounds = list('sound/effects/mob_effects/tesharicougha.ogg','sound/effects/mob_effects/tesharicoughb.ogg')
 	// male_sneeze_sound = 'sound/effects/mob_effects/tesharisneeze.ogg'
@@ -168,6 +167,8 @@
 		/decl/emote/audible/teshtrill
 	)
 
+	footstep = FOOTSTEP_MOB_TESHARI
+
 /datum/species/teshari/equip_survival_gear(var/mob/living/carbon/human/H)
 	..()
 	H.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(H),slot_shoes)

code/modules/mob/living/silicon/silicon.dm

@@ -37,7 +37,7 @@
 	init_id()
 	init_subsystems()
 
-	AddElement(/datum/element/footstep, FOOTSTEP_MOB_SHOE, 1, -6) // CHOMPAdd
+	AddElement(/datum/element/footstep, FOOTSTEP_MOB_SHOE, 1, -6)
 
 /mob/living/silicon/Destroy()
 	silicon_mob_list -= src

code/modules/mob/living/simple_mob/simple_mob.dm

@@ -212,7 +212,7 @@
 	if(CONFIG_GET(flag/allow_simple_mob_recolor))
 		add_verb(src, /mob/living/simple_mob/proc/ColorMate)
 
-	AddElement(/datum/element/footstep, FOOTSTEP_MOB_SHOE, 1, -6) // CHOMPEdit - Giving them all shoe footsteps FOR NOW until I go through all of them and give appropiate ones
+	AddElement(/datum/element/footstep, FOOTSTEP_MOB_SHOE, 1, -6) // Need to go through all of the mobs to give them proper footsteps...
 
 	return ..()
 

code/modules/mob/mob_defines.dm

@@ -240,6 +240,7 @@
 
 	var/list/datum/action/actions
 
-	var/custom_footstep = FOOTSTEP_MOB_SHOE // CHOMPEdit
 	var/list/viruses
 	var/list/resistances
+
+	var/custom_footstep = FOOTSTEP_MOB_SHOE

code/modules/mob/mob_movement.dm

@@ -410,10 +410,8 @@
 			if(mob.check_holy(T))
 				to_chat(mob, span_warning("You cannot get past holy grounds while you are in this plane of existence!"))
 				return
-			//CHOMPEdit start - add ability to block incorporeal movement for nonghosts
 			else if(!istype(mob, /mob/observer/dead) && T.blocks_nonghost_incorporeal)
 				return
-			//CHOMPEdit end
 			//RS Port #658 Start
 			if(!holder)
 				if(isliving(mob) && A.flag_check(AREA_BLOCK_PHASE_SHIFT))

code/modules/organs/subtypes/machine.dm

@@ -47,9 +47,8 @@
 	return ..()
 
 /obj/item/organ/internal/mmi_holder/Initialize(mapload, var/internal, var/obj/item/mmi/installed)
-	..(mapload, internal)
-	var/mob/living/carbon/human/dummy/mannequin/M = loc
-	if(istype(M))
+	. = ..(mapload, internal)
+	if(!ishuman(loc) || istype(loc, /mob/living/carbon/human/dummy/mannequin))
 		return
 	if(installed)
 		stored_mmi = installed

modular_chomp/code/game/turfs/turf.dm

@@ -1,52 +0,0 @@
-/turf
-	var/blocks_nonghost_incorporeal = FALSE
-	var/footstep
-	var/barefootstep
-	var/heavyfootstep
-	var/clawfootstep
-
-/turf/simulated/floor
-	footstep = FOOTSTEP_FLOOR
-	barefootstep = FOOTSTEP_HARD_BAREFOOT
-	heavyfootstep = FOOTSTEP_GENERIC_HEAVY
-	clawfootstep = FOOTSTEP_HARD_CLAW
-
-/turf/simulated/floor/wood
-	footstep = FOOTSTEP_WOOD
-	barefootstep = FOOTSTEP_WOOD_BAREFOOT
-	clawfootstep = FOOTSTEP_WOOD_CLAW
-
-/turf/simulated/floor/carpet
-	footstep = FOOTSTEP_CARPET
-	barefootstep = FOOTSTEP_CARPET_BAREFOOT
-	clawfootstep = FOOTSTEP_CARPET_BAREFOOT
-
-/turf/simulated/floor/plating
-	footstep = FOOTSTEP_PLATING
-	barefootstep = FOOTSTEP_HARD_BAREFOOT
-	clawfootstep = FOOTSTEP_HARD_CLAW
-
-/turf/simulated/mineral
-	footstep = FOOTSTEP_SAND
-	barefootstep = FOOTSTEP_SAND
-	clawfootstep = FOOTSTEP_SAND
-
-/turf/simulated/floor/outdoors
-	footstep = FOOTSTEP_SAND
-	barefootstep = FOOTSTEP_SAND
-	clawfootstep = FOOTSTEP_SAND
-
-/turf/simulated/floor/outdoors/grass
-	footstep = FOOTSTEP_GRASS
-	barefootstep = FOOTSTEP_GRASS
-	clawfootstep = FOOTSTEP_GRASS
-
-/turf/simulated/floor/water
-	footstep = FOOTSTEP_WATER
-	barefootstep = FOOTSTEP_WATER
-	clawfootstep = FOOTSTEP_WATER
-
-/turf/simulated/floor/lava
-	footstep = FOOTSTEP_LAVA
-	barefootstep = FOOTSTEP_LAVA
-	clawfootstep = FOOTSTEP_LAVA

vorestation.dme

@@ -71,7 +71,7 @@
 #include "code\__defines\exosuit_fab.dm"
 #include "code\__defines\faction.dm"
 #include "code\__defines\flags.dm"
-#include "code\__defines\footsteps_ch.dm"
+#include "code\__defines\footsteps.dm"
 #include "code\__defines\gamemode.dm"
 #include "code\__defines\holder.dm"
 #include "code\__defines\holomap.dm"
@@ -144,6 +144,7 @@
 #include "code\__defines\shuttle.dm"
 #include "code\__defines\simple_mob.dm"
 #include "code\__defines\size.dm"
+#include "code\__defines\slosh.dm"
 #include "code\__defines\sound.dm"
 #include "code\__defines\span_vr.dm"
 #include "code\__defines\species_languages.dm"
@@ -186,6 +187,7 @@
 #include "code\__defines\dcs\signals.dm"
 #include "code\__defines\dcs\signals_ch.dm"
 #include "code\__defines\dcs\signals\signals_subsystem.dm"
+#include "code\__defines\dcs\signals\signals_turf.dm"
 #include "code\__defines\dcs\signals_ch\signals_mob\signals_mob_main_ch.dm"
 #include "code\__defines\traits\_traits.dm"
 #include "code\__defines\traits\declarations.dm"
@@ -474,9 +476,9 @@
 #include "code\datums\organs.dm"
 #include "code\datums\position_point_vector.dm"
 #include "code\datums\progressbar.dm"
+#include "code\datums\reference_tracking_new.dm"
 #include "code\datums\riding.dm"
 #include "code\datums\signals.dm"
-#include "code\datums\reference_tracking_new.dm"
 #include "code\datums\soul_link.dm"
 #include "code\datums\sun.dm"
 #include "code\datums\verb_callbacks.dm"
@@ -568,7 +570,10 @@
 #include "code\datums\diseases\advance\symptoms\weigh.dm"
 #include "code\datums\elements\_element.dm"
 #include "code\datums\elements\conflict_checking.dm"
+#include "code\datums\elements\footstep.dm"
+#include "code\datums\elements\footstep_override.dm"
 #include "code\datums\elements\light_blocking.dm"
+#include "code\datums\elements\slosh.dm"
 #include "code\datums\elements\turf_transparency.dm"
 #include "code\datums\game_masters\_common.dm"
 #include "code\datums\helper_datums\construction_datum.dm"
@@ -4765,7 +4770,6 @@
 #include "modular_chomp\code\__defines\_planes+layers.dm"
 #include "modular_chomp\code\__defines\span.dm"
 #include "modular_chomp\code\__defines\text.dm"
-#include "modular_chomp\code\__defines\dcs\signals\signals_turf.dm"
 #include "modular_chomp\code\_global_vars\tgui.dm"
 #include "modular_chomp\code\_global_vars\list\names.dm"
 #include "modular_chomp\code\_HELPERS\announcements.dm"
@@ -4785,9 +4789,6 @@
 #include "modular_chomp\code\datums\crafting\items.dm"
 #include "modular_chomp\code\datums\crafting\recipes.dm"
 #include "modular_chomp\code\datums\crafting\tyr_tribal.dm"
-#include "modular_chomp\code\datums\elements\footstep.dm"
-#include "modular_chomp\code\datums\elements\footstep_override.dm"
-#include "modular_chomp\code\datums\elements\slosh.dm"
 #include "modular_chomp\code\datums\outfits\jobs\cargo.dm"
 #include "modular_chomp\code\datums\outfits\jobs\command.dm"
 #include "modular_chomp\code\datums\outfits\jobs\noncrew.dm"
@@ -4858,7 +4859,6 @@
 #include "modular_chomp\code\game\objects\structures\weathersignal.dm"
 #include "modular_chomp\code\game\objects\structures\crate_lockers\largecrate.dm"
 #include "modular_chomp\code\game\objects\structures\crates_lockers\closets\secure\secure_closets.dm"
-#include "modular_chomp\code\game\turfs\turf.dm"
 #include "modular_chomp\code\game\turfs\simulated\alien.dm"
 #include "modular_chomp\code\game\turfs\simulated\blackholeturfs.dm"
 #include "modular_chomp\code\game\turfs\simulated\outdoors\desert_planet.dm"