Merge pull request #1 from Schrodinger71/anim_gun

Add smail update
AdventureTimeSS14 · Jan 14, 2024 · 05d6148 · 05d6148
2 parents ec27764 + 1d0f23f
commit 05d6148
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/Resources/Prototypes/ADT/Entities/Mobs/SecurityCyborg/damage_mod_set.yml b/Resources/Prototypes/ADT/Entities/Mobs/SecurityCyborg/damage_mod_set.yml
@@ -3,7 +3,7 @@
   coefficients:
     Blunt: 0.7
     Slash: 0.7
-    Piercing: 0.8
+    Piercing: 0.7
     # fire and lasers burn it good
     Heat: 1.0
     # zap

diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Battery/BlueShield.rsi/base.png b/Resources/Textures/ADT/Objects/Weapons/Guns/Battery/BlueShield.rsi/base.png
diff --git a/...ces/Textures/ADT/Objects/Weapons/Guns/Battery/BlueShield.rsi/mag-unshaded-0.png b/...ces/Textures/ADT/Objects/Weapons/Guns/Battery/BlueShield.rsi/mag-unshaded-0.png
diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/Battery/BlueShield.rsi/meta.json b/Resources/Textures/ADT/Objects/Weapons/Guns/Battery/BlueShield.rsi/meta.json
@@ -11,10 +11,12 @@
           "name": "icon"
       },
       {
-          "name": "base"
+          "name": "base",
+          "delays": [ [ 0.1, 0.2, 0.1, 0.2, 0.1, 0.2, 0.1, 0.2, 0.1, 1.1 ] ]
       },
       {
-          "name": "mag-unshaded-0"
+          "name": "mag-unshaded-0",
+          "delays": [ [ 1.2, 1.2 ] ]
       },
       {
           "name": "mag-unshaded-1"
@@ -37,4 +39,4 @@
           "directions": 4
       }
   ]
-}
+}