Updated Drozd and Lecter with magazine states and small animations. (#37790)

Co-authored-by: RedBookcase <Usualmoves@gmail.com>

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
index ef47ef8b97693950afc6e9bb27004e878772015e..c380af2d9b5071716e73ab109c5c5f15722b9076 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
@@ -187,7 +187,7 @@
       gun_chamber: !type:ContainerSlot
   - type: MagazineVisuals
     magState: mag
-    steps: 1
+    steps: 5
     zeroVisible: true
   - type: Appearance
 

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
index 492581d900d1b38ae9552135a36838d93f8a8ac7..94866e2f21fb704744733c98bc92e6852ec7e033 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
@@ -173,7 +173,7 @@
               - CartridgePistol
     - type: MagazineVisuals
       magState: mag
-      steps: 1
+      steps: 5
       zeroVisible: true
     - type: Appearance
 

diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/base.png
index b9197c0717dbb56a3fa637afde8ddac72bb7277e..79022c904b4189034c682310a8d6e5389ab65b6d 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/base.png and b/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/base.png differ

diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/bolt-open.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/bolt-open.png
index 55fc78d5ddee7f3018500550a5a4d9a035f80c89..1004bdaea482c528fd09d6919c87ccfe7efdd17c 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/bolt-open.png and b/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/bolt-open.png differ

diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/icon.png
index 129bebc43bce0c687b51e19dab892792d914c7da..8cb2578cce877685f80b8cc3adc43fd537bbcba2 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/icon.png and b/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/icon.png differ

diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/mag-0.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/mag-0.png
index 4002c82378ff153286d6cd6308307c722639a760..272409ddc5984239ae64d05cbc3f3c22f0bc4d75 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/mag-0.png and b/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/mag-0.png differ

diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/mag-1.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/mag-1.png
new file mode 100644 (file)
index 0000000..878ed2b
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/mag-1.png differ

diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/mag-2.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/mag-2.png
new file mode 100644 (file)
index 0000000..714d334
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/mag-2.png differ

diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/mag-3.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/mag-3.png
new file mode 100644 (file)
index 0000000..6636521
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/mag-3.png differ

diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/mag-4.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/mag-4.png
new file mode 100644 (file)
index 0000000..5b5ab40
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/mag-4.png differ

diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/meta.json
index 8bc8dfa99b84991d16f75b95489a9ee783bd48a7..d2d6aaa2173282d7ddd9d621fba3ebe560c34411 100644 (file)
--- a/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Original sprite by Emisse (GitHub), all altered sprites by https://github.com/august-sun.",
+    "copyright": "Original sprite by Emisse (GitHub), all altered sprites by https://github.com/august-sun. Magazine state sprites by RedBookcase on Github.",
     "size": {
         "x": 32,
         "y": 32
@@ -17,7 +17,49 @@
             "name": "bolt-open"
         },
         {
-            "name": "mag-0"
+            "name": "mag-0",
+                       "delays": [
+                       [
+                       0.5,
+                       0.5
+                       ]
+               ]
+        },
+        {
+            "name": "mag-1",
+                       "delays": [
+                       [
+                       0.5,
+                       0.5
+                       ]
+               ]
+        },
+        {
+            "name": "mag-2",
+                       "delays": [
+                       [
+                       0.5,
+                       0.5
+                       ]
+               ]
+        },
+        {
+            "name": "mag-3",
+                       "delays": [
+                       [
+                       0.5,
+                       0.5
+                       ]
+               ]
+        },
+        {
+            "name": "mag-4",
+                       "delays": [
+                       [
+                       0.5,
+                       0.5
+                       ]
+               ]
         },
         {
             "name": "inhand-left",

diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/drozd.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/SMGs/drozd.rsi/base.png
index c0555d9ed3e1e81f0a6d360da73eb8bf9dcf86f4..48cf06c92bbd1dc97cff7e13adabc4085eff1d4a 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/SMGs/drozd.rsi/base.png and b/Resources/Textures/Objects/Weapons/Guns/SMGs/drozd.rsi/base.png differ

diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/drozd.rsi/bolt-open.png b/Resources/Textures/Objects/Weapons/Guns/SMGs/drozd.rsi/bolt-open.png
index 5a96a55749359f4716f2c3facce409882edd6159..0231bfabf55c6c3a0f1a12df3ab0f84592043e66 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/SMGs/drozd.rsi/bolt-open.png and b/Resources/Textures/Objects/Weapons/Guns/SMGs/drozd.rsi/bolt-open.png differ

diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/drozd.rsi/mag-0.png b/Resources/Textures/Objects/Weapons/Guns/SMGs/drozd.rsi/mag-0.png
index 8242a6d00ab3e57d4ce6bcebb16005ff2866e151..99fec8cbea39aeb92e9307833dfa566a4b3967bf 100644 (file)
Binary files a/Resources/Textures/Objects/Weapons/Guns/SMGs/drozd.rsi/mag-0.png and b/Resources/Textures/Objects/Weapons/Guns/SMGs/drozd.rsi/mag-0.png differ

diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/drozd.rsi/mag-1.png b/Resources/Textures/Objects/Weapons/Guns/SMGs/drozd.rsi/mag-1.png
new file mode 100644 (file)
index 0000000..c9520c8
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/SMGs/drozd.rsi/mag-1.png differ

diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/drozd.rsi/mag-2.png b/Resources/Textures/Objects/Weapons/Guns/SMGs/drozd.rsi/mag-2.png
new file mode 100644 (file)
index 0000000..b218d58
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/SMGs/drozd.rsi/mag-2.png differ

diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/drozd.rsi/mag-3.png b/Resources/Textures/Objects/Weapons/Guns/SMGs/drozd.rsi/mag-3.png
new file mode 100644 (file)
index 0000000..84dcfb7
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/SMGs/drozd.rsi/mag-3.png differ

diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/drozd.rsi/mag-4.png b/Resources/Textures/Objects/Weapons/Guns/SMGs/drozd.rsi/mag-4.png
new file mode 100644 (file)
index 0000000..14065f9
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/SMGs/drozd.rsi/mag-4.png differ

diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/drozd.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/SMGs/drozd.rsi/meta.json
index 59312b50931e8e17dac620cbb5c6c0b2c45eba61..08577a04fe3a927eead38ef42be878e0b818374d 100644 (file)
--- a/Resources/Textures/Objects/Weapons/Guns/SMGs/drozd.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/SMGs/drozd.rsi/meta.json
@@ -1,7 +1,7 @@
 {
        "version": 1,
        "license": "CC-BY-SA-3.0",
-       "copyright": "Taken/modified from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/56cbafd6ad8c013ccd5472d6c4a0db790f7f872a/icons/obj/guns/projectile/drozd.dmi, sprite modification by Jaсkal 298/TaralGit, backpack sling sprite edited by Boaz1111, wield sprites by RiceMar1244, all sprites minus suppressor heavily edited by Emisse for SS14",
+       "copyright": "Taken/modified from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/56cbafd6ad8c013ccd5472d6c4a0db790f7f872a/icons/obj/guns/projectile/drozd.dmi, sprite modification by Jaсkal 298/TaralGit, backpack sling sprite edited by Boaz1111, wield sprites by RiceMar1244, all sprites minus suppressor heavily edited by Emisse for SS14. Magazine state sprites by RedBookcase on Github.",
        "size": {
                "x": 32,
                "y": 32
@@ -17,7 +17,49 @@
             "name": "bolt-open"
         },
         {
-            "name": "mag-0"
+            "name": "mag-0",
+                       "delays": [
+                       [
+                       0.5,
+                       0.5
+                       ]
+               ]
+        },
+        {
+            "name": "mag-1",
+                       "delays": [
+                       [
+                       0.5,
+                       0.5
+                       ]
+               ]
+        },
+        {
+            "name": "mag-2",
+                       "delays": [
+                       [
+                       0.5,
+                       0.5
+                       ]
+               ]
+        },
+        {
+            "name": "mag-3",
+                       "delays": [
+                       [
+                       0.5,
+                       0.5
+                       ]
+               ]
+        },
+        {
+            "name": "mag-4",
+                       "delays": [
+                       [
+                       0.5,
+                       0.5
+                       ]
+               ]
         },
         {
             "name": "suppressor"