From 65c478c56c365d1c778f52578fd5de1588e90ee0 Mon Sep 17 00:00:00 2001 From: FL-OZ Date: Fri, 22 May 2020 16:21:20 -0500 Subject: [PATCH 1/3] spagetti --- Resources/Prototypes/Kitchen/meal_recipes.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Resources/Prototypes/Kitchen/meal_recipes.yml b/Resources/Prototypes/Kitchen/meal_recipes.yml index 707a4c3b47..2b01387c45 100644 --- a/Resources/Prototypes/Kitchen/meal_recipes.yml +++ b/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 From 1e183ca5a826889a0dc85a6325c281a49c5e2853 Mon Sep 17 00:00:00 2001 From: FL-OZ Date: Fri, 22 May 2020 16:23:18 -0500 Subject: [PATCH 2/3] GLOBAL SLUUUUURRRRP --- .../GameObjects/Components/Nutrition/DrinkComponent.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Content.Server/GameObjects/Components/Nutrition/DrinkComponent.cs b/Content.Server/GameObjects/Components/Nutrition/DrinkComponent.cs index 6fa85b8c52..8c611bb3f3 100644 --- a/Content.Server/GameObjects/Components/Nutrition/DrinkComponent.cs +++ b/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(); var audioSystem = entitySystemManager.GetEntitySystem(); - audioSystem.Play(_useSound); + audioSystem.Play(_useSound, Owner, AudioParams.Default.WithVolume(-2f)); user.PopupMessage(user, _localizationManager.GetString("Slurp")); } } From 597761b0c7dd7c8da5669f010330224d96e71502 Mon Sep 17 00:00:00 2001 From: FL-OZ Date: Fri, 22 May 2020 16:26:17 -0500 Subject: [PATCH 3/3] fix food proto as well --- Resources/Prototypes/Entities/Items/Consumables/food.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Items/Consumables/food.yml b/Resources/Prototypes/Entities/Items/Consumables/food.yml index 6a597b9141..6ef5841454 100644 --- a/Resources/Prototypes/Entities/Items/Consumables/food.yml +++ b/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: