Satiety tweaks (#9519)

* Satiety tweaks

* actually lets do this

Content.Server/Body/Components/StomachComponent.cs

@@ -24,7 +24,7 @@ namespace Content.Server.Body.Components
         ///     Initial internal solution storage volume
         /// </summary>
         [DataField("maxVolume")]
-        public FixedPoint2 InitialMaxVolume { get; private set; } = FixedPoint2.New(20);
+        public FixedPoint2 InitialMaxVolume { get; private set; } = FixedPoint2.New(50);
 
         /// <summary>
         ///     Time in seconds between reagents being ingested and them being

Content.Server/Chemistry/Components/ChemMasterComponent.cs

@@ -290,7 +290,7 @@ namespace Content.Server.Chemistry.Components
                     return;
                 }
 
-                var actualVolume = FixedPoint2.Min(individualVolume, FixedPoint2.New(20));
+                var actualVolume = FixedPoint2.Min(individualVolume, FixedPoint2.New(25));
                 for (int i = 0; i < pillAmount; i++)
                 {
                     var pill = _entities.SpawnEntity("Pill", _entities.GetComponent<TransformComponent>(Owner).Coordinates);

Content.Server/Nutrition/EntitySystems/DrinkSystem.cs

@@ -314,11 +314,22 @@ namespace Content.Server.Nutrition.EntitySystems
 
             // All stomach are full or can't handle whatever solution we have.
             if (firstStomach == null)
+            {
+                _solutionContainerSystem.TryAddSolution(args.Drink.Owner, args.DrinkSolution, drained);
+                _popupSystem.PopupEntity(Loc.GetString("drink-component-try-use-drink-had-enough"),
+                    uid, Filter.Entities(uid));
+
+                if (forceDrink)
                 {
                     _popupSystem.PopupEntity(Loc.GetString("drink-component-try-use-drink-had-enough-other"),
                         uid, Filter.Entities(args.User));
-
                     _spillableSystem.SpillAt(uid, drained, "PuddleSmear");
+                }
+                else
+                {
+                    _solutionContainerSystem.TryAddSolution(args.Drink.Owner, args.DrinkSolution, drained);
+                }
+
                 return;
             }
 

Resources/Locale/en-US/chemistry/components/chem-master-component.ftl

@@ -22,7 +22,7 @@ chem-master-window-packaging-text = Packaging
 chem-master-current-text-label = Label:
 chem-master-window-pills-label = Pills:
 chem-master-window-pill-type-label = Pill type:
-chem-master-window-max-pills-volume-text = max 20u/each
+chem-master-window-max-pills-volume-text = max 25u/each
 chem-master-window-max-bottles-volume-text = max 30u/each
 chem-master-window-create-pill-button = Create
 chem-master-window-create-bottle-button = Create

Resources/Prototypes/Body/Mechanisms/reptilian.yml

@@ -0,0 +1,7 @@
+- type: entity
+  id: OrganReptilianStomach
+  parent: OrganAnimalStomach
+  noSpawn: true
+  components:
+  - type: Stomach
+    maxVolume: 50

Resources/Prototypes/Body/Parts/reptilian.yml

@@ -28,7 +28,7 @@
     mechanisms:
     - OrganAnimalHeart
     - OrganHumanLungs
-    - OrganAnimalStomach
+    - OrganReptilianStomach
     - OrganAnimalLiver
     - OrganHumanKidneys
 #    criticalThreshold: 100

Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml

@@ -123,7 +123,7 @@
   - type: SolutionContainerManager
     solutions:
       food:
-        maxVol: 20
+        maxVol: 25
         reagents:
         - ReagentId: Dexalin
           Quantity: 15
@@ -136,7 +136,7 @@
   - type: SolutionContainerManager
     solutions:
       food:
-        maxVol: 20
+        maxVol: 25
         reagents:
         - ReagentId: Dylovene
           Quantity: 15
@@ -149,7 +149,7 @@
   - type: SolutionContainerManager
     solutions:
       food:
-        maxVol: 20
+        maxVol: 25
         reagents:
         - ReagentId: Hyronalin
           Quantity: 15
@@ -162,7 +162,7 @@
   - type: SolutionContainerManager
     solutions:
       food:
-        maxVol: 20
+        maxVol: 25
         reagents:
         - ReagentId: Iron
           Quantity: 15
@@ -175,7 +175,7 @@
   - type: SolutionContainerManager
     solutions:
       food:
-        maxVol: 20
+        maxVol: 25
         reagents:
         - ReagentId: Kelotane
           Quantity: 15
@@ -188,7 +188,7 @@
   - type: SolutionContainerManager
     solutions:
       food:
-        maxVol: 20
+        maxVol: 25
         reagents:
         - ReagentId: SpaceDrugs
           Quantity: 15
@@ -201,7 +201,7 @@
   - type: SolutionContainerManager
     solutions:
       food:
-        maxVol: 20
+        maxVol: 25
         reagents:
         - ReagentId: Tricordrazine
           Quantity: 15
@@ -214,7 +214,7 @@
   - type: SolutionContainerManager
     solutions:
       food:
-        maxVol: 20
+        maxVol: 25
         reagents:
         - ReagentId: Romerol
           Quantity: 10

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

@@ -272,7 +272,7 @@
   - type: SolutionContainerManager
     solutions:
       food:
-        maxVol: 20
+        maxVol: 25
   - type: SolutionSpiker
     sourceSolution: food
   - type: DeleteOnTrigger