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

Turns GameTicker into an EntitySystem. (#4197)

Browse Source 
* GameTicker turned into an EntitySystem

* Turns ClientGameTicker into an EntitySystem, turn NetMessages into events

* Change event names to be more consistent with the rest.

* YAML linter uses the dummy gameticker CVar override.

* Fix game ticker initialization order

* Dummy ticker won't spawn players.

* Fix character creation test
This commit is contained in:
Vera Aguilera Puerto
2021-06-20 10:09:24 +02:00
committed by GitHub
parent 15fb554c28
commit d3a611164b
81 changed files with 1711 additions and 1990 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,9 +1,11 @@
#nullable enable
using System;
using System.Collections.Generic;
using Content.Server.GameTicking;
using Content.Shared;
using Content.Shared.CCVar;
using Robust.Server.Player;
using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
using Robust.Shared.Localization;
using Robust.Shared.Random;
@@ -46,7 +48,7 @@ namespace Content.Server.Voting.Managers
if (votesYes / (float) total >= ratioRequired)
{
_chatManager.DispatchServerAnnouncement(Loc.GetString("ui-vote-restart-succeeded"));
_ticker.RestartRound();
EntitySystem.Get<GameTicker>().RestartRound();
}
else
{
@@ -109,7 +111,7 @@ namespace Content.Server.Voting.Managers
Loc.GetString("ui-vote-gamemode-win", ("winner", Loc.GetString(presets[picked]))));
}
_ticker.SetStartPreset(picked);
EntitySystem.Get<GameTicker>().SetStartPreset(picked);
};
}
}