From e6dd47ea460daab61a0e2b83bbef412c7025fbc8 Mon Sep 17 00:00:00 2001
From: themias <89101928+themias@users.noreply.github.com>
Date: Thu, 11 May 2023 07:20:41 -0400
Subject: [PATCH] Fix dead mob sprites rotating on death (#16317)

---
 Content.Client/Buckle/BuckleSystem.cs           |   2 +-
 .../Rotation/RotationVisualsComponent.cs        |   8 ++++++--
 .../Prototypes/Entities/Mobs/NPCs/simplemob.yml |   2 ++
 .../Aliens/slimes.rsi/blue_adult_slime_dead.png | Bin 475 -> 490 bytes
 .../slimes.rsi/green_adult_slime_dead.png       | Bin 465 -> 484 bytes
 .../slimes.rsi/yellow_adult_slime_dead.png      | Bin 456 -> 457 bytes
 6 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/Content.Client/Buckle/BuckleSystem.cs b/Content.Client/Buckle/BuckleSystem.cs
index 70d25488ba..70960d06a2 100644
--- a/Content.Client/Buckle/BuckleSystem.cs
+++ b/Content.Client/Buckle/BuckleSystem.cs
@@ -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;
         }
 
diff --git a/Content.Client/Rotation/RotationVisualsComponent.cs b/Content.Client/Rotation/RotationVisualsComponent.cs
index 3ca602746e..103ee6b5d3 100644
--- a/Content.Client/Rotation/RotationVisualsComponent.cs
+++ b/Content.Client/Rotation/RotationVisualsComponent.cs
@@ -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;
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml b/Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml
index 7b386c5a33..79ca05200a 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml
@@ -130,6 +130,8 @@
         Brute: 5
   - type: Appearance
   - type: RotationVisuals
+    defaultRotation: 0
+    horizontalRotation: 0
   - type: FireVisuals
     sprite: Mobs/Effects/onfire.rsi
     normalState: Generic_mob_burning
diff --git a/Resources/Textures/Mobs/Aliens/slimes.rsi/blue_adult_slime_dead.png b/Resources/Textures/Mobs/Aliens/slimes.rsi/blue_adult_slime_dead.png
index c1dc616d25bee2612cae36079f57c82500309767..4a178f261a489bd0004221d0a061c7c4ce4b3234 100644
GIT binary patch
delta 452
zcmV;#0XzQN1L^~iFn<69XF*Lt006O%3;baP00009a7bBm000id000id0mpBsWB>pG
ze@R3^R9Hvtlrc*KF%-vNz3U{n93sbQyE^$HbkWVlSsk=OXIK3a4qA}fkKiH>;s+4w
zcj%p3RHQg5G=h1#q^3#kE?x^d<Od<|rNjUK{=Ebo4u`|>*MC&_ZcT7=mGF}BmW;Ik
zyNxAYSz&EJ2yd-zu-?QaUHywz+E^MXG*Bdrq9$yO<QhP6A-p{tK6a|rh&7ZfVHIX1
z$3&(9SzN|eSnwLhKyI%yP0a9p3?YtF^CKqwTXAH*Rs(-^9iV-te61;30;b8!2n#R)
zguK51bnmq!jDHEpOd@WBW<b8zlZuP!M|AIa@k3z(Ws${M{27>U0sUYOcJ@mppiVs!
zZ=C|1oNG5>DhZ&dSTcE&3$h;~er-aUgo-L8qlx0=6#wuDNWHElkoyw)y<Wl|5e~c0
z3dSk9C{k%OLvJqV2T>Ga|Lprd`+<{dV1W?w89#ZOgFW=0>a>p^SW&?2UUL!m505@X
u%PU{(P(n2^HPA4oh6`(c>~Q>N0KNhDsFxvAa^pJy0000<MNUMnLSTZXT*Pqz

delta 437
zcmV;m0ZRVr1KR_TFn<A+Nkl<ZScUCYF-yZh7=3Coi4=?&N=*AB1b=`!s8c6L(ZQ<t
zBLr7xq3sfNbaJu|D)<9*aB>owGz3elbaKc+9nxqLa=GL#ieeuG^4%TZd-uNkE&)dP
z?-<Lp+NfIqpy)aPptroH|BQek@!n=NG<<&36c)i2VAQQBaetm7#%U8OAw+JqEC9HO
zJU%vD*Ir**g>rpq@d}_iP<S>6{kvwnNZEZQ67xDib)fP_odOVcLIlYy4EQ2MN<kHH
zY8<rX#g$Y^&SY83O3W0H7Qs^RxWE+9HO<VTautvUA_p=T0U}5g;PyMI6ZtOmtZa>t
z%7O1Z2fwofDt{q_CmGLSj1}-|+m8S4pMx}Ia84S))=sAH0ks5^+xv59)UxE_Lacyk
zO)JKYC%M40d#ZpJNs`_tzT#jz=G_t0{{fW{(s_Espmyw_x(fi13$vj$Go=!`rV01<
zifi`(qYb4g#R<mIi%FCmU^oDH9pN4wdV@nJK5_pbL@o{h5^I55E(Zy`dv<=oiv-CN
f!Fw5v@aOOWoN<+zeM28L00000NkvXXu0mjf5_rP~

diff --git a/Resources/Textures/Mobs/Aliens/slimes.rsi/green_adult_slime_dead.png b/Resources/Textures/Mobs/Aliens/slimes.rsi/green_adult_slime_dead.png
index dbacc8fd209ded1207ec3fa11a97a5fa4bc25fa3..42762e5a1116954cd80b56bbcc7bb704e6971c86 100644
GIT binary patch
delta 446
zcmV;v0YU!J1LOmcFn<69XF*Lt006O%3;baP00009a7bBm000id000id0mpBsWB>pG
zc}YY;R9Hvtl(A03Fc5|>B%~68LKO)KsTC6HL$D#i$l8quft3v&1U5!C9)O(*1XC+T
zR8$b4Kuc1{xxV7WPU5skF!)=1R)+7tb8Ije3<kqrWARlR?|-7%<|QMzf8^DeaIe?k
zr54%&NW8GK%JwR{K^LO)aUk6wg#n7hC{>{wBsT!cNqhwRZ~(`wMzX|dFi2jA%mAWX
zL|05iy-$G4*US)ed`&=d?3zGvSvg{R^8lNR;GB4gpO=s(pz3@YF~KGf6ZYT0xf)56
zP)<N(7P$^m0Dtjb&nl<xiSVY+s~-v{FfF1S$Df510ME!jz2>{}pjatCdjUB7kZ!`S
zOn{`K7$Ld)Ua7M}LFPL^*T&whvAsxIBqEI)JCAX<YxUulFZps`Lg#M1jgQEL_&%pm
zo-daoR;$XocN^6Xu7j1^#4+Rsa340lMnTj`oTCO-Yd3j~m$7)s=j8-3L~ekxRGymQ
ou>EXf9d{hXB8Po282&E+-*RoN3QPr>F8}}l07*qoM6N<$f(9zY7XSbN

delta 427
zcmV;c0aX6v1JMJJFn<AyNkl<ZScUDDF-yZh7>3{2v;n1!C15C|P^5@I!OcN8M|IKv
zA^rsMe{}5VR-L<wYdf7#B8IevD8{sLkb|V=lFMBL(Y_E!a>;$qz2A4-2dwnpr4;#C
z?HL3Bbh8Nna1KXpSpc<2;MUo0a$o==3z6%9+B3+vz%jkv+J90`tg!}a&)ZRT+#vw)
zG_w;I)fFzVeqh2FbcrYc(}C)^L!zOF%26|Qd`mYI&!SE+9r*D5%pc=U$cPERBMKpt
z3N}FBgR)oWn&cAKMdNY+a4Mb(5f^d+7EUODRU!b7WD2qr02yTh<ZZ>cs0%aOEf0X|
zC+pyMra+r^g@2YTQjDnp0ePv=ds+uPX_()*2+y5D=K(VX%BkK$-zzegkWv9^?Z!Oq
zeU=L%t7ihdZ;le3QhYm>y(8ESiB+E{Ck>0HVHtvgESyky^_c((m^aN@hM>Wtp(h+1
z$moc)>DQ?i-TPK>=RN`ej+4i;`mm4+4sdkE!Tux;NhAP3-Pr&D>EM~74y^R&^$9A|
VtJn#yszd+)002ovPDHLkV1ly~#6<uA

diff --git a/Resources/Textures/Mobs/Aliens/slimes.rsi/yellow_adult_slime_dead.png b/Resources/Textures/Mobs/Aliens/slimes.rsi/yellow_adult_slime_dead.png
index 30a833c5b47e05dee87ff6c2f7c806ec946b9632..1824094546e8e8d557c8ddde18dd67a56d06a5af 100644
GIT binary patch
delta 419
zcmV;U0bKsb1IYuBFn<69XF*Lt006O%3;baP00009a7bBm000id000id0mpBsWB>pG
zUP(kjR9HvtlsittKoCGDP6`TB1tbijOH0KCKnM_501;7h0WQD|BGD5m2pU=>KH>ya
z5gnZ&4uS^Zf+9-LEIabx{dkR$pxD=Vwt8>;1CPh!@%%M4d4F~0`n(y-QSdx`lhYSF
z`=doUI^i5Z;+4&|IP0iSPT{2cB4*c+!hj+%N_Dt~SOZW_;&HGB!T3hZh)J9WLu?Vo
z050daiiu?S4!4&d#t3Zy$@$i0#T;9N5}@0>svLQJN}+$>P$B|(HBv?Hf)c>L>#B0v
zo_HLL<dji(2Y-GFm*ed>p#<PFIy>&jQ+ZIVlV4l`92|o368_2^ASo9kw#^CSf1r2N
z5P!h!_N+K_@*+-Nikl<5dm+rX(&EpMGk6GN{C<hmjVU>0=(Z#&vb7E{vk*cwH!aS!
zF!>f?4Va`+jN9_(=mJWKrR7LY89c%oP!<gC-z8#3aU6bIkLMo(@Cox@qtwFX67m25
N002ovPDHLkV1k}!wO{}M

delta 418
zcmV;T0bTyd1IPoAFn<ApNkl<ZScUDDF-yZh9K~O128W1)N{!Xc)yXfQVi8vtQBh|X
zzfM=BR5#Zm5$hM|6maTx*lVc{(hME6aR?{5kjq`}Qc>)KK$5%U{qFtmE&-<c@3QiA
zZq#f70Oj&L0ATmvZS6+@nDOD+C3pYn{@NHq3ec$8BxzhEM1M)t5C$&kb{ql#GvO_F
zFpWz)*xEbC!`%YW1rR3C?Kq_6jc|Orl-mAj9dXyXNeB~oeF-ujj3;3tA%Kb)gh?rc
z08J0ruFk5xWc--dR}P@6cqw#JkOI)&Py?$#02P@`$U*>2lnEePigB?N`u+Ff0GK8@
z4}NC}!obzq+kbT?V=92(rr+mm9;lSzrar*Q#Ye91fv^Po)o3@Iv{C^!Hr>?DSt;m@
zUI<`0lzUNpITpPlg#QC!;1a)0(e$En0Kj6!;rh7CbD+H;THZ)&^nhd;CJmDtlc_l%
zNr0KuuOefX1e5=48<_)uE$gtd9>fg@0IXJ`$4t#Lr5n2$P4(yW1-L7mh{qeKcK`qY
M07*qoM6N<$g2bl8HUIzs