Merge pull request #957 from FL-OZ/fix_recipes_and_SLURP

Fix recipes and global slurrrpp

Content.Server/GameObjects/Components/Nutrition/DrinkComponent.cs

@@ -9,6 +9,7 @@ using Content.Shared.Interfaces;
 using Content.Shared.Maths;
 using Robust.Server.GameObjects;
 using Robust.Server.GameObjects.EntitySystems;
+using Robust.Shared.Audio;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Interfaces.GameObjects;
 using Robust.Shared.IoC;
@@ -126,7 +127,7 @@ namespace Content.Server.GameObjects.Components.Nutrition
                     {
                         var entitySystemManager = IoCManager.Resolve<IEntitySystemManager>();
                         var audioSystem = entitySystemManager.GetEntitySystem<AudioSystem>();
-                        audioSystem.Play(_useSound);
+                        audioSystem.Play(_useSound, Owner, AudioParams.Default.WithVolume(-2f));
                         user.PopupMessage(user, _localizationManager.GetString("Slurp"));
                     }
                 }

Resources/Prototypes/Entities/Items/Consumables/food.yml

@@ -295,7 +295,7 @@
 
 - type: entity
   parent: FoodBase
-  id: FoodSpagettiBoiled
+  id: FoodSpaghettiBoiled
   name: Boiled spaghetti
   description: A plain dish of noodles, this sucks.
   components:

Resources/Prototypes/Kitchen/meal_recipes.yml

@@ -174,12 +174,12 @@
 - type: microwaveMealRecipe
   id: RecipeBoiledSpaghetti
   name: Boiled Spaghetti Recipe
-  result: FoodSpagettiBoiled
+  result: FoodSpaghettiBoiled
   time: 5
   reagents:
     chem.H2O: 5
   solids:
-    FoodSpagetti: 1
+    FoodSpaghetti: 1
 
 - type: microwaveMealRecipe
   id: RecipePastaTomato
@@ -189,7 +189,7 @@
   reagents:
     chem.H2O: 5
   solids:
-    FoodSpagetti: 1
+    FoodSpaghetti: 1
     FoodTomato: 2
 
 - type: microwaveMealRecipe
@@ -200,7 +200,7 @@
   reagents:
     chem.H2O: 5
   solids:
-    FoodSpagetti: 1
+    FoodSpaghetti: 1
     FoodMeatball: 2
 
 - type: microwaveMealRecipe