Merge branch 'master' into reenable-clown-stuff

.envrc

@@ -1,4 +1,4 @@
-if ! has nix_direnv_version || ! nix_direnv_version 3.0.4; then
-    source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/3.0.4/direnvrc" "sha256-DzlYZ33mWF/Gs8DDeyjr8mnVmQGx7ASYqA5WlxwvBG4="
+if ! has nix_direnv_version || ! nix_direnv_version 3.0.6; then
+  source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/3.0.6/direnvrc" "sha256-RYcUJaRMf8oF5LznDrlCXbkOQrywm0HDv1VjYGaJGdM="
 fi
-use flake
+use nix

Content.Client/Emoting/AnimatedEmotesSystem.cs

@@ -0,0 +1,121 @@
+using Robust.Client.Animations;
+using Robust.Shared.Animations;
+using Robust.Shared.GameStates;
+using Robust.Client.GameObjects;
+using Content.Shared.Emoting;
+using System.Numerics;
+using Robust.Shared.Prototypes;
+using Content.Shared.Chat.Prototypes;
+
+namespace Content.Client.Emoting;
+
+public sealed partial class AnimatedEmotesSystem : SharedAnimatedEmotesSystem
+{
+    [Dependency] private readonly AnimationPlayerSystem _anim = default!;
+    [Dependency] private readonly IPrototypeManager _prot = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<AnimatedEmotesComponent, ComponentHandleState>(OnHandleState);
+
+        SubscribeLocalEvent<AnimatedEmotesComponent, AnimationFlipEmoteEvent>(OnFlip);
+        SubscribeLocalEvent<AnimatedEmotesComponent, AnimationSpinEmoteEvent>(OnSpin);
+        SubscribeLocalEvent<AnimatedEmotesComponent, AnimationJumpEmoteEvent>(OnJump);
+    }
+
+    public void PlayEmote(EntityUid uid, Animation anim, string animationKey = "emoteAnimKeyId")
+    {
+        if (_anim.HasRunningAnimation(uid, animationKey))
+            return;
+
+        _anim.Play(uid, anim, animationKey);
+    }
+
+    private void OnHandleState(EntityUid uid, AnimatedEmotesComponent component, ref ComponentHandleState args)
+    {
+        if (args.Current is not AnimatedEmotesComponentState state
+        || !_prot.TryIndex<EmotePrototype>(state.Emote, out var emote))
+            return;
+
+        if (emote.Event != null)
+            RaiseLocalEvent(uid, emote.Event);
+    }
+
+    private void OnFlip(Entity<AnimatedEmotesComponent> ent, ref AnimationFlipEmoteEvent args)
+    {
+        var a = new Animation
+        {
+            Length = TimeSpan.FromMilliseconds(500),
+            AnimationTracks =
+            {
+                new AnimationTrackComponentProperty
+                {
+                    ComponentType = typeof(SpriteComponent),
+                    Property = nameof(SpriteComponent.Rotation),
+                    InterpolationMode = AnimationInterpolationMode.Linear,
+                    KeyFrames =
+                    {
+                        new AnimationTrackProperty.KeyFrame(Angle.Zero, 0f),
+                        new AnimationTrackProperty.KeyFrame(Angle.FromDegrees(180), 0.25f),
+                        new AnimationTrackProperty.KeyFrame(Angle.FromDegrees(360), 0.25f),
+                    }
+                }
+            }
+        };
+        PlayEmote(ent, a);
+    }
+    private void OnSpin(Entity<AnimatedEmotesComponent> ent, ref AnimationSpinEmoteEvent args)
+    {
+        var a = new Animation
+        {
+            Length = TimeSpan.FromMilliseconds(600),
+            AnimationTracks =
+            {
+                new AnimationTrackComponentProperty
+                {
+                    ComponentType = typeof(TransformComponent),
+                    Property = nameof(TransformComponent.LocalRotation),
+                    InterpolationMode = AnimationInterpolationMode.Linear,
+                    KeyFrames =
+                    {
+                        new AnimationTrackProperty.KeyFrame(Angle.FromDegrees(0), 0f),
+                        new AnimationTrackProperty.KeyFrame(Angle.FromDegrees(90), 0.075f),
+                        new AnimationTrackProperty.KeyFrame(Angle.FromDegrees(180), 0.075f),
+                        new AnimationTrackProperty.KeyFrame(Angle.FromDegrees(270), 0.075f),
+                        new AnimationTrackProperty.KeyFrame(Angle.Zero, 0.075f),
+                        new AnimationTrackProperty.KeyFrame(Angle.FromDegrees(90), 0.075f),
+                        new AnimationTrackProperty.KeyFrame(Angle.FromDegrees(180), 0.075f),
+                        new AnimationTrackProperty.KeyFrame(Angle.FromDegrees(270), 0.075f),
+                        new AnimationTrackProperty.KeyFrame(Angle.Zero, 0.075f),
+                    }
+                }
+            }
+        };
+        PlayEmote(ent, a, "emoteAnimSpin");
+    }
+    private void OnJump(Entity<AnimatedEmotesComponent> ent, ref AnimationJumpEmoteEvent args)
+    {
+        var a = new Animation
+        {
+            Length = TimeSpan.FromMilliseconds(250),
+            AnimationTracks =
+            {
+                new AnimationTrackComponentProperty
+                {
+                    ComponentType = typeof(SpriteComponent),
+                    Property = nameof(SpriteComponent.Offset),
+                    InterpolationMode = AnimationInterpolationMode.Cubic,
+                    KeyFrames =
+                    {
+                        new AnimationTrackProperty.KeyFrame(Vector2.Zero, 0f),
+                        new AnimationTrackProperty.KeyFrame(new Vector2(0, .35f), 0.125f),
+                        new AnimationTrackProperty.KeyFrame(Vector2.Zero, 0.125f),
+                    }
+                }
+            }
+        };
+        PlayEmote(ent, a);
+    }
+}

Content.Server/Chat/Systems/ChatSystem.Emote.cs

@@ -176,7 +176,7 @@ private void TryEmoteChatInput(EntityUid uid, string textInput)
     private void InvokeEmoteEvent(EntityUid uid, EmotePrototype proto)
     {
         var ev = new EmoteEvent(proto);
-        RaiseLocalEvent(uid, ref ev);
+        RaiseLocalEvent(uid, ref ev, true); // goob edit
     }
 }
 

Content.Server/Emoting/AnimatedEmotesSystem.cs

@@ -0,0 +1,28 @@
+using Robust.Shared.GameStates;
+using Content.Server.Chat.Systems;
+using Content.Shared.Chat.Prototypes;
+using Content.Shared.Emoting;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.Emoting;
+
+public sealed partial class AnimatedEmotesSystem : SharedAnimatedEmotesSystem
+{
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<AnimatedEmotesComponent, EmoteEvent>(OnEmote);
+    }
+
+    private void OnEmote(EntityUid uid, AnimatedEmotesComponent component, ref EmoteEvent args)
+    {
+        PlayEmoteAnimation(uid, component, args.Emote.ID);
+    }
+
+    public void PlayEmoteAnimation(EntityUid uid, AnimatedEmotesComponent component, ProtoId<EmotePrototype> prot)
+    {
+        component.Emote = prot;
+        Dirty(uid, component);
+    }
+}

Content.Shared/Chat/Prototypes/EmotePrototype.cs

@@ -68,6 +68,10 @@ public sealed partial class EmotePrototype : IPrototype
     /// </summary>
     [DataField]
     public HashSet<string> ChatTriggers = new();
+
+    // goob edit - animations
+    [DataField]
+    public object? Event = null;
 }
 
 /// <summary>

Content.Shared/Customization/Systems/CharacterRequirements.Misc.cs

@@ -0,0 +1,55 @@
+using Content.Shared.Customization.Systems;
+using Content.Shared.Preferences;
+using Content.Shared.Roles;
+using JetBrains.Annotations;
+using Robust.Shared.Configuration;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.Customization.Systems;
+
+/// <summary>
+///     Requires the server to have a specific CVar value. 
+/// </summary>
+[UsedImplicitly, Serializable, NetSerializable,]
+public sealed partial class CVarRequirement : CharacterRequirement
+{
+    [DataField("cvar", required: true)]
+    public string CVar;
+
+    [DataField(required: true)]
+    public string RequiredValue;
+
+    public override bool IsValid(
+        JobPrototype job,
+        HumanoidCharacterProfile profile,
+        Dictionary<string, TimeSpan> playTimes,
+        bool whitelisted,
+        IPrototype prototype,
+        IEntityManager entityManager,
+        IPrototypeManager prototypeManager,
+        IConfigurationManager configManager,
+        out string? reason,
+        int depth = 0
+    )
+    {
+        if (!configManager.IsCVarRegistered(CVar))
+        {
+            reason = null;
+            return true;
+        }
+
+        const string color = "lightblue";
+        var cvar = configManager.GetCVar(CVar);
+        var isValid = cvar.ToString()! == RequiredValue;
+
+        reason = Loc.GetString(
+            "character-cvar-requirement",
+            ("inverted", Inverted),
+            ("color", color),
+            ("cvar", CVar),
+            ("value", RequiredValue));
+
+        return isValid;
+    }
+}