diff --git a/_maps/map_files/vanderlin/vanderlin.dmm b/_maps/map_files/vanderlin/vanderlin.dmm
index 80be8f5ae5c..531365c39b0 100644
--- a/_maps/map_files/vanderlin/vanderlin.dmm
+++ b/_maps/map_files/vanderlin/vanderlin.dmm
@@ -7130,6 +7130,9 @@
 "doH" = (
 /obj/structure/table/wood/plain_alt,
 /obj/item/candle/yellow,
+/obj/machinery/light/fueled/wallfire/candle/lamp{
+	pixel_y = 40
+	},
 /turf/open/floor/ruinedwood/chevron,
 /area/indoors/town/keep/halls/w)
 "doM" = (
@@ -22608,7 +22611,6 @@
 /area/under/town/basement)
 "kGM" = (
 /obj/structure/door,
-/obj/effect/mapping_helpers/access/locker,
 /obj/effect/mapping_helpers/access/keyset/manor/atarms,
 /turf/open/floor/cobble,
 /area/under/town/basement)
@@ -23184,10 +23186,6 @@
 	},
 /turf/open/floor/churchmarble/violet,
 /area/indoors/town/church/inquisition)
-"kVZ" = (
-/obj/structure/bars/cemetery,
-/turf/open/openspace,
-/area/outdoors/town/roofs)
 "kWb" = (
 /obj/structure/chair/bench/couch/right/lord_secondary{
 	dir = 8
@@ -28984,10 +28982,6 @@
 "nBt" = (
 /obj/structure/fluff/railing/border,
 /obj/structure/fluff/statue/gargoyle{
-	pixel_y = 8;
-	pixel_x = -1
-	},
-/obj/machinery/light/fueled/torchholder{
 	pixel_y = 8
 	},
 /turf/open/floor/carpet/royalblack,
@@ -44166,12 +44160,6 @@
 /obj/machinery/light/fueled/hearth,
 /turf/open/floor/wood,
 /area/indoors/town/cell)
-"urU" = (
-/obj/structure/closet/dirthole/closed/loot,
-/obj/structure/gravemarker,
-/mob/living/simple_animal/hostile/retaliate/gator,
-/turf/open/floor/dirt,
-/area/outdoors/exposed/church)
 "urY" = (
 /obj/structure/lever/hidden/keep{
 	redstone_id = 615
@@ -45160,13 +45148,6 @@
 	},
 /turf/open/floor/ruinedwood/alt,
 /area/outdoors/town)
-"uOj" = (
-/obj/item/rotation_contraption/shaft,
-/obj/structure/rotation_piece/cog/large,
-/turf/open/water/river{
-	dir = 8
-	},
-/area/indoors/town/dwarfin)
 "uOw" = (
 /obj/structure/window/openclose/reinforced{
 	dir = 1
@@ -49890,7 +49871,6 @@
 /obj/structure/lever/hidden/keep{
 	redstone_id = "ClockPathPassage"
 	},
-/obj/structure/water_pipe,
 /turf/closed/wall/mineral/stone,
 /area/under/town/basement)
 "wJW" = (
@@ -74718,7 +74698,7 @@ smk
 uVU
 vnJ
 oEG
-uOj
+pot
 uVU
 smk
 cQu
@@ -113103,10 +113083,10 @@ iOl
 mFi
 hZn
 czz
-xkP
-wrm
-wrm
-vbp
+hZn
+tGt
+tGt
+hZn
 czz
 gwN
 ujA
@@ -113306,8 +113286,8 @@ mFi
 hZn
 hZn
 hZn
-evL
-evL
+hZn
+hZn
 hZn
 hZn
 hZn
@@ -127884,7 +127864,7 @@ wgG
 oSl
 oSl
 oSl
-urU
+ssk
 iKJ
 gEF
 oSl
@@ -161976,7 +161956,7 @@ biy
 biy
 biy
 biy
-kVZ
+biy
 biy
 gLs
 bKi
diff --git a/code/__DEFINES/footsteps.dm b/code/__DEFINES/footsteps.dm
index ca65e08161b..80e248229fa 100644
--- a/code/__DEFINES/footsteps.dm
+++ b/code/__DEFINES/footsteps.dm
@@ -1,4 +1,5 @@
 #define FOOTSTEP_WOOD "wood"
+#define FOOTSTEP_OLDWOOD "oldwood"
 #define FOOTSTEP_FLOOR "floor"
 #define FOOTSTEP_PLATING "plating"
 #define FOOTSTEP_CARPET "carpet"
@@ -9,6 +10,7 @@
 #define FOOTSTEP_MUD "mud"
 #define FOOTSTEP_STONE "stone"
 #define FOOTSTEP_SHALLOW "shallow"
+#define FOOTSTEP_CATWALK "catwalk"
 
 //barefoot sounds
 #define FOOTSTEP_WOOD_BAREFOOT "woodbarefoot"
@@ -58,6 +60,12 @@ GLOBAL_LIST_INIT(footstep, list(
 		'sound/foley/footsteps/FTWOO_A2.ogg',
 		'sound/foley/footsteps/FTWOO_A3.ogg',
 		'sound/foley/footsteps/FTWOO_A4.ogg'), 42, 0),
+	FOOTSTEP_OLDWOOD = list(list(
+		'sound/foley/footsteps/FTOLDWOO_A1.ogg',
+		'sound/foley/footsteps/FTOLDWOO_A2.ogg',
+		'sound/foley/footsteps/FTOLDWOO_A3.ogg',
+		'sound/foley/footsteps/FTOLDWOO_A4.ogg',
+		'sound/foley/footsteps/FTOLDWOO_A5.ogg'), 42, 0),
 	FOOTSTEP_FLOOR = list(list(
 		'sound/foley/footsteps/FTTIL_A1.ogg',
 		'sound/foley/footsteps/FTTIL_A2.ogg',
@@ -107,6 +115,12 @@ GLOBAL_LIST_INIT(footstep, list(
 		'sound/foley/footsteps/FTMUD (3).ogg',
 		'sound/foley/footsteps/FTMUD (4).ogg',
 		'sound/foley/footsteps/FTMUD (5).ogg'), 80, 0),
+	FOOTSTEP_CATWALK = list(list(
+		'sound/foley/footsteps/FTCAT_A1.ogg',
+		'sound/foley/footsteps/FTCAT_A2.ogg',
+		'sound/foley/footsteps/FTCAT_A3.ogg',
+		'sound/foley/footsteps/FTCAT_A4.ogg',
+		'sound/foley/footsteps/FTCAT_A5.ogg'), 40, 0),
 ))
 //bare footsteps lists
 GLOBAL_LIST_INIT(barefootstep, list(
diff --git a/code/datums/components/squeak.dm b/code/datums/components/squeak.dm
index 30aae5d47ef..48b845d7005 100644
--- a/code/datums/components/squeak.dm
+++ b/code/datums/components/squeak.dm
@@ -83,6 +83,8 @@
 		var/mob/living/living_arrived = AM
 		if(living_arrived.mob_size < MOB_SIZE_HUMAN)
 			return
+		if(living_arrived.m_intent == MOVE_INTENT_SNEAK)
+			return
 	var/atom/current_parent = parent
 	if(isturf(current_parent.loc))
 		play_squeak()
diff --git a/code/game/objects/structures/bridge.dm b/code/game/objects/structures/bridge.dm
index 72138554909..83a7617c7b2 100644
--- a/code/game/objects/structures/bridge.dm
+++ b/code/game/objects/structures/bridge.dm
@@ -14,6 +14,7 @@
 
 /obj/structure/bridge/Initialize(mapload)
 	. = ..()
+	AddElement(/datum/element/footstep_override, footstep = FOOTSTEP_OLDWOOD)
 	var/static/list/loc_connections = list(COMSIG_ATOM_EXIT = PROC_REF(on_exit))
 	AddElement(/datum/element/connect_loc, loc_connections)
 	// Shift sprite down when going east/west so that people properly walk on the bridge
diff --git a/code/game/objects/structures/fluff.dm b/code/game/objects/structures/fluff.dm
index 53325dd6344..7e46273343c 100644
--- a/code/game/objects/structures/fluff.dm
+++ b/code/game/objects/structures/fluff.dm
@@ -287,7 +287,7 @@
 	var/togg = FALSE
 
 /obj/structure/bars/grille/Initialize()
-	AddComponent(/datum/component/squeak, list('sound/foley/footsteps/FTMET_A1.ogg','sound/foley/footsteps/FTMET_A2.ogg','sound/foley/footsteps/FTMET_A3.ogg','sound/foley/footsteps/FTMET_A4.ogg'), 40, extrarange = SHORT_RANGE_SOUND_EXTRARANGE)
+	AddElement(/datum/element/footstep_override, footstep = FOOTSTEP_CATWALK)
 	dir = pick(GLOB.cardinals)
 	return ..()
 
@@ -340,7 +340,7 @@
 
 /obj/structure/bars/pipe/Initialize()
 	. = ..()
-	AddComponent(/datum/component/squeak, list('sound/foley/footsteps/FTMET_A1.ogg','sound/foley/footsteps/FTMET_A2.ogg','sound/foley/footsteps/FTMET_A3.ogg','sound/foley/footsteps/FTMET_A4.ogg'), 40, extrarange = SHORT_RANGE_SOUND_EXTRARANGE)
+	AddElement(/datum/element/footstep_override, footstep = FOOTSTEP_CATWALK)
 
 
 /obj/structure/bars/pipe/left
@@ -1498,5 +1498,6 @@
 
 /obj/structure/fluff/steamvent/Initialize()
 	. = ..()
+	AddElement(/datum/element/footstep_override, footstep = FOOTSTEP_CATWALK)
 	var/obj/effect/abstract/shared_particle_holder/steamvent_particle = add_shared_particles(/particles/smoke/cig/big, "steam_vent", pool_size = 4)
 	steamvent_particle.particles.position = generator(GEN_BOX, list(-14, -14), list(14, 14))
diff --git a/code/game/objects/structures/ladders.dm b/code/game/objects/structures/ladders.dm
index 84e378af917..ebfe1a33a2d 100644
--- a/code/game/objects/structures/ladders.dm
+++ b/code/game/objects/structures/ladders.dm
@@ -72,14 +72,15 @@
 	if(is_ghost)
 		return
 
-	if(!is_ghost)
-		playsound(src, 'sound/foley/ladder.ogg', 100, FALSE)
-		if(!do_after(user, 3 SECONDS, src))
-			return
+	if(isliving(user))
+		var/mob/living/L = user
+		if(L.m_intent != MOVE_INTENT_SNEAK)
+			playsound(src, 'sound/foley/ladder.ogg', 100, FALSE)
+	if(!do_after(user, 3 SECONDS, src))
+		return
 
-	if(!is_ghost)
-		show_fluff_message(going_up, user)
-		ladder.add_fingerprint(user)
+	show_fluff_message(going_up, user)
+	ladder.add_fingerprint(user)
 	var/turf/T = get_turf(ladder)
 	if(isliving(user))
 		movable_travel_z_level(user, T)
diff --git a/code/game/objects/structures/redstone.dm b/code/game/objects/structures/redstone.dm
index dc6cf1a8b26..4e828550ec1 100644
--- a/code/game/objects/structures/redstone.dm
+++ b/code/game/objects/structures/redstone.dm
@@ -406,6 +406,7 @@ GLOBAL_LIST_EMPTY(redstone_objs)
 	resistance_flags = INDESTRUCTIBLE
 
 /obj/structure/floordoor/Initialize()
+	AddElement(/datum/element/footstep_override, footstep = FOOTSTEP_OLDWOOD)
 	AddComponent(/datum/component/squeak, list('sound/foley/footsteps/FTMET_A1.ogg','sound/foley/footsteps/FTMET_A2.ogg','sound/foley/footsteps/FTMET_A3.ogg','sound/foley/footsteps/FTMET_A4.ogg'), 40, extrarange = SHORT_RANGE_SOUND_EXTRARANGE)
 	return ..()
 
@@ -496,6 +497,10 @@ GLOBAL_LIST_EMPTY(redstone_objs)
 	layer = ABOVE_OPEN_TURF_LAYER
 	resistance_flags = INDESTRUCTIBLE
 
+/obj/structure/kybraxor/Initialize()
+	. = ..()
+	AddElement(/datum/element/footstep_override, footstep = FOOTSTEP_CATWALK)
+
 /obj/structure/kybraxor/redstone_triggered(mob/user)
 	if(changing_state)
 		return
diff --git a/code/game/rotational_objects/fluid_objects/pipe_system.dm b/code/game/rotational_objects/fluid_objects/pipe_system.dm
index a8a35209cb9..04e8c8d7016 100644
--- a/code/game/rotational_objects/fluid_objects/pipe_system.dm
+++ b/code/game/rotational_objects/fluid_objects/pipe_system.dm
@@ -24,7 +24,7 @@
 
 /obj/structure/water_pipe/Initialize()
 	. = ..()
-	AddComponent(/datum/component/squeak, list('sound/foley/footsteps/FTMET_A1.ogg','sound/foley/footsteps/FTMET_A2.ogg','sound/foley/footsteps/FTMET_A3.ogg','sound/foley/footsteps/FTMET_A4.ogg'), 40, extrarange = SHORT_RANGE_SOUND_EXTRARANGE)
+	AddElement(/datum/element/footstep_override, footstep = FOOTSTEP_CATWALK)
 	for(var/direction in GLOB.cardinals_multiz)
 		var/turf/cardinal_turf = get_step_multiz(src, direction)
 		for(var/obj/structure/water_pipe/pipe in cardinal_turf)
diff --git a/sound/foley/footsteps/FTCAT_A1.ogg b/sound/foley/footsteps/FTCAT_A1.ogg
new file mode 100644
index 00000000000..759d13108a7
Binary files /dev/null and b/sound/foley/footsteps/FTCAT_A1.ogg differ
diff --git a/sound/foley/footsteps/FTCAT_A2.ogg b/sound/foley/footsteps/FTCAT_A2.ogg
new file mode 100644
index 00000000000..fc1d997025c
Binary files /dev/null and b/sound/foley/footsteps/FTCAT_A2.ogg differ
diff --git a/sound/foley/footsteps/FTCAT_A3.ogg b/sound/foley/footsteps/FTCAT_A3.ogg
new file mode 100644
index 00000000000..596c75d47a2
Binary files /dev/null and b/sound/foley/footsteps/FTCAT_A3.ogg differ
diff --git a/sound/foley/footsteps/FTCAT_A4.ogg b/sound/foley/footsteps/FTCAT_A4.ogg
new file mode 100644
index 00000000000..745deaf9068
Binary files /dev/null and b/sound/foley/footsteps/FTCAT_A4.ogg differ
diff --git a/sound/foley/footsteps/FTCAT_A5.ogg b/sound/foley/footsteps/FTCAT_A5.ogg
new file mode 100644
index 00000000000..c5c62f402c9
Binary files /dev/null and b/sound/foley/footsteps/FTCAT_A5.ogg differ
diff --git a/sound/foley/footsteps/FTOLDWOO_A1.ogg b/sound/foley/footsteps/FTOLDWOO_A1.ogg
new file mode 100644
index 00000000000..5a4bb78e914
Binary files /dev/null and b/sound/foley/footsteps/FTOLDWOO_A1.ogg differ
diff --git a/sound/foley/footsteps/FTOLDWOO_A2.ogg b/sound/foley/footsteps/FTOLDWOO_A2.ogg
new file mode 100644
index 00000000000..d198a2ad31d
Binary files /dev/null and b/sound/foley/footsteps/FTOLDWOO_A2.ogg differ
diff --git a/sound/foley/footsteps/FTOLDWOO_A3.ogg b/sound/foley/footsteps/FTOLDWOO_A3.ogg
new file mode 100644
index 00000000000..b6453b8893d
Binary files /dev/null and b/sound/foley/footsteps/FTOLDWOO_A3.ogg differ
diff --git a/sound/foley/footsteps/FTOLDWOO_A4.ogg b/sound/foley/footsteps/FTOLDWOO_A4.ogg
new file mode 100644
index 00000000000..be628799a1a
Binary files /dev/null and b/sound/foley/footsteps/FTOLDWOO_A4.ogg differ
diff --git a/sound/foley/footsteps/FTOLDWOO_A5.ogg b/sound/foley/footsteps/FTOLDWOO_A5.ogg
new file mode 100644
index 00000000000..c303a3a1ede
Binary files /dev/null and b/sound/foley/footsteps/FTOLDWOO_A5.ogg differ
diff --git a/sound/foley/ladder.ogg b/sound/foley/ladder.ogg
index 52e0581e8dd..62b369afcb0 100644
Binary files a/sound/foley/ladder.ogg and b/sound/foley/ladder.ogg differ