Ed 5f7600b6a2 Merge remote-tracking branch 'upstream/stable' into ed-08-09-2025-upstream-sync ...

# Conflicts:
#	.github/CODEOWNERS
#	Content.IntegrationTests/Tests/CargoTest.cs
#	Content.Server/Chat/Systems/ChatSystem.cs
#	Content.Shared/Chat/SharedChatSystem.cs
#	Content.Shared/Lock/LockSystem.cs
#	Content.Shared/StatusEffectNew/StatusEffectSystem.Relay.cs
#	Content.Shared/Storage/Components/EntityStorageComponent.cs
#	Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml
#	Resources/Prototypes/game_presets.yml

2025-09-08 13:12:50 +03:00

..

Antags

Merge remote-tracking branch 'upstream/stable' into ed-25-08-2025-upstream-sync

2025-08-25 16:22:32 +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-08-09-2025-upstream-sync

2025-09-08 13:12:50 +03:00

MindRoles

Minor fix to give Lone Operatives the correct roletype (#36521)

2025-08-18 20:57:30 +02: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