Remove starvation damage (#9024)

* Remove starvation damage

* remove more

* Even more cleanup

Content.Server/Nutrition/Components/HungerComponent.cs

@@ -1,8 +1,4 @@
-using Content.Server.Administration.Logs;
 using Content.Shared.Alert;
-using Content.Shared.Damage;
-using Content.Shared.Database;
-using Content.Shared.MobState.Components;
 using Content.Shared.Movement.Components;
 using Content.Shared.Movement.Systems;
 using Content.Shared.Nutrition.Components;
@@ -70,10 +66,6 @@ namespace Content.Server.Nutrition.Components
             { HungerThreshold.Starving, AlertType.Starving },
         };
 
-        [DataField("damage", required: true)]
-        [ViewVariables(VVAccess.ReadWrite)]
-        public DamageSpecifier Damage = default!;
-
         public void HungerThresholdEffect(bool force = false)
         {
             if (_currentHungerThreshold != _lastHungerThreshold || force)
@@ -173,21 +165,6 @@ namespace Content.Server.Nutrition.Components
 
             if (_currentHungerThreshold != HungerThreshold.Dead)
                 return;
-            // --> Current Hunger is below dead threshold
-
-            if (!_entMan.TryGetComponent(Owner, out MobStateComponent? mobState))
-                return;
-
-            if (!mobState.IsDead())
-            {
-                // --> But they are not dead yet.
-                _accumulatedFrameTime += frametime;
-                if (_accumulatedFrameTime >= 1)
-                {
-                    EntitySystem.Get<DamageableSystem>().TryChangeDamage(Owner, Damage * (int) _accumulatedFrameTime, true);
-                    _accumulatedFrameTime -= (int) _accumulatedFrameTime;
-                }
-            }
         }
 
         private void UpdateCurrentThreshold()
@@ -196,12 +173,6 @@ namespace Content.Server.Nutrition.Components
             // _trySound(calculatedThreshold);
             if (calculatedHungerThreshold != _currentHungerThreshold)
             {
-                var logManager = IoCManager.Resolve<IAdminLogManager>();
-                if (_currentHungerThreshold == HungerThreshold.Dead)
-                    logManager.Add(LogType.Hunger, $"{_entMan.ToPrettyString(Owner):entity} has stopped starving");
-                else if (calculatedHungerThreshold == HungerThreshold.Dead)
-                    logManager.Add(LogType.Hunger, $"{_entMan.ToPrettyString(Owner):entity} has started starving");
-
                 _currentHungerThreshold = calculatedHungerThreshold;
                 HungerThresholdEffect();
                 Dirty();

Content.Server/Nutrition/Components/ThirstComponent.cs

@@ -1,5 +1,4 @@
 using Content.Shared.Alert;
-using Content.Shared.Damage;
 
 namespace Content.Server.Nutrition.Components
 {
@@ -50,10 +49,5 @@ namespace Content.Server.Nutrition.Components
             {ThirstThreshold.Thirsty, AlertType.Thirsty},
             {ThirstThreshold.Parched, AlertType.Parched},
         };
-
-
-        [DataField("damage", required: true)]
-        [ViewVariables(VVAccess.ReadWrite)]
-        public DamageSpecifier Damage = default!;
     }
 }

Content.Server/Nutrition/EntitySystems/ThirstSystem.cs

@@ -135,24 +135,9 @@ namespace Content.Server.Nutrition.EntitySystems
                     var calculatedThirstThreshold = GetThirstThreshold(component, component.CurrentThirst);
                     if (calculatedThirstThreshold != component.CurrentThirstThreshold)
                     {
-                        if (component.CurrentThirstThreshold == ThirstThreshold.Dead)
-                            _adminLogger.Add(LogType.Thirst, $"{EntityManager.ToPrettyString(component.Owner):entity} has stopped taking dehydration damage");
-                        else if (calculatedThirstThreshold == ThirstThreshold.Dead)
-                           _adminLogger.Add(LogType.Thirst, $"{EntityManager.ToPrettyString(component.Owner):entity} has started taking dehydration damage");
-
                         component.CurrentThirstThreshold = calculatedThirstThreshold;
                         UpdateEffects(component);
                     }
-                    if (component.CurrentThirstThreshold == ThirstThreshold.Dead)
-                    {
-                        if (!EntityManager.TryGetComponent(component.Owner, out MobStateComponent? mobState))
-                            return;
-
-                        if (!mobState.IsDead())
-                        {
-                            _damage.TryChangeDamage(component.Owner, component.Damage, true);
-                        }
-                    }
                 }
                 _accumulatedFrameTime -= 1;
             }

Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml

@@ -167,13 +167,7 @@
     # - Hunger TODO: eating on the floor and fix weird AI endless stomach
     # - Thirst
   - type: Hunger
-    damage:
-      types:
-        Blunt: 2
   - type: Thirst
-    damage:
-      types:
-        Blunt: 2
   - type: Barotrauma
     damage:
       types:

Resources/Prototypes/Entities/Mobs/Species/human.yml

@@ -46,13 +46,7 @@
     soundHit:
       path: /Audio/Effects/hit_kick.ogg
   - type: Hunger
-    damage:
-      types:
-        Blunt: 2
   - type: Thirst
-    damage:
-      types:
-        Blunt: 2
   # Organs
   - type: InjectableSolution
     solution: chemicals