Merge branch 'master' into expl_int_analyzer

This commit is contained in:
Pieter-Jan Briers
2021-02-08 22:46:28 +01:00
140 changed files with 3622 additions and 1208 deletions

View File

@@ -0,0 +1,33 @@
using Content.Shared.GameObjects.EntitySystems.ActionBlocker;
using Robust.Shared.GameObjects;
using Robust.Shared.Serialization;
namespace Content.Shared.GameObjects.Components.Mobs.Speech
{
[RegisterComponent]
public class SharedEmotingComponent : Component, IActionBlocker
{
private bool _enabled = true;
public override string Name => "Emoting";
public bool Enabled
{
get => _enabled;
set
{
if (_enabled == value) return;
_enabled = value;
Dirty();
}
}
bool IActionBlocker.CanEmote() => Enabled;
public override void ExposeData(ObjectSerializer serializer)
{
base.ExposeData(serializer);
serializer.DataField(this, x => x.Enabled, "enabled", true);
}
}
}

View File

@@ -0,0 +1,36 @@
using Content.Shared.GameObjects.EntitySystems.ActionBlocker;
using Robust.Shared.GameObjects;
using Robust.Shared.Serialization;
namespace Content.Shared.GameObjects.Components.Mobs.Speech
{
/// <summary>
/// Component required for entities to be able to speak.
/// </summary>
[RegisterComponent]
public class SharedSpeechComponent : Component, IActionBlocker
{
private bool _enabled = true;
public override string Name => "Speech";
public bool Enabled
{
get => _enabled;
set
{
if (_enabled == value) return;
_enabled = value;
Dirty();
}
}
bool IActionBlocker.CanSpeak() => Enabled;
public override void ExposeData(ObjectSerializer serializer)
{
base.ExposeData(serializer);
serializer.DataField(this, x => x.Enabled, "enabled", true);
}
}
}