diff --git a/Content.Shared/Movement/Systems/SharedMoverController.cs b/Content.Shared/Movement/Systems/SharedMoverController.cs index ae94221d93..a93e479817 100644 --- a/Content.Shared/Movement/Systems/SharedMoverController.cs +++ b/Content.Shared/Movement/Systems/SharedMoverController.cs @@ -36,7 +36,8 @@ namespace Content.Shared.Movement.Systems private const float StepSoundMoveDistanceWalking = 1.5f; private const float FootstepVariation = 0f; - private const float FootstepVolume = 1f; + private const float FootstepVolume = 6f; + private const float FootstepWalkingVolumeModifier = 0.2f; /// /// @@ -275,11 +276,12 @@ namespace Content.Shared.Movement.Systems : worldTotal.ToWorldAngle(); xform.DeferUpdates = false; - if (TryGetSound(mover, mobMover, xform, out var variation, out var sound)) + if (!weightless && TryGetSound(mover, mobMover, xform, out var variation, out var sound)) { + var soundModifier = mover.Sprinting ? 1.0f : FootstepWalkingVolumeModifier; SoundSystem.Play(sound, GetSoundPlayers(mover.Owner), - mover.Owner, AudioHelpers.WithVariation(variation).WithVolume(FootstepVolume)); + mover.Owner, AudioHelpers.WithVariation(variation).WithVolume(FootstepVolume * soundModifier)); } } diff --git a/Resources/Audio/Effects/Footsteps/catwalk1.ogg b/Resources/Audio/Effects/Footsteps/catwalk1.ogg index 5d6ad7b4a0..2183584e5c 100644 Binary files a/Resources/Audio/Effects/Footsteps/catwalk1.ogg and b/Resources/Audio/Effects/Footsteps/catwalk1.ogg differ diff --git a/Resources/Audio/Effects/Footsteps/catwalk2.ogg b/Resources/Audio/Effects/Footsteps/catwalk2.ogg index 07a624dbe4..72c11e6219 100644 Binary files a/Resources/Audio/Effects/Footsteps/catwalk2.ogg and b/Resources/Audio/Effects/Footsteps/catwalk2.ogg differ diff --git a/Resources/Audio/Effects/Footsteps/catwalk3.ogg b/Resources/Audio/Effects/Footsteps/catwalk3.ogg index acff22e386..178cffe3f1 100644 Binary files a/Resources/Audio/Effects/Footsteps/catwalk3.ogg and b/Resources/Audio/Effects/Footsteps/catwalk3.ogg differ diff --git a/Resources/Audio/Effects/Footsteps/catwalk4.ogg b/Resources/Audio/Effects/Footsteps/catwalk4.ogg index 7235a6b9fe..a0b0b33851 100644 Binary files a/Resources/Audio/Effects/Footsteps/catwalk4.ogg and b/Resources/Audio/Effects/Footsteps/catwalk4.ogg differ diff --git a/Resources/Audio/Effects/Footsteps/catwalk5.ogg b/Resources/Audio/Effects/Footsteps/catwalk5.ogg index c33f248acd..c38debdd73 100644 Binary files a/Resources/Audio/Effects/Footsteps/catwalk5.ogg and b/Resources/Audio/Effects/Footsteps/catwalk5.ogg differ diff --git a/Resources/Audio/Effects/Footsteps/floor1.ogg b/Resources/Audio/Effects/Footsteps/floor1.ogg index 1e3e155839..bf2c85e039 100644 Binary files a/Resources/Audio/Effects/Footsteps/floor1.ogg and b/Resources/Audio/Effects/Footsteps/floor1.ogg differ diff --git a/Resources/Audio/Effects/Footsteps/floor2.ogg b/Resources/Audio/Effects/Footsteps/floor2.ogg index cce5a25d82..5c18558508 100644 Binary files a/Resources/Audio/Effects/Footsteps/floor2.ogg and b/Resources/Audio/Effects/Footsteps/floor2.ogg differ diff --git a/Resources/Audio/Effects/Footsteps/floor3.ogg b/Resources/Audio/Effects/Footsteps/floor3.ogg index 16ab67f729..f24d5f6554 100644 Binary files a/Resources/Audio/Effects/Footsteps/floor3.ogg and b/Resources/Audio/Effects/Footsteps/floor3.ogg differ diff --git a/Resources/Audio/Effects/Footsteps/floor4.ogg b/Resources/Audio/Effects/Footsteps/floor4.ogg index 9ef15430ff..ae3058894e 100644 Binary files a/Resources/Audio/Effects/Footsteps/floor4.ogg and b/Resources/Audio/Effects/Footsteps/floor4.ogg differ diff --git a/Resources/Audio/Effects/Footsteps/floor5.ogg b/Resources/Audio/Effects/Footsteps/floor5.ogg index 0f6a66057d..24961793f6 100644 Binary files a/Resources/Audio/Effects/Footsteps/floor5.ogg and b/Resources/Audio/Effects/Footsteps/floor5.ogg differ diff --git a/Resources/Audio/Effects/Footsteps/grass1.ogg b/Resources/Audio/Effects/Footsteps/grass1.ogg new file mode 100644 index 0000000000..a805d8a414 Binary files /dev/null and b/Resources/Audio/Effects/Footsteps/grass1.ogg differ diff --git a/Resources/Audio/Effects/Footsteps/grass2.ogg b/Resources/Audio/Effects/Footsteps/grass2.ogg new file mode 100644 index 0000000000..1e9eb579b0 Binary files /dev/null and b/Resources/Audio/Effects/Footsteps/grass2.ogg differ diff --git a/Resources/Audio/Effects/Footsteps/grass3.ogg b/Resources/Audio/Effects/Footsteps/grass3.ogg new file mode 100644 index 0000000000..0e2938e3e7 Binary files /dev/null and b/Resources/Audio/Effects/Footsteps/grass3.ogg differ diff --git a/Resources/Audio/Effects/Footsteps/grass4.ogg b/Resources/Audio/Effects/Footsteps/grass4.ogg new file mode 100644 index 0000000000..b790911215 Binary files /dev/null and b/Resources/Audio/Effects/Footsteps/grass4.ogg differ diff --git a/Resources/Audio/Effects/Footsteps/hull1.ogg b/Resources/Audio/Effects/Footsteps/hull1.ogg index 615df6c550..058fcd7329 100644 Binary files a/Resources/Audio/Effects/Footsteps/hull1.ogg and b/Resources/Audio/Effects/Footsteps/hull1.ogg differ diff --git a/Resources/Audio/Effects/Footsteps/hull2.ogg b/Resources/Audio/Effects/Footsteps/hull2.ogg index 3aecb743f7..6bda53fe6a 100644 Binary files a/Resources/Audio/Effects/Footsteps/hull2.ogg and b/Resources/Audio/Effects/Footsteps/hull2.ogg differ diff --git a/Resources/Audio/Effects/Footsteps/hull3.ogg b/Resources/Audio/Effects/Footsteps/hull3.ogg index 03339131f6..cfb2623b8a 100644 Binary files a/Resources/Audio/Effects/Footsteps/hull3.ogg and b/Resources/Audio/Effects/Footsteps/hull3.ogg differ diff --git a/Resources/Audio/Effects/Footsteps/hull4.ogg b/Resources/Audio/Effects/Footsteps/hull4.ogg index 2fba89d318..5d4dcc8970 100644 Binary files a/Resources/Audio/Effects/Footsteps/hull4.ogg and b/Resources/Audio/Effects/Footsteps/hull4.ogg differ diff --git a/Resources/Audio/Effects/Footsteps/hull5.ogg b/Resources/Audio/Effects/Footsteps/hull5.ogg index 10c5912b97..83e6c08dff 100644 Binary files a/Resources/Audio/Effects/Footsteps/hull5.ogg and b/Resources/Audio/Effects/Footsteps/hull5.ogg differ diff --git a/Resources/Audio/Effects/Footsteps/plating1.ogg b/Resources/Audio/Effects/Footsteps/plating1.ogg index 0df770e663..e085807bcb 100644 Binary files a/Resources/Audio/Effects/Footsteps/plating1.ogg and b/Resources/Audio/Effects/Footsteps/plating1.ogg differ diff --git a/Resources/Audio/Effects/Footsteps/plating2.ogg b/Resources/Audio/Effects/Footsteps/plating2.ogg index 314b9133d2..917461b41e 100644 Binary files a/Resources/Audio/Effects/Footsteps/plating2.ogg and b/Resources/Audio/Effects/Footsteps/plating2.ogg differ diff --git a/Resources/Audio/Effects/Footsteps/plating3.ogg b/Resources/Audio/Effects/Footsteps/plating3.ogg index 5c571d77eb..926c2e84ed 100644 Binary files a/Resources/Audio/Effects/Footsteps/plating3.ogg and b/Resources/Audio/Effects/Footsteps/plating3.ogg differ diff --git a/Resources/Audio/Effects/Footsteps/plating4.ogg b/Resources/Audio/Effects/Footsteps/plating4.ogg index 5953262764..b74dff3336 100644 Binary files a/Resources/Audio/Effects/Footsteps/plating4.ogg and b/Resources/Audio/Effects/Footsteps/plating4.ogg differ diff --git a/Resources/Audio/Effects/Footsteps/plating5.ogg b/Resources/Audio/Effects/Footsteps/plating5.ogg index 4676a637a6..1a671bd9df 100644 Binary files a/Resources/Audio/Effects/Footsteps/plating5.ogg and b/Resources/Audio/Effects/Footsteps/plating5.ogg differ diff --git a/Resources/Audio/Effects/Footsteps/sources.txt b/Resources/Audio/Effects/Footsteps/sources.txt index b065629097..72717810ae 100644 --- a/Resources/Audio/Effects/Footsteps/sources.txt +++ b/Resources/Audio/Effects/Footsteps/sources.txt @@ -1,4 +1,9 @@ -Sounds in this folder taken from here: +Most sounds in this folder taken from here unless otherwise specified: https://github.com/discordia-space/CEV-Eris/tree/04f9e57ecf8a1c89ae2cba0f6803b6c5e9887c15/sound/effects/footstep https://github.com/tgstation/tgstation/tree/f8ee37afc00bce1ad421615eaa0e4cbddd5eea90/sound/effects -https://github.com/vgstation-coders/vgstation13/tree/fbe7abec4cbadf2ad01369838828704fd7ca81ea/sound/effects \ No newline at end of file +https://github.com/vgstation-coders/vgstation13/tree/fbe7abec4cbadf2ad01369838828704fd7ca81ea/sound/effects + +catwalk, floor, plating, tile, hull and wood sfx modified by mirrorcult. + +grass1.ogg and grass2.ogg are taken from https://freesound.org/people/D001447733/sounds/464609/ by D001447733 licensed under CC BY-3.0 and split by mirrorcult +grass3.ogg and grass4.ogg are taken from https://freesound.org/people/jevans27/sounds/563529/ by jevans27 licensed under CC-0 and split/modified by mirrorcult \ No newline at end of file diff --git a/Resources/Audio/Effects/Footsteps/tile1.ogg b/Resources/Audio/Effects/Footsteps/tile1.ogg new file mode 100644 index 0000000000..532157cd09 Binary files /dev/null and b/Resources/Audio/Effects/Footsteps/tile1.ogg differ diff --git a/Resources/Audio/Effects/Footsteps/tile1.wav b/Resources/Audio/Effects/Footsteps/tile1.wav deleted file mode 100644 index 4b2c672890..0000000000 Binary files a/Resources/Audio/Effects/Footsteps/tile1.wav and /dev/null differ diff --git a/Resources/Audio/Effects/Footsteps/tile2.ogg b/Resources/Audio/Effects/Footsteps/tile2.ogg new file mode 100644 index 0000000000..8d50a9f534 Binary files /dev/null and b/Resources/Audio/Effects/Footsteps/tile2.ogg differ diff --git a/Resources/Audio/Effects/Footsteps/tile2.wav b/Resources/Audio/Effects/Footsteps/tile2.wav deleted file mode 100644 index a0b0a64f1b..0000000000 Binary files a/Resources/Audio/Effects/Footsteps/tile2.wav and /dev/null differ diff --git a/Resources/Audio/Effects/Footsteps/tile3.ogg b/Resources/Audio/Effects/Footsteps/tile3.ogg new file mode 100644 index 0000000000..4bf66c8461 Binary files /dev/null and b/Resources/Audio/Effects/Footsteps/tile3.ogg differ diff --git a/Resources/Audio/Effects/Footsteps/tile3.wav b/Resources/Audio/Effects/Footsteps/tile3.wav deleted file mode 100644 index 4455538ca9..0000000000 Binary files a/Resources/Audio/Effects/Footsteps/tile3.wav and /dev/null differ diff --git a/Resources/Audio/Effects/Footsteps/tile4.ogg b/Resources/Audio/Effects/Footsteps/tile4.ogg new file mode 100644 index 0000000000..e794fb1d70 Binary files /dev/null and b/Resources/Audio/Effects/Footsteps/tile4.ogg differ diff --git a/Resources/Audio/Effects/Footsteps/wood1.ogg b/Resources/Audio/Effects/Footsteps/wood1.ogg index c76fc423fc..482fbdaaa1 100644 Binary files a/Resources/Audio/Effects/Footsteps/wood1.ogg and b/Resources/Audio/Effects/Footsteps/wood1.ogg differ diff --git a/Resources/Audio/Effects/Footsteps/wood2.ogg b/Resources/Audio/Effects/Footsteps/wood2.ogg index 71dc1aa967..3590d104d7 100644 Binary files a/Resources/Audio/Effects/Footsteps/wood2.ogg and b/Resources/Audio/Effects/Footsteps/wood2.ogg differ diff --git a/Resources/Audio/Effects/Footsteps/wood3.ogg b/Resources/Audio/Effects/Footsteps/wood3.ogg index bf86889006..e74769b2d4 100644 Binary files a/Resources/Audio/Effects/Footsteps/wood3.ogg and b/Resources/Audio/Effects/Footsteps/wood3.ogg differ diff --git a/Resources/Audio/Effects/Footsteps/wood4.ogg b/Resources/Audio/Effects/Footsteps/wood4.ogg index 44734425ce..b35ee69a45 100644 Binary files a/Resources/Audio/Effects/Footsteps/wood4.ogg and b/Resources/Audio/Effects/Footsteps/wood4.ogg differ diff --git a/Resources/Audio/Effects/Footsteps/wood5.ogg b/Resources/Audio/Effects/Footsteps/wood5.ogg index 5ad4fa81e7..019202c5e6 100644 Binary files a/Resources/Audio/Effects/Footsteps/wood5.ogg and b/Resources/Audio/Effects/Footsteps/wood5.ogg differ diff --git a/Resources/Prototypes/SoundCollections/footsteps.yml b/Resources/Prototypes/SoundCollections/footsteps.yml index 9b49b9582b..d0445e15f6 100644 --- a/Resources/Prototypes/SoundCollections/footsteps.yml +++ b/Resources/Prototypes/SoundCollections/footsteps.yml @@ -55,10 +55,10 @@ - type: soundCollection id: footstep_tile files: - - /Audio/Effects/Footsteps/tile1.wav - - /Audio/Effects/Footsteps/tile2.wav - - /Audio/Effects/Footsteps/tile3.wav - - /Audio/Effects/Footsteps/tile4.wav + - /Audio/Effects/Footsteps/tile1.ogg + - /Audio/Effects/Footsteps/tile2.ogg + - /Audio/Effects/Footsteps/tile3.ogg + - /Audio/Effects/Footsteps/tile4.ogg - type: soundCollection id: footstep_clown @@ -90,3 +90,11 @@ id: footstep_snow files: - /Audio/Effects/Footsteps/snowstep.ogg + +- type: soundCollection + id: footstep_grass + files: + - /Audio/Effects/Footsteps/grass1.ogg + - /Audio/Effects/Footsteps/grass2.ogg + - /Audio/Effects/Footsteps/grass3.ogg + - /Audio/Effects/Footsteps/grass4.ogg diff --git a/Resources/Prototypes/Tiles/floors.yml b/Resources/Prototypes/Tiles/floors.yml index b80c7b715c..d5b50955a7 100644 --- a/Resources/Prototypes/Tiles/floors.yml +++ b/Resources/Prototypes/Tiles/floors.yml @@ -14,21 +14,6 @@ item_drop: FloorTileItemSteel thermalConductivity: 0.04 heatCapacity: 10000 - -- type: tile - id: FloorMetalDiamond - name: diamond plate floor - texture: "metaldiamond" - base_turfs: - - plating - is_subfloor: false - can_crowbar: true - footstep_sounds: - collection: footstep_floor - friction: 0.30 - item_drop: FloorTileItemMetalDiamond - thermalConductivity: 0.04 - heatCapacity: 10000 - type: tile id: floor_wood @@ -58,7 +43,7 @@ is_subfloor: false can_crowbar: true footstep_sounds: - collection: footstep_floor + collection: footstep_tile friction: 0.25 item_drop: FloorTileItemWhite thermalConductivity: 0.04 @@ -75,7 +60,7 @@ is_subfloor: false can_crowbar: true footstep_sounds: - collection: footstep_floor + collection: footstep_tile friction: 0.30 item_drop: FloorTileItemDark thermalConductivity: 0.04 @@ -90,7 +75,7 @@ is_subfloor: false can_crowbar: true footstep_sounds: - collection: footstep_floor + collection: footstep_hull friction: 0.30 item_drop: FloorTileItemTechmaint thermalConductivity: 0.04 @@ -105,7 +90,7 @@ is_subfloor: false can_crowbar: true footstep_sounds: - collection: footstep_floor + collection: footstep_hull friction: 0.30 item_drop: FloorTileItemReinforced thermalConductivity: 0.04 @@ -120,7 +105,7 @@ is_subfloor: false can_crowbar: true footstep_sounds: - collection: footstep_floor + collection: footstep_tile friction: 0.30 item_drop: FloorTileItemMono thermalConductivity: 0.04 @@ -135,7 +120,7 @@ is_subfloor: false can_crowbar: true footstep_sounds: - collection: footstep_floor + collection: footstep_tile friction: 0.30 item_drop: FloorTileItemLino thermalConductivity: 0.04 @@ -165,7 +150,7 @@ is_subfloor: false can_crowbar: true footstep_sounds: - collection: footstep_floor + collection: footstep_hull friction: 0.30 item_drop: FloorTileItemElevatorShaft thermalConductivity: 0.04 @@ -180,7 +165,7 @@ is_subfloor: false can_crowbar: true footstep_sounds: - collection: footstep_floor + collection: footstep_asteroid friction: 0.30 item_drop: FloorTileItemRockVault thermalConductivity: 0.04 @@ -195,7 +180,7 @@ is_subfloor: false can_crowbar: true footstep_sounds: - collection: footstep_floor + collection: footstep_tile friction: 0.30 item_drop: FloorTileItemBlue thermalConductivity: 0.04 @@ -211,7 +196,7 @@ is_subfloor: false can_crowbar: true footstep_sounds: - collection: footstep_floor + collection: footstep_hull friction: 0.30 item_drop: FloorTileItemFreezer thermalConductivity: 0.04 @@ -303,7 +288,7 @@ is_subfloor: false can_crowbar: true footstep_sounds: - collection: footstep_floor + collection: footstep_tile friction: 0.30 item_drop: FloorTileItemKitchen thermalConductivity: 0.04 @@ -318,7 +303,7 @@ is_subfloor: false can_crowbar: true footstep_sounds: - collection: footstep_floor + collection: footstep_tile friction: 0.30 item_drop: FloorTileItemLaundry thermalConductivity: 0.04 @@ -334,7 +319,7 @@ is_subfloor: false can_crowbar: true footstep_sounds: - collection: footstep_floor + collection: footstep_carpet friction: 0.40 item_drop: FloorTileItemArcadeBlue thermalConductivity: 0.04 @@ -349,7 +334,7 @@ is_subfloor: false can_crowbar: true footstep_sounds: - collection: footstep_floor + collection: footstep_carpet friction: 0.40 item_drop: FloorTileItemArcadeBlue2 thermalConductivity: 0.04 @@ -364,7 +349,7 @@ is_subfloor: false can_crowbar: true footstep_sounds: - collection: footstep_floor + collection: footstep_carpet friction: 0.40 item_drop: FloorTileItemArcadeRed thermalConductivity: 0.04 @@ -379,12 +364,12 @@ is_subfloor: false can_crowbar: true footstep_sounds: - collection: footstep_floor + collection: footstep_carpet friction: 0.40 item_drop: FloorTileItemEighties thermalConductivity: 0.04 heatCapacity: 10000 - + - type: tile id: FloorCarpetClown name: clown carpet floor @@ -394,12 +379,12 @@ is_subfloor: false can_crowbar: true footstep_sounds: - collection: footstep_floor + collection: footstep_carpet friction: 0.40 item_drop: FloorTileItemCarpetClown thermalConductivity: 0.04 heatCapacity: 10000 - + - type: tile id: FloorCarpetOffice name: office carpet floor @@ -409,12 +394,12 @@ is_subfloor: false can_crowbar: true footstep_sounds: - collection: footstep_floor + collection: footstep_carpet friction: 0.40 item_drop: FloorTileItemCarpetOffice thermalConductivity: 0.04 heatCapacity: 10000 - + - type: tile id: FloorBoxing name: boxing ring floor @@ -431,7 +416,7 @@ item_drop: FloorTileItemBoxing thermalConductivity: 0.04 heatCapacity: 10000 - + - type: tile id: FloorGym name: gym floor @@ -536,7 +521,7 @@ is_subfloor: false can_crowbar: true footstep_sounds: - collection: footstep_floor + collection: footstep_tile friction: 0.30 item_drop: FloorTileItemGold thermalConductivity: 0.04 @@ -551,7 +536,7 @@ is_subfloor: false can_crowbar: true footstep_sounds: - collection: footstep_floor + collection: footstep_tile friction: 0.30 item_drop: FloorTileItemSilver thermalConductivity: 0.04 @@ -566,7 +551,7 @@ is_subfloor: false can_crowbar: true footstep_sounds: - collection: footstep_floor + collection: footstep_tile friction: 0.30 item_drop: SheetGlass1 thermalConductivity: 0.04 @@ -581,12 +566,27 @@ is_subfloor: false can_crowbar: true footstep_sounds: - collection: footstep_floor + collection: footstep_tile friction: 0.30 item_drop: SheetRGlass1 thermalConductivity: 0.04 heatCapacity: 10000 +- type: tile + id: FloorMetalDiamond + name: diamond plate floor + texture: "metaldiamond" + base_turfs: + - plating + is_subfloor: false + can_crowbar: true + footstep_sounds: + collection: footstep_tile + friction: 0.30 + item_drop: FloorTileItemMetalDiamond + thermalConductivity: 0.04 + heatCapacity: 10000 + # Circuits - type: tile id: floor_green_circuit @@ -597,7 +597,7 @@ is_subfloor: false can_crowbar: true footstep_sounds: - collection: footstep_floor + collection: footstep_hull friction: 0.30 item_drop: FloorTileItemGCircuit thermalConductivity: 0.04 @@ -612,7 +612,7 @@ is_subfloor: false can_crowbar: true footstep_sounds: - collection: footstep_floor + collection: footstep_hull friction: 0.30 item_drop: FloorTileItemBCircuit thermalConductivity: 0.04 @@ -643,7 +643,7 @@ is_subfloor: false can_crowbar: true footstep_sounds: - collection: footstep_floor + collection: footstep_grass friction: 0.30 item_drop: FloorTileItemGrass thermalConductivity: 0.04 @@ -658,7 +658,7 @@ is_subfloor: false can_crowbar: true footstep_sounds: - collection: footstep_floor + collection: footstep_grass friction: 0.30 item_drop: FloorTileItemGrassJungle thermalConductivity: 0.04