crystall-punk-14

Files

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

DungeonJob

Merge remote-tracking branch 'upstream/stable' into ed-11-12-2024-upstream

2024-12-11 14:49:02 +03:00

DungeonAtlasTemplateComponent.cs

Refactor serialization copying to use source generators (#19412 )

2023-08-22 18:14:33 -07:00

DungeonSystem.Commands.cs

Replace obsolete Tile Access methods (#32508 )

2024-09-29 01:27:47 +02:00

DungeonSystem.cs

Demiplan polishing 2 (#528 )