Ed 7328f3449c Merge remote-tracking branch 'upstream/master' into ed-16-02-2025-planet-light-upstream ...

# Conflicts:
#	Content.IntegrationTests/Tests/EntityTest.cs
#	Content.IntegrationTests/Tests/PostMapInitTest.cs
#	Content.Server/Medical/HealthAnalyzerSystem.cs
#	Content.Server/Procedural/DungeonSystem.Rooms.cs
#	Content.Server/Procedural/RoomFillComponent.cs
#	Content.Server/Procedural/RoomFillSystem.cs
#	Content.Shared/Inventory/InventorySystem.Relay.cs
#	Content.Shared/Projectiles/SharedProjectileSystem.cs
#	Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs
#	Resources/Prototypes/Maps/Pools/default.yml
#	Resources/migration.yml

2025-02-16 11:58:47 +03:00

..

DamageableSystem.cs

Wizard Staff of Animation (#34649)

2025-02-12 23:46:02 -05: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

Remove unused IoC dependency references. (#31704)

2024-09-01 23:22:50 +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

Add Galoshes slowdown over slippery surfaces (#30967)

2024-08-23 19:59:51 +10:00

SlowOnDamageSystem.cs

Hivelord mob (#31322)

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

StaminaSystem.cs

Sprint loadout action (#698)

2025-01-05 17:46:54 +03:00

StaminaSystem.Modifier.cs

stimulants increase stamina (#18754)

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