Remove overfed/overhydrated alerts (#9852)
This commit is contained in:
@@ -59,7 +59,6 @@ namespace Content.Server.Nutrition.Components
|
|||||||
|
|
||||||
public static readonly Dictionary<HungerThreshold, AlertType> HungerThresholdAlertTypes = new()
|
public static readonly Dictionary<HungerThreshold, AlertType> HungerThresholdAlertTypes = new()
|
||||||
{
|
{
|
||||||
{ HungerThreshold.Overfed, AlertType.Overfed },
|
|
||||||
{ HungerThreshold.Peckish, AlertType.Peckish },
|
{ HungerThreshold.Peckish, AlertType.Peckish },
|
||||||
{ HungerThreshold.Starving, AlertType.Starving },
|
{ HungerThreshold.Starving, AlertType.Starving },
|
||||||
{ HungerThreshold.Dead, AlertType.Starving },
|
{ HungerThreshold.Dead, AlertType.Starving },
|
||||||
|
|||||||
@@ -44,7 +44,6 @@ namespace Content.Server.Nutrition.Components
|
|||||||
|
|
||||||
public static readonly Dictionary<ThirstThreshold, AlertType> ThirstThresholdAlertTypes = new()
|
public static readonly Dictionary<ThirstThreshold, AlertType> ThirstThresholdAlertTypes = new()
|
||||||
{
|
{
|
||||||
{ThirstThreshold.OverHydrated, AlertType.Overhydrated},
|
|
||||||
{ThirstThreshold.Thirsty, AlertType.Thirsty},
|
{ThirstThreshold.Thirsty, AlertType.Thirsty},
|
||||||
{ThirstThreshold.Parched, AlertType.Parched},
|
{ThirstThreshold.Parched, AlertType.Parched},
|
||||||
{ThirstThreshold.Dead, AlertType.Parched},
|
{ThirstThreshold.Dead, AlertType.Parched},
|
||||||
|
|||||||
@@ -22,10 +22,8 @@
|
|||||||
HumanDead,
|
HumanDead,
|
||||||
HumanHealth,
|
HumanHealth,
|
||||||
PilotingShuttle,
|
PilotingShuttle,
|
||||||
Overfed,
|
|
||||||
Peckish,
|
Peckish,
|
||||||
Starving,
|
Starving,
|
||||||
Overhydrated,
|
|
||||||
Thirsty,
|
Thirsty,
|
||||||
Parched,
|
Parched,
|
||||||
Stamina,
|
Stamina,
|
||||||
|
|||||||
@@ -28,10 +28,6 @@ namespace Content.Tests.Shared.Alert
|
|||||||
id: LowPressure
|
id: LowPressure
|
||||||
category: Pressure
|
category: Pressure
|
||||||
|
|
||||||
- type: alert
|
|
||||||
id: Overfed
|
|
||||||
category: Hunger
|
|
||||||
|
|
||||||
- type: alert
|
- type: alert
|
||||||
id: HighPressure
|
id: HighPressure
|
||||||
category: Pressure
|
category: Pressure
|
||||||
@@ -79,7 +75,6 @@ namespace Content.Tests.Shared.Alert
|
|||||||
expectedOrder.Add(AlertType.Handcuffed);
|
expectedOrder.Add(AlertType.Handcuffed);
|
||||||
expectedOrder.Add(AlertType.HighPressure);
|
expectedOrder.Add(AlertType.HighPressure);
|
||||||
// stuff with only category + same category ordered by enum value
|
// stuff with only category + same category ordered by enum value
|
||||||
expectedOrder.Add(AlertType.Overfed);
|
|
||||||
expectedOrder.Add(AlertType.Peckish);
|
expectedOrder.Add(AlertType.Peckish);
|
||||||
expectedOrder.Add(AlertType.Hot);
|
expectedOrder.Add(AlertType.Hot);
|
||||||
expectedOrder.Add(AlertType.Stun);
|
expectedOrder.Add(AlertType.Stun);
|
||||||
|
|||||||
@@ -150,13 +150,6 @@
|
|||||||
name: Piloting Shuttle
|
name: Piloting Shuttle
|
||||||
description: You are piloting a shuttle. Click the alert to stop.
|
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
|
- type: alert
|
||||||
id: Peckish
|
id: Peckish
|
||||||
category: Hunger
|
category: Hunger
|
||||||
@@ -182,13 +175,6 @@
|
|||||||
name: "[color=red]Starving[/color]"
|
name: "[color=red]Starving[/color]"
|
||||||
description: You're severely malnourished. The hunger pains make moving around a chore.
|
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
|
- type: alert
|
||||||
id: Thirsty
|
id: Thirsty
|
||||||
category: Thirst
|
category: Thirst
|
||||||
|
|||||||
Reference in New Issue
Block a user