Port stethoscopes + innate verbs from nyano (#8228)
* port stethoscopes from nyanotrasen * remove mono crash wtf * don't touch puddle * Switch to using action * both verb and action * Address reviews
This commit is contained in:
@@ -102,6 +102,13 @@ namespace Content.Shared.Verbs
|
||||
verbs.UnionWith(verbEvent.Verbs);
|
||||
}
|
||||
|
||||
if (types.Contains(typeof(InnateVerb)))
|
||||
{
|
||||
var verbEvent = new GetVerbsEvent<InnateVerb>(user, target, @using, hands, canInteract, canAccess);
|
||||
RaiseLocalEvent(user, verbEvent);
|
||||
verbs.UnionWith(verbEvent.Verbs);
|
||||
}
|
||||
|
||||
if (types.Contains(typeof(AlternativeVerb)))
|
||||
{
|
||||
var verbEvent = new GetVerbsEvent<AlternativeVerb>(user, target, @using, hands, canInteract, canAccess);
|
||||
|
||||
@@ -215,6 +215,7 @@ namespace Content.Shared.Verbs
|
||||
{ typeof(Verb) },
|
||||
{ typeof(InteractionVerb) },
|
||||
{ typeof(UtilityVerb) },
|
||||
{ typeof(InnateVerb)},
|
||||
{ typeof(AlternativeVerb) },
|
||||
{ typeof(ActivationVerb) },
|
||||
{ typeof(ExamineVerb) }
|
||||
@@ -262,6 +263,24 @@ namespace Content.Shared.Verbs
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// This is for verbs facilitated by components on the user.
|
||||
/// Verbs from clothing, species, etc. rather than a held item.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Add a component to the user's entity and sub to the get verbs event
|
||||
/// and it'll appear in the verbs menu on any target.
|
||||
/// </summary>
|
||||
[Serializable, NetSerializable]
|
||||
public sealed class InnateVerb : Verb
|
||||
{
|
||||
public override int TypePriority => 3;
|
||||
public InnateVerb() : base()
|
||||
{
|
||||
TextStyleClass = InteractionVerb.DefaultTextStyleClass;
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Verbs for alternative-interactions.
|
||||
/// </summary>
|
||||
|
||||
Reference in New Issue
Block a user