diff --git a/Content.Shared/Movement/Systems/SharedMoverController.cs b/Content.Shared/Movement/Systems/SharedMoverController.cs index a93e479817..16e94b6684 100644 --- a/Content.Shared/Movement/Systems/SharedMoverController.cs +++ b/Content.Shared/Movement/Systems/SharedMoverController.cs @@ -36,8 +36,8 @@ namespace Content.Shared.Movement.Systems private const float StepSoundMoveDistanceWalking = 1.5f; private const float FootstepVariation = 0f; - private const float FootstepVolume = 6f; - private const float FootstepWalkingVolumeModifier = 0.2f; + private const float FootstepVolume = 3f; + private const float FootstepWalkingAddedVolumeMultiplier = 0f; /// /// @@ -278,7 +278,7 @@ namespace Content.Shared.Movement.Systems if (!weightless && TryGetSound(mover, mobMover, xform, out var variation, out var sound)) { - var soundModifier = mover.Sprinting ? 1.0f : FootstepWalkingVolumeModifier; + var soundModifier = mover.Sprinting ? 1.0f : FootstepWalkingAddedVolumeMultiplier; SoundSystem.Play(sound, GetSoundPlayers(mover.Owner), mover.Owner, AudioHelpers.WithVariation(variation).WithVolume(FootstepVolume * soundModifier)); diff --git a/Resources/Audio/Effects/Footsteps/clownstep1.ogg b/Resources/Audio/Effects/Footsteps/clownstep1.ogg index 740fb5fd9f..24ded92d9e 100644 Binary files a/Resources/Audio/Effects/Footsteps/clownstep1.ogg and b/Resources/Audio/Effects/Footsteps/clownstep1.ogg differ diff --git a/Resources/Audio/Effects/Footsteps/clownstep2.ogg b/Resources/Audio/Effects/Footsteps/clownstep2.ogg index 5a5426b3fe..5783f3a60d 100644 Binary files a/Resources/Audio/Effects/Footsteps/clownstep2.ogg and b/Resources/Audio/Effects/Footsteps/clownstep2.ogg differ diff --git a/Resources/Audio/Effects/Footsteps/tile1.ogg b/Resources/Audio/Effects/Footsteps/tile1.ogg index 532157cd09..2b38ee7a18 100644 Binary files a/Resources/Audio/Effects/Footsteps/tile1.ogg and b/Resources/Audio/Effects/Footsteps/tile1.ogg differ diff --git a/Resources/Audio/Effects/Footsteps/tile2.ogg b/Resources/Audio/Effects/Footsteps/tile2.ogg index 8d50a9f534..7dc6fa8fd5 100644 Binary files a/Resources/Audio/Effects/Footsteps/tile2.ogg and b/Resources/Audio/Effects/Footsteps/tile2.ogg differ diff --git a/Resources/Audio/Effects/Footsteps/tile3.ogg b/Resources/Audio/Effects/Footsteps/tile3.ogg index 4bf66c8461..f0f0a4a660 100644 Binary files a/Resources/Audio/Effects/Footsteps/tile3.ogg and b/Resources/Audio/Effects/Footsteps/tile3.ogg differ diff --git a/Resources/Audio/Effects/Footsteps/tile4.ogg b/Resources/Audio/Effects/Footsteps/tile4.ogg index e794fb1d70..4d8f00ca9c 100644 Binary files a/Resources/Audio/Effects/Footsteps/tile4.ogg and b/Resources/Audio/Effects/Footsteps/tile4.ogg differ diff --git a/Resources/Audio/Effects/Footsteps/tile4.wav b/Resources/Audio/Effects/Footsteps/tile4.wav deleted file mode 100644 index 830fac36fa..0000000000 Binary files a/Resources/Audio/Effects/Footsteps/tile4.wav and /dev/null differ diff --git a/Resources/Prototypes/Tiles/floors.yml b/Resources/Prototypes/Tiles/floors.yml index d5b50955a7..478d1da96e 100644 --- a/Resources/Prototypes/Tiles/floors.yml +++ b/Resources/Prototypes/Tiles/floors.yml @@ -135,7 +135,7 @@ is_subfloor: false can_crowbar: true footstep_sounds: - collection: footstep_floor + collection: footstep_plating friction: 0.30 item_drop: FloorTileItemDirty thermalConductivity: 0.04 @@ -156,6 +156,21 @@ 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_hull + friction: 0.30 + item_drop: FloorTileItemMetalDiamond + thermalConductivity: 0.04 + heatCapacity: 10000 + - type: tile id: floor_rock_vault name: rock floor @@ -572,21 +587,6 @@ 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