hguh

Simple-Station · Aug 9, 2024 · de1642a · de1642a
1 parent f9792ed
commit de1642a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
diff --git a/Content.Server/Chat/SuicideSystem.cs b/Content.Server/Chat/SuicideSystem.cs
@@ -56,7 +56,6 @@ public bool Suicide(EntityUid victim)
                 return false;
 
             DefaultSuicideHandler(victim, suicideEvent);
-            DefaultSuicideHandler(victim, Event);
 
             ApplyDeath(victim, suicideEvent.Kind!.Value);
             _adminLogger.Add(LogType.Mind, $"{EntityManager.ToPrettyString(victim):player} suicided{(environmentSuicide ? " (environment)" : "")}");
@@ -141,4 +140,4 @@ private void ApplyDeath(EntityUid target, SuicideKind kind)
             _damageableSystem.TryChangeDamage(target, new(damagePrototype, lethalAmountOfDamage), true, origin: target);
         }
     }
-}
+}
diff --git a/Content.Server/Kitchen/EntitySystems/KettleSystem.cs b/Content.Server/Kitchen/EntitySystems/KettleSystem.cs
@@ -134,9 +134,9 @@ private void SubtractContents(KettleComponent component, DrinkRecipePrototype re
                 }
             }
 
-            foreach (var recipeLeaf in recipe.Leaves)
+            foreach (var recipeSolid in recipe.Solids)
             {
-                for (var i = 0; i < recipeLeaf.Value; i++)
+                for (var i = 0; i < recipeSolid.Value; i++)
                 {
                     foreach (var item in component.Storage.ContainedEntities)
                     {
@@ -146,7 +146,7 @@ private void SubtractContents(KettleComponent component, DrinkRecipePrototype re
                             continue;
                         }
 
-                        if (metaData.EntityPrototype.ID == recipeLeaf.Key)
+                        if (metaData.EntityPrototype.ID == recipeSolid.Key)
                         {
                             _container.Remove(item, component.Storage);
                             EntityManager.DeleteEntity(item);

diff --git a/Content.Shared/Kitchen/KettleRecipePrototype.cs b/Content.Shared/Kitchen/KettleRecipePrototype.cs
@@ -28,8 +28,8 @@ public sealed partial class DrinkRecipePrototype : IPrototype
         [DataField("reagents")]
         public Dictionary<string, FixedPoint2> Reagents { get; private set; } = new();
 
-        [DataField("leaves")]
-        public IReadOnlyDictionary<string, FixedPoint2> Leaves => Leaves;
+        [DataField("solids")]
+        public IReadOnlyDictionary<string, FixedPoint2> Solids => Solids;
 
         [DataField("products")]
         public Dictionary<string, FixedPoint2> Products { get; private set; } = new();
@@ -48,7 +48,7 @@ public FixedPoint2 IngredientCount()
         {
             FixedPoint2 n = 0;
             n += Reagents.Count; // number of distinct reagents
-            foreach (FixedPoint2 i in Leaves.Values) // sum the number of solid ingredients
+            foreach (FixedPoint2 i in Solids.Values) // sum the number of solid ingredients
             {
                 n += i;
             }