From bd13a4b35723e64574264682e60a0b78eece9ace Mon Sep 17 00:00:00 2001 From: Vordenburg <114301317+Vordenburg@users.noreply.github.com> Date: Mon, 7 Aug 2023 21:08:53 -0400 Subject: [PATCH] Cull high-velocity ammo (#18656) --- .../Catalog/Fills/Boxes/ammunition.yml | 77 ------------------ .../VendingMachines/Inventories/ammo.yml | 7 +- .../Guns/Ammunition/Boxes/caseless_rifle.yml | 15 ---- .../Guns/Ammunition/Boxes/light_rifle.yml | 15 ---- .../Weapons/Guns/Ammunition/Boxes/magnum.yml | 15 ---- .../Weapons/Guns/Ammunition/Boxes/pistol.yml | 15 ---- .../Weapons/Guns/Ammunition/Boxes/rifle.yml | 15 ---- .../Ammunition/Cartridges/caseless_rifle.yml | 8 -- .../Ammunition/Cartridges/light_rifle.yml | 8 -- .../Guns/Ammunition/Cartridges/magnum.yml | 8 -- .../Guns/Ammunition/Cartridges/pistol.yml | 8 -- .../Guns/Ammunition/Cartridges/rifle.yml | 8 -- .../Ammunition/Magazines/caseless_rifle.yml | 49 ----------- .../Guns/Ammunition/Magazines/light_rifle.yml | 14 ---- .../Guns/Ammunition/Magazines/magnum.yml | 14 ---- .../Guns/Ammunition/Magazines/pistol.yml | 42 ---------- .../Guns/Ammunition/Magazines/rifle.yml | 14 ---- .../Ammunition/Projectiles/antimateriel.yml | 2 +- .../Ammunition/Projectiles/caseless_rifle.yml | 11 --- .../Ammunition/Projectiles/light_rifle.yml | 11 --- .../Guns/Ammunition/Projectiles/magnum.yml | 13 +-- .../Guns/Ammunition/Projectiles/pistol.yml | 11 --- .../Guns/Ammunition/Projectiles/rifle.yml | 11 --- .../Guns/Ammunition/SpeedLoaders/magnum.yml | 22 +---- .../Guns/Ammunition/SpeedLoaders/pistol.yml | 19 ----- .../Weapons/Guns/Projectiles/magic.yml | 4 +- .../Weapons/Guns/Projectiles/projectiles.yml | 15 +--- .../Entities/Structures/Machines/lathe.yml | 8 -- .../Prototypes/Recipes/Lathes/security.yml | 56 ------------- Resources/Prototypes/Research/arsenal.yml | 19 ----- .../Boxes/caseless_rifle.rsi/hv.png | Bin 308 -> 0 bytes .../Boxes/caseless_rifle.rsi/meta.json | 3 - .../Ammunition/Boxes/light_rifle.rsi/hv.png | Bin 264 -> 0 bytes .../Boxes/light_rifle.rsi/meta.json | 3 - .../Guns/Ammunition/Boxes/magnum.rsi/hv.png | Bin 137 -> 0 bytes .../Ammunition/Boxes/magnum.rsi/meta.json | 3 - .../Guns/Ammunition/Boxes/pistol.rsi/hv.png | Bin 276 -> 0 bytes .../Ammunition/Boxes/pistol.rsi/hvdisplay.png | Bin 456 -> 0 bytes .../Ammunition/Boxes/pistol.rsi/meta.json | 6 -- .../Guns/Ammunition/Boxes/rifle.rsi/hv.png | Bin 315 -> 0 bytes .../Guns/Ammunition/Boxes/rifle.rsi/meta.json | 3 - .../caseless_pistol_mag.rsi/high_velocity.png | Bin 223 -> 0 bytes .../caseless_pistol_mag.rsi/meta.json | 3 - .../caseless_rifle_mag.rsi/high_velocity.png | Bin 376 -> 0 bytes .../caseless_rifle_mag.rsi/meta.json | 5 +- .../high_velocity.png | Bin 368 -> 0 bytes .../caseless_rifle_mag_short.rsi/meta.json | 5 +- .../light_rifle_mag.rsi/high_velocity.png | Bin 236 -> 0 bytes .../LightRifle/light_rifle_mag.rsi/meta.json | 3 - .../magnum_smg_mag.rsi/high_velocity.png | Bin 225 -> 0 bytes .../Magnum/magnum_smg_mag.rsi/meta.json | 3 - .../high_velocity.png | Bin 226 -> 0 bytes .../pistol_high_capacity_mag.rsi/meta.json | 3 - .../Pistol/pistol_mag.rsi/high_velocity.png | Bin 221 -> 0 bytes .../Magazine/Pistol/pistol_mag.rsi/meta.json | 3 - .../Pistol/smg_mag.rsi/high_velocity.png | Bin 230 -> 0 bytes .../Magazine/Pistol/smg_mag.rsi/meta.json | 3 - .../Rifle/rifle_mag.rsi/high_velocity.png | Bin 244 -> 0 bytes .../Magazine/Rifle/rifle_mag.rsi/meta.json | 3 - .../high-velocity-1.png | Bin 171 -> 0 bytes .../high-velocity-2.png | Bin 173 -> 0 bytes .../high-velocity-3.png | Bin 174 -> 0 bytes .../high-velocity-4.png | Bin 177 -> 0 bytes .../high-velocity-5.png | Bin 186 -> 0 bytes .../high-velocity-6.png | Bin 192 -> 0 bytes .../Magnum/magnum_speed_loader.rsi/meta.json | 18 ---- .../high-velocity-1.png | Bin 2211 -> 0 bytes .../high-velocity-2.png | Bin 2309 -> 0 bytes .../high-velocity-3.png | Bin 2496 -> 0 bytes .../high-velocity-4.png | Bin 2547 -> 0 bytes .../high-velocity-5.png | Bin 2522 -> 0 bytes .../high-velocity-6.png | Bin 2527 -> 0 bytes .../Pistol/pistol_speed_loader.rsi/meta.json | 20 +---- Resources/migration.yml | 38 ++++++++- 74 files changed, 47 insertions(+), 612 deletions(-) delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/hv.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/hv.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/hv.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/hv.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/hvdisplay.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/hv.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/high_velocity.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/high_velocity.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi/high_velocity.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/high_velocity.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/high_velocity.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/high_velocity.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/high_velocity.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/high_velocity.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/high_velocity.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/high-velocity-1.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/high-velocity-2.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/high-velocity-3.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/high-velocity-4.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/high-velocity-5.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/high-velocity-6.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/high-velocity-1.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/high-velocity-2.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/high-velocity-3.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/high-velocity-4.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/high-velocity-5.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/high-velocity-6.png diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/ammunition.yml b/Resources/Prototypes/Catalog/Fills/Boxes/ammunition.yml index af7776e600..cd3eb15581 100644 --- a/Resources/Prototypes/Catalog/Fills/Boxes/ammunition.yml +++ b/Resources/Prototypes/Catalog/Fills/Boxes/ammunition.yml @@ -22,17 +22,6 @@ - id: MagazinePistolCaselessRifle amount: 6 -- type: entity - name: box of .25 caseless (high-velocity) magazines - parent: BoxMagazine - id: BoxMagazinePistolCaselessRifleHighVelocity - description: A box full of .25 caseless high-velocity magazines. - components: - - type: StorageFill - contents: - - id: MagazinePistolCaselessRifleHighVelocity - amount: 6 - - type: entity name: box of .25 caseless (practice) magazines parent: BoxMagazine @@ -67,17 +56,6 @@ - id: MagazineLightRifle amount: 6 -- type: entity - name: box of .30 rifle (high-velocity) magazines - parent: BoxMagazine - id: BoxMagazineLightRifleHighVelocity - description: A box full of .30 rifle (high-velocity) magazines. - components: - - type: StorageFill - contents: - - id: MagazineLightRifleHighVelocity - amount: 6 - - type: entity name: box of .30 rifle (practice) magazines parent: BoxMagazine @@ -126,17 +104,6 @@ - state: box_science - state: omegacart -- type: entity - name: box of Vector (high-velocity) magazines - parent: BoxMagazine - id: BoxMagazineMagnumSubMachineGunHighVelocity - description: A box full of Vector (high-velocity) magazines. - components: - - type: StorageFill - contents: - - id: MagazineMagnumSubMachineGunHighVelocity - amount: 3 - - type: entity name: box of Vector (practice) magazines parent: BoxMagazine @@ -182,17 +149,6 @@ - id: MagazinePistol amount: 6 -- type: entity - name: box of pistol .35 auto (high-velocity) magazines - parent: BoxMagazine - id: BoxMagazinePistolHighVelocity - description: A box full of pistol .35 auto (high-velocity) magazines. - components: - - type: StorageFill - contents: - - id: MagazinePistolHighVelocity - amount: 6 - - type: entity name: box of pistol .35 auto (practice) magazines parent: BoxMagazine @@ -226,17 +182,6 @@ - id: MagazinePistolHighCapacity amount: 6 -- type: entity - name: box of machine pistol .35 auto (high-velocity) magazines - parent: BoxMagazine - id: BoxMagazinePistolHighCapacityHighVelocity - description: A box full of machine pistol .35 auto (high-velocity) magazines. - components: - - type: StorageFill - contents: - - id: MagazinePistolHighCapacityHighVelocity - amount: 6 - - type: entity name: box of machine pistol .35 auto (practice) magazines parent: BoxMagazine @@ -271,17 +216,6 @@ - id: MagazinePistolSubMachineGun amount: 3 -- type: entity - name: box of SMG .35 auto (high-velocity) magazines - parent: BoxMagazine - id: BoxMagazinePistolSubMachineGunHighVelocity - description: A box full of SMG .35 auto (high-velocity) magazines. - components: - - type: StorageFill - contents: - - id: MagazinePistolSubMachineGunHighVelocity - amount: 3 - - type: entity name: box of SMG .35 auto (practice) magazines parent: BoxMagazine @@ -479,17 +413,6 @@ - id: MagazineRifle amount: 6 -- type: entity - name: box of .20 rifle (high-velocity) magazines - parent: BoxMagazine - id: BoxMagazineRifleHighVelocity - description: A box full of .20 rifle (high-velocity) magazines. - components: - - type: StorageFill - contents: - - id: MagazineRifleHighVelocity - amount: 6 - - type: entity name: box of .20 rifle (practice) magazines parent: BoxMagazine diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/ammo.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/ammo.yml index 999914eb42..3c539243c9 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/ammo.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/ammo.yml @@ -1,27 +1,22 @@ -- type: vendingMachineInventory +- type: vendingMachineInventory id: AmmoVendInventory startingInventory: MagazineBoxCaselessRifle: 3 - MagazineBoxCaselessRifleHighVelocity: 3 MagazineBoxCaselessRiflePractice: 3 MagazineBoxCaselessRifleRubber: 3 MagazineBoxLightRifleBig: 3 - MagazineBoxLightRifleHighVelocity: 3 MagazineBoxLightRiflePractice: 3 MagazineBoxLightRifleRubber: 3 MagazineBoxMagnum: 3 - MagazineBoxMagnumHighVelocity: 3 MagazineBoxMagnumPractice: 3 MagazineBoxMagnumRubber: 3 MagazineBoxPistol: 3 - MagazineBoxPistolHighVelocity: 3 MagazineBoxPistolPractice: 3 MagazineBoxPistolRubber: 3 MagazineBoxRifle: 3 - MagazineBoxRifleHighVelocity: 3 MagazineBoxRiflePractice: 3 MagazineBoxRifleRubber: 3 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.yml index 6e73310a85..4a77bfcfc5 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.yml @@ -100,21 +100,6 @@ - state: mag-1 map: ["enum.GunVisualLayers.Mag"] -- type: entity - parent: BaseMagazineBoxCaselessRifle - id: MagazineBoxCaselessRifleHighVelocity - name: ammunition box (.25 caseless high-velocity) - components: - - type: BallisticAmmoProvider - proto: CartridgeCaselessRifleHighVelocity - - type: Sprite - layers: - - state: base - map: ["enum.GunVisualLayers.Base"] - - state: mag-1 - map: ["enum.GunVisualLayers.Mag"] - - state: hv - - type: entity parent: BaseMagazineBoxCaselessRifle id: MagazineBoxCaselessRiflePractice diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.yml index 7018ff3764..1c8fbc26e1 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.yml @@ -59,21 +59,6 @@ - state: mag-1 map: ["enum.GunVisualLayers.Mag"] -- type: entity - parent: BaseMagazineBoxLightRifle - id: MagazineBoxLightRifleHighVelocity - name: ammunition box (.30 rifle high-velocity) - components: - - type: BallisticAmmoProvider - proto: CartridgeLightRifleHighVelocity - - type: Sprite - layers: - - state: base - map: ["enum.GunVisualLayers.Base"] - - state: mag-1 - map: ["enum.GunVisualLayers.Mag"] - - state: hv - - type: entity parent: BaseMagazineBoxLightRifle id: MagazineBoxLightRiflePractice diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/magnum.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/magnum.yml index 9f7adc7868..5a9a850e9c 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/magnum.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/magnum.yml @@ -38,21 +38,6 @@ - state: mag-1 map: ["enum.GunVisualLayers.Mag"] -- type: entity - parent: BaseMagazineBoxMagnum - id: MagazineBoxMagnumHighVelocity - name: ammunition box (.45 magnum high-velocity) - components: - - type: BallisticAmmoProvider - proto: CartridgeMagnumHighVelocity - - type: Sprite - layers: - - state: base - map: ["enum.GunVisualLayers.Base"] - - state: mag-1 - map: ["enum.GunVisualLayers.Mag"] - - state: hv - - type: entity parent: BaseMagazineBoxMagnum id: MagazineBoxMagnumPractice diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/pistol.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/pistol.yml index d8bab16cdb..a9a78f399a 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/pistol.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/pistol.yml @@ -39,21 +39,6 @@ - state: mag-1 map: ["enum.GunVisualLayers.Mag"] -- type: entity - parent: BaseMagazineBoxPistol - id: MagazineBoxPistolHighVelocity - name: ammunition box (.35 auto high-velocity) - components: - - type: BallisticAmmoProvider - proto: CartridgePistolHighVelocity - - type: Sprite - layers: - - state: base - map: ["enum.GunVisualLayers.Base"] - - state: mag-1 - map: ["enum.GunVisualLayers.Mag"] - - state: hv - - type: entity parent: BaseMagazineBoxPistol id: MagazineBoxPistolPractice diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/rifle.yml index 260237c3c0..3725ad91af 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/rifle.yml @@ -79,21 +79,6 @@ - state: mag-1 map: ["enum.GunVisualLayers.Mag"] -- type: entity - parent: BaseMagazineBoxRifle - id: MagazineBoxRifleHighVelocity - name: ammunition box (.20 rifle high-velocity) - components: - - type: BallisticAmmoProvider - proto: CartridgeRifleHighVelocity - - type: Sprite - layers: - - state: base - map: ["enum.GunVisualLayers.Base"] - - state: mag-1 - map: ["enum.GunVisualLayers.Mag"] - - state: hv - - type: entity parent: BaseMagazineBoxRifle id: MagazineBoxRiflePractice diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/caseless_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/caseless_rifle.yml index 87df215fe3..4a8e64d9a1 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/caseless_rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/caseless_rifle.yml @@ -29,14 +29,6 @@ - type: CartridgeAmmo proto: BulletCaselessRifle -- type: entity - id: CartridgeCaselessRifleHighVelocity - name: cartridge (.25 caseless high-velocity) - parent: BaseCartridgeCaselessRifle - components: - - type: CartridgeAmmo - proto: BulletCaselessRifleHighVelocity - - type: entity id: CartridgeCaselessRiflePractice name: cartridge (.25 caseless practice) diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/light_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/light_rifle.yml index 248a919ced..c595ea141e 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/light_rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/light_rifle.yml @@ -28,14 +28,6 @@ - type: CartridgeAmmo proto: BulletLightRifle -- type: entity - id: CartridgeLightRifleHighVelocity - name: cartridge (.30 rifle high-velocity) - parent: BaseCartridgeLightRifle - components: - - type: CartridgeAmmo - proto: BulletLightRifleHighVelocity - - type: entity id: CartridgeLightRiflePractice name: cartridge (.30 rifle practice) diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/magnum.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/magnum.yml index 4309471c8e..2368b81269 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/magnum.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/magnum.yml @@ -28,14 +28,6 @@ - type: CartridgeAmmo proto: BulletMagnum -- type: entity - id: CartridgeMagnumHighVelocity - name: cartridge (.45 magnum high-velocity) - parent: BaseCartridgeMagnum - components: - - type: CartridgeAmmo - proto: BulletMagnumHighVelocity - - type: entity id: CartridgeMagnumPractice name: cartridge (.45 magnum practice) diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml index 0210b78c31..828251ade7 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml @@ -28,14 +28,6 @@ - type: CartridgeAmmo proto: BulletPistol -- type: entity - id: CartridgePistolHighVelocity - name: cartridge (.35 auto high-velocity) - parent: BaseCartridgePistol - components: - - type: CartridgeAmmo - proto: BulletPistolHighVelocity - - type: entity id: CartridgePistolPractice name: cartridge (.35 auto practice) diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/rifle.yml index f30aa1a372..4a6229ea2a 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/rifle.yml @@ -28,14 +28,6 @@ - type: CartridgeAmmo proto: BulletRifle -- type: entity - id: CartridgeRifleHighVelocity - name: cartridge (.20 rifle high-velocity) - parent: BaseCartridgeRifle - components: - - type: CartridgeAmmo - proto: BulletRifleHighVelocity - - type: entity id: CartridgeRiflePractice name: cartridge (.20 rifle practice) diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/caseless_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/caseless_rifle.yml index c746534674..773ff01ed8 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/caseless_rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/caseless_rifle.yml @@ -112,26 +112,6 @@ zeroVisible: false - type: Appearance -- type: entity - id: MagazinePistolCaselessRifleHighVelocity - name: "pistol magazine (.25 caseless high-velocity)" - parent: BaseMagazinePistolCaselessRifle - components: - - type: BallisticAmmoProvider - proto: CartridgeCaselessRifleHighVelocity - capacity: 10 - - type: Sprite - layers: - - state: high_velocity - map: ["enum.GunVisualLayers.Base"] - - state: mag-1 - map: ["enum.GunVisualLayers.Mag"] - - type: MagazineVisuals - magState: mag - steps: 6 - zeroVisible: false - - type: Appearance - - type: entity id: MagazinePistolCaselessRiflePractice name: "pistol magazine (.25 caseless practice)" @@ -186,20 +166,6 @@ - state: mag-1 map: ["enum.GunVisualLayers.Mag"] -- type: entity - id: MagazineCaselessRifleHighVelocity - name: "magazine (.25 caseless high-velocity)" - parent: BaseMagazineCaselessRifle - components: - - type: BallisticAmmoProvider - proto: CartridgeCaselessRifleHighVelocity - - type: Sprite - layers: - - state: high_velocity - map: ["enum.GunVisualLayers.Base"] - - state: mag-1 - map: ["enum.GunVisualLayers.Mag"] - - type: entity id: MagazineCaselessRiflePractice name: "magazine (.25 caseless practice)" @@ -243,21 +209,6 @@ - state: mag-1 map: ["enum.GunVisualLayers.Mag"] -- type: entity - id: MagazineCaselessRifleShortHighVelocity - name: "short magazine (.25 caseless high-velocity)" - parent: BaseMagazineCaselessRifleShort - components: - - type: BallisticAmmoProvider - proto: CartridgeCaselessRifleHighVelocity - capacity: 20 - - type: Sprite - layers: - - state: high_velocity - map: ["enum.GunVisualLayers.Base"] - - state: mag-1 - map: ["enum.GunVisualLayers.Mag"] - - type: entity id: MagazineCaselessRifleShortPractice name: "short magazine (.25 caseless practice)" diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml index f09d3e3bb6..e586364369 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml @@ -68,20 +68,6 @@ - state: mag-1 map: ["enum.GunVisualLayers.Mag"] -- type: entity - id: MagazineLightRifleHighVelocity - name: "magazine (.30 rifle high-velocity)" - parent: BaseMagazineLightRifle - components: - - type: BallisticAmmoProvider - proto: CartridgeLightRifleHighVelocity - - type: Sprite - layers: - - state: high_velocity - map: ["enum.GunVisualLayers.Base"] - - state: mag-1 - map: ["enum.GunVisualLayers.Mag"] - - type: entity id: MagazineLightRiflePractice name: "magazine (.30 rifle practice)" diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml index ab439303c9..6060898d49 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml @@ -45,20 +45,6 @@ - state: mag-1 map: ["enum.GunVisualLayers.Mag"] -- type: entity - id: MagazineMagnumSubMachineGunHighVelocity - name: "Vector magazine (.45 magnum High-Velocity)" - parent: BaseMagazineMagnumSubMachineGun - components: - - type: BallisticAmmoProvider - proto: CartridgeMagnumHighVelocity - - type: Sprite - layers: - - state: high_velocity - map: ["enum.GunVisualLayers.Base"] - - state: mag-1 - map: ["enum.GunVisualLayers.Mag"] - - type: entity id: MagazineMagnumSubMachineGunPractice name: "Vector magazine (.45 magnum practice)" diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml index 42bb148742..4ed38fdeb3 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml @@ -142,20 +142,6 @@ - state: mag-1 map: ["enum.GunVisualLayers.Mag"] -- type: entity - id: MagazinePistolHighVelocity - name: pistol magazine (.35 auto high-velocity) - parent: BaseMagazinePistol - components: - - type: BallisticAmmoProvider - proto: CartridgePistolHighVelocity - - type: Sprite - layers: - - state: high_velocity - map: ["enum.GunVisualLayers.Base"] - - state: mag-1 - map: ["enum.GunVisualLayers.Mag"] - - type: entity id: MagazinePistolPractice name: pistol magazine (.35 auto practice) @@ -198,20 +184,6 @@ - state: mag-1 map: ["enum.GunVisualLayers.Mag"] -- type: entity - id: MagazinePistolHighCapacityHighVelocity - name: machine pistol magazine (.35 auto high-velocity) - parent: BaseMagazinePistolHighCapacity - components: - - type: BallisticAmmoProvider - proto: CartridgePistolHighVelocity - - type: Sprite - layers: - - state: high_velocity - map: ["enum.GunVisualLayers.Base"] - - state: mag-1 - map: ["enum.GunVisualLayers.Mag"] - - type: entity id: MagazinePistolHighCapacityPractice name: machine pistol magazine (.35 auto practice) @@ -260,20 +232,6 @@ - state: mag-1 map: ["enum.GunVisualLayers.Mag"] -- type: entity - id: MagazinePistolSubMachineGunHighVelocity - name: SMG magazine (.35 auto high-velocity) - parent: BaseMagazinePistolSubMachineGun - components: - - type: BallisticAmmoProvider - proto: CartridgePistolHighVelocity - - type: Sprite - layers: - - state: high_velocity - map: ["enum.GunVisualLayers.Base"] - - state: mag-1 - map: ["enum.GunVisualLayers.Mag"] - - type: entity id: MagazinePistolSubMachineGunPractice name: SMG magazine (.35 auto practice) diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle.yml index d2b0ea32ea..ca1f9b8de2 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle.yml @@ -47,20 +47,6 @@ - state: mag-1 map: ["enum.GunVisualLayers.Mag"] -- type: entity - id: MagazineRifleHighVelocity - name: "magazine (.20 rifle high-velocity)" - parent: BaseMagazineRifle - components: - - type: BallisticAmmoProvider - proto: CartridgeRifleHighVelocity - - type: Sprite - layers: - - state: high_velocity - map: ["enum.GunVisualLayers.Base"] - - state: mag-1 - map: ["enum.GunVisualLayers.Mag"] - - type: entity id: MagazineRiflePractice name: "magazine (.20 rifle practice)" diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/antimateriel.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/antimateriel.yml index a86de79aa0..2e4a7271f4 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/antimateriel.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/antimateriel.yml @@ -1,6 +1,6 @@ - type: entity noSpawn: true - parent: BaseBulletHighVelocity + parent: BaseBullet id: BulletAntiMateriel name: bullet (.60 anti-materiel) components: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/caseless_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/caseless_rifle.yml index 694d9589de..5ce0bf82fe 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/caseless_rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/caseless_rifle.yml @@ -9,17 +9,6 @@ types: Piercing: 19 -- type: entity - id: BulletCaselessRifleHighVelocity - name: bullet (.25 caseless high-velocity) - parent: BaseBulletHighVelocity - noSpawn: true - components: - - type: Projectile - damage: - types: - Piercing: 22 - - type: entity id: BulletCaselessRiflePractice name: bullet (.25 caseless practice) diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/light_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/light_rifle.yml index 8bf5ce5e62..315f1af7e1 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/light_rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/light_rifle.yml @@ -9,17 +9,6 @@ types: Piercing: 19 -- type: entity - id: BulletLightRifleHighVelocity - name: bullet (.20 rifle high-velocity) - parent: BaseBulletHighVelocity - noSpawn: true - components: - - type: Projectile - damage: - types: - Piercing: 21 - - type: entity id: BulletLightRiflePractice name: bullet (.20 rifle practice) diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/magnum.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/magnum.yml index c6ed5e3d6e..2da1e190d9 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/magnum.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/magnum.yml @@ -9,17 +9,6 @@ types: Piercing: 35 -- type: entity - id: BulletMagnumHighVelocity - name: bullet (.45 magnum high-velocity) - parent: BaseBulletHighVelocity - noSpawn: true - components: - - type: Projectile - damage: - types: - Piercing: 44 # 25% increase - - type: entity id: BulletMagnumPractice name: bullet (.45 magnum practice) @@ -65,4 +54,4 @@ damage: types: Piercing: 26 # 20% decrease - ignoreResistances: true \ No newline at end of file + ignoreResistances: true diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/pistol.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/pistol.yml index 8474160ef7..f3e7d1e6ba 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/pistol.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/pistol.yml @@ -9,17 +9,6 @@ types: Piercing: 16 -- type: entity - id: BulletPistolHighVelocity - name: bullet (.35 auto high-velocity) - parent: BaseBulletHighVelocity - noSpawn: true - components: - - type: Projectile - damage: - types: - Piercing: 19 - - type: entity id: BulletPistolPractice name: bullet (.35 auto practice) diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/rifle.yml index c3a0496e18..009ab6bbb4 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/rifle.yml @@ -9,17 +9,6 @@ types: Piercing: 17 -- type: entity - id: BulletRifleHighVelocity - name: bullet (0.20 rifle high-velocity) - parent: BaseBulletHighVelocity - noSpawn: true - components: - - type: Projectile - damage: - types: - Piercing: 21 - - type: entity id: BulletRiflePractice name: bullet (0.20 rifle practice) diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/magnum.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/magnum.yml index b3d63c3c0e..9926b0cf5b 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/magnum.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/magnum.yml @@ -39,26 +39,6 @@ zeroVisible: false - type: Appearance -- type: entity - id: SpeedLoaderMagnumHighVelocity - name: "speed loader (.45 magnum high-velocity)" - parent: BaseSpeedLoaderMagnum - components: - - type: BallisticAmmoProvider - proto: CartridgeMagnumHighVelocity - - type: Sprite - sprite: Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi - layers: - - state: base - map: [ "enum.GunVisualLayers.Base" ] - - state: high-velocity-6 - map: [ "enum.GunVisualLayers.Mag" ] - - type: MagazineVisuals - magState: high-velocity - steps: 7 - zeroVisible: false - - type: Appearance - - type: entity id: SpeedLoaderMagnumPractice name: "speed loader (.45 magnum practice)" @@ -117,4 +97,4 @@ magState: base steps: 7 zeroVisible: false - - type: Appearance \ No newline at end of file + - type: Appearance diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/pistol.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/pistol.yml index ef869fe4be..1fef25f16f 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/pistol.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/pistol.yml @@ -39,25 +39,6 @@ zeroVisible: false - type: Appearance -- type: entity - id: SpeedLoaderPistolHighVelocity - name: "speed loader (.35 auto high-velocity)" - parent: BaseSpeedLoaderPistol - components: - - type: BallisticAmmoProvider - proto: CartridgePistolHighVelocity - - type: Sprite - layers: - - state: base - map: ["enum.GunVisualLayers.Base"] - - state: high-velocity-6 - map: ["enum.GunVisualLayers.Mag"] - - type: MagazineVisuals - magState: high-velocity - steps: 7 - zeroVisible: false - - type: Appearance - - type: entity id: SpeedLoaderPistolPractice name: "speed loader (.35 auto practice)" diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/magic.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/magic.yml index 06479d26ae..bd789402d2 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/magic.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/magic.yml @@ -102,7 +102,7 @@ - type: entity id: BulletInstakillMagic name: magical lead cylinder - parent: BaseBulletHighVelocity + parent: BaseBullet noSpawn: true description: This looks familiar. components: @@ -127,7 +127,7 @@ - type: entity id: ProjectileIcicle - parent: BaseBulletHighVelocity + parent: BaseBullet name: Icicle description: Brrrrr. noSpawn: true diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml index f0821be2d9..f9917e7294 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml @@ -89,17 +89,6 @@ - BulletImpassable fly-by: *flybyfixture -- type: entity - id: BaseBulletHighVelocity - name: base bullet high-velocity - parent: BaseBullet - noSpawn: true - components: - - type: Projectile - damage: - types: - Piercing: 17 - - type: entity id: BaseBulletPractice name: base bullet practice @@ -321,7 +310,7 @@ - type: entity id: BulletKinetic name: kinetic bolt - parent: BaseBulletHighVelocity + parent: BaseBullet noSpawn: true description: Not too bad, but you still don't want to get hit by it. components: @@ -347,7 +336,7 @@ - type: entity id: BulletCharge name: charge bolt - parent: BaseBulletHighVelocity + parent: BaseBullet noSpawn: true description: Marks a target for additional damage. components: diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 441fbb6e30..3beddd7e9f 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -483,14 +483,6 @@ - MagazineBoxMagnumRubber - MagazineBoxRifleRubber - MagazineBoxLightRifleRubber - - CartridgePistolHighVelocity - - CartridgeMagnumHighVelocity - - CartridgeLightRifleHighVelocity - - CartridgeRifleHighVelocity - - MagazineBoxPistolHighVelocity - - MagazineBoxMagnumHighVelocity - - MagazineBoxLightRifleHighVelocity - - MagazineBoxRifleHighVelocity - ShellShotgunIncendiary - CartridgePistolIncendiary - CartridgeMagnumIncendiary diff --git a/Resources/Prototypes/Recipes/Lathes/security.yml b/Resources/Prototypes/Recipes/Lathes/security.yml index d995a7701e..efe6e0db84 100644 --- a/Resources/Prototypes/Recipes/Lathes/security.yml +++ b/Resources/Prototypes/Recipes/Lathes/security.yml @@ -304,62 +304,6 @@ Steel: 350 Plastic: 600 -- type: latheRecipe - id: CartridgePistolHighVelocity - result: CartridgePistolHighVelocity - completetime: 2 - materials: - Steel: 20 - -- type: latheRecipe - id: CartridgeMagnumHighVelocity - result: CartridgeMagnumHighVelocity - completetime: 2 - materials: - Steel: 40 - -- type: latheRecipe - id: CartridgeLightRifleHighVelocity - result: CartridgeLightRifleHighVelocity - completetime: 2 - materials: - Steel: 40 - -- type: latheRecipe - id: CartridgeRifleHighVelocity - result: CartridgeRifleHighVelocity - completetime: 2 - materials: - Steel: 30 - -- type: latheRecipe - id: MagazineBoxPistolHighVelocity - result: MagazineBoxPistolHighVelocity - completetime: 5 - materials: - Steel: 1250 - -- type: latheRecipe - id: MagazineBoxMagnumHighVelocity - result: MagazineBoxMagnumHighVelocity - completetime: 5 - materials: - Steel: 2450 - -- type: latheRecipe - id: MagazineBoxLightRifleHighVelocity - result: MagazineBoxLightRifleHighVelocity - completetime: 5 - materials: - Steel: 2050 - -- type: latheRecipe - id: MagazineBoxRifleHighVelocity - result: MagazineBoxRifleHighVelocity - completetime: 5 - materials: - Steel: 1850 - - type: latheRecipe id: ShellShotgunIncendiary result: ShellShotgunIncendiary diff --git a/Resources/Prototypes/Research/arsenal.yml b/Resources/Prototypes/Research/arsenal.yml index 1b5d739213..32abc1ba04 100644 --- a/Resources/Prototypes/Research/arsenal.yml +++ b/Resources/Prototypes/Research/arsenal.yml @@ -87,25 +87,6 @@ # Tier 2 -- type: technology - id: OptimizedBallistics - name: research-technology-optimized-ballistics - icon: - sprite: Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi - state: hvdisplay - discipline: Arsenal - tier: 2 - cost: 7500 - recipeUnlocks: - - CartridgePistolHighVelocity - - CartridgeMagnumHighVelocity - - CartridgeLightRifleHighVelocity - - CartridgeRifleHighVelocity - - MagazineBoxPistolHighVelocity - - MagazineBoxMagnumHighVelocity - - MagazineBoxLightRifleHighVelocity - - MagazineBoxRifleHighVelocity - - type: technology id: ConcentratedLaserWeaponry name: research-technology-concentrated-laser-weaponry diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/hv.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/hv.png deleted file mode 100644 index 0cf417216494258bdd8f2ac287089e3ffe761b0b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 308 zcmV-40n7f0P)90eeY zK^SBax=+z9-#Xy{?Ghm@1VEPFxO0;M7Ba+I4gwS^|_&e&33;MQu+{h#i(;ViI3xuav>& zs@U)@Tf%qEQw4`W4h8F$komz^8Bg#zZmaoykDDi2UFN`S4$YziYm4U>e(KyP!=mBE zoaMGB!Mj}c&(Q~I=iN2|H5Q6A$TaeJY^(u0o6C)n83-867KTXb8*tADdX2%;)z4*} HQ$iB}PL^W0 diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/meta.json index 787a519c84..583b7e9393 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi/meta.json @@ -19,9 +19,6 @@ { "name": "magb-1" }, - { - "name": "hv" - }, { "name": "incendiary" }, diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/hv.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/hv.png deleted file mode 100644 index 6e64601f6b53545442b5b5376ecfe071feaf50d3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 137 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ08bakkcie~3D(64B0Wuk23&3j zH55d*ocZ`$UTm7%)`DcE(8H~-`z5~IiTfjOzaVz hwK4J?IB#!Z(TrW@-kGas(r(RxB` za*`!Sz!WwIJ9qx7l+)Ya?>(@g^bq4K^+R9!^m(?Qt36i0v2xnvw+y+ia&7lwdo=hQ z%LF!p1ZF5Z{4k!cczDXc?J1Fd6PXPx$f=NU{R9J=Wk}*gEQ5eU6hBOAz=3ui_bZybnO)XKAE>5;MNP`a15IO`7x#-|@ z5Jp2w4Pr<`1cC%E*+EzkffU*%4!Sg5lgF8zckfUlxc~Ov$NPT2_wj)nH*Wqoo^i!W zrDD5L{yMG!?C<18ddjkF`p#>cU;&o`eoK+52pHi2q9QYsgol0IArUFyXFD!yQxO;k zA4GlmuR!t2%c zkVtQCjeNG_2o4rYSS%#9Xe0!LXw^=J;Pq-7&*~oc4{!P}MB$bK0F9?d0G3t`SzbgJ z8Ndh0ocAazVsKjmW+KYjrCw9tzep*k!f+u0qloe6jb`6594wZw(d?sKsblL$$63d4 yu$aK0c{-KQ0HQ%@qHs$AGZEvR8#iwLeZB#J>e8q+vdqE&0000utmIH7(1X*kpjDk@xbN~Yb0|2%ya(bSljN1SJ N002ovPDHLkV1mI#evbeE diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/meta.json index 4cb2a76ac5..08e598b8b8 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/meta.json @@ -19,9 +19,6 @@ { "name": "magb-1" }, - { - "name": "hv" - }, { "name": "incendiary" }, diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/high_velocity.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/high_velocity.png deleted file mode 100644 index 5ac05763759a0a64e59b74fd989779be99cca5f5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 223 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv#^NA%C&rs6b?Si}&H|6fVg?3o zVGw3ym^DWNC@2x&6XFV_?d|PDLqj<@I8;?t8N3+yvKUmSG6b?*xDS-$C<*clX7~>Q zS5Ji)0mXbgT^vIy<|HRb+;I@#2w-XH5fKe!kzsXp31H>9$jY%YK~SWm#8E6kOsu5D zL9oC@yx>?!Vu#X!S#ff54T}yPJ$i(}^?(G21e-Yn!$mnRrV7PrhCp)}JYD@<);T3K F0RUtGI#mDw diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/meta.json index 7a9840a0b1..7ae6c4a71a 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/meta.json @@ -10,9 +10,6 @@ { "name": "base" }, - { - "name": "high_velocity" - }, { "name": "practice" }, diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/high_velocity.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/high_velocity.png deleted file mode 100644 index 5d4f0f47b868b59ba53189eca3a8c2513f52551f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 376 zcmV-;0f+vHP)gir6%^z!x8+_sVBNUn( zKyog)apxx4mSF>oq&CSCl5_tH2uWfskQf*sh0>yB>llbFmPrl)YUc*B3L+ zT!j)T!B4gWaMk?}9y}t+as~zx%K>EY;oWnF3usY6PNRh6TtICwv}(gq2aGy^761VJ WyKsnUIOmA~0000Lf6LrA0t!?8hr1|Zmkua1Ozim2U~Xx^Agdrjk|RiVK#uPO#tYXU!7aXY zKp8G~^7sW(jUz1^!obs$nhZ=YB{0Nc(en*QS%D3Zl?aj30yfJhPH!N(SZ1W8S)QNS z@E^GZB-L^T1`5l8iPIYxzrB6V0K=qO&cHxn2v7qI{i1l(0izC}6aWDGCT$STwznAo O0000lo~O-;SLyt1;g7`zym3z$`>GAz;E#txL@C<*clX7~>Q zS5Ji)0mULcT^vIy<|HRbI4CS>P*ZrLp`p>B^x(~#9wmh*Pg=ADrcIkB)}SL07Z=y3 zB*4YexT0;<3W-G=D+GiRj))jIm2xbeD7>tJYu4?ly@9M#dIR@rYiOJ>*ulUMvzFib U&^6niKuZ`rUHx3vIVCg!0JO?S9smFU diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/meta.json index 40e76cad7c..dc6dc886cb 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_mag.rsi/meta.json @@ -10,9 +10,6 @@ { "name": "base" }, - { - "name": "high_velocity" - }, { "name": "practice" }, diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/high_velocity.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/high_velocity.png deleted file mode 100644 index 656c4fa115ef60d819c7b908b0f06f7adc637fbb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 225 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv#^NA%C&rs6b?Si}&H|6fVg?3o zVGw3ym^DWNC@3A^6XFV_m6es#($c0*o$Bc5D6gO4@j1Q8cu0V6RH2SI@_qc9iYfFc*eLnn^9GK4yKwz@DT zii(RE8|oYs;gAzZUow6A^o1NLB_&%Hax7tVWMY2Hz;J7mfc@#j%kn@|89ZJ6T-G@y GGywn>n?8a7 diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/meta.json index ef6749e019..dc2364cfed 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/meta.json @@ -10,9 +10,6 @@ { "name": "base" }, - { - "name": "high_velocity" - }, { "name": "practice" }, diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/high_velocity.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_high_capacity_mag.rsi/high_velocity.png deleted file mode 100644 index a185c2c4412a550c2c2ffc44428d18159ee7ce63..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 226 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv#^NA%C&rs6b?Si}&H|6fVg?3o zVGw3ym^DWNC@2@;6XFV_6A}_iN=nwPTQ_CO6l-g11}_G_EC$u745nw9&af%?0#$I8 z1o;Is{D*BOLu2FOIgMcq45@#_49YtdEP+Ncc)I$z JtaD0e0sz7AL&5+6 diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/meta.json index 6fc0edd751..8e095fd2f1 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/meta.json @@ -10,9 +10,6 @@ { "name": "base" }, - { - "name": "high_velocity" - }, { "name": "practice" }, diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/high_velocity.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/high_velocity.png deleted file mode 100644 index e79fd8b9989ba3e5fd3d6cdbcc64f82a9b686ae0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 244 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv#^NA%C&rs6b?Si}&H|6fVg?3o zVGw3ym^DWNC@2x&6XFV@#icaVRAgmk9c(NZ^%)tw7*wY+h`ye13Mj`>666=m@E-!M zo(eGniY0owIEGZrNluV(P|#>lQ&7?9&{A8nWJ!xw!XlL>#RVNY0@Hw?OGh9M2!Iq9 zlSZ0`wWgI4w?PtzhLxt3;_cHbRGMB1@Gve&pTZIt!}f`1R>PtN3Y!`fw8{k-7_O=C VN~cdsZ3kM$;OXk;vd$@?2>|U(LgN4c diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/meta.json index ce37ea6c1f..785b31f6be 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/meta.json @@ -10,9 +10,6 @@ { "name": "base" }, - { - "name": "high_velocity" - }, { "name": "practice" }, diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/high-velocity-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/high-velocity-1.png deleted file mode 100644 index e18b146d3bf6b5dcb9148771e176db38bed05730..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 171 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv#^NA%C&rs6b?Si}&H|6fVg?3o zVGw3ym^DWNC@31>6XFV_r{^0p*fB8XGVbWNJ-#KvxL;`f)(;jy3HFj8zhH*{V6e1) z*>9kbjHioZNX4Aw1c^5e0RfV&=U+%Ar8R^f)mR|Mz+lA8*llvg_XtoOgQu&X%Q~lo FCIF2SFlPV& diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/high-velocity-2.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/high-velocity-2.png deleted file mode 100644 index 3381efe180c9ebae6d910271ce7a2d9ae4cda1ed..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 173 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv#^NA%C&rs6b?Si}&H|6fVg?3o zVGw3ym^DWNC@31>6XFV_r{^0p*fB8XGVbWNJ-#KvxL;`f)(;jy3HFj8zhH*{V6e1) z*>9kboTrOpNX4Aw1c^5e0RfV&=U+%Ar8R`JR#v$&nlUg4-eVU1Ju6=csFK0c)z4*} HQ$iB}6XFV_r{^0p*fB8XGVbWNJ-#KvxL;`f)(;jy3HFj8zhH*{V6e1) z*>9kbyr+v}NX4Aw1c^5e0RfV&=U+%Ar8R`JR#vS@eE)%&p_7Sa{)QQkK}s1sUHx3v IIVCg!09bA`Bme*a diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/high-velocity-4.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/high-velocity-4.png deleted file mode 100644 index f9b8504dc87779eefb871dc5621551adae723484..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 177 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv#^NA%C&rs6b?Si}&H|6fVg?3o zVGw3ym^DWNC@31>6XFV_r{^0p*fB8XGVbWNJ-#KvxL;`f)(;jy3HFj8zhH*{V6e1) z*>9kblBbJfNX4Aw1c^5e0RfV&=U+%Ar8R`JR#s_jpDwkH&y0a#vk{x7RM8cEplSwB LS3j3^P66XFV_r{^0p*fB8XGVbWNJ-#KvxL;`f)(;jy3HFj8zhH*{V6e1) z*>9kbwx^3@NX4Aw1c^5e0RfV&=U+%Ar8R`JR#qAKI0P~p9b`GmQzCk0L+J-bhT4T} Vzvq_x>H}(H@O1TaS?83{1OUm!H}U`g diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/high-velocity-6.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/high-velocity-6.png deleted file mode 100644 index 1a08c6a0803c88472d1fa7b2ebba48e2fe4fd9bb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 192 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv#^NA%C&rs6b?Si}&H|6fVg?3o zVGw3ym^DWNC@2x&6XFV_r{^0p*fB8XGVbWNJ-#JEqMFUPUr1)@vOb_3M@f)hFvEWc zxOytY2q>oO>EaktF()}e;*CQ zaB^>EX>4U6ba`-PAZ2)IW&i+q+U-|ccH}4w{bv=k1SBB@%Mq`0W(TwUxnQS~R5Cr? zNq@FoHW*_)?iCUh=0AV0@D~nd;*iuzt~o~>siw+~PKnoXwG`92pM&pLcz!n?9xoU} zf>y4_Jn#9Aaee*3(mmeZj|c0woN^1I_)fKK&AUHtBX2>%*ErqJq23>Oe&f!4alggB zxb^g$3}6g}JmJ7oNaDHkrAe;KaVhRBv?t=dOA^7I#6IE|9?*RP;G_41UwpAlUg5X| zy||U1aJt7ypT^~(hTmC4{LsvAEh;@)e0#jXZ>>?*nwNK;asXWUcIw5I)5F9DIOTkn zaT+c~-_BWamgupAwEw7>F-QG{|YuJZ+~A6BAE1w9Fld@3A7rl{?5Fz>kv_ zTaYS43Rvl2PB6?5Tj=PmTOX7aXdZ-_Ob`Z+-=E=m;H&35L2KcN-7)x_sx6Dwd)56lG)dTf`7rt}(Ha(I@g0aH`F)(hFV1pp%GRv1G9 z24W^r$`p;+h=5}OKMu=T5;rhF8k7gDWCVW(Ifb`wd}DOxvhp>I^a3JOvKXkT;vg#} zO&RO0AcQ=qXj0XzrbVlImYlNYoGtG>9+@z(ZEjMeW)#e@H(^J=;yY9OD=l4l*($3pf3SA5`ku9C=6=i?-K_B;YR|J*)-Y`LB7$~0(ajkc<3wQG zHUkJ~-kilkDe-1*a~3O05K)Gey2%-|83Ti966>M|cdyL-CvO4h{wi<$8FOJ%_dA#i zo4Pm5edO&E)`p*SD~F)H3V|syq+t226rBrx@vCk4u7E#+{s{VQf>yQQO}wh00N1{1 z+M`K)W^aA2TxYUfSJ$q=ishm6Grkol06dqwsL!j5wRU&D)#~K1RH=*}r+GU*E*|cqpp+h*8GO?Y zY}@h1;67%A$iV*#IEylddfqjm_AfxPcHCMTAB;zNlb;LH@H1TPU zEkXbQ0flKpLr_UWLm+T+Z)Rz1WdHzpoPCi!NW(xJ#a~-XMJooi9Y#}X1qLV$!C%Ba9Zlvb4# z11Z{%x%h`|f0A4hxyoSVSU?pDMB5Mk2fw>D3R9C#QZNSiUo7h*0t9w}X5F&Bk1eZt z0{EVRE4A&fHh|er((7$4d<67w0~gnAP1*x4cYvWMP1HqO^3n7b3c&jreNzq?xCMIF zoZeddIDG&z)YbA0aBv8W7Abq(<=x$#z5RQp)!z@R@N&Kd(fVls000JJOGiWi{{a60 z|De66lK=n!32;bRa{vG?BLDy{BLR4&KXw2B00(qQO+^Rf1r-Y`5@))&DF6TgeMv+? zR9M69mOn@WQ5?s=&mm|}!Gw#BAa2pXSvY74mz;u@+Y%(=5C<1qTqGo#4ywsTa5|Uv zlR~(`;)Jk3E;=YdX?E)x;vQW>-RT`J@4Gzsy$7Gq`@?&WXqtv)CW0l02`~XBzytyl z$jYLfl|_3g0$EwK_jY%%xv>hr5|N%%Jw2Y~Lw_t@)Ce{f%0 zkV+?M`@VHVe#8CF+_ONvR)uK|X6k2;8S)dpf9@adc?IgVDpa)v05E!e007SkxLe7P zMc|$V6s3t=?tn@-;W+{7$2JM=CM=aJP?RR!f1VSd>mAx}S_4GmF-THA908saDBM~4 zXgmg8@3_vzA`*WJ6bgq>)fR=D)&P^y7>&jyCZjPO=hWs2@$xN~q&%YW*bK;-^}KM; l0zttR5?~(^Ccp&3$`^PFo5+yM$4&qM002ovPDHLkV1jrH7v diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/high-velocity-2.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/high-velocity-2.png deleted file mode 100644 index 09e5f1577060ab96010b805342711cc360279e6e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2309 zcmV+g3HtVlP) zaB^>EX>4U6ba`-PAZ2)IW&i+q+U-|cmg6W4{bv=k1SBB@%Mq`0W(TwUx!6vsl1_Ek zRQLRq9UF|XknYukg!#|kEBu9nxyF#xO0GFa9I2+tj!uc^akdoGaX${eUg7y+JltO} zh6Jsgk9l769pn1;fu(D_J&p(Kmz;75qWG}1?3H(aTuNSogwJuho*9Wi zy_xm&oD5(Lg*@TFQ%K@*=W``FFUO_0v(TQ1_bv&oV>JJWU${f}0>FFk3BP#LOy1x) z1>MZbPdHuUq)+2=UxptvBEGN8?=>18ExteA;kVW(Yt7R-PdNatd>M5!<>+Bz1DtYv zmT?*`Mc=pZ#Vc1q8q-j7 zwOVSe?pV~5LzZK{W1w-9mYTNQtd&-qceqbaU3>1j5>VMge%Q7 zb>?Za%sPF+*Osibbme8Mth)Tp+QsT4YtPL6oHe>wGcd-9 zz_@J&;LyA|i-l6+&D`cJR+b>53@vq&GiWmg2GbsK|2b8DKexW{8oz21;6;!HvF!DZ$aOJ{+OUuEqD{JDk#9U zubTE~5}(;ypDWjyY}eJbYp^0*)CN-bECXNlX{obylx-#KAu|G5cOO~l>utDobVy!YvLf9ak&XvyGhBoWsY=nF_Lo z4fXvv_wrgq2NK@Gh9VD`0y|Cn2&&f7V)_&iKfxh<1_0}Gz(fd#Dy48ko|+}MM&5Es zcsol##WC;MC$io^`jR|&nYb5?3t16KFGpWFIk!@MmEpj0wmolT8OV{FY7Py_eHPc$ zhU-%5u32^-gcHD4tW$l?F4#QbYg-1v3;nzRS6YyYb94?6)?#kZh-Q|8J=VckGsZ0B z_ru>(oZ}as89sDbnU)VE2E^`uE4?Ix_a5XW)Da`(`vMM;_ye|c-hd=FE*T%}YF6`V zgqks|!S`1u8N;cxwQB@FLdMyFtb_htYEUjN$UZ`hn@2}s0U7{i2UF>a(hEmAA!=bd zoiK16s6=pCeEkcbdDVs&FW}+>rC2P=E^NwBs5gLwYCbRg8v!B#M1Uq$;1^DWYSoO0 z>1|?b5um^PYWZsl8{aCjv9QqxK@X!jwl;>n2dZxv-{eiWR;G{M0u{col0U! z>=`~`VE8yFbfq*-GgVRSd4~k78rZ37w>?*=b{S@P4ofrkCXDUWeq8%?9HV0{^aBTq ze-HhzVTUvL-%?t#xMt6%A&7fl0hW(9%dvNmuVuLx(N9N;+j-0004nX+uL$Nkc;*aB^>E zX>4Tx0C=2zkv&MmKpe$iTT4YN4ptCx$j~~71yK=4sbUc+gyEO_^lTK1F2KZkr>mvdLc7bNyvc8Wkt9b(Wo`Ea1?XNa~*-z5zZ7qBR z^lt+f*KJMO11@)fp(jn$MO*UG^cD)h`x$*x4j8xvde)rYTKhPC05a6o@(pls2#gjf zd)?*T-JQMtd#2Uj53BHUz6H_xX#fBK24YJ`L;(K){{a7>y{D4^000SaNLh0L04^f{ z04^f|c%?sf00007bV*G`2jm463o8JW1Ib|k00D_fL_t(o!|j$aNCHtD#=mz&(4K+` z7af7zQbDtD&=fA-B(&UAfjm z5L7}43;x=9^UXpRI4%^&W{te!wDdTIzkiGnvFqLEje!=pGJZ$ELmJfiTR zO)Rj&0YFtVFpL^jI#(190QXNoOOGRM{x%W%6>M&A(DiHmfOz45n{ab|VUd{yD&-Qo zz4qAr>?KLOa93tuV23j|P$`#Snsop`>){yyAc->W7L&dvf}A{%fML|2su?QbMiOP5 z+$4w>o<3)XPZT&V6k!-OdjFCr!?v6Bd$-p{Bo>AFogmY|CkjZSOyO?zkysSA-Sqtz zUWrfza=AU2W}U*jy*7sZ0jkwY4EqDR&z(&Z!tyNFv@9aA=om=TvH&nOoLL|&*h~Wa fLBa*Nz<=cjnW(vM!olP^00000NkvXXu0mjf+zB!i diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/high-velocity-3.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/high-velocity-3.png deleted file mode 100644 index 502e3d36837033d953616efc12319b849ffa0ce5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2496 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 JPDHLkV1hSmz&ii{ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/high-velocity-5.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/high-velocity-5.png deleted file mode 100644 index 43baa78b9470e01dcd8feb16c3721c2d2ab9be77..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2522 zcmV<02_^Q4P) zaB^>EX>4U6ba`-PAZ2)IW&i+q+U-|uZsj%%{I65=2qGzp(s8ISpf~98JCdE3ZkiT)cXU^Z``?m z+;6ilZaqCG0~kYLPdM-tl6bCs%_P^)@l#w`Xb;4DmvpWw`YnFp0o?}xKJK3Ii!Upa zS2!+1FK*>0obG=iGlc{M1!0b&C_=3SYqPIhL*Vl@!eO%xN-*> z1o&~%Vhd7bNC7Jy%n7>ru@*Y>);%94E0}o@Ml!(|IDUVI=Z>$Q?+mTAWlj{!11qeH zx4y89&D_3X6bPYpW2y&V3Re@Kk4>zAK|L@RIOwrmCYsW#w&d_EQ3Hmicocbsw)OQx31tXMTKQc}^9i9zadAp;>Gj67_VQHM{O zkkU+3XP!38tkV~?wq&KHD=%AR)#VS?ZdTv3_RQQrvqm>-e2CiP?3Fcio4uHz9Zqy} z2F5rM7`M#;1kIbXSSTgl%x%tMWeFn6Sfy@q25rW`V4B3b=)v79bD#1SfbP%o#vd^k zHg*37b752WhPiKf`+&9KC)~;*XzxN`iU=v#ek(=ig1`9HHvFoA--iDGhM+SQd6sGze>xw^*XcgREQi;5UejRxsBqcQv1jhWai6gOUQuRxbI@=r`zz|fvsb^ z6{A}E@@BjmHr-fW2exe&!_&k@4AgCy?;onkK1io3oSXxTSMSD}U1sNjzIg^>?P{Vr zV%5@70(!>>VV=h8QsfaE2r{tOhAxdTj>v>CQisI4kh~}<=}t0f-|o8a(T3-aA8oBq zgpH;~h;&p}Q24S8F`{AK?ew~xj%rQD`J^^88SHg41i&VcE7g1Dh1j>!1nHpyBhpb6 zp$$<9A==$wXV%`GZfM~s6 zK4rw$gAZI6L}3uoLyNT0AMC z0&ES)0hnW8?U0_t3|1oE`o1ESjMPWnpdATK%wIm%MEJgFF2!v8Z}mVnu`Kv@94W}= zQ#@?Y&{iiGU<)SsjfJ-Tk9R4mlcN!G`)~Ek?2~_DClPJ(Hr*TvUozwwlW~ev``jLn9?5% zGU2;H1PH_FR;VvXxNgX`sWxKUI~*_~25<|Pyow`pcdYq{YeMLVII9ZGsPwwi^*aAo zY;D;`+6r4-<4IfyriD%jMj?SBc2sN|#NQRY4O`F!%7&M~>Tv=V4quG;tL~M9lSSs3 zt_9RLsD0!_EY!^>MikUYQq1Q(JF6GRo{IMq-coCO(=j&%pD69Hc7P2^b!{&&E|*F8 zM{FEVfHKM%#MoUQm5T!O+K1~5UvNyO&^m|(Q4vR}Vi7EqwnD28CYOFelZGV4#ZhoAIQX$xb#QUk)xlK|1V2EW z9Gw(hq{ROvg%&X$9QWhhy~o`6NhC*rF?JJVVUz5XQfhOt$Xqp2J`Aln(H)2 z5XTY{NJ4;w8p^1^M3h#Q6ay*RkGc4VZGVzn61mD??&Jfh)D`uQq_$PtxmcEqny@Zvz+CZB5z(E_Z;TCr#8v zTk_HL77D=o8GTa@7`O#`)|}p2`#607GSt=b4RCM>j20<--R0fgoxS~grq$mMtMGEZ z1=0Fx00006VoOIv0RI600RN!9r;`8x010qNS#tmYE+YT{E+YYWr9XB6000McNliru z3g(sp(W`6XEjoEh+4zPCs%RNZA+e`#h z;Q*SJX8j^378m})pFX+1cT*BZVv{`=zE#e0ozBEep&|O;Rv)FisT2Eey3-vJz%u;KPtRN=}3OG_Wnw6v74D-lgn*y?g* z;@P}99H2ubfcE?o(Il11Hod+508~wbP$Z0ALvV0pxrN`^fkwF9`cNcHrLyhFMJN(R zKkpJ=Ue#L##>bzd>uVBTH4V;cbyim1a#pL$d-k4}5-Q*FOlFKwB-{kbWX1qI!<7Z@ k3)Yf=|0VMUe1U&eR{~|^A6^ePzyJUM07*qoM6N<$g1il_GXMYp diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/high-velocity-6.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/high-velocity-6.png deleted file mode 100644 index 50db6ec38baf8e7eef74eb56a02b7b157b443fb3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2527 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