Make hunger/thirst more prominent

Content.IntegrationTests/Tests/Nutrition/HungerThirstTest.cs

@@ -12,7 +12,7 @@ namespace Content.IntegrationTests.Tests.Nutrition;
 /// </summary>
 public sealed class HungerThirstTest : InteractionTest
 {
-    private readonly EntProtoId _drink = "DrinkLemonadeGlass";
+    private readonly EntProtoId _drink = "DrinkCoconutWaterGlass"; // ES EDIT - Fuck you!
     private readonly EntProtoId _food = "FoodCakeVanillaSlice";
     protected override string PlayerPrototype => "MobHuman";
 

Content.Shared/Nutrition/Components/HungerComponent.cs

@@ -34,7 +34,9 @@ public sealed partial class HungerComponent : Component
     /// </summary>
     /// <remarks>Any time this is modified, <see cref="HungerSystem.SetAuthoritativeHungerValue"/> should be called.</remarks>
     [DataField("baseDecayRate"), ViewVariables(VVAccess.ReadWrite)]
-    public float BaseDecayRate = 0.01666666666f;
+// ES START
+    public float BaseDecayRate = 1 / 20f;
+// ES END
 
     /// <summary>
     /// The actual amount at which <see cref="LastAuthoritativeHungerValue"/> decays.

Content.Shared/Nutrition/Components/ThirstComponent.cs

@@ -14,7 +14,9 @@ public sealed partial class ThirstComponent : Component
     [ViewVariables(VVAccess.ReadWrite)]
     [DataField("baseDecayRate")]
     [AutoNetworkedField]
-    public float BaseDecayRate = 0.1f;
+// ES START
+    public float BaseDecayRate = 0.3f;
+// ES END
 
     [ViewVariables(VVAccess.ReadWrite)]
     [AutoNetworkedField]

Resources/Prototypes/_ES/Catalog/Crates/crates.yml

@@ -132,18 +132,6 @@
           id: MedkitAdvancedFilled
           amount: 2
 
-- type: entity
-  parent: CrateGenericSteel
-  id: ESCrateRestock
-  name: vending machine restock crate
-  description: Contains a box used for restocking vending machines.
-  suffix: ES
-  components:
-  - type: EntityTableContainerFill
-    containers:
-      entity_storage:
-        id: ESVendingMachineRestockGlobal
-
 #Security
 - type: entity
   parent: CrateSecgear
@@ -395,7 +383,6 @@
       weight: 2
     - id: ESGeneralToolsCrate
     - id: ESCrateEmergencyFire
-    - id: ESCrateRestock
     - id: ESCrateEmergencyEVA    #These four aren't just ESGeneralCratesTable due to the Water tank and advanced tools
     - tableId: ESCargoGeneralCratesTable
     - tableId: ESCargoMedicalCratesTable
@@ -418,4 +405,4 @@
     - id: ESSpeedLoader357
       amount: 2
     - id: ESMagazine9mm
-      amount: 2
+      amount: 2

Resources/Prototypes/_ES/Entities/Markers/Spawners/Distributed/cargo.yml

@@ -44,8 +44,6 @@
     - id: ESCrateFoodCooking
     - id: ESCrateServiceJanitorialSupplies
     - id: ESCrateServiceReplacementLights
-    - id: ESCrateRestock
-      weight: 0.25
 
 - type: entityTable
   id: ESCargoGeneralCratesTable
@@ -56,8 +54,6 @@
     - id: WaterTankHighCapacity
     - id: ESCrateEmergencyEVA
     - id: ESAdvancedToolsCrate
-    - id: ESCrateRestock
-      weight: 0.25
 
 - type: entity
   id: ESSpawnerRandomDistributedCargo

Resources/Prototypes/_ES/Lathe/packs.yml

@@ -86,10 +86,8 @@
 - type: latheRecipePack
   id: ESCargoStatic
   recipes:
-  - AppraisalTool
   - Pickaxe
   - ESWeaponKnife
-  - ESVendingMachineRestockGlobal
 
 # Medical
 - type: latheRecipePack

Resources/migration.yml

@@ -316,6 +316,10 @@ CryogenicSleepUnitSpawnerLateJoin: null
 
 # 2026-2-10
 AnomalyLocator: ESAnomalyProbe
+
+# 2026-2-23
+ESVendingMachineRestockGlobal: null
+ESCrateRestock: null
 # ES END
 
 # 2023-07-03