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

..

Antags

Merge remote-tracking branch 'upstream/stable' into ed-23-06-2025-upstream-sync

2025-06-23 16:37:22 +03:00

Ghostroles

Fixed ghost role rules for some syndicate familiars (#32457)

2024-12-02 20:43:59 +01:00

Jobs

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

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

MindRoles

Dragon Direction Briefing Fixed (#37181)

2025-05-10 19:35:27 -04:00

play_time_trackers.yml

Fix some contraband issues (#31606)

2024-09-09 13:36:25 -06:00

requirement_overrides.yml

Revert "Ed 09 06 2024 upstream (#230)"

2024-06-11 15:20:47 +03:00

role_types.yml

Role subtypes (#35359)

2025-04-16 19:04:48 +02:00