From: RedBookcase Date: Sun, 25 May 2025 21:55:50 +0000 (-0700) Subject: Updated Drozd and Lecter with magazine states and small animations. (#37790) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=394388be5c0123ae3dca6f784856febe000f264b;p=space-station-14.git Updated Drozd and Lecter with magazine states and small animations. (#37790) Co-authored-by: RedBookcase --- diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml index ef47ef8b97..c380af2d9b 100644 --- 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 492581d900..94866e2f21 100644 --- 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 b9197c0717..79022c904b 100644 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 55fc78d5dd..1004bdaea4 100644 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 129bebc43b..8cb2578cce 100644 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 4002c82378..272409ddc5 100644 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 index 0000000000..878ed2bd44 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 index 0000000000..714d3343c4 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 index 0000000000..6636521282 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 index 0000000000..5b5ab4078a 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 8bc8dfa99b..d2d6aaa217 100644 --- 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 c0555d9ed3..48cf06c92b 100644 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 5a96a55749..0231bfabf5 100644 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 8242a6d00a..99fec8cbea 100644 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 index 0000000000..c9520c87b1 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 index 0000000000..b218d58bfd 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 index 0000000000..84dcfb788b 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 index 0000000000..14065f9404 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 59312b5093..08577a04fe 100644 --- 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"