Ed 42d39a7c67 Merge remote-tracking branch 'upstream/stable' into ed-10-06-2025-upstream-sync ...

# Conflicts:
#	.github/CODEOWNERS
#	Content.IntegrationTests/Tests/Atmos/ConstantsTest.cs
#	Content.Server/Chat/Managers/ChatManager.cs
#	Content.Server/Connection/ConnectionManager.cs
#	Content.Shared/Actions/SharedActionsSystem.cs
#	Content.Shared/Lock/LockSystem.cs

2025-06-10 11:33:34 +03:00

..

Magnet

return vanilla vgroid gen

2025-05-30 14:38:35 +03:00

Themes

Merge remote-tracking branch 'upstream/stable' into ed-12-05-2025-upstream

2025-05-12 14:25:42 +03:00

biome_markers.yml

Add additional Biome Markers. (#36300)

2025-04-05 14:03:19 +02:00

biome_ore_templates_low.yml

Add additional Biome Markers. (#36300)

2025-04-05 14:03:19 +02:00

biome_ore_templates.yml

Mining Rebalance (#30920)

2024-08-16 11:43:54 +10:00

biome_templates.yml

Upstream sync (#1035)

2025-03-17 11:54:43 +03:00

dungeon_configs.yml

DungeonData rework (#37172)

2025-05-18 03:10:30 +10:00

dungeon_presets.yml

Dungeon generation refactor (#17121)

2023-06-27 19:17:42 +10:00

dungeon_room_packs.yml

Dungeon generation refactor (#17121)

2023-06-27 19:17:42 +10:00

salvage_difficulties.yml

Expeditions rework (#18960)

2023-09-19 22:52:01 +10:00

salvage_factions.yml

Localization of the Salvage Expedition Console (#30339)

2024-07-30 10:05:19 -04:00

salvage_loot.yml

Chemistry bottle cleanup (#35911)

2025-03-23 13:24:55 +01:00

salvage_misc.yml

Salvage expeditions (#12745)

2023-04-20 10:43:13 +10:00

salvage_mods.yml

Localization of the Salvage Expedition Console (#30339)

2024-07-30 10:05:19 -04:00

salvage_rewards.yml

Cargo food crate adjustments (#38006)

2025-06-03 18:01:07 +02:00

vgroid.yml

return vanilla vgroid gen

2025-05-30 14:38:35 +03:00