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

Browse Source 
# Conflicts:
#	.github/CODEOWNERS
#	Content.IntegrationTests/Tests/Atmos/ConstantsTest.cs
#	Content.Server/Chat/Managers/ChatManager.cs
#	Content.Server/Connection/ConnectionManager.cs
#	Content.Shared/Actions/SharedActionsSystem.cs
#	Content.Shared/Lock/LockSystem.cs
This commit is contained in:
Ed
2025-06-10 11:33:34 +03:00
parent a51f579591 d4c4606cf4
commit 42d39a7c67
1246 changed files with 48618 additions and 34899 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs
View File

@@ -563,7 +563,7 @@ public sealed partial class ShuttleSystem
comp.State = FTLState.Cooldown;
comp.StateTime = StartEndTime.FromCurTime(_gameTiming, FTLCooldown);
_console.RefreshShuttleConsoles(uid);
_mapManager.SetMapPaused(mapId, false);
_mapSystem.SetPaused(mapId, false);
Smimsh(uid, xform: xform);
var ftlEvent = new FTLCompletedEvent(uid, _mapSystem.GetMap(mapId));