From 0558449128d99810d37f781618778c555a5e3934 Mon Sep 17 00:00:00 2001
From: Wiebe Geertsma <1354802+GreaseMonk@users.noreply.github.com>
Date: Mon, 4 Mar 2024 23:36:07 +0100
Subject: [PATCH] Play ambient when adding oil to fryer

---
 .../Kitchen/EntitySystems/DeepFryerSystem.cs         | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/Content.Server/Nyanotrasen/Kitchen/EntitySystems/DeepFryerSystem.cs b/Content.Server/Nyanotrasen/Kitchen/EntitySystems/DeepFryerSystem.cs
index 84157ed5f17..bd33da45928 100644
--- a/Content.Server/Nyanotrasen/Kitchen/EntitySystems/DeepFryerSystem.cs
+++ b/Content.Server/Nyanotrasen/Kitchen/EntitySystems/DeepFryerSystem.cs
@@ -104,7 +104,7 @@ public override void Initialize()
         SubscribeLocalEvent<DeepFryerComponent, MachineDeconstructedEvent>(OnDeconstruct);
         SubscribeLocalEvent<DeepFryerComponent, DestructionEventArgs>(OnDestruction);
         SubscribeLocalEvent<DeepFryerComponent, ThrowHitByEvent>(OnThrowHitBy);
-        SubscribeLocalEvent<DeepFryerComponent, SolutionChangedEvent>(OnSolutionChange);
+        SubscribeLocalEvent<DeepFryerComponent, SolutionContainerChangedEvent>(OnSolutionChange);
         SubscribeLocalEvent<DeepFryerComponent, ContainerRelayMovementEntityEvent>(OnRelayMovement);
         SubscribeLocalEvent<DeepFryerComponent, InteractUsingEvent>(OnInteractUsing);
 
@@ -181,7 +181,9 @@ public FixedPoint2 GetWasteVolume(EntityUid uid, DeepFryerComponent component)
     /// </summary>
     public FixedPoint2 GetOilPurity(EntityUid uid, DeepFryerComponent component)
     {
-        return GetOilVolume(uid, component) / component.Solution.Volume;
+        if (component.Solution.Volume > 0)
+            return GetOilVolume(uid, component) / component.Solution.Volume;
+        return FixedPoint2.Zero;
     }
 
     /// <summary>
@@ -189,7 +191,9 @@ public FixedPoint2 GetOilPurity(EntityUid uid, DeepFryerComponent component)
     /// </summary>
     public FixedPoint2 GetOilLevel(EntityUid uid, DeepFryerComponent component)
     {
-        return GetOilVolume(uid, component) / component.Solution.MaxVolume;
+        if (component.Solution.Volume > 0)
+            return GetOilVolume(uid, component) / component.Solution.Volume;
+        return FixedPoint2.Zero;
     }
 
     /// <summary>
@@ -491,7 +495,7 @@ private void OnThrowHitBy(EntityUid uid, DeepFryerComponent component, ThrowHitB
         args.Handled = true;
     }
 
-    private void OnSolutionChange(EntityUid uid, DeepFryerComponent component, SolutionChangedEvent args)
+    private void OnSolutionChange(EntityUid uid, DeepFryerComponent component, SolutionContainerChangedEvent args)
     {
         UpdateUserInterface(uid, component);
         UpdateAmbientSound(uid, component);