tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Teleport noobs off Arrivals shuttle to spawn (#17189)

Browse Source
This commit is contained in:
Tom Leys
2023-08-22 22:46:50 +12:00
committed by GitHub
parent 4d845caa07
commit bc097c7b4d
5 changed files with 95 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Content.Server/GameTicking/GameTicker.Spawning.cs
View File

@@ -239,7 +239,16 @@ namespace Content.Server.GameTicking
// We also want this message last.
if (lateJoin && _arrivals.Enabled)
{
_chatManager.DispatchServerMessage(player, Loc.GetString("latejoin-arrivals-direction"));
var arrival = _arrivals.NextShuttleArrival();
if (arrival == null)
{
_chatManager.DispatchServerMessage(player, Loc.GetString("latejoin-arrivals-direction"));
}
else
{
_chatManager.DispatchServerMessage(player, Loc.GetString("latejoin-arrivals-direction-time",
("time", $"{arrival:mm\\:ss}")));
}
}
// We raise this event directed to the mob, but also broadcast it so game rules can do something now.