Merge branch 'master' into 20-06-24-movement-prediction
This commit is contained in:
@@ -1,6 +1,7 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using Content.Server.GameObjects;
|
||||
using Content.Shared.GameObjects.EntitySystems;
|
||||
using Robust.Server.GameObjects.Components.Container;
|
||||
using Robust.Server.GameObjects.EntitySystemMessages;
|
||||
using Robust.Shared.Interfaces.GameObjects;
|
||||
|
||||
@@ -21,7 +21,7 @@ namespace Content.Server.Interfaces.GameTicking
|
||||
void Update(FrameEventArgs frameEventArgs);
|
||||
|
||||
void RestartRound();
|
||||
void StartRound();
|
||||
void StartRound(bool force = false);
|
||||
void EndRound();
|
||||
|
||||
void Respawn(IPlayerSession targetPlayer);
|
||||
@@ -39,7 +39,16 @@ namespace Content.Server.Interfaces.GameTicking
|
||||
void RemoveGameRule(GameRule rule);
|
||||
IEnumerable<GameRule> ActiveGameRules { get; }
|
||||
|
||||
void SetStartPreset(Type type);
|
||||
void SetStartPreset(string type);
|
||||
bool TryGetPreset(string name, out Type type);
|
||||
void SetStartPreset(Type type, bool force = false);
|
||||
void SetStartPreset(string name, bool force = false);
|
||||
|
||||
/// <returns>true if changed, false otherwise</returns>
|
||||
bool PauseStart(bool pause = true);
|
||||
|
||||
/// <returns>true if paused, false otherwise</returns>
|
||||
bool TogglePause();
|
||||
|
||||
bool DelayStart(TimeSpan time);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user