From 4ded69eaa78104599f0fbb4ea6f65d59c46a38d8 Mon Sep 17 00:00:00 2001
From: Rane <60792108+Elijahrane@users.noreply.github.com>
Date: Mon, 18 Jul 2022 00:41:54 -0400
Subject: [PATCH] Remove overfed/overhydrated alerts (#9852)

---
 .../Nutrition/Components/HungerComponent.cs        |  1 -
 .../Nutrition/Components/ThirstComponent.cs        |  1 -
 Content.Shared/Alert/AlertType.cs                  |  2 --
 .../Shared/Alert/AlertOrderPrototypeTests.cs       |  5 -----
 Resources/Prototypes/Alerts/alerts.yml             | 14 --------------
 5 files changed, 23 deletions(-)

diff --git a/Content.Server/Nutrition/Components/HungerComponent.cs b/Content.Server/Nutrition/Components/HungerComponent.cs
index 5c8f4a9e8b..b3c189ae3b 100644
--- a/Content.Server/Nutrition/Components/HungerComponent.cs
+++ b/Content.Server/Nutrition/Components/HungerComponent.cs
@@ -59,7 +59,6 @@ namespace Content.Server.Nutrition.Components
 
         public static readonly Dictionary<HungerThreshold, AlertType> HungerThresholdAlertTypes = new()
         {
-            { HungerThreshold.Overfed, AlertType.Overfed },
             { HungerThreshold.Peckish, AlertType.Peckish },
             { HungerThreshold.Starving, AlertType.Starving },
             { HungerThreshold.Dead, AlertType.Starving },
diff --git a/Content.Server/Nutrition/Components/ThirstComponent.cs b/Content.Server/Nutrition/Components/ThirstComponent.cs
index 5b3df87af2..aedf75a59f 100644
--- a/Content.Server/Nutrition/Components/ThirstComponent.cs
+++ b/Content.Server/Nutrition/Components/ThirstComponent.cs
@@ -44,7 +44,6 @@ namespace Content.Server.Nutrition.Components
 
         public static readonly Dictionary<ThirstThreshold, AlertType> ThirstThresholdAlertTypes = new()
         {
-            {ThirstThreshold.OverHydrated, AlertType.Overhydrated},
             {ThirstThreshold.Thirsty, AlertType.Thirsty},
             {ThirstThreshold.Parched, AlertType.Parched},
             {ThirstThreshold.Dead, AlertType.Parched},
diff --git a/Content.Shared/Alert/AlertType.cs b/Content.Shared/Alert/AlertType.cs
index c348edca5a..208ec62f3e 100644
--- a/Content.Shared/Alert/AlertType.cs
+++ b/Content.Shared/Alert/AlertType.cs
@@ -22,10 +22,8 @@
         HumanDead,
         HumanHealth,
         PilotingShuttle,
-        Overfed,
         Peckish,
         Starving,
-        Overhydrated,
         Thirsty,
         Parched,
         Stamina,
diff --git a/Content.Tests/Shared/Alert/AlertOrderPrototypeTests.cs b/Content.Tests/Shared/Alert/AlertOrderPrototypeTests.cs
index 46ce5a81d7..d1c2a429c5 100644
--- a/Content.Tests/Shared/Alert/AlertOrderPrototypeTests.cs
+++ b/Content.Tests/Shared/Alert/AlertOrderPrototypeTests.cs
@@ -28,10 +28,6 @@ namespace Content.Tests.Shared.Alert
   id: LowPressure
   category: Pressure
 
-- type: alert
-  id: Overfed
-  category: Hunger
-
 - type: alert
   id: HighPressure
   category: Pressure
@@ -79,7 +75,6 @@ namespace Content.Tests.Shared.Alert
             expectedOrder.Add(AlertType.Handcuffed);
             expectedOrder.Add(AlertType.HighPressure);
             // stuff with only category + same category ordered by enum value
-            expectedOrder.Add(AlertType.Overfed);
             expectedOrder.Add(AlertType.Peckish);
             expectedOrder.Add(AlertType.Hot);
             expectedOrder.Add(AlertType.Stun);
diff --git a/Resources/Prototypes/Alerts/alerts.yml b/Resources/Prototypes/Alerts/alerts.yml
index f2635768fb..3132191550 100644
--- a/Resources/Prototypes/Alerts/alerts.yml
+++ b/Resources/Prototypes/Alerts/alerts.yml
@@ -150,13 +150,6 @@
   name: Piloting Shuttle
   description: You are piloting a shuttle. Click the alert to stop.
 
-- type: alert
-  id: Overfed
-  category: Hunger
-  icon: /Textures/Interface/Alerts/Hunger/Overfed.png
-  name: "[color=yellow]Overfed[/color]"
-  description: You ate too much food, lardass. Run around the station and lose some weight.
-
 - type: alert
   id: Peckish
   category: Hunger
@@ -182,13 +175,6 @@
   name: "[color=red]Starving[/color]"
   description: You're severely malnourished. The hunger pains make moving around a chore.
 
-- type: alert
-  id: Overhydrated
-  category: Thirst
-  icon: /Textures/Interface/Alerts/Thirst/OverHydrated.png
-  name: "[color=yellow]Overhydrated[/color]"
-  description: You drank too much.
-
 - type: alert
   id: Thirsty
   category: Thirst