diff --git a/code/controllers/subsystems/garbage-debug.dm b/code/controllers/subsystems/garbage-debug.dm index 016ff8b1664..ac19afb0db3 100644 --- a/code/controllers/subsystems/garbage-debug.dm +++ b/code/controllers/subsystems/garbage-debug.dm @@ -481,13 +481,18 @@ SearchVar(hiss_sound) SearchVar(page_sound) SearchVar(fracture_sound) - SearchVar(defaultfootsteps) - SearchVar(concretefootsteps) - SearchVar(grassfootsteps) - SearchVar(dirtfootsteps) - SearchVar(waterfootsteps) - SearchVar(sandfootsteps) - SearchVar(gravelfootsteps) + SearchVar(blank) + SearchVar(catwalk) + SearchVar(wood) + SearchVar(tiles) + SearchVar(plating) + SearchVar(carpet) + SearchVar(asteroid) + SearchVar(grass) + SearchVar(water) + SearchVar(lava) + SearchVar(snow) + SearchVar(sand) SearchVar(footstepfx) SearchVar(FALLOFF_SOUNDS) SearchVar(all_antag_types) diff --git a/code/game/objects/items/weapons/cigs_lighters.dm b/code/game/objects/items/weapons/cigs_lighters.dm index d26f100bb99..149f6bec69a 100644 --- a/code/game/objects/items/weapons/cigs_lighters.dm +++ b/code/game/objects/items/weapons/cigs_lighters.dm @@ -279,7 +279,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM var/transfered = glass.reagents.trans_to_obj(src, chem_volume) if(transfered) //if reagents were transfered, show the message to_chat(user, span("warning", "You dip \the [src] into \the [glass].")) - playsound(src.loc, 'sound/effects/footsteps/slosh1.wav', 50, 1) + playsound(src.loc, 'sound/effects/footstep/water1.ogg', 50, 1) else //if not, either the beaker was empty, or the cigarette was full if(!glass.reagents.total_volume) to_chat(user, span("notice", "[glass] is empty.")) diff --git a/code/game/objects/structures.dm b/code/game/objects/structures.dm index 616adb0f172..3482a4c8cfa 100644 --- a/code/game/objects/structures.dm +++ b/code/game/objects/structures.dm @@ -6,6 +6,7 @@ var/breakable var/parts var/list/climbers + var/list/footstep_sound //footstep sounds when stepped on /obj/structure/Destroy() if(parts) diff --git a/code/game/objects/structures/lattice.dm b/code/game/objects/structures/lattice.dm index 2af84cd2947..9ac8bc0d0cb 100644 --- a/code/game/objects/structures/lattice.dm +++ b/code/game/objects/structures/lattice.dm @@ -20,6 +20,7 @@ /obj/structure/grille, /turf/unsimulated/mineral/asteroid ) + footstep_sound = "catwalk" /obj/structure/lattice/Initialize() . = ..() diff --git a/code/game/sound.dm b/code/game/sound.dm index f56e6546235..d9dacc6e5f0 100644 --- a/code/game/sound.dm +++ b/code/game/sound.dm @@ -36,6 +36,83 @@ #define ASTEROID CAVE #define SPACE UNDERWATER +//footsteps +var/list/blank_footstep = list('sound/effects/footstep/blank.ogg') + +var/list/catwalk_footstep = list( + 'sound/effects/footstep/catwalk1.ogg', + 'sound/effects/footstep/catwalk2.ogg', + 'sound/effects/footstep/catwalk3.ogg', + 'sound/effects/footstep/catwalk4.ogg', + 'sound/effects/footstep/catwalk5.ogg' +) +var/list/wood_footstep = list( + 'sound/effects/footstep/wood1.ogg', + 'sound/effects/footstep/wood2.ogg', + 'sound/effects/footstep/wood3.ogg', + 'sound/effects/footstep/wood4.ogg', + 'sound/effects/footstep/wood5.ogg') + +var/list/tiles_footstep = list( + 'sound/effects/footstep/floor1.ogg', + 'sound/effects/footstep/floor2.ogg', + 'sound/effects/footstep/floor3.ogg', + 'sound/effects/footstep/floor4.ogg', + 'sound/effects/footstep/floor5.ogg' +) +var/list/plating_footstep = 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' +) +var/list/carpet_footstep = list( + 'sound/effects/footstep/carpet1.ogg', + 'sound/effects/footstep/carpet2.ogg', + 'sound/effects/footstep/carpet3.ogg', + 'sound/effects/footstep/carpet4.ogg', + 'sound/effects/footstep/carpet5.ogg' +) +var/list/asteroid_footstep = 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' +) +var/list/grass_footstep = list( + 'sound/effects/footstep/grass1.ogg', + 'sound/effects/footstep/grass2.ogg', + 'sound/effects/footstep/grass3.ogg', + 'sound/effects/footstep/grass4.ogg' +) +var/list/water_footstep = list( + 'sound/effects/footstep/water1.ogg', + 'sound/effects/footstep/water2.ogg', + 'sound/effects/footstep/water3.ogg', + 'sound/effects/footstep/water4.ogg' +) +var/list/lava_footstep = list( + 'sound/effects/footstep/lava1.ogg', + 'sound/effects/footstep/lava2.ogg', + 'sound/effects/footstep/lava3.ogg' +) +var/list/snow_footstep = list( + 'sound/effects/footstep/snow1.ogg', + 'sound/effects/footstep/snow2.ogg', + 'sound/effects/footstep/snow3.ogg', + 'sound/effects/footstep/snow4.ogg', + 'sound/effects/footstep/snow5.ogg' +) +var/list/sand_footstep = list( + 'sound/effects/footstep/sand1.ogg', + 'sound/effects/footstep/sand2.ogg', + 'sound/effects/footstep/sand3.ogg', + 'sound/effects/footstep/sand4.ogg' +) +var/list/footstepfx = list("blank", "catwalk", "wood", "tiles", "plating", "carpet", "asteroid", "grass", "water", "lava", "snow", "sand") + var/list/shatter_sound = list( 'sound/effects/Glassbr1.ogg', 'sound/effects/Glassbr2.ogg', @@ -90,64 +167,20 @@ var/list/fracture_sound = list( 'sound/effects/bonebreak3.ogg', 'sound/effects/bonebreak4.ogg' ) - -//FOOTSTEPS -var/list/defaultfootsteps = list( - 'sound/effects/footsteps/tile1.wav', - 'sound/effects/footsteps/tile2.wav', - 'sound/effects/footsteps/tile3.wav', - 'sound/effects/footsteps/tile4.wav' -) -var/list/concretefootsteps = list( - 'sound/effects/footsteps/concrete1.wav', - 'sound/effects/footsteps/concrete2.wav', - 'sound/effects/footsteps/concrete3.wav', - 'sound/effects/footsteps/concrete4.wav' -) -var/list/grassfootsteps = list( - 'sound/effects/footsteps/grass1.wav', - 'sound/effects/footsteps/grass2.wav', - 'sound/effects/footsteps/grass3.wav', - 'sound/effects/footsteps/grass4.wav' -) -var/list/dirtfootsteps = list( - 'sound/effects/footsteps/dirt1.wav', - 'sound/effects/footsteps/dirt2.wav', - 'sound/effects/footsteps/dirt3.wav', - 'sound/effects/footsteps/dirt4.wav' -) -var/list/waterfootsteps = list( - 'sound/effects/footsteps/slosh1.wav', - 'sound/effects/footsteps/slosh2.wav', - 'sound/effects/footsteps/slosh3.wav', - 'sound/effects/footsteps/slosh4.wav' -) -var/list/sandfootsteps = list( - 'sound/effects/footsteps/sand1.wav', - 'sound/effects/footsteps/sand2.wav', - 'sound/effects/footsteps/sand3.wav', - 'sound/effects/footsteps/sand4.wav' -) -var/list/gravelfootsteps = list( - 'sound/effects/footsteps/gravel1.wav', - 'sound/effects/footsteps/gravel2.wav', - 'sound/effects/footsteps/gravel3.wav', - 'sound/effects/footsteps/gravel4.wav' -) -var/list/computerbeeps = list( +var/list/computerbeep_sound = list( 'sound/machines/compbeep1.ogg', 'sound/machines/compbeep2.ogg', 'sound/machines/compbeep3.ogg', 'sound/machines/compbeep4.ogg', 'sound/machines/compbeep5.ogg' ) -var/list/switchsounds = list( +var/list/switch_sound = list( 'sound/machines/switch1.ogg', 'sound/machines/switch2.ogg', 'sound/machines/switch3.ogg', 'sound/machines/switch4.ogg' ) -var/list/keyboardsounds = list( +var/list/keyboard_sound = list( 'sound/machines/keyboard/keypress1.ogg', 'sound/machines/keyboard/keypress2.ogg', 'sound/machines/keyboard/keypress3.ogg', @@ -156,16 +189,13 @@ var/list/keyboardsounds = list( 'sound/machines/keyboard/keystroke2.ogg', 'sound/machines/keyboard/keystroke3.ogg', 'sound/machines/keyboard/keystroke4.ogg' - ) -var/list/pickaxesounds = list( +) +var/list/pickaxe_sound = list( 'sound/weapons/mine/pickaxe1.ogg', 'sound/weapons/mine/pickaxe2.ogg', 'sound/weapons/mine/pickaxe3.ogg', 'sound/weapons/mine/pickaxe4.ogg' - ) - -var/list/footstepfx = list("defaultstep","concretestep","grassstep","dirtstep","waterstep","sandstep", "gravelstep") - +) //var/list/gun_sound = list('sound/weapons/gunshot/gunshot1.ogg', 'sound/weapons/gunshot/gunshot2.ogg','sound/weapons/gunshot/gunshot3.ogg','sound/weapons/gunshot/gunshot4.ogg') /proc/playsound(atom/source, soundin, vol, vary, extrarange, falloff, is_global, usepressure = 1, environment = -1, required_preferences = 0, required_asfx_toggles = 0) @@ -351,6 +381,20 @@ var/list/footstepfx = list("defaultstep","concretestep","grassstep","dirtstep"," /proc/get_sfx(soundin) if(istext(soundin)) switch(soundin) + //footsteps + if ("blank") soundin = pick(blank_footstep) + if ("catwalk") soundin = pick(catwalk_footstep) + if ("wood") soundin = pick(wood_footstep) + if ("tiles") soundin = pick(tiles_footstep) + if ("plating") soundin = pick(plating_footstep) + if ("carpet") soundin = pick(carpet_footstep) + if ("asteroid") soundin = pick(asteroid_footstep) + if ("grass") soundin = pick(grass_footstep) + if ("water") soundin = pick(water_footstep) + if ("lava") soundin = pick(lava_footstep) + if ("snow") soundin = pick(snow_footstep) + if ("sand") soundin = pick(sand_footstep) + //misc if ("shatter") soundin = pick(shatter_sound) if ("explosion") soundin = pick(explosion_sound) if ("sparks") soundin = pick(spark_sound) @@ -362,15 +406,8 @@ var/list/footstepfx = list("defaultstep","concretestep","grassstep","dirtstep"," if ("pageturn") soundin = pick(page_sound) if ("fracture") soundin = pick(fracture_sound) //if ("gunshot") soundin = pick(gun_sound) - if ("defaultstep") soundin = pick(defaultfootsteps) - if ("concretestep") soundin = pick(concretefootsteps) - if ("grassstep") soundin = pick(grassfootsteps) - if ("dirtstep") soundin = pick(dirtfootsteps) - if ("waterstep") soundin = pick(waterfootsteps) - if ("sandstep") soundin = pick(sandfootsteps) - if ("gravelstep") soundin = pick(gravelfootsteps) - if ("computerbeep") soundin = pick(computerbeeps) - if ("switch") soundin = pick(switchsounds) - if ("keyboard") soundin = pick(keyboardsounds) - if ("pickaxe") soundin = pick(pickaxesounds) + if ("computerbeep") soundin = pick(computerbeep_sound) + if ("switch") soundin = pick(switch_sound) + if ("keyboard") soundin = pick(keyboard_sound) + if ("pickaxe") soundin = pick(pickaxe_sound) return soundin diff --git a/code/game/turfs/flooring/flooring.dm b/code/game/turfs/flooring/flooring.dm index ccc540bcfd9..31c416e9a98 100644 --- a/code/game/turfs/flooring/flooring.dm +++ b/code/game/turfs/flooring/flooring.dm @@ -37,6 +37,7 @@ var/list/flooring_types var/descriptor = "tiles" var/flags var/can_paint + var/footstep_sound = "tiles" /decl/flooring/grass name = "grass" @@ -47,6 +48,7 @@ var/list/flooring_types damage_temperature = T0C+80 flags = TURF_HAS_EDGES | TURF_REMOVE_SHOVEL build_type = /obj/item/stack/tile/grass + footstep_sound = "grass" /decl/flooring/asteroid name = "coarse sand" @@ -55,6 +57,7 @@ var/list/flooring_types icon_base = "asteroid" flags = TURF_HAS_EDGES | TURF_REMOVE_SHOVEL build_type = null + footstep_sound = "asteroid" /decl/flooring/carpet name = "carpet" @@ -64,6 +67,7 @@ var/list/flooring_types build_type = /obj/item/stack/tile/carpet damage_temperature = T0C+200 flags = TURF_HAS_EDGES | TURF_HAS_CORNERS | TURF_REMOVE_CROWBAR | TURF_CAN_BURN + footstep_sound = "carpet" /decl/flooring/carpet/blue name = "carpet" @@ -81,6 +85,7 @@ var/list/flooring_types flags = TURF_REMOVE_CROWBAR | TURF_CAN_BREAK | TURF_CAN_BURN build_type = /obj/item/stack/tile/floor can_paint = 1 + footstep_sound = "tiles" /decl/flooring/linoleum name = "linoleum" @@ -89,6 +94,7 @@ var/list/flooring_types icon_base = "lino" flags = TURF_REMOVE_CROWBAR | TURF_CAN_BREAK can_paint = 1 + footstep_sound = "tiles" /decl/flooring/tiling/red name = "floor" @@ -145,6 +151,7 @@ var/list/flooring_types descriptor = "planks" build_type = /obj/item/stack/tile/wood flags = TURF_CAN_BREAK | TURF_IS_FRAGILE | TURF_REMOVE_SCREWDRIVER | TURF_CAN_BURN + footstep_sound = "wood" /decl/flooring/reinforced name = "reinforced floor" @@ -158,6 +165,7 @@ var/list/flooring_types apply_thermal_conductivity = 0.025 apply_heat_capacity = 325000 can_paint = 1 + footstep_sound = "plating" /decl/flooring/reinforced/circuit name = "processing strata" @@ -205,6 +213,7 @@ var/list/flooring_types icon = 'icons/turf/floors.dmi' icon_base = "diona" flags = TURF_ACID_IMMUNE | TURF_REMOVE_SHOVEL + footstep_sound = "grass" //material turfs diff --git a/code/game/turfs/flooring/flooring_premade.dm b/code/game/turfs/flooring/flooring_premade.dm index 6ad8398f225..49afa27bef5 100644 --- a/code/game/turfs/flooring/flooring_premade.dm +++ b/code/game/turfs/flooring/flooring_premade.dm @@ -3,7 +3,7 @@ icon = 'icons/turf/flooring/carpet.dmi' icon_state = "carpet" initial_flooring = /decl/flooring/carpet - footstep_sound = "dirtstep"//It sounds better than squeaky hard-floor audio + footstep_sound = "carpet" /turf/simulated/floor/bluegrid name = "mainframe floor" @@ -22,13 +22,14 @@ icon = 'icons/turf/flooring/wood.dmi' icon_state = "wood" initial_flooring = /decl/flooring/wood + footstep_sound = "wood" /turf/simulated/floor/grass name = "grass patch" icon = 'icons/turf/flooring/grass.dmi' icon_state = "grass0" initial_flooring = /decl/flooring/grass - footstep_sound = "grassstep" + footstep_sound = "grass" /turf/simulated/floor/carpet/blue name = "blue carpet" @@ -46,7 +47,7 @@ icon = 'icons/turf/flooring/tiles.dmi' icon_state = "reinforced" initial_flooring = /decl/flooring/reinforced - footstep_sound = "concretestep" + footstep_sound = "plating" /turf/simulated/floor/reinforced/airless oxygen = 0 @@ -165,7 +166,7 @@ oxygen = 0 nitrogen = 0 temperature = TCMB - footstep_sound = "concretestep" + footstep_sound = "plating" roof_type = null @@ -212,7 +213,7 @@ name = "snow" icon = 'icons/turf/snow.dmi' icon_state = "snow" - footstep_sound = "gravelstep" + footstep_sound = "snow" /turf/simulated/floor/snow/Initialize() . = ..() @@ -221,7 +222,7 @@ /turf/simulated/floor/plating/snow icon = 'icons/turf/snow.dmi' icon_state = "snowplating" - footstep_sound = "gravelstep" + footstep_sound = "snow" /turf/simulated/floor/airless/ceiling icon_state = "asteroidplating" @@ -268,7 +269,6 @@ name = "foamed metal" icon = 'icons/effects/effects.dmi' icon_state = "metalfoam" - footstep_sound = "gravelstep" /turf/simulated/floor/foamedmetal/attack_hand(var/mob/user) user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN) diff --git a/code/game/turfs/simulated/floor.dm b/code/game/turfs/simulated/floor.dm index 536f5aad432..8b8e80282ad 100644 --- a/code/game/turfs/simulated/floor.dm +++ b/code/game/turfs/simulated/floor.dm @@ -34,6 +34,7 @@ //Set the initial strings name = flooring.name desc = flooring.desc + footstep_sound = flooring.footstep_sound if (mapload) queue_icon_update() else diff --git a/code/game/turfs/simulated/floor_types.dm b/code/game/turfs/simulated/floor_types.dm index 4de5303a36d..c262d74b08a 100644 --- a/code/game/turfs/simulated/floor_types.dm +++ b/code/game/turfs/simulated/floor_types.dm @@ -1,10 +1,10 @@ /turf/simulated/floor/plating - footstep_sound = "concretestep" + footstep_sound = "plating" /turf/simulated/floor/diona name = "biomass flooring" icon_state = "diona" - footstep_sound = "grassstep" + footstep_sound = "grass" initial_flooring = /decl/flooring/diona /turf/simulated/floor/diona/attackby() diff --git a/code/game/turfs/simulated/shuttle_turfs.dm b/code/game/turfs/simulated/shuttle_turfs.dm index 2faccef4c0f..8bcd82ad7ba 100644 --- a/code/game/turfs/simulated/shuttle_turfs.dm +++ b/code/game/turfs/simulated/shuttle_turfs.dm @@ -120,7 +120,7 @@ roof_flags = ROOF_CLEANUP permit_ao = 0 initial_flooring = /decl/flooring/shuttle - footstep_sound = "concretestep" + footstep_sound = "plating" /turf/simulated/floor/shuttle/yellow icon_state = "floor2" diff --git a/code/game/turfs/simulated/water.dm b/code/game/turfs/simulated/water.dm index 5aeea998edb..1325aa095f5 100644 --- a/code/game/turfs/simulated/water.dm +++ b/code/game/turfs/simulated/water.dm @@ -1,7 +1,7 @@ /turf/simulated/floor/beach name = "beach" icon = 'icons/misc/beach.dmi' - footstep_sound = "sandstep" + footstep_sound = "sand" /turf/simulated/floor/beach/sand name = "sand" @@ -14,12 +14,12 @@ name = "coastline" icon = 'icons/misc/beach2.dmi' icon_state = "sandwater" - footstep_sound = "waterstep" + footstep_sound = "water" /turf/simulated/floor/beach/water name = "water" icon_state = "water" - footstep_sound = "waterstep" + footstep_sound = "water" movement_cost = 2 var/watertype = "water5" var/obj/effect/water_effect/water_overlay diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm index ee7dc8efc6d..2db485926b0 100644 --- a/code/game/turfs/turf.dm +++ b/code/game/turfs/turf.dm @@ -22,7 +22,7 @@ var/pathweight = 1 // How much does it cost to pathfind over this turf? var/blessed = 0 // Has the turf been blessed? - var/footstep_sound = "defaultstep" + var/footstep_sound = "tiles" var/list/decals diff --git a/code/game/turfs/unsimulated/beach.dm b/code/game/turfs/unsimulated/beach.dm index 85f9696d541..fd44c154ebb 100644 --- a/code/game/turfs/unsimulated/beach.dm +++ b/code/game/turfs/unsimulated/beach.dm @@ -1,23 +1,23 @@ /turf/unsimulated/beach name = "Beach" icon = 'icons/misc/beach.dmi' - footstep_sound = "sandstep" + footstep_sound = "sand" /turf/unsimulated/beach/sand name = "Sand" icon_state = "sand" - footstep_sound = "sandstep" + footstep_sound = "sand" /turf/unsimulated/beach/coastline name = "Coastline" icon = 'icons/misc/beach2.dmi' icon_state = "sandwater" - footstep_sound = "sandstep" + footstep_sound = "sand" /turf/unsimulated/beach/water name = "Water" icon_state = "water" - footstep_sound = "waterstep" + footstep_sound = "water" /turf/unsimulated/beach/water/Initialize() . = ..() diff --git a/code/game/turfs/unsimulated/floor.dm b/code/game/turfs/unsimulated/floor.dm index 364d297c6d0..5f156d986e5 100644 --- a/code/game/turfs/unsimulated/floor.dm +++ b/code/game/turfs/unsimulated/floor.dm @@ -7,7 +7,7 @@ name = "snow" icon = 'icons/turf/snow.dmi' icon_state = "snow" - footstep_sound = "grassstep" + footstep_sound = "snow" /turf/unsimulated/mask name = "mask" diff --git a/code/modules/holodeck/HolodeckObjects.dm b/code/modules/holodeck/HolodeckObjects.dm index 8a3f5fd8ede..ec12c3f06ca 100644 --- a/code/modules/holodeck/HolodeckObjects.dm +++ b/code/modules/holodeck/HolodeckObjects.dm @@ -18,7 +18,7 @@ icon = 'icons/turf/flooring/carpet.dmi' icon_state = "carpet" initial_flooring = /decl/flooring/carpet - footstep_sound = "dirtstep"//It sounds better than squeaky hard-floor audio + footstep_sound = "carpet" /turf/simulated/floor/holofloor/tiled name = "floor" @@ -101,7 +101,7 @@ icon = 'icons/misc/beach.dmi' base_icon = 'icons/misc/beach.dmi' initial_flooring = null - footstep_sound = "sandstep" + footstep_sound = "sand" /turf/simulated/floor/holofloor/beach/sand name = "sand" @@ -113,13 +113,13 @@ icon = 'icons/misc/beach2.dmi' icon_state = "sandwater" base_icon_state = "sandwater" - footstep_sound = "waterstep" + footstep_sound = "water" /turf/simulated/floor/holofloor/beach/water name = "water" icon_state = "seashallow" base_icon_state = "seashallow" - footstep_sound = "waterstep" + footstep_sound = "water" /turf/simulated/floor/holofloor/desert name = "desert sand" @@ -131,7 +131,7 @@ icon = 'icons/turf/flooring/asteroid.dmi' base_icon = 'icons/turf/flooring/asteroid.dmi' initial_flooring = null - footstep_sound = "gravelstep" + footstep_sound = "sand" /turf/simulated/floor/holofloor/desert/Initialize() . = ..() diff --git a/code/modules/mining/mine_turf_types.dm b/code/modules/mining/mine_turf_types.dm index b0d13d6cbb9..bfce11da8ac 100644 --- a/code/modules/mining/mine_turf_types.dm +++ b/code/modules/mining/mine_turf_types.dm @@ -63,7 +63,7 @@ canSmoothWith = null openspace_override_type = /turf/simulated/open/chasm/airless - footstep_sound = "concretestep" + footstep_sound = "asteroid" /turf/unsimulated/floor/asteroid/basalt/get_smooth_underlay_icon(mutable_appearance/underlay_appearance, turf/asking_turf, adjacency_dir) underlay_appearance.icon = icon @@ -92,7 +92,7 @@ smooth = SMOOTH_MORE | SMOOTH_BORDER | SMOOTH_NO_CLEAR_ICON base_icon = 'icons/turf/smooth/ash.dmi' base_icon_state = "ash" - footstep_sound = "sandstep" + footstep_sound = "sand" /turf/unsimulated/floor/asteroid/ash/Initialize() . = ..() @@ -104,5 +104,4 @@ icon_state = "rockyash" base_icon_state = "rockyash" base_icon = 'icons/turf/smooth/rocky_ash.dmi' - desc = "A fine grey ash. Seems to contain medium-sized rocks." - footstep_sound = "gravelstep" \ No newline at end of file + desc = "A fine grey ash. Seems to contain medium-sized rocks." \ No newline at end of file diff --git a/code/modules/mob/living/carbon/human/human_movement.dm b/code/modules/mob/living/carbon/human/human_movement.dm index 43c70ad48c3..e395e7f8e9e 100644 --- a/code/modules/mob/living/carbon/human/human_movement.dm +++ b/code/modules/mob/living/carbon/human/human_movement.dm @@ -137,24 +137,28 @@ . = ..() var/turf/T = loc - if (!isturf(T)) - return + var/footsound + for(var/obj/structure/S in T) + footsound = S.footstep_sound + if(footsound) break + if(!footsound) + footsound = T.footstep_sound if (client) var/turf/B = GetAbove(T) up_hint.icon_state = "uphint[(B ? !!B.is_hole : 0)]" if (is_noisy && !stat && !lying) - if ((x == last_x && y == last_y) || !T.footstep_sound) + if ((x == last_x && y == last_y) || !footsound) return last_x = x last_y = y if (m_intent == "run") - playsound(src, T.footstep_sound, 70, 1, required_asfx_toggles = ASFX_FOOTSTEPS) + playsound(src, footsound, 70, 1, required_asfx_toggles = ASFX_FOOTSTEPS) else footstep++ if (footstep % 2) - playsound(src, T.footstep_sound, 40, 1, required_asfx_toggles = ASFX_FOOTSTEPS) + playsound(src, footsound, 40, 1, required_asfx_toggles = ASFX_FOOTSTEPS) /mob/living/carbon/human/mob_has_gravity() . = ..() diff --git a/code/modules/multiz/structures.dm b/code/modules/multiz/structures.dm index 304d44ef5cc..63eb056bbe5 100644 --- a/code/modules/multiz/structures.dm +++ b/code/modules/multiz/structures.dm @@ -170,7 +170,7 @@ /obj/structure/stairs name = "stairs" - desc = "Stairs leading to another deck. Not too useful if the gravity goes out." + desc = "Stairs leading to another level. Not too useful if the gravity goes out." icon = 'icons/obj/stairs.dmi' density = 0 opacity = 0 @@ -205,6 +205,9 @@ var/mob/living/L = A if(L.pulling) L.pulling.forceMove(target) + if(ishuman(A)) + playsound(src, 'sound/effects/stairs_step.ogg', 50) + playsound(target, 'sound/effects/stairs_step.ogg', 50) /obj/structure/stairs/proc/upperStep(var/turf/T) return (T == loc) diff --git a/code/modules/multiz/turfs/open_space.dm b/code/modules/multiz/turfs/open_space.dm index c4dc7f73302..1a057413732 100644 --- a/code/modules/multiz/turfs/open_space.dm +++ b/code/modules/multiz/turfs/open_space.dm @@ -12,8 +12,8 @@ pathweight = 100000 //Seriously, don't try and path over this one numbnuts is_hole = TRUE flags = MIMIC_BELOW | MIMIC_OVERWRITE | MIMIC_NO_AO - roof_type = null + footstep_sound = null // A lazy list to contain a list of mobs who are currently scaling // up this turf. Used in human/can_fall. diff --git a/sound/effects/footstep/asteroid1.ogg b/sound/effects/footstep/asteroid1.ogg new file mode 100644 index 00000000000..1cb215dc782 Binary files /dev/null and b/sound/effects/footstep/asteroid1.ogg differ diff --git a/sound/effects/footstep/asteroid2.ogg b/sound/effects/footstep/asteroid2.ogg new file mode 100644 index 00000000000..331d0ef2417 Binary files /dev/null and b/sound/effects/footstep/asteroid2.ogg differ diff --git a/sound/effects/footstep/asteroid3.ogg b/sound/effects/footstep/asteroid3.ogg new file mode 100644 index 00000000000..90fbf251a0e Binary files /dev/null and b/sound/effects/footstep/asteroid3.ogg differ diff --git a/sound/effects/footstep/asteroid4.ogg b/sound/effects/footstep/asteroid4.ogg new file mode 100644 index 00000000000..186ff17a439 Binary files /dev/null and b/sound/effects/footstep/asteroid4.ogg differ diff --git a/sound/effects/footstep/asteroid5.ogg b/sound/effects/footstep/asteroid5.ogg new file mode 100644 index 00000000000..0ea4c962d0d Binary files /dev/null and b/sound/effects/footstep/asteroid5.ogg differ diff --git a/sound/effects/footstep/blank.ogg b/sound/effects/footstep/blank.ogg new file mode 100644 index 00000000000..a8732ae21ef Binary files /dev/null and b/sound/effects/footstep/blank.ogg differ diff --git a/sound/effects/footstep/carpet1.ogg b/sound/effects/footstep/carpet1.ogg new file mode 100644 index 00000000000..2735a9bf3dc Binary files /dev/null and b/sound/effects/footstep/carpet1.ogg differ diff --git a/sound/effects/footstep/carpet2.ogg b/sound/effects/footstep/carpet2.ogg new file mode 100644 index 00000000000..07e5f2320aa Binary files /dev/null and b/sound/effects/footstep/carpet2.ogg differ diff --git a/sound/effects/footstep/carpet3.ogg b/sound/effects/footstep/carpet3.ogg new file mode 100644 index 00000000000..edb0193f6e2 Binary files /dev/null and b/sound/effects/footstep/carpet3.ogg differ diff --git a/sound/effects/footstep/carpet4.ogg b/sound/effects/footstep/carpet4.ogg new file mode 100644 index 00000000000..c9598e2b736 Binary files /dev/null and b/sound/effects/footstep/carpet4.ogg differ diff --git a/sound/effects/footstep/carpet5.ogg b/sound/effects/footstep/carpet5.ogg new file mode 100644 index 00000000000..076818323ae Binary files /dev/null and b/sound/effects/footstep/carpet5.ogg differ diff --git a/sound/effects/footstep/catwalk1.ogg b/sound/effects/footstep/catwalk1.ogg new file mode 100644 index 00000000000..5d6ad7b4a00 Binary files /dev/null and b/sound/effects/footstep/catwalk1.ogg differ diff --git a/sound/effects/footstep/catwalk2.ogg b/sound/effects/footstep/catwalk2.ogg new file mode 100644 index 00000000000..07a624dbe49 Binary files /dev/null and b/sound/effects/footstep/catwalk2.ogg differ diff --git a/sound/effects/footstep/catwalk3.ogg b/sound/effects/footstep/catwalk3.ogg new file mode 100644 index 00000000000..acff22e3864 Binary files /dev/null and b/sound/effects/footstep/catwalk3.ogg differ diff --git a/sound/effects/footstep/catwalk4.ogg b/sound/effects/footstep/catwalk4.ogg new file mode 100644 index 00000000000..7235a6b9feb Binary files /dev/null and b/sound/effects/footstep/catwalk4.ogg differ diff --git a/sound/effects/footstep/catwalk5.ogg b/sound/effects/footstep/catwalk5.ogg new file mode 100644 index 00000000000..c33f248acd6 Binary files /dev/null and b/sound/effects/footstep/catwalk5.ogg differ diff --git a/sound/effects/footstep/floor1.ogg b/sound/effects/footstep/floor1.ogg new file mode 100644 index 00000000000..1e3e1558399 Binary files /dev/null and b/sound/effects/footstep/floor1.ogg differ diff --git a/sound/effects/footstep/floor2.ogg b/sound/effects/footstep/floor2.ogg new file mode 100644 index 00000000000..cce5a25d829 Binary files /dev/null and b/sound/effects/footstep/floor2.ogg differ diff --git a/sound/effects/footstep/floor3.ogg b/sound/effects/footstep/floor3.ogg new file mode 100644 index 00000000000..16ab67f729c Binary files /dev/null and b/sound/effects/footstep/floor3.ogg differ diff --git a/sound/effects/footstep/floor4.ogg b/sound/effects/footstep/floor4.ogg new file mode 100644 index 00000000000..9ef15430ff8 Binary files /dev/null and b/sound/effects/footstep/floor4.ogg differ diff --git a/sound/effects/footstep/floor5.ogg b/sound/effects/footstep/floor5.ogg new file mode 100644 index 00000000000..0f6a66057de Binary files /dev/null and b/sound/effects/footstep/floor5.ogg differ diff --git a/sound/effects/footstep/grass1.ogg b/sound/effects/footstep/grass1.ogg new file mode 100644 index 00000000000..357547cd77a Binary files /dev/null and b/sound/effects/footstep/grass1.ogg differ diff --git a/sound/effects/footstep/grass2.ogg b/sound/effects/footstep/grass2.ogg new file mode 100644 index 00000000000..75bf8657e8d Binary files /dev/null and b/sound/effects/footstep/grass2.ogg differ diff --git a/sound/effects/footstep/grass3.ogg b/sound/effects/footstep/grass3.ogg new file mode 100644 index 00000000000..04f82872b1d Binary files /dev/null and b/sound/effects/footstep/grass3.ogg differ diff --git a/sound/effects/footstep/grass4.ogg b/sound/effects/footstep/grass4.ogg new file mode 100644 index 00000000000..6d736f2fb2d Binary files /dev/null and b/sound/effects/footstep/grass4.ogg differ diff --git a/sound/effects/footstep/hull1.ogg b/sound/effects/footstep/hull1.ogg new file mode 100644 index 00000000000..615df6c5502 Binary files /dev/null and b/sound/effects/footstep/hull1.ogg differ diff --git a/sound/effects/footstep/hull2.ogg b/sound/effects/footstep/hull2.ogg new file mode 100644 index 00000000000..3aecb743f70 Binary files /dev/null and b/sound/effects/footstep/hull2.ogg differ diff --git a/sound/effects/footstep/hull3.ogg b/sound/effects/footstep/hull3.ogg new file mode 100644 index 00000000000..03339131f63 Binary files /dev/null and b/sound/effects/footstep/hull3.ogg differ diff --git a/sound/effects/footstep/hull4.ogg b/sound/effects/footstep/hull4.ogg new file mode 100644 index 00000000000..2fba89d3185 Binary files /dev/null and b/sound/effects/footstep/hull4.ogg differ diff --git a/sound/effects/footstep/hull5.ogg b/sound/effects/footstep/hull5.ogg new file mode 100644 index 00000000000..10c5912b97a Binary files /dev/null and b/sound/effects/footstep/hull5.ogg differ diff --git a/sound/effects/footstep/lava1.ogg b/sound/effects/footstep/lava1.ogg new file mode 100644 index 00000000000..e26dbaf8bda Binary files /dev/null and b/sound/effects/footstep/lava1.ogg differ diff --git a/sound/effects/footstep/lava2.ogg b/sound/effects/footstep/lava2.ogg new file mode 100644 index 00000000000..90b73f840b2 Binary files /dev/null and b/sound/effects/footstep/lava2.ogg differ diff --git a/sound/effects/footstep/lava3.ogg b/sound/effects/footstep/lava3.ogg new file mode 100644 index 00000000000..34363815106 Binary files /dev/null and b/sound/effects/footstep/lava3.ogg differ diff --git a/sound/effects/footstep/plating1.ogg b/sound/effects/footstep/plating1.ogg new file mode 100644 index 00000000000..0df770e6638 Binary files /dev/null and b/sound/effects/footstep/plating1.ogg differ diff --git a/sound/effects/footstep/plating2.ogg b/sound/effects/footstep/plating2.ogg new file mode 100644 index 00000000000..314b9133d25 Binary files /dev/null and b/sound/effects/footstep/plating2.ogg differ diff --git a/sound/effects/footstep/plating3.ogg b/sound/effects/footstep/plating3.ogg new file mode 100644 index 00000000000..5c571d77eb6 Binary files /dev/null and b/sound/effects/footstep/plating3.ogg differ diff --git a/sound/effects/footstep/plating4.ogg b/sound/effects/footstep/plating4.ogg new file mode 100644 index 00000000000..5953262764b Binary files /dev/null and b/sound/effects/footstep/plating4.ogg differ diff --git a/sound/effects/footstep/plating5.ogg b/sound/effects/footstep/plating5.ogg new file mode 100644 index 00000000000..4676a637a6d Binary files /dev/null and b/sound/effects/footstep/plating5.ogg differ diff --git a/sound/effects/footstep/sand1.ogg b/sound/effects/footstep/sand1.ogg new file mode 100644 index 00000000000..63de531f22e Binary files /dev/null and b/sound/effects/footstep/sand1.ogg differ diff --git a/sound/effects/footstep/sand2.ogg b/sound/effects/footstep/sand2.ogg new file mode 100644 index 00000000000..e9d597fd94a Binary files /dev/null and b/sound/effects/footstep/sand2.ogg differ diff --git a/sound/effects/footstep/sand3.ogg b/sound/effects/footstep/sand3.ogg new file mode 100644 index 00000000000..51c92e49f3f Binary files /dev/null and b/sound/effects/footstep/sand3.ogg differ diff --git a/sound/effects/footstep/sand4.ogg b/sound/effects/footstep/sand4.ogg new file mode 100644 index 00000000000..9bc430db51f Binary files /dev/null and b/sound/effects/footstep/sand4.ogg differ diff --git a/sound/effects/footstep/snow1.ogg b/sound/effects/footstep/snow1.ogg new file mode 100644 index 00000000000..8434e8ee366 Binary files /dev/null and b/sound/effects/footstep/snow1.ogg differ diff --git a/sound/effects/footstep/snow2.ogg b/sound/effects/footstep/snow2.ogg new file mode 100644 index 00000000000..8e7e6efc8d1 Binary files /dev/null and b/sound/effects/footstep/snow2.ogg differ diff --git a/sound/effects/footstep/snow3.ogg b/sound/effects/footstep/snow3.ogg new file mode 100644 index 00000000000..ee468aa3f4c Binary files /dev/null and b/sound/effects/footstep/snow3.ogg differ diff --git a/sound/effects/footstep/snow4.ogg b/sound/effects/footstep/snow4.ogg new file mode 100644 index 00000000000..b180f10ba54 Binary files /dev/null and b/sound/effects/footstep/snow4.ogg differ diff --git a/sound/effects/footstep/snow5.ogg b/sound/effects/footstep/snow5.ogg new file mode 100644 index 00000000000..ec5d1a47f98 Binary files /dev/null and b/sound/effects/footstep/snow5.ogg differ diff --git a/sound/effects/footstep/water1.ogg b/sound/effects/footstep/water1.ogg new file mode 100644 index 00000000000..f22cbf28482 Binary files /dev/null and b/sound/effects/footstep/water1.ogg differ diff --git a/sound/effects/footstep/water2.ogg b/sound/effects/footstep/water2.ogg new file mode 100644 index 00000000000..e2a47650c63 Binary files /dev/null and b/sound/effects/footstep/water2.ogg differ diff --git a/sound/effects/footstep/water3.ogg b/sound/effects/footstep/water3.ogg new file mode 100644 index 00000000000..97ce152a5ce Binary files /dev/null and b/sound/effects/footstep/water3.ogg differ diff --git a/sound/effects/footstep/water4.ogg b/sound/effects/footstep/water4.ogg new file mode 100644 index 00000000000..5778a52560d Binary files /dev/null and b/sound/effects/footstep/water4.ogg differ diff --git a/sound/effects/footstep/wood1.ogg b/sound/effects/footstep/wood1.ogg new file mode 100644 index 00000000000..c76fc423fc2 Binary files /dev/null and b/sound/effects/footstep/wood1.ogg differ diff --git a/sound/effects/footstep/wood2.ogg b/sound/effects/footstep/wood2.ogg new file mode 100644 index 00000000000..71dc1aa9679 Binary files /dev/null and b/sound/effects/footstep/wood2.ogg differ diff --git a/sound/effects/footstep/wood3.ogg b/sound/effects/footstep/wood3.ogg new file mode 100644 index 00000000000..bf86889006e Binary files /dev/null and b/sound/effects/footstep/wood3.ogg differ diff --git a/sound/effects/footstep/wood4.ogg b/sound/effects/footstep/wood4.ogg new file mode 100644 index 00000000000..44734425ce6 Binary files /dev/null and b/sound/effects/footstep/wood4.ogg differ diff --git a/sound/effects/footstep/wood5.ogg b/sound/effects/footstep/wood5.ogg new file mode 100644 index 00000000000..5ad4fa81e77 Binary files /dev/null and b/sound/effects/footstep/wood5.ogg differ diff --git a/sound/effects/footsteps/concrete1.wav b/sound/effects/footsteps/concrete1.wav deleted file mode 100644 index 374112c574d..00000000000 Binary files a/sound/effects/footsteps/concrete1.wav and /dev/null differ diff --git a/sound/effects/footsteps/concrete2.wav b/sound/effects/footsteps/concrete2.wav deleted file mode 100644 index f31827d56a9..00000000000 Binary files a/sound/effects/footsteps/concrete2.wav and /dev/null differ diff --git a/sound/effects/footsteps/concrete3.wav b/sound/effects/footsteps/concrete3.wav deleted file mode 100644 index 5319f845551..00000000000 Binary files a/sound/effects/footsteps/concrete3.wav and /dev/null differ diff --git a/sound/effects/footsteps/concrete4.wav b/sound/effects/footsteps/concrete4.wav deleted file mode 100644 index bdb27ed9c32..00000000000 Binary files a/sound/effects/footsteps/concrete4.wav and /dev/null differ diff --git a/sound/effects/footsteps/dirt1.wav b/sound/effects/footsteps/dirt1.wav deleted file mode 100644 index 0ed297dad23..00000000000 Binary files a/sound/effects/footsteps/dirt1.wav and /dev/null differ diff --git a/sound/effects/footsteps/dirt2.wav b/sound/effects/footsteps/dirt2.wav deleted file mode 100644 index cf48cf6a26b..00000000000 Binary files a/sound/effects/footsteps/dirt2.wav and /dev/null differ diff --git a/sound/effects/footsteps/dirt3.wav b/sound/effects/footsteps/dirt3.wav deleted file mode 100644 index b96e9980478..00000000000 Binary files a/sound/effects/footsteps/dirt3.wav and /dev/null differ diff --git a/sound/effects/footsteps/dirt4.wav b/sound/effects/footsteps/dirt4.wav deleted file mode 100644 index c3c0c7b473c..00000000000 Binary files a/sound/effects/footsteps/dirt4.wav and /dev/null differ diff --git a/sound/effects/footsteps/grass1.wav b/sound/effects/footsteps/grass1.wav deleted file mode 100644 index dc51aa693dd..00000000000 Binary files a/sound/effects/footsteps/grass1.wav and /dev/null differ diff --git a/sound/effects/footsteps/grass2.wav b/sound/effects/footsteps/grass2.wav deleted file mode 100644 index 06d6744a2ba..00000000000 Binary files a/sound/effects/footsteps/grass2.wav and /dev/null differ diff --git a/sound/effects/footsteps/grass3.wav b/sound/effects/footsteps/grass3.wav deleted file mode 100644 index 53b1cf4419b..00000000000 Binary files a/sound/effects/footsteps/grass3.wav and /dev/null differ diff --git a/sound/effects/footsteps/grass4.wav b/sound/effects/footsteps/grass4.wav deleted file mode 100644 index 262180ed357..00000000000 Binary files a/sound/effects/footsteps/grass4.wav and /dev/null differ diff --git a/sound/effects/footsteps/gravel1.wav b/sound/effects/footsteps/gravel1.wav deleted file mode 100644 index 9a23dd47a90..00000000000 Binary files a/sound/effects/footsteps/gravel1.wav and /dev/null differ diff --git a/sound/effects/footsteps/gravel2.wav b/sound/effects/footsteps/gravel2.wav deleted file mode 100644 index 726565bd7a2..00000000000 Binary files a/sound/effects/footsteps/gravel2.wav and /dev/null differ diff --git a/sound/effects/footsteps/gravel3.wav b/sound/effects/footsteps/gravel3.wav deleted file mode 100644 index e9c93099067..00000000000 Binary files a/sound/effects/footsteps/gravel3.wav and /dev/null differ diff --git a/sound/effects/footsteps/gravel4.wav b/sound/effects/footsteps/gravel4.wav deleted file mode 100644 index f1e26df69c6..00000000000 Binary files a/sound/effects/footsteps/gravel4.wav and /dev/null differ diff --git a/sound/effects/footsteps/sand1.wav b/sound/effects/footsteps/sand1.wav deleted file mode 100644 index 7afc0c822dd..00000000000 Binary files a/sound/effects/footsteps/sand1.wav and /dev/null differ diff --git a/sound/effects/footsteps/sand2.wav b/sound/effects/footsteps/sand2.wav deleted file mode 100644 index 231a863c1cc..00000000000 Binary files a/sound/effects/footsteps/sand2.wav and /dev/null differ diff --git a/sound/effects/footsteps/sand3.wav b/sound/effects/footsteps/sand3.wav deleted file mode 100644 index d94ab0784ca..00000000000 Binary files a/sound/effects/footsteps/sand3.wav and /dev/null differ diff --git a/sound/effects/footsteps/sand4.wav b/sound/effects/footsteps/sand4.wav deleted file mode 100644 index dc61ac667be..00000000000 Binary files a/sound/effects/footsteps/sand4.wav and /dev/null differ diff --git a/sound/effects/footsteps/slosh1.wav b/sound/effects/footsteps/slosh1.wav deleted file mode 100644 index 1c8f52ef5f5..00000000000 Binary files a/sound/effects/footsteps/slosh1.wav and /dev/null differ diff --git a/sound/effects/footsteps/slosh2.wav b/sound/effects/footsteps/slosh2.wav deleted file mode 100644 index a3cde5706dd..00000000000 Binary files a/sound/effects/footsteps/slosh2.wav and /dev/null differ diff --git a/sound/effects/footsteps/slosh3.wav b/sound/effects/footsteps/slosh3.wav deleted file mode 100644 index 6de8e787b11..00000000000 Binary files a/sound/effects/footsteps/slosh3.wav and /dev/null differ diff --git a/sound/effects/footsteps/slosh4.wav b/sound/effects/footsteps/slosh4.wav deleted file mode 100644 index 37353c4eec6..00000000000 Binary files a/sound/effects/footsteps/slosh4.wav and /dev/null differ diff --git a/sound/effects/footsteps/tile1.wav b/sound/effects/footsteps/tile1.wav deleted file mode 100644 index 4b2c672890f..00000000000 Binary files a/sound/effects/footsteps/tile1.wav and /dev/null differ diff --git a/sound/effects/footsteps/tile2.wav b/sound/effects/footsteps/tile2.wav deleted file mode 100644 index a0b0a64f1b6..00000000000 Binary files a/sound/effects/footsteps/tile2.wav and /dev/null differ diff --git a/sound/effects/footsteps/tile3.wav b/sound/effects/footsteps/tile3.wav deleted file mode 100644 index 4455538ca91..00000000000 Binary files a/sound/effects/footsteps/tile3.wav and /dev/null differ diff --git a/sound/effects/footsteps/tile4.wav b/sound/effects/footsteps/tile4.wav deleted file mode 100644 index 830fac36fa3..00000000000 Binary files a/sound/effects/footsteps/tile4.wav and /dev/null differ diff --git a/sound/effects/stairs_step.ogg b/sound/effects/stairs_step.ogg new file mode 100644 index 00000000000..14f3d4963ed Binary files /dev/null and b/sound/effects/stairs_step.ogg differ