Merge branch 'Fansana:master' into NNN-to-Floof-Folder

Fansana · Aug 18, 2024 · f7ff0fb · f7ff0fb
2 parents d1ebc45 + 73823cc
commit f7ff0fb
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/Content.Server/FloofStation/Traits/LewdTraitSystem.cs b/Content.Server/FloofStation/Traits/LewdTraitSystem.cs
@@ -287,7 +287,7 @@ public override void Update(float frameTime)
                 if (_hunger.GetHungerThreshold(hunger) < HungerThreshold.Okay)
                     continue;
 
-                _hunger.ModifyHunger(uid, -containerCum.HungerUsage, hunger);
+                //_hunger.ModifyHunger(uid, -containerCum.HungerUsage, hunger);
             }
 
             if (!_solutionContainer.ResolveSolution(uid, containerCum.SolutionName, ref containerCum.Solution))
@@ -311,7 +311,7 @@ public override void Update(float frameTime)
                 if (_hunger.GetHungerThreshold(hunger) < HungerThreshold.Okay)
                     continue;
 
-                _hunger.ModifyHunger(uid, -containerMilk.HungerUsage, hunger);
+                //_hunger.ModifyHunger(uid, -containerMilk.HungerUsage, hunger);
             }
 
             if (!_solutionContainer.ResolveSolution(uid, containerMilk.SolutionName, ref containerMilk.Solution))

diff --git a/Resources/Changelog/Floof.yml b/Resources/Changelog/Floof.yml
@@ -532,3 +532,9 @@ Entries:
       message: Updated the Rouny Sprite
   id: 72
   time: '2024-08-16T06:52:50.0000000+00:00'
+- author: Memeji
+  changes:
+    - type: Tweak
+      message: Cum/Milk regeneration doesn't use hunger.
+  id: 73
+  time: '2024-08-17T23:21:19.0000000+00:00'