Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Pieter-Jan Briers
2020-11-13 01:29:08 +01:00
parent 9e36ef2202 f8f177f43a
commit 5ff8aa7fb1
91 changed files with 6248 additions and 325 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Content.Server/GameObjects/Components/Body/BodyCommands.cs
View File

@@ -1,6 +1,8 @@
#nullable enable
using System;
using System.Linq;
using Content.Server.Administration;
using Content.Shared.Administration;
using Content.Shared.Damage;
using Content.Shared.GameObjects.Components.Body;
using Content.Shared.GameObjects.Components.Body.Part;
@@ -16,6 +18,7 @@ using Robust.Shared.Random;
namespace Content.Server.GameObjects.Components.Body
{
[AdminCommand(AdminFlags.Fun)]
class AddHandCommand : IClientCommand
{
public const string DefaultHandPrototype = "LeftHandHuman";
@@ -149,6 +152,7 @@ namespace Content.Server.GameObjects.Components.Body
}
}
[AdminCommand(AdminFlags.Fun)]
class RemoveHandCommand : IClientCommand
{
public string Command => "removehand";
@@ -190,6 +194,7 @@ namespace Content.Server.GameObjects.Components.Body
}
}
[AdminCommand(AdminFlags.Fun)]
class DestroyMechanismCommand : IClientCommand
{
public string Command => "destroymechanism";
@@ -242,6 +247,7 @@ namespace Content.Server.GameObjects.Components.Body
}
}
[AdminCommand(AdminFlags.Fun)]
class HurtCommand : IClientCommand
{
public string Command => "hurt";

5
Content.Server/GameObjects/Components/Damage/DamageCommands.cs
View File

@@ -1,7 +1,9 @@
#nullable enable
using System;
using System.Diagnostics.CodeAnalysis;
using Content.Server.Administration;
using Content.Server.GameObjects.Components.Atmos;
using Content.Shared.Administration;
using Content.Shared.GameObjects.Components.Damage;
using Robust.Server.Interfaces.Console;
using Robust.Server.Interfaces.Player;
@@ -115,6 +117,7 @@ namespace Content.Server.GameObjects.Components.Damage
}
}
[AdminCommand(AdminFlags.Fun)]
public class AddDamageFlagCommand : DamageFlagCommand
{
public override string Command => "adddamageflag";
@@ -133,6 +136,7 @@ namespace Content.Server.GameObjects.Components.Damage
}
}
[AdminCommand(AdminFlags.Fun)]
public class RemoveDamageFlagCommand : DamageFlagCommand
{
public override string Command => "removedamageflag";
@@ -151,6 +155,7 @@ namespace Content.Server.GameObjects.Components.Damage
}
}
[AdminCommand(AdminFlags.Admin)]
public class GodModeCommand : IClientCommand
{
public string Command => "godmode";

3
Content.Server/GameObjects/Components/Disposal/DisposalCommands.cs
View File

@@ -1,4 +1,6 @@
#nullable enable
using Content.Server.Administration;
using Content.Shared.Administration;
using Robust.Server.Interfaces.Console;
using Robust.Server.Interfaces.Player;
using Robust.Shared.GameObjects;
@@ -8,6 +10,7 @@ using Robust.Shared.Localization;
namespace Content.Server.GameObjects.Components.Disposal
{
[AdminCommand(AdminFlags.Debug)]
public class TubeConnectionsCommand : IClientCommand
{
public string Command => "tubeconnections";

8
Content.Server/GameObjects/Components/Interactable/ToolCommands.cs
View File

@@ -1,5 +1,7 @@
#nullable enable
using System.Linq;
using Content.Server.Administration;
using Content.Shared.Administration;
using Content.Shared.Maps;
using JetBrains.Annotations;
using Robust.Server.Interfaces.Console;
@@ -14,7 +16,7 @@ namespace Content.Server.GameObjects.Components.Interactable
/// <summary>
/// <see cref="TilePryingComponent.TryPryTile"/>
/// </summary>
[UsedImplicitly]
[AdminCommand(AdminFlags.Debug)]
class TilePryCommand : IClientCommand
{
public string Command => "tilepry";
@@ -69,7 +71,7 @@ namespace Content.Server.GameObjects.Components.Interactable
}
}
[UsedImplicitly]
[AdminCommand(AdminFlags.Debug)]
class AnchorCommand : IClientCommand
{
public string Command => "anchor";
@@ -114,7 +116,7 @@ namespace Content.Server.GameObjects.Components.Interactable
}
}
[UsedImplicitly]
[AdminCommand(AdminFlags.Debug)]
class UnAnchorCommand : IClientCommand
{
public string Command => "unanchor";

4
Content.Server/GameObjects/Components/Mobs/ServerAlertsComponent.cs
View File

@@ -1,6 +1,8 @@
using System;
using Content.Server.Administration;
using Content.Server.Commands;
using Content.Server.GameObjects.EntitySystems;
using Content.Shared.Administration;
using Content.Shared.Alert;
using Content.Shared.GameObjects.Components.Mobs;
using Robust.Server.Interfaces.Console;
@@ -88,6 +90,7 @@ namespace Content.Server.GameObjects.Components.Mobs
}
}
[AdminCommand(AdminFlags.Debug)]
public sealed class ShowAlert : IClientCommand
{
public string Command => "showalert";
@@ -129,6 +132,7 @@ namespace Content.Server.GameObjects.Components.Mobs
}
}
[AdminCommand(AdminFlags.Debug)]
public sealed class ClearAlert : IClientCommand
{
public string Command => "clearalert";

9
Content.Server/GameObjects/Components/Mobs/Speech/SpeechComponent.cs
View File

@@ -1,5 +1,7 @@
using System;
using System.Linq;
using Content.Server.Administration;
using Content.Shared.Administration;
using Robust.Server.Interfaces.Console;
using Robust.Server.Interfaces.Player;
using Robust.Shared.Interfaces.GameObjects;
@@ -17,6 +19,7 @@ namespace Content.Server.GameObjects.Components.Mobs.Speech
public string Accentuate(string message);
}
[AdminCommand(AdminFlags.Fun)]
public class AddAccent : IClientCommand
{
public string Command => "addaccent";
@@ -38,12 +41,12 @@ namespace Content.Server.GameObjects.Components.Mobs.Speech
shell.SendText(player, "You don't have a player!");
return;
}
var compFactory = IoCManager.Resolve<IComponentFactory>();
if (args[0] == "?")
{
// Get all components that implement the ISpeechComponent except
// Get all components that implement the ISpeechComponent except
var speeches = compFactory.GetAllRefTypes()
.Where(c => typeof(IAccentComponent).IsAssignableFrom(c) && c.IsClass);
var msg = "";