Fix some damagestatevisuals (#15674)

diff --git a/Content.Client/DamageState/DamageStateVisualizerSystem.cs b/Content.Client/DamageState/DamageStateVisualizerSystem.cs
index 7ecfb4a7eb499698a1e01a29ed4ae7163a63c0bf..fa2a2c79fc75c0caa151fdfdc788166bfff34300 100644 (file)
--- 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 4152539bb5a82cbd9bb55511d42d009a4b9f4a48..8034fd8798640103edd7f982fccf346a6cf14466 100644 (file)
--- 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 7fb146e1d72c3db09df6b77c9ecc90ebabc2988d..c3f46b3a6ec08222b5617f5c14e922cb0e8d217b 100644 (file)
--- 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 c1c675f86a8d455ca410ce3dfd6877bce5efa1ae..bde8dd9081e30c8e4bfb8aba020395f7781d8160 100644 (file)
--- 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 (file)
index 487fddc..0000000
Binary files a/Resources/Textures/Mobs/Animals/monkey.rsi/dead.png and /dev/null differ

diff --git a/Resources/Textures/Mobs/Animals/monkey.rsi/meta.json b/Resources/Textures/Mobs/Animals/monkey.rsi/meta.json
index cda9e24b13a48585e6722b87966db9e722c93199..739a57c0b74b271b20454efa84c7db424961f560 100644 (file)
--- 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
     }
   ]
 }