Significantly less annoying eating sounds (#24195)

diff --git a/Content.Server/Nutrition/Components/FoodComponent.cs b/Content.Server/Nutrition/Components/FoodComponent.cs
index c7f90ccff1da4cb90a03ad241837f17b4e728737..dbc89d5a4497115ae7218f9c7e0b98f668a9099d 100644 (file)
--- 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 ece220cd7196d856e3620d60444b1eafb36462b8..ac277f9d1b28627beb8a70e7c5a6ecdf36390ad1 100644 (file)
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 (file)
index 69fd537..0000000
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 68942cd3d19bc290da1032bdf6b4d971ed9bb3a6..65b15bffb31534259c7b98b305e21b3634aac9d5 100644 (file)
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 332dbb056f141e0339a388b2f71b5ee686aeb172..2da52f29d08c6f51091d70d85b5bd7923ee09ee3 100644 (file)
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 3174dc6cf58060148fa9be073dd9ff7334f8678e..3f69d7523e5202b52f364157db0dfcbef90e0b42 100644 (file)
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 d49260841273e747817c0d4ca592e910a76f2984..b623956d38f9ac700fa7bab1b647382e1eb82302 100644 (file)
--- 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