Merge branch 'master' into buckle-locker-fix-1262

This commit is contained in:
DrSmugleaf
2020-07-08 15:35:20 +02:00
121 changed files with 1116 additions and 772 deletions

View File

@@ -18,6 +18,7 @@ namespace Content.Server.Interfaces.Chat
void EntityMe(IEntity source, string action);
void SendOOC(IPlayerSession player, string message);
void SendAdminChat(IPlayerSession player, string message);
void SendDeadChat(IPlayerSession player, string message);
void SendHookOOC(string sender, string message);

View File

@@ -1,9 +1,8 @@
#nullable enable
using System;
using Content.Server.GameObjects.Components.Access;
using System.Collections.Generic;
#nullable enable
namespace Content.Server.Interfaces
{
/// <summary>