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

..

floors.yml

No weather on concrete tiles (#30952)

2024-08-13 15:39:25 -06:00

planet.yml

Removes Trials of Mana grassland sprites: Bare Minimum Edition (#28868)

2024-06-11 23:04:43 -07:00

plating.yml

Clockwork structures and furniture (#24673)

2024-03-06 03:25:59 +03:00

space.yml

Wallmount update (#262)

2024-06-21 18:27:18 +03:00

tile_migrations.yml

New tiles (#274)

2024-06-27 22:16:05 +03:00