From 0fb846f7b7f4cbdd3f49b2f98e643a9a31e40b72 Mon Sep 17 00:00:00 2001
From: BIGZi0348 <svalker0348@gmail.com>
Date: Mon, 6 Jan 2025 20:01:20 +0300
Subject: [PATCH] =?UTF-8?q?=D0=B3=D0=BE=D0=BB=D0=BE=D0=B4=20=D0=B8=20?=
 =?UTF-8?q?=D0=B6=D0=B0=D0=B6=D0=B4=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Nutrition/EntitySystems/HungerSystem.cs   |  2 +-
 .../Nutrition/EntitySystems/ThirstSystem.cs   |  6 +++--
 .../_White/Mood/moodEffects_needs.yml         | 24 +++++++++++++++----
 3 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/Content.Shared/Nutrition/EntitySystems/HungerSystem.cs b/Content.Shared/Nutrition/EntitySystems/HungerSystem.cs
index 82273f8784..42ee21d746 100644
--- a/Content.Shared/Nutrition/EntitySystems/HungerSystem.cs
+++ b/Content.Shared/Nutrition/EntitySystems/HungerSystem.cs
@@ -136,7 +136,7 @@ public sealed class HungerSystem : EntitySystem
             return;
 
         //WD start
-        if (_net.IsServer && component.CurrentThreshold != HungerThreshold.Overfed)
+        if (_net.IsServer)
         {
             var ev = new MoodEffectEvent("Hunger" + component.CurrentThreshold);
             RaiseLocalEvent(uid, ev);
diff --git a/Content.Shared/Nutrition/EntitySystems/ThirstSystem.cs b/Content.Shared/Nutrition/EntitySystems/ThirstSystem.cs
index 6190e7aa36..144ec5f538 100644
--- a/Content.Shared/Nutrition/EntitySystems/ThirstSystem.cs
+++ b/Content.Shared/Nutrition/EntitySystems/ThirstSystem.cs
@@ -10,6 +10,7 @@ using Robust.Shared.Random;
 using Robust.Shared.Timing;
 using Content.Shared._White.Mood;
 using Robust.Shared.Utility;
+using Robust.Shared.Network;
 
 namespace Content.Shared.Nutrition.EntitySystems;
 
@@ -22,6 +23,7 @@ public sealed class ThirstSystem : EntitySystem
     [Dependency] private readonly AlertsSystem _alerts = default!;
     [Dependency] private readonly MovementSpeedModifierSystem _movement = default!;
     [Dependency] private readonly SharedJetpackSystem _jetpack = default!;
+    [Dependency] private readonly INetManager _net = default!; // WD edit
 
     [ValidatePrototypeId<StatusIconPrototype>]
     private const string ThirstIconOverhydratedId = "ThirstIconOverhydrated";
@@ -65,7 +67,7 @@ public sealed class ThirstSystem : EntitySystem
         UpdateEffects(uid, component);
 
         TryComp(uid, out MovementSpeedModifierComponent? moveMod);
-            _movement.RefreshMovementSpeedModifiers(uid, moveMod);
+        _movement.RefreshMovementSpeedModifiers(uid, moveMod);
     }
 
     private void OnRefreshMovespeed(EntityUid uid, ThirstComponent component, RefreshMovementSpeedModifiersEvent args)
@@ -172,7 +174,7 @@ public sealed class ThirstSystem : EntitySystem
         }
 
         // WD start
-        if (component.CurrentThirstThreshold != ThirstThreshold.OverHydrated)
+        if (_net.IsServer)
         {
             var ev = new MoodEffectEvent("Thirst" + component.CurrentThirstThreshold);
             RaiseLocalEvent(uid, ev);
diff --git a/Resources/Prototypes/_White/Mood/moodEffects_needs.yml b/Resources/Prototypes/_White/Mood/moodEffects_needs.yml
index f99aac0ebc..b09f63408a 100644
--- a/Resources/Prototypes/_White/Mood/moodEffects_needs.yml
+++ b/Resources/Prototypes/_White/Mood/moodEffects_needs.yml
@@ -1,8 +1,9 @@
 #Hunger
 - type: moodEffect
   id: HungerOverfed
-  description: "Во мне столько жира..."
-  moodChange: enum.MoodChangeLevel.Small
+  description: "Мой желудок полон!"
+  moodChange: enum.MoodChangeLevel.Medium
+  positive: true
   category: "Hunger"
 
 - type: moodEffect
@@ -24,11 +25,18 @@
   moodChange: enum.MoodChangeLevel.Big
   category: "Hunger"
 
+- type: moodEffect
+  id: HungerDead
+  description: "Умираю от голода!"
+  moodChange: enum.MoodChangeLevel.Huge
+  category: "Hunger"
+
 #Thirst
 - type: moodEffect
   id: ThirstOverHydrated
-  description: "СЛИШКОМ МНОГО ВОДЫ..."
-  moodChange: enum.MoodChangeLevel.Small
+  description: "Не хочу пить."
+  moodChange: enum.MoodChangeLevel.Medium
+  positive: true
   category: "Thirst"
 
 - type: moodEffect
@@ -46,10 +54,16 @@
 
 - type: moodEffect
   id: ThirstParched
-  description: "ВОДЫ!"
+  description: "Хочу пить!"
   moodChange: enum.MoodChangeLevel.Big
   category: "Thirst"
 
+- type: moodEffect
+  id: ThirstDead
+  description: "Умираю от жажды!"
+  moodChange: enum.MoodChangeLevel.Huge
+  category: "Thirst"
+
 #Health
 - type: moodEffect
   id: HealthNoDamage