diff --git a/Resources/Audio/DeltaV/Weapons/Guns/Gunshots/axiom.ogg b/Resources/Audio/DeltaV/Weapons/Guns/Gunshots/axiom.ogg new file mode 100644 index 0000000000..c992143f51 Binary files /dev/null and b/Resources/Audio/DeltaV/Weapons/Guns/Gunshots/axiom.ogg differ diff --git a/Resources/Audio/DeltaV/Weapons/Guns/Gunshots/jackdaw.ogg b/Resources/Audio/DeltaV/Weapons/Guns/Gunshots/jackdaw.ogg new file mode 100644 index 0000000000..39ceccdf4a Binary files /dev/null and b/Resources/Audio/DeltaV/Weapons/Guns/Gunshots/jackdaw.ogg differ diff --git a/Resources/Audio/DeltaV/Weapons/Guns/Gunshots/universal.ogg b/Resources/Audio/DeltaV/Weapons/Guns/Gunshots/universal.ogg new file mode 100644 index 0000000000..fe322c18ee Binary files /dev/null and b/Resources/Audio/DeltaV/Weapons/Guns/Gunshots/universal.ogg differ diff --git a/Resources/Audio/DeltaV/license.txt b/Resources/Audio/DeltaV/license.txt index 68d3dfa64c..ff29d0e1be 100644 --- a/Resources/Audio/DeltaV/license.txt +++ b/Resources/Audio/DeltaV/license.txt @@ -1 +1,4 @@ typewriter.ogg is modified from https://www.freesoundslibrary.com/typewriter-sound/ which is licensed under the CC BY 4.0 License. This modified file follows the same license. +axiom.ogg is modified from free sound effects from https://www.fesliyanstudios.com which are licensed under the CC0 1.0 License. This modified file follows the same license. +jackdaw.ogg is modified from atreides.ogg which was taken from https://gitlab.com/cmdevs/colonial-warfare/-/tree/32cb5892413243cc74bb2d11df8e3085f8ef1164/sound/weapons which is licensed under the CC-BY-SA 3.0 License. This modified file follows the same license. +universal.ogg is modified from free sound effects from https://www.fesliyanstudios.com which are licensed under the CC0 1.0 License. This modified file follows the same license. diff --git a/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/armory.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/armory.yml index 4a25602537..a66a6b268a 100644 --- a/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/armory.yml +++ b/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/armory.yml @@ -17,7 +17,7 @@ contents: - id: WeaponPistolUniversal amount: 2 - - id: MagazineUniversalCaselessRifle + - id: MagazineUniversalMagnum amount: 4 - type: entity diff --git a/Resources/Prototypes/DeltaV/Catalog/Fills/Lockers/security.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Lockers/security.yml index 02c77c2d14..9c31dfa4df 100644 --- a/Resources/Prototypes/DeltaV/Catalog/Fills/Lockers/security.yml +++ b/Resources/Prototypes/DeltaV/Catalog/Fills/Lockers/security.yml @@ -7,7 +7,7 @@ contents: - id: WeaponPistolUniversal amount: 2 - - id: MagazineUniversalCaselessRifle + - id: MagazineUniversalMagnum amount: 4 - type: entity diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Pistols/pistols.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Pistols/pistols.yml index d5e051ff8e..ea6718300c 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Pistols/pistols.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Pistols/pistols.yml @@ -7,6 +7,43 @@ components: - type: Sprite sprite: DeltaV/Objects/Weapons/Guns/Pistols/viperwood.rsi + - type: Clothing + sprite: DeltaV/Objects/Weapons/Guns/Pistols/viperwood.rsi + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + startingItem: MagazinePistol + insertSound: /Audio/Weapons/Guns/MagIn/pistol_magin.ogg + ejectSound: /Audio/Weapons/Guns/MagOut/pistol_magout.ogg + priority: 2 + whitelist: + tags: + - MagazinePistol + - MagazinePistolHighCapacity + gun_chamber: + name: Chamber + startingItem: CartridgePistol + priority: 1 + whitelist: + tags: + - CartridgePistol + - type: ContainerContainer + containers: + gun_magazine: !type:ContainerSlot + gun_chamber: !type:ContainerSlot + +- type: entity + name: Pollock + parent: BaseWeaponPistol + id: WeaponPistolPollock + description: A compact and mass-produced combat pistol. Uses .35 auto ammo. + suffix: Mercenary + components: + - type: Sprite + sprite: DeltaV/Objects/Weapons/Guns/Pistols/pollock.rsi + - type: Clothing + sprite: DeltaV/Objects/Weapons/Guns/Pistols/pollock.rsi - type: ItemSlots slots: gun_magazine: diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Rifles/rifles.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Rifles/rifles.yml index 46786c8d08..996147dc74 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Rifles/rifles.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Rifles/rifles.yml @@ -2,7 +2,7 @@ name: vulcan parent: BaseWeaponRifle id: WeaponRifleVulcan - description: One of the first firearms modified for space usage, this rifle has been used to punch holes in Cargonian "combat mechs." + description: One of the first firearms modified for space usage, this rifle has been used to punch holes in Cargonian "combat mechs." Uses .30 rifle ammo. components: - type: Sprite sprite: DeltaV/Objects/Weapons/Guns/Rifles/vulcan.rsi @@ -46,4 +46,130 @@ - type: Appearance - type: Clothing sprite: DeltaV/Objects/Weapons/Guns/Rifles/vulcan.rsi - \ No newline at end of file + +- type: entity + name: CAWS-25 Jackdaw + parent: BaseWeaponRifle + id: WeaponRifleJackdaw + description: The beginning of the end is heralded by the song of a Jackdaw. Uses .25 caseless ammo. + suffix: Deathsquad + components: + - type: Item + size: 30 + - type: Sprite + sprite: DeltaV/Objects/Weapons/Guns/Rifles/jackdaw.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-0 + map: ["enum.GunVisualLayers.Mag"] + - type: Gun + minAngle: 2 + maxAngle: 6 + angleIncrease: 2 + angleDecay: 8 + fireRate: 8 + selectedMode: FullAuto + availableModes: + - SemiAuto + - FullAuto + soundGunshot: + path: /Audio/DeltaV/Weapons/Guns/Gunshots/jackdaw.ogg + - type: ChamberMagazineAmmoProvider + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + startingItem: MagazineCaselessRifle + insertSound: /Audio/Weapons/Guns/MagIn/batrifle_magin.ogg + ejectSound: /Audio/Weapons/Guns/MagOut/batrifle_magout.ogg + priority: 2 + whitelist: + tags: + - MagazineCaselessRifle + gun_chamber: + name: Chamber + startingItem: CartridgeCaselessRifle + priority: 1 + whitelist: + tags: + - CartridgeCaselessRifle + - type: ContainerContainer + containers: + gun_magazine: !type:ContainerSlot + gun_chamber: !type:ContainerSlot + - type: MagazineVisuals + magState: mag + steps: 1 + zeroVisible: true + - type: Appearance + - type: Clothing + sprite: DeltaV/Objects/Weapons/Guns/Rifles/jackdaw.rsi + +- type: entity + name: Tenebra + parent: BaseWeaponRifle + id: WeaponRifleTenebra + description: A mass-produced and minimalist rifle in bullpup design. Uses .20 rifle ammo. + suffix: Mercenary + components: + - type: Sprite + sprite: DeltaV/Objects/Weapons/Guns/Rifles/tenebra.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-0 + map: ["enum.GunVisualLayers.Mag"] + - type: Gun + minAngle: 3 + maxAngle: 12 + angleIncrease: 3 + angleDecay: 12 + fireRate: 5 + selectedMode: FullAuto + availableModes: + - SemiAuto + - FullAuto + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/ltrifle.ogg + - type: ChamberMagazineAmmoProvider + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + startingItem: MagazineRifle + insertSound: /Audio/Weapons/Guns/MagIn/ltrifle_magin.ogg + ejectSound: /Audio/Weapons/Guns/MagOut/ltrifle_magout.ogg + priority: 2 + whitelist: + tags: + - MagazineRifle + gun_chamber: + name: Chamber + startingItem: CartridgeRifle + priority: 1 + whitelist: + tags: + - CartridgeRifle + - type: ContainerContainer + containers: + gun_magazine: !type:ContainerSlot + gun_chamber: !type:ContainerSlot + - type: MagazineVisuals + magState: mag + steps: 1 + zeroVisible: true + - type: Appearance + - type: Clothing + sprite: DeltaV/Objects/Weapons/Guns/Rifles/tenebra.rsi + +- type: entity + name: M-90 + id: WeaponRifleM90 + parent: WeaponRifleM90GrenadeLauncher + description: An older bullpup carbine model. Uses .20 rifle ammo. + components: + - type: Sprite + sprite: DeltaV/Objects/Weapons/Guns/Rifles/carbinenogl.rsi + - type: Clothing + sprite: DeltaV/Objects/Weapons/Guns/Rifles/carbinenogl.rsi diff --git a/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Boxes/ammunition.yml b/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Boxes/ammunition.yml index 3e92b969b4..dcf8cbc86b 100644 --- a/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Boxes/ammunition.yml +++ b/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Boxes/ammunition.yml @@ -13,52 +13,52 @@ - state: shellslug - type: entity - name: box of .25 caseless Universal magazines - parent: BoxCardboard - id: BoxMagazineUniversalCaselessRifle - description: A box full of .25 caseless magazines. + name: box of .45 magnum Universal magazines + parent: BoxMagazine + id: BoxMagazineUniversalMagnum + description: A box full of .45 magnum magazines. components: - type: StorageFill contents: - - id: MagazineUniversalCaselessRifle + - id: MagazineUniversalMagnum amount: 6 - type: entity - name: box of .25 caseless Universal (high-velocity) magazines - parent: BoxCardboard - id: BoxMagazineUniversalCaselessRifleHighVelocity - description: A box full of .25 caseless high-velocity magazines. + name: box of .45 magnum Universal (high-velocity) magazines + parent: BoxMagazine + id: BoxMagazineUniversalMagnumHighVelocity + description: A box full of .45 magnum high-velocity magazines. components: - type: StorageFill contents: - - id: MagazineUniversalCaselessRifleHighVelocity + - id: MagazineUniversalMagnumHighVelocity amount: 6 - type: entity - name: box of .25 caseless Universal (practice) magazines - parent: BoxCardboard - id: BoxMagazineUniversalCaselessRiflePractice - description: A box full of .25 caseless practice magazines. + name: box of .45 magnum Universal (practice) magazines + parent: BoxMagazine + id: BoxMagazineUniversalMagnumPractice + description: A box full of .45 magnum practice magazines. components: - type: StorageFill contents: - - id: MagazineUniversalCaselessRiflePractice + - id: MagazineUniversalMagnumPractice amount: 6 - type: entity - name: box of .25 caseless Universal (rubber) magazines - parent: BoxCardboard - id: BoxMagazineUniversalCaselessRifleRubber - description: A box full of .25 caseless rubber magazines. + name: box of .45 magnum Universal (rubber) magazines + parent: BoxMagazine + id: BoxMagazineUniversalMagnumRubber + description: A box full of .45 magnum rubber magazines. components: - type: StorageFill contents: - - id: MagazineUniversalCaselessRifleRubber + - id: MagazineUniversalMagnumRubber amount: 6 - type: entity name: box of .30 rifle speed loaders - parent: BoxCardboard + parent: BoxMagazine id: BoxSpeedLoaderLightRifle description: A box full of .30 rifle speed loaders. components: diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Guns/Ammunition/Magazine/caseless_rifle.yml b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Guns/Ammunition/Magazine/magnum.yml similarity index 64% rename from Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Guns/Ammunition/Magazine/caseless_rifle.yml rename to Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Guns/Ammunition/Magazine/magnum.yml index 488c81a54f..b452b27df2 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Guns/Ammunition/Magazine/caseless_rifle.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Guns/Ammunition/Magazine/magnum.yml @@ -1,22 +1,22 @@ - type: entity - id: BaseMagazineUniversalCaselessRifle - name: "Universal magazine (.25 caseless)" - parent: BaseMagazineCaselessRifle + id: BaseMagazineUniversalMagnum + name: "Universal magazine (.45 magnum)" + parent: BaseMagazinePistol abstract: true components: - type: Tag tags: - - MagazineUniversalCaselessRifle + - MagazineUniversalMagnum - type: BallisticAmmoProvider whitelist: tags: - - CartridgeCaselessRifle - proto: CartridgeCaselessRifle + - CartridgeMagnum + proto: CartridgeMagnum capacity: 12 - type: Item size: 5 - type: Sprite - sprite: Nyanotrasen/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_universal_mag.rsi + sprite: Nyanotrasen/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/caseless_universal_mag.rsi layers: - state: base map: ["enum.GunVisualLayers.Base"] @@ -31,12 +31,12 @@ # Magazines for the Universal Pistol - type: entity - id: MagazineUniversalCaselessRifle - name: "Universal magazine (.25 caseless)" - parent: BaseMagazineUniversalCaselessRifle + id: MagazineUniversalMagnum + name: "Universal magazine (.45 magnum)" + parent: BaseMagazineUniversalMagnum components: - type: BallisticAmmoProvider - proto: CartridgeCaselessRifle + proto: CartridgeMagnum capacity: 12 - type: Sprite layers: @@ -50,12 +50,12 @@ zeroVisible: false - type: entity - id: MagazineUniversalCaselessRifleHighVelocity - name: "Universal magazine (.25 caseless high-velocity)" - parent: BaseMagazineUniversalCaselessRifle + id: MagazineUniversalMagnumHighVelocity + name: "Universal magazine (.45 magnum high-velocity)" + parent: BaseMagazineUniversalMagnum components: - type: BallisticAmmoProvider - proto: CartridgeCaselessRifleHighVelocity + proto: CartridgeMagnumHighVelocity capacity: 12 - type: Sprite layers: @@ -69,12 +69,12 @@ zeroVisible: false - type: entity - id: MagazineUniversalCaselessRiflePractice - name: "Universal magazine (.25 caseless practice)" - parent: BaseMagazineUniversalCaselessRifle + id: MagazineUniversalMagnumPractice + name: "Universal magazine (.45 magnum practice)" + parent: BaseMagazineUniversalMagnum components: - type: BallisticAmmoProvider - proto: CartridgeCaselessRiflePractice + proto: CartridgeMagnumPractice capacity: 12 - type: Sprite layers: @@ -88,12 +88,12 @@ zeroVisible: false - type: entity - id: MagazineUniversalCaselessRifleRubber - name: "Universal magazine (.25 caseless rubber)" - parent: BaseMagazineUniversalCaselessRifle + id: MagazineUniversalMagnumRubber + name: "Universal magazine (.45 magnum rubber)" + parent: BaseMagazineUniversalMagnum components: - type: BallisticAmmoProvider - proto: CartridgeCaselessRifleRubber + proto: CartridgeMagnumRubber capacity: 12 - type: Sprite layers: diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Guns/Pistols/pistols.yml b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Guns/Pistols/pistols.yml index d7be301c2b..5fc1f4cdca 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Guns/Pistols/pistols.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Guns/Pistols/pistols.yml @@ -2,7 +2,7 @@ name: mk 32 "Universal" parent: BaseWeaponPistol id: WeaponPistolUniversal - description: An expensive and robust pistol with decent offensive capabilities. Uses .25 caseless ammo. + description: An expensive and robust pistol with decent offensive capabilities. Uses .45 magnum ammo. components: - type: Sprite sprite: Nyanotrasen/Objects/Weapons/Guns/Pistols/universal.rsi @@ -16,25 +16,25 @@ - type: Gun fireRate: 3 soundGunshot: - path: /Audio/Weapons/Guns/Gunshots/hpistol.ogg + path: /Audio/DeltaV/Weapons/Guns/Gunshots/universal.ogg - type: ItemSlots slots: gun_magazine: name: Magazine - startingItem: MagazineUniversalCaselessRifle + startingItem: MagazineUniversalMagnum insertSound: /Audio/Weapons/Guns/MagIn/pistol_magin.ogg ejectSound: /Audio/Weapons/Guns/MagOut/pistol_magout.ogg priority: 2 whitelist: tags: - - MagazineUniversalCaselessRifle + - MagazineUniversalMagnum gun_chamber: name: Chamber - startingItem: CartridgeCaselessRifle + startingItem: CartridgeMagnum priority: 1 whitelist: tags: - - CartridgeCaselessRifle + - CartridgeMagnum - type: ContainerContainer containers: gun_magazine: !type:ContainerSlot diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml index 7f19ae3a31..d714c3a57f 100644 --- a/Resources/Prototypes/tags.yml +++ b/Resources/Prototypes/tags.yml @@ -506,7 +506,7 @@ id: MagazineShotgun - type: Tag - id: MagazineUniversalCaselessRifle + id: MagazineUniversalMagnum - type: Tag id: MagazineMagnumSubMachineGun diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/pollock.rsi/base.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/pollock.rsi/base.png new file mode 100644 index 0000000000..81d70abe95 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/pollock.rsi/base.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/pollock.rsi/bolt-open.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/pollock.rsi/bolt-open.png new file mode 100644 index 0000000000..21dae187a3 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/pollock.rsi/bolt-open.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/pollock.rsi/equipped-BELT.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/pollock.rsi/equipped-BELT.png new file mode 100644 index 0000000000..52666b6192 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/pollock.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/pollock.rsi/icon.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/pollock.rsi/icon.png new file mode 100644 index 0000000000..8cfeb0987a Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/pollock.rsi/icon.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/pollock.rsi/inhand-left.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/pollock.rsi/inhand-left.png new file mode 100644 index 0000000000..7e1df839ce Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/pollock.rsi/inhand-left.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/pollock.rsi/inhand-right.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/pollock.rsi/inhand-right.png new file mode 100644 index 0000000000..d0e8068dae Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/pollock.rsi/inhand-right.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/pollock.rsi/mag-0.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/pollock.rsi/mag-0.png new file mode 100644 index 0000000000..a225b095d1 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/pollock.rsi/mag-0.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/pollock.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/pollock.rsi/meta.json new file mode 100644 index 0000000000..984eb3b868 --- /dev/null +++ b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/pollock.rsi/meta.json @@ -0,0 +1,35 @@ +{ + "version": 1, + "license": "CC0-1.0", + "copyright": "Original work by TJohnson.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "mag-0" + }, + { + "name": "bolt-open" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BELT", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/viperwood.rsi/bolt-open.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/viperwood.rsi/bolt-open.png new file mode 100644 index 0000000000..082e8463ea Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/viperwood.rsi/bolt-open.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/viperwood.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/viperwood.rsi/meta.json index 3d2232b80e..1d390175d5 100644 --- a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/viperwood.rsi/meta.json +++ b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/viperwood.rsi/meta.json @@ -19,6 +19,9 @@ { "name": "suppressor" }, + { + "name": "bolt-open" + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Revolvers/webleysnubnose.rsi/bolt-open.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Revolvers/webleysnubnose.rsi/bolt-open.png new file mode 100644 index 0000000000..e306212f39 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Revolvers/webleysnubnose.rsi/bolt-open.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Revolvers/webleysnubnose.rsi/icon.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Revolvers/webleysnubnose.rsi/icon.png index ede60284b4..575ea2ad78 100644 Binary files a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Revolvers/webleysnubnose.rsi/icon.png and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Revolvers/webleysnubnose.rsi/icon.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Revolvers/webleysnubnose.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Revolvers/webleysnubnose.rsi/meta.json index 8bd78b08c9..21dc63b86b 100644 --- a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Revolvers/webleysnubnose.rsi/meta.json +++ b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Revolvers/webleysnubnose.rsi/meta.json @@ -10,6 +10,9 @@ { "name": "icon" }, + { + "name": "bolt-open" + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/carbinenogl.rsi/base.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/carbinenogl.rsi/base.png new file mode 100644 index 0000000000..ad3b01ba9c Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/carbinenogl.rsi/base.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/carbinenogl.rsi/bolt-open.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/carbinenogl.rsi/bolt-open.png new file mode 100644 index 0000000000..119a03725e Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/carbinenogl.rsi/bolt-open.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/carbinenogl.rsi/equipped-BACKPACK.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/carbinenogl.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000..58563f1822 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/carbinenogl.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/carbinenogl.rsi/icon.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/carbinenogl.rsi/icon.png new file mode 100644 index 0000000000..7b7baaad15 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/carbinenogl.rsi/icon.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/carbinenogl.rsi/inhand-left.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/carbinenogl.rsi/inhand-left.png new file mode 100644 index 0000000000..5dfb70b2c4 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/carbinenogl.rsi/inhand-left.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/carbinenogl.rsi/inhand-right.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/carbinenogl.rsi/inhand-right.png new file mode 100644 index 0000000000..50cc43898d Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/carbinenogl.rsi/inhand-right.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/carbinenogl.rsi/mag-0.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/carbinenogl.rsi/mag-0.png new file mode 100644 index 0000000000..50feca5bb6 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/carbinenogl.rsi/mag-0.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/carbinenogl.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/carbinenogl.rsi/meta.json new file mode 100644 index 0000000000..013ebbce3f --- /dev/null +++ b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/carbinenogl.rsi/meta.json @@ -0,0 +1,35 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from Polaris at https://github.com/PolarisSS13/Polaris/commit/ff87150c3dfc387c46db7d1c956abf19ddff7819, backpack sprite by Peptide. Modified by TJohnson.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "mag-0" + }, + { + "name": "bolt-open" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/jackdaw.rsi/base.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/jackdaw.rsi/base.png new file mode 100644 index 0000000000..7bf391aa6c Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/jackdaw.rsi/base.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/jackdaw.rsi/bolt-open.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/jackdaw.rsi/bolt-open.png new file mode 100644 index 0000000000..e3fcd958f0 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/jackdaw.rsi/bolt-open.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/jackdaw.rsi/equipped-BACKPACK.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/jackdaw.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000..6bf1ff578c Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/jackdaw.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/jackdaw.rsi/icon.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/jackdaw.rsi/icon.png new file mode 100644 index 0000000000..fae3a84f7e Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/jackdaw.rsi/icon.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/jackdaw.rsi/inhand-left.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/jackdaw.rsi/inhand-left.png new file mode 100644 index 0000000000..5e24bdfce5 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/jackdaw.rsi/inhand-left.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/jackdaw.rsi/inhand-right.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/jackdaw.rsi/inhand-right.png new file mode 100644 index 0000000000..e3bcf6f339 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/jackdaw.rsi/inhand-right.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/jackdaw.rsi/mag-0.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/jackdaw.rsi/mag-0.png new file mode 100644 index 0000000000..2b3836a5e8 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/jackdaw.rsi/mag-0.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/jackdaw.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/jackdaw.rsi/meta.json new file mode 100644 index 0000000000..f3e24a3ea2 --- /dev/null +++ b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/jackdaw.rsi/meta.json @@ -0,0 +1,35 @@ +{ + "version": 1, + "license": "CC0-1.0", + "copyright": "Original work by TJohnson.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "mag-0" + }, + { + "name": "bolt-open" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/tenebra.rsi/base.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/tenebra.rsi/base.png new file mode 100644 index 0000000000..e242e459dc Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/tenebra.rsi/base.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/tenebra.rsi/bolt-open.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/tenebra.rsi/bolt-open.png new file mode 100644 index 0000000000..1552153581 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/tenebra.rsi/bolt-open.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/tenebra.rsi/equipped-BACKPACK.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/tenebra.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000..6276d5e3ff Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/tenebra.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/tenebra.rsi/icon.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/tenebra.rsi/icon.png new file mode 100644 index 0000000000..6b1019f406 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/tenebra.rsi/icon.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/tenebra.rsi/inhand-left.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/tenebra.rsi/inhand-left.png new file mode 100644 index 0000000000..6b9d8a59f4 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/tenebra.rsi/inhand-left.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/tenebra.rsi/inhand-right.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/tenebra.rsi/inhand-right.png new file mode 100644 index 0000000000..828a439d31 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/tenebra.rsi/inhand-right.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/tenebra.rsi/mag-0.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/tenebra.rsi/mag-0.png new file mode 100644 index 0000000000..148c42717e Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/tenebra.rsi/mag-0.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/tenebra.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/tenebra.rsi/meta.json new file mode 100644 index 0000000000..c6650f60b9 --- /dev/null +++ b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/tenebra.rsi/meta.json @@ -0,0 +1,35 @@ +{ + "version": 1, + "license": "CC0-1.0", + "copyright": "Original work by TJohnson.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "mag-0" + }, + { + "name": "bolt-open" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/SMGs/typewriter.rsi/bolt-open.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/SMGs/typewriter.rsi/bolt-open.png new file mode 100644 index 0000000000..54cec2d21a Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/SMGs/typewriter.rsi/bolt-open.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/SMGs/typewriter.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Weapons/Guns/SMGs/typewriter.rsi/meta.json index 3b8f4bcb99..02720779bb 100644 --- a/Resources/Textures/DeltaV/Objects/Weapons/Guns/SMGs/typewriter.rsi/meta.json +++ b/Resources/Textures/DeltaV/Objects/Weapons/Guns/SMGs/typewriter.rsi/meta.json @@ -19,6 +19,9 @@ { "name": "mag-1" }, + { + "name": "bolt-open" + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_universal_mag.rsi/base.png b/Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/caseless_universal_mag.rsi/base.png similarity index 100% rename from Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_universal_mag.rsi/base.png rename to Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/caseless_universal_mag.rsi/base.png diff --git a/Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_universal_mag.rsi/high_velocity.png b/Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/caseless_universal_mag.rsi/high_velocity.png similarity index 100% rename from Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_universal_mag.rsi/high_velocity.png rename to Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/caseless_universal_mag.rsi/high_velocity.png diff --git a/Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_universal_mag.rsi/mag-1.png b/Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/caseless_universal_mag.rsi/mag-1.png similarity index 100% rename from Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_universal_mag.rsi/mag-1.png rename to Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/caseless_universal_mag.rsi/mag-1.png diff --git a/Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_universal_mag.rsi/mag-10.png b/Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/caseless_universal_mag.rsi/mag-10.png similarity index 100% rename from Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_universal_mag.rsi/mag-10.png rename to Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/caseless_universal_mag.rsi/mag-10.png diff --git a/Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_universal_mag.rsi/mag-11.png b/Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/caseless_universal_mag.rsi/mag-11.png similarity index 100% rename from Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_universal_mag.rsi/mag-11.png rename to Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/caseless_universal_mag.rsi/mag-11.png diff --git a/Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_universal_mag.rsi/mag-2.png b/Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/caseless_universal_mag.rsi/mag-2.png similarity index 100% rename from Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_universal_mag.rsi/mag-2.png rename to Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/caseless_universal_mag.rsi/mag-2.png diff --git a/Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_universal_mag.rsi/mag-3.png b/Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/caseless_universal_mag.rsi/mag-3.png similarity index 100% rename from Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_universal_mag.rsi/mag-3.png rename to Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/caseless_universal_mag.rsi/mag-3.png diff --git a/Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_universal_mag.rsi/mag-4.png b/Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/caseless_universal_mag.rsi/mag-4.png similarity index 100% rename from Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_universal_mag.rsi/mag-4.png rename to Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/caseless_universal_mag.rsi/mag-4.png diff --git a/Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_universal_mag.rsi/mag-5.png b/Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/caseless_universal_mag.rsi/mag-5.png similarity index 100% rename from Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_universal_mag.rsi/mag-5.png rename to Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/caseless_universal_mag.rsi/mag-5.png diff --git a/Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_universal_mag.rsi/mag-6.png b/Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/caseless_universal_mag.rsi/mag-6.png similarity index 100% rename from Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_universal_mag.rsi/mag-6.png rename to Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/caseless_universal_mag.rsi/mag-6.png diff --git a/Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_universal_mag.rsi/mag-7.png b/Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/caseless_universal_mag.rsi/mag-7.png similarity index 100% rename from Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_universal_mag.rsi/mag-7.png rename to Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/caseless_universal_mag.rsi/mag-7.png diff --git a/Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_universal_mag.rsi/mag-8.png b/Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/caseless_universal_mag.rsi/mag-8.png similarity index 100% rename from Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_universal_mag.rsi/mag-8.png rename to Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/caseless_universal_mag.rsi/mag-8.png diff --git a/Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_universal_mag.rsi/mag-9.png b/Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/caseless_universal_mag.rsi/mag-9.png similarity index 100% rename from Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_universal_mag.rsi/mag-9.png rename to Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/caseless_universal_mag.rsi/mag-9.png diff --git a/Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_universal_mag.rsi/meta.json b/Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/caseless_universal_mag.rsi/meta.json similarity index 100% rename from Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_universal_mag.rsi/meta.json rename to Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/caseless_universal_mag.rsi/meta.json diff --git a/Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_universal_mag.rsi/practice.png b/Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/caseless_universal_mag.rsi/practice.png similarity index 100% rename from Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_universal_mag.rsi/practice.png rename to Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/caseless_universal_mag.rsi/practice.png diff --git a/Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_universal_mag.rsi/red-icon.png b/Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/caseless_universal_mag.rsi/red-icon.png similarity index 100% rename from Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_universal_mag.rsi/red-icon.png rename to Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/caseless_universal_mag.rsi/red-icon.png diff --git a/Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_universal_mag.rsi/red.png b/Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/caseless_universal_mag.rsi/red.png similarity index 100% rename from Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_universal_mag.rsi/red.png rename to Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/caseless_universal_mag.rsi/red.png diff --git a/Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_universal_mag.rsi/rubber.png b/Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/caseless_universal_mag.rsi/rubber.png similarity index 100% rename from Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_universal_mag.rsi/rubber.png rename to Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/caseless_universal_mag.rsi/rubber.png diff --git a/Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Pistols/universal.rsi/base.png b/Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Pistols/universal.rsi/base.png index 71dd8ffbe0..1779140b7f 100644 Binary files a/Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Pistols/universal.rsi/base.png and b/Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Pistols/universal.rsi/base.png differ diff --git a/Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Pistols/universal.rsi/bolt-open.png b/Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Pistols/universal.rsi/bolt-open.png new file mode 100644 index 0000000000..932c89e116 Binary files /dev/null and b/Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Pistols/universal.rsi/bolt-open.png differ diff --git a/Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Pistols/universal.rsi/icon.png b/Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Pistols/universal.rsi/icon.png index 7597947ac8..f602561671 100644 Binary files a/Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Pistols/universal.rsi/icon.png and b/Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Pistols/universal.rsi/icon.png differ diff --git a/Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Pistols/universal.rsi/mag-0.png b/Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Pistols/universal.rsi/mag-0.png index e4cd2e3457..8fd0aaea86 100644 Binary files a/Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Pistols/universal.rsi/mag-0.png and b/Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Pistols/universal.rsi/mag-0.png differ diff --git a/Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Pistols/universal.rsi/meta.json b/Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Pistols/universal.rsi/meta.json index 3f8331d5e6..18316c8565 100644 --- a/Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Pistols/universal.rsi/meta.json +++ b/Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Pistols/universal.rsi/meta.json @@ -16,6 +16,9 @@ { "name": "mag-0" }, + { + "name": "bolt-open" + }, { "name": "inhand-left", "directions": 4