From 01e434a1ae1049239422b80c29c270f697095ed1 Mon Sep 17 00:00:00 2001 From: Pierson Arnold Date: Thu, 15 Aug 2024 22:49:15 -0500 Subject: [PATCH 1/2] Disable hunger mechanic for now --- Content.Server/FloofStation/Traits/LewdTraitSystem.cs | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/Content.Server/FloofStation/Traits/LewdTraitSystem.cs b/Content.Server/FloofStation/Traits/LewdTraitSystem.cs index 5c5f084ce08..a3702b7beb3 100644 --- a/Content.Server/FloofStation/Traits/LewdTraitSystem.cs +++ b/Content.Server/FloofStation/Traits/LewdTraitSystem.cs @@ -279,15 +279,12 @@ public override void Update(float frameTime) containerCum.NextGrowth = now + containerCum.GrowthDelay; - if (_mobState.IsDead(uid)) - continue; - if (EntityManager.TryGetComponent(uid, out HungerComponent? hunger)) { 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)) @@ -303,15 +300,12 @@ public override void Update(float frameTime) containerMilk.NextGrowth = now + containerMilk.GrowthDelay; - if (_mobState.IsDead(uid)) - continue; - if (EntityManager.TryGetComponent(uid, out HungerComponent? hunger)) { 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)) From 0a996fa240b123aec1674f95b345116c2b525fd7 Mon Sep 17 00:00:00 2001 From: Memeji Dankiri <39416235+Memeji@users.noreply.github.com> Date: Sat, 17 Aug 2024 18:11:29 -0500 Subject: [PATCH 2/2] Added dead-check back --- Content.Server/FloofStation/Traits/LewdTraitSystem.cs | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Content.Server/FloofStation/Traits/LewdTraitSystem.cs b/Content.Server/FloofStation/Traits/LewdTraitSystem.cs index a3702b7beb3..6a5a927d417 100644 --- a/Content.Server/FloofStation/Traits/LewdTraitSystem.cs +++ b/Content.Server/FloofStation/Traits/LewdTraitSystem.cs @@ -279,6 +279,9 @@ public override void Update(float frameTime) containerCum.NextGrowth = now + containerCum.GrowthDelay; + if (_mobState.IsDead(uid)) + continue; + if (EntityManager.TryGetComponent(uid, out HungerComponent? hunger)) { if (_hunger.GetHungerThreshold(hunger) < HungerThreshold.Okay) @@ -300,6 +303,9 @@ public override void Update(float frameTime) containerMilk.NextGrowth = now + containerMilk.GrowthDelay; + if (_mobState.IsDead(uid)) + continue; + if (EntityManager.TryGetComponent(uid, out HungerComponent? hunger)) { if (_hunger.GetHungerThreshold(hunger) < HungerThreshold.Okay)