Ed ef6d973301 Merge remote-tracking branch 'upstream/stable' into ed-30-04-2025-upstream-sync ...

# Conflicts:
#	Content.Client/Parallax/ParallaxControl.cs
#	Content.Client/UserInterface/Systems/Storage/Controls/ItemGridPiece.cs
#	Content.IntegrationTests/Tests/PostMapInitTest.cs
#	Content.Server/Chat/Managers/ChatManager.cs
#	Content.Server/Fluids/EntitySystems/PuddleSystem.Evaporation.cs
#	Content.Server/Labels/Label/LabelSystem.cs
#	Content.Shared/Actions/SharedActionsSystem.cs
#	Content.Shared/Fluids/Components/EvaporationComponent.cs
#	Content.Shared/Labels/EntitySystems/SharedLabelSystem.cs
#	README.md
#	Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
#	Resources/Prototypes/Maps/Pools/deathmatch.yml
#	Resources/Prototypes/Maps/arenas.yml

2025-04-30 20:31:50 +03:00

..

DamageableSystem.cs

3mo xeno archeology (first phase) (#33370)

2025-04-15 10:34:53 +10: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

Add some tests and fix some miscellaneous bugs (#22836)

2023-12-28 10:05:20 +11: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

The long overdue downfall of stun meta - Stamina resists on Nukie & ERT Suits. (#35580)

2025-04-14 17:27:26 +02:00

SlowOnDamageSystem.cs

Hivelord mob (#31322)

2024-09-11 09:52:27 -04:00

StaminaSystem.cs

Merge remote-tracking branch 'upstream/stable' into ed-30-04-2025-upstream-sync

2025-04-30 20:31:50 +03:00

StaminaSystem.Modifier.cs

stimulants increase stamina (#18754)

2023-08-06 21:06:23 +10:00

StaminaSystem.Resistance.cs

The long overdue downfall of stun meta - Stamina resists on Nukie & ERT Suits. (#35580)

2025-04-14 17:27:26 +02:00