From: Kara Date: Wed, 17 Jan 2024 16:46:06 +0000 (-0700) Subject: Significantly less annoying eating sounds (#24195) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=fd3222993e6c5b0f0ec6296934fad6438b1e260a;p=space-station-14.git Significantly less annoying eating sounds (#24195) --- diff --git a/Content.Server/Nutrition/Components/FoodComponent.cs b/Content.Server/Nutrition/Components/FoodComponent.cs index c7f90ccff1..dbc89d5a44 100644 --- a/Content.Server/Nutrition/Components/FoodComponent.cs +++ b/Content.Server/Nutrition/Components/FoodComponent.cs @@ -13,7 +13,7 @@ public sealed partial class FoodComponent : Component public string Solution = "food"; [DataField] - public SoundSpecifier UseSound = new SoundPathSpecifier("/Audio/Items/eatfood.ogg"); + public SoundSpecifier UseSound = new SoundCollectionSpecifier("eating"); [DataField] public EntProtoId? Trash; diff --git a/Resources/Audio/Items/drink.ogg b/Resources/Audio/Items/drink.ogg index ece220cd71..ac277f9d1b 100644 Binary files a/Resources/Audio/Items/drink.ogg and b/Resources/Audio/Items/drink.ogg differ diff --git a/Resources/Audio/Items/eatfood.ogg b/Resources/Audio/Items/eatfood.ogg deleted file mode 100644 index 69fd537493..0000000000 Binary files a/Resources/Audio/Items/eatfood.ogg and /dev/null differ diff --git a/Resources/Audio/Items/eating_1.ogg b/Resources/Audio/Items/eating_1.ogg index 68942cd3d1..65b15bffb3 100644 Binary files a/Resources/Audio/Items/eating_1.ogg and b/Resources/Audio/Items/eating_1.ogg differ diff --git a/Resources/Audio/Items/eating_2.ogg b/Resources/Audio/Items/eating_2.ogg index 332dbb056f..2da52f29d0 100644 Binary files a/Resources/Audio/Items/eating_2.ogg and b/Resources/Audio/Items/eating_2.ogg differ diff --git a/Resources/Audio/Items/eating_3.ogg b/Resources/Audio/Items/eating_3.ogg index 3174dc6cf5..3f69d7523e 100644 Binary files a/Resources/Audio/Items/eating_3.ogg and b/Resources/Audio/Items/eating_3.ogg differ diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml index d492608412..b623956d38 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml @@ -27,7 +27,7 @@ - type: Drink solution: food useSound: - path: /Audio/Items/eating_1.ogg + collection: eating - type: Damageable damageContainer: Inorganic - type: Spillable @@ -238,7 +238,7 @@ Quantity: 50 - type: Tag tags: - - Mayo + - Mayo # - type: entity # parent: ReagentPacketBase