Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Nukie win conditions (#10220)

Browse Source 
Co-authored-by: Kara <lunarautomaton6@gmail.com>
This commit is contained in:
Flipp Syder
2022-09-13 19:42:19 -07:00
committed by GitHub
parent 053c70d8d5
commit ffbd0085bc
5 changed files with 334 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Content.Server/Shuttles/Systems/ShuttleSystem.EmergencyConsole.cs
View File

@@ -136,24 +136,24 @@ public sealed partial class ShuttleSystem
{
_launchedShuttles = true;
if (_centComMap != null)
if (CentComMap != null)
{
foreach (var comp in EntityQuery<StationDataComponent>(true))
{
if (!TryComp<ShuttleComponent>(comp.EmergencyShuttle, out var shuttle)) continue;
if (Deleted(_centCom))
if (Deleted(CentCom))
{
// TODO: Need to get non-overlapping positions.
FTLTravel(shuttle,
new EntityCoordinates(
_mapManager.GetMapEntityId(_centComMap.Value),
_mapManager.GetMapEntityId(CentComMap.Value),
Vector2.One * 1000f), _consoleAccumulator, TransitTime);
}
else
{
FTLTravel(shuttle,
_centCom.Value, _consoleAccumulator, TransitTime, dock: true);
CentCom.Value, _consoleAccumulator, TransitTime, dock: true);
}
}
}
@@ -169,8 +169,8 @@ public sealed partial class ShuttleSystem
Timer.Spawn((int) (TransitTime * 1000) + _bufferTime.Milliseconds, () => _roundEnd.EndRound(), _roundEndCancelToken.Token);
// Guarantees that emergency shuttle arrives first before anyone else can FTL.
if (_centCom != null)
AddFTLDestination(_centCom.Value, true);
if (CentCom != null)
AddFTLDestination(CentCom.Value, true);
}
}