Ed f59de85047 Merge remote-tracking branch 'upstream/stable' into ed-21-07-2025-upstream-sync ...

# Conflicts:
#	Content.Client/Overlays/StencilOverlay.Weather.cs
#	Content.IntegrationTests/Tests/Atmos/AlarmThresholdTest.cs
#	Content.IntegrationTests/Tests/VendingMachineRestockTest.cs
#	Content.Server/Chat/Systems/ChatSystem.cs
#	Content.Server/Fluids/EntitySystems/PuddleSystem.cs
#	Content.Shared/Damage/Systems/SharedStaminaSystem.cs
#	Content.Shared/Fluids/Components/EvaporationComponent.cs
#	Content.Shared/GameTicking/SharedGameTicker.cs

2025-07-21 11:27:53 +03:00

..

DamageableSystem.cs

Predict healing and bloodstream (#38690)

2025-07-02 19:20:31 -04:00

DamageContactsSystem.cs

Damaged by contact fix (#31921)

2024-09-07 17:46:24 -06:00

DamageExamineSystem.cs

Optimization!

2024-11-10 00:45:54 -06:00

DamageOnAttackedSystem.cs

Remove unused IoC dependency references. (#31704)

2024-09-01 23:22:50 +02:00

DamageOnHighSpeedImpactSystem.cs

Clean up all missing EntitySystem proxy method uses (#38353)

2025-06-26 16:50:49 -07:00

DamageOnHoldingSystem.cs

replace all uses of TryGetContainingContainer with non-obsolete overload (#30583)

2024-08-04 15:38:53 +10:00

DamageOnInteractSystem.cs

Death Nettle changes (#25253)

2025-03-29 10:35:16 +01:00

DamagePopupSystem.cs

Predict DamagePopup (#36547)

2025-04-14 21:10:09 +02:00

DamageProtectionBuffSystem.cs

Add haloperidol, potassium iodide (#27454)

2024-08-03 03:12:08 +10:00

PassiveDamageSystem.cs

Magic redesign (#594)

2024-11-20 00:23:44 +03:00

RequireProjectileTargetSystem.cs

Cluster grenade refactor and contra markings (#31108)

2024-12-16 13:08:07 +01:00

SharedGodmodeSystem.cs

New status effect system (#37238)

2025-06-25 07:41:35 -04:00

SharedStaminaSystem.cs

Merge remote-tracking branch 'upstream/stable' into ed-21-07-2025-upstream-sync

2025-07-21 11:27:53 +03:00

SharedStaminaSystem.Modifier.cs

StaminaSystem to SharedStaminaSystem (#37199)

2025-05-06 12:39:05 -04:00

SharedStaminaSystem.Resistance.cs

StaminaSystem to SharedStaminaSystem (#37199)

2025-05-06 12:39:05 -04:00

SlowOnDamageSystem.cs

Clean up all missing EntitySystem proxy method uses (#38353)

2025-06-26 16:50:49 -07:00