Ed
2367085160
Merge remote-tracking branch 'upstream/master' into ed-23-07-2024-upstream
# Conflicts:
# .github/PULL_REQUEST_TEMPLATE.md
# Content.Client/Clothing/ClientClothingSystem.cs
# Content.Client/Hands/Systems/HandsSystem.cs
# Content.IntegrationTests/Tests/PostMapInitTest.cs
# Content.Shared/Hands/Components/HandsComponent.cs
# Content.Shared/Inventory/InventoryComponent.cs
# Content.Shared/Storage/StorageComponent.cs
# Resources/Prototypes/Accents/word_replacements.yml
# Resources/Prototypes/Entities/Mobs/Player/human.yml
# Resources/Prototypes/Maps/Pools/default.yml
# Resources/Prototypes/Maps/fland.yml
# Resources/Prototypes/Maps/oasis.yml
# Resources/Prototypes/Maps/packed.yml
# Resources/Prototypes/Maps/saltern.yml
2024-07-23 12:24:42 +03:00
..
2023-08-23 16:50:49 -05:00
2024-07-15 12:58:23 +03:00
2024-06-22 22:16:08 -04:00
2020-02-04 20:42:36 +01:00
2024-07-09 23:35:31 +02:00
2024-07-23 12:24:42 +03:00
2024-05-31 00:01:22 +03:00