Ed 7328f3449c Merge remote-tracking branch 'upstream/master' into ed-16-02-2025-planet-light-upstream ...

# Conflicts:
#	Content.IntegrationTests/Tests/EntityTest.cs
#	Content.IntegrationTests/Tests/PostMapInitTest.cs
#	Content.Server/Medical/HealthAnalyzerSystem.cs
#	Content.Server/Procedural/DungeonSystem.Rooms.cs
#	Content.Server/Procedural/RoomFillComponent.cs
#	Content.Server/Procedural/RoomFillSystem.cs
#	Content.Shared/Inventory/InventorySystem.Relay.cs
#	Content.Shared/Projectiles/SharedProjectileSystem.cs
#	Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs
#	Resources/Prototypes/Maps/Pools/default.yml
#	Resources/migration.yml

2025-02-16 11:58:47 +03:00

..

Magnet

Demiplan modifiers (#526)

2024-11-01 18:08:57 +03:00

Themes

Merge remote-tracking branch 'upstream/master' into ed-16-02-2025-planet-light-upstream

2025-02-16 11:58:47 +03:00

biome_markers.yml

Gateway destinations (#21040)

2023-11-14 19:23:40 -07:00

biome_ore_templates.yml

Mining Rebalance (#30920)

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

biome_templates.yml

Add planet lighting (#32522)

2025-02-16 19:35:32 +11:00

dungeon_configs.yml

Merge remote-tracking branch 'upstream/staging' into ed-22-12-2024-upstream

2024-12-22 15:48:30 +03: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

Mining Rebalance (#30920)

2024-08-16 11:43:54 +10: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

Remove vehicles (#24681)

2024-02-01 11:33:10 +11:00

vgroid.yml

Demiplan modifiers (#526)

2024-11-01 18:08:57 +03:00