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

Add arrivals (#14755)

Browse Source 
* Arrivals

* More arrivals and shitty uhh preload

* cvar

* a

* clockin + maps

* shitter prevention

* Placement

* a

* cvar for tests and dev

* weh
This commit is contained in:
metalgearsloth
2023-03-22 20:29:55 +11:00
committed by GitHub
parent a26b284349
commit f3a06a0696
39 changed files with 9456 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Content.Server/Voting/Managers/VoteManager.DefaultVotes.cs
View File

@@ -199,7 +199,7 @@ namespace Content.Server.Voting.Managers
_adminLogger.Add(LogType.Vote, LogImpact.Medium, $"Map vote finished: {picked.MapName}");
var ticker = _entityManager.EntitySysManager.GetEntitySystem<GameTicker>();
if (ticker.RunLevel == GameRunLevel.PreRoundLobby)
if (ticker.CanUpdateMap())
{
if (_gameMapManager.TrySelectMapIfEligible(picked.ID))
{
@@ -208,7 +208,14 @@ namespace Content.Server.Voting.Managers
}
else
{
_chatManager.DispatchServerAnnouncement(Loc.GetString("ui-vote-map-notlobby"));
if (ticker.RoundPreloadTime <= TimeSpan.Zero)
{
_chatManager.DispatchServerAnnouncement(Loc.GetString("ui-vote-map-notlobby"));
}
else
{
_chatManager.DispatchServerAnnouncement(Loc.GetString("ui-vote-map-notlobby-time"));
}
}
};
}