Commit Graph

4 Commits

Author SHA1 Message Date
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
Perry Fraser
dbfe05d5cc refactor: rework the new status effect system to use containers (#38915) 2025-07-12 19:49:58 +03:00
Red
5b4440d18d Merge pull request #1516 from crystallpunk-14/ed-08-07-2025-shader-sea
Status effect spells
2025-07-09 09:16:49 +03:00
Red
283d0863a0 New Status Effects system: Relay events (#38579) 2025-06-26 23:05:58 +03:00