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

Merge remote-tracking branch 'upstream/master' into ed-29-08-2024

Browse Source 
# Conflicts:
#	Content.Server/Station/Systems/StationSpawningSystem.cs
#	Resources/Prototypes/Maps/reach.yml
This commit is contained in:
Ed
2024-08-29 14:32:09 +03:00
parent e02a9951a7 f0615ec3c8
commit ca656b3c10
798 changed files with 60310 additions and 25524 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -50,7 +50,6 @@ public sealed partial class ShuttleSystem : SharedShuttleSystem
[Dependency] private readonly MetaDataSystem _metadata = default!;
[Dependency] private readonly PvsOverrideSystem _pvs = default!;
[Dependency] private readonly SharedAudioSystem _audio = default!;
[Dependency] private readonly SharedMapSystem _maps = default!;
[Dependency] private readonly SharedPhysicsSystem _physics = default!;
[Dependency] private readonly SharedTransformSystem _transform = default!;
[Dependency] private readonly ShuttleConsoleSystem _console = default!;