juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/stable' into ed-08-07-2025-upstream

Browse Source 
# Conflicts:
#	Content.Server/Audio/ContentAudioSystem.cs
#	Content.Server/Medical/HealthAnalyzerSystem.cs
#	Content.Server/Shuttles/Systems/ShuttleSystem.cs
#	Resources/Locale/en-US/navmap-beacons/station-beacons.ftl
This commit is contained in:
Ed
2025-07-08 00:40:30 +03:00
parent e7b73354ab 2181585030
commit 7a8326d41e
920 changed files with 19950 additions and 9262 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Content.Server/Procedural/DungeonSystem.cs
View File

@@ -36,6 +36,7 @@ public sealed partial class DungeonSystem : SharedDungeonSystem
[Dependency] private readonly DecalSystem _decals = default!;
[Dependency] private readonly EntityLookupSystem _lookup = default!;
[Dependency] private readonly TileSystem _tile = default!;
[Dependency] private readonly TurfSystem _turf = default!;
[Dependency] private readonly MapLoaderSystem _loader = default!;
[Dependency] private readonly SharedMapSystem _maps = default!;
[Dependency] private readonly SharedTransformSystem _transform = default!;
@@ -212,6 +213,7 @@ public sealed partial class DungeonSystem : SharedDungeonSystem
this,
_lookup,
_tile,
_turf,
_transform,
gen,
grid,
@@ -244,6 +246,7 @@ public sealed partial class DungeonSystem : SharedDungeonSystem
this,
_lookup,
_tile,
_turf,
_transform,
gen,
grid,