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