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

..

Pools

derotate train while i work on it (#31121)

2024-08-17 01:01:33 -06:00

arenas.yml

Update arenas.yml

2024-07-23 13:46:57 +03:00

bagel.yml

standardize map protos and fill gaps (#31120)

2024-08-17 00:23:57 -06:00

box.yml

tweak(medical): Reduce chemist slots (#28711)

2024-06-23 02:03:00 -06:00

centcomm.yml

Update centcomm.yml

2024-07-23 21:50:00 +03:00

cog.yml

Updated cog (#31117)

2024-08-16 23:41:03 -06:00

core.yml

standardize map protos and fill gaps (#31120)

2024-08-17 00:23:57 -06:00

debug.yml

Update debug.yml

2024-07-23 13:40:19 +03:00

fland.yml

Fixing Botanist role numbers in various stations - V2 (#29581)

2024-07-21 01:23:27 -06:00

marathon.yml

Merge remote-tracking branch 'upstream/master' into ed-13-06-2024-upstream2

2024-06-13 12:35:00 +03:00

meta.yml

tweak(medical): Reduce chemist slots (#28711)

2024-06-23 02:03:00 -06:00

oasis.yml

Fixing Botanist role numbers in various stations - V2 (#29581)

2024-07-21 01:23:27 -06:00

omega.yml

standardize map protos and fill gaps (#31120)

2024-08-17 00:23:57 -06:00

packed.yml

standardize map protos and fill gaps (#31120)

2024-08-17 00:23:57 -06:00

reach.yml

Merge remote-tracking branch 'upstream/master' into ed-13-06-2024-upstream2

2024-06-13 12:35:00 +03:00

saltern.yml

Fixing Botanist role numbers in various stations - V2 (#29581)

2024-07-21 01:23:27 -06:00

salvage.yml

anonymize salvage wrecks (#31087)

2024-08-17 15:09:21 +10:00

train.yml

standardize map protos and fill gaps (#31120)

2024-08-17 00:23:57 -06:00