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-23-06-2025-upstream-sync

Browse Source 
# Conflicts:
#	.github/workflows/check-trailing-whitespace.yml
#	Content.IntegrationTests/Tests/Access/AccessReaderTest.cs
#	Content.IntegrationTests/Tests/Chameleon/ChameleonJobLoadoutTest.cs
#	Content.IntegrationTests/Tests/GameRules/NukeOpsTest.cs
#	Content.IntegrationTests/Tests/PostMapInitTest.cs
#	Content.Server/Administration/Systems/AdminVerbSystem.Antags.cs
#	Content.Shared/Light/Components/SunShadowCycleComponent.cs
#	Resources/Prototypes/Damage/modifier_sets.yml
#	Resources/Prototypes/Maps/Pools/default.yml
This commit is contained in:
Ed
2025-06-23 16:37:22 +03:00
parent e1e32ee8fc b6bc1ab8c9
commit b581f5d132
1455 changed files with 168869 additions and 1121592 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Content.Server/Shuttles/Systems/ShuttleSystem.cs
View File

@@ -49,7 +49,6 @@ public sealed partial class ShuttleSystem : SharedShuttleSystem
[Dependency] private readonly DockingSystem _dockSystem = default!;
[Dependency] private readonly DungeonSystem _dungeon = default!;
[Dependency] private readonly EntityLookupSystem _lookup = default!;
[Dependency] private readonly FixtureSystem _fixtures = default!;
[Dependency] private readonly MapLoaderSystem _loader = default!;
[Dependency] private readonly MapSystem _mapSystem = default!;
[Dependency] private readonly MetaDataSystem _metadata = default!;