Ed c82b17a65e Merge remote-tracking branch 'upstream/master' into ed-19-08-2024-upstream ...

# Conflicts:
#	Content.IntegrationTests/Tests/PostMapInitTest.cs
#	Content.Server/Damage/Systems/DamageOtherOnHitSystem.cs
#	Content.Shared/Clothing/Components/ClothingComponent.cs
#	Resources/Prototypes/Accents/word_replacements.yml
#	Resources/Prototypes/Maps/Pools/default.yml
#	Resources/Prototypes/Maps/atlas.yml
#	Resources/Prototypes/Maps/bagel.yml
#	Resources/Prototypes/Maps/cluster.yml
#	Resources/Prototypes/Maps/europa.yml
#	Resources/Prototypes/Maps/omega.yml
#	Resources/Prototypes/Maps/origin.yml
#	Resources/Prototypes/Traits/speech.yml
#	Resources/Prototypes/Voice/disease_emotes.yml
#	Resources/Prototypes/Voice/speech_emotes.yml
#	Resources/Prototypes/game_presets.yml
#	Resources/Prototypes/secret_weights.yml

2024-08-19 19:06:38 +03:00

..

AntagPreferenceTest.cs

Code Cleanup: Integration Tests (#29584)

2024-07-03 10:01:37 +10:00

FailAndStartPresetTest.cs

Replace noSpawn: true with categories: [ HideSpawnMenu ] (#30100)

2024-07-25 05:24:00 -07:00

NukeOpsTest.cs

Merge remote-tracking branch 'upstream/master' into ed-05-08-2024-upstream

2024-08-12 14:40:15 +03:00

RuleMaxTimeRestartTest.cs

refactor event schedulers to use explicit game rules (#29320)

2024-08-14 15:21:01 +10:00

SecretStartsTest.cs

Mega Antag Refactor (#25786)

2024-04-25 11:31:45 +10:00

StartEndGameRulesTest.cs

Remove obsolete TestPair.Pair (#19496)

2023-08-25 10:56:51 +10:00

TraitorRuleTest.cs

Merge remote-tracking branch 'upstream/master' into ed-19-08-2024-upstream

2024-08-19 19:06:38 +03:00