From eabbfefdd2663842e5216c522264cdb6dc7a165d Mon Sep 17 00:00:00 2001
From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Date: Sun, 23 Apr 2023 14:29:56 +1000
Subject: [PATCH] Fix some damagestatevisuals (#15674)

---
 .../DamageStateVisualizerSystem.cs            |  10 --------
 .../DamageStateVisualsComponent.cs            |   5 ----
 .../Prototypes/Entities/Mobs/NPCs/animals.yml |  12 ---------
 .../Entities/Mobs/NPCs/regalrat.yml           |   1 -
 .../Textures/Mobs/Animals/monkey.rsi/dead.png | Bin 348 -> 0 bytes
 .../Mobs/Animals/monkey.rsi/meta.json         |  24 +-----------------
 6 files changed, 1 insertion(+), 51 deletions(-)
 delete mode 100644 Resources/Textures/Mobs/Animals/monkey.rsi/dead.png

diff --git a/Content.Client/DamageState/DamageStateVisualizerSystem.cs b/Content.Client/DamageState/DamageStateVisualizerSystem.cs
index 7ecfb4a7eb..fa2a2c79fc 100644
--- a/Content.Client/DamageState/DamageStateVisualizerSystem.cs
+++ b/Content.Client/DamageState/DamageStateVisualizerSystem.cs
@@ -20,16 +20,6 @@ public sealed class DamageStateVisualizerSystem : VisualizerSystem<DamageStateVi
             return;
         }
 
-        if (component.Rotate)
-        {
-            sprite.NoRotation = data switch
-            {
-                MobState.Critical => false,
-                MobState.Dead => false,
-                _ => true
-            };
-        }
-
         // Brain no worky rn so this was just easier.
         foreach (var key in new []{ DamageStateVisualLayers.Base, DamageStateVisualLayers.BaseUnshaded })
         {
diff --git a/Content.Client/DamageState/DamageStateVisualsComponent.cs b/Content.Client/DamageState/DamageStateVisualsComponent.cs
index 4152539bb5..8034fd8798 100644
--- a/Content.Client/DamageState/DamageStateVisualsComponent.cs
+++ b/Content.Client/DamageState/DamageStateVisualsComponent.cs
@@ -8,11 +8,6 @@ public sealed class DamageStateVisualsComponent : Component
     public int? OriginalDrawDepth;
 
     [DataField("states")] public Dictionary<MobState, Dictionary<DamageStateVisualLayers, string>> States = new();
-
-    /// <summary>
-    /// Should noRot be turned off when crit / dead.
-    /// </summary>
-    [DataField("rotate")] public bool Rotate;
 }
 
 public enum DamageStateVisualLayers : byte
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
index 7fb146e1d7..c3f46b3a6e 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
@@ -1,6 +1,3 @@
-# Bounds Guide
-#1D2L3U4R
-
 - type: entity
   name: bat
   parent: SimpleMobBase
@@ -103,7 +100,6 @@
     excess: 10
   - type: Appearance
   - type: DamageStateVisuals
-    rotate: true
     states:
       Alive:
         Base: 0
@@ -715,14 +711,6 @@
   - type: Body
     prototype: Primate
     requiredLegs: 1 # TODO: More than 1 leg
-  - type: DamageStateVisuals
-    states:
-      Alive:
-        Base: monkey
-      Critical:
-        Base: dead
-      Dead:
-        Base: dead
   - type: Appearance
   - type: FireVisuals
     sprite: Mobs/Effects/onfire.rsi
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml b/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml
index c1c675f86a..bde8dd9081 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml
@@ -255,7 +255,6 @@
     baseDecayRate: 0.1
   - type: Appearance
   - type: DamageStateVisuals
-    rotate: true
     states:
       Alive:
         Base: mouse-3
diff --git a/Resources/Textures/Mobs/Animals/monkey.rsi/dead.png b/Resources/Textures/Mobs/Animals/monkey.rsi/dead.png
deleted file mode 100644
index 487fddc0724443bacae7512574a51730af659c38..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 348
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfvxd5LK*8>L*O!QzdW?=X~(|D#a
z!~ZjBiHV619z1AhXkcKNc}Vt>1W+YoNswPKgTu2MX+TavRY*jMOKNd)QD#9&W_}(6
zL&conu!5q}?_YuoK7M_o<*loA?#%h%4WR}XjUPPHIq#!+lA)-lcZY>>knv?>FNHae
zCLNg+q7bZUZm(~>^^$>|s;QxCXScEH<`oheIVX<J44X1zHdmsy_KsgW8+_Rrq#|VY
zJae+B0om>8;uxYaF*!k^&LO~)apv&@8E-UNRFu{%QCOp-ab$rAgRp>zXL3+bpiqlu
zQizaNxrj)hp=cAQK?VbB%pB$B2g^LBSX=F~Xm4VbV3m-NG(8pjK#S$#S%H=tK`h%_
q104b+ugW$tb-mC#`hoi|BZG~CVA!-tIfg*H89ZJ6T-G@yGywo(X?r37

diff --git a/Resources/Textures/Mobs/Animals/monkey.rsi/meta.json b/Resources/Textures/Mobs/Animals/monkey.rsi/meta.json
index cda9e24b13..739a57c0b7 100644
--- a/Resources/Textures/Mobs/Animals/monkey.rsi/meta.json
+++ b/Resources/Textures/Mobs/Animals/monkey.rsi/meta.json
@@ -7,31 +7,9 @@
   "license": "CC-BY-SA-3.0",
   "copyright": "Taken from https://github.com/tgstation/tgstation/commit/53d1f1477d22a11a99c6c6924977cd431075761b",
   "states": [
-    {
-      "name": "dead",
-      "delays": [
-        [
-          1
-        ]
-      ]
-    },
     {
       "name": "monkey",
-      "directions": 4,
-      "delays": [
-        [
-          1
-        ],
-        [
-          1
-        ],
-        [
-          1
-        ],
-        [
-          1
-        ]
-      ]
+      "directions": 4
     }
   ]
 }
-- 
2.51.2