Fix throwable solution (#4590)

* Fix throwable solution

* Revert previous commit

* Change Spillable and SpillBehavior

* Fix sloth's suggestion. Add more documents

Content.Server/Destructible/Thresholds/Behaviors/SpillBehavior.cs

@@ -10,13 +10,32 @@ namespace Content.Server.Destructible.Thresholds.Behaviors
     [DataDefinition]
     public class SpillBehavior : IThresholdBehavior
     {
+        [DataField("solution")]
+        public string? Solution;
+
+        /// <summary>
+        /// If there is a SpillableComponent on IEntity owner use it to create a puddle/smear.
+        /// Or whatever solution is specified in the behavior itself.
+        /// If none are available do nothing.
+        /// </summary>
+        /// <param name="owner">Entity on which behavior is executed</param>
+        /// <param name="system">system calling the behavior</param>
         public void Execute(IEntity owner, DestructibleSystem system)
         {
-            // TODO see if this is correct
+            var solutionContainerSystem = EntitySystem.Get<SolutionContainerSystem>();
-            if (!EntitySystem.Get<SolutionContainerSystem>().TryGetSolution(owner, SpillableComponent.SolutionName, out var solution))
-                return;
 
-            solution.SpillAt(owner.Transform.Coordinates, "PuddleSmear", false);
+
+            if (owner.TryGetComponent(out SpillableComponent? spillableComponent) &&
+                solutionContainerSystem.TryGetSolution(owner.Uid, spillableComponent.SolutionName,
+                    out var compSolution))
+            {
+                compSolution.SpillAt(owner.Transform.Coordinates, "PuddleSmear", false);
+            }
+            else if (Solution != null &&
+                     solutionContainerSystem.TryGetSolution(owner.Uid, Solution, out var behaviorSolution))
+            {
+                behaviorSolution.SpillAt(owner.Transform.Coordinates, "PuddleSmear", false);
+            }
         }
     }
 }

Content.Server/Fluids/Components/SpillableComponent.cs

@@ -7,6 +7,7 @@ using Content.Shared.Notification.Managers;
 using Content.Shared.Verbs;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Localization;
+using Robust.Shared.Serialization.Manager.Attributes;
 
 namespace Content.Server.Fluids.Components
 {
@@ -14,7 +15,9 @@ namespace Content.Server.Fluids.Components
     public class SpillableComponent : Component, IDropped
     {
         public override string Name => "Spillable";
-        public const string SolutionName = "puddle";
+
+        [DataField("solution")]
+        public string SolutionName = "puddle";
 
         /// <summary>
         ///     Transfers solution from the held container to the floor.

Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/bowl.yml

@@ -23,6 +23,7 @@
       types:
         Blunt: 5
   - type: Spillable
+    solution: food
   - type: Damageable
     damageContainer: Inorganic
   - type: Destructible

Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml

@@ -36,6 +36,7 @@
     useSound:
       path: /Audio/Items/eating_1.ogg
   - type: Spillable
+    solution: food
 
 - type: entity
   parent: ReagentContainerBase

Resources/Prototypes/Entities/Objects/Consumable/Food/soup.yml

@@ -24,6 +24,7 @@
       types:
         Blunt: 5
   - type: Spillable
+    solution: food
   - type: Damageable
     damageContainer: Inorganic
   - type: Destructible

Resources/Prototypes/Entities/Objects/Consumable/drinks.yml

@@ -16,6 +16,7 @@
   - type: Sprite
     state: icon
   - type: Spillable
+    solution: drink
   - type: UserInterface
     interfaces:
     - key: enum.TransferAmountUiKey.Key

Resources/Prototypes/Entities/Objects/Consumable/drinks_bottles.yml

@@ -27,6 +27,7 @@
       types:
         Blunt: 10
   - type: Spillable
+    solution: drink
   - type: Damageable
     damageContainer: Inorganic
   - type: Destructible

Resources/Prototypes/Entities/Objects/Consumable/drinks_cans.yml

@@ -23,8 +23,8 @@
       type: TransferAmountBoundUserInterface
   - type: Sprite
     state: icon
-
   - type: Spillable
+    solution: drink
 
 - type: entity
   parent: DrinkCanBaseFull

Resources/Prototypes/Entities/Objects/Consumable/drinks_cups.yml

@@ -21,6 +21,7 @@
   - type: Sprite
     state: icon
   - type: Spillable
+    solution: drink
 
 - type: entity
   parent: DrinkBaseCup

Resources/Prototypes/Entities/Objects/Consumable/trash_drinks.yml

@@ -18,6 +18,7 @@
   - type: Drink
     isOpen: true
   - type: Spillable
+    solution: drink
   - type: UserInterface
     interfaces:
     - key: enum.TransferAmountUiKey.Key

Resources/Prototypes/Entities/Objects/Specific/Hydroponics/sprays.yml

@@ -44,6 +44,7 @@
   - type: DrainableSolution
     solution: spray
   - type: Spillable
+    solution: spray
   - type: ItemCooldown
   - type: Spray
     transferAmount: 1

Resources/Prototypes/Entities/Objects/Specific/Janitorial/spray.yml

@@ -24,6 +24,7 @@
     solution: spray
   - type: SolutionTransfer
   - type: Spillable
+    solution: spray
   - type: ItemCooldown
   - type: Spray
     transferAmount: 10

Resources/Prototypes/Entities/Objects/Specific/chemistry-bottles.yml

@@ -34,6 +34,7 @@
   - type: Item
     sprite: Objects/Specific/Chemistry/beaker.rsi
   - type: Spillable
+    solution: drink
 
 - type: entity
   name: bottle

Resources/Prototypes/Entities/Objects/Specific/chemistry.yml

@@ -36,6 +36,7 @@
     - key: enum.TransferAmountUiKey.Key
       type: TransferAmountBoundUserInterface
   - type: Spillable
+    solution: beaker
   - type: Drink
     isOpen: true
   - type: Appearance
@@ -167,6 +168,7 @@
     - key: enum.TransferAmountUiKey.Key
       type: TransferAmountBoundUserInterface
   - type: Spillable
+    solution: dropper
   - type: Item
     sprite: Objects/Specific/Chemistry/dropper.rsi
   - type: Appearance
@@ -200,6 +202,7 @@
   - type: Injector
     injectOnly: false
   - type: Spillable
+    solution: injector
   - type: Appearance
     visuals:
       # this visualizer used for reagent inside

Resources/Prototypes/Entities/Objects/Tools/bucket.yml

@@ -40,3 +40,4 @@
       mask:
       - Impassable
   - type: Spillable
+    solution: bucket