Merge branch 'master' into DecimalReagents
This commit is contained in:
@@ -18,6 +18,7 @@ namespace Content.Server.Interfaces.Chat
|
||||
void EntityMe(IEntity source, string action);
|
||||
|
||||
void SendOOC(IPlayerSession player, string message);
|
||||
void SendDeadChat(IPlayerSession player, string message);
|
||||
|
||||
void SendHookOOC(string sender, string message);
|
||||
}
|
||||
|
||||
@@ -2,6 +2,7 @@ using System;
|
||||
using System.Collections.Generic;
|
||||
using Content.Server.GameTicking;
|
||||
using Robust.Server.Interfaces.Player;
|
||||
using Robust.Shared.Map;
|
||||
using Robust.Shared.Timing;
|
||||
|
||||
namespace Content.Server.Interfaces.GameTicking
|
||||
@@ -27,6 +28,10 @@ namespace Content.Server.Interfaces.GameTicking
|
||||
void MakeJoinGame(IPlayerSession player);
|
||||
void ToggleReady(IPlayerSession player, bool ready);
|
||||
|
||||
GridCoordinates GetLateJoinSpawnPoint();
|
||||
GridCoordinates GetJobSpawnPoint(string jobId);
|
||||
GridCoordinates GetObserverSpawnPoint();
|
||||
|
||||
// GameRule system.
|
||||
T AddGameRule<T>() where T : GameRule, new();
|
||||
void RemoveGameRule(GameRule rule);
|
||||
|
||||
Reference in New Issue
Block a user