Merge branch 'master' into slimecats

.github/workflows/build-test-debug-win.yml

@@ -0,0 +1,63 @@
+name: Build & Test Debug Windows
+
+on:
+  # push:
+    # branches: [ master, staging, trying ]
+  # merge_group:
+  # pull_request:
+    # types: [ opened, reopened, synchronize, ready_for_review ]
+    # branches: [ master ]
+  workflow_dispatch: # ручной запуск
+
+jobs:
+  build:
+    if: github.actor != 'IanComradeBot' && github.event.pull_request.draft == false
+    strategy:
+      matrix:
+        os: [ windows-latest ]
+
+    runs-on: ${{ matrix.os }}
+
+    steps:
+      - name: Checkout Master
+        uses: actions/[email protected]
+
+      - name: Setup Submodule
+        run: |
+          git submodule update --init --recursive
+
+      - name: Pull engine updates
+        uses: space-wizards/[email protected]
+
+      - name: Update Engine Submodules
+        run: |
+          cd RobustToolbox/
+          git submodule update --init --recursive
+
+      - name: Setup .NET Core
+        uses: actions/[email protected]
+        with:
+          dotnet-version: 8.0.x
+
+      - name: Install dependencies
+        run: dotnet restore
+
+      - name: Build Project
+        run: dotnet build --configuration DebugOpt --no-restore /p:WarningsAsErrors=nullable /m
+
+      - name: Run Content.Tests
+        run: dotnet test --no-build --configuration DebugOpt Content.Tests/Content.Tests.csproj -- NUnit.ConsoleOut=0
+
+      - name: Run Content.IntegrationTests
+        shell: pwsh
+        run: |
+          $env:DOTNET_gcServer=1
+          dotnet test --no-build --configuration DebugOpt Content.IntegrationTests/Content.IntegrationTests.csproj -- NUnit.ConsoleOut=0 NUnit.MapWarningTo=Failed
+  ci-success:
+    name: Build & Test Debug
+    needs:
+      - build
+    runs-on: windows-latest
+    steps:
+      - name: CI succeeded
+        run: exit 0

.github/workflows/build-test-debug.yml

@@ -1,4 +1,4 @@
-name: Build & Test Debug
+name: Build & Test Debug Linux # ADT-Tweak
 
 on:
   push:

.github/workflows/labeler-needsreview.yml

@@ -10,7 +10,7 @@ jobs:
     steps:
     - uses: actions-ecosystem/action-add-labels@v1
       with:
-        labels: "S: Needs Review"
+        labels: "Status: Needs Review"
     - uses: actions-ecosystem/action-remove-labels@v1
       with:
-        labels: "S: Awaiting Changes"
+        labels: "Status: Awaiting Changes"

Content.Client/ADT/Animations/FlipOnHitSystem.cs

@@ -0,0 +1,76 @@
+using Robust.Client.Animations;
+using Robust.Client.GameObjects;
+using Robust.Shared.Animations;
+using Robust.Shared.Timing;
+using Content.Shared.Animations;
+
+namespace Content.Client.Animations;
+
+public sealed class FlipOnHitSystem : SharedFlipOnHitSystem
+{
+    [Dependency] private readonly AnimationPlayerSystem _animationSystem = default!;
+    [Dependency] private readonly IGameTiming _timing = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<FlippingComponent, AnimationCompletedEvent>(OnAnimationComplete);
+        SubscribeAllEvent<FlipOnHitEvent>(ev => PlayAnimation(GetEntity(ev.User)));
+    }
+
+    private void OnAnimationComplete(Entity<FlippingComponent> ent, ref AnimationCompletedEvent args)
+    {
+        if (args.Key != FlippingComponent.AnimationKey)
+            return;
+
+        PlayAnimation(ent);
+    }
+
+    protected override void PlayAnimation(EntityUid user)
+    {
+        if (!_timing.IsFirstTimePredicted)
+            return;
+
+        if (TerminatingOrDeleted(user))
+            return;
+
+        if (_animationSystem.HasRunningAnimation(user, FlippingComponent.AnimationKey))
+        {
+            EnsureComp<FlippingComponent>(user);
+            return;
+        }
+
+        RemComp<FlippingComponent>(user);
+
+        var baseAngle = Angle.Zero;
+        if (EntityManager.TryGetComponent(user, out SpriteComponent? sprite))
+            baseAngle = sprite.Rotation;
+
+        var degrees = baseAngle.Degrees;
+
+        var animation = new Animation
+        {
+            Length = TimeSpan.FromMilliseconds(500),
+            AnimationTracks =
+            {
+                new AnimationTrackComponentProperty
+                {
+                    ComponentType = typeof(SpriteComponent),
+                    Property = nameof(SpriteComponent.Rotation),
+                    InterpolationMode = AnimationInterpolationMode.Linear,
+                    KeyFrames =
+                    {
+                        new AnimationTrackProperty.KeyFrame(Angle.FromDegrees(baseAngle.Degrees), 0f),
+                        new AnimationTrackProperty.KeyFrame(Angle.FromDegrees(baseAngle.Degrees + 180), 0.25f),
+                        new AnimationTrackProperty.KeyFrame(Angle.FromDegrees(baseAngle.Degrees + 360), 0.25f),
+                        new AnimationTrackProperty.KeyFrame(Angle.FromDegrees(baseAngle.Degrees), 0f),
+                    }
+                }
+            }
+        };
+
+
+        _animationSystem.Play(user, animation, FlippingComponent.AnimationKey);
+    }
+}

Content.Client/ADT/Animations/FlippingComponent.cs

@@ -0,0 +1,7 @@
+namespace Content.Client.Animations;
+
+[RegisterComponent]
+public sealed partial class FlippingComponent : Component
+{
+    public const string AnimationKey = "flip";
+}

Content.Client/ADT/BookPrinter/BookPrinterBoundUserInterface.cs

@@ -1,3 +1,5 @@
+// Оригинал данного файла был сделан @temporaldarkness (discord). Код был взят с https://github.com/ss14-ganimed/ENT14-Master.
+
 using Content.Shared.ADT.BookPrinter;
 using Content.Shared.Containers.ItemSlots;
 using JetBrains.Annotations;

Content.Client/ADT/BookPrinter/BookPrinterWindow.xaml

@@ -1,3 +1,5 @@
+<!-- Оригинал данного файла был сделан @temporaldarkness (discord). Код был взят с https://github.com/ss14-ganimed/ENT14-Master. -->
+
 <DefaultWindow
             xmlns="https://spacestation14.io"
             xmlns:gfx="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"

Content.Client/ADT/BookPrinter/BookTerminalWindow.xaml.cs

@@ -1,3 +1,5 @@
+// Оригинал данного файла был сделан @temporaldarkness (discord). Код был взят с https://github.com/ss14-ganimed/ENT14-Master.
+
 using System.Linq;
 using System.Numerics;
 using Content.Client.Stylesheets;

Content.Client/ADT/BookPrinter/Visualizers/BookPrinterlVisualizerSystem.cs

@@ -1,3 +1,5 @@
+// Оригинал данного файла был сделан @temporaldarkness (discord). Код был взят с https://github.com/ss14-ganimed/ENT14-Master.
+
 using Content.Shared.ADT.BookPrinter.Components;
 using Content.Shared.Containers.ItemSlots;
 using Robust.Client.GameObjects;

Content.Client/ADT/Heretic/Ritual.CustomBehaviors.cs

@@ -8,6 +8,7 @@ namespace Content.Client.Heretic;
 // - john
 
 public sealed partial class RitualAshAscendBehavior : RitualSacrificeBehavior { }
+public sealed partial class RitualBladeAscendBehavior : RitualSacrificeBehavior { }
 public sealed partial class RitualMuteGhoulifyBehavior : RitualSacrificeBehavior { }
 
 [Virtual] public partial class RitualSacrificeBehavior : RitualCustomBehavior