]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Fix dead mob sprites rotating on death (#16317)
authorthemias <89101928+themias@users.noreply.github.com>
Thu, 11 May 2023 11:20:41 +0000 (07:20 -0400)
committerGitHub <noreply@github.com>
Thu, 11 May 2023 11:20:41 +0000 (21:20 +1000)
Content.Client/Buckle/BuckleSystem.cs
Content.Client/Rotation/RotationVisualsComponent.cs
Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml
Resources/Textures/Mobs/Aliens/slimes.rsi/blue_adult_slime_dead.png
Resources/Textures/Mobs/Aliens/slimes.rsi/green_adult_slime_dead.png
Resources/Textures/Mobs/Aliens/slimes.rsi/yellow_adult_slime_dead.png

index 70d25488badeac6f53e1eb5c30be05b7b5d62a81..70960d06a2bd2aa9641d530e93cd6d1ce47b3aec 100644 (file)
@@ -70,7 +70,7 @@ internal sealed class BuckleSystem : SharedBuckleSystem
             !buckled ||
             args.Sprite == null)
         {
-            _rotationVisualizerSystem.SetHorizontalAngle(uid, RotationVisualsComponent.DefaultRotation, rotVisuals);
+            _rotationVisualizerSystem.SetHorizontalAngle(uid, rotVisuals.DefaultRotation, rotVisuals);
             return;
         }
 
index 3ca602746edcd35c2857614ea0fbaea2d3cc3aab..103ee6b5d364f20020ad53cc1f5146de5cb6ed2c 100644 (file)
@@ -3,12 +3,16 @@ namespace Content.Client.Rotation;
 [RegisterComponent]
 public sealed class RotationVisualsComponent : Component
 {
-    public static readonly Angle DefaultRotation = Angle.FromDegrees(90);
+    [DataField("defaultRotation")]
+    [ViewVariables(VVAccess.ReadOnly)]
+    public readonly Angle DefaultRotation = Angle.FromDegrees(90);
 
     [ViewVariables(VVAccess.ReadWrite)]
     public Angle VerticalRotation = 0;
 
-    [ViewVariables(VVAccess.ReadWrite)] public Angle HorizontalRotation = DefaultRotation;
+    [DataField("horizontalRotation")]
+    [ViewVariables(VVAccess.ReadWrite)]
+    public Angle HorizontalRotation = Angle.FromDegrees(90);
 
     [ViewVariables(VVAccess.ReadWrite)]
     public float AnimationTime = 0.125f;
index 7b386c5a33be52d53fed3725585aa23711a9d56c..79ca05200a00f697dcd494de952b7aabe61a7ae2 100644 (file)
         Brute: 5
   - type: Appearance
   - type: RotationVisuals
+    defaultRotation: 0
+    horizontalRotation: 0
   - type: FireVisuals
     sprite: Mobs/Effects/onfire.rsi
     normalState: Generic_mob_burning
index c1dc616d25bee2612cae36079f57c82500309767..4a178f261a489bd0004221d0a061c7c4ce4b3234 100644 (file)
Binary files a/Resources/Textures/Mobs/Aliens/slimes.rsi/blue_adult_slime_dead.png and b/Resources/Textures/Mobs/Aliens/slimes.rsi/blue_adult_slime_dead.png differ
index dbacc8fd209ded1207ec3fa11a97a5fa4bc25fa3..42762e5a1116954cd80b56bbcc7bb704e6971c86 100644 (file)
Binary files a/Resources/Textures/Mobs/Aliens/slimes.rsi/green_adult_slime_dead.png and b/Resources/Textures/Mobs/Aliens/slimes.rsi/green_adult_slime_dead.png differ
index 30a833c5b47e05dee87ff6c2f7c806ec946b9632..1824094546e8e8d557c8ddde18dd67a56d06a5af 100644 (file)
Binary files a/Resources/Textures/Mobs/Aliens/slimes.rsi/yellow_adult_slime_dead.png and b/Resources/Textures/Mobs/Aliens/slimes.rsi/yellow_adult_slime_dead.png differ