Merge branch '20-10-30-admins' into 20-11-13-merges

This commit is contained in:
Pieter-Jan Briers
2020-11-13 01:29:08 +01:00
91 changed files with 6248 additions and 325 deletions

View File

@@ -1,8 +1,10 @@
#nullable enable
using System;
using Content.Server.Administration;
using Content.Server.GameObjects.Components.Atmos;
using Content.Server.GameObjects.EntitySystems;
using Content.Server.GameObjects.EntitySystems.Atmos;
using Content.Shared.Administration;
using Content.Shared.Atmos;
using Robust.Server.Interfaces.Console;
using Robust.Server.Interfaces.Player;
@@ -15,6 +17,7 @@ using Robust.Shared.Maths;
namespace Content.Server.Atmos
{
[AdminCommand(AdminFlags.Debug)]
public class AddAtmos : IClientCommand
{
public string Command => "addatmos";