diff --git a/Content.Server/Botany/Components/PlantHolderComponent.cs b/Content.Server/Botany/Components/PlantHolderComponent.cs index 8218bead72..f0661e4a30 100644 --- a/Content.Server/Botany/Components/PlantHolderComponent.cs +++ b/Content.Server/Botany/Components/PlantHolderComponent.cs @@ -1,5 +1,6 @@ using Content.Shared.Chemistry.Components; using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom; +using Robust.Shared.Audio; namespace Content.Server.Botany.Components; @@ -23,6 +24,9 @@ public sealed partial class PlantHolderComponent : Component [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))] public TimeSpan LastCycle = TimeSpan.Zero; + [DataField] + public SoundSpecifier? WateringSound; + [DataField] public bool UpdateSpriteAfterUpdate; diff --git a/Content.Server/Botany/Systems/PlantHolderSystem.cs b/Content.Server/Botany/Systems/PlantHolderSystem.cs index fa03265692..b17c261371 100644 --- a/Content.Server/Botany/Systems/PlantHolderSystem.cs +++ b/Content.Server/Botany/Systems/PlantHolderSystem.cs @@ -11,6 +11,7 @@ using Content.Shared.Chemistry.Reagent; using Content.Shared.Coordinates.Helpers; using Content.Shared.Examine; using Content.Shared.FixedPoint; +using Content.Shared.Fluids.Components; using Content.Shared.Hands.Components; using Content.Shared.IdentityManagement; using Content.Shared.Interaction; @@ -37,7 +38,6 @@ public sealed class PlantHolderSystem : EntitySystem [Dependency] private readonly SharedAudioSystem _audio = default!; [Dependency] private readonly PopupSystem _popup = default!; [Dependency] private readonly IGameTiming _gameTiming = default!; - [Dependency] private readonly SharedPointLightSystem _pointLight = default!; [Dependency] private readonly SharedSolutionContainerSystem _solutionContainerSystem = default!; [Dependency] private readonly TagSystem _tagSystem = default!; [Dependency] private readonly RandomHelperSystem _randomHelper = default!; @@ -53,6 +53,7 @@ public sealed class PlantHolderSystem : EntitySystem SubscribeLocalEvent(OnExamine); SubscribeLocalEvent(OnInteractUsing); SubscribeLocalEvent(OnInteractHand); + SubscribeLocalEvent(OnSolutionTransferred); } public override void Update(float frameTime) @@ -320,6 +321,10 @@ public sealed class PlantHolderSystem : EntitySystem } } + private void OnSolutionTransferred(Entity ent, ref SolutionTransferredEvent args) + { + _audio.PlayPvs(ent.Comp.WateringSound, ent.Owner); + } private void OnInteractHand(Entity entity, ref InteractHandEvent args) { DoHarvest(entity, args.User, entity.Comp); diff --git a/Content.Server/Nutrition/EntitySystems/DrinkSystem.cs b/Content.Server/Nutrition/EntitySystems/DrinkSystem.cs index f04d79b47d..90a925e39f 100644 --- a/Content.Server/Nutrition/EntitySystems/DrinkSystem.cs +++ b/Content.Server/Nutrition/EntitySystems/DrinkSystem.cs @@ -317,7 +317,7 @@ public sealed class DrinkSystem : SharedDrinkSystem _adminLogger.Add(LogType.Ingestion, LogImpact.Low, $"{ToPrettyString(args.User):target} drank {ToPrettyString(entity.Owner):drink}"); } - _audio.PlayPvs(entity.Comp.UseSound, args.Target.Value, AudioParams.Default.WithVolume(-2f)); + _audio.PlayPvs(entity.Comp.UseSound, args.Target.Value, AudioParams.Default.WithVolume(-2f).WithVariation(0.25f)); _reaction.DoEntityReaction(args.Target.Value, solution, ReactionMethod.Ingestion); _stomach.TryTransferSolution(firstStomach.Value.Owner, drained, firstStomach.Value.Comp1); diff --git a/Content.Server/Nutrition/EntitySystems/FoodSystem.cs b/Content.Server/Nutrition/EntitySystems/FoodSystem.cs index d7daf632d6..158c7f4955 100644 --- a/Content.Server/Nutrition/EntitySystems/FoodSystem.cs +++ b/Content.Server/Nutrition/EntitySystems/FoodSystem.cs @@ -296,7 +296,7 @@ public sealed class FoodSystem : EntitySystem _adminLogger.Add(LogType.Ingestion, LogImpact.Low, $"{ToPrettyString(args.User):target} ate {ToPrettyString(entity.Owner):food}"); } - _audio.PlayPvs(entity.Comp.UseSound, args.Target.Value, AudioParams.Default.WithVolume(-1f)); + _audio.PlayPvs(entity.Comp.UseSound, args.Target.Value, AudioParams.Default.WithVolume(-1f).WithVariation(0.20f)); // Try to break all used utensils foreach (var utensil in utensils) diff --git a/Content.Shared/VendingMachines/VendingMachineComponent.cs b/Content.Shared/VendingMachines/VendingMachineComponent.cs index 50023a023a..f3fe3a1ecd 100644 --- a/Content.Shared/VendingMachines/VendingMachineComponent.cs +++ b/Content.Shared/VendingMachines/VendingMachineComponent.cs @@ -87,12 +87,13 @@ namespace Content.Shared.VendingMachines /// Sound that plays when ejecting an item /// [DataField("soundVend")] - // Grabbed from: https://github.com/discordia-space/CEV-Eris/blob/f702afa271136d093ddeb415423240a2ceb212f0/sound/machines/vending_drop.ogg + // Grabbed from: https://github.com/tgstation/tgstation/blob/d34047a5ae911735e35cd44a210953c9563caa22/sound/machines/machine_vend.ogg public SoundSpecifier SoundVend = new SoundPathSpecifier("/Audio/Machines/machine_vend.ogg") { Params = new AudioParams { - Volume = -2f + Volume = -4f, + Variation = 0.15f } }; diff --git a/Resources/Audio/Machines/attributions.yml b/Resources/Audio/Machines/attributions.yml index 1b4ea74741..7675162a04 100644 --- a/Resources/Audio/Machines/attributions.yml +++ b/Resources/Audio/Machines/attributions.yml @@ -163,6 +163,7 @@ - chime.ogg - buzz-sigh.ogg - buzztwo.ogg + - machine_vend.gg license: "CC-BY-SA-3.0" copyright: "Taken from TG station." source: "https://github.com/tgstation/tgstation/tree/d4f678a1772007ff8d7eddd21cf7218c8e07bfc0" diff --git a/Resources/Audio/Machines/machine_vend.ogg b/Resources/Audio/Machines/machine_vend.ogg index 8f7c187d0c..92867a1f3d 100644 Binary files a/Resources/Audio/Machines/machine_vend.ogg and b/Resources/Audio/Machines/machine_vend.ogg differ diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/boots.yml b/Resources/Prototypes/Entities/Clothing/Shoes/boots.yml index fbaeba6047..4223f2217e 100644 --- a/Resources/Prototypes/Entities/Clothing/Shoes/boots.yml +++ b/Resources/Prototypes/Entities/Clothing/Shoes/boots.yml @@ -204,6 +204,8 @@ - type: FootstepModifier footstepSoundCollection: collection: FootstepSpurs + params: + variation: 0.09 - type: entity parent: ClothingShoesBootsCowboyBrown diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/specific.yml b/Resources/Prototypes/Entities/Clothing/Shoes/specific.yml index a4fbe012c5..87a0c06c4a 100644 --- a/Resources/Prototypes/Entities/Clothing/Shoes/specific.yml +++ b/Resources/Prototypes/Entities/Clothing/Shoes/specific.yml @@ -40,6 +40,8 @@ - type: FootstepModifier footstepSoundCollection: collection: FootstepClown + params: + variation: 0.17 # for H.O.N.K. construction - type: Tag tags: @@ -59,6 +61,8 @@ - type: FootstepModifier footstepSoundCollection: collection: FootstepSlip + params: + variation: 0.10 - type: Construction graph: BananaClownShoes node: shoes @@ -79,6 +83,8 @@ - type: FootstepModifier footstepSoundCollection: collection: FootstepClown + params: + variation: 0.17 - type: PointLight enabled: true radius: 3 @@ -215,6 +221,8 @@ - type: FootstepModifier footstepSoundCollection: collection: FootstepJester + params: + variation: 0.07 - type: entity parent: ClothingShoesClown @@ -274,3 +282,5 @@ - type: FootstepModifier footstepSoundCollection: collection: FootstepSkates + params: + variation: 0.08 diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml b/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml index f82f4c43ff..5883790b66 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml @@ -166,6 +166,8 @@ maxInterval: 12 sound: collection: BikeHorn + params: + variation: 0.125 - type: Sprite sprite: Mobs/Silicon/Bots/honkbot.rsi state: honkbot @@ -210,6 +212,8 @@ interactFailureString: petting-failure-honkbot interactSuccessSound: path: /Audio/Items/bikehorn.ogg + params: + variation: 0.125 - type: entity parent: MobHonkBot @@ -220,6 +224,8 @@ - type: SpamEmitSound sound: collection: CluwneHorn + params: + variation: 0.125 - type: Sprite state: jonkbot - type: Construction @@ -235,6 +241,8 @@ - type: InteractionPopup interactSuccessSound: path: /Audio/Items/brokenbikehorn.ogg + params: + variation: 0.125 - type: Vocal sounds: Unsexed: Cluwne diff --git a/Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml b/Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml index 1fbde27e71..4c4e44c28c 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml @@ -167,6 +167,8 @@ - type: FootstepModifier footstepSoundCollection: collection: FootstepClown + params: + variation: 0.17 - type: Mech baseState: honker openState: honker-open diff --git a/Resources/Prototypes/Entities/Structures/Machines/Computers/base_structurecomputers.yml b/Resources/Prototypes/Entities/Structures/Machines/Computers/base_structurecomputers.yml index 9baca8b4b6..e961cf94d3 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/Computers/base_structurecomputers.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/Computers/base_structurecomputers.yml @@ -60,6 +60,8 @@ collection: Keyboard params: volume: -1 + variation: 0.10 + pitch: 1.10 # low pitch keyboard sounds feel kinda weird - type: ContainerContainer containers: board: !type:Container diff --git a/Resources/Prototypes/Entities/Structures/hydro_tray.yml b/Resources/Prototypes/Entities/Structures/hydro_tray.yml index 7224c154f9..b1cbcc8b86 100644 --- a/Resources/Prototypes/Entities/Structures/hydro_tray.yml +++ b/Resources/Prototypes/Entities/Structures/hydro_tray.yml @@ -67,6 +67,11 @@ False: { visible: false } - type: PlantHolder drawWarnings: true + wateringSound: + path: /Audio/Effects/Fluids/slosh.ogg + params: + volume: -6 + variation: 0.20 - type: Destructible thresholds: - trigger: