Merge remote-tracking branch 'upstream/stable' into ed-06-02-2025-upstream-sync-fix

Browse Source

# Conflicts:
#	Content.IntegrationTests/Tests/PostMapInitTest.cs
#	Content.Shared/Wieldable/Components/IncreaseDamageOnWieldComponent.cs
#	Resources/Maps/Test/dev_map.yml
#	Resources/Prototypes/Maps/Pools/default.yml

...

This commit is contained in:

Ed

2025-02-06 14:38:00 +03:00

parent f83505cfba 6824ab4292

commit 5c391b753f

1 changed files with 3108 additions and 683 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

3791

Resources/Maps/Test/dev_map.yml

File diff suppressed because it is too large Load Diff