From: IProduceWidgets <107586145+IProduceWidgets@users.noreply.github.com> Date: Fri, 19 Sep 2025 19:30:07 +0000 (-0400) Subject: The Experimental Lecter 8 (#40372) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=2b411b244e681431accb1d74846c46044d90b54d;p=space-station-14.git The Experimental Lecter 8 (#40372) * XL8 files * slap dat on the ERT lead * oop mag indicator offset * fix newline --- diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml index 99fb4edce7..fcb12ef711 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml @@ -193,6 +193,33 @@ zeroVisible: true - type: Appearance +- type: entity + parent: WeaponRifleLecter + id: WeaponRifleLecterXL8 + name: XL8 + description: |- + The Experimental Lecter 8 + An unreasonably expensive military grade assault rifle with integrated optic. + Uses .20 rifle ammo. + components: + - type: Sprite + sprite: Objects/Weapons/Guns/Rifles/XL8.rsi + - type: Clothing + sprite: Objects/Weapons/Guns/Rifles/XL8.rsi + - type: CursorOffsetRequiresWield + - type: EyeCursorOffset + maxOffset: 2 + pvsIncrease: 0.2 + - type: StaticPrice + price: 1500 #3x lecter + - type: Gun + shotsPerBurst: 3 + selectedMode: Burst + availableModes: + - Burst + - SemiAuto + - FullAuto + - type: entity name: Estoc DMR parent: [BaseWeaponRifle, BaseSyndicateContraband] diff --git a/Resources/Prototypes/Roles/Jobs/CentComm/emergencyresponseteam.yml b/Resources/Prototypes/Roles/Jobs/CentComm/emergencyresponseteam.yml index 1423db752a..c78463b1e1 100644 --- a/Resources/Prototypes/Roles/Jobs/CentComm/emergencyresponseteam.yml +++ b/Resources/Prototypes/Roles/Jobs/CentComm/emergencyresponseteam.yml @@ -81,7 +81,7 @@ pocket1: MagazineRifle pocket2: MagazineRifle inhand: - - WeaponRifleLecter + - WeaponRifleLecterXL8 storage: back: - WeaponDisabler diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/XL8.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/XL8.rsi/base.png new file mode 100644 index 0000000000..51372ad979 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Rifles/XL8.rsi/base.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/XL8.rsi/bolt-open.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/XL8.rsi/bolt-open.png new file mode 100644 index 0000000000..dede8daa13 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Rifles/XL8.rsi/bolt-open.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/XL8.rsi/equipped-BACKPACK.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/XL8.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000..7b8ff925e0 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Rifles/XL8.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/XL8.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/XL8.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 0000000000..7b8ff925e0 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Rifles/XL8.rsi/equipped-SUITSTORAGE.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/XL8.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/XL8.rsi/icon.png new file mode 100644 index 0000000000..99f8c0b667 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Rifles/XL8.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/XL8.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/XL8.rsi/inhand-left.png new file mode 100644 index 0000000000..08c12bc659 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Rifles/XL8.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/XL8.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/XL8.rsi/inhand-right.png new file mode 100644 index 0000000000..70e62a3f6a Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Rifles/XL8.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/XL8.rsi/mag-0.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/XL8.rsi/mag-0.png new file mode 100644 index 0000000000..3298e5ea44 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Rifles/XL8.rsi/mag-0.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/XL8.rsi/mag-1.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/XL8.rsi/mag-1.png new file mode 100644 index 0000000000..0686f2063f Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Rifles/XL8.rsi/mag-1.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/XL8.rsi/mag-2.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/XL8.rsi/mag-2.png new file mode 100644 index 0000000000..015c6dc0da Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Rifles/XL8.rsi/mag-2.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/XL8.rsi/mag-3.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/XL8.rsi/mag-3.png new file mode 100644 index 0000000000..44686162d6 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Rifles/XL8.rsi/mag-3.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/XL8.rsi/mag-4.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/XL8.rsi/mag-4.png new file mode 100644 index 0000000000..96aeee8a74 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Rifles/XL8.rsi/mag-4.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/XL8.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Rifles/XL8.rsi/meta.json new file mode 100644 index 0000000000..9aad06372d --- /dev/null +++ b/Resources/Textures/Objects/Weapons/Guns/Rifles/XL8.rsi/meta.json @@ -0,0 +1,89 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken/modified from tgstation at https://github.com/tgstation/tgstation/pull/41393/commits/1e56473177d0994d163c9edca3d13d6e5b640cc4, https://github.com/tgstation/tgstation/tree/master/icons/obj/weapons/guns backpack sprite by Peptide (copy of carbine), backpack sling sprite edited by Boaz1111, wield sprites by RiceMar1244, all sprites heavily edited by Emisse for SS14 using a palette inspired by coolstation weapon sprites https://github.com/coolstation/coolstation, tweaked for optic and mag anim by IProduceWidgets (github)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "bolt-open" + }, + { + "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", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "wielded-inhand-left", + "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/XL8.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/XL8.rsi/wielded-inhand-left.png new file mode 100644 index 0000000000..2a8c7d955b Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Rifles/XL8.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/XL8.rsi/wielded-inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/XL8.rsi/wielded-inhand-right.png new file mode 100644 index 0000000000..dbc6271c8f Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Rifles/XL8.rsi/wielded-inhand-right.png differ