From fb943a61dc632199b3b8bb152cd5a3ff3b13d404 Mon Sep 17 00:00:00 2001 From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Date: Wed, 1 Jun 2022 19:59:58 +1000 Subject: [PATCH] Gun refactor (#8301) Co-authored-by: Kara Co-authored-by: T-Stalker Co-authored-by: T-Stalker <43253663+DogZeroX@users.noreply.github.com> Co-authored-by: ElectroJr Co-authored-by: metalgearsloth --- Content.Client/Content.Client.csproj | 1 - .../Effects/EffectVisualizerSystem.cs | 17 + .../Effects/EffectVisualsComponent.cs | 8 + Content.Client/Items/ItemStatusMessages.cs | 5 +- .../ClientBatteryBarrelComponent.cs | 140 - .../ClientBoltActionBarrelComponent.cs | 212 - .../ClientMagazineBarrelComponent.cs | 248 - .../Components/ClientPumpBarrelComponent.cs | 212 - .../ClientRevolverBarrelComponent.cs | 168 - .../ClientBatteryBarrelSystem.cs | 19 - .../Visualizers/BarrelBoltVisualizer.cs | 39 - .../Barrels/Visualizers/MagVisualizer.cs | 106 - .../Visualizers/SpentAmmoVisualizer.cs | 30 - .../Ranged/ClientRangedWeaponComponent.cs | 34 - .../Ranged/{ => Commands}/TetherGunCommand.cs | 1 + .../Ranged/Components/AmmoCounterComponent.cs | 10 + .../Ranged/Components/MagVisualizer.cs | 107 + .../Components/SpentAmmoVisualsComponent.cs | 20 + .../Weapons/Ranged/GunSystem.AmmoCounter.cs | 31 - .../Weapons/Ranged/RangedWeaponSystem.cs | 110 - .../Ranged/{ => Systems}/FlyBySoundSystem.cs | 5 +- .../Ranged/Systems/GunSystem.AmmoCounter.cs | 513 + .../Ranged/Systems/GunSystem.Ballistic.cs | 48 + .../Ranged/Systems/GunSystem.Battery.cs | 30 + .../Systems/GunSystem.ChamberMagazine.cs | 50 + .../Ranged/Systems/GunSystem.Magazine.cs | 29 + .../Ranged/Systems/GunSystem.Revolver.cs | 37 + .../Ranged/Systems/GunSystem.SpentAmmo.cs | 34 + .../Weapons/Ranged/Systems/GunSystem.cs | 187 + .../Ranged/{ => Systems}/TetherGunSystem.cs | 4 +- Content.Server/Entry/IgnoredComponents.cs | 4 +- .../Interaction/InteractionSystem.cs | 2 - .../Power/Components/ChargerComponent.cs | 27 +- .../Power/EntitySystems/ChargerSystem.cs | 13 +- .../Components/HitscanComponent.cs | 166 - .../Projectiles/SharedProjectileSystem.cs | 3 +- .../Tools/ToolSystem.MultipleTool.cs | 2 +- .../Ammunition/Components/AmmoBoxComponent.cs | 49 - .../Ammunition/Components/AmmoComponent.cs | 113 - .../Components/AmmoComponentData.cs | 8 - .../Components/RangedMagazineComponent.cs | 34 - .../Components/SpeedLoaderComponent.cs | 27 - .../Components/BatteryBarrelComponent.cs | 55 - .../Components/BoltActionBarrelComponent.cs | 89 - .../Components/MagazineBarrelComponent.cs | 131 - .../Barrels/Components/PumpBarrelComponent.cs | 57 - .../Components/RevolverBarrelComponent.cs | 60 - .../Components/ServerRangedBarrelComponent.cs | 136 - .../Ranged/Components/AmmoCounterComponent.cs | 6 + .../Components/ChemicalAmmoComponent.cs | 2 +- .../RangedDamageSoundComponent.cs | 2 +- .../Weapon/Ranged/FlyBySoundSystem.cs | 5 - .../Weapon/Ranged/GunSystem.Ammo.cs | 91 - .../Weapon/Ranged/GunSystem.AmmoBox.cs | 206 - .../Weapon/Ranged/GunSystem.Battery.cs | 106 - .../Weapon/Ranged/GunSystem.Bolt.cs | 266 - .../Weapon/Ranged/GunSystem.Guns.cs | 302 - .../Weapon/Ranged/GunSystem.Magazine.cs | 375 - .../Weapon/Ranged/GunSystem.Pump.cs | 190 - .../Weapon/Ranged/GunSystem.RangedMagazine.cs | 130 - .../Weapon/Ranged/GunSystem.Revolvers.cs | 226 - .../Weapon/Ranged/GunSystem.SpeedLoader.cs | 181 - Content.Server/Weapon/Ranged/GunSystem.cs | 258 - .../Weapon/Ranged/RangedWeaponSystem.cs | 22 - .../Ranged/ServerRangedWeaponComponent.cs | 30 - .../{ => Systems}/ChemicalAmmoSystem.cs | 8 +- .../Weapon/Ranged/Systems/FlyBySoundSystem.cs | 5 + .../Ranged/Systems/GunSystem.Ballistic.cs | 31 + .../Ranged/Systems/GunSystem.Battery.cs | 59 + .../Ranged/Systems/GunSystem.Revolver.cs | 17 + .../Weapon/Ranged/Systems/GunSystem.cs | 298 + .../Ranged/{ => Systems}/TetherGunSystem.cs | 4 +- .../CombatMode/SharedCombatModeSystem.cs | 5 + .../Containers/ItemSlot/ItemSlotsSystem.cs | 16 +- .../SharedBoltActionBarrelComponent.cs | 26 - .../SharedMagazineBarrelComponent.cs | 46 - .../Components/SharedPumpBarrelComponent.cs | 26 - .../SharedRevolverBarrelComponent.cs | 26 - .../Ranged/Components/AmmoComponent.cs | 54 + .../Components/AmmoProviderComponent.cs | 6 + .../BallisticAmmoProviderComponent.cs | 48 + .../BatteryAmmoProviderComponent.cs | 18 + .../ChamberMagazineAmmoProviderComponent.cs | 7 + .../{ => Components}/FlyBySoundComponent.cs | 2 +- .../Weapons/Ranged/Components/GunComponent.cs | 119 + .../HitscanBatteryAmmoProviderComponent.cs | 11 + .../MagazineAmmoProviderComponent.cs | 20 + .../ProjectileBatteryAmmoProviderComponent.cs | 12 + .../RevolverAmmoProviderComponent.cs | 50 + .../Components/SharedAmmoCounterComponent.cs | 9 + .../Components/SharedRangedBarrelComponent.cs | 24 - .../Components/SharedRangedWeaponComponent.cs | 40 - .../Weapons/Ranged/Events/AmmoShotEvent.cs | 9 + .../Ranged/Events/GetAmmoCountEvent.cs | 11 + .../{ => Events}/MagazineAutoEjectEvent.cs | 2 +- .../Ranged/Events/RequestShootEvent.cs | 14 + .../Ranged/Events/RequestStopShootEvent.cs | 12 + .../Weapons/Ranged/Events/TakeAmmoEvent.cs | 26 + .../Weapons/Ranged/HitscanPrototype.cs | 39 + Content.Shared/Weapons/Ranged/IShootable.cs | 6 + .../{ => Systems}/SharedFlyBySoundSystem.cs | 3 +- .../Systems/SharedGunSystem.Ballistic.cs | 215 + .../Ranged/Systems/SharedGunSystem.Battery.cs | 111 + .../Systems/SharedGunSystem.Cartridges.cs | 34 + .../SharedGunSystem.ChamberMagazine.cs | 121 + .../Systems/SharedGunSystem.Interactions.cs | 101 + .../Systems/SharedGunSystem.Magazine.cs | 157 + .../Systems/SharedGunSystem.Revolver.cs | 331 + .../Weapons/Ranged/Systems/SharedGunSystem.cs | 392 + .../{ => Systems}/SharedTetherGunSystem.cs | 4 +- .../Audio/Weapons/Guns/Misc/licenses.txt | 2 + .../Audio/Weapons/Guns/Misc/selector.ogg | Bin 0 -> 7482 bytes .../Locale/en-US/power/components/charger.ftl | 1 + .../components/ammo-box-component.ftl | 9 - .../ammunition/components/ammo-component.ftl | 2 - .../components/ranged-magazine-component.ftl | 4 - .../components/speed-loader-component.ftl | 3 - .../bolt-action-barrel-component.ftl | 16 - .../pump-barrel-action-component.ftl | 5 - .../components/revolver-barrel-component.ftl | 9 - .../server-magazine-barrel-component.ftl | 15 - .../server-ranged-barrel-component.ftl | 5 - Resources/Locale/en-US/weapons/ranged/gun.ftl | 28 + .../ranged/server-ranged-weapon-component.ftl | 3 - Resources/Maps/Salvage/asteroid-base.yml | 12 +- Resources/Maps/Salvage/cargo-1.yml | 7 +- Resources/Maps/Salvage/medium-pirate.yml | 7 +- Resources/Maps/Salvage/small-4.yml | 7 +- Resources/Maps/Salvage/stationstation.yml | 42 +- Resources/Maps/atlas.yml | 94 +- Resources/Maps/bagel.yml | 150 +- Resources/Maps/barratry.yml | 138 +- Resources/Maps/centcomm.yml | 29322 ---------------- Resources/Maps/dart.yml | 6066 ---- Resources/Maps/delta.yml | 57 +- Resources/Maps/infiltrator.yml | 22 +- Resources/Maps/marathon.yml | 167 +- Resources/Maps/moonrise.yml | 25734 -------------- Resources/Maps/moose.yml | 99 +- Resources/Maps/mothership.yml | 24544 ------------- Resources/Maps/nss_pillar.yml | 195 +- Resources/Maps/packedstation.yml | 176 +- Resources/Maps/packedstationxmas.yml | 49 +- Resources/Maps/saltern.yml | 197 +- Resources/Maps/splitstation.yml | 140 +- Resources/Maps/ssreach.yml | 44 +- Resources/Maps/waystation.yml | 74 +- .../Catalog/Fills/Backpacks/duffelbag.yml | 26 +- .../Catalog/Fills/Boxes/ammunition.yml | 377 +- .../Catalog/Fills/Boxes/security.yml | 190 +- .../Catalog/Fills/Crates/armory.yml | 6 +- .../Catalog/Fills/Crates/salvage.yml | 10 +- .../Catalog/Fills/Crates/security.yml | 6 +- .../Catalog/Fills/Lockers/heads.yml | 8 +- .../Prototypes/Catalog/Fills/Lockers/misc.yml | 4 +- .../Catalog/Fills/Lockers/security.yml | 3 +- .../Catalog/Fills/Lockers/service.yml | 2 +- .../Catalog/Research/technologies.yml | 12 +- .../VendingMachines/Inventories/ammo.yml | 48 +- .../Prototypes/Catalog/uplink_catalog.yml | 26 +- .../Entities/Clothing/Belt/belts.yml | 4 +- .../Entities/Debugging/debug_sweps.yml | 34 +- .../Spawners/Conditional/suspicion.yml | 317 - .../Markers/Spawners/Random/maintenance.yml | 4 +- .../Entities/Mobs/Player/silicon.yml | 6 +- .../Objects/Consumable/Food/produce.yml | 2 +- .../Prototypes/Entities/Objects/Fun/toys.yml | 42 +- .../Guns/Ammunition/Boxes/antimaterial.yml | 11 +- .../Guns/Ammunition/Boxes/caseless_rifle.yml | 163 + .../Weapons/Guns/Ammunition/Boxes/clrifle.yml | 157 - .../Guns/Ammunition/Boxes/light_rifle.yml | 105 + .../Weapons/Guns/Ammunition/Boxes/lrifle.yml | 99 - .../Weapons/Guns/Ammunition/Boxes/magnum.yml | 72 +- .../Weapons/Guns/Ammunition/Boxes/pistol.yml | 72 +- .../Weapons/Guns/Ammunition/Boxes/rifle.yml | 141 + .../Weapons/Guns/Ammunition/Boxes/srifle.yml | 135 - .../Weapons/Guns/Ammunition/Boxes/toy.yml | 14 +- .../Ammunition/Cartridges/antimaterial.yml | 15 +- .../{BaseCartridge.yml => base_cartridge.yml} | 2 + .../Ammunition/Cartridges/caseless_rifle.yml | 61 + .../Guns/Ammunition/Cartridges/clrifle.yml | 64 - .../{hrifle.yml => heavy_rifle.yml} | 22 +- .../Ammunition/Cartridges/light_rifle.yml | 60 + .../Guns/Ammunition/Cartridges/lrifle.yml | 59 - .../Guns/Ammunition/Cartridges/magnum.yml | 47 +- .../Guns/Ammunition/Cartridges/pistol.yml | 47 +- .../Guns/Ammunition/Cartridges/rifle.yml | 60 + .../Guns/Ammunition/Cartridges/shotgun.yml | 115 +- .../Guns/Ammunition/Cartridges/srifle.yml | 59 - .../Guns/Ammunition/Cartridges/toy.yml | 16 +- .../Ammunition/Magazines/caseless_rifle.yml | 306 + .../Guns/Ammunition/Magazines/clrifle.yml | 220 - .../Guns/Ammunition/Magazines/heavy_rifle.yml | 27 + .../Guns/Ammunition/Magazines/hrifle.yml | 44 - .../Guns/Ammunition/Magazines/light_rifle.yml | 158 + .../Guns/Ammunition/Magazines/lrifle.yml | 132 - .../Guns/Ammunition/Magazines/magnum.yml | 171 +- .../Guns/Ammunition/Magazines/pistol.yml | 325 +- .../Guns/Ammunition/Magazines/rifle.yml | 103 + .../Guns/Ammunition/Magazines/shotgun.yml | 70 +- .../Guns/Ammunition/Magazines/srifle.yml | 81 - .../Ammunition/Projectiles/antimaterial.yml | 2 +- .../{clrifle.yml => caseless_rifle.yml} | 20 +- .../{hrifle.yml => heavy_rifle.yml} | 6 +- .../{lrifle.yml => light_rifle.yml} | 20 +- .../Guns/Ammunition/Projectiles/magnum.yml | 12 +- .../Guns/Ammunition/Projectiles/pistol.yml | 12 +- .../Projectiles/{srifle.yml => rifle.yml} | 20 +- .../Guns/Ammunition/Projectiles/shotgun.yml | 48 +- .../Guns/Ammunition/Projectiles/toy.yml | 19 +- .../Guns/Ammunition/Speed Loaders/lrifle.yml | 24 - .../Guns/Ammunition/Speed Loaders/magnum.yml | 78 - .../Guns/Ammunition/Speed Loaders/pistol.yml | 78 - .../Guns/Ammunition/Speed Loaders/toy.yml | 32 - .../Guns/Ammunition/SpeedLoaders/magnum.yml | 118 + .../Guns/Ammunition/SpeedLoaders/pistol.yml | 114 + .../Ammunition/SpeedLoaders/rifle_light.yml | 25 + .../Guns/Ammunition/SpeedLoaders/toy.yml | 33 + .../Weapons/Guns/Ammunition/explosives.yml | 99 +- .../Weapons/Guns/Battery/battery_guns.yml | 410 +- .../Objects/Weapons/Guns/HMGs/hmgs.yml | 60 +- .../Objects/Weapons/Guns/LMGs/lmgs.yml | 112 +- .../Weapons/Guns/Launchers/launchers.yml | 94 +- .../Objects/Weapons/Guns/Pistols/pistols.yml | 467 +- .../Weapons/Guns/Projectiles/hitscan.yml | 154 +- .../Weapons/Guns/Projectiles/projectiles.yml | 107 +- .../Weapons/Guns/Revolvers/revolvers.yml | 148 +- .../Objects/Weapons/Guns/Rifles/rifles.yml | 427 +- .../Objects/Weapons/Guns/SMGs/smgs.yml | 276 +- .../Weapons/Guns/Shotguns/shotguns.yml | 247 +- .../Objects/Weapons/Guns/Snipers/snipers.yml | 133 +- .../Objects/Weapons/Guns/flare_gun.yml | 47 +- .../Objects/Weapons/Guns/pneumatic_cannon.yml | 8 +- .../Entities/Structures/Machines/lathe.yml | 8 +- .../Power/Generation/PA/particles.yml | 2 +- .../Entities/Structures/Power/chargers.yml | 37 +- .../LootTables/suspicion_loot_table.yml | 129 +- Resources/Prototypes/Maps/game.yml | 35 - .../Objectives/traitorObjectives..yml | 4 +- .../Graphs/improvised/pneumatic_cannon.yml | 4 +- .../Prototypes/Recipes/Lathes/security.yml | 34 +- .../Roles/Jobs/Civilian/janitor.yml | 2 +- Resources/Prototypes/tags.yml | 86 +- .../Boxes/anti_material.rsi/icon.png | Bin 358 -> 0 bytes .../Boxes/anti_material.rsi/meta.json | 3 - .../base-10x24.png | Bin .../base-b.png | Bin .../base.png | Bin .../flash.png | Bin .../hv.png | Bin .../mag-1.png | Bin .../mag10-1.png | Bin .../magb-1.png | Bin .../meta.json | 3 - .../practice.png | Bin .../rubber-b.png | Bin .../rubber.png | Bin .../Ammunition/Boxes/cl_rifle.rsi/icon.png | Bin 450 -> 0 bytes .../Ammunition/Boxes/l_rifle.rsi/icon.png | Bin 487 -> 0 bytes .../base-b.png | Bin .../{l_rifle.rsi => light_rifle.rsi}/base.png | Bin .../{l_rifle.rsi => light_rifle.rsi}/hv.png | Bin .../mag-1.png | Bin .../magb-1.png | Bin .../meta.json | 3 - .../practice.png | Bin .../rubber.png | Bin .../Guns/Ammunition/Boxes/magnum.rsi/icon.png | Bin 436 -> 0 bytes .../Ammunition/Boxes/magnum.rsi/meta.json | 3 - .../Guns/Ammunition/Boxes/pistol.rsi/icon.png | Bin 459 -> 0 bytes .../Ammunition/Boxes/pistol.rsi/meta.json | 3 - .../{s_rifle.rsi => rifle.rsi}/base-b.png | Bin .../Boxes/{s_rifle.rsi => rifle.rsi}/base.png | Bin .../{s_rifle.rsi => rifle.rsi}/flash.png | Bin .../Boxes/{s_rifle.rsi => rifle.rsi}/hv.png | Bin .../{s_rifle.rsi => rifle.rsi}/mag-1.png | Bin .../{s_rifle.rsi => rifle.rsi}/magb-1.png | Bin .../{s_rifle.rsi => rifle.rsi}/meta.json | 3 - .../{s_rifle.rsi => rifle.rsi}/practice-b.png | Bin .../{s_rifle.rsi => rifle.rsi}/practice.png | Bin .../{s_rifle.rsi => rifle.rsi}/rubber.png | Bin .../Ammunition/Boxes/s_rifle.rsi/icon.png | Bin 435 -> 0 bytes .../{spent.png => base-spent.png} | Bin .../Casings/ammo_casing.rsi/meta.json | 2 +- .../{spent.png => base-spent.png} | Bin .../beanbag-spent.png} | Bin .../beanbag.png} | Bin .../blank-spent.png} | Bin .../base.png => shotgun_shell.rsi/blank.png} | Bin .../flare-spent.png} | Bin .../base.png => shotgun_shell.rsi/flare.png} | Bin .../flash-spent.png} | Bin .../base.png => shotgun_shell.rsi/flash.png} | Bin .../incendiary-spent.png} | Bin .../incendiary.png} | Bin .../Casings/shotgun_shell.rsi/meta.json | 44 +- .../practice-spent.png} | Bin .../practice.png} | Bin .../slug-spent.png} | Bin .../base.png => shotgun_shell.rsi/slug.png} | Bin .../shotgun_shell_beanbag.rsi/meta.json | 17 - .../Casings/shotgun_shell_blank.rsi/meta.json | 17 - .../shotgun_shell_beanbag.rsi/base.png | Bin 289 -> 0 bytes .../shotgun_shell_beanbag.rsi/spent.png | Bin 324 -> 0 bytes .../Casings/shotgun_shell_flare.rsi/meta.json | 17 - .../Casings/shotgun_shell_flash.rsi/meta.json | 17 - .../shotgun_shell_incendiary.rsi/meta.json | 17 - .../shotgun_shell_practice.rsi/meta.json | 17 - .../Casings/shotgun_shell_slug.rsi/meta.json | 17 - .../base.png => explosives.rsi/baton.png} | Bin .../base.png => explosives.rsi/blast.png} | Bin .../base.png => explosives.rsi/flash.png} | Bin .../base.png => explosives.rsi/frag.png} | Bin .../explosives.rsi}/meta.json | 14 +- .../frag.png => explosives.rsi/rpg.png} | Bin .../spent.png | Bin .../Explosives/grenade_baton.rsi/meta.json | 17 - .../Explosives/grenade_blast.rsi/meta.json | 17 - .../Explosives/grenade_blast.rsi/spent.png | Bin 205 -> 0 bytes .../Explosives/grenade_flash.rsi/meta.json | 17 - .../Explosives/grenade_flash.rsi/spent.png | Bin 205 -> 0 bytes .../Explosives/grenade_frag.rsi/meta.json | 17 - .../Explosives/grenade_frag.rsi/spent.png | Bin 205 -> 0 bytes .../Ammunition/Explosives/rpg.rsi/meta.json | 14 - .../10x24.rsi/base.png | Bin .../10x24.rsi/mag-1.png | Bin .../10x24.rsi/mag-2.png | Bin .../10x24.rsi/mag-3.png | Bin .../10x24.rsi/mag-4.png | Bin .../10x24.rsi/mag-5.png | Bin .../10x24.rsi/mag-6.png | Bin .../10x24.rsi/mag-7.png | Bin .../10x24.rsi}/meta.json | 6 +- .../caseless_pistol_mag.rsi}/base.png | Bin .../high_velocity.png} | Bin .../caseless_pistol_mag.rsi}/mag-1.png | Bin .../caseless_pistol_mag.rsi}/mag-2.png | Bin .../caseless_pistol_mag.rsi}/mag-3.png | Bin .../caseless_pistol_mag.rsi}/mag-4.png | Bin .../caseless_pistol_mag.rsi}/mag-5.png | Bin .../caseless_pistol_mag.rsi}/meta.json | 16 +- .../caseless_pistol_mag.rsi/practice.png} | Bin .../caseless_pistol_mag.rsi/red.png} | Bin .../caseless_pistol_mag.rsi/rubber.png} | Bin .../caseless_rifle_mag.rsi}/base.png | Bin .../caseless_rifle_mag.rsi/flash.png} | Bin .../caseless_rifle_mag.rsi/high_velocity.png} | Bin .../caseless_rifle_mag.rsi}/mag-1.png | Bin .../caseless_rifle_mag.rsi}/meta.json | 27 +- .../caseless_rifle_mag.rsi/practice.png} | Bin .../caseless_rifle_mag.rsi/red.png} | Bin .../caseless_rifle_mag.rsi/rubber.png} | Bin .../caseless_rifle_mag_short.rsi}/base.png | Bin .../caseless_rifle_mag_short.rsi/flash.png} | Bin .../high_velocity.png} | Bin .../caseless_rifle_mag_short.rsi}/mag-1.png | Bin .../caseless_rifle_mag_short.rsi}/meta.json | 27 +- .../practice.png} | Bin .../caseless_rifle_mag_short.rsi/red.png} | Bin .../caseless_rifle_mag_short.rsi/rubber.png} | Bin .../Magazine/ClRifle/10x24.rsi/icon.png | Bin 331 -> 0 bytes .../Magazine/ClRifle/10x24.rsi/meta.json | 38 - .../ClRifle/ClRifle-NEW/10x24.rsi/base.png | Bin 302 -> 0 bytes .../ClRifle/ClRifle-NEW/10x24.rsi/icon.png | Bin 331 -> 0 bytes .../ClRifle/ClRifle-NEW/10x24.rsi/mag-1.png | Bin 2185 -> 0 bytes .../ClRifle/ClRifle-NEW/10x24.rsi/mag-2.png | Bin 2187 -> 0 bytes .../ClRifle/ClRifle-NEW/10x24.rsi/mag-3.png | Bin 2190 -> 0 bytes .../ClRifle/ClRifle-NEW/10x24.rsi/mag-4.png | Bin 2190 -> 0 bytes .../ClRifle/ClRifle-NEW/10x24.rsi/mag-5.png | Bin 2191 -> 0 bytes .../ClRifle/ClRifle-NEW/10x24.rsi/mag-6.png | Bin 2191 -> 0 bytes .../ClRifle/ClRifle-NEW/10x24.rsi/mag-7.png | Bin 2186 -> 0 bytes .../ClRifle/ClRifle-NEW/10x24.rsi/meta.json | 38 - .../ClRifle-NEW/cl_pistol.rsi/base.png | Bin 381 -> 0 bytes .../ClRifle/ClRifle-NEW/cl_pistol.rsi/hv.png | Bin 133 -> 0 bytes .../ClRifle-NEW/cl_pistol.rsi/meta.json | 38 - .../ClRifle-NEW/cl_pistol.rsi/practice.png | Bin 133 -> 0 bytes .../ClRifle-NEW/cl_pistol.rsi/rubber.png | Bin 133 -> 0 bytes .../ClRifle-NEW/cl_rifle.rsi/flash.png | Bin 142 -> 0 bytes .../ClRifle/ClRifle-NEW/cl_rifle.rsi/hv.png | Bin 151 -> 0 bytes .../ClRifle-NEW/cl_rifle.rsi/meta.json | 29 - .../ClRifle-NEW/cl_rifle.rsi/practice.png | Bin 151 -> 0 bytes .../ClRifle-NEW/cl_rifle.rsi/rubber.png | Bin 151 -> 0 bytes .../ClRifle-NEW/cl_rifle_short.rsi/flash.png | Bin 203 -> 0 bytes .../ClRifle-NEW/cl_rifle_short.rsi/hv.png | Bin 207 -> 0 bytes .../ClRifle-NEW/cl_rifle_short.rsi/meta.json | 29 - .../cl_rifle_short.rsi/practice.png | Bin 214 -> 0 bytes .../ClRifle-NEW/cl_rifle_short.rsi/rubber.png | Bin 210 -> 0 bytes .../ClRifle/cl_pistol_mag.rsi/icon.png | Bin 438 -> 0 bytes .../ClRifle/cl_pistol_mag.rsi/mag-1.png | Bin 2460 -> 0 bytes .../ClRifle/cl_pistol_mag.rsi/mag-2.png | Bin 2472 -> 0 bytes .../ClRifle/cl_pistol_mag.rsi/mag-3.png | Bin 2469 -> 0 bytes .../ClRifle/cl_pistol_mag.rsi/mag-4.png | Bin 2464 -> 0 bytes .../ClRifle/cl_pistol_mag.rsi/mag-5.png | Bin 2463 -> 0 bytes .../ClRifle/cl_pistol_mag.rsi/meta.json | 32 - .../ClRifle/cl_pistol_mag_base.rsi/icon.png | Bin 395 -> 0 bytes .../ClRifle/cl_pistol_mag_base.rsi/mag-1.png | Bin 2460 -> 0 bytes .../ClRifle/cl_pistol_mag_base.rsi/mag-2.png | Bin 2472 -> 0 bytes .../ClRifle/cl_pistol_mag_base.rsi/mag-3.png | Bin 2469 -> 0 bytes .../ClRifle/cl_pistol_mag_base.rsi/mag-4.png | Bin 2464 -> 0 bytes .../ClRifle/cl_pistol_mag_base.rsi/mag-5.png | Bin 2463 -> 0 bytes .../ClRifle/cl_pistol_mag_base.rsi/meta.json | 32 - .../ClRifle/cl_pistol_mag_hv.rsi/icon.png | Bin 435 -> 0 bytes .../ClRifle/cl_pistol_mag_hv.rsi/mag-1.png | Bin 2460 -> 0 bytes .../ClRifle/cl_pistol_mag_hv.rsi/mag-2.png | Bin 2472 -> 0 bytes .../ClRifle/cl_pistol_mag_hv.rsi/mag-3.png | Bin 2469 -> 0 bytes .../ClRifle/cl_pistol_mag_hv.rsi/mag-4.png | Bin 2464 -> 0 bytes .../ClRifle/cl_pistol_mag_hv.rsi/mag-5.png | Bin 2463 -> 0 bytes .../ClRifle/cl_pistol_mag_hv.rsi/meta.json | 32 - .../cl_pistol_mag_practice.rsi/icon.png | Bin 434 -> 0 bytes .../cl_pistol_mag_practice.rsi/mag-1.png | Bin 2460 -> 0 bytes .../cl_pistol_mag_practice.rsi/mag-2.png | Bin 2472 -> 0 bytes .../cl_pistol_mag_practice.rsi/mag-3.png | Bin 2469 -> 0 bytes .../cl_pistol_mag_practice.rsi/mag-4.png | Bin 2464 -> 0 bytes .../cl_pistol_mag_practice.rsi/mag-5.png | Bin 2463 -> 0 bytes .../cl_pistol_mag_practice.rsi/meta.json | 32 - .../ClRifle/cl_pistol_mag_rubber.rsi/icon.png | Bin 429 -> 0 bytes .../cl_pistol_mag_rubber.rsi/mag-1.png | Bin 2460 -> 0 bytes .../cl_pistol_mag_rubber.rsi/mag-2.png | Bin 2472 -> 0 bytes .../cl_pistol_mag_rubber.rsi/mag-3.png | Bin 2469 -> 0 bytes .../cl_pistol_mag_rubber.rsi/mag-4.png | Bin 2464 -> 0 bytes .../cl_pistol_mag_rubber.rsi/mag-5.png | Bin 2463 -> 0 bytes .../cl_pistol_mag_rubber.rsi/meta.json | 32 - .../ClRifle/cl_rifle_mag.rsi/base.png | Bin 367 -> 0 bytes .../ClRifle/cl_rifle_mag.rsi/icon.png | Bin 395 -> 0 bytes .../ClRifle/cl_rifle_mag.rsi/mag-1.png | Bin 2169 -> 0 bytes .../ClRifle/cl_rifle_mag_base.rsi/icon.png | Bin 339 -> 0 bytes .../ClRifle/cl_rifle_mag_base.rsi/mag-1.png | Bin 2169 -> 0 bytes .../ClRifle/cl_rifle_mag_base.rsi/meta.json | 20 - .../ClRifle/cl_rifle_mag_flash.rsi/icon.png | Bin 389 -> 0 bytes .../ClRifle/cl_rifle_mag_flash.rsi/mag-1.png | Bin 2169 -> 0 bytes .../ClRifle/cl_rifle_mag_flash.rsi/meta.json | 20 - .../ClRifle/cl_rifle_mag_hv.rsi/icon.png | Bin 407 -> 0 bytes .../ClRifle/cl_rifle_mag_hv.rsi/mag-1.png | Bin 2169 -> 0 bytes .../ClRifle/cl_rifle_mag_hv.rsi/meta.json | 20 - .../cl_rifle_mag_practice.rsi/icon.png | Bin 406 -> 0 bytes .../cl_rifle_mag_practice.rsi/mag-1.png | Bin 2169 -> 0 bytes .../cl_rifle_mag_practice.rsi/meta.json | 20 - .../ClRifle/cl_rifle_mag_rubber.rsi/icon.png | Bin 407 -> 0 bytes .../ClRifle/cl_rifle_mag_rubber.rsi/mag-1.png | Bin 2169 -> 0 bytes .../ClRifle/cl_rifle_mag_rubber.rsi/meta.json | 20 - .../ClRifle/cl_rifle_mag_short.rsi/base.png | Bin 362 -> 0 bytes .../ClRifle/cl_rifle_mag_short.rsi/icon.png | Bin 395 -> 0 bytes .../ClRifle/cl_rifle_mag_short.rsi/mag-1.png | Bin 2048 -> 0 bytes .../ClRifle/cl_rifle_mag_short.rsi/meta.json | 20 - .../cl_rifle_mag_short_base.rsi/icon.png | Bin 342 -> 0 bytes .../cl_rifle_mag_short_base.rsi/mag-1.png | Bin 2048 -> 0 bytes .../cl_rifle_mag_short_base.rsi/meta.json | 20 - .../cl_rifle_mag_short_flash.rsi/icon.png | Bin 404 -> 0 bytes .../cl_rifle_mag_short_flash.rsi/mag-1.png | Bin 2048 -> 0 bytes .../cl_rifle_mag_short_flash.rsi/meta.json | 20 - .../cl_rifle_mag_short_hv.rsi/icon.png | Bin 403 -> 0 bytes .../cl_rifle_mag_short_hv.rsi/mag-1.png | Bin 2048 -> 0 bytes .../cl_rifle_mag_short_hv.rsi/meta.json | 20 - .../cl_rifle_mag_short_practice.rsi/icon.png | Bin 396 -> 0 bytes .../cl_rifle_mag_short_practice.rsi/mag-1.png | Bin 2048 -> 0 bytes .../cl_rifle_mag_short_practice.rsi/meta.json | 20 - .../cl_rifle_mag_short_rubber.rsi/icon.png | Bin 393 -> 0 bytes .../cl_rifle_mag_short_rubber.rsi/mag-1.png | Bin 2048 -> 0 bytes .../cl_rifle_mag_short_rubber.rsi/meta.json | 20 - .../Magazine/Dart/darts.rsi/icon.png | Bin 409 -> 0 bytes .../Magazine/Dart/darts.rsi/meta.json | 3 - .../Magazine/LRifle/l_rifle_box.rsi/icon.png | Bin 310 -> 0 bytes .../Magazine/LRifle/l_rifle_box.rsi/meta.json | 38 - .../Magazine/LRifle/l_rifle_mag.rsi/icon.png | Bin 442 -> 0 bytes .../Magazine/LRifle/l_rifle_mag.rsi/meta.json | 20 - .../LRifle/l_rifle_mag_base.rsi/icon.png | Bin 371 -> 0 bytes .../LRifle/l_rifle_mag_base.rsi/mag-1.png | Bin 2183 -> 0 bytes .../LRifle/l_rifle_mag_base.rsi/meta.json | 20 - .../LRifle/l_rifle_mag_flash.rsi/icon.png | Bin 434 -> 0 bytes .../LRifle/l_rifle_mag_flash.rsi/mag-1.png | Bin 2183 -> 0 bytes .../LRifle/l_rifle_mag_flash.rsi/meta.json | 20 - .../LRifle/l_rifle_mag_hv.rsi/icon.png | Bin 434 -> 0 bytes .../LRifle/l_rifle_mag_hv.rsi/mag-1.png | Bin 2183 -> 0 bytes .../LRifle/l_rifle_mag_hv.rsi/meta.json | 20 - .../LRifle/l_rifle_mag_practice.rsi/icon.png | Bin 434 -> 0 bytes .../LRifle/l_rifle_mag_practice.rsi/mag-1.png | Bin 2183 -> 0 bytes .../LRifle/l_rifle_mag_practice.rsi/meta.json | 20 - .../LRifle/l_rifle_mag_rubber.rsi/icon.png | Bin 434 -> 0 bytes .../LRifle/l_rifle_mag_rubber.rsi/mag-1.png | Bin 2183 -> 0 bytes .../LRifle/l_rifle_mag_rubber.rsi/meta.json | 20 - .../Magazine/LRifle/maxim.rsi/icon.png | Bin 243 -> 0 bytes .../Magazine/LRifle/maxim.rsi/meta.json | 20 - .../Magazine/LRifle/pk_box.rsi/icon.png | Bin 483 -> 0 bytes .../light_rifle_box.rsi}/base.png | Bin .../light_rifle_box.rsi}/mag-1.png | Bin .../light_rifle_box.rsi}/mag-2.png | Bin .../light_rifle_box.rsi}/mag-3.png | Bin .../light_rifle_box.rsi}/mag-4.png | Bin .../light_rifle_box.rsi}/mag-5.png | Bin .../light_rifle_box.rsi}/mag-6.png | Bin .../light_rifle_box.rsi}/mag-7.png | Bin .../light_rifle_box.rsi}/meta.json | 6 +- .../light_rifle_mag.rsi}/base.png | Bin .../light_rifle_mag.rsi/flash.png} | Bin .../light_rifle_mag.rsi/high_velocity.png} | Bin .../light_rifle_mag.rsi}/mag-1.png | Bin .../light_rifle_mag.rsi}/meta.json | 27 +- .../light_rifle_mag.rsi/practice.png} | Bin .../light_rifle_mag.rsi/red.png} | Bin .../light_rifle_mag.rsi/rubber.png} | Bin .../{LRifle => LightRifle}/maxim.rsi/base.png | Bin .../maxim.rsi/mag-1.png | Bin .../maxim.rsi}/meta.json | 3 - .../pk_box.rsi/base.png | Bin .../pk_box.rsi/mag-1.png | Bin .../pk_box.rsi/mag-2.png | Bin .../pk_box.rsi/mag-3.png | Bin .../pk_box.rsi/mag-4.png | Bin .../pk_box.rsi/mag-5.png | Bin .../pk_box.rsi/mag-6.png | Bin .../pk_box.rsi/mag-7.png | Bin .../pk_box.rsi/meta.json | 3 - .../Magazine/Magnum/magnum_mag.rsi/base.png | Bin 416 -> 341 bytes .../base.png => magnum_mag.rsi/flash.png} | Bin .../high_velocity.png} | Bin .../Magazine/Magnum/magnum_mag.rsi/icon.png | Bin 483 -> 0 bytes .../Magazine/Magnum/magnum_mag.rsi/meta.json | 16 +- .../base.png => magnum_mag.rsi/practice.png} | Bin .../Magazine/Magnum/magnum_mag.rsi/red.png | Bin 0 -> 416 bytes .../base.png => magnum_mag.rsi/rubber.png} | Bin .../Magnum/magnum_mag_base.rsi/base.png | Bin 341 -> 0 bytes .../Magnum/magnum_mag_base.rsi/icon.png | Bin 448 -> 0 bytes .../Magnum/magnum_mag_base.rsi/mag-1.png | Bin 2298 -> 0 bytes .../Magnum/magnum_mag_base.rsi/mag-2.png | Bin 2299 -> 0 bytes .../Magnum/magnum_mag_base.rsi/mag-3.png | Bin 2298 -> 0 bytes .../Magnum/magnum_mag_base.rsi/mag-4.png | Bin 2298 -> 0 bytes .../Magnum/magnum_mag_flash.rsi/icon.png | Bin 476 -> 0 bytes .../Magnum/magnum_mag_flash.rsi/mag-1.png | Bin 2298 -> 0 bytes .../Magnum/magnum_mag_flash.rsi/mag-2.png | Bin 2299 -> 0 bytes .../Magnum/magnum_mag_flash.rsi/mag-3.png | Bin 2298 -> 0 bytes .../Magnum/magnum_mag_flash.rsi/mag-4.png | Bin 2298 -> 0 bytes .../Magnum/magnum_mag_hv.rsi/icon.png | Bin 482 -> 0 bytes .../Magnum/magnum_mag_hv.rsi/mag-1.png | Bin 2298 -> 0 bytes .../Magnum/magnum_mag_hv.rsi/mag-2.png | Bin 2299 -> 0 bytes .../Magnum/magnum_mag_hv.rsi/mag-3.png | Bin 2298 -> 0 bytes .../Magnum/magnum_mag_hv.rsi/mag-4.png | Bin 2298 -> 0 bytes .../Magnum/magnum_mag_practice.rsi/icon.png | Bin 461 -> 0 bytes .../Magnum/magnum_mag_practice.rsi/mag-1.png | Bin 2298 -> 0 bytes .../Magnum/magnum_mag_practice.rsi/mag-2.png | Bin 2299 -> 0 bytes .../Magnum/magnum_mag_practice.rsi/mag-3.png | Bin 2298 -> 0 bytes .../Magnum/magnum_mag_practice.rsi/mag-4.png | Bin 2298 -> 0 bytes .../Magnum/magnum_mag_rubber.rsi/icon.png | Bin 478 -> 0 bytes .../Magnum/magnum_mag_rubber.rsi/mag-1.png | Bin 2298 -> 0 bytes .../Magnum/magnum_mag_rubber.rsi/mag-2.png | Bin 2299 -> 0 bytes .../Magnum/magnum_mag_rubber.rsi/mag-3.png | Bin 2298 -> 0 bytes .../Magnum/magnum_mag_rubber.rsi/mag-4.png | Bin 2298 -> 0 bytes .../Magnum/magnum_mag_rubber.rsi/meta.json | 29 - .../Magnum/magnum_smg_mag.rsi/base.png | Bin 350 -> 314 bytes .../high_velocity.png} | Bin .../Magnum/magnum_smg_mag.rsi/icon.png | Bin 371 -> 0 bytes .../Magnum/magnum_smg_mag.rsi/meta.json | 13 +- .../practice.png} | Bin .../Magnum/magnum_smg_mag.rsi/red.png | Bin 0 -> 350 bytes .../rubber.png} | Bin .../Magnum/magnum_smg_mag_base.rsi/base.png | Bin 314 -> 0 bytes .../Magnum/magnum_smg_mag_base.rsi/icon.png | Bin 337 -> 0 bytes .../Magnum/magnum_smg_mag_base.rsi/mag-1.png | Bin 2310 -> 0 bytes .../Magnum/magnum_smg_mag_base.rsi/meta.json | 20 - .../Magnum/magnum_smg_mag_hv.rsi/icon.png | Bin 369 -> 0 bytes .../Magnum/magnum_smg_mag_hv.rsi/mag-1.png | Bin 2310 -> 0 bytes .../Magnum/magnum_smg_mag_hv.rsi/meta.json | 20 - .../magnum_smg_mag_practice.rsi/icon.png | Bin 368 -> 0 bytes .../magnum_smg_mag_practice.rsi/mag-1.png | Bin 2310 -> 0 bytes .../magnum_smg_mag_practice.rsi/meta.json | 20 - .../Magnum/magnum_smg_mag_rubber.rsi/icon.png | Bin 375 -> 0 bytes .../magnum_smg_mag_rubber.rsi/mag-1.png | Bin 2310 -> 0 bytes .../magnum_smg_mag_rubber.rsi/meta.json | 20 - .../Magazine/Pistol/calico_mag.rsi/base.png | Bin 128 -> 0 bytes .../Magazine/Pistol/calico_mag.rsi/mag-1.png | Bin 128 -> 0 bytes .../Magazine/Pistol/calico_mag.rsi/meta.json | 6 - .../Pistol/pistol_hc_mag.rsi/icon.png | Bin 381 -> 0 bytes .../Pistol/pistol_hc_mag_base.rsi/icon.png | Bin 341 -> 0 bytes .../Pistol/pistol_hc_mag_base.rsi/mag-1.png | Bin 2238 -> 0 bytes .../Pistol/pistol_hc_mag_base.rsi/mag-2.png | Bin 2243 -> 0 bytes .../Pistol/pistol_hc_mag_base.rsi/mag-3.png | Bin 2243 -> 0 bytes .../Pistol/pistol_hc_mag_base.rsi/mag-4.png | Bin 2244 -> 0 bytes .../Pistol/pistol_hc_mag_base.rsi/mag-5.png | Bin 2244 -> 0 bytes .../Pistol/pistol_hc_mag_base.rsi/mag-6.png | Bin 2240 -> 0 bytes .../Pistol/pistol_hc_mag_base.rsi/meta.json | 35 - .../Pistol/pistol_hc_mag_hv.rsi/icon.png | Bin 381 -> 0 bytes .../Pistol/pistol_hc_mag_hv.rsi/mag-1.png | Bin 2238 -> 0 bytes .../Pistol/pistol_hc_mag_hv.rsi/mag-2.png | Bin 2243 -> 0 bytes .../Pistol/pistol_hc_mag_hv.rsi/mag-3.png | Bin 2243 -> 0 bytes .../Pistol/pistol_hc_mag_hv.rsi/mag-4.png | Bin 2244 -> 0 bytes .../Pistol/pistol_hc_mag_hv.rsi/mag-5.png | Bin 2244 -> 0 bytes .../Pistol/pistol_hc_mag_hv.rsi/mag-6.png | Bin 2240 -> 0 bytes .../pistol_hc_mag_practice.rsi/icon.png | Bin 377 -> 0 bytes .../pistol_hc_mag_practice.rsi/mag-1.png | Bin 2238 -> 0 bytes .../pistol_hc_mag_practice.rsi/mag-2.png | Bin 2243 -> 0 bytes .../pistol_hc_mag_practice.rsi/mag-3.png | Bin 2243 -> 0 bytes .../pistol_hc_mag_practice.rsi/mag-4.png | Bin 2244 -> 0 bytes .../pistol_hc_mag_practice.rsi/mag-5.png | Bin 2244 -> 0 bytes .../pistol_hc_mag_practice.rsi/mag-6.png | Bin 2240 -> 0 bytes .../pistol_hc_mag_practice.rsi/meta.json | 35 - .../Pistol/pistol_hc_mag_rubber.rsi/icon.png | Bin 377 -> 0 bytes .../Pistol/pistol_hc_mag_rubber.rsi/mag-1.png | Bin 2238 -> 0 bytes .../Pistol/pistol_hc_mag_rubber.rsi/mag-2.png | Bin 2243 -> 0 bytes .../Pistol/pistol_hc_mag_rubber.rsi/mag-3.png | Bin 2243 -> 0 bytes .../Pistol/pistol_hc_mag_rubber.rsi/mag-4.png | Bin 2244 -> 0 bytes .../Pistol/pistol_hc_mag_rubber.rsi/mag-5.png | Bin 2244 -> 0 bytes .../Pistol/pistol_hc_mag_rubber.rsi/mag-6.png | Bin 2240 -> 0 bytes .../Pistol/pistol_hc_mag_rubber.rsi/meta.json | 35 - .../base.png | Bin .../high_velocity.png} | Bin .../mag-1.png | Bin .../mag-2.png | Bin .../mag-3.png | Bin .../mag-4.png | Bin .../mag-5.png | Bin .../mag-6.png | Bin .../meta.json | 13 +- .../practice.png} | Bin .../red.png} | Bin .../rubber.png} | Bin .../Magazine/Pistol/pistol_mag.rsi/base.png | Bin 371 -> 329 bytes .../base.png => pistol_mag.rsi/flash.png} | Bin .../high_velocity.png} | Bin .../Magazine/Pistol/pistol_mag.rsi/meta.json | 16 +- .../base.png => pistol_mag.rsi/practice.png} | Bin .../pistol_mag.rsi/{icon.png => red.png} | Bin .../base.png => pistol_mag.rsi/rubber.png} | Bin .../Pistol/pistol_mag_base.rsi/base.png | Bin 329 -> 0 bytes .../Pistol/pistol_mag_base.rsi/icon.png | Bin 372 -> 0 bytes .../Pistol/pistol_mag_base.rsi/mag-1.png | Bin 2345 -> 0 bytes .../Pistol/pistol_mag_base.rsi/mag-2.png | Bin 2350 -> 0 bytes .../Pistol/pistol_mag_base.rsi/mag-3.png | Bin 2351 -> 0 bytes .../Pistol/pistol_mag_base.rsi/mag-4.png | Bin 2347 -> 0 bytes .../Pistol/pistol_mag_base.rsi/meta.json | 29 - .../Pistol/pistol_mag_flash.rsi/icon.png | Bin 411 -> 0 bytes .../Pistol/pistol_mag_flash.rsi/mag-1.png | Bin 2345 -> 0 bytes .../Pistol/pistol_mag_flash.rsi/mag-2.png | Bin 2350 -> 0 bytes .../Pistol/pistol_mag_flash.rsi/mag-3.png | Bin 2351 -> 0 bytes .../Pistol/pistol_mag_flash.rsi/mag-4.png | Bin 2347 -> 0 bytes .../Pistol/pistol_mag_flash.rsi/meta.json | 29 - .../Magazine/Pistol/pistol_mag_h.rsi/base.png | Bin 347 -> 0 bytes .../Magazine/Pistol/pistol_mag_h.rsi/icon.png | Bin 381 -> 0 bytes .../Pistol/pistol_mag_h.rsi/mag-1.png | Bin 2166 -> 0 bytes .../Pistol/pistol_mag_h.rsi/mag-2.png | Bin 2171 -> 0 bytes .../Pistol/pistol_mag_h.rsi/mag-3.png | Bin 2171 -> 0 bytes .../Pistol/pistol_mag_h.rsi/mag-4.png | Bin 2172 -> 0 bytes .../Pistol/pistol_mag_h.rsi/mag-5.png | Bin 2172 -> 0 bytes .../Pistol/pistol_mag_h.rsi/mag-6.png | Bin 2166 -> 0 bytes .../Pistol/pistol_mag_h.rsi/meta.json | 35 - .../Pistol/pistol_mag_h_base.rsi/50ae.png | Bin 341 -> 0 bytes .../Pistol/pistol_mag_h_base.rsi/base.png | Bin 306 -> 0 bytes .../Pistol/pistol_mag_h_base.rsi/icon.png | Bin 341 -> 0 bytes .../Pistol/pistol_mag_h_base.rsi/mag-1.png | Bin 2166 -> 0 bytes .../Pistol/pistol_mag_h_base.rsi/mag-2.png | Bin 2171 -> 0 bytes .../Pistol/pistol_mag_h_base.rsi/mag-3.png | Bin 2171 -> 0 bytes .../Pistol/pistol_mag_h_base.rsi/mag-4.png | Bin 2172 -> 0 bytes .../Pistol/pistol_mag_h_base.rsi/mag-5.png | Bin 2172 -> 0 bytes .../Pistol/pistol_mag_h_base.rsi/mag-6.png | Bin 2166 -> 0 bytes .../Pistol/pistol_mag_h_base.rsi/meta.json | 35 - .../Pistol/pistol_mag_h_flash.rsi/base.png | Bin 345 -> 0 bytes .../Pistol/pistol_mag_h_flash.rsi/icon.png | Bin 377 -> 0 bytes .../Pistol/pistol_mag_h_flash.rsi/mag-1.png | Bin 2166 -> 0 bytes .../Pistol/pistol_mag_h_flash.rsi/mag-2.png | Bin 2171 -> 0 bytes .../Pistol/pistol_mag_h_flash.rsi/mag-3.png | Bin 2171 -> 0 bytes .../Pistol/pistol_mag_h_flash.rsi/mag-4.png | Bin 2172 -> 0 bytes .../Pistol/pistol_mag_h_flash.rsi/mag-5.png | Bin 2172 -> 0 bytes .../Pistol/pistol_mag_h_flash.rsi/mag-6.png | Bin 2166 -> 0 bytes .../Pistol/pistol_mag_h_hv.rsi/base.png | Bin 349 -> 0 bytes .../Pistol/pistol_mag_h_hv.rsi/icon.png | Bin 381 -> 0 bytes .../Pistol/pistol_mag_h_hv.rsi/mag-1.png | Bin 2166 -> 0 bytes .../Pistol/pistol_mag_h_hv.rsi/mag-2.png | Bin 2171 -> 0 bytes .../Pistol/pistol_mag_h_hv.rsi/mag-3.png | Bin 2171 -> 0 bytes .../Pistol/pistol_mag_h_hv.rsi/mag-4.png | Bin 2172 -> 0 bytes .../Pistol/pistol_mag_h_hv.rsi/mag-5.png | Bin 2172 -> 0 bytes .../Pistol/pistol_mag_h_hv.rsi/mag-6.png | Bin 2166 -> 0 bytes .../Pistol/pistol_mag_h_practice.rsi/base.png | Bin 347 -> 0 bytes .../Pistol/pistol_mag_h_practice.rsi/icon.png | Bin 377 -> 0 bytes .../pistol_mag_h_practice.rsi/mag-1.png | Bin 2166 -> 0 bytes .../pistol_mag_h_practice.rsi/mag-2.png | Bin 2171 -> 0 bytes .../pistol_mag_h_practice.rsi/mag-3.png | Bin 2171 -> 0 bytes .../pistol_mag_h_practice.rsi/mag-4.png | Bin 2172 -> 0 bytes .../pistol_mag_h_practice.rsi/mag-5.png | Bin 2172 -> 0 bytes .../pistol_mag_h_practice.rsi/mag-6.png | Bin 2166 -> 0 bytes .../pistol_mag_h_practice.rsi/meta.json | 35 - .../Pistol/pistol_mag_h_rubber.rsi/base.png | Bin 346 -> 0 bytes .../Pistol/pistol_mag_h_rubber.rsi/icon.png | Bin 377 -> 0 bytes .../Pistol/pistol_mag_h_rubber.rsi/mag-1.png | Bin 2166 -> 0 bytes .../Pistol/pistol_mag_h_rubber.rsi/mag-2.png | Bin 2171 -> 0 bytes .../Pistol/pistol_mag_h_rubber.rsi/mag-3.png | Bin 2171 -> 0 bytes .../Pistol/pistol_mag_h_rubber.rsi/mag-4.png | Bin 2172 -> 0 bytes .../Pistol/pistol_mag_h_rubber.rsi/mag-5.png | Bin 2172 -> 0 bytes .../Pistol/pistol_mag_h_rubber.rsi/mag-6.png | Bin 2166 -> 0 bytes .../Pistol/pistol_mag_h_rubber.rsi/meta.json | 35 - .../Pistol/pistol_mag_hv.rsi/icon.png | Bin 418 -> 0 bytes .../Pistol/pistol_mag_hv.rsi/mag-1.png | Bin 2345 -> 0 bytes .../Pistol/pistol_mag_hv.rsi/mag-2.png | Bin 2350 -> 0 bytes .../Pistol/pistol_mag_hv.rsi/mag-3.png | Bin 2351 -> 0 bytes .../Pistol/pistol_mag_hv.rsi/mag-4.png | Bin 2347 -> 0 bytes .../Pistol/pistol_mag_hv.rsi/meta.json | 29 - .../Pistol/pistol_mag_practice.rsi/icon.png | Bin 416 -> 0 bytes .../Pistol/pistol_mag_practice.rsi/mag-1.png | Bin 2345 -> 0 bytes .../Pistol/pistol_mag_practice.rsi/mag-2.png | Bin 2350 -> 0 bytes .../Pistol/pistol_mag_practice.rsi/mag-3.png | Bin 2351 -> 0 bytes .../Pistol/pistol_mag_practice.rsi/mag-4.png | Bin 2347 -> 0 bytes .../Pistol/pistol_mag_practice.rsi/meta.json | 29 - .../Pistol/pistol_mag_rubber.rsi/icon.png | Bin 414 -> 0 bytes .../Pistol/pistol_mag_rubber.rsi/mag-1.png | Bin 2345 -> 0 bytes .../Pistol/pistol_mag_rubber.rsi/mag-2.png | Bin 2350 -> 0 bytes .../Pistol/pistol_mag_rubber.rsi/mag-3.png | Bin 2351 -> 0 bytes .../Pistol/pistol_mag_rubber.rsi/mag-4.png | Bin 2347 -> 0 bytes .../Pistol/pistol_mag_rubber.rsi/meta.json | 29 - .../Magazine/Pistol/smg_mag.rsi/base.png | Bin 284 -> 246 bytes .../base.png => smg_mag.rsi/flash.png} | Bin .../high_velocity.png} | Bin .../Magazine/Pistol/smg_mag.rsi/icon.png | Bin 340 -> 0 bytes .../Magazine/Pistol/smg_mag.rsi/meta.json | 16 +- .../base.png => smg_mag.rsi/practice.png} | Bin .../Magazine/Pistol/smg_mag.rsi/red.png | Bin 0 -> 284 bytes .../base.png => smg_mag.rsi/rubber.png} | Bin .../Magazine/Pistol/smg_mag_base.rsi/base.png | Bin 246 -> 0 bytes .../Magazine/Pistol/smg_mag_base.rsi/icon.png | Bin 297 -> 0 bytes .../Pistol/smg_mag_base.rsi/mag-1.png | Bin 1980 -> 0 bytes .../Pistol/smg_mag_base.rsi/meta.json | 20 - .../Pistol/smg_mag_flash.rsi/icon.png | Bin 340 -> 0 bytes .../Pistol/smg_mag_flash.rsi/mag-1.png | Bin 1980 -> 0 bytes .../Pistol/smg_mag_flash.rsi/meta.json | 20 - .../Magazine/Pistol/smg_mag_hv.rsi/icon.png | Bin 339 -> 0 bytes .../Magazine/Pistol/smg_mag_hv.rsi/mag-1.png | Bin 1980 -> 0 bytes .../Magazine/Pistol/smg_mag_hv.rsi/meta.json | 20 - .../Pistol/smg_mag_practice.rsi/icon.png | Bin 339 -> 0 bytes .../Pistol/smg_mag_practice.rsi/mag-1.png | Bin 1980 -> 0 bytes .../Pistol/smg_mag_practice.rsi/meta.json | 20 - .../Pistol/smg_mag_rubber.rsi/icon.png | Bin 341 -> 0 bytes .../Pistol/smg_mag_rubber.rsi/mag-1.png | Bin 1980 -> 0 bytes .../Pistol/smg_mag_rubber.rsi/meta.json | 20 - .../Pistol/smg_mag_top_mounted.rsi/icon.png | Bin 256 -> 0 bytes .../Pistol/smg_mag_top_mounted.rsi/meta.json | 3 - .../rifle_mag.rsi}/base.png | Bin .../rifle_mag.rsi/flash.png} | Bin .../rifle_mag.rsi/high_velocity.png} | Bin .../rifle_mag.rsi}/mag-1.png | Bin .../rifle_mag.rsi}/meta.json | 27 +- .../rifle_mag.rsi/practice.png} | Bin .../base.png => Rifle/rifle_mag.rsi/red.png} | Bin .../rifle_mag.rsi/rubber.png} | Bin .../Magazine/SRifle/s_rifle_mag.rsi/icon.png | Bin 369 -> 0 bytes .../Magazine/SRifle/s_rifle_mag.rsi/meta.json | 20 - .../SRifle/s_rifle_mag_base.rsi/icon.png | Bin 310 -> 0 bytes .../SRifle/s_rifle_mag_base.rsi/mag-1.png | Bin 2133 -> 0 bytes .../SRifle/s_rifle_mag_base.rsi/meta.json | 20 - .../SRifle/s_rifle_mag_flash.rsi/icon.png | Bin 361 -> 0 bytes .../SRifle/s_rifle_mag_flash.rsi/mag-1.png | Bin 2133 -> 0 bytes .../SRifle/s_rifle_mag_flash.rsi/meta.json | 20 - .../SRifle/s_rifle_mag_hv.rsi/icon.png | Bin 367 -> 0 bytes .../SRifle/s_rifle_mag_hv.rsi/mag-1.png | Bin 2133 -> 0 bytes .../SRifle/s_rifle_mag_hv.rsi/meta.json | 20 - .../SRifle/s_rifle_mag_practice.rsi/icon.png | Bin 363 -> 0 bytes .../SRifle/s_rifle_mag_practice.rsi/mag-1.png | Bin 2133 -> 0 bytes .../SRifle/s_rifle_mag_practice.rsi/meta.json | 20 - .../SRifle/s_rifle_mag_rubber.rsi/icon.png | Bin 369 -> 0 bytes .../SRifle/s_rifle_mag_rubber.rsi/mag-1.png | Bin 2133 -> 0 bytes .../SRifle/s_rifle_mag_rubber.rsi/meta.json | 20 - .../base.png => m12.rsi/beanbag.png} | Bin .../Magazine/Shotgun/m12.rsi/icon.png | Bin 422 -> 0 bytes .../Magazine/Shotgun/m12.rsi/meta.json | 10 +- .../base.png => m12.rsi/pellets.png} | Bin .../base.png => m12.rsi/slug.png} | Bin .../Magazine/Shotgun/m12_beanbag.rsi/icon.png | Bin 483 -> 0 bytes .../Shotgun/m12_beanbag.rsi/mag-1.png | Bin 2294 -> 0 bytes .../Shotgun/m12_beanbag.rsi/meta.json | 20 - .../Magazine/Shotgun/m12_pellets.rsi/icon.png | Bin 505 -> 0 bytes .../Shotgun/m12_pellets.rsi/mag-1.png | Bin 2420 -> 0 bytes .../Shotgun/m12_pellets.rsi/meta.json | 20 - .../Magazine/Shotgun/m12_slug.rsi/icon.png | Bin 432 -> 0 bytes .../Magazine/Shotgun/m12_slug.rsi/mag-1.png | Bin 2083 -> 0 bytes .../Magazine/Shotgun/m12_slug.rsi/meta.json | 20 - .../LRifle/l_rifle_sl.rsi/icon.png | Bin 497 -> 0 bytes .../light_rifle_speed_loader.rsi}/base.png | Bin .../light_rifle_speed_loader.rsi}/mag-1.png | Bin .../light_rifle_speed_loader.rsi}/mag-2.png | Bin .../light_rifle_speed_loader.rsi}/mag-3.png | Bin .../light_rifle_speed_loader.rsi}/mag-4.png | Bin .../light_rifle_speed_loader.rsi}/mag-5.png | Bin .../light_rifle_speed_loader.rsi}/meta.json | 3 - .../Magnum/magnum_sl.rsi/icon.png | Bin 546 -> 0 bytes .../Magnum/magnum_sl.rsi/meta.json | 35 - .../Magnum/magnum_sl_flash.rsi/icon.png | Bin 532 -> 0 bytes .../Magnum/magnum_sl_flash.rsi/meta.json | 35 - .../Magnum/magnum_sl_hv.rsi/base.png | Bin 302 -> 0 bytes .../Magnum/magnum_sl_hv.rsi/icon.png | Bin 543 -> 0 bytes .../Magnum/magnum_sl_hv.rsi/meta.json | 35 - .../Magnum/magnum_sl_practice.rsi/base.png | Bin 302 -> 0 bytes .../Magnum/magnum_sl_practice.rsi/icon.png | Bin 542 -> 0 bytes .../Magnum/magnum_sl_practice.rsi/meta.json | 35 - .../Magnum/magnum_sl_rubber.rsi/base.png | Bin 302 -> 0 bytes .../Magnum/magnum_sl_rubber.rsi/icon.png | Bin 536 -> 0 bytes .../Magnum/magnum_sl_rubber.rsi/meta.json | 35 - .../base-1.png} | Bin .../base-2.png} | Bin .../base-3.png} | Bin .../base-4.png} | Bin .../base-5.png} | Bin .../base-6.png} | Bin .../base.png | Bin .../flash-1.png} | Bin .../flash-2.png} | Bin .../flash-3.png} | Bin .../flash-4.png} | Bin .../flash-5.png} | Bin .../flash-6.png} | Bin .../high-velocity-1.png} | Bin .../high-velocity-2.png} | Bin .../high-velocity-3.png} | Bin .../high-velocity-4.png} | Bin .../high-velocity-5.png} | Bin .../high-velocity-6.png} | Bin .../Magnum/magnum_speed_loader.rsi/meta.json | 104 + .../practice-1.png} | Bin .../practice-2.png} | Bin .../practice-3.png} | Bin .../practice-4.png} | Bin .../practice-5.png} | Bin .../practice-6.png} | Bin .../rubber-1.png} | Bin .../rubber-2.png} | Bin .../rubber-3.png} | Bin .../rubber-4.png} | Bin .../rubber-5.png} | Bin .../rubber-6.png} | Bin .../Pistol/pistol_sl.rsi/base.png | Bin 302 -> 0 bytes .../Pistol/pistol_sl.rsi/icon.png | Bin 526 -> 0 bytes .../Pistol/pistol_sl.rsi/meta.json | 35 - .../Pistol/pistol_sl_flash.rsi/base.png | Bin 302 -> 0 bytes .../Pistol/pistol_sl_flash.rsi/icon.png | Bin 515 -> 0 bytes .../Pistol/pistol_sl_flash.rsi/meta.json | 35 - .../Pistol/pistol_sl_hv.rsi/base.png | Bin 302 -> 0 bytes .../Pistol/pistol_sl_hv.rsi/icon.png | Bin 529 -> 0 bytes .../Pistol/pistol_sl_hv.rsi/meta.json | 35 - .../Pistol/pistol_sl_practice.rsi/base.png | Bin 302 -> 0 bytes .../Pistol/pistol_sl_practice.rsi/icon.png | Bin 529 -> 0 bytes .../Pistol/pistol_sl_practice.rsi/meta.json | 35 - .../Pistol/pistol_sl_rubber.rsi/base.png | Bin 302 -> 0 bytes .../Pistol/pistol_sl_rubber.rsi/icon.png | Bin 530 -> 0 bytes .../Pistol/pistol_sl_rubber.rsi/meta.json | 35 - .../base-1.png} | Bin .../base-2.png} | Bin .../base-3.png} | Bin .../base-4.png} | Bin .../base-5.png} | Bin .../base-6.png} | Bin .../pistol_speed_loader.rsi}/base.png | Bin .../flash-1.png} | Bin .../flash-2.png} | Bin .../flash-3.png} | Bin .../flash-4.png} | Bin .../flash-5.png} | Bin .../flash-6.png} | Bin .../high-velocity-1.png} | Bin .../high-velocity-2.png} | Bin .../high-velocity-3.png} | Bin .../high-velocity-4.png} | Bin .../high-velocity-5.png} | Bin .../high-velocity-6.png} | Bin .../Pistol/pistol_speed_loader.rsi/meta.json | 104 + .../practice-1.png} | Bin .../practice-2.png} | Bin .../practice-3.png} | Bin .../practice-4.png} | Bin .../practice-5.png} | Bin .../practice-6.png} | Bin .../rubber-1.png} | Bin .../rubber-2.png} | Bin .../rubber-3.png} | Bin .../rubber-4.png} | Bin .../rubber-5.png} | Bin .../rubber-6.png} | Bin .../Guns/HMGs/minigun.rsi/bolt-closed.png | Bin 825 -> 0 bytes .../Guns/HMGs/minigun.rsi/bolt-open.png | Bin 825 -> 0 bytes .../Weapons/Guns/HMGs/minigun.rsi/icon.png | Bin 825 -> 5911 bytes .../Weapons/Guns/HMGs/minigun.rsi/meta.json | 44 +- .../Objects/Weapons/Guns/LMGs/l6.rsi/base.png | Bin 2400 -> 5721 bytes .../Weapons/Guns/LMGs/l6.rsi/bolt-closed.png | Bin 2254 -> 0 bytes .../Weapons/Guns/LMGs/l6.rsi/bolt-open.png | Bin 2394 -> 0 bytes .../Weapons/Guns/LMGs/l6.rsi/meta.json | 6 - .../Objects/Weapons/Guns/LMGs/pk.rsi/base.png | Bin 316 -> 5674 bytes .../Weapons/Guns/LMGs/pk.rsi/bolt-closed.png | Bin 177 -> 0 bytes .../Weapons/Guns/LMGs/pk.rsi/bolt-open.png | Bin 176 -> 0 bytes .../Weapons/Guns/LMGs/pk.rsi/meta.json | 6 - .../Guns/Launchers/china_lake.rsi/base.png | Bin 2465 -> 0 bytes .../Launchers/china_lake.rsi/bolt-closed.png | Bin 2545 -> 0 bytes .../Launchers/china_lake.rsi/bolt-open.png | Bin 2517 -> 0 bytes .../Guns/Launchers/china_lake.rsi/meta.json | 9 - .../Guns/Launchers/rocket.rsi/icon.png | Bin 582 -> 0 bytes .../Guns/Launchers/rocket.rsi/meta.json | 5 +- .../Guns/Pistols/clarissa.rsi/base.png | Bin 1988 -> 5361 bytes .../Guns/Pistols/clarissa.rsi/bolt-closed.png | Bin 1905 -> 0 bytes .../Guns/Pistols/clarissa.rsi/bolt-open.png | Bin 1947 -> 0 bytes .../Guns/Pistols/clarissa.rsi/meta.json | 6 - .../Weapons/Guns/Pistols/colt.rsi/base.png | Bin 2574 -> 5912 bytes .../Guns/Pistols/colt.rsi/bolt-closed.png | Bin 2581 -> 0 bytes .../Guns/Pistols/colt.rsi/bolt-open.png | Bin 2566 -> 0 bytes .../Weapons/Guns/Pistols/colt.rsi/meta.json | 6 - .../Guns/Pistols/debug.rsi/bolt-closed.png | Bin 277 -> 0 bytes .../Guns/Pistols/debug.rsi/bolt-open.png | Bin 277 -> 0 bytes .../Weapons/Guns/Pistols/debug.rsi/meta.json | 6 - .../Weapons/Guns/Pistols/giskard.rsi/base.png | Bin 2346 -> 5782 bytes .../Guns/Pistols/giskard.rsi/bolt-closed.png | Bin 2287 -> 0 bytes .../Guns/Pistols/giskard.rsi/bolt-open.png | Bin 2260 -> 0 bytes .../Guns/Pistols/giskard.rsi/meta.json | 6 - .../Guns/Pistols/gyro_pistol.rsi/base.png | Bin 279 -> 5397 bytes .../Pistols/gyro_pistol.rsi/bolt-closed.png | Bin 147 -> 0 bytes .../Pistols/gyro_pistol.rsi/bolt-open.png | Bin 139 -> 0 bytes .../Guns/Pistols/gyro_pistol.rsi/meta.json | 6 - .../Guns/Pistols/hm_pistol.rsi/base.png | Bin 2483 -> 5855 bytes .../Pistols/hm_pistol.rsi/bolt-closed.png | Bin 2476 -> 0 bytes .../Guns/Pistols/hm_pistol.rsi/bolt-open.png | Bin 2531 -> 0 bytes .../Guns/Pistols/hm_pistol.rsi/meta.json | 6 - .../Weapons/Guns/Pistols/lamia.rsi/base.png | Bin 278 -> 5648 bytes .../Guns/Pistols/lamia.rsi/bolt-closed.png | Bin 213 -> 0 bytes .../Guns/Pistols/lamia.rsi/bolt-open.png | Bin 211 -> 0 bytes .../Weapons/Guns/Pistols/lamia.rsi/meta.json | 8 - .../Guns/Pistols/mandella.rsi/base.png | Bin 2587 -> 5909 bytes .../Guns/Pistols/mandella.rsi/bolt-closed.png | Bin 2412 -> 0 bytes .../Guns/Pistols/mandella.rsi/bolt-open.png | Bin 2552 -> 0 bytes .../Guns/Pistols/mandella.rsi/meta.json | 6 - .../Weapons/Guns/Pistols/mk58.rsi/base.png | Bin 2587 -> 5905 bytes .../Guns/Pistols/mk58.rsi/bolt-closed.png | Bin 2584 -> 0 bytes .../Guns/Pistols/mk58.rsi/bolt-open.png | Bin 2512 -> 0 bytes .../Weapons/Guns/Pistols/mk58.rsi/meta.json | 6 - .../Guns/Pistols/mk58_wood.rsi/base.png | Bin 2372 -> 5761 bytes .../Pistols/mk58_wood.rsi/bolt-closed.png | Bin 2453 -> 0 bytes .../Guns/Pistols/mk58_wood.rsi/bolt-open.png | Bin 2369 -> 0 bytes .../Guns/Pistols/mk58_wood.rsi/meta.json | 6 - .../Weapons/Guns/Pistols/molly.rsi/base.png | Bin 277 -> 5602 bytes .../Guns/Pistols/molly.rsi/bolt-closed.png | Bin 204 -> 0 bytes .../Guns/Pistols/molly.rsi/bolt-open.png | Bin 199 -> 0 bytes .../Weapons/Guns/Pistols/molly.rsi/meta.json | 6 - .../Guns/Pistols/olivaw_civil.rsi/base.png | Bin 2465 -> 0 bytes .../Pistols/olivaw_civil.rsi/bolt-closed.png | Bin 2461 -> 0 bytes .../Pistols/olivaw_civil.rsi/bolt-open.png | Bin 2458 -> 0 bytes .../Guns/Pistols/olivaw_civil.rsi/meta.json | 9 - .../Weapons/Guns/Pistols/paco.rsi/base.png | Bin 2527 -> 5923 bytes .../Guns/Pistols/paco.rsi/bolt-closed.png | Bin 2366 -> 0 bytes .../Guns/Pistols/paco.rsi/bolt-open.png | Bin 2623 -> 0 bytes .../Weapons/Guns/Pistols/paco.rsi/meta.json | 6 - .../Guns/Projectiles/buckshot.rsi/meta.json | 14 - .../Guns/Projectiles/bullet.rsi/meta.json | 20 - .../Weapons/Guns/Projectiles/copyright.json | 13 - .../Projectiles/flare_buckshot.rsi/meta.json | 14 - .../Guns/Projectiles/grenade.rsi/meta.json | 20 - .../Weapons/Guns/Projectiles/heavy_laser.png | Bin 155 -> 0 bytes .../Guns/Projectiles/heavy_laser_impact.png | Bin 2795 -> 0 bytes .../Guns/Projectiles/heavy_laser_muzzle.png | Bin 2301 -> 0 bytes .../Weapons/Guns/Projectiles/laser.png | Bin 140 -> 0 bytes .../Weapons/Guns/Projectiles/laser_impact.png | Bin 2528 -> 0 bytes .../Weapons/Guns/Projectiles/laser_muzzle.png | Bin 1963 -> 0 bytes .../Weapons/Guns/Projectiles/plasma.png | Bin 182 -> 0 bytes .../Guns/Projectiles/projectiles.rsi/beam.png | Bin 0 -> 1036 bytes .../Projectiles/projectiles.rsi/beam_blue.png | Bin 0 -> 400 bytes .../projectiles.rsi/beam_heavy.png | Bin 0 -> 438 bytes .../Projectiles/projectiles.rsi/beam_omni.png | Bin 0 -> 407 bytes .../Guns/Projectiles/projectiles.rsi/bolt.png | Bin 0 -> 274 bytes .../projectiles.rsi/impact_beam_heavy.png | Bin 0 -> 1555 bytes .../projectiles.rsi/impact_blue.png | Bin 0 -> 1613 bytes .../projectiles.rsi/impact_laser.png | Bin 0 -> 1355 bytes .../projectiles.rsi/impact_omni.png | Bin 0 -> 1644 bytes .../projectiles.rsi/impact_u_laser.png | Bin 0 -> 1540 bytes .../projectiles.rsi/impact_xray.png | Bin 0 -> 1106 bytes .../Projectiles/projectiles.rsi/meta.json | 293 + .../projectiles.rsi/muzzle_beam_heavy.png | Bin 0 -> 1112 bytes .../projectiles.rsi/muzzle_blue.png | Bin 0 -> 1212 bytes .../muzzle_bullet.png} | Bin .../projectiles.rsi/muzzle_laser.png | Bin 0 -> 1481 bytes .../projectiles.rsi/muzzle_omni.png | Bin 0 -> 1253 bytes .../projectiles.rsi/muzzle_u_laser.png | Bin 0 -> 1113 bytes .../projectiles.rsi/muzzle_xray.png | Bin 0 -> 1068 bytes .../Projectiles/projectiles.rsi/u_laser.png | Bin 0 -> 439 bytes .../Guns/Projectiles/projectiles.rsi/xray.png | Bin 0 -> 800 bytes .../buckshot-flare.png} | Bin .../buckshot.png} | Bin .../bullet.png | Bin .../{rocket.rsi => projectiles2.rsi}/frag.png | Bin .../grenade.png | Bin .../Projectiles/projectiles2.rsi/meta.json | 53 + .../base.png => projectiles2.rsi/slug.png} | Bin .../smallfrag.png | Bin .../{spark.rsi => projectiles2.rsi}/spark.png | Bin .../Weapons/Guns/Projectiles/pulse.png | Bin 311 -> 0 bytes .../Weapons/Guns/Projectiles/pulse_impact.png | Bin 2398 -> 0 bytes .../Weapons/Guns/Projectiles/pulse_muzzle.png | Bin 1931 -> 0 bytes .../Guns/Projectiles/rocket.rsi/meta.json | 17 - .../Guns/Projectiles/slug.rsi/meta.json | 14 - .../Guns/Projectiles/spark.rsi/meta.json | 20 - .../Objects/Weapons/Guns/Projectiles/xray.png | Bin 131 -> 0 bytes .../Weapons/Guns/Projectiles/xray_impact.png | Bin 1896 -> 0 bytes .../Weapons/Guns/Projectiles/xray_muzzle.png | Bin 2087 -> 0 bytes .../Guns/Revolvers/deckard.rsi/base.png | Bin 2628 -> 5964 bytes .../Revolvers/deckard.rsi/bolt-closed.png | Bin 2613 -> 0 bytes .../Guns/Revolvers/deckard.rsi/bolt-open.png | Bin 2623 -> 0 bytes .../Guns/Revolvers/deckard.rsi/icon.png | Bin 2631 -> 0 bytes .../Guns/Revolvers/deckard.rsi/meta.json | 9 - .../Weapons/Guns/Rifles/ak.rsi/base.png | Bin 303 -> 5681 bytes .../Guns/Rifles/ak.rsi/bolt-closed.png | Bin 153 -> 0 bytes .../Weapons/Guns/Rifles/ak.rsi/bolt-open.png | Bin 140 -> 0 bytes .../Weapons/Guns/Rifles/ak.rsi/meta.json | 6 - .../Weapons/Guns/Rifles/black_ak.rsi/base.png | Bin 290 -> 5463 bytes .../Guns/Rifles/black_ak.rsi/bolt-closed.png | Bin 153 -> 0 bytes .../Guns/Rifles/black_ak.rsi/bolt-open.png | Bin 140 -> 0 bytes .../Guns/Rifles/black_ak.rsi/meta.json | 6 - .../Weapons/Guns/Rifles/carbine.rsi/base.png | Bin 326 -> 5598 bytes .../Guns/Rifles/carbine.rsi/bolt-closed.png | Bin 151 -> 0 bytes .../Guns/Rifles/carbine.rsi/bolt-open.png | Bin 147 -> 0 bytes .../Weapons/Guns/Rifles/carbine.rsi/meta.json | 6 - .../Weapons/Guns/Rifles/sts.rsi/base.png | Bin 289 -> 5474 bytes .../Guns/Rifles/sts.rsi/bolt-closed.png | Bin 145 -> 0 bytes .../Weapons/Guns/Rifles/sts.rsi/bolt-open.png | Bin 141 -> 0 bytes .../Weapons/Guns/Rifles/sts.rsi/meta.json | 6 - .../Weapons/Guns/Rifles/vintorez.rsi/base.png | Bin 2708 -> 6032 bytes .../Guns/Rifles/vintorez.rsi/bolt-closed.png | Bin 2695 -> 0 bytes .../Guns/Rifles/vintorez.rsi/bolt-open.png | Bin 2793 -> 0 bytes .../Guns/Rifles/vintorez.rsi/meta.json | 6 - .../Guns/Rifles/wintermute.rsi/base.png | Bin 352 -> 5727 bytes .../Rifles/wintermute.rsi/bolt-closed.png | Bin 140 -> 0 bytes .../Guns/Rifles/wintermute.rsi/bolt-open.png | Bin 136 -> 0 bytes .../Guns/Rifles/wintermute.rsi/meta.json | 6 - .../Weapons/Guns/SMGs/atreides.rsi/base.png | Bin 2402 -> 5695 bytes .../Guns/SMGs/atreides.rsi/bolt-closed.png | Bin 2567 -> 0 bytes .../Guns/SMGs/atreides.rsi/bolt-open.png | Bin 2115 -> 0 bytes .../Weapons/Guns/SMGs/atreides.rsi/meta.json | 6 - .../Weapons/Guns/SMGs/c20r.rsi/base.png | Bin 329 -> 5473 bytes .../Guns/SMGs/c20r.rsi/bolt-closed.png | Bin 147 -> 0 bytes .../Weapons/Guns/SMGs/c20r.rsi/bolt-open.png | Bin 139 -> 0 bytes .../Weapons/Guns/SMGs/c20r.rsi/meta.json | 6 - .../Weapons/Guns/SMGs/drozd.rsi/base.png | Bin 339 -> 5741 bytes .../Guns/SMGs/drozd.rsi/bolt-closed.png | Bin 2663 -> 0 bytes .../Weapons/Guns/SMGs/drozd.rsi/bolt-open.png | Bin 1456 -> 0 bytes .../Weapons/Guns/SMGs/drozd.rsi/meta.json | 6 - .../Weapons/Guns/SMGs/zoric.rsi/base.png | Bin 3107 -> 6388 bytes .../Guns/SMGs/zoric.rsi/bolt-closed.png | Bin 3090 -> 0 bytes .../Weapons/Guns/SMGs/zoric.rsi/bolt-open.png | Bin 1345 -> 0 bytes .../Weapons/Guns/SMGs/zoric.rsi/meta.json | 6 - .../Guns/Shotguns/bojevic.rsi/base.png | Bin 347 -> 5510 bytes .../Guns/Shotguns/bojevic.rsi/bolt-closed.png | Bin 146 -> 0 bytes .../Guns/Shotguns/bojevic.rsi/bolt-open.png | Bin 138 -> 0 bytes .../Guns/Shotguns/bojevic.rsi/meta.json | 6 - .../Guns/Shotguns/db_shotgun.rsi/base.png | Bin 2325 -> 0 bytes .../Shotguns/db_shotgun.rsi/bolt-closed.png | Bin 2319 -> 0 bytes .../Shotguns/db_shotgun.rsi/bolt-open.png | Bin 2360 -> 0 bytes .../Guns/Shotguns/db_shotgun.rsi/meta.json | 9 - .../Guns/Shotguns/flaregun.rsi/base.png | Bin 500 -> 0 bytes .../Shotguns/flaregun.rsi/bolt-closed.png | Bin 214 -> 0 bytes .../Guns/Shotguns/flaregun.rsi/bolt-open.png | Bin 284 -> 0 bytes .../Guns/Shotguns/flaregun.rsi/meta.json | 9 - .../Weapons/Guns/Shotguns/sawn.rsi/base.png | Bin 2310 -> 0 bytes .../Guns/Shotguns/sawn.rsi/bolt-closed.png | Bin 2301 -> 0 bytes .../Guns/Shotguns/sawn.rsi/bolt-open.png | Bin 2192 -> 0 bytes .../Weapons/Guns/Shotguns/sawn.rsi/meta.json | 9 - 1051 files changed, 8230 insertions(+), 99090 deletions(-) create mode 100644 Content.Client/Effects/EffectVisualizerSystem.cs create mode 100644 Content.Client/Effects/EffectVisualsComponent.cs delete mode 100644 Content.Client/Weapons/Ranged/Barrels/Components/ClientBatteryBarrelComponent.cs delete mode 100644 Content.Client/Weapons/Ranged/Barrels/Components/ClientBoltActionBarrelComponent.cs delete mode 100644 Content.Client/Weapons/Ranged/Barrels/Components/ClientMagazineBarrelComponent.cs delete mode 100644 Content.Client/Weapons/Ranged/Barrels/Components/ClientPumpBarrelComponent.cs delete mode 100644 Content.Client/Weapons/Ranged/Barrels/Components/ClientRevolverBarrelComponent.cs delete mode 100644 Content.Client/Weapons/Ranged/Barrels/EntitySystems/ClientBatteryBarrelSystem.cs delete mode 100644 Content.Client/Weapons/Ranged/Barrels/Visualizers/BarrelBoltVisualizer.cs delete mode 100644 Content.Client/Weapons/Ranged/Barrels/Visualizers/MagVisualizer.cs delete mode 100644 Content.Client/Weapons/Ranged/Barrels/Visualizers/SpentAmmoVisualizer.cs delete mode 100644 Content.Client/Weapons/Ranged/ClientRangedWeaponComponent.cs rename Content.Client/Weapons/Ranged/{ => Commands}/TetherGunCommand.cs (93%) create mode 100644 Content.Client/Weapons/Ranged/Components/AmmoCounterComponent.cs create mode 100644 Content.Client/Weapons/Ranged/Components/MagVisualizer.cs create mode 100644 Content.Client/Weapons/Ranged/Components/SpentAmmoVisualsComponent.cs delete mode 100644 Content.Client/Weapons/Ranged/GunSystem.AmmoCounter.cs delete mode 100644 Content.Client/Weapons/Ranged/RangedWeaponSystem.cs rename Content.Client/Weapons/Ranged/{ => Systems}/FlyBySoundSystem.cs (89%) create mode 100644 Content.Client/Weapons/Ranged/Systems/GunSystem.AmmoCounter.cs create mode 100644 Content.Client/Weapons/Ranged/Systems/GunSystem.Ballistic.cs create mode 100644 Content.Client/Weapons/Ranged/Systems/GunSystem.Battery.cs create mode 100644 Content.Client/Weapons/Ranged/Systems/GunSystem.ChamberMagazine.cs create mode 100644 Content.Client/Weapons/Ranged/Systems/GunSystem.Magazine.cs create mode 100644 Content.Client/Weapons/Ranged/Systems/GunSystem.Revolver.cs create mode 100644 Content.Client/Weapons/Ranged/Systems/GunSystem.SpentAmmo.cs create mode 100644 Content.Client/Weapons/Ranged/Systems/GunSystem.cs rename Content.Client/Weapons/Ranged/{ => Systems}/TetherGunSystem.cs (97%) delete mode 100644 Content.Server/Projectiles/Components/HitscanComponent.cs delete mode 100644 Content.Server/Weapon/Ranged/Ammunition/Components/AmmoBoxComponent.cs delete mode 100644 Content.Server/Weapon/Ranged/Ammunition/Components/AmmoComponent.cs delete mode 100644 Content.Server/Weapon/Ranged/Ammunition/Components/AmmoComponentData.cs delete mode 100644 Content.Server/Weapon/Ranged/Ammunition/Components/RangedMagazineComponent.cs delete mode 100644 Content.Server/Weapon/Ranged/Ammunition/Components/SpeedLoaderComponent.cs delete mode 100644 Content.Server/Weapon/Ranged/Barrels/Components/BatteryBarrelComponent.cs delete mode 100644 Content.Server/Weapon/Ranged/Barrels/Components/BoltActionBarrelComponent.cs delete mode 100644 Content.Server/Weapon/Ranged/Barrels/Components/MagazineBarrelComponent.cs delete mode 100644 Content.Server/Weapon/Ranged/Barrels/Components/PumpBarrelComponent.cs delete mode 100644 Content.Server/Weapon/Ranged/Barrels/Components/RevolverBarrelComponent.cs delete mode 100644 Content.Server/Weapon/Ranged/Barrels/Components/ServerRangedBarrelComponent.cs create mode 100644 Content.Server/Weapon/Ranged/Components/AmmoCounterComponent.cs rename Content.Server/Weapon/Ranged/{Ammunition => }/Components/ChemicalAmmoComponent.cs (81%) rename Content.Server/Weapon/Ranged/{ => Components}/RangedDamageSoundComponent.cs (95%) delete mode 100644 Content.Server/Weapon/Ranged/FlyBySoundSystem.cs delete mode 100644 Content.Server/Weapon/Ranged/GunSystem.Ammo.cs delete mode 100644 Content.Server/Weapon/Ranged/GunSystem.AmmoBox.cs delete mode 100644 Content.Server/Weapon/Ranged/GunSystem.Battery.cs delete mode 100644 Content.Server/Weapon/Ranged/GunSystem.Bolt.cs delete mode 100644 Content.Server/Weapon/Ranged/GunSystem.Guns.cs delete mode 100644 Content.Server/Weapon/Ranged/GunSystem.Magazine.cs delete mode 100644 Content.Server/Weapon/Ranged/GunSystem.Pump.cs delete mode 100644 Content.Server/Weapon/Ranged/GunSystem.RangedMagazine.cs delete mode 100644 Content.Server/Weapon/Ranged/GunSystem.Revolvers.cs delete mode 100644 Content.Server/Weapon/Ranged/GunSystem.SpeedLoader.cs delete mode 100644 Content.Server/Weapon/Ranged/GunSystem.cs delete mode 100644 Content.Server/Weapon/Ranged/RangedWeaponSystem.cs delete mode 100644 Content.Server/Weapon/Ranged/ServerRangedWeaponComponent.cs rename Content.Server/Weapon/Ranged/{ => Systems}/ChemicalAmmoSystem.cs (87%) create mode 100644 Content.Server/Weapon/Ranged/Systems/FlyBySoundSystem.cs create mode 100644 Content.Server/Weapon/Ranged/Systems/GunSystem.Ballistic.cs create mode 100644 Content.Server/Weapon/Ranged/Systems/GunSystem.Battery.cs create mode 100644 Content.Server/Weapon/Ranged/Systems/GunSystem.Revolver.cs create mode 100644 Content.Server/Weapon/Ranged/Systems/GunSystem.cs rename Content.Server/Weapon/Ranged/{ => Systems}/TetherGunSystem.cs (98%) delete mode 100644 Content.Shared/Weapons/Ranged/Barrels/Components/SharedBoltActionBarrelComponent.cs delete mode 100644 Content.Shared/Weapons/Ranged/Barrels/Components/SharedMagazineBarrelComponent.cs delete mode 100644 Content.Shared/Weapons/Ranged/Barrels/Components/SharedPumpBarrelComponent.cs delete mode 100644 Content.Shared/Weapons/Ranged/Barrels/Components/SharedRevolverBarrelComponent.cs create mode 100644 Content.Shared/Weapons/Ranged/Components/AmmoComponent.cs create mode 100644 Content.Shared/Weapons/Ranged/Components/AmmoProviderComponent.cs create mode 100644 Content.Shared/Weapons/Ranged/Components/BallisticAmmoProviderComponent.cs create mode 100644 Content.Shared/Weapons/Ranged/Components/BatteryAmmoProviderComponent.cs create mode 100644 Content.Shared/Weapons/Ranged/Components/ChamberMagazineAmmoProviderComponent.cs rename Content.Shared/Weapons/Ranged/{ => Components}/FlyBySoundComponent.cs (93%) create mode 100644 Content.Shared/Weapons/Ranged/Components/GunComponent.cs create mode 100644 Content.Shared/Weapons/Ranged/Components/HitscanBatteryAmmoProviderComponent.cs create mode 100644 Content.Shared/Weapons/Ranged/Components/MagazineAmmoProviderComponent.cs create mode 100644 Content.Shared/Weapons/Ranged/Components/ProjectileBatteryAmmoProviderComponent.cs create mode 100644 Content.Shared/Weapons/Ranged/Components/RevolverAmmoProviderComponent.cs create mode 100644 Content.Shared/Weapons/Ranged/Components/SharedAmmoCounterComponent.cs delete mode 100644 Content.Shared/Weapons/Ranged/Components/SharedRangedBarrelComponent.cs delete mode 100644 Content.Shared/Weapons/Ranged/Components/SharedRangedWeaponComponent.cs create mode 100644 Content.Shared/Weapons/Ranged/Events/AmmoShotEvent.cs create mode 100644 Content.Shared/Weapons/Ranged/Events/GetAmmoCountEvent.cs rename Content.Shared/Weapons/Ranged/{ => Events}/MagazineAutoEjectEvent.cs (85%) create mode 100644 Content.Shared/Weapons/Ranged/Events/RequestShootEvent.cs create mode 100644 Content.Shared/Weapons/Ranged/Events/RequestStopShootEvent.cs create mode 100644 Content.Shared/Weapons/Ranged/Events/TakeAmmoEvent.cs create mode 100644 Content.Shared/Weapons/Ranged/HitscanPrototype.cs create mode 100644 Content.Shared/Weapons/Ranged/IShootable.cs rename Content.Shared/Weapons/Ranged/{ => Systems}/SharedFlyBySoundSystem.cs (95%) create mode 100644 Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Ballistic.cs create mode 100644 Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Battery.cs create mode 100644 Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Cartridges.cs create mode 100644 Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.ChamberMagazine.cs create mode 100644 Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Interactions.cs create mode 100644 Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Magazine.cs create mode 100644 Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Revolver.cs create mode 100644 Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs rename Content.Shared/Weapons/Ranged/{ => Systems}/SharedTetherGunSystem.cs (88%) create mode 100644 Resources/Audio/Weapons/Guns/Misc/licenses.txt create mode 100644 Resources/Audio/Weapons/Guns/Misc/selector.ogg create mode 100644 Resources/Locale/en-US/power/components/charger.ftl delete mode 100644 Resources/Locale/en-US/weapons/ranged/ammunition/components/ammo-box-component.ftl delete mode 100644 Resources/Locale/en-US/weapons/ranged/ammunition/components/ammo-component.ftl delete mode 100644 Resources/Locale/en-US/weapons/ranged/ammunition/components/ranged-magazine-component.ftl delete mode 100644 Resources/Locale/en-US/weapons/ranged/ammunition/components/speed-loader-component.ftl delete mode 100644 Resources/Locale/en-US/weapons/ranged/barrels/components/bolt-action-barrel-component.ftl delete mode 100644 Resources/Locale/en-US/weapons/ranged/barrels/components/pump-barrel-action-component.ftl delete mode 100644 Resources/Locale/en-US/weapons/ranged/barrels/components/revolver-barrel-component.ftl delete mode 100644 Resources/Locale/en-US/weapons/ranged/barrels/components/server-magazine-barrel-component.ftl delete mode 100644 Resources/Locale/en-US/weapons/ranged/barrels/components/server-ranged-barrel-component.ftl create mode 100644 Resources/Locale/en-US/weapons/ranged/gun.ftl delete mode 100644 Resources/Locale/en-US/weapons/ranged/server-ranged-weapon-component.ftl delete mode 100644 Resources/Maps/centcomm.yml delete mode 100644 Resources/Maps/dart.yml delete mode 100644 Resources/Maps/moonrise.yml delete mode 100644 Resources/Maps/mothership.yml delete mode 100644 Resources/Prototypes/Entities/Markers/Spawners/Conditional/suspicion.yml create mode 100644 Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.yml delete mode 100644 Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/clrifle.yml create mode 100644 Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.yml delete mode 100644 Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/lrifle.yml create mode 100644 Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/rifle.yml delete mode 100644 Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/srifle.yml rename Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/{BaseCartridge.yml => base_cartridge.yml} (84%) create mode 100644 Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/caseless_rifle.yml delete mode 100644 Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/clrifle.yml rename Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/{hrifle.yml => heavy_rifle.yml} (57%) create mode 100644 Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/light_rifle.yml delete mode 100644 Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/lrifle.yml create mode 100644 Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/rifle.yml delete mode 100644 Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/srifle.yml create mode 100644 Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/caseless_rifle.yml delete mode 100644 Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/clrifle.yml create mode 100644 Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/heavy_rifle.yml delete mode 100644 Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/hrifle.yml create mode 100644 Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml delete mode 100644 Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/lrifle.yml create mode 100644 Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle.yml delete mode 100644 Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/srifle.yml rename Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/{clrifle.yml => caseless_rifle.yml} (71%) rename Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/{hrifle.yml => heavy_rifle.yml} (81%) rename Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/{lrifle.yml => light_rifle.yml} (71%) rename Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/{srifle.yml => rifle.yml} (73%) delete mode 100644 Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Speed Loaders/lrifle.yml delete mode 100644 Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Speed Loaders/magnum.yml delete mode 100644 Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Speed Loaders/pistol.yml delete mode 100644 Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Speed Loaders/toy.yml create mode 100644 Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/magnum.yml create mode 100644 Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/pistol.yml create mode 100644 Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/rifle_light.yml create mode 100644 Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/toy.yml delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_material.rsi/icon.png rename Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/{cl_rifle.rsi => caseless_rifle.rsi}/base-10x24.png (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/{cl_rifle.rsi => caseless_rifle.rsi}/base-b.png (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/{cl_rifle.rsi => caseless_rifle.rsi}/base.png (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/{cl_rifle.rsi => caseless_rifle.rsi}/flash.png (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/{cl_rifle.rsi => caseless_rifle.rsi}/hv.png (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/{cl_rifle.rsi => caseless_rifle.rsi}/mag-1.png (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/{cl_rifle.rsi => caseless_rifle.rsi}/mag10-1.png (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/{cl_rifle.rsi => caseless_rifle.rsi}/magb-1.png (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/{cl_rifle.rsi => caseless_rifle.rsi}/meta.json (95%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/{cl_rifle.rsi => caseless_rifle.rsi}/practice.png (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/{cl_rifle.rsi => caseless_rifle.rsi}/rubber-b.png (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/{cl_rifle.rsi => caseless_rifle.rsi}/rubber.png (100%) delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/cl_rifle.rsi/icon.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/l_rifle.rsi/icon.png rename Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/{l_rifle.rsi => light_rifle.rsi}/base-b.png (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/{l_rifle.rsi => light_rifle.rsi}/base.png (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/{l_rifle.rsi => light_rifle.rsi}/hv.png (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/{l_rifle.rsi => light_rifle.rsi}/mag-1.png (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/{l_rifle.rsi => light_rifle.rsi}/magb-1.png (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/{l_rifle.rsi => light_rifle.rsi}/meta.json (93%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/{l_rifle.rsi => light_rifle.rsi}/practice.png (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/{l_rifle.rsi => light_rifle.rsi}/rubber.png (100%) delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/icon.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/icon.png rename Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/{s_rifle.rsi => rifle.rsi}/base-b.png (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/{s_rifle.rsi => rifle.rsi}/base.png (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/{s_rifle.rsi => rifle.rsi}/flash.png (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/{s_rifle.rsi => rifle.rsi}/hv.png (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/{s_rifle.rsi => rifle.rsi}/mag-1.png (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/{s_rifle.rsi => rifle.rsi}/magb-1.png (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/{s_rifle.rsi => rifle.rsi}/meta.json (94%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/{s_rifle.rsi => rifle.rsi}/practice-b.png (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/{s_rifle.rsi => rifle.rsi}/practice.png (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/{s_rifle.rsi => rifle.rsi}/rubber.png (100%) delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/s_rifle.rsi/icon.png rename Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/ammo_casing.rsi/{spent.png => base-spent.png} (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/{spent.png => base-spent.png} (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/{shotgun_shell_beanbag.rsi/spent.png => shotgun_shell.rsi/beanbag-spent.png} (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/{shotgun_shell_beanbag.rsi/base.png => shotgun_shell.rsi/beanbag.png} (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/{shotgun_shell_blank.rsi/spent.png => shotgun_shell.rsi/blank-spent.png} (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/{shotgun_shell_blank.rsi/base.png => shotgun_shell.rsi/blank.png} (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/{shotgun_shell_flare.rsi/spent.png => shotgun_shell.rsi/flare-spent.png} (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/{shotgun_shell_flare.rsi/base.png => shotgun_shell.rsi/flare.png} (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/{shotgun_shell_flash.rsi/spent.png => shotgun_shell.rsi/flash-spent.png} (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/{shotgun_shell_flash.rsi/base.png => shotgun_shell.rsi/flash.png} (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/{shotgun_shell_incendiary.rsi/spent.png => shotgun_shell.rsi/incendiary-spent.png} (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/{shotgun_shell_incendiary.rsi/base.png => shotgun_shell.rsi/incendiary.png} (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/{shotgun_shell_practice.rsi/spent.png => shotgun_shell.rsi/practice-spent.png} (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/{shotgun_shell_practice.rsi/base.png => shotgun_shell.rsi/practice.png} (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/{shotgun_shell_slug.rsi/spent.png => shotgun_shell.rsi/slug-spent.png} (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/{shotgun_shell_slug.rsi/base.png => shotgun_shell.rsi/slug.png} (100%) delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell_beanbag.rsi/meta.json delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell_blank.rsi/meta.json delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell_blank.rsi/shotgun_shell_beanbag.rsi/base.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell_blank.rsi/shotgun_shell_beanbag.rsi/spent.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell_flare.rsi/meta.json delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell_flash.rsi/meta.json delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell_incendiary.rsi/meta.json delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell_practice.rsi/meta.json delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell_slug.rsi/meta.json rename Resources/Textures/Objects/Weapons/Guns/Ammunition/Explosives/{grenade_baton.rsi/base.png => explosives.rsi/baton.png} (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/Explosives/{grenade_blast.rsi/base.png => explosives.rsi/blast.png} (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/Explosives/{grenade_flash.rsi/base.png => explosives.rsi/flash.png} (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/Explosives/{grenade_frag.rsi/base.png => explosives.rsi/frag.png} (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/{Casings/shotgun_shell_blank.rsi/shotgun_shell_beanbag.rsi => Explosives/explosives.rsi}/meta.json (59%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/Explosives/{rpg.rsi/frag.png => explosives.rsi/rpg.png} (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/Explosives/{grenade_baton.rsi => explosives.rsi}/spent.png (100%) delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Explosives/grenade_baton.rsi/meta.json delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Explosives/grenade_blast.rsi/meta.json delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Explosives/grenade_blast.rsi/spent.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Explosives/grenade_flash.rsi/meta.json delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Explosives/grenade_flash.rsi/spent.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Explosives/grenade_frag.rsi/meta.json delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Explosives/grenade_frag.rsi/spent.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Explosives/rpg.rsi/meta.json rename Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/{ClRifle => CaselessRifle}/10x24.rsi/base.png (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/{ClRifle => CaselessRifle}/10x24.rsi/mag-1.png (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/{ClRifle => CaselessRifle}/10x24.rsi/mag-2.png (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/{ClRifle => CaselessRifle}/10x24.rsi/mag-3.png (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/{ClRifle => CaselessRifle}/10x24.rsi/mag-4.png (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/{ClRifle => CaselessRifle}/10x24.rsi/mag-5.png (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/{ClRifle => CaselessRifle}/10x24.rsi/mag-6.png (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/{ClRifle => CaselessRifle}/10x24.rsi/mag-7.png (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/{Pistol/pistol_mag_h_flash.rsi => CaselessRifle/10x24.rsi}/meta.json (95%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/{ClRifle/cl_pistol_mag_base.rsi => CaselessRifle/caseless_pistol_mag.rsi}/base.png (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/{ClRifle/cl_pistol_mag_hv.rsi/base.png => CaselessRifle/caseless_pistol_mag.rsi/high_velocity.png} (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/{ClRifle/ClRifle-NEW/cl_pistol.rsi => CaselessRifle/caseless_pistol_mag.rsi}/mag-1.png (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/{ClRifle/ClRifle-NEW/cl_pistol.rsi => CaselessRifle/caseless_pistol_mag.rsi}/mag-2.png (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/{ClRifle/ClRifle-NEW/cl_pistol.rsi => CaselessRifle/caseless_pistol_mag.rsi}/mag-3.png (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/{ClRifle/ClRifle-NEW/cl_pistol.rsi => CaselessRifle/caseless_pistol_mag.rsi}/mag-4.png (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/{ClRifle/ClRifle-NEW/cl_pistol.rsi => CaselessRifle/caseless_pistol_mag.rsi}/mag-5.png (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/{Pistol/pistol_hc_mag.rsi => CaselessRifle/caseless_pistol_mag.rsi}/meta.json (78%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/{ClRifle/cl_pistol_mag_practice.rsi/base.png => CaselessRifle/caseless_pistol_mag.rsi/practice.png} (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/{ClRifle/cl_pistol_mag.rsi/base.png => CaselessRifle/caseless_pistol_mag.rsi/red.png} (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/{ClRifle/cl_pistol_mag_rubber.rsi/base.png => CaselessRifle/caseless_pistol_mag.rsi/rubber.png} (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/{ClRifle/cl_rifle_mag_base.rsi => CaselessRifle/caseless_rifle_mag.rsi}/base.png (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/{ClRifle/cl_rifle_mag_flash.rsi/base.png => CaselessRifle/caseless_rifle_mag.rsi/flash.png} (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/{ClRifle/cl_rifle_mag_hv.rsi/base.png => CaselessRifle/caseless_rifle_mag.rsi/high_velocity.png} (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/{ClRifle/ClRifle-NEW/cl_rifle.rsi => CaselessRifle/caseless_rifle_mag.rsi}/mag-1.png (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/{Magnum/magnum_mag_hv.rsi => CaselessRifle/caseless_rifle_mag.rsi}/meta.json (72%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/{ClRifle/cl_rifle_mag_practice.rsi/base.png => CaselessRifle/caseless_rifle_mag.rsi/practice.png} (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/{ClRifle/ClRifle-NEW/cl_rifle.rsi/base.png => CaselessRifle/caseless_rifle_mag.rsi/red.png} (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/{ClRifle/cl_rifle_mag_rubber.rsi/base.png => CaselessRifle/caseless_rifle_mag.rsi/rubber.png} (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/{ClRifle/cl_rifle_mag_short_base.rsi => CaselessRifle/caseless_rifle_mag_short.rsi}/base.png (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/{ClRifle/cl_rifle_mag_short_flash.rsi/base.png => CaselessRifle/caseless_rifle_mag_short.rsi/flash.png} (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/{ClRifle/cl_rifle_mag_short_hv.rsi/base.png => CaselessRifle/caseless_rifle_mag_short.rsi/high_velocity.png} (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/{ClRifle/ClRifle-NEW/cl_rifle_short.rsi => CaselessRifle/caseless_rifle_mag_short.rsi}/mag-1.png (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/{Magnum/magnum_mag_practice.rsi => CaselessRifle/caseless_rifle_mag_short.rsi}/meta.json (72%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/{ClRifle/cl_rifle_mag_short_practice.rsi/base.png => CaselessRifle/caseless_rifle_mag_short.rsi/practice.png} (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/{ClRifle/ClRifle-NEW/cl_rifle_short.rsi/base.png => CaselessRifle/caseless_rifle_mag_short.rsi/red.png} (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/{ClRifle/cl_rifle_mag_short_rubber.rsi/base.png => CaselessRifle/caseless_rifle_mag_short.rsi/rubber.png} (100%) delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/10x24.rsi/icon.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/10x24.rsi/meta.json delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/10x24.rsi/base.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/10x24.rsi/icon.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/10x24.rsi/mag-1.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/10x24.rsi/mag-2.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/10x24.rsi/mag-3.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/10x24.rsi/mag-4.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/10x24.rsi/mag-5.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/10x24.rsi/mag-6.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/10x24.rsi/mag-7.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/10x24.rsi/meta.json delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/cl_pistol.rsi/base.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/cl_pistol.rsi/hv.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/cl_pistol.rsi/meta.json delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/cl_pistol.rsi/practice.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/cl_pistol.rsi/rubber.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/cl_rifle.rsi/flash.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/cl_rifle.rsi/hv.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/cl_rifle.rsi/meta.json delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/cl_rifle.rsi/practice.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/cl_rifle.rsi/rubber.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/cl_rifle_short.rsi/flash.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/cl_rifle_short.rsi/hv.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/cl_rifle_short.rsi/meta.json delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/cl_rifle_short.rsi/practice.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/cl_rifle_short.rsi/rubber.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag.rsi/icon.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag.rsi/mag-1.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag.rsi/mag-2.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag.rsi/mag-3.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag.rsi/mag-4.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag.rsi/mag-5.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag.rsi/meta.json delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_base.rsi/icon.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_base.rsi/mag-1.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_base.rsi/mag-2.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_base.rsi/mag-3.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_base.rsi/mag-4.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_base.rsi/mag-5.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_base.rsi/meta.json delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_hv.rsi/icon.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_hv.rsi/mag-1.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_hv.rsi/mag-2.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_hv.rsi/mag-3.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_hv.rsi/mag-4.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_hv.rsi/mag-5.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_hv.rsi/meta.json delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_practice.rsi/icon.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_practice.rsi/mag-1.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_practice.rsi/mag-2.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_practice.rsi/mag-3.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_practice.rsi/mag-4.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_practice.rsi/mag-5.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_practice.rsi/meta.json delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_rubber.rsi/icon.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_rubber.rsi/mag-1.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_rubber.rsi/mag-2.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_rubber.rsi/mag-3.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_rubber.rsi/mag-4.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_rubber.rsi/mag-5.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_rubber.rsi/meta.json delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag.rsi/base.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag.rsi/icon.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag.rsi/mag-1.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_base.rsi/icon.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_base.rsi/mag-1.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_base.rsi/meta.json delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_flash.rsi/icon.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_flash.rsi/mag-1.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_flash.rsi/meta.json delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_hv.rsi/icon.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_hv.rsi/mag-1.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_hv.rsi/meta.json delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_practice.rsi/icon.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_practice.rsi/mag-1.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_practice.rsi/meta.json delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_rubber.rsi/icon.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_rubber.rsi/mag-1.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_rubber.rsi/meta.json delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_short.rsi/base.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_short.rsi/icon.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_short.rsi/mag-1.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_short.rsi/meta.json delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_short_base.rsi/icon.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_short_base.rsi/mag-1.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_short_base.rsi/meta.json delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_short_flash.rsi/icon.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_short_flash.rsi/mag-1.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_short_flash.rsi/meta.json delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_short_hv.rsi/icon.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_short_hv.rsi/mag-1.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_short_hv.rsi/meta.json delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_short_practice.rsi/icon.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_short_practice.rsi/mag-1.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_short_practice.rsi/meta.json delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_short_rubber.rsi/icon.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_short_rubber.rsi/mag-1.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_short_rubber.rsi/meta.json delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Dart/darts.rsi/icon.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LRifle/l_rifle_box.rsi/icon.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LRifle/l_rifle_box.rsi/meta.json delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LRifle/l_rifle_mag.rsi/icon.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LRifle/l_rifle_mag.rsi/meta.json delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LRifle/l_rifle_mag_base.rsi/icon.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LRifle/l_rifle_mag_base.rsi/mag-1.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LRifle/l_rifle_mag_base.rsi/meta.json delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LRifle/l_rifle_mag_flash.rsi/icon.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LRifle/l_rifle_mag_flash.rsi/mag-1.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LRifle/l_rifle_mag_flash.rsi/meta.json delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LRifle/l_rifle_mag_hv.rsi/icon.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LRifle/l_rifle_mag_hv.rsi/mag-1.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LRifle/l_rifle_mag_hv.rsi/meta.json delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LRifle/l_rifle_mag_practice.rsi/icon.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LRifle/l_rifle_mag_practice.rsi/mag-1.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LRifle/l_rifle_mag_practice.rsi/meta.json delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LRifle/l_rifle_mag_rubber.rsi/icon.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LRifle/l_rifle_mag_rubber.rsi/mag-1.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LRifle/l_rifle_mag_rubber.rsi/meta.json delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LRifle/maxim.rsi/icon.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LRifle/maxim.rsi/meta.json delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LRifle/pk_box.rsi/icon.png rename Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/{LRifle/l_rifle_box.rsi => LightRifle/light_rifle_box.rsi}/base.png (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/{LRifle/l_rifle_box.rsi => LightRifle/light_rifle_box.rsi}/mag-1.png (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/{LRifle/l_rifle_box.rsi => LightRifle/light_rifle_box.rsi}/mag-2.png (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/{LRifle/l_rifle_box.rsi => LightRifle/light_rifle_box.rsi}/mag-3.png (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/{LRifle/l_rifle_box.rsi => LightRifle/light_rifle_box.rsi}/mag-4.png (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/{LRifle/l_rifle_box.rsi => LightRifle/light_rifle_box.rsi}/mag-5.png (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/{LRifle/l_rifle_box.rsi => LightRifle/light_rifle_box.rsi}/mag-6.png (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/{LRifle/l_rifle_box.rsi => LightRifle/light_rifle_box.rsi}/mag-7.png (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/{Pistol/pistol_mag_h_hv.rsi => LightRifle/light_rifle_box.rsi}/meta.json (95%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/{LRifle/l_rifle_mag_base.rsi => LightRifle/light_rifle_mag.rsi}/base.png (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/{LRifle/l_rifle_mag_flash.rsi/base.png => LightRifle/light_rifle_mag.rsi/flash.png} (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/{LRifle/l_rifle_mag_hv.rsi/base.png => LightRifle/light_rifle_mag.rsi/high_velocity.png} (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/{LRifle/l_rifle_mag.rsi => LightRifle/light_rifle_mag.rsi}/mag-1.png (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/{Magnum/magnum_mag_base.rsi => LightRifle/light_rifle_mag.rsi}/meta.json (72%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/{LRifle/l_rifle_mag_practice.rsi/base.png => LightRifle/light_rifle_mag.rsi/practice.png} (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/{LRifle/l_rifle_mag.rsi/base.png => LightRifle/light_rifle_mag.rsi/red.png} (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/{LRifle/l_rifle_mag_rubber.rsi/base.png => LightRifle/light_rifle_mag.rsi/rubber.png} (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/{LRifle => LightRifle}/maxim.rsi/base.png (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/{LRifle => LightRifle}/maxim.rsi/mag-1.png (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/{ClRifle/cl_rifle_mag.rsi => LightRifle/maxim.rsi}/meta.json (88%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/{LRifle => LightRifle}/pk_box.rsi/base.png (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/{LRifle => LightRifle}/pk_box.rsi/mag-1.png (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/{LRifle => LightRifle}/pk_box.rsi/mag-2.png (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/{LRifle => LightRifle}/pk_box.rsi/mag-3.png (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/{LRifle => LightRifle}/pk_box.rsi/mag-4.png (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/{LRifle => LightRifle}/pk_box.rsi/mag-5.png (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/{LRifle => LightRifle}/pk_box.rsi/mag-6.png (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/{LRifle => LightRifle}/pk_box.rsi/mag-7.png (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/{LRifle => LightRifle}/pk_box.rsi/meta.json (93%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/{magnum_mag_flash.rsi/base.png => magnum_mag.rsi/flash.png} (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/{magnum_mag_hv.rsi/base.png => magnum_mag.rsi/high_velocity.png} (100%) delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_mag.rsi/icon.png rename Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/{magnum_mag_practice.rsi/base.png => magnum_mag.rsi/practice.png} (100%) create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_mag.rsi/red.png rename Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/{magnum_mag_rubber.rsi/base.png => magnum_mag.rsi/rubber.png} (100%) delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_mag_base.rsi/base.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_mag_base.rsi/icon.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_mag_base.rsi/mag-1.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_mag_base.rsi/mag-2.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_mag_base.rsi/mag-3.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_mag_base.rsi/mag-4.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_mag_flash.rsi/icon.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_mag_flash.rsi/mag-1.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_mag_flash.rsi/mag-2.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_mag_flash.rsi/mag-3.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_mag_flash.rsi/mag-4.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_mag_hv.rsi/icon.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_mag_hv.rsi/mag-1.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_mag_hv.rsi/mag-2.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_mag_hv.rsi/mag-3.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_mag_hv.rsi/mag-4.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_mag_practice.rsi/icon.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_mag_practice.rsi/mag-1.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_mag_practice.rsi/mag-2.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_mag_practice.rsi/mag-3.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_mag_practice.rsi/mag-4.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_mag_rubber.rsi/icon.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_mag_rubber.rsi/mag-1.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_mag_rubber.rsi/mag-2.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_mag_rubber.rsi/mag-3.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_mag_rubber.rsi/mag-4.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_mag_rubber.rsi/meta.json rename Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/{magnum_smg_mag_hv.rsi/base.png => magnum_smg_mag.rsi/high_velocity.png} (100%) delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/icon.png rename Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/{magnum_smg_mag_practice.rsi/base.png => magnum_smg_mag.rsi/practice.png} (100%) create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/red.png rename Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/{magnum_smg_mag_rubber.rsi/base.png => magnum_smg_mag.rsi/rubber.png} (100%) delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag_base.rsi/base.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag_base.rsi/icon.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag_base.rsi/mag-1.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag_base.rsi/meta.json delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag_hv.rsi/icon.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag_hv.rsi/mag-1.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag_hv.rsi/meta.json delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag_practice.rsi/icon.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag_practice.rsi/mag-1.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag_practice.rsi/meta.json delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag_rubber.rsi/icon.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag_rubber.rsi/mag-1.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag_rubber.rsi/meta.json delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/calico_mag.rsi/base.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/calico_mag.rsi/mag-1.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag.rsi/icon.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_base.rsi/icon.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_base.rsi/mag-1.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_base.rsi/mag-2.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_base.rsi/mag-3.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_base.rsi/mag-4.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_base.rsi/mag-5.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_base.rsi/mag-6.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_base.rsi/meta.json delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_hv.rsi/icon.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_hv.rsi/mag-1.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_hv.rsi/mag-2.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_hv.rsi/mag-3.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_hv.rsi/mag-4.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_hv.rsi/mag-5.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_hv.rsi/mag-6.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_practice.rsi/icon.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_practice.rsi/mag-1.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_practice.rsi/mag-2.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_practice.rsi/mag-3.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_practice.rsi/mag-4.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_practice.rsi/mag-5.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_practice.rsi/mag-6.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_practice.rsi/meta.json delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_rubber.rsi/icon.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_rubber.rsi/mag-1.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_rubber.rsi/mag-2.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_rubber.rsi/mag-3.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_rubber.rsi/mag-4.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_rubber.rsi/mag-5.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_rubber.rsi/mag-6.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_rubber.rsi/meta.json rename Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/{pistol_hc_mag_base.rsi => pistol_high_capacity_mag.rsi}/base.png (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/{pistol_hc_mag_hv.rsi/base.png => pistol_high_capacity_mag.rsi/high_velocity.png} (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/{pistol_hc_mag.rsi => pistol_high_capacity_mag.rsi}/mag-1.png (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/{pistol_hc_mag.rsi => pistol_high_capacity_mag.rsi}/mag-2.png (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/{pistol_hc_mag.rsi => pistol_high_capacity_mag.rsi}/mag-3.png (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/{pistol_hc_mag.rsi => pistol_high_capacity_mag.rsi}/mag-4.png (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/{pistol_hc_mag.rsi => pistol_high_capacity_mag.rsi}/mag-5.png (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/{pistol_hc_mag.rsi => pistol_high_capacity_mag.rsi}/mag-6.png (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/{pistol_hc_mag_hv.rsi => pistol_high_capacity_mag.rsi}/meta.json (77%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/{pistol_hc_mag_practice.rsi/base.png => pistol_high_capacity_mag.rsi/practice.png} (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/{pistol_hc_mag.rsi/base.png => pistol_high_capacity_mag.rsi/red.png} (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/{pistol_hc_mag_rubber.rsi/base.png => pistol_high_capacity_mag.rsi/rubber.png} (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/{pistol_mag_flash.rsi/base.png => pistol_mag.rsi/flash.png} (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/{pistol_mag_hv.rsi/base.png => pistol_mag.rsi/high_velocity.png} (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/{pistol_mag_practice.rsi/base.png => pistol_mag.rsi/practice.png} (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi/{icon.png => red.png} (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/{pistol_mag_rubber.rsi/base.png => pistol_mag.rsi/rubber.png} (100%) delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_base.rsi/base.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_base.rsi/icon.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_base.rsi/mag-1.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_base.rsi/mag-2.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_base.rsi/mag-3.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_base.rsi/mag-4.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_base.rsi/meta.json delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_flash.rsi/icon.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_flash.rsi/mag-1.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_flash.rsi/mag-2.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_flash.rsi/mag-3.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_flash.rsi/mag-4.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_flash.rsi/meta.json delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_h.rsi/base.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_h.rsi/icon.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_h.rsi/mag-1.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_h.rsi/mag-2.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_h.rsi/mag-3.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_h.rsi/mag-4.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_h.rsi/mag-5.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_h.rsi/mag-6.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_h.rsi/meta.json delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_base.rsi/50ae.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_base.rsi/base.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_base.rsi/icon.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_base.rsi/mag-1.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_base.rsi/mag-2.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_base.rsi/mag-3.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_base.rsi/mag-4.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_base.rsi/mag-5.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_base.rsi/mag-6.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_base.rsi/meta.json delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_flash.rsi/base.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_flash.rsi/icon.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_flash.rsi/mag-1.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_flash.rsi/mag-2.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_flash.rsi/mag-3.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_flash.rsi/mag-4.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_flash.rsi/mag-5.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_flash.rsi/mag-6.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_hv.rsi/base.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_hv.rsi/icon.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_hv.rsi/mag-1.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_hv.rsi/mag-2.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_hv.rsi/mag-3.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_hv.rsi/mag-4.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_hv.rsi/mag-5.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_hv.rsi/mag-6.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_practice.rsi/base.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_practice.rsi/icon.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_practice.rsi/mag-1.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_practice.rsi/mag-2.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_practice.rsi/mag-3.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_practice.rsi/mag-4.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_practice.rsi/mag-5.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_practice.rsi/mag-6.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_practice.rsi/meta.json delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_rubber.rsi/base.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_rubber.rsi/icon.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_rubber.rsi/mag-1.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_rubber.rsi/mag-2.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_rubber.rsi/mag-3.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_rubber.rsi/mag-4.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_rubber.rsi/mag-5.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_rubber.rsi/mag-6.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_rubber.rsi/meta.json delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_hv.rsi/icon.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_hv.rsi/mag-1.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_hv.rsi/mag-2.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_hv.rsi/mag-3.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_hv.rsi/mag-4.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_hv.rsi/meta.json delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_practice.rsi/icon.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_practice.rsi/mag-1.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_practice.rsi/mag-2.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_practice.rsi/mag-3.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_practice.rsi/mag-4.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_practice.rsi/meta.json delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_rubber.rsi/icon.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_rubber.rsi/mag-1.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_rubber.rsi/mag-2.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_rubber.rsi/mag-3.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_rubber.rsi/mag-4.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_rubber.rsi/meta.json rename Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/{smg_mag_flash.rsi/base.png => smg_mag.rsi/flash.png} (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/{smg_mag_hv.rsi/base.png => smg_mag.rsi/high_velocity.png} (100%) delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/icon.png rename Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/{smg_mag_practice.rsi/base.png => smg_mag.rsi/practice.png} (100%) create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/red.png rename Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/{smg_mag_rubber.rsi/base.png => smg_mag.rsi/rubber.png} (100%) delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag_base.rsi/base.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag_base.rsi/icon.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag_base.rsi/mag-1.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag_base.rsi/meta.json delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag_flash.rsi/icon.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag_flash.rsi/mag-1.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag_flash.rsi/meta.json delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag_hv.rsi/icon.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag_hv.rsi/mag-1.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag_hv.rsi/meta.json delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag_practice.rsi/icon.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag_practice.rsi/mag-1.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag_practice.rsi/meta.json delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag_rubber.rsi/icon.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag_rubber.rsi/mag-1.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag_rubber.rsi/meta.json delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag_top_mounted.rsi/icon.png rename Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/{SRifle/s_rifle_mag_base.rsi => Rifle/rifle_mag.rsi}/base.png (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/{SRifle/s_rifle_mag_flash.rsi/base.png => Rifle/rifle_mag.rsi/flash.png} (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/{SRifle/s_rifle_mag_hv.rsi/base.png => Rifle/rifle_mag.rsi/high_velocity.png} (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/{SRifle/s_rifle_mag.rsi => Rifle/rifle_mag.rsi}/mag-1.png (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/{Magnum/magnum_mag_flash.rsi => Rifle/rifle_mag.rsi}/meta.json (72%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/{SRifle/s_rifle_mag_practice.rsi/base.png => Rifle/rifle_mag.rsi/practice.png} (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/{SRifle/s_rifle_mag.rsi/base.png => Rifle/rifle_mag.rsi/red.png} (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/{SRifle/s_rifle_mag_rubber.rsi/base.png => Rifle/rifle_mag.rsi/rubber.png} (100%) delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/SRifle/s_rifle_mag.rsi/icon.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/SRifle/s_rifle_mag.rsi/meta.json delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/SRifle/s_rifle_mag_base.rsi/icon.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/SRifle/s_rifle_mag_base.rsi/mag-1.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/SRifle/s_rifle_mag_base.rsi/meta.json delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/SRifle/s_rifle_mag_flash.rsi/icon.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/SRifle/s_rifle_mag_flash.rsi/mag-1.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/SRifle/s_rifle_mag_flash.rsi/meta.json delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/SRifle/s_rifle_mag_hv.rsi/icon.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/SRifle/s_rifle_mag_hv.rsi/mag-1.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/SRifle/s_rifle_mag_hv.rsi/meta.json delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/SRifle/s_rifle_mag_practice.rsi/icon.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/SRifle/s_rifle_mag_practice.rsi/mag-1.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/SRifle/s_rifle_mag_practice.rsi/meta.json delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/SRifle/s_rifle_mag_rubber.rsi/icon.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/SRifle/s_rifle_mag_rubber.rsi/mag-1.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/SRifle/s_rifle_mag_rubber.rsi/meta.json rename Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Shotgun/{m12_beanbag.rsi/base.png => m12.rsi/beanbag.png} (100%) delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Shotgun/m12.rsi/icon.png rename Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Shotgun/{m12_pellets.rsi/base.png => m12.rsi/pellets.png} (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Shotgun/{m12_slug.rsi/base.png => m12.rsi/slug.png} (100%) delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Shotgun/m12_beanbag.rsi/icon.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Shotgun/m12_beanbag.rsi/mag-1.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Shotgun/m12_beanbag.rsi/meta.json delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Shotgun/m12_pellets.rsi/icon.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Shotgun/m12_pellets.rsi/mag-1.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Shotgun/m12_pellets.rsi/meta.json delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Shotgun/m12_slug.rsi/icon.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Shotgun/m12_slug.rsi/mag-1.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Shotgun/m12_slug.rsi/meta.json delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/LRifle/l_rifle_sl.rsi/icon.png rename Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/{LRifle/l_rifle_sl.rsi => LightRifle/light_rifle_speed_loader.rsi}/base.png (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/{LRifle/l_rifle_sl.rsi => LightRifle/light_rifle_speed_loader.rsi}/mag-1.png (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/{LRifle/l_rifle_sl.rsi => LightRifle/light_rifle_speed_loader.rsi}/mag-2.png (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/{LRifle/l_rifle_sl.rsi => LightRifle/light_rifle_speed_loader.rsi}/mag-3.png (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/{LRifle/l_rifle_sl.rsi => LightRifle/light_rifle_speed_loader.rsi}/mag-4.png (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/{LRifle/l_rifle_sl.rsi => LightRifle/light_rifle_speed_loader.rsi}/mag-5.png (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/{LRifle/l_rifle_sl.rsi => LightRifle/light_rifle_speed_loader.rsi}/meta.json (92%) delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl.rsi/icon.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl.rsi/meta.json delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_flash.rsi/icon.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_flash.rsi/meta.json delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_hv.rsi/base.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_hv.rsi/icon.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_hv.rsi/meta.json delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_practice.rsi/base.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_practice.rsi/icon.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_practice.rsi/meta.json delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_rubber.rsi/base.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_rubber.rsi/icon.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_rubber.rsi/meta.json rename Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/{magnum_sl.rsi/mag-1.png => magnum_speed_loader.rsi/base-1.png} (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/{magnum_sl.rsi/mag-2.png => magnum_speed_loader.rsi/base-2.png} (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/{magnum_sl.rsi/mag-3.png => magnum_speed_loader.rsi/base-3.png} (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/{magnum_sl.rsi/mag-4.png => magnum_speed_loader.rsi/base-4.png} (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/{magnum_sl.rsi/mag-5.png => magnum_speed_loader.rsi/base-5.png} (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/{magnum_sl.rsi/mag-6.png => magnum_speed_loader.rsi/base-6.png} (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/{magnum_sl.rsi => magnum_speed_loader.rsi}/base.png (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/{magnum_sl_flash.rsi/mag-1.png => magnum_speed_loader.rsi/flash-1.png} (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/{magnum_sl_flash.rsi/mag-2.png => magnum_speed_loader.rsi/flash-2.png} (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/{magnum_sl_flash.rsi/mag-3.png => magnum_speed_loader.rsi/flash-3.png} (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/{magnum_sl_flash.rsi/mag-4.png => magnum_speed_loader.rsi/flash-4.png} (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/{magnum_sl_flash.rsi/mag-5.png => magnum_speed_loader.rsi/flash-5.png} (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/{magnum_sl_flash.rsi/mag-6.png => magnum_speed_loader.rsi/flash-6.png} (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/{magnum_sl_hv.rsi/mag-1.png => magnum_speed_loader.rsi/high-velocity-1.png} (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/{magnum_sl_hv.rsi/mag-2.png => magnum_speed_loader.rsi/high-velocity-2.png} (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/{magnum_sl_hv.rsi/mag-3.png => magnum_speed_loader.rsi/high-velocity-3.png} (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/{magnum_sl_hv.rsi/mag-4.png => magnum_speed_loader.rsi/high-velocity-4.png} (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/{magnum_sl_hv.rsi/mag-5.png => magnum_speed_loader.rsi/high-velocity-5.png} (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/{magnum_sl_hv.rsi/mag-6.png => magnum_speed_loader.rsi/high-velocity-6.png} (100%) create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi/meta.json rename Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/{magnum_sl_practice.rsi/mag-1.png => magnum_speed_loader.rsi/practice-1.png} (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/{magnum_sl_practice.rsi/mag-2.png => magnum_speed_loader.rsi/practice-2.png} (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/{magnum_sl_practice.rsi/mag-3.png => magnum_speed_loader.rsi/practice-3.png} (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/{magnum_sl_practice.rsi/mag-4.png => magnum_speed_loader.rsi/practice-4.png} (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/{magnum_sl_practice.rsi/mag-5.png => magnum_speed_loader.rsi/practice-5.png} (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/{magnum_sl_practice.rsi/mag-6.png => magnum_speed_loader.rsi/practice-6.png} (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/{magnum_sl_rubber.rsi/mag-1.png => magnum_speed_loader.rsi/rubber-1.png} (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/{magnum_sl_rubber.rsi/mag-2.png => magnum_speed_loader.rsi/rubber-2.png} (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/{magnum_sl_rubber.rsi/mag-3.png => magnum_speed_loader.rsi/rubber-3.png} (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/{magnum_sl_rubber.rsi/mag-4.png => magnum_speed_loader.rsi/rubber-4.png} (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/{magnum_sl_rubber.rsi/mag-5.png => magnum_speed_loader.rsi/rubber-5.png} (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/{magnum_sl_rubber.rsi/mag-6.png => magnum_speed_loader.rsi/rubber-6.png} (100%) delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl.rsi/base.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl.rsi/icon.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl.rsi/meta.json delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_flash.rsi/base.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_flash.rsi/icon.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_flash.rsi/meta.json delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_hv.rsi/base.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_hv.rsi/icon.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_hv.rsi/meta.json delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_practice.rsi/base.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_practice.rsi/icon.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_practice.rsi/meta.json delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_rubber.rsi/base.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_rubber.rsi/icon.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_rubber.rsi/meta.json rename Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/{pistol_sl.rsi/mag-1.png => pistol_speed_loader.rsi/base-1.png} (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/{pistol_sl.rsi/mag-2.png => pistol_speed_loader.rsi/base-2.png} (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/{pistol_sl.rsi/mag-3.png => pistol_speed_loader.rsi/base-3.png} (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/{pistol_sl.rsi/mag-4.png => pistol_speed_loader.rsi/base-4.png} (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/{pistol_sl.rsi/mag-5.png => pistol_speed_loader.rsi/base-5.png} (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/{pistol_sl.rsi/mag-6.png => pistol_speed_loader.rsi/base-6.png} (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/{Magnum/magnum_sl_flash.rsi => Pistol/pistol_speed_loader.rsi}/base.png (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/{pistol_sl_flash.rsi/mag-1.png => pistol_speed_loader.rsi/flash-1.png} (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/{pistol_sl_flash.rsi/mag-2.png => pistol_speed_loader.rsi/flash-2.png} (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/{pistol_sl_flash.rsi/mag-3.png => pistol_speed_loader.rsi/flash-3.png} (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/{pistol_sl_flash.rsi/mag-4.png => pistol_speed_loader.rsi/flash-4.png} (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/{pistol_sl_flash.rsi/mag-5.png => pistol_speed_loader.rsi/flash-5.png} (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/{pistol_sl_flash.rsi/mag-6.png => pistol_speed_loader.rsi/flash-6.png} (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/{pistol_sl_hv.rsi/mag-1.png => pistol_speed_loader.rsi/high-velocity-1.png} (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/{pistol_sl_hv.rsi/mag-2.png => pistol_speed_loader.rsi/high-velocity-2.png} (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/{pistol_sl_hv.rsi/mag-3.png => pistol_speed_loader.rsi/high-velocity-3.png} (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/{pistol_sl_hv.rsi/mag-4.png => pistol_speed_loader.rsi/high-velocity-4.png} (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/{pistol_sl_hv.rsi/mag-5.png => pistol_speed_loader.rsi/high-velocity-5.png} (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/{pistol_sl_hv.rsi/mag-6.png => pistol_speed_loader.rsi/high-velocity-6.png} (100%) create mode 100644 Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/meta.json rename Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/{pistol_sl_practice.rsi/mag-1.png => pistol_speed_loader.rsi/practice-1.png} (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/{pistol_sl_practice.rsi/mag-2.png => pistol_speed_loader.rsi/practice-2.png} (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/{pistol_sl_practice.rsi/mag-3.png => pistol_speed_loader.rsi/practice-3.png} (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/{pistol_sl_practice.rsi/mag-4.png => pistol_speed_loader.rsi/practice-4.png} (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/{pistol_sl_practice.rsi/mag-5.png => pistol_speed_loader.rsi/practice-5.png} (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/{pistol_sl_practice.rsi/mag-6.png => pistol_speed_loader.rsi/practice-6.png} (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/{pistol_sl_rubber.rsi/mag-1.png => pistol_speed_loader.rsi/rubber-1.png} (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/{pistol_sl_rubber.rsi/mag-2.png => pistol_speed_loader.rsi/rubber-2.png} (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/{pistol_sl_rubber.rsi/mag-3.png => pistol_speed_loader.rsi/rubber-3.png} (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/{pistol_sl_rubber.rsi/mag-4.png => pistol_speed_loader.rsi/rubber-4.png} (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/{pistol_sl_rubber.rsi/mag-5.png => pistol_speed_loader.rsi/rubber-5.png} (100%) rename Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/{pistol_sl_rubber.rsi/mag-6.png => pistol_speed_loader.rsi/rubber-6.png} (100%) delete mode 100644 Resources/Textures/Objects/Weapons/Guns/HMGs/minigun.rsi/bolt-closed.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/HMGs/minigun.rsi/bolt-open.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/LMGs/l6.rsi/bolt-closed.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/LMGs/l6.rsi/bolt-open.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/LMGs/pk.rsi/bolt-closed.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/LMGs/pk.rsi/bolt-open.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Launchers/china_lake.rsi/base.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Launchers/china_lake.rsi/bolt-closed.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Launchers/china_lake.rsi/bolt-open.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Launchers/rocket.rsi/icon.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Pistols/clarissa.rsi/bolt-closed.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Pistols/clarissa.rsi/bolt-open.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Pistols/colt.rsi/bolt-closed.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Pistols/colt.rsi/bolt-open.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Pistols/debug.rsi/bolt-closed.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Pistols/debug.rsi/bolt-open.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Pistols/giskard.rsi/bolt-closed.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Pistols/giskard.rsi/bolt-open.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Pistols/gyro_pistol.rsi/bolt-closed.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Pistols/gyro_pistol.rsi/bolt-open.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Pistols/hm_pistol.rsi/bolt-closed.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Pistols/hm_pistol.rsi/bolt-open.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Pistols/lamia.rsi/bolt-closed.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Pistols/lamia.rsi/bolt-open.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Pistols/mandella.rsi/bolt-closed.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Pistols/mandella.rsi/bolt-open.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Pistols/mk58.rsi/bolt-closed.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Pistols/mk58.rsi/bolt-open.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Pistols/mk58_wood.rsi/bolt-closed.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Pistols/mk58_wood.rsi/bolt-open.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Pistols/molly.rsi/bolt-closed.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Pistols/molly.rsi/bolt-open.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Pistols/olivaw_civil.rsi/base.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Pistols/olivaw_civil.rsi/bolt-closed.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Pistols/olivaw_civil.rsi/bolt-open.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Pistols/paco.rsi/bolt-closed.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Pistols/paco.rsi/bolt-open.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Projectiles/buckshot.rsi/meta.json delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Projectiles/bullet.rsi/meta.json delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Projectiles/copyright.json delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Projectiles/flare_buckshot.rsi/meta.json delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Projectiles/grenade.rsi/meta.json delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Projectiles/heavy_laser.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Projectiles/heavy_laser_impact.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Projectiles/heavy_laser_muzzle.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Projectiles/laser.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Projectiles/laser_impact.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Projectiles/laser_muzzle.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Projectiles/plasma.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles.rsi/beam.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles.rsi/beam_blue.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles.rsi/beam_heavy.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles.rsi/beam_omni.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles.rsi/bolt.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles.rsi/impact_beam_heavy.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles.rsi/impact_blue.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles.rsi/impact_laser.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles.rsi/impact_omni.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles.rsi/impact_u_laser.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles.rsi/impact_xray.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles.rsi/meta.json create mode 100644 Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles.rsi/muzzle_beam_heavy.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles.rsi/muzzle_blue.png rename Resources/Textures/Objects/Weapons/Guns/Projectiles/{bullet_muzzle.png => projectiles.rsi/muzzle_bullet.png} (100%) create mode 100644 Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles.rsi/muzzle_laser.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles.rsi/muzzle_omni.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles.rsi/muzzle_u_laser.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles.rsi/muzzle_xray.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles.rsi/u_laser.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles.rsi/xray.png rename Resources/Textures/Objects/Weapons/Guns/Projectiles/{flare_buckshot.rsi/base.png => projectiles2.rsi/buckshot-flare.png} (100%) rename Resources/Textures/Objects/Weapons/Guns/Projectiles/{buckshot.rsi/base.png => projectiles2.rsi/buckshot.png} (100%) rename Resources/Textures/Objects/Weapons/Guns/Projectiles/{bullet.rsi => projectiles2.rsi}/bullet.png (100%) rename Resources/Textures/Objects/Weapons/Guns/Projectiles/{rocket.rsi => projectiles2.rsi}/frag.png (100%) rename Resources/Textures/Objects/Weapons/Guns/Projectiles/{grenade.rsi => projectiles2.rsi}/grenade.png (100%) create mode 100644 Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles2.rsi/meta.json rename Resources/Textures/Objects/Weapons/Guns/Projectiles/{slug.rsi/base.png => projectiles2.rsi/slug.png} (100%) rename Resources/Textures/Objects/Weapons/Guns/Projectiles/{rocket.rsi => projectiles2.rsi}/smallfrag.png (100%) rename Resources/Textures/Objects/Weapons/Guns/Projectiles/{spark.rsi => projectiles2.rsi}/spark.png (100%) delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Projectiles/pulse.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Projectiles/pulse_impact.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Projectiles/pulse_muzzle.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Projectiles/rocket.rsi/meta.json delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Projectiles/slug.rsi/meta.json delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Projectiles/spark.rsi/meta.json delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Projectiles/xray.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Projectiles/xray_impact.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Projectiles/xray_muzzle.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Revolvers/deckard.rsi/bolt-closed.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Revolvers/deckard.rsi/bolt-open.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Revolvers/deckard.rsi/icon.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Rifles/ak.rsi/bolt-closed.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Rifles/ak.rsi/bolt-open.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Rifles/black_ak.rsi/bolt-closed.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Rifles/black_ak.rsi/bolt-open.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/bolt-closed.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/bolt-open.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Rifles/sts.rsi/bolt-closed.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Rifles/sts.rsi/bolt-open.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Rifles/vintorez.rsi/bolt-closed.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Rifles/vintorez.rsi/bolt-open.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Rifles/wintermute.rsi/bolt-closed.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Rifles/wintermute.rsi/bolt-open.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/SMGs/atreides.rsi/bolt-closed.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/SMGs/atreides.rsi/bolt-open.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/bolt-closed.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/bolt-open.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/SMGs/drozd.rsi/bolt-closed.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/SMGs/drozd.rsi/bolt-open.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/SMGs/zoric.rsi/bolt-closed.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/SMGs/zoric.rsi/bolt-open.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Shotguns/bojevic.rsi/bolt-closed.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Shotguns/bojevic.rsi/bolt-open.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Shotguns/db_shotgun.rsi/base.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Shotguns/db_shotgun.rsi/bolt-closed.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Shotguns/db_shotgun.rsi/bolt-open.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Shotguns/flaregun.rsi/base.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Shotguns/flaregun.rsi/bolt-closed.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Shotguns/flaregun.rsi/bolt-open.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Shotguns/sawn.rsi/base.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Shotguns/sawn.rsi/bolt-closed.png delete mode 100644 Resources/Textures/Objects/Weapons/Guns/Shotguns/sawn.rsi/bolt-open.png diff --git a/Content.Client/Content.Client.csproj b/Content.Client/Content.Client.csproj index 0ac62cc4ad..92b0d11497 100644 --- a/Content.Client/Content.Client.csproj +++ b/Content.Client/Content.Client.csproj @@ -23,7 +23,6 @@ - diff --git a/Content.Client/Effects/EffectVisualizerSystem.cs b/Content.Client/Effects/EffectVisualizerSystem.cs new file mode 100644 index 0000000000..05489bf82d --- /dev/null +++ b/Content.Client/Effects/EffectVisualizerSystem.cs @@ -0,0 +1,17 @@ +using Robust.Client.Animations; +using Robust.Client.GameObjects; + +namespace Content.Client.Effects; + +public sealed class EffectVisualizerSystem : EntitySystem +{ + public override void Initialize() + { + SubscribeLocalEvent(OnEffectAnimComplete); + } + + private void OnEffectAnimComplete(EntityUid uid, EffectVisualsComponent component, AnimationCompletedEvent args) + { + QueueDel(uid); + } +} diff --git a/Content.Client/Effects/EffectVisualsComponent.cs b/Content.Client/Effects/EffectVisualsComponent.cs new file mode 100644 index 0000000000..05a1231f28 --- /dev/null +++ b/Content.Client/Effects/EffectVisualsComponent.cs @@ -0,0 +1,8 @@ +namespace Content.Client.Effects; + +[RegisterComponent] +public sealed class EffectVisualsComponent : Component +{ + public float Length; + public float Accumulator = 0f; +} diff --git a/Content.Client/Items/ItemStatusMessages.cs b/Content.Client/Items/ItemStatusMessages.cs index 93ebaeabe0..58a302e882 100644 --- a/Content.Client/Items/ItemStatusMessages.cs +++ b/Content.Client/Items/ItemStatusMessages.cs @@ -1,7 +1,4 @@ -using System; -using System.Collections.Generic; -using Robust.Client.UserInterface; -using Robust.Shared.GameObjects; +using Robust.Client.UserInterface; namespace Content.Client.Items { diff --git a/Content.Client/Weapons/Ranged/Barrels/Components/ClientBatteryBarrelComponent.cs b/Content.Client/Weapons/Ranged/Barrels/Components/ClientBatteryBarrelComponent.cs deleted file mode 100644 index bc8720faf1..0000000000 --- a/Content.Client/Weapons/Ranged/Barrels/Components/ClientBatteryBarrelComponent.cs +++ /dev/null @@ -1,140 +0,0 @@ -using Content.Client.Items.Components; -using Content.Client.Stylesheets; -using Content.Shared.Weapons.Ranged.Barrels.Components; -using Robust.Client.Graphics; -using Robust.Client.UserInterface; -using Robust.Client.UserInterface.Controls; -using Robust.Shared.GameStates; -using static Robust.Client.UserInterface.Controls.BoxContainer; - -namespace Content.Client.Weapons.Ranged.Barrels.Components -{ - [RegisterComponent] - [NetworkedComponent()] - public sealed class ClientBatteryBarrelComponent : Component, IItemStatus - { - public StatusControl? ItemStatus; - - public Control MakeControl() - { - ItemStatus = new StatusControl(this); - - if (IoCManager.Resolve().TryGetComponent(Owner, out AppearanceComponent appearance)) - ItemStatus.Update(appearance); - - return ItemStatus; - } - - public void DestroyControl(Control control) - { - if (ItemStatus == control) - { - ItemStatus = null; - } - } - - public sealed class StatusControl : Control - { - private readonly ClientBatteryBarrelComponent _parent; - private readonly BoxContainer _bulletsList; - private readonly Label _noBatteryLabel; - private readonly Label _ammoCount; - - public StatusControl(ClientBatteryBarrelComponent parent) - { - MinHeight = 15; - _parent = parent; - HorizontalExpand = true; - VerticalAlignment = VAlignment.Center; - - AddChild(new BoxContainer - { - Orientation = LayoutOrientation.Horizontal, - HorizontalExpand = true, - Children = - { - new Control - { - HorizontalExpand = true, - Children = - { - (_bulletsList = new BoxContainer - { - Orientation = LayoutOrientation.Horizontal, - VerticalAlignment = VAlignment.Center, - SeparationOverride = 4 - }), - (_noBatteryLabel = new Label - { - Text = "No Battery!", - StyleClasses = {StyleNano.StyleClassItemStatus} - }) - } - }, - new Control() { MinSize = (5,0) }, - (_ammoCount = new Label - { - StyleClasses = {StyleNano.StyleClassItemStatus}, - HorizontalAlignment = HAlignment.Right, - }), - } - }); - } - - public void Update(AppearanceComponent appearance) - { - _bulletsList.RemoveAllChildren(); - - if (!appearance.TryGetData(MagazineBarrelVisuals.MagLoaded, out bool loaded) || !loaded) - { - _noBatteryLabel.Visible = true; - _ammoCount.Visible = false; - return; - } - - appearance.TryGetData(AmmoVisuals.AmmoCount, out int count); - appearance.TryGetData(AmmoVisuals.AmmoMax, out int capacity); - - _noBatteryLabel.Visible = false; - _ammoCount.Visible = true; - - _ammoCount.Text = $"x{count:00}"; - capacity = Math.Min(capacity, 8); - FillBulletRow(_bulletsList, count, capacity); - } - - private static void FillBulletRow(Control container, int count, int capacity) - { - var colorGone = Color.FromHex("#000000"); - var color = Color.FromHex("#E00000"); - - // Draw the empty ones - for (var i = count; i < capacity; i++) - { - container.AddChild(new PanelContainer - { - PanelOverride = new StyleBoxFlat() - { - BackgroundColor = colorGone, - }, - MinSize = (10, 15), - }); - } - - // Draw the full ones, but limit the count to the capacity - count = Math.Min(count, capacity); - for (var i = 0; i < count; i++) - { - container.AddChild(new PanelContainer - { - PanelOverride = new StyleBoxFlat() - { - BackgroundColor = color, - }, - MinSize = (10, 15), - }); - } - } - } - } -} diff --git a/Content.Client/Weapons/Ranged/Barrels/Components/ClientBoltActionBarrelComponent.cs b/Content.Client/Weapons/Ranged/Barrels/Components/ClientBoltActionBarrelComponent.cs deleted file mode 100644 index f50754abb2..0000000000 --- a/Content.Client/Weapons/Ranged/Barrels/Components/ClientBoltActionBarrelComponent.cs +++ /dev/null @@ -1,212 +0,0 @@ -using System; -using Content.Client.IoC; -using Content.Client.Items.Components; -using Content.Client.Resources; -using Content.Client.Stylesheets; -using Content.Shared.Weapons.Ranged.Barrels.Components; -using Robust.Client.Graphics; -using Robust.Client.UserInterface; -using Robust.Client.UserInterface.Controls; -using Robust.Shared.GameObjects; -using Robust.Shared.GameStates; -using Robust.Shared.Maths; -using Robust.Shared.ViewVariables; -using static Robust.Client.UserInterface.Controls.BoxContainer; - -namespace Content.Client.Weapons.Ranged.Barrels.Components -{ - [RegisterComponent] - [NetworkedComponent()] - public sealed class ClientBoltActionBarrelComponent : Component, IItemStatus - { - private StatusControl? _statusControl; - - /// - /// chambered is true when a bullet is chambered - /// spent is true when the chambered bullet is spent - /// - [ViewVariables] - public (bool chambered, bool spent) Chamber { get; private set; } - - /// - /// Count of bullets in the magazine. - /// - /// - /// Null if no magazine is inserted. - /// - [ViewVariables] - public (int count, int max)? MagazineCount { get; private set; } - - public override void HandleComponentState(ComponentState? curState, ComponentState? nextState) - { - base.HandleComponentState(curState, nextState); - - if (curState is not BoltActionBarrelComponentState cast) - return; - - Chamber = cast.Chamber; - MagazineCount = cast.Magazine; - _statusControl?.Update(); - } - - public Control MakeControl() - { - _statusControl = new StatusControl(this); - _statusControl.Update(); - return _statusControl; - } - - public void DestroyControl(Control control) - { - if (_statusControl == control) - { - _statusControl = null; - } - } - - private sealed class StatusControl : Control - { - private readonly ClientBoltActionBarrelComponent _parent; - private readonly BoxContainer _bulletsListTop; - private readonly BoxContainer _bulletsListBottom; - private readonly TextureRect _chamberedBullet; - private readonly Label _noMagazineLabel; - - public StatusControl(ClientBoltActionBarrelComponent parent) - { - MinHeight = 15; - _parent = parent; - HorizontalExpand = true; - VerticalAlignment = VAlignment.Center; - AddChild(new BoxContainer - { - Orientation = LayoutOrientation.Vertical, - HorizontalExpand = true, - VerticalAlignment = VAlignment.Center, - SeparationOverride = 0, - Children = - { - (_bulletsListTop = new BoxContainer - { - Orientation = LayoutOrientation.Horizontal, - SeparationOverride = 0 - }), - new BoxContainer - { - Orientation = LayoutOrientation.Horizontal, - HorizontalExpand = true, - Children = - { - new Control - { - HorizontalExpand = true, - Children = - { - (_bulletsListBottom = new BoxContainer - { - Orientation = LayoutOrientation.Horizontal, - VerticalAlignment = VAlignment.Center, - SeparationOverride = 0 - }), - (_noMagazineLabel = new Label - { - Text = "No Magazine!", - StyleClasses = {StyleNano.StyleClassItemStatus} - }) - } - }, - (_chamberedBullet = new TextureRect - { - Texture = StaticIoC.ResC.GetTexture("/Textures/Interface/ItemStatus/Bullets/chambered.png"), - VerticalAlignment = VAlignment.Center, - HorizontalAlignment = HAlignment.Right, - }) - } - } - } - }); - } - - public void Update() - { - _chamberedBullet.ModulateSelfOverride = - _parent.Chamber.chambered ? - _parent.Chamber.spent ? Color.Red : Color.FromHex("#d7df60") - : Color.Black; - - _bulletsListTop.RemoveAllChildren(); - _bulletsListBottom.RemoveAllChildren(); - - if (_parent.MagazineCount == null) - { - _noMagazineLabel.Visible = true; - return; - } - - var (count, capacity) = _parent.MagazineCount.Value; - - _noMagazineLabel.Visible = false; - - string texturePath; - if (capacity <= 20) - { - texturePath = "/Textures/Interface/ItemStatus/Bullets/normal.png"; - } - else if (capacity <= 30) - { - texturePath = "/Textures/Interface/ItemStatus/Bullets/small.png"; - } - else - { - texturePath = "/Textures/Interface/ItemStatus/Bullets/tiny.png"; - } - - var texture = StaticIoC.ResC.GetTexture(texturePath); - - const int tinyMaxRow = 60; - - if (capacity > tinyMaxRow) - { - FillBulletRow(_bulletsListBottom, Math.Min(tinyMaxRow, count), tinyMaxRow, texture); - FillBulletRow(_bulletsListTop, Math.Max(0, count - tinyMaxRow), capacity - tinyMaxRow, texture); - } - else - { - FillBulletRow(_bulletsListBottom, count, capacity, texture); - } - } - - private static void FillBulletRow(Control container, int count, int capacity, Texture texture) - { - var colorA = Color.FromHex("#b68f0e"); - var colorB = Color.FromHex("#d7df60"); - var colorGoneA = Color.FromHex("#000000"); - var colorGoneB = Color.FromHex("#222222"); - - var altColor = false; - - for (var i = count; i < capacity; i++) - { - container.AddChild(new TextureRect - { - Texture = texture, - ModulateSelfOverride = altColor ? colorGoneA : colorGoneB - }); - - altColor ^= true; - } - - for (var i = 0; i < count; i++) - { - container.AddChild(new TextureRect - { - Texture = texture, - ModulateSelfOverride = altColor ? colorA : colorB - }); - - altColor ^= true; - } - } - } - } -} diff --git a/Content.Client/Weapons/Ranged/Barrels/Components/ClientMagazineBarrelComponent.cs b/Content.Client/Weapons/Ranged/Barrels/Components/ClientMagazineBarrelComponent.cs deleted file mode 100644 index f11adce7b5..0000000000 --- a/Content.Client/Weapons/Ranged/Barrels/Components/ClientMagazineBarrelComponent.cs +++ /dev/null @@ -1,248 +0,0 @@ -using System; -using Content.Client.IoC; -using Content.Client.Items.Components; -using Content.Client.Resources; -using Content.Client.Stylesheets; -using Content.Shared.Weapons.Ranged.Barrels.Components; -using Robust.Client.Animations; -using Robust.Client.Graphics; -using Robust.Client.UserInterface; -using Robust.Client.UserInterface.Controls; -using Robust.Shared.Animations; -using Robust.Shared.GameObjects; -using Robust.Shared.GameStates; -using Robust.Shared.Maths; -using Robust.Shared.Serialization.Manager.Attributes; -using Robust.Shared.ViewVariables; -using static Robust.Client.UserInterface.Controls.BoxContainer; - -namespace Content.Client.Weapons.Ranged.Barrels.Components -{ - [RegisterComponent] - [NetworkedComponent()] - public sealed class ClientMagazineBarrelComponent : Component, IItemStatus - { - private static readonly Animation AlarmAnimationSmg = new() - { - Length = TimeSpan.FromSeconds(1.4), - AnimationTracks = - { - new AnimationTrackControlProperty - { - // These timings match the SMG audio file. - Property = nameof(Label.FontColorOverride), - InterpolationMode = AnimationInterpolationMode.Previous, - KeyFrames = - { - new AnimationTrackProperty.KeyFrame(Color.Red, 0.1f), - new AnimationTrackProperty.KeyFrame(null!, 0.3f), - new AnimationTrackProperty.KeyFrame(Color.Red, 0.2f), - new AnimationTrackProperty.KeyFrame(null!, 0.3f), - new AnimationTrackProperty.KeyFrame(Color.Red, 0.2f), - new AnimationTrackProperty.KeyFrame(null!, 0.3f), - } - } - } - }; - - private static readonly Animation AlarmAnimationLmg = new() - { - Length = TimeSpan.FromSeconds(0.75), - AnimationTracks = - { - new AnimationTrackControlProperty - { - // These timings match the SMG audio file. - Property = nameof(Label.FontColorOverride), - InterpolationMode = AnimationInterpolationMode.Previous, - KeyFrames = - { - new AnimationTrackProperty.KeyFrame(Color.Red, 0.0f), - new AnimationTrackProperty.KeyFrame(null!, 0.15f), - new AnimationTrackProperty.KeyFrame(Color.Red, 0.15f), - new AnimationTrackProperty.KeyFrame(null!, 0.15f), - new AnimationTrackProperty.KeyFrame(Color.Red, 0.15f), - new AnimationTrackProperty.KeyFrame(null!, 0.15f), - } - } - } - }; - private StatusControl? _statusControl; - - /// - /// True if a bullet is chambered. - /// - [ViewVariables] - public bool Chambered { get; private set; } - - /// - /// Count of bullets in the magazine. - /// - /// - /// Null if no magazine is inserted. - /// - [ViewVariables] - public (int count, int max)? MagazineCount { get; private set; } - - [ViewVariables(VVAccess.ReadWrite)] [DataField("lmg_alarm_animation")] private bool _isLmgAlarmAnimation = default; - - public override void HandleComponentState(ComponentState? curState, ComponentState? nextState) - { - base.HandleComponentState(curState, nextState); - - if (curState is not MagazineBarrelComponentState cast) - return; - - Chambered = cast.Chambered; - MagazineCount = cast.Magazine; - _statusControl?.Update(); - } - - public void PlayAlarmAnimation() - { - _statusControl?.PlayAlarmAnimation(); - } - - public Control MakeControl() - { - _statusControl = new StatusControl(this); - _statusControl.Update(); - return _statusControl; - } - - public void DestroyControl(Control control) - { - if (_statusControl == control) - { - _statusControl = null; - } - } - - private sealed class StatusControl : Control - { - private readonly ClientMagazineBarrelComponent _parent; - private readonly BoxContainer _bulletsList; - private readonly TextureRect _chamberedBullet; - private readonly Label _noMagazineLabel; - private readonly Label _ammoCount; - - public StatusControl(ClientMagazineBarrelComponent parent) - { - MinHeight = 15; - _parent = parent; - HorizontalExpand = true; - VerticalAlignment = VAlignment.Center; - - AddChild(new BoxContainer - { - Orientation = LayoutOrientation.Horizontal, - HorizontalExpand = true, - Children = - { - (_chamberedBullet = new TextureRect - { - Texture = StaticIoC.ResC.GetTexture("/Textures/Interface/ItemStatus/Bullets/chambered_rotated.png"), - VerticalAlignment = VAlignment.Center, - HorizontalAlignment = HAlignment.Right, - }), - new Control() { MinSize = (5,0) }, - new Control - { - HorizontalExpand = true, - Children = - { - (_bulletsList = new BoxContainer - { - Orientation = LayoutOrientation.Horizontal, - VerticalAlignment = VAlignment.Center, - SeparationOverride = 0 - }), - (_noMagazineLabel = new Label - { - Text = "No Magazine!", - StyleClasses = {StyleNano.StyleClassItemStatus} - }) - } - }, - new Control() { MinSize = (5,0) }, - (_ammoCount = new Label - { - StyleClasses = {StyleNano.StyleClassItemStatus}, - HorizontalAlignment = HAlignment.Right, - }), - } - }); - } - - public void Update() - { - _chamberedBullet.ModulateSelfOverride = - _parent.Chambered ? Color.FromHex("#d7df60") : Color.Black; - - _bulletsList.RemoveAllChildren(); - - if (_parent.MagazineCount == null) - { - _noMagazineLabel.Visible = true; - _ammoCount.Visible = false; - return; - } - - var (count, capacity) = _parent.MagazineCount.Value; - - _noMagazineLabel.Visible = false; - _ammoCount.Visible = true; - - var texturePath = "/Textures/Interface/ItemStatus/Bullets/normal.png"; - var texture = StaticIoC.ResC.GetTexture(texturePath); - - _ammoCount.Text = $"x{count:00}"; - capacity = Math.Min(capacity, 20); - FillBulletRow(_bulletsList, count, capacity, texture); - } - - private static void FillBulletRow(Control container, int count, int capacity, Texture texture) - { - var colorA = Color.FromHex("#b68f0e"); - var colorB = Color.FromHex("#d7df60"); - var colorGoneA = Color.FromHex("#000000"); - var colorGoneB = Color.FromHex("#222222"); - - var altColor = false; - - // Draw the empty ones - for (var i = count; i < capacity; i++) - { - container.AddChild(new TextureRect - { - Texture = texture, - ModulateSelfOverride = altColor ? colorGoneA : colorGoneB, - Stretch = TextureRect.StretchMode.KeepCentered - }); - - altColor ^= true; - } - - // Draw the full ones, but limit the count to the capacity - count = Math.Min(count, capacity); - for (var i = 0; i < count; i++) - { - container.AddChild(new TextureRect - { - Texture = texture, - ModulateSelfOverride = altColor ? colorA : colorB, - Stretch = TextureRect.StretchMode.KeepCentered - }); - - altColor ^= true; - } - } - - public void PlayAlarmAnimation() - { - var animation = _parent._isLmgAlarmAnimation ? AlarmAnimationLmg : AlarmAnimationSmg; - _noMagazineLabel.PlayAnimation(animation, "alarm"); - } - } - } -} diff --git a/Content.Client/Weapons/Ranged/Barrels/Components/ClientPumpBarrelComponent.cs b/Content.Client/Weapons/Ranged/Barrels/Components/ClientPumpBarrelComponent.cs deleted file mode 100644 index 5d103819f7..0000000000 --- a/Content.Client/Weapons/Ranged/Barrels/Components/ClientPumpBarrelComponent.cs +++ /dev/null @@ -1,212 +0,0 @@ -using System; -using Content.Client.IoC; -using Content.Client.Items.Components; -using Content.Client.Resources; -using Content.Client.Stylesheets; -using Content.Shared.Weapons.Ranged.Barrels.Components; -using Robust.Client.Graphics; -using Robust.Client.UserInterface; -using Robust.Client.UserInterface.Controls; -using Robust.Shared.GameObjects; -using Robust.Shared.GameStates; -using Robust.Shared.Maths; -using Robust.Shared.ViewVariables; -using static Robust.Client.UserInterface.Controls.BoxContainer; - -namespace Content.Client.Weapons.Ranged.Barrels.Components -{ - [RegisterComponent] - [NetworkedComponent()] - public sealed class ClientPumpBarrelComponent : Component, IItemStatus - { - private StatusControl? _statusControl; - - /// - /// chambered is true when a bullet is chambered - /// spent is true when the chambered bullet is spent - /// - [ViewVariables] - public (bool chambered, bool spent) Chamber { get; private set; } - - /// - /// Count of bullets in the magazine. - /// - /// - /// Null if no magazine is inserted. - /// - [ViewVariables] - public (int count, int max)? MagazineCount { get; private set; } - - public override void HandleComponentState(ComponentState? curState, ComponentState? nextState) - { - base.HandleComponentState(curState, nextState); - - if (curState is not PumpBarrelComponentState cast) - return; - - Chamber = cast.Chamber; - MagazineCount = cast.Magazine; - _statusControl?.Update(); - } - - public Control MakeControl() - { - _statusControl = new StatusControl(this); - _statusControl.Update(); - return _statusControl; - } - - public void DestroyControl(Control control) - { - if (_statusControl == control) - { - _statusControl = null; - } - } - - private sealed class StatusControl : Control - { - private readonly ClientPumpBarrelComponent _parent; - private readonly BoxContainer _bulletsListTop; - private readonly BoxContainer _bulletsListBottom; - private readonly TextureRect _chamberedBullet; - private readonly Label _noMagazineLabel; - - public StatusControl(ClientPumpBarrelComponent parent) - { - MinHeight = 15; - _parent = parent; - HorizontalExpand = true; - VerticalAlignment = VAlignment.Center; - AddChild(new BoxContainer - { - Orientation = LayoutOrientation.Vertical, - HorizontalExpand = true, - VerticalAlignment = VAlignment.Center, - SeparationOverride = 0, - Children = - { - (_bulletsListTop = new BoxContainer - { - Orientation = LayoutOrientation.Horizontal, - SeparationOverride = 0 - }), - new BoxContainer - { - Orientation = LayoutOrientation.Horizontal, - HorizontalExpand = true, - Children = - { - new Control - { - HorizontalExpand = true, - Children = - { - (_bulletsListBottom = new BoxContainer - { - Orientation = LayoutOrientation.Horizontal, - VerticalAlignment = VAlignment.Center, - SeparationOverride = 0 - }), - (_noMagazineLabel = new Label - { - Text = "No Magazine!", - StyleClasses = {StyleNano.StyleClassItemStatus} - }) - } - }, - (_chamberedBullet = new TextureRect - { - Texture = StaticIoC.ResC.GetTexture("/Textures/Interface/ItemStatus/Bullets/chambered.png"), - VerticalAlignment = VAlignment.Center, - HorizontalAlignment = HAlignment.Right, - }) - } - } - } - }); - } - - public void Update() - { - _chamberedBullet.ModulateSelfOverride = - _parent.Chamber.chambered ? - _parent.Chamber.spent ? Color.Red : Color.FromHex("#d7df60") - : Color.Black; - - _bulletsListTop.RemoveAllChildren(); - _bulletsListBottom.RemoveAllChildren(); - - if (_parent.MagazineCount == null) - { - _noMagazineLabel.Visible = true; - return; - } - - var (count, capacity) = _parent.MagazineCount.Value; - - _noMagazineLabel.Visible = false; - - string texturePath; - if (capacity <= 20) - { - texturePath = "/Textures/Interface/ItemStatus/Bullets/normal.png"; - } - else if (capacity <= 30) - { - texturePath = "/Textures/Interface/ItemStatus/Bullets/small.png"; - } - else - { - texturePath = "/Textures/Interface/ItemStatus/Bullets/tiny.png"; - } - - var texture = StaticIoC.ResC.GetTexture(texturePath); - - const int tinyMaxRow = 60; - - if (capacity > tinyMaxRow) - { - FillBulletRow(_bulletsListBottom, Math.Min(tinyMaxRow, count), tinyMaxRow, texture); - FillBulletRow(_bulletsListTop, Math.Max(0, count - tinyMaxRow), capacity - tinyMaxRow, texture); - } - else - { - FillBulletRow(_bulletsListBottom, count, capacity, texture); - } - } - - private static void FillBulletRow(Control container, int count, int capacity, Texture texture) - { - var colorA = Color.FromHex("#b68f0e"); - var colorB = Color.FromHex("#d7df60"); - var colorGoneA = Color.FromHex("#000000"); - var colorGoneB = Color.FromHex("#222222"); - - var altColor = false; - - for (var i = count; i < capacity; i++) - { - container.AddChild(new TextureRect - { - Texture = texture, - ModulateSelfOverride = altColor ? colorGoneA : colorGoneB - }); - - altColor ^= true; - } - - for (var i = 0; i < count; i++) - { - container.AddChild(new TextureRect - { - Texture = texture, - ModulateSelfOverride = altColor ? colorA : colorB - }); - - altColor ^= true; - } - } - } - } -} diff --git a/Content.Client/Weapons/Ranged/Barrels/Components/ClientRevolverBarrelComponent.cs b/Content.Client/Weapons/Ranged/Barrels/Components/ClientRevolverBarrelComponent.cs deleted file mode 100644 index 8ddd3999bc..0000000000 --- a/Content.Client/Weapons/Ranged/Barrels/Components/ClientRevolverBarrelComponent.cs +++ /dev/null @@ -1,168 +0,0 @@ -using Content.Client.IoC; -using Content.Client.Items.Components; -using Content.Client.Resources; -using Content.Shared.Weapons.Ranged.Barrels.Components; -using Robust.Client.Graphics; -using Robust.Client.UserInterface; -using Robust.Client.UserInterface.Controls; -using Robust.Shared.GameObjects; -using Robust.Shared.GameStates; -using Robust.Shared.Maths; -using Robust.Shared.ViewVariables; -using static Robust.Client.UserInterface.Controls.BoxContainer; - -namespace Content.Client.Weapons.Ranged.Barrels.Components -{ - [RegisterComponent] - [NetworkedComponent()] - public sealed class ClientRevolverBarrelComponent : Component, IItemStatus - { - private StatusControl? _statusControl; - - /// - /// A array that lists the bullet states - /// true means a spent bullet - /// false means a "shootable" bullet - /// null means no bullet - /// - [ViewVariables] - public bool?[] Bullets { get; private set; } = new bool?[0]; - - [ViewVariables] - public int CurrentSlot { get; private set; } - - public override void HandleComponentState(ComponentState? curState, ComponentState? nextState) - { - base.HandleComponentState(curState, nextState); - - if (curState is not RevolverBarrelComponentState cast) - return; - - CurrentSlot = cast.CurrentSlot; - Bullets = cast.Bullets; - _statusControl?.Update(); - } - - public Control MakeControl() - { - _statusControl = new StatusControl(this); - _statusControl.Update(); - return _statusControl; - } - - public void DestroyControl(Control control) - { - if (_statusControl == control) - { - _statusControl = null; - } - } - - private sealed class StatusControl : Control - { - private readonly ClientRevolverBarrelComponent _parent; - private readonly BoxContainer _bulletsList; - - public StatusControl(ClientRevolverBarrelComponent parent) - { - MinHeight = 15; - _parent = parent; - HorizontalExpand = true; - VerticalAlignment = VAlignment.Center; - AddChild((_bulletsList = new BoxContainer - { - Orientation = LayoutOrientation.Horizontal, - HorizontalExpand = true, - VerticalAlignment = VAlignment.Center, - SeparationOverride = 0 - })); - } - - public void Update() - { - _bulletsList.RemoveAllChildren(); - - var capacity = _parent.Bullets.Length; - - string texturePath; - if (capacity <= 20) - { - texturePath = "/Textures/Interface/ItemStatus/Bullets/normal.png"; - } - else if (capacity <= 30) - { - texturePath = "/Textures/Interface/ItemStatus/Bullets/small.png"; - } - else - { - texturePath = "/Textures/Interface/ItemStatus/Bullets/tiny.png"; - } - - var texture = StaticIoC.ResC.GetTexture(texturePath); - var spentTexture = StaticIoC.ResC.GetTexture("/Textures/Interface/ItemStatus/Bullets/empty.png"); - - FillBulletRow(_bulletsList, texture, spentTexture); - } - - private void FillBulletRow(Control container, Texture texture, Texture emptyTexture) - { - var colorA = Color.FromHex("#b68f0e"); - var colorB = Color.FromHex("#d7df60"); - var colorSpentA = Color.FromHex("#b50e25"); - var colorSpentB = Color.FromHex("#d3745f"); - var colorGoneA = Color.FromHex("#000000"); - var colorGoneB = Color.FromHex("#222222"); - - var altColor = false; - var scale = 1.3f; - - for (var i = 0; i < _parent.Bullets.Length; i++) - { - var bulletSpent = _parent.Bullets[i]; - // Add a outline - var box = new Control() - { - MinSize = texture.Size * scale, - }; - if (i == _parent.CurrentSlot) - { - box.AddChild(new TextureRect - { - Texture = texture, - TextureScale = (scale, scale), - ModulateSelfOverride = Color.LimeGreen, - }); - } - Color color; - Texture bulletTexture = texture; - - if (bulletSpent.HasValue) - { - if (bulletSpent.Value) - { - color = altColor ? colorSpentA : colorSpentB; - bulletTexture = emptyTexture; - } - else - { - color = altColor ? colorA : colorB; - } - } - else - { - color = altColor ? colorGoneA : colorGoneB; - } - - box.AddChild(new TextureRect - { - Stretch = TextureRect.StretchMode.KeepCentered, - Texture = bulletTexture, - ModulateSelfOverride = color, - }); - altColor ^= true; - container.AddChild(box); - } - } - } - } -} diff --git a/Content.Client/Weapons/Ranged/Barrels/EntitySystems/ClientBatteryBarrelSystem.cs b/Content.Client/Weapons/Ranged/Barrels/EntitySystems/ClientBatteryBarrelSystem.cs deleted file mode 100644 index 19523712ab..0000000000 --- a/Content.Client/Weapons/Ranged/Barrels/EntitySystems/ClientBatteryBarrelSystem.cs +++ /dev/null @@ -1,19 +0,0 @@ -using Content.Client.Weapons.Ranged.Barrels.Components; -using Robust.Client.GameObjects; - -namespace Content.Client.Weapons.Ranged.Barrels.EntitySystems; - -public sealed class ClientBatteryBarrelSystem : EntitySystem -{ - public override void Initialize() - { - base.Initialize(); - - SubscribeLocalEvent(OnAppearanceChange); - } - - private void OnAppearanceChange(EntityUid uid, ClientBatteryBarrelComponent component, ref AppearanceChangeEvent args) - { - component.ItemStatus?.Update(args.Component); - } -} diff --git a/Content.Client/Weapons/Ranged/Barrels/Visualizers/BarrelBoltVisualizer.cs b/Content.Client/Weapons/Ranged/Barrels/Visualizers/BarrelBoltVisualizer.cs deleted file mode 100644 index cce9bbdac8..0000000000 --- a/Content.Client/Weapons/Ranged/Barrels/Visualizers/BarrelBoltVisualizer.cs +++ /dev/null @@ -1,39 +0,0 @@ -using Content.Shared.Weapons.Ranged.Barrels.Components; -using JetBrains.Annotations; -using Robust.Client.GameObjects; -using Robust.Shared.GameObjects; -using Robust.Shared.IoC; - -namespace Content.Client.Weapons.Ranged.Barrels.Visualizers -{ - [UsedImplicitly] - public sealed class BarrelBoltVisualizer : AppearanceVisualizer - { - public override void InitializeEntity(EntityUid entity) - { - base.InitializeEntity(entity); - var sprite = IoCManager.Resolve().GetComponent(entity); - sprite.LayerSetState(RangedBarrelVisualLayers.Bolt, "bolt-open"); - } - - public override void OnChangeData(AppearanceComponent component) - { - base.OnChangeData(component); - var sprite = IoCManager.Resolve().GetComponent(component.Owner); - - if (!component.TryGetData(BarrelBoltVisuals.BoltOpen, out bool boltOpen)) - { - return; - } - - if (boltOpen) - { - sprite.LayerSetState(RangedBarrelVisualLayers.Bolt, "bolt-open"); - } - else - { - sprite.LayerSetState(RangedBarrelVisualLayers.Bolt, "bolt-closed"); - } - } - } -} diff --git a/Content.Client/Weapons/Ranged/Barrels/Visualizers/MagVisualizer.cs b/Content.Client/Weapons/Ranged/Barrels/Visualizers/MagVisualizer.cs deleted file mode 100644 index 948c1aeff3..0000000000 --- a/Content.Client/Weapons/Ranged/Barrels/Visualizers/MagVisualizer.cs +++ /dev/null @@ -1,106 +0,0 @@ -using Content.Shared.Rounding; -using Content.Shared.Weapons.Ranged.Barrels.Components; -using JetBrains.Annotations; -using Robust.Client.GameObjects; -using Robust.Shared.GameObjects; -using Robust.Shared.IoC; -using Robust.Shared.Serialization.Manager.Attributes; - -namespace Content.Client.Weapons.Ranged.Barrels.Visualizers -{ - [UsedImplicitly] - public sealed class MagVisualizer : AppearanceVisualizer - { - private bool _magLoaded; - [DataField("magState")] - private string? _magState; - [DataField("steps")] - private int _magSteps; - [DataField("zeroVisible")] - private bool _zeroVisible; - - public override void InitializeEntity(EntityUid entity) - { - base.InitializeEntity(entity); - var sprite = IoCManager.Resolve().GetComponent(entity); - - if (sprite.LayerMapTryGet(RangedBarrelVisualLayers.Mag, out _)) - { - sprite.LayerSetState(RangedBarrelVisualLayers.Mag, $"{_magState}-{_magSteps-1}"); - sprite.LayerSetVisible(RangedBarrelVisualLayers.Mag, false); - } - - if (sprite.LayerMapTryGet(RangedBarrelVisualLayers.MagUnshaded, out _)) - { - sprite.LayerSetState(RangedBarrelVisualLayers.MagUnshaded, $"{_magState}-unshaded-{_magSteps-1}"); - sprite.LayerSetVisible(RangedBarrelVisualLayers.MagUnshaded, false); - } - } - - public override void OnChangeData(AppearanceComponent component) - { - base.OnChangeData(component); - - // tl;dr - // 1.If no mag then hide it OR - // 2. If step 0 isn't visible then hide it (mag or unshaded) - // 3. Otherwise just do mag / unshaded as is - var sprite = IoCManager.Resolve().GetComponent(component.Owner); - - component.TryGetData(MagazineBarrelVisuals.MagLoaded, out _magLoaded); - - if (_magLoaded) - { - if (!component.TryGetData(AmmoVisuals.AmmoMax, out int capacity)) - { - return; - } - if (!component.TryGetData(AmmoVisuals.AmmoCount, out int current)) - { - return; - } - - var step = ContentHelpers.RoundToLevels(current, capacity, _magSteps); - - if (step == 0 && !_zeroVisible) - { - if (sprite.LayerMapTryGet(RangedBarrelVisualLayers.Mag, out _)) - { - sprite.LayerSetVisible(RangedBarrelVisualLayers.Mag, false); - } - - if (sprite.LayerMapTryGet(RangedBarrelVisualLayers.MagUnshaded, out _)) - { - sprite.LayerSetVisible(RangedBarrelVisualLayers.MagUnshaded, false); - } - - return; - } - - if (sprite.LayerMapTryGet(RangedBarrelVisualLayers.Mag, out _)) - { - sprite.LayerSetVisible(RangedBarrelVisualLayers.Mag, true); - sprite.LayerSetState(RangedBarrelVisualLayers.Mag, $"{_magState}-{step}"); - } - - if (sprite.LayerMapTryGet(RangedBarrelVisualLayers.MagUnshaded, out _)) - { - sprite.LayerSetVisible(RangedBarrelVisualLayers.MagUnshaded, true); - sprite.LayerSetState(RangedBarrelVisualLayers.MagUnshaded, $"{_magState}-unshaded-{step}"); - } - } - else - { - if (sprite.LayerMapTryGet(RangedBarrelVisualLayers.Mag, out _)) - { - sprite.LayerSetVisible(RangedBarrelVisualLayers.Mag, false); - } - - if (sprite.LayerMapTryGet(RangedBarrelVisualLayers.MagUnshaded, out _)) - { - sprite.LayerSetVisible(RangedBarrelVisualLayers.MagUnshaded, false); - } - } - } - } -} diff --git a/Content.Client/Weapons/Ranged/Barrels/Visualizers/SpentAmmoVisualizer.cs b/Content.Client/Weapons/Ranged/Barrels/Visualizers/SpentAmmoVisualizer.cs deleted file mode 100644 index 10602a6644..0000000000 --- a/Content.Client/Weapons/Ranged/Barrels/Visualizers/SpentAmmoVisualizer.cs +++ /dev/null @@ -1,30 +0,0 @@ -using Content.Shared.Weapons.Ranged.Barrels.Components; -using JetBrains.Annotations; -using Robust.Client.GameObjects; -using Robust.Shared.GameObjects; -using Robust.Shared.IoC; - -namespace Content.Client.Weapons.Ranged.Barrels.Visualizers -{ - [UsedImplicitly] - public sealed class SpentAmmoVisualizer : AppearanceVisualizer - { - public override void OnChangeData(AppearanceComponent component) - { - base.OnChangeData(component); - var sprite = IoCManager.Resolve().GetComponent(component.Owner); - - if (!component.TryGetData(AmmoVisuals.Spent, out bool spent)) - { - return; - } - - sprite.LayerSetState(AmmoVisualLayers.Base, spent ? "spent" : "base"); - } - } - - public enum AmmoVisualLayers : byte - { - Base, - } -} diff --git a/Content.Client/Weapons/Ranged/ClientRangedWeaponComponent.cs b/Content.Client/Weapons/Ranged/ClientRangedWeaponComponent.cs deleted file mode 100644 index 8ce2c638ec..0000000000 --- a/Content.Client/Weapons/Ranged/ClientRangedWeaponComponent.cs +++ /dev/null @@ -1,34 +0,0 @@ -using Content.Shared.Weapons.Ranged.Components; -using Robust.Shared.GameObjects; -using Robust.Shared.Map; -using Robust.Shared.Maths; - -namespace Content.Client.Weapons.Ranged -{ - // Yeah I put it all in the same enum, don't judge me - public enum RangedBarrelVisualLayers : byte - { - Base, - BaseUnshaded, - Bolt, - Mag, - MagUnshaded, - } - - [RegisterComponent] - public sealed class ClientRangedWeaponComponent : SharedRangedWeaponComponent - { - public FireRateSelector FireRateSelector { get; private set; } = FireRateSelector.Automatic; - - public override void HandleComponentState(ComponentState? curState, ComponentState? nextState) - { - base.HandleComponentState(curState, nextState); - if (curState is not RangedWeaponComponentState rangedState) - { - return; - } - - FireRateSelector = rangedState.FireRateSelector; - } - } -} diff --git a/Content.Client/Weapons/Ranged/TetherGunCommand.cs b/Content.Client/Weapons/Ranged/Commands/TetherGunCommand.cs similarity index 93% rename from Content.Client/Weapons/Ranged/TetherGunCommand.cs rename to Content.Client/Weapons/Ranged/Commands/TetherGunCommand.cs index 4a9609addf..f932eeb8a0 100644 --- a/Content.Client/Weapons/Ranged/TetherGunCommand.cs +++ b/Content.Client/Weapons/Ranged/Commands/TetherGunCommand.cs @@ -1,3 +1,4 @@ +using Content.Client.Weapons.Ranged.Systems; using Robust.Shared.Console; namespace Content.Client.Weapons.Ranged; diff --git a/Content.Client/Weapons/Ranged/Components/AmmoCounterComponent.cs b/Content.Client/Weapons/Ranged/Components/AmmoCounterComponent.cs new file mode 100644 index 0000000000..22742219c0 --- /dev/null +++ b/Content.Client/Weapons/Ranged/Components/AmmoCounterComponent.cs @@ -0,0 +1,10 @@ +using Content.Shared.Weapons.Ranged.Components; +using Robust.Client.UserInterface; + +namespace Content.Client.Weapons.Ranged.Components; + +[RegisterComponent] +public sealed class AmmoCounterComponent : SharedAmmoCounterComponent +{ + public Control? Control; +} diff --git a/Content.Client/Weapons/Ranged/Components/MagVisualizer.cs b/Content.Client/Weapons/Ranged/Components/MagVisualizer.cs new file mode 100644 index 0000000000..00f04a6f87 --- /dev/null +++ b/Content.Client/Weapons/Ranged/Components/MagVisualizer.cs @@ -0,0 +1,107 @@ +using Content.Shared.Rounding; +using Content.Shared.Weapons.Ranged.Systems; +using JetBrains.Annotations; +using Robust.Client.GameObjects; +using SharedGunSystem = Content.Shared.Weapons.Ranged.Systems.SharedGunSystem; + +namespace Content.Client.Weapons.Ranged.Components; + +[UsedImplicitly] +public sealed class MagVisualizer : AppearanceVisualizer +{ + [DataField("magState")] private string? _magState; + [DataField("steps")] private int _magSteps; + [DataField("zeroVisible")] private bool _zeroVisible; + + public override void InitializeEntity(EntityUid entity) + { + base.InitializeEntity(entity); + var sprite = IoCManager.Resolve().GetComponent(entity); + + if (sprite.LayerMapTryGet(GunVisualLayers.Mag, out _)) + { + sprite.LayerSetState(GunVisualLayers.Mag, $"{_magState}-{_magSteps - 1}"); + sprite.LayerSetVisible(GunVisualLayers.Mag, false); + } + + if (sprite.LayerMapTryGet(GunVisualLayers.MagUnshaded, out _)) + { + sprite.LayerSetState(GunVisualLayers.MagUnshaded, $"{_magState}-unshaded-{_magSteps - 1}"); + sprite.LayerSetVisible(GunVisualLayers.MagUnshaded, false); + } + } + + public override void OnChangeData(AppearanceComponent component) + { + base.OnChangeData(component); + + // tl;dr + // 1.If no mag then hide it OR + // 2. If step 0 isn't visible then hide it (mag or unshaded) + // 3. Otherwise just do mag / unshaded as is + var sprite = IoCManager.Resolve().GetComponent(component.Owner); + + if (!component.TryGetData(AmmoVisuals.MagLoaded, out bool magloaded) || + magloaded) + { + if (!component.TryGetData(AmmoVisuals.AmmoMax, out int capacity)) + { + capacity = _magSteps; + } + + if (!component.TryGetData(AmmoVisuals.AmmoCount, out int current)) + { + current = _magSteps; + } + + var step = ContentHelpers.RoundToLevels(current, capacity, _magSteps); + + if (step == 0 && !_zeroVisible) + { + if (sprite.LayerMapTryGet(GunVisualLayers.Mag, out _)) + { + sprite.LayerSetVisible(GunVisualLayers.Mag, false); + } + + if (sprite.LayerMapTryGet(GunVisualLayers.MagUnshaded, out _)) + { + sprite.LayerSetVisible(GunVisualLayers.MagUnshaded, false); + } + + return; + } + + if (sprite.LayerMapTryGet(GunVisualLayers.Mag, out _)) + { + sprite.LayerSetVisible(GunVisualLayers.Mag, true); + sprite.LayerSetState(GunVisualLayers.Mag, $"{_magState}-{step}"); + } + + if (sprite.LayerMapTryGet(GunVisualLayers.MagUnshaded, out _)) + { + sprite.LayerSetVisible(GunVisualLayers.MagUnshaded, true); + sprite.LayerSetState(GunVisualLayers.MagUnshaded, $"{_magState}-unshaded-{step}"); + } + } + else + { + if (sprite.LayerMapTryGet(GunVisualLayers.Mag, out _)) + { + sprite.LayerSetVisible(GunVisualLayers.Mag, false); + } + + if (sprite.LayerMapTryGet(GunVisualLayers.MagUnshaded, out _)) + { + sprite.LayerSetVisible(GunVisualLayers.MagUnshaded, false); + } + } + } +} + +public enum GunVisualLayers : byte +{ + Base, + BaseUnshaded, + Mag, + MagUnshaded, +} diff --git a/Content.Client/Weapons/Ranged/Components/SpentAmmoVisualsComponent.cs b/Content.Client/Weapons/Ranged/Components/SpentAmmoVisualsComponent.cs new file mode 100644 index 0000000000..e14263cf88 --- /dev/null +++ b/Content.Client/Weapons/Ranged/Components/SpentAmmoVisualsComponent.cs @@ -0,0 +1,20 @@ +using Content.Client.Weapons.Ranged.Systems; + +namespace Content.Client.Weapons.Ranged.Components; + +[RegisterComponent, Friend(typeof(GunSystem))] +public sealed class SpentAmmoVisualsComponent : Component +{ + /// + /// Should we do "{_state}-spent" or just "spent" + /// + [DataField("suffix")] public bool Suffix = true; + + [DataField("state")] + public string State = "base"; +} + +public enum AmmoVisualLayers : byte +{ + Base, +} diff --git a/Content.Client/Weapons/Ranged/GunSystem.AmmoCounter.cs b/Content.Client/Weapons/Ranged/GunSystem.AmmoCounter.cs deleted file mode 100644 index 8515d06a47..0000000000 --- a/Content.Client/Weapons/Ranged/GunSystem.AmmoCounter.cs +++ /dev/null @@ -1,31 +0,0 @@ -using Content.Client.Weapons.Ranged.Barrels.Components; -using Content.Shared.Weapons.Ranged; -using Robust.Client.Player; -using Robust.Shared.Containers; -using Robust.Shared.GameObjects; -using Robust.Shared.IoC; - -namespace Content.Client.Weapons.Ranged; - -public sealed class GunSystem : EntitySystem -{ - [Dependency] private readonly IPlayerManager _playerManager = default!; - [Dependency] private readonly SharedContainerSystem _container = default!; - - public override void Initialize() - { - base.Initialize(); - SubscribeNetworkEvent(OnMagAutoEject); - } - - private void OnMagAutoEject(MagazineAutoEjectEvent ev) - { - var player = _playerManager.LocalPlayer?.ControlledEntity; - - if (!TryComp(ev.Uid, out ClientMagazineBarrelComponent? mag) || - !_container.TryGetContainingContainer(ev.Uid, out var container) || - container.Owner != player) return; - - mag.PlayAlarmAnimation(); - } -} diff --git a/Content.Client/Weapons/Ranged/RangedWeaponSystem.cs b/Content.Client/Weapons/Ranged/RangedWeaponSystem.cs deleted file mode 100644 index 1484aa7872..0000000000 --- a/Content.Client/Weapons/Ranged/RangedWeaponSystem.cs +++ /dev/null @@ -1,110 +0,0 @@ -using System; -using Content.Client.CombatMode; -using Content.Shared.Hands.Components; -using Content.Shared.Weapons.Ranged.Components; -using JetBrains.Annotations; -using Robust.Client.GameObjects; -using Robust.Client.Graphics; -using Robust.Client.Input; -using Robust.Client.Player; -using Robust.Shared.GameObjects; -using Robust.Shared.Input; -using Robust.Shared.IoC; -using Robust.Shared.Map; -using Robust.Shared.Timing; - -namespace Content.Client.Weapons.Ranged -{ - [UsedImplicitly] - public sealed class RangedWeaponSystem : EntitySystem - { - [Dependency] private readonly IPlayerManager _playerManager = default!; - [Dependency] private readonly IEyeManager _eyeManager = default!; - [Dependency] private readonly IMapManager _mapManager = default!; - [Dependency] private readonly IInputManager _inputManager = default!; - [Dependency] private readonly IGameTiming _gameTiming = default!; - [Dependency] private readonly InputSystem _inputSystem = default!; - [Dependency] private readonly CombatModeSystem _combatModeSystem = default!; - - private bool _blocked; - private int _shotCounter; - - public override void Initialize() - { - base.Initialize(); - - UpdatesOutsidePrediction = true; - } - - public override void Update(float frameTime) - { - base.Update(frameTime); - - if (!_gameTiming.IsFirstTimePredicted) - { - return; - } - - var state = _inputSystem.CmdStates.GetState(EngineKeyFunctions.Use); - if (!_combatModeSystem.IsInCombatMode() || state != BoundKeyState.Down) - { - _shotCounter = 0; - _blocked = false; - return; - } - - var entity = _playerManager.LocalPlayer?.ControlledEntity; - if (!EntityManager.TryGetComponent(entity, out SharedHandsComponent? hands)) - { - return; - } - - if (hands.ActiveHandEntity is not EntityUid held || !EntityManager.TryGetComponent(held, out ClientRangedWeaponComponent? weapon)) - { - _blocked = true; - return; - } - - switch (weapon.FireRateSelector) - { - case FireRateSelector.Safety: - _blocked = true; - return; - case FireRateSelector.Single: - if (_shotCounter >= 1) - { - _blocked = true; - return; - } - - break; - case FireRateSelector.Automatic: - break; - default: - throw new ArgumentOutOfRangeException(); - } - - if (_blocked) - return; - - var mapCoordinates = _eyeManager.ScreenToMap(_inputManager.MouseScreenPosition); - EntityCoordinates coordinates; - - if (_mapManager.TryFindGridAt(mapCoordinates, out var grid)) - { - coordinates = EntityCoordinates.FromMap(grid.GridEntityId, mapCoordinates); - } - else - { - coordinates = EntityCoordinates.FromMap(_mapManager.GetMapEntityId(mapCoordinates.MapId), mapCoordinates); - } - - SyncFirePos(coordinates); - } - - private void SyncFirePos(EntityCoordinates coordinates) - { - RaiseNetworkEvent(new FirePosEvent(coordinates)); - } - } -} diff --git a/Content.Client/Weapons/Ranged/FlyBySoundSystem.cs b/Content.Client/Weapons/Ranged/Systems/FlyBySoundSystem.cs similarity index 89% rename from Content.Client/Weapons/Ranged/FlyBySoundSystem.cs rename to Content.Client/Weapons/Ranged/Systems/FlyBySoundSystem.cs index 0a0beb08a8..da9184a3c3 100644 --- a/Content.Client/Weapons/Ranged/FlyBySoundSystem.cs +++ b/Content.Client/Weapons/Ranged/Systems/FlyBySoundSystem.cs @@ -1,12 +1,13 @@ using Content.Client.Projectiles; -using Content.Shared.Weapons.Ranged; +using Content.Shared.Weapons.Ranged.Components; +using Content.Shared.Weapons.Ranged.Systems; using Robust.Client.Player; using Robust.Shared.Audio; using Robust.Shared.Physics.Dynamics; using Robust.Shared.Player; using Robust.Shared.Random; -namespace Content.Client.Weapons.Ranged; +namespace Content.Client.Weapons.Ranged.Systems; public sealed class FlyBySoundSystem : SharedFlyBySoundSystem { diff --git a/Content.Client/Weapons/Ranged/Systems/GunSystem.AmmoCounter.cs b/Content.Client/Weapons/Ranged/Systems/GunSystem.AmmoCounter.cs new file mode 100644 index 0000000000..afb4229bb7 --- /dev/null +++ b/Content.Client/Weapons/Ranged/Systems/GunSystem.AmmoCounter.cs @@ -0,0 +1,513 @@ +using Content.Client.IoC; +using Content.Client.Items; +using Content.Client.Resources; +using Content.Client.Stylesheets; +using Content.Client.Weapons.Ranged.Components; +using Robust.Client.Animations; +using Robust.Client.Graphics; +using Robust.Client.UserInterface; +using Robust.Client.UserInterface.Controls; + +namespace Content.Client.Weapons.Ranged.Systems; + +public sealed partial class GunSystem +{ + private void OnAmmoCounterCollect(EntityUid uid, AmmoCounterComponent component, ItemStatusCollectMessage args) + { + RefreshControl(uid, component); + + if (component.Control != null) + args.Controls.Add(component.Control); + } + + /// + /// Refreshes the control being used to show ammo. Useful if you change the AmmoProvider. + /// + /// + /// + private void RefreshControl(EntityUid uid, AmmoCounterComponent? component = null) + { + if (!Resolve(uid, ref component, false)) return; + + component.Control?.Dispose(); + component.Control = null; + + var ev = new AmmoCounterControlEvent(); + RaiseLocalEvent(uid, ev, false); + + // Fallback to default if none specified + ev.Control ??= new DefaultStatusControl(); + + component.Control = ev.Control; + UpdateAmmoCount(uid, component); + } + + private void UpdateAmmoCount(EntityUid uid, AmmoCounterComponent component) + { + if (component.Control == null) return; + + var ev = new UpdateAmmoCounterEvent() + { + Control = component.Control + }; + + RaiseLocalEvent(uid, ev, false); + } + + protected override void UpdateAmmoCount(EntityUid uid) + { + // Don't use resolves because the method is shared and there's no compref and I'm trying to + // share as much code as possible + if (!Timing.IsFirstTimePredicted || + !TryComp(uid, out var clientComp)) return; + + UpdateAmmoCount(uid, clientComp); + } + + /// + /// Raised when an ammocounter is requesting a control. + /// + public sealed class AmmoCounterControlEvent : EntityEventArgs + { + public Control? Control; + } + + /// + /// Raised whenever the ammo count / magazine for a control needs updating. + /// + public sealed class UpdateAmmoCounterEvent : HandledEntityEventArgs + { + public Control Control = default!; + } + + #region Controls + + private sealed class DefaultStatusControl : Control + { + private readonly BoxContainer _bulletsListTop; + private readonly BoxContainer _bulletsListBottom; + + public DefaultStatusControl() + { + MinHeight = 15; + HorizontalExpand = true; + VerticalAlignment = VAlignment.Center; + AddChild(new BoxContainer + { + Orientation = BoxContainer.LayoutOrientation.Vertical, + HorizontalExpand = true, + VerticalAlignment = VAlignment.Center, + SeparationOverride = 0, + Children = + { + (_bulletsListTop = new BoxContainer + { + Orientation = BoxContainer.LayoutOrientation.Horizontal, + SeparationOverride = 0 + }), + new BoxContainer + { + Orientation = BoxContainer.LayoutOrientation.Horizontal, + HorizontalExpand = true, + Children = + { + new Control + { + HorizontalExpand = true, + Children = + { + (_bulletsListBottom = new BoxContainer + { + Orientation = BoxContainer.LayoutOrientation.Horizontal, + VerticalAlignment = VAlignment.Center, + SeparationOverride = 0 + }), + } + }, + } + } + } + }); + } + + public void Update(int count, int capacity) + { + _bulletsListTop.RemoveAllChildren(); + _bulletsListBottom.RemoveAllChildren(); + + string texturePath; + if (capacity <= 20) + { + texturePath = "/Textures/Interface/ItemStatus/Bullets/normal.png"; + } + else if (capacity <= 30) + { + texturePath = "/Textures/Interface/ItemStatus/Bullets/small.png"; + } + else + { + texturePath = "/Textures/Interface/ItemStatus/Bullets/tiny.png"; + } + + var texture = StaticIoC.ResC.GetTexture(texturePath); + + const int tinyMaxRow = 60; + + if (capacity > tinyMaxRow) + { + FillBulletRow(_bulletsListBottom, Math.Min(tinyMaxRow, count), tinyMaxRow, texture); + FillBulletRow(_bulletsListTop, Math.Max(0, count - tinyMaxRow), capacity - tinyMaxRow, texture); + } + else + { + FillBulletRow(_bulletsListBottom, count, capacity, texture); + } + } + + private static void FillBulletRow(Control container, int count, int capacity, Texture texture) + { + var colorA = Color.FromHex("#b68f0e"); + var colorB = Color.FromHex("#d7df60"); + var colorGoneA = Color.FromHex("#000000"); + var colorGoneB = Color.FromHex("#222222"); + + var altColor = false; + + for (var i = count; i < capacity; i++) + { + container.AddChild(new TextureRect + { + Texture = texture, + ModulateSelfOverride = altColor ? colorGoneA : colorGoneB + }); + + altColor ^= true; + } + + for (var i = 0; i < count; i++) + { + container.AddChild(new TextureRect + { + Texture = texture, + ModulateSelfOverride = altColor ? colorA : colorB + }); + + altColor ^= true; + } + } + } + + public sealed class BoxesStatusControl : Control + { + private readonly BoxContainer _bulletsList; + private readonly Label _ammoCount; + + public BoxesStatusControl() + { + MinHeight = 15; + HorizontalExpand = true; + VerticalAlignment = VAlignment.Center; + + AddChild(new BoxContainer + { + Orientation = BoxContainer.LayoutOrientation.Horizontal, + HorizontalExpand = true, + Children = + { + new Control + { + HorizontalExpand = true, + Children = + { + (_bulletsList = new BoxContainer + { + Orientation = BoxContainer.LayoutOrientation.Horizontal, + VerticalAlignment = VAlignment.Center, + SeparationOverride = 4 + }), + } + }, + new Control() { MinSize = (5, 0) }, + (_ammoCount = new Label + { + StyleClasses = { StyleNano.StyleClassItemStatus }, + HorizontalAlignment = HAlignment.Right, + }), + } + }); + } + + public void Update(int count, int max) + { + _bulletsList.RemoveAllChildren(); + + _ammoCount.Visible = true; + + _ammoCount.Text = $"x{count:00}"; + max = Math.Min(max, 8); + FillBulletRow(_bulletsList, count, max); + } + + private static void FillBulletRow(Control container, int count, int capacity) + { + var colorGone = Color.FromHex("#000000"); + var color = Color.FromHex("#E00000"); + + // Draw the empty ones + for (var i = count; i < capacity; i++) + { + container.AddChild(new PanelContainer + { + PanelOverride = new StyleBoxFlat() + { + BackgroundColor = colorGone, + }, + MinSize = (10, 15), + }); + } + + // Draw the full ones, but limit the count to the capacity + count = Math.Min(count, capacity); + for (var i = 0; i < count; i++) + { + container.AddChild(new PanelContainer + { + PanelOverride = new StyleBoxFlat() + { + BackgroundColor = color, + }, + MinSize = (10, 15), + }); + } + } + } + + private sealed class ChamberMagazineStatusControl : Control + { + private readonly BoxContainer _bulletsList; + private readonly TextureRect _chamberedBullet; + private readonly Label _noMagazineLabel; + private readonly Label _ammoCount; + + public ChamberMagazineStatusControl() + { + MinHeight = 15; + HorizontalExpand = true; + VerticalAlignment = VAlignment.Center; + + AddChild(new BoxContainer + { + Orientation = BoxContainer.LayoutOrientation.Horizontal, + HorizontalExpand = true, + Children = + { + (_chamberedBullet = new TextureRect + { + Texture = StaticIoC.ResC.GetTexture("/Textures/Interface/ItemStatus/Bullets/chambered_rotated.png"), + VerticalAlignment = VAlignment.Center, + HorizontalAlignment = HAlignment.Right, + }), + new Control() { MinSize = (5,0) }, + new Control + { + HorizontalExpand = true, + Children = + { + (_bulletsList = new BoxContainer + { + Orientation = BoxContainer.LayoutOrientation.Horizontal, + VerticalAlignment = VAlignment.Center, + SeparationOverride = 0 + }), + (_noMagazineLabel = new Label + { + Text = "No Magazine!", + StyleClasses = {StyleNano.StyleClassItemStatus} + }) + } + }, + new Control() { MinSize = (5,0) }, + (_ammoCount = new Label + { + StyleClasses = {StyleNano.StyleClassItemStatus}, + HorizontalAlignment = HAlignment.Right, + }), + } + }); + } + + public void Update(bool chambered, bool magazine, int count, int capacity) + { + _chamberedBullet.ModulateSelfOverride = + chambered ? Color.FromHex("#d7df60") : Color.Black; + + _bulletsList.RemoveAllChildren(); + + if (!magazine) + { + _noMagazineLabel.Visible = true; + _ammoCount.Visible = false; + return; + } + + _noMagazineLabel.Visible = false; + _ammoCount.Visible = true; + + var texturePath = "/Textures/Interface/ItemStatus/Bullets/normal.png"; + var texture = StaticIoC.ResC.GetTexture(texturePath); + + _ammoCount.Text = $"x{count:00}"; + capacity = Math.Min(capacity, 20); + FillBulletRow(_bulletsList, count, capacity, texture); + } + + private static void FillBulletRow(Control container, int count, int capacity, Texture texture) + { + var colorA = Color.FromHex("#b68f0e"); + var colorB = Color.FromHex("#d7df60"); + var colorGoneA = Color.FromHex("#000000"); + var colorGoneB = Color.FromHex("#222222"); + + var altColor = false; + + // Draw the empty ones + for (var i = count; i < capacity; i++) + { + container.AddChild(new TextureRect + { + Texture = texture, + ModulateSelfOverride = altColor ? colorGoneA : colorGoneB, + Stretch = TextureRect.StretchMode.KeepCentered + }); + + altColor ^= true; + } + + // Draw the full ones, but limit the count to the capacity + count = Math.Min(count, capacity); + for (var i = 0; i < count; i++) + { + container.AddChild(new TextureRect + { + Texture = texture, + ModulateSelfOverride = altColor ? colorA : colorB, + Stretch = TextureRect.StretchMode.KeepCentered + }); + + altColor ^= true; + } + } + + public void PlayAlarmAnimation(Animation animation) + { + _noMagazineLabel.PlayAnimation(animation, "alarm"); + } + } + + private sealed class RevolverStatusControl : Control + { + private readonly BoxContainer _bulletsList; + + public RevolverStatusControl() + { + MinHeight = 15; + HorizontalExpand = true; + VerticalAlignment = VAlignment.Center; + AddChild((_bulletsList = new BoxContainer + { + Orientation = BoxContainer.LayoutOrientation.Horizontal, + HorizontalExpand = true, + VerticalAlignment = VAlignment.Center, + SeparationOverride = 0 + })); + } + + public void Update(int currentIndex, bool?[] bullets) + { + _bulletsList.RemoveAllChildren(); + var capacity = bullets.Length; + + string texturePath; + if (capacity <= 20) + { + texturePath = "/Textures/Interface/ItemStatus/Bullets/normal.png"; + } + else if (capacity <= 30) + { + texturePath = "/Textures/Interface/ItemStatus/Bullets/small.png"; + } + else + { + texturePath = "/Textures/Interface/ItemStatus/Bullets/tiny.png"; + } + + var texture = StaticIoC.ResC.GetTexture(texturePath); + var spentTexture = StaticIoC.ResC.GetTexture("/Textures/Interface/ItemStatus/Bullets/empty.png"); + + FillBulletRow(currentIndex, bullets, _bulletsList, texture, spentTexture); + } + + private void FillBulletRow(int currentIndex, bool?[] bullets, Control container, Texture texture, Texture emptyTexture) + { + var capacity = bullets.Length; + var colorA = Color.FromHex("#b68f0e"); + var colorB = Color.FromHex("#d7df60"); + var colorSpentA = Color.FromHex("#b50e25"); + var colorSpentB = Color.FromHex("#d3745f"); + var colorGoneA = Color.FromHex("#000000"); + var colorGoneB = Color.FromHex("#222222"); + + var altColor = false; + var scale = 1.3f; + + for (var i = 0; i < capacity; i++) + { + var bulletFree = bullets[i]; + // Add a outline + var box = new Control() + { + MinSize = texture.Size * scale, + }; + if (i == currentIndex) + { + box.AddChild(new TextureRect + { + Texture = texture, + TextureScale = (scale, scale), + ModulateSelfOverride = Color.LimeGreen, + }); + } + Color color; + Texture bulletTexture = texture; + + if (bulletFree.HasValue) + { + if (bulletFree.Value) + { + color = altColor ? colorA : colorB; + } + else + { + color = altColor ? colorSpentA : colorSpentB; + bulletTexture = emptyTexture; + } + } + else + { + color = altColor ? colorGoneA : colorGoneB; + } + + box.AddChild(new TextureRect + { + Stretch = TextureRect.StretchMode.KeepCentered, + Texture = bulletTexture, + ModulateSelfOverride = color, + }); + altColor ^= true; + container.AddChild(box); + } + } + } + + #endregion +} diff --git a/Content.Client/Weapons/Ranged/Systems/GunSystem.Ballistic.cs b/Content.Client/Weapons/Ranged/Systems/GunSystem.Ballistic.cs new file mode 100644 index 0000000000..4f0cce523c --- /dev/null +++ b/Content.Client/Weapons/Ranged/Systems/GunSystem.Ballistic.cs @@ -0,0 +1,48 @@ +using Content.Shared.Weapons.Ranged.Components; +using Robust.Shared.Map; + +namespace Content.Client.Weapons.Ranged.Systems; + +public sealed partial class GunSystem +{ + protected override void InitializeBallistic() + { + base.InitializeBallistic(); + SubscribeLocalEvent(OnBallisticAmmoCount); + } + + private void OnBallisticAmmoCount(EntityUid uid, BallisticAmmoProviderComponent component, UpdateAmmoCounterEvent args) + { + if (args.Control is DefaultStatusControl control) + { + control.Update(GetBallisticShots(component), component.Capacity); + return; + } + } + + protected override void Cycle(BallisticAmmoProviderComponent component, MapCoordinates coordinates) + { + if (!Timing.IsFirstTimePredicted) return; + + EntityUid? ent = null; + + // TODO: Combine with TakeAmmo + if (component.Entities.Count > 0) + { + var existing = component.Entities[^1]; + component.Entities.RemoveAt(component.Entities.Count - 1); + + component.Container.Remove(existing); + EnsureComp(existing); + } + else if (component.UnspawnedCount > 0) + { + component.UnspawnedCount--; + ent = Spawn(component.FillProto, coordinates); + EnsureComp(ent.Value); + } + + if (ent != null && ent.Value.IsClientSide()) + Del(ent.Value); + } +} diff --git a/Content.Client/Weapons/Ranged/Systems/GunSystem.Battery.cs b/Content.Client/Weapons/Ranged/Systems/GunSystem.Battery.cs new file mode 100644 index 0000000000..122244e7f2 --- /dev/null +++ b/Content.Client/Weapons/Ranged/Systems/GunSystem.Battery.cs @@ -0,0 +1,30 @@ +using Content.Shared.Weapons.Ranged.Components; + +namespace Content.Client.Weapons.Ranged.Systems; + +public sealed partial class GunSystem +{ + protected override void InitializeBattery() + { + base.InitializeBattery(); + // Hitscan + SubscribeLocalEvent(OnControl); + SubscribeLocalEvent(OnAmmoCountUpdate); + + // Projectile + SubscribeLocalEvent(OnControl); + SubscribeLocalEvent(OnAmmoCountUpdate); + } + + private void OnAmmoCountUpdate(EntityUid uid, BatteryAmmoProviderComponent component, UpdateAmmoCounterEvent args) + { + if (args.Control is not BoxesStatusControl boxes) return; + + boxes.Update(component.Shots, component.Capacity); + } + + private void OnControl(EntityUid uid, BatteryAmmoProviderComponent component, AmmoCounterControlEvent args) + { + args.Control = new BoxesStatusControl(); + } +} diff --git a/Content.Client/Weapons/Ranged/Systems/GunSystem.ChamberMagazine.cs b/Content.Client/Weapons/Ranged/Systems/GunSystem.ChamberMagazine.cs new file mode 100644 index 0000000000..76cf47cb0c --- /dev/null +++ b/Content.Client/Weapons/Ranged/Systems/GunSystem.ChamberMagazine.cs @@ -0,0 +1,50 @@ +using Content.Shared.Examine; +using Content.Shared.Weapons.Ranged.Components; +using Content.Shared.Weapons.Ranged.Events; +using Robust.Shared.Containers; + +namespace Content.Client.Weapons.Ranged.Systems; + +public sealed partial class GunSystem +{ + protected override void InitializeChamberMagazine() + { + base.InitializeChamberMagazine(); + SubscribeLocalEvent(OnChamberMagazineCounter); + SubscribeLocalEvent(OnChamberMagazineAmmoUpdate); + SubscribeLocalEvent(OnChamberEntRemove); + } + + private void OnChamberEntRemove(EntityUid uid, ChamberMagazineAmmoProviderComponent component, EntRemovedFromContainerMessage args) + { + if (args.Container.ID != ChamberSlot) return; + + // This is dirty af. Prediction moment. + // We may be predicting spawning entities and the engine just removes them from the container so we'll just delete them. + if (args.Entity.IsClientSide()) + QueueDel(args.Entity); + + // AFAIK the only main alternative is having some client-specific handling via a bool or otherwise for the state. + // which is much larger and I'm not sure how much better it is. It's bad enough we have to do it with revolvers + // to avoid 6-7 additional entity spawns. + } + + private void OnChamberMagazineCounter(EntityUid uid, ChamberMagazineAmmoProviderComponent component, AmmoCounterControlEvent args) + { + args.Control = new ChamberMagazineStatusControl(); + } + + private void OnChamberMagazineAmmoUpdate(EntityUid uid, ChamberMagazineAmmoProviderComponent component, UpdateAmmoCounterEvent args) + { + if (args.Control is not ChamberMagazineStatusControl control) return; + + var chambered = GetChamberEntity(uid); + var magEntity = GetMagazineEntity(uid); + var ammoCountEv = new GetAmmoCountEvent(); + + if (magEntity != null) + RaiseLocalEvent(magEntity.Value, ref ammoCountEv, false); + + control.Update(chambered != null, magEntity != null, ammoCountEv.Count, ammoCountEv.Capacity); + } +} diff --git a/Content.Client/Weapons/Ranged/Systems/GunSystem.Magazine.cs b/Content.Client/Weapons/Ranged/Systems/GunSystem.Magazine.cs new file mode 100644 index 0000000000..eaab8401bc --- /dev/null +++ b/Content.Client/Weapons/Ranged/Systems/GunSystem.Magazine.cs @@ -0,0 +1,29 @@ +using Content.Shared.Weapons.Ranged; + +namespace Content.Client.Weapons.Ranged.Systems; + +public sealed partial class GunSystem +{ + protected override void InitializeMagazine() + { + base.InitializeMagazine(); + SubscribeLocalEvent(OnMagazineAmmoUpdate); + } + + private void OnMagazineAmmoUpdate(EntityUid uid, MagazineAmmoProviderComponent component, UpdateAmmoCounterEvent args) + { + var ent = GetMagazineEntity(uid); + + if (ent == null) + { + if (args.Control is DefaultStatusControl control) + { + control.Update(0, 0); + } + + return; + } + + RaiseLocalEvent(ent.Value, args, false); + } +} diff --git a/Content.Client/Weapons/Ranged/Systems/GunSystem.Revolver.cs b/Content.Client/Weapons/Ranged/Systems/GunSystem.Revolver.cs new file mode 100644 index 0000000000..93e8266169 --- /dev/null +++ b/Content.Client/Weapons/Ranged/Systems/GunSystem.Revolver.cs @@ -0,0 +1,37 @@ +using Content.Shared.Weapons.Ranged.Components; +using Robust.Shared.Containers; +using Robust.Shared.Utility; + +namespace Content.Client.Weapons.Ranged.Systems; + +public sealed partial class GunSystem +{ + protected override void InitializeRevolver() + { + base.InitializeRevolver(); + SubscribeLocalEvent(OnRevolverCounter); + SubscribeLocalEvent(OnRevolverAmmoUpdate); + SubscribeLocalEvent(OnRevolverEntRemove); + } + + private void OnRevolverEntRemove(EntityUid uid, RevolverAmmoProviderComponent component, EntRemovedFromContainerMessage args) + { + if (args.Container.ID != RevolverContainer) return; + + // See ChamberMagazineAmmoProvider + if (!args.Entity.IsClientSide()) return; + + QueueDel(args.Entity); + } + + private void OnRevolverAmmoUpdate(EntityUid uid, RevolverAmmoProviderComponent component, UpdateAmmoCounterEvent args) + { + if (args.Control is not RevolverStatusControl control) return; + control.Update(component.CurrentIndex, component.Chambers); + } + + private void OnRevolverCounter(EntityUid uid, RevolverAmmoProviderComponent component, AmmoCounterControlEvent args) + { + args.Control = new RevolverStatusControl(); + } +} diff --git a/Content.Client/Weapons/Ranged/Systems/GunSystem.SpentAmmo.cs b/Content.Client/Weapons/Ranged/Systems/GunSystem.SpentAmmo.cs new file mode 100644 index 0000000000..7227f333c0 --- /dev/null +++ b/Content.Client/Weapons/Ranged/Systems/GunSystem.SpentAmmo.cs @@ -0,0 +1,34 @@ +using Content.Client.Weapons.Ranged.Components; +using Content.Shared.Weapons.Ranged.Systems; +using Robust.Client.GameObjects; + +namespace Content.Client.Weapons.Ranged.Systems; + +public sealed partial class GunSystem +{ + private void InitializeSpentAmmo() + { + SubscribeLocalEvent(OnSpentAmmoAppearance); + } + + private void OnSpentAmmoAppearance(EntityUid uid, SpentAmmoVisualsComponent component, ref AppearanceChangeEvent args) + { + var sprite = args.Sprite; + if (sprite == null) return; + + if (!args.AppearanceData.TryGetValue(AmmoVisuals.Spent, out var varSpent)) + { + return; + } + + var spent = (bool) varSpent; + string state; + + if (spent) + state = component.Suffix ? $"{component.State}-spent" : "spent"; + else + state = component.State; + + sprite.LayerSetState(AmmoVisualLayers.Base, state); + } +} diff --git a/Content.Client/Weapons/Ranged/Systems/GunSystem.cs b/Content.Client/Weapons/Ranged/Systems/GunSystem.cs new file mode 100644 index 0000000000..8f84040bbd --- /dev/null +++ b/Content.Client/Weapons/Ranged/Systems/GunSystem.cs @@ -0,0 +1,187 @@ +using Content.Client.Items; +using Content.Client.Weapons.Ranged.Components; +using Content.Shared.Weapons.Ranged; +using Content.Shared.Weapons.Ranged.Components; +using Content.Shared.Weapons.Ranged.Events; +using Content.Shared.Weapons.Ranged.Systems; +using Robust.Client.Animations; +using Robust.Client.GameObjects; +using Robust.Client.Graphics; +using Robust.Client.Input; +using Robust.Client.Player; +using Robust.Shared.Audio; +using Robust.Shared.Input; +using Robust.Shared.Map; +using Robust.Shared.Player; +using Robust.Shared.Utility; +using SharedGunSystem = Content.Shared.Weapons.Ranged.Systems.SharedGunSystem; + +namespace Content.Client.Weapons.Ranged.Systems; + +public sealed partial class GunSystem : SharedGunSystem +{ + [Dependency] private readonly IEyeManager _eyeManager = default!; + [Dependency] private readonly IInputManager _inputManager = default!; + [Dependency] private readonly IPlayerManager _player = default!; + [Dependency] private readonly AnimationPlayerSystem _animPlayer = default!; + [Dependency] private readonly EffectSystem _effects = default!; + [Dependency] private readonly InputSystem _inputSystem = default!; + + public override void Initialize() + { + base.Initialize(); + UpdatesOutsidePrediction = true; + SubscribeLocalEvent(OnAmmoCounterCollect); + + // Plays animated effects on the client. + SubscribeNetworkEvent(OnHitscan); + + InitializeSpentAmmo(); + } + + private void OnHitscan(HitscanEvent ev) + { + // ALL I WANT IS AN ANIMATED EFFECT + foreach (var a in ev.Sprites) + { + if (a.Sprite is not SpriteSpecifier.Rsi rsi) continue; + + var ent = Spawn("HitscanEffect", a.coordinates); + var sprite = Comp(ent); + var xform = Transform(ent); + xform.LocalRotation = a.angle; + sprite[EffectLayers.Unshaded].AutoAnimated = false; + sprite.LayerSetSprite(EffectLayers.Unshaded, rsi); + sprite.LayerSetState(EffectLayers.Unshaded, rsi.RsiState); + sprite.Scale = new Vector2(a.Distance, 1f); + sprite[EffectLayers.Unshaded].Visible = true; + + var anim = new Animation() + { + Length = TimeSpan.FromSeconds(0.48f), + AnimationTracks = + { + new AnimationTrackSpriteFlick() + { + LayerKey = EffectLayers.Unshaded, + KeyFrames = + { + new AnimationTrackSpriteFlick.KeyFrame(rsi.RsiState, 0f), + } + } + } + }; + + _animPlayer.Play(ent, null, anim, "hitscan-effect"); + } + } + + public override void Update(float frameTime) + { + if (!Timing.IsFirstTimePredicted) + return; + + var entityNull = _player.LocalPlayer?.ControlledEntity; + + if (entityNull == null) + { + return; + } + + var entity = entityNull.Value; + var gun = GetGun(entity); + + if (gun == null) + { + return; + } + + if (_inputSystem.CmdStates.GetState(EngineKeyFunctions.Use) != BoundKeyState.Down) + { + if (gun.ShotCounter != 0) + EntityManager.RaisePredictiveEvent(new RequestStopShootEvent { Gun = gun.Owner }); + return; + } + + if (gun.NextFire > Timing.CurTime) + return; + + var mousePos = _eyeManager.ScreenToMap(_inputManager.MouseScreenPosition); + EntityCoordinates coordinates; + + // Bro why would I want a ternary here + // ReSharper disable once ConvertIfStatementToConditionalTernaryExpression + if (MapManager.TryFindGridAt(mousePos, out var grid)) + { + coordinates = EntityCoordinates.FromMap(grid.GridEntityId, mousePos, EntityManager); + } + else + { + coordinates = EntityCoordinates.FromMap(MapManager.GetMapEntityId(mousePos.MapId), mousePos, EntityManager); + } + + Sawmill.Debug($"Sending shoot request tick {Timing.CurTick} / {Timing.CurTime}"); + + EntityManager.RaisePredictiveEvent(new RequestShootEvent + { + Coordinates = coordinates, + Gun = gun.Owner, + }); + } + + public override void Shoot(GunComponent gun, List ammo, EntityCoordinates fromCoordinates, EntityCoordinates toCoordinates, EntityUid? user = null) + { + // Rather than splitting client / server for every ammo provider it's easier + // to just delete the spawned entities. This is for programmer sanity despite the wasted perf. + // This also means any ammo specific stuff can be grabbed as necessary. + foreach (var ent in ammo) + { + switch (ent) + { + case CartridgeAmmoComponent cartridge: + if (!cartridge.Spent) + { + SetCartridgeSpent(cartridge, true); + MuzzleFlash(gun.Owner, cartridge, user); + + // TODO: Can't predict entity deletions. + //if (cartridge.DeleteOnSpawn) + // Del(cartridge.Owner); + } + else + { + PlaySound(gun.Owner, gun.SoundEmpty?.GetSound(Random, ProtoManager), user); + } + + if (cartridge.Owner.IsClientSide()) + Del(cartridge.Owner); + + break; + case AmmoComponent newAmmo: + MuzzleFlash(gun.Owner, newAmmo, user); + if (newAmmo.Owner.IsClientSide()) + Del(newAmmo.Owner); + else + RemComp(newAmmo.Owner); + break; + } + } + } + + protected override void PlaySound(EntityUid gun, string? sound, EntityUid? user = null) + { + if (sound == null || user == null || !Timing.IsFirstTimePredicted) return; + SoundSystem.Play(Filter.Local(), sound, gun); + } + + protected override void Popup(string message, EntityUid? uid, EntityUid? user) + { + if (uid == null || user == null || !Timing.IsFirstTimePredicted) return; + PopupSystem.PopupEntity(message, uid.Value, Filter.Entities(user.Value)); + } + + protected override void CreateEffect(EffectSystemMessage message, EntityUid? user = null) + { + _effects.CreateEffect(message); + } +} diff --git a/Content.Client/Weapons/Ranged/TetherGunSystem.cs b/Content.Client/Weapons/Ranged/Systems/TetherGunSystem.cs similarity index 97% rename from Content.Client/Weapons/Ranged/TetherGunSystem.cs rename to Content.Client/Weapons/Ranged/Systems/TetherGunSystem.cs index 67a0e1a2d8..5a6117d0b1 100644 --- a/Content.Client/Weapons/Ranged/TetherGunSystem.cs +++ b/Content.Client/Weapons/Ranged/Systems/TetherGunSystem.cs @@ -1,5 +1,5 @@ using Content.Client.Clickable; -using Content.Shared.Weapons.Ranged; +using Content.Shared.Weapons.Ranged.Systems; using Robust.Client.GameObjects; using Robust.Client.Graphics; using Robust.Client.Input; @@ -7,7 +7,7 @@ using Robust.Shared.Input; using Robust.Shared.Map; using Robust.Shared.Timing; -namespace Content.Client.Weapons.Ranged; +namespace Content.Client.Weapons.Ranged.Systems; public sealed class TetherGunSystem : SharedTetherGunSystem { diff --git a/Content.Server/Entry/IgnoredComponents.cs b/Content.Server/Entry/IgnoredComponents.cs index acab9fa497..9f8b773cd5 100644 --- a/Content.Server/Entry/IgnoredComponents.cs +++ b/Content.Server/Entry/IgnoredComponents.cs @@ -9,6 +9,7 @@ namespace Content.Server.Entry "StasisBedVisuals", "InteractionOutline", "MeleeWeaponArcAnimation", + "EffectVisuals", "AnimationsTest", "ItemStatus", "VehicleVisuals", @@ -21,11 +22,12 @@ namespace Content.Server.Entry "LatheVisuals", "DiseaseMachineVisuals", "HandheldGPS", + "SpentAmmoVisuals", "ToggleableLightVisuals", "CableVisualizer", "PotencyVisuals", "PaperVisuals", - "SurveillanceCameraVisuals" + "SurveillanceCameraVisuals", }; } } diff --git a/Content.Server/Interaction/InteractionSystem.cs b/Content.Server/Interaction/InteractionSystem.cs index 67a54f9c6c..4cbd608afa 100644 --- a/Content.Server/Interaction/InteractionSystem.cs +++ b/Content.Server/Interaction/InteractionSystem.cs @@ -3,7 +3,6 @@ using Content.Server.CombatMode; using Content.Server.Hands.Components; using Content.Server.Pulling; using Content.Server.Storage.Components; -using Content.Server.Weapon.Ranged.Barrels.Components; using Content.Shared.ActionBlocker; using Content.Shared.Database; using Content.Shared.DragDrop; @@ -13,7 +12,6 @@ using Content.Shared.Interaction.Events; using Content.Shared.Item; using Content.Shared.Pulling.Components; using Content.Shared.Weapons.Melee; -using Content.Shared.Weapons.Ranged.Components; using JetBrains.Annotations; using Robust.Server.GameObjects; using Robust.Shared.Containers; diff --git a/Content.Server/Power/Components/ChargerComponent.cs b/Content.Server/Power/Components/ChargerComponent.cs index d39f10ef46..f9e7dbddb3 100644 --- a/Content.Server/Power/Components/ChargerComponent.cs +++ b/Content.Server/Power/Components/ChargerComponent.cs @@ -15,29 +15,26 @@ namespace Content.Server.Power.Components private CellChargerStatus _status; [DataField("chargeRate")] - private int _chargeRate = 100; - - [DataField("transferEfficiency")] - private float _transferEfficiency = 0.85f; + public int ChargeRate = 20; [DataField("chargerSlot", required: true)] public ItemSlot ChargerSlot = new(); private CellChargerStatus GetStatus() { - if (_entMan.TryGetComponent(Owner, out ApcPowerReceiverComponent? receiver) && - !receiver.Powered) + if (!_entMan.TryGetComponent(Owner, out var xform) || + !xform.Anchored || + _entMan.TryGetComponent(Owner, out ApcPowerReceiverComponent? receiver) && !receiver.Powered) { return CellChargerStatus.Off; } + if (!ChargerSlot.HasItem) - { return CellChargerStatus.Empty; - } + if (HeldBattery != null && Math.Abs(HeldBattery.MaxCharge - HeldBattery.CurrentCharge) < 0.01) - { return CellChargerStatus.Charged; - } + return CellChargerStatus.Charging; } @@ -66,7 +63,7 @@ namespace Content.Server.Power.Components appearance?.SetData(CellVisual.Light, CellChargerStatus.Empty); break; case CellChargerStatus.Charging: - receiver.Load = (int) (_chargeRate / _transferEfficiency); + receiver.Load = ChargeRate; appearance?.SetData(CellVisual.Light, CellChargerStatus.Charging); break; case CellChargerStatus.Charged: @@ -83,9 +80,8 @@ namespace Content.Server.Power.Components public void OnUpdate(float frameTime) //todo: make single system for this { if (_status == CellChargerStatus.Empty || _status == CellChargerStatus.Charged || !ChargerSlot.HasItem) - { return; - } + TransferPower(frameTime); } @@ -98,16 +94,15 @@ namespace Content.Server.Power.Components } if (HeldBattery == null) - { return; - } - HeldBattery.CurrentCharge += _chargeRate * frameTime; + HeldBattery.CurrentCharge += ChargeRate * frameTime; // Just so the sprite won't be set to 99.99999% visibility if (HeldBattery.MaxCharge - HeldBattery.CurrentCharge < 0.01) { HeldBattery.CurrentCharge = HeldBattery.MaxCharge; } + UpdateStatus(); } } diff --git a/Content.Server/Power/EntitySystems/ChargerSystem.cs b/Content.Server/Power/EntitySystems/ChargerSystem.cs index d3278871bd..b259d98bb3 100644 --- a/Content.Server/Power/EntitySystems/ChargerSystem.cs +++ b/Content.Server/Power/EntitySystems/ChargerSystem.cs @@ -1,6 +1,7 @@ using Content.Server.Power.Components; using Content.Server.PowerCell; using Content.Shared.Containers.ItemSlots; +using Content.Shared.Examine; using Content.Shared.PowerCell.Components; using JetBrains.Annotations; using Robust.Shared.Containers; @@ -15,16 +16,18 @@ internal sealed class ChargerSystem : EntitySystem public override void Initialize() { - base.Initialize(); - SubscribeLocalEvent(OnChargerInit); SubscribeLocalEvent(OnChargerRemove); - SubscribeLocalEvent(OnPowerChanged); - SubscribeLocalEvent(OnInserted); SubscribeLocalEvent(OnRemoved); SubscribeLocalEvent(OnInsertAttempt); + SubscribeLocalEvent(OnChargerExamine); + } + + private void OnChargerExamine(EntityUid uid, ChargerComponent component, ExaminedEvent args) + { + args.PushMarkup(Loc.GetString("charger-examine", ("color", "yellow"), ("chargeRate", component.ChargeRate))); } public override void Update(float frameTime) @@ -63,7 +66,7 @@ internal sealed class ChargerSystem : EntitySystem // or by checking for a power cell slot on the inserted entity _cellSystem.TryGetBatteryFromSlot(args.Entity, out component.HeldBattery); } - + component.UpdateStatus(); } diff --git a/Content.Server/Projectiles/Components/HitscanComponent.cs b/Content.Server/Projectiles/Components/HitscanComponent.cs deleted file mode 100644 index a16fd6ca1b..0000000000 --- a/Content.Server/Projectiles/Components/HitscanComponent.cs +++ /dev/null @@ -1,166 +0,0 @@ -using Content.Server.Weapon.Ranged; -using Content.Shared.Damage; -using Content.Shared.Physics; -using Content.Shared.Sound; -using Robust.Server.GameObjects; -using Robust.Shared.Audio; -using Robust.Shared.Map; -using Robust.Shared.Player; -using Robust.Shared.Timing; - -namespace Content.Server.Projectiles.Components -{ - /// - /// Lasers etc. - /// - [RegisterComponent] - public sealed class HitscanComponent : Component - { - [Dependency] private readonly IEntityManager _entMan = default!; - [Dependency] private readonly IGameTiming _gameTiming = default!; - - public CollisionGroup CollisionMask => (CollisionGroup) _collisionMask; - - [DataField("layers")] //todo WithFormat.Flags() - private int _collisionMask = (int) CollisionGroup.Opaque; - - [DataField("damage", required: true)] - [ViewVariables(VVAccess.ReadWrite)] - public DamageSpecifier Damage = default!; - - public float MaxLength => 20.0f; - private TimeSpan _startTime; - private TimeSpan _deathTime; - - public float ColorModifier { get; set; } = 1.0f; - [DataField("spriteName")] - private string _spriteName = "Objects/Weapons/Guns/Projectiles/laser.png"; - [DataField("muzzleFlash")] - private string? _muzzleFlash; - [DataField("impactFlash")] - private string? _impactFlash; - - [DataField("soundHit")] - public SoundSpecifier? SoundHit; - - [DataField("soundForce")] - public bool ForceSound = false; - - public void FireEffects(EntityUid user, float distance, Angle angle, EntityUid? hitEntity = null) - { - var effectSystem = EntitySystem.Get(); - _startTime = _gameTiming.CurTime; - _deathTime = _startTime + TimeSpan.FromSeconds(1); - - var mapManager = IoCManager.Resolve(); - - // We'll get the effects relative to the grid / map of the firer - var gridOrMap = _entMan.GetComponent(user).GridID == GridId.Invalid ? mapManager.GetMapEntityId(_entMan.GetComponent(user).MapID) : - mapManager.GetGrid(_entMan.GetComponent(user).GridID).GridEntityId; - - var parentXform = _entMan.GetComponent(gridOrMap); - - var localCoordinates = new EntityCoordinates(gridOrMap, parentXform.InvWorldMatrix.Transform(_entMan.GetComponent(user).WorldPosition)); - var localAngle = angle - parentXform.WorldRotation; - - var afterEffect = AfterEffects(localCoordinates, localAngle, distance, 1.0f); - if (afterEffect != null) - { - effectSystem.CreateParticle(afterEffect); - } - - // if we're too close we'll stop the impact and muzzle / impact sprites from clipping - if (distance > 1.0f) - { - var impactEffect = ImpactFlash(distance, localAngle); - if (impactEffect != null) - { - effectSystem.CreateParticle(impactEffect); - } - - var muzzleEffect = MuzzleFlash(localCoordinates, localAngle); - if (muzzleEffect != null) - { - effectSystem.CreateParticle(muzzleEffect); - } - } - - Owner.SpawnTimer((int) _deathTime.TotalMilliseconds, () => - { - if (!_entMan.Deleted(Owner)) - { - _entMan.DeleteEntity(Owner); - } - }); - } - - private EffectSystemMessage? MuzzleFlash(EntityCoordinates grid, Angle angle) - { - if (_muzzleFlash == null) - { - return null; - } - - var offset = angle.ToVec().Normalized / 2; - - var message = new EffectSystemMessage - { - EffectSprite = _muzzleFlash, - Born = _startTime, - DeathTime = _deathTime, - Coordinates = grid.Offset(offset), - //Rotated from east facing - Rotation = (float) angle.Theta, - Color = Vector4.Multiply(new Vector4(255, 255, 255, 750), ColorModifier), - ColorDelta = new Vector4(0, 0, 0, -1500f), - Shaded = false - }; - - return message; - } - - private EffectSystemMessage AfterEffects(EntityCoordinates origin, Angle angle, float distance, float offset = 0.0f) - { - var midPointOffset = angle.ToVec() * distance / 2; - var message = new EffectSystemMessage - { - EffectSprite = _spriteName, - Born = _startTime, - DeathTime = _deathTime, - Size = new Vector2(distance - offset, 1f), - Coordinates = origin.Offset(midPointOffset), - //Rotated from east facing - Rotation = (float) angle.Theta, - Color = Vector4.Multiply(new Vector4(255, 255, 255, 750), ColorModifier), - ColorDelta = new Vector4(0, 0, 0, -1500f), - - Shaded = false - }; - - return message; - } - - private EffectSystemMessage? ImpactFlash(float distance, Angle angle) - { - if (_impactFlash == null) - { - return null; - } - - var message = new EffectSystemMessage - { - EffectSprite = _impactFlash, - Born = _startTime, - DeathTime = _deathTime, - Coordinates = _entMan.GetComponent(Owner).Coordinates.Offset(angle.ToVec() * distance), - //Rotated from east facing - Rotation = (float) angle.FlipPositive(), - Color = Vector4.Multiply(new Vector4(255, 255, 255, 750), ColorModifier), - ColorDelta = new Vector4(0, 0, 0, -1500f), - Shaded = false - }; - - return message; - } - } -} diff --git a/Content.Server/Projectiles/SharedProjectileSystem.cs b/Content.Server/Projectiles/SharedProjectileSystem.cs index 22d205c064..3d9bd47922 100644 --- a/Content.Server/Projectiles/SharedProjectileSystem.cs +++ b/Content.Server/Projectiles/SharedProjectileSystem.cs @@ -14,6 +14,7 @@ using Robust.Shared.Audio; using Robust.Shared.Physics.Dynamics; using Robust.Shared.Player; using Robust.Shared.Prototypes; +using GunSystem = Content.Server.Weapon.Ranged.Systems.GunSystem; namespace Content.Server.Projectiles { @@ -51,7 +52,7 @@ namespace Content.Server.Projectiles $"Projectile {ToPrettyString(component.Owner):projectile} shot by {ToPrettyString(component.Shooter):user} hit {ToPrettyString(otherEntity):target} and dealt {modifiedDamage.Total:damage} damage"); } - _guns.PlaySound(otherEntity, modifiedDamage, component.SoundHit, component.ForceSound); + _guns.PlayImpactSound(otherEntity, modifiedDamage, component.SoundHit, component.ForceSound); // Damaging it can delete it if (HasComp(otherEntity)) diff --git a/Content.Server/Tools/ToolSystem.MultipleTool.cs b/Content.Server/Tools/ToolSystem.MultipleTool.cs index c469ca9e35..1ae571093c 100644 --- a/Content.Server/Tools/ToolSystem.MultipleTool.cs +++ b/Content.Server/Tools/ToolSystem.MultipleTool.cs @@ -64,7 +64,7 @@ namespace Content.Server.Tools return; // Sprite is optional. - Resolve(uid, ref sprite); + Resolve(uid, ref sprite, false); if (multiple.Entries.Length == 0) { diff --git a/Content.Server/Weapon/Ranged/Ammunition/Components/AmmoBoxComponent.cs b/Content.Server/Weapon/Ranged/Ammunition/Components/AmmoBoxComponent.cs deleted file mode 100644 index b4cecd5f82..0000000000 --- a/Content.Server/Weapon/Ranged/Ammunition/Components/AmmoBoxComponent.cs +++ /dev/null @@ -1,49 +0,0 @@ -using Robust.Shared.Containers; -using Robust.Shared.Prototypes; -using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype; - -namespace Content.Server.Weapon.Ranged.Ammunition.Components -{ - /// - /// Stores ammo and can quickly transfer ammo into a magazine. - /// - [RegisterComponent] - [Friend(typeof(GunSystem))] - public sealed class AmmoBoxComponent : Component - { - [DataField("caliber")] - public BallisticCaliber Caliber = BallisticCaliber.Unspecified; - - [DataField("capacity")] - public int Capacity - { - get => _capacity; - set - { - _capacity = value; - SpawnedAmmo = new Stack(value); - } - } - - private int _capacity = 30; - - public int AmmoLeft => SpawnedAmmo.Count + UnspawnedCount; - public Stack SpawnedAmmo = new(); - - /// - /// Container that holds any instantiated ammo. - /// - public Container AmmoContainer = default!; - - /// - /// How many more deferred entities can be spawned. We defer these to avoid instantiating the entities until needed for performance reasons. - /// - public int UnspawnedCount; - - /// - /// The prototype of the ammo to be retrieved when getting ammo. - /// - [DataField("fillPrototype", customTypeSerializer:typeof(PrototypeIdSerializer))] - public string? FillPrototype; - } -} diff --git a/Content.Server/Weapon/Ranged/Ammunition/Components/AmmoComponent.cs b/Content.Server/Weapon/Ranged/Ammunition/Components/AmmoComponent.cs deleted file mode 100644 index ebe0b62ce2..0000000000 --- a/Content.Server/Weapon/Ranged/Ammunition/Components/AmmoComponent.cs +++ /dev/null @@ -1,113 +0,0 @@ -using Content.Shared.Sound; -using Robust.Shared.Prototypes; -using Robust.Shared.Serialization; -using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype; -using Robust.Shared.Utility; - -namespace Content.Server.Weapon.Ranged.Ammunition.Components -{ - /// - /// Allows this entity to be loaded into a ranged weapon (if the caliber matches) - /// Generally used for bullets but can be used for other things like bananas - /// - [RegisterComponent] - [Friend(typeof(GunSystem))] - public sealed class AmmoComponent : Component, ISerializationHooks - { - [DataField("caliber")] - public BallisticCaliber Caliber { get; } = BallisticCaliber.Unspecified; - - public bool Spent - { - get - { - if (AmmoIsProjectile) - { - return false; - } - - return _spent; - } - set => _spent = value; - } - - private bool _spent; - - // TODO: Make it so null projectile = dis - /// - /// Used for anything without a case that fires itself - /// - [DataField("isProjectile")] public bool AmmoIsProjectile; - - /// - /// Used for something that is deleted when the projectile is retrieved - /// - [DataField("caseless")] - public bool Caseless { get; } - - // Rather than managing bullet / case state seemed easier to just have 2 toggles - // ammoIsProjectile being for a beanbag for example and caseless being for ClRifle rounds - - /// - /// For shotguns where they might shoot multiple entities - /// - [DataField("projectilesFired")] - public int ProjectilesFired { get; } = 1; - - [DataField("projectile", customTypeSerializer: typeof(PrototypeIdSerializer))] - public string? ProjectileId; - - // How far apart each entity is if multiple are shot - [DataField("ammoSpread")] - public float EvenSpreadAngle { get; } = default; - - /// - /// How fast the shot entities travel - /// - [DataField("ammoVelocity")] - public float Velocity { get; } = 20f; - - [DataField("muzzleFlash")] - public ResourcePath? MuzzleFlashSprite = new("Objects/Weapons/Guns/Projectiles/bullet_muzzle.png"); - - [DataField("soundCollectionEject")] - public SoundSpecifier SoundCollectionEject { get; } = new SoundCollectionSpecifier("CasingEject"); - - void ISerializationHooks.AfterDeserialization() - { - // Being both caseless and shooting yourself doesn't make sense - DebugTools.Assert(!(AmmoIsProjectile && Caseless)); - - if (ProjectilesFired < 1) - { - Logger.Error("Ammo can't have less than 1 projectile"); - } - - if (EvenSpreadAngle > 0 && ProjectilesFired == 1) - { - Logger.Error("Can't have an even spread if only 1 projectile is fired"); - throw new InvalidOperationException(); - } - } - } - - public enum BallisticCaliber - { - Unspecified = 0, - A357, // Placeholder? - ClRifle, - SRifle, - Pistol, - A35, // Placeholder? - LRifle, - HRifle, - Magnum, - AntiMaterial, - Shotgun, - Cap, - Rocket, - Dart, // Placeholder - Grenade, - Energy, - } -} diff --git a/Content.Server/Weapon/Ranged/Ammunition/Components/AmmoComponentData.cs b/Content.Server/Weapon/Ranged/Ammunition/Components/AmmoComponentData.cs deleted file mode 100644 index ebe5a62a59..0000000000 --- a/Content.Server/Weapon/Ranged/Ammunition/Components/AmmoComponentData.cs +++ /dev/null @@ -1,8 +0,0 @@ -using Robust.Shared.Serialization; - -namespace Content.Server.Weapon.Ranged.Ammunition.Components -{ - public sealed partial class AmmoComponentData : ISerializationHooks - { - } -} diff --git a/Content.Server/Weapon/Ranged/Ammunition/Components/RangedMagazineComponent.cs b/Content.Server/Weapon/Ranged/Ammunition/Components/RangedMagazineComponent.cs deleted file mode 100644 index a6f33617b1..0000000000 --- a/Content.Server/Weapon/Ranged/Ammunition/Components/RangedMagazineComponent.cs +++ /dev/null @@ -1,34 +0,0 @@ -using Content.Server.Weapon.Ranged.Barrels.Components; -using Robust.Shared.Containers; -using Robust.Shared.Prototypes; -using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype; - -namespace Content.Server.Weapon.Ranged.Ammunition.Components -{ - [RegisterComponent] - public sealed class RangedMagazineComponent : Component - { - public readonly Stack SpawnedAmmo = new(); - public Container AmmoContainer = default!; - - public int ShotsLeft => SpawnedAmmo.Count + UnspawnedCount; - public int Capacity => _capacity; - [DataField("capacity")] - private int _capacity = 20; - - public MagazineType MagazineType => _magazineType; - [DataField("magazineType")] - private MagazineType _magazineType = MagazineType.Unspecified; - public BallisticCaliber Caliber => _caliber; - [DataField("caliber")] - private BallisticCaliber _caliber = BallisticCaliber.Unspecified; - - // If there's anything already in the magazine - [DataField("fillPrototype", customTypeSerializer:typeof(PrototypeIdSerializer))] - public string? FillPrototype; - - // By default the magazine won't spawn the entity until needed so we need to keep track of how many left we can spawn - // Generally you probablt don't want to use this - public int UnspawnedCount; - } -} diff --git a/Content.Server/Weapon/Ranged/Ammunition/Components/SpeedLoaderComponent.cs b/Content.Server/Weapon/Ranged/Ammunition/Components/SpeedLoaderComponent.cs deleted file mode 100644 index 3d9222abe0..0000000000 --- a/Content.Server/Weapon/Ranged/Ammunition/Components/SpeedLoaderComponent.cs +++ /dev/null @@ -1,27 +0,0 @@ -using Robust.Shared.Containers; -using Robust.Shared.Prototypes; -using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype; - -namespace Content.Server.Weapon.Ranged.Ammunition.Components -{ - /// - /// Used to load certain ranged weapons quickly - /// - [RegisterComponent] - public sealed class SpeedLoaderComponent : Component - { - [DataField("caliber")] public BallisticCaliber Caliber = BallisticCaliber.Unspecified; - public int Capacity => _capacity; - [DataField("capacity")] - private int _capacity = 6; - - public Container AmmoContainer = default!; - public Stack SpawnedAmmo = new(); - public int UnspawnedCount; - - public int AmmoLeft => SpawnedAmmo.Count + UnspawnedCount; - - [DataField("fillPrototype", customTypeSerializer:typeof(PrototypeIdSerializer))] - public string? FillPrototype; - } -} diff --git a/Content.Server/Weapon/Ranged/Barrels/Components/BatteryBarrelComponent.cs b/Content.Server/Weapon/Ranged/Barrels/Components/BatteryBarrelComponent.cs deleted file mode 100644 index ad36a606fd..0000000000 --- a/Content.Server/Weapon/Ranged/Barrels/Components/BatteryBarrelComponent.cs +++ /dev/null @@ -1,55 +0,0 @@ -using Content.Server.PowerCell; -using Robust.Shared.Containers; -using Robust.Shared.GameStates; -using Robust.Shared.Prototypes; -using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype; - -namespace Content.Server.Weapon.Ranged.Barrels.Components -{ - [RegisterComponent, NetworkedComponent, ComponentReference(typeof(ServerRangedBarrelComponent))] - public sealed class BatteryBarrelComponent : ServerRangedBarrelComponent - { - // The minimum change we need before we can fire - [DataField("lowerChargeLimit")] - [ViewVariables] - public float LowerChargeLimit = 10; - - [DataField("fireCost")] - [ViewVariables] - public int BaseFireCost = 300; - - // What gets fired - [DataField("ammoPrototype", customTypeSerializer:typeof(PrototypeIdSerializer))] - [ViewVariables] - public string? AmmoPrototype; - - public ContainerSlot AmmoContainer = default!; - - public override int ShotsLeft - { - get - { - - if (!EntitySystem.Get().TryGetBatteryFromSlot(Owner, out var battery)) - { - return 0; - } - - return (int) Math.Ceiling(battery.CurrentCharge / BaseFireCost); - } - } - - public override int Capacity - { - get - { - if (!EntitySystem.Get().TryGetBatteryFromSlot(Owner, out var battery)) - { - return 0; - } - - return (int) Math.Ceiling(battery.MaxCharge / BaseFireCost); - } - } - } -} diff --git a/Content.Server/Weapon/Ranged/Barrels/Components/BoltActionBarrelComponent.cs b/Content.Server/Weapon/Ranged/Barrels/Components/BoltActionBarrelComponent.cs deleted file mode 100644 index 5a2f231af3..0000000000 --- a/Content.Server/Weapon/Ranged/Barrels/Components/BoltActionBarrelComponent.cs +++ /dev/null @@ -1,89 +0,0 @@ -using Content.Server.Weapon.Ranged.Ammunition.Components; -using Content.Shared.Sound; -using Robust.Shared.Audio; -using Robust.Shared.Containers; -using Robust.Shared.GameStates; -using Robust.Shared.Player; -using Robust.Shared.Prototypes; -using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype; - -namespace Content.Server.Weapon.Ranged.Barrels.Components -{ - /// - /// Shotguns mostly - /// - [RegisterComponent, NetworkedComponent, ComponentReference(typeof(ServerRangedBarrelComponent))] - public sealed class BoltActionBarrelComponent : ServerRangedBarrelComponent - { - // Originally I had this logic shared with PumpBarrel and used a couple of variables to control things - // but it felt a lot messier to play around with, especially when adding verbs - - public override int ShotsLeft - { - get - { - var chamberCount = ChamberContainer.ContainedEntity != null ? 1 : 0; - return chamberCount + SpawnedAmmo.Count + UnspawnedCount; - } - } - public override int Capacity => _capacity; - - [DataField("capacity")] - internal int _capacity = 6; - - public ContainerSlot ChamberContainer = default!; - public Stack SpawnedAmmo = default!; - public Container AmmoContainer = default!; - - [ViewVariables] - [DataField("caliber")] - public BallisticCaliber Caliber = BallisticCaliber.Unspecified; - - [ViewVariables] - [DataField("fillPrototype", customTypeSerializer:typeof(PrototypeIdSerializer))] - public string? FillPrototype; - - [ViewVariables] - public int UnspawnedCount; - - public bool BoltOpen - { - get => _boltOpen; - set - { - if (_boltOpen == value) - { - return; - } - - var gunSystem = EntitySystem.Get(); - - if (value) - { - gunSystem.TryEjectChamber(this); - SoundSystem.Play(Filter.Pvs(Owner), _soundBoltOpen.GetSound(), Owner, AudioParams.Default.WithVolume(-2)); - } - else - { - gunSystem.TryFeedChamber(this); - SoundSystem.Play(Filter.Pvs(Owner), _soundBoltClosed.GetSound(), Owner, AudioParams.Default.WithVolume(-2)); - } - - _boltOpen = value; - gunSystem.UpdateBoltAppearance(this); - Dirty(); - } - } - private bool _boltOpen; - - [DataField("autoCycle")] public bool AutoCycle; - - // Sounds - [DataField("soundCycle")] public SoundSpecifier SoundCycle = new SoundPathSpecifier("/Audio/Weapons/Guns/Cock/sf_rifle_cock.ogg"); - [DataField("soundBoltOpen")] - private SoundSpecifier _soundBoltOpen = new SoundPathSpecifier("/Audio/Weapons/Guns/Bolt/rifle_bolt_open.ogg"); - [DataField("soundBoltClosed")] - private SoundSpecifier _soundBoltClosed = new SoundPathSpecifier("/Audio/Weapons/Guns/Bolt/rifle_bolt_closed.ogg"); - [DataField("soundInsert")] public SoundSpecifier SoundInsert = new SoundPathSpecifier("/Audio/Weapons/Guns/MagIn/bullet_insert.ogg"); - } -} diff --git a/Content.Server/Weapon/Ranged/Barrels/Components/MagazineBarrelComponent.cs b/Content.Server/Weapon/Ranged/Barrels/Components/MagazineBarrelComponent.cs deleted file mode 100644 index 0b2e7b4fe5..0000000000 --- a/Content.Server/Weapon/Ranged/Barrels/Components/MagazineBarrelComponent.cs +++ /dev/null @@ -1,131 +0,0 @@ -using Content.Server.Weapon.Ranged.Ammunition.Components; -using Content.Shared.Sound; -using Robust.Shared.Audio; -using Robust.Shared.Containers; -using Robust.Shared.GameStates; -using Robust.Shared.Player; -using Robust.Shared.Prototypes; -using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype; - -namespace Content.Server.Weapon.Ranged.Barrels.Components -{ - [RegisterComponent, NetworkedComponent, ComponentReference(typeof(ServerRangedBarrelComponent))] - public sealed class MagazineBarrelComponent : ServerRangedBarrelComponent - { - [Dependency] private readonly IEntityManager _entities = default!; - - [ViewVariables] public ContainerSlot ChamberContainer = default!; - [ViewVariables] public bool HasMagazine => MagazineContainer.ContainedEntity != null; - public ContainerSlot MagazineContainer = default!; - - [ViewVariables] public MagazineType MagazineTypes => _magazineTypes; - [DataField("magazineTypes")] - private MagazineType _magazineTypes = default; - [ViewVariables] public BallisticCaliber Caliber => _caliber; - [DataField("caliber")] - private BallisticCaliber _caliber = BallisticCaliber.Unspecified; - - public override int ShotsLeft - { - get - { - var count = 0; - if (ChamberContainer.ContainedEntity != null) - { - count++; - } - - if (MagazineContainer.ContainedEntity is {Valid: true} magazine) - { - count += _entities.GetComponent(magazine).ShotsLeft; - } - - return count; - } - } - - public override int Capacity - { - get - { - // Chamber - var count = 1; - if (MagazineContainer.ContainedEntity is {Valid: true} magazine) - { - count += _entities.GetComponent(magazine).Capacity; - } - - return count; - } - } - - [DataField("magFillPrototype", customTypeSerializer:typeof(PrototypeIdSerializer))] - public string? MagFillPrototype; - - public bool BoltOpen - { - get => _boltOpen; - set - { - if (_boltOpen == value) - { - return; - } - - var gunSystem = EntitySystem.Get(); - - if (value) - { - gunSystem.TryEjectChamber(this); - SoundSystem.Play(Filter.Pvs(Owner), SoundBoltOpen.GetSound(), Owner, AudioParams.Default.WithVolume(-2)); - } - else - { - gunSystem.TryFeedChamber(this); - SoundSystem.Play(Filter.Pvs(Owner), SoundBoltClosed.GetSound(), Owner, AudioParams.Default.WithVolume(-2)); - } - - _boltOpen = value; - gunSystem.UpdateMagazineAppearance(this); - Dirty(_entities); - } - } - private bool _boltOpen = true; - - [DataField("autoEjectMag")] public bool AutoEjectMag; - // If the bolt needs to be open before we can insert / remove the mag (i.e. for LMGs) - public bool MagNeedsOpenBolt => _magNeedsOpenBolt; - [DataField("magNeedsOpenBolt")] - private bool _magNeedsOpenBolt = default; - - // Sounds - [DataField("soundBoltOpen", required: true)] - public SoundSpecifier SoundBoltOpen = default!; - [DataField("soundBoltClosed", required: true)] - public SoundSpecifier SoundBoltClosed = default!; - [DataField("soundRack", required: true)] - public SoundSpecifier SoundRack = default!; - [DataField("soundMagInsert", required: true)] - public SoundSpecifier SoundMagInsert = default!; - [DataField("soundMagEject", required: true)] - public SoundSpecifier SoundMagEject = default!; - [DataField("soundAutoEject")] public SoundSpecifier SoundAutoEject = new SoundPathSpecifier("/Audio/Weapons/Guns/EmptyAlarm/smg_empty_alarm.ogg"); - } - - [Flags] - public enum MagazineType - { - Unspecified = 0, - LPistol = 1 << 0, // Placeholder? - Pistol = 1 << 1, - HCPistol = 1 << 2, - Smg = 1 << 3, - SmgTopMounted = 1 << 4, - Rifle = 1 << 5, - IH = 1 << 6, // Placeholder? - Box = 1 << 7, - Pan = 1 << 8, - Dart = 1 << 9, // Placeholder - CalicoTopMounted = 1 << 10, - } -} diff --git a/Content.Server/Weapon/Ranged/Barrels/Components/PumpBarrelComponent.cs b/Content.Server/Weapon/Ranged/Barrels/Components/PumpBarrelComponent.cs deleted file mode 100644 index c721828257..0000000000 --- a/Content.Server/Weapon/Ranged/Barrels/Components/PumpBarrelComponent.cs +++ /dev/null @@ -1,57 +0,0 @@ -using Content.Server.Weapon.Ranged.Ammunition.Components; -using Content.Shared.Sound; -using Robust.Shared.Containers; -using Robust.Shared.GameStates; -using Robust.Shared.Prototypes; -using Robust.Shared.Serialization; -using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype; - -namespace Content.Server.Weapon.Ranged.Barrels.Components -{ - /// - /// Bolt-action rifles - /// - [RegisterComponent, NetworkedComponent, ComponentReference(typeof(ServerRangedBarrelComponent))] - public sealed class PumpBarrelComponent : ServerRangedBarrelComponent, ISerializationHooks - { - public override int ShotsLeft - { - get - { - var chamberCount = ChamberContainer.ContainedEntity != null ? 1 : 0; - return chamberCount + SpawnedAmmo.Count + UnspawnedCount; - } - } - - private const int DefaultCapacity = 6; - [DataField("capacity")] - public override int Capacity { get; } = DefaultCapacity; - - // Even a point having a chamber? I guess it makes some of the below code cleaner - public ContainerSlot ChamberContainer = default!; - public Stack SpawnedAmmo = new(DefaultCapacity - 1); - public Container AmmoContainer = default!; - - [ViewVariables] - [DataField("caliber")] - public BallisticCaliber Caliber = BallisticCaliber.Unspecified; - - [ViewVariables] - [DataField("fillPrototype", customTypeSerializer:typeof(PrototypeIdSerializer))] - public string? FillPrototype; - - [ViewVariables] public int UnspawnedCount; - - [DataField("manualCycle")] public bool ManualCycle = true; - - // Sounds - [DataField("soundCycle")] public SoundSpecifier SoundCycle = new SoundPathSpecifier("/Audio/Weapons/Guns/Cock/sf_rifle_cock.ogg"); - - [DataField("soundInsert")] public SoundSpecifier SoundInsert = new SoundPathSpecifier("/Audio/Weapons/Guns/MagIn/bullet_insert.ogg"); - - void ISerializationHooks.AfterDeserialization() - { - SpawnedAmmo = new Stack(Capacity - 1); - } - } -} diff --git a/Content.Server/Weapon/Ranged/Barrels/Components/RevolverBarrelComponent.cs b/Content.Server/Weapon/Ranged/Barrels/Components/RevolverBarrelComponent.cs deleted file mode 100644 index 4d21fb1211..0000000000 --- a/Content.Server/Weapon/Ranged/Barrels/Components/RevolverBarrelComponent.cs +++ /dev/null @@ -1,60 +0,0 @@ -using Content.Server.Weapon.Ranged.Ammunition.Components; -using Content.Shared.Sound; -using Robust.Shared.Containers; -using Robust.Shared.GameStates; -using Robust.Shared.Prototypes; -using Robust.Shared.Serialization; -using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype; - -namespace Content.Server.Weapon.Ranged.Barrels.Components -{ - [RegisterComponent, NetworkedComponent, ComponentReference(typeof(ServerRangedBarrelComponent))] - public sealed class RevolverBarrelComponent : ServerRangedBarrelComponent, ISerializationHooks - { - [ViewVariables] - [DataField("caliber")] - public BallisticCaliber Caliber = BallisticCaliber.Unspecified; - - public Container AmmoContainer = default!; - - [ViewVariables] - public int CurrentSlot; - - public override int Capacity => AmmoSlots.Length; - - [DataField("capacity")] - private int _serializedCapacity = 6; - - [DataField("ammoSlots", readOnly: true)] - public EntityUid?[] AmmoSlots = Array.Empty(); - - public override int ShotsLeft => AmmoContainer.ContainedEntities.Count; - - [ViewVariables] - [DataField("fillPrototype", customTypeSerializer:typeof(PrototypeIdSerializer))] - public string? FillPrototype; - - [ViewVariables] - public int UnspawnedCount; - - // Sounds - [DataField("soundEject")] - public SoundSpecifier SoundEject = new SoundPathSpecifier("/Audio/Weapons/Guns/MagOut/revolver_magout.ogg"); - - [DataField("soundInsert")] - public SoundSpecifier SoundInsert = new SoundPathSpecifier("/Audio/Weapons/Guns/MagIn/revolver_magin.ogg"); - - [DataField("soundSpin")] - public SoundSpecifier SoundSpin = new SoundPathSpecifier("/Audio/Weapons/Guns/Misc/revolver_spin.ogg"); - - void ISerializationHooks.BeforeSerialization() - { - _serializedCapacity = AmmoSlots.Length; - } - - void ISerializationHooks.AfterDeserialization() - { - AmmoSlots = new EntityUid?[_serializedCapacity]; - } - } -} diff --git a/Content.Server/Weapon/Ranged/Barrels/Components/ServerRangedBarrelComponent.cs b/Content.Server/Weapon/Ranged/Barrels/Components/ServerRangedBarrelComponent.cs deleted file mode 100644 index 85819f8db1..0000000000 --- a/Content.Server/Weapon/Ranged/Barrels/Components/ServerRangedBarrelComponent.cs +++ /dev/null @@ -1,136 +0,0 @@ -using Content.Shared.Sound; -using Content.Shared.Weapons.Ranged.Components; -using Robust.Shared.Serialization; - -namespace Content.Server.Weapon.Ranged.Barrels.Components -{ - /// - /// All of the ranged weapon components inherit from this to share mechanics like shooting etc. - /// Only difference between them is how they retrieve a projectile to shoot (battery, magazine, etc.) - /// - [Friend(typeof(GunSystem))] - public abstract class ServerRangedBarrelComponent : SharedRangedBarrelComponent, ISerializationHooks - { - public override FireRateSelector FireRateSelector => _fireRateSelector; - - [DataField("currentSelector")] - private FireRateSelector _fireRateSelector = FireRateSelector.Safety; - - public override FireRateSelector AllRateSelectors => _fireRateSelector; - - [DataField("fireRate")] - public override float FireRate { get; } = 2f; - - // _lastFire is when we actually fired (so if we hold the button then recoil doesn't build up if we're not firing) - public TimeSpan LastFire; - - // Recoil / spray control - [DataField("minAngle")] - private float _minAngleDegrees; - - public Angle MinAngle { get; private set; } - - [DataField("maxAngle")] - private float _maxAngleDegrees = 45; - - public Angle MaxAngle { get; private set; } - - public Angle CurrentAngle = Angle.Zero; - - [DataField("angleDecay")] - private float _angleDecayDegrees = 20; - - /// - /// How slowly the angle's theta decays per second in radians - /// - public float AngleDecay { get; private set; } - - [DataField("angleIncrease")] - private float? _angleIncreaseDegrees; - - /// - /// How quickly the angle's theta builds for every shot fired in radians - /// - public float AngleIncrease { get; private set; } - - // Multiplies the ammo spread to get the final spread of each pellet - [DataField("ammoSpreadRatio")] - public float SpreadRatio { get; private set; } - - [DataField("canMuzzleFlash")] - public bool CanMuzzleFlash { get; } = true; - - // Sounds - [DataField("soundGunshot", required: true)] - public SoundSpecifier SoundGunshot { get; set; } = default!; - - [DataField("soundEmpty")] - public SoundSpecifier SoundEmpty { get; } = new SoundPathSpecifier("/Audio/Weapons/Guns/Empty/empty.ogg"); - - void ISerializationHooks.BeforeSerialization() - { - _minAngleDegrees = (float) (MinAngle.Degrees * 2); - _maxAngleDegrees = (float) (MaxAngle.Degrees * 2); - _angleIncreaseDegrees = MathF.Round(AngleIncrease / ((float) Math.PI / 180f), 2); - AngleDecay = MathF.Round(AngleDecay / ((float) Math.PI / 180f), 2); - } - - void ISerializationHooks.AfterDeserialization() - { - // This hard-to-read area's dealing with recoil - // Use degrees in yaml as it's easier to read compared to "0.0125f" - MinAngle = Angle.FromDegrees(_minAngleDegrees / 2f); - - // Random doubles it as it's +/- so uhh we'll just half it here for readability - MaxAngle = Angle.FromDegrees(_maxAngleDegrees / 2f); - - _angleIncreaseDegrees ??= 40 / FireRate; - AngleIncrease = _angleIncreaseDegrees.Value * (float) Math.PI / 180f; - - AngleDecay = _angleDecayDegrees * (float) Math.PI / 180f; - - // For simplicity we'll enforce it this way; ammo determines max spread - if (SpreadRatio > 1.0f) - { - Logger.Error("SpreadRatio must be <= 1.0f for guns"); - throw new InvalidOperationException(); - } - } - } - - /// - /// Raised on a gun when it fires projectiles. - /// - public sealed class GunShotEvent : EntityEventArgs - { - /// - /// Uid of the entity that shot. - /// - public EntityUid Uid; - - public readonly EntityUid[] FiredProjectiles; - - public GunShotEvent(EntityUid[] firedProjectiles) - { - FiredProjectiles = firedProjectiles; - } - } - - /// - /// Raised on ammo when it is fired. - /// - public sealed class AmmoShotEvent : EntityEventArgs - { - /// - /// Uid of the entity that shot. - /// - public EntityUid Uid; - - public readonly EntityUid[] FiredProjectiles; - - public AmmoShotEvent(EntityUid[] firedProjectiles) - { - FiredProjectiles = firedProjectiles; - } - } -} diff --git a/Content.Server/Weapon/Ranged/Components/AmmoCounterComponent.cs b/Content.Server/Weapon/Ranged/Components/AmmoCounterComponent.cs new file mode 100644 index 0000000000..8d38896abc --- /dev/null +++ b/Content.Server/Weapon/Ranged/Components/AmmoCounterComponent.cs @@ -0,0 +1,6 @@ +using Content.Shared.Weapons.Ranged.Components; + +namespace Content.Server.Weapon.Ranged.Components; + +[RegisterComponent] +public sealed class AmmoCounterComponent : SharedAmmoCounterComponent {} diff --git a/Content.Server/Weapon/Ranged/Ammunition/Components/ChemicalAmmoComponent.cs b/Content.Server/Weapon/Ranged/Components/ChemicalAmmoComponent.cs similarity index 81% rename from Content.Server/Weapon/Ranged/Ammunition/Components/ChemicalAmmoComponent.cs rename to Content.Server/Weapon/Ranged/Components/ChemicalAmmoComponent.cs index 11d5c7540a..ce81de0a43 100644 --- a/Content.Server/Weapon/Ranged/Ammunition/Components/ChemicalAmmoComponent.cs +++ b/Content.Server/Weapon/Ranged/Components/ChemicalAmmoComponent.cs @@ -1,4 +1,4 @@ -namespace Content.Server.Weapon.Ranged.Ammunition.Components +namespace Content.Server.Weapon.Ranged.Components { [RegisterComponent] public sealed class ChemicalAmmoComponent : Component diff --git a/Content.Server/Weapon/Ranged/RangedDamageSoundComponent.cs b/Content.Server/Weapon/Ranged/Components/RangedDamageSoundComponent.cs similarity index 95% rename from Content.Server/Weapon/Ranged/RangedDamageSoundComponent.cs rename to Content.Server/Weapon/Ranged/Components/RangedDamageSoundComponent.cs index 39303a5210..bb5fc27fbf 100644 --- a/Content.Server/Weapon/Ranged/RangedDamageSoundComponent.cs +++ b/Content.Server/Weapon/Ranged/Components/RangedDamageSoundComponent.cs @@ -2,7 +2,7 @@ using Content.Shared.Damage.Prototypes; using Content.Shared.Sound; using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.Dictionary; -namespace Content.Server.Weapon.Ranged; +namespace Content.Server.Weapon.Ranged.Components; /// /// Plays the specified sound upon receiving damage of that type. diff --git a/Content.Server/Weapon/Ranged/FlyBySoundSystem.cs b/Content.Server/Weapon/Ranged/FlyBySoundSystem.cs deleted file mode 100644 index 79e425e2e4..0000000000 --- a/Content.Server/Weapon/Ranged/FlyBySoundSystem.cs +++ /dev/null @@ -1,5 +0,0 @@ -using Content.Shared.Weapons.Ranged; - -namespace Content.Server.Weapon.Ranged; - -public sealed class FlyBySoundSystem : SharedFlyBySoundSystem {} diff --git a/Content.Server/Weapon/Ranged/GunSystem.Ammo.cs b/Content.Server/Weapon/Ranged/GunSystem.Ammo.cs deleted file mode 100644 index cd714b9de5..0000000000 --- a/Content.Server/Weapon/Ranged/GunSystem.Ammo.cs +++ /dev/null @@ -1,91 +0,0 @@ -using Content.Server.Weapon.Ranged.Ammunition.Components; -using Content.Shared.Examine; -using Content.Shared.Weapons.Ranged.Barrels.Components; -using Robust.Shared.Map; - -namespace Content.Server.Weapon.Ranged; - -public sealed partial class GunSystem -{ - private void OnAmmoExamine(EntityUid uid, AmmoComponent component, ExaminedEvent args) - { - var text = Loc.GetString("ammo-component-on-examine",("caliber", component.Caliber)); - args.PushMarkup(text); - } - - public EntityUid? TakeBullet(AmmoComponent component, EntityCoordinates spawnAt) - { - if (component.AmmoIsProjectile) - { - return component.Owner; - } - - if (component.Spent) - { - return null; - } - - component.Spent = true; - - if (TryComp(component.Owner, out AppearanceComponent? appearanceComponent)) - { - appearanceComponent.SetData(AmmoVisuals.Spent, true); - } - - var entity = EntityManager.SpawnEntity(component.ProjectileId, spawnAt); - - return entity; - } - - public void MuzzleFlash(EntityUid entity, AmmoComponent component, Angle angle) - { - if (component.MuzzleFlashSprite == null) - { - return; - } - - var time = _gameTiming.CurTime; - var deathTime = time + TimeSpan.FromMilliseconds(200); - // Offset the sprite so it actually looks like it's coming from the gun - var offset = new Vector2(0.0f, -0.5f); - - var message = new EffectSystemMessage - { - EffectSprite = component.MuzzleFlashSprite.ToString(), - Born = time, - DeathTime = deathTime, - AttachedEntityUid = entity, - AttachedOffset = offset, - //Rotated from east facing - Rotation = -MathF.PI / 2f, - Color = Vector4.Multiply(new Vector4(255, 255, 255, 255), 1.0f), - ColorDelta = new Vector4(0, 0, 0, -1500f), - Shaded = false - }; - - /* TODO: Fix rotation when shooting sideways. This was the closest I got but still had issues. - * var time = _gameTiming.CurTime; - var deathTime = time + TimeSpan.FromMilliseconds(200); - var entityRotation = EntityManager.GetComponent(entity).WorldRotation; - var localAngle = entityRotation - (angle + MathF.PI / 2f); - // Offset the sprite so it actually looks like it's coming from the gun - var offset = localAngle.RotateVec(new Vector2(0.0f, -0.5f)); - - var message = new EffectSystemMessage - { - EffectSprite = component.MuzzleFlashSprite.ToString(), - Born = time, - DeathTime = deathTime, - AttachedEntityUid = entity, - AttachedOffset = offset, - //Rotated from east facing - Rotation = (float) (localAngle - MathF.PI / 2), - Color = Vector4.Multiply(new Vector4(255, 255, 255, 255), 1.0f), - ColorDelta = new Vector4(0, 0, 0, -1500f), - Shaded = false - }; - */ - - _effects.CreateParticle(message); - } -} diff --git a/Content.Server/Weapon/Ranged/GunSystem.AmmoBox.cs b/Content.Server/Weapon/Ranged/GunSystem.AmmoBox.cs deleted file mode 100644 index 4e1125205a..0000000000 --- a/Content.Server/Weapon/Ranged/GunSystem.AmmoBox.cs +++ /dev/null @@ -1,206 +0,0 @@ -using Content.Server.Hands.Components; -using Content.Server.Weapon.Ranged.Ammunition.Components; -using Content.Shared.Examine; -using Content.Shared.Interaction; -using Content.Shared.Interaction.Events; -using Content.Shared.Verbs; -using Content.Shared.Weapons.Ranged.Barrels.Components; -using Robust.Shared.Containers; -using Robust.Shared.Player; - -namespace Content.Server.Weapon.Ranged; - -public sealed partial class GunSystem -{ - // Probably needs combining with magazines in future given the common functionality. - - private void OnAmmoBoxAltVerbs(EntityUid uid, AmmoBoxComponent component, GetVerbsEvent args) - { - if (args.Hands == null || !args.CanAccess || !args.CanInteract) - return; - - if (component.AmmoLeft == 0) - return; - - AlternativeVerb verb = new() - { - Text = Loc.GetString("dump-vert-get-data-text"), - IconTexture = "/Textures/Interface/VerbIcons/eject.svg.192dpi.png", - Act = () => AmmoBoxEjectContents(component, 10) - }; - args.Verbs.Add(verb); - } - - private void OnAmmoBoxInteractHand(EntityUid uid, AmmoBoxComponent component, InteractHandEvent args) - { - if (args.Handled) return; - - TryUse(args.User, component); - } - - private void OnAmmoBoxUse(EntityUid uid, AmmoBoxComponent component, UseInHandEvent args) - { - if (args.Handled) return; - - TryUse(args.User, component); - } - - private void OnAmmoBoxInteractUsing(EntityUid uid, AmmoBoxComponent component, InteractUsingEvent args) - { - if (args.Handled) return; - - if (TryComp(args.Used, out AmmoComponent? ammoComponent)) - { - if (TryInsertAmmo(args.User, args.Used, component, ammoComponent)) - { - args.Handled = true; - } - - return; - } - - if (!TryComp(args.Used, out RangedMagazineComponent? rangedMagazine)) return; - - for (var i = 0; i < Math.Max(10, rangedMagazine.ShotsLeft); i++) - { - if (TakeAmmo(rangedMagazine) is not {Valid: true} ammo) - { - continue; - } - - if (!TryInsertAmmo(args.User, ammo, component)) - { - TryInsertAmmo(args.User, ammo, rangedMagazine); - args.Handled = true; - return; - } - } - - args.Handled = true; - } - - private void OnAmmoBoxInit(EntityUid uid, AmmoBoxComponent component, ComponentInit args) - { - component.AmmoContainer = uid.EnsureContainer($"{component.Name}-container", out var existing); - - if (existing) - { - foreach (var entity in component.AmmoContainer.ContainedEntities) - { - component.UnspawnedCount--; - component.SpawnedAmmo.Push(entity); - component.AmmoContainer.Insert(entity); - } - } - } - - private void OnAmmoBoxExamine(EntityUid uid, AmmoBoxComponent component, ExaminedEvent args) - { - args.PushMarkup(Loc.GetString("ammo-box-component-on-examine-caliber-description", ("caliber", component.Caliber))); - args.PushMarkup(Loc.GetString("ammo-box-component-on-examine-remaining-ammo-description", ("ammoLeft", component.AmmoLeft),("capacity", component.Capacity))); - } - - private void OnAmmoBoxMapInit(EntityUid uid, AmmoBoxComponent component, MapInitEvent args) - { - component.UnspawnedCount += component.Capacity; - UpdateAmmoBoxAppearance(uid, component); - } - - private void UpdateAmmoBoxAppearance(EntityUid uid, AmmoBoxComponent ammoBox, AppearanceComponent? appearanceComponent = null) - { - if (!Resolve(uid, ref appearanceComponent, false)) return; - - appearanceComponent.SetData(MagazineBarrelVisuals.MagLoaded, true); - appearanceComponent.SetData(AmmoVisuals.AmmoCount, ammoBox.AmmoLeft); - appearanceComponent.SetData(AmmoVisuals.AmmoMax, ammoBox.Capacity); - } - - private void AmmoBoxEjectContents(AmmoBoxComponent ammoBox, int count) - { - var ejectCount = Math.Min(count, ammoBox.Capacity); - var ejectAmmo = new List(ejectCount); - - for (var i = 0; i < Math.Min(count, ammoBox.Capacity); i++) - { - if (TakeAmmo(ammoBox) is not { } ammo) - { - break; - } - - ejectAmmo.Add(ammo); - } - - EjectCasings(ejectAmmo); - UpdateAmmoBoxAppearance(ammoBox.Owner, ammoBox); - } - - private bool TryUse(EntityUid user, AmmoBoxComponent ammoBox) - { - if (!TryComp(user, out HandsComponent? handsComponent)) - { - return false; - } - - if (TakeAmmo(ammoBox) is not { } ammo) - { - return false; - } - - if (!_handsSystem.TryPickup(user, ammo, handsComp: handsComponent)) - { - TryInsertAmmo(user, ammo, ammoBox); - return false; - } - - UpdateAmmoBoxAppearance(ammoBox.Owner, ammoBox); - return true; - } - - public bool TryInsertAmmo(EntityUid user, EntityUid ammo, AmmoBoxComponent ammoBox, AmmoComponent? ammoComponent = null) - { - if (!Resolve(ammo, ref ammoComponent, false)) - { - return false; - } - - if (ammoComponent.Caliber != ammoBox.Caliber) - { - _popup.PopupEntity(Loc.GetString("ammo-box-component-try-insert-ammo-wrong-caliber"), ammo, Filter.Entities(user)); - return false; - } - - if (ammoBox.AmmoLeft >= ammoBox.Capacity) - { - _popup.PopupEntity(Loc.GetString("ammo-box-component-try-insert-ammo-no-room"), ammo, Filter.Entities(user)); - return false; - } - - ammoBox.SpawnedAmmo.Push(ammo); - ammoBox.AmmoContainer.Insert(ammo); - UpdateAmmoBoxAppearance(ammoBox.Owner, ammoBox); - return true; - } - - public EntityUid? TakeAmmo(AmmoBoxComponent ammoBox, TransformComponent? xform = null) - { - if (!Resolve(ammoBox.Owner, ref xform)) return null; - - if (ammoBox.SpawnedAmmo.TryPop(out var ammo)) - { - ammoBox.AmmoContainer.Remove(ammo); - return ammo; - } - - if (ammoBox.UnspawnedCount > 0) - { - ammo = EntityManager.SpawnEntity(ammoBox.FillPrototype, xform.Coordinates); - - // when dumping from held ammo box, this detaches the spawned ammo from the player. - EntityManager.GetComponent(ammo).AttachParentToContainerOrGrid(); - - ammoBox.UnspawnedCount--; - } - - return ammo; - } -} diff --git a/Content.Server/Weapon/Ranged/GunSystem.Battery.cs b/Content.Server/Weapon/Ranged/GunSystem.Battery.cs deleted file mode 100644 index 2604d8bec3..0000000000 --- a/Content.Server/Weapon/Ranged/GunSystem.Battery.cs +++ /dev/null @@ -1,106 +0,0 @@ -using Content.Server.Projectiles.Components; -using Content.Server.Weapon.Ranged.Barrels.Components; -using Content.Shared.PowerCell.Components; -using Content.Shared.Weapons.Ranged.Barrels.Components; -using Robust.Shared.Containers; -using Robust.Shared.Map; - -namespace Content.Server.Weapon.Ranged; - -public sealed partial class GunSystem -{ - private void OnBatteryInit(EntityUid uid, BatteryBarrelComponent component, ComponentInit args) - { - if (component.AmmoPrototype != null) - { - component.AmmoContainer = uid.EnsureContainer($"{component.GetType()}-ammo-container"); - } - - component.Dirty(EntityManager); - } - - private void OnBatteryMapInit(EntityUid uid, BatteryBarrelComponent component, MapInitEvent args) - { - UpdateBatteryAppearance(component); - } - - private void OnCellSlotUpdated(EntityUid uid, BatteryBarrelComponent component, PowerCellChangedEvent args) - { - UpdateBatteryAppearance(component); - } - - public void UpdateBatteryAppearance(BatteryBarrelComponent component) - { - if (!EntityManager.TryGetComponent(component.Owner, out AppearanceComponent? appearanceComponent)) return; - - appearanceComponent.SetData(MagazineBarrelVisuals.MagLoaded, _cell.TryGetBatteryFromSlot(component.Owner, out _)); - appearanceComponent.SetData(AmmoVisuals.AmmoCount, component.ShotsLeft); - appearanceComponent.SetData(AmmoVisuals.AmmoMax, component.Capacity); - } - - public EntityUid? PeekAmmo(BatteryBarrelComponent component) - { - // Spawn a dummy entity because it's easier to work with I guess - // This will get re-used for the projectile - var ammo = component.AmmoContainer.ContainedEntity; - if (ammo == null) - { - ammo = EntityManager.SpawnEntity(component.AmmoPrototype, Transform(component.Owner).Coordinates); - component.AmmoContainer.Insert(ammo.Value); - } - - return ammo.Value; - } - - public EntityUid? TakeProjectile(BatteryBarrelComponent component, EntityCoordinates spawnAt) - { - if (!_cell.TryGetBatteryFromSlot(component.Owner, out var capacitor)) - return null; - - if (capacitor.CurrentCharge < component.LowerChargeLimit) - return null; - - // Can fire confirmed - // Multiply the entity's damage / whatever by the percentage of charge the shot has. - EntityUid? entity; - var chargeChange = Math.Min(capacitor.CurrentCharge, component.BaseFireCost); - if (capacitor.UseCharge(chargeChange) < component.LowerChargeLimit) - { - // Handling of funny exploding cells. - return null; - } - var energyRatio = chargeChange / component.BaseFireCost; - - if (component.AmmoContainer.ContainedEntity != null) - { - entity = component.AmmoContainer.ContainedEntity; - component.AmmoContainer.Remove(entity.Value); - Transform(entity.Value).Coordinates = spawnAt; - } - else - { - entity = EntityManager.SpawnEntity(component.AmmoPrototype, spawnAt); - } - - if (TryComp(entity.Value, out ProjectileComponent? projectileComponent)) - { - if (energyRatio < 1.0) - { - projectileComponent.Damage *= energyRatio; - } - } - else if (TryComp(entity.Value, out HitscanComponent? hitscanComponent)) - { - hitscanComponent.Damage *= energyRatio; - hitscanComponent.ColorModifier = energyRatio; - } - else - { - throw new InvalidOperationException("Ammo doesn't have hitscan or projectile?"); - } - - // capacitor.UseCharge() triggers a PowerCellChangedEvent which will cause appearance to be updated. - // So let's not double-call UpdateAppearance() here. - return entity.Value; - } -} diff --git a/Content.Server/Weapon/Ranged/GunSystem.Bolt.cs b/Content.Server/Weapon/Ranged/GunSystem.Bolt.cs deleted file mode 100644 index 4ec199d790..0000000000 --- a/Content.Server/Weapon/Ranged/GunSystem.Bolt.cs +++ /dev/null @@ -1,266 +0,0 @@ -using Content.Server.Weapon.Ranged.Ammunition.Components; -using Content.Server.Weapon.Ranged.Barrels.Components; -using Content.Shared.Examine; -using Content.Shared.Interaction; -using Content.Shared.Interaction.Events; -using Content.Shared.Verbs; -using Content.Shared.Weapons.Ranged.Barrels.Components; -using Robust.Shared.Audio; -using Robust.Shared.Containers; -using Robust.Shared.GameStates; -using Robust.Shared.Map; -using Robust.Shared.Player; - -namespace Content.Server.Weapon.Ranged; - -public sealed partial class GunSystem -{ - private void AddToggleBoltVerb(EntityUid uid, BoltActionBarrelComponent component, GetVerbsEvent args) - { - if (args.Hands == null || - !args.CanAccess || - !args.CanInteract) - return; - - InteractionVerb verb = new() - { - Text = component.BoltOpen - ? Loc.GetString("close-bolt-verb-get-data-text") - : Loc.GetString("open-bolt-verb-get-data-text"), - Act = () => component.BoltOpen = !component.BoltOpen - }; - args.Verbs.Add(verb); - } - - private void OnBoltExamine(EntityUid uid, BoltActionBarrelComponent component, ExaminedEvent args) - { - args.PushMarkup(Loc.GetString("bolt-action-barrel-component-on-examine", ("caliber", component.Caliber))); - } - - private void OnBoltFireAttempt(EntityUid uid, BoltActionBarrelComponent component, GunFireAttemptEvent args) - { - if (args.Cancelled) return; - - if (component.BoltOpen || component.ChamberContainer.ContainedEntity == null) - args.Cancel(); - } - - private void OnBoltMapInit(EntityUid uid, BoltActionBarrelComponent component, MapInitEvent args) - { - if (component.FillPrototype != null) - { - component.UnspawnedCount += component.Capacity; - if (component.UnspawnedCount > 0) - { - component.UnspawnedCount--; - var chamberEntity = EntityManager.SpawnEntity(component.FillPrototype, EntityManager.GetComponent(uid).Coordinates); - component.ChamberContainer.Insert(chamberEntity); - } - } - - UpdateBoltAppearance(component); - } - - public void UpdateBoltAppearance(BoltActionBarrelComponent component) - { - if (!TryComp(component.Owner, out AppearanceComponent? appearanceComponent)) return; - - appearanceComponent.SetData(BarrelBoltVisuals.BoltOpen, component.BoltOpen); - appearanceComponent.SetData(AmmoVisuals.AmmoCount, component.ShotsLeft); - appearanceComponent.SetData(AmmoVisuals.AmmoMax, component.Capacity); - } - - private void OnBoltInit(EntityUid uid, BoltActionBarrelComponent component, ComponentInit args) - { - component.SpawnedAmmo = new Stack(component.Capacity - 1); - component.AmmoContainer = uid.EnsureContainer($"{component.GetType()}-ammo-container", out var existing); - - if (existing) - { - foreach (var entity in component.AmmoContainer.ContainedEntities) - { - component.SpawnedAmmo.Push(entity); - component.UnspawnedCount--; - } - } - - component.ChamberContainer = uid.EnsureContainer($"{component.GetType()}-chamber-container"); - - if (TryComp(uid, out AppearanceComponent? appearanceComponent)) - { - appearanceComponent.SetData(MagazineBarrelVisuals.MagLoaded, true); - } - - component.Dirty(EntityManager); - UpdateBoltAppearance(component); - } - - private void OnBoltUse(EntityUid uid, BoltActionBarrelComponent component, UseInHandEvent args) - { - if (args.Handled) return; - - args.Handled = true; - - if (component.BoltOpen) - { - component.BoltOpen = false; - _popup.PopupEntity(Loc.GetString("bolt-action-barrel-component-bolt-closed"), uid, Filter.Entities(args.User)); - return; - } - - CycleBolt(component, true); - } - - private void CycleBolt(BoltActionBarrelComponent component, bool manual = false) - { - TryEjectChamber(component); - TryFeedChamber(component); - - if (component.ChamberContainer.ContainedEntity == null && manual) - { - component.BoltOpen = true; - - if (_container.TryGetContainingContainer(component.Owner, out var container)) - { - _popup.PopupEntity(Loc.GetString("bolt-action-barrel-component-bolt-opened"), container.Owner, Filter.Entities(container.Owner)); - } - return; - } - else - { - SoundSystem.Play(Filter.Pvs(component.Owner), component.SoundCycle.GetSound(), component.Owner, AudioParams.Default.WithVolume(-2)); - } - - component.Dirty(EntityManager); - UpdateBoltAppearance(component); - } - - public bool TryEjectChamber(BoltActionBarrelComponent component) - { - if (component.ChamberContainer.ContainedEntity is {Valid: true} chambered) - { - if (!component.ChamberContainer.Remove(chambered)) - return false; - - if (TryComp(chambered, out AmmoComponent? ammoComponent) && !ammoComponent.Caseless) - EjectCasing(chambered); - - return true; - } - - return false; - } - - public bool TryFeedChamber(BoltActionBarrelComponent component) - { - if (component.ChamberContainer.ContainedEntity != null) - { - return false; - } - if (component.SpawnedAmmo.TryPop(out var next)) - { - component.AmmoContainer.Remove(next); - component.ChamberContainer.Insert(next); - return true; - } - else if (component.UnspawnedCount > 0) - { - component.UnspawnedCount--; - var ammoEntity = EntityManager.SpawnEntity(component.FillPrototype, EntityManager.GetComponent(component.Owner).Coordinates); - component.ChamberContainer.Insert(ammoEntity); - return true; - } - return false; - } - - private void OnBoltInteractUsing(EntityUid uid, BoltActionBarrelComponent component, InteractUsingEvent args) - { - if (args.Handled) return; - - if (TryInsertBullet(args.User, args.Used, component)) - args.Handled = true; - } - - public bool TryInsertBullet(EntityUid user, EntityUid ammo, BoltActionBarrelComponent component) - { - if (!TryComp(ammo, out AmmoComponent? ammoComponent)) - return false; - - if (ammoComponent.Caliber != component.Caliber) - { - _popup.PopupEntity(Loc.GetString("bolt-action-barrel-component-try-insert-bullet-wrong-caliber"), component.Owner, Filter.Entities(user)); - return false; - } - - if (!component.BoltOpen) - { - _popup.PopupEntity(Loc.GetString("bolt-action-barrel-component-try-insert-bullet-bolt-closed"), component.Owner, Filter.Entities(user)); - return false; - } - - if (component.ChamberContainer.ContainedEntity == null) - { - component.ChamberContainer.Insert(ammo); - SoundSystem.Play(Filter.Pvs(component.Owner), component.SoundInsert.GetSound(), component.Owner, AudioParams.Default.WithVolume(-2)); - component.Dirty(EntityManager); - UpdateBoltAppearance(component); - return true; - } - - if (component.AmmoContainer.ContainedEntities.Count < component.Capacity - 1) - { - component.AmmoContainer.Insert(ammo); - component.SpawnedAmmo.Push(ammo); - SoundSystem.Play(Filter.Pvs(component.Owner), component.SoundInsert.GetSound(), component.Owner, AudioParams.Default.WithVolume(-2)); - component.Dirty(EntityManager); - UpdateBoltAppearance(component); - return true; - } - - _popup.PopupEntity(Loc.GetString("bolt-action-barrel-component-try-insert-bullet-no-room"), component.Owner, Filter.Entities(user)); - - return false; - } - - private void OnBoltGetState(EntityUid uid, BoltActionBarrelComponent component, ref ComponentGetState args) - { - (int, int)? count = (component.ShotsLeft, component.Capacity); - var chamberedExists = component.ChamberContainer.ContainedEntity != null; - // (Is one chambered?, is the bullet spend) - var chamber = (chamberedExists, false); - - if (chamberedExists && TryComp(component.ChamberContainer.ContainedEntity!.Value, out var ammo)) - { - chamber.Item2 = ammo.Spent; - } - - args.State = new BoltActionBarrelComponentState( - chamber, - component.FireRateSelector, - count, - component.SoundGunshot.GetSound()); - } - - public EntityUid? PeekAmmo(BoltActionBarrelComponent component) - { - return component.ChamberContainer.ContainedEntity; - } - - public EntityUid? TakeProjectile(BoltActionBarrelComponent component, EntityCoordinates spawnAt) - { - if (component.AutoCycle) - { - CycleBolt(component); - } - else - { - component.Dirty(EntityManager); - } - - if (component.ChamberContainer.ContainedEntity is not {Valid: true} chamberEntity) return null; - - var ammoComponent = EntityManager.GetComponentOrNull(chamberEntity); - - return ammoComponent == null ? null : TakeBullet(ammoComponent, spawnAt); - } -} diff --git a/Content.Server/Weapon/Ranged/GunSystem.Guns.cs b/Content.Server/Weapon/Ranged/GunSystem.Guns.cs deleted file mode 100644 index cf171540d7..0000000000 --- a/Content.Server/Weapon/Ranged/GunSystem.Guns.cs +++ /dev/null @@ -1,302 +0,0 @@ -using System.Linq; -using Content.Server.CombatMode; -using Content.Server.Hands.Components; -using Content.Server.Interaction.Components; -using Content.Server.Projectiles.Components; -using Content.Server.Weapon.Melee; -using Content.Server.Weapon.Ranged.Ammunition.Components; -using Content.Server.Weapon.Ranged.Barrels.Components; -using Content.Shared.Audio; -using Content.Shared.Camera; -using Content.Shared.Damage; -using Content.Shared.Database; -using Content.Shared.Interaction.Events; -using Content.Shared.Popups; -using Content.Shared.Sound; -using Robust.Shared.Audio; -using Robust.Shared.Map; -using Robust.Shared.Physics; -using Robust.Shared.Player; -using Robust.Shared.Utility; - -namespace Content.Server.Weapon.Ranged; - -public sealed partial class GunSystem -{ - private void OnMeleeAttempt(EntityUid uid, ServerRangedWeaponComponent component, ref MeleeAttackAttemptEvent args) - { - args.Cancelled = true; - } - - /// - /// Tries to fire a round of ammo out of the weapon. - /// - private void TryFire(EntityUid user, EntityCoordinates targetCoords, ServerRangedWeaponComponent gun) - { - if (!TryComp(gun.Owner, out ServerRangedBarrelComponent? barrel)) return; - - if (!TryComp(user, out HandsComponent? hands) || hands.ActiveHand?.HeldEntity != gun.Owner) return; - - if (!TryComp(user, out CombatModeComponent? combat) || - !combat.IsInCombatMode || - !_blocker.CanInteract(user, gun.Owner)) return; - - var fireAttempt = new GunFireAttemptEvent(user, gun); - EntityManager.EventBus.RaiseLocalEvent(gun.Owner, fireAttempt); - - if (fireAttempt.Cancelled) return; - - var curTime = _gameTiming.CurTime; - var span = curTime - gun.LastFireTime; - if (span.TotalSeconds < 1 / barrel.FireRate) return; - - // TODO: Clumsy should be eventbus I think? - - gun.LastFireTime = curTime; - var coordinates = Transform(gun.Owner).Coordinates; - - if (gun.ClumsyCheck && EntityManager.TryGetComponent(user, out var clumsyComponent) && ClumsyComponent.TryRollClumsy(user, gun.ClumsyExplodeChance)) - { - //Wound them - _damageable.TryChangeDamage(user, clumsyComponent.ClumsyDamage); - _stun.TryParalyze(user, TimeSpan.FromSeconds(3f), true); - - // Apply salt to the wound ("Honk!") - SoundSystem.Play( - Filter.Pvs(gun.Owner), gun.ClumsyWeaponHandlingSound.GetSound(), - coordinates, AudioParams.Default.WithMaxDistance(5)); - - SoundSystem.Play( - Filter.Pvs(gun.Owner), gun.ClumsyWeaponShotSound.GetSound(), - coordinates, AudioParams.Default.WithMaxDistance(5)); - - user.PopupMessage(Loc.GetString("server-ranged-weapon-component-try-fire-clumsy")); - - EntityManager.DeleteEntity(gun.Owner); - return; - } - - // Firing confirmed - - if (gun.CanHotspot) - _atmos.HotspotExpose(coordinates, 700, 50); - - EntityManager.EventBus.RaiseLocalEvent(gun.Owner, new GunShotEvent()); - Fire(user, barrel, targetCoords); - } - - /// - /// Fires a round of ammo out of the weapon. - /// - private void Fire(EntityUid shooter, ServerRangedBarrelComponent component, EntityCoordinates coordinates) - { - if (component.ShotsLeft == 0) - { - SoundSystem.Play(Filter.Pvs(component.Owner), component.SoundEmpty.GetSound(), component.Owner); - return; - } - - var ammo = PeekAtAmmo(component); - if (TakeOutProjectile(component, Transform(shooter).Coordinates) is not {Valid: true} projectile) - { - SoundSystem.Play(Filter.Pvs(component.Owner), component.SoundEmpty.GetSound(), component.Owner); - return; - } - - var targetPos = coordinates.ToMapPos(EntityManager); - - // At this point firing is confirmed - var direction = (targetPos - Transform(shooter).WorldPosition).ToAngle(); - var angle = GetRecoilAngle(component, direction); - // This should really be client-side but for now we'll just leave it here - if (HasComp(shooter)) - { - var kick = -angle.ToVec() * 0.15f; - _recoil.KickCamera(shooter, kick); - } - - // This section probably needs tweaking so there can be caseless hitscan etc. - if (TryComp(projectile, out HitscanComponent? hitscan)) - { - FireHitscan(shooter, hitscan, component, angle); - } - else if (HasComp(projectile) && - TryComp(ammo, out AmmoComponent? ammoComponent)) - { - FireProjectiles(shooter, projectile, component, ammoComponent.ProjectilesFired, ammoComponent.EvenSpreadAngle, angle, ammoComponent.Velocity, ammo!.Value); - - if (component.CanMuzzleFlash) - { - MuzzleFlash(component.Owner, ammoComponent, angle); - } - - if (ammoComponent.Caseless) - { - EntityManager.DeleteEntity(ammo.Value); - } - } - else - { - // Invalid types - throw new InvalidOperationException(); - } - - SoundSystem.Play(Filter.Broadcast(), component.SoundGunshot.GetSound(), component.Owner); - - component.Dirty(EntityManager); - component.LastFire = _gameTiming.CurTime; - } - - #region Firing - - /// - /// Handles firing one or many projectiles - /// - private void FireProjectiles(EntityUid shooter, EntityUid baseProjectile, ServerRangedBarrelComponent component, int count, float evenSpreadAngle, Angle angle, float velocity, EntityUid ammo) - { - List? sprayAngleChange = null; - if (count > 1) - { - evenSpreadAngle *= component.SpreadRatio; - sprayAngleChange = Linspace(-evenSpreadAngle / 2, evenSpreadAngle / 2, count); - } - - var firedProjectiles = new EntityUid[count]; - for (var i = 0; i < count; i++) - { - EntityUid projectile; - - if (i == 0) - { - projectile = baseProjectile; - } - else - { - // TODO: Cursed as bruh - projectile = EntityManager.SpawnEntity( - MetaData(baseProjectile).EntityPrototype?.ID, - Transform(baseProjectile).Coordinates); - } - - firedProjectiles[i] = projectile; - - Angle projectileAngle; - - if (sprayAngleChange != null) - { - projectileAngle = angle + sprayAngleChange[i]; - } - else - { - projectileAngle = angle; - } - - var physics = EntityManager.GetComponent(projectile); - physics.BodyStatus = BodyStatus.InAir; - - var projectileComponent = EntityManager.GetComponent(projectile); - projectileComponent.IgnoreEntity(shooter); - - // FIXME: Work around issue where inserting and removing an entity from a container, - // then setting its linear velocity in the same tick resets velocity back to zero. - // See SharedBroadphaseSystem.HandleContainerInsert()... It sets Awake to false, which causes this. - projectile.SpawnTimer(TimeSpan.FromMilliseconds(25), () => - { - EntityManager.GetComponent(projectile) - .LinearVelocity = projectileAngle.ToVec() * velocity; - }); - - - Transform(projectile).WorldRotation = projectileAngle + MathHelper.PiOver2; - } - - EntityManager.EventBus.RaiseLocalEvent(component.Owner, new Barrels.Components.GunShotEvent(firedProjectiles)); - EntityManager.EventBus.RaiseLocalEvent(ammo, new AmmoShotEvent(firedProjectiles)); - } - - /// - /// Returns a list of numbers that form a set of equal intervals between the start and end value. Used to calculate shotgun spread angles. - /// - private List Linspace(double start, double end, int intervals) - { - DebugTools.Assert(intervals > 1); - - var linspace = new List(intervals); - - for (var i = 0; i <= intervals - 1; i++) - { - linspace.Add(Angle.FromDegrees(start + (end - start) * i / (intervals - 1))); - } - return linspace; - } - - /// - /// Fires hitscan entities and then displays their effects - /// - private void FireHitscan(EntityUid shooter, HitscanComponent hitscan, ServerRangedBarrelComponent component, Angle angle) - { - var ray = new CollisionRay(Transform(component.Owner).WorldPosition, angle.ToVec(), (int) hitscan.CollisionMask); - var rayCastResults = _physics.IntersectRay(Transform(component.Owner).MapID, ray, hitscan.MaxLength, shooter, false).ToList(); - - if (rayCastResults.Count >= 1) - { - var result = rayCastResults[0]; - var distance = result.Distance; - hitscan.FireEffects(shooter, distance, angle, result.HitEntity); - var modifiedDamage = _damageable.TryChangeDamage(result.HitEntity, hitscan.Damage); - if (modifiedDamage != null) - _adminLogger.Add(LogType.HitScanHit, - $"{EntityManager.ToPrettyString(shooter):user} hit {EntityManager.ToPrettyString(result.HitEntity):target} using {EntityManager.ToPrettyString(hitscan.Owner):used} and dealt {modifiedDamage.Total:damage} damage"); - - PlaySound(rayCastResults[0].HitEntity, modifiedDamage, hitscan.SoundHit, hitscan.ForceSound); - } - else - { - hitscan.FireEffects(shooter, hitscan.MaxLength, angle); - } - } - - #endregion - - #region Impact sounds - - public void PlaySound(EntityUid otherEntity, DamageSpecifier? modifiedDamage, SoundSpecifier? weaponSound, bool forceWeaponSound) - { - // Like projectiles and melee, - // 1. Entity specific sound - // 2. Ammo's sound - // 3. Nothing - var playedSound = false; - - if (!forceWeaponSound && modifiedDamage != null && modifiedDamage.Total > 0 && TryComp(otherEntity, out var rangedSound)) - { - var type = MeleeWeaponSystem.GetHighestDamageSound(modifiedDamage, _protoManager); - - if (type != null && rangedSound.SoundTypes?.TryGetValue(type, out var damageSoundType) == true) - { - SoundSystem.Play( - Filter.Pvs(otherEntity, entityManager: EntityManager), - damageSoundType!.GetSound(), - otherEntity, - AudioHelpers.WithVariation(DamagePitchVariation)); - - playedSound = true; - } - else if (type != null && rangedSound.SoundGroups?.TryGetValue(type, out var damageSoundGroup) == true) - { - SoundSystem.Play( - Filter.Pvs(otherEntity, entityManager: EntityManager), - damageSoundGroup!.GetSound(), - otherEntity, - AudioHelpers.WithVariation(DamagePitchVariation)); - - playedSound = true; - } - } - - if (!playedSound && weaponSound != null) - SoundSystem.Play(Filter.Pvs(otherEntity, entityManager: EntityManager), weaponSound.GetSound(), otherEntity); - } - - #endregion -} diff --git a/Content.Server/Weapon/Ranged/GunSystem.Magazine.cs b/Content.Server/Weapon/Ranged/GunSystem.Magazine.cs deleted file mode 100644 index c3606d3880..0000000000 --- a/Content.Server/Weapon/Ranged/GunSystem.Magazine.cs +++ /dev/null @@ -1,375 +0,0 @@ -using Content.Server.Weapon.Ranged.Ammunition.Components; -using Content.Server.Weapon.Ranged.Barrels.Components; -using Content.Shared.Examine; -using Content.Shared.Interaction; -using Content.Shared.Interaction.Events; -using Content.Shared.Verbs; -using Content.Shared.Weapons.Ranged; -using Content.Shared.Weapons.Ranged.Barrels.Components; -using Robust.Shared.Audio; -using Robust.Shared.Containers; -using Robust.Shared.GameStates; -using Robust.Shared.Map; -using Robust.Shared.Player; - -namespace Content.Server.Weapon.Ranged; - -public sealed partial class GunSystem -{ - private void AddEjectMagazineVerb(EntityUid uid, MagazineBarrelComponent component, GetVerbsEvent args) - { - if (args.Hands == null || - !args.CanAccess || - !args.CanInteract || - component.MagazineContainer.ContainedEntity is not EntityUid mag || - !_blocker.CanPickup(args.User, mag)) - return; - - if (component.MagNeedsOpenBolt && !component.BoltOpen) - return; - - AlternativeVerb verb = new() - { - Text = MetaData(mag).EntityName, - Category = VerbCategory.Eject, - Act = () => RemoveMagazine(args.User, component) - }; - args.Verbs.Add(verb); - } - - private void AddMagazineInteractionVerbs(EntityUid uid, MagazineBarrelComponent component, GetVerbsEvent args) - { - if (args.Hands == null || - !args.CanAccess || - !args.CanInteract) - return; - - // Toggle bolt verb - InteractionVerb toggleBolt = new() - { - Text = component.BoltOpen - ? Loc.GetString("close-bolt-verb-get-data-text") - : Loc.GetString("open-bolt-verb-get-data-text"), - Act = () => component.BoltOpen = !component.BoltOpen - }; - args.Verbs.Add(toggleBolt); - - // Are we holding a mag that we can insert? - if (args.Using is not {Valid: true} @using || - !CanInsertMagazine(args.User, @using, component) || - !_blocker.CanDrop(args.User)) - return; - - // Insert mag verb - InteractionVerb insert = new() - { - Text = MetaData(@using).EntityName, - Category = VerbCategory.Insert, - Act = () => InsertMagazine(args.User, @using, component) - }; - args.Verbs.Add(insert); - } - - private void OnMagazineExamine(EntityUid uid, MagazineBarrelComponent component, ExaminedEvent args) - { - args.PushMarkup(Loc.GetString("server-magazine-barrel-component-on-examine", ("caliber", component.Caliber))); - - foreach (var magazineType in GetMagazineTypes(component)) - { - args.PushMarkup(Loc.GetString("server-magazine-barrel-component-on-examine-magazine-type", ("magazineType", magazineType))); - } - } - - private void OnMagazineUse(EntityUid uid, MagazineBarrelComponent component, UseInHandEvent args) - { - if (args.Handled) return; - - // Behavior: - // If bolt open just close it - // If bolt closed then cycle - // If we cycle then get next round - // If no more round then open bolt - - args.Handled = true; - - if (component.BoltOpen) - { - SoundSystem.Play(Filter.Pvs(component.Owner), component.SoundBoltClosed.GetSound(), component.Owner, AudioParams.Default.WithVolume(-5)); - _popup.PopupEntity(Loc.GetString("server-magazine-barrel-component-use-entity-bolt-closed"), component.Owner, Filter.Entities(args.User)); - component.BoltOpen = false; - return; - } - - // Could play a rack-slide specific sound here if you're so inclined (if the chamber is empty but rounds are available) - - CycleMagazine(component, true); - return; - } - - public void UpdateMagazineAppearance(MagazineBarrelComponent component) - { - if (!TryComp(component.Owner, out AppearanceComponent? appearanceComponent)) return; - - appearanceComponent.SetData(BarrelBoltVisuals.BoltOpen, component.BoltOpen); - appearanceComponent.SetData(MagazineBarrelVisuals.MagLoaded, component.MagazineContainer.ContainedEntity != null); - appearanceComponent.SetData(AmmoVisuals.AmmoCount, component.ShotsLeft); - appearanceComponent.SetData(AmmoVisuals.AmmoMax, component.Capacity); - } - - private void OnMagazineGetState(EntityUid uid, MagazineBarrelComponent component, ref ComponentGetState args) - { - (int, int)? count = null; - if (component.MagazineContainer.ContainedEntity is {Valid: true} magazine && - TryComp(magazine, out RangedMagazineComponent? rangedMagazineComponent)) - { - count = (rangedMagazineComponent.ShotsLeft, rangedMagazineComponent.Capacity); - } - - args.State = new MagazineBarrelComponentState( - component.ChamberContainer.ContainedEntity != null, - component.FireRateSelector, - count, - component.SoundGunshot.GetSound()); - } - - private void OnMagazineInteractUsing(EntityUid uid, MagazineBarrelComponent component, InteractUsingEvent args) - { - if (args.Handled) return; - - if (CanInsertMagazine(args.User, args.Used, component, false)) - { - InsertMagazine(args.User, args.Used, component); - args.Handled = true; - return; - } - - // Insert 1 ammo - if (TryComp(args.Used, out AmmoComponent? ammoComponent)) - { - if (!component.BoltOpen) - { - _popup.PopupEntity(Loc.GetString("server-magazine-barrel-component-interact-using-ammo-bolt-closed"), component.Owner, Filter.Entities(args.User)); - return; - } - - if (ammoComponent.Caliber != component.Caliber) - { - _popup.PopupEntity(Loc.GetString("server-magazine-barrel-component-interact-using-wrong-caliber"), component.Owner, Filter.Entities(args.User)); - return; - } - - if (component.ChamberContainer.ContainedEntity == null) - { - _popup.PopupEntity(Loc.GetString("server-magazine-barrel-component-interact-using-ammo-success"), component.Owner, Filter.Entities(args.User)); - component.ChamberContainer.Insert(args.Used); - component.Dirty(EntityManager); - UpdateMagazineAppearance(component); - args.Handled = true; - return; - } - - _popup.PopupEntity(Loc.GetString("server-magazine-barrel-component-interact-using-ammo-full"), component.Owner, Filter.Entities(args.User)); - } - } - - private void OnMagazineInit(EntityUid uid, MagazineBarrelComponent component, ComponentInit args) - { - component.ChamberContainer = uid.EnsureContainer($"{component.GetType()}-chamber"); - component.MagazineContainer = uid.EnsureContainer($"{component.GetType()}-magazine", out var existing); - - if (!existing && component.MagFillPrototype != null) - { - var magEntity = EntityManager.SpawnEntity(component.MagFillPrototype, Transform(uid).Coordinates); - component.MagazineContainer.Insert(magEntity); - } - - // Temporary coz client doesn't know about magfill. - component.Dirty(EntityManager); - } - - private void OnMagazineMapInit(EntityUid uid, MagazineBarrelComponent component, MapInitEvent args) - { - UpdateMagazineAppearance(component); - } - - public bool TryEjectChamber(MagazineBarrelComponent component) - { - if (component.ChamberContainer.ContainedEntity is {Valid: true} chamberEntity) - { - if (!component.ChamberContainer.Remove(chamberEntity)) - { - return false; - } - var ammoComponent = EntityManager.GetComponent(chamberEntity); - if (!ammoComponent.Caseless) - { - EjectCasing(chamberEntity); - } - return true; - } - return false; - } - - public bool TryFeedChamber(MagazineBarrelComponent component) - { - if (component.ChamberContainer.ContainedEntity != null) - { - return false; - } - - // Try and pull a round from the magazine to replace the chamber if possible - var magazine = component.MagazineContainer.ContainedEntity; - var magComp = EntityManager.GetComponentOrNull(magazine); - - if (magComp == null || TakeAmmo(magComp) is not {Valid: true} nextRound) - { - return false; - } - - component.ChamberContainer.Insert(nextRound); - - if (component.AutoEjectMag && magazine != null && EntityManager.GetComponent(magazine.Value).ShotsLeft == 0) - { - SoundSystem.Play(Filter.Pvs(component.Owner), component.SoundAutoEject.GetSound(), component.Owner, AudioParams.Default.WithVolume(-2)); - - component.MagazineContainer.Remove(magazine.Value); - // TODO: Should be a state or something, waste of bandwidth - RaiseNetworkEvent(new MagazineAutoEjectEvent {Uid = component.Owner}); - } - return true; - } - - private void CycleMagazine(MagazineBarrelComponent component, bool manual = false) - { - if (component.BoltOpen) - return; - - TryEjectChamber(component); - - TryFeedChamber(component); - - if (component.ChamberContainer.ContainedEntity == null && !component.BoltOpen) - { - SoundSystem.Play(Filter.Pvs(component.Owner), component.SoundBoltOpen.GetSound(), component.Owner, AudioParams.Default.WithVolume(-5)); - - if (_container.TryGetContainingContainer(component.Owner, out var container)) - { - _popup.PopupEntity(Loc.GetString("server-magazine-barrel-component-cycle-bolt-open"), component.Owner, Filter.Entities(container.Owner)); - } - - component.BoltOpen = true; - return; - } - - if (manual) - { - SoundSystem.Play(Filter.Pvs(component.Owner), component.SoundRack.GetSound(), component.Owner, AudioParams.Default.WithVolume(-2)); - } - - component.Dirty(EntityManager); - UpdateMagazineAppearance(component); - } - - public EntityUid? PeekAmmo(MagazineBarrelComponent component) - { - return component.BoltOpen ? null : component.ChamberContainer.ContainedEntity; - } - - public EntityUid? TakeProjectile(MagazineBarrelComponent component, EntityCoordinates spawnAt) - { - if (component.BoltOpen) - return null; - - var entity = component.ChamberContainer.ContainedEntity; - - CycleMagazine(component); - - return entity != null ? TakeBullet(EntityManager.GetComponent(entity.Value), spawnAt) : null; - } - - public List GetMagazineTypes(MagazineBarrelComponent component) - { - var types = new List(); - - foreach (MagazineType mag in Enum.GetValues(typeof(MagazineType))) - { - if ((component.MagazineTypes & mag) != 0) - { - types.Add(mag); - } - } - - return types; - } - - public void RemoveMagazine(EntityUid user, MagazineBarrelComponent component) - { - var mag = component.MagazineContainer.ContainedEntity; - - if (mag == null) - return; - - if (component.MagNeedsOpenBolt && !component.BoltOpen) - { - _popup.PopupEntity(Loc.GetString("server-magazine-barrel-component-remove-magazine-bolt-closed"), component.Owner, Filter.Entities(user)); - return; - } - - component.MagazineContainer.Remove(mag.Value); - SoundSystem.Play(Filter.Pvs(component.Owner), component.SoundMagEject.GetSound(), component.Owner, AudioParams.Default.WithVolume(-2)); - - _handsSystem.PickupOrDrop(user, mag.Value); - - component.Dirty(EntityManager); - UpdateMagazineAppearance(component); - } - - public bool CanInsertMagazine(EntityUid user, EntityUid magazine, MagazineBarrelComponent component, bool quiet = true) - { - if (!TryComp(magazine, out RangedMagazineComponent? magazineComponent)) - { - return false; - } - - if ((component.MagazineTypes & magazineComponent.MagazineType) == 0) - { - if (!quiet) - _popup.PopupEntity(Loc.GetString("server-magazine-barrel-component-interact-using-wrong-magazine-type"), component.Owner, Filter.Entities(user)); - - return false; - } - - if (magazineComponent.Caliber != component.Caliber) - { - if (!quiet) - _popup.PopupEntity(Loc.GetString("server-magazine-barrel-component-interact-using-wrong-caliber"), component.Owner, Filter.Entities(user)); - - return false; - } - - if (component.MagNeedsOpenBolt && !component.BoltOpen) - { - if (!quiet) - _popup.PopupEntity(Loc.GetString("server-magazine-barrel-component-interact-using-bolt-closed"), component.Owner, Filter.Entities(user)); - - return false; - } - - if (component.MagazineContainer.ContainedEntity == null) - return true; - - if (!quiet) - _popup.PopupEntity(Loc.GetString("server-magazine-barrel-component-interact-using-already-holding-magazine"), component.Owner, Filter.Entities(user)); - - return false; - } - - public void InsertMagazine(EntityUid user, EntityUid magazine, MagazineBarrelComponent component) - { - SoundSystem.Play(Filter.Pvs(component.Owner), component.SoundMagInsert.GetSound(), component.Owner, AudioParams.Default.WithVolume(-2)); - _popup.PopupEntity(Loc.GetString("server-magazine-barrel-component-interact-using-success"), component.Owner, Filter.Entities(user)); - component.MagazineContainer.Insert(magazine); - component.Dirty(EntityManager); - UpdateMagazineAppearance(component); - } -} diff --git a/Content.Server/Weapon/Ranged/GunSystem.Pump.cs b/Content.Server/Weapon/Ranged/GunSystem.Pump.cs deleted file mode 100644 index 4e81eebd0c..0000000000 --- a/Content.Server/Weapon/Ranged/GunSystem.Pump.cs +++ /dev/null @@ -1,190 +0,0 @@ -using Content.Server.Weapon.Ranged.Ammunition.Components; -using Content.Server.Weapon.Ranged.Barrels.Components; -using Content.Shared.Examine; -using Content.Shared.Interaction; -using Content.Shared.Interaction.Events; -using Content.Shared.Weapons.Ranged.Barrels.Components; -using Robust.Shared.Audio; -using Robust.Shared.Containers; -using Robust.Shared.GameStates; -using Robust.Shared.Map; -using Robust.Shared.Player; - -namespace Content.Server.Weapon.Ranged; - -public sealed partial class GunSystem -{ - private void OnPumpExamine(EntityUid uid, PumpBarrelComponent component, ExaminedEvent args) - { - args.PushMarkup(Loc.GetString("pump-barrel-component-on-examine", ("caliber", component.Caliber))); - } - - private void OnPumpGetState(EntityUid uid, PumpBarrelComponent component, ref ComponentGetState args) - { - (int, int)? count = (component.ShotsLeft, component.Capacity); - var chamberedExists = component.ChamberContainer.ContainedEntity != null; - // (Is one chambered?, is the bullet spend) - var chamber = (chamberedExists, false); - - if (chamberedExists && TryComp(component.ChamberContainer.ContainedEntity!.Value, out var ammo)) - { - chamber.Item2 = ammo.Spent; - } - - args.State = new PumpBarrelComponentState( - chamber, - component.FireRateSelector, - count, - component.SoundGunshot.GetSound()); - } - - private void OnPumpMapInit(EntityUid uid, PumpBarrelComponent component, MapInitEvent args) - { - if (component.FillPrototype != null) - { - component.UnspawnedCount += component.Capacity - 1; - } - - UpdatePumpAppearance(component); - } - - private void UpdatePumpAppearance(PumpBarrelComponent component) - { - if (!TryComp(component.Owner, out AppearanceComponent? appearanceComponent)) return; - - appearanceComponent.SetData(AmmoVisuals.AmmoCount, component.ShotsLeft); - appearanceComponent.SetData(AmmoVisuals.AmmoMax, component.Capacity); - } - - private void OnPumpInit(EntityUid uid, PumpBarrelComponent component, ComponentInit args) - { - component.AmmoContainer = - uid.EnsureContainer($"{component.GetType()}-ammo-container", out var existing); - - if (existing) - { - foreach (var entity in component.AmmoContainer.ContainedEntities) - { - component.SpawnedAmmo.Push(entity); - component.UnspawnedCount--; - } - } - - component.ChamberContainer = - uid.EnsureContainer($"{component.GetType()}-chamber-container", out existing); - - if (existing) - { - component.UnspawnedCount--; - } - - if (TryComp(uid, out AppearanceComponent? appearanceComponent)) - { - appearanceComponent.SetData(MagazineBarrelVisuals.MagLoaded, true); - } - - component.Dirty(EntityManager); - UpdatePumpAppearance(component); - } - - private void OnPumpUse(EntityUid uid, PumpBarrelComponent component, UseInHandEvent args) - { - if (args.Handled) return; - - args.Handled = true; - CyclePump(component, true); - } - - private void OnPumpInteractUsing(EntityUid uid, PumpBarrelComponent component, InteractUsingEvent args) - { - if (args.Handled) return; - - if (TryInsertBullet(component, args)) - args.Handled = true; - } - - public bool TryInsertBullet(PumpBarrelComponent component, InteractUsingEvent args) - { - if (!TryComp(args.Used, out AmmoComponent? ammoComponent)) - { - return false; - } - - if (ammoComponent.Caliber != component.Caliber) - { - _popup.PopupEntity(Loc.GetString("pump-barrel-component-try-insert-bullet-wrong-caliber"), component.Owner, Filter.Entities(args.User)); - return false; - } - - if (component.AmmoContainer.ContainedEntities.Count < component.Capacity - 1) - { - component.AmmoContainer.Insert(args.Used); - component.SpawnedAmmo.Push(args.Used); - component.Dirty(EntityManager); - UpdatePumpAppearance(component); - SoundSystem.Play(Filter.Pvs(component.Owner), component.SoundInsert.GetSound(), component.Owner, AudioParams.Default.WithVolume(-2)); - return true; - } - - _popup.PopupEntity(Loc.GetString("pump-barrel-component-try-insert-bullet-no-room"), component.Owner, Filter.Entities(args.User)); - - return false; - } - - private void CyclePump(PumpBarrelComponent component, bool manual = false) - { - if (component.ChamberContainer.ContainedEntity is {Valid: true} chamberedEntity) - { - component.ChamberContainer.Remove(chamberedEntity); - var ammoComponent = EntityManager.GetComponent(chamberedEntity); - if (!ammoComponent.Caseless) - { - EjectCasing(chamberedEntity); - } - } - - if (component.SpawnedAmmo.TryPop(out var next)) - { - component.AmmoContainer.Remove(next); - component.ChamberContainer.Insert(next); - } - - if (component.UnspawnedCount > 0) - { - component.UnspawnedCount--; - var ammoEntity = EntityManager.SpawnEntity(component.FillPrototype, Transform(component.Owner).Coordinates); - component.ChamberContainer.Insert(ammoEntity); - } - - if (manual) - { - SoundSystem.Play(Filter.Pvs(component.Owner), component.SoundCycle.GetSound(), component.Owner, AudioParams.Default.WithVolume(-2)); - } - - component.Dirty(EntityManager); - UpdatePumpAppearance(component); - } - - public EntityUid? PeekAmmo(PumpBarrelComponent component) - { - return component.ChamberContainer.ContainedEntity; - } - - public EntityUid? TakeProjectile(PumpBarrelComponent component, EntityCoordinates spawnAt) - { - if (!component.ManualCycle) - { - CyclePump(component); - } - else - { - component.Dirty(EntityManager); - } - - if (component.ChamberContainer.ContainedEntity is not {Valid: true} chamberEntity) return null; - - var ammoComponent = EntityManager.GetComponentOrNull(chamberEntity); - - return ammoComponent == null ? null : TakeBullet(ammoComponent, spawnAt); - } -} diff --git a/Content.Server/Weapon/Ranged/GunSystem.RangedMagazine.cs b/Content.Server/Weapon/Ranged/GunSystem.RangedMagazine.cs deleted file mode 100644 index ec857a449a..0000000000 --- a/Content.Server/Weapon/Ranged/GunSystem.RangedMagazine.cs +++ /dev/null @@ -1,130 +0,0 @@ -using Content.Server.Hands.Components; -using Content.Server.Weapon.Ranged.Ammunition.Components; -using Content.Shared.Examine; -using Content.Shared.Interaction; -using Content.Shared.Interaction.Events; -using Content.Shared.Weapons.Ranged.Barrels.Components; -using Robust.Shared.Containers; -using Robust.Shared.Player; - -namespace Content.Server.Weapon.Ranged; - -public sealed partial class GunSystem -{ - private void OnRangedMagMapInit(EntityUid uid, RangedMagazineComponent component, MapInitEvent args) - { - if (component.FillPrototype != null) - { - component.UnspawnedCount += component.Capacity; - } - - UpdateRangedMagAppearance(component); - } - - private void OnRangedMagInit(EntityUid uid, RangedMagazineComponent component, ComponentInit args) - { - component.AmmoContainer = uid.EnsureContainer($"{component.GetType()}-magazine", out var existing); - - if (existing) - { - if (component.AmmoContainer.ContainedEntities.Count > component.Capacity) - { - throw new InvalidOperationException("Initialized capacity of magazine higher than its actual capacity"); - } - - foreach (var entity in component.AmmoContainer.ContainedEntities) - { - component.SpawnedAmmo.Push(entity); - component.UnspawnedCount--; - } - } - - if (TryComp(component.Owner, out AppearanceComponent? appearanceComponent)) - { - appearanceComponent.SetData(MagazineBarrelVisuals.MagLoaded, true); - } - } - - private void UpdateRangedMagAppearance(RangedMagazineComponent component) - { - if (!TryComp(component.Owner, out AppearanceComponent? appearanceComponent)) return; - - appearanceComponent.SetData(AmmoVisuals.AmmoCount, component.ShotsLeft); - appearanceComponent.SetData(AmmoVisuals.AmmoMax, component.Capacity); - } - - private void OnRangedMagUse(EntityUid uid, RangedMagazineComponent component, UseInHandEvent args) - { - if (args.Handled) return; - - if (!TryComp(args.User, out HandsComponent? handsComponent)) - { - return; - } - - if (TakeAmmo(component) is not {Valid: true} ammo) - return; - - _handsSystem.PickupOrDrop(args.User, ammo, handsComp: handsComponent); - EjectCasing(ammo); - - args.Handled = true; - } - - private void OnRangedMagExamine(EntityUid uid, RangedMagazineComponent component, ExaminedEvent args) - { - args.PushMarkup(Loc.GetString("ranged-magazine-component-on-examine", ("magazineType", component.MagazineType),("caliber", component.Caliber))); - } - - private void OnRangedMagInteractUsing(EntityUid uid, RangedMagazineComponent component, InteractUsingEvent args) - { - if (args.Handled) return; - - if (TryInsertAmmo(args.User, args.Used, component)) - args.Handled = true; - } - - public bool TryInsertAmmo(EntityUid user, EntityUid ammo, RangedMagazineComponent component) - { - if (!TryComp(ammo, out AmmoComponent? ammoComponent)) - { - return false; - } - - if (ammoComponent.Caliber != component.Caliber) - { - _popup.PopupEntity(Loc.GetString("ranged-magazine-component-try-insert-ammo-wrong-caliber"), component.Owner, Filter.Entities(user)); - return false; - } - - if (component.ShotsLeft >= component.Capacity) - { - _popup.PopupEntity(Loc.GetString("ranged-magazine-component-try-insert-ammo-is-full "), component.Owner, Filter.Entities(user)); - return false; - } - - component.AmmoContainer.Insert(ammo); - component.SpawnedAmmo.Push(ammo); - UpdateRangedMagAppearance(component); - return true; - } - - public EntityUid? TakeAmmo(RangedMagazineComponent component) - { - EntityUid? ammo = null; - // If anything's spawned use that first, otherwise use the fill prototype as a fallback (if we have spawn count left) - if (component.SpawnedAmmo.TryPop(out var entity)) - { - ammo = entity; - component.AmmoContainer.Remove(entity); - } - else if (component.UnspawnedCount > 0) - { - component.UnspawnedCount--; - ammo = EntityManager.SpawnEntity(component.FillPrototype, Transform(component.Owner).Coordinates); - } - - UpdateRangedMagAppearance(component); - return ammo; - } -} diff --git a/Content.Server/Weapon/Ranged/GunSystem.Revolvers.cs b/Content.Server/Weapon/Ranged/GunSystem.Revolvers.cs deleted file mode 100644 index bd2ed48d8c..0000000000 --- a/Content.Server/Weapon/Ranged/GunSystem.Revolvers.cs +++ /dev/null @@ -1,226 +0,0 @@ -using Content.Server.Weapon.Ranged.Ammunition.Components; -using Content.Server.Weapon.Ranged.Barrels.Components; -using Content.Shared.Interaction; -using Content.Shared.Interaction.Events; -using Content.Shared.Popups; -using Content.Shared.Verbs; -using Content.Shared.Weapons.Ranged.Barrels.Components; -using Robust.Shared.Audio; -using Robust.Shared.Containers; -using Robust.Shared.GameStates; -using Robust.Shared.Map; -using Robust.Shared.Player; - -namespace Content.Server.Weapon.Ranged; - -public sealed partial class GunSystem -{ - private void OnRevolverUse(EntityUid uid, RevolverBarrelComponent component, UseInHandEvent args) - { - if (args.Handled) return; - - EjectAllSlots(component); - component.Dirty(EntityManager); - UpdateRevolverAppearance(component); - args.Handled = true; - } - - private void OnRevolverInteractUsing(EntityUid uid, RevolverBarrelComponent component, InteractUsingEvent args) - { - if (args.Handled) return; - - if (TryInsertBullet(args.User, args.Used, component)) - args.Handled = true; - } - - public bool TryInsertBullet(EntityUid user, EntityUid entity, RevolverBarrelComponent component) - { - if (!TryComp(entity, out AmmoComponent? ammoComponent)) - { - return false; - } - - if (ammoComponent.Caliber != component.Caliber) - { - _popup.PopupEntity(Loc.GetString("revolver-barrel-component-try-insert-bullet-wrong-caliber"), component.Owner, Filter.Entities(user)); - return false; - } - - // Functions like a stack - // These are inserted in reverse order but then when fired Cycle will go through in order - // The reason we don't just use an actual stack is because spin can select a random slot to point at - for (var i = component.AmmoSlots.Length - 1; i >= 0; i--) - { - var slot = component.AmmoSlots[i]; - if (slot == default) - { - component.CurrentSlot = i; - component.AmmoSlots[i] = entity; - component.AmmoContainer.Insert(entity); - SoundSystem.Play(Filter.Pvs(component.Owner), component.SoundInsert.GetSound(), component.Owner, AudioParams.Default.WithVolume(-2)); - - component.Dirty(EntityManager); - UpdateRevolverAppearance(component); - return true; - } - } - - _popup.PopupEntity(Loc.GetString("revolver-barrel-component-try-insert-bullet-ammo-full"), ammoComponent.Owner, Filter.Entities(user)); - return false; - } - - /// - /// Russian Roulette - /// - public void SpinRevolver(RevolverBarrelComponent component) - { - var random = _random.Next(component.AmmoSlots.Length - 1); - component.CurrentSlot = random; - SoundSystem.Play(Filter.Pvs(component.Owner), component.SoundSpin.GetSound(), component.Owner, AudioParams.Default.WithVolume(-2)); - component.Dirty(EntityManager); - } - - public void CycleRevolver(RevolverBarrelComponent component) - { - // Move up a slot - component.CurrentSlot = (component.CurrentSlot + 1) % component.AmmoSlots.Length; - component.Dirty(EntityManager); - UpdateRevolverAppearance(component); - } - - private void EjectAllSlots(RevolverBarrelComponent component) - { - for (var i = 0; i < component.AmmoSlots.Length; i++) - { - var entity = component.AmmoSlots[i]; - if (entity == null) continue; - - component.AmmoContainer.Remove(entity.Value); - EjectCasing(entity.Value); - component.AmmoSlots[i] = null; - } - - if (component.AmmoContainer.ContainedEntities.Count > 0) - { - SoundSystem.Play(Filter.Pvs(component.Owner), component.SoundEject.GetSound(), component.Owner, AudioParams.Default.WithVolume(-1)); - } - - // May as well point back at the end? - component.CurrentSlot = component.AmmoSlots.Length - 1; - } - - private void OnRevolverGetState(EntityUid uid, RevolverBarrelComponent component, ref ComponentGetState args) - { - var slotsSpent = new bool?[component.Capacity]; - for (var i = 0; i < component.Capacity; i++) - { - slotsSpent[i] = null; - var ammoEntity = component.AmmoSlots[i]; - if (ammoEntity != default && TryComp(ammoEntity, out AmmoComponent? ammo)) - { - slotsSpent[i] = ammo.Spent; - } - } - - //TODO: make yaml var to not sent currentSlot/UI? (for russian roulette) - args.State = new RevolverBarrelComponentState( - component.CurrentSlot, - component.FireRateSelector, - slotsSpent, - component.SoundGunshot.GetSound()); - } - - private void OnRevolverMapInit(EntityUid uid, RevolverBarrelComponent component, MapInitEvent args) - { - component.UnspawnedCount = component.Capacity; - var idx = 0; - component.AmmoContainer = component.Owner.EnsureContainer($"{component.GetType()}-ammoContainer", out var existing); - if (existing) - { - foreach (var entity in component.AmmoContainer.ContainedEntities) - { - component.UnspawnedCount--; - component.AmmoSlots[idx] = entity; - idx++; - } - } - - // TODO: Revolvers should also defer spawning T B H - var xform = EntityManager.GetComponent(uid); - - for (var i = 0; i < component.UnspawnedCount; i++) - { - var entity = EntityManager.SpawnEntity(component.FillPrototype, xform.Coordinates); - component.AmmoSlots[idx] = entity; - component.AmmoContainer.Insert(entity); - idx++; - } - - UpdateRevolverAppearance(component); - component.Dirty(EntityManager); - } - - private void UpdateRevolverAppearance(RevolverBarrelComponent component) - { - if (!TryComp(component.Owner, out AppearanceComponent? appearance)) - { - return; - } - - // Placeholder, at this stage it's just here for the RPG - appearance.SetData(MagazineBarrelVisuals.MagLoaded, component.ShotsLeft > 0); - appearance.SetData(AmmoVisuals.AmmoCount, component.ShotsLeft); - appearance.SetData(AmmoVisuals.AmmoMax, component.Capacity); - } - - private void AddSpinVerb(EntityUid uid, RevolverBarrelComponent component, GetVerbsEvent args) - { - if (args.Hands == null || !args.CanAccess || !args.CanInteract) - return; - - if (component.Capacity <= 1 || component.ShotsLeft == 0) - return; - - AlternativeVerb verb = new() - { - Text = Loc.GetString("spin-revolver-verb-get-data-text"), - IconTexture = "/Textures/Interface/VerbIcons/refresh.svg.192dpi.png", - Act = () => - { - SpinRevolver(component); - component.Owner.PopupMessage(args.User, Loc.GetString("spin-revolver-verb-on-activate")); - } - }; - args.Verbs.Add(verb); - } - - public EntityUid? PeekAmmo(RevolverBarrelComponent component) - { - return component.AmmoSlots[component.CurrentSlot]; - } - - /// - /// Takes a projectile out if possible - /// IEnumerable just to make supporting shotguns saner - /// - /// - /// - public EntityUid? TakeProjectile(RevolverBarrelComponent component, EntityCoordinates spawnAt) - { - var ammo = component.AmmoSlots[component.CurrentSlot]; - EntityUid? bullet = null; - if (ammo != null) - { - var ammoComponent = EntityManager.GetComponent(ammo.Value); - bullet = TakeBullet(ammoComponent, spawnAt); - if (ammoComponent.Caseless) - { - component.AmmoSlots[component.CurrentSlot] = null; - component.AmmoContainer.Remove(ammo.Value); - } - } - CycleRevolver(component); - UpdateRevolverAppearance(component); - return bullet; - } -} diff --git a/Content.Server/Weapon/Ranged/GunSystem.SpeedLoader.cs b/Content.Server/Weapon/Ranged/GunSystem.SpeedLoader.cs deleted file mode 100644 index ff78ca0eb6..0000000000 --- a/Content.Server/Weapon/Ranged/GunSystem.SpeedLoader.cs +++ /dev/null @@ -1,181 +0,0 @@ -using Content.Server.Hands.Components; -using Content.Server.Weapon.Ranged.Ammunition.Components; -using Content.Server.Weapon.Ranged.Barrels.Components; -using Content.Shared.Interaction; -using Content.Shared.Interaction.Events; -using Content.Shared.Weapons.Ranged.Barrels.Components; -using Robust.Shared.Containers; -using Robust.Shared.Player; - -namespace Content.Server.Weapon.Ranged; - -public sealed partial class GunSystem -{ - private void OnSpeedLoaderInit(EntityUid uid, SpeedLoaderComponent component, ComponentInit args) - { - component.AmmoContainer = uid.EnsureContainer($"{component.GetType()}-container", out var existing); - - if (existing) - { - foreach (var ammo in component.AmmoContainer.ContainedEntities) - { - component.UnspawnedCount--; - component.SpawnedAmmo.Push(ammo); - } - } - } - - private void OnSpeedLoaderMapInit(EntityUid uid, SpeedLoaderComponent component, MapInitEvent args) - { - component.UnspawnedCount += component.Capacity; - UpdateSpeedLoaderAppearance(component); - } - - private void UpdateSpeedLoaderAppearance(SpeedLoaderComponent component) - { - if (!TryComp(component.Owner, out AppearanceComponent? appearanceComponent)) return; - - appearanceComponent.SetData(MagazineBarrelVisuals.MagLoaded, true); - appearanceComponent.SetData(AmmoVisuals.AmmoCount, component.AmmoLeft); - appearanceComponent.SetData(AmmoVisuals.AmmoMax, component.Capacity); - } - - private EntityUid? TakeAmmo(SpeedLoaderComponent component) - { - if (component.SpawnedAmmo.TryPop(out var entity)) - { - component.AmmoContainer.Remove(entity); - return entity; - } - - if (component.UnspawnedCount > 0) - { - component.UnspawnedCount--; - return EntityManager.SpawnEntity(component.FillPrototype, Transform(component.Owner).Coordinates); - } - - return null; - } - - private void OnSpeedLoaderUse(EntityUid uid, SpeedLoaderComponent component, UseInHandEvent args) - { - if (args.Handled) return; - - if (!TryComp(args.User, out HandsComponent? handsComponent)) - { - return; - } - - var ammo = TakeAmmo(component); - if (ammo == null) - { - return; - } - - if (!_handsSystem.TryPickup(args.User, ammo.Value, handsComp: handsComponent)) - { - EjectCasing(ammo.Value); - } - - UpdateSpeedLoaderAppearance(component); - args.Handled = true; - } - - private void OnSpeedLoaderAfterInteract(EntityUid uid, SpeedLoaderComponent component, AfterInteractEvent args) - { - if (args.Handled || !args.CanReach) return; - - if (args.Target == null) - { - return; - } - - // This area is dirty but not sure of an easier way to do it besides add an interface or somethin - var changed = false; - - if (TryComp(args.Target.Value, out RevolverBarrelComponent? revolverBarrel)) - { - for (var i = 0; i < component.Capacity; i++) - { - var ammo = TakeAmmo(component); - if (ammo == null) - { - break; - } - - if (TryInsertBullet(args.User, ammo.Value, revolverBarrel)) - { - changed = true; - continue; - } - - // Take the ammo back - TryInsertAmmo(args.User, ammo.Value, component); - break; - } - } - else if (TryComp(args.Target.Value, out BoltActionBarrelComponent? boltActionBarrel)) - { - for (var i = 0; i < component.Capacity; i++) - { - var ammo = TakeAmmo(component); - if (ammo == null) - { - break; - } - - if (TryInsertBullet(args.User, ammo.Value, boltActionBarrel)) - { - changed = true; - continue; - } - - // Take the ammo back - TryInsertAmmo(args.User, ammo.Value, component); - break; - } - - } - - if (changed) - { - UpdateSpeedLoaderAppearance(component); - } - - args.Handled = true; - } - - public bool TryInsertAmmo(EntityUid user, EntityUid entity, SpeedLoaderComponent component) - { - if (!TryComp(entity, out AmmoComponent? ammoComponent)) - { - return false; - } - - if (ammoComponent.Caliber != component.Caliber) - { - _popup.PopupEntity(Loc.GetString("speed-loader-component-try-insert-ammo-wrong-caliber"), component.Owner, Filter.Entities(user)); - return false; - } - - if (component.AmmoLeft >= component.Capacity) - { - _popup.PopupEntity(Loc.GetString("speed-loader-component-try-insert-ammo-no-room"), component.Owner, Filter.Entities(user)); - return false; - } - - component.SpawnedAmmo.Push(entity); - component.AmmoContainer.Insert(entity); - UpdateSpeedLoaderAppearance(component); - return true; - - } - - private void OnSpeedLoaderInteractUsing(EntityUid uid, SpeedLoaderComponent component, InteractUsingEvent args) - { - if (args.Handled) return; - - if (TryInsertAmmo(args.User, args.Used, component)) - args.Handled = true; - } -} diff --git a/Content.Server/Weapon/Ranged/GunSystem.cs b/Content.Server/Weapon/Ranged/GunSystem.cs deleted file mode 100644 index 9ac7dc76c4..0000000000 --- a/Content.Server/Weapon/Ranged/GunSystem.cs +++ /dev/null @@ -1,258 +0,0 @@ -using Content.Server.Administration.Logs; -using Content.Server.Atmos.EntitySystems; -using Content.Server.Hands.Components; -using Content.Server.PowerCell; -using Content.Server.Stunnable; -using Content.Server.Weapon.Melee; -using Content.Server.Weapon.Ranged.Ammunition.Components; -using Content.Server.Weapon.Ranged.Barrels.Components; -using Content.Shared.ActionBlocker; -using Content.Shared.Camera; -using Content.Shared.Damage; -using Content.Shared.Examine; -using Content.Shared.Hands.EntitySystems; -using Content.Shared.Interaction; -using Content.Shared.Interaction.Events; -using Content.Shared.Popups; -using Content.Shared.PowerCell.Components; -using Content.Shared.Verbs; -using Content.Shared.Weapons.Ranged.Components; -using Robust.Server.GameObjects; -using Robust.Shared.Audio; -using Robust.Shared.Containers; -using Robust.Shared.GameStates; -using Robust.Shared.Map; -using Robust.Shared.Player; -using Robust.Shared.Prototypes; -using Robust.Shared.Random; -using Robust.Shared.Timing; - -namespace Content.Server.Weapon.Ranged; - -public sealed partial class GunSystem : EntitySystem -{ - [Dependency] private readonly IGameTiming _gameTiming = default!; - [Dependency] private readonly IPrototypeManager _protoManager = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly ActionBlockerSystem _blocker = default!; - [Dependency] private readonly IAdminLogManager _adminLogger = default!; - [Dependency] private readonly AtmosphereSystem _atmos = default!; - [Dependency] private readonly CameraRecoilSystem _recoil = default!; - [Dependency] private readonly DamageableSystem _damageable = default!; - [Dependency] private readonly EffectSystem _effects = default!; - [Dependency] private readonly PowerCellSystem _cell = default!; - [Dependency] private readonly SharedContainerSystem _container = default!; - [Dependency] private readonly SharedPhysicsSystem _physics = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly StunSystem _stun = default!; - [Dependency] private readonly SharedHandsSystem _handsSystem = default!; - - public const float DamagePitchVariation = MeleeWeaponSystem.DamagePitchVariation; - - /// - /// How many sounds are allowed to be played on ejecting multiple casings. - /// - private const int EjectionSoundMax = 3; - - public override void Initialize() - { - base.Initialize(); - - // TODO: So at the time I thought there might've been a need to keep magazines - // and ammo boxes separate. - // There isn't. - // They should be combined. - - SubscribeLocalEvent(OnAmmoExamine); - - SubscribeLocalEvent(OnAmmoBoxInit); - SubscribeLocalEvent(OnAmmoBoxMapInit); - SubscribeLocalEvent(OnAmmoBoxExamine); - SubscribeLocalEvent(OnAmmoBoxInteractUsing); - SubscribeLocalEvent(OnAmmoBoxUse); - SubscribeLocalEvent(OnAmmoBoxInteractHand); - SubscribeLocalEvent>(OnAmmoBoxAltVerbs); - - SubscribeLocalEvent(OnRangedMagInit); - SubscribeLocalEvent(OnRangedMagMapInit); - SubscribeLocalEvent(OnRangedMagUse); - SubscribeLocalEvent(OnRangedMagExamine); - SubscribeLocalEvent(OnRangedMagInteractUsing); - - // Whenever I get around to refactoring guns this is all going to change. - // Essentially the idea is - // You have GunComponent and ChamberedGunComponent (which is just guncomp + containerslot for chamber) - // GunComponent has a component for an ammo provider on it (e.g. battery) and asks it for ammo to shoot - // ALTERNATIVELY, it has a "MagazineAmmoProvider" that has its own containerslot that it can ask - // (All of these would be comp references so max you only ever have 2 components on the gun). - SubscribeLocalEvent(OnBatteryInit); - SubscribeLocalEvent(OnBatteryMapInit); - SubscribeLocalEvent(OnCellSlotUpdated); - - SubscribeLocalEvent(OnBoltInit); - SubscribeLocalEvent(OnBoltMapInit); - SubscribeLocalEvent(OnBoltFireAttempt); - SubscribeLocalEvent(OnBoltUse); - SubscribeLocalEvent(OnBoltInteractUsing); - SubscribeLocalEvent(OnBoltGetState); - SubscribeLocalEvent(OnBoltExamine); - SubscribeLocalEvent>(AddToggleBoltVerb); - - SubscribeLocalEvent(OnMagazineInit); - SubscribeLocalEvent(OnMagazineMapInit); - SubscribeLocalEvent(OnMagazineExamine); - SubscribeLocalEvent(OnMagazineUse); - SubscribeLocalEvent(OnMagazineInteractUsing); - SubscribeLocalEvent(OnMagazineGetState); - SubscribeLocalEvent>(AddMagazineInteractionVerbs); - SubscribeLocalEvent>(AddEjectMagazineVerb); - - SubscribeLocalEvent(OnPumpGetState); - SubscribeLocalEvent(OnPumpInit); - SubscribeLocalEvent(OnPumpMapInit); - SubscribeLocalEvent(OnPumpExamine); - SubscribeLocalEvent(OnPumpUse); - SubscribeLocalEvent(OnPumpInteractUsing); - - SubscribeLocalEvent(OnRevolverMapInit); - SubscribeLocalEvent(OnRevolverUse); - SubscribeLocalEvent(OnRevolverInteractUsing); - SubscribeLocalEvent(OnRevolverGetState); - SubscribeLocalEvent>(AddSpinVerb); - - SubscribeLocalEvent(OnSpeedLoaderInit); - SubscribeLocalEvent(OnSpeedLoaderMapInit); - SubscribeLocalEvent(OnSpeedLoaderUse); - SubscribeLocalEvent(OnSpeedLoaderAfterInteract); - SubscribeLocalEvent(OnSpeedLoaderInteractUsing); - - // SubscribeLocalEvent(OnGunExamine); - SubscribeNetworkEvent(OnFirePos); - SubscribeLocalEvent(OnMeleeAttempt); - } - - private void OnFirePos(FirePosEvent msg, EntitySessionEventArgs args) - { - if (args.SenderSession.AttachedEntity is not {Valid: true} user) - return; - - if (!msg.Coordinates.IsValid(EntityManager)) - return; - - if (!TryComp(user, out HandsComponent? handsComponent)) - return; - - // TODO: Not exactly robust - var gun = handsComponent.ActiveHand?.HeldEntity; - - if (gun == null || !TryComp(gun, out ServerRangedWeaponComponent? weapon)) - return; - - // map pos - TryFire(user, msg.Coordinates, weapon); - } - - public EntityUid? PeekAtAmmo(ServerRangedBarrelComponent component) - { - return component switch - { - BatteryBarrelComponent battery => PeekAmmo(battery), - BoltActionBarrelComponent bolt => PeekAmmo(bolt), - MagazineBarrelComponent mag => PeekAmmo(mag), - PumpBarrelComponent pump => PeekAmmo(pump), - RevolverBarrelComponent revolver => PeekAmmo(revolver), - _ => throw new NotImplementedException() - }; - } - - public EntityUid? TakeOutProjectile(ServerRangedBarrelComponent component, EntityCoordinates spawnAt) - { - return component switch - { - BatteryBarrelComponent battery => TakeProjectile(battery, spawnAt), - BoltActionBarrelComponent bolt => TakeProjectile(bolt, spawnAt), - MagazineBarrelComponent mag => TakeProjectile(mag, spawnAt), - PumpBarrelComponent pump => TakeProjectile(pump, spawnAt), - RevolverBarrelComponent revolver => TakeProjectile(revolver, spawnAt), - _ => throw new NotImplementedException() - }; - } - - /// - /// Drops multiple cartridges / shells on the floor - /// Wraps EjectCasing to make it less toxic for bulk ejections - /// - public void EjectCasings(IEnumerable entities) - { - var soundPlayCount = 0; - var playSound = true; - - foreach (var entity in entities) - { - EjectCasing(entity, playSound); - soundPlayCount++; - if (soundPlayCount > EjectionSoundMax) - { - playSound = false; - } - } - } - - /// - /// Drops a single cartridge / shell - /// - public void EjectCasing( - EntityUid entity, - bool playSound = true, - AmmoComponent? ammoComponent = null) - { - const float ejectOffset = 0.4f; - - if (!Resolve(entity, ref ammoComponent)) return; - - var offsetPos = (_random.NextFloat(-ejectOffset, ejectOffset), _random.NextFloat(-ejectOffset, ejectOffset)); - - var xform = Transform(entity); - - var coordinates = xform.Coordinates; - coordinates = coordinates.Offset(offsetPos); - - xform.LocalRotation = _random.NextFloat(MathF.Tau); - xform.Coordinates = coordinates; - - if (playSound) - SoundSystem.Play(Filter.Pvs(entity), ammoComponent.SoundCollectionEject.GetSound(), coordinates, AudioParams.Default.WithVolume(-1)); - } - - private Angle GetRecoilAngle(ServerRangedBarrelComponent component, Angle direction) - { - var currentTime = _gameTiming.CurTime; - var timeSinceLastFire = (currentTime - component.LastFire).TotalSeconds; - var newTheta = MathHelper.Clamp(component.CurrentAngle.Theta + component.AngleIncrease - component.AngleDecay * timeSinceLastFire, component.MinAngle.Theta, component.MaxAngle.Theta); - component.CurrentAngle = new Angle(newTheta); - - var random = (_random.NextDouble(-1, 1)); - var angle = Angle.FromDegrees(direction.Degrees + component.CurrentAngle.Degrees * random); - return angle; - } - - /// - /// Raised on a gun when it fires. - /// - public sealed class GunShotEvent : EntityEventArgs - { - - } - - public sealed class GunFireAttemptEvent : CancellableEntityEventArgs - { - public EntityUid? User = null; - public ServerRangedWeaponComponent Weapon; - - public GunFireAttemptEvent(EntityUid? user, ServerRangedWeaponComponent weapon) - { - User = user; - Weapon = weapon; - } - } -} diff --git a/Content.Server/Weapon/Ranged/RangedWeaponSystem.cs b/Content.Server/Weapon/Ranged/RangedWeaponSystem.cs deleted file mode 100644 index e6a2e8a5af..0000000000 --- a/Content.Server/Weapon/Ranged/RangedWeaponSystem.cs +++ /dev/null @@ -1,22 +0,0 @@ -using Content.Shared.Hands; - -namespace Content.Server.Weapon.Ranged -{ - public sealed class RangedWeaponSysten : EntitySystem - { - public override void Initialize() - { - base.Initialize(); - - SubscribeLocalEvent(OnHandSelected); - } - - private void OnHandSelected(EntityUid uid, ServerRangedWeaponComponent component, HandSelectedEvent args) - { - // Instead of dirtying on hand-select this component should probably by dirtied whenever it needs to be. - // I take no responsibility for this code. It was like this when I got here. - - Dirty(component); - } - } -} diff --git a/Content.Server/Weapon/Ranged/ServerRangedWeaponComponent.cs b/Content.Server/Weapon/Ranged/ServerRangedWeaponComponent.cs deleted file mode 100644 index 1719183f61..0000000000 --- a/Content.Server/Weapon/Ranged/ServerRangedWeaponComponent.cs +++ /dev/null @@ -1,30 +0,0 @@ -using Content.Shared.Sound; -using Content.Shared.Weapons.Ranged.Components; - -namespace Content.Server.Weapon.Ranged -{ - [RegisterComponent] - public sealed class ServerRangedWeaponComponent : SharedRangedWeaponComponent - { - public TimeSpan LastFireTime; - - [ViewVariables(VVAccess.ReadWrite)] - [DataField("clumsyCheck")] - public bool ClumsyCheck { get; set; } = true; - - [ViewVariables(VVAccess.ReadWrite)] - [DataField("clumsyExplodeChance")] - public float ClumsyExplodeChance { get; set; } = 0.5f; - - [ViewVariables(VVAccess.ReadWrite)] - [DataField("canHotspot")] - public bool CanHotspot = true; - - [DataField("clumsyWeaponHandlingSound")] - public SoundSpecifier ClumsyWeaponHandlingSound = new SoundPathSpecifier("/Audio/Items/bikehorn.ogg"); - - [DataField("clumsyWeaponShotSound")] - public SoundSpecifier ClumsyWeaponShotSound = new SoundPathSpecifier("/Audio/Weapons/Guns/Gunshots/bang.ogg"); - - } -} diff --git a/Content.Server/Weapon/Ranged/ChemicalAmmoSystem.cs b/Content.Server/Weapon/Ranged/Systems/ChemicalAmmoSystem.cs similarity index 87% rename from Content.Server/Weapon/Ranged/ChemicalAmmoSystem.cs rename to Content.Server/Weapon/Ranged/Systems/ChemicalAmmoSystem.cs index 777e629ee3..49d3dbebc7 100644 --- a/Content.Server/Weapon/Ranged/ChemicalAmmoSystem.cs +++ b/Content.Server/Weapon/Ranged/Systems/ChemicalAmmoSystem.cs @@ -1,14 +1,14 @@ using System.Linq; using Content.Server.Chemistry.EntitySystems; -using Content.Server.Weapon.Ranged.Ammunition.Components; -using Content.Server.Weapon.Ranged.Barrels.Components; +using Content.Server.Weapon.Ranged.Components; using Content.Shared.Chemistry.Components; +using Content.Shared.Weapons.Ranged.Events; -namespace Content.Server.Weapon.Ranged +namespace Content.Server.Weapon.Ranged.Systems { public sealed class ChemicalAmmoSystem : EntitySystem { - [Dependency] private SolutionContainerSystem _solutionSystem = default!; + [Dependency] private readonly SolutionContainerSystem _solutionSystem = default!; public override void Initialize() { diff --git a/Content.Server/Weapon/Ranged/Systems/FlyBySoundSystem.cs b/Content.Server/Weapon/Ranged/Systems/FlyBySoundSystem.cs new file mode 100644 index 0000000000..993322a52d --- /dev/null +++ b/Content.Server/Weapon/Ranged/Systems/FlyBySoundSystem.cs @@ -0,0 +1,5 @@ +using Content.Shared.Weapons.Ranged.Systems; + +namespace Content.Server.Weapon.Ranged.Systems; + +public sealed class FlyBySoundSystem : SharedFlyBySoundSystem {} diff --git a/Content.Server/Weapon/Ranged/Systems/GunSystem.Ballistic.cs b/Content.Server/Weapon/Ranged/Systems/GunSystem.Ballistic.cs new file mode 100644 index 0000000000..cbfe3c22c7 --- /dev/null +++ b/Content.Server/Weapon/Ranged/Systems/GunSystem.Ballistic.cs @@ -0,0 +1,31 @@ +using Content.Shared.Weapons.Ranged.Components; +using Robust.Shared.Map; + +namespace Content.Server.Weapon.Ranged.Systems; + +public sealed partial class GunSystem +{ + protected override void Cycle(BallisticAmmoProviderComponent component, MapCoordinates coordinates) + { + EntityUid? ent = null; + + // TODO: Combine with TakeAmmo + if (component.Entities.Count > 0) + { + var existing = component.Entities[^1]; + component.Entities.RemoveAt(component.Entities.Count - 1); + + component.Container.Remove(existing); + EnsureComp(existing); + } + else if (component.UnspawnedCount > 0) + { + component.UnspawnedCount--; + ent = Spawn(component.FillProto, coordinates); + EnsureComp(ent.Value); + } + + if (ent != null) + EjectCartridge(ent.Value); + } +} diff --git a/Content.Server/Weapon/Ranged/Systems/GunSystem.Battery.cs b/Content.Server/Weapon/Ranged/Systems/GunSystem.Battery.cs new file mode 100644 index 0000000000..34d089e62a --- /dev/null +++ b/Content.Server/Weapon/Ranged/Systems/GunSystem.Battery.cs @@ -0,0 +1,59 @@ +using Content.Server.Power.Components; +using Content.Shared.Weapons.Ranged.Components; + +namespace Content.Server.Weapon.Ranged.Systems; + +public sealed partial class GunSystem +{ + protected override void InitializeBattery() + { + base.InitializeBattery(); + + // Hitscan + SubscribeLocalEvent(OnBatteryStartup); + SubscribeLocalEvent(OnBatteryChargeChange); + + // Projectile + SubscribeLocalEvent(OnBatteryStartup); + SubscribeLocalEvent(OnBatteryChargeChange); + } + + private void OnBatteryStartup(EntityUid uid, BatteryAmmoProviderComponent component, ComponentStartup args) + { + UpdateShots(uid, component); + } + + private void OnBatteryChargeChange(EntityUid uid, BatteryAmmoProviderComponent component, ChargeChangedEvent args) + { + UpdateShots(uid, component); + } + + private void UpdateShots(EntityUid uid, BatteryAmmoProviderComponent component) + { + if (!TryComp(uid, out var battery)) return; + UpdateShots(component, battery); + } + + private void UpdateShots(BatteryAmmoProviderComponent component, BatteryComponent battery) + { + var shots = (int) (battery.CurrentCharge / component.FireCost); + var maxShots = (int) (battery.MaxCharge / component.FireCost); + + if (component.Shots != shots || component.Capacity != maxShots) + { + Dirty(component); + } + + component.Shots = shots; + component.Capacity = maxShots; + UpdateBatteryAppearance(component.Owner, component); + } + + protected override void TakeCharge(EntityUid uid, BatteryAmmoProviderComponent component) + { + if (!TryComp(uid, out var battery)) return; + + battery.CurrentCharge -= component.FireCost; + UpdateShots(component, battery); + } +} diff --git a/Content.Server/Weapon/Ranged/Systems/GunSystem.Revolver.cs b/Content.Server/Weapon/Ranged/Systems/GunSystem.Revolver.cs new file mode 100644 index 0000000000..7f68d20531 --- /dev/null +++ b/Content.Server/Weapon/Ranged/Systems/GunSystem.Revolver.cs @@ -0,0 +1,17 @@ +using Content.Shared.Weapons.Ranged.Components; + +namespace Content.Server.Weapon.Ranged.Systems; + +public sealed partial class GunSystem +{ + protected override void SpinRevolver(RevolverAmmoProviderComponent component, EntityUid? user = null) + { + base.SpinRevolver(component, user); + var index = Random.Next(component.Capacity); + + if (component.CurrentIndex == index) return; + + component.CurrentIndex = index; + Dirty(component); + } +} diff --git a/Content.Server/Weapon/Ranged/Systems/GunSystem.cs b/Content.Server/Weapon/Ranged/Systems/GunSystem.cs new file mode 100644 index 0000000000..537dd5bc58 --- /dev/null +++ b/Content.Server/Weapon/Ranged/Systems/GunSystem.cs @@ -0,0 +1,298 @@ +using System.Linq; +using Content.Server.Projectiles.Components; +using Content.Server.Weapon.Melee; +using Content.Server.Weapon.Ranged.Components; +using Content.Shared.Audio; +using Content.Shared.Damage; +using Content.Shared.Database; +using Content.Shared.Sound; +using Content.Shared.Throwing; +using Content.Shared.Weapons.Ranged; +using Content.Shared.Weapons.Ranged.Components; +using Content.Shared.Weapons.Ranged.Events; +using Robust.Server.GameObjects; +using Robust.Shared.Audio; +using Robust.Shared.Map; +using Robust.Shared.Physics; +using Robust.Shared.Player; +using Robust.Shared.Random; +using Robust.Shared.Utility; +using SharedGunSystem = Content.Shared.Weapons.Ranged.Systems.SharedGunSystem; + +namespace Content.Server.Weapon.Ranged.Systems; + +public sealed partial class GunSystem : SharedGunSystem +{ + [Dependency] private readonly EffectSystem _effects = default!; + + public const float DamagePitchVariation = MeleeWeaponSystem.DamagePitchVariation; + + public override void Shoot(GunComponent gun, List ammo, EntityCoordinates fromCoordinates, EntityCoordinates toCoordinates, EntityUid? user = null) + { + var fromMap = fromCoordinates.ToMap(EntityManager); + var toMap = toCoordinates.ToMapPos(EntityManager); + var mapDirection = toMap - fromMap.Position; + var mapAngle = mapDirection.ToAngle(); + var angle = GetRecoilAngle(Timing.CurTime, gun, mapDirection.ToAngle()); + + // Update shot based on the recoil + toMap = fromMap.Position + angle.ToVec() * mapDirection.Length; + mapDirection = toMap - fromMap.Position; + var entityDirection = Transform(fromCoordinates.EntityId).InvWorldMatrix.Transform(toMap) - fromCoordinates.Position; + + // I must be high because this was getting tripped even when true. + // DebugTools.Assert(direction != Vector2.Zero); + var shotProjectiles = new List(ammo.Count); + + foreach (var shootable in ammo) + { + switch (shootable) + { + // Cartridge shoots something else + case CartridgeAmmoComponent cartridge: + if (!cartridge.Spent) + { + if (cartridge.Count > 1) + { + var angles = LinearSpread(mapAngle - Angle.FromDegrees(cartridge.Spread / 2f), + mapAngle + Angle.FromDegrees(cartridge.Spread / 2f), cartridge.Count); + + for (var i = 0; i < cartridge.Count; i++) + { + var uid = Spawn(cartridge.Prototype, fromCoordinates); + ShootProjectile(uid, angles[i].ToVec(), user); + shotProjectiles.Add(uid); + } + } + else + { + var uid = Spawn(cartridge.Prototype, fromCoordinates); + ShootProjectile(uid, mapDirection, user); + shotProjectiles.Add(uid); + } + + SetCartridgeSpent(cartridge, true); + MuzzleFlash(gun.Owner, cartridge, user); + + if (cartridge.DeleteOnSpawn) + Del(cartridge.Owner); + } + else + { + PlaySound(gun.Owner, gun.SoundEmpty?.GetSound(Random, ProtoManager), user); + } + + // Something like ballistic might want to leave it in the container still + if (!cartridge.DeleteOnSpawn && !Containers.IsEntityInContainer(cartridge.Owner)) + EjectCartridge(cartridge.Owner); + + Dirty(cartridge); + break; + // Ammo shoots itself + case AmmoComponent newAmmo: + shotProjectiles.Add(newAmmo.Owner); + MuzzleFlash(gun.Owner, newAmmo, user); + + // Do a throw + if (!HasComp(newAmmo.Owner)) + { + RemComp(newAmmo.Owner); + // TODO: Someone can probably yeet this a billion miles so need to pre-validate input somewhere up the call stack. + ThrowingSystem.TryThrow(newAmmo.Owner, mapDirection, 20f, user); + break; + } + + ShootProjectile(newAmmo.Owner, mapDirection, user); + break; + case HitscanPrototype hitscan: + var ray = new CollisionRay(fromMap.Position, mapDirection.Normalized, hitscan.CollisionMask); + var rayCastResults = Physics.IntersectRay(fromMap.MapId, ray, hitscan.MaxLength, user, false).ToList(); + + if (rayCastResults.Count >= 1) + { + var result = rayCastResults[0]; + var distance = result.Distance; + FireEffects(fromCoordinates, distance, entityDirection.ToAngle(), hitscan, result.HitEntity); + + var dmg = hitscan.Damage; + + if (dmg != null) + dmg = Damageable.TryChangeDamage(result.HitEntity, dmg); + + if (dmg != null) + { + if (user != null) + { + Logs.Add(LogType.HitScanHit, + $"{ToPrettyString(user.Value):user} hit {ToPrettyString(result.HitEntity):target} using hitscan and dealt {dmg.Total:damage} damage"); + } + else + { + Logs.Add(LogType.HitScanHit, + $"Hit {ToPrettyString(result.HitEntity):target} using hitscan and dealt {dmg.Total:damage} damage"); + } + } + } + else + { + FireEffects(fromCoordinates, hitscan.MaxLength, entityDirection.ToAngle(), hitscan); + } + break; + default: + throw new ArgumentOutOfRangeException(); + } + } + + RaiseLocalEvent(gun.Owner, new AmmoShotEvent() + { + FiredProjectiles = shotProjectiles, + }, false); + } + + private void ShootProjectile(EntityUid uid, Vector2 direction, EntityUid? user = null) + { + var physics = EnsureComp(uid); + physics.BodyStatus = BodyStatus.InAir; + physics.LinearVelocity = direction.Normalized * 20f; + + if (user != null) + { + var projectile = EnsureComp(uid); + projectile.IgnoreEntity(user.Value); + } + + Transform(uid).WorldRotation = direction.ToWorldAngle(); + } + + /// + /// Gets a linear spread of angles between start and end. + /// + /// Start angle in degrees + /// End angle in degrees + /// How many shots there are + private Angle[] LinearSpread(Angle start, Angle end, int intervals) + { + var angles = new Angle[intervals]; + DebugTools.Assert(intervals > 1); + + for (var i = 0; i <= intervals - 1; i++) + { + angles[i] = new Angle(start + (end - start) * i / (intervals - 1)); + } + + return angles; + } + + private Angle GetRecoilAngle(TimeSpan curTime, GunComponent component, Angle direction) + { + var timeSinceLastFire = (curTime - component.LastFire).TotalSeconds; + var newTheta = MathHelper.Clamp(component.CurrentAngle.Theta + component.AngleIncrease.Theta - component.AngleDecay.Theta * timeSinceLastFire, component.MinAngle.Theta, component.MaxAngle.Theta); + component.CurrentAngle = new Angle(newTheta); + component.LastFire = component.NextFire; + + // Convert it so angle can go either side. + var random = Random.NextGaussian(0, 0.5); + var angle = new Angle(direction.Theta + component.CurrentAngle.Theta * random); + return angle; + } + + protected override void PlaySound(EntityUid gun, string? sound, EntityUid? user = null) + { + if (sound == null) return; + + SoundSystem.Play(Filter.Pvs(gun, entityManager: EntityManager).RemoveWhereAttachedEntity(e => e == user), sound, gun); + } + + protected override void Popup(string message, EntityUid? uid, EntityUid? user) {} + + protected override void CreateEffect(EffectSystemMessage message, EntityUid? user = null) + { + // TODO: Fucking bad + if (TryComp(user, out var actor)) + { + _effects.CreateParticle(message, actor.PlayerSession); + } + else + { + _effects.CreateParticle(message); + } + } + + public void PlayImpactSound(EntityUid otherEntity, DamageSpecifier? modifiedDamage, SoundSpecifier? weaponSound, bool forceWeaponSound) + { + // Like projectiles and melee, + // 1. Entity specific sound + // 2. Ammo's sound + // 3. Nothing + var playedSound = false; + + if (!forceWeaponSound && modifiedDamage != null && modifiedDamage.Total > 0 && TryComp(otherEntity, out var rangedSound)) + { + var type = MeleeWeaponSystem.GetHighestDamageSound(modifiedDamage, ProtoManager); + + if (type != null && rangedSound.SoundTypes?.TryGetValue(type, out var damageSoundType) == true) + { + SoundSystem.Play( + Filter.Pvs(otherEntity, entityManager: EntityManager), + damageSoundType!.GetSound(), + otherEntity, + AudioHelpers.WithVariation(DamagePitchVariation)); + + playedSound = true; + } + else if (type != null && rangedSound.SoundGroups?.TryGetValue(type, out var damageSoundGroup) == true) + { + SoundSystem.Play( + Filter.Pvs(otherEntity, entityManager: EntityManager), + damageSoundGroup!.GetSound(), + otherEntity, + AudioHelpers.WithVariation(DamagePitchVariation)); + + playedSound = true; + } + } + + if (!playedSound && weaponSound != null) + SoundSystem.Play(Filter.Pvs(otherEntity, entityManager: EntityManager), weaponSound.GetSound(), otherEntity); + } + + // TODO: Pseudo RNG so the client can predict these. + #region Hitscan effects + + private void FireEffects(EntityCoordinates fromCoordinates, float distance, Angle angle, HitscanPrototype hitscan, EntityUid? hitEntity = null) + { + // Lord + // Forgive me for the shitcode I am about to do + // Effects tempt me not + var sprites = new List<(EntityCoordinates coordinates, Angle angle, SpriteSpecifier sprite, float scale)>(); + + // We'll get the effects relative to the grid / map of the firer + if (distance >= 1f) + { + if (hitscan.MuzzleFlash != null) + { + sprites.Add((fromCoordinates.Offset(angle.ToVec().Normalized / 2), angle, hitscan.MuzzleFlash, 1f)); + } + + if (hitscan.TravelFlash != null) + { + sprites.Add((fromCoordinates.Offset(angle.ToVec() * (distance + 0.5f) / 2), angle, hitscan.TravelFlash, distance - 1.5f)); + } + } + + if (hitscan.ImpactFlash != null) + { + sprites.Add((fromCoordinates.Offset(angle.ToVec() * distance), angle.FlipPositive(), hitscan.ImpactFlash, 1f)); + } + + if (sprites.Count > 0) + { + RaiseNetworkEvent(new HitscanEvent() + { + Sprites = sprites, + }, Filter.Pvs(fromCoordinates, entityMan: EntityManager)); + } + } + + #endregion +} diff --git a/Content.Server/Weapon/Ranged/TetherGunSystem.cs b/Content.Server/Weapon/Ranged/Systems/TetherGunSystem.cs similarity index 98% rename from Content.Server/Weapon/Ranged/TetherGunSystem.cs rename to Content.Server/Weapon/Ranged/Systems/TetherGunSystem.cs index 7dbb7526c8..e1fc7edda6 100644 --- a/Content.Server/Weapon/Ranged/TetherGunSystem.cs +++ b/Content.Server/Weapon/Ranged/Systems/TetherGunSystem.cs @@ -1,6 +1,6 @@ using Content.Server.Ghost.Components; using Content.Shared.Administration; -using Content.Shared.Weapons.Ranged; +using Content.Shared.Weapons.Ranged.Systems; using Robust.Server.Console; using Robust.Server.Player; using Robust.Shared.Containers; @@ -11,7 +11,7 @@ using Robust.Shared.Players; using Robust.Shared.Timing; using Robust.Shared.Utility; -namespace Content.Server.Weapon.Ranged; +namespace Content.Server.Weapon.Ranged.Systems; public sealed class TetherGunSystem : SharedTetherGunSystem { diff --git a/Content.Shared/CombatMode/SharedCombatModeSystem.cs b/Content.Shared/CombatMode/SharedCombatModeSystem.cs index 3495f807ca..d08544ad47 100644 --- a/Content.Shared/CombatMode/SharedCombatModeSystem.cs +++ b/Content.Shared/CombatMode/SharedCombatModeSystem.cs @@ -52,6 +52,11 @@ namespace Content.Shared.CombatMode _actionsSystem.RemoveAction(uid, component.DisarmAction); } + public bool IsInCombatMode(EntityUid entity) + { + return TryComp(entity, out var combatMode) && combatMode.IsInCombatMode; + } + private void OnActionPerform(EntityUid uid, SharedCombatModeComponent component, ToggleCombatActionEvent args) { if (args.Handled) diff --git a/Content.Shared/Containers/ItemSlot/ItemSlotsSystem.cs b/Content.Shared/Containers/ItemSlot/ItemSlotsSystem.cs index b872af8b53..50d0c17344 100644 --- a/Content.Shared/Containers/ItemSlot/ItemSlotsSystem.cs +++ b/Content.Shared/Containers/ItemSlot/ItemSlotsSystem.cs @@ -203,6 +203,8 @@ namespace Content.Shared.Containers.ItemSlots // ContainerSlot automatically raises a directed EntInsertedIntoContainerMessage PlaySound(uid, slot.InsertSound, slot.SoundOptions, excludeUserAudio ? user : null); + var ev = new ItemSlotChangedEvent(); + RaiseLocalEvent(uid, ref ev); } /// @@ -326,6 +328,8 @@ namespace Content.Shared.Containers.ItemSlots // ContainerSlot automatically raises a directed EntRemovedFromContainerMessage PlaySound(uid, slot.EjectSound, slot.SoundOptions, excludeUserAudio ? user : null); + var ev = new ItemSlotChangedEvent(); + RaiseLocalEvent(uid, ref ev); } /// @@ -336,13 +340,13 @@ namespace Content.Shared.Containers.ItemSlots { item = null; - /// This handles logic with the slot itself + // This handles logic with the slot itself if (!CanEject(slot)) return false; item = slot.Item; - /// This handles user logic + // This handles user logic if (user != null && item != null && !_actionBlockerSystem.CanPickup(user.Value, item.Value)) return false; @@ -354,7 +358,7 @@ namespace Content.Shared.Containers.ItemSlots /// Try to eject item from a slot. /// /// False if the id is not valid, the item slot is locked, or it has no item inserted - public bool TryEject(EntityUid uid, string id, EntityUid user, + public bool TryEject(EntityUid uid, string id, EntityUid? user, [NotNullWhen(true)] out EntityUid? item, ItemSlotsComponent? itemSlots = null, bool excludeUserAudio = false) { item = null; @@ -586,4 +590,10 @@ namespace Content.Shared.Containers.ItemSlots args.State = new ItemSlotsComponentState(component.Slots); } } + + /// + /// Raised directed on an entity when one of its item slots changes. + /// + [ByRefEvent] + public readonly struct ItemSlotChangedEvent {} } diff --git a/Content.Shared/Weapons/Ranged/Barrels/Components/SharedBoltActionBarrelComponent.cs b/Content.Shared/Weapons/Ranged/Barrels/Components/SharedBoltActionBarrelComponent.cs deleted file mode 100644 index ff87754280..0000000000 --- a/Content.Shared/Weapons/Ranged/Barrels/Components/SharedBoltActionBarrelComponent.cs +++ /dev/null @@ -1,26 +0,0 @@ -using Content.Shared.Weapons.Ranged.Components; -using Robust.Shared.Serialization; - -namespace Content.Shared.Weapons.Ranged.Barrels.Components -{ - [Serializable, NetSerializable] - public sealed class BoltActionBarrelComponentState : ComponentState - { - public (bool chambered, bool spent) Chamber { get; } - public FireRateSelector FireRateSelector { get; } - public (int count, int max)? Magazine { get; } - public string? SoundGunshot { get; } - - public BoltActionBarrelComponentState( - (bool chambered, bool spent) chamber, - FireRateSelector fireRateSelector, - (int count, int max)? magazine, - string? soundGunshot) - { - Chamber = chamber; - FireRateSelector = fireRateSelector; - Magazine = magazine; - SoundGunshot = soundGunshot; - } - } -} diff --git a/Content.Shared/Weapons/Ranged/Barrels/Components/SharedMagazineBarrelComponent.cs b/Content.Shared/Weapons/Ranged/Barrels/Components/SharedMagazineBarrelComponent.cs deleted file mode 100644 index 6d07fcb6d5..0000000000 --- a/Content.Shared/Weapons/Ranged/Barrels/Components/SharedMagazineBarrelComponent.cs +++ /dev/null @@ -1,46 +0,0 @@ -using Content.Shared.Weapons.Ranged.Components; -using Robust.Shared.Serialization; - -namespace Content.Shared.Weapons.Ranged.Barrels.Components -{ - [Serializable, NetSerializable] - public enum AmmoVisuals - { - AmmoCount, - AmmoMax, - Spent, - } - - [Serializable, NetSerializable] - public enum MagazineBarrelVisuals - { - MagLoaded - } - - [Serializable, NetSerializable] - public enum BarrelBoltVisuals - { - BoltOpen, - } - - [Serializable, NetSerializable] - public sealed class MagazineBarrelComponentState : ComponentState - { - public bool Chambered { get; } - public FireRateSelector FireRateSelector { get; } - public (int count, int max)? Magazine { get; } - public string? SoundGunshot { get; } - - public MagazineBarrelComponentState( - bool chambered, - FireRateSelector fireRateSelector, - (int count, int max)? magazine, - string? soundGunshot) - { - Chambered = chambered; - FireRateSelector = fireRateSelector; - Magazine = magazine; - SoundGunshot = soundGunshot; - } - } -} diff --git a/Content.Shared/Weapons/Ranged/Barrels/Components/SharedPumpBarrelComponent.cs b/Content.Shared/Weapons/Ranged/Barrels/Components/SharedPumpBarrelComponent.cs deleted file mode 100644 index bb910abc2b..0000000000 --- a/Content.Shared/Weapons/Ranged/Barrels/Components/SharedPumpBarrelComponent.cs +++ /dev/null @@ -1,26 +0,0 @@ -using Content.Shared.Weapons.Ranged.Components; -using Robust.Shared.Serialization; - -namespace Content.Shared.Weapons.Ranged.Barrels.Components -{ - [Serializable, NetSerializable] - public sealed class PumpBarrelComponentState : ComponentState - { - public (bool chambered, bool spent) Chamber { get; } - public FireRateSelector FireRateSelector { get; } - public (int count, int max)? Magazine { get; } - public string? SoundGunshot { get; } - - public PumpBarrelComponentState( - (bool chambered, bool spent) chamber, - FireRateSelector fireRateSelector, - (int count, int max)? magazine, - string? soundGunshot) - { - Chamber = chamber; - FireRateSelector = fireRateSelector; - Magazine = magazine; - SoundGunshot = soundGunshot; - } - } -} diff --git a/Content.Shared/Weapons/Ranged/Barrels/Components/SharedRevolverBarrelComponent.cs b/Content.Shared/Weapons/Ranged/Barrels/Components/SharedRevolverBarrelComponent.cs deleted file mode 100644 index 133ca84462..0000000000 --- a/Content.Shared/Weapons/Ranged/Barrels/Components/SharedRevolverBarrelComponent.cs +++ /dev/null @@ -1,26 +0,0 @@ -using Content.Shared.Weapons.Ranged.Components; -using Robust.Shared.Serialization; - -namespace Content.Shared.Weapons.Ranged.Barrels.Components -{ - [Serializable, NetSerializable] - public sealed class RevolverBarrelComponentState : ComponentState - { - public int CurrentSlot { get; } - public FireRateSelector FireRateSelector { get; } - public bool?[] Bullets { get; } - public string? SoundGunshot { get; } - - public RevolverBarrelComponentState( - int currentSlot, - FireRateSelector fireRateSelector, - bool?[] bullets, - string? soundGunshot) - { - CurrentSlot = currentSlot; - FireRateSelector = fireRateSelector; - Bullets = bullets; - SoundGunshot = soundGunshot; - } - } -} diff --git a/Content.Shared/Weapons/Ranged/Components/AmmoComponent.cs b/Content.Shared/Weapons/Ranged/Components/AmmoComponent.cs new file mode 100644 index 0000000000..6bcbcef148 --- /dev/null +++ b/Content.Shared/Weapons/Ranged/Components/AmmoComponent.cs @@ -0,0 +1,54 @@ +using Content.Shared.Sound; +using Content.Shared.Weapons.Ranged.Systems; +using Robust.Shared.GameStates; +using Robust.Shared.Prototypes; +using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype; +using Robust.Shared.Utility; + +namespace Content.Shared.Weapons.Ranged.Components; + +/// +/// Allows the entity to be fired from a gun. +/// +[RegisterComponent, Virtual] +public class AmmoComponent : Component, IShootable +{ + // Muzzle flash stored on ammo because if we swap a gun to whatever we may want to override it. + + [ViewVariables, DataField("muzzleFlash")] + public ResourcePath? MuzzleFlash = new ResourcePath("Objects/Weapons/Guns/Projectiles/projectiles.rsi/muzzle_bullet.png"); +} + +/// +/// Spawns another prototype to be shot instead of itself. +/// +[RegisterComponent, NetworkedComponent, ComponentReference(typeof(AmmoComponent))] +public sealed class CartridgeAmmoComponent : AmmoComponent +{ + [ViewVariables(VVAccess.ReadWrite), DataField("proto", required: true, customTypeSerializer: typeof(PrototypeIdSerializer))] + public string Prototype = default!; + + [ViewVariables(VVAccess.ReadWrite), DataField("spent")] + public bool Spent = false; + + /// + /// How much the ammo spreads when shot, in degrees. Does nothing if count is 0. + /// + [ViewVariables(VVAccess.ReadWrite), DataField("spread")] + public float Spread = 10f; + + /// + /// How many prototypes are spawned when shot. + /// + [ViewVariables(VVAccess.ReadWrite), DataField("count")] + public int Count = 1; + + /// + /// Caseless ammunition. + /// + [ViewVariables, DataField("deleteOnSpawn")] + public bool DeleteOnSpawn; + + [ViewVariables, DataField("soundEject")] + public SoundSpecifier? EjectSound = new SoundCollectionSpecifier("CasingEject"); +} diff --git a/Content.Shared/Weapons/Ranged/Components/AmmoProviderComponent.cs b/Content.Shared/Weapons/Ranged/Components/AmmoProviderComponent.cs new file mode 100644 index 0000000000..c54d081c88 --- /dev/null +++ b/Content.Shared/Weapons/Ranged/Components/AmmoProviderComponent.cs @@ -0,0 +1,6 @@ +using Robust.Shared.GameStates; + +namespace Content.Shared.Weapons.Ranged.Components; + +[NetworkedComponent] +public abstract class AmmoProviderComponent : Component {} diff --git a/Content.Shared/Weapons/Ranged/Components/BallisticAmmoProviderComponent.cs b/Content.Shared/Weapons/Ranged/Components/BallisticAmmoProviderComponent.cs new file mode 100644 index 0000000000..73a85c5641 --- /dev/null +++ b/Content.Shared/Weapons/Ranged/Components/BallisticAmmoProviderComponent.cs @@ -0,0 +1,48 @@ +using Content.Shared.Sound; +using Content.Shared.Whitelist; +using Robust.Shared.Containers; +using Robust.Shared.GameStates; +using Robust.Shared.Prototypes; +using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype; + +namespace Content.Shared.Weapons.Ranged.Components; + +[RegisterComponent, NetworkedComponent] +public sealed class BallisticAmmoProviderComponent : Component +{ + [ViewVariables(VVAccess.ReadOnly), DataField("soundRack")] + public SoundSpecifier? SoundRack = new SoundPathSpecifier("/Audio/Weapons/Guns/Cock/smg_cock.ogg"); + + [ViewVariables(VVAccess.ReadOnly), DataField("soundInsert")] + public SoundSpecifier? SoundInsert = new SoundPathSpecifier("/Audio/Weapons/Guns/MagIn/bullet_insert.ogg"); + + [ViewVariables, DataField("proto", customTypeSerializer: typeof(PrototypeIdSerializer))] + public string? FillProto; + + [ViewVariables(VVAccess.ReadWrite), DataField("capacity")] + public int Capacity = 30; + + [ViewVariables, DataField("unspawnedCount")] + public int UnspawnedCount; + + [ViewVariables(VVAccess.ReadWrite), DataField("whitelist")] + public EntityWhitelist? Whitelist; + + public Container Container = default!; + + // TODO: Make this use stacks when the typeserializer is done. + [ViewVariables, DataField("entities")] + public List Entities = new(); + + /// + /// Will the ammoprovider automatically cycle through rounds or does it need doing manually. + /// + [ViewVariables(VVAccess.ReadWrite), DataField("autoCycle")] + public bool AutoCycle = true; + + /// + /// Is the gun ready to shoot; if AutoCycle is true then this will always stay true and not need to be manually done. + /// + [ViewVariables(VVAccess.ReadWrite), DataField("cycled")] + public bool Cycled = true; +} diff --git a/Content.Shared/Weapons/Ranged/Components/BatteryAmmoProviderComponent.cs b/Content.Shared/Weapons/Ranged/Components/BatteryAmmoProviderComponent.cs new file mode 100644 index 0000000000..438276e21f --- /dev/null +++ b/Content.Shared/Weapons/Ranged/Components/BatteryAmmoProviderComponent.cs @@ -0,0 +1,18 @@ +namespace Content.Shared.Weapons.Ranged.Components; + +public abstract class BatteryAmmoProviderComponent : AmmoProviderComponent +{ + /// + /// How much battery it costs to fire once. + /// + [ViewVariables, DataField("fireCost")] + public float FireCost = 100; + + // Batteries aren't predicted which means we need to track the battery and manually count it ourselves woo! + + [ViewVariables] + public int Shots; + + [ViewVariables] + public int Capacity; +} diff --git a/Content.Shared/Weapons/Ranged/Components/ChamberMagazineAmmoProviderComponent.cs b/Content.Shared/Weapons/Ranged/Components/ChamberMagazineAmmoProviderComponent.cs new file mode 100644 index 0000000000..10fcb6ddd6 --- /dev/null +++ b/Content.Shared/Weapons/Ranged/Components/ChamberMagazineAmmoProviderComponent.cs @@ -0,0 +1,7 @@ +namespace Content.Shared.Weapons.Ranged.Components; + +/// +/// Chamber + mags in one package. If you need just magazine then use +/// +[RegisterComponent] +public sealed class ChamberMagazineAmmoProviderComponent : MagazineAmmoProviderComponent {} diff --git a/Content.Shared/Weapons/Ranged/FlyBySoundComponent.cs b/Content.Shared/Weapons/Ranged/Components/FlyBySoundComponent.cs similarity index 93% rename from Content.Shared/Weapons/Ranged/FlyBySoundComponent.cs rename to Content.Shared/Weapons/Ranged/Components/FlyBySoundComponent.cs index 4d10fbc817..43fd067e26 100644 --- a/Content.Shared/Weapons/Ranged/FlyBySoundComponent.cs +++ b/Content.Shared/Weapons/Ranged/Components/FlyBySoundComponent.cs @@ -2,7 +2,7 @@ using Content.Shared.Sound; using Robust.Shared.Audio; using Robust.Shared.GameStates; -namespace Content.Shared.Weapons.Ranged; +namespace Content.Shared.Weapons.Ranged.Components; /// /// Plays a sound when its non-hard fixture collides with a player. diff --git a/Content.Shared/Weapons/Ranged/Components/GunComponent.cs b/Content.Shared/Weapons/Ranged/Components/GunComponent.cs new file mode 100644 index 0000000000..f153794f09 --- /dev/null +++ b/Content.Shared/Weapons/Ranged/Components/GunComponent.cs @@ -0,0 +1,119 @@ +using Content.Shared.Actions.ActionTypes; +using Content.Shared.Sound; +using Robust.Shared.GameStates; +using Robust.Shared.Map; + +namespace Content.Shared.Weapons.Ranged.Components; + +[RegisterComponent, NetworkedComponent, Virtual] +public class GunComponent : Component +{ + #region Sound + + [ViewVariables(VVAccess.ReadWrite), DataField("soundGunshot")] + public SoundSpecifier? SoundGunshot = new SoundPathSpecifier("/Audio/Weapons/Guns/Gunshots/smg.ogg"); + + [ViewVariables(VVAccess.ReadWrite), DataField("soundEmpty")] + public SoundSpecifier? SoundEmpty = new SoundPathSpecifier("/Audio/Weapons/Guns/Empty/empty.ogg"); + + /// + /// Sound played when toggling the for this gun. + /// + [ViewVariables(VVAccess.ReadWrite), DataField("soundMode")] + public SoundSpecifier? SoundModeToggle = new SoundPathSpecifier("/Audio/Weapons/Guns/Misc/selector.ogg"); + + #endregion + + #region Recoil + + // These values are very small for now until we get a debug overlay and fine tune it + + /// + /// Last time the gun fired. + /// Used for recoil purposes. + /// + [ViewVariables, DataField("lastFire")] + public TimeSpan LastFire = TimeSpan.Zero; + + /// + /// What the current spread is for shooting. This gets changed every time the gun fires. + /// + [ViewVariables, DataField("currentAngle")] + public Angle CurrentAngle; + + /// + /// How much the spread increases every time the gun fires. + /// + [ViewVariables, DataField("angleIncrease")] + public Angle AngleIncrease = Angle.FromDegrees(0.5); + + /// + /// How much the decreases per second. + /// + [ViewVariables, DataField("angleDecay")] + public Angle AngleDecay = Angle.FromDegrees(4); + + /// + /// The maximum angle allowed for + /// + [ViewVariables, DataField("maxAngle")] + public Angle MaxAngle = Angle.FromDegrees(2); + + /// + /// The minimum angle allowed for + /// + [ViewVariables, DataField("minAngle")] + public Angle MinAngle = Angle.FromDegrees(1); + + #endregion + + /// + /// Where the gun is being requested to shoot. + /// + [ViewVariables] + public EntityCoordinates? ShootCoordinates = null; + + /// + /// Used for tracking semi-auto / burst + /// + [ViewVariables] + public int ShotCounter = 0; + + /// + /// How many times it shoots per second. + /// + [ViewVariables(VVAccess.ReadWrite), DataField("fireRate")] + public float FireRate = 8f; + + /// + /// When the gun is next available to be shot. + /// Can be set multiple times in a single tick due to guns firing faster than a single tick time. + /// + [ViewVariables, DataField("nextFire")] + public TimeSpan NextFire = TimeSpan.Zero; + + /// + /// What firemodes can be selected. + /// + [ViewVariables(VVAccess.ReadWrite), DataField("availableModes")] + public SelectiveFire AvailableModes = SelectiveFire.SemiAuto; + + /// + /// What firemode is currently selected. + /// + [ViewVariables(VVAccess.ReadWrite), DataField("selectedMode")] + public SelectiveFire SelectedMode = SelectiveFire.SemiAuto; + + [DataField("selectModeAction")] + public InstantAction? SelectModeAction; +} + +[Flags] +public enum SelectiveFire : byte +{ + Invalid = 0, + // Combat mode already functions as the equivalent of Safety + SemiAuto = 1 << 0, + Burst = 1 << 1, + FullAuto = 1 << 2, // Not in the building! +} diff --git a/Content.Shared/Weapons/Ranged/Components/HitscanBatteryAmmoProviderComponent.cs b/Content.Shared/Weapons/Ranged/Components/HitscanBatteryAmmoProviderComponent.cs new file mode 100644 index 0000000000..57b9ac91fa --- /dev/null +++ b/Content.Shared/Weapons/Ranged/Components/HitscanBatteryAmmoProviderComponent.cs @@ -0,0 +1,11 @@ +using Robust.Shared.GameStates; +using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype; + +namespace Content.Shared.Weapons.Ranged.Components; + +[RegisterComponent, NetworkedComponent] +public sealed class HitscanBatteryAmmoProviderComponent : BatteryAmmoProviderComponent +{ + [ViewVariables(VVAccess.ReadWrite), DataField("proto", required: true, customTypeSerializer: typeof(PrototypeIdSerializer))] + public string Prototype = default!; +} diff --git a/Content.Shared/Weapons/Ranged/Components/MagazineAmmoProviderComponent.cs b/Content.Shared/Weapons/Ranged/Components/MagazineAmmoProviderComponent.cs new file mode 100644 index 0000000000..18d5d04397 --- /dev/null +++ b/Content.Shared/Weapons/Ranged/Components/MagazineAmmoProviderComponent.cs @@ -0,0 +1,20 @@ +using Content.Shared.Sound; +using Content.Shared.Weapons.Ranged.Components; + +namespace Content.Shared.Weapons.Ranged; + +/// +/// Wrapper around a magazine (handled via ItemSlot). Passes all AmmoProvider logic onto it. +/// +[RegisterComponent, Virtual] +public class MagazineAmmoProviderComponent : AmmoProviderComponent +{ + [ViewVariables(VVAccess.ReadWrite), DataField("soundAutoEject")] + public SoundSpecifier? SoundAutoEject = new SoundPathSpecifier("/Audio/Weapons/Guns/EmptyAlarm/smg_empty_alarm.ogg"); + + /// + /// Should the magazine automatically eject when empty. + /// + [ViewVariables(VVAccess.ReadWrite), DataField("autoEject")] + public bool AutoEject = false; +} diff --git a/Content.Shared/Weapons/Ranged/Components/ProjectileBatteryAmmoProviderComponent.cs b/Content.Shared/Weapons/Ranged/Components/ProjectileBatteryAmmoProviderComponent.cs new file mode 100644 index 0000000000..0e5e1bb238 --- /dev/null +++ b/Content.Shared/Weapons/Ranged/Components/ProjectileBatteryAmmoProviderComponent.cs @@ -0,0 +1,12 @@ +using Robust.Shared.GameStates; +using Robust.Shared.Prototypes; +using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype; + +namespace Content.Shared.Weapons.Ranged.Components; + +[RegisterComponent, NetworkedComponent] +public sealed class ProjectileBatteryAmmoProviderComponent : BatteryAmmoProviderComponent +{ + [ViewVariables(VVAccess.ReadWrite), DataField("proto", required: true, customTypeSerializer: typeof(PrototypeIdSerializer))] + public string Prototype = default!; +} diff --git a/Content.Shared/Weapons/Ranged/Components/RevolverAmmoProviderComponent.cs b/Content.Shared/Weapons/Ranged/Components/RevolverAmmoProviderComponent.cs new file mode 100644 index 0000000000..9dbba734b4 --- /dev/null +++ b/Content.Shared/Weapons/Ranged/Components/RevolverAmmoProviderComponent.cs @@ -0,0 +1,50 @@ +using Content.Shared.Sound; +using Content.Shared.Whitelist; +using Robust.Shared.Containers; +using Robust.Shared.GameStates; +using Robust.Shared.Prototypes; +using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype; + +namespace Content.Shared.Weapons.Ranged.Components; + +[RegisterComponent, NetworkedComponent] +public sealed class RevolverAmmoProviderComponent : AmmoProviderComponent +{ + /* + * Revolver has an array of its slots of which we can fire from any index. + * We also keep a separate array of slots we haven't spawned entities for, Chambers. This means that rather than creating + * for example 7 entities when revolver spawns (1 for the revolver and 6 cylinders) we can instead defer it. + */ + + [ViewVariables, DataField("whitelist")] + public EntityWhitelist? Whitelist; + + public Container AmmoContainer = default!; + + [ViewVariables, DataField("currentSlot")] + public int CurrentIndex; + + [ViewVariables, DataField("capacity")] + public int Capacity = 6; + + // Like BallisticAmmoProvider we defer spawning until necessary + // AmmoSlots is the instantiated ammo and Chambers is the unspawned ammo (that may or may not have been shot). + + [DataField("ammoSlots")] + public EntityUid?[] AmmoSlots = Array.Empty(); + + [DataField("chambers")] + public bool?[] Chambers = Array.Empty(); + + [DataField("proto", customTypeSerializer:typeof(PrototypeIdSerializer))] + public string? FillPrototype = "CartridgeMagnum"; + + [ViewVariables, DataField("soundEject")] + public SoundSpecifier? SoundEject = new SoundPathSpecifier("/Audio/Weapons/Guns/MagOut/revolver_magout.ogg"); + + [ViewVariables, DataField("soundInsert")] + public SoundSpecifier? SoundInsert = new SoundPathSpecifier("/Audio/Weapons/Guns/MagIn/revolver_magin.ogg"); + + [ViewVariables, DataField("soundSpin")] + public SoundSpecifier? SoundSpin = new SoundPathSpecifier("/Audio/Weapons/Guns/Misc/revolver_spin.ogg"); +} diff --git a/Content.Shared/Weapons/Ranged/Components/SharedAmmoCounterComponent.cs b/Content.Shared/Weapons/Ranged/Components/SharedAmmoCounterComponent.cs new file mode 100644 index 0000000000..cf70ca516e --- /dev/null +++ b/Content.Shared/Weapons/Ranged/Components/SharedAmmoCounterComponent.cs @@ -0,0 +1,9 @@ +using Robust.Shared.GameStates; + +namespace Content.Shared.Weapons.Ranged.Components; + +/// +/// Shows an ItemStatus with the ammo of the gun. Adjusts based on what the ammoprovider is. +/// +[NetworkedComponent] +public abstract class SharedAmmoCounterComponent : Component {} diff --git a/Content.Shared/Weapons/Ranged/Components/SharedRangedBarrelComponent.cs b/Content.Shared/Weapons/Ranged/Components/SharedRangedBarrelComponent.cs deleted file mode 100644 index 0e49acfe89..0000000000 --- a/Content.Shared/Weapons/Ranged/Components/SharedRangedBarrelComponent.cs +++ /dev/null @@ -1,24 +0,0 @@ -namespace Content.Shared.Weapons.Ranged.Components -{ - public abstract class SharedRangedBarrelComponent : Component - { - [ViewVariables] - public abstract FireRateSelector FireRateSelector { get; } - [ViewVariables] - public abstract FireRateSelector AllRateSelectors { get; } - [ViewVariables] - public abstract float FireRate { get; } - [ViewVariables] - public abstract int ShotsLeft { get; } - [ViewVariables] - public abstract int Capacity { get; } - } - - [Flags] - public enum FireRateSelector - { - Safety = 0, - Single = 1 << 0, - Automatic = 1 << 1, - } -} diff --git a/Content.Shared/Weapons/Ranged/Components/SharedRangedWeaponComponent.cs b/Content.Shared/Weapons/Ranged/Components/SharedRangedWeaponComponent.cs deleted file mode 100644 index 0a9749752c..0000000000 --- a/Content.Shared/Weapons/Ranged/Components/SharedRangedWeaponComponent.cs +++ /dev/null @@ -1,40 +0,0 @@ -using Robust.Shared.GameStates; -using Robust.Shared.Map; -using Robust.Shared.Serialization; - -namespace Content.Shared.Weapons.Ranged.Components -{ - [NetworkedComponent()] - public abstract class SharedRangedWeaponComponent : Component - { - // Each RangedWeapon should have a RangedWeapon component + - // some kind of RangedBarrelComponent (this dictates what ammo is retrieved). - } - - [Serializable, NetSerializable] - public sealed class RangedWeaponComponentState : ComponentState - { - public FireRateSelector FireRateSelector { get; } - - public RangedWeaponComponentState( - FireRateSelector fireRateSelector - ) - { - FireRateSelector = fireRateSelector; - } - } - - /// - /// An event raised when the weapon is fired at a position on the map by a client. - /// - [Serializable, NetSerializable] - public sealed class FirePosEvent : EntityEventArgs - { - public EntityCoordinates Coordinates; - - public FirePosEvent(EntityCoordinates coordinates) - { - Coordinates = coordinates; - } - } -} diff --git a/Content.Shared/Weapons/Ranged/Events/AmmoShotEvent.cs b/Content.Shared/Weapons/Ranged/Events/AmmoShotEvent.cs new file mode 100644 index 0000000000..3b9ea0ebb0 --- /dev/null +++ b/Content.Shared/Weapons/Ranged/Events/AmmoShotEvent.cs @@ -0,0 +1,9 @@ +namespace Content.Shared.Weapons.Ranged.Events; + +/// +/// Raised on a gun when projectiles have been fired from it. +/// +public sealed class AmmoShotEvent : EntityEventArgs +{ + public List FiredProjectiles = default!; +} diff --git a/Content.Shared/Weapons/Ranged/Events/GetAmmoCountEvent.cs b/Content.Shared/Weapons/Ranged/Events/GetAmmoCountEvent.cs new file mode 100644 index 0000000000..e080ff5848 --- /dev/null +++ b/Content.Shared/Weapons/Ranged/Events/GetAmmoCountEvent.cs @@ -0,0 +1,11 @@ +namespace Content.Shared.Weapons.Ranged.Events; + +/// +/// Raised on an AmmoProvider to request deets. +/// +[ByRefEvent] +public struct GetAmmoCountEvent +{ + public int Count; + public int Capacity; +} \ No newline at end of file diff --git a/Content.Shared/Weapons/Ranged/MagazineAutoEjectEvent.cs b/Content.Shared/Weapons/Ranged/Events/MagazineAutoEjectEvent.cs similarity index 85% rename from Content.Shared/Weapons/Ranged/MagazineAutoEjectEvent.cs rename to Content.Shared/Weapons/Ranged/Events/MagazineAutoEjectEvent.cs index d241cb9703..e20b36eea8 100644 --- a/Content.Shared/Weapons/Ranged/MagazineAutoEjectEvent.cs +++ b/Content.Shared/Weapons/Ranged/Events/MagazineAutoEjectEvent.cs @@ -1,6 +1,6 @@ using Robust.Shared.Serialization; -namespace Content.Shared.Weapons.Ranged +namespace Content.Shared.Weapons.Ranged.Events { /// /// This is sent if the MagazineBarrel AutoEjects the magazine diff --git a/Content.Shared/Weapons/Ranged/Events/RequestShootEvent.cs b/Content.Shared/Weapons/Ranged/Events/RequestShootEvent.cs new file mode 100644 index 0000000000..af352d8445 --- /dev/null +++ b/Content.Shared/Weapons/Ranged/Events/RequestShootEvent.cs @@ -0,0 +1,14 @@ +using Robust.Shared.Map; +using Robust.Shared.Serialization; + +namespace Content.Shared.Weapons.Ranged.Events; + +/// +/// Raised on the client to indicate it'd like to shoot. +/// +[Serializable, NetSerializable] +public sealed class RequestShootEvent : EntityEventArgs +{ + public EntityUid Gun; + public EntityCoordinates Coordinates; +} \ No newline at end of file diff --git a/Content.Shared/Weapons/Ranged/Events/RequestStopShootEvent.cs b/Content.Shared/Weapons/Ranged/Events/RequestStopShootEvent.cs new file mode 100644 index 0000000000..5fc1f5dc4e --- /dev/null +++ b/Content.Shared/Weapons/Ranged/Events/RequestStopShootEvent.cs @@ -0,0 +1,12 @@ +using Robust.Shared.Serialization; + +namespace Content.Shared.Weapons.Ranged.Events; + +/// +/// Raised on the client to request it would like to stop hooting. +/// +[Serializable, NetSerializable] +public sealed class RequestStopShootEvent : EntityEventArgs +{ + public EntityUid Gun; +} \ No newline at end of file diff --git a/Content.Shared/Weapons/Ranged/Events/TakeAmmoEvent.cs b/Content.Shared/Weapons/Ranged/Events/TakeAmmoEvent.cs new file mode 100644 index 0000000000..5ad53fd970 --- /dev/null +++ b/Content.Shared/Weapons/Ranged/Events/TakeAmmoEvent.cs @@ -0,0 +1,26 @@ +using Robust.Shared.Map; + +namespace Content.Shared.Weapons.Ranged.Events; + +/// +/// Raised on a gun when it would like to take the specified amount of ammo. +/// +public sealed class TakeAmmoEvent : EntityEventArgs +{ + public EntityUid? User; + public readonly int Shots; + public List Ammo; + + /// + /// Coordinates to spawn the ammo at. + /// + public EntityCoordinates Coordinates; + + public TakeAmmoEvent(int shots, List ammo, EntityCoordinates coordinates, EntityUid? user) + { + Shots = shots; + Ammo = ammo; + Coordinates = coordinates; + User = user; + } +} diff --git a/Content.Shared/Weapons/Ranged/HitscanPrototype.cs b/Content.Shared/Weapons/Ranged/HitscanPrototype.cs new file mode 100644 index 0000000000..d7bab2668d --- /dev/null +++ b/Content.Shared/Weapons/Ranged/HitscanPrototype.cs @@ -0,0 +1,39 @@ +using Content.Shared.Damage; +using Content.Shared.Physics; +using Content.Shared.Weapons.Ranged.Systems; +using Robust.Shared.Prototypes; +using Robust.Shared.Utility; + +namespace Content.Shared.Weapons.Ranged; + +[Prototype("hitscan")] +public sealed class HitscanPrototype : IPrototype, IShootable +{ + [ViewVariables] + [IdDataFieldAttribute] + public string ID { get; } = default!; + + [ViewVariables(VVAccess.ReadWrite), DataField("damage")] + public DamageSpecifier? Damage; + + [ViewVariables(VVAccess.ReadOnly), DataField("muzzleFlash")] + public SpriteSpecifier? MuzzleFlash; + + [ViewVariables(VVAccess.ReadOnly), DataField("travelFlash")] + public SpriteSpecifier? TravelFlash; + + [ViewVariables(VVAccess.ReadOnly), DataField("impactFlash")] + public SpriteSpecifier? ImpactFlash; + + [ViewVariables, DataField("collisionMask")] + public int CollisionMask = (int) CollisionGroup.Opaque; + + [ViewVariables(VVAccess.ReadWrite), DataField("color")] + public Color Color = Color.White; + + /// + /// Try not to set this too high. + /// + [ViewVariables, DataField("maxLength")] + public float MaxLength = 20f; +} diff --git a/Content.Shared/Weapons/Ranged/IShootable.cs b/Content.Shared/Weapons/Ranged/IShootable.cs new file mode 100644 index 0000000000..b136b6a122 --- /dev/null +++ b/Content.Shared/Weapons/Ranged/IShootable.cs @@ -0,0 +1,6 @@ +namespace Content.Shared.Weapons.Ranged; + +/// +/// Interface that says this can be shot from a gun. Exists to facilitate hitscan OR prototype shooting. +/// +public interface IShootable {} \ No newline at end of file diff --git a/Content.Shared/Weapons/Ranged/SharedFlyBySoundSystem.cs b/Content.Shared/Weapons/Ranged/Systems/SharedFlyBySoundSystem.cs similarity index 95% rename from Content.Shared/Weapons/Ranged/SharedFlyBySoundSystem.cs rename to Content.Shared/Weapons/Ranged/Systems/SharedFlyBySoundSystem.cs index eefc23f314..084c65ce24 100644 --- a/Content.Shared/Weapons/Ranged/SharedFlyBySoundSystem.cs +++ b/Content.Shared/Weapons/Ranged/Systems/SharedFlyBySoundSystem.cs @@ -1,12 +1,13 @@ using Content.Shared.Physics; using Content.Shared.Sound; +using Content.Shared.Weapons.Ranged.Components; using Robust.Shared.GameStates; using Robust.Shared.Physics; using Robust.Shared.Physics.Collision.Shapes; using Robust.Shared.Physics.Dynamics; using Robust.Shared.Serialization; -namespace Content.Shared.Weapons.Ranged; +namespace Content.Shared.Weapons.Ranged.Systems; public abstract class SharedFlyBySoundSystem : EntitySystem { diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Ballistic.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Ballistic.cs new file mode 100644 index 0000000000..5295861577 --- /dev/null +++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Ballistic.cs @@ -0,0 +1,215 @@ +using Content.Shared.Examine; +using Content.Shared.Interaction; +using Content.Shared.Verbs; +using Content.Shared.Weapons.Ranged.Components; +using Content.Shared.Weapons.Ranged.Events; +using Robust.Shared.Containers; +using Robust.Shared.GameStates; +using Robust.Shared.Map; +using Robust.Shared.Serialization; +using Robust.Shared.Utility; + +namespace Content.Shared.Weapons.Ranged.Systems; + +public abstract partial class SharedGunSystem +{ + protected virtual void InitializeBallistic() + { + SubscribeLocalEvent(OnBallisticInit); + SubscribeLocalEvent(OnBallisticTakeAmmo); + SubscribeLocalEvent(OnBallisticAmmoCount); + SubscribeLocalEvent(OnBallisticGetState); + SubscribeLocalEvent(OnBallisticHandleState); + + SubscribeLocalEvent(OnBallisticExamine); + SubscribeLocalEvent>(OnBallisticVerb); + SubscribeLocalEvent(OnBallisticInteractUsing); + SubscribeLocalEvent(OnBallisticActivate); + } + + private void OnBallisticActivate(EntityUid uid, BallisticAmmoProviderComponent component, ActivateInWorldEvent args) + { + ManualCycle(component, Transform(uid).MapPosition, args.User); + args.Handled = true; + } + + private void OnBallisticInteractUsing(EntityUid uid, BallisticAmmoProviderComponent component, InteractUsingEvent args) + { + if (args.Handled || component.Whitelist?.IsValid(args.Used, EntityManager) != true) return; + + if (GetBallisticShots(component) >= component.Capacity) return; + + component.Entities.Add(args.Used); + component.Container.Insert(args.Used); + // Not predicted so + PlaySound(uid, component.SoundInsert?.GetSound(Random, ProtoManager), args.User); + args.Handled = true; + UpdateBallisticAppearance(component); + Dirty(component); + } + + private void OnBallisticVerb(EntityUid uid, BallisticAmmoProviderComponent component, GetVerbsEvent args) + { + if (!args.CanAccess || !args.CanInteract) return; + + args.Verbs.Add(new Verb() + { + Text = Loc.GetString("gun-ballistic-cycle"), + Disabled = GetBallisticShots(component) == 0, + Act = () => ManualCycle(component, Transform(uid).MapPosition, args.User), + }); + } + + private void OnBallisticExamine(EntityUid uid, BallisticAmmoProviderComponent component, ExaminedEvent args) + { + args.PushMarkup(Loc.GetString("gun-magazine-examine", ("color", AmmoExamineColor), ("count", GetBallisticShots(component)))); + } + + private void ManualCycle(BallisticAmmoProviderComponent component, MapCoordinates coordinates, EntityUid? user = null) + { + // Reset shotting for cycling + if (TryComp(component.Owner, out var gunComp) && + gunComp is { FireRate: > 0f }) + { + gunComp.NextFire = Timing.CurTime + TimeSpan.FromSeconds(1 / gunComp.FireRate); + } + + Dirty(component); + var sound = component.SoundRack?.GetSound(Random, ProtoManager); + + if (sound != null) + PlaySound(component.Owner, sound, user); + + var shots = GetBallisticShots(component); + component.Cycled = true; + + Cycle(component, coordinates); + + var text = Loc.GetString(shots == 0 ? "gun-ballistic-cycled-empty" : "gun-ballistic-cycled"); + + Popup(text, component.Owner, user); + UpdateBallisticAppearance(component); + UpdateAmmoCount(component.Owner); + } + + protected abstract void Cycle(BallisticAmmoProviderComponent component, MapCoordinates coordinates); + + private void OnBallisticGetState(EntityUid uid, BallisticAmmoProviderComponent component, ref ComponentGetState args) + { + args.State = new BallisticAmmoProviderComponentState() + { + UnspawnedCount = component.UnspawnedCount, + Entities = component.Entities, + Cycled = component.Cycled, + }; + } + + private void OnBallisticHandleState(EntityUid uid, BallisticAmmoProviderComponent component, ref ComponentHandleState args) + { + if (args.Current is not BallisticAmmoProviderComponentState state) return; + + component.Cycled = state.Cycled; + component.UnspawnedCount = state.UnspawnedCount; + + component.Entities.Clear(); + + foreach (var ent in state.Entities) + { + component.Entities.Add(ent); + } + } + + private void OnBallisticInit(EntityUid uid, BallisticAmmoProviderComponent component, ComponentInit args) + { + component.Container = Containers.EnsureContainer(uid, "ballistic-ammo"); + component.UnspawnedCount = component.Capacity; + + if (component.FillProto != null) + { + component.UnspawnedCount -= Math.Min(component.UnspawnedCount, component.Container.ContainedEntities.Count); + } + else + { + component.UnspawnedCount = 0; + } + } + + protected int GetBallisticShots(BallisticAmmoProviderComponent component) + { + return component.Entities.Count + component.UnspawnedCount; + } + + private void OnBallisticTakeAmmo(EntityUid uid, BallisticAmmoProviderComponent component, TakeAmmoEvent args) + { + for (var i = 0; i < args.Shots; i++) + { + if (!component.Cycled) break; + + EntityUid entity; + + if (component.Entities.Count > 0) + { + entity = component.Entities[^1]; + + // Leave the entity as is if it doesn't auto cycle + // TODO: Suss this out with NewAmmoComponent as I don't think it gets removed from container properly + if (HasComp(entity) && component.AutoCycle) + { + component.Entities.RemoveAt(component.Entities.Count - 1); + component.Container.Remove(entity); + } + + args.Ammo.Add(EnsureComp(entity)); + } + else if (component.UnspawnedCount > 0) + { + component.UnspawnedCount--; + entity = Spawn(component.FillProto, args.Coordinates); + args.Ammo.Add(EnsureComp(entity)); + + // Put it back in if it doesn't auto-cycle + if (HasComp(entity) && !component.AutoCycle) + { + if (!entity.IsClientSide()) + { + component.Entities.Add(entity); + component.Container.Insert(entity); + } + else + { + component.UnspawnedCount++; + } + } + } + + if (!component.AutoCycle) + { + component.Cycled = false; + } + } + + UpdateBallisticAppearance(component); + Dirty(component); + } + + private void OnBallisticAmmoCount(EntityUid uid, BallisticAmmoProviderComponent component, ref GetAmmoCountEvent args) + { + args.Count = GetBallisticShots(component); + args.Capacity = component.Capacity; + } + + private void UpdateBallisticAppearance(BallisticAmmoProviderComponent component) + { + if (!Timing.IsFirstTimePredicted || !TryComp(component.Owner, out var appearance)) return; + appearance.SetData(AmmoVisuals.AmmoCount, GetBallisticShots(component)); + appearance.SetData(AmmoVisuals.AmmoMax, component.Capacity); + } + + [Serializable, NetSerializable] + private sealed class BallisticAmmoProviderComponentState : ComponentState + { + public int UnspawnedCount; + public List Entities = default!; + public bool Cycled; + } +} diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Battery.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Battery.cs new file mode 100644 index 0000000000..10c23ebcb9 --- /dev/null +++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Battery.cs @@ -0,0 +1,111 @@ +using Content.Shared.Examine; +using Content.Shared.Weapons.Ranged.Components; +using Content.Shared.Weapons.Ranged.Events; +using Robust.Shared.GameStates; +using Robust.Shared.Map; +using Robust.Shared.Serialization; + +namespace Content.Shared.Weapons.Ranged.Systems; + +public abstract partial class SharedGunSystem +{ + protected virtual void InitializeBattery() + { + // Trying to dump comp references hence the below + // Hitscan + SubscribeLocalEvent(OnBatteryGetState); + SubscribeLocalEvent(OnBatteryHandleState); + SubscribeLocalEvent(OnBatteryTakeAmmo); + SubscribeLocalEvent(OnBatteryAmmoCount); + SubscribeLocalEvent(OnBatteryExamine); + + // Projectile + SubscribeLocalEvent(OnBatteryGetState); + SubscribeLocalEvent(OnBatteryHandleState); + SubscribeLocalEvent(OnBatteryTakeAmmo); + SubscribeLocalEvent(OnBatteryAmmoCount); + SubscribeLocalEvent(OnBatteryExamine); + } + + private void OnBatteryHandleState(EntityUid uid, BatteryAmmoProviderComponent component, ref ComponentHandleState args) + { + if (args.Current is not BatteryAmmoProviderComponentState state) return; + + component.Shots = state.Shots; + component.Capacity = state.MaxShots; + component.FireCost = state.FireCost; + } + + private void OnBatteryGetState(EntityUid uid, BatteryAmmoProviderComponent component, ref ComponentGetState args) + { + args.State = new BatteryAmmoProviderComponentState() + { + Shots = component.Shots, + MaxShots = component.Capacity, + FireCost = component.FireCost, + }; + } + + private void OnBatteryExamine(EntityUid uid, BatteryAmmoProviderComponent component, ExaminedEvent args) + { + args.PushMarkup(Loc.GetString("gun-battery-examine", ("color", AmmoExamineColor), ("count", component.Shots))); + } + + private void OnBatteryTakeAmmo(EntityUid uid, BatteryAmmoProviderComponent component, TakeAmmoEvent args) + { + var shots = Math.Min(args.Shots, component.Shots); + + // Don't dirty if it's an empty fire. + if (shots == 0) return; + + for (var i = 0; i < shots; i++) + { + args.Ammo.Add(GetShootable(component, args.Coordinates)); + component.Shots--; + } + + TakeCharge(uid, component); + UpdateBatteryAppearance(uid, component); + Dirty(component); + } + + private void OnBatteryAmmoCount(EntityUid uid, BatteryAmmoProviderComponent component, ref GetAmmoCountEvent args) + { + args.Count = component.Shots; + args.Capacity = component.Capacity; + } + + /// + /// Update the battery (server-only) whenever fired. + /// + protected virtual void TakeCharge(EntityUid uid, BatteryAmmoProviderComponent component) {} + + protected void UpdateBatteryAppearance(EntityUid uid, BatteryAmmoProviderComponent component) + { + if (!TryComp(uid, out var appearance)) return; + appearance.SetData(AmmoVisuals.AmmoCount, component.Shots); + appearance.SetData(AmmoVisuals.AmmoMax, component.Capacity); + } + + private IShootable GetShootable(BatteryAmmoProviderComponent component, EntityCoordinates coordinates) + { + switch (component) + { + case ProjectileBatteryAmmoProviderComponent proj: + var ent = Spawn(proj.Prototype, coordinates); + return EnsureComp(ent); + case HitscanBatteryAmmoProviderComponent hitscan: + return ProtoManager.Index(hitscan.Prototype); + default: + throw new ArgumentOutOfRangeException(); + } + } + + [Serializable, NetSerializable] + private sealed class BatteryAmmoProviderComponentState : ComponentState + { + public int Shots; + public int MaxShots; + public float FireCost; + } +} diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Cartridges.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Cartridges.cs new file mode 100644 index 0000000000..e1f7c9da8f --- /dev/null +++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Cartridges.cs @@ -0,0 +1,34 @@ +using Content.Shared.Weapons.Ranged.Components; +using Robust.Shared.GameStates; +using Robust.Shared.Serialization; + +namespace Content.Shared.Weapons.Ranged.Systems; + +public abstract partial class SharedGunSystem +{ + private void InitializeCartridge() + { + SubscribeLocalEvent(OnCartridgeGetState); + SubscribeLocalEvent(OnCartridgeHandleState); + } + + private void OnCartridgeHandleState(EntityUid uid, CartridgeAmmoComponent component, ref ComponentHandleState args) + { + if (args.Current is not CartridgeAmmoComponentState state) return; + component.Spent = state.Spent; + } + + private void OnCartridgeGetState(EntityUid uid, CartridgeAmmoComponent component, ref ComponentGetState args) + { + args.State = new CartridgeAmmoComponentState() + { + Spent = component.Spent, + }; + } + + [Serializable, NetSerializable] + private sealed class CartridgeAmmoComponentState : ComponentState + { + public bool Spent; + } +} diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.ChamberMagazine.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.ChamberMagazine.cs new file mode 100644 index 0000000000..41be6f1ba4 --- /dev/null +++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.ChamberMagazine.cs @@ -0,0 +1,121 @@ +using System.Diagnostics.CodeAnalysis; +using Content.Shared.Containers.ItemSlots; +using Content.Shared.Examine; +using Content.Shared.Interaction; +using Content.Shared.Verbs; +using Content.Shared.Weapons.Ranged.Components; +using Content.Shared.Weapons.Ranged.Events; +using Robust.Shared.Containers; + +namespace Content.Shared.Weapons.Ranged.Systems; + +public abstract partial class SharedGunSystem +{ + protected const string ChamberSlot = "gun-chamber"; + + protected virtual void InitializeChamberMagazine() + { + SubscribeLocalEvent(OnChamberMagazineTakeAmmo); + SubscribeLocalEvent>(OnMagazineVerb); + SubscribeLocalEvent(OnMagazineSlotChange); + SubscribeLocalEvent(OnMagazineActivate); + SubscribeLocalEvent(OnChamberMagazineExamine); + } + + private void OnChamberMagazineExamine(EntityUid uid, ChamberMagazineAmmoProviderComponent component, ExaminedEvent args) + { + var (count, _) = GetChamberMagazineCountCapacity(component); + args.PushMarkup(Loc.GetString("gun-magazine-examine", ("color", AmmoExamineColor), ("count", count))); + } + + private bool TryTakeChamberEntity(EntityUid uid, [NotNullWhen(true)] out EntityUid? entity) + { + if (!Containers.TryGetContainer(uid, ChamberSlot, out var container) || + container is not ContainerSlot slot) + { + entity = null; + return false; + } + + entity = slot.ContainedEntity; + if (entity == null) return false; + container.Remove(entity.Value); + return true; + } + + protected EntityUid? GetChamberEntity(EntityUid uid) + { + if (!Containers.TryGetContainer(uid, ChamberSlot, out var container) || + container is not ContainerSlot slot) + { + return null; + } + + return slot.ContainedEntity; + } + + protected (int, int) GetChamberMagazineCountCapacity(ChamberMagazineAmmoProviderComponent component) + { + var count = GetChamberEntity(component.Owner) != null ? 1 : 0; + var (magCount, magCapacity) = GetMagazineCountCapacity(component); + return (count + magCount, magCapacity); + } + + private bool TryInsertChamber(EntityUid uid, EntityUid ammo) + { + return Containers.TryGetContainer(uid, ChamberSlot, out var container) && + container is ContainerSlot slot && + slot.Insert(ammo); + } + + private void OnChamberMagazineTakeAmmo(EntityUid uid, ChamberMagazineAmmoProviderComponent component, TakeAmmoEvent args) + { + // So chamber logic is kinda sussier than the others + // Essentially we want to treat the chamber as a potentially free slot and then the mag as the remaining slots + // i.e. if we shoot 3 times, then we use the chamber once (regardless if it's empty or not) and 2 from the mag + // We move the n + 1 shot into the chamber as we essentially treat it like a stack. + TryComp(uid, out var appearance); + + if (TryTakeChamberEntity(uid, out var chamberEnt)) + { + args.Ammo.Add(EnsureComp(chamberEnt.Value)); + } + + var magEnt = GetMagazineEntity(uid); + + // Pass an event to the magazine to get more (to refill chamber or for shooting). + if (magEnt != null) + { + // We pass in Shots not Shots - 1 as we'll take the last entity and move it into the chamber. + var relayedArgs = new TakeAmmoEvent(args.Shots, new List(), args.Coordinates, args.User); + RaiseLocalEvent(magEnt.Value, relayedArgs, false); + + // Put in the nth slot back into the chamber + // Rest of the ammo gets shot + if (relayedArgs.Ammo.Count > 0) + { + var newChamberEnt = ((AmmoComponent) relayedArgs.Ammo[^1]).Owner; + TryInsertChamber(uid, newChamberEnt); + } + + // Anything above the chamber-refill amount gets fired. + for (var i = 0; i < relayedArgs.Ammo.Count - 1; i++) + { + args.Ammo.Add(relayedArgs.Ammo[i]); + } + } + else + { + appearance?.SetData(AmmoVisuals.MagLoaded, false); + return; + } + + var count = chamberEnt != null ? 1 : 0; + const int capacity = 1; + + var ammoEv = new GetAmmoCountEvent(); + RaiseLocalEvent(magEnt.Value, ref ammoEv, false); + + FinaliseMagazineTakeAmmo(uid, component, args, count + ammoEv.Count, capacity + ammoEv.Capacity, appearance); + } +} diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Interactions.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Interactions.cs new file mode 100644 index 0000000000..0f4ba1f2ee --- /dev/null +++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Interactions.cs @@ -0,0 +1,101 @@ +using Content.Shared.Actions; +using Content.Shared.Actions.ActionTypes; +using Content.Shared.CombatMode; +using Content.Shared.Examine; +using Content.Shared.Verbs; +using Content.Shared.Weapons.Ranged.Components; +using Robust.Shared.Utility; + +namespace Content.Shared.Weapons.Ranged.Systems; + +public abstract partial class SharedGunSystem +{ + private void OnExamine(EntityUid uid, GunComponent component, ExaminedEvent args) + { + args.PushMarkup(Loc.GetString("gun-selected-mode-examine", ("color", ModeExamineColor), ("mode", GetLocSelector(component.SelectedMode)))); + args.PushMarkup(Loc.GetString("gun-fire-rate-examine", ("color", FireRateExamineColor), ("fireRate", component.FireRate))); + } + + private string GetLocSelector(SelectiveFire mode) + { + return Loc.GetString($"gun-{mode.ToString()}"); + } + + private void OnAltVerb(EntityUid uid, GunComponent component, GetVerbsEvent args) + { + if (!args.CanAccess || !args.CanInteract || component.SelectedMode == component.AvailableModes) + return; + + var nextMode = GetNextMode(component); + + AlternativeVerb verb = new() + { + Act = () => SelectFire(component, nextMode, args.User), + Text = Loc.GetString("gun-selector-verb", ("mode", GetLocSelector(nextMode))), + IconTexture = "/Textures/Interface/VerbIcons/fold.svg.192dpi.png", + }; + + args.Verbs.Add(verb); + } + + private SelectiveFire GetNextMode(GunComponent component) + { + var modes = new List(); + + foreach (var mode in Enum.GetValues()) + { + if ((mode & component.AvailableModes) == 0x0) continue; + modes.Add(mode); + } + + var index = modes.IndexOf(component.SelectedMode); + return modes[(index + 1) % modes.Count]; + } + + private void SelectFire(GunComponent component, SelectiveFire fire, EntityUid? user = null) + { + if (component.SelectedMode == fire) return; + + DebugTools.Assert((component.AvailableModes & fire) != 0x0); + component.SelectedMode = fire; + var curTime = Timing.CurTime; + var cooldown = TimeSpan.FromSeconds(InteractNextFire); + + if (component.NextFire < curTime) + component.NextFire = curTime + cooldown; + else + component.NextFire += cooldown; + + PlaySound(component.Owner, component.SoundModeToggle?.GetSound(Random, ProtoManager), user); + Popup(Loc.GetString("gun-selected-mode", ("mode", GetLocSelector(fire))), component.Owner, user); + Dirty(component); + } + + /// + /// Cycles the gun's to the next available one. + /// + public void CycleFire(GunComponent component, EntityUid? user = null) + { + // Noop + if (component.SelectedMode == component.AvailableModes) return; + + DebugTools.Assert((component.AvailableModes & component.SelectedMode) == component.SelectedMode); + var nextMode = GetNextMode(component); + SelectFire(component, nextMode, user); + } + + private sealed class CycleModeEvent : InstantActionEvent + { + public SelectiveFire Mode; + + public CycleModeEvent(SelectiveFire mode) + { + Mode = mode; + } + } + + private void OnCycleMode(EntityUid uid, GunComponent component, CycleModeEvent args) + { + SelectFire(component, args.Mode, args.Performer); + } +} diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Magazine.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Magazine.cs new file mode 100644 index 0000000000..5d5d1d3975 --- /dev/null +++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Magazine.cs @@ -0,0 +1,157 @@ +using Content.Shared.Containers.ItemSlots; +using Content.Shared.Examine; +using Content.Shared.Interaction; +using Content.Shared.Verbs; +using Content.Shared.Weapons.Ranged.Components; +using Content.Shared.Weapons.Ranged.Events; +using Robust.Shared.Containers; + +namespace Content.Shared.Weapons.Ranged.Systems; + +public abstract partial class SharedGunSystem +{ + protected const string MagazineSlot = "gun-magazine"; + + protected virtual void InitializeMagazine() + { + SubscribeLocalEvent(OnMagazineTakeAmmo); + SubscribeLocalEvent>(OnMagazineVerb); + SubscribeLocalEvent(OnMagazineSlotChange); + SubscribeLocalEvent(OnMagazineActivate); + SubscribeLocalEvent(OnMagazineExamine); + } + + private void OnMagazineExamine(EntityUid uid, MagazineAmmoProviderComponent component, ExaminedEvent args) + { + var (count, _) = GetMagazineCountCapacity(component); + args.PushMarkup(Loc.GetString("gun-magazine-examine", ("color", AmmoExamineColor), ("count", count))); + } + + private void OnMagazineActivate(EntityUid uid, MagazineAmmoProviderComponent component, ActivateInWorldEvent args) + { + var magEnt = GetMagazineEntity(uid); + + if (magEnt == null) return; + + RaiseLocalEvent(magEnt.Value, args, false); + UpdateAmmoCount(uid); + UpdateMagazineAppearance(component, magEnt.Value); + } + + private void OnMagazineVerb(EntityUid uid, MagazineAmmoProviderComponent component, GetVerbsEvent args) + { + if (!args.CanInteract || !args.CanAccess) return; + + var magEnt = GetMagazineEntity(uid); + + if (magEnt != null) + { + RaiseLocalEvent(magEnt.Value, args, false); + UpdateMagazineAppearance(component, magEnt.Value); + } + } + + private void OnMagazineSlotChange(EntityUid uid, MagazineAmmoProviderComponent component, ref ItemSlotChangedEvent args) + { + UpdateAmmoCount(uid); + if (!TryComp(uid, out var appearance)) return; + appearance.SetData(AmmoVisuals.MagLoaded, GetMagazineEntity(uid) != null); + } + + protected (int, int) GetMagazineCountCapacity(MagazineAmmoProviderComponent component) + { + var count = 0; + var capacity = 1; + var magEnt = GetMagazineEntity(component.Owner); + + if (magEnt != null) + { + var ev = new GetAmmoCountEvent(); + RaiseLocalEvent(magEnt.Value, ref ev, false); + count += ev.Count; + capacity += ev.Capacity; + } + + return (count, capacity); + } + + protected EntityUid? GetMagazineEntity(EntityUid uid) + { + if (!Containers.TryGetContainer(uid, MagazineSlot, out var container) || + container is not ContainerSlot slot) return null; + return slot.ContainedEntity; + } + + private void OnMagazineTakeAmmo(EntityUid uid, MagazineAmmoProviderComponent component, TakeAmmoEvent args) + { + var magEntity = GetMagazineEntity(uid); + TryComp(uid, out var appearance); + + if (magEntity == null) + { + appearance?.SetData(AmmoVisuals.MagLoaded, false); + return; + } + + // Pass the event onwards. + RaiseLocalEvent(magEntity.Value, args, false); + // Should be Dirtied by what other ammoprovider is handling it. + + var ammoEv = new GetAmmoCountEvent(); + RaiseLocalEvent(magEntity.Value, ref ammoEv, false); + FinaliseMagazineTakeAmmo(uid, component, args, ammoEv.Count, ammoEv.Capacity, appearance); + } + + private void FinaliseMagazineTakeAmmo(EntityUid uid, MagazineAmmoProviderComponent component, TakeAmmoEvent args, int count, int capacity, AppearanceComponent? appearance) + { + // If no ammo then check for autoeject + if (component.AutoEject && args.Ammo.Count == 0) + { + EjectMagazine(component); + PlaySound(uid, component.SoundAutoEject?.GetSound(Random, ProtoManager), args.User); + } + + UpdateMagazineAppearance(appearance, true, count, capacity); + } + + private void UpdateMagazineAppearance(MagazineAmmoProviderComponent component, EntityUid magEnt) + { + TryComp(component.Owner, out var appearance); + + var count = 0; + var capacity = 0; + + if (component is ChamberMagazineAmmoProviderComponent chamber) + { + count = GetChamberEntity(chamber.Owner) != null ? 1 : 0; + capacity = 1; + } + + if (TryComp(magEnt, out var magAppearance)) + { + magAppearance.TryGetData(AmmoVisuals.AmmoCount, out var addCount); + magAppearance.TryGetData(AmmoVisuals.AmmoMax, out var addCapacity); + count += addCount; + capacity += addCapacity; + } + + UpdateMagazineAppearance(appearance, true, count, capacity); + } + + private void UpdateMagazineAppearance(AppearanceComponent? appearance, bool magLoaded, int count, int capacity) + { + // Copy the magazine's appearance data + appearance?.SetData(AmmoVisuals.MagLoaded, magLoaded); + appearance?.SetData(AmmoVisuals.AmmoCount, count); + appearance?.SetData(AmmoVisuals.AmmoMax, capacity); + } + + private void EjectMagazine(MagazineAmmoProviderComponent component) + { + var ent = GetMagazineEntity(component.Owner); + + if (ent == null) return; + + _slots.TryEject(component.Owner, MagazineSlot, null, out var a, excludeUserAudio: true); + } +} diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Revolver.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Revolver.cs new file mode 100644 index 0000000000..1ecdc4e53c --- /dev/null +++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Revolver.cs @@ -0,0 +1,331 @@ +using Content.Shared.Interaction; +using Content.Shared.Verbs; +using Content.Shared.Weapons.Ranged.Components; +using Content.Shared.Weapons.Ranged.Events; +using Robust.Shared.Containers; +using Robust.Shared.GameStates; +using Robust.Shared.Serialization; +using Robust.Shared.Utility; + +namespace Content.Shared.Weapons.Ranged.Systems; + +public partial class SharedGunSystem +{ + protected const string RevolverContainer = "revolver-ammo"; + + protected virtual void InitializeRevolver() + { + SubscribeLocalEvent(OnRevolverGetState); + SubscribeLocalEvent(OnRevolverHandleState); + SubscribeLocalEvent(OnRevolverInit); + SubscribeLocalEvent(OnRevolverTakeAmmo); + SubscribeLocalEvent>(OnRevolverVerbs); + SubscribeLocalEvent(OnRevolverInteractUsing); + SubscribeLocalEvent(OnRevolverGetAmmoCount); + } + + private void OnRevolverGetAmmoCount(EntityUid uid, RevolverAmmoProviderComponent component, ref GetAmmoCountEvent args) + { + args.Count += GetRevolverCount(component); + args.Capacity += component.Capacity; + } + + private void OnRevolverInteractUsing(EntityUid uid, RevolverAmmoProviderComponent component, InteractUsingEvent args) + { + if (args.Handled) return; + + if (TryRevolverInsert(component, args.Used, args.User)) + args.Handled = true; + } + + private void OnRevolverGetState(EntityUid uid, RevolverAmmoProviderComponent component, ref ComponentGetState args) + { + args.State = new RevolverAmmoProviderComponentState + { + CurrentIndex = component.CurrentIndex, + AmmoSlots = component.AmmoSlots, + Chambers = component.Chambers, + }; + } + + private void OnRevolverHandleState(EntityUid uid, RevolverAmmoProviderComponent component, ref ComponentHandleState args) + { + if (args.Current is not RevolverAmmoProviderComponentState state) return; + + var oldIndex = component.CurrentIndex; + component.CurrentIndex = state.CurrentIndex; + + component.AmmoSlots = new EntityUid?[state.AmmoSlots.Length]; + component.Chambers = new bool?[state.Chambers.Length]; + + DebugTools.Assert(component.AmmoSlots.Length == component.Chambers.Length); + + // Need to copy across the state rather than the ref. + for (var i = 0; i < component.AmmoSlots.Length; i++) + { + component.AmmoSlots[i] = state.AmmoSlots[i]; + component.Chambers[i] = state.Chambers[i]; + } + + // Handle spins + if (Timing.IsFirstTimePredicted) + { + if (oldIndex != state.CurrentIndex) + UpdateAmmoCount(uid); + } + } + + public bool TryRevolverInsert(RevolverAmmoProviderComponent component, EntityUid uid, EntityUid? user) + { + if (component.Whitelist?.IsValid(uid, EntityManager) == false) return false; + + for (var i = 0; i < component.Capacity; i++) + { + var index = (component.CurrentIndex + i) % component.Capacity; + + if (component.AmmoSlots[index] != null || + component.Chambers[index] != null) continue; + + component.AmmoSlots[index] = uid; + component.AmmoContainer.Insert(uid); + PlaySound(component.Owner, component.SoundInsert?.GetSound(Random, ProtoManager), user); + Popup(Loc.GetString("gun-revolver-insert"), component.Owner, user); + UpdateRevolverAppearance(component); + UpdateAmmoCount(uid); + Dirty(component); + return true; + } + + Popup(Loc.GetString("gun-revolver-full"), component.Owner, user); + return false; + } + + private void OnRevolverVerbs(EntityUid uid, RevolverAmmoProviderComponent component, GetVerbsEvent args) + { + if (!args.CanAccess || !args.CanInteract) return; + + args.Verbs.Add(new Verb() + { + Text = Loc.GetString("gun-revolver-empty"), + Disabled = !AnyRevolverCartridges(component), + Act = () => EmptyRevolver(component, args.User) + }); + + args.Verbs.Add(new Verb() + { + Text = Loc.GetString("gun-revolver-spin"), + // Category = VerbCategory.G, + Act = () => SpinRevolver(component, args.User) + }); + } + + private bool AnyRevolverCartridges(RevolverAmmoProviderComponent component) + { + for (var i = 0; i < component.Capacity; i++) + { + if (component.Chambers[i] != null || + component.AmmoSlots[i] != null) return true; + } + + return false; + } + + private int GetRevolverCount(RevolverAmmoProviderComponent component) + { + var count = 0; + + for (var i = 0; i < component.Capacity; i++) + { + if (component.Chambers[i] != null || + component.AmmoSlots[i] != null) + { + count++; + } + } + + return count; + } + + private int GetRevolverUnspentCount(RevolverAmmoProviderComponent component) + { + var count = 0; + + for (var i = 0; i < component.Capacity; i++) + { + var chamber = component.Chambers[i]; + + if (chamber == true) + { + count++; + continue; + } + + var ammo = component.AmmoSlots[i]; + + if (TryComp(ammo, out var cartridge) && !cartridge.Spent) + { + count++; + } + } + + return count; + } + + public void EmptyRevolver(RevolverAmmoProviderComponent component, EntityUid? user = null) + { + var xform = Transform(component.Owner); + var mapCoordinates = xform.MapPosition; + var anyEmpty = false; + + for (var i = 0; i < component.Capacity; i++) + { + var chamber = component.Chambers[i]; + var slot = component.AmmoSlots[i]; + + if (slot == null) + { + if (chamber == null) continue; + + // Too lazy to make a new method don't sue me. + if (!_netManager.IsClient) + { + var uid = Spawn(component.FillPrototype, mapCoordinates); + + if (TryComp(uid, out var cartridge)) + SetCartridgeSpent(cartridge, !(bool) chamber); + + EjectCartridge(uid); + } + + component.Chambers[i] = null; + anyEmpty = true; + } + else + { + component.AmmoSlots[i] = null; + component.AmmoContainer.Remove(slot.Value); + + if (!_netManager.IsClient) + EjectCartridge(slot.Value); + + anyEmpty = true; + } + } + + if (anyEmpty) + { + PlaySound(component.Owner, component.SoundEject?.GetSound(Random, ProtoManager), user); + UpdateAmmoCount(component.Owner); + UpdateRevolverAppearance(component); + Dirty(component); + } + } + + private void UpdateRevolverAppearance(RevolverAmmoProviderComponent component) + { + if (!TryComp(component.Owner, out var appearance)) return; + appearance.SetData(AmmoVisuals.AmmoCount, GetRevolverCount(component)); + appearance.SetData(AmmoVisuals.AmmoMax, component.Capacity); + } + + protected virtual void SpinRevolver(RevolverAmmoProviderComponent component, EntityUid? user = null) + { + PlaySound(component.Owner, component.SoundSpin?.GetSound(Random, ProtoManager), user); + Popup(Loc.GetString("gun-revolver-spun"), component.Owner, user); + } + + private void OnRevolverTakeAmmo(EntityUid uid, RevolverAmmoProviderComponent component, TakeAmmoEvent args) + { + var currentIndex = component.CurrentIndex; + Cycle(component, args.Shots); + + // Revolvers provide the bullets themselves rather than the cartridges so they stay in the revolver. + for (var i = 0; i < args.Shots; i++) + { + var index = (currentIndex + i) % component.Capacity; + var chamber = component.Chambers[index]; + + // Get unspawned ent first if possible. + if (chamber != null) + { + if (chamber == true) + { + // TODO: This is kinda sussy boy + var ent = Spawn(component.FillPrototype, args.Coordinates); + + if (TryComp(ent, out var cartridge)) + { + component.Chambers[index] = false; + SetCartridgeSpent(cartridge, true); + args.Ammo.Add(EnsureComp(Spawn(cartridge.Prototype, args.Coordinates))); + Del(ent); + continue; + } + + component.Chambers[i] = null; + args.Ammo.Add(EnsureComp(ent)); + } + } + else if (component.AmmoSlots[index] != null) + { + var ent = component.AmmoSlots[index]!; + + if (TryComp(ent, out var cartridge)) + { + if (cartridge.Spent) continue; + + SetCartridgeSpent(cartridge, true); + args.Ammo.Add(EnsureComp(Spawn(cartridge.Prototype, args.Coordinates))); + continue; + } + + component.AmmoContainer.Remove(ent.Value); + component.AmmoSlots[index] = null; + args.Ammo.Add(EnsureComp(ent.Value)); + Transform(ent.Value).Coordinates = args.Coordinates; + } + } + + UpdateRevolverAppearance(component); + Dirty(component); + } + + private void Cycle(RevolverAmmoProviderComponent component, int count = 1) + { + component.CurrentIndex = (component.CurrentIndex + count) % component.Capacity; + } + + private void OnRevolverInit(EntityUid uid, RevolverAmmoProviderComponent component, ComponentInit args) + { + component.AmmoContainer = Containers.EnsureContainer(uid, RevolverContainer); + component.AmmoSlots = new EntityUid?[component.Capacity]; + component.Chambers = new bool?[component.Capacity]; + + if (component.FillPrototype != null) + { + for (var i = 0; i < component.Capacity; i++) + { + if (component.AmmoSlots[i] != null) + { + component.Chambers[i] = null; + continue; + } + + component.Chambers[i] = true; + } + } + } + + [Serializable, NetSerializable] + protected sealed class RevolverAmmoProviderComponentState : ComponentState + { + public int CurrentIndex; + public EntityUid?[] AmmoSlots = default!; + public bool?[] Chambers = default!; + } + + public sealed class RevolverSpinEvent : EntityEventArgs + { + + } +} diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs new file mode 100644 index 0000000000..515088dc45 --- /dev/null +++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs @@ -0,0 +1,392 @@ +using Content.Shared.Actions; +using Content.Shared.Administration.Logs; +using Content.Shared.Audio; +using Content.Shared.CombatMode; +using Content.Shared.Containers.ItemSlots; +using Content.Shared.Damage; +using Content.Shared.Examine; +using Content.Shared.Hands.Components; +using Content.Shared.Interaction.Events; +using Content.Shared.Popups; +using Content.Shared.Throwing; +using Content.Shared.Verbs; +using Content.Shared.Weapons.Ranged.Components; +using Content.Shared.Weapons.Ranged.Events; +using Robust.Shared.Audio; +using Robust.Shared.Containers; +using Robust.Shared.GameStates; +using Robust.Shared.Map; +using Robust.Shared.Network; +using Robust.Shared.Player; +using Robust.Shared.Prototypes; +using Robust.Shared.Random; +using Robust.Shared.Serialization; +using Robust.Shared.Timing; +using Robust.Shared.Utility; + +namespace Content.Shared.Weapons.Ranged.Systems; + +public abstract partial class SharedGunSystem : EntitySystem +{ + [Dependency] protected readonly IGameTiming Timing = default!; + [Dependency] protected readonly IMapManager MapManager = default!; + [Dependency] private readonly INetManager _netManager = default!; + [Dependency] protected readonly IPrototypeManager ProtoManager = default!; + [Dependency] protected readonly IRobustRandom Random = default!; + [Dependency] protected readonly ISharedAdminLogManager Logs = default!; + [Dependency] protected readonly DamageableSystem Damageable = default!; + [Dependency] private readonly ItemSlotsSystem _slots = default!; + [Dependency] protected readonly SharedActionsSystem Actions = default!; + [Dependency] private readonly SharedCombatModeSystem _combatMode = default!; + [Dependency] protected readonly SharedContainerSystem Containers = default!; + [Dependency] protected readonly SharedPhysicsSystem Physics = default!; + [Dependency] protected readonly SharedPopupSystem PopupSystem = default!; + [Dependency] protected readonly ThrowingSystem ThrowingSystem = default!; + + protected ISawmill Sawmill = default!; + + private const float MuzzleFlashLifetime = 1f; + private const float InteractNextFire = 0.3f; + private const double SafetyNextFire = 0.5; + private const float EjectOffset = 0.4f; + protected const string AmmoExamineColor = "yellow"; + protected const string FireRateExamineColor = "yellow"; + protected const string SafetyExamineColor = "lightgreen"; + protected const string ModeExamineColor = "cyan"; + + public override void Initialize() + { + Sawmill = Logger.GetSawmill("gun"); + Sawmill.Level = LogLevel.Info; + SubscribeLocalEvent(OnGetState); + SubscribeAllEvent(OnShootRequest); + SubscribeAllEvent(OnStopShootRequest); + SubscribeLocalEvent(OnHandleState); + SubscribeLocalEvent(OnGunMeleeAttempt); + + // Ammo providers + InitializeBallistic(); + InitializeBattery(); + InitializeCartridge(); + InitializeChamberMagazine(); + InitializeMagazine(); + InitializeRevolver(); + + // Interactions + SubscribeLocalEvent>(OnAltVerb); + SubscribeLocalEvent(OnExamine); + SubscribeLocalEvent(OnCycleMode); + SubscribeLocalEvent(OnGunInit); + } + + private void OnGunInit(EntityUid uid, GunComponent component, ComponentInit args) + { + DebugTools.Assert((component.AvailableModes & component.SelectedMode) != 0x0); + } + + private void OnGunMeleeAttempt(EntityUid uid, GunComponent component, ref MeleeAttackAttemptEvent args) + { + args.Cancelled = true; + } + + private void OnShootRequest(RequestShootEvent msg, EntitySessionEventArgs args) + { + var user = args.SenderSession.AttachedEntity; + + if (user == null) return; + + var gun = GetGun(user.Value); + + if (gun?.Owner != msg.Gun) return; + + gun.ShootCoordinates = msg.Coordinates; + Sawmill.Debug($"Set shoot coordinates to {gun.ShootCoordinates}"); + AttemptShoot(user.Value, gun); + } + + private void OnStopShootRequest(RequestStopShootEvent ev, EntitySessionEventArgs args) + { + if (args.SenderSession.AttachedEntity == null || + !TryComp(ev.Gun, out var gun)) return; + + var userGun = GetGun(args.SenderSession.AttachedEntity.Value); + + if (userGun != gun) return; + + StopShooting(gun); + } + + private void OnGetState(EntityUid uid, GunComponent component, ref ComponentGetState args) + { + args.State = new GunComponentState + { + NextFire = component.NextFire, + ShotCounter = component.ShotCounter, + SelectiveFire = component.SelectedMode, + AvailableSelectiveFire = component.AvailableModes, + }; + } + + private void OnHandleState(EntityUid uid, GunComponent component, ref ComponentHandleState args) + { + if (args.Current is not GunComponentState state) return; + + Sawmill.Debug($"Handle state: setting shot count from {component.ShotCounter} to {state.ShotCounter}"); + component.NextFire = state.NextFire; + component.ShotCounter = state.ShotCounter; + component.SelectedMode = state.SelectiveFire; + component.AvailableModes = state.AvailableSelectiveFire; + } + + protected GunComponent? GetGun(EntityUid entity) + { + if (!EntityManager.TryGetComponent(entity, out SharedHandsComponent? hands) || + hands.ActiveHandEntity is not { } held) + { + return null; + } + + if (!EntityManager.TryGetComponent(held, out GunComponent? gun)) + return null; + + if (!_combatMode.IsInCombatMode(entity)) + return null; + + return gun; + } + + private void StopShooting(GunComponent gun) + { + if (gun.ShotCounter == 0) return; + + Sawmill.Debug($"Stopped shooting {ToPrettyString(gun.Owner)}"); + gun.ShotCounter = 0; + gun.ShootCoordinates = null; + Dirty(gun); + } + + private void AttemptShoot(EntityUid user, GunComponent gun) + { + if (gun.FireRate <= 0f) return; + + var toCoordinates = gun.ShootCoordinates; + + if (toCoordinates == null) return; + + var curTime = Timing.CurTime; + + // Need to do this to play the clicking sound for empty automatic weapons + // but not play anything for burst fire. + if (gun.NextFire > curTime) return; + + // First shot + if (gun.ShotCounter == 0 && gun.NextFire < curTime) + gun.NextFire = curTime; + + var shots = 0; + var lastFire = gun.NextFire; + var fireRate = TimeSpan.FromSeconds(1f / gun.FireRate); + + while (gun.NextFire <= curTime) + { + gun.NextFire += fireRate; + shots++; + } + + // Get how many shots we're actually allowed to make, due to clip size or otherwise. + // Don't do this in the loop so we still reset NextFire. + switch (gun.SelectedMode) + { + case SelectiveFire.SemiAuto: + shots = Math.Min(shots, 1 - gun.ShotCounter); + break; + case SelectiveFire.Burst: + shots = Math.Min(shots, 3 - gun.ShotCounter); + break; + case SelectiveFire.FullAuto: + break; + default: + throw new ArgumentOutOfRangeException($"No implemented shooting behavior for {gun.SelectedMode}!"); + } + + var fromCoordinates = Transform(user).Coordinates; + // Remove ammo + var ev = new TakeAmmoEvent(shots, new List(), fromCoordinates, user); + + // Listen it just makes the other code around it easier if shots == 0 to do this. + if (shots > 0) + RaiseLocalEvent(gun.Owner, ev, false); + + DebugTools.Assert(ev.Ammo.Count <= shots); + DebugTools.Assert(shots >= 0); + UpdateAmmoCount(gun.Owner); + + // Even if we don't actually shoot update the ShotCounter. This is to avoid spamming empty sounds + // where the gun may be SemiAuto or Burst. + gun.ShotCounter += shots; + + if (ev.Ammo.Count <= 0) + { + // Play empty gun sounds if relevant + // If they're firing an existing clip then don't play anything. + if (shots > 0) + { + // Don't spam safety sounds at gun fire rate, play it at a reduced rate. + // May cause prediction issues? Needs more tweaking + gun.NextFire = TimeSpan.FromSeconds(Math.Max(lastFire.TotalSeconds + SafetyNextFire, gun.NextFire.TotalSeconds)); + PlaySound(gun.Owner, gun.SoundEmpty?.GetSound(Random, ProtoManager), user); + Dirty(gun); + return; + } + + return; + } + + // Shoot confirmed + Shoot(gun, ev.Ammo, fromCoordinates, toCoordinates.Value, user); + + // Predicted sound moment + PlaySound(gun.Owner, gun.SoundGunshot?.GetSound(Random, ProtoManager), user); + Dirty(gun); + } + + public void Shoot( + GunComponent gun, + EntityUid ammo, + EntityCoordinates fromCoordinates, + EntityCoordinates toCoordinates, + EntityUid? user = null) + { + var shootable = EnsureComp(ammo); + Shoot(gun, new List(1) { shootable }, fromCoordinates, toCoordinates, user); + } + + public abstract void Shoot( + GunComponent gun, + List ammo, + EntityCoordinates fromCoordinates, + EntityCoordinates toCoordinates, + EntityUid? user = null); + + public void Shoot( + GunComponent gun, + IShootable ammo, + EntityCoordinates fromCoordinates, + EntityCoordinates toCoordinates, + EntityUid? user = null) + { + Shoot(gun, new List(1) { ammo }, fromCoordinates, toCoordinates, user); + } + + protected abstract void PlaySound(EntityUid gun, string? sound, EntityUid? user = null); + + protected abstract void Popup(string message, EntityUid? uid, EntityUid? user); + + /// + /// Call this whenever the ammo count for a gun changes. + /// + protected virtual void UpdateAmmoCount(EntityUid uid) {} + + protected void SetCartridgeSpent(CartridgeAmmoComponent cartridge, bool spent) + { + if (cartridge.Spent != spent) + Dirty(cartridge); + + cartridge.Spent = spent; + if (!TryComp(cartridge.Owner, out var appearance)) return; + appearance.SetData(AmmoVisuals.Spent, spent); + } + + /// + /// Drops a single cartridge / shell + /// + protected void EjectCartridge( + EntityUid entity, + bool playSound = true) + { + // TODO: Sound limit version. + var offsetPos = (Random.NextVector2(EjectOffset)); + var xform = Transform(entity); + + var coordinates = xform.Coordinates; + coordinates = coordinates.Offset(offsetPos); + + xform.LocalRotation = Random.NextAngle(); + xform.Coordinates = coordinates; + + string? sound = null; + + if (TryComp(entity, out var cartridge)) + { + sound = cartridge.EjectSound?.GetSound(Random, ProtoManager); + } + + if (sound != null && playSound) + SoundSystem.Play(Filter.Pvs(entity, entityManager: EntityManager), sound, coordinates, AudioHelpers.WithVariation(0.05f).WithVolume(-1f)); + } + + protected void MuzzleFlash(EntityUid gun, AmmoComponent component, EntityUid? user = null) + { + var sprite = component.MuzzleFlash?.ToString(); + + // TODO: AAAAA THIS MUZZLE FLASH CODE IS BAD + // NEEDS EFFECTS TO NOT BE BAD! + if (sprite == null) + return; + + var time = Timing.CurTime; + var deathTime = time + TimeSpan.FromSeconds(MuzzleFlashLifetime); + // Offset the sprite so it actually looks like it's coming from the gun + var offset = new Vector2(0.0f, -0.5f); + + var message = new EffectSystemMessage + { + EffectSprite = sprite, + Born = time, + DeathTime = deathTime, + AttachedEntityUid = gun, + AttachedOffset = offset, + //Rotated from east facing + Rotation = -MathF.PI / 2f, + Color = Vector4.Multiply(new Vector4(255, 255, 255, 255), 1.0f), + ColorDelta = new Vector4(0, 0, 0, -1500f), + Shaded = false + }; + + CreateEffect(message, user); + } + + protected abstract void CreateEffect(EffectSystemMessage message, EntityUid? user = null); + + [Serializable, NetSerializable] + protected sealed class GunComponentState : ComponentState + { + public TimeSpan NextFire; + public int ShotCounter; + public SelectiveFire SelectiveFire; + public SelectiveFire AvailableSelectiveFire; + } + + /// + /// Used for animated effects on the client. + /// + [Serializable, NetSerializable] + protected sealed class HitscanEvent : EntityEventArgs + { + public List<(EntityCoordinates coordinates, Angle angle, SpriteSpecifier Sprite, float Distance)> Sprites = new(); + } + + public enum EffectLayers : byte + { + Unshaded, + } +} + +[Serializable, NetSerializable] +public enum AmmoVisuals : byte +{ + Spent, + AmmoCount, + AmmoMax, + MagLoaded, +} diff --git a/Content.Shared/Weapons/Ranged/SharedTetherGunSystem.cs b/Content.Shared/Weapons/Ranged/Systems/SharedTetherGunSystem.cs similarity index 88% rename from Content.Shared/Weapons/Ranged/SharedTetherGunSystem.cs rename to Content.Shared/Weapons/Ranged/Systems/SharedTetherGunSystem.cs index ff937d4deb..15c3205f36 100644 --- a/Content.Shared/Weapons/Ranged/SharedTetherGunSystem.cs +++ b/Content.Shared/Weapons/Ranged/Systems/SharedTetherGunSystem.cs @@ -1,11 +1,11 @@ using Robust.Shared.Map; using Robust.Shared.Serialization; -namespace Content.Shared.Weapons.Ranged; +namespace Content.Shared.Weapons.Ranged.Systems; public abstract class SharedTetherGunSystem : EntitySystem { - public const string CommandName = "tethergun"; + protected const string CommandName = "tethergun"; } [Serializable, NetSerializable] diff --git a/Resources/Audio/Weapons/Guns/Misc/licenses.txt b/Resources/Audio/Weapons/Guns/Misc/licenses.txt new file mode 100644 index 0000000000..3eecf46587 --- /dev/null +++ b/Resources/Audio/Weapons/Guns/Misc/licenses.txt @@ -0,0 +1,2 @@ +Taken from https://github.com/tgstation/TerraGov-Marine-Corps/blob/0d97ec86c49e2a89409bd3ddf0b7451b3f1c9a0e/sound/weapons/guns/interact/selector.ogg under CC-BY-NC-SA 3.0 +- selector.ogg \ No newline at end of file diff --git a/Resources/Audio/Weapons/Guns/Misc/selector.ogg b/Resources/Audio/Weapons/Guns/Misc/selector.ogg new file mode 100644 index 0000000000000000000000000000000000000000..298181609e49e3be023a552778543d1e163f9097 GIT binary patch literal 7482 zcmb7Ic|4Tg_kV`5FWEyBvW-kkS>nToWF1>Gj9u2rI*BoaWEX|RkhLfyWM@d0$i9T3 zu`el0QCbwO{GOrj_x1Vy{`f8Tb>}|kIp^MUo^$Vc-+S(udw5s?bikjIW$K|tBYXE6 zr65NkL4E2vAdIFQ!f-HHTIZY<1Yib$ zNC^|cuE^0;3;=KeKtZ``W>{bA&O%sJi2+|&0*!iIZZH~}&;(MOtq+C6208xw69cAXQWdOj5(PkEp z2e62Vf6H@I#1Ru^3MEH$~~^by#3U=aF)yMMN|bK4FL7Y-O6q ze>nS1ES5_LRPwK8-w!eHTR^7!K9i>TK;MB|Vn8I#bEDgQgEb=0DI(85iHvYdp?IVy zr{LpgWsB3A7)w2>CB_=#=opNn2H~igxJj#h!U|{GfSdi#y6?Ie1SmMJmUbMLCIL%( zeI^YW8(&TbxYMSjK=#J#Gbzi4DN)rK)^1v^76`!wJRwe zA!++<&O@)9;{R*a_Uw}bw86RT^%ps)1_6>x`!n1JfNQFamh26XH^3|P;x!Bcb$bI% z`iYkPWCyl?EdsdgVA1B4*R#;*P1hLVRUR2vdd_Q#QZgO?KU538sQq{W9TCsJnCTtK zd^*)-e_A3zwStAr=hzP{fgKVGm&I~MbGDwVaptTPl=9_{cO+Wo$~2W`<>H6c*7AIZ zg(VW$i zCO(i#B<9MHn=B9X?JLC(mtM#l?oe9-MlX8q^FeUu#G7Nz{7j(idUgZUty_k$T@ z9fY&JLzr!hbDSb9PKGZ|COaLD$J%E8M?G*I^aP;6X&;V6*Ca%5UW}Oz%fSNwL5_hx zU+-;^{@aqqwUVY|^3OjjnQtjkc=f<=vEX;4@Ds)buofzgL|H-_6b zgfH&=qfQe3i5w6%5^5>04gV84DX-3?95+gnv`v%VM^0(>-M6Lp{~K}&Ja0VAy74gK z##%y(Y+|NYVoq7pecyq~jVJ$W{Wo$zz<^Z`Evfe($Z1E2oCCpAD{s1W;G-r5+#Le- z4*zoj0H8gU-I%tONTSeiDq5L}hGQ%>G5=ek(x3%SY{vdh%c1^FIIKUbD=o}3Nrydj zBMYAr`aDUZ&;K3Q>4XrrjN{Od&U-M1^3KB( z)sdnkKA!>d14~z9vdXX;_?m+$Xp#lZ` z=>X2&PZ~z!x~MTF)E5&9L6Z{bXf$qO!K;U%>Y^~F)?^&T5^F!EH2wm7RYqB2P|CPz zOU&%H$#|yeBo&9k5bPUpE?01~JDTJ5;45xE(9u2^H@$<8?Kr)yj0$w5 zV6e7<7+Wjs^p2zLHUWhRx6i=Rq&v99!|~G-;Y)#zjx^0yw%g&elNl=$gr#pL;|-vL zgmFUn;x@q}o8b6OZ}Mw6CNtcPjCJ}Jw^;hK=TlNy*+$uW)~9lV&#Kv)x8~Xuh=kd1 zxOtDcwp*WG|LVEzGy4p&(SV<8tCWAbb^03CCbZaVws_;mlebUW6gHk9=GvVY+va^5zMT-r^LUumkS_vS57jWhZ;6yNpquIgzfW)bTRDvV$h$D1Kn z^T6E=6il32D+%O8uZw}lxpz$wpW8|vkzHL*G?s{zLu3$L*-N{u&^O3MmTo>ZD*|rA zg+u{kxf)P_L#zn84XM$L=N%ZI0Kdfw3{X&&nrtbk3I^*QQZoWoslSm0N0`971(1mq zpek5tH>e8UZF9~Do=J3t!@8$jhnl)G?U@S6smLVobM2GV8YjFtNL@Au#*@g~f;8iT z#&XKw2%PfvjBB|XIn&3xW>vs#guF80Gu--c!rQcFWyW<#b5+p&c@xti9ne96b1+21 zgf|YcD)PrTYywmTpO^s!`^KrlpdS-c;9O0Ds!F?ae1{CIgv!4MEq^$FdAZ%IoVH+#kEf~uv-jkO;D%O>SN6Yo(#iSy;v+!KVfxMXWNMtrh z8NrBYNMuDE8i_0=gRo_#!Pa+_Xd_ZU+jO+$fXEJi`N1t+lrna@MskE#ZyZEr5RF4o z!cZIF2OKbfX&g%ol|Y#1r6op_VC3)Y_aT6AFdYx1ab~x}$CWUX1T47EyAbv{6F4^; z8fUrz=csmR9z?|9c$ci1C!0Up6xe$|n$QF7ydpp(tFMjdQjw>8_5N2ef;ld`4x@M+ zyAGHY5_Jq=QUKuG4gtj4V^5v;>_Y-#V5TY7W#>}?9+s}9U;|R|$o<#5+xS$fF)f8bfH@9M zfQvJ+>Wr|%{xnGfk=hA}o;*A!2w+_#0#vh~4;#Y%@M2T{@Cu3OQwKaL;&~9F zw0_N6d1f_o{o_|y5fAuRuBmay5hp~w7kEJz* zu{13-ie`78k|Xf}z~z_Vk?0J~cek{SO_p}J0_+Dqm@116+xf!uX%ijaC)Onv&kF0# zBeTO|M2bydvBZpFM0`TJfIS;OJ($gM(NZV6C^}iiR0zPt%z_5AU7`xl#WHg}Xm5Y~ zxE{Ri=(xul>dG@FvQV{A2vI=(q~bEYc6^WiOgBTI(97tPo9bLTT+v)zuK-rV_6` z^a;WvaY_fxvoE4GQ0PI{PrDgHq5D@o=yA0JG3}~HVzEZ1Ol!kC4cgiEKEvTN&%suxU$sW@ua8YxHQ-U4j<)`_FeRQe>Qmu zXn%S#=zI6iPWDR|u}>vuUM>o)t?m+Rzv%<+41Rgul}m9`5HuhU9LiK-??gIXdp4I6 zGm{d5n{G++87MGFGdV2?@k@tInZ=yWrrjNR|w>E#|V&A3Y6leRZY<74~wxxk zE3L)TVJ-Ak-j9B-d4TwPf%(*nH|?#~rUO|~O!P0G78_4K+q9O$Ern9~&7m=hn9;w0 zScZG9=-#?he`zlRmZRtKu%#9W`LQciOE-9}j*e9lYJ@**geNPf$G|I1Kb}kn${7}& z6Uf1@wamXns}zLX9rVlP*qdCiul)4jXr^55;%)Np?8Md9ROS$^ElJd!h{(2j#_Nd#1VbRdntg z5t;3Jj@v)_>obo8F^EJuY|Z?rG->XFM^&5u+}JHvr%Gzk;rysE2cd|`LiRZL$9`|L}+KpR4kn3e8OeX= zWg-A4ou&1G>L3X59d@#K0&{X%!e!gedo}E_9)}zF2Zs$Wk$We+p7T1p6rk+v0+chA zuv&&EKWCZ3ZMq z3}h9IUJ7bRVF&77Dd!3K$$6cDdxg^j>_bc>VKvW#^6t zrhZ#6`NE%y3%2o(mr`%u4g_W?fV@Xq=r3bzOPK0cnUcm3Q4^;_pNZ}Eu5Vl!f@4GO za^}IcGU`+5pYjCX=_{}W5?gTVzK3=x(}!@4Pjf#mZGF>P^lXaajtD?KI0+C%pOUnb z9y7Gjmv9eB6hs4ekd76Vvom*8%yR2KP%Oks+7ImP< zjM7z-6Q6X50WaTgNp1QlaN*4Iq^|lWt*nwciJQQjs2}qiU07AmndkzJmm6m5D%TrF zMDaeyKJ=)*nyq?;$8%5hyf(hamwrKJ8L=ajl~7SSKFlQMDZy0GeZ6(#D)in@wmN7= zqAIp_S97E2!tZBfYm4{YR&XLbVxS=C1r?IQDHtgaY;L!Bg#>+aPBxTuzhqs9_xw2| zl0H$&ymO)ifm&p>;yw+;!k>OE_-W@p3P?a~Ac2~@^=3EZHuJLMd9M1z2_zl%IWEX@ zNg)AR4!?)27f%9o?dZ6m)pUlVGtv*3+gd`OSN|F>>yew;5FI&{S?YQQ(gI)XOJHMv z0q{YqFSh^GvC@%uFM3{BwmTW66LI*upDUFsluiVB2kL)&&7Vb#*%|W2Qa)r^cJ{XE zBD#9$9W1jPa?d13FW^YcG;SA2dQE^n3uEnlAK4F z-T)N9fsPnqJ$d4{O=fa=uP-6_X>DKdS4_#si?4|1yEf0@>zaRt?)^L> zvxSe)+CGC2%2%_KHkHSJK+M#VyjzcMKXR{XJ86)!{j?{0pAs-f1JR^wrhg0KAGS^U)HD?L_jWp|>Xt4Fozu>bS9ikk3iCrxn>`ea$_ zhK&rrmR3irruqb*lH$9Aas-T9gO3e4zw1cd)nY$ACBK?WruBn~uWaf*ihj5(;M$Y) z<8*0^c=tvB5-yXOM#0gQ+AO~*36H8+*kX$<_wZ;+Z$sLyCiH~lQwP_ZzqTthFpk27 z7f;h~z^500zimVe1x*8ab*n9`fk@pVz_>9ya7-WV_K6>8Utc0G7nel9`xgg<$k$X9 z%HG|xnF(>ay>brofrJWw>uIXWFN*Wd^Yl1-*tp`11is6_iC;yXa*NVDam}G3mQ(1^ ztyRI>_Lj{%O3|-#CXBC;U-`u^+J%grSzMvugMC{XgARE~c8m?VTHKN-llpWzsX_8_ zQ|G`r5}TuA$|cL;8>vS!nsk5KDts?1x<20U}4bV3Ki|6a7@y|vk$HIKX%w`fz3QkLa6l-qj5J6guMw>vv> zvoF!H<=W)LJXG-KUwc59K3tPuQIhrjAn>{wd^U_$d_T*xtMci!kRfpGx@0r#bQkocIU6vFGZ%JBV=y$50U|Aqp>3MK z;C9}BRnH8~{A+S|`Um~q;qtL))rj4#?FGyDU?;Mbm0f+XS==lBzjQZcl2}DN!rZ2; zScNkwdl$bV%8Tk=xnTw%kB?-&e?HPvT}X_136t(qzc5LCYLq;ncJ}L4$>uVuVM43c ztu-od?zt$kd}5)@mm)0Zw~}4Y94r2|iJp!XwD%X^NQNqwYQvf{v$G>9As@uQomG`Q z%+`6lSWr1O#q?;fFhw0PZPJ!!^Ua5m z?{4O}!-!S9K2ORW@7**mx!_fK;fckNDNIIEBWM9NKf~RAT zXXZ3TZ=I7qyxlQ6)}#bgXIoVkYY1S^M0$mq#@<(T#N9}rib+KAqJiD`u(MNMSX5?~jPFaem4+Xs{(1zZCcx^Z3WTeUS}`>e}lKY z_Nsln%Tru!v-Gs+>$ew!Tkddr-YHIbbc!k{-INv+x}Kh{Wdumoz>M76x>=M(T673@ zsESUmLAb`@EV=L#vIcd6&=Lh66Ubjy(&sRAVswBv#7|5@Aj{A`-NK6Dnp7l8wO zMfVO}S31^tk3fj#(Eh#aR4b*jUQ@c`UG?kCv$l8U%j$J%WzudLy!wI=ASZ~Oume>j z#mX^>WAY~XfdVGQku8k}Ncr`$0bkL%iA0W}s4cIQ_hAM}>QN(=P9?!X-&1ZialqLx zRB78w9e&>P`BovR%a}CnSH@UBv;OVdE6+MAwNQ^rjY=Y=7baGXE&Zy{^E+ELKITnT zo9CuvFNA$)-PxL-pN}~9WuX~5`d9TrG-k4Ulu^S^JDJnvE-c3=f@4xOYq_4Gif$cE z(hwHqy!BO}KpT=ZG!|XQPAwfk@zaG=!c<-uqu;r}rXH<3w?W!6iwH1-CPrcAtq4ok z&F+ly8f6~32LZe%%F!6Xwxhp?=9Am(YXlV1*L%IMN4(V-)we!sZWgbBX@)w!Er2{h zMnvBTmK{*6#r-@hdZX;odlxg!0STv>ShO1Pa^U*O(}H~%v%kA_9=x^RYrXj#?YxQ< z-z5xiAD;4o{@wGkCWVr-K#c|J(z`#6)VVh-B+R<(Rn1`(k4v5pmmVa+z2`~#NKe7n z`WzG)hi7R1FFF~9Nvj*;DCGhrRgc&Cf+?Y2$9;y_1m>qqQ}VMI6h-Qn!6l5%6`n2;~y`VYxq-V{T7~Ez03( z$JRxJx!>2jRpyw`526o)$o<@ Power cell " whitelist: components: - - PowerCell + - PowerCell - type: ApcPowerReceiver - type: ExtensionCableReceiver - type: Appearance @@ -29,6 +28,16 @@ - type: InteractionOutline - type: Physics bodyType: Static + - type: Fixtures + fixtures: + - shape: + !type:PhysShapeAabb + bounds: "-0.10,-0.10,0.10,0.10" + mass: 20 + mask: + - MachineMask + layer: + - HighImpassable - type: entity name: recharger @@ -36,19 +45,14 @@ parent: PowerCellRecharger components: - type: Sprite - netsync: false sprite: Structures/Power/recharger.rsi - drawdepth: SmallObjects - - type: Icon - sprite: Structures/Power/recharger.rsi - state: empty - type: Charger chargerSlot: ejectOnInteract: true whitelist: components: - - PowerCell - - PowerCellSlot + - HitscanBatteryAmmoProvider + - ProjectileBatteryAmmoProvider - type: entity name: wall recharger @@ -56,18 +60,13 @@ parent: PowerCellRecharger components: - type: Sprite - netsync: false sprite: Structures/Power/wall_recharger.rsi - drawdepth: SmallObjects - - type: Icon - sprite: Structures/Power/wall_recharger.rsi - state: empty - type: WallMount - type: Charger - transferEfficiency: 0.95 + chargeRate: 25 chargerSlot: ejectOnInteract: true whitelist: components: - - PowerCell - - PowerCellSlot \ No newline at end of file + - HitscanBatteryAmmoProvider + - ProjectileBatteryAmmoProvider diff --git a/Resources/Prototypes/LootTables/suspicion_loot_table.yml b/Resources/Prototypes/LootTables/suspicion_loot_table.yml index 08233d09ee..7b4a332b31 100644 --- a/Resources/Prototypes/LootTables/suspicion_loot_table.yml +++ b/Resources/Prototypes/LootTables/suspicion_loot_table.yml @@ -2,64 +2,27 @@ - type: entityLootTable id: SuspicionRule entries: - - id: RifleAk + - id: WeaponRifleAk amount: 0 maxAmount: 5 - - id: RifleBlackAk + - id: WeaponRifleBulldog amount: 0 maxAmount: 5 - - id: RifleCarbine + - id: WeaponRifleWintermute amount: 0 maxAmount: 5 - - id: RifleDallas + - id: WeaponPistolClarissa amount: 0 maxAmount: 5 - - id: RifleSTS + - id: WeaponPistolHandmade amount: 0 maxAmount: 5 - - id: RifleVintorez + - id: WeaponPistolMandella amount: 0 maxAmount: 5 - - id: RifleWintermute + - id: WeaponPistolMk58 amount: 0 maxAmount: 5 - - id: RifleCalico - amount: 0 - maxAmount: 5 - - id: PistolClarissa - amount: 0 - maxAmount: 5 - - id: PistolColt - amount: 0 - maxAmount: 5 - - id: PistolGiskard - amount: 0 - maxAmount: 5 - - id: PistolHMPistol - amount: 0 - maxAmount: 5 - - id: PistolLamia - amount: 0 - maxAmount: 5 - - id: PistolMandella - amount: 0 - maxAmount: 5 - - id: PistolMk58 - amount: 0 - maxAmount: 5 - - id: PistolMk58Wood - amount: 0 - maxAmount: 5 - - id: PistolMolly - amount: 0 - maxAmount: 5 - - id: PistolOlivaw - amount: 0 - maxAmount: 5 - - id: PistolPaco - amount: 0 - maxAmount: 5 - - id: ButchCleaver maxAmount: 5 - id: Pickaxe @@ -73,91 +36,69 @@ - id: Stunbaton maxAmount: 10 - - id: RevolverDeckard + - id: WeaponRevolverDeckard amount: 0 maxAmount: 5 - - id: RevolverInspector + - id: WeaponRevolverInspector amount: 0 maxAmount: 5 - - id: RevolverMateba + - id: WeaponRevolverMateba amount: 0 maxAmount: 5 - - id: ShotgunBojevic + - id: WeaponShotgunBojevic amount: 0 maxAmount: 5 - - id: ShotgunDB + - id: WeaponShotgunDoubleBarreled amount: 0 maxAmount: 5 - - id: ShotgunBull + - id: WeaponShotgunGladstone amount: 0 maxAmount: 5 - - id: ShotgunGladstone + - id: WeaponShotgunKammerer amount: 0 maxAmount: 5 - - id: ShotgunRegulator - amount: 0 - maxAmount: 5 - - id: ShotgunPump - amount: 0 - maxAmount: 5 - - id: ShotgunSawn + - id: WeaponShotgunSawn amount: 0 maxAmount: 5 - - id: SmgAtreides + - id: WeaponSubMachineGunAtreides amount: 0 maxAmount: 5 - - id: SmgC20r + - id: WeaponSubMachineGunC20r amount: 0 maxAmount: 5 - - id: SmgDrozd + - id: WeaponSubMachineGunDrozd amount: 0 maxAmount: 5 - - id: SmgWt550 - amount: 0 - maxAmount: 5 - - id: SmgZoric + - id: WeaponSubMachineGunWt550 amount: 0 maxAmount: 5 - - id: SniperBoltGun + - id: WeaponSniperMosin amount: 0 maxAmount: 5 - - id: SniperBoltGunWood + - id: WeaponSniperHristov amount: 0 maxAmount: 5 - - id: SniperHeavy - amount: 0 - maxAmount: 5 - - - id: RedLaser - amount: 0 - maxAmount: 5 - - id: RedHeavyLaser + - id: WeaponLaserGun amount: 0 maxAmount: 1 - - id: XrayLaser + - id: WeaponLaserCannon amount: 0 maxAmount: 1 - - id: LaserGun - amount: 0 - maxAmount: 1 - - id: LaserCannon - amount: 0 - maxAmount: 1 - - id: XrayCannon + - id: WeaponXrayCannon amount: 0 maxAmount: 2 - - id: TaserGun + - id: WeaponTaser amount: 0 maxAmount: 4 - - id: LauncherChinaLake + - id: WeaponLauncherChinaLake prob: 0.30 maxAmount: 3 - - id: LauncherRocket + - id: WeaponLauncherRocket prob: 0.20 maxAmount: 3 @@ -186,15 +127,15 @@ # Spawn a bunch of ammo around! - - id: MagazineSRifle + - id: MagazineRifle maxAmount: 15 - - id: MagazineClRifle + - id: MagazineCaselessRifle maxAmount: 15 - - id: MagazineClRifle10x24 + - id: MagazineCaselessRifle10x24 maxAmount: 15 - - id: MagazineClRiflePistol + - id: MagazinePistolCaselessRifle maxAmount: 15 - - id: MagazineLRifle + - id: MagazineLightRifle maxAmount: 15 - id: MagazinePistolCalicoTopMounted maxAmount: 15 @@ -202,13 +143,13 @@ maxAmount: 15 - id: MagazinePistol maxAmount: 15 - - id: MagazineHCPistol + - id: MagazinePistolHighCapacity maxAmount: 15 - id: MagazineMagnum maxAmount: 15 - - id: MagazineMagnumSmg + - id: MagazineMagnumSubMachineGun maxAmount: 15 - - id: RocketAmmo + - id: CartridgeRocket maxAmount: 15 - id: GrenadeFrag maxAmount: 15 diff --git a/Resources/Prototypes/Maps/game.yml b/Resources/Prototypes/Maps/game.yml index 61dbb2deed..e30f5b4033 100644 --- a/Resources/Prototypes/Maps/game.yml +++ b/Resources/Prototypes/Maps/game.yml @@ -29,38 +29,3 @@ SecurityOfficer: [ 2, 4 ] Janitor: [ 1, 1 ] Musician: [1, 1] - -- type: gameMap - id: dart - mapName: 'Dart' - mapPath: /Maps/dart.yml - minPlayers: 0 - votable: false - stations: - Station: #TODO: Mapper, add a BecomesStation component to the primary grid of the map. - mapNameTemplate: '{0} Dart {1}' - nameGenerator: - !type:NanotrasenNameGenerator - prefixCreator: '14' - overflowJobs: [] - availableJobs: - Captain: [ 1, 1 ] - -- type: gameMap - id: moonrise - mapName: 'Moonrise ERC' - mapPath: /Maps/moonrise.yml - minPlayers: 0 - votable: false - stations: - Station: - mapNameTemplate: '{0} Moonrise {1}' - nameGenerator: - !type:NanotrasenNameGenerator - prefixCreator: 'VG' - overflowJobs: [] - availableJobs: - Captain: [ 1, 1 ] - ChiefEngineer: [ 1, 1 ] - ChiefMedicalOfficer: [ 1, 1 ] - SecurityOfficer: [ 3, 6 ] diff --git a/Resources/Prototypes/Objectives/traitorObjectives..yml b/Resources/Prototypes/Objectives/traitorObjectives..yml index 4f36763aae..20b1994503 100644 --- a/Resources/Prototypes/Objectives/traitorObjectives..yml +++ b/Resources/Prototypes/Objectives/traitorObjectives..yml @@ -169,5 +169,5 @@ - DieCondition conditions: - !type:StealCondition - prototype: AntiqueLaserGun - + prototype: WeaponAntiqueLaser + diff --git a/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/pneumatic_cannon.yml b/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/pneumatic_cannon.yml index 48a526abaa..85a68d5f39 100644 --- a/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/pneumatic_cannon.yml +++ b/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/pneumatic_cannon.yml @@ -1,4 +1,4 @@ -- type: constructionGraph +- type: constructionGraph id: PneumaticCannon start: start graph: @@ -21,4 +21,4 @@ amount: 6 doAfter: 10 - node: cannon - entity: ImprovisedPneumaticCannon + entity: WeaponImprovisedPneumaticCannon diff --git a/Resources/Prototypes/Recipes/Lathes/security.yml b/Resources/Prototypes/Recipes/Lathes/security.yml index 2581e57b07..b3475a18f5 100644 --- a/Resources/Prototypes/Recipes/Lathes/security.yml +++ b/Resources/Prototypes/Recipes/Lathes/security.yml @@ -34,8 +34,8 @@ - type: latheRecipe id: ShellShotgunBeanbag icon: - sprite: Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell_beanbag.rsi - state: base + sprite: Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi + state: beanbag result: ShellShotgunBeanbag completetime: 2 materials: @@ -65,33 +65,33 @@ Steel: 5 - type: latheRecipe - id: CartridgeClRifleRubber + id: CartridgeCaselessRifleRubber icon: sprite: Objects/Weapons/Guns/Ammunition/Casings/ammo_casing.rsi state: base - result: CartridgeClRifleRubber + result: CartridgeCaselessRifleRubber completetime: 2 materials: Plastic: 10 Steel: 5 - type: latheRecipe - id: CartridgeLRifleRubber + id: CartridgeLightRifleRubber icon: sprite: Objects/Weapons/Guns/Ammunition/Casings/ammo_casing.rsi state: base - result: CartridgeLRifleRubber + result: CartridgeLightRifleRubber completetime: 2 materials: Plastic: 10 Steel: 5 - type: latheRecipe - id: CartridgeSRifleRubber + id: CartridgeRifleRubber icon: sprite: Objects/Weapons/Guns/Ammunition/Casings/ammo_casing.rsi state: base - result: CartridgeSRifleRubber + result: CartridgeRifleRubber completetime: 2 materials: Plastic: 10 @@ -128,11 +128,11 @@ Steel: 20 - type: latheRecipe - id: CartridgeLRifle + id: CartridgeLightRifle icon: sprite: Objects/Weapons/Guns/Ammunition/Casings/ammo_casing.rsi state: base - result: CartridgeLRifle + result: CartridgeLightRifle completetime: 2 materials: Steel: 30 @@ -140,8 +140,8 @@ - type: latheRecipe id: ShellShotgunFlare icon: - sprite: Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell_flare.rsi - state: base + sprite: Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi + state: flare result: ShellShotgunFlare completetime: 2 materials: @@ -151,8 +151,8 @@ - type: latheRecipe id: ShellTranquilizer icon: - sprite: Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell_practice.rsi - state: base + sprite: Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi + state: practice result: ShellTranquilizer completetime: 4 materials: @@ -163,10 +163,10 @@ - type: latheRecipe id: ShellShotgunFlash icon: - sprite: Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell_flash.rsi - state: base + sprite: Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi + state: flash result: ShellShotgunFlash completetime: 2 materials: Plastic: 20 - Steel: 5 \ No newline at end of file + Steel: 5 diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/janitor.yml b/Resources/Prototypes/Roles/Jobs/Civilian/janitor.yml index afde462ccc..e557824ab8 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/janitor.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/janitor.yml @@ -12,7 +12,7 @@ special: - !type:GiveItemOnHolidaySpecial holiday: GarbageDay - prototype: RevolverInspector + prototype: WeaponRevolverInspector - type: startingGear id: JanitorGear diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml index 3d8add8cc6..176cd39620 100644 --- a/Resources/Prototypes/tags.yml +++ b/Resources/Prototypes/tags.yml @@ -54,6 +54,33 @@ - type: Tag id: Cartridge +- type: Tag + id: CartridgeAntiMaterial + +- type: Tag + id: CartridgeCap + +- type: Tag + id: CartridgeCaselessRifle + +- type: Tag + id: CartridgeHeavyRifle + +- type: Tag + id: CartridgeLightRifle + +- type: Tag + id: CartridgeMagnum + +- type: Tag + id: CartridgePistol + +- type: Tag + id: CartridgeRifle + +- type: Tag + id: CartridgeRocket + - type: Tag id: CigFilter @@ -177,6 +204,9 @@ - type: Tag id: GlassBeaker +- type: Tag + id: Grenade + - type: Tag id: Handcuffs @@ -207,6 +237,56 @@ - type: Tag id: Machete +# Magazines ordered by slot then caliber + +- type: Tag + id: MagazineBoxLightRifle + +- type: Tag + id: MagazineCalico + +- type: Tag + id: MagazineCaselessRifle + +- type: Tag + id: MagazineHeavyRifle + +- type: Tag + id: MagazineHeavyRifleBox + +- type: Tag + id: MagazineLightRifle + +- type: Tag + id: MagazineLightRiflePan + +- type: Tag + id: MagazineMagnum + +- type: Tag + id: MagazinePistol + +- type: Tag + id: MagazinePistolCaselessRifle + +- type: Tag + id: MagazinePistolHighCapacity + +- type: Tag + id: MagazinePistolTopMounted + +- type: Tag + id: MagazineRifle + +- type: Tag + id: MagazineShotgun + +- type: Tag + id: MagazineMagnumSubMachineGun + +- type: Tag + id: MagazinePistolSubMachineGun + - type: Tag id: Matchstick @@ -266,7 +346,7 @@ - type: Tag id: PlantSampleTaker - + - type: Tag id: Plastic @@ -275,7 +355,7 @@ - type: Tag id: PussyWagonKeys - + - type: Tag id: RawMaterial @@ -302,7 +382,7 @@ id: Sheet - type: Tag - id: ShotgunShell + id: ShellShotgun - type: Tag id: Shovel diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_material.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_material.rsi/icon.png deleted file mode 100644 index d837a9003bf76903e2c9bf4743a943de55eb328b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 358 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=hEVFzR}`IEGZrNwz6?z;M`sX&K|z z+AEBU`6NmYtYBtqW{&vax$TouV!&i zu}ru&i<^gsg=ZnlgVF=9r~6CD=$J@=z`A??4=q^hp4A=N28O)2hIK;M_oo8GkHOQ`&t;ucLK6T) Cos3xk diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_material.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_material.rsi/meta.json index 0b02c18419..3a7a5a89c9 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_material.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_material.rsi/meta.json @@ -7,9 +7,6 @@ "y": 32 }, "states": [ - { - "name": "icon" - }, { "name": "base" }, diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/cl_rifle.rsi/base-10x24.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/base-10x24.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/cl_rifle.rsi/base-10x24.png rename to Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/base-10x24.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/cl_rifle.rsi/base-b.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/base-b.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/cl_rifle.rsi/base-b.png rename to Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/base-b.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/cl_rifle.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/base.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/cl_rifle.rsi/base.png rename to Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/base.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/cl_rifle.rsi/flash.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/flash.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/cl_rifle.rsi/flash.png rename to Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/flash.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/cl_rifle.rsi/hv.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/hv.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/cl_rifle.rsi/hv.png rename to Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/hv.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/cl_rifle.rsi/mag-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/mag-1.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/cl_rifle.rsi/mag-1.png rename to Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/mag-1.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/cl_rifle.rsi/mag10-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/mag10-1.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/cl_rifle.rsi/mag10-1.png rename to Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/mag10-1.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/cl_rifle.rsi/magb-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/magb-1.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/cl_rifle.rsi/magb-1.png rename to Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/magb-1.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/cl_rifle.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/meta.json similarity index 95% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/cl_rifle.rsi/meta.json rename to Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/meta.json index 04a9fb6184..632f0d68a9 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/cl_rifle.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/meta.json @@ -7,9 +7,6 @@ "y": 32 }, "states": [ - { - "name": "icon" - }, { "name": "base" }, diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/cl_rifle.rsi/practice.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/practice.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/cl_rifle.rsi/practice.png rename to Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/practice.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/cl_rifle.rsi/rubber-b.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/rubber-b.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/cl_rifle.rsi/rubber-b.png rename to Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/rubber-b.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/cl_rifle.rsi/rubber.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/rubber.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/cl_rifle.rsi/rubber.png rename to Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi/rubber.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/cl_rifle.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/cl_rifle.rsi/icon.png deleted file mode 100644 index 836bafb06719127b52cd1bca2bc1c39cd6680a2a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 450 zcmV;z0X_bSP)F6m119Ed>$S7QLY{@TQi;CP5DR!?g$| zoDJci*A}$5T!TGPGrgyR1owj*?(w_#`P}#3JDz432E(k8q0&78PrwuK1o{yWLU)AF zouLQ_p*z>dUrc>I^ev(+AmO%|WogDjiWK8vrx*__i;Swm<6~FY<|O(1cUBJ)*k%^+ z5slP(GCvaYH-_eBPS**@HwO?Y9{{$QMWlS}O<485Xry+zO~jQzW9$H@7YlU}34hyt zZhA(F+=V+!bo~TE=+5SLf^;$jP>4-GQseZt; zUk&a`;QZ`F1K2-2asam4^aKM?&8foyG}TkF+*Uhl&EuI|Eddoc^solxw}POHF4v*GrM{AzwonTBLAWG*$vHRo%R|$3oo2?>RJtSJ2si>QEs%&u zL?Rv$O%X`MBVud4AJx`P?rya{bRh5(*1H$X)~?pGgEgfd? z;|EJCFaOqUpT60GgN-*~b)vyV0dTb21HgW)NcQoAjl*MG@R|jFiU2ji>lSE4TKA90 d5pV<=l`mV2gg3w|Fd6UwW zlS3eiI7WZKYY4?Ky?4(iQus~B!Moq@``-7ydq%ljW|pxqQ~F#$MZmOdkxXaBOax5J z7TY`Py4d~%2I1jI3|&=_5|~Ej(gLI4x~ec%V49gr33NO4v5S{iHZd(*n3kE+R-5_(BeD*0000 diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/meta.json index 5a978b945c..5efc1be2a8 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi/meta.json @@ -7,9 +7,6 @@ "y": 32 }, "states": [ - { - "name": "icon" - }, { "name": "base" }, diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/icon.png deleted file mode 100644 index 59f8dc24f795d165eba2a7ec6dac81d32710fa3c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 459 zcmV;+0W|)JP)3_SaTI@n{s6V9n+U;7E`n3L$EB3w;vf!^4nhYV?9xFB(&DN^DLA-iqMXQLc2JfLrl1)Hn~e9g_0LSE*!`6+;<;I1WnVh$gC`s9twm4OC>N&$z+(4 z3Gcc{P;fD7j$6MH>vx*KvR0V)MMT5tv|i1-m&ja4;Di%Jvd3c7yq;zEWAQEE2Df5W zA#j0NaG|7g!2uslSjncz>8%7p0ckJ~9N?@#C7ULP2dnloQKYHT)9~sCaHIv)gyo`2 z_BP%j$79In2KY2aQzE=@W`S~1CHoN_$L9)qwHN#)LJP6NnFO40L+?+BjMjFM&kcOR z0gomu7gdr}5&#nD)vhPthTexDo}gOq*t_6`dkO$R`>g>0*xI?k_9ko*3vT7+VT24P zoJnAoNTKv-&o#fkkty7B!?^@#5qjtC?$|dR@MywzcZ|YQ({=vxD(4#xFn$fQnKJ?a z$#@I^P_1_Yfinv@MF0c>=N9;nEYCk-C=d$x%@5JJ(FDf~N;Log002ovPDHLkV1oTJ B$WH(O diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/meta.json index 5a978b945c..5efc1be2a8 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi/meta.json @@ -7,9 +7,6 @@ "y": 32 }, "states": [ - { - "name": "icon" - }, { "name": "base" }, diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/s_rifle.rsi/base-b.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/base-b.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/s_rifle.rsi/base-b.png rename to Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/base-b.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/s_rifle.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/base.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/s_rifle.rsi/base.png rename to Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/base.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/s_rifle.rsi/flash.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/flash.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/s_rifle.rsi/flash.png rename to Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/flash.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/s_rifle.rsi/hv.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/hv.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/s_rifle.rsi/hv.png rename to Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/hv.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/s_rifle.rsi/mag-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/mag-1.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/s_rifle.rsi/mag-1.png rename to Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/mag-1.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/s_rifle.rsi/magb-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/magb-1.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/s_rifle.rsi/magb-1.png rename to Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/magb-1.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/s_rifle.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/meta.json similarity index 94% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/s_rifle.rsi/meta.json rename to Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/meta.json index d91e29a27c..52a51b7fc7 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/s_rifle.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/meta.json @@ -7,9 +7,6 @@ "y": 32 }, "states": [ - { - "name": "icon" - }, { "name": "base" }, diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/s_rifle.rsi/practice-b.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/practice-b.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/s_rifle.rsi/practice-b.png rename to Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/practice-b.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/s_rifle.rsi/practice.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/practice.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/s_rifle.rsi/practice.png rename to Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/practice.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/s_rifle.rsi/rubber.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/rubber.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/s_rifle.rsi/rubber.png rename to Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi/rubber.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/s_rifle.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/s_rifle.rsi/icon.png deleted file mode 100644 index d864a73b1bad3393df0b97d41487cef997c14bfd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 435 zcmV;k0ZjghP)7hU<5DJ6>;|K_0N+C=+ z6#*ekd3F5B;`{yBBH989{`z>w>T(?=QcEXgEuGXBnH?4GR61-PWV<3A;`8p9QdeT- z+A@O7X$1Wn4uU(C4)Krv@ujkR_Y(DD4j~ux<@+LSKPqt3k8XAeGu4D$;&)Gou3!Bye_mVgT$P9!Y>* zk1??*w9EQ%(AWo5sLyI|>-Y0g+0B3s97gB?HM#H*(S^eZ8TcE$8;ve}A_C*a|2>d| d0-?a9;tP2+!}vJuo$3Gp002ovPDHLkV1mknyaxaP diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/ammo_casing.rsi/spent.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/ammo_casing.rsi/base-spent.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/ammo_casing.rsi/spent.png rename to Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/ammo_casing.rsi/base-spent.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/ammo_casing.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/ammo_casing.rsi/meta.json index 0736b42558..023731bcb3 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/ammo_casing.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/ammo_casing.rsi/meta.json @@ -11,7 +11,7 @@ "name": "base" }, { - "name": "spent" + "name": "base-spent" } ] } diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/spent.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/base-spent.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/spent.png rename to Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/base-spent.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell_beanbag.rsi/spent.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/beanbag-spent.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell_beanbag.rsi/spent.png rename to Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/beanbag-spent.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell_beanbag.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/beanbag.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell_beanbag.rsi/base.png rename to Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/beanbag.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell_blank.rsi/spent.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/blank-spent.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell_blank.rsi/spent.png rename to Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/blank-spent.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell_blank.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/blank.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell_blank.rsi/base.png rename to Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/blank.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell_flare.rsi/spent.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/flare-spent.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell_flare.rsi/spent.png rename to Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/flare-spent.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell_flare.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/flare.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell_flare.rsi/base.png rename to Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/flare.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell_flash.rsi/spent.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/flash-spent.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell_flash.rsi/spent.png rename to Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/flash-spent.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell_flash.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/flash.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell_flash.rsi/base.png rename to Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/flash.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell_incendiary.rsi/spent.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/incendiary-spent.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell_incendiary.rsi/spent.png rename to Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/incendiary-spent.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell_incendiary.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/incendiary.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell_incendiary.rsi/base.png rename to Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/incendiary.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/meta.json index 8fe2966bee..7ef062a143 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/meta.json @@ -11,7 +11,49 @@ "name": "base" }, { - "name": "spent" + "name": "base-spent" + }, + { + "name": "beanbag" + }, + { + "name": "beanbag-spent" + }, + { + "name": "blank" + }, + { + "name": "blank-spent" + }, + { + "name": "flare" + }, + { + "name": "flare-spent" + }, + { + "name": "flash" + }, + { + "name": "flash-spent" + }, + { + "name": "incendiary" + }, + { + "name": "incendiary-spent" + }, + { + "name": "practice" + }, + { + "name": "practice-spent" + }, + { + "name": "slug" + }, + { + "name": "slug-spent" } ] } \ No newline at end of file diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell_practice.rsi/spent.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/practice-spent.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell_practice.rsi/spent.png rename to Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/practice-spent.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell_practice.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/practice.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell_practice.rsi/base.png rename to Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/practice.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell_slug.rsi/spent.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/slug-spent.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell_slug.rsi/spent.png rename to Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/slug-spent.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell_slug.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/slug.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell_slug.rsi/base.png rename to Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi/slug.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell_beanbag.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell_beanbag.rsi/meta.json deleted file mode 100644 index 059a7d46bd..0000000000 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell_beanbag.rsi/meta.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/79b16e252e29d5a223a2b928fba25e2e6f9644ee/icons/obj/ammo.dmi", - "states": [ - { - "name": "base" - }, - { - "name": "spent" - } - ] -} \ No newline at end of file diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell_blank.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell_blank.rsi/meta.json deleted file mode 100644 index 8fe2966bee..0000000000 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell_blank.rsi/meta.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/e1d495c3faf4642b6ec1c4be8acc7cd5bc51d785/icons/obj/ammo.dmi", - "states": [ - { - "name": "base" - }, - { - "name": "spent" - } - ] -} \ No newline at end of file diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell_blank.rsi/shotgun_shell_beanbag.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell_blank.rsi/shotgun_shell_beanbag.rsi/base.png deleted file mode 100644 index 01aa3bcd82b5d4c962308d59b770bac0f99350bf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 289 zcmV++0p9+JP)R8-@AgnIBWIMxwE{N>@;6Uz4 zcMJP|xWSGQ5!#$it91u(00(dYTL6E05v>A{$MDxZErc<^f9wRj062wOCt(D5#YY_Q z0^qQh&wc^m5f_Ua$#_XX9s|o2kS0n9rgI(hh>Q95y}!=5T%-xknDrDGZyfL7Tuo+hZ)DgDg nfaZU|=KRNX>;Mkn04DPU49R91cMdsC00000NkvXXu0mjfSgLt! diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell_blank.rsi/shotgun_shell_beanbag.rsi/spent.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell_blank.rsi/shotgun_shell_beanbag.rsi/spent.png deleted file mode 100644 index d6a0429b66b1a01ad5504ec8ceb35a99ef5a108a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 324 zcmV-K0lWT*P)2{^hiJw~ znCM+EYeMd4`bYGA(o61y)|xiwq}6%=1V8`;fG(z?e(%ZZW-;gG z_EFe;>$GWny@d0nW^>W8j)UbAD5d_y0k)qw#jOBJDHBD}!MGl2r+96^F8(GTV3K%? z*9K%+Cd#seNkSaQbe|G0@!EhL0-z`gz)#!?0FdXo_0+cfbOe>I5@8WN=pk$e^>E*?0sVaLSAhff*V+Ols;NSvFerp-9%EyHhl z-v5$GuOCi3eDnlE&*I!ef$Tk231Evq@-Z-6WKg(tW$uY8p!*m+UHx3vIVCg!0DLe@ A>;M1& diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Explosives/grenade_flash.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Explosives/grenade_flash.rsi/meta.json deleted file mode 100644 index 8fe2966bee..0000000000 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Explosives/grenade_flash.rsi/meta.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/e1d495c3faf4642b6ec1c4be8acc7cd5bc51d785/icons/obj/ammo.dmi", - "states": [ - { - "name": "base" - }, - { - "name": "spent" - } - ] -} \ No newline at end of file diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Explosives/grenade_flash.rsi/spent.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Explosives/grenade_flash.rsi/spent.png deleted file mode 100644 index d770bca84016cf4611f3f051bfb496599bc6f35f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 205 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJDV{ElAr*6yZ3-SR9Clz@#<;ci z3gcoviP8frnB8OzBxDXa^{M?{eDA+xkFTVJ%x(#ZZ_^D8=GdM+00adWs0+cfbOe>I5@8WN=pk$e^>E*?0sVaLSAhff*V+Ols;NSvFerp-9%EyHhl z-v5$GuOCi3eDnlE&*I!ef$Tk231Evq@-Z-6WKg(tW$uY8p!*m+UHx3vIVCg!0DLe@ A>;M1& diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Explosives/grenade_frag.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Explosives/grenade_frag.rsi/meta.json deleted file mode 100644 index 8fe2966bee..0000000000 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Explosives/grenade_frag.rsi/meta.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/e1d495c3faf4642b6ec1c4be8acc7cd5bc51d785/icons/obj/ammo.dmi", - "states": [ - { - "name": "base" - }, - { - "name": "spent" - } - ] -} \ No newline at end of file diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Explosives/grenade_frag.rsi/spent.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Explosives/grenade_frag.rsi/spent.png deleted file mode 100644 index d770bca84016cf4611f3f051bfb496599bc6f35f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 205 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJDV{ElAr*6yZ3-SR9Clz@#<;ci z3gcoviP8frnB8OzBxDXa^{M?{eDA+xkFTVJ%x(#ZZ_^D8=GdM+00adWs0+cfbOe>I5@8WN=pk$e^>E*?0sVaLSAhff*V+Ols;NSvFerp-9%EyHhl z-v5$GuOCi3eDnlE&*I!ef$Tk231Evq@-Z-6WKg(tW$uY8p!*m+UHx3vIVCg!0DLe@ A>;M1& diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Explosives/rpg.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Explosives/rpg.rsi/meta.json deleted file mode 100644 index 3e7d56798e..0000000000 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Explosives/rpg.rsi/meta.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/e1d495c3faf4642b6ec1c4be8acc7cd5bc51d785/icons/obj/guns/projectile/rocket.dmi", - "states": [ - { - "name": "frag" - } - ] -} \ No newline at end of file diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/10x24.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/10x24.rsi/base.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/10x24.rsi/base.png rename to Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/10x24.rsi/base.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/10x24.rsi/mag-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/10x24.rsi/mag-1.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/10x24.rsi/mag-1.png rename to Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/10x24.rsi/mag-1.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/10x24.rsi/mag-2.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/10x24.rsi/mag-2.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/10x24.rsi/mag-2.png rename to Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/10x24.rsi/mag-2.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/10x24.rsi/mag-3.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/10x24.rsi/mag-3.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/10x24.rsi/mag-3.png rename to Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/10x24.rsi/mag-3.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/10x24.rsi/mag-4.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/10x24.rsi/mag-4.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/10x24.rsi/mag-4.png rename to Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/10x24.rsi/mag-4.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/10x24.rsi/mag-5.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/10x24.rsi/mag-5.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/10x24.rsi/mag-5.png rename to Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/10x24.rsi/mag-5.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/10x24.rsi/mag-6.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/10x24.rsi/mag-6.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/10x24.rsi/mag-6.png rename to Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/10x24.rsi/mag-6.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/10x24.rsi/mag-7.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/10x24.rsi/mag-7.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/10x24.rsi/mag-7.png rename to Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/10x24.rsi/mag-7.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_flash.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/10x24.rsi/meta.json similarity index 95% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_flash.rsi/meta.json rename to Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/10x24.rsi/meta.json index c2ea42f1c9..ae6061f323 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_flash.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/10x24.rsi/meta.json @@ -7,9 +7,6 @@ "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi", "states": [ - { - "name": "icon" - }, { "name": "base" }, @@ -30,6 +27,9 @@ }, { "name": "mag-6" + }, + { + "name": "mag-7" } ] } \ No newline at end of file diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_base.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/base.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_base.rsi/base.png rename to Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/base.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_hv.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/high_velocity.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_hv.rsi/base.png rename to Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/high_velocity.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/cl_pistol.rsi/mag-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/mag-1.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/cl_pistol.rsi/mag-1.png rename to Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/mag-1.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/cl_pistol.rsi/mag-2.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/mag-2.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/cl_pistol.rsi/mag-2.png rename to Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/mag-2.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/cl_pistol.rsi/mag-3.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/mag-3.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/cl_pistol.rsi/mag-3.png rename to Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/mag-3.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/cl_pistol.rsi/mag-4.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/mag-4.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/cl_pistol.rsi/mag-4.png rename to Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/mag-4.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/cl_pistol.rsi/mag-5.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/mag-5.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/cl_pistol.rsi/mag-5.png rename to Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/mag-5.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/meta.json similarity index 78% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag.rsi/meta.json rename to Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/meta.json index 4e596816bc..9867f65ae0 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/meta.json @@ -8,10 +8,19 @@ "copyright": "https://github.com/discordia-space/CEV-Eris/raw/831c7c2743530e8a31910d781bae9dc34f3f1ec8/icons/obj/ammo_mags.dmi", "states": [ { - "name": "icon" + "name": "base" }, { - "name": "base" + "name": "high_velocity" + }, + { + "name": "practice" + }, + { + "name": "red" + }, + { + "name": "rubber" }, { "name": "mag-1" @@ -27,9 +36,6 @@ }, { "name": "mag-5" - }, - { - "name": "mag-6" } ] } \ No newline at end of file diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_practice.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/practice.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_practice.rsi/base.png rename to Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/practice.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/red.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag.rsi/base.png rename to Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/red.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_rubber.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/rubber.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_rubber.rsi/base.png rename to Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi/rubber.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_base.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/base.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_base.rsi/base.png rename to Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/base.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_flash.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/flash.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_flash.rsi/base.png rename to Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/flash.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_hv.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/high_velocity.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_hv.rsi/base.png rename to Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/high_velocity.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/cl_rifle.rsi/mag-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/mag-1.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/cl_rifle.rsi/mag-1.png rename to Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/mag-1.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_mag_hv.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/meta.json similarity index 72% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_mag_hv.rsi/meta.json rename to Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/meta.json index 43b96fbef7..0da5f470a4 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_mag_hv.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/meta.json @@ -7,23 +7,26 @@ "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi", "states": [ - { - "name": "icon" - }, { "name": "base" }, + { + "name": "flash" + }, + { + "name": "high_velocity" + }, + { + "name": "practice" + }, + { + "name": "red" + }, + { + "name": "rubber" + }, { "name": "mag-1" - }, - { - "name": "mag-2" - }, - { - "name": "mag-3" - }, - { - "name": "mag-4" } ] } \ No newline at end of file diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_practice.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/practice.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_practice.rsi/base.png rename to Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/practice.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/cl_rifle.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/red.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/cl_rifle.rsi/base.png rename to Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/red.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_rubber.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/rubber.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_rubber.rsi/base.png rename to Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag.rsi/rubber.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_short_base.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi/base.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_short_base.rsi/base.png rename to Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi/base.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_short_flash.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi/flash.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_short_flash.rsi/base.png rename to Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi/flash.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_short_hv.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi/high_velocity.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_short_hv.rsi/base.png rename to Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi/high_velocity.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/cl_rifle_short.rsi/mag-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi/mag-1.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/cl_rifle_short.rsi/mag-1.png rename to Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi/mag-1.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_mag_practice.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi/meta.json similarity index 72% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_mag_practice.rsi/meta.json rename to Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi/meta.json index 43b96fbef7..0da5f470a4 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_mag_practice.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi/meta.json @@ -7,23 +7,26 @@ "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi", "states": [ - { - "name": "icon" - }, { "name": "base" }, + { + "name": "flash" + }, + { + "name": "high_velocity" + }, + { + "name": "practice" + }, + { + "name": "red" + }, + { + "name": "rubber" + }, { "name": "mag-1" - }, - { - "name": "mag-2" - }, - { - "name": "mag-3" - }, - { - "name": "mag-4" } ] } \ No newline at end of file diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_short_practice.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi/practice.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_short_practice.rsi/base.png rename to Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi/practice.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/cl_rifle_short.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi/red.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/cl_rifle_short.rsi/base.png rename to Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi/red.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_short_rubber.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi/rubber.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_short_rubber.rsi/base.png rename to Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi/rubber.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/10x24.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/10x24.rsi/icon.png deleted file mode 100644 index 9a0cfee6b6e24844e327240d683741b42af91b51..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 331 zcmV-R0kr;!P)8C5H=8wNd)##W#|C&%i)N2>f~Rjp68vyIAE&wVZ*0#56z)FyQ@y dQ3njT0|2!+R^89K)93&I002ovPDHLkV1lLtjVJ&B diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/10x24.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/10x24.rsi/meta.json deleted file mode 100644 index ba03633bbe..0000000000 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/10x24.rsi/meta.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi", - "states": [ - { - "name": "icon" - }, - { - "name": "base" - }, - { - "name": "mag-1" - }, - { - "name": "mag-2" - }, - { - "name": "mag-3" - }, - { - "name": "mag-4" - }, - { - "name": "mag-5" - }, - { - "name": "mag-6" - }, - { - "name": "mag-7" - } - ] -} \ No newline at end of file diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/10x24.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/10x24.rsi/base.png deleted file mode 100644 index 09cc70d6ef2eb67ae727277a0ad7cb639aa3a3df..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 302 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJubwWBAr*6yZ3-SR9Clz@#<;ci z3S;v@Mx7@ar*zl+?AJ5fxxaN{9$x|wT(}V6{_wfjwLj{|1yigaeE9cQqbAT(bJH2c z(~Rrq+b0W5o#MpFYMssf%aY;QZE5qoMIEnSt(cS}7P<4m*U#xsG8WHcKGB=M$}+)( z#myN^G|WvaRCZp$Y)$Qec@%tX1Y?+xQ6+b*bYTmY3 x|6S5l<*P+(Y(keAbPqIq=XR4dc)-WNaI7UD)AeiPO<({pc)I$ztaD0e0sw`Re0cx> diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/10x24.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/10x24.rsi/icon.png deleted file mode 100644 index 9a0cfee6b6e24844e327240d683741b42af91b51..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 331 zcmV-R0kr;!P)8C5H=8wNd)##W#|C&%i)N2>f~Rjp68vyIAE&wVZ*0#56z)FyQ@y dQ3njT0|2!+R^89K)93&I002ovPDHLkV1lLtjVJ&B diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/10x24.rsi/mag-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/10x24.rsi/mag-1.png deleted file mode 100644 index b5b70cc8598e11d961d92ae01b95a15177cf95b4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2185 zcmV;42zK|0P) zaB^>EX>4U6ba`-PAZ2)IW&i+q+SONCw&N%a{bv=u1SBB@%K-%E^bUIYeX*Uqp;B+i ztDlM!W6M~edo?A@|NdR!AADF!4oR)#nsdY_)l|9RqQvuajug{zK0bUs!u=b0xIbWs z1f!g{d0z7ykH@9< zX4bp=WB|hz`h){dA&JMC&z0o-HT)E362(N4dPow^Ea_ML!X3H?0N$_O;TLZ^lNUHn zMK`nZJDe^#={vdHm*F=%BEGN8uXiN%?g+o&x0aW+=4o9^@S~dYWz@}-;|dcy;FROF zjKlC#T-$NfxEE=0fHjAyJ;aWiN({soC30%CXddIBfh{JUY#5mb%ONXbTzSZ*Ank(| zTL2p_1xySuClK>}FLbP1_j*{YU}Y!FWP&nq{Pqa%1tgYA# z2^feO?oFAZF&hzZEa0bM=WufFV1P6zJ9f!QB!is7du_a9bj)StQ;hTiB2=;%s6n`Z ztdulm#9M(2wV9yDd0`^D=>0 z;{t_XD9bGHvOYSO(3Z&R*;cP01u0TG?gjV0imgEi$qAJ_+Vs|?POAgK0=nitBViWA zL=9%k`a<<7oTpP#(z)tH>DkwaoiC2zyDvnwv0ULVZex-b&tsbu;IX+=cN)ns&T0T< zB4{wJ?=Gw_c%?0uvGB%>6@Yn@<-UgDo)!Ykau8k2u*Ya16!Api)3mLRX-q3~WgKkAxWa?mMu`!Cad|>UFt0u@A=(zc}$_>{G#F zgI9p|UKUyL)k4E2@LgkiCr54=Vu$CyTG>3F0mj@R&oZ{hsG7(O846CTcR+8pewa1fve@HYZfUht1!#Xmej&_n#g z0|K7HKRh7dsWE&n5Ppw;ctF5Y_=i7{_&5IHYXR^%{^4r@@c9^?OGMgQR^81FIws3f zD=_M=xwIj(_ahOfxVYWKucR}z?x&XS4VA5+P@&a88)a7-K?Cz+yu-r+8*{7Zod?q3 z0D_{Zeu~z|B5+izaSAL%%LdRFJffP1ETdEuG#P$SCXc#2E$txr>%X!Et% zuDgt8jNG@kMMp`Mpzc)l=7}1=Uod}LX%AB_ld|EDc0}`f7{+wjhbYK!qXUl4yh~QN zm_;8w5i43gF{we0U+W^^7;fspj7-{8^hlJ;1y$`}_6aE2G@{Cqcvafa1uFUuY zhABYPDqdOH(3WfyZ+k=hjuAJj=Zw}0n%f9e!jBMsHHM!m_*)dAFY=1G`5)*okEK1! zhL`{V0fcEoLr_UWLm+T+Z)Rz1WdHzpoPCi!NW(xJ#a~lPi&Q$;LBt_Lb+RBT;wV)t zf`!snXw|{w(l2PzkfgXc3a$kQKNhPFF3!3-xC(;c2Z)oSlcI~1_`jskBF2N`e!RQ) zxO)c(tr}C!z6n6pEF+Uli21^*7<@$l5rhziPhzH?$}Z;MIlk`UFGy6jh^qA@8!nd5g1JYp~8e`3u8EZ6(Wfnj=VJ2`Qu@LPi5s)Ls4+#Vr-c&kS0002|NklQ*R+{07!cs=MIRIuU49HlxGMwvn z_%9ZFfRQc^*!$mxaYe;5B#}c5qLMZYlVj-=0y)`JSv0`19f$!_gOavC5HZImu~Yv|}>r09pV5Vw_dnzv8R@00000 LNkvXXu0mjfe&rS{ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/10x24.rsi/mag-2.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/10x24.rsi/mag-2.png deleted file mode 100644 index fa67e8801c1773ccd73a151cbe61f2d2a2c0d15c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2187 zcmV;62z2*}P) zaB^>EX>4U6ba`-PAZ2)IW&i+q+SONCw&N%a{bv=u1SBB@%K-%E^bUIYeX*Uqp;B+i ztDlM!W6M~edo?A@|NdR!AADF!4oR)#nsdY_)l|9RqQvuajug{zK0bUs!u=b0xIbWs z1f!g{d0z7ykH@9< zX4bp=WB|hz`h){dA&JMC&z0o-HT)E362(N4dPveCDZk7q+pP z+h@!IA+#<`^}v_HImGv$O{{=HJzy>{u*H6==t?iXB?r$EHDGFrXS|U4r2r6NZN+9t zz(CA!Z^{&n*@%E+0Y42pXGz?_0BKNm?2?m6204ZI+IYw4n9Iti80iH>sAMrvgKz;^ zDQU`xw*nVxK}D0QW;HEZwPndEYtGs7&Qs0AlBs1gD^{%)DXD15#Y!o)w8~YG#x&Gi zt(IDAYgn|U23-yF8w8!Z^whQIZoTx{+kpFwG<4))ql`M5vx_4I1kY|>yn357;Yu@2 zoq5_Uv(C2QYfDyIy7IDBR$cAR+QsTy*4{JsF>7?O#s^V*p1rUJvDr-p?R27>Gcd-9 zz_@J&;LyA|i-l6+&D`cJR+b>hTiB&;a-23}U@%Q$U3BN}g}LAI7J%+|dE-aSg-zX` zU@mOxUNQG8Zx2}WcBET52-;ByOpzf4;kQz3T=0$0j^U>Y{#HdB+g@jPTW|>HWdgCr z1q#7XmRaCseRM9NEs@o;tzJP2Qlxa;3+{atTZ0gi6DoPM>8(qhRtJIwbj^K6!Yqi1 z8qAjUh3Zo{Pp71$bJdB`v#$|5UmU}CUx;dBxx!!E#w0DC$2KXzV{@nOG?HPQ)d0#w z&|q5MU07f6N?R^t;f)z90P`lxeGS7sEd-e5Ai9`gkI_IV;)%kiX7cVLx+xi*K?>vDHuAC4h@apKF^r-H=> zuK?}6EVAOOg@#SwyTcE4EwF^$sF@kmn~ui*>d!uf+Sd_cq}Je=XQIoMa>AV3e`Zv?2k;2*z=e|UnRhxmsF z1U!X*ctF5YWB6Vm{2u@CfPkm)4}T)@Z~Vj80^oD}!`A}f^D#V^h_tn=x|Zaj*==t-Kpx$6E%LnVE(q!9;RF-Wy2rsi01V$jOnruQIO$A2OOPwm#lCx zi#~cHWbp6O0eyG;Q_OR>0kWgQ7ZtxT(#j(b3D3oPAB5E=`~#%q8LgmXU+bn_nehh< zQ-G#byt1;PE!igC_J;T!BW_mD8LbsGw-Km>A0hl|3_n%ywBa=*s`NFCgd_@2egb;>LVy2$TF6Q7lzV6}U>s_2@d7t}p3@AmD z0X~st?f%Ws^^4huXpYUDEW#8G0g+{1DY zvx=b-PZP%!Rik_%@3O*qi?dp5u+BaC3&TZiCChc1BS>NiDWoAnMgvvUU?EPcMv93H z?I%3^!;U{qE}2|aFmf!Q4i%E)2mgcL-I}GTNjE8+00J+z{V@szcY$`(w!e>UyL|%q zpMfi_>#w(f*-z4&T`hJ5M7Dv8>#ip60hc?#(3371k|X(P3Z)Y8en#I^00wV?{x!F^ z&OS~bfE;zTd;=UD0%K*$UiWx+sJFL&&vg3x0r22*bMCWb0RR9124YJ`L;(K){{a7> zy{D4^000SaNLh0L04^f{04^f|c%?sf00007bV*G`2jm402?P^9fzw9-00935~icwkk0WXf~YWeQ#jPfxN9s45J}18UmvsFd6~_+8!|Rl4UU0 zlSC0adFc-Q9PsDGH-?i8&oRWv0gR+H%R9PC8LZuu87y=avC5yge4pXyuDc8sW!b>lO;!&M(Ljy-$?R3St0P}#W#kdFYaQMBh_+})4*uQWYht)007M!R^955c}V~O N002ovPDHLkV1oA(4E+EA diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/10x24.rsi/mag-3.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/10x24.rsi/mag-3.png deleted file mode 100644 index b436f1dbc80f54eb90f2b5372345cab2eade28b2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2190 zcmV;92yyp`P) zaB^>EX>4U6ba`-PAZ2)IW&i+q+SONCw&N%a{bv=u1SBB@%K-%E^bUIYeX*Uqp;B+i ztDlM!W6M~edo?A@|NdR!AADF!4oR)#nsdY_)l|9RqQvuajug{zK0bUs!u=b0xIbWs z1f!g{d0z7ykH@9< zX4bp=WB|hz`h){dA&JMC&z0o-HT)E362(N4dPveCptV5im7Oq?3Ch6n+atUeJbS!RwAOZWqFC-&VPCxc3)|St z?K5V95Ly?edf-dp9OC=WCRV_p9xxXe*kV6bbfp*Hl7nZ78Zb4*GhWF2QUHjswqi5z z;zTjSy(v>PW+MWQ1^hJZoF#Dw1EfLOu}e-O8RQh+YvUcGV=gP7Vx$)kp_0Ww4Z;Ov zrKBk%-U?i(1r<%In$@&u)s`ivtT|`PJ5MzeOQx31tXQ>Hq@?Za%sShGuPs?=>B`GiS#`BLYZt3;S$ogi$E?xC8XrXMdG^8@#AY`Yw9|=h&cGNa z0^_zBfJ5`7v_G;TL8M><&7UP7dCZ& zg1NA%d&S(Zyggve+mUYNAZSM+FhzzGgx^ZBaltn}JBFVs_*)fiYY7phO;Je`t~&Q&K$&%Q?Nd~poleIcri~r#fdLtp9&Tm zyaKfMvdD_B78*8z?;6uPIda1gL!8fz+#oktJ%At#sX%cfZVXh=O!oa0<_aE;6?XBe zCnbtT?P>oGpG{ab!x&_z!zE>42R2(rQrUS$I+BuRw79{i&(*vQbUo?Vc|$e5c?~%P zUEInz#xzPx$0JQ~yoN7)3+E5U@BtB@@NkCH=3rlig8)5%zY(DFf`9xf{^1FN9^xM! z5bzZK;Q;|pjp2KN@O%8j0|K7HKm3Wrzwr-W3xLn@4_^y_&&TjwBGT5f>TYh(F@EeGpcg@DGrZXS9NneXW~zWyT*c zOaYo!@yg1Ewq%=l+Z*C{jJR1nXS7z(+(w`heuVI=G5l1)-=YY8kypgc|DpDep%>iO zegFUgglR)VP)S2WAaHVTW@&6?004NLeUUv#!$2IxUsFqqR65u}#34gBa=*s`NFCgd_@2egb;>LVy2$TF6Q7lzV6}U>s_2@d7t}p3@AmD z0X~st?f%Ws^^4huXpYUDEW#8G0g+{1DY zvx=b-PZP%!Rik_%@3O*qi?dp5u+BaC3&TZiCChc1BS>NiDWoAnMgvvUU?EPcMv93H z?I%3^!;U{qE}2|aFmf!Q4i%E)2mgcL-I}GTNjE8+00J+z{V@szcY$`(w!e>UyL|%q zpMfi_>#w(f*-z4&T`hJ5M7Dv8>#ip60hc?#(3371k|X(P3Z)Y8en#I^00wV?{x!F^ z&OS~bfE;zTd;=UD0%K*$UiWx+sJFL&&vg3x0r22*bMCWb0RR9124YJ`L;(K){{a7> zy{D4^000SaNLh0L04^f{04^f|c%?sf00007bV*G`2jm402?PwYiQcjR009C?L_t(o z!(%*f-~huw0w#t52BQuba0jrEqiI8t!+$G71mDP3n&FAUQbxKt0A?u+$XK{Coa=V@ zFBW@%kuDC{``?CfMa45DkwXlkk~R#JW9bwEub)3-5S5f-(9lqai`iLQ&@T;4^1k=K z`J5EvjT<*n#C3I4>5~icwkk0WXf~YWeeeH(I$$t_0K-6s0K;eqjE2By2n=X@z{E?I z!CX%gMeO9IJM?qFpBLX4PBJ{l5F-aLlF}^i=qhEfc2j1s&{f1Lf8z3ehNHXgGE|gx z(=G%~UV2WJ99>TUi&c(P%SlcHqaBk`2hail04hIM-4Pg5 Qr2qf`07*qoM6N<$f-blL5dZ)H diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/10x24.rsi/mag-4.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/10x24.rsi/mag-4.png deleted file mode 100644 index 8505a40d6d765625b8c41512e67d17a629e2cb03..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2190 zcmV;92yyp`P) zaB^>EX>4U6ba`-PAZ2)IW&i+q+SONCw&N%a{bv=u1SBB@%K-%E^bUIYeX*Uqp;B+i ztDlM!W6M~edo?A@|NdR!AADF!4oR)#nsdY_)l|9RqQvuajug{zK0bUs!u=b0xIbWs z1f!g{d0z7ykH@9< zX4bp=WB|hz`h){dA&JMC&z0o-HT)E362(N4dPvfF{uRG)hwcG@_p5jK#oNy01&&kE z&8++mr%O)yPA>Ol_|1-p?<@1`9Z9`A!Y}x(<)Z2fh@}A-?}?Vg(H90ds+YE%sAIS9g#{ z24aSLQ>JLlMg$xS_-WWVOX3a&NQ1Itmz+d0$SJ(n#ydvGTvk5CNG~8lC5wR?gbT<@ zNmE9=6}V6fDw;GB>!sJ;2Ha<)p(76)Wz^A}T^uPOcy{yR)!U>ASDI<+ z%+qF>b+!dxTe8y9m6xru>S}k^E>_>N_MW+qS)+?JK8V`$?1eRm&2B1arxV?rfiX@5 z#%(hIhvv;$ER+&&<~C=svIIfi!Y*}_9%%c&L52710p`*;S8tE!M+Ly0eS#`BS7T^|M*q>!xIEO#6LVB z;3@pW0|K5J!}kK=_xOhg1U!X*_!EhL;~%~j0H5O@z7_zVkKwsQq^)Ju-Q1vKvMjX% zqwbnZ8!~%85^;))+fDpRI#cU@YU$ok*$N63S`D;OcBK(CFh9mSJS?y=w~F3*APo*6 zD2nQ*XniaKN3|NKz(TZa0DZwDs(HvVN<~4Q8P9i0?VtcPqAZT5xD?;|G_{E~Uz_c^ z%V@^PeS2GUlvD}oPE~K7sPX#+^S71uFy%5S8~$iVG_QwYOqYF#f($o0;ONY|WQB`a z^wAR`gMXI}=)2>eVxGGVkR27isQ8VMRvvjscrMoaAgngwA0Q>qXayzvS~u;=j6YzQ z0yM4Sm6Z)`$u{w}H^lE4akF~PXsw{RjX)**2;o;__^E=wMG^WUuZWxf0mTrHqjV`N z5C8xHglR)VP)S2WAaHVTW@&6?004NLeUUv#!$2IxUsFqqR65u}#34gBa=*s`NFCgd_@2egb;>LVy2$TF6Q7lzV6}U>s_2@d7t}p3@AmD z0X~st?f%Ws^^4huXpYUDEW#8G0g+{1DY zvx=b-PZP%!Rik_%@3O*qi?dp5u+BaC3&TZiCChc1BS>NiDWoAnMgvvUU?EPcMv93H z?I%3^!;U{qE}2|aFmf!Q4i%E)2mgcL-I}GTNjE8+00J+z{V@szcY$`(w!e>UyL|%q zpMfi_>#w(f*-z4&T`hJ5M7Dv8>#ip60hc?#(3371k|X(P3Z)Y8en#I^00wV?{x!F^ z&OS~bfE;zTd;=UD0%K*$UiWx+sJFL&&vg3x0r22*bMCWb0RR9124YJ`L;(K){{a7> zy{D4^000SaNLh0L04^f{04^f|c%?sf00007bV*G`2jm402?PboRc00d009C?L_t(o z!(%*f-~huw0w#t52BQuba0jrEqiI8t!+$G71mDP3n&FAUQbxKt0A?u+$XK{Coa=V@ zFBW@%kuDC{``?CfMa45DkwXlkk~R#JW9bwEub)3-5S5f-(9lqai`iLQ&@T;4^1k=K z`J5EvjT<*n#C3I4>5~icwkk0WXf~YWeeeH(I$$&e215ui40H%EjE2By2n=X@z{E?I z!CX%gMeO9IJM?qFpBLX4PBJ{l5F-aLlF}^i=qhEfc2j1s&{f1Lf8z3ehNHXgGE|gx z(=G%~UV2WJ99>TUi&c(P%SlcHqaBk`2hail0EI!sQ>@~ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/10x24.rsi/mag-5.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/10x24.rsi/mag-5.png deleted file mode 100644 index 8da9ab83e53e203de825c1f7a0b2606deca9860b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2191 zcmV;A2ypj_P) zaB^>EX>4U6ba`-PAZ2)IW&i+q+SONCw&N%a{bv=u1SBB@%K-%E^bUIYeX*Uqp;B+i ztDlM!W6M~edo?A@|NdR!AADF!4oR)#nsdY_)l|9RqQvuajug{zK0bUs!u=b0xIbWs z1f!g{d0z7ykH@9< zX4bp=WB|hz`h){dA&JMC&z0o-HT)E362(N4dPoFkmHaDy;SSvc0Pk1t@Qb&d$qO8( zqMKRy9Zr{=^qpMp%kY~W5#Lwl*E^DWcZ6T?Tg%H@^R%ud_)$&yGU{f^afOK;aLVyo z#$os=uI)H#+>5k0z?#F<9%9E$B?jV)5;-+mG>>u6z!novHjK=J<&YIIt~_K@koG}~ zEr1P|0-gq#6Nve~7dqChdp#^xu(A_oGC>(QetU%Xf@hC6iq_h0P87=>E9{H6e_dqW z1PsIs_ohtIn2iWH7Vy)sbC$#%43Gw8$1XXEWRO#MuZ?$%j=8LSijiJG1cE~h)F50y zR!W*O;;q1iT2RrXs##5oR&7~w%9?Ywyz^8uv1Dr5%!*ZOMM^4KaPl~q@}vv#rimbLfHeasqNtnoqAo@XztL2PzYK|7u3<_wH+ zA~0^70XQ^o&SIgIcr&*-iwBo%G(3hydCLQ4uW0EW9^z3WI&KJk<-4~+TSg!CFw=qeJ=dn!+@Yvj`JB?%*XElH_ z5j2?AcNf+dywaA-Sa@T`3c$R{a$m!6PYVHNIfyQ1*kd#hig=>%Y1-DuG^Uj~Gay?9 zPF{63(=~?0VsH(bDI{*y;s3MSrM?#Ey_Z?W}V6M#}^}5`h*oR|?U!3?d_Nid8 z!7D&}FN>`BYN25h_^vU%lOs0_F~s@Y$PIFX)dL8^kO~wx;>JJ)&1BzCVXoleSYa2h zdQzfj)SmY5@Y#e_GmJrYI$Tl)c3`u0B$b_4q$4S5MvEJK`drQ1K-ZIwoi|j|o7a#- z(8aBcV@#v8bUe}&$7}e)w{ZSo3?C5j2@hvDZ4UNTI0(=K_!|K#FZjo=;vb$M=pp{$ z0Rd0pA080!)EK@O2*1ZaJRsmH{KKC}{2Tx9wE*}W|M0Z{_@@-r-?^jk#6y&I4(1 z06|eyKSk?f5jd*VI0Y7>WdrC79#PFhmQgAS^2~U?Q)&kVs1apxJjJE>)~BgWwE5a> z*Ih<4M(*3&qNAirPFGy6jh^qA@8!nd5g1JYp~8e`3u8EZ6(Wfnj=VJ2`Qu@LPi5s)Ls4+#T0GjiSR00033NklQ*R+{07!cs=MIRIuU49HlxGMwvn z_%9ZFfRQc^*!$mxaYe;5B#}c5qLMZYlVj-=0 zzxkXL0e% R0O0@t002ovPDHLkV1izZ1s4DS diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/10x24.rsi/mag-6.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/10x24.rsi/mag-6.png deleted file mode 100644 index 703bfbf86d96ebc2f589d104ec6d80007a43670d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2191 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 M07*qoM6N<$f+~FiX8-^I diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/10x24.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/10x24.rsi/meta.json deleted file mode 100644 index 01e679daee..0000000000 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/10x24.rsi/meta.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" - }, - { - "name": "base" - }, - { - "name": "mag-1" - }, - { - "name": "mag-2" - }, - { - "name": "mag-3" - }, - { - "name": "mag-4" - }, - { - "name": "mag-5" - }, - { - "name": "mag-6" - }, - { - "name": "mag-7" - } - ] -} diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/cl_pistol.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/cl_pistol.rsi/base.png deleted file mode 100644 index 518fa5947b4cca9493f50a9c550cf35216b07e9a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 381 zcmV-@0fPRCP)OA{4S@IpFQP7YwFmb`0j`#(348Jb9Mk$Z=v#B{2kG7T^Pfq6r-^k?H^txOe9k z7$XBv$biI1O$S6d02Hst27__~wj2S9rk3_%qT`=v2Y?JFCJT}SNR9$r!A~e{-~uEk zLR=w1PW*!aK?k76KP~`@rs*@gNs50EAQ%P6@sBO|DFq}&0k+_$B>q8wta1PykQ@IX zfHwq?;~y6ExbicL390ecm zlW#c);0=LuzXcht1Y{62g!$xIhRpQR|Kvmi!CXL03a2D%;&lKh0TOFCxw&8zjDmp$ b3=9kacbj#2giL(700000NkvXXu0mjfqfnDH diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/cl_pistol.rsi/hv.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/cl_pistol.rsi/hv.png deleted file mode 100644 index e07e5ffd1cffebab1aa743845f76e981a023dfaf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 133 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzA5Ry@kcie~3D(64B0Wuk23&3j zH9(vr%x*P|3m%{UX@BUtXugDH)Cz+o;r{76Hhr{?+g!k?=9QfAzteh(lp$Ed$%e*8 aMg}$x&U7u|ikU!j89ZJ6T-G@yGywo&M<@OO diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/cl_pistol.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/cl_pistol.rsi/meta.json deleted file mode 100644 index d47fb675f1..0000000000 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/cl_pistol.rsi/meta.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/831c7c2743530e8a31910d781bae9dc34f3f1ec8/icons/obj/ammo_mags.dmi", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "base" - }, - { - "name": "mag-1" - }, - { - "name": "mag-2" - }, - { - "name": "mag-3" - }, - { - "name": "mag-4" - }, - { - "name": "mag-5" - }, - { - "name": "hv" - }, - { - "name": "practice" - }, - { - "name": "rubber" - } - ] -} diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/cl_pistol.rsi/practice.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/cl_pistol.rsi/practice.png deleted file mode 100644 index 1270482f6258e8fc03a2e157b43cb502bb6b589a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 133 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzA5Ry@kcie~3D(64B0Wuk23&3j zH9(vr%x*P|0VzvA+Q+yHM(i diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/cl_rifle.rsi/flash.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/cl_rifle.rsi/flash.png deleted file mode 100644 index 1ee4ff6255fd877da3499cfb4ba6ed57f78d2c9a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 142 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJP)`@fkcie~3D(64B0Wuk23&3j zJJ@@cusBq?ovRnnRn=?_y?66wW8%k2sXWH%K8m+u)PiILBn6w2K5Tw|J|Lrr!IKZ6 gxlKMHA%THm+XLPrvI11ZQ1Fw#3I4#VVOv?eoTFf(`06k tA_k5-JBlagoOU~?0X69$yM%-U1Mf+Jr0vE^;y{}iJYD@<);T3K0RXs<8+RH6o$-GA-#6o-$c9iF^U3_LV@liu%uAl~+cbrwH(`06k tA_k5VRMM^QEZ#Bb1CED>E{0b?W_OwBtGlWRGE3wC6C9Z?gLZL)=<~~%{t{}WeTTd z#ENvLg-%HLP;m8czuxzM+}bA$kJu539DR_vZ uD|^OK1)j;)m4BE{^1 diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/cl_rifle_short.rsi/hv.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/cl_rifle_short.rsi/hv.png deleted file mode 100644 index 7841e6bf0a22bd6068fd60b2dbe1362b4bfad560..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 207 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJX`U{QArY;~60D08M0%P64Y=G6 zcChy>VRMM^QEZ#Bb1CED@^4%J>&Mg|*|6+8lV_UIL}})J`8^EDw(YzBJ5IBXS}`G& zkK0o0w3dfKg?i23e!b&gE=`=+_>jr-*+dzpOV6(VZ?5UpDSO#q^!P~M|DFXa6htSy zX^^?k*|T6rTO`jRgPoI)dw%|_0d+wmI}Z;J!=@d2{O%!Hw}CEX@O1TaS?83{1OONW BPf7p) diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/cl_rifle_short.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/cl_rifle_short.rsi/meta.json deleted file mode 100644 index 19dae78f6d..0000000000 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/cl_rifle_short.rsi/meta.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/831c7c2743530e8a31910d781bae9dc34f3f1ec8/icons/obj/ammo_mags.dmi", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "base" - }, - { - "name": "mag-1" - }, - { - "name": "flash" - }, - { - "name": "hv" - }, - { - "name": "practice" - }, - { - "name": "rubber" - } - ] -} diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/cl_rifle_short.rsi/practice.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/cl_rifle_short.rsi/practice.png deleted file mode 100644 index d2deffb46d71e0055d6c391dcc184ece8b86eab7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 214 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJxt=bLArY;~60D08M0%P64Y=G6 zcChy>VRMM^QEZ#Bb17r<*`uug`R%Ju2W)yOi@Yr;}&#$tuszYx$#v_Ms)SG z32Ab|EBOpGXCC3`%ARpF;q<}>Pd;)lkunEbuK{vP10yptGsC`v+Pkax*p~tw%HZkh K=d#Wzp$Py!WljD7 diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/cl_rifle_short.rsi/rubber.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/ClRifle-NEW/cl_rifle_short.rsi/rubber.png deleted file mode 100644 index d4aa304e137af2fe7fe44b42012b36950e1bb29d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 210 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 av;zPe zaB^>EX>4U6ba`-PAZ2)IW&i+q+U-|cb|fnf{AU%j1VBiFD6CbQNW`bK(sDivT`)FY$|S zp3!?au8H2ZB`&P!er^-_~8n#13$fR})`94lDsdK4GrdV2|UPVsLur79E@^a)4=xSH2`& z_XG$L)@C>ZE|(M~5hqDebJmm)#|nHpJa^g;Adon4Uhpy(A^|ux``UO%)3ME*uVKgw zfM60*K+~uLtWvlL@~whGJuq=$W?|*Zjk}N(VG&Vro$5+jlvPx>Qb zEjNOUacI)C)z(_?ShSapxjO7S21Xt<%HSbGM;&eS3Hr=3dCJsTXPbTHMGF!TmMmR$ zwbggppwcdzw`|>Yx7`g~GqPfAVrtcz^#^JJ2l zf)J11CS+kOTs*k$+7ldWY-Ow&OcXv$ft~MV@d;zc&Mr6muu;?o?)})K)i8l2U&D+M zZX~4bWWjJa|C#A$%iS)+O}&P`niNKSp(K|RS=y%2XiwX8;=UYxHd@|kycC#=y#o@(@3rCc1K^t&5rsmZ27(&*g3RqKwL`iSf}MDl1@rp$ zDBu~2Rh0$eqTIpBj8L24+nn=|*4aCaIuC|@&Ukg=OB>=Z9(>)NZ0dEQoEM0^7*7Na zYCXL2?^dWAO{c+{bL3@xLt?>>F^9sdwbzz0P{)DTMMrX12hdgC>Zybpl1CF;1**O_ zlo}FW1|-}_*Mt<;Y63~mOXAJ?Laib$V*;WjXiG;eDxn=n9kDt)>rLohzO`et;q!yB z0f0eDPG_Kc19lfVYV`y_AlwLK&vi2M89_Z=YWBI73O%G*pm?xN{4U2)t35cU0fk zUeZq;3t#9D76ES%+0%5C#|X_EWweb3=^n;wvw=+N^vOut1s1CKzhUO20e`Y7t+=71 zXKHZLDcVq#fTFl$H(A{_#I*|kt-uk{S3u=4uXIKEp(vOiX*V=d{Xm4%N$oA`UN#qg z3X`?Hk6}ME-sC#sCqegw%3j10OzC~vOU6a+ocgI|zs7xd z+;N8k5($d~$WRVlK(mf=o%b-T#gAL5PZr1sl)>O*y=Nhm%PIKziCUm!WXWTW%OH2* z428VT&iwlmGJN|;{hyvlQAV}!A88uaUEk8QR|HHKWNgBq_{W=t_25w7OM^} z&bm6d3WDGdh?Ap}qKlMxUs7lhXnEbqQQYd|TO4DgA>b4)iZ;tk@NO-tvzPaI}tNg+Nb z9yjQM#E)E;U4G+Sa#-M*VI!NKCk_*fr7o7cn3WBcc$zq>s2b%9IhPgATb$Kuowe`D zUl=NAD;ciS8bJa}NFoIhGU}+H3JWpXHBwBZ={)Y?A9nmHa>?YXfRSSXHK>prKlmT~ zo~>D&nsk#waUk$w+aIGqa2IGbZ2SAzwp%BF{~5T_I{sP{nEfQZ(b1wuz~DA;aoy46 zJ>YT&h&<_%AvuztmQXAL?`QN)d0^-k=v#B=);`DS1CXUzE#CkKhrn2gve!M{-P=94 ze|y^V`vGATa-bR@*t`G$00v@9M??Vs0RI60puMM)00009a7bBm001r{001r{0eGc9 zb^rhX2XskIMF->s7z_&n7_36K0004FNkl%6Z{*&Sek{ob` z-Ip<8CJxD&Zy6XEd>I(n85ja+5dv@Dyrm67MwnHh#@K2 zm$tc}&UwZEI_DMtk;Tl-jT!FUxy2wXBtiWUsHyBlF}P`O1S76!nm)6e`sKjecP|)} zRMZAXK~(3wf}zfN1p|8UlbZO*PJ~T+Be05-6aPdx06qTkMH8vgy((>GF%DBAZQ5l$+HZZ>7`^v1HoKCObWku=N4^3Kv+nE mXv4|P1&pIzvrz{Ov;zRfsC>91t-?(J0000 zaB^>EX>4U6ba`-PAZ2)IW&i+q+U-|cb|fnf{AU%j1VBiFD6CbQNW`bK(sDzwij%7Xf_qUg8(u zJfrt;Tob)*OJ3r1k0*W^r^hn+$)l7XE9Z|Mweldsr}&wzYPPT4^#UHXBKM}=wsLwf z90(_!*94d1%joO58m=09oIq`1t0TmLo0c--XsM)?da|@nJJW=VCGV_gbDo*bSS8IZ zPXsW>tV5ql~;mgPM9nm96wy)b>OGh(?n)Y^ORzJ z#0q|8=NH^?z)81!rBaH5&?lIi8x7$nzN>aI9A}(;kna(0D;7T^MaST5DCDk+1JK9nvQMed<{ch z00fhe0-8o0V3oo}kZ%H&#Um|0l4a^o%}MOZ{sT&KE{7G)Jxt=hC#s-<$3s9-o5X&V2adiYh=Xf8e17_1`~x3Q()(NS$x9Sv9rs~K5P`VfqOspXf;e=$=5Jr zgc}KIJ6SLs&VOe5*>bnba8s|LuO@{NUnt4tM3%N`G}_ZPowzSYpN*Dx8t=wX5*=}D zNK2c>dsuL#X)3@ zJqmb+VpU~XAqt1h2pEF*a_|k^>iw9q~C!2bmDCY$tFUAvr zgIW)-{JRzEM$>7q<{Wuh-;h|aW6YuOYVEaU4AgNTcF~dC)d6&sw|Xj}hUC%2R)MOo z4W)*}mjMYk(lsH)wVFWE^OAV8zEG=(%b0*@3EI+8i%Mt*Qb(-L&UzENmv8MDZTS3P zYye=8lG7Qe-hkajj#@nd5C}IyrsHc}+4&jHxw1gt3Hq8|3_bxnu?5}e3iA-S3CYNO zbEC96eZAwr4jTU%jSSv7lqr~cp?U|Y$^n7}_1mYHJkC&3Gz}FbBJSKmBm!?#<{j1d zwU_i$$HEu-gGIm_MD{ctuS*-cir4RNi4e=BfA^c7Hf%qv|{ekcm&N7@aIR6h{mbW(fEx|hv` zpTcBqZ)9^CD8(8G5f(h=m04zuAJ{f7wz=r?n{wtSvc+e*g`02A=`S+q&l4zoFQYtx z)Wenb=|HQFbl@MqRrVb{IEv%>m#2~l;O%38le9;HUx><_Q;R@uEFkrwFL2FO3RwQ5 z;D3$ULuS3x{UC=%T{7)QV|h|$LOSOWkTXQXB0%b7xSnpW~<#GysexepA8Cmj}<1)xy zI71 zKm`5pAto_XPi7Xg@T{+U>Z7`g@htDYKWjiKm<;fV#B)qHEaDB~nN3UQyiXivWl14E zCmuKGg2azpmtB72Tyj|8nPDTFo+l0yi={4>yO@;?m3W#ss;C;}3ptk+&Rd+-YMr(3 z$zK>MXe$}6(;7hnOGqLG5i;tipb85y+BH&4r0G2F;U9MVDRRl=s(_JW0X3+Q96$IU z{GP2@oSJl#LUADQV%s01KyVjmHEjF)*tT0Ifd3h|(mMWH6PW!Zz0uL4N5J4VaBw3ZSuNiH2Zz8|iL%!{-rd_h zw|{%u^ZNl|6mp;%AlSSB000JJOGiWi{{a60|De66lK=n!32;bRa{vG?BLDy{BLR4& zKXw2B00(qQO+^Rf1sDtpILEuHL;wH*Ur9tkR9M4fJaFIu!$1Nih5-hn4j6U7fIEPN zScNr}y$mKlH~+UX#4c}SE6p%v(o=?jz5|RjaR9PK*no_MD}&YH1q>UC9R8Ey2$CFd zhTWGjVI~gAnQs{w7YP^$OkDsCehe{6 z;-6}@A-VBSFa(g}9~Si3LV?`)C+GnA&(|5!B%~M^o}XrTx=>NAGj#^c>g`^65+Yuf(%yzG6)*NeDW+qW_l@E(LgX45R=01-MK}Z5D*rUAlh(p ja{=RM*KE`Q1ML6+bj^OZze-E@00000NkvXXu0mjfRx^&| diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag.rsi/mag-4.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag.rsi/mag-4.png deleted file mode 100644 index 16c225e94625c9b9710c4a889bbb4af507d4bb47..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2464 zcmV;R319Y!P) zaB^>EX>4U6ba`-PAZ2)IW&i+q+U-|cb|fnf{AU%j1VBiFD6CbQNW`bK(sDcdx>9s z^NilZaZU8LEqRI4J)ZbwoF2>MCy!Eoteii3)XIYhpWs@cAF*9&;mirkxe+sf&| za3Gv?UK3o3FQc#LYPf3baRRl4t&R`}Zd%HSqotBo>dDeR?MxFcmb|l~&3R@zW0f?w zJQ4VWz~f4mHBh5P6_`vQM;OizU(#8(`FdEaV&#=!nG+^U2geUrcpdoZ^)!*0(>$eE zAF+a8+4%)G96A4m6#z+g$COWeQ@EP=`f*?h2=WPY#RhvE*A#=(JGbcIOpyajOT6+W z>AELCh_E)pnM6P!N+M2@qUNkAA&wRJba?KxA3z{+;Jn~vE<^%wYWB79j;3RqIbXw& z7XZN|q=2ST2Uw+W5#(D1g?eD(!py?Tl^b^T0X+v_Yj^HgDOw>u$RnxMpO<*u>PTHR})5Zd9L9dqwW|sHGdVe1LL0eMb$$s&7*y zmlJl(fLJaGh^r$2LTAS;)>KM%e@RA*zl^ii3Sa!;6>4Dula=*kaAiCeh zEq{evaOnOCJySjD1e%9;>~I@4OlB7sm;$T)JGVUGdL`s!K}S4H*bX# z4ivIAZK|Jzzq1X0YFwE&DRb4i@CM@z(0%%0nBN0G`fRkk(|9+AlIVzI zLt5H2-ot_`O_PDs5NI=mb9)CQir;I)=Lf(yF(L|uJ`Dsl?gg3KS!#!LCj>k3EDPrK z?NPup6ssx=#6`J-lNq5l!M8c*A+57_8g(8F`<(IW#FsY2Up)A_J=xUjL^&@Ic`=>{ z9MpPv<=?GPH=0g^HRs67`i8`U9b*oKS8J~=W1x-$v5Su6t`4B9ywy_)H6)KFwhB~z zZ74M)z6?mXk**0TuGIvRo|nX%^{BEd;xZ;6T7tH8)S?pFfz%PJv$NiW?&VuMMjJjq z7#jc>q~vr4syASFk)u{m00hE~km>kZS9X4ebFM7VcY?mA7lTj0PHaIpy23mJZbC9L z-`pszPG9dhu!F{bMk9lF4rL0aUZ~zds&ar}LH+jWC66C8LWBj6d1aPa;|I2li)}8t{HC1wiEQziZsF#ebNY)6`tt+|-^(aZ zAoXyieLB#pBOUn1Z(Ok zDEMEa_K;ccbU(N>DA#!p!&>~fmHK3Xj6fL-KGu5{Lb;rRpP#4&N=BAE=C}-U z7tT<~>+H*d*7QsSkE41oh^3p$O(vYOMI0~)>2Y(i; z4ld5RI=Bjg;17tCqm!bGlz3lKXc6Ou$NM<%p2K_h0YbCNRI_ISP&La)C*oo*zbXb_ z5kLg}@F6BKQ%`0Vv+%61d+MXQi}5V)zCUX~DVPlKiNteEH!R`};+aiL=e$oGW@Sks zJ|`YG=z_$LT$f#b<6LrB;F)0~o1P~Q6N{xTmb;jh4V8GBII5@` z(d0egatDY!>5?HilAo4PECTOm^i6qS=oaW(bLZAR$LRx*rCBZC00)P_Sc$UNJ>K2h zJ-2^*+VlGXVH9$p8X(xb00006VoOIv0RI600RN!9r;`8x010qNS#tmYE+YT{E+YYW zr9XB6000McNliru_suSX>SB0u4tM*vzz+mz}t5( z7?f1h21h}JEBHxGd}Jp=T)|IH{1fE>^!UdYO{B&@QBi;#|JZ_`Zgl~!;HM=1sa6}3 z8~+4D06G5aoL9g?fokzj&;jzFuQQ}cNHH)xKh5xTi82EN0|P@c!)X*X{1@*q9AkYy za8dB_{(IUb!gId`8Lk9m5Hy7O;s< e*{A~s+5rG2M1Zz5bK@BR0000 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 av;zPe zaB^>EX>4U6ba`-PAZ2)IW&i+q+U-|cb|fnf{AU%j1VBiFD6CbQNW`bK(sDivT`)FY$|S zp3!?au8H2ZB`&P!er^-_~8n#13$fR})`94lDsdK4GrdV2|UPVsLur79E@^a)4=xSH2`& z_XG$L)@C>ZE|(M~5hqDebJmm)#|nHpJa^g;Adon4Uhpy(A^|ux``UO%)3ME*uVKgw zfM60*K+~uLtWvlL@~whGJuq=$W?|*Zjk}N(VG&Vro$5+jlvPx>Qb zEjNOUacI)C)z(_?ShSapxjO7S21Xt<%HSbGM;&eS3Hr=3dCJsTXPbTHMGF!TmMmR$ zwbggppwcdzw`|>Yx7`g~GqPfAVrtcz^#^JJ2l zf)J11CS+kOTs*k$+7ldWY-Ow&OcXv$ft~MV@d;zc&Mr6muu;?o?)})K)i8l2U&D+M zZX~4bWWjJa|C#A$%iS)+O}&P`niNKSp(K|RS=y%2XiwX8;=UYxHd@|kycC#=y#o@(@3rCc1K^t&5rsmZ27(&*g3RqKwL`iSf}MDl1@rp$ zDBu~2Rh0$eqTIpBj8L24+nn=|*4aCaIuC|@&Ukg=OB>=Z9(>)NZ0dEQoEM0^7*7Na zYCXL2?^dWAO{c+{bL3@xLt?>>F^9sdwbzz0P{)DTMMrX12hdgC>Zybpl1CF;1**O_ zlo}FW1|-}_*Mt<;Y63~mOXAJ?Laib$V*;WjXiG;eDxn=n9kDt)>rLohzO`et;q!yB z0f0eDPG_Kc19lfVYV`y_AlwLK&vi2M89_Z=YWBI73O%G*pm?xN{4U2)t35cU0fk zUeZq;3t#9D76ES%+0%5C#|X_EWweb3=^n;wvw=+N^vOut1s1CKzhUO20e`Y7t+=71 zXKHZLDcVq#fTFl$H(A{_#I*|kt-uk{S3u=4uXIKEp(vOiX*V=d{Xm4%N$oA`UN#qg z3X`?Hk6}ME-sC#sCqegw%3j10OzC~vOU6a+ocgI|zs7xd z+;N8k5($d~$WRVlK(mf=o%b-T#gAL5PZr1sl)>O*y=Nhm%PIKziCUm!WXWTW%OH2* z428VT&iwlmGJN|;{hyvlQAV}!A88uaUEk8QR|HHKWNgBq_{W=t_25w7OM^} z&bm6d3WDGdh?Ap}qKlMxUs7lhXnEbqQQYd|TO4DgA>b4)iZ;tk@NO-tvzPaI}tNg+Nb z9yjQM#E)E;U4G+Sa#-M*VI!NKCk_*fr7o7cn3WBcc$zq>s2b%9IhPgATb$Kuowe`D zUl=NAD;ciS8bJa}NFoIhGU}+H3JWpXHBwBZ={)Y?A9nmHa>?YXfRSSXHK>prKlmT~ zo~>D&nsk#waUk$w+aIGqa2IGbZ2SAzwp%BF{~5T_I{sP{nEfQZ(b1wuz~DA;aoy46 zJ>YT&h&<_%AvuztmQXAL?`QN)d0^-k=v#B=);`DS1CXUzE#CkKhrn2gve!M{-P=94 ze|y^V`vGATa-bR@*t`G$00v@9M??Vs0RI60puMM)00009a7bBm001r{001r{0eGc9 zb^rhX2XskIMF->s7z_&n7_36K0004FNkl%6Z{*&Sek{ob` z-Ip<8CJxD&Zy6XEd>I(n85ja+5dv@Dyrm67MwnHh#@K2 zm$tc}&UwZEI_DMtk;Tl-jT!FUxy2wXBtiWUsHyBlF}P`O1S76!nm)6e`sKjecP|)} zRMZAXK~(3wf}zfN1p|8UlbZO*PJ~T+Be05-6aPdx06qTkMH8vgy((>GF%DBAZQ5l$+HZZ>7`^v1HoKCObWku=N4^3Kv+nE mXv4|P1&pIzvrz{Ov;zRfsC>91t-?(J0000 zaB^>EX>4U6ba`-PAZ2)IW&i+q+U-|cb|fnf{AU%j1VBiFD6CbQNW`bK(sDzwij%7Xf_qUg8(u zJfrt;Tob)*OJ3r1k0*W^r^hn+$)l7XE9Z|Mweldsr}&wzYPPT4^#UHXBKM}=wsLwf z90(_!*94d1%joO58m=09oIq`1t0TmLo0c--XsM)?da|@nJJW=VCGV_gbDo*bSS8IZ zPXsW>tV5ql~;mgPM9nm96wy)b>OGh(?n)Y^ORzJ z#0q|8=NH^?z)81!rBaH5&?lIi8x7$nzN>aI9A}(;kna(0D;7T^MaST5DCDk+1JK9nvQMed<{ch z00fhe0-8o0V3oo}kZ%H&#Um|0l4a^o%}MOZ{sT&KE{7G)Jxt=hC#s-<$3s9-o5X&V2adiYh=Xf8e17_1`~x3Q()(NS$x9Sv9rs~K5P`VfqOspXf;e=$=5Jr zgc}KIJ6SLs&VOe5*>bnba8s|LuO@{NUnt4tM3%N`G}_ZPowzSYpN*Dx8t=wX5*=}D zNK2c>dsuL#X)3@ zJqmb+VpU~XAqt1h2pEF*a_|k^>iw9q~C!2bmDCY$tFUAvr zgIW)-{JRzEM$>7q<{Wuh-;h|aW6YuOYVEaU4AgNTcF~dC)d6&sw|Xj}hUC%2R)MOo z4W)*}mjMYk(lsH)wVFWE^OAV8zEG=(%b0*@3EI+8i%Mt*Qb(-L&UzENmv8MDZTS3P zYye=8lG7Qe-hkajj#@nd5C}IyrsHc}+4&jHxw1gt3Hq8|3_bxnu?5}e3iA-S3CYNO zbEC96eZAwr4jTU%jSSv7lqr~cp?U|Y$^n7}_1mYHJkC&3Gz}FbBJSKmBm!?#<{j1d zwU_i$$HEu-gGIm_MD{ctuS*-cir4RNi4e=BfA^c7Hf%qv|{ekcm&N7@aIR6h{mbW(fEx|hv` zpTcBqZ)9^CD8(8G5f(h=m04zuAJ{f7wz=r?n{wtSvc+e*g`02A=`S+q&l4zoFQYtx z)Wenb=|HQFbl@MqRrVb{IEv%>m#2~l;O%38le9;HUx><_Q;R@uEFkrwFL2FO3RwQ5 z;D3$ULuS3x{UC=%T{7)QV|h|$LOSOWkTXQXB0%b7xSnpW~<#GysexepA8Cmj}<1)xy zI71 zKm`5pAto_XPi7Xg@T{+U>Z7`g@htDYKWjiKm<;fV#B)qHEaDB~nN3UQyiXivWl14E zCmuKGg2azpmtB72Tyj|8nPDTFo+l0yi={4>yO@;?m3W#ss;C;}3ptk+&Rd+-YMr(3 z$zK>MXe$}6(;7hnOGqLG5i;tipb85y+BH&4r0G2F;U9MVDRRl=s(_JW0X3+Q96$IU z{GP2@oSJl#LUADQV%s01KyVjmHEjF)*tT0Ifd3h|(mMWH6PW!Zz0uL4N5J4VaBw3ZSuNiH2Zz8|iL%!{-rd_h zw|{%u^ZNl|6mp;%AlSSB000JJOGiWi{{a60|De66lK=n!32;bRa{vG?BLDy{BLR4& zKXw2B00(qQO+^Rf1sDtpILEuHL;wH*Ur9tkR9M4fJaFIu!$1Nih5-hn4j6U7fIEPN zScNr}y$mKlH~+UX#4c}SE6p%v(o=?jz5|RjaR9PK*no_MD}&YH1q>UC9R8Ey2$CFd zhTWGjVI~gAnQs{w7YP^$OkDsCehe{6 z;-6}@A-VBSFa(g}9~Si3LV?`)C+GnA&(|5!B%~M^o}XrTx=>NAGj#^c>g`^65+Yuf(%yzG6)*NeDW+qW_l@E(LgX45R=01-MK}Z5D*rUAlh(p ja{=RM*KE`Q1ML6+bj^OZze-E@00000NkvXXu0mjfRx^&| diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_base.rsi/mag-4.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_base.rsi/mag-4.png deleted file mode 100644 index 16c225e94625c9b9710c4a889bbb4af507d4bb47..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2464 zcmV;R319Y!P) zaB^>EX>4U6ba`-PAZ2)IW&i+q+U-|cb|fnf{AU%j1VBiFD6CbQNW`bK(sDcdx>9s z^NilZaZU8LEqRI4J)ZbwoF2>MCy!Eoteii3)XIYhpWs@cAF*9&;mirkxe+sf&| za3Gv?UK3o3FQc#LYPf3baRRl4t&R`}Zd%HSqotBo>dDeR?MxFcmb|l~&3R@zW0f?w zJQ4VWz~f4mHBh5P6_`vQM;OizU(#8(`FdEaV&#=!nG+^U2geUrcpdoZ^)!*0(>$eE zAF+a8+4%)G96A4m6#z+g$COWeQ@EP=`f*?h2=WPY#RhvE*A#=(JGbcIOpyajOT6+W z>AELCh_E)pnM6P!N+M2@qUNkAA&wRJba?KxA3z{+;Jn~vE<^%wYWB79j;3RqIbXw& z7XZN|q=2ST2Uw+W5#(D1g?eD(!py?Tl^b^T0X+v_Yj^HgDOw>u$RnxMpO<*u>PTHR})5Zd9L9dqwW|sHGdVe1LL0eMb$$s&7*y zmlJl(fLJaGh^r$2LTAS;)>KM%e@RA*zl^ii3Sa!;6>4Dula=*kaAiCeh zEq{evaOnOCJySjD1e%9;>~I@4OlB7sm;$T)JGVUGdL`s!K}S4H*bX# z4ivIAZK|Jzzq1X0YFwE&DRb4i@CM@z(0%%0nBN0G`fRkk(|9+AlIVzI zLt5H2-ot_`O_PDs5NI=mb9)CQir;I)=Lf(yF(L|uJ`Dsl?gg3KS!#!LCj>k3EDPrK z?NPup6ssx=#6`J-lNq5l!M8c*A+57_8g(8F`<(IW#FsY2Up)A_J=xUjL^&@Ic`=>{ z9MpPv<=?GPH=0g^HRs67`i8`U9b*oKS8J~=W1x-$v5Su6t`4B9ywy_)H6)KFwhB~z zZ74M)z6?mXk**0TuGIvRo|nX%^{BEd;xZ;6T7tH8)S?pFfz%PJv$NiW?&VuMMjJjq z7#jc>q~vr4syASFk)u{m00hE~km>kZS9X4ebFM7VcY?mA7lTj0PHaIpy23mJZbC9L z-`pszPG9dhu!F{bMk9lF4rL0aUZ~zds&ar}LH+jWC66C8LWBj6d1aPa;|I2li)}8t{HC1wiEQziZsF#ebNY)6`tt+|-^(aZ zAoXyieLB#pBOUn1Z(Ok zDEMEa_K;ccbU(N>DA#!p!&>~fmHK3Xj6fL-KGu5{Lb;rRpP#4&N=BAE=C}-U z7tT<~>+H*d*7QsSkE41oh^3p$O(vYOMI0~)>2Y(i; z4ld5RI=Bjg;17tCqm!bGlz3lKXc6Ou$NM<%p2K_h0YbCNRI_ISP&La)C*oo*zbXb_ z5kLg}@F6BKQ%`0Vv+%61d+MXQi}5V)zCUX~DVPlKiNteEH!R`};+aiL=e$oGW@Sks zJ|`YG=z_$LT$f#b<6LrB;F)0~o1P~Q6N{xTmb;jh4V8GBII5@` z(d0egatDY!>5?HilAo4PECTOm^i6qS=oaW(bLZAR$LRx*rCBZC00)P_Sc$UNJ>K2h zJ-2^*+VlGXVH9$p8X(xb00006VoOIv0RI600RN!9r;`8x010qNS#tmYE+YT{E+YYW zr9XB6000McNliru_suSX>SB0u4tM*vzz+mz}t5( z7?f1h21h}JEBHxGd}Jp=T)|IH{1fE>^!UdYO{B&@QBi;#|JZ_`Zgl~!;HM=1sa6}3 z8~+4D06G5aoL9g?fokzj&;jzFuQQ}cNHH)xKh5xTi82EN0|P@c!)X*X{1@*q9AkYy za8dB_{(IUb!gId`8Lk9m5Hy7O;s< e*{A~s+5rG2M1Zz5bK@BR0000 zaB^>EX>4U6ba`-PAZ2)IW&i+q+U-|cb|fnf{AU%j1VBiFD6CbQNW`bK(sD%dR1r-{s*<|)Pc zh!y(R6Gx=W7`9 z0w9=#6woy40IL)(f_$r>P!CL8m|0l4a^o%}MOZ{sT&KE{7G)Jxt=hC#s-<$3s9-o5X&V2adiYh=&WEL=Re?%ER^Yiwn#8B7#DOo5&6W$_7P$IdP{`>;{e2A=)cqt!5hC11mg z5pE=;?PS4lIRBaHXUp9#!%e-0zM2$9e4!+l6It4((P&TGbmG1oeKuO&X}lXlNp!@q zAuVkh?_t4}rpdr*2(%f(xxE7t#qYJ@^9$gc7!id+p9X>&_kzsrEVVBQO*lQUW_LK z2elqv`FAVSji%FJ%{lV2z9F$-$CyLm)!J*z7^vew?4l#Ns{`mNZ}n6{4auX4tpZhF z8%hm{F9Q;8q-#QoYc+wS=OyuGeW6wnmoWj+611hG7M0Krq>fmfo%JSkFW=fR+VJ_s z*Z{yFC8sk`y#c$69JP7^AP{bZOvi0q+4&jHxw1gt3Hq8|3_bxnu?5}e3iA-S3CYNO zbEC96eZAwr4jTU%jSSv7lqr~cp?U|Y$^n7}_1mW(d7Po7Xc{U=MBKTBNCe)f%sZ;@ zYcJ`ij)gDu2aA9=i0o-P%43A)jWXIsgLDt$wb?)>b^2r^?E(u`{NFQk(ttnNlvdo( z(K9tT=@f0KN7@3SbuXI> zKZVKK-pJ-OP>MAWA}n~!E3?cRKd^0FY;)1&H|5MvWQ)&q3pd}K(_duJpC?fGUPgHW zsfR1=(}7kU>A*jJtL!^^a1_V$FHa>Az}v?FCuxrYzYvu zKm`5pAto_XPi7Xg@T{+U>Z7`g@htDYKWjiKm<;fV#B)qHEaDB~nN3UQyiXivWl14E zCmuKGg2azpmtB72Tyj|8nPDTFo+l0yi={4>yO@;?m3W#ss;C;}3ptk+&Rd+-YMr(3 z$zK>MXe$}6(;7hnOGqLG5i;tipb85y+BH&4r0G2F;U9MVDRRl=s(_JW0X3+Q96$IU z{GP2@oSJl#LUADQV%s01KyVjmHEjF)*tT0Ifd3h|(mMWH6PW!Zz0uL4N5J4VaBw3ZSuNiH2Zz8|iL%!{-rd_h zw|{%u^ZNl|6mp;%AlSSB000JJOGiWi{{a60|De66lK=n!32;bRa{vG?BLDy{BLR4& zKXw2B00(qQO+^Rf1sDtpEZt##IRF3wSxH1eR9M4fJaFIu!$1Nih5-hn4j6U7fIEPN zScNr}y$mKlH~+UX#4c}SE6p%v(o=?jz5|RjaR9PK*no_MD}&YH1q>UC9R8Ey2$CFd zhTWGjVI~gAnQs{w7-&L= zf{*v#(=HL7`z^?DB_M;KA9bfScTLuOOUj_zt28I9<%p}?YZ{NLOFg3Gd zFgG{GtM253?#ffnY8mCWYU-bBk1aiF1IkkOa|&lbZ_|N4sXD d4j5<$006`bdxgGCaq|EG002ovPDHLkV1ggbtr7qL diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_hv.rsi/mag-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_hv.rsi/mag-1.png deleted file mode 100644 index 4f930fb7cadaed4fa15bd5e05b378b17b658206f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2460 zcmV;N31jw&P) zaB^>EX>4U6ba`-PAZ2)IW&i+q+U-|cb|fnf{AU%j1VBiFD6CbQNW`bK(sD9I_H@+jrU%K4*5tvrbEDSl?Fn(b?My?{rp$i1nzt(+bV z2f|6`HNmC$GWvS1hO5RNCs141>IiY*rlpLCTPkU#o-FOt&NSg-$vZ3BoM)ypR!MWq z6G2Z@{7RNJP@_c^m`or?7|su0(pk6pdRVMt<&|KW6DCUs#}8L{9r)?>G?AIpJf&D4 zv4UUO`2{x|Isb(f07-Voluvw9xSII-abO7u@(FXr274UW6ob<{x9H$ZkpoOiyz(XK zx+g%0ur|XPaJi%?i8x7$nzN>aI9A}(;kna(0D;7T^MaST5DCDk+1JK9nvQMed<{ch z00fhe0-8o0V3oo}kZ%Vb(1GYczMZrp{W2#bh{>r_|LqO78-Rh#xowN$QBwbt5d zZ@CdRgO*(tN72X^ns{Svo;=zbTs z{1tM+q5CJ03l7}}l20BXXCH>=4sV6B9tHb1XWA7N0=;IMcGv-Y;!ycJG3 zP{`J_seTsz&Nlq1ab@15%vI;Y8;mzV_vwdiib&QVhQX>f6YZMLhR13&_cwzS{;MHf z5rla3HX#dR;o`w{*Ph^5V=H6LV50D03haC@i%%Fkc6PbhhmE2(aPP++t%eCK`5I=7 za3djYCkuwd`Oi#0TkdulZt6Ak)ub@u3njUn$kH~AMtj<(6Zhrlv(fTSrp>WJ0ZS#Lu3@~s`C4WA#3 z4FC*MaykRm8?d{`QL85a0^vr;bbPHVJ3qrYR~G0yL0{90!6#rRwxAnbVIBfEAsLx( zZj@H1uXh~SLE}H8k-IWj6PHJyi_p-V0 zQ<$vnjciT>rC0+Y!h*-VGRv&-1KY;MHWyufQ_lQEw)jl9aP!SM{Y3`-c>;y+Wt1n7 zdbrX)9ca~&4*cV{%D$rqM{zv=@>CK5ynPIClJ+R@3sISKY7xkd1*Bf|1+KYD0n2|B z{I5}a$gFp|ALP)eOQ!v3EKkZzNas8P@+Q|2KMA@gRQ4j4U`p@PUNSCn=hRO%`!(*v z%50yEq>feeX>ACpbQ2d>pcshTu#ByPt*b>BTF80Tn4!d zXDH-#cIMxokm1`$>i_gaiZZH&{{Ysq)?+hJf)M}!0flKpLr_UWLm+T+Z)Rz1WdHzp zoPCi!NW)MRg-=sUMJo<=DB_TzI$01Eag-_+!9r;(wCZ5;(m!a@kfgXc3a$kQe-^6_ zF3!3-xC(;c4~UbalcI~1cwbUz5#xo&`#A5O!+ZAuLbJ+Lvu6TOHOojR;$kkpDh6K> zKm`5pAto_XPi7Xg@T{+U>Z7`g@htDYKWjiKm<;fV#B)qHEaDB~nN3UQyiXivWl14E zCmuKGg2azpmtB72Tyj|8nPDTFo+l0yi={4>yO@;?m3W#ss;C;}3ptk+&Rd+-YMr(3 z$zK>MXe$}6(;7hnOGqLG5i;tipb85y+BH&4r0G2F;U9MVDRRl=s(_JW0X3+Q96$IU z{GP2@oSJl#LUADQV%s01KyVjmHEjF)*tT0Ifd3h|(mMWH6PW!Zz0uL4N5J4VaBw3ZSuNiH2Zz8|iL%!{-rd_h zw|{%u^ZNl|6mp;%AlSSB000JJOGiWi{{a60|De66lK=n!32;bRa{vG?BLDy{BLR4& zKXw2B00(qQO+^Rf1sDtq2>5xcsQ>^0R!KxbR9M4fJaFIu!$1Nih5-hn4j6U7fIEPN zScNr}y$mKlH~+UX#4c}SE6p%v(o=?jz5|RjaR9PK*no_MD}&YH1q>UC9R8Ey2$CFd zhTWGjVI~gAnQs{w7&+MjtIq>$~3kD?> zwZTyk;R=3I6Cc@$5LfV%6aPdx06qTkMH8vgy((>GF%DBAZQ5l$+HZZ>7`^v1HoKCObWku=N4^3Kv+nEXv4|P1&pIzvrz{O av;zPe zaB^>EX>4U6ba`-PAZ2)IW&i+q+U-|cb|fnf{AU%j1VBiFD6CbQNW`bK(sDivT`)FY$|S zp3!?au8H2ZB`&P!er^-_~8n#13$fR})`94lDsdK4GrdV2|UPVsLur79E@^a)4=xSH2`& z_XG$L)@C>ZE|(M~5hqDebJmm)#|nHpJa^g;Adon4Uhpy(A^|ux``UO%)3ME*uVKgw zfM60*K+~uLtWvlL@~whGJuq=$W?|*Zjk}N(VG&Vro$5+jlvPx>Qb zEjNOUacI)C)z(_?ShSapxjO7S21Xt<%HSbGM;&eS3Hr=3dCJsTXPbTHMGF!TmMmR$ zwbggppwcdzw`|>Yx7`g~GqPfAVrtcz^#^JJ2l zf)J11CS+kOTs*k$+7ldWY-Ow&OcXv$ft~MV@d;zc&Mr6muu;?o?)})K)i8l2U&D+M zZX~4bWWjJa|C#A$%iS)+O}&P`niNKSp(K|RS=y%2XiwX8;=UYxHd@|kycC#=y#o@(@3rCc1K^t&5rsmZ27(&*g3RqKwL`iSf}MDl1@rp$ zDBu~2Rh0$eqTIpBj8L24+nn=|*4aCaIuC|@&Ukg=OB>=Z9(>)NZ0dEQoEM0^7*7Na zYCXL2?^dWAO{c+{bL3@xLt?>>F^9sdwbzz0P{)DTMMrX12hdgC>Zybpl1CF;1**O_ zlo}FW1|-}_*Mt<;Y63~mOXAJ?Laib$V*;WjXiG;eDxn=n9kDt)>rLohzO`et;q!yB z0f0eDPG_Kc19lfVYV`y_AlwLK&vi2M89_Z=YWBI73O%G*pm?xN{4U2)t35cU0fk zUeZq;3t#9D76ES%+0%5C#|X_EWweb3=^n;wvw=+N^vOut1s1CKzhUO20e`Y7t+=71 zXKHZLDcVq#fTFl$H(A{_#I*|kt-uk{S3u=4uXIKEp(vOiX*V=d{Xm4%N$oA`UN#qg z3X`?Hk6}ME-sC#sCqegw%3j10OzC~vOU6a+ocgI|zs7xd z+;N8k5($d~$WRVlK(mf=o%b-T#gAL5PZr1sl)>O*y=Nhm%PIKziCUm!WXWTW%OH2* z428VT&iwlmGJN|;{hyvlQAV}!A88uaUEk8QR|HHKWNgBq_{W=t_25w7OM^} z&bm6d3WDGdh?Ap}qKlMxUs7lhXnEbqQQYd|TO4DgA>b4)iZ;tk@NO-tvzPaI}tNg+Nb z9yjQM#E)E;U4G+Sa#-M*VI!NKCk_*fr7o7cn3WBcc$zq>s2b%9IhPgATb$Kuowe`D zUl=NAD;ciS8bJa}NFoIhGU}+H3JWpXHBwBZ={)Y?A9nmHa>?YXfRSSXHK>prKlmT~ zo~>D&nsk#waUk$w+aIGqa2IGbZ2SAzwp%BF{~5T_I{sP{nEfQZ(b1wuz~DA;aoy46 zJ>YT&h&<_%AvuztmQXAL?`QN)d0^-k=v#B=);`DS1CXUzE#CkKhrn2gve!M{-P=94 ze|y^V`vGATa-bR@*t`G$00v@9M??Vs0RI60puMM)00009a7bBm001r{001r{0eGc9 zb^rhX2XskIMF->s7z_&n7_36K0004FNkl%6Z{*&Sek{ob` z-Ip<8CJxD&Zy6XEd>I(n85ja+5dv@Dyrm67MwnHh#@K2 zm$tc}&UwZEI_DMtk;Tl-jT!FUxy2wXBtiWUsHyBlF}P`O1S76!nm)6e`sKjecP|)} zRMZAXK~(3wf}zfN1p|8UlbZO*PJ~T+Be05-6aPdx06qTkMH8vgy((>GF%DBAZQ5l$+HZZ>7`^v1HoKCObWku=N4^3Kv+nE mXv4|P1&pIzvrz{Ov;zRfsC>91t-?(J0000 zaB^>EX>4U6ba`-PAZ2)IW&i+q+U-|cb|fnf{AU%j1VBiFD6CbQNW`bK(sDzwij%7Xf_qUg8(u zJfrt;Tob)*OJ3r1k0*W^r^hn+$)l7XE9Z|Mweldsr}&wzYPPT4^#UHXBKM}=wsLwf z90(_!*94d1%joO58m=09oIq`1t0TmLo0c--XsM)?da|@nJJW=VCGV_gbDo*bSS8IZ zPXsW>tV5ql~;mgPM9nm96wy)b>OGh(?n)Y^ORzJ z#0q|8=NH^?z)81!rBaH5&?lIi8x7$nzN>aI9A}(;kna(0D;7T^MaST5DCDk+1JK9nvQMed<{ch z00fhe0-8o0V3oo}kZ%H&#Um|0l4a^o%}MOZ{sT&KE{7G)Jxt=hC#s-<$3s9-o5X&V2adiYh=Xf8e17_1`~x3Q()(NS$x9Sv9rs~K5P`VfqOspXf;e=$=5Jr zgc}KIJ6SLs&VOe5*>bnba8s|LuO@{NUnt4tM3%N`G}_ZPowzSYpN*Dx8t=wX5*=}D zNK2c>dsuL#X)3@ zJqmb+VpU~XAqt1h2pEF*a_|k^>iw9q~C!2bmDCY$tFUAvr zgIW)-{JRzEM$>7q<{Wuh-;h|aW6YuOYVEaU4AgNTcF~dC)d6&sw|Xj}hUC%2R)MOo z4W)*}mjMYk(lsH)wVFWE^OAV8zEG=(%b0*@3EI+8i%Mt*Qb(-L&UzENmv8MDZTS3P zYye=8lG7Qe-hkajj#@nd5C}IyrsHc}+4&jHxw1gt3Hq8|3_bxnu?5}e3iA-S3CYNO zbEC96eZAwr4jTU%jSSv7lqr~cp?U|Y$^n7}_1mYHJkC&3Gz}FbBJSKmBm!?#<{j1d zwU_i$$HEu-gGIm_MD{ctuS*-cir4RNi4e=BfA^c7Hf%qv|{ekcm&N7@aIR6h{mbW(fEx|hv` zpTcBqZ)9^CD8(8G5f(h=m04zuAJ{f7wz=r?n{wtSvc+e*g`02A=`S+q&l4zoFQYtx z)Wenb=|HQFbl@MqRrVb{IEv%>m#2~l;O%38le9;HUx><_Q;R@uEFkrwFL2FO3RwQ5 z;D3$ULuS3x{UC=%T{7)QV|h|$LOSOWkTXQXB0%b7xSnpW~<#GysexepA8Cmj}<1)xy zI71 zKm`5pAto_XPi7Xg@T{+U>Z7`g@htDYKWjiKm<;fV#B)qHEaDB~nN3UQyiXivWl14E zCmuKGg2azpmtB72Tyj|8nPDTFo+l0yi={4>yO@;?m3W#ss;C;}3ptk+&Rd+-YMr(3 z$zK>MXe$}6(;7hnOGqLG5i;tipb85y+BH&4r0G2F;U9MVDRRl=s(_JW0X3+Q96$IU z{GP2@oSJl#LUADQV%s01KyVjmHEjF)*tT0Ifd3h|(mMWH6PW!Zz0uL4N5J4VaBw3ZSuNiH2Zz8|iL%!{-rd_h zw|{%u^ZNl|6mp;%AlSSB000JJOGiWi{{a60|De66lK=n!32;bRa{vG?BLDy{BLR4& zKXw2B00(qQO+^Rf1sDtpILEuHL;wH*Ur9tkR9M4fJaFIu!$1Nih5-hn4j6U7fIEPN zScNr}y$mKlH~+UX#4c}SE6p%v(o=?jz5|RjaR9PK*no_MD}&YH1q>UC9R8Ey2$CFd zhTWGjVI~gAnQs{w7YP^$OkDsCehe{6 z;-6}@A-VBSFa(g}9~Si3LV?`)C+GnA&(|5!B%~M^o}XrTx=>NAGj#^c>g`^65+Yuf(%yzG6)*NeDW+qW_l@E(LgX45R=01-MK}Z5D*rUAlh(p ja{=RM*KE`Q1ML6+bj^OZze-E@00000NkvXXu0mjfRx^&| diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_hv.rsi/mag-4.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_hv.rsi/mag-4.png deleted file mode 100644 index 16c225e94625c9b9710c4a889bbb4af507d4bb47..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2464 zcmV;R319Y!P) zaB^>EX>4U6ba`-PAZ2)IW&i+q+U-|cb|fnf{AU%j1VBiFD6CbQNW`bK(sDcdx>9s z^NilZaZU8LEqRI4J)ZbwoF2>MCy!Eoteii3)XIYhpWs@cAF*9&;mirkxe+sf&| za3Gv?UK3o3FQc#LYPf3baRRl4t&R`}Zd%HSqotBo>dDeR?MxFcmb|l~&3R@zW0f?w zJQ4VWz~f4mHBh5P6_`vQM;OizU(#8(`FdEaV&#=!nG+^U2geUrcpdoZ^)!*0(>$eE zAF+a8+4%)G96A4m6#z+g$COWeQ@EP=`f*?h2=WPY#RhvE*A#=(JGbcIOpyajOT6+W z>AELCh_E)pnM6P!N+M2@qUNkAA&wRJba?KxA3z{+;Jn~vE<^%wYWB79j;3RqIbXw& z7XZN|q=2ST2Uw+W5#(D1g?eD(!py?Tl^b^T0X+v_Yj^HgDOw>u$RnxMpO<*u>PTHR})5Zd9L9dqwW|sHGdVe1LL0eMb$$s&7*y zmlJl(fLJaGh^r$2LTAS;)>KM%e@RA*zl^ii3Sa!;6>4Dula=*kaAiCeh zEq{evaOnOCJySjD1e%9;>~I@4OlB7sm;$T)JGVUGdL`s!K}S4H*bX# z4ivIAZK|Jzzq1X0YFwE&DRb4i@CM@z(0%%0nBN0G`fRkk(|9+AlIVzI zLt5H2-ot_`O_PDs5NI=mb9)CQir;I)=Lf(yF(L|uJ`Dsl?gg3KS!#!LCj>k3EDPrK z?NPup6ssx=#6`J-lNq5l!M8c*A+57_8g(8F`<(IW#FsY2Up)A_J=xUjL^&@Ic`=>{ z9MpPv<=?GPH=0g^HRs67`i8`U9b*oKS8J~=W1x-$v5Su6t`4B9ywy_)H6)KFwhB~z zZ74M)z6?mXk**0TuGIvRo|nX%^{BEd;xZ;6T7tH8)S?pFfz%PJv$NiW?&VuMMjJjq z7#jc>q~vr4syASFk)u{m00hE~km>kZS9X4ebFM7VcY?mA7lTj0PHaIpy23mJZbC9L z-`pszPG9dhu!F{bMk9lF4rL0aUZ~zds&ar}LH+jWC66C8LWBj6d1aPa;|I2li)}8t{HC1wiEQziZsF#ebNY)6`tt+|-^(aZ zAoXyieLB#pBOUn1Z(Ok zDEMEa_K;ccbU(N>DA#!p!&>~fmHK3Xj6fL-KGu5{Lb;rRpP#4&N=BAE=C}-U z7tT<~>+H*d*7QsSkE41oh^3p$O(vYOMI0~)>2Y(i; z4ld5RI=Bjg;17tCqm!bGlz3lKXc6Ou$NM<%p2K_h0YbCNRI_ISP&La)C*oo*zbXb_ z5kLg}@F6BKQ%`0Vv+%61d+MXQi}5V)zCUX~DVPlKiNteEH!R`};+aiL=e$oGW@Sks zJ|`YG=z_$LT$f#b<6LrB;F)0~o1P~Q6N{xTmb;jh4V8GBII5@` z(d0egatDY!>5?HilAo4PECTOm^i6qS=oaW(bLZAR$LRx*rCBZC00)P_Sc$UNJ>K2h zJ-2^*+VlGXVH9$p8X(xb00006VoOIv0RI600RN!9r;`8x010qNS#tmYE+YT{E+YYW zr9XB6000McNliru_suSX>SB0u4tM*vzz+mz}t5( z7?f1h21h}JEBHxGd}Jp=T)|IH{1fE>^!UdYO{B&@QBi;#|JZ_`Zgl~!;HM=1sa6}3 z8~+4D06G5aoL9g?fokzj&;jzFuQQ}cNHH)xKh5xTi82EN0|P@c!)X*X{1@*q9AkYy za8dB_{(IUb!gId`8Lk9m5Hy7O;s< e*{A~s+5rG2M1Zz5bK@BR0000 zaB^>EX>4U6ba`-PAZ2)IW&i+q+U-|cb|fnf{AU%j1VBiFD6CbQNW`bK(sD%dR1r-{s*<|)Pc zh!y(R6Gx=W7`9 z0w9=#6woy40IL)(f_$r>P!CL8m|0l4a^o%}MOZ{sT&KE{7G)Jxt=hC#s-<$3s9-o5X&V2adiYh=&WEL=Re?%ER^Yiwn#8B7#DOo5&6W$_7P$IdP{`>;{e2A=)cqt!5hC11mg z5pE=;?PS4lIRBaHXUp9#!%e-0zM2$9e4!+l6It4((P&TGbmG1oeKuO&X}lXlNp!@q zAuVkh?_t4}rpdr*2(%f(xxE7t#qYJ@^9$gc7!id+p9X>&_kzsrEVVBQO*lQUW_LK z2elqv`FAVSji%FJ%{lV2z9F$-$CyLm)!J*z7^vew?4l#Ns{`mNZ}n6{4auX4tpZhF z8%hm{F9Q;8q-#QoYc+wS=OyuGeW6wnmoWj+611hG7M0Krq>fmfo%JSkFW=fR+VJ_s z*Z{yFC8sk`y#c$69JP7^AP{bZOvi0q+4&jHxw1gt3Hq8|3_bxnu?5}e3iA-S3CYNO zbEC96eZAwr4jTU%jSSv7lqr~cp?U|Y$^n7}_1mW(d7Po7Xc{U=MBKTBNCe)f%sZ;@ zYcJ`ij)gDu2aA9=i0o-P%43A)jWXIsgLDt$wb?)>b^2r^?E(u`{NFQk(ttnNlvdo( z(K9tT=@f0KN7@3SbuXI> zKZVKK-pJ-OP>MAWA}n~!E3?cRKd^0FY;)1&H|5MvWQ)&q3pd}K(_duJpC?fGUPgHW zsfR1=(}7kU>A*jJtL!^^a1_V$FHa>Az}v?FCuxrYzYvu zKm`5pAto_XPi7Xg@T{+U>Z7`g@htDYKWjiKm<;fV#B)qHEaDB~nN3UQyiXivWl14E zCmuKGg2azpmtB72Tyj|8nPDTFo+l0yi={4>yO@;?m3W#ss;C;}3ptk+&Rd+-YMr(3 z$zK>MXe$}6(;7hnOGqLG5i;tipb85y+BH&4r0G2F;U9MVDRRl=s(_JW0X3+Q96$IU z{GP2@oSJl#LUADQV%s01KyVjmHEjF)*tT0Ifd3h|(mMWH6PW!Zz0uL4N5J4VaBw3ZSuNiH2Zz8|iL%!{-rd_h zw|{%u^ZNl|6mp;%AlSSB000JJOGiWi{{a60|De66lK=n!32;bRa{vG?BLDy{BLR4& zKXw2B00(qQO+^Rf1sDtpEZt##IRF3wSxH1eR9M4fJaFIu!$1Nih5-hn4j6U7fIEPN zScNr}y$mKlH~+UX#4c}SE6p%v(o=?jz5|RjaR9PK*no_MD}&YH1q>UC9R8Ey2$CFd zhTWGjVI~gAnQs{w7-&L= zf{*v#(=HL7`z^?DB_M;KA9bfScTLuOOUj_zt28I9<%p}?YZ{NLOFg3Gd zFgG{GtM25UsA3wug;m_pQ&A`Awg(&!NWIsjv z@rJdZ`2rdGq}&LuPvEe{!OMU@jmgh2Oh#i&T4wbAYgr1kr|*n+q66yJn*f c7-$Co042VAsCgUr6#xJL07*qoM6N<$g8Ol^9RL6T diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_practice.rsi/mag-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_practice.rsi/mag-1.png deleted file mode 100644 index 4f930fb7cadaed4fa15bd5e05b378b17b658206f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2460 zcmV;N31jw&P) zaB^>EX>4U6ba`-PAZ2)IW&i+q+U-|cb|fnf{AU%j1VBiFD6CbQNW`bK(sD9I_H@+jrU%K4*5tvrbEDSl?Fn(b?My?{rp$i1nzt(+bV z2f|6`HNmC$GWvS1hO5RNCs141>IiY*rlpLCTPkU#o-FOt&NSg-$vZ3BoM)ypR!MWq z6G2Z@{7RNJP@_c^m`or?7|su0(pk6pdRVMt<&|KW6DCUs#}8L{9r)?>G?AIpJf&D4 zv4UUO`2{x|Isb(f07-Voluvw9xSII-abO7u@(FXr274UW6ob<{x9H$ZkpoOiyz(XK zx+g%0ur|XPaJi%?i8x7$nzN>aI9A}(;kna(0D;7T^MaST5DCDk+1JK9nvQMed<{ch z00fhe0-8o0V3oo}kZ%Vb(1GYczMZrp{W2#bh{>r_|LqO78-Rh#xowN$QBwbt5d zZ@CdRgO*(tN72X^ns{Svo;=zbTs z{1tM+q5CJ03l7}}l20BXXCH>=4sV6B9tHb1XWA7N0=;IMcGv-Y;!ycJG3 zP{`J_seTsz&Nlq1ab@15%vI;Y8;mzV_vwdiib&QVhQX>f6YZMLhR13&_cwzS{;MHf z5rla3HX#dR;o`w{*Ph^5V=H6LV50D03haC@i%%Fkc6PbhhmE2(aPP++t%eCK`5I=7 za3djYCkuwd`Oi#0TkdulZt6Ak)ub@u3njUn$kH~AMtj<(6Zhrlv(fTSrp>WJ0ZS#Lu3@~s`C4WA#3 z4FC*MaykRm8?d{`QL85a0^vr;bbPHVJ3qrYR~G0yL0{90!6#rRwxAnbVIBfEAsLx( zZj@H1uXh~SLE}H8k-IWj6PHJyi_p-V0 zQ<$vnjciT>rC0+Y!h*-VGRv&-1KY;MHWyufQ_lQEw)jl9aP!SM{Y3`-c>;y+Wt1n7 zdbrX)9ca~&4*cV{%D$rqM{zv=@>CK5ynPIClJ+R@3sISKY7xkd1*Bf|1+KYD0n2|B z{I5}a$gFp|ALP)eOQ!v3EKkZzNas8P@+Q|2KMA@gRQ4j4U`p@PUNSCn=hRO%`!(*v z%50yEq>feeX>ACpbQ2d>pcshTu#ByPt*b>BTF80Tn4!d zXDH-#cIMxokm1`$>i_gaiZZH&{{Ysq)?+hJf)M}!0flKpLr_UWLm+T+Z)Rz1WdHzp zoPCi!NW)MRg-=sUMJo<=DB_TzI$01Eag-_+!9r;(wCZ5;(m!a@kfgXc3a$kQe-^6_ zF3!3-xC(;c4~UbalcI~1cwbUz5#xo&`#A5O!+ZAuLbJ+Lvu6TOHOojR;$kkpDh6K> zKm`5pAto_XPi7Xg@T{+U>Z7`g@htDYKWjiKm<;fV#B)qHEaDB~nN3UQyiXivWl14E zCmuKGg2azpmtB72Tyj|8nPDTFo+l0yi={4>yO@;?m3W#ss;C;}3ptk+&Rd+-YMr(3 z$zK>MXe$}6(;7hnOGqLG5i;tipb85y+BH&4r0G2F;U9MVDRRl=s(_JW0X3+Q96$IU z{GP2@oSJl#LUADQV%s01KyVjmHEjF)*tT0Ifd3h|(mMWH6PW!Zz0uL4N5J4VaBw3ZSuNiH2Zz8|iL%!{-rd_h zw|{%u^ZNl|6mp;%AlSSB000JJOGiWi{{a60|De66lK=n!32;bRa{vG?BLDy{BLR4& zKXw2B00(qQO+^Rf1sDtq2>5xcsQ>^0R!KxbR9M4fJaFIu!$1Nih5-hn4j6U7fIEPN zScNr}y$mKlH~+UX#4c}SE6p%v(o=?jz5|RjaR9PK*no_MD}&YH1q>UC9R8Ey2$CFd zhTWGjVI~gAnQs{w7&+MjtIq>$~3kD?> zwZTyk;R=3I6Cc@$5LfV%6aPdx06qTkMH8vgy((>GF%DBAZQ5l$+HZZ>7`^v1HoKCObWku=N4^3Kv+nEXv4|P1&pIzvrz{O av;zPe zaB^>EX>4U6ba`-PAZ2)IW&i+q+U-|cb|fnf{AU%j1VBiFD6CbQNW`bK(sDivT`)FY$|S zp3!?au8H2ZB`&P!er^-_~8n#13$fR})`94lDsdK4GrdV2|UPVsLur79E@^a)4=xSH2`& z_XG$L)@C>ZE|(M~5hqDebJmm)#|nHpJa^g;Adon4Uhpy(A^|ux``UO%)3ME*uVKgw zfM60*K+~uLtWvlL@~whGJuq=$W?|*Zjk}N(VG&Vro$5+jlvPx>Qb zEjNOUacI)C)z(_?ShSapxjO7S21Xt<%HSbGM;&eS3Hr=3dCJsTXPbTHMGF!TmMmR$ zwbggppwcdzw`|>Yx7`g~GqPfAVrtcz^#^JJ2l zf)J11CS+kOTs*k$+7ldWY-Ow&OcXv$ft~MV@d;zc&Mr6muu;?o?)})K)i8l2U&D+M zZX~4bWWjJa|C#A$%iS)+O}&P`niNKSp(K|RS=y%2XiwX8;=UYxHd@|kycC#=y#o@(@3rCc1K^t&5rsmZ27(&*g3RqKwL`iSf}MDl1@rp$ zDBu~2Rh0$eqTIpBj8L24+nn=|*4aCaIuC|@&Ukg=OB>=Z9(>)NZ0dEQoEM0^7*7Na zYCXL2?^dWAO{c+{bL3@xLt?>>F^9sdwbzz0P{)DTMMrX12hdgC>Zybpl1CF;1**O_ zlo}FW1|-}_*Mt<;Y63~mOXAJ?Laib$V*;WjXiG;eDxn=n9kDt)>rLohzO`et;q!yB z0f0eDPG_Kc19lfVYV`y_AlwLK&vi2M89_Z=YWBI73O%G*pm?xN{4U2)t35cU0fk zUeZq;3t#9D76ES%+0%5C#|X_EWweb3=^n;wvw=+N^vOut1s1CKzhUO20e`Y7t+=71 zXKHZLDcVq#fTFl$H(A{_#I*|kt-uk{S3u=4uXIKEp(vOiX*V=d{Xm4%N$oA`UN#qg z3X`?Hk6}ME-sC#sCqegw%3j10OzC~vOU6a+ocgI|zs7xd z+;N8k5($d~$WRVlK(mf=o%b-T#gAL5PZr1sl)>O*y=Nhm%PIKziCUm!WXWTW%OH2* z428VT&iwlmGJN|;{hyvlQAV}!A88uaUEk8QR|HHKWNgBq_{W=t_25w7OM^} z&bm6d3WDGdh?Ap}qKlMxUs7lhXnEbqQQYd|TO4DgA>b4)iZ;tk@NO-tvzPaI}tNg+Nb z9yjQM#E)E;U4G+Sa#-M*VI!NKCk_*fr7o7cn3WBcc$zq>s2b%9IhPgATb$Kuowe`D zUl=NAD;ciS8bJa}NFoIhGU}+H3JWpXHBwBZ={)Y?A9nmHa>?YXfRSSXHK>prKlmT~ zo~>D&nsk#waUk$w+aIGqa2IGbZ2SAzwp%BF{~5T_I{sP{nEfQZ(b1wuz~DA;aoy46 zJ>YT&h&<_%AvuztmQXAL?`QN)d0^-k=v#B=);`DS1CXUzE#CkKhrn2gve!M{-P=94 ze|y^V`vGATa-bR@*t`G$00v@9M??Vs0RI60puMM)00009a7bBm001r{001r{0eGc9 zb^rhX2XskIMF->s7z_&n7_36K0004FNkl%6Z{*&Sek{ob` z-Ip<8CJxD&Zy6XEd>I(n85ja+5dv@Dyrm67MwnHh#@K2 zm$tc}&UwZEI_DMtk;Tl-jT!FUxy2wXBtiWUsHyBlF}P`O1S76!nm)6e`sKjecP|)} zRMZAXK~(3wf}zfN1p|8UlbZO*PJ~T+Be05-6aPdx06qTkMH8vgy((>GF%DBAZQ5l$+HZZ>7`^v1HoKCObWku=N4^3Kv+nE mXv4|P1&pIzvrz{Ov;zRfsC>91t-?(J0000 zaB^>EX>4U6ba`-PAZ2)IW&i+q+U-|cb|fnf{AU%j1VBiFD6CbQNW`bK(sDzwij%7Xf_qUg8(u zJfrt;Tob)*OJ3r1k0*W^r^hn+$)l7XE9Z|Mweldsr}&wzYPPT4^#UHXBKM}=wsLwf z90(_!*94d1%joO58m=09oIq`1t0TmLo0c--XsM)?da|@nJJW=VCGV_gbDo*bSS8IZ zPXsW>tV5ql~;mgPM9nm96wy)b>OGh(?n)Y^ORzJ z#0q|8=NH^?z)81!rBaH5&?lIi8x7$nzN>aI9A}(;kna(0D;7T^MaST5DCDk+1JK9nvQMed<{ch z00fhe0-8o0V3oo}kZ%H&#Um|0l4a^o%}MOZ{sT&KE{7G)Jxt=hC#s-<$3s9-o5X&V2adiYh=Xf8e17_1`~x3Q()(NS$x9Sv9rs~K5P`VfqOspXf;e=$=5Jr zgc}KIJ6SLs&VOe5*>bnba8s|LuO@{NUnt4tM3%N`G}_ZPowzSYpN*Dx8t=wX5*=}D zNK2c>dsuL#X)3@ zJqmb+VpU~XAqt1h2pEF*a_|k^>iw9q~C!2bmDCY$tFUAvr zgIW)-{JRzEM$>7q<{Wuh-;h|aW6YuOYVEaU4AgNTcF~dC)d6&sw|Xj}hUC%2R)MOo z4W)*}mjMYk(lsH)wVFWE^OAV8zEG=(%b0*@3EI+8i%Mt*Qb(-L&UzENmv8MDZTS3P zYye=8lG7Qe-hkajj#@nd5C}IyrsHc}+4&jHxw1gt3Hq8|3_bxnu?5}e3iA-S3CYNO zbEC96eZAwr4jTU%jSSv7lqr~cp?U|Y$^n7}_1mYHJkC&3Gz}FbBJSKmBm!?#<{j1d zwU_i$$HEu-gGIm_MD{ctuS*-cir4RNi4e=BfA^c7Hf%qv|{ekcm&N7@aIR6h{mbW(fEx|hv` zpTcBqZ)9^CD8(8G5f(h=m04zuAJ{f7wz=r?n{wtSvc+e*g`02A=`S+q&l4zoFQYtx z)Wenb=|HQFbl@MqRrVb{IEv%>m#2~l;O%38le9;HUx><_Q;R@uEFkrwFL2FO3RwQ5 z;D3$ULuS3x{UC=%T{7)QV|h|$LOSOWkTXQXB0%b7xSnpW~<#GysexepA8Cmj}<1)xy zI71 zKm`5pAto_XPi7Xg@T{+U>Z7`g@htDYKWjiKm<;fV#B)qHEaDB~nN3UQyiXivWl14E zCmuKGg2azpmtB72Tyj|8nPDTFo+l0yi={4>yO@;?m3W#ss;C;}3ptk+&Rd+-YMr(3 z$zK>MXe$}6(;7hnOGqLG5i;tipb85y+BH&4r0G2F;U9MVDRRl=s(_JW0X3+Q96$IU z{GP2@oSJl#LUADQV%s01KyVjmHEjF)*tT0Ifd3h|(mMWH6PW!Zz0uL4N5J4VaBw3ZSuNiH2Zz8|iL%!{-rd_h zw|{%u^ZNl|6mp;%AlSSB000JJOGiWi{{a60|De66lK=n!32;bRa{vG?BLDy{BLR4& zKXw2B00(qQO+^Rf1sDtpILEuHL;wH*Ur9tkR9M4fJaFIu!$1Nih5-hn4j6U7fIEPN zScNr}y$mKlH~+UX#4c}SE6p%v(o=?jz5|RjaR9PK*no_MD}&YH1q>UC9R8Ey2$CFd zhTWGjVI~gAnQs{w7YP^$OkDsCehe{6 z;-6}@A-VBSFa(g}9~Si3LV?`)C+GnA&(|5!B%~M^o}XrTx=>NAGj#^c>g`^65+Yuf(%yzG6)*NeDW+qW_l@E(LgX45R=01-MK}Z5D*rUAlh(p ja{=RM*KE`Q1ML6+bj^OZze-E@00000NkvXXu0mjfRx^&| diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_practice.rsi/mag-4.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_practice.rsi/mag-4.png deleted file mode 100644 index 16c225e94625c9b9710c4a889bbb4af507d4bb47..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2464 zcmV;R319Y!P) zaB^>EX>4U6ba`-PAZ2)IW&i+q+U-|cb|fnf{AU%j1VBiFD6CbQNW`bK(sDcdx>9s z^NilZaZU8LEqRI4J)ZbwoF2>MCy!Eoteii3)XIYhpWs@cAF*9&;mirkxe+sf&| za3Gv?UK3o3FQc#LYPf3baRRl4t&R`}Zd%HSqotBo>dDeR?MxFcmb|l~&3R@zW0f?w zJQ4VWz~f4mHBh5P6_`vQM;OizU(#8(`FdEaV&#=!nG+^U2geUrcpdoZ^)!*0(>$eE zAF+a8+4%)G96A4m6#z+g$COWeQ@EP=`f*?h2=WPY#RhvE*A#=(JGbcIOpyajOT6+W z>AELCh_E)pnM6P!N+M2@qUNkAA&wRJba?KxA3z{+;Jn~vE<^%wYWB79j;3RqIbXw& z7XZN|q=2ST2Uw+W5#(D1g?eD(!py?Tl^b^T0X+v_Yj^HgDOw>u$RnxMpO<*u>PTHR})5Zd9L9dqwW|sHGdVe1LL0eMb$$s&7*y zmlJl(fLJaGh^r$2LTAS;)>KM%e@RA*zl^ii3Sa!;6>4Dula=*kaAiCeh zEq{evaOnOCJySjD1e%9;>~I@4OlB7sm;$T)JGVUGdL`s!K}S4H*bX# z4ivIAZK|Jzzq1X0YFwE&DRb4i@CM@z(0%%0nBN0G`fRkk(|9+AlIVzI zLt5H2-ot_`O_PDs5NI=mb9)CQir;I)=Lf(yF(L|uJ`Dsl?gg3KS!#!LCj>k3EDPrK z?NPup6ssx=#6`J-lNq5l!M8c*A+57_8g(8F`<(IW#FsY2Up)A_J=xUjL^&@Ic`=>{ z9MpPv<=?GPH=0g^HRs67`i8`U9b*oKS8J~=W1x-$v5Su6t`4B9ywy_)H6)KFwhB~z zZ74M)z6?mXk**0TuGIvRo|nX%^{BEd;xZ;6T7tH8)S?pFfz%PJv$NiW?&VuMMjJjq z7#jc>q~vr4syASFk)u{m00hE~km>kZS9X4ebFM7VcY?mA7lTj0PHaIpy23mJZbC9L z-`pszPG9dhu!F{bMk9lF4rL0aUZ~zds&ar}LH+jWC66C8LWBj6d1aPa;|I2li)}8t{HC1wiEQziZsF#ebNY)6`tt+|-^(aZ zAoXyieLB#pBOUn1Z(Ok zDEMEa_K;ccbU(N>DA#!p!&>~fmHK3Xj6fL-KGu5{Lb;rRpP#4&N=BAE=C}-U z7tT<~>+H*d*7QsSkE41oh^3p$O(vYOMI0~)>2Y(i; z4ld5RI=Bjg;17tCqm!bGlz3lKXc6Ou$NM<%p2K_h0YbCNRI_ISP&La)C*oo*zbXb_ z5kLg}@F6BKQ%`0Vv+%61d+MXQi}5V)zCUX~DVPlKiNteEH!R`};+aiL=e$oGW@Sks zJ|`YG=z_$LT$f#b<6LrB;F)0~o1P~Q6N{xTmb;jh4V8GBII5@` z(d0egatDY!>5?HilAo4PECTOm^i6qS=oaW(bLZAR$LRx*rCBZC00)P_Sc$UNJ>K2h zJ-2^*+VlGXVH9$p8X(xb00006VoOIv0RI600RN!9r;`8x010qNS#tmYE+YT{E+YYW zr9XB6000McNliru_suSX>SB0u4tM*vzz+mz}t5( z7?f1h21h}JEBHxGd}Jp=T)|IH{1fE>^!UdYO{B&@QBi;#|JZ_`Zgl~!;HM=1sa6}3 z8~+4D06G5aoL9g?fokzj&;jzFuQQ}cNHH)xKh5xTi82EN0|P@c!)X*X{1@*q9AkYy za8dB_{(IUb!gId`8Lk9m5Hy7O;s< e*{A~s+5rG2M1Zz5bK@BR0000 zaB^>EX>4U6ba`-PAZ2)IW&i+q+U-|cb|fnf{AU%j1VBiFD6CbQNW`bK(sD%dR1r-{s*<|)Pc zh!y(R6Gx=W7`9 z0w9=#6woy40IL)(f_$r>P!CL8m|0l4a^o%}MOZ{sT&KE{7G)Jxt=hC#s-<$3s9-o5X&V2adiYh=&WEL=Re?%ER^Yiwn#8B7#DOo5&6W$_7P$IdP{`>;{e2A=)cqt!5hC11mg z5pE=;?PS4lIRBaHXUp9#!%e-0zM2$9e4!+l6It4((P&TGbmG1oeKuO&X}lXlNp!@q zAuVkh?_t4}rpdr*2(%f(xxE7t#qYJ@^9$gc7!id+p9X>&_kzsrEVVBQO*lQUW_LK z2elqv`FAVSji%FJ%{lV2z9F$-$CyLm)!J*z7^vew?4l#Ns{`mNZ}n6{4auX4tpZhF z8%hm{F9Q;8q-#QoYc+wS=OyuGeW6wnmoWj+611hG7M0Krq>fmfo%JSkFW=fR+VJ_s z*Z{yFC8sk`y#c$69JP7^AP{bZOvi0q+4&jHxw1gt3Hq8|3_bxnu?5}e3iA-S3CYNO zbEC96eZAwr4jTU%jSSv7lqr~cp?U|Y$^n7}_1mW(d7Po7Xc{U=MBKTBNCe)f%sZ;@ zYcJ`ij)gDu2aA9=i0o-P%43A)jWXIsgLDt$wb?)>b^2r^?E(u`{NFQk(ttnNlvdo( z(K9tT=@f0KN7@3SbuXI> zKZVKK-pJ-OP>MAWA}n~!E3?cRKd^0FY;)1&H|5MvWQ)&q3pd}K(_duJpC?fGUPgHW zsfR1=(}7kU>A*jJtL!^^a1_V$FHa>Az}v?FCuxrYzYvu zKm`5pAto_XPi7Xg@T{+U>Z7`g@htDYKWjiKm<;fV#B)qHEaDB~nN3UQyiXivWl14E zCmuKGg2azpmtB72Tyj|8nPDTFo+l0yi={4>yO@;?m3W#ss;C;}3ptk+&Rd+-YMr(3 z$zK>MXe$}6(;7hnOGqLG5i;tipb85y+BH&4r0G2F;U9MVDRRl=s(_JW0X3+Q96$IU z{GP2@oSJl#LUADQV%s01KyVjmHEjF)*tT0Ifd3h|(mMWH6PW!Zz0uL4N5J4VaBw3ZSuNiH2Zz8|iL%!{-rd_h zw|{%u^ZNl|6mp;%AlSSB000JJOGiWi{{a60|De66lK=n!32;bRa{vG?BLDy{BLR4& zKXw2B00(qQO+^Rf1sDtpEZt##IRF3wSxH1eR9M4fJaFIu!$1Nih5-hn4j6U7fIEPN zScNr}y$mKlH~+UX#4c}SE6p%v(o=?jz5|RjaR9PK*no_MD}&YH1q>UC9R8Ey2$CFd zhTWGjVI~gAnQs{w7-&L= zf{*v#(=HL7`z^?DB_M;KA9bfScTLuOOUj_zt28I9<%p}?YZ{NLOFg3Gd zFgG{GtM25p2Io)y5J6K^H7a^y3_peO*AMsr#ZfT#!YhjO;|&4! zw`Uo0nCu7|a#ER_Av3-7KRMArFc%P$!tdR=MXJ5TIY3xQf@s6Z%>|63U9(XK4739P X15$Y=UHMi{00000NkvXXu0mjf+$yY( diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_rubber.rsi/mag-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_rubber.rsi/mag-1.png deleted file mode 100644 index 4f930fb7cadaed4fa15bd5e05b378b17b658206f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2460 zcmV;N31jw&P) zaB^>EX>4U6ba`-PAZ2)IW&i+q+U-|cb|fnf{AU%j1VBiFD6CbQNW`bK(sD9I_H@+jrU%K4*5tvrbEDSl?Fn(b?My?{rp$i1nzt(+bV z2f|6`HNmC$GWvS1hO5RNCs141>IiY*rlpLCTPkU#o-FOt&NSg-$vZ3BoM)ypR!MWq z6G2Z@{7RNJP@_c^m`or?7|su0(pk6pdRVMt<&|KW6DCUs#}8L{9r)?>G?AIpJf&D4 zv4UUO`2{x|Isb(f07-Voluvw9xSII-abO7u@(FXr274UW6ob<{x9H$ZkpoOiyz(XK zx+g%0ur|XPaJi%?i8x7$nzN>aI9A}(;kna(0D;7T^MaST5DCDk+1JK9nvQMed<{ch z00fhe0-8o0V3oo}kZ%Vb(1GYczMZrp{W2#bh{>r_|LqO78-Rh#xowN$QBwbt5d zZ@CdRgO*(tN72X^ns{Svo;=zbTs z{1tM+q5CJ03l7}}l20BXXCH>=4sV6B9tHb1XWA7N0=;IMcGv-Y;!ycJG3 zP{`J_seTsz&Nlq1ab@15%vI;Y8;mzV_vwdiib&QVhQX>f6YZMLhR13&_cwzS{;MHf z5rla3HX#dR;o`w{*Ph^5V=H6LV50D03haC@i%%Fkc6PbhhmE2(aPP++t%eCK`5I=7 za3djYCkuwd`Oi#0TkdulZt6Ak)ub@u3njUn$kH~AMtj<(6Zhrlv(fTSrp>WJ0ZS#Lu3@~s`C4WA#3 z4FC*MaykRm8?d{`QL85a0^vr;bbPHVJ3qrYR~G0yL0{90!6#rRwxAnbVIBfEAsLx( zZj@H1uXh~SLE}H8k-IWj6PHJyi_p-V0 zQ<$vnjciT>rC0+Y!h*-VGRv&-1KY;MHWyufQ_lQEw)jl9aP!SM{Y3`-c>;y+Wt1n7 zdbrX)9ca~&4*cV{%D$rqM{zv=@>CK5ynPIClJ+R@3sISKY7xkd1*Bf|1+KYD0n2|B z{I5}a$gFp|ALP)eOQ!v3EKkZzNas8P@+Q|2KMA@gRQ4j4U`p@PUNSCn=hRO%`!(*v z%50yEq>feeX>ACpbQ2d>pcshTu#ByPt*b>BTF80Tn4!d zXDH-#cIMxokm1`$>i_gaiZZH&{{Ysq)?+hJf)M}!0flKpLr_UWLm+T+Z)Rz1WdHzp zoPCi!NW)MRg-=sUMJo<=DB_TzI$01Eag-_+!9r;(wCZ5;(m!a@kfgXc3a$kQe-^6_ zF3!3-xC(;c4~UbalcI~1cwbUz5#xo&`#A5O!+ZAuLbJ+Lvu6TOHOojR;$kkpDh6K> zKm`5pAto_XPi7Xg@T{+U>Z7`g@htDYKWjiKm<;fV#B)qHEaDB~nN3UQyiXivWl14E zCmuKGg2azpmtB72Tyj|8nPDTFo+l0yi={4>yO@;?m3W#ss;C;}3ptk+&Rd+-YMr(3 z$zK>MXe$}6(;7hnOGqLG5i;tipb85y+BH&4r0G2F;U9MVDRRl=s(_JW0X3+Q96$IU z{GP2@oSJl#LUADQV%s01KyVjmHEjF)*tT0Ifd3h|(mMWH6PW!Zz0uL4N5J4VaBw3ZSuNiH2Zz8|iL%!{-rd_h zw|{%u^ZNl|6mp;%AlSSB000JJOGiWi{{a60|De66lK=n!32;bRa{vG?BLDy{BLR4& zKXw2B00(qQO+^Rf1sDtq2>5xcsQ>^0R!KxbR9M4fJaFIu!$1Nih5-hn4j6U7fIEPN zScNr}y$mKlH~+UX#4c}SE6p%v(o=?jz5|RjaR9PK*no_MD}&YH1q>UC9R8Ey2$CFd zhTWGjVI~gAnQs{w7&+MjtIq>$~3kD?> zwZTyk;R=3I6Cc@$5LfV%6aPdx06qTkMH8vgy((>GF%DBAZQ5l$+HZZ>7`^v1HoKCObWku=N4^3Kv+nEXv4|P1&pIzvrz{O av;zPe zaB^>EX>4U6ba`-PAZ2)IW&i+q+U-|cb|fnf{AU%j1VBiFD6CbQNW`bK(sDivT`)FY$|S zp3!?au8H2ZB`&P!er^-_~8n#13$fR})`94lDsdK4GrdV2|UPVsLur79E@^a)4=xSH2`& z_XG$L)@C>ZE|(M~5hqDebJmm)#|nHpJa^g;Adon4Uhpy(A^|ux``UO%)3ME*uVKgw zfM60*K+~uLtWvlL@~whGJuq=$W?|*Zjk}N(VG&Vro$5+jlvPx>Qb zEjNOUacI)C)z(_?ShSapxjO7S21Xt<%HSbGM;&eS3Hr=3dCJsTXPbTHMGF!TmMmR$ zwbggppwcdzw`|>Yx7`g~GqPfAVrtcz^#^JJ2l zf)J11CS+kOTs*k$+7ldWY-Ow&OcXv$ft~MV@d;zc&Mr6muu;?o?)})K)i8l2U&D+M zZX~4bWWjJa|C#A$%iS)+O}&P`niNKSp(K|RS=y%2XiwX8;=UYxHd@|kycC#=y#o@(@3rCc1K^t&5rsmZ27(&*g3RqKwL`iSf}MDl1@rp$ zDBu~2Rh0$eqTIpBj8L24+nn=|*4aCaIuC|@&Ukg=OB>=Z9(>)NZ0dEQoEM0^7*7Na zYCXL2?^dWAO{c+{bL3@xLt?>>F^9sdwbzz0P{)DTMMrX12hdgC>Zybpl1CF;1**O_ zlo}FW1|-}_*Mt<;Y63~mOXAJ?Laib$V*;WjXiG;eDxn=n9kDt)>rLohzO`et;q!yB z0f0eDPG_Kc19lfVYV`y_AlwLK&vi2M89_Z=YWBI73O%G*pm?xN{4U2)t35cU0fk zUeZq;3t#9D76ES%+0%5C#|X_EWweb3=^n;wvw=+N^vOut1s1CKzhUO20e`Y7t+=71 zXKHZLDcVq#fTFl$H(A{_#I*|kt-uk{S3u=4uXIKEp(vOiX*V=d{Xm4%N$oA`UN#qg z3X`?Hk6}ME-sC#sCqegw%3j10OzC~vOU6a+ocgI|zs7xd z+;N8k5($d~$WRVlK(mf=o%b-T#gAL5PZr1sl)>O*y=Nhm%PIKziCUm!WXWTW%OH2* z428VT&iwlmGJN|;{hyvlQAV}!A88uaUEk8QR|HHKWNgBq_{W=t_25w7OM^} z&bm6d3WDGdh?Ap}qKlMxUs7lhXnEbqQQYd|TO4DgA>b4)iZ;tk@NO-tvzPaI}tNg+Nb z9yjQM#E)E;U4G+Sa#-M*VI!NKCk_*fr7o7cn3WBcc$zq>s2b%9IhPgATb$Kuowe`D zUl=NAD;ciS8bJa}NFoIhGU}+H3JWpXHBwBZ={)Y?A9nmHa>?YXfRSSXHK>prKlmT~ zo~>D&nsk#waUk$w+aIGqa2IGbZ2SAzwp%BF{~5T_I{sP{nEfQZ(b1wuz~DA;aoy46 zJ>YT&h&<_%AvuztmQXAL?`QN)d0^-k=v#B=);`DS1CXUzE#CkKhrn2gve!M{-P=94 ze|y^V`vGATa-bR@*t`G$00v@9M??Vs0RI60puMM)00009a7bBm001r{001r{0eGc9 zb^rhX2XskIMF->s7z_&n7_36K0004FNkl%6Z{*&Sek{ob` z-Ip<8CJxD&Zy6XEd>I(n85ja+5dv@Dyrm67MwnHh#@K2 zm$tc}&UwZEI_DMtk;Tl-jT!FUxy2wXBtiWUsHyBlF}P`O1S76!nm)6e`sKjecP|)} zRMZAXK~(3wf}zfN1p|8UlbZO*PJ~T+Be05-6aPdx06qTkMH8vgy((>GF%DBAZQ5l$+HZZ>7`^v1HoKCObWku=N4^3Kv+nE mXv4|P1&pIzvrz{Ov;zRfsC>91t-?(J0000 zaB^>EX>4U6ba`-PAZ2)IW&i+q+U-|cb|fnf{AU%j1VBiFD6CbQNW`bK(sDzwij%7Xf_qUg8(u zJfrt;Tob)*OJ3r1k0*W^r^hn+$)l7XE9Z|Mweldsr}&wzYPPT4^#UHXBKM}=wsLwf z90(_!*94d1%joO58m=09oIq`1t0TmLo0c--XsM)?da|@nJJW=VCGV_gbDo*bSS8IZ zPXsW>tV5ql~;mgPM9nm96wy)b>OGh(?n)Y^ORzJ z#0q|8=NH^?z)81!rBaH5&?lIi8x7$nzN>aI9A}(;kna(0D;7T^MaST5DCDk+1JK9nvQMed<{ch z00fhe0-8o0V3oo}kZ%H&#Um|0l4a^o%}MOZ{sT&KE{7G)Jxt=hC#s-<$3s9-o5X&V2adiYh=Xf8e17_1`~x3Q()(NS$x9Sv9rs~K5P`VfqOspXf;e=$=5Jr zgc}KIJ6SLs&VOe5*>bnba8s|LuO@{NUnt4tM3%N`G}_ZPowzSYpN*Dx8t=wX5*=}D zNK2c>dsuL#X)3@ zJqmb+VpU~XAqt1h2pEF*a_|k^>iw9q~C!2bmDCY$tFUAvr zgIW)-{JRzEM$>7q<{Wuh-;h|aW6YuOYVEaU4AgNTcF~dC)d6&sw|Xj}hUC%2R)MOo z4W)*}mjMYk(lsH)wVFWE^OAV8zEG=(%b0*@3EI+8i%Mt*Qb(-L&UzENmv8MDZTS3P zYye=8lG7Qe-hkajj#@nd5C}IyrsHc}+4&jHxw1gt3Hq8|3_bxnu?5}e3iA-S3CYNO zbEC96eZAwr4jTU%jSSv7lqr~cp?U|Y$^n7}_1mYHJkC&3Gz}FbBJSKmBm!?#<{j1d zwU_i$$HEu-gGIm_MD{ctuS*-cir4RNi4e=BfA^c7Hf%qv|{ekcm&N7@aIR6h{mbW(fEx|hv` zpTcBqZ)9^CD8(8G5f(h=m04zuAJ{f7wz=r?n{wtSvc+e*g`02A=`S+q&l4zoFQYtx z)Wenb=|HQFbl@MqRrVb{IEv%>m#2~l;O%38le9;HUx><_Q;R@uEFkrwFL2FO3RwQ5 z;D3$ULuS3x{UC=%T{7)QV|h|$LOSOWkTXQXB0%b7xSnpW~<#GysexepA8Cmj}<1)xy zI71 zKm`5pAto_XPi7Xg@T{+U>Z7`g@htDYKWjiKm<;fV#B)qHEaDB~nN3UQyiXivWl14E zCmuKGg2azpmtB72Tyj|8nPDTFo+l0yi={4>yO@;?m3W#ss;C;}3ptk+&Rd+-YMr(3 z$zK>MXe$}6(;7hnOGqLG5i;tipb85y+BH&4r0G2F;U9MVDRRl=s(_JW0X3+Q96$IU z{GP2@oSJl#LUADQV%s01KyVjmHEjF)*tT0Ifd3h|(mMWH6PW!Zz0uL4N5J4VaBw3ZSuNiH2Zz8|iL%!{-rd_h zw|{%u^ZNl|6mp;%AlSSB000JJOGiWi{{a60|De66lK=n!32;bRa{vG?BLDy{BLR4& zKXw2B00(qQO+^Rf1sDtpILEuHL;wH*Ur9tkR9M4fJaFIu!$1Nih5-hn4j6U7fIEPN zScNr}y$mKlH~+UX#4c}SE6p%v(o=?jz5|RjaR9PK*no_MD}&YH1q>UC9R8Ey2$CFd zhTWGjVI~gAnQs{w7YP^$OkDsCehe{6 z;-6}@A-VBSFa(g}9~Si3LV?`)C+GnA&(|5!B%~M^o}XrTx=>NAGj#^c>g`^65+Yuf(%yzG6)*NeDW+qW_l@E(LgX45R=01-MK}Z5D*rUAlh(p ja{=RM*KE`Q1ML6+bj^OZze-E@00000NkvXXu0mjfRx^&| diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_rubber.rsi/mag-4.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_pistol_mag_rubber.rsi/mag-4.png deleted file mode 100644 index 16c225e94625c9b9710c4a889bbb4af507d4bb47..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2464 zcmV;R319Y!P) zaB^>EX>4U6ba`-PAZ2)IW&i+q+U-|cb|fnf{AU%j1VBiFD6CbQNW`bK(sDcdx>9s z^NilZaZU8LEqRI4J)ZbwoF2>MCy!Eoteii3)XIYhpWs@cAF*9&;mirkxe+sf&| za3Gv?UK3o3FQc#LYPf3baRRl4t&R`}Zd%HSqotBo>dDeR?MxFcmb|l~&3R@zW0f?w zJQ4VWz~f4mHBh5P6_`vQM;OizU(#8(`FdEaV&#=!nG+^U2geUrcpdoZ^)!*0(>$eE zAF+a8+4%)G96A4m6#z+g$COWeQ@EP=`f*?h2=WPY#RhvE*A#=(JGbcIOpyajOT6+W z>AELCh_E)pnM6P!N+M2@qUNkAA&wRJba?KxA3z{+;Jn~vE<^%wYWB79j;3RqIbXw& z7XZN|q=2ST2Uw+W5#(D1g?eD(!py?Tl^b^T0X+v_Yj^HgDOw>u$RnxMpO<*u>PTHR})5Zd9L9dqwW|sHGdVe1LL0eMb$$s&7*y zmlJl(fLJaGh^r$2LTAS;)>KM%e@RA*zl^ii3Sa!;6>4Dula=*kaAiCeh zEq{evaOnOCJySjD1e%9;>~I@4OlB7sm;$T)JGVUGdL`s!K}S4H*bX# z4ivIAZK|Jzzq1X0YFwE&DRb4i@CM@z(0%%0nBN0G`fRkk(|9+AlIVzI zLt5H2-ot_`O_PDs5NI=mb9)CQir;I)=Lf(yF(L|uJ`Dsl?gg3KS!#!LCj>k3EDPrK z?NPup6ssx=#6`J-lNq5l!M8c*A+57_8g(8F`<(IW#FsY2Up)A_J=xUjL^&@Ic`=>{ z9MpPv<=?GPH=0g^HRs67`i8`U9b*oKS8J~=W1x-$v5Su6t`4B9ywy_)H6)KFwhB~z zZ74M)z6?mXk**0TuGIvRo|nX%^{BEd;xZ;6T7tH8)S?pFfz%PJv$NiW?&VuMMjJjq z7#jc>q~vr4syASFk)u{m00hE~km>kZS9X4ebFM7VcY?mA7lTj0PHaIpy23mJZbC9L z-`pszPG9dhu!F{bMk9lF4rL0aUZ~zds&ar}LH+jWC66C8LWBj6d1aPa;|I2li)}8t{HC1wiEQziZsF#ebNY)6`tt+|-^(aZ zAoXyieLB#pBOUn1Z(Ok zDEMEa_K;ccbU(N>DA#!p!&>~fmHK3Xj6fL-KGu5{Lb;rRpP#4&N=BAE=C}-U z7tT<~>+H*d*7QsSkE41oh^3p$O(vYOMI0~)>2Y(i; z4ld5RI=Bjg;17tCqm!bGlz3lKXc6Ou$NM<%p2K_h0YbCNRI_ISP&La)C*oo*zbXb_ z5kLg}@F6BKQ%`0Vv+%61d+MXQi}5V)zCUX~DVPlKiNteEH!R`};+aiL=e$oGW@Sks zJ|`YG=z_$LT$f#b<6LrB;F)0~o1P~Q6N{xTmb;jh4V8GBII5@` z(d0egatDY!>5?HilAo4PECTOm^i6qS=oaW(bLZAR$LRx*rCBZC00)P_Sc$UNJ>K2h zJ-2^*+VlGXVH9$p8X(xb00006VoOIv0RI600RN!9r;`8x010qNS#tmYE+YT{E+YYW zr9XB6000McNliru_suSX>SB0u4tM*vzz+mz}t5( z7?f1h21h}JEBHxGd}Jp=T)|IH{1fE>^!UdYO{B&@QBi;#|JZ_`Zgl~!;HM=1sa6}3 z8~+4D06G5aoL9g?fokzj&;jzFuQQ}cNHH)xKh5xTi82EN0|P@c!)X*X{1@*q9AkYy za8dB_{(IUb!gId`8Lk9m5Hy7O;s< e*{A~s+5rG2M1Zz5bK@BR0000 zaB^>EX>4U6ba`-PAZ2)IW&i+q+U-|cb|fnf{AU%j1VBiFD6CbQNW`bK(sD%dR1r-{s*<|)Pc zh!y(R6Gx=W7`9 z0w9=#6woy40IL)(f_$r>P!CL8m|0l4a^o%}MOZ{sT&KE{7G)Jxt=hC#s-<$3s9-o5X&V2adiYh=&WEL=Re?%ER^Yiwn#8B7#DOo5&6W$_7P$IdP{`>;{e2A=)cqt!5hC11mg z5pE=;?PS4lIRBaHXUp9#!%e-0zM2$9e4!+l6It4((P&TGbmG1oeKuO&X}lXlNp!@q zAuVkh?_t4}rpdr*2(%f(xxE7t#qYJ@^9$gc7!id+p9X>&_kzsrEVVBQO*lQUW_LK z2elqv`FAVSji%FJ%{lV2z9F$-$CyLm)!J*z7^vew?4l#Ns{`mNZ}n6{4auX4tpZhF z8%hm{F9Q;8q-#QoYc+wS=OyuGeW6wnmoWj+611hG7M0Krq>fmfo%JSkFW=fR+VJ_s z*Z{yFC8sk`y#c$69JP7^AP{bZOvi0q+4&jHxw1gt3Hq8|3_bxnu?5}e3iA-S3CYNO zbEC96eZAwr4jTU%jSSv7lqr~cp?U|Y$^n7}_1mW(d7Po7Xc{U=MBKTBNCe)f%sZ;@ zYcJ`ij)gDu2aA9=i0o-P%43A)jWXIsgLDt$wb?)>b^2r^?E(u`{NFQk(ttnNlvdo( z(K9tT=@f0KN7@3SbuXI> zKZVKK-pJ-OP>MAWA}n~!E3?cRKd^0FY;)1&H|5MvWQ)&q3pd}K(_duJpC?fGUPgHW zsfR1=(}7kU>A*jJtL!^^a1_V$FHa>Az}v?FCuxrYzYvu zKm`5pAto_XPi7Xg@T{+U>Z7`g@htDYKWjiKm<;fV#B)qHEaDB~nN3UQyiXivWl14E zCmuKGg2azpmtB72Tyj|8nPDTFo+l0yi={4>yO@;?m3W#ss;C;}3ptk+&Rd+-YMr(3 z$zK>MXe$}6(;7hnOGqLG5i;tipb85y+BH&4r0G2F;U9MVDRRl=s(_JW0X3+Q96$IU z{GP2@oSJl#LUADQV%s01KyVjmHEjF)*tT0Ifd3h|(mMWH6PW!Zz0uL4N5J4VaBw3ZSuNiH2Zz8|iL%!{-rd_h zw|{%u^ZNl|6mp;%AlSSB000JJOGiWi{{a60|De66lK=n!32;bRa{vG?BLDy{BLR4& zKXw2B00(qQO+^Rf1sDtpEZt##IRF3wSxH1eR9M4fJaFIu!$1Nih5-hn4j6U7fIEPN zScNr}y$mKlH~+UX#4c}SE6p%v(o=?jz5|RjaR9PK*no_MD}&YH1q>UC9R8Ey2$CFd zhTWGjVI~gAnQs{w7-&L= zf{*v#(=HL7`z^?DB_M;KA9bfPo*L>oB=9ji)C9?z&@bsM7*kxbwp=05KEpPv~ywjQ_>o|#7 zZ;tgz1qGE(#dQl5j(>P?P&w$W+F3?}Zc&jZ22b9s@i|e(aIy2l;oZ**PA5*An5`Mf zw?I_kB%^`+VJ9Xxd8@KEMLjK$iM;uK3r{eMd|(wd@s|RLr>b;DuGZ?y?527@`;${Q2^}|JPCj1tf!~tDnm{ Hr-UW|0=SR7 diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag.rsi/icon.png deleted file mode 100644 index 72d850aadfe5dfcfd9d81c8dbec829589b0166a5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 395 zcmV;60d)R}P){){~G3KfHSmw;W~}xt5aU09pZ(902n%EF@s`p<`zl;-Z2W z3QF7l)64-2=1xXQ;na!-l0x9ayXO>Hh7B;1(jJ(dlk#8kFC&Amv?Nw}enmls?&DV( zQm4!zx;!8$1kerM{PZ~rO%5PA7d&SsIi2AJBt-!O1Efw65R$}NATcmN3Z+HM)-g=z zt|BTLNDcvN=LWJ0B5LLavP(i-g%T;jPqqWlqXF4bq*%_tKw@=_3_iSj&Ts)ODsVXr pA0RmwP#X-b+HlkXqYj`20062AaTjTINZkMc002ovPDHLkV1k`{j~f60 diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag.rsi/mag-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag.rsi/mag-1.png deleted file mode 100644 index 54bf062641e2bd479bd904a771ee2b1b1530accf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2169 zcmV-<2!{8GP) zaB^>EX>4U6ba`-PAZ2)IW&i+q+U-|cawI7X{O1&V1dtGd{eEA;YsLF1)wZ}m?5WhY;Tf`79#+sZZ`my?$vrlSwnvn$sNH9c+T`cS{j z-nRAf92LPB0((r3CI|NWo6bsnJ{2FqcVNN9z!_t?>3@u$yNB+b0NzJ0@$)y&_z{j{ z=(er&5~oWagkdtW>D8K@jZ@ zi_~%90Yr#9kYlLn?n~I~7F!RCWvn~`W>SDLVEp!WuZr*9Zw#$vG!Mb&d#vCW8Nc9$ zA!py11wg{OVk$en!5!gWF9Vi=pzJVbY_R%vOf(4(Zt=#My*Nyb{+ySf<1&B{VQqmk zfq{Tepm#{YE0KnPIA-8e;W=@n1_XjQp#d)`GADqO$=1d@8unZgI%=dB03n=M0Zriw zuws;$aNaT~RGqLy5lNzwrASSjVv>}SCd*S*S)+<3Rn1zoX3jB7PFZu#CD%fQk;cT8 zRJ7z$O08J5#tK^%^D7jM8n@V_rKT;n(rO2NdhF6u*PeUnb>-SUEtc{6_>2Ebmdi6y`y%a`WCfU z)x)#N3{vS*MUGg`>R&LEH;eve6E1^Z3w3Ibt@HUny3Z!OBNvWW8&q2#Sa0I2OjO$0 zq_?@G4xL3upSfH19$A(}3eK5l!M4+pkVJXmbDIiB~AksL4QZq8m=50fo{tQa@E$kcB$*INKQbdiezD@_a zLsH3kyFT-It+j?ihjBz##B7PN(rm_MLZ>$reVHAcc3dWM`KvDdM7oCp=O>4OTZASj7*f0*^cBur5I;6IJs<)qS!wRA4&JwgeNJBgXlnY z5|q&HH%)I&p=76-(v2FZ)^$T})o73BM2Mq_!l=>a^QQQX>v2S%^C6^^U-kb3>0T7t zyBM7{G^rxMHIzq4L+o*TzUghdJ-m)W&gy%ypGHvWI<#23*GkqF?jbMXQtJ zHF-9sKb&gHeCC#uZs5En9@`~$*327JsouDPdDBa=*s`NFCgd_@2e zgb;>LVy2$TF6Q7lzV6}U>s_2@d7t}p3@AmD0X~st?f%Ws^^4huXpYUDEW#8G0g+{1DYvx=b-PZP%!Rik_%@3O*qi?dp5u+BaC z3&TZiCChc1BS>NiDWoAnMgvvUU?EPcMv93H?I%3^!;U{qE}2|aFmf!Q4i%E)2mgcL z-I}GTNjE8+00J+z{V@szcY$`(w!e>UyL|%qpMfi_>#w(f*-z4&T`hJ5M7Dv8>#ip6 z0hc?#(3371k|X(P3Z)Y8en#I^00wV?{x!F^&OS~bfE;zTd;=UD0%K*$UiWx+sJFL& z&vg3x0r22*bMCWb0RR9124YJ`L;(K){{a7>y{D4^000SaNLh0L04^f{04^f|c%?sf z00007bV*G`2jm402r>rSg3Rs!009L_L_t(o!(%*f-~huw0w#t52BQubb-;i-fQ49v z3CXz(0sNQ$;U z*#TWfflHDIfvL|J7#Q3b6cpqb9xy**2%u#M2nazeR#1?`kh8NgVR-Q15p5IUhj-86 zmcuL~*V3Vz4Picpg#?T~bnFa6TvQN4L1`Q99I#;SWUP*%G#W?>fe-JV4}3{T?Pws$ z0knt)l0$&n(Lh!;P&<16d(J&1fLIB*YaBi{){~G3KfHSmw;W~}xt5aU09pZ(902n%EF@s`p<`zl;-Z2W z3QF7l)64-2=1xXQ;na!-l0x9ayXO>HMzI4J7^oi&BsqW<(LiztP&*pP%7)a829g~> z?Pwq?1gIGeWS4}vqG8dpbqo`_tB9@@$#MXCG$1>Q6w4VHNUV;L!H0Lx87`nj1ulo- l1B{~`lTinZI$)q3007GzaYBw#mBRo4002ovPDHLkV1gW!dS?It diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_base.rsi/mag-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_base.rsi/mag-1.png deleted file mode 100644 index 54bf062641e2bd479bd904a771ee2b1b1530accf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2169 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 Bo|FIp diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_hv.rsi/mag-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_hv.rsi/mag-1.png deleted file mode 100644 index 54bf062641e2bd479bd904a771ee2b1b1530accf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2169 zcmV-<2!{8GP) zaB^>EX>4U6ba`-PAZ2)IW&i+q+U-|cawI7X{O1&V1dtGd{eEA;YsLF1)wZ}m?5WhY;Tf`79#+sZZ`my?$vrlSwnvn$sNH9c+T`cS{j z-nRAf92LPB0((r3CI|NWo6bsnJ{2FqcVNN9z!_t?>3@u$yNB+b0NzJ0@$)y&_z{j{ z=(er&5~oWagkdtW>D8K@jZ@ zi_~%90Yr#9kYlLn?n~I~7F!RCWvn~`W>SDLVEp!WuZr*9Zw#$vG!Mb&d#vCW8Nc9$ zA!py11wg{OVk$en!5!gWF9Vi=pzJVbY_R%vOf(4(Zt=#My*Nyb{+ySf<1&B{VQqmk zfq{Tepm#{YE0KnPIA-8e;W=@n1_XjQp#d)`GADqO$=1d@8unZgI%=dB03n=M0Zriw zuws;$aNaT~RGqLy5lNzwrASSjVv>}SCd*S*S)+<3Rn1zoX3jB7PFZu#CD%fQk;cT8 zRJ7z$O08J5#tK^%^D7jM8n@V_rKT;n(rO2NdhF6u*PeUnb>-SUEtc{6_>2Ebmdi6y`y%a`WCfU z)x)#N3{vS*MUGg`>R&LEH;eve6E1^Z3w3Ibt@HUny3Z!OBNvWW8&q2#Sa0I2OjO$0 zq_?@G4xL3upSfH19$A(}3eK5l!M4+pkVJXmbDIiB~AksL4QZq8m=50fo{tQa@E$kcB$*INKQbdiezD@_a zLsH3kyFT-It+j?ihjBz##B7PN(rm_MLZ>$reVHAcc3dWM`KvDdM7oCp=O>4OTZASj7*f0*^cBur5I;6IJs<)qS!wRA4&JwgeNJBgXlnY z5|q&HH%)I&p=76-(v2FZ)^$T})o73BM2Mq_!l=>a^QQQX>v2S%^C6^^U-kb3>0T7t zyBM7{G^rxMHIzq4L+o*TzUghdJ-m)W&gy%ypGHvWI<#23*GkqF?jbMXQtJ zHF-9sKb&gHeCC#uZs5En9@`~$*327JsouDPdDBa=*s`NFCgd_@2e zgb;>LVy2$TF6Q7lzV6}U>s_2@d7t}p3@AmD0X~st?f%Ws^^4huXpYUDEW#8G0g+{1DYvx=b-PZP%!Rik_%@3O*qi?dp5u+BaC z3&TZiCChc1BS>NiDWoAnMgvvUU?EPcMv93H?I%3^!;U{qE}2|aFmf!Q4i%E)2mgcL z-I}GTNjE8+00J+z{V@szcY$`(w!e>UyL|%qpMfi_>#w(f*-z4&T`hJ5M7Dv8>#ip6 z0hc?#(3371k|X(P3Z)Y8en#I^00wV?{x!F^&OS~bfE;zTd;=UD0%K*$UiWx+sJFL& z&vg3x0r22*bMCWb0RR9124YJ`L;(K){{a7>y{D4^000SaNLh0L04^f{04^f|c%?sf z00007bV*G`2jm402r>rSg3Rs!009L_L_t(o!(%*f-~huw0w#t52BQubb-;i-fQ49v z3CXz(0sNQ$;U z*#TWfflHDIfvL|J7#Q3b6cpqb9xy**2%u#M2nazeR#1?`kh8NgVR-Q15p5IUhj-86 zmcuL~*V3Vz4Picpg#?T~bnFa6TvQN4L1`Q99I#;SWUP*%G#W?>fe-JV4}3{T?Pws$ z0knt)l0$&n(Lh!;P&<16d(J&1fLIB*YaBi{){~G3KfHSmw;W~}xt5aU09pZ(902n%EF@s`p<`zl;-Z2W z3QF7l)64-2=1xXQ;na!-l0x9ayXO>Hh7FLE4THpgGe~_u#b7HX%)lVXz`($87eQaY z%ix{s$S|`i#o1wMmwcocmuuND^y- z#J~V4lol;p$1tJ0il}HHIRvPk8^|h%sF@qcE(viJN~8oo*$zOD24qK(VmSi?iRAz? z`0(yI!v(acz~wM}faF|2Z7{TI!%+u}I)D}c0KQFg-CTgyC;$Ke07*qoM6N<$g1tte AtN;K2 diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_practice.rsi/mag-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_practice.rsi/mag-1.png deleted file mode 100644 index 54bf062641e2bd479bd904a771ee2b1b1530accf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2169 zcmV-<2!{8GP) zaB^>EX>4U6ba`-PAZ2)IW&i+q+U-|cawI7X{O1&V1dtGd{eEA;YsLF1)wZ}m?5WhY;Tf`79#+sZZ`my?$vrlSwnvn$sNH9c+T`cS{j z-nRAf92LPB0((r3CI|NWo6bsnJ{2FqcVNN9z!_t?>3@u$yNB+b0NzJ0@$)y&_z{j{ z=(er&5~oWagkdtW>D8K@jZ@ zi_~%90Yr#9kYlLn?n~I~7F!RCWvn~`W>SDLVEp!WuZr*9Zw#$vG!Mb&d#vCW8Nc9$ zA!py11wg{OVk$en!5!gWF9Vi=pzJVbY_R%vOf(4(Zt=#My*Nyb{+ySf<1&B{VQqmk zfq{Tepm#{YE0KnPIA-8e;W=@n1_XjQp#d)`GADqO$=1d@8unZgI%=dB03n=M0Zriw zuws;$aNaT~RGqLy5lNzwrASSjVv>}SCd*S*S)+<3Rn1zoX3jB7PFZu#CD%fQk;cT8 zRJ7z$O08J5#tK^%^D7jM8n@V_rKT;n(rO2NdhF6u*PeUnb>-SUEtc{6_>2Ebmdi6y`y%a`WCfU z)x)#N3{vS*MUGg`>R&LEH;eve6E1^Z3w3Ibt@HUny3Z!OBNvWW8&q2#Sa0I2OjO$0 zq_?@G4xL3upSfH19$A(}3eK5l!M4+pkVJXmbDIiB~AksL4QZq8m=50fo{tQa@E$kcB$*INKQbdiezD@_a zLsH3kyFT-It+j?ihjBz##B7PN(rm_MLZ>$reVHAcc3dWM`KvDdM7oCp=O>4OTZASj7*f0*^cBur5I;6IJs<)qS!wRA4&JwgeNJBgXlnY z5|q&HH%)I&p=76-(v2FZ)^$T})o73BM2Mq_!l=>a^QQQX>v2S%^C6^^U-kb3>0T7t zyBM7{G^rxMHIzq4L+o*TzUghdJ-m)W&gy%ypGHvWI<#23*GkqF?jbMXQtJ zHF-9sKb&gHeCC#uZs5En9@`~$*327JsouDPdDBa=*s`NFCgd_@2e zgb;>LVy2$TF6Q7lzV6}U>s_2@d7t}p3@AmD0X~st?f%Ws^^4huXpYUDEW#8G0g+{1DYvx=b-PZP%!Rik_%@3O*qi?dp5u+BaC z3&TZiCChc1BS>NiDWoAnMgvvUU?EPcMv93H?I%3^!;U{qE}2|aFmf!Q4i%E)2mgcL z-I}GTNjE8+00J+z{V@szcY$`(w!e>UyL|%qpMfi_>#w(f*-z4&T`hJ5M7Dv8>#ip6 z0hc?#(3371k|X(P3Z)Y8en#I^00wV?{x!F^&OS~bfE;zTd;=UD0%K*$UiWx+sJFL& z&vg3x0r22*bMCWb0RR9124YJ`L;(K){{a7>y{D4^000SaNLh0L04^f{04^f|c%?sf z00007bV*G`2jm402r>rSg3Rs!009L_L_t(o!(%*f-~huw0w#t52BQubb-;i-fQ49v z3CXz(0sNQ$;U z*#TWfflHDIfvL|J7#Q3b6cpqb9xy**2%u#M2nazeR#1?`kh8NgVR-Q15p5IUhj-86 zmcuL~*V3Vz4Picpg#?T~bnFa6TvQN4L1`Q99I#;SWUP*%G#W?>fe-JV4}3{T?Pws$ z0knt)l0$&n(Lh!;P&<16d(J&1fLIB*YaBi{){~G3KfHSmw;W~}xt5aU09pZ(902n%EF@s`p<`zl;-Z2W z3QF7l)64-2=1xXQ;na!-l0x9ayXO>Hh7FLE4VlEP8D8)!Gd$NbXJD{pV0h2K0H@D0 zFfb(dIxr+vO!z;qErRIsfTR#WH(2u0NfeqKKyog4b?q+MmSF>oq&CSCl5_tH2uWfs zkQf*sh0>yB>lh|XCa|2lg5jArI*(D*aLWz{%C))w&(SYnIQY>d+Ah8@k z1|Qx%XSjeC6}TLR50IP-s11fzZ8++HQ3uch0016QaMr2T#i;-Q002ovPDHLkV1f@M Bm{9-# diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_rubber.rsi/mag-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_rubber.rsi/mag-1.png deleted file mode 100644 index 54bf062641e2bd479bd904a771ee2b1b1530accf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2169 zcmV-<2!{8GP) zaB^>EX>4U6ba`-PAZ2)IW&i+q+U-|cawI7X{O1&V1dtGd{eEA;YsLF1)wZ}m?5WhY;Tf`79#+sZZ`my?$vrlSwnvn$sNH9c+T`cS{j z-nRAf92LPB0((r3CI|NWo6bsnJ{2FqcVNN9z!_t?>3@u$yNB+b0NzJ0@$)y&_z{j{ z=(er&5~oWagkdtW>D8K@jZ@ zi_~%90Yr#9kYlLn?n~I~7F!RCWvn~`W>SDLVEp!WuZr*9Zw#$vG!Mb&d#vCW8Nc9$ zA!py11wg{OVk$en!5!gWF9Vi=pzJVbY_R%vOf(4(Zt=#My*Nyb{+ySf<1&B{VQqmk zfq{Tepm#{YE0KnPIA-8e;W=@n1_XjQp#d)`GADqO$=1d@8unZgI%=dB03n=M0Zriw zuws;$aNaT~RGqLy5lNzwrASSjVv>}SCd*S*S)+<3Rn1zoX3jB7PFZu#CD%fQk;cT8 zRJ7z$O08J5#tK^%^D7jM8n@V_rKT;n(rO2NdhF6u*PeUnb>-SUEtc{6_>2Ebmdi6y`y%a`WCfU z)x)#N3{vS*MUGg`>R&LEH;eve6E1^Z3w3Ibt@HUny3Z!OBNvWW8&q2#Sa0I2OjO$0 zq_?@G4xL3upSfH19$A(}3eK5l!M4+pkVJXmbDIiB~AksL4QZq8m=50fo{tQa@E$kcB$*INKQbdiezD@_a zLsH3kyFT-It+j?ihjBz##B7PN(rm_MLZ>$reVHAcc3dWM`KvDdM7oCp=O>4OTZASj7*f0*^cBur5I;6IJs<)qS!wRA4&JwgeNJBgXlnY z5|q&HH%)I&p=76-(v2FZ)^$T})o73BM2Mq_!l=>a^QQQX>v2S%^C6^^U-kb3>0T7t zyBM7{G^rxMHIzq4L+o*TzUghdJ-m)W&gy%ypGHvWI<#23*GkqF?jbMXQtJ zHF-9sKb&gHeCC#uZs5En9@`~$*327JsouDPdDBa=*s`NFCgd_@2e zgb;>LVy2$TF6Q7lzV6}U>s_2@d7t}p3@AmD0X~st?f%Ws^^4huXpYUDEW#8G0g+{1DYvx=b-PZP%!Rik_%@3O*qi?dp5u+BaC z3&TZiCChc1BS>NiDWoAnMgvvUU?EPcMv93H?I%3^!;U{qE}2|aFmf!Q4i%E)2mgcL z-I}GTNjE8+00J+z{V@szcY$`(w!e>UyL|%qpMfi_>#w(f*-z4&T`hJ5M7Dv8>#ip6 z0hc?#(3371k|X(P3Z)Y8en#I^00wV?{x!F^&OS~bfE;zTd;=UD0%K*$UiWx+sJFL& z&vg3x0r22*bMCWb0RR9124YJ`L;(K){{a7>y{D4^000SaNLh0L04^f{04^f|c%?sf z00007bV*G`2jm402r>rSg3Rs!009L_L_t(o!(%*f-~huw0w#t52BQubb-;i-fQ49v z3CXz(0sNQ$;U z*#TWfflHDIfvL|J7#Q3b6cpqb9xy**2%u#M2nazeR#1?`kh8NgVR-Q15p5IUhj-86 zmcuL~*V3Vz4Picpg#?T~bnFa6TvQN4L1`Q99I#;SWUP*%G#W?>fe-JV4}3{T?Pws$ z0knt)l0$&n(Lh!;P&<16d(J&1fLIB*YaBiLf6LrA0t!9nW^=BFQ6$Kd>o?=fQ_y9>E(B6{Hh-`5O$5RyfN5(!R z=LV9a!20bOhU^z-QN*T77&EkeS7I=?G+>ZbkRZtsBs;)o`fSF{(4d|wVaza9!Wb@h z^7sW(jUz7&92GWUcqAc#Ar6b4Z#c>dY=Ep>fSeYvSw3-k1JT7YBPGr9{LF^`$R!}D zmNPI=SPo2_-oW_n?Q;egCe?BV1`0!f8er%b#iI@wbpWLR0E{zfXbb}|X#fBK07*qo IM6N<$g0udL+yDRo diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_short.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_short.rsi/icon.png deleted file mode 100644 index ab03b01371935eb91864359b69bb8faf28a8190e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 395 zcmV;60d)R}P)AVHENNOpkF^x2G?p+P-W!kA&IgfU$1 zaB^>EX>4U6ba`-PAZ2)IW&i+q+U-|cmgFW3{bvPUDWCvM(F4$H5nCVWY zdp^f58<1ro?iI2stbhLY@D~nd${~x^(n^Uqa?6bkof@y>YANP(KL_8BFn%Ks&j$=q zLYuB(S+~AHE-x==zUBR`Jm|RX)Y}lnH&drQ^X|{v$=gukOHTJVwEG1suaHvhD&g#Bv7Q(PCuTz{)k_ALiZB@pS^eZ#fN9<1&+(m zV_D@LPPd%oojg6K;Wr);KWFCG9@QB&zCK>z=RT|Zx>jeo1i)49MLm{sdQj|uGo9B8 zPQ@kY>p2_F8Z8d6HnG$mV#lBn14pM!lZ>3!X$K9sn0c|HWgeW4tS05gBW()uKFL`F z*qEt;rvc^?#QgMy&b)2Uhsi2to&-%M7z4*|&+uOG)$@%Z_Z{X$u|BbaU%cZBZfxfE z9agFy~I{JJf|oDsySZ!g>>Eq01@UEI70~x z#DegqLQ$EO2sl>oWAL0)<_-o(g7AcwoKq?wr}CZ~?|GUyuwoqOuJOD|n}?XBBD_>4Scl%b=JHf-`t6Dc6fGIiG3rY%|srInYg zvUJtemN{b0lV=w%u3o*lJz2Y1eaqT==00bQZr1n^we|FcHHcLoCTOP<*_?qf&IHDF zGk}2R%~`CJGjHZLXR&b#33&@%$|h&hW(*AGMJ!HF?p~PtkhcJIf0Z}>8FOJ%_dA#i zo4Qxb{m9!-SetgzZ8`+)T?kB(ArrQr=V)B0+v-ytyK%B> zf>@%L9u)hdq*bxU`{-LaCGSPOH|z*}pHjy-VLZL64?;d%(BffhT2F0h8^~1HBD~yp z#`B7d)Kp!&< zsiR{m8Ax=!;ejCM1Yi^MSX$>Q0M%;)@UYt)02$b!ZF$_5k&MblNBv-0+QZ`&kkX>a zYEWkHu`eXTHbgqnS%lcQ){4CQ8BF18_--FA7j~z3)?f_<4btk4x4A!GSNx&M=u@l@ zE4yuZL}#qbqV=WobP#!(+4z_bvMWP5{rH_WycOv1E{+f4>GVm<@~G2~pFN|XtTy0v zo2UdGvAuf56CfFSjoT@;4yH27$=)k%Q`@!-e7wFNkRP;{vo4kPebzBh=vu&)Uv!Gg z*q+Qja~W~_c!fu5co82wT1r;7?7X50McG$9`gmzS2E_+4aav%FzZ`hl;~p*39w+zE zJhyoPTTn!Nng8&q0$nan?S!2=o6KlBM)u7==H85=VA)X-5FW{DSwk3U0uj6OANN)S zw|uQX*Z+1Yd@rVHXDWbBa=*s`NFCgd_@2egb;>LVy2$TF6Q7lzV6}U>s_2@ zd7t}p3@AmD0X~st?f%Ws^^4huXpYUDEW z#8G0g+{1DYvx=b-PZP%!Rik_%@3O*qi?dp5u+BaC3&TZiCChc1BS>NiDWoAnMgvvU zU?EPcMv93H?I%3^!;U{qE}2|aFmf!Q4i%E)2mgcL-I}GTNjE8+00J+z{V@szcY$`( zw!e>UyL|%qpMfi_>#w(f*-z4&T`hJ5M7Dv8>#ip60hc?#(3371k|X(P3Z)Y8en#I^ z00wV?{x!F^&OS~bfE;zTd;=UD0%K*$UiWx+sJFL&&vg3x0r22*bMCWb0RR9124YJ` zL;(K){{a7>y{D4^000SaNLh0L04^f{04^f|c%?sf00007bV*G`2jm402?`R|1hJ=%U@?O|^b-1Vi0000wuXJoJtpN0XM!XqY%ECK zV6}(gokfw1<0R&9_2mgS?sw{ZYG`ac*a!yR5t9@fLT-DOGECo~(!8dLrR&CHc6|va zC0mJWI`&;rnP+b+&ZVR@sNu}VHNY^?c2{wCd>#qEh(YF!mP%A diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_short_base.rsi/mag-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_short_base.rsi/mag-1.png deleted file mode 100644 index f67c10605d628e98f3530809db9ce7cff7019d5d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2048 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 diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_short_hv.rsi/mag-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_short_hv.rsi/mag-1.png deleted file mode 100644 index f67c10605d628e98f3530809db9ce7cff7019d5d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2048 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 diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_short_rubber.rsi/mag-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/ClRifle/cl_rifle_mag_short_rubber.rsi/mag-1.png deleted file mode 100644 index f67c10605d628e98f3530809db9ce7cff7019d5d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2048 zcmV+b2> zaB^>EX>4U6ba`-PAZ2)IW&i+q+U-|cmgFW3{bvPUDWCvM(F4$H5nCVWY zdp^f58<1ro?iI2stbhLY@D~nd${~x^(n^Uqa?6bkof@y>YANP(KL_8BFn%Ks&j$=q zLYuB(S+~AHE-x==zUBR`Jm|RX)Y}lnH&drQ^X|{v$=gukOHTJVwEG1suaHvhD&g#Bv7Q(PCuTz{)k_ALiZB@pS^eZ#fN9<1&+(m zV_D@LPPd%oojg6K;Wr);KWFCG9@QB&zCK>z=RT|Zx>jeo1i)49MLm{sdQj|uGo9B8 zPQ@kY>p2_F8Z8d6HnG$mV#lBn14pM!lZ>3!X$K9sn0c|HWgeW4tS05gBW()uKFL`F z*qEt;rvc^?#QgMy&b)2Uhsi2to&-%M7z4*|&+uOG)$@%Z_Z{X$u|BbaU%cZBZfxfE z9agFy~I{JJf|oDsySZ!g>>Eq01@UEI70~x z#DegqLQ$EO2sl>oWAL0)<_-o(g7AcwoKq?wr}CZ~?|GUyuwoqOuJOD|n}?XBBD_>4Scl%b=JHf-`t6Dc6fGIiG3rY%|srInYg zvUJtemN{b0lV=w%u3o*lJz2Y1eaqT==00bQZr1n^we|FcHHcLoCTOP<*_?qf&IHDF zGk}2R%~`CJGjHZLXR&b#33&@%$|h&hW(*AGMJ!HF?p~PtkhcJIf0Z}>8FOJ%_dA#i zo4Qxb{m9!-SetgzZ8`+)T?kB(ArrQr=V)B0+v-ytyK%B> zf>@%L9u)hdq*bxU`{-LaCGSPOH|z*}pHjy-VLZL64?;d%(BffhT2F0h8^~1HBD~yp z#`B7d)Kp!&< zsiR{m8Ax=!;ejCM1Yi^MSX$>Q0M%;)@UYt)02$b!ZF$_5k&MblNBv-0+QZ`&kkX>a zYEWkHu`eXTHbgqnS%lcQ){4CQ8BF18_--FA7j~z3)?f_<4btk4x4A!GSNx&M=u@l@ zE4yuZL}#qbqV=WobP#!(+4z_bvMWP5{rH_WycOv1E{+f4>GVm<@~G2~pFN|XtTy0v zo2UdGvAuf56CfFSjoT@;4yH27$=)k%Q`@!-e7wFNkRP;{vo4kPebzBh=vu&)Uv!Gg z*q+Qja~W~_c!fu5co82wT1r;7?7X50McG$9`gmzS2E_+4aav%FzZ`hl;~p*39w+zE zJhyoPTTn!Nng8&q0$nan?S!2=o6KlBM)u7==H85=VA)X-5FW{DSwk3U0uj6OANN)S zw|uQX*Z+1Yd@rVHXDWbBa=*s`NFCgd_@2egb;>LVy2$TF6Q7lzV6}U>s_2@ zd7t}p3@AmD0X~st?f%Ws^^4huXpYUDEW z#8G0g+{1DYvx=b-PZP%!Rik_%@3O*qi?dp5u+BaC3&TZiCChc1BS>NiDWoAnMgvvU zU?EPcMv93H?I%3^!;U{qE}2|aFmf!Q4i%E)2mgcL-I}GTNjE8+00J+z{V@szcY$`( zw!e>UyL|%qpMfi_>#w(f*-z4&T`hJ5M7Dv8>#ip60hc?#(3371k|X(P3Z)Y8en#I^ z00wV?{x!F^&OS~bfE;zTd;=UD0%K*$UiWx+sJFL&&vg3x0r22*bMCWb0RR9124YJ` zL;(K){{a7>y{D4^000SaNLh0L04^f{04^f|c%?sf00007bV*G`2jm402?`R|1hJ=%U@?O|^b-1Vi0000f0uD~TWcb6tz`%9n5W~mk&lngOVu>=7=xhk{J&eWx=Hd)2A-c2+0hsS` zh61fafPn#z?->|q9|8;vv`GU*I{-PGVao;Z5D3v_;4a-mtg(b0@cQ{Plwubqh5=|5 z0wOQ;LS58ihWO#1JKKWkrx8!U_e3uxfC3fAwX&|Opyc7Lx3F185l??hz{>Mhr)-2 z0D35V{_>L~2N2aBfB|9}C8RV)NOk}%z<{?2M;$QgfB|;^0QYZVg}aNG0000007*qo IM6N<$f|7D~)c^nh diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LRifle/l_rifle_box.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LRifle/l_rifle_box.rsi/meta.json deleted file mode 100644 index ba03633bbe..0000000000 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LRifle/l_rifle_box.rsi/meta.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi", - "states": [ - { - "name": "icon" - }, - { - "name": "base" - }, - { - "name": "mag-1" - }, - { - "name": "mag-2" - }, - { - "name": "mag-3" - }, - { - "name": "mag-4" - }, - { - "name": "mag-5" - }, - { - "name": "mag-6" - }, - { - "name": "mag-7" - } - ] -} \ No newline at end of file diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LRifle/l_rifle_mag.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LRifle/l_rifle_mag.rsi/icon.png deleted file mode 100644 index b77ffd8187f22f4633fdab2f0a011456ba727565..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 442 zcmV;r0Y(0aP)hJ=%sGxI;)9Ps$T3x>xJUNA5)Ffg1veu2T< z(tsReNOM4YOFARWQdtEFjP%gK@swdpW-7^{KvFiu2C`qAWnfr;mVsYUkb&XpbCUIw z6a~nkkp1E;#BwC?$k>PEv_Ntiuzq_6!{VtD#td!Wl^Dz|4MHum001cg#OK;umykwMzx+*TH# zaB^>EX>4U6ba`-PAZ2)IW&i+q+U-|ccH}4w{bv=k1SAlG%AHdw}z(7gy%*#G=(;V&G_!Xb;+(n^Uqa?6c7IyGL$)l$soeh$80;rX3BJYFzF z32nL_%f82V$mR6|&9{8Kmj|7@S^d%0w6Qy|Wd|67@)o}^#lmr7QwbN(ZbIQNQFFZo`K>#1Ur})Je&(do+ zE=4cXDo=5`Y=6g9p*-o(#rRkMA~uICaEu5wT6Wh$qKfdk=8 z=d*%SaS8f*&W5wb9w$&+nCb{|;Gq#C;zpSkbu!wgoiyQM=FN(hd2%|knv@&QSg8Vy3FH#Q{P2a2-RAaStitjljAVi`$M4-4o(11M-zhS4niIwPh!y-|=NH^? zeDtmXO9I zw9>TI)>`i{+H;4lj`1CW!6S`4WR#(!jyC!PeP*6A%hXwCn|<+03n?J1vUJteR^PNi zrJc9zvUS(pb~kX%l4TPsrdF+4f1q}w`X04s1ed z6UYUJ?hSIk;`RY*tDkh64nV#N5mRKygym;BcCPrv@3!Hm3jSC0HAMqZ_dWWUpiOHA z;^=6=8ksjOu3Lco5UXmFu+(=2DJH%n+pF2e=g9)F@3!Z%ZMu<#>+%kCpu z8wNhwXdq>C^-MeRGRUHTQCU}r38mJwC7{yM?x_>j$HqrAm+Y$G_F=V97LpaQ)J_*G z{Y@L51>b220}hb~vd&x`J3b&mvN5Ei zW!LDsks1KTG=OuqMeDIU<{fdhR1f~4d->?XAGU85Ax8k7J>VejgIc@csgPX4$gP80 z;+!kvZoT}}u%h@_#0*1zfL{0yShpjH3JZ5FD0|L|n6c-EO55XqUZLU%w8rxN97);4 ztMH8+ZrC@#(s4T6*Ftb_LSp+kR>Vu}H*I(pe5Dol7?p>h6WsT#y`errmUhRN?}jf+ zd#^nz`Yj1IJ)e|G!J2Jd3EN=WmCx7_8s_&W@DCro_#F@KAupbefo*HmXaP<-QO8v0 z3O1=UcgpiY-d#}5e%GT2R|084ld5RI=Bjg;0K74qm!bGl=#1- z&?3fz<9@um_qclp2(21Z&Atgh)hr{EOo;iysu+Al01<=`hEHOqp2{xf;5okT;p6LF zoM(BT`*RE^MUw$Ok$8^jhDE$VJhN%(ocD>NtRgAI=fvX%U6A;Z>$1yloXZXiJTq$K zGV{byVzJ!Aau2hLp%PCM#}rkgd?D|$!g-6cT5GV*J^2g6MQtU^b($kcVhJgvAwot2 zRn%Z1POC}R!kyVgjsH~YuKL zk6&Ogw=|%A2(-7P!!4CnkibX}t5OzrB6VFmZYVK{FVs(Jar; zY+&FLmW1<(wVY~+aN_g^hHr15!!fazQ!NBW8>OQT7hJ=%sGxI;)9Ps$T3x>xJUNA5)Ffg1veu2T< z(tsReNOM4YOFARWQdtEFjP&5)s>`r^#Tt@Bf#Nivtt!g!<;_zDXJ-ep^poTOyeIv#bv cr~{}00QJh0g8*@{3IG5A07*qoM6N<$g0$MP@c;k- diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LRifle/l_rifle_mag_flash.rsi/mag-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LRifle/l_rifle_mag_flash.rsi/mag-1.png deleted file mode 100644 index 639ec8244c48cf31d8e23562821c6ef52ff71b53..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2183 zcmV;22zd92P) zaB^>EX>4U6ba`-PAZ2)IW&i+q+U-|ccH}4w{bv=k1SAlG%AHdw}z(7gy%*#G=(;V&G_!Xb;+(n^Uqa?6c7IyGL$)l$soeh$80;rX3BJYFzF z32nL_%f82V$mR6|&9{8Kmj|7@S^d%0w6Qy|Wd|67@)o}^#lmr7QwbN(ZbIQNQFFZo`K>#1Ur})Je&(do+ zE=4cXDo=5`Y=6g9p*-o(#rRkMA~uICaEu5wT6Wh$qKfdk=8 z=d*%SaS8f*&W5wb9w$&+nCb{|;Gq#C;zpSkbu!wgoiyQM=FN(hd2%|knv@&QSg8Vy3FH#Q{P2a2-RAaStitjljAVi`$M4-4o(11M-zhS4niIwPh!y-|=NH^? zeDtmXO9I zw9>TI)>`i{+H;4lj`1CW!6S`4WR#(!jyC!PeP*6A%hXwCn|<+03n?J1vUJteR^PNi zrJc9zvUS(pb~kX%l4TPsrdF+4f1q}w`X04s1ed z6UYUJ?hSIk;`RY*tDkh64nV#N5mRKygym;BcCPrv@3!Hm3jSC0HAMqZ_dWWUpiOHA z;^=6=8ksjOu3Lco5UXmFu+(=2DJH%n+pF2e=g9)F@3!Z%ZMu<#>+%kCpu z8wNhwXdq>C^-MeRGRUHTQCU}r38mJwC7{yM?x_>j$HqrAm+Y$G_F=V97LpaQ)J_*G z{Y@L51>b220}hb~vd&x`J3b&mvN5Ei zW!LDsks1KTG=OuqMeDIU<{fdhR1f~4d->?XAGU85Ax8k7J>VejgIc@csgPX4$gP80 z;+!kvZoT}}u%h@_#0*1zfL{0yShpjH3JZ5FD0|L|n6c-EO55XqUZLU%w8rxN97);4 ztMH8+ZrC@#(s4T6*Ftb_LSp+kR>Vu}H*I(pe5Dol7?p>h6WsT#y`errmUhRN?}jf+ zd#^nz`Yj1IJ)e|G!J2Jd3EN=WmCx7_8s_&W@DCro_#F@KAupbefo*HmXaP<-QO8v0 z3O1=UcgpiY-d#}5e%GT2R|084ld5RI=Bjg;0K74qm!bGl=#1- z&?3fz<9@um_qclp2(21Z&Atgh)hr{EOo;iysu+Al01<=`hEHOqp2{xf;5okT;p6LF zoM(BT`*RE^MUw$Ok$8^jhDE$VJhN%(ocD>NtRgAI=fvX%U6A;Z>$1yloXZXiJTq$K zGV{byVzJ!Aau2hLp%PCM#}rkgd?D|$!g-6cT5GV*J^2g6MQtU^b($kcVhJgvAwot2 zRn%Z1POC}R!kyVgjsH~YuKL zk6&Ogw=|%A2(-7P!!4CnkibX}t5OzrB6VFmZYVK{FVs(Jar; zY+&FLmW1<(wVY~+aN_g^hHr15!!fazQ!NBW8>OQT7hJ=%sGxI;)9Ps$T3x>xJUNA5)Ffg1veu2T< z(tsReNOM4YOFARWQdtEFjP&50@Rec8<^qyKf#Niv=Wv(dJNsG&M++6Q^poTOA3FQXN5-1CY}KE=Ldx$j$}$904mQzP)`;I|tx$1dRXf?Q@2S z(;EoZkc`x5mgi?S{O1yug!75DoPmK#mC?lM4UFI3K4*YoVl8K2pi&4>0)}>VJnDc^ c2T%h50AkORgDZ96egFUf07*qoM6N<$g7dSm^Z)<= diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LRifle/l_rifle_mag_hv.rsi/mag-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LRifle/l_rifle_mag_hv.rsi/mag-1.png deleted file mode 100644 index 639ec8244c48cf31d8e23562821c6ef52ff71b53..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2183 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 diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LRifle/l_rifle_mag_rubber.rsi/mag-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/LRifle/l_rifle_mag_rubber.rsi/mag-1.png deleted file mode 100644 index 639ec8244c48cf31d8e23562821c6ef52ff71b53..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2183 zcmV;22zd92P) zaB^>EX>4U6ba`-PAZ2)IW&i+q+U-|ccH}4w{bv=k1SAlG%AHdw}z(7gy%*#G=(;V&G_!Xb;+(n^Uqa?6c7IyGL$)l$soeh$80;rX3BJYFzF z32nL_%f82V$mR6|&9{8Kmj|7@S^d%0w6Qy|Wd|67@)o}^#lmr7QwbN(ZbIQNQFFZo`K>#1Ur})Je&(do+ zE=4cXDo=5`Y=6g9p*-o(#rRkMA~uICaEu5wT6Wh$qKfdk=8 z=d*%SaS8f*&W5wb9w$&+nCb{|;Gq#C;zpSkbu!wgoiyQM=FN(hd2%|knv@&QSg8Vy3FH#Q{P2a2-RAaStitjljAVi`$M4-4o(11M-zhS4niIwPh!y-|=NH^? zeDtmXO9I zw9>TI)>`i{+H;4lj`1CW!6S`4WR#(!jyC!PeP*6A%hXwCn|<+03n?J1vUJteR^PNi zrJc9zvUS(pb~kX%l4TPsrdF+4f1q}w`X04s1ed z6UYUJ?hSIk;`RY*tDkh64nV#N5mRKygym;BcCPrv@3!Hm3jSC0HAMqZ_dWWUpiOHA z;^=6=8ksjOu3Lco5UXmFu+(=2DJH%n+pF2e=g9)F@3!Z%ZMu<#>+%kCpu z8wNhwXdq>C^-MeRGRUHTQCU}r38mJwC7{yM?x_>j$HqrAm+Y$G_F=V97LpaQ)J_*G z{Y@L51>b220}hb~vd&x`J3b&mvN5Ei zW!LDsks1KTG=OuqMeDIU<{fdhR1f~4d->?XAGU85Ax8k7J>VejgIc@csgPX4$gP80 z;+!kvZoT}}u%h@_#0*1zfL{0yShpjH3JZ5FD0|L|n6c-EO55XqUZLU%w8rxN97);4 ztMH8+ZrC@#(s4T6*Ftb_LSp+kR>Vu}H*I(pe5Dol7?p>h6WsT#y`errmUhRN?}jf+ zd#^nz`Yj1IJ)e|G!J2Jd3EN=WmCx7_8s_&W@DCro_#F@KAupbefo*HmXaP<-QO8v0 z3O1=UcgpiY-d#}5e%GT2R|084ld5RI=Bjg;0K74qm!bGl=#1- z&?3fz<9@um_qclp2(21Z&Atgh)hr{EOo;iysu+Al01<=`hEHOqp2{xf;5okT;p6LF zoM(BT`*RE^MUw$Ok$8^jhDE$VJhN%(ocD>NtRgAI=fvX%U6A;Z>$1yloXZXiJTq$K zGV{byVzJ!Aau2hLp%PCM#}rkgd?D|$!g-6cT5GV*J^2g6MQtU^b($kcVhJgvAwot2 zRn%Z1POC}R!kyVgjsH~YuKL zk6&Ogw=|%A2(-7P!!4CnkibX}t5OzrB6VFmZYVK{FVs(Jar; zY+&FLmW1<(wVY~+aN_g^hHr15!!fazQ!NBW8>OQT7L*1cqmKPMUw@;#Ffa z&;S4bt0v54*u=mer0UxO0Dvg9ED|FVF=-)=-Nc4zz0~-mYP;Tqj=q4Eef7JL4Zd&b z9{~hDHo3?H4>uaZ{*iVZq*yV95U~l&+5_d=r|FwMJ*KNU{-F8HZHn6hda3{Q3X23qVMboj_&2sJ&^-J<9yfj8<4C<7TD<~PfC^9n0K98na?Z`a*E(bH zb-gw(16UU&BAnV5ALlaw;5H2SemtbL0SGN%=3E>AQc8$10)GIeX?iU{2%(8F!djcZ zb}4!vM|8&E^K#i(Qw-oQF>{`4Y!Cqu(Pr&740*1xK?JaPzt$2&ts3ct#5p%JGg3-8 zwQcr)83BlX$07&OdKaWQ5CfFXff%544#XJ%%I2V0Gt%au7=Shhs%}U`n;vi<#~Tq69RL6T delta 389 zcmV;00eb$`0-ytsB!6c~L_t(|ob8ssYQr!Phd=iZ8H_W_Lqmp=#k;2V75WI?GUx@; zXNVue83LWVbPIIz&}K1&PQ@9LsfC1eE9nqyOr26oD0uNLk`C`p@?z8}L96L#p5ClQ-wRzChdW|mx_oGoo8fyT5nUu2Fo5-LA;JR+bx6HC) zZz6*hK(2k+@%CfuYlI?Xr&RAv!GiC+5ooeKpVhz9cTlL zqsZwj=1gw}+TJGU)TDhPC^Fwadsf3)TS2b+9_G-w=&%!q~jeCiBi{00000NkvXXu0mjfHh{TC diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_mag_flash.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_mag.rsi/flash.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_mag_flash.rsi/base.png rename to Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_mag.rsi/flash.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_mag_hv.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_mag.rsi/high_velocity.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_mag_hv.rsi/base.png rename to Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_mag.rsi/high_velocity.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_mag.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_mag.rsi/icon.png deleted file mode 100644 index 2d950bc78b37c9dce0035b215d7b6c92e9d6edc7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 483 zcmV<90UZ8`P)>fjda7N{1X zP!&<*(1M`Q5(h!zP+B6Xc<(h5hnyuJH=Oh2ocG>y1jliZq>UvSJq1VsQh@&eFv0S1 zrCbP>7Jx=8y0*FN2s{7+?MYZE7lPycW!zrZQPkzgx=C3BzSz)d4fWC>?~$z^VggfKfWIk669@0>HE^VXD=@!Ac&hy;oH8S=`rh zSe*BedwW4OpT&uxQ|lnMZpgbEVgm@5p*>E&5t!QXz%D)}v2k_@064sP007iZWdQG} zb^Fgcr7z|T7={rjiUL(t0rVS`L`dXn7zR}usON#OX_`jm+_vo>=L0T)I4$v+Fa<~) Z;1d@Ri=Mvf3`qb0002ovPDHLkV1m3T(#HS* diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_mag.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_mag.rsi/meta.json index 43b96fbef7..542b70c21e 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_mag.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_mag.rsi/meta.json @@ -8,10 +8,22 @@ "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi", "states": [ { - "name": "icon" + "name": "base" }, { - "name": "base" + "name": "flash" + }, + { + "name": "high_velocity" + }, + { + "name": "practice" + }, + { + "name": "red" + }, + { + "name": "rubber" }, { "name": "mag-1" diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_mag_practice.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_mag.rsi/practice.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_mag_practice.rsi/base.png rename to Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_mag.rsi/practice.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_mag.rsi/red.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_mag.rsi/red.png new file mode 100644 index 0000000000000000000000000000000000000000..d3be1ff3f029267ed6538e501ecfc93908204919 GIT binary patch literal 416 zcmV;R0bl-!P)73bYMw52dX!I7K1!w_U0N}#pp)d^hzkR+CjHAdo z89+Ix>$-G3kE>n}fMu4k*=}`X1DX;@DU09$X_}HG2>`p@?z8}L96L#p5ClQ-wRzCh zdW|mx_oGoo8fyT5nUu2Fo5-LA;JR+bx6HC)Zz6*hK(2k+@%CfuYlI?Xr&RAv!GiC+5ooeKpVhz9cTlLqsZwj=1gw}+-^Ua4El5yb9^DV{`z1t z=<}$Cwflj!%g8hf)&RZt~5Jf*xx)EEOB6|V%a~$`+z~&6uWB4T0?tKBaSn8~(*$RsUMPWu>(fBvEEYLjs zKOQ%I-{VNV9a_BtRDcRl0RX&fUUJUOzt=ir@O8a5F9TQ?B_f>K79Zy`0N^$Z_{`4Y!Cqu z(Pr&740*1xK?JaPzt$2&ts3ct#5p%JGg3-8wQcr)83BlX$07&OdKaWQ5CfFXff%54 z4#XJ%%I2V0Gt%au7=Shhs%}U`n;vi<#~3`7+mUXPPq=Rv2 zz|E359YW(tD&{*<;*fVq$Q^f2?tSxpF~TrJo7!o0_YR-~=m7o$z%FI-WZchBj)3Qv z>e$6iXy^bKbt~ay+|M8GPVx3S#b9Vx#x2g_2LTzP_6f}9HV)1{0oY)Sp=X-dw+oPu zB*E8mN!=R&F#|$~a&rKP;}}sC0RXZr+b)2V(ukr6j^mVXn`If^pZ2gwQ&^niax}`f z2JoA%{b_lxV*?3*F;;n|ei1r0kO0=+tGc}+@2L;q2f>dVSe#=pwBep7+Bs;X5~?;( zb3g{zlmpcUY7WQ%n{puUsjGaeb}3fnx^6CnKpe;DnI;x#isQosv$+k6a{#DamK*Da zstuGJGzOsBK*<5A9k0b0tMmZ*STv?Znv&KcpMd9ix#KtxLI5Zll*M`F>UmzRdY~P` qI`gEIe+E$tph>m zaB^>EX>4U6ba`-PAZ2)IW&i+q+U-|SmgFc7{O1&N1S25?#}Odj+Z*ihCuBRbDsyYM zd%F5(=Z&2#47G|&BWJbxCHmif`OUa`AoRWIr1%j=^45&0{DD-i{J6E zj6cG0DSEh7-{N%3v%JaqISsv7l<7G$eYVK!p~vUrQ~dT`ZEwH4vr-enRd1&ruAEO8 zI1o-g|5lGsSpj!L8)wJa4m&1LTX1!xW1!PBA>uoiyt3t;{cLBRFtL!6q9vNdr>wD3 zr^x|9i8F7~#GMxqA)Y{vA*QD-`JA`Me3-0Z=9Mv$GL!{=FK2oe{Ob9lXzxh#oR9X5 z73`wO8kiBt#T}ynNZxl$<&1AmS981{0W1SSIm6uGpdI5VXgqDQOu41Xg(O(~i zI+4H(h*8NvTmu0lGzDfy%cW2t7nmKLI5Bt&R!V@gav%l-i)WIZpV)mM_g`^Ki0)s- zjlM!I1$4gyxfIZSLhe6t`vSFPC*AT1P*fpe3Wj8q-!6wy!|(XjHhovYKZ^eE6d|o> zbRSE1LNP4bij2-)*|AliF`EsfxwC2S%4@H+r(#*n$a}7C;AF)PZSG#AjxD}D;Ud~q zy?%b1&zJEo``mMGJ3I_A-`I+LWnB6V;bGTlXkF3S8E=LSu+oxg*vrZ?6IeE~N32$h7&SU$ zgn-ZlKFEr>02sP!*xEXFC!g@m+6Kv;1P7l=_+)U+4TQX5(f8eoHhu9zC!E-l@vy>A zP$+g*ay96m9*s(;U%YZ1(=844aR7Rp6$!6g$3m`hwdot{09hAAWWskjWXAX^i8+!cJ~AbMh&NsaFB#|zHl2O{M&-S zw~Qh~>R=sS&gwS62y2by8|&fWHnEZ?*8zTk|1xq!1$TF>p3t>Td^jLGq51&{q;Ii@ z*uq*|r=6~~gBFr4WN-{UyRab%3#Ya*NmnI|K>hau2j~b!D5uvbJ=?xgg#(5?f$_9_ z=d%ysTrveoM7B$ODE^>LKRfWzo@8*9?8yqj5s0WJ?1~=5fHFYl;0`zq`)7x>$U#Gq zM-I(~?;fAJEC}GNBkVDS!HU?oB`F5HD`OUXthAWxuNrx_>8HE_m*%McgR3q^{xKn^U!t-nV?AgY-y*NwpY1(D`Jp`h9-{p_D#C~9>gi93H&&DK z;`1&500D$)LqkwWLqi~Na&Km7Y-Iodc$|HaJxIeq9K~N#ON&%G*g?c0Lv^wsD&i2R|084ld5RI=Bjg;0K74qm!bGl=#1-&?3fz<9@um z_qclp2(21Z&Atgh)hr{EOo;iysu+Al01<=`hEHOqp2{xf;5okT;p6LFoM(BT`*RE^ zMUw$Ok$8^jhDE$VJhN%(ocD>NtRgAI=fvX%U6A;Z>$1yloXZXiJTq$KGV{byVzJ!A zau2hLp%PCM#}rkgd?D|$!g-6cT5GV*J^2g6MQtU^b($kcVhJgvAwot2Rn%Z1POC=Ip6A0p79190> z5K!a>>(GFkN9J=7OQknlLjNp%mzK7Wr};g}8z)H;bXj}oxO#vdpaOAblUzZ zxCs}OJ7GBnQxA** zws}yF!PEm|fNdVc5B9U?*c?iOAOPnaQc4V67r9b6Im)nHF?f^~zO>p6%Q2XEP#Zuw z1``hkHiHpDDm@^6`fW_PQq4*zgn;k+;G7o?%A>S$6+$#C;jRs=5rFl)&Kwi07*qoM6N<$f}&1L(f|Me diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_mag_base.rsi/mag-2.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_mag_base.rsi/mag-2.png deleted file mode 100644 index 6a97e07ec724e8a7a15353d5e31c64898cc48923..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2299 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 diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_mag_base.rsi/mag-4.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_mag_base.rsi/mag-4.png deleted file mode 100644 index 68d8fc44ef7d540b37ab5b317eceb746168c2067..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2298 zcmV zaB^>EX>4U6ba`-PAZ2)IW&i+q+U-|SmgFW3{O1%of{_q{;|LJ%sfJN0noe8Rwi za9+`6sAmol9QX^3Hy?Gf$XU$Vt%>P2yA5SgF(G zfS|;gH)-O|3y2U;Ajc5X)0TYB+haaV)-dzR7)cq*0>76teH8rc`J!m=Nb{VJ_KX$m zqR20p5y-_IqX0ixxqm@#-(CNe#1m#phn zfDmDBfianZz)_Ljx#mNOG-t%I0Uv|q#DxYB$dZH>tfazR0ZyZs8~@RKjwPW>40-_& z!j%=!bT)uhij<0aYe*qW!cs(}ib|6%R=JicwN|acQ>Ls%MXRbd?P`r%Y0_%b)>?1Y zsWWIyQm%E&{QY!{shVcf$puwXI8FlDrqYs-%pIN5NI(4?$r!88%KmlphrK_#J z%(EkvytsIE_2%7eBiAA?6#Kmd}h!zaTv9IxTIhb$HS6h-a;3ZRsvseO1&M%BPW*g)&tz zOJN7a?LJ`NP*k#Lm%R%2wAV(3qO{9E>2B6FyDb^ZRunxL0AZL?x2R39C6;?o%96%l zL(!E*c8C%p9g>W=e5p;Jz5wO>ig|s(ay;YBumM(DG7WoKS!M#uM)ru+Y7wJGXN(XK zn!pEHF&6+scMV%x$L{14zFFHKxs%}FQwg68uDOAbH!S+PThXRZUg(4qTQVM2_z4Qd z&PuKZ{nMjS>GX?Nu4B5Tp*{{kkFz4-mFrl@RjxLDV;vytf{0A`F2^j0gq@igTm1KJ z`Y8B`cDPCen=HCJv$+t!09vrWv9v9ytAI?$3_myW#c1ht$BG@vx;pkk+EKj8QFV&4 zoId)*?s0c%UM&0%R51_tu;hits#t8qmAn+}t z$dEc%hnKUu4KTu5WBJB>;+W z7T0N~Ywe(gWD6M_L(eX3NW#LYZA{Wt2_sPdy}$uFf)UE;HA>I6uTBa=*s`NFCgd_@2egb;>LVy2$TF6Q7lzV6}U>s_2@d7t}p3@AmD z0X~st?f%Ws^^4huXpYUDEW#8G0g+{1DY zvx=b-PZP%!Rik_%@3O*qi?dp5u+BaC3&TZiCChc1BS>NiDWoAnMgvvUU?EPcMv93H z?I%3^!;U{qE}2|aFmf!Q4i%E)2mgcL-I}GTNjE8+00J+z{V@szcY$`(w!e>UyL|%q zpMfi_>#w(f*-z4&T`hJ5M7Dv8>#ip60hc?#(3371k|X(P3Z)Y8en#I^00wV?{x!F^ z&OS~bfE;zTd;=UD0%K*$UiWx+sJFL&&vg3x0r22*bMCWb0RR9124YJ`L;(K){{a7> zy{D4^000SaNLh0L04^f{04^f|c%?sf00007bV*G`2jm402n-ltNb2wa00C}EL_t(o z!|j$oOT;i3hkudVLT?k&!8o`G1rdada>H$Yhi*4?m(xY$#+JjcAoLRm;$9pB2XYWl zKo8IZbPg~u`FK7X6{p9* z%WL)B$t!_{=!{wlZ$ z7v;T83`PKy(#kV^McBk(1n`%=UU%0mZbV@e{qw+O4C4tW{zYo-K`lF>9)qa|#sJ$q z&|@(5z!+eg2l0db>=Bzosqgy`LO>~nq2pkkWjHxXi{*+Fm$A~9R=c4dgNX;V0q8N9 zcrdUTj8a3`7Td13OL5zco5RjsfQ95*Ua+3~OLZR8Ex`=d4DE@&W!Yw*D2>yZK7ziyw zp;{b_XbWzZEQ-XTw4|iPyOH7bRS$4%W|Y&A_S&oaYHb#!2Oeq_1$*>GDK0t zQZ9!zc?k02dH5I%cw+jXMXTvfA2dVU zD_|H#pePDdRRu7-pd>;fPs1>ne85}}gr#X3)8v%WU+aTd07)wKnlJ-M9pDFcG>LMk S6kNdo0000 zaB^>EX>4U6ba`-PAZ2)IW&i+q+U-|SmgFc7{O1&N1S25?#}Odj+Z*ihCuBRbDsyYM zd%F5(=Z&2#47G|&BWJbxCHmif`OUa`AoRWIr1%j=^45&0{DD-i{J6E zj6cG0DSEh7-{N%3v%JaqISsv7l<7G$eYVK!p~vUrQ~dT`ZEwH4vr-enRd1&ruAEO8 zI1o-g|5lGsSpj!L8)wJa4m&1LTX1!xW1!PBA>uoiyt3t;{cLBRFtL!6q9vNdr>wD3 zr^x|9i8F7~#GMxqA)Y{vA*QD-`JA`Me3-0Z=9Mv$GL!{=FK2oe{Ob9lXzxh#oR9X5 z73`wO8kiBt#T}ynNZxl$<&1AmS981{0W1SSIm6uGpdI5VXgqDQOu41Xg(O(~i zI+4H(h*8NvTmu0lGzDfy%cW2t7nmKLI5Bt&R!V@gav%l-i)WIZpV)mM_g`^Ki0)s- zjlM!I1$4gyxfIZSLhe6t`vSFPC*AT1P*fpe3Wj8q-!6wy!|(XjHhovYKZ^eE6d|o> zbRSE1LNP4bij2-)*|AliF`EsfxwC2S%4@H+r(#*n$a}7C;AF)PZSG#AjxD}D;Ud~q zy?%b1&zJEo``mMGJ3I_A-`I+LWnB6V;bGTlXkF3S8E=LSu+oxg*vrZ?6IeE~N32$h7&SU$ zgn-ZlKFEr>02sP!*xEXFC!g@m+6Kv;1P7l=_+)U+4TQX5(f8eoHhu9zC!E-l@vy>A zP$+g*ay96m9*s(;U%YZ1(=844aR7Rp6$!6g$3m`hwdot{09hAAWWskjWXAX^i8+!cJ~AbMh&NsaFB#|zHl2O{M&-S zw~Qh~>R=sS&gwS62y2by8|&fWHnEZ?*8zTk|1xq!1$TF>p3t>Td^jLGq51&{q;Ii@ z*uq*|r=6~~gBFr4WN-{UyRab%3#Ya*NmnI|K>hau2j~b!D5uvbJ=?xgg#(5?f$_9_ z=d%ysTrveoM7B$ODE^>LKRfWzo@8*9?8yqj5s0WJ?1~=5fHFYl;0`zq`)7x>$U#Gq zM-I(~?;fAJEC}GNBkVDS!HU?oB`F5HD`OUXthAWxuNrx_>8HE_m*%McgR3q^{xKn^U!t-nV?AgY-y*NwpY1(D`Jp`h9-{p_D#C~9>gi93H&&DK z;`1&500D$)LqkwWLqi~Na&Km7Y-Iodc$|HaJxIeq9K~N#ON&%G*g?c0Lv^wsD&i2R|084ld5RI=Bjg;0K74qm!bGl=#1-&?3fz<9@um z_qclp2(21Z&Atgh)hr{EOo;iysu+Al01<=`hEHOqp2{xf;5okT;p6LFoM(BT`*RE^ zMUw$Ok$8^jhDE$VJhN%(ocD>NtRgAI=fvX%U6A;Z>$1yloXZXiJTq$KGV{byVzJ!A zau2hLp%PCM#}rkgd?D|$!g-6cT5GV*J^2g6MQtU^b($kcVhJgvAwot2Rn%Z1POC=Ip6A0p79190> z5K!a>>(GFkN9J=7OQknlLjNp%mzK7Wr};g}8z)H;bXj}oxO#vdpaOAblUzZ zxCs}OJ7GBnQxA** zws}yF!PEm|fNdVc5B9U?*c?iOAOPnaQc4V67r9b6Im)nHF?f^~zO>p6%Q2XEP#Zuw z1``hkHiHpDDm@^6`fW_PQq4*zgn;k+;G7o?%A>S$6+$#C;jRs=5rFl)&Kwi07*qoM6N<$f}&1L(f|Me diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_mag_flash.rsi/mag-2.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_mag_flash.rsi/mag-2.png deleted file mode 100644 index 6a97e07ec724e8a7a15353d5e31c64898cc48923..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2299 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 diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_mag_flash.rsi/mag-4.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_mag_flash.rsi/mag-4.png deleted file mode 100644 index 68d8fc44ef7d540b37ab5b317eceb746168c2067..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2298 zcmV zaB^>EX>4U6ba`-PAZ2)IW&i+q+U-|SmgFW3{O1%of{_q{;|LJ%sfJN0noe8Rwi za9+`6sAmol9QX^3Hy?Gf$XU$Vt%>P2yA5SgF(G zfS|;gH)-O|3y2U;Ajc5X)0TYB+haaV)-dzR7)cq*0>76teH8rc`J!m=Nb{VJ_KX$m zqR20p5y-_IqX0ixxqm@#-(CNe#1m#phn zfDmDBfianZz)_Ljx#mNOG-t%I0Uv|q#DxYB$dZH>tfazR0ZyZs8~@RKjwPW>40-_& z!j%=!bT)uhij<0aYe*qW!cs(}ib|6%R=JicwN|acQ>Ls%MXRbd?P`r%Y0_%b)>?1Y zsWWIyQm%E&{QY!{shVcf$puwXI8FlDrqYs-%pIN5NI(4?$r!88%KmlphrK_#J z%(EkvytsIE_2%7eBiAA?6#Kmd}h!zaTv9IxTIhb$HS6h-a;3ZRsvseO1&M%BPW*g)&tz zOJN7a?LJ`NP*k#Lm%R%2wAV(3qO{9E>2B6FyDb^ZRunxL0AZL?x2R39C6;?o%96%l zL(!E*c8C%p9g>W=e5p;Jz5wO>ig|s(ay;YBumM(DG7WoKS!M#uM)ru+Y7wJGXN(XK zn!pEHF&6+scMV%x$L{14zFFHKxs%}FQwg68uDOAbH!S+PThXRZUg(4qTQVM2_z4Qd z&PuKZ{nMjS>GX?Nu4B5Tp*{{kkFz4-mFrl@RjxLDV;vytf{0A`F2^j0gq@igTm1KJ z`Y8B`cDPCen=HCJv$+t!09vrWv9v9ytAI?$3_myW#c1ht$BG@vx;pkk+EKj8QFV&4 zoId)*?s0c%UM&0%R51_tu;hits#t8qmAn+}t z$dEc%hnKUu4KTu5WBJB>;+W z7T0N~Ywe(gWD6M_L(eX3NW#LYZA{Wt2_sPdy}$uFf)UE;HA>I6uTBa=*s`NFCgd_@2egb;>LVy2$TF6Q7lzV6}U>s_2@d7t}p3@AmD z0X~st?f%Ws^^4huXpYUDEW#8G0g+{1DY zvx=b-PZP%!Rik_%@3O*qi?dp5u+BaC3&TZiCChc1BS>NiDWoAnMgvvUU?EPcMv93H z?I%3^!;U{qE}2|aFmf!Q4i%E)2mgcL-I}GTNjE8+00J+z{V@szcY$`(w!e>UyL|%q zpMfi_>#w(f*-z4&T`hJ5M7Dv8>#ip60hc?#(3371k|X(P3Z)Y8en#I^00wV?{x!F^ z&OS~bfE;zTd;=UD0%K*$UiWx+sJFL&&vg3x0r22*bMCWb0RR9124YJ`L;(K){{a7> zy{D4^000SaNLh0L04^f{04^f|c%?sf00007bV*G`2jm402n-ltNb2wa00C}EL_t(o z!|j$oOT;i3hkudVLT?k&!8o`G1rdada>H$Yhi*4?m(xY$#+JjcAoLRm;$9pB2XYWl zKo8IZbPg~u`FK7X6{p9* z%WL)B$t!_{=!{wlZ$ z7v;T83`PKy(#kV^McBk(1n`%=UU%0mZbV@e{qw+O4C4tW{zYo-K`lF>9)qa|#sJ$q z&|@(5z!+eg2l0db>=Bzosqgy`LO>~nq2pkkWjHxXi{*+Fm$A~9R=c4dgNX;V0q8N9 zcrdUTj8aSAOZLf0JA(V zS1UO$y9~6tLErA7C4>PGSWm)gCFj-8R&m>FAYYIJeu)qmrpXP#yaMfe84K$#0Az@w zi1}0s8F>iu=s0*A40v+`;M9Pss^jDU(CKtw+cp5eb=~O#P)Y^cwxKA>_-|d;#luw^ z&;33mLaG=jSYwswQv#34I zVP(mID_x^l&f>Vf!>ohIx?$Me5E+2K4BfjP^LJeBcx0b9i`d@0007u{1&{`94t*!h z7JxK!EbbN1b=^}G1*)n77&a)0kib>fbtWA!&jWtbG>s`ZrS#YNAQV897W+(?0K^XP Y1=U81Quw7k@Bjb+07*qoM6N<$f=ad1_5c6? diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_mag_hv.rsi/mag-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_mag_hv.rsi/mag-1.png deleted file mode 100644 index 4bfdd096ef916cd87b42d9d229ca7f4f1dd7c3cf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2298 zcmV zaB^>EX>4U6ba`-PAZ2)IW&i+q+U-|SmgFc7{O1&N1S25?#}Odj+Z*ihCuBRbDsyYM zd%F5(=Z&2#47G|&BWJbxCHmif`OUa`AoRWIr1%j=^45&0{DD-i{J6E zj6cG0DSEh7-{N%3v%JaqISsv7l<7G$eYVK!p~vUrQ~dT`ZEwH4vr-enRd1&ruAEO8 zI1o-g|5lGsSpj!L8)wJa4m&1LTX1!xW1!PBA>uoiyt3t;{cLBRFtL!6q9vNdr>wD3 zr^x|9i8F7~#GMxqA)Y{vA*QD-`JA`Me3-0Z=9Mv$GL!{=FK2oe{Ob9lXzxh#oR9X5 z73`wO8kiBt#T}ynNZxl$<&1AmS981{0W1SSIm6uGpdI5VXgqDQOu41Xg(O(~i zI+4H(h*8NvTmu0lGzDfy%cW2t7nmKLI5Bt&R!V@gav%l-i)WIZpV)mM_g`^Ki0)s- zjlM!I1$4gyxfIZSLhe6t`vSFPC*AT1P*fpe3Wj8q-!6wy!|(XjHhovYKZ^eE6d|o> zbRSE1LNP4bij2-)*|AliF`EsfxwC2S%4@H+r(#*n$a}7C;AF)PZSG#AjxD}D;Ud~q zy?%b1&zJEo``mMGJ3I_A-`I+LWnB6V;bGTlXkF3S8E=LSu+oxg*vrZ?6IeE~N32$h7&SU$ zgn-ZlKFEr>02sP!*xEXFC!g@m+6Kv;1P7l=_+)U+4TQX5(f8eoHhu9zC!E-l@vy>A zP$+g*ay96m9*s(;U%YZ1(=844aR7Rp6$!6g$3m`hwdot{09hAAWWskjWXAX^i8+!cJ~AbMh&NsaFB#|zHl2O{M&-S zw~Qh~>R=sS&gwS62y2by8|&fWHnEZ?*8zTk|1xq!1$TF>p3t>Td^jLGq51&{q;Ii@ z*uq*|r=6~~gBFr4WN-{UyRab%3#Ya*NmnI|K>hau2j~b!D5uvbJ=?xgg#(5?f$_9_ z=d%ysTrveoM7B$ODE^>LKRfWzo@8*9?8yqj5s0WJ?1~=5fHFYl;0`zq`)7x>$U#Gq zM-I(~?;fAJEC}GNBkVDS!HU?oB`F5HD`OUXthAWxuNrx_>8HE_m*%McgR3q^{xKn^U!t-nV?AgY-y*NwpY1(D`Jp`h9-{p_D#C~9>gi93H&&DK z;`1&500D$)LqkwWLqi~Na&Km7Y-Iodc$|HaJxIeq9K~N#ON&%G*g?c0Lv^wsD&i2R|084ld5RI=Bjg;0K74qm!bGl=#1-&?3fz<9@um z_qclp2(21Z&Atgh)hr{EOo;iysu+Al01<=`hEHOqp2{xf;5okT;p6LFoM(BT`*RE^ zMUw$Ok$8^jhDE$VJhN%(ocD>NtRgAI=fvX%U6A;Z>$1yloXZXiJTq$KGV{byVzJ!A zau2hLp%PCM#}rkgd?D|$!g-6cT5GV*J^2g6MQtU^b($kcVhJgvAwot2Rn%Z1POC=Ip6A0p79190> z5K!a>>(GFkN9J=7OQknlLjNp%mzK7Wr};g}8z)H;bXj}oxO#vdpaOAblUzZ zxCs}OJ7GBnQxA** zws}yF!PEm|fNdVc5B9U?*c?iOAOPnaQc4V67r9b6Im)nHF?f^~zO>p6%Q2XEP#Zuw z1``hkHiHpDDm@^6`fW_PQq4*zgn;k+;G7o?%A>S$6+$#C;jRs=5rFl)&Kwi07*qoM6N<$f}&1L(f|Me diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_mag_hv.rsi/mag-2.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_mag_hv.rsi/mag-2.png deleted file mode 100644 index 6a97e07ec724e8a7a15353d5e31c64898cc48923..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2299 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 diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_mag_hv.rsi/mag-4.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_mag_hv.rsi/mag-4.png deleted file mode 100644 index 68d8fc44ef7d540b37ab5b317eceb746168c2067..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2298 zcmV zaB^>EX>4U6ba`-PAZ2)IW&i+q+U-|SmgFW3{O1%of{_q{;|LJ%sfJN0noe8Rwi za9+`6sAmol9QX^3Hy?Gf$XU$Vt%>P2yA5SgF(G zfS|;gH)-O|3y2U;Ajc5X)0TYB+haaV)-dzR7)cq*0>76teH8rc`J!m=Nb{VJ_KX$m zqR20p5y-_IqX0ixxqm@#-(CNe#1m#phn zfDmDBfianZz)_Ljx#mNOG-t%I0Uv|q#DxYB$dZH>tfazR0ZyZs8~@RKjwPW>40-_& z!j%=!bT)uhij<0aYe*qW!cs(}ib|6%R=JicwN|acQ>Ls%MXRbd?P`r%Y0_%b)>?1Y zsWWIyQm%E&{QY!{shVcf$puwXI8FlDrqYs-%pIN5NI(4?$r!88%KmlphrK_#J z%(EkvytsIE_2%7eBiAA?6#Kmd}h!zaTv9IxTIhb$HS6h-a;3ZRsvseO1&M%BPW*g)&tz zOJN7a?LJ`NP*k#Lm%R%2wAV(3qO{9E>2B6FyDb^ZRunxL0AZL?x2R39C6;?o%96%l zL(!E*c8C%p9g>W=e5p;Jz5wO>ig|s(ay;YBumM(DG7WoKS!M#uM)ru+Y7wJGXN(XK zn!pEHF&6+scMV%x$L{14zFFHKxs%}FQwg68uDOAbH!S+PThXRZUg(4qTQVM2_z4Qd z&PuKZ{nMjS>GX?Nu4B5Tp*{{kkFz4-mFrl@RjxLDV;vytf{0A`F2^j0gq@igTm1KJ z`Y8B`cDPCen=HCJv$+t!09vrWv9v9ytAI?$3_myW#c1ht$BG@vx;pkk+EKj8QFV&4 zoId)*?s0c%UM&0%R51_tu;hits#t8qmAn+}t z$dEc%hnKUu4KTu5WBJB>;+W z7T0N~Ywe(gWD6M_L(eX3NW#LYZA{Wt2_sPdy}$uFf)UE;HA>I6uTBa=*s`NFCgd_@2egb;>LVy2$TF6Q7lzV6}U>s_2@d7t}p3@AmD z0X~st?f%Ws^^4huXpYUDEW#8G0g+{1DY zvx=b-PZP%!Rik_%@3O*qi?dp5u+BaC3&TZiCChc1BS>NiDWoAnMgvvUU?EPcMv93H z?I%3^!;U{qE}2|aFmf!Q4i%E)2mgcL-I}GTNjE8+00J+z{V@szcY$`(w!e>UyL|%q zpMfi_>#w(f*-z4&T`hJ5M7Dv8>#ip60hc?#(3371k|X(P3Z)Y8en#I^00wV?{x!F^ z&OS~bfE;zTd;=UD0%K*$UiWx+sJFL&&vg3x0r22*bMCWb0RR9124YJ`L;(K){{a7> zy{D4^000SaNLh0L04^f{04^f|c%?sf00007bV*G`2jm402n-ltNb2wa00C}EL_t(o z!|j$oOT;i3hkudVLT?k&!8o`G1rdada>H$Yhi*4?m(xY$#+JjcAoLRm;$9pB2XYWl zKo8IZbPg~u`FK7X6{p9* z%WL)B$t!_{=!{wlZ$ z7v;T83`PKy(#kV^McBk(1n`%=UU%0mZbV@e{qw+O4C4tW{zYo-K`lF>9)qa|#sJ$q z&|@(5z!+eg2l0db>=Bzosqgy`LO>~nq2pkkWjHxXi{*+Fm$A~9R=c4dgNX;V0q8N9 zcrdUTj8ax2%1^bUT;OZ_twtwO&G5`wiPS|c$tGvf&jkn0|25ZnlAujO!0jmrfE+9Hi{xVUM%5x zID|$B4w}t)ZU8^UvD2I0%g7)EpsH%>S#m|l$RGsprF}9^4~28e130ex%?BDGs5Nxh z+o7}%GT8}}GKl&>7+{tUk}`<;Kp0?_4_H@pmOlVEuB+&STXc_hv9tV+PTj!Ubp>li zh|SUnow|X`_8zwnGV6x2t06Ohqzr@C5AN@{yJ0dYrSWfOV~lZiM&SxjN@LSBVObV{ zNrTb|NnI(WTt1MhfNk4clk-$T3LwkK{Y+Q@Vd00000NkvXXu0mjf D1zg4L diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_mag_practice.rsi/mag-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_mag_practice.rsi/mag-1.png deleted file mode 100644 index 4bfdd096ef916cd87b42d9d229ca7f4f1dd7c3cf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2298 zcmV zaB^>EX>4U6ba`-PAZ2)IW&i+q+U-|SmgFc7{O1&N1S25?#}Odj+Z*ihCuBRbDsyYM zd%F5(=Z&2#47G|&BWJbxCHmif`OUa`AoRWIr1%j=^45&0{DD-i{J6E zj6cG0DSEh7-{N%3v%JaqISsv7l<7G$eYVK!p~vUrQ~dT`ZEwH4vr-enRd1&ruAEO8 zI1o-g|5lGsSpj!L8)wJa4m&1LTX1!xW1!PBA>uoiyt3t;{cLBRFtL!6q9vNdr>wD3 zr^x|9i8F7~#GMxqA)Y{vA*QD-`JA`Me3-0Z=9Mv$GL!{=FK2oe{Ob9lXzxh#oR9X5 z73`wO8kiBt#T}ynNZxl$<&1AmS981{0W1SSIm6uGpdI5VXgqDQOu41Xg(O(~i zI+4H(h*8NvTmu0lGzDfy%cW2t7nmKLI5Bt&R!V@gav%l-i)WIZpV)mM_g`^Ki0)s- zjlM!I1$4gyxfIZSLhe6t`vSFPC*AT1P*fpe3Wj8q-!6wy!|(XjHhovYKZ^eE6d|o> zbRSE1LNP4bij2-)*|AliF`EsfxwC2S%4@H+r(#*n$a}7C;AF)PZSG#AjxD}D;Ud~q zy?%b1&zJEo``mMGJ3I_A-`I+LWnB6V;bGTlXkF3S8E=LSu+oxg*vrZ?6IeE~N32$h7&SU$ zgn-ZlKFEr>02sP!*xEXFC!g@m+6Kv;1P7l=_+)U+4TQX5(f8eoHhu9zC!E-l@vy>A zP$+g*ay96m9*s(;U%YZ1(=844aR7Rp6$!6g$3m`hwdot{09hAAWWskjWXAX^i8+!cJ~AbMh&NsaFB#|zHl2O{M&-S zw~Qh~>R=sS&gwS62y2by8|&fWHnEZ?*8zTk|1xq!1$TF>p3t>Td^jLGq51&{q;Ii@ z*uq*|r=6~~gBFr4WN-{UyRab%3#Ya*NmnI|K>hau2j~b!D5uvbJ=?xgg#(5?f$_9_ z=d%ysTrveoM7B$ODE^>LKRfWzo@8*9?8yqj5s0WJ?1~=5fHFYl;0`zq`)7x>$U#Gq zM-I(~?;fAJEC}GNBkVDS!HU?oB`F5HD`OUXthAWxuNrx_>8HE_m*%McgR3q^{xKn^U!t-nV?AgY-y*NwpY1(D`Jp`h9-{p_D#C~9>gi93H&&DK z;`1&500D$)LqkwWLqi~Na&Km7Y-Iodc$|HaJxIeq9K~N#ON&%G*g?c0Lv^wsD&i2R|084ld5RI=Bjg;0K74qm!bGl=#1-&?3fz<9@um z_qclp2(21Z&Atgh)hr{EOo;iysu+Al01<=`hEHOqp2{xf;5okT;p6LFoM(BT`*RE^ zMUw$Ok$8^jhDE$VJhN%(ocD>NtRgAI=fvX%U6A;Z>$1yloXZXiJTq$KGV{byVzJ!A zau2hLp%PCM#}rkgd?D|$!g-6cT5GV*J^2g6MQtU^b($kcVhJgvAwot2Rn%Z1POC=Ip6A0p79190> z5K!a>>(GFkN9J=7OQknlLjNp%mzK7Wr};g}8z)H;bXj}oxO#vdpaOAblUzZ zxCs}OJ7GBnQxA** zws}yF!PEm|fNdVc5B9U?*c?iOAOPnaQc4V67r9b6Im)nHF?f^~zO>p6%Q2XEP#Zuw z1``hkHiHpDDm@^6`fW_PQq4*zgn;k+;G7o?%A>S$6+$#C;jRs=5rFl)&Kwi07*qoM6N<$f}&1L(f|Me diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_mag_practice.rsi/mag-2.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_mag_practice.rsi/mag-2.png deleted file mode 100644 index 6a97e07ec724e8a7a15353d5e31c64898cc48923..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2299 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 diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_mag_practice.rsi/mag-4.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_mag_practice.rsi/mag-4.png deleted file mode 100644 index 68d8fc44ef7d540b37ab5b317eceb746168c2067..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2298 zcmV zaB^>EX>4U6ba`-PAZ2)IW&i+q+U-|SmgFW3{O1%of{_q{;|LJ%sfJN0noe8Rwi za9+`6sAmol9QX^3Hy?Gf$XU$Vt%>P2yA5SgF(G zfS|;gH)-O|3y2U;Ajc5X)0TYB+haaV)-dzR7)cq*0>76teH8rc`J!m=Nb{VJ_KX$m zqR20p5y-_IqX0ixxqm@#-(CNe#1m#phn zfDmDBfianZz)_Ljx#mNOG-t%I0Uv|q#DxYB$dZH>tfazR0ZyZs8~@RKjwPW>40-_& z!j%=!bT)uhij<0aYe*qW!cs(}ib|6%R=JicwN|acQ>Ls%MXRbd?P`r%Y0_%b)>?1Y zsWWIyQm%E&{QY!{shVcf$puwXI8FlDrqYs-%pIN5NI(4?$r!88%KmlphrK_#J z%(EkvytsIE_2%7eBiAA?6#Kmd}h!zaTv9IxTIhb$HS6h-a;3ZRsvseO1&M%BPW*g)&tz zOJN7a?LJ`NP*k#Lm%R%2wAV(3qO{9E>2B6FyDb^ZRunxL0AZL?x2R39C6;?o%96%l zL(!E*c8C%p9g>W=e5p;Jz5wO>ig|s(ay;YBumM(DG7WoKS!M#uM)ru+Y7wJGXN(XK zn!pEHF&6+scMV%x$L{14zFFHKxs%}FQwg68uDOAbH!S+PThXRZUg(4qTQVM2_z4Qd z&PuKZ{nMjS>GX?Nu4B5Tp*{{kkFz4-mFrl@RjxLDV;vytf{0A`F2^j0gq@igTm1KJ z`Y8B`cDPCen=HCJv$+t!09vrWv9v9ytAI?$3_myW#c1ht$BG@vx;pkk+EKj8QFV&4 zoId)*?s0c%UM&0%R51_tu;hits#t8qmAn+}t z$dEc%hnKUu4KTu5WBJB>;+W z7T0N~Ywe(gWD6M_L(eX3NW#LYZA{Wt2_sPdy}$uFf)UE;HA>I6uTBa=*s`NFCgd_@2egb;>LVy2$TF6Q7lzV6}U>s_2@d7t}p3@AmD z0X~st?f%Ws^^4huXpYUDEW#8G0g+{1DY zvx=b-PZP%!Rik_%@3O*qi?dp5u+BaC3&TZiCChc1BS>NiDWoAnMgvvUU?EPcMv93H z?I%3^!;U{qE}2|aFmf!Q4i%E)2mgcL-I}GTNjE8+00J+z{V@szcY$`(w!e>UyL|%q zpMfi_>#w(f*-z4&T`hJ5M7Dv8>#ip60hc?#(3371k|X(P3Z)Y8en#I^00wV?{x!F^ z&OS~bfE;zTd;=UD0%K*$UiWx+sJFL&&vg3x0r22*bMCWb0RR9124YJ`L;(K){{a7> zy{D4^000SaNLh0L04^f{04^f|c%?sf00007bV*G`2jm402n-ltNb2wa00C}EL_t(o z!|j$oOT;i3hkudVLT?k&!8o`G1rdada>H$Yhi*4?m(xY$#+JjcAoLRm;$9pB2XYWl zKo8IZbPg~u`FK7X6{p9* z%WL)B$t!_{=!{wlZ$ z7v;T83`PKy(#kV^McBk(1n`%=UU%0mZbV@e{qw+O4C4tW{zYo-K`lF>9)qa|#sJ$q z&|@(5z!+eg2l0db>=Bzosqgy`LO>~nq2pkkWjHxXi{*+Fm$A~9R=c4dgNX;V0q8N9 zcrdUTj8a6KvZ?lA201dkT;OqyYZ`Aj9%< zt&;awmVul5=-AGIE${#cw4Jb4$@}Lgt9X34Mxm%g#$`fKHBDv+>KV9wQn0xG4nTn@ zikOxpEGPqzmu3?muFIMm0HX&qO$(9(K%>!s<2V2S&+{e=U|E*nI1W@*4gS{iJUm~` z;;qwxObE)Ql0Pwk-?U%74(@r%zyu(QV&qwPMevk?31C?Junu>bbMgaJO>@KtG9f4w z73dpHZXd+b3BzSz^#L=$I3I+|!0H2LfN?&s&RC=Th`JSrwY7KZ&*hfjzV?w3dvMz> za@k|t^|v9-OZf6;a8zESYRj?hhP;a{ea7ax~@|Nw=C;VBXR-6sl?BODL~=?-~9TE U^>}XNp8x;=07*qoM6N<$f}tJLssI20 diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_mag_rubber.rsi/mag-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_mag_rubber.rsi/mag-1.png deleted file mode 100644 index 4bfdd096ef916cd87b42d9d229ca7f4f1dd7c3cf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2298 zcmV zaB^>EX>4U6ba`-PAZ2)IW&i+q+U-|SmgFc7{O1&N1S25?#}Odj+Z*ihCuBRbDsyYM zd%F5(=Z&2#47G|&BWJbxCHmif`OUa`AoRWIr1%j=^45&0{DD-i{J6E zj6cG0DSEh7-{N%3v%JaqISsv7l<7G$eYVK!p~vUrQ~dT`ZEwH4vr-enRd1&ruAEO8 zI1o-g|5lGsSpj!L8)wJa4m&1LTX1!xW1!PBA>uoiyt3t;{cLBRFtL!6q9vNdr>wD3 zr^x|9i8F7~#GMxqA)Y{vA*QD-`JA`Me3-0Z=9Mv$GL!{=FK2oe{Ob9lXzxh#oR9X5 z73`wO8kiBt#T}ynNZxl$<&1AmS981{0W1SSIm6uGpdI5VXgqDQOu41Xg(O(~i zI+4H(h*8NvTmu0lGzDfy%cW2t7nmKLI5Bt&R!V@gav%l-i)WIZpV)mM_g`^Ki0)s- zjlM!I1$4gyxfIZSLhe6t`vSFPC*AT1P*fpe3Wj8q-!6wy!|(XjHhovYKZ^eE6d|o> zbRSE1LNP4bij2-)*|AliF`EsfxwC2S%4@H+r(#*n$a}7C;AF)PZSG#AjxD}D;Ud~q zy?%b1&zJEo``mMGJ3I_A-`I+LWnB6V;bGTlXkF3S8E=LSu+oxg*vrZ?6IeE~N32$h7&SU$ zgn-ZlKFEr>02sP!*xEXFC!g@m+6Kv;1P7l=_+)U+4TQX5(f8eoHhu9zC!E-l@vy>A zP$+g*ay96m9*s(;U%YZ1(=844aR7Rp6$!6g$3m`hwdot{09hAAWWskjWXAX^i8+!cJ~AbMh&NsaFB#|zHl2O{M&-S zw~Qh~>R=sS&gwS62y2by8|&fWHnEZ?*8zTk|1xq!1$TF>p3t>Td^jLGq51&{q;Ii@ z*uq*|r=6~~gBFr4WN-{UyRab%3#Ya*NmnI|K>hau2j~b!D5uvbJ=?xgg#(5?f$_9_ z=d%ysTrveoM7B$ODE^>LKRfWzo@8*9?8yqj5s0WJ?1~=5fHFYl;0`zq`)7x>$U#Gq zM-I(~?;fAJEC}GNBkVDS!HU?oB`F5HD`OUXthAWxuNrx_>8HE_m*%McgR3q^{xKn^U!t-nV?AgY-y*NwpY1(D`Jp`h9-{p_D#C~9>gi93H&&DK z;`1&500D$)LqkwWLqi~Na&Km7Y-Iodc$|HaJxIeq9K~N#ON&%G*g?c0Lv^wsD&i2R|084ld5RI=Bjg;0K74qm!bGl=#1-&?3fz<9@um z_qclp2(21Z&Atgh)hr{EOo;iysu+Al01<=`hEHOqp2{xf;5okT;p6LFoM(BT`*RE^ zMUw$Ok$8^jhDE$VJhN%(ocD>NtRgAI=fvX%U6A;Z>$1yloXZXiJTq$KGV{byVzJ!A zau2hLp%PCM#}rkgd?D|$!g-6cT5GV*J^2g6MQtU^b($kcVhJgvAwot2Rn%Z1POC=Ip6A0p79190> z5K!a>>(GFkN9J=7OQknlLjNp%mzK7Wr};g}8z)H;bXj}oxO#vdpaOAblUzZ zxCs}OJ7GBnQxA** zws}yF!PEm|fNdVc5B9U?*c?iOAOPnaQc4V67r9b6Im)nHF?f^~zO>p6%Q2XEP#Zuw z1``hkHiHpDDm@^6`fW_PQq4*zgn;k+;G7o?%A>S$6+$#C;jRs=5rFl)&Kwi07*qoM6N<$f}&1L(f|Me diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_mag_rubber.rsi/mag-2.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_mag_rubber.rsi/mag-2.png deleted file mode 100644 index 6a97e07ec724e8a7a15353d5e31c64898cc48923..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2299 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 diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_mag_rubber.rsi/mag-4.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_mag_rubber.rsi/mag-4.png deleted file mode 100644 index 68d8fc44ef7d540b37ab5b317eceb746168c2067..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2298 zcmV zaB^>EX>4U6ba`-PAZ2)IW&i+q+U-|SmgFW3{O1%of{_q{;|LJ%sfJN0noe8Rwi za9+`6sAmol9QX^3Hy?Gf$XU$Vt%>P2yA5SgF(G zfS|;gH)-O|3y2U;Ajc5X)0TYB+haaV)-dzR7)cq*0>76teH8rc`J!m=Nb{VJ_KX$m zqR20p5y-_IqX0ixxqm@#-(CNe#1m#phn zfDmDBfianZz)_Ljx#mNOG-t%I0Uv|q#DxYB$dZH>tfazR0ZyZs8~@RKjwPW>40-_& z!j%=!bT)uhij<0aYe*qW!cs(}ib|6%R=JicwN|acQ>Ls%MXRbd?P`r%Y0_%b)>?1Y zsWWIyQm%E&{QY!{shVcf$puwXI8FlDrqYs-%pIN5NI(4?$r!88%KmlphrK_#J z%(EkvytsIE_2%7eBiAA?6#Kmd}h!zaTv9IxTIhb$HS6h-a;3ZRsvseO1&M%BPW*g)&tz zOJN7a?LJ`NP*k#Lm%R%2wAV(3qO{9E>2B6FyDb^ZRunxL0AZL?x2R39C6;?o%96%l zL(!E*c8C%p9g>W=e5p;Jz5wO>ig|s(ay;YBumM(DG7WoKS!M#uM)ru+Y7wJGXN(XK zn!pEHF&6+scMV%x$L{14zFFHKxs%}FQwg68uDOAbH!S+PThXRZUg(4qTQVM2_z4Qd z&PuKZ{nMjS>GX?Nu4B5Tp*{{kkFz4-mFrl@RjxLDV;vytf{0A`F2^j0gq@igTm1KJ z`Y8B`cDPCen=HCJv$+t!09vrWv9v9ytAI?$3_myW#c1ht$BG@vx;pkk+EKj8QFV&4 zoId)*?s0c%UM&0%R51_tu;hits#t8qmAn+}t z$dEc%hnKUu4KTu5WBJB>;+W z7T0N~Ywe(gWD6M_L(eX3NW#LYZA{Wt2_sPdy}$uFf)UE;HA>I6uTBa=*s`NFCgd_@2egb;>LVy2$TF6Q7lzV6}U>s_2@d7t}p3@AmD z0X~st?f%Ws^^4huXpYUDEW#8G0g+{1DY zvx=b-PZP%!Rik_%@3O*qi?dp5u+BaC3&TZiCChc1BS>NiDWoAnMgvvUU?EPcMv93H z?I%3^!;U{qE}2|aFmf!Q4i%E)2mgcL-I}GTNjE8+00J+z{V@szcY$`(w!e>UyL|%q zpMfi_>#w(f*-z4&T`hJ5M7Dv8>#ip60hc?#(3371k|X(P3Z)Y8en#I^00wV?{x!F^ z&OS~bfE;zTd;=UD0%K*$UiWx+sJFL&&vg3x0r22*bMCWb0RR9124YJ`L;(K){{a7> zy{D4^000SaNLh0L04^f{04^f|c%?sf00007bV*G`2jm402n-ltNb2wa00C}EL_t(o z!|j$oOT;i3hkudVLT?k&!8o`G1rdada>H$Yhi*4?m(xY$#+JjcAoLRm;$9pB2XYWl zKo8IZbPg~u`FK7X6{p9* z%WL)B$t!_{=!{wlZ$ z7v;T83`PKy(#kV^McBk(1n`%=UU%0mZbV@e{qw+O4C4tW{zYo-K`lF>9)qa|#sJ$q z&|@(5z!+eg2l0db>=Bzosqgy`LO>~nq2pkkWjHxXi{*+Fm$A~9R=c4dgNX;V0q8N9 zcrdUTj8a0=fc_Bmn`DC69kFFtpRar~{}0$gT~s0dndBvTH;1TyW#YO>&GP&jA`5 z>J%416gj}o+JYf9C3fH(fUPZX=;#TCS#uYX+$;cRz|afs=`5pxccR0wLsK8dY(HGT@dmSsb(0SJnu=vd zHY{R_d?L`iVhQizClQyFdNIP4sFCF#1~{U*ohaeNhj|44=v7QJHHlcdU1| zMKQabfr&H2Z2x%s`ePfCj@nF`{nXi*MMA>Bxl!i6u>lbD{kUhy&`=e0$i3rb0x&Qc NJYD@<);T3K0RXwZlV1P; 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 8b190de6f1..977631eeed 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 @@ -8,10 +8,19 @@ "copyright": "https://github.com/discordia-space/CEV-Eris/raw/831c7c2743530e8a31910d781bae9dc34f3f1ec8/icons/obj/ammo_mags.dmi", "states": [ { - "name": "icon" + "name": "base" }, { - "name": "base" + "name": "high_velocity" + }, + { + "name": "practice" + }, + { + "name": "red" + }, + { + "name": "rubber" }, { "name": "mag-1" diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag_practice.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/practice.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag_practice.rsi/base.png rename to Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/practice.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/red.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/red.png new file mode 100644 index 0000000000000000000000000000000000000000..2cda90438898d6fc7977489d540607baf8ebbfb3 GIT binary patch literal 350 zcmV-k0iphhP)q5hDE!>Qn*ZcDf-DETe*TQ% z_48*aVxp2#t1rE*N#d z&~|{GwFQHnwFN~EAUhY_xN(!=#*Ld81rpsHK&izPIl%qLO9tQ9sIkX?@eRWVokEh$ z8rq4F8i1@Q*vTQz@K6-B*tOHQV9=$P1JG+i7$B!EAiFk1&jmMb+$6^+@*JR{p-yoD zM3DpRtSuN)Q(_0s0od9ChmM|Lm^F7H$<4B%nGLZexEnWa;>;cRz|afOV literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag_rubber.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/rubber.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag_rubber.rsi/base.png rename to Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag.rsi/rubber.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag_base.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag_base.rsi/base.png deleted file mode 100644 index 5bf9ecc11e4519eace281643f5999a56852fb607..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 314 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=hEVFfw|&IEGZrNwz6?z;M`sX&K|z zS_6xQRvF)&t)~Ak9##9k-Qdz$MjjxLl6s}_=gy&7|DRYi>9Fsq``7dE>*sWhq(zg0 zo=CXPV|GzpDsgGj?9!AX*Sb1WR?*$sd|#;PlG=DI$ulh1f6^dw3TTqtXpyOp&W zh+X*EzV%n7L{3WK~@iE_` z9;Ne)Ku3s(JBU~wICrZ_(NwkUflR|%-GUb{INKtN#V6g-k)E}aA-ZXI;bXOPcN+P5 z&I%lOcKQ1G`G#vE4Evv?{k*`#$i{XiK;igzkdJzl_m%T7R3Gt})MfTY8W<)Fp00i_ I>zopr0NB5Mod5s; diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag_base.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag_base.rsi/icon.png deleted file mode 100644 index c89015bedbd8b0b6764d5f265ed4eb6139b59123..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 337 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 diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag_base.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag_base.rsi/meta.json deleted file mode 100644 index 8b190de6f1..0000000000 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag_base.rsi/meta.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/831c7c2743530e8a31910d781bae9dc34f3f1ec8/icons/obj/ammo_mags.dmi", - "states": [ - { - "name": "icon" - }, - { - "name": "base" - }, - { - "name": "mag-1" - } - ] -} \ No newline at end of file diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag_hv.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag_hv.rsi/icon.png deleted file mode 100644 index 58b995360c4b2f2fae196d90df0b0b6a5df19d2e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 369 zcmV-%0gnEOP)(hC0Os5Je8Kv$kMJO(CQ8K`jShYYQAYdV*or+=c%q_qUMLEE}5H5L<$~ zapNY=+<^}a%@Dxm)7Q_RF|1fIkK|_g& zaB^>EX>4U6ba`-PAZ2)IW&i+q+O1b>dLt#+Z*ihw}7_eIGM>z zoNn7Zng*$=B(R(R{cG+YT*Q=J6wRrmImgcqcs*lUaYa*u8AFj45*9$d0xO07}U(?>) zdTK`n7(*~0lcULj{r;u15}$9ySMW<5*FfAAV|4e2kNCMebe{ltuRY=CZd>t3Sw7Ki`+3cNPV@uS`!CW&e0R;Ab|n**xCWm>l3rms2-ab`1j?;N<;U!maoU z>bmcOJNxQ8SQ~J)Ip5GIfq=M$7)GeU!rWyK9VSMaq$r6x@$Sp4RH!e|Ij%bxspGyjLBn37?cfjhJ)3&Gewi|rY+t)vloY<(Vut;I<5%-5!MzM6BrEm z6j(wEUWqgW;F!Trh2=~34GaWvLIYM(WKJL_(^?zvXxL*(=yW5!fC%A)Aju%8f~*)N zCd6BYgsKykC?ZKzvJ|O_Q%sUl(zNnaRo1AYNma8Jt(kMol2g{4bIG+(VWcr}B^52X zlu|1et+8URit!a4jT*Puq@|`Ux6*2de0uECQ`eq*>2=WHffV3I8anbQqs}lPr5UHp zGVASb zx2Sty?jvuXur}&Wx4a2jQ3yBAk)f3;$L+r_ZOx6YQWc}b{k?2yNUJ|pvBaePy5Cuf`nzz&@2icA=n_s zb-+A$S>Yxm!OL*$Rs^}4OL;ZmP}rSbF<2lfXszJ=j-660nA8(G@g(b^0p}YjlcMpO84mlFq8$b+pb8DvCrcL@?JHvfE}EnjKLy&}Rl4O(?IiLA|K#VJmI z$T3z&?P&n23a`=OK}1%D<-dqMXFh`xyHG09~aK3_ffs%t2nt2!;VE23njxQ z({VJ#c34dGY%iE-v4rh1y(n+@Tb{7sfH|v@uv`t;qCC%)!3=*d>d6N=TGe~<=agET zb^24}4o@pjHBQz7rW*e6HwVM956C)?4*Lf2q$E5 zI{162{xoNw?1cbDYQvcbJCvQh2`l%?Jn)|u`)_C%K4rattOAc34pdbG5{&XOZH4<@>wA^%~b zH`1qEfa0tZk0nx&32u!Qh8d-fXtA^wV!4vPl-z&LqK~qKVOGoCLLALENGot~$XFO5 z8B|Xlc|vfiU60cky&ln&Z=RIgD@UwvPJ{!LjpF_Xp6X*7kEX>4Tx0C=2zkv&MmP!xqvQ%glF4t6NwkfAzR5EXHhDi*;)X)CnqVDi#GXws0R zxHt-~1qXi?s}3&Cx;nTDg5VE`lcSTOi|xiA_WmL>ZqU!3o+U?QcR@jJnrEicKj)F$>gel zkz)ZhsE`~#_#gb9ty!F!bdy4HAn;<_AEQ8U7icwX`}^3oTPJ}38Mx9q{#p~5{Up87 z(V|Dd;5Kk^-O=Pd;Bp6uJn51lIg+22P%HxPXY@^ZVCWX;TXW~uKF8?;kfm8I-v9@P zz*vd0*FE0d+da2`d)o8+0bvw!pc)|9yZ`_I24YJ`L;(K){{a7>y{D4^000SaNLh0L z04^f{04^f|c%?sf00007bV*G`2jm493=smTfw*h{00ACJL_t(o!(%*f-~huw0w#t5 z1_SN@7IHLgD0293Wr*M#*-A4!QCP}IHwVBhg#j50SB7)l4*$hs4=~cj0V|#eB9@vG%W&ev3Hn9Bp`)0V>FTJCX2Vej(ANQW))owQ z))w?H2^km|7;fCS$#CPwO$H4O^?`8!r501<0QVm+8GK)(#vcF0Hw+(i3P*DReWG9| zhd9GSQPg7BPTzt-mtGEd{rnkLadPScvTH;1TyW#YP5MQFhK4%D1rS9Ju(P&cNKJ_y zI0s;B3miInf??L&g$$GXTSh=O#FpT0+_;G|cMQJ}z~n+a07*qoM6N<$g2PuYtN;K2 diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag_hv.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag_hv.rsi/meta.json deleted file mode 100644 index 8b190de6f1..0000000000 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag_hv.rsi/meta.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/831c7c2743530e8a31910d781bae9dc34f3f1ec8/icons/obj/ammo_mags.dmi", - "states": [ - { - "name": "icon" - }, - { - "name": "base" - }, - { - "name": "mag-1" - } - ] -} \ No newline at end of file diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag_practice.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag_practice.rsi/icon.png deleted file mode 100644 index 39086e86329bbc571e455cc247ad68ab26cc26fc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 368 zcmV-$0gwKPP)S=1Ed48qF~`uK8BOLN+@D>pClP{>E(de&!1rxC#NnTyEa761vhTo zB*!T79H610PH_Q5kpt|kEf`W$$Y^~~%K_Nh0*8*CV3;*`;s43~EhII|hGsUzmf&vO zxQR1&-~&T51hDz^_48*8D^|=Sxmi9mLx6z+GZe`2Jp%&+1LKJA9RmO(o>3tm+KJ%+ O0000 zaB^>EX>4U6ba`-PAZ2)IW&i+q+O1b>dLt#+Z*ihw}7_eIGM>z zoNn7Zng*$=B(R(R{cG+YT*Q=J6wRrmImgcqcs*lUaYa*u8AFj45*9$d0xO07}U(?>) zdTK`n7(*~0lcULj{r;u15}$9ySMW<5*FfAAV|4e2kNCMebe{ltuRY=CZd>t3Sw7Ki`+3cNPV@uS`!CW&e0R;Ab|n**xCWm>l3rms2-ab`1j?;N<;U!maoU z>bmcOJNxQ8SQ~J)Ip5GIfq=M$7)GeU!rWyK9VSMaq$r6x@$Sp4RH!e|Ij%bxspGyjLBn37?cfjhJ)3&Gewi|rY+t)vloY<(Vut;I<5%-5!MzM6BrEm z6j(wEUWqgW;F!Trh2=~34GaWvLIYM(WKJL_(^?zvXxL*(=yW5!fC%A)Aju%8f~*)N zCd6BYgsKykC?ZKzvJ|O_Q%sUl(zNnaRo1AYNma8Jt(kMol2g{4bIG+(VWcr}B^52X zlu|1et+8URit!a4jT*Puq@|`Ux6*2de0uECQ`eq*>2=WHffV3I8anbQqs}lPr5UHp zGVASb zx2Sty?jvuXur}&Wx4a2jQ3yBAk)f3;$L+r_ZOx6YQWc}b{k?2yNUJ|pvBaePy5Cuf`nzz&@2icA=n_s zb-+A$S>Yxm!OL*$Rs^}4OL;ZmP}rSbF<2lfXszJ=j-660nA8(G@g(b^0p}YjlcMpO84mlFq8$b+pb8DvCrcL@?JHvfE}EnjKLy&}Rl4O(?IiLA|K#VJmI z$T3z&?P&n23a`=OK}1%D<-dqMXFh`xyHG09~aK3_ffs%t2nt2!;VE23njxQ z({VJ#c34dGY%iE-v4rh1y(n+@Tb{7sfH|v@uv`t;qCC%)!3=*d>d6N=TGe~<=agET zb^24}4o@pjHBQz7rW*e6HwVM956C)?4*Lf2q$E5 zI{162{xoNw?1cbDYQvcbJCvQh2`l%?Jn)|u`)_C%K4rattOAc34pdbG5{&XOZH4<@>wA^%~b zH`1qEfa0tZk0nx&32u!Qh8d-fXtA^wV!4vPl-z&LqK~qKVOGoCLLALENGot~$XFO5 z8B|Xlc|vfiU60cky&ln&Z=RIgD@UwvPJ{!LjpF_Xp6X*7kEX>4Tx0C=2zkv&MmP!xqvQ%glF4t6NwkfAzR5EXHhDi*;)X)CnqVDi#GXws0R zxHt-~1qXi?s}3&Cx;nTDg5VE`lcSTOi|xiA_WmL>ZqU!3o+U?QcR@jJnrEicKj)F$>gel zkz)ZhsE`~#_#gb9ty!F!bdy4HAn;<_AEQ8U7icwX`}^3oTPJ}38Mx9q{#p~5{Up87 z(V|Dd;5Kk^-O=Pd;Bp6uJn51lIg+22P%HxPXY@^ZVCWX;TXW~uKF8?;kfm8I-v9@P zz*vd0*FE0d+da2`d)o8+0bvw!pc)|9yZ`_I24YJ`L;(K){{a7>y{D4^000SaNLh0L z04^f{04^f|c%?sf00007bV*G`2jm493=smTfw*h{00ACJL_t(o!(%*f-~huw0w#t5 z1_SN@7IHLgD0293Wr*M#*-A4!QCP}IHwVBhg#j50SB7)l4*$hs4=~cj0V|#eB9@vG%W&ev3Hn9Bp`)0V>FTJCX2Vej(ANQW))owQ z))w?H2^km|7;fCS$#CPwO$H4O^?`8!r501<0QVm+8GK)(#vcF0Hw+(i3P*DReWG9| zhd9GSQPg7BPTzt-mtGEd{rnkLadPScvTH;1TyW#YP5MQFhK4%D1rS9Ju(P&cNKJ_y zI0s;B3miInf??L&g$$GXTSh=O#FpT0+_;G|cMQJ}z~n+a07*qoM6N<$g2PuYtN;K2 diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag_practice.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag_practice.rsi/meta.json deleted file mode 100644 index 8b190de6f1..0000000000 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag_practice.rsi/meta.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/831c7c2743530e8a31910d781bae9dc34f3f1ec8/icons/obj/ammo_mags.dmi", - "states": [ - { - "name": "icon" - }, - { - "name": "base" - }, - { - "name": "mag-1" - } - ] -} \ No newline at end of file diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag_rubber.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag_rubber.rsi/icon.png deleted file mode 100644 index 50c09cc39025b22c1b5e4baacea5c54ea58cd535..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 375 zcmV--0f_#IP)L-aru(WU^pjAfqTI%K@*SKf@|cPF+BD zZHS%=Zrr#@j#1<}Ktn^F;sS^w2iRF#Fr=oC(fXj41F*FP4jnzgFl+9@|C9S$NNSc1 z&1{G*!QHrV6KC$g2Zm+{VDstg=g$~cte8h~vwUcV00RSND3IfO1_lNO#u48;1^^yV VQfGB#K|TNg002ovPDHLkV1krsmn;AP diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag_rubber.rsi/mag-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag_rubber.rsi/mag-1.png deleted file mode 100644 index 54966daa2371c7ec073554e0736efb99e370ff29..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2310 zcmV+h3HkPkP) zaB^>EX>4U6ba`-PAZ2)IW&i+q+O1b>dLt#+Z*ihw}7_eIGM>z zoNn7Zng*$=B(R(R{cG+YT*Q=J6wRrmImgcqcs*lUaYa*u8AFj45*9$d0xO07}U(?>) zdTK`n7(*~0lcULj{r;u15}$9ySMW<5*FfAAV|4e2kNCMebe{ltuRY=CZd>t3Sw7Ki`+3cNPV@uS`!CW&e0R;Ab|n**xCWm>l3rms2-ab`1j?;N<;U!maoU z>bmcOJNxQ8SQ~J)Ip5GIfq=M$7)GeU!rWyK9VSMaq$r6x@$Sp4RH!e|Ij%bxspGyjLBn37?cfjhJ)3&Gewi|rY+t)vloY<(Vut;I<5%-5!MzM6BrEm z6j(wEUWqgW;F!Trh2=~34GaWvLIYM(WKJL_(^?zvXxL*(=yW5!fC%A)Aju%8f~*)N zCd6BYgsKykC?ZKzvJ|O_Q%sUl(zNnaRo1AYNma8Jt(kMol2g{4bIG+(VWcr}B^52X zlu|1et+8URit!a4jT*Puq@|`Ux6*2de0uECQ`eq*>2=WHffV3I8anbQqs}lPr5UHp zGVASb zx2Sty?jvuXur}&Wx4a2jQ3yBAk)f3;$L+r_ZOx6YQWc}b{k?2yNUJ|pvBaePy5Cuf`nzz&@2icA=n_s zb-+A$S>Yxm!OL*$Rs^}4OL;ZmP}rSbF<2lfXszJ=j-660nA8(G@g(b^0p}YjlcMpO84mlFq8$b+pb8DvCrcL@?JHvfE}EnjKLy&}Rl4O(?IiLA|K#VJmI z$T3z&?P&n23a`=OK}1%D<-dqMXFh`xyHG09~aK3_ffs%t2nt2!;VE23njxQ z({VJ#c34dGY%iE-v4rh1y(n+@Tb{7sfH|v@uv`t;qCC%)!3=*d>d6N=TGe~<=agET zb^24}4o@pjHBQz7rW*e6HwVM956C)?4*Lf2q$E5 zI{162{xoNw?1cbDYQvcbJCvQh2`l%?Jn)|u`)_C%K4rattOAc34pdbG5{&XOZH4<@>wA^%~b zH`1qEfa0tZk0nx&32u!Qh8d-fXtA^wV!4vPl-z&LqK~qKVOGoCLLALENGot~$XFO5 z8B|Xlc|vfiU60cky&ln&Z=RIgD@UwvPJ{!LjpF_Xp6X*7kEX>4Tx0C=2zkv&MmP!xqvQ%glF4t6NwkfAzR5EXHhDi*;)X)CnqVDi#GXws0R zxHt-~1qXi?s}3&Cx;nTDg5VE`lcSTOi|xiA_WmL>ZqU!3o+U?QcR@jJnrEicKj)F$>gel zkz)ZhsE`~#_#gb9ty!F!bdy4HAn;<_AEQ8U7icwX`}^3oTPJ}38Mx9q{#p~5{Up87 z(V|Dd;5Kk^-O=Pd;Bp6uJn51lIg+22P%HxPXY@^ZVCWX;TXW~uKF8?;kfm8I-v9@P zz*vd0*FE0d+da2`d)o8+0bvw!pc)|9yZ`_I24YJ`L;(K){{a7>y{D4^000SaNLh0L z04^f{04^f|c%?sf00007bV*G`2jm493=smTfw*h{00ACJL_t(o!(%*f-~huw0w#t5 z1_SN@7IHLgD0293Wr*M#*-A4!QCP}IHwVBhg#j50SB7)l4*$hs4=~cj0V|#eB9@vG%W&ev3Hn9Bp`)0V>FTJCX2Vej(ANQW))owQ z))w?H2^km|7;fCS$#CPwO$H4O^?`8!r501<0QVm+8GK)(#vcF0Hw+(i3P*DReWG9| zhd9GSQPg7BPTzt-mtGEd{rnkLadPScvTH;1TyW#YP5MQFhK4%D1rS9Ju(P&cNKJ_y zI0s;B3miInf??L&g$$GXTSh=O#FpT0+_;G|cMQJ}z~n+a07*qoM6N<$g2PuYtN;K2 diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag_rubber.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag_rubber.rsi/meta.json deleted file mode 100644 index 8b190de6f1..0000000000 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_smg_mag_rubber.rsi/meta.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/831c7c2743530e8a31910d781bae9dc34f3f1ec8/icons/obj/ammo_mags.dmi", - "states": [ - { - "name": "icon" - }, - { - "name": "base" - }, - { - "name": "mag-1" - } - ] -} \ No newline at end of file diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/calico_mag.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/calico_mag.rsi/base.png deleted file mode 100644 index c52c68456214b2135786b2739bf065c37c92daab..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 128 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnH3?%tPCZz)@o&cW^*8>L*gapN#7(1w{nz$S} z?+6rUED7=pW^j0RBMrz=@^oMzWb7Ex3 XQDloyP}lPZs%G$X^>bP0l+XkKMTQ{3 diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/calico_mag.rsi/mag-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/calico_mag.rsi/mag-1.png deleted file mode 100644 index c52c68456214b2135786b2739bf065c37c92daab..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 128 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnH3?%tPCZz)@o&cW^*8>L*gapN#7(1w{nz$S} z?+6rUED7=pW^j0RBMrz=@^oMzWb7Ex3 XQDloyP}lPZs%G$X^>bP0l+XkKMTQ{3 diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/calico_mag.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/calico_mag.rsi/meta.json index f05246b95f..515de882a4 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/calico_mag.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/calico_mag.rsi/meta.json @@ -9,12 +9,6 @@ "states": [ { "name": "icon" - }, - { - "name": "base" - }, - { - "name": "mag-1" } ] } \ No newline at end of file diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag.rsi/icon.png deleted file mode 100644 index f6d42a0402b35aa3331cce77e6c884d8da261665..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 381 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=hEVFuHiUIEGZrNwz6?z;M`sX&K|z z+AEBU`6NmYBor`kTh2PQO6p(qUyFuNy#?vj92=A%mzM<-ug|l z4r_m?pJd$9QP0LE)RlDA-(TXA$`T2Qdv;EO&-ZVe`|#%Pvj92=A%mzM<-ug|l z4r_m?pJdzul$2?Z`+tRr`JRH}NydIT`-1|_p&pzkcm6+F$l$s4;p*x6l5u-$y!&h| h7$0ZcFF0b&z#yO*!`Oe>P#YLr44$rjF6*2UngEGagyjGL diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_base.rsi/mag-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_base.rsi/mag-1.png deleted file mode 100644 index 8832cd933bb3b9567b79e7ad47083ab7325536fb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2238 zcmV;v2toIWP) zaB^>EX>4U6ba`-PAZ2)IW&i+q+U-|ca_cq>{pTvW1QH+!ayfj?bO&924=CEPebY>m zo1bMvEW}&PnJH{Cl1yw6_j=Wmknn>j8< zH?`7>oen+73!U%V(33=g?mN??L^FH!kH>@k)*5-Od1+T;axhmqO5If1Gc0T{C-2V^ zPQ@kOSld}}W?y{=Y6Ge^=NleMAXt2b7)GdJg}KKbIz)^#3FaoEPP}Ou<}cLQAc%H` zMe4Zl;0!c6kYmH;E=$<^7TXV-W$ZixR#E^nL-FZ!uY~WOPmInb$xJ zL(cA41wg_&HkEDP;I6^H9tJF88q3Vg846b4E*4F~n{V;PnY}nHjsA+4pyM!riLkdo zn7}~5r@#_Y@Jgg1z>XRCR7g%7sR4l?PG~?%ip&Y%WU{^SjfTCJgf24D3xE(#tbnF) z1z0gkOo+D(7phKJqKG6>$x@^yPBBSJNt5NNs;p5(ld5JdS~KUEC8w-8=aOro!boG{ zN-A1%DWz6yT4M#TiuDzQMvYr+(o)lwTWPh!eR}NDQ`eq*>2=WHffV3I8anbQqs}nl zN;6KGY3j_g%(~!fi&tE-($bYzS@n+ELG>B6SL8lMEgaNn17+*<4K;9A!^{_A$1DUX#lRWC5Cej729g!-*u5e5kGMHl_p7+kd&oJ1 z?kA9Q2HgX4zvA`|YNPIS%NrnzLf8};k`aC@`brr;|J~93E`$FW{c9PmG98sF>Un0Z z)Zm4<_X)4lrHUl7tUfAgorE=)&Q0-gRiEtp1^4IK#u{#{u2y+{7#QGf}Mw@lp|zFhWo?odK!D%aS@}X&tGp z*xa0o?9-r4r&R@ysl@XEI*Ej;soO44j8s4=>#nFaksyndnu0#6@nD79Dh;3$1s}Afo5wgL|Jf;RPi&vd`x(hKRjN!>T^ z@|Xay_5ugY99jl;LkYf_pim9y!cvc``8ErZ_9fSVeY0G80b>qX96FF?@BA1&UB;pB zNa;RYz~+x;-rV+pB6i6X(Fk5@>6|E z{pbKsNe`BHKa-6vM#v^7nNVsi!ZqQpwWVkQR@f|vJb=~~;f0Ea@LJk5az$X}f`XS& zAzj)`=LCyB1(@0v&C(MB@POp`a}s^sc_xaoO;DLB?I_42o^)z9RldueGyaw%s*62A(OxzfN~@}~=l`(oueIj9lp*@y*Q zVcj83u1NL>>}*{h7I(D4An_F%$vm)X+EvLWC87nrnC52(aX(|~|0*LC-BH}%MpRoh z$^$Q00004nX+uL$Nkc;*aB^>EX>4Tx0C=2zkv&MmKpe$iQ;Q-M2Rn#5WT=8*K~&UH zs#pXIrLEAagUO{|(4-+rad8w}3l4rPRvlcNb#-tR1i=pwCr2km7b)?7NufoI2gm(* zckglc4iM^PrkWk&fT~$WG8Ppx*;TRg6#)!Fz$j)UX6o_OVj7;~>mEM7-bHwp_qjhu zkCHPP;1h}Gm~L3a8^qI_md<&fIK+yQLVQjbR8c}179zB2 zq?kz3e$>N1;P?~dlF3y9BgXjAn;<_AHzWBF3_mi_V=-E zH%AOrG<}x-fiIGx~0i`z~v6m|D;QXG%;XZUO8@`>24YJ`L;(K) z{{a7>y{D4^000SaNLh0L04^f{04^f|c%?sf00007bV*G`2jm4C0xC5$rEtFh00AyZ zL_t(o!(%*f-~huw0w#t52BQubb-<_t2HXKG137jBKSD7#J8BrW85+C&dwDIpEdHw+v$9!VEpv9S{~>XJC+%m0@_q@q{6O z9w8tnE5l%AVS@;f6Gs@VENmDaJzl{;mneW)I-t2AjAse`9Z*))z#t|r%)r3Fz_98| z3|!pG!iHhR>J2ljHze#6L+zvFfKM3~3Tl3=D4{p@{Qe+s^Rp{nHW9AUXP-li~I^CX`&j zz`(%3@QH!pk)Slgn&e!D1#>6Uwng;n?wDxBvhE diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_base.rsi/mag-2.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_base.rsi/mag-2.png deleted file mode 100644 index c5b8b2b2b4bc9906d02d83196b552bb194ac1c53..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2243 zcmV;!2t4 zaB^>EX>4U6ba`-PAZ2)IW&i+q+U-|ca_cq>{pTvW1QH+!ayfj?bO&924=CEPebY>m zo1bMvEW}&Pv!Ul8l{w(2C zT;h$jodsw1)pwvaplWlz;h_YA#aD=7gc??ud+eb@#7L81ZX)W$o0ehzLY)nQXlGcY zjtdXYK%)aWHeBwqguQRE{jgca&LdzY1u!!dpHBBm`0n|{Xf1Q|5PZJd3UZP87sN2+ z?2c6cB&=go+4c?Y8vN^Fz#^ux%*>pjVD;@{(ImY27H^!{i^J0BuXqVM4g;77dkcgK z3dC@n1N4)VzeVND`GSMQY*{lcbb1S)QuO8dWr@YSyAPbBR!wiT~ z3_x5B0XQ@nWcY|8*=}Mn}c<~iW|L$oHOWt z0y$^UJs|fhZttKr>Q1-30kSBBO_3oP;kTl%l=1W59o_FT_@B|gmeDHHQK_PyXVyv$ zUWj|2@H$)rt@=6(I>D1Vz&skV?EPsZ*BLk=lyQ z&8f&f4cc^CRq&WfJRhKwNT`~+?E=L}1(dSxifR)HG6~7S4e97k5YkvYxUbHzSYbps zu4BNE5&h^ow6A~(4={+>X7;q|z}_^})ip@#^aKOx=Wnedy;F}2w)qpN6^|+dEvmj|-at+uw%cU1E=8(mq16lUYkI~a*9Quxw z?!yIa{%GdSZ4W47mrN0j;H5^c6MbRwuFcx|m`mnLh+Hd_aLzHeM?iQn)5FiMF^Ard z4)B!pV0rg5+2~?~Y;uwbrPd-`6Yg4DiWXpn&4S1SXl)T*sCWpkrA;GO1XeC6cnKBK zrOk9su;^2Oscq3LJs|)ONS;3@(bt`4qA1%0m6_6x@*N`NKlUVf_9R1~^ByL;(UMJx z<#y6J*{7z6Ms+8pa@0cS^tsV}VxjgfQW2QA`IweK(iBG!{I3`tO?7HT-I$1!HT*2y z8sw1?rfr<;I~O|E9nvTXm5RmpE)%)tH0Qyf*rx6);(s(=i~=eEdNK&B!-lB?hD0Jl zQby)X4P!mNP{PbN`-KLBYq7P?CUGK{awa74s}Pwh4a_Bfx{$apR-TiC8lj$zSkM*L z9n$2AWRJkk*7ad=M;iVJBT`DsDfZYRMb(b zSOg2DthaWK8lL0p9zMR_MR=C?xj#pb zk~10L6N%@TZdk+{#M7IW&Uv3W#EOzad`>)O&;^Mfxh}i>#<}3Iz%xTeIyp}qA{Gm6 zEVnT$8Y=M=aad6`$`>*&E1b7DtK}+d-jlyDnA28LT&FpN7?u!60wQEoQ9>COBD89x zm`Kuo)WbjE_!H!k$yEX)#{w!)Avu2VKlt6PnV+0+lY&to@M7B^!$9XQ(5Tt=_pxm^ zP5}QiaHX~Ul{zr{NqViNg^z&VZQ$a%rOA81K2b-rK)tn*IF%&dzeoQd&p>JXlk5O$ z$3MksfYSIU+X2*yf07(Pi})w0C|3RSgdt5rih<$nBNTD|Yug!~y?;6a8YD-*b28li z#)Og!7#J8B7(OvDJQ9>g8Lih5+Me-*Ch`006ztVz`pe RN;m)j002ovPDHLkV1n4>5p4hf diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_base.rsi/mag-3.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_base.rsi/mag-3.png deleted file mode 100644 index a563ffebf8b8132b3e85a07a11ae30ffe5bc679a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2243 zcmV;!2t4 zaB^>EX>4U6ba`-PAZ2)IW&i+q+U-|ca_cq>{pTvW1QH+!ayfj?bO&924=CEPebY>m zo1bMvEW}&PNOpg-H?A1RW5B6JYzI#3~TFcx#1fTD=f?Q-?12GIa zyJHmq3G3KYwta)U2LE~(u!w0aGc#u>Sbe)#Gzo9M#T#e#;;=OOD_(+*!vH42-U49) z0|B1`OGv>hk%j;}X5dpHIdP;01cErB0VydmCxDa5_Qp3F_F59U$Ve{$LO8Jkn!*)e z#V9c$-ZEUMI$?<-l0+p-k(xNgBq=3LmZz$+Miot}nzd-noMV=pvgVviu7wICjfpF% zXvw9NTCr)36}&3eR}dOCZm~&AOBWwgq4RH~@wnYB`b z7vkP0yiS)YlE||9sHk-k)?7L_#m7~BvhNq%pJy9uxUsrg<<${&fs%Fg0KVbIH$QMi zb$R4?_?bx2`GwNBAFSE>{^;I)0a>t14YSQewIakzMM%O3LD6&uq!KSn>XfB*q_$#n zb1Je=gEpO36+EUA&j;uv5~`+dyFf8g0i~?FqS{1)OhR&SLpr(>gftcp?yEB_Ru~bE z>liR(L_fL??JHoy0}LXznLVvKus02Lb^;_ zW1oXsD=0Yt9^I(2nP5b5+;YFYvH|5}%2D8^N$lAQIM@r?)b~Bp{f0{~r0XVi-@MCX z0>Ih}958ce8Q2Xa_-2AaHJ}SiJ+9{4EJ)gyTm$yaa_I$(Ib?C@K$gApWAtS^YqPdK=90M*BG(EfoO8_W5fEO?^zgH5%%S(A z13V=?Sl<0iHo6!go1A1qskI2#guB+3q6JuCvmo*ST3dt{DjvdXY17CRft3piUP6U* zX)~P@Ecz5+YFji*PYA#RlIPD!^mXT%D9ScLWu~;Fe1{16k3C7AJ;@O0yoZTyv}99a zxt(-Q_NghNQQb+Y9JSCneQtE0Sg5^=R0Jk&KBgs*G{q4F|0_mEQ=M8-Hzp!w4L?h_ z26<$JX&Wc|&V`P3hcrq;rDE~D%S5g@&3P~=wyFDy_#cfIqksy4o(#h3uwm+eA(4oX zl#w}8!&r|mlrZznexbqOT5PSeNu0=~oC!(%Dn#Z=19QorE+p=YmFMK3MyO{a7IcMm zhcvk&*(0#Cb$wXe(FTLWS7;>jz^Z9iC7YCp7W878pB=>gjH&;tj8Jq(aeo6fYg;rL zY`L5O00D(*LqkwWLqi~Na&Km7Y-Iodc$|HaJxIeq9K~N#iy{>VJBT`DsDfZYRMb(b zSOg2DthaWK8lL0p9zMR_MR=C?xj#pb zk~10L6N%@TZdk+{#M7IW&Uv3W#EOzad`>)O&;^Mfxh}i>#<}3Iz%xTeIyp}qA{Gm6 zEVnT$8Y=M=aad6`$`>*&E1b7DtK}+d-jlyDnA28LT&FpN7?u!60wQEoQ9>COBD89x zm`Kuo)WbjE_!H!k$yEX)#{w!)Avu2VKlt6PnV+0+lY&to@M7B^!$9XQ(5Tt=_pxm^ zP5}QiaHX~Ul{zr{NqViNg^z&VZQ$a%rOA81K2b-rK)tn*IF%&dzeo#RU;^DA3gbVLVIdUlgOoKLe%lPqG8B z#Q(r%L*!7Ps{^PN|0Fqp7V%F~QLOsu2}7EM6a&NCM=0X_*S0e}d;fF&)yub34FSf{zTt>>004=_W4HtL R+718!002ovPDHLkV1k|(`PKjc diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_base.rsi/mag-4.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_base.rsi/mag-4.png deleted file mode 100644 index 8a3db8895b71a0dda265632f3bbf952778509889..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2244 zcmV;#2s`(QP) zaB^>EX>4U6ba`-PAZ2)IW&i+q+U-|ca_cq>{pTvW1QH+!ayfj?bO&924=CEPebY>m zo1bMvEW}&Pq4RwkdXgy6eP?=u!+=FhW0{#bL&56X#iB`g^DW*uvloY@(O>ZrbQ}gS5%v}c z6Br2i6j(wEUWqgW*f9g23dxBhH6Reg2@Oa|5q=MFGTGkvM#El9LKhk71waTVRzOp@ z0<0J%Cd6BY3som9QACocWGPY;rZX{l+;t+d+VK0S8nscX-@^g3wpKnidp4IO!uQD>NN zr5UHpG#B77l8(fwFb_h8oDKHx|Lti5O-; zjA8)dY6!rg$uRRd#7KsmVde|5V-|vxV&IHmhylSk1IY?^?B0<3N8B8&`&HcNJ>;B0 z_Y=rDgYE&jUvYZ}wNZDvo^*pmy zYVbnb`-Io&QbiJ3Rv#6$PQsc?=cf3$s!#U)g8TDqV+}V}SF5}_qApOft{%WQ-1z1P zuBa}L91lMeDLTJU8ux=WTi+kuyDuOMcBx^unW$ETc&P|U7$GQ{&VW?nWl5c~w2stP zY;I0P_G!?j)2f2URO0ynokT*_)NL0iMk=6`byrlINRUZL4sJ+CcY=_{;=z4&hQ$ga z!f_n~hK%S(*P(p{On87n#5S|1RR{K_p{}kuDuk|RPz1j;(QWOS|I+9_Tp){s=-{>| z(qrs%P-_Jx2f(8nRW=ihD2`k1w^ufxoJ=_i+%$4kLNr0$z{ zc}xIUdw~OH4lM(_p#aZ*F@)5xZoHXap}ca-HZ4lXq>_*2i2jS3=}kp@egexjh2HiDC~Rj4*BEWZ${avF?yYNvKpTzIU0(HK#cb2E{gYUlISK@nRHE0nn2{SRFP@9WW#k z5t1@8XKEPh@r4p*zS%D{7+j03bvB6;xs)>@iC=}tTxnn~`O}5OeX;VK9MlN)Y{Y`D zuEX>4Tx0C=2zkv&MmKpe$iQ;Q-M2Rn#5WT=8*K~&UH zs#pXIrLEAagUO{|(4-+rad8w}3l4rPRvlcNb#-tR1i=pwCr2km7b)?7NufoI2gm(* zckglc4iM^PrkWk&fT~$WG8Ppx*;TRg6#)!Fz$j)UX6o_OVj7;~>mEM7-bHwp_qjhu zkCHPP;1h}Gm~L3a8^qI_md<&fIK+yQLVQjbR8c}179zB2 zq?kz3e$>N1;P?~dlF3y9BgXjAn;<_AHzWBF3_mi_V=-E zH%AOrG<}x-fiIGx~0i`z~v6m|D;QXG%;XZUO8@`>24YJ`L;(K) z{{a7>y{D4^000SaNLh0L04^f{04^f|c%?sf00007bV*G`2jm4C0xBgb5@6c^00A^f zL_t(o!(%*f-~huw0w#t52BQubb-<_t2HXKG137jBKSD7#J8BrW85+C&dwDIpEdHw+v$9!VEpv9S{~>XJC+%m0@_q@q{6O z9w8tnE5l%AVS@;f6Gs@VENmDaJzl{;mneW)I-t2AjAzMzx;vn(s)0dFT$q7@fq`Mw zml${&u(GgWSh0EqLswe^Z5{CHuRpawyQ%0n~_pk{v+p_$S!`SmJ+R zv*D^QF$3cOYWSRF2cX4212y8Gq@q~$(-Vd?2`L7Kw~tW7`LAtfc=rD32xyQT{m#j7 z`x_HVE?{6_U|{&f!0<>=nqf_HF2jPklWE%`diC-x!>gBXsTu-|qkY2>?*IT>tz@`B SSm{sz0000 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 O0000vj92=A%mzM<-ug|l z4r_m?pJd$9QP0LE)b%KTk-DT(O{}DZgx$i9+0l2BEWSNqwk$I?FyL9rc5=G57SHUs zdZ&}DJU}2`wm+%jOGJZWqVv1|ti|e+Wq4JtwylrbmkRRc%CZNnJ&S7(3%+Myhzm+P V@bH-fBQRJQJYD@<);T3K0RTS{l&=5) diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_hv.rsi/mag-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_hv.rsi/mag-1.png deleted file mode 100644 index 8832cd933bb3b9567b79e7ad47083ab7325536fb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2238 zcmV;v2toIWP) zaB^>EX>4U6ba`-PAZ2)IW&i+q+U-|ca_cq>{pTvW1QH+!ayfj?bO&924=CEPebY>m zo1bMvEW}&PnJH{Cl1yw6_j=Wmknn>j8< zH?`7>oen+73!U%V(33=g?mN??L^FH!kH>@k)*5-Od1+T;axhmqO5If1Gc0T{C-2V^ zPQ@kOSld}}W?y{=Y6Ge^=NleMAXt2b7)GdJg}KKbIz)^#3FaoEPP}Ou<}cLQAc%H` zMe4Zl;0!c6kYmH;E=$<^7TXV-W$ZixR#E^nL-FZ!uY~WOPmInb$xJ zL(cA41wg_&HkEDP;I6^H9tJF88q3Vg846b4E*4F~n{V;PnY}nHjsA+4pyM!riLkdo zn7}~5r@#_Y@Jgg1z>XRCR7g%7sR4l?PG~?%ip&Y%WU{^SjfTCJgf24D3xE(#tbnF) z1z0gkOo+D(7phKJqKG6>$x@^yPBBSJNt5NNs;p5(ld5JdS~KUEC8w-8=aOro!boG{ zN-A1%DWz6yT4M#TiuDzQMvYr+(o)lwTWPh!eR}NDQ`eq*>2=WHffV3I8anbQqs}nl zN;6KGY3j_g%(~!fi&tE-($bYzS@n+ELG>B6SL8lMEgaNn17+*<4K;9A!^{_A$1DUX#lRWC5Cej729g!-*u5e5kGMHl_p7+kd&oJ1 z?kA9Q2HgX4zvA`|YNPIS%NrnzLf8};k`aC@`brr;|J~93E`$FW{c9PmG98sF>Un0Z z)Zm4<_X)4lrHUl7tUfAgorE=)&Q0-gRiEtp1^4IK#u{#{u2y+{7#QGf}Mw@lp|zFhWo?odK!D%aS@}X&tGp z*xa0o?9-r4r&R@ysl@XEI*Ej;soO44j8s4=>#nFaksyndnu0#6@nD79Dh;3$1s}Afo5wgL|Jf;RPi&vd`x(hKRjN!>T^ z@|Xay_5ugY99jl;LkYf_pim9y!cvc``8ErZ_9fSVeY0G80b>qX96FF?@BA1&UB;pB zNa;RYz~+x;-rV+pB6i6X(Fk5@>6|E z{pbKsNe`BHKa-6vM#v^7nNVsi!ZqQpwWVkQR@f|vJb=~~;f0Ea@LJk5az$X}f`XS& zAzj)`=LCyB1(@0v&C(MB@POp`a}s^sc_xaoO;DLB?I_42o^)z9RldueGyaw%s*62A(OxzfN~@}~=l`(oueIj9lp*@y*Q zVcj83u1NL>>}*{h7I(D4An_F%$vm)X+EvLWC87nrnC52(aX(|~|0*LC-BH}%MpRoh z$^$Q00004nX+uL$Nkc;*aB^>EX>4Tx0C=2zkv&MmKpe$iQ;Q-M2Rn#5WT=8*K~&UH zs#pXIrLEAagUO{|(4-+rad8w}3l4rPRvlcNb#-tR1i=pwCr2km7b)?7NufoI2gm(* zckglc4iM^PrkWk&fT~$WG8Ppx*;TRg6#)!Fz$j)UX6o_OVj7;~>mEM7-bHwp_qjhu zkCHPP;1h}Gm~L3a8^qI_md<&fIK+yQLVQjbR8c}179zB2 zq?kz3e$>N1;P?~dlF3y9BgXjAn;<_AHzWBF3_mi_V=-E zH%AOrG<}x-fiIGx~0i`z~v6m|D;QXG%;XZUO8@`>24YJ`L;(K) z{{a7>y{D4^000SaNLh0L04^f{04^f|c%?sf00007bV*G`2jm4C0xC5$rEtFh00AyZ zL_t(o!(%*f-~huw0w#t52BQubb-<_t2HXKG137jBKSD7#J8BrW85+C&dwDIpEdHw+v$9!VEpv9S{~>XJC+%m0@_q@q{6O z9w8tnE5l%AVS@;f6Gs@VENmDaJzl{;mneW)I-t2AjAse`9Z*))z#t|r%)r3Fz_98| z3|!pG!iHhR>J2ljHze#6L+zvFfKM3~3Tl3=D4{p@{Qe+s^Rp{nHW9AUXP-li~I^CX`&j zz`(%3@QH!pk)Slgn&e!D1#>6Uwng;n?wDxBvhE diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_hv.rsi/mag-2.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_hv.rsi/mag-2.png deleted file mode 100644 index c5b8b2b2b4bc9906d02d83196b552bb194ac1c53..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2243 zcmV;!2t4 zaB^>EX>4U6ba`-PAZ2)IW&i+q+U-|ca_cq>{pTvW1QH+!ayfj?bO&924=CEPebY>m zo1bMvEW}&Pv!Ul8l{w(2C zT;h$jodsw1)pwvaplWlz;h_YA#aD=7gc??ud+eb@#7L81ZX)W$o0ehzLY)nQXlGcY zjtdXYK%)aWHeBwqguQRE{jgca&LdzY1u!!dpHBBm`0n|{Xf1Q|5PZJd3UZP87sN2+ z?2c6cB&=go+4c?Y8vN^Fz#^ux%*>pjVD;@{(ImY27H^!{i^J0BuXqVM4g;77dkcgK z3dC@n1N4)VzeVND`GSMQY*{lcbb1S)QuO8dWr@YSyAPbBR!wiT~ z3_x5B0XQ@nWcY|8*=}Mn}c<~iW|L$oHOWt z0y$^UJs|fhZttKr>Q1-30kSBBO_3oP;kTl%l=1W59o_FT_@B|gmeDHHQK_PyXVyv$ zUWj|2@H$)rt@=6(I>D1Vz&skV?EPsZ*BLk=lyQ z&8f&f4cc^CRq&WfJRhKwNT`~+?E=L}1(dSxifR)HG6~7S4e97k5YkvYxUbHzSYbps zu4BNE5&h^ow6A~(4={+>X7;q|z}_^})ip@#^aKOx=Wnedy;F}2w)qpN6^|+dEvmj|-at+uw%cU1E=8(mq16lUYkI~a*9Quxw z?!yIa{%GdSZ4W47mrN0j;H5^c6MbRwuFcx|m`mnLh+Hd_aLzHeM?iQn)5FiMF^Ard z4)B!pV0rg5+2~?~Y;uwbrPd-`6Yg4DiWXpn&4S1SXl)T*sCWpkrA;GO1XeC6cnKBK zrOk9su;^2Oscq3LJs|)ONS;3@(bt`4qA1%0m6_6x@*N`NKlUVf_9R1~^ByL;(UMJx z<#y6J*{7z6Ms+8pa@0cS^tsV}VxjgfQW2QA`IweK(iBG!{I3`tO?7HT-I$1!HT*2y z8sw1?rfr<;I~O|E9nvTXm5RmpE)%)tH0Qyf*rx6);(s(=i~=eEdNK&B!-lB?hD0Jl zQby)X4P!mNP{PbN`-KLBYq7P?CUGK{awa74s}Pwh4a_Bfx{$apR-TiC8lj$zSkM*L z9n$2AWRJkk*7ad=M;iVJBT`DsDfZYRMb(b zSOg2DthaWK8lL0p9zMR_MR=C?xj#pb zk~10L6N%@TZdk+{#M7IW&Uv3W#EOzad`>)O&;^Mfxh}i>#<}3Iz%xTeIyp}qA{Gm6 zEVnT$8Y=M=aad6`$`>*&E1b7DtK}+d-jlyDnA28LT&FpN7?u!60wQEoQ9>COBD89x zm`Kuo)WbjE_!H!k$yEX)#{w!)Avu2VKlt6PnV+0+lY&to@M7B^!$9XQ(5Tt=_pxm^ zP5}QiaHX~Ul{zr{NqViNg^z&VZQ$a%rOA81K2b-rK)tn*IF%&dzeoQd&p>JXlk5O$ z$3MksfYSIU+X2*yf07(Pi})w0C|3RSgdt5rih<$nBNTD|Yug!~y?;6a8YD-*b28li z#)Og!7#J8B7(OvDJQ9>g8Lih5+Me-*Ch`006ztVz`pe RN;m)j002ovPDHLkV1n4>5p4hf diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_hv.rsi/mag-3.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_hv.rsi/mag-3.png deleted file mode 100644 index a563ffebf8b8132b3e85a07a11ae30ffe5bc679a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2243 zcmV;!2t4 zaB^>EX>4U6ba`-PAZ2)IW&i+q+U-|ca_cq>{pTvW1QH+!ayfj?bO&924=CEPebY>m zo1bMvEW}&PNOpg-H?A1RW5B6JYzI#3~TFcx#1fTD=f?Q-?12GIa zyJHmq3G3KYwta)U2LE~(u!w0aGc#u>Sbe)#Gzo9M#T#e#;;=OOD_(+*!vH42-U49) z0|B1`OGv>hk%j;}X5dpHIdP;01cErB0VydmCxDa5_Qp3F_F59U$Ve{$LO8Jkn!*)e z#V9c$-ZEUMI$?<-l0+p-k(xNgBq=3LmZz$+Miot}nzd-noMV=pvgVviu7wICjfpF% zXvw9NTCr)36}&3eR}dOCZm~&AOBWwgq4RH~@wnYB`b z7vkP0yiS)YlE||9sHk-k)?7L_#m7~BvhNq%pJy9uxUsrg<<${&fs%Fg0KVbIH$QMi zb$R4?_?bx2`GwNBAFSE>{^;I)0a>t14YSQewIakzMM%O3LD6&uq!KSn>XfB*q_$#n zb1Je=gEpO36+EUA&j;uv5~`+dyFf8g0i~?FqS{1)OhR&SLpr(>gftcp?yEB_Ru~bE z>liR(L_fL??JHoy0}LXznLVvKus02Lb^;_ zW1oXsD=0Yt9^I(2nP5b5+;YFYvH|5}%2D8^N$lAQIM@r?)b~Bp{f0{~r0XVi-@MCX z0>Ih}958ce8Q2Xa_-2AaHJ}SiJ+9{4EJ)gyTm$yaa_I$(Ib?C@K$gApWAtS^YqPdK=90M*BG(EfoO8_W5fEO?^zgH5%%S(A z13V=?Sl<0iHo6!go1A1qskI2#guB+3q6JuCvmo*ST3dt{DjvdXY17CRft3piUP6U* zX)~P@Ecz5+YFji*PYA#RlIPD!^mXT%D9ScLWu~;Fe1{16k3C7AJ;@O0yoZTyv}99a zxt(-Q_NghNQQb+Y9JSCneQtE0Sg5^=R0Jk&KBgs*G{q4F|0_mEQ=M8-Hzp!w4L?h_ z26<$JX&Wc|&V`P3hcrq;rDE~D%S5g@&3P~=wyFDy_#cfIqksy4o(#h3uwm+eA(4oX zl#w}8!&r|mlrZznexbqOT5PSeNu0=~oC!(%Dn#Z=19QorE+p=YmFMK3MyO{a7IcMm zhcvk&*(0#Cb$wXe(FTLWS7;>jz^Z9iC7YCp7W878pB=>gjH&;tj8Jq(aeo6fYg;rL zY`L5O00D(*LqkwWLqi~Na&Km7Y-Iodc$|HaJxIeq9K~N#iy{>VJBT`DsDfZYRMb(b zSOg2DthaWK8lL0p9zMR_MR=C?xj#pb zk~10L6N%@TZdk+{#M7IW&Uv3W#EOzad`>)O&;^Mfxh}i>#<}3Iz%xTeIyp}qA{Gm6 zEVnT$8Y=M=aad6`$`>*&E1b7DtK}+d-jlyDnA28LT&FpN7?u!60wQEoQ9>COBD89x zm`Kuo)WbjE_!H!k$yEX)#{w!)Avu2VKlt6PnV+0+lY&to@M7B^!$9XQ(5Tt=_pxm^ zP5}QiaHX~Ul{zr{NqViNg^z&VZQ$a%rOA81K2b-rK)tn*IF%&dzeo#RU;^DA3gbVLVIdUlgOoKLe%lPqG8B z#Q(r%L*!7Ps{^PN|0Fqp7V%F~QLOsu2}7EM6a&NCM=0X_*S0e}d;fF&)yub34FSf{zTt>>004=_W4HtL R+718!002ovPDHLkV1k|(`PKjc diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_hv.rsi/mag-4.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_hv.rsi/mag-4.png deleted file mode 100644 index 8a3db8895b71a0dda265632f3bbf952778509889..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2244 zcmV;#2s`(QP) zaB^>EX>4U6ba`-PAZ2)IW&i+q+U-|ca_cq>{pTvW1QH+!ayfj?bO&924=CEPebY>m zo1bMvEW}&Pq4RwkdXgy6eP?=u!+=FhW0{#bL&56X#iB`g^DW*uvloY@(O>ZrbQ}gS5%v}c z6Br2i6j(wEUWqgW*f9g23dxBhH6Reg2@Oa|5q=MFGTGkvM#El9LKhk71waTVRzOp@ z0<0J%Cd6BY3som9QACocWGPY;rZX{l+;t+d+VK0S8nscX-@^g3wpKnidp4IO!uQD>NN zr5UHpG#B77l8(fwFb_h8oDKHx|Lti5O-; zjA8)dY6!rg$uRRd#7KsmVde|5V-|vxV&IHmhylSk1IY?^?B0<3N8B8&`&HcNJ>;B0 z_Y=rDgYE&jUvYZ}wNZDvo^*pmy zYVbnb`-Io&QbiJ3Rv#6$PQsc?=cf3$s!#U)g8TDqV+}V}SF5}_qApOft{%WQ-1z1P zuBa}L91lMeDLTJU8ux=WTi+kuyDuOMcBx^unW$ETc&P|U7$GQ{&VW?nWl5c~w2stP zY;I0P_G!?j)2f2URO0ynokT*_)NL0iMk=6`byrlINRUZL4sJ+CcY=_{;=z4&hQ$ga z!f_n~hK%S(*P(p{On87n#5S|1RR{K_p{}kuDuk|RPz1j;(QWOS|I+9_Tp){s=-{>| z(qrs%P-_Jx2f(8nRW=ihD2`k1w^ufxoJ=_i+%$4kLNr0$z{ zc}xIUdw~OH4lM(_p#aZ*F@)5xZoHXap}ca-HZ4lXq>_*2i2jS3=}kp@egexjh2HiDC~Rj4*BEWZ${avF?yYNvKpTzIU0(HK#cb2E{gYUlISK@nRHE0nn2{SRFP@9WW#k z5t1@8XKEPh@r4p*zS%D{7+j03bvB6;xs)>@iC=}tTxnn~`O}5OeX;VK9MlN)Y{Y`D zuEX>4Tx0C=2zkv&MmKpe$iQ;Q-M2Rn#5WT=8*K~&UH zs#pXIrLEAagUO{|(4-+rad8w}3l4rPRvlcNb#-tR1i=pwCr2km7b)?7NufoI2gm(* zckglc4iM^PrkWk&fT~$WG8Ppx*;TRg6#)!Fz$j)UX6o_OVj7;~>mEM7-bHwp_qjhu zkCHPP;1h}Gm~L3a8^qI_md<&fIK+yQLVQjbR8c}179zB2 zq?kz3e$>N1;P?~dlF3y9BgXjAn;<_AHzWBF3_mi_V=-E zH%AOrG<}x-fiIGx~0i`z~v6m|D;QXG%;XZUO8@`>24YJ`L;(K) z{{a7>y{D4^000SaNLh0L04^f{04^f|c%?sf00007bV*G`2jm4C0xBgb5@6c^00A^f zL_t(o!(%*f-~huw0w#t52BQubb-<_t2HXKG137jBKSD7#J8BrW85+C&dwDIpEdHw+v$9!VEpv9S{~>XJC+%m0@_q@q{6O z9w8tnE5l%AVS@;f6Gs@VENmDaJzl{;mneW)I-t2AjAzMzx;vn(s)0dFT$q7@fq`Mw zml${&u(GgWSh0EqLswe^Z5{CHuRpawyQ%0n~_pk{v+p_$S!`SmJ+R zv*D^QF$3cOYWSRF2cX4212y8Gq@q~$(-Vd?2`L7Kw~tW7`LAtfc=rD32xyQT{m#j7 z`x_HVE?{6_U|{&f!0<>=nqf_HF2jPklWE%`diC-x!>gBXsTu-|qkY2>?*IT>tz@`B SSm{sz0000 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 diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_practice.rsi/mag-2.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_practice.rsi/mag-2.png deleted file mode 100644 index c5b8b2b2b4bc9906d02d83196b552bb194ac1c53..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2243 zcmV;!2t4 zaB^>EX>4U6ba`-PAZ2)IW&i+q+U-|ca_cq>{pTvW1QH+!ayfj?bO&924=CEPebY>m zo1bMvEW}&Pv!Ul8l{w(2C zT;h$jodsw1)pwvaplWlz;h_YA#aD=7gc??ud+eb@#7L81ZX)W$o0ehzLY)nQXlGcY zjtdXYK%)aWHeBwqguQRE{jgca&LdzY1u!!dpHBBm`0n|{Xf1Q|5PZJd3UZP87sN2+ z?2c6cB&=go+4c?Y8vN^Fz#^ux%*>pjVD;@{(ImY27H^!{i^J0BuXqVM4g;77dkcgK z3dC@n1N4)VzeVND`GSMQY*{lcbb1S)QuO8dWr@YSyAPbBR!wiT~ z3_x5B0XQ@nWcY|8*=}Mn}c<~iW|L$oHOWt z0y$^UJs|fhZttKr>Q1-30kSBBO_3oP;kTl%l=1W59o_FT_@B|gmeDHHQK_PyXVyv$ zUWj|2@H$)rt@=6(I>D1Vz&skV?EPsZ*BLk=lyQ z&8f&f4cc^CRq&WfJRhKwNT`~+?E=L}1(dSxifR)HG6~7S4e97k5YkvYxUbHzSYbps zu4BNE5&h^ow6A~(4={+>X7;q|z}_^})ip@#^aKOx=Wnedy;F}2w)qpN6^|+dEvmj|-at+uw%cU1E=8(mq16lUYkI~a*9Quxw z?!yIa{%GdSZ4W47mrN0j;H5^c6MbRwuFcx|m`mnLh+Hd_aLzHeM?iQn)5FiMF^Ard z4)B!pV0rg5+2~?~Y;uwbrPd-`6Yg4DiWXpn&4S1SXl)T*sCWpkrA;GO1XeC6cnKBK zrOk9su;^2Oscq3LJs|)ONS;3@(bt`4qA1%0m6_6x@*N`NKlUVf_9R1~^ByL;(UMJx z<#y6J*{7z6Ms+8pa@0cS^tsV}VxjgfQW2QA`IweK(iBG!{I3`tO?7HT-I$1!HT*2y z8sw1?rfr<;I~O|E9nvTXm5RmpE)%)tH0Qyf*rx6);(s(=i~=eEdNK&B!-lB?hD0Jl zQby)X4P!mNP{PbN`-KLBYq7P?CUGK{awa74s}Pwh4a_Bfx{$apR-TiC8lj$zSkM*L z9n$2AWRJkk*7ad=M;iVJBT`DsDfZYRMb(b zSOg2DthaWK8lL0p9zMR_MR=C?xj#pb zk~10L6N%@TZdk+{#M7IW&Uv3W#EOzad`>)O&;^Mfxh}i>#<}3Iz%xTeIyp}qA{Gm6 zEVnT$8Y=M=aad6`$`>*&E1b7DtK}+d-jlyDnA28LT&FpN7?u!60wQEoQ9>COBD89x zm`Kuo)WbjE_!H!k$yEX)#{w!)Avu2VKlt6PnV+0+lY&to@M7B^!$9XQ(5Tt=_pxm^ zP5}QiaHX~Ul{zr{NqViNg^z&VZQ$a%rOA81K2b-rK)tn*IF%&dzeoQd&p>JXlk5O$ z$3MksfYSIU+X2*yf07(Pi})w0C|3RSgdt5rih<$nBNTD|Yug!~y?;6a8YD-*b28li z#)Og!7#J8B7(OvDJQ9>g8Lih5+Me-*Ch`006ztVz`pe RN;m)j002ovPDHLkV1n4>5p4hf diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_practice.rsi/mag-3.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_practice.rsi/mag-3.png deleted file mode 100644 index a563ffebf8b8132b3e85a07a11ae30ffe5bc679a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2243 zcmV;!2t4 zaB^>EX>4U6ba`-PAZ2)IW&i+q+U-|ca_cq>{pTvW1QH+!ayfj?bO&924=CEPebY>m zo1bMvEW}&PNOpg-H?A1RW5B6JYzI#3~TFcx#1fTD=f?Q-?12GIa zyJHmq3G3KYwta)U2LE~(u!w0aGc#u>Sbe)#Gzo9M#T#e#;;=OOD_(+*!vH42-U49) z0|B1`OGv>hk%j;}X5dpHIdP;01cErB0VydmCxDa5_Qp3F_F59U$Ve{$LO8Jkn!*)e z#V9c$-ZEUMI$?<-l0+p-k(xNgBq=3LmZz$+Miot}nzd-noMV=pvgVviu7wICjfpF% zXvw9NTCr)36}&3eR}dOCZm~&AOBWwgq4RH~@wnYB`b z7vkP0yiS)YlE||9sHk-k)?7L_#m7~BvhNq%pJy9uxUsrg<<${&fs%Fg0KVbIH$QMi zb$R4?_?bx2`GwNBAFSE>{^;I)0a>t14YSQewIakzMM%O3LD6&uq!KSn>XfB*q_$#n zb1Je=gEpO36+EUA&j;uv5~`+dyFf8g0i~?FqS{1)OhR&SLpr(>gftcp?yEB_Ru~bE z>liR(L_fL??JHoy0}LXznLVvKus02Lb^;_ zW1oXsD=0Yt9^I(2nP5b5+;YFYvH|5}%2D8^N$lAQIM@r?)b~Bp{f0{~r0XVi-@MCX z0>Ih}958ce8Q2Xa_-2AaHJ}SiJ+9{4EJ)gyTm$yaa_I$(Ib?C@K$gApWAtS^YqPdK=90M*BG(EfoO8_W5fEO?^zgH5%%S(A z13V=?Sl<0iHo6!go1A1qskI2#guB+3q6JuCvmo*ST3dt{DjvdXY17CRft3piUP6U* zX)~P@Ecz5+YFji*PYA#RlIPD!^mXT%D9ScLWu~;Fe1{16k3C7AJ;@O0yoZTyv}99a zxt(-Q_NghNQQb+Y9JSCneQtE0Sg5^=R0Jk&KBgs*G{q4F|0_mEQ=M8-Hzp!w4L?h_ z26<$JX&Wc|&V`P3hcrq;rDE~D%S5g@&3P~=wyFDy_#cfIqksy4o(#h3uwm+eA(4oX zl#w}8!&r|mlrZznexbqOT5PSeNu0=~oC!(%Dn#Z=19QorE+p=YmFMK3MyO{a7IcMm zhcvk&*(0#Cb$wXe(FTLWS7;>jz^Z9iC7YCp7W878pB=>gjH&;tj8Jq(aeo6fYg;rL zY`L5O00D(*LqkwWLqi~Na&Km7Y-Iodc$|HaJxIeq9K~N#iy{>VJBT`DsDfZYRMb(b zSOg2DthaWK8lL0p9zMR_MR=C?xj#pb zk~10L6N%@TZdk+{#M7IW&Uv3W#EOzad`>)O&;^Mfxh}i>#<}3Iz%xTeIyp}qA{Gm6 zEVnT$8Y=M=aad6`$`>*&E1b7DtK}+d-jlyDnA28LT&FpN7?u!60wQEoQ9>COBD89x zm`Kuo)WbjE_!H!k$yEX)#{w!)Avu2VKlt6PnV+0+lY&to@M7B^!$9XQ(5Tt=_pxm^ zP5}QiaHX~Ul{zr{NqViNg^z&VZQ$a%rOA81K2b-rK)tn*IF%&dzeo#RU;^DA3gbVLVIdUlgOoKLe%lPqG8B z#Q(r%L*!7Ps{^PN|0Fqp7V%F~QLOsu2}7EM6a&NCM=0X_*S0e}d;fF&)yub34FSf{zTt>>004=_W4HtL R+718!002ovPDHLkV1k|(`PKjc diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_practice.rsi/mag-4.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_practice.rsi/mag-4.png deleted file mode 100644 index 8a3db8895b71a0dda265632f3bbf952778509889..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2244 zcmV;#2s`(QP) zaB^>EX>4U6ba`-PAZ2)IW&i+q+U-|ca_cq>{pTvW1QH+!ayfj?bO&924=CEPebY>m zo1bMvEW}&Pq4RwkdXgy6eP?=u!+=FhW0{#bL&56X#iB`g^DW*uvloY@(O>ZrbQ}gS5%v}c z6Br2i6j(wEUWqgW*f9g23dxBhH6Reg2@Oa|5q=MFGTGkvM#El9LKhk71waTVRzOp@ z0<0J%Cd6BY3som9QACocWGPY;rZX{l+;t+d+VK0S8nscX-@^g3wpKnidp4IO!uQD>NN zr5UHpG#B77l8(fwFb_h8oDKHx|Lti5O-; zjA8)dY6!rg$uRRd#7KsmVde|5V-|vxV&IHmhylSk1IY?^?B0<3N8B8&`&HcNJ>;B0 z_Y=rDgYE&jUvYZ}wNZDvo^*pmy zYVbnb`-Io&QbiJ3Rv#6$PQsc?=cf3$s!#U)g8TDqV+}V}SF5}_qApOft{%WQ-1z1P zuBa}L91lMeDLTJU8ux=WTi+kuyDuOMcBx^unW$ETc&P|U7$GQ{&VW?nWl5c~w2stP zY;I0P_G!?j)2f2URO0ynokT*_)NL0iMk=6`byrlINRUZL4sJ+CcY=_{;=z4&hQ$ga z!f_n~hK%S(*P(p{On87n#5S|1RR{K_p{}kuDuk|RPz1j;(QWOS|I+9_Tp){s=-{>| z(qrs%P-_Jx2f(8nRW=ihD2`k1w^ufxoJ=_i+%$4kLNr0$z{ zc}xIUdw~OH4lM(_p#aZ*F@)5xZoHXap}ca-HZ4lXq>_*2i2jS3=}kp@egexjh2HiDC~Rj4*BEWZ${avF?yYNvKpTzIU0(HK#cb2E{gYUlISK@nRHE0nn2{SRFP@9WW#k z5t1@8XKEPh@r4p*zS%D{7+j03bvB6;xs)>@iC=}tTxnn~`O}5OeX;VK9MlN)Y{Y`D zuEX>4Tx0C=2zkv&MmKpe$iQ;Q-M2Rn#5WT=8*K~&UH zs#pXIrLEAagUO{|(4-+rad8w}3l4rPRvlcNb#-tR1i=pwCr2km7b)?7NufoI2gm(* zckglc4iM^PrkWk&fT~$WG8Ppx*;TRg6#)!Fz$j)UX6o_OVj7;~>mEM7-bHwp_qjhu zkCHPP;1h}Gm~L3a8^qI_md<&fIK+yQLVQjbR8c}179zB2 zq?kz3e$>N1;P?~dlF3y9BgXjAn;<_AHzWBF3_mi_V=-E zH%AOrG<}x-fiIGx~0i`z~v6m|D;QXG%;XZUO8@`>24YJ`L;(K) z{{a7>y{D4^000SaNLh0L04^f{04^f|c%?sf00007bV*G`2jm4C0xBgb5@6c^00A^f zL_t(o!(%*f-~huw0w#t52BQubb-<_t2HXKG137jBKSD7#J8BrW85+C&dwDIpEdHw+v$9!VEpv9S{~>XJC+%m0@_q@q{6O z9w8tnE5l%AVS@;f6Gs@VENmDaJzl{;mneW)I-t2AjAzMzx;vn(s)0dFT$q7@fq`Mw zml${&u(GgWSh0EqLswe^Z5{CHuRpawyQ%0n~_pk{v+p_$S!`SmJ+R zv*D^QF$3cOYWSRF2cX4212y8Gq@q~$(-Vd?2`L7Kw~tW7`LAtfc=rD32xyQT{m#j7 z`x_HVE?{6_U|{&f!0<>=nqf_HF2jPklWE%`diC-x!>gBXsTu-|qkY2>?*IT>tz@`B SSm{sz0000 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 O0000rS{_6nc^r~rNgz=F!ARy)Yt*XY}| z=1HVY9RQ$P_c>S@L#%Hs0dThOXA%e{fFw@QjRwa(e;n+AZJG4zLz;rKlq+CcCa&Y< ze)sMc*YW5NLeV+O03S(pQ|uafHL$K1C*`57@%zZ#Q>95RDWfFvh)`LOhbPVjN&JjdE441o`|om z>C_&cRdNG==|M7zI~d{Pmo5Of@4#p zaB^>EX>4U6ba`-PAZ2)IW&i+q+U-|ca_cq>{pTvW1QH+!ayfj?bO&924=CEPebY>m zo1bMvEW}&PnJH{Cl1yw6_j=Wmknn>j8< zH?`7>oen+73!U%V(33=g?mN??L^FH!kH>@k)*5-Od1+T;axhmqO5If1Gc0T{C-2V^ zPQ@kOSld}}W?y{=Y6Ge^=NleMAXt2b7)GdJg}KKbIz)^#3FaoEPP}Ou<}cLQAc%H` zMe4Zl;0!c6kYmH;E=$<^7TXV-W$ZixR#E^nL-FZ!uY~WOPmInb$xJ zL(cA41wg_&HkEDP;I6^H9tJF88q3Vg846b4E*4F~n{V;PnY}nHjsA+4pyM!riLkdo zn7}~5r@#_Y@Jgg1z>XRCR7g%7sR4l?PG~?%ip&Y%WU{^SjfTCJgf24D3xE(#tbnF) z1z0gkOo+D(7phKJqKG6>$x@^yPBBSJNt5NNs;p5(ld5JdS~KUEC8w-8=aOro!boG{ zN-A1%DWz6yT4M#TiuDzQMvYr+(o)lwTWPh!eR}NDQ`eq*>2=WHffV3I8anbQqs}nl zN;6KGY3j_g%(~!fi&tE-($bYzS@n+ELG>B6SL8lMEgaNn17+*<4K;9A!^{_A$1DUX#lRWC5Cej729g!-*u5e5kGMHl_p7+kd&oJ1 z?kA9Q2HgX4zvA`|YNPIS%NrnzLf8};k`aC@`brr;|J~93E`$FW{c9PmG98sF>Un0Z z)Zm4<_X)4lrHUl7tUfAgorE=)&Q0-gRiEtp1^4IK#u{#{u2y+{7#QGf}Mw@lp|zFhWo?odK!D%aS@}X&tGp z*xa0o?9-r4r&R@ysl@XEI*Ej;soO44j8s4=>#nFaksyndnu0#6@nD79Dh;3$1s}Afo5wgL|Jf;RPi&vd`x(hKRjN!>T^ z@|Xay_5ugY99jl;LkYf_pim9y!cvc``8ErZ_9fSVeY0G80b>qX96FF?@BA1&UB;pB zNa;RYz~+x;-rV+pB6i6X(Fk5@>6|E z{pbKsNe`BHKa-6vM#v^7nNVsi!ZqQpwWVkQR@f|vJb=~~;f0Ea@LJk5az$X}f`XS& zAzj)`=LCyB1(@0v&C(MB@POp`a}s^sc_xaoO;DLB?I_42o^)z9RldueGyaw%s*62A(OxzfN~@}~=l`(oueIj9lp*@y*Q zVcj83u1NL>>}*{h7I(D4An_F%$vm)X+EvLWC87nrnC52(aX(|~|0*LC-BH}%MpRoh z$^$Q00004nX+uL$Nkc;*aB^>EX>4Tx0C=2zkv&MmKpe$iQ;Q-M2Rn#5WT=8*K~&UH zs#pXIrLEAagUO{|(4-+rad8w}3l4rPRvlcNb#-tR1i=pwCr2km7b)?7NufoI2gm(* zckglc4iM^PrkWk&fT~$WG8Ppx*;TRg6#)!Fz$j)UX6o_OVj7;~>mEM7-bHwp_qjhu zkCHPP;1h}Gm~L3a8^qI_md<&fIK+yQLVQjbR8c}179zB2 zq?kz3e$>N1;P?~dlF3y9BgXjAn;<_AHzWBF3_mi_V=-E zH%AOrG<}x-fiIGx~0i`z~v6m|D;QXG%;XZUO8@`>24YJ`L;(K) z{{a7>y{D4^000SaNLh0L04^f{04^f|c%?sf00007bV*G`2jm4C0xC5$rEtFh00AyZ zL_t(o!(%*f-~huw0w#t52BQubb-<_t2HXKG137jBKSD7#J8BrW85+C&dwDIpEdHw+v$9!VEpv9S{~>XJC+%m0@_q@q{6O z9w8tnE5l%AVS@;f6Gs@VENmDaJzl{;mneW)I-t2AjAse`9Z*))z#t|r%)r3Fz_98| z3|!pG!iHhR>J2ljHze#6L+zvFfKM3~3Tl3=D4{p@{Qe+s^Rp{nHW9AUXP-li~I^CX`&j zz`(%3@QH!pk)Slgn&e!D1#>6Uwng;n?wDxBvhE diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_rubber.rsi/mag-2.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_rubber.rsi/mag-2.png deleted file mode 100644 index c5b8b2b2b4bc9906d02d83196b552bb194ac1c53..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2243 zcmV;!2t4 zaB^>EX>4U6ba`-PAZ2)IW&i+q+U-|ca_cq>{pTvW1QH+!ayfj?bO&924=CEPebY>m zo1bMvEW}&Pv!Ul8l{w(2C zT;h$jodsw1)pwvaplWlz;h_YA#aD=7gc??ud+eb@#7L81ZX)W$o0ehzLY)nQXlGcY zjtdXYK%)aWHeBwqguQRE{jgca&LdzY1u!!dpHBBm`0n|{Xf1Q|5PZJd3UZP87sN2+ z?2c6cB&=go+4c?Y8vN^Fz#^ux%*>pjVD;@{(ImY27H^!{i^J0BuXqVM4g;77dkcgK z3dC@n1N4)VzeVND`GSMQY*{lcbb1S)QuO8dWr@YSyAPbBR!wiT~ z3_x5B0XQ@nWcY|8*=}Mn}c<~iW|L$oHOWt z0y$^UJs|fhZttKr>Q1-30kSBBO_3oP;kTl%l=1W59o_FT_@B|gmeDHHQK_PyXVyv$ zUWj|2@H$)rt@=6(I>D1Vz&skV?EPsZ*BLk=lyQ z&8f&f4cc^CRq&WfJRhKwNT`~+?E=L}1(dSxifR)HG6~7S4e97k5YkvYxUbHzSYbps zu4BNE5&h^ow6A~(4={+>X7;q|z}_^})ip@#^aKOx=Wnedy;F}2w)qpN6^|+dEvmj|-at+uw%cU1E=8(mq16lUYkI~a*9Quxw z?!yIa{%GdSZ4W47mrN0j;H5^c6MbRwuFcx|m`mnLh+Hd_aLzHeM?iQn)5FiMF^Ard z4)B!pV0rg5+2~?~Y;uwbrPd-`6Yg4DiWXpn&4S1SXl)T*sCWpkrA;GO1XeC6cnKBK zrOk9su;^2Oscq3LJs|)ONS;3@(bt`4qA1%0m6_6x@*N`NKlUVf_9R1~^ByL;(UMJx z<#y6J*{7z6Ms+8pa@0cS^tsV}VxjgfQW2QA`IweK(iBG!{I3`tO?7HT-I$1!HT*2y z8sw1?rfr<;I~O|E9nvTXm5RmpE)%)tH0Qyf*rx6);(s(=i~=eEdNK&B!-lB?hD0Jl zQby)X4P!mNP{PbN`-KLBYq7P?CUGK{awa74s}Pwh4a_Bfx{$apR-TiC8lj$zSkM*L z9n$2AWRJkk*7ad=M;iVJBT`DsDfZYRMb(b zSOg2DthaWK8lL0p9zMR_MR=C?xj#pb zk~10L6N%@TZdk+{#M7IW&Uv3W#EOzad`>)O&;^Mfxh}i>#<}3Iz%xTeIyp}qA{Gm6 zEVnT$8Y=M=aad6`$`>*&E1b7DtK}+d-jlyDnA28LT&FpN7?u!60wQEoQ9>COBD89x zm`Kuo)WbjE_!H!k$yEX)#{w!)Avu2VKlt6PnV+0+lY&to@M7B^!$9XQ(5Tt=_pxm^ zP5}QiaHX~Ul{zr{NqViNg^z&VZQ$a%rOA81K2b-rK)tn*IF%&dzeoQd&p>JXlk5O$ z$3MksfYSIU+X2*yf07(Pi})w0C|3RSgdt5rih<$nBNTD|Yug!~y?;6a8YD-*b28li z#)Og!7#J8B7(OvDJQ9>g8Lih5+Me-*Ch`006ztVz`pe RN;m)j002ovPDHLkV1n4>5p4hf diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_rubber.rsi/mag-3.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_rubber.rsi/mag-3.png deleted file mode 100644 index a563ffebf8b8132b3e85a07a11ae30ffe5bc679a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2243 zcmV;!2t4 zaB^>EX>4U6ba`-PAZ2)IW&i+q+U-|ca_cq>{pTvW1QH+!ayfj?bO&924=CEPebY>m zo1bMvEW}&PNOpg-H?A1RW5B6JYzI#3~TFcx#1fTD=f?Q-?12GIa zyJHmq3G3KYwta)U2LE~(u!w0aGc#u>Sbe)#Gzo9M#T#e#;;=OOD_(+*!vH42-U49) z0|B1`OGv>hk%j;}X5dpHIdP;01cErB0VydmCxDa5_Qp3F_F59U$Ve{$LO8Jkn!*)e z#V9c$-ZEUMI$?<-l0+p-k(xNgBq=3LmZz$+Miot}nzd-noMV=pvgVviu7wICjfpF% zXvw9NTCr)36}&3eR}dOCZm~&AOBWwgq4RH~@wnYB`b z7vkP0yiS)YlE||9sHk-k)?7L_#m7~BvhNq%pJy9uxUsrg<<${&fs%Fg0KVbIH$QMi zb$R4?_?bx2`GwNBAFSE>{^;I)0a>t14YSQewIakzMM%O3LD6&uq!KSn>XfB*q_$#n zb1Je=gEpO36+EUA&j;uv5~`+dyFf8g0i~?FqS{1)OhR&SLpr(>gftcp?yEB_Ru~bE z>liR(L_fL??JHoy0}LXznLVvKus02Lb^;_ zW1oXsD=0Yt9^I(2nP5b5+;YFYvH|5}%2D8^N$lAQIM@r?)b~Bp{f0{~r0XVi-@MCX z0>Ih}958ce8Q2Xa_-2AaHJ}SiJ+9{4EJ)gyTm$yaa_I$(Ib?C@K$gApWAtS^YqPdK=90M*BG(EfoO8_W5fEO?^zgH5%%S(A z13V=?Sl<0iHo6!go1A1qskI2#guB+3q6JuCvmo*ST3dt{DjvdXY17CRft3piUP6U* zX)~P@Ecz5+YFji*PYA#RlIPD!^mXT%D9ScLWu~;Fe1{16k3C7AJ;@O0yoZTyv}99a zxt(-Q_NghNQQb+Y9JSCneQtE0Sg5^=R0Jk&KBgs*G{q4F|0_mEQ=M8-Hzp!w4L?h_ z26<$JX&Wc|&V`P3hcrq;rDE~D%S5g@&3P~=wyFDy_#cfIqksy4o(#h3uwm+eA(4oX zl#w}8!&r|mlrZznexbqOT5PSeNu0=~oC!(%Dn#Z=19QorE+p=YmFMK3MyO{a7IcMm zhcvk&*(0#Cb$wXe(FTLWS7;>jz^Z9iC7YCp7W878pB=>gjH&;tj8Jq(aeo6fYg;rL zY`L5O00D(*LqkwWLqi~Na&Km7Y-Iodc$|HaJxIeq9K~N#iy{>VJBT`DsDfZYRMb(b zSOg2DthaWK8lL0p9zMR_MR=C?xj#pb zk~10L6N%@TZdk+{#M7IW&Uv3W#EOzad`>)O&;^Mfxh}i>#<}3Iz%xTeIyp}qA{Gm6 zEVnT$8Y=M=aad6`$`>*&E1b7DtK}+d-jlyDnA28LT&FpN7?u!60wQEoQ9>COBD89x zm`Kuo)WbjE_!H!k$yEX)#{w!)Avu2VKlt6PnV+0+lY&to@M7B^!$9XQ(5Tt=_pxm^ zP5}QiaHX~Ul{zr{NqViNg^z&VZQ$a%rOA81K2b-rK)tn*IF%&dzeo#RU;^DA3gbVLVIdUlgOoKLe%lPqG8B z#Q(r%L*!7Ps{^PN|0Fqp7V%F~QLOsu2}7EM6a&NCM=0X_*S0e}d;fF&)yub34FSf{zTt>>004=_W4HtL R+718!002ovPDHLkV1k|(`PKjc diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_rubber.rsi/mag-4.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_hc_mag_rubber.rsi/mag-4.png deleted file mode 100644 index 8a3db8895b71a0dda265632f3bbf952778509889..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2244 zcmV;#2s`(QP) zaB^>EX>4U6ba`-PAZ2)IW&i+q+U-|ca_cq>{pTvW1QH+!ayfj?bO&924=CEPebY>m zo1bMvEW}&Pq4RwkdXgy6eP?=u!+=FhW0{#bL&56X#iB`g^DW*uvloY@(O>ZrbQ}gS5%v}c z6Br2i6j(wEUWqgW*f9g23dxBhH6Reg2@Oa|5q=MFGTGkvM#El9LKhk71waTVRzOp@ z0<0J%Cd6BY3som9QACocWGPY;rZX{l+;t+d+VK0S8nscX-@^g3wpKnidp4IO!uQD>NN zr5UHpG#B77l8(fwFb_h8oDKHx|Lti5O-; zjA8)dY6!rg$uRRd#7KsmVde|5V-|vxV&IHmhylSk1IY?^?B0<3N8B8&`&HcNJ>;B0 z_Y=rDgYE&jUvYZ}wNZDvo^*pmy zYVbnb`-Io&QbiJ3Rv#6$PQsc?=cf3$s!#U)g8TDqV+}V}SF5}_qApOft{%WQ-1z1P zuBa}L91lMeDLTJU8ux=WTi+kuyDuOMcBx^unW$ETc&P|U7$GQ{&VW?nWl5c~w2stP zY;I0P_G!?j)2f2URO0ynokT*_)NL0iMk=6`byrlINRUZL4sJ+CcY=_{;=z4&hQ$ga z!f_n~hK%S(*P(p{On87n#5S|1RR{K_p{}kuDuk|RPz1j;(QWOS|I+9_Tp){s=-{>| z(qrs%P-_Jx2f(8nRW=ihD2`k1w^ufxoJ=_i+%$4kLNr0$z{ zc}xIUdw~OH4lM(_p#aZ*F@)5xZoHXap}ca-HZ4lXq>_*2i2jS3=}kp@egexjh2HiDC~Rj4*BEWZ${avF?yYNvKpTzIU0(HK#cb2E{gYUlISK@nRHE0nn2{SRFP@9WW#k z5t1@8XKEPh@r4p*zS%D{7+j03bvB6;xs)>@iC=}tTxnn~`O}5OeX;VK9MlN)Y{Y`D zuEX>4Tx0C=2zkv&MmKpe$iQ;Q-M2Rn#5WT=8*K~&UH zs#pXIrLEAagUO{|(4-+rad8w}3l4rPRvlcNb#-tR1i=pwCr2km7b)?7NufoI2gm(* zckglc4iM^PrkWk&fT~$WG8Ppx*;TRg6#)!Fz$j)UX6o_OVj7;~>mEM7-bHwp_qjhu zkCHPP;1h}Gm~L3a8^qI_md<&fIK+yQLVQjbR8c}179zB2 zq?kz3e$>N1;P?~dlF3y9BgXjAn;<_AHzWBF3_mi_V=-E zH%AOrG<}x-fiIGx~0i`z~v6m|D;QXG%;XZUO8@`>24YJ`L;(K) z{{a7>y{D4^000SaNLh0L04^f{04^f|c%?sf00007bV*G`2jm4C0xBgb5@6c^00A^f zL_t(o!(%*f-~huw0w#t52BQubb-<_t2HXKG137jBKSD7#J8BrW85+C&dwDIpEdHw+v$9!VEpv9S{~>XJC+%m0@_q@q{6O z9w8tnE5l%AVS@;f6Gs@VENmDaJzl{;mneW)I-t2AjAzMzx;vn(s)0dFT$q7@fq`Mw zml${&u(GgWSh0EqLswe^Z5{CHuRpawyQ%0n~_pk{v+p_$S!`SmJ+R zv*D^QF$3cOYWSRF2cX4212y8Gq@q~$(-Vd?2`L7Kw~tW7`LAtfc=rD32xyQT{m#j7 z`x_HVE?{6_U|{&f!0<>=nqf_HF2jPklWE%`diC-x!>gBXsTu-|qkY2>?*IT>tz@`B SSm{sz0000 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 delta 117 zcmV-*0E+*~0`mfpBmp{+CDTwD7)U6Jl|GziNRyCaV0iJAfq{boLNhQh@L#ycaE|#2 zId(HJFi;^1KHh&%k$$2>;L2YahBJYQSmk~nzrc{6+3t)500su~|63U9(XK b4739P{Ig)PHH?xN00000NkvXXu0mjftSo{; diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_base.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_base.rsi/icon.png deleted file mode 100644 index 285483cff7c72a0b01a614fe20e136e8b3b973e6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 372 zcmV-)0gL{LP)83@7Ix3C#J)z`zj6z`(`85I}1Oe0%$x zLEYGp!Q9dS(_zOikYpCwA%M%Wn`h56Fr@esZ3fkHfw`pt!{Y}p7`TKbNzzBM11f7~ z{)bu8=CTS!?%Uhv4DBuHw9N(I-acoLRghp{U|?XV+7m{qcFG-q4VYURkev9a>Hr1? z2D0LxWCu_?{z-NKwd0>;2Vet~#6MLWz`#I${FCGWTEss|4xmN+ljHzgfRgxUU?8zF z!dCmiKz?S!|B2HZNR9@Q9DvKWj~~1s)n3vaz$Gk+*CKLr0pn=bY}5e*?EnCG?P*A0 S*!jBv0000 zaB^>EX>4U6ba`-PAZ2)IW&i+q+U-|en&c)7eCHH70!RqKaro2s;*(o$)NxYd^|{&<^Z7p?x^Ln7U4MAq zAapTWzAnqY$9MG0>jBMo|9IaYbl!IAZRo!7Fvvc$&$ezSZ$nI1f4Z+jyItz#&2sLa zO={jHHYbkfpRSqs`gQyS|B15?MBAA;pML!ozwm_a69AuQAMlIw z?&lXAm!Ze9$_Je8{v@B{cTjrkQKIL}^wuNJPa%AZpRH=PuhsQj0^ln5q8>{*XBY@b zGoQx_4#iJ!uIFetYV2`>wS}dQ5C<+=A|P%lrkDo;bN-J}ASBt1sT_P$xSII!Npn)JdY7b&G^@jTU)HLGY*)v8T<<(jM1Qnl9FYH!pS zX-q;ZOUawS6yxO zoi?Pj^OjwX-0lBW}K z&cGPu1jf}FfS}1ai#6p;&YW`=8*yM3f|ugttmKS=!MqcRr6+eU=Dy2Y0J=ZR8-2!H zaO!>sbHS;5!`!#LeZt!6C*ATP$fFRLB11C5&vNWk@r_??!>=0n-_TbLf!%`OjT@Ov z3-3yu287V}=woUhtr=vcqd^JC%f4@Hfi8vwt7%VqZwtqp@(gN+8wHn&e{M_N{fMSr9cQZHvosKo|p!(Qm;UdepYhVR|@ zkyea1Vj>Do!d}I)_QsUTSdHK?g3OQ}5cld4wv8|bdlg*7nm7%`(x+nMPkRop9hama zbJ*@n4H?rHG@FkAl!#Ot;|6sj3s|asXHc?M$*Gtj(l3Omv>i&Cph}TbtpXv3<>m3N z3tPF3IJQ$&rOfPJBD;*}>r2wHm-|`p8t`=eVtX0VxtdsR>zp9f?e3{n)>ytF!jUC& z&b^?KO;}yq5}_wRR$Ya-f*`Fhl!yejkv}nJ#gY5XbwN?`W6};k5esLwT;Nm#c0&c? zs>@DDg4y>3(sr8O660Ou+-;4{wBU)#Mjd?|T~#z$ z?yJB_U8Gm!d8zX;T*6o5>`i+Fj1ZwTr+ZO+7fe!<43mY(OSINJlsF^JcP3iS${2Hj z6~7#PnGS0d_SB5}7qm=T9rqtHJWWSw*|JgdXzfR7O1+hhHB-Gvm{UMU`1Rnp+J~X< z1j!}uUCJv5!BKeO)x(Zp;_*5kpn$+kjtpLotD}1Nlk)^={STl><5p&t2+?DT#;(guUZ$a%H<#$B1DOOdzN>e9qoTTR&KAQXeB516%2x!nA@HU-4{x;c zdp!Ew!@*1Igr@;Mav9i-UYWD`dmS;y+h@eL#cV0-LcwuU1Xt;@2AL<&}y1W88S<=ed*%RtSx$zK) zx*d*7QsSkE41oha_JW|X-HCB90k{cgCC1k2N!2u z9b5%L@B_rj(Mi!oO8j3_Xc6PVaX;SOd)&PPgnF5&X4eFuYL=0VMa4{ZRrJ5Yhko=T zgh7d!dOWq5hU@schlj6s5uW9K?$6PuBbKWNovZACApA(N8 zbV1@ruFDR;aV|7j;F&=qot!5Q5{rcnmOGdg4V8GBIIO4|0qkw-GXw+=```ES{CxG`ExYFAGN*$Q}B)!(w!biZsHgIv>*5p0l zat9cG(j`M`N?w{mJ`cQ~(Kls*p4H?WW4KN*c`~m}ALI9U#H_x7DU`X+& ze=ab$G+=oA-~|Jhuq17>VP(xsxFu~at1zOby(OKt4*2%=IfJZ%1Oo#D14GrGu)$Ff znOho=ocO4o2FQtjk{v+p_$S!`)Q*3uL;)r7Pqj2aZv2zv09wR9Ne-Yz{8J?gD2acP zDR9}MJYHZV+_-auOi;PUO`2QO$J0$jq9cr79~7ch=?%|;zC&<+3qr7C4f$ry!& P00000NkvXXu0mjfVX9Kr diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_base.rsi/mag-2.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_base.rsi/mag-2.png deleted file mode 100644 index 046845943972d4584ed1ecddedf41835239f26f5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2350 zcmV+}3DNe6P) zaB^>EX>4U6ba`-PAZ2)IW&i+q+U-|cmgFW3{bv>$g}6?Rp1_w*z) zJ@c2?<-*8V2;D0ohyB-|7XH9Nxy4XeTGd)3j-o}WuI;5`@utD_L+UQbsKpr%5=%o-4A-3)a#q&+?P#K z7xB0ree4&3GZsT%ra(KV9M3;pGv({*xETK_7axeWXFocm^;`dir|Uj(;PdW-|Khym z`Q?sF(PLTlgP(4B;?Mney!6(hM9-P&twp&!iSVueY&Elet*)0E;I4Wv>amn_hk+6-Q*bfv<(!JM#U3Y6TUhD{aiF7#;BiYOt<;mHecG8OOf0lX&=O5}++{5bDNTR@ zApA^560+u%8&H`*E<;RDThf_VeLhUqF!M?nNeRk;@%uA;6nyo3r^w7{o>FX2U%@VN ze!&b!&i^qAfF!$p%E!McTuuCVIItNA@^N#+0(%^nioxl{t$c9KkpqU7c*RSSbt{02 zFgL@Plz~93DRZhR3X!A)KQ`dgVL5^J0|+DzObb?0$+-fYMm{&*k#xoq(dN+wiLj{#W!>ML@SAc;iMU zlbUy6I!342v5(lt}6V=2L41eqZ{AnwH@Y#U(=_9~c&HRUt}OP_*`KkYfZc3hkS z&tbbSF=R|%&{Q7*S0YkvjN7RjS-?{3y8x24YDv`$k$!oYs_szJ1XO~YY7HK8x4bOg zZDA|75yy6@8rNCeN@SN2eSL{L_Hw@qUIQM{FSeH=nM>J$6JU6?sBHFJPIpI-Wmhc$$vVQj3v#wD!X^p{{jf&D1Us=48MTemyv@_MzxI zL2}W1*ZRsqFcemJ^{^w5c)S#@*WsVs@v(RrtL^7a3ja3XvJe?p%B%|KYM!&2vl|{{ zQEUjcvZ1Q=ZNU58P)wlgKz|3pR;y+kf28-_q>oo@xi2LXt;qFAL<<0vb+L0S<>p-#S`j8x$z)~ zI6>n2m^j04D2@ILicpv>4Sxd*dwx!itzpps00D(*LqkwWLqi~Na&Km7Y-Iodc$|Ha zJxIeq9K~N#OGT?9b`a^1p*mR*6>*d*7QsSkE41oha_JW|X-HCB90k{cgCC1k2N!2u z9b5%L@B_rj(Mi!oO8j3_Xc6PVaX;SOd)&PPgnF5&X4eFuYL=0VMa4{ZRrJ5Yhko=T zgh7d!dOWq5hU@schlj6s5uW9K?$6PuBbKWNovZACApA(N8 zbV1@ruFDR;aV|7j;F&=qot!5Q5{rcnmOGdg4V8GBIIO4|0qkw-GXw+=```ES{CxG`ExYFAGN*$Q}B)!(w!biZsHgIv>*5p0l zat9cG(j`M`N?w{mJ`cQ~(Kls*p4H?WW4KN*c`~m}ALI9U#H_x7DU`X+& ze=ab$G+=oA-~|Jhuq17>VP(xsxFu~atNx=$O?yi^Z5{CK?Q;fM1qlWQ1_p+zJzt(E2FQ(nk{m#b_$SE$w1|JI zL;)r7PjY31t@eX~{LBW1iPIZs>i}H7ef;1B?L&Y|SQ4*Ai_@% diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_base.rsi/mag-3.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_base.rsi/mag-3.png deleted file mode 100644 index 06f19ec207247013648af5534e55286eb6d5547d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2351 zcmV+~3DEY5P) zaB^>EX>4U6ba`-PAZ2)IW&i+q+U-|cmgOc4{AU$e0tkfAa(L;S>>$fe3H#pL-P4oI z^vqx4`@qInh^ms1!~W|}3xD9C++rv!t!k|iN716xanj;-Ty2Ww{GWsFTeyDLAD%Y| zT^Vh@F6+L>cl7h?0V#L?c;6pn-geq;=)UnVn0;oSZQV}ZhB96K>AntnyVUEO<=j7; zq~68jy7lq82*6kjdzk|5oN_$>bj_5nU&oK}pK|emXnXdf=aN6cFFc|91i{*XBY@b z4;&4i)hPHe&gFa*pB8(ZU~OTkBgBCVO$5X(m9$b%miB39nsBkuCP7Oyfw=dzETl9+ z28i%aGLn!ruiU`O1aleP^z?4zgpVCx{k$_|<}yzywkKBb zi(FrD!$o5Iz^kB1YR!5|-)8y48(xJ(RAFKy++bB-J^w8Sf3lC0YR zAi~@XXHo_Ov8K$arYJ;`5^!wbr^9oC><1V~9GDioq>^(5IgNa7JR|9hC8nzz=>vW&3>tZq!J`ftZRqF|@|k7wtW##2I{TuP7g9i2b;)W= zSKnzvO1o^{b<1vBcQiCe}=?KUuq3eb3rQ=Kh(rbhAc>C?6*;*3d2TFp)f+ zuyY2+s3b5h&Hw~W&RJ}!6msUAv#69q&P?!Tm7WldueRY=4g7EDtA@aCMexRr zOeQt&Mx6$P(D&$LN*}5QS;; zHrdH9BQ%vUD#CKzeMHk?P;0QE(5$+BN;}fBIxPAljgWeC;e=XjkSO*-Kle)JlQw+s z#*egYc_Stw<0R}=tw`5Qsg9)thY@6k^nkb*kFafoG1#l%BG#1C5G;KPHvY8d@Y->4 z3OtAHzQm9*eL+)w1fWEu+88&e8(F|o>$`xGwQ5P#43T~zOjUQNX@V+2PPGPv9F~{I zyDe)$Q)7mDgClA;OWx zbI!e>kxf{gZjR6sAZxBdTtSdlGn9w~wvj(EX2ntZ&2>dl@?+8tKM@OOwo>7g0=pp$ zakXV9BuW4q$mTTX*c}Y+?U!tQIrEw!@KRBnFDwh4eL|S)puACub*aW1Nq_gS7?m;S z1V}ndE_Iv;YkgM9yJG8j@Du-WmEkLqjtOSp6G+=>x~7bGk#kp-&a~i(>P8)X99@ki zS?R07Nm(RUN^uHXJw4J zz=~gvzD$NGg*~O9{sk?QR>%E^3{TThT52&;kJf&aCe*cVteM(H!ki2`!mkI%)jkY; zCrB=N?^<6u2#&%FuO4;;6OV_&^*Hd!9WRTQv)X>%rSNY9E)S7$rOc`TSM!|JT-`vB zMX@2&%7&`ew*kNIhGGI`2lA8nYu{?sD+hGeJa=s;rZ^%Z5cZD0@s;hgjS<5lm_TrO zRR%b6R)gM@+YxbZsr}gM!VklcEY~BnDeL5_f{Nky__({Cl&=WV!SF_%hc{aJ zJsy4T;mAwcgr@;M<~pz&y)vizdmS73F>!|9P#XOg452Vv8vX{5+*d*7QsSkE41oha_JW|X-HCB90k{cgCC1k2N!2u z9b5%L@B_rj(Mi!oO8j3_Xc6PVaX;SOd)&PPgnF5&X4eFuYL=0VMa4{ZRrJ5Yhko=T zgh7d!dOWq5hU@schlj6s5uW9K?$6PuBbKWNovZACApA(N8 zbV1@ruFDR;aV|7j;F&=qot!5Q5{rcnmOGdg4V8GBIIO4|0qkw-GXw+=```ES{CxG`ExYFAGN*$Q}B)!(w!biZsHgIv>*5p0l zat9cG(j`M`N?w{mJ`cQ~(Kls*p4H?WW4KN*c`~m}ALI9U#H_x7DU`X+& ze=ab$G+=oA-~|Jhuq17>VP(xsxFu~atNx=$O?yi^Z5{CK?Q;fM1qlWQ1_p+zJzY5@y|ew_$SE$Xz@RI z8YGm&KgpF5w%QK{@-rJ4CQfgltpjlR_VI%kv=0F;VM)9ek(&z`N4sXD4j5<$002uT VXGtr3tlR(q002ovPDHLkV1iu4R%rkL diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_base.rsi/mag-4.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_base.rsi/mag-4.png deleted file mode 100644 index 5b9929303c7bcef5666c7f87b6791dfc56f07649..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2347 zcmV+`3Dow9P) zaB^>EX>4U6ba`-PAZ2)IW&i+q+U-|en&c)7eCHH70tkfAaro2sX;o{DIEogfj*Awr<7!hZ=l?nAeuVpX{o(n5 z(3R2V>$dKDd`CaOUXXJ4kN5pS=543lhVBOsgV|^H+1BmkZ79>#pYHphw@bagSH~gp z-u?Ln$7SfTtoi|`yFc;g_#KqqdX(rnGrjdFm!}ZE#m`nV+t=!PsR3}+dr^<2oGT0j zq$Qu%Do(+VaV_UmoGtb^!P>%7M~DMAnh1znDru#jEbY_IG~r^QO@fwa0&(waSx9Mu z3=rXGGLn!ruiU`I1aleP^z?2d!^e)Vp6?8qxy)0F?THoq zBG(t(aOV6!MuCuIH>P~>P2pTscP?-w3iNB9pgJX28}$*;8BN+Hgxm}`OGqT)+w`1oqf^D3n?J1x@5Jb ztM9ZSrCm1fx@EVmyBoA-*^04M6Kkf{pRC=izGv+tbN|d*x>=(`l#i1aYv>kvm`I*Z z*f|4ZR1z2$X8?jG=Pb5V3ORGmSyaj)XC`>bPR>fs7#J)&5nFn4_hRn5yak~9v%Jw~ z%mt_JcQ6;6x;M;y%iAZct$xyNJ_LCb0#jtjjPSD(J2m{pueRY=4g7EDtA@aCMexRr zOeQt&Mx6$P(D&$LN*}5QS;YQblY>; zHrdH4 z3OtAHzQm9*eL+)w1fWEu+88&e8(F|o>$`xGwQ5P#43T~zOjUQNX@V+2PPGPv9F~{I zyDekxf{gZjR6sAZxBd+(D35Gn9w~wvj(EX2ntZ&2>dl@?+8tKM@OOwo>7g0=pp$ zakXV9BuW4q$mTTX*c}Y+?YC@wIrEw!@KRBnFDwh4eL|S)puACub*aW1Nq_gS7?m;S z1V}ndE_Iv;YkgM9yJG8j@Du-WmEkLqjtOSp6G+=>x~7b8k@HlQ&a~i(>P8)X99@ki zS?R07Nm(RUN^uHXJw4J zz>43FzD$NGg*~O9{sk?QR>$*)3{T@99$JjlqqQHU33aU-Yo>OQFeihK@aw^GwGTtz z36e|RyVh3@f}`-ltA`!I#N(xKy$*bG$H(I3thS$bDg4`j%R^*bDYGiT)jVf4S2qx3 zQEUjcvZ1Q=ZNTrlp_o9~f&3)?*|%Et$^o4<&t2PzDUOH;guUZ$d}TXrW5losCJv^N)u1=!c0}A;YCpER@WU`9%k>Ct$~w8KprX1TPL1IaKJKn3) zk4K+-IP#J<;c0-6xen|`ugt0bU588qUOdkt?L^Nz(_KRVacU@0*GqLrKOz6BfbKSY z-|-CvA2QiDcf*Gfq7GXZM9?FWdtOMP_+ZjAG~C3C4|R=fSzdvhENOM^;t6%4+;|8? zTp)3MOq}62lt%vrLnzFahQ9&U;C@R_gc$??00D(*LqkwWLqi~Na&Km7Y-Iodc$|Ha zJxIeq9K~N#OGT?9b`a^1p*mR*6>*d*7QsSkE41oha_JW|X-HCB90k{cgCC1k2N!2u z9b5%L@B_rj(Mi!oO8j3_Xc6PVaX;SOd)&PPgnF5&X4eFuYL=0VMa4{ZRrJ5Yhko=T zgh7d!dOWq5hU@schlj6s5uW9K?$6PuBbKWNovZACApA(N8 zbV1@ruFDR;aV|7j;F&=qot!5Q5{rcnmOGdg4V8GBIIO4|0qkw-GXw+=```ES{CxG`ExYFAGN*$Q}B)!(w!biZsHgIv>*5p0l zat9cG(j`M`N?w{mJ`cQ~(Kls*p4H?WW4KN*c`~m}ALI9U#H_x7DU`X+& ze=ab$G+=oA-~|Jhuq17>VP(xsxFu~atNx=$O?yi^Z5{CK?Q;fM1qlWQ1_p+zJzY{h<}nCK#TaNN)%8M z|0GvN*lIr*$j@wGm^i(GwhqAM+s6-H&^`pXgeCD>L~br%9POHoI$)q3005owXi2=h Ru}J^`002ovPDHLkV1gOGSmFQx diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_base.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_base.rsi/meta.json deleted file mode 100644 index 43b96fbef7..0000000000 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_base.rsi/meta.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi", - "states": [ - { - "name": "icon" - }, - { - "name": "base" - }, - { - "name": "mag-1" - }, - { - "name": "mag-2" - }, - { - "name": "mag-3" - }, - { - "name": "mag-4" - } - ] -} \ No newline at end of file diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_flash.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_flash.rsi/icon.png deleted file mode 100644 index b4c2878453eb14bf04f2b607b2825d5609daa1ed..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 411 zcmV;M0c8G(P)83@7Ix3C#J)z`zj6z`(`85I}1Oe0%$x zLEYGp!Q9dS(_zOikYpCwA%M%Wn`h56Fr@esZ3fkHfw`pt!{Y}p7`TKbNzzBM11f7~ z{)bu8=CTS!?%Uhv4DBuHw9N(I-acoLRghp{U|?XV+7m{qcFG-q4VYURkev9a>Hr1? z2D0LxWCu_?{z-NKwd0>;2Vet~#6MLWz`#I${FCGWTEssC0|`a3sPGR4Vi}4EdQ2B((!z zfTY?GS89L!-~~B$ljZ;}VM)9ek(&z`N4sXD4j5<$003)PYwhID&@uo3002ovPDHLk FV1jdwtGECF diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_flash.rsi/mag-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_flash.rsi/mag-1.png deleted file mode 100644 index ef549ebdfc5aa77cdbfe3a615a72486554625d41..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2345 zcmV+^3D)+BP) zaB^>EX>4U6ba`-PAZ2)IW&i+q+U-|en&c)7eCHH70!RqKaro2s;*(o$)NxYd^|{&<^Z7p?x^Ln7U4MAq zAapTWzAnqY$9MG0>jBMo|9IaYbl!IAZRo!7Fvvc$&$ezSZ$nI1f4Z+jyItz#&2sLa zO={jHHYbkfpRSqs`gQyS|B15?MBAA;pML!ozwm_a69AuQAMlIw z?&lXAm!Ze9$_Je8{v@B{cTjrkQKIL}^wuNJPa%AZpRH=PuhsQj0^ln5q8>{*XBY@b zGoQx_4#iJ!uIFetYV2`>wS}dQ5C<+=A|P%lrkDo;bN-J}ASBt1sT_P$xSII!Npn)JdY7b&G^@jTU)HLGY*)v8T<<(jM1Qnl9FYH!pS zX-q;ZOUawS6yxO zoi?Pj^OjwX-0lBW}K z&cGPu1jf}FfS}1ai#6p;&YW`=8*yM3f|ugttmKS=!MqcRr6+eU=Dy2Y0J=ZR8-2!H zaO!>sbHS;5!`!#LeZt!6C*ATP$fFRLB11C5&vNWk@r_??!>=0n-_TbLf!%`OjT@Ov z3-3yu287V}=woUhtr=vcqd^JC%f4@Hfi8vwt7%VqZwtqp@(gN+8wHn&e{M_N{fMSr9cQZHvosKo|p!(Qm;UdepYhVR|@ zkyea1Vj>Do!d}I)_QsUTSdHK?g3OQ}5cld4wv8|bdlg*7nm7%`(x+nMPkRop9hama zbJ*@n4H?rHG@FkAl!#Ot;|6sj3s|asXHc?M$*Gtj(l3Omv>i&Cph}TbtpXv3<>m3N z3tPF3IJQ$&rOfPJBD;*}>r2wHm-|`p8t`=eVtX0VxtdsR>zp9f?e3{n)>ytF!jUC& z&b^?KO;}yq5}_wRR$Ya-f*`Fhl!yejkv}nJ#gY5XbwN?`W6};k5esLwT;Nm#c0&c? zs>@DDg4y>3(sr8O660Ou+-;4{wBU)#Mjd?|T~#z$ z?yJB_U8Gm!d8zX;T*6o5>`i+Fj1ZwTr+ZO+7fe!<43mY(OSINJlsF^JcP3iS${2Hj z6~7#PnGS0d_SB5}7qm=T9rqtHJWWSw*|JgdXzfR7O1+hhHB-Gvm{UMU`1Rnp+J~X< z1j!}uUCJv5!BKeO)x(Zp;_*5kpn$+kjtpLotD}1Nlk)^={STl><5p&t2+?DT#;(guUZ$a%H<#$B1DOOdzN>e9qoTTR&KAQXeB516%2x!nA@HU-4{x;c zdp!Ew!@*1Igr@;Mav9i-UYWD`dmS;y+h@eL#cV0-LcwuU1Xt;@2AL<&}y1W88S<=ed*%RtSx$zK) zx*d*7QsSkE41oha_JW|X-HCB90k{cgCC1k2N!2u z9b5%L@B_rj(Mi!oO8j3_Xc6PVaX;SOd)&PPgnF5&X4eFuYL=0VMa4{ZRrJ5Yhko=T zgh7d!dOWq5hU@schlj6s5uW9K?$6PuBbKWNovZACApA(N8 zbV1@ruFDR;aV|7j;F&=qot!5Q5{rcnmOGdg4V8GBIIO4|0qkw-GXw+=```ES{CxG`ExYFAGN*$Q}B)!(w!biZsHgIv>*5p0l zat9cG(j`M`N?w{mJ`cQ~(Kls*p4H?WW4KN*c`~m}ALI9U#H_x7DU`X+& ze=ab$G+=oA-~|Jhuq17>VP(xsxFu~at1zOby(OKt4*2%=IfJZ%1Oo#D14GrGu)$Ff znOho=ocO4o2FQtjk{v+p_$S!`)Q*3uL;)r7Pqj2aZv2zv09wR9Ne-Yz{8J?gD2acP zDR9}MJYHZV+_-auOi;PUO`2QO$J0$jq9cr79~7ch=?%|;zC&<+3qr7C4f$ry!& P00000NkvXXu0mjfVX9Kr diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_flash.rsi/mag-2.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_flash.rsi/mag-2.png deleted file mode 100644 index 046845943972d4584ed1ecddedf41835239f26f5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2350 zcmV+}3DNe6P) zaB^>EX>4U6ba`-PAZ2)IW&i+q+U-|cmgFW3{bv>$g}6?Rp1_w*z) zJ@c2?<-*8V2;D0ohyB-|7XH9Nxy4XeTGd)3j-o}WuI;5`@utD_L+UQbsKpr%5=%o-4A-3)a#q&+?P#K z7xB0ree4&3GZsT%ra(KV9M3;pGv({*xETK_7axeWXFocm^;`dir|Uj(;PdW-|Khym z`Q?sF(PLTlgP(4B;?Mney!6(hM9-P&twp&!iSVueY&Elet*)0E;I4Wv>amn_hk+6-Q*bfv<(!JM#U3Y6TUhD{aiF7#;BiYOt<;mHecG8OOf0lX&=O5}++{5bDNTR@ zApA^560+u%8&H`*E<;RDThf_VeLhUqF!M?nNeRk;@%uA;6nyo3r^w7{o>FX2U%@VN ze!&b!&i^qAfF!$p%E!McTuuCVIItNA@^N#+0(%^nioxl{t$c9KkpqU7c*RSSbt{02 zFgL@Plz~93DRZhR3X!A)KQ`dgVL5^J0|+DzObb?0$+-fYMm{&*k#xoq(dN+wiLj{#W!>ML@SAc;iMU zlbUy6I!342v5(lt}6V=2L41eqZ{AnwH@Y#U(=_9~c&HRUt}OP_*`KkYfZc3hkS z&tbbSF=R|%&{Q7*S0YkvjN7RjS-?{3y8x24YDv`$k$!oYs_szJ1XO~YY7HK8x4bOg zZDA|75yy6@8rNCeN@SN2eSL{L_Hw@qUIQM{FSeH=nM>J$6JU6?sBHFJPIpI-Wmhc$$vVQj3v#wD!X^p{{jf&D1Us=48MTemyv@_MzxI zL2}W1*ZRsqFcemJ^{^w5c)S#@*WsVs@v(RrtL^7a3ja3XvJe?p%B%|KYM!&2vl|{{ zQEUjcvZ1Q=ZNU58P)wlgKz|3pR;y+kf28-_q>oo@xi2LXt;qFAL<<0vb+L0S<>p-#S`j8x$z)~ zI6>n2m^j04D2@ILicpv>4Sxd*dwx!itzpps00D(*LqkwWLqi~Na&Km7Y-Iodc$|Ha zJxIeq9K~N#OGT?9b`a^1p*mR*6>*d*7QsSkE41oha_JW|X-HCB90k{cgCC1k2N!2u z9b5%L@B_rj(Mi!oO8j3_Xc6PVaX;SOd)&PPgnF5&X4eFuYL=0VMa4{ZRrJ5Yhko=T zgh7d!dOWq5hU@schlj6s5uW9K?$6PuBbKWNovZACApA(N8 zbV1@ruFDR;aV|7j;F&=qot!5Q5{rcnmOGdg4V8GBIIO4|0qkw-GXw+=```ES{CxG`ExYFAGN*$Q}B)!(w!biZsHgIv>*5p0l zat9cG(j`M`N?w{mJ`cQ~(Kls*p4H?WW4KN*c`~m}ALI9U#H_x7DU`X+& ze=ab$G+=oA-~|Jhuq17>VP(xsxFu~atNx=$O?yi^Z5{CK?Q;fM1qlWQ1_p+zJzt(E2FQ(nk{m#b_$SE$w1|JI zL;)r7PjY31t@eX~{LBW1iPIZs>i}H7ef;1B?L&Y|SQ4*Ai_@% diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_flash.rsi/mag-3.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_flash.rsi/mag-3.png deleted file mode 100644 index 06f19ec207247013648af5534e55286eb6d5547d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2351 zcmV+~3DEY5P) zaB^>EX>4U6ba`-PAZ2)IW&i+q+U-|cmgOc4{AU$e0tkfAa(L;S>>$fe3H#pL-P4oI z^vqx4`@qInh^ms1!~W|}3xD9C++rv!t!k|iN716xanj;-Ty2Ww{GWsFTeyDLAD%Y| zT^Vh@F6+L>cl7h?0V#L?c;6pn-geq;=)UnVn0;oSZQV}ZhB96K>AntnyVUEO<=j7; zq~68jy7lq82*6kjdzk|5oN_$>bj_5nU&oK}pK|emXnXdf=aN6cFFc|91i{*XBY@b z4;&4i)hPHe&gFa*pB8(ZU~OTkBgBCVO$5X(m9$b%miB39nsBkuCP7Oyfw=dzETl9+ z28i%aGLn!ruiU`O1aleP^z?4zgpVCx{k$_|<}yzywkKBb zi(FrD!$o5Iz^kB1YR!5|-)8y48(xJ(RAFKy++bB-J^w8Sf3lC0YR zAi~@XXHo_Ov8K$arYJ;`5^!wbr^9oC><1V~9GDioq>^(5IgNa7JR|9hC8nzz=>vW&3>tZq!J`ftZRqF|@|k7wtW##2I{TuP7g9i2b;)W= zSKnzvO1o^{b<1vBcQiCe}=?KUuq3eb3rQ=Kh(rbhAc>C?6*;*3d2TFp)f+ zuyY2+s3b5h&Hw~W&RJ}!6msUAv#69q&P?!Tm7WldueRY=4g7EDtA@aCMexRr zOeQt&Mx6$P(D&$LN*}5QS;; zHrdH9BQ%vUD#CKzeMHk?P;0QE(5$+BN;}fBIxPAljgWeC;e=XjkSO*-Kle)JlQw+s z#*egYc_Stw<0R}=tw`5Qsg9)thY@6k^nkb*kFafoG1#l%BG#1C5G;KPHvY8d@Y->4 z3OtAHzQm9*eL+)w1fWEu+88&e8(F|o>$`xGwQ5P#43T~zOjUQNX@V+2PPGPv9F~{I zyDe)$Q)7mDgClA;OWx zbI!e>kxf{gZjR6sAZxBdTtSdlGn9w~wvj(EX2ntZ&2>dl@?+8tKM@OOwo>7g0=pp$ zakXV9BuW4q$mTTX*c}Y+?U!tQIrEw!@KRBnFDwh4eL|S)puACub*aW1Nq_gS7?m;S z1V}ndE_Iv;YkgM9yJG8j@Du-WmEkLqjtOSp6G+=>x~7bGk#kp-&a~i(>P8)X99@ki zS?R07Nm(RUN^uHXJw4J zz=~gvzD$NGg*~O9{sk?QR>%E^3{TThT52&;kJf&aCe*cVteM(H!ki2`!mkI%)jkY; zCrB=N?^<6u2#&%FuO4;;6OV_&^*Hd!9WRTQv)X>%rSNY9E)S7$rOc`TSM!|JT-`vB zMX@2&%7&`ew*kNIhGGI`2lA8nYu{?sD+hGeJa=s;rZ^%Z5cZD0@s;hgjS<5lm_TrO zRR%b6R)gM@+YxbZsr}gM!VklcEY~BnDeL5_f{Nky__({Cl&=WV!SF_%hc{aJ zJsy4T;mAwcgr@;M<~pz&y)vizdmS73F>!|9P#XOg452Vv8vX{5+*d*7QsSkE41oha_JW|X-HCB90k{cgCC1k2N!2u z9b5%L@B_rj(Mi!oO8j3_Xc6PVaX;SOd)&PPgnF5&X4eFuYL=0VMa4{ZRrJ5Yhko=T zgh7d!dOWq5hU@schlj6s5uW9K?$6PuBbKWNovZACApA(N8 zbV1@ruFDR;aV|7j;F&=qot!5Q5{rcnmOGdg4V8GBIIO4|0qkw-GXw+=```ES{CxG`ExYFAGN*$Q}B)!(w!biZsHgIv>*5p0l zat9cG(j`M`N?w{mJ`cQ~(Kls*p4H?WW4KN*c`~m}ALI9U#H_x7DU`X+& ze=ab$G+=oA-~|Jhuq17>VP(xsxFu~atNx=$O?yi^Z5{CK?Q;fM1qlWQ1_p+zJzY5@y|ew_$SE$Xz@RI z8YGm&KgpF5w%QK{@-rJ4CQfgltpjlR_VI%kv=0F;VM)9ek(&z`N4sXD4j5<$002uT VXGtr3tlR(q002ovPDHLkV1iu4R%rkL diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_flash.rsi/mag-4.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_flash.rsi/mag-4.png deleted file mode 100644 index 5b9929303c7bcef5666c7f87b6791dfc56f07649..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2347 zcmV+`3Dow9P) zaB^>EX>4U6ba`-PAZ2)IW&i+q+U-|en&c)7eCHH70tkfAaro2sX;o{DIEogfj*Awr<7!hZ=l?nAeuVpX{o(n5 z(3R2V>$dKDd`CaOUXXJ4kN5pS=543lhVBOsgV|^H+1BmkZ79>#pYHphw@bagSH~gp z-u?Ln$7SfTtoi|`yFc;g_#KqqdX(rnGrjdFm!}ZE#m`nV+t=!PsR3}+dr^<2oGT0j zq$Qu%Do(+VaV_UmoGtb^!P>%7M~DMAnh1znDru#jEbY_IG~r^QO@fwa0&(waSx9Mu z3=rXGGLn!ruiU`I1aleP^z?2d!^e)Vp6?8qxy)0F?THoq zBG(t(aOV6!MuCuIH>P~>P2pTscP?-w3iNB9pgJX28}$*;8BN+Hgxm}`OGqT)+w`1oqf^D3n?J1x@5Jb ztM9ZSrCm1fx@EVmyBoA-*^04M6Kkf{pRC=izGv+tbN|d*x>=(`l#i1aYv>kvm`I*Z z*f|4ZR1z2$X8?jG=Pb5V3ORGmSyaj)XC`>bPR>fs7#J)&5nFn4_hRn5yak~9v%Jw~ z%mt_JcQ6;6x;M;y%iAZct$xyNJ_LCb0#jtjjPSD(J2m{pueRY=4g7EDtA@aCMexRr zOeQt&Mx6$P(D&$LN*}5QS;YQblY>; zHrdH4 z3OtAHzQm9*eL+)w1fWEu+88&e8(F|o>$`xGwQ5P#43T~zOjUQNX@V+2PPGPv9F~{I zyDekxf{gZjR6sAZxBd+(D35Gn9w~wvj(EX2ntZ&2>dl@?+8tKM@OOwo>7g0=pp$ zakXV9BuW4q$mTTX*c}Y+?YC@wIrEw!@KRBnFDwh4eL|S)puACub*aW1Nq_gS7?m;S z1V}ndE_Iv;YkgM9yJG8j@Du-WmEkLqjtOSp6G+=>x~7b8k@HlQ&a~i(>P8)X99@ki zS?R07Nm(RUN^uHXJw4J zz>43FzD$NGg*~O9{sk?QR>$*)3{T@99$JjlqqQHU33aU-Yo>OQFeihK@aw^GwGTtz z36e|RyVh3@f}`-ltA`!I#N(xKy$*bG$H(I3thS$bDg4`j%R^*bDYGiT)jVf4S2qx3 zQEUjcvZ1Q=ZNTrlp_o9~f&3)?*|%Et$^o4<&t2PzDUOH;guUZ$d}TXrW5losCJv^N)u1=!c0}A;YCpER@WU`9%k>Ct$~w8KprX1TPL1IaKJKn3) zk4K+-IP#J<;c0-6xen|`ugt0bU588qUOdkt?L^Nz(_KRVacU@0*GqLrKOz6BfbKSY z-|-CvA2QiDcf*Gfq7GXZM9?FWdtOMP_+ZjAG~C3C4|R=fSzdvhENOM^;t6%4+;|8? zTp)3MOq}62lt%vrLnzFahQ9&U;C@R_gc$??00D(*LqkwWLqi~Na&Km7Y-Iodc$|Ha zJxIeq9K~N#OGT?9b`a^1p*mR*6>*d*7QsSkE41oha_JW|X-HCB90k{cgCC1k2N!2u z9b5%L@B_rj(Mi!oO8j3_Xc6PVaX;SOd)&PPgnF5&X4eFuYL=0VMa4{ZRrJ5Yhko=T zgh7d!dOWq5hU@schlj6s5uW9K?$6PuBbKWNovZACApA(N8 zbV1@ruFDR;aV|7j;F&=qot!5Q5{rcnmOGdg4V8GBIIO4|0qkw-GXw+=```ES{CxG`ExYFAGN*$Q}B)!(w!biZsHgIv>*5p0l zat9cG(j`M`N?w{mJ`cQ~(Kls*p4H?WW4KN*c`~m}ALI9U#H_x7DU`X+& ze=ab$G+=oA-~|Jhuq17>VP(xsxFu~atNx=$O?yi^Z5{CK?Q;fM1qlWQ1_p+zJzY{h<}nCK#TaNN)%8M z|0GvN*lIr*$j@wGm^i(GwhqAM+s6-H&^`pXgeCD>L~br%9POHoI$)q3005owXi2=h Ru}J^`002ovPDHLkV1gOGSmFQx diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_flash.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_flash.rsi/meta.json deleted file mode 100644 index 43b96fbef7..0000000000 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_flash.rsi/meta.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi", - "states": [ - { - "name": "icon" - }, - { - "name": "base" - }, - { - "name": "mag-1" - }, - { - "name": "mag-2" - }, - { - "name": "mag-3" - }, - { - "name": "mag-4" - } - ] -} \ No newline at end of file diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_h.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_h.rsi/base.png deleted file mode 100644 index fbe93746f123d92702a71b1f23239206b9a2a06b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 347 zcmV-h0i^zkP)w$;zOJ2v;* zV-8s%@apAT1~GAAtd4l}_z6Q-TLaOdL6!p;7#JAjWMvqvENtNXV<(O zBy-4i0L)TK0Y$k0JqqaJfU>HF|6=083=9mAXn+AL3mb+Nt5=W||71Df)yuai7E>Au z6c^gAcR?Qcw&3GWjF!y`dyhBe8#{};@iOmZ}k tR2#l}`Ih0;%eSQ3ffq22_6vj92=A%mzM<-ug|l z4r_m?pJd$9QP0LE)RlDA-(TXA$`T2Qdv;EO&-ZVe`|#%P zaB^>EX>4U6ba`-PAZ2)IW&i+q+U-|ca_cq>{pTvW1Ogxkayfj?bO&924=LKQoiuZk zo1bHfgMoV^QbDdreGj*vsle&6}pNv^BlQrt-t3rP~@ED`r0^xl5%Zn_T)c%Qx4&)+1IH*;K! zZfeCBI~_Xd3tjHp@RLNu_nrAsqMp6^$K%0%bM`dnxU?%FI+!aSrEaS185UNUQ}$;O zr{Pk}ZJ!xu^2Ilx)}d;3zTzPh!{U{`FYE3J}z7<^%-!7XYCM5d${cDp+4Ys9dFnsx?-tspeW5+^2=6EjDYZT=R~ljH zh{Hx2d6WrXn=-@H8K=!O^DKAN4ywWK6c4I*+o#?_0h;bkw zZVLf8G%w72q7Zl?w=naW#R>8jq|^mYr-c|041-uF-LZQ^?jLb;uXyV z#Jvr8olP?&k-6%lq1GwQF>P#$53~5VzMpV^8MV*u`fRo;uk~OPlw`9J_|lDUdf=kY5$DZka!=)$Eb=9(O-laYO zU}+f+n1pHqcHJ1h8KF=ibYZcDS$!QDN&Awk!@fx`y@0V$Qil#?u6Mro7BA!QccgTm zE|BGq%e<-X0Y&VRDWDO&)JSEZFO1&RQEKaB>X;Fcy9ypwoMghW)&SRpyOtWm3a~88g2)4CZ4q9mcnGg))q)fRR>~-N5f#$K z&2$W~XhVVN+M=%XgaAAsdHFSozV18&MR`q7nK|w#-yy>Ob5GJ|Pg)2x*~36Ln$uEZ zx}9`R_9-!-QQb)?AGOdq{o3e$VWG9AS`e7H`4Fc<(il1^{#W#draIPat`9`Y?0)37 z8swf3rnR5!J0?2T9nvTXh4YHAXL-p<5JP+(F2wpz?`b5zDRvpJt#^x-@R*3&=Qx6 zDQe%(EX>4Tx0C=2zkv&Mm zKpe$iQ%j3fI@m$PAwzYtAS&W0RV;#q(pG5I!Q|2}Xws0RxHt-~1qVMCs}3&Cx;nTD zg5U>;lcSTOiU7TlmpZjwRC`FS2K9P8i>4rtTK|Hf*>74h8qpTt+#OK8023?T& zk?XR{Z=A~x3p_Jwoq#;5^169;uAx^7Ciir&ECp`Sajz3KHMh6UK29Hi9CfvP0~{OzV`a)-_jq@xx3_=Kbo%=N z@ZfTD?z3b800006VoOIv0RI600RN!9r;`8x010qNS#tmYE+YT{E+YYWr9XB6000Mc zNliruM985) zR|ild{z-NKwd0>;2T(iyDNX~F#y{B(pjP~oTikN=U`B6{@r3C;>BAvu@! sEuvR1-!i;<`If37z&P4B9PthS03G{T10CGK=Kufz07*qoM6N<$f>vSV&;S4c diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_h.rsi/mag-2.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_h.rsi/mag-2.png deleted file mode 100644 index abe2107373e59cc2cd8743aef7ee9ad1febe3c99..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2171 zcmV->2!!{EP) zaB^>EX>4U6ba`-PAZ2)IW&i+q+U-|ca_cq>{pTvW1Ogxkayfj?bO&924=LKQoiuZk zo1bHfgMoV^QbDdreGj*vsle&6}pNv^BlQrt-t3rP~@ED?7ReQ!T^H{AyYyw6_j=Wmk9n>j8< zH?`u6oerJ!g)aAP_(>w-`_B9*QP1A|IeVIOT-uco9n2MvQa4rh3=1pFDf_dC z({L%~w$F?+`QjT;>rk~iU-6KMVev_UIu)8U_SmRF#K40MBXeWfv?Ruvn=A;zI%%>w z$DLoVY7stJ7Fagm;vMG)4dYDdpuhm79Jl`k^V3xH6Bhyj``1z?4s zAtK%qT&Oq|4XPT|G-=inC5EUmMvE&?6%z}l7R@YKwvr@;q$ws#Ddki$XF(cMmt(e^ za?Yh-(-I1J6|65HRIXA()f%hSRC6s2?$bik7Mr!yax0y?bff^+W4E4q?q$$`D~&L8 z#9A@khwH1>H{| z=N5Di$i2ty1Jrui=~gyCD+*y#WJp2y&EN|s{QP%E_qz=KXY{XSH1lwri<*~_tZ;=F z;@$?l&ZZfX$XxZ&Q0tWDm^L=Whgp1F-%q%|jM`^+eKuQ_*LtuCO0wAqeCftFJ#a;J zdE|KbEs=ur6QyxKtY+)`qx5YAYhx(;w&9|b2nG!=mkO-G$@K+9O$<8%ztTgpDxfTq}HYGiM9~h z=v-??$pP@_MopFpdQc}dwcD#Tpqvan3fwdaEv*6$_KG(3W6yNI;nEZ7x@y@s?@}KC zu(S*ZOhPpQyKW5Mj8Lc$y0F;7tiFznqeUcgu=sY3@c*E`>PiYNRsI7e?>uD7E!5b2(QcZ@Uv@7)Y{Pj zo)RA{?|vp5U5t=TPBP(GYk+IQT}zE&1z474LF56nwg@j&JcQS@YC#GDD`gbChzjZA zW;zB~w4uOsZBbWxLI56+y!@I(Uw58?qP!-k%p7-=?+{`CxhLtfCoKe;>|vlA&1oqy z-A+0u`;-{asP3eck6P%QerBMl2K;*smrUWF zoL;;EX>4Tx0C=2zkv&Mm zKpe$iQ%j3fI@m$PAwzYtAS&W0RV;#q(pG5I!Q|2}Xws0RxHt-~1qVMCs}3&Cx;nTD zg5U>;lcSTOiU7TlmpZjwRC`FS2K9P8i>4rtTK|Hf*>74h8qpTt+#OK8023?T& zk?XR{Z=A~x3p_Jwoq#;5^169;uAx^7Ciir&ECp`Sajz3KHMh6UK29Hi9CfvP0~{OzV`a)-_jq@xx3_=Kbo%=N z@ZfTD?z3b800006VoOIv0RI600RN!9r;`8x010qNS#tmYE+YT{E+YYWr9XB6000Mc zNliruQd&p>JXlk5O$$3MksfYSIU+X2*yf07(Pi})wW0qF5RGFwEC9zVfZ xAtfZ|(!NFX>g8L8S1;dEH3S$(`-UUl0RZpvS_64KiKzep002ovPDHLkV1kAm<}v^P diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_h.rsi/mag-3.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_h.rsi/mag-3.png deleted file mode 100644 index bd66ea4630925ede5055e1d8413c1be9a9adf079..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2171 zcmV->2!!{EP) zaB^>EX>4U6ba`-PAZ2)IW&i+q+U-|ca_cq>{pTvW1Ogxkayfj?bO&924=LKQoiuZk zo1bHfgMoV^QbDdreGj*vsle&6}pNv^BlQrt-t3rP~@EOFn{d;7V&={_*vefDBMf0In!%yBWg zsTE)Bbm*inbh&TCPZAN|cjiZldiLfYj|cnB+0&fk(yoN)V6J$Sx~Z~fSXg0B*`Gz6 zhD$NGeP*1=7vF$dhpN^2iib=Li%$yFsnDdc$3_hz1|Dn}nH$TdB{9z2WI+(tNt4Y< zmJUQ%8jur^`7R6Xee>E6nZJ3?v?P}^NG=%%gu>=y4wnJ@$xT-v5;GL ztO6i3k4<&km)te@*JA-IKv1`t6BI1IUM#B8n{Ua+S-d(d4gQK3vVIuAMA%y)3<(hM z5$;WqyfGUQ?3jR0f#fWKD-a-c${kX25QzXM@!A{T811#Je36k}0E8k$4A5jL04oFy z5%HGbLdB_QP}QiWNwbzHF+`0qT3mUmm{>5iXlBW>l_V)7O)*(YDW{S-3(}an9JA$= zb1ns&mQcW}V0{6ha+MmY)>y5knrmrrpB9?7*sP_NTj|`TBL%n~yYflD2@AJHCx{w-G?tA3w9|q>WEwlLOd6QB#c0Yrjw9LyiP4cr-JnxEHRV5vaNt(`zF2g0>(l~9XgP?-ud2Jyo|%&koDwJ@}KDI|dcwMH4pIu|3){YMF zl=xtI_cPh(VuWmRk_pFJ16&jCT51d{z_Kh0A`hUoMR=j&A-twl3sMkRDWl*;R7e*$ z(=ouJ4F#rai@MSi0`P$3<<}(oy7LSaR7Y6J`gFh`;psf zkb6Ry)_$_@nCMt{NTVba&MUrmnMftYF%AZKZR)-v{%7OGh<4tIS)2AX;D2klWD57> z^y1~A#U~ecKU8SnG1_5za|Y#rP))0kOGTqc4_I~pbE=;DBK2kUpeWgV_pUubOI$9d zsC_?|v;X^yP-_=0{`cKIN0004mX+uL$Nkc;*aB^>EX>4Tx0C=2zkv&Mm zKpe$iQ%j3fI@m$PAwzYtAS&W0RV;#q(pG5I!Q|2}Xws0RxHt-~1qVMCs}3&Cx;nTD zg5U>;lcSTOiU7TlmpZjwRC`FS2K9P8i>4rtTK|Hf*>74h8qpTt+#OK8023?T& zk?XR{Z=A~x3p_Jwoq#;5^169;uAx^7Ciir&ECp`Sajz3KHMh6UK29Hi9CfvP0~{OzV`a)-_jq@xx3_=Kbo%=N z@ZfTD?z3b800006VoOIv0RI600RN!9r;`8x010qNS#tmYE+YT{E+YYWr9XB6000Mc zNliru#RU;^ zDA3gbVLVIdUlgOoKLe%lPqG8B#Q(r%L*!7Ps{^PN|0Fqp7V%G#1JL7tWVVPNJ${0- xLP|)^rG1O&)yuaGuU@{TY6vin_6z diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_h.rsi/mag-4.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_h.rsi/mag-4.png deleted file mode 100644 index 1bc185a7a8c5ff0c32f10717b60e631a3f141c15..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2172 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 diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_h.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_h.rsi/meta.json deleted file mode 100644 index c2ea42f1c9..0000000000 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_h.rsi/meta.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi", - "states": [ - { - "name": "icon" - }, - { - "name": "base" - }, - { - "name": "mag-1" - }, - { - "name": "mag-2" - }, - { - "name": "mag-3" - }, - { - "name": "mag-4" - }, - { - "name": "mag-5" - }, - { - "name": "mag-6" - } - ] -} \ No newline at end of file diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_base.rsi/50ae.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_base.rsi/50ae.png deleted file mode 100644 index 5cb13dd32dd2ee9afa6ee0928b469d43acbefd7f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 341 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=hEVFv@tkIEGZrNwz6?z;M`sX&K|z z+AEBU`6NmYBor`kTh2PQO6p(qUyFuNy#?vj92=A%mzM<-ug|l z4r_m?pJdzul$2?Z`+tRr`JRH}NydIT`-1|_p&pzkcm6+F$l$s4;p*x6l5u-$y!&h| h7$0ZcFF0b&z#yO*!`Oe>P#YLr44$rjF6*2UngEGagyjGL diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_base.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_base.rsi/base.png deleted file mode 100644 index 0064338a50c720756c3a7c18dc32ace2c1268d8b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 306 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJpPnv`Ar*6yZ3-SR9Clz@#<;ci z3gcoviP8fJ1q|Glvres&`gi)|sRbQRQ2q@+r$(aCx6Ct1DEAR_XHflbw(CY9n7WejJ6 zyck_~GT3sxc+{|IRonlhM~8TLcqU{tFluv4w~4L}pCIx-#qz<`)7v$~f~B}b#9dxI zWxOln(ECIECgYX9`bn}5Z$Zo#4VQkX-)6khRX<6_q5FsWNyZl+{dEl<@Cr?mY0!O_ zC>rEcr1$nV^ZK}bsTE&8=~{k!z|yn0_ORf428Q>YvHk~Qma_l@fx*+&&t;ucLK6UZ COn%A$ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_base.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_base.rsi/icon.png deleted file mode 100644 index 5cb13dd32dd2ee9afa6ee0928b469d43acbefd7f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 341 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=hEVFv@tkIEGZrNwz6?z;M`sX&K|z z+AEBU`6NmYBor`kTh2PQO6p(qUyFuNy#?vj92=A%mzM<-ug|l z4r_m?pJdzul$2?Z`+tRr`JRH}NydIT`-1|_p&pzkcm6+F$l$s4;p*x6l5u-$y!&h| h7$0ZcFF0b&z#yO*!`Oe>P#YLr44$rjF6*2UngEGagyjGL diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_base.rsi/mag-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_base.rsi/mag-1.png deleted file mode 100644 index 68c0528a998ae08798516ea728570bec70d33dda..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2166 zcmV-+2#NQJP) zaB^>EX>4U6ba`-PAZ2)IW&i+q+U-|ca_cq>{pTvW1Ogxkayfj?bO&924=LKQoiuZk zo1bHfgMoV^QbDdreGj*vsle&6}pNv^BlQrt-t3rP~@ED`r0^xl5%Zn_T)c%Qx4&)+1IH*;K! zZfeCBI~_Xd3tjHp@RLNu_nrAsqMp6^$K%0%bM`dnxU?%FI+!aSrEaS185UNUQ}$;O zr{Pk}ZJ!xu^2Ilx)}d;3zTzPh!{U{`FYE3J}z7<^%-!7XYCM5d${cDp+4Ys9dFnsx?-tspeW5+^2=6EjDYZT=R~ljH zh{Hx2d6WrXn=-@H8K=!O^DKAN4ywWK6c4I*+o#?_0h;bkw zZVLf8G%w72q7Zl?w=naW#R>8jq|^mYr-c|041-uF-LZQ^?jLb;uXyV z#Jvr8olP?&k-6%lq1GwQF>P#$53~5VzMpV^8MV*u`fRo;uk~OPlw`9J_|lDUdf=kY5$DZka!=)$Eb=9(O-laYO zU}+f+n1pHqcHJ1h8KF=ibYZcDS$!QDN&Awk!@fx`y@0V$Qil#?u6Mro7BA!QccgTm zE|BGq%e<-X0Y&VRDWDO&)JSEZFO1&RQEKaB>X;Fcy9ypwoMghW)&SRpyOtWm3a~88g2)4CZ4q9mcnGg))q)fRR>~-N5f#$K z&2$W~XhVVN+M=%XgaAAsdHFSozV18&MR`q7nK|w#-yy>Ob5GJ|Pg)2x*~36Ln$uEZ zx}9`R_9-!-QQb)?AGOdq{o3e$VWG9AS`e7H`4Fc<(il1^{#W#draIPat`9`Y?0)37 z8swf3rnR5!J0?2T9nvTXh4YHAXL-p<5JP+(F2wpz?`b5zDRvpJt#^x-@R*3&=Qx6 zDQe%(EX>4Tx0C=2zkv&Mm zKpe$iQ%j3fI@m$PAwzYtAS&W0RV;#q(pG5I!Q|2}Xws0RxHt-~1qVMCs}3&Cx;nTD zg5U>;lcSTOiU7TlmpZjwRC`FS2K9P8i>4rtTK|Hf*>74h8qpTt+#OK8023?T& zk?XR{Z=A~x3p_Jwoq#;5^169;uAx^7Ciir&ECp`Sajz3KHMh6UK29Hi9CfvP0~{OzV`a)-_jq@xx3_=Kbo%=N z@ZfTD?z3b800006VoOIv0RI600RN!9r;`8x010qNS#tmYE+YT{E+YYWr9XB6000Mc zNliruM985) zR|ild{z-NKwd0>;2T(iyDNX~F#y{B(pjP~oTikN=U`B6{@r3C;>BAvu@! sEuvR1-!i;<`If37z&P4B9PthS03G{T10CGK=Kufz07*qoM6N<$f>vSV&;S4c diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_base.rsi/mag-2.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_base.rsi/mag-2.png deleted file mode 100644 index abe2107373e59cc2cd8743aef7ee9ad1febe3c99..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2171 zcmV->2!!{EP) zaB^>EX>4U6ba`-PAZ2)IW&i+q+U-|ca_cq>{pTvW1Ogxkayfj?bO&924=LKQoiuZk zo1bHfgMoV^QbDdreGj*vsle&6}pNv^BlQrt-t3rP~@ED?7ReQ!T^H{AyYyw6_j=Wmk9n>j8< zH?`u6oerJ!g)aAP_(>w-`_B9*QP1A|IeVIOT-uco9n2MvQa4rh3=1pFDf_dC z({L%~w$F?+`QjT;>rk~iU-6KMVev_UIu)8U_SmRF#K40MBXeWfv?Ruvn=A;zI%%>w z$DLoVY7stJ7Fagm;vMG)4dYDdpuhm79Jl`k^V3xH6Bhyj``1z?4s zAtK%qT&Oq|4XPT|G-=inC5EUmMvE&?6%z}l7R@YKwvr@;q$ws#Ddki$XF(cMmt(e^ za?Yh-(-I1J6|65HRIXA()f%hSRC6s2?$bik7Mr!yax0y?bff^+W4E4q?q$$`D~&L8 z#9A@khwH1>H{| z=N5Di$i2ty1Jrui=~gyCD+*y#WJp2y&EN|s{QP%E_qz=KXY{XSH1lwri<*~_tZ;=F z;@$?l&ZZfX$XxZ&Q0tWDm^L=Whgp1F-%q%|jM`^+eKuQ_*LtuCO0wAqeCftFJ#a;J zdE|KbEs=ur6QyxKtY+)`qx5YAYhx(;w&9|b2nG!=mkO-G$@K+9O$<8%ztTgpDxfTq}HYGiM9~h z=v-??$pP@_MopFpdQc}dwcD#Tpqvan3fwdaEv*6$_KG(3W6yNI;nEZ7x@y@s?@}KC zu(S*ZOhPpQyKW5Mj8Lc$y0F;7tiFznqeUcgu=sY3@c*E`>PiYNRsI7e?>uD7E!5b2(QcZ@Uv@7)Y{Pj zo)RA{?|vp5U5t=TPBP(GYk+IQT}zE&1z474LF56nwg@j&JcQS@YC#GDD`gbChzjZA zW;zB~w4uOsZBbWxLI56+y!@I(Uw58?qP!-k%p7-=?+{`CxhLtfCoKe;>|vlA&1oqy z-A+0u`;-{asP3eck6P%QerBMl2K;*smrUWF zoL;;EX>4Tx0C=2zkv&Mm zKpe$iQ%j3fI@m$PAwzYtAS&W0RV;#q(pG5I!Q|2}Xws0RxHt-~1qVMCs}3&Cx;nTD zg5U>;lcSTOiU7TlmpZjwRC`FS2K9P8i>4rtTK|Hf*>74h8qpTt+#OK8023?T& zk?XR{Z=A~x3p_Jwoq#;5^169;uAx^7Ciir&ECp`Sajz3KHMh6UK29Hi9CfvP0~{OzV`a)-_jq@xx3_=Kbo%=N z@ZfTD?z3b800006VoOIv0RI600RN!9r;`8x010qNS#tmYE+YT{E+YYWr9XB6000Mc zNliruQd&p>JXlk5O$$3MksfYSIU+X2*yf07(Pi})wW0qF5RGFwEC9zVfZ xAtfZ|(!NFX>g8L8S1;dEH3S$(`-UUl0RZpvS_64KiKzep002ovPDHLkV1kAm<}v^P diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_base.rsi/mag-3.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_base.rsi/mag-3.png deleted file mode 100644 index bd66ea4630925ede5055e1d8413c1be9a9adf079..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2171 zcmV->2!!{EP) zaB^>EX>4U6ba`-PAZ2)IW&i+q+U-|ca_cq>{pTvW1Ogxkayfj?bO&924=LKQoiuZk zo1bHfgMoV^QbDdreGj*vsle&6}pNv^BlQrt-t3rP~@EOFn{d;7V&={_*vefDBMf0In!%yBWg zsTE)Bbm*inbh&TCPZAN|cjiZldiLfYj|cnB+0&fk(yoN)V6J$Sx~Z~fSXg0B*`Gz6 zhD$NGeP*1=7vF$dhpN^2iib=Li%$yFsnDdc$3_hz1|Dn}nH$TdB{9z2WI+(tNt4Y< zmJUQ%8jur^`7R6Xee>E6nZJ3?v?P}^NG=%%gu>=y4wnJ@$xT-v5;GL ztO6i3k4<&km)te@*JA-IKv1`t6BI1IUM#B8n{Ua+S-d(d4gQK3vVIuAMA%y)3<(hM z5$;WqyfGUQ?3jR0f#fWKD-a-c${kX25QzXM@!A{T811#Je36k}0E8k$4A5jL04oFy z5%HGbLdB_QP}QiWNwbzHF+`0qT3mUmm{>5iXlBW>l_V)7O)*(YDW{S-3(}an9JA$= zb1ns&mQcW}V0{6ha+MmY)>y5knrmrrpB9?7*sP_NTj|`TBL%n~yYflD2@AJHCx{w-G?tA3w9|q>WEwlLOd6QB#c0Yrjw9LyiP4cr-JnxEHRV5vaNt(`zF2g0>(l~9XgP?-ud2Jyo|%&koDwJ@}KDI|dcwMH4pIu|3){YMF zl=xtI_cPh(VuWmRk_pFJ16&jCT51d{z_Kh0A`hUoMR=j&A-twl3sMkRDWl*;R7e*$ z(=ouJ4F#rai@MSi0`P$3<<}(oy7LSaR7Y6J`gFh`;psf zkb6Ry)_$_@nCMt{NTVba&MUrmnMftYF%AZKZR)-v{%7OGh<4tIS)2AX;D2klWD57> z^y1~A#U~ecKU8SnG1_5za|Y#rP))0kOGTqc4_I~pbE=;DBK2kUpeWgV_pUubOI$9d zsC_?|v;X^yP-_=0{`cKIN0004mX+uL$Nkc;*aB^>EX>4Tx0C=2zkv&Mm zKpe$iQ%j3fI@m$PAwzYtAS&W0RV;#q(pG5I!Q|2}Xws0RxHt-~1qVMCs}3&Cx;nTD zg5U>;lcSTOiU7TlmpZjwRC`FS2K9P8i>4rtTK|Hf*>74h8qpTt+#OK8023?T& zk?XR{Z=A~x3p_Jwoq#;5^169;uAx^7Ciir&ECp`Sajz3KHMh6UK29Hi9CfvP0~{OzV`a)-_jq@xx3_=Kbo%=N z@ZfTD?z3b800006VoOIv0RI600RN!9r;`8x010qNS#tmYE+YT{E+YYWr9XB6000Mc zNliru#RU;^ zDA3gbVLVIdUlgOoKLe%lPqG8B#Q(r%L*!7Ps{^PN|0Fqp7V%G#1JL7tWVVPNJ${0- xLP|)^rG1O&)yuaGuU@{TY6vin_6z diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_base.rsi/mag-4.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_base.rsi/mag-4.png deleted file mode 100644 index 1bc185a7a8c5ff0c32f10717b60e631a3f141c15..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2172 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 diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_base.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_base.rsi/meta.json deleted file mode 100644 index c2ea42f1c9..0000000000 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_base.rsi/meta.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi", - "states": [ - { - "name": "icon" - }, - { - "name": "base" - }, - { - "name": "mag-1" - }, - { - "name": "mag-2" - }, - { - "name": "mag-3" - }, - { - "name": "mag-4" - }, - { - "name": "mag-5" - }, - { - "name": "mag-6" - } - ] -} \ No newline at end of file diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_flash.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_flash.rsi/base.png deleted file mode 100644 index 7910e3ea7f550178038463c65b0c129a50bd08d6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 345 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=hEVFe-SuIEGZrNwz6?z;M`sX&K|z z+AEBU`6NmYBor`kTh2PQO6uR~lcyGRJWW|3$p?;h3N>}|P8Hes4=?Mx8HKqxOrWlwR9ThM) zzM8zF@-vrZnX!QZ&r-INOSQ`-;`Y?_PyC=4zxx=-A8m7Y^Z$!CC^tHJ(IF`J2hb~R p;rjO{WwFN{u()L|^O28%;df!$#cFNi1Hd3-@O1TaS?83{1OWTij^6+P diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_flash.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_flash.rsi/icon.png deleted file mode 100644 index fae421fb5ffdcc16f65df76849a95b76cc230ad8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 377 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=hEVFgkd;IEGZrNwz6?z;M`sX&K|z z+AEBU`6NmYBor`kTh2PQO6p(qUyFuNy#?vj92=A%mzM<-ug|l z4r_m?pJd$9QP0LE)Rn{;=*X6=9L!T_9BkV*+kE|mWOHWb!vR?nVs;g^KRo*SyT;Cj z#>U2npSEW6^vl^N-q`v3!GG3b^~o~4Dp%Xq$L&i6d2wag1J<6!wTA`YGcd>qrZz9? Sjhg}tQU*^~KbLh*2~7a$sFzp( diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_flash.rsi/mag-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_flash.rsi/mag-1.png deleted file mode 100644 index 68c0528a998ae08798516ea728570bec70d33dda..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2166 zcmV-+2#NQJP) zaB^>EX>4U6ba`-PAZ2)IW&i+q+U-|ca_cq>{pTvW1Ogxkayfj?bO&924=LKQoiuZk zo1bHfgMoV^QbDdreGj*vsle&6}pNv^BlQrt-t3rP~@ED`r0^xl5%Zn_T)c%Qx4&)+1IH*;K! zZfeCBI~_Xd3tjHp@RLNu_nrAsqMp6^$K%0%bM`dnxU?%FI+!aSrEaS185UNUQ}$;O zr{Pk}ZJ!xu^2Ilx)}d;3zTzPh!{U{`FYE3J}z7<^%-!7XYCM5d${cDp+4Ys9dFnsx?-tspeW5+^2=6EjDYZT=R~ljH zh{Hx2d6WrXn=-@H8K=!O^DKAN4ywWK6c4I*+o#?_0h;bkw zZVLf8G%w72q7Zl?w=naW#R>8jq|^mYr-c|041-uF-LZQ^?jLb;uXyV z#Jvr8olP?&k-6%lq1GwQF>P#$53~5VzMpV^8MV*u`fRo;uk~OPlw`9J_|lDUdf=kY5$DZka!=)$Eb=9(O-laYO zU}+f+n1pHqcHJ1h8KF=ibYZcDS$!QDN&Awk!@fx`y@0V$Qil#?u6Mro7BA!QccgTm zE|BGq%e<-X0Y&VRDWDO&)JSEZFO1&RQEKaB>X;Fcy9ypwoMghW)&SRpyOtWm3a~88g2)4CZ4q9mcnGg))q)fRR>~-N5f#$K z&2$W~XhVVN+M=%XgaAAsdHFSozV18&MR`q7nK|w#-yy>Ob5GJ|Pg)2x*~36Ln$uEZ zx}9`R_9-!-QQb)?AGOdq{o3e$VWG9AS`e7H`4Fc<(il1^{#W#draIPat`9`Y?0)37 z8swf3rnR5!J0?2T9nvTXh4YHAXL-p<5JP+(F2wpz?`b5zDRvpJt#^x-@R*3&=Qx6 zDQe%(EX>4Tx0C=2zkv&Mm zKpe$iQ%j3fI@m$PAwzYtAS&W0RV;#q(pG5I!Q|2}Xws0RxHt-~1qVMCs}3&Cx;nTD zg5U>;lcSTOiU7TlmpZjwRC`FS2K9P8i>4rtTK|Hf*>74h8qpTt+#OK8023?T& zk?XR{Z=A~x3p_Jwoq#;5^169;uAx^7Ciir&ECp`Sajz3KHMh6UK29Hi9CfvP0~{OzV`a)-_jq@xx3_=Kbo%=N z@ZfTD?z3b800006VoOIv0RI600RN!9r;`8x010qNS#tmYE+YT{E+YYWr9XB6000Mc zNliruM985) zR|ild{z-NKwd0>;2T(iyDNX~F#y{B(pjP~oTikN=U`B6{@r3C;>BAvu@! sEuvR1-!i;<`If37z&P4B9PthS03G{T10CGK=Kufz07*qoM6N<$f>vSV&;S4c diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_flash.rsi/mag-2.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_flash.rsi/mag-2.png deleted file mode 100644 index abe2107373e59cc2cd8743aef7ee9ad1febe3c99..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2171 zcmV->2!!{EP) zaB^>EX>4U6ba`-PAZ2)IW&i+q+U-|ca_cq>{pTvW1Ogxkayfj?bO&924=LKQoiuZk zo1bHfgMoV^QbDdreGj*vsle&6}pNv^BlQrt-t3rP~@ED?7ReQ!T^H{AyYyw6_j=Wmk9n>j8< zH?`u6oerJ!g)aAP_(>w-`_B9*QP1A|IeVIOT-uco9n2MvQa4rh3=1pFDf_dC z({L%~w$F?+`QjT;>rk~iU-6KMVev_UIu)8U_SmRF#K40MBXeWfv?Ruvn=A;zI%%>w z$DLoVY7stJ7Fagm;vMG)4dYDdpuhm79Jl`k^V3xH6Bhyj``1z?4s zAtK%qT&Oq|4XPT|G-=inC5EUmMvE&?6%z}l7R@YKwvr@;q$ws#Ddki$XF(cMmt(e^ za?Yh-(-I1J6|65HRIXA()f%hSRC6s2?$bik7Mr!yax0y?bff^+W4E4q?q$$`D~&L8 z#9A@khwH1>H{| z=N5Di$i2ty1Jrui=~gyCD+*y#WJp2y&EN|s{QP%E_qz=KXY{XSH1lwri<*~_tZ;=F z;@$?l&ZZfX$XxZ&Q0tWDm^L=Whgp1F-%q%|jM`^+eKuQ_*LtuCO0wAqeCftFJ#a;J zdE|KbEs=ur6QyxKtY+)`qx5YAYhx(;w&9|b2nG!=mkO-G$@K+9O$<8%ztTgpDxfTq}HYGiM9~h z=v-??$pP@_MopFpdQc}dwcD#Tpqvan3fwdaEv*6$_KG(3W6yNI;nEZ7x@y@s?@}KC zu(S*ZOhPpQyKW5Mj8Lc$y0F;7tiFznqeUcgu=sY3@c*E`>PiYNRsI7e?>uD7E!5b2(QcZ@Uv@7)Y{Pj zo)RA{?|vp5U5t=TPBP(GYk+IQT}zE&1z474LF56nwg@j&JcQS@YC#GDD`gbChzjZA zW;zB~w4uOsZBbWxLI56+y!@I(Uw58?qP!-k%p7-=?+{`CxhLtfCoKe;>|vlA&1oqy z-A+0u`;-{asP3eck6P%QerBMl2K;*smrUWF zoL;;EX>4Tx0C=2zkv&Mm zKpe$iQ%j3fI@m$PAwzYtAS&W0RV;#q(pG5I!Q|2}Xws0RxHt-~1qVMCs}3&Cx;nTD zg5U>;lcSTOiU7TlmpZjwRC`FS2K9P8i>4rtTK|Hf*>74h8qpTt+#OK8023?T& zk?XR{Z=A~x3p_Jwoq#;5^169;uAx^7Ciir&ECp`Sajz3KHMh6UK29Hi9CfvP0~{OzV`a)-_jq@xx3_=Kbo%=N z@ZfTD?z3b800006VoOIv0RI600RN!9r;`8x010qNS#tmYE+YT{E+YYWr9XB6000Mc zNliruQd&p>JXlk5O$$3MksfYSIU+X2*yf07(Pi})wW0qF5RGFwEC9zVfZ xAtfZ|(!NFX>g8L8S1;dEH3S$(`-UUl0RZpvS_64KiKzep002ovPDHLkV1kAm<}v^P diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_flash.rsi/mag-3.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_flash.rsi/mag-3.png deleted file mode 100644 index bd66ea4630925ede5055e1d8413c1be9a9adf079..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2171 zcmV->2!!{EP) zaB^>EX>4U6ba`-PAZ2)IW&i+q+U-|ca_cq>{pTvW1Ogxkayfj?bO&924=LKQoiuZk zo1bHfgMoV^QbDdreGj*vsle&6}pNv^BlQrt-t3rP~@EOFn{d;7V&={_*vefDBMf0In!%yBWg zsTE)Bbm*inbh&TCPZAN|cjiZldiLfYj|cnB+0&fk(yoN)V6J$Sx~Z~fSXg0B*`Gz6 zhD$NGeP*1=7vF$dhpN^2iib=Li%$yFsnDdc$3_hz1|Dn}nH$TdB{9z2WI+(tNt4Y< zmJUQ%8jur^`7R6Xee>E6nZJ3?v?P}^NG=%%gu>=y4wnJ@$xT-v5;GL ztO6i3k4<&km)te@*JA-IKv1`t6BI1IUM#B8n{Ua+S-d(d4gQK3vVIuAMA%y)3<(hM z5$;WqyfGUQ?3jR0f#fWKD-a-c${kX25QzXM@!A{T811#Je36k}0E8k$4A5jL04oFy z5%HGbLdB_QP}QiWNwbzHF+`0qT3mUmm{>5iXlBW>l_V)7O)*(YDW{S-3(}an9JA$= zb1ns&mQcW}V0{6ha+MmY)>y5knrmrrpB9?7*sP_NTj|`TBL%n~yYflD2@AJHCx{w-G?tA3w9|q>WEwlLOd6QB#c0Yrjw9LyiP4cr-JnxEHRV5vaNt(`zF2g0>(l~9XgP?-ud2Jyo|%&koDwJ@}KDI|dcwMH4pIu|3){YMF zl=xtI_cPh(VuWmRk_pFJ16&jCT51d{z_Kh0A`hUoMR=j&A-twl3sMkRDWl*;R7e*$ z(=ouJ4F#rai@MSi0`P$3<<}(oy7LSaR7Y6J`gFh`;psf zkb6Ry)_$_@nCMt{NTVba&MUrmnMftYF%AZKZR)-v{%7OGh<4tIS)2AX;D2klWD57> z^y1~A#U~ecKU8SnG1_5za|Y#rP))0kOGTqc4_I~pbE=;DBK2kUpeWgV_pUubOI$9d zsC_?|v;X^yP-_=0{`cKIN0004mX+uL$Nkc;*aB^>EX>4Tx0C=2zkv&Mm zKpe$iQ%j3fI@m$PAwzYtAS&W0RV;#q(pG5I!Q|2}Xws0RxHt-~1qVMCs}3&Cx;nTD zg5U>;lcSTOiU7TlmpZjwRC`FS2K9P8i>4rtTK|Hf*>74h8qpTt+#OK8023?T& zk?XR{Z=A~x3p_Jwoq#;5^169;uAx^7Ciir&ECp`Sajz3KHMh6UK29Hi9CfvP0~{OzV`a)-_jq@xx3_=Kbo%=N z@ZfTD?z3b800006VoOIv0RI600RN!9r;`8x010qNS#tmYE+YT{E+YYWr9XB6000Mc zNliru#RU;^ zDA3gbVLVIdUlgOoKLe%lPqG8B#Q(r%L*!7Ps{^PN|0Fqp7V%G#1JL7tWVVPNJ${0- xLP|)^rG1O&)yuaGuU@{TY6vin_6z diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_flash.rsi/mag-4.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_flash.rsi/mag-4.png deleted file mode 100644 index 1bc185a7a8c5ff0c32f10717b60e631a3f141c15..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2172 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 diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_hv.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_hv.rsi/base.png deleted file mode 100644 index 8280184573639d0ffa2338ef973f85b8414284a4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 349 zcmV-j0iyniP)w$;zOJ2v;* zV-8s%@apAT1~GAAtd4l}_z6Q-TLaOdL6!p;7#JAjWMvqvENtNXV<(O zBy-4i0L)TK0Y$k0JqqaJfU>HF|6=083=9mAXn+AL3mb+Nt5=W||71Df)yuai7E>Au z6c8TxuU|b>Gda!gm+>0D~3mp1sD=Gg8L8S1;d^Y6o7xINCQH@eTk0J;7)Ws%qE!00000NkvXXu0mjfR9TZ3 diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_hv.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_hv.rsi/icon.png deleted file mode 100644 index 64d5b7f21663d93ede371601ca95bc3d4d9df2a4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 381 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=hEVFuHiUIEGZrNwz6?z;M`sX&K|z z+AEBU`6NmYBor`kTh2PQO6p(qUyFuNy#?vj92=A%mzM<-ug|l z4r_m?pJd$9QP0LE)b%KTk-DT(O{}DZgx$i9+0l2BEWSNqwk$I?FyL9rc5=G57SHUs zdZ&}DJU}2`wm+%jOGJZWqVv1|ti|e+Wq4JtwylrbmkRRc%CZNnJ&S7(3%+Myhzm+P V@bH-fBQRJQJYD@<);T3K0RTS{l&=5) diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_hv.rsi/mag-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_hv.rsi/mag-1.png deleted file mode 100644 index 68c0528a998ae08798516ea728570bec70d33dda..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2166 zcmV-+2#NQJP) zaB^>EX>4U6ba`-PAZ2)IW&i+q+U-|ca_cq>{pTvW1Ogxkayfj?bO&924=LKQoiuZk zo1bHfgMoV^QbDdreGj*vsle&6}pNv^BlQrt-t3rP~@ED`r0^xl5%Zn_T)c%Qx4&)+1IH*;K! zZfeCBI~_Xd3tjHp@RLNu_nrAsqMp6^$K%0%bM`dnxU?%FI+!aSrEaS185UNUQ}$;O zr{Pk}ZJ!xu^2Ilx)}d;3zTzPh!{U{`FYE3J}z7<^%-!7XYCM5d${cDp+4Ys9dFnsx?-tspeW5+^2=6EjDYZT=R~ljH zh{Hx2d6WrXn=-@H8K=!O^DKAN4ywWK6c4I*+o#?_0h;bkw zZVLf8G%w72q7Zl?w=naW#R>8jq|^mYr-c|041-uF-LZQ^?jLb;uXyV z#Jvr8olP?&k-6%lq1GwQF>P#$53~5VzMpV^8MV*u`fRo;uk~OPlw`9J_|lDUdf=kY5$DZka!=)$Eb=9(O-laYO zU}+f+n1pHqcHJ1h8KF=ibYZcDS$!QDN&Awk!@fx`y@0V$Qil#?u6Mro7BA!QccgTm zE|BGq%e<-X0Y&VRDWDO&)JSEZFO1&RQEKaB>X;Fcy9ypwoMghW)&SRpyOtWm3a~88g2)4CZ4q9mcnGg))q)fRR>~-N5f#$K z&2$W~XhVVN+M=%XgaAAsdHFSozV18&MR`q7nK|w#-yy>Ob5GJ|Pg)2x*~36Ln$uEZ zx}9`R_9-!-QQb)?AGOdq{o3e$VWG9AS`e7H`4Fc<(il1^{#W#draIPat`9`Y?0)37 z8swf3rnR5!J0?2T9nvTXh4YHAXL-p<5JP+(F2wpz?`b5zDRvpJt#^x-@R*3&=Qx6 zDQe%(EX>4Tx0C=2zkv&Mm zKpe$iQ%j3fI@m$PAwzYtAS&W0RV;#q(pG5I!Q|2}Xws0RxHt-~1qVMCs}3&Cx;nTD zg5U>;lcSTOiU7TlmpZjwRC`FS2K9P8i>4rtTK|Hf*>74h8qpTt+#OK8023?T& zk?XR{Z=A~x3p_Jwoq#;5^169;uAx^7Ciir&ECp`Sajz3KHMh6UK29Hi9CfvP0~{OzV`a)-_jq@xx3_=Kbo%=N z@ZfTD?z3b800006VoOIv0RI600RN!9r;`8x010qNS#tmYE+YT{E+YYWr9XB6000Mc zNliruM985) zR|ild{z-NKwd0>;2T(iyDNX~F#y{B(pjP~oTikN=U`B6{@r3C;>BAvu@! sEuvR1-!i;<`If37z&P4B9PthS03G{T10CGK=Kufz07*qoM6N<$f>vSV&;S4c diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_hv.rsi/mag-2.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_hv.rsi/mag-2.png deleted file mode 100644 index abe2107373e59cc2cd8743aef7ee9ad1febe3c99..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2171 zcmV->2!!{EP) zaB^>EX>4U6ba`-PAZ2)IW&i+q+U-|ca_cq>{pTvW1Ogxkayfj?bO&924=LKQoiuZk zo1bHfgMoV^QbDdreGj*vsle&6}pNv^BlQrt-t3rP~@ED?7ReQ!T^H{AyYyw6_j=Wmk9n>j8< zH?`u6oerJ!g)aAP_(>w-`_B9*QP1A|IeVIOT-uco9n2MvQa4rh3=1pFDf_dC z({L%~w$F?+`QjT;>rk~iU-6KMVev_UIu)8U_SmRF#K40MBXeWfv?Ruvn=A;zI%%>w z$DLoVY7stJ7Fagm;vMG)4dYDdpuhm79Jl`k^V3xH6Bhyj``1z?4s zAtK%qT&Oq|4XPT|G-=inC5EUmMvE&?6%z}l7R@YKwvr@;q$ws#Ddki$XF(cMmt(e^ za?Yh-(-I1J6|65HRIXA()f%hSRC6s2?$bik7Mr!yax0y?bff^+W4E4q?q$$`D~&L8 z#9A@khwH1>H{| z=N5Di$i2ty1Jrui=~gyCD+*y#WJp2y&EN|s{QP%E_qz=KXY{XSH1lwri<*~_tZ;=F z;@$?l&ZZfX$XxZ&Q0tWDm^L=Whgp1F-%q%|jM`^+eKuQ_*LtuCO0wAqeCftFJ#a;J zdE|KbEs=ur6QyxKtY+)`qx5YAYhx(;w&9|b2nG!=mkO-G$@K+9O$<8%ztTgpDxfTq}HYGiM9~h z=v-??$pP@_MopFpdQc}dwcD#Tpqvan3fwdaEv*6$_KG(3W6yNI;nEZ7x@y@s?@}KC zu(S*ZOhPpQyKW5Mj8Lc$y0F;7tiFznqeUcgu=sY3@c*E`>PiYNRsI7e?>uD7E!5b2(QcZ@Uv@7)Y{Pj zo)RA{?|vp5U5t=TPBP(GYk+IQT}zE&1z474LF56nwg@j&JcQS@YC#GDD`gbChzjZA zW;zB~w4uOsZBbWxLI56+y!@I(Uw58?qP!-k%p7-=?+{`CxhLtfCoKe;>|vlA&1oqy z-A+0u`;-{asP3eck6P%QerBMl2K;*smrUWF zoL;;EX>4Tx0C=2zkv&Mm zKpe$iQ%j3fI@m$PAwzYtAS&W0RV;#q(pG5I!Q|2}Xws0RxHt-~1qVMCs}3&Cx;nTD zg5U>;lcSTOiU7TlmpZjwRC`FS2K9P8i>4rtTK|Hf*>74h8qpTt+#OK8023?T& zk?XR{Z=A~x3p_Jwoq#;5^169;uAx^7Ciir&ECp`Sajz3KHMh6UK29Hi9CfvP0~{OzV`a)-_jq@xx3_=Kbo%=N z@ZfTD?z3b800006VoOIv0RI600RN!9r;`8x010qNS#tmYE+YT{E+YYWr9XB6000Mc zNliruQd&p>JXlk5O$$3MksfYSIU+X2*yf07(Pi})wW0qF5RGFwEC9zVfZ xAtfZ|(!NFX>g8L8S1;dEH3S$(`-UUl0RZpvS_64KiKzep002ovPDHLkV1kAm<}v^P diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_hv.rsi/mag-3.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_hv.rsi/mag-3.png deleted file mode 100644 index bd66ea4630925ede5055e1d8413c1be9a9adf079..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2171 zcmV->2!!{EP) zaB^>EX>4U6ba`-PAZ2)IW&i+q+U-|ca_cq>{pTvW1Ogxkayfj?bO&924=LKQoiuZk zo1bHfgMoV^QbDdreGj*vsle&6}pNv^BlQrt-t3rP~@EOFn{d;7V&={_*vefDBMf0In!%yBWg zsTE)Bbm*inbh&TCPZAN|cjiZldiLfYj|cnB+0&fk(yoN)V6J$Sx~Z~fSXg0B*`Gz6 zhD$NGeP*1=7vF$dhpN^2iib=Li%$yFsnDdc$3_hz1|Dn}nH$TdB{9z2WI+(tNt4Y< zmJUQ%8jur^`7R6Xee>E6nZJ3?v?P}^NG=%%gu>=y4wnJ@$xT-v5;GL ztO6i3k4<&km)te@*JA-IKv1`t6BI1IUM#B8n{Ua+S-d(d4gQK3vVIuAMA%y)3<(hM z5$;WqyfGUQ?3jR0f#fWKD-a-c${kX25QzXM@!A{T811#Je36k}0E8k$4A5jL04oFy z5%HGbLdB_QP}QiWNwbzHF+`0qT3mUmm{>5iXlBW>l_V)7O)*(YDW{S-3(}an9JA$= zb1ns&mQcW}V0{6ha+MmY)>y5knrmrrpB9?7*sP_NTj|`TBL%n~yYflD2@AJHCx{w-G?tA3w9|q>WEwlLOd6QB#c0Yrjw9LyiP4cr-JnxEHRV5vaNt(`zF2g0>(l~9XgP?-ud2Jyo|%&koDwJ@}KDI|dcwMH4pIu|3){YMF zl=xtI_cPh(VuWmRk_pFJ16&jCT51d{z_Kh0A`hUoMR=j&A-twl3sMkRDWl*;R7e*$ z(=ouJ4F#rai@MSi0`P$3<<}(oy7LSaR7Y6J`gFh`;psf zkb6Ry)_$_@nCMt{NTVba&MUrmnMftYF%AZKZR)-v{%7OGh<4tIS)2AX;D2klWD57> z^y1~A#U~ecKU8SnG1_5za|Y#rP))0kOGTqc4_I~pbE=;DBK2kUpeWgV_pUubOI$9d zsC_?|v;X^yP-_=0{`cKIN0004mX+uL$Nkc;*aB^>EX>4Tx0C=2zkv&Mm zKpe$iQ%j3fI@m$PAwzYtAS&W0RV;#q(pG5I!Q|2}Xws0RxHt-~1qVMCs}3&Cx;nTD zg5U>;lcSTOiU7TlmpZjwRC`FS2K9P8i>4rtTK|Hf*>74h8qpTt+#OK8023?T& zk?XR{Z=A~x3p_Jwoq#;5^169;uAx^7Ciir&ECp`Sajz3KHMh6UK29Hi9CfvP0~{OzV`a)-_jq@xx3_=Kbo%=N z@ZfTD?z3b800006VoOIv0RI600RN!9r;`8x010qNS#tmYE+YT{E+YYWr9XB6000Mc zNliru#RU;^ zDA3gbVLVIdUlgOoKLe%lPqG8B#Q(r%L*!7Ps{^PN|0Fqp7V%G#1JL7tWVVPNJ${0- xLP|)^rG1O&)yuaGuU@{TY6vin_6z diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_hv.rsi/mag-4.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_hv.rsi/mag-4.png deleted file mode 100644 index 1bc185a7a8c5ff0c32f10717b60e631a3f141c15..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2172 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 diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_practice.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_practice.rsi/base.png deleted file mode 100644 index e5d2fdf4a869dfbe30969ef4e55c05030e333a76..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 347 zcmV-h0i^zkP)w$;zOJ2v;* zV-8s%@apAT1~GAAtd4l}_z6Q-TLaOdL6!p;7#JAjWMvqvENtNXV<(O zBy-4i0L)TK0Y$k0JqqaJfU>HF|6=083=9mAXn+AL3mb+Nt5=W||71Df)yuai7E>Au z6c_!YxHp?Boi&A`Aglo}-KUa~SAVfc@k@V4G!c=S$)VM=oD{{?d=lN=2s t)rPNLzGZmz@-3-$;027MeZvv&002UgWF5_mc(4Ef002ovPDHLkV1mDRl(PT; diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_practice.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_practice.rsi/icon.png deleted file mode 100644 index ff09f2eb7960fdab83e546b0af60310d14518196..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 377 zcmV-<0fzpGP)(xaNf$R~7m*H~GC7F2*i~?F2nufQ8A|aR6da?1 z38a&QQ`5=RiU{|Twu-s!?(yFJxIcIAJuM7F7HLZh&0Yai02RP*09aPp)b9A1^B#V? z);bThnF9dyYaYj&6Nv4d4FI}FUM7K10!ZSNMpNf(;7x)9uuOxf_DoA~mU0Cw)4;La z-0wg1aBP?8DG;5b4DgY(s1@ph-PP;)1GGDS)@bSg+`R4QamRKEZUatFd{GyO0g^by zGL76XT7|-c=yMh33Q&grVt}&s7Xy^7zZl@F71duEpe+4G0JG2^1f$sHmA$QX;AJYl zrYDT*LzUdXUwV+-#Vhp4rn&%t`$wW-o$kS5c6E6nmO*qICUHs zaB^>EX>4U6ba`-PAZ2)IW&i+q+U-|ca_cq>{pTvW1Ogxkayfj?bO&924=LKQoiuZk zo1bHfgMoV^QbDdreGj*vsle&6}pNv^BlQrt-t3rP~@ED`r0^xl5%Zn_T)c%Qx4&)+1IH*;K! zZfeCBI~_Xd3tjHp@RLNu_nrAsqMp6^$K%0%bM`dnxU?%FI+!aSrEaS185UNUQ}$;O zr{Pk}ZJ!xu^2Ilx)}d;3zTzPh!{U{`FYE3J}z7<^%-!7XYCM5d${cDp+4Ys9dFnsx?-tspeW5+^2=6EjDYZT=R~ljH zh{Hx2d6WrXn=-@H8K=!O^DKAN4ywWK6c4I*+o#?_0h;bkw zZVLf8G%w72q7Zl?w=naW#R>8jq|^mYr-c|041-uF-LZQ^?jLb;uXyV z#Jvr8olP?&k-6%lq1GwQF>P#$53~5VzMpV^8MV*u`fRo;uk~OPlw`9J_|lDUdf=kY5$DZka!=)$Eb=9(O-laYO zU}+f+n1pHqcHJ1h8KF=ibYZcDS$!QDN&Awk!@fx`y@0V$Qil#?u6Mro7BA!QccgTm zE|BGq%e<-X0Y&VRDWDO&)JSEZFO1&RQEKaB>X;Fcy9ypwoMghW)&SRpyOtWm3a~88g2)4CZ4q9mcnGg))q)fRR>~-N5f#$K z&2$W~XhVVN+M=%XgaAAsdHFSozV18&MR`q7nK|w#-yy>Ob5GJ|Pg)2x*~36Ln$uEZ zx}9`R_9-!-QQb)?AGOdq{o3e$VWG9AS`e7H`4Fc<(il1^{#W#draIPat`9`Y?0)37 z8swf3rnR5!J0?2T9nvTXh4YHAXL-p<5JP+(F2wpz?`b5zDRvpJt#^x-@R*3&=Qx6 zDQe%(EX>4Tx0C=2zkv&Mm zKpe$iQ%j3fI@m$PAwzYtAS&W0RV;#q(pG5I!Q|2}Xws0RxHt-~1qVMCs}3&Cx;nTD zg5U>;lcSTOiU7TlmpZjwRC`FS2K9P8i>4rtTK|Hf*>74h8qpTt+#OK8023?T& zk?XR{Z=A~x3p_Jwoq#;5^169;uAx^7Ciir&ECp`Sajz3KHMh6UK29Hi9CfvP0~{OzV`a)-_jq@xx3_=Kbo%=N z@ZfTD?z3b800006VoOIv0RI600RN!9r;`8x010qNS#tmYE+YT{E+YYWr9XB6000Mc zNliruM985) zR|ild{z-NKwd0>;2T(iyDNX~F#y{B(pjP~oTikN=U`B6{@r3C;>BAvu@! sEuvR1-!i;<`If37z&P4B9PthS03G{T10CGK=Kufz07*qoM6N<$f>vSV&;S4c diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_practice.rsi/mag-2.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_practice.rsi/mag-2.png deleted file mode 100644 index abe2107373e59cc2cd8743aef7ee9ad1febe3c99..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2171 zcmV->2!!{EP) zaB^>EX>4U6ba`-PAZ2)IW&i+q+U-|ca_cq>{pTvW1Ogxkayfj?bO&924=LKQoiuZk zo1bHfgMoV^QbDdreGj*vsle&6}pNv^BlQrt-t3rP~@ED?7ReQ!T^H{AyYyw6_j=Wmk9n>j8< zH?`u6oerJ!g)aAP_(>w-`_B9*QP1A|IeVIOT-uco9n2MvQa4rh3=1pFDf_dC z({L%~w$F?+`QjT;>rk~iU-6KMVev_UIu)8U_SmRF#K40MBXeWfv?Ruvn=A;zI%%>w z$DLoVY7stJ7Fagm;vMG)4dYDdpuhm79Jl`k^V3xH6Bhyj``1z?4s zAtK%qT&Oq|4XPT|G-=inC5EUmMvE&?6%z}l7R@YKwvr@;q$ws#Ddki$XF(cMmt(e^ za?Yh-(-I1J6|65HRIXA()f%hSRC6s2?$bik7Mr!yax0y?bff^+W4E4q?q$$`D~&L8 z#9A@khwH1>H{| z=N5Di$i2ty1Jrui=~gyCD+*y#WJp2y&EN|s{QP%E_qz=KXY{XSH1lwri<*~_tZ;=F z;@$?l&ZZfX$XxZ&Q0tWDm^L=Whgp1F-%q%|jM`^+eKuQ_*LtuCO0wAqeCftFJ#a;J zdE|KbEs=ur6QyxKtY+)`qx5YAYhx(;w&9|b2nG!=mkO-G$@K+9O$<8%ztTgpDxfTq}HYGiM9~h z=v-??$pP@_MopFpdQc}dwcD#Tpqvan3fwdaEv*6$_KG(3W6yNI;nEZ7x@y@s?@}KC zu(S*ZOhPpQyKW5Mj8Lc$y0F;7tiFznqeUcgu=sY3@c*E`>PiYNRsI7e?>uD7E!5b2(QcZ@Uv@7)Y{Pj zo)RA{?|vp5U5t=TPBP(GYk+IQT}zE&1z474LF56nwg@j&JcQS@YC#GDD`gbChzjZA zW;zB~w4uOsZBbWxLI56+y!@I(Uw58?qP!-k%p7-=?+{`CxhLtfCoKe;>|vlA&1oqy z-A+0u`;-{asP3eck6P%QerBMl2K;*smrUWF zoL;;EX>4Tx0C=2zkv&Mm zKpe$iQ%j3fI@m$PAwzYtAS&W0RV;#q(pG5I!Q|2}Xws0RxHt-~1qVMCs}3&Cx;nTD zg5U>;lcSTOiU7TlmpZjwRC`FS2K9P8i>4rtTK|Hf*>74h8qpTt+#OK8023?T& zk?XR{Z=A~x3p_Jwoq#;5^169;uAx^7Ciir&ECp`Sajz3KHMh6UK29Hi9CfvP0~{OzV`a)-_jq@xx3_=Kbo%=N z@ZfTD?z3b800006VoOIv0RI600RN!9r;`8x010qNS#tmYE+YT{E+YYWr9XB6000Mc zNliruQd&p>JXlk5O$$3MksfYSIU+X2*yf07(Pi})wW0qF5RGFwEC9zVfZ xAtfZ|(!NFX>g8L8S1;dEH3S$(`-UUl0RZpvS_64KiKzep002ovPDHLkV1kAm<}v^P diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_practice.rsi/mag-3.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_practice.rsi/mag-3.png deleted file mode 100644 index bd66ea4630925ede5055e1d8413c1be9a9adf079..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2171 zcmV->2!!{EP) zaB^>EX>4U6ba`-PAZ2)IW&i+q+U-|ca_cq>{pTvW1Ogxkayfj?bO&924=LKQoiuZk zo1bHfgMoV^QbDdreGj*vsle&6}pNv^BlQrt-t3rP~@EOFn{d;7V&={_*vefDBMf0In!%yBWg zsTE)Bbm*inbh&TCPZAN|cjiZldiLfYj|cnB+0&fk(yoN)V6J$Sx~Z~fSXg0B*`Gz6 zhD$NGeP*1=7vF$dhpN^2iib=Li%$yFsnDdc$3_hz1|Dn}nH$TdB{9z2WI+(tNt4Y< zmJUQ%8jur^`7R6Xee>E6nZJ3?v?P}^NG=%%gu>=y4wnJ@$xT-v5;GL ztO6i3k4<&km)te@*JA-IKv1`t6BI1IUM#B8n{Ua+S-d(d4gQK3vVIuAMA%y)3<(hM z5$;WqyfGUQ?3jR0f#fWKD-a-c${kX25QzXM@!A{T811#Je36k}0E8k$4A5jL04oFy z5%HGbLdB_QP}QiWNwbzHF+`0qT3mUmm{>5iXlBW>l_V)7O)*(YDW{S-3(}an9JA$= zb1ns&mQcW}V0{6ha+MmY)>y5knrmrrpB9?7*sP_NTj|`TBL%n~yYflD2@AJHCx{w-G?tA3w9|q>WEwlLOd6QB#c0Yrjw9LyiP4cr-JnxEHRV5vaNt(`zF2g0>(l~9XgP?-ud2Jyo|%&koDwJ@}KDI|dcwMH4pIu|3){YMF zl=xtI_cPh(VuWmRk_pFJ16&jCT51d{z_Kh0A`hUoMR=j&A-twl3sMkRDWl*;R7e*$ z(=ouJ4F#rai@MSi0`P$3<<}(oy7LSaR7Y6J`gFh`;psf zkb6Ry)_$_@nCMt{NTVba&MUrmnMftYF%AZKZR)-v{%7OGh<4tIS)2AX;D2klWD57> z^y1~A#U~ecKU8SnG1_5za|Y#rP))0kOGTqc4_I~pbE=;DBK2kUpeWgV_pUubOI$9d zsC_?|v;X^yP-_=0{`cKIN0004mX+uL$Nkc;*aB^>EX>4Tx0C=2zkv&Mm zKpe$iQ%j3fI@m$PAwzYtAS&W0RV;#q(pG5I!Q|2}Xws0RxHt-~1qVMCs}3&Cx;nTD zg5U>;lcSTOiU7TlmpZjwRC`FS2K9P8i>4rtTK|Hf*>74h8qpTt+#OK8023?T& zk?XR{Z=A~x3p_Jwoq#;5^169;uAx^7Ciir&ECp`Sajz3KHMh6UK29Hi9CfvP0~{OzV`a)-_jq@xx3_=Kbo%=N z@ZfTD?z3b800006VoOIv0RI600RN!9r;`8x010qNS#tmYE+YT{E+YYWr9XB6000Mc zNliru#RU;^ zDA3gbVLVIdUlgOoKLe%lPqG8B#Q(r%L*!7Ps{^PN|0Fqp7V%G#1JL7tWVVPNJ${0- xLP|)^rG1O&)yuaGuU@{TY6vin_6z diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_practice.rsi/mag-4.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_practice.rsi/mag-4.png deleted file mode 100644 index 1bc185a7a8c5ff0c32f10717b60e631a3f141c15..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2172 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 diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_practice.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_practice.rsi/meta.json deleted file mode 100644 index c2ea42f1c9..0000000000 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_practice.rsi/meta.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi", - "states": [ - { - "name": "icon" - }, - { - "name": "base" - }, - { - "name": "mag-1" - }, - { - "name": "mag-2" - }, - { - "name": "mag-3" - }, - { - "name": "mag-4" - }, - { - "name": "mag-5" - }, - { - "name": "mag-6" - } - ] -} \ No newline at end of file diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_rubber.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_rubber.rsi/base.png deleted file mode 100644 index 58c5644ed4e1a67b3c3459d397265de3b0df1118..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 346 zcmV-g0j2(lP)w$;zOJ2v;* zV-8s%@apAT1~GAAtd4l}_z6Q-TLaOdL6!p;7#JAjWMvqvENtNXV<(O zBy-4i0L)TK0Y$k0JqqaJfU>HF|6=083=9mAXn+AL3mb+Nt5=W||71Df)yuai7E>Au z6c!F>We{I+10&&GI?BNC@9`6cgycp47tEbZax{=s s8@_t^mf_XQx1`#E7ch?Y4M)5K086`OCpUp~5&!@I07*qoM6N<$f=7*$>i_@% diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_rubber.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_rubber.rsi/icon.png deleted file mode 100644 index 681af36b78eba00973ecc748d96d4697e0d10117..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 377 zcmV-<0fzpGP)rS{_6nc^r~rNgz=F!ARy)Yt*XY}| z=1HVY9RQ$P_c>S@L#%Hs0dThOXA%e{fFw@QjRwa(e;n+AZJG4zLz;rKlq+CcCa&Y< ze)sMc*YW5NLeV+O03S(pQ|uafHL$K1C*`57@%zZ#Q>95RDWfFvh)`LOhbPVjN&JjdE441o`|om z>C_&cRdNG==|M7zI~d{Pmo5Of@4#p zaB^>EX>4U6ba`-PAZ2)IW&i+q+U-|ca_cq>{pTvW1Ogxkayfj?bO&924=LKQoiuZk zo1bHfgMoV^QbDdreGj*vsle&6}pNv^BlQrt-t3rP~@ED`r0^xl5%Zn_T)c%Qx4&)+1IH*;K! zZfeCBI~_Xd3tjHp@RLNu_nrAsqMp6^$K%0%bM`dnxU?%FI+!aSrEaS185UNUQ}$;O zr{Pk}ZJ!xu^2Ilx)}d;3zTzPh!{U{`FYE3J}z7<^%-!7XYCM5d${cDp+4Ys9dFnsx?-tspeW5+^2=6EjDYZT=R~ljH zh{Hx2d6WrXn=-@H8K=!O^DKAN4ywWK6c4I*+o#?_0h;bkw zZVLf8G%w72q7Zl?w=naW#R>8jq|^mYr-c|041-uF-LZQ^?jLb;uXyV z#Jvr8olP?&k-6%lq1GwQF>P#$53~5VzMpV^8MV*u`fRo;uk~OPlw`9J_|lDUdf=kY5$DZka!=)$Eb=9(O-laYO zU}+f+n1pHqcHJ1h8KF=ibYZcDS$!QDN&Awk!@fx`y@0V$Qil#?u6Mro7BA!QccgTm zE|BGq%e<-X0Y&VRDWDO&)JSEZFO1&RQEKaB>X;Fcy9ypwoMghW)&SRpyOtWm3a~88g2)4CZ4q9mcnGg))q)fRR>~-N5f#$K z&2$W~XhVVN+M=%XgaAAsdHFSozV18&MR`q7nK|w#-yy>Ob5GJ|Pg)2x*~36Ln$uEZ zx}9`R_9-!-QQb)?AGOdq{o3e$VWG9AS`e7H`4Fc<(il1^{#W#draIPat`9`Y?0)37 z8swf3rnR5!J0?2T9nvTXh4YHAXL-p<5JP+(F2wpz?`b5zDRvpJt#^x-@R*3&=Qx6 zDQe%(EX>4Tx0C=2zkv&Mm zKpe$iQ%j3fI@m$PAwzYtAS&W0RV;#q(pG5I!Q|2}Xws0RxHt-~1qVMCs}3&Cx;nTD zg5U>;lcSTOiU7TlmpZjwRC`FS2K9P8i>4rtTK|Hf*>74h8qpTt+#OK8023?T& zk?XR{Z=A~x3p_Jwoq#;5^169;uAx^7Ciir&ECp`Sajz3KHMh6UK29Hi9CfvP0~{OzV`a)-_jq@xx3_=Kbo%=N z@ZfTD?z3b800006VoOIv0RI600RN!9r;`8x010qNS#tmYE+YT{E+YYWr9XB6000Mc zNliruM985) zR|ild{z-NKwd0>;2T(iyDNX~F#y{B(pjP~oTikN=U`B6{@r3C;>BAvu@! sEuvR1-!i;<`If37z&P4B9PthS03G{T10CGK=Kufz07*qoM6N<$f>vSV&;S4c diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_rubber.rsi/mag-2.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_rubber.rsi/mag-2.png deleted file mode 100644 index abe2107373e59cc2cd8743aef7ee9ad1febe3c99..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2171 zcmV->2!!{EP) zaB^>EX>4U6ba`-PAZ2)IW&i+q+U-|ca_cq>{pTvW1Ogxkayfj?bO&924=LKQoiuZk zo1bHfgMoV^QbDdreGj*vsle&6}pNv^BlQrt-t3rP~@ED?7ReQ!T^H{AyYyw6_j=Wmk9n>j8< zH?`u6oerJ!g)aAP_(>w-`_B9*QP1A|IeVIOT-uco9n2MvQa4rh3=1pFDf_dC z({L%~w$F?+`QjT;>rk~iU-6KMVev_UIu)8U_SmRF#K40MBXeWfv?Ruvn=A;zI%%>w z$DLoVY7stJ7Fagm;vMG)4dYDdpuhm79Jl`k^V3xH6Bhyj``1z?4s zAtK%qT&Oq|4XPT|G-=inC5EUmMvE&?6%z}l7R@YKwvr@;q$ws#Ddki$XF(cMmt(e^ za?Yh-(-I1J6|65HRIXA()f%hSRC6s2?$bik7Mr!yax0y?bff^+W4E4q?q$$`D~&L8 z#9A@khwH1>H{| z=N5Di$i2ty1Jrui=~gyCD+*y#WJp2y&EN|s{QP%E_qz=KXY{XSH1lwri<*~_tZ;=F z;@$?l&ZZfX$XxZ&Q0tWDm^L=Whgp1F-%q%|jM`^+eKuQ_*LtuCO0wAqeCftFJ#a;J zdE|KbEs=ur6QyxKtY+)`qx5YAYhx(;w&9|b2nG!=mkO-G$@K+9O$<8%ztTgpDxfTq}HYGiM9~h z=v-??$pP@_MopFpdQc}dwcD#Tpqvan3fwdaEv*6$_KG(3W6yNI;nEZ7x@y@s?@}KC zu(S*ZOhPpQyKW5Mj8Lc$y0F;7tiFznqeUcgu=sY3@c*E`>PiYNRsI7e?>uD7E!5b2(QcZ@Uv@7)Y{Pj zo)RA{?|vp5U5t=TPBP(GYk+IQT}zE&1z474LF56nwg@j&JcQS@YC#GDD`gbChzjZA zW;zB~w4uOsZBbWxLI56+y!@I(Uw58?qP!-k%p7-=?+{`CxhLtfCoKe;>|vlA&1oqy z-A+0u`;-{asP3eck6P%QerBMl2K;*smrUWF zoL;;EX>4Tx0C=2zkv&Mm zKpe$iQ%j3fI@m$PAwzYtAS&W0RV;#q(pG5I!Q|2}Xws0RxHt-~1qVMCs}3&Cx;nTD zg5U>;lcSTOiU7TlmpZjwRC`FS2K9P8i>4rtTK|Hf*>74h8qpTt+#OK8023?T& zk?XR{Z=A~x3p_Jwoq#;5^169;uAx^7Ciir&ECp`Sajz3KHMh6UK29Hi9CfvP0~{OzV`a)-_jq@xx3_=Kbo%=N z@ZfTD?z3b800006VoOIv0RI600RN!9r;`8x010qNS#tmYE+YT{E+YYWr9XB6000Mc zNliruQd&p>JXlk5O$$3MksfYSIU+X2*yf07(Pi})wW0qF5RGFwEC9zVfZ xAtfZ|(!NFX>g8L8S1;dEH3S$(`-UUl0RZpvS_64KiKzep002ovPDHLkV1kAm<}v^P diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_rubber.rsi/mag-3.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_rubber.rsi/mag-3.png deleted file mode 100644 index bd66ea4630925ede5055e1d8413c1be9a9adf079..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2171 zcmV->2!!{EP) zaB^>EX>4U6ba`-PAZ2)IW&i+q+U-|ca_cq>{pTvW1Ogxkayfj?bO&924=LKQoiuZk zo1bHfgMoV^QbDdreGj*vsle&6}pNv^BlQrt-t3rP~@EOFn{d;7V&={_*vefDBMf0In!%yBWg zsTE)Bbm*inbh&TCPZAN|cjiZldiLfYj|cnB+0&fk(yoN)V6J$Sx~Z~fSXg0B*`Gz6 zhD$NGeP*1=7vF$dhpN^2iib=Li%$yFsnDdc$3_hz1|Dn}nH$TdB{9z2WI+(tNt4Y< zmJUQ%8jur^`7R6Xee>E6nZJ3?v?P}^NG=%%gu>=y4wnJ@$xT-v5;GL ztO6i3k4<&km)te@*JA-IKv1`t6BI1IUM#B8n{Ua+S-d(d4gQK3vVIuAMA%y)3<(hM z5$;WqyfGUQ?3jR0f#fWKD-a-c${kX25QzXM@!A{T811#Je36k}0E8k$4A5jL04oFy z5%HGbLdB_QP}QiWNwbzHF+`0qT3mUmm{>5iXlBW>l_V)7O)*(YDW{S-3(}an9JA$= zb1ns&mQcW}V0{6ha+MmY)>y5knrmrrpB9?7*sP_NTj|`TBL%n~yYflD2@AJHCx{w-G?tA3w9|q>WEwlLOd6QB#c0Yrjw9LyiP4cr-JnxEHRV5vaNt(`zF2g0>(l~9XgP?-ud2Jyo|%&koDwJ@}KDI|dcwMH4pIu|3){YMF zl=xtI_cPh(VuWmRk_pFJ16&jCT51d{z_Kh0A`hUoMR=j&A-twl3sMkRDWl*;R7e*$ z(=ouJ4F#rai@MSi0`P$3<<}(oy7LSaR7Y6J`gFh`;psf zkb6Ry)_$_@nCMt{NTVba&MUrmnMftYF%AZKZR)-v{%7OGh<4tIS)2AX;D2klWD57> z^y1~A#U~ecKU8SnG1_5za|Y#rP))0kOGTqc4_I~pbE=;DBK2kUpeWgV_pUubOI$9d zsC_?|v;X^yP-_=0{`cKIN0004mX+uL$Nkc;*aB^>EX>4Tx0C=2zkv&Mm zKpe$iQ%j3fI@m$PAwzYtAS&W0RV;#q(pG5I!Q|2}Xws0RxHt-~1qVMCs}3&Cx;nTD zg5U>;lcSTOiU7TlmpZjwRC`FS2K9P8i>4rtTK|Hf*>74h8qpTt+#OK8023?T& zk?XR{Z=A~x3p_Jwoq#;5^169;uAx^7Ciir&ECp`Sajz3KHMh6UK29Hi9CfvP0~{OzV`a)-_jq@xx3_=Kbo%=N z@ZfTD?z3b800006VoOIv0RI600RN!9r;`8x010qNS#tmYE+YT{E+YYWr9XB6000Mc zNliru#RU;^ zDA3gbVLVIdUlgOoKLe%lPqG8B#Q(r%L*!7Ps{^PN|0Fqp7V%G#1JL7tWVVPNJ${0- xLP|)^rG1O&)yuaGuU@{TY6vin_6z diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_rubber.rsi/mag-4.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_rubber.rsi/mag-4.png deleted file mode 100644 index 1bc185a7a8c5ff0c32f10717b60e631a3f141c15..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2172 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 diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_rubber.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_rubber.rsi/meta.json deleted file mode 100644 index c2ea42f1c9..0000000000 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_h_rubber.rsi/meta.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi", - "states": [ - { - "name": "icon" - }, - { - "name": "base" - }, - { - "name": "mag-1" - }, - { - "name": "mag-2" - }, - { - "name": "mag-3" - }, - { - "name": "mag-4" - }, - { - "name": "mag-5" - }, - { - "name": "mag-6" - } - ] -} \ No newline at end of file diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_hv.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_hv.rsi/icon.png deleted file mode 100644 index ef5353437b5a3c030a0b59e7bf21ef682af6f8fb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 418 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 P00000NkvXXu0mjfVX9Kr diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_hv.rsi/mag-2.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_hv.rsi/mag-2.png deleted file mode 100644 index 046845943972d4584ed1ecddedf41835239f26f5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2350 zcmV+}3DNe6P) zaB^>EX>4U6ba`-PAZ2)IW&i+q+U-|cmgFW3{bv>$g}6?Rp1_w*z) zJ@c2?<-*8V2;D0ohyB-|7XH9Nxy4XeTGd)3j-o}WuI;5`@utD_L+UQbsKpr%5=%o-4A-3)a#q&+?P#K z7xB0ree4&3GZsT%ra(KV9M3;pGv({*xETK_7axeWXFocm^;`dir|Uj(;PdW-|Khym z`Q?sF(PLTlgP(4B;?Mney!6(hM9-P&twp&!iSVueY&Elet*)0E;I4Wv>amn_hk+6-Q*bfv<(!JM#U3Y6TUhD{aiF7#;BiYOt<;mHecG8OOf0lX&=O5}++{5bDNTR@ zApA^560+u%8&H`*E<;RDThf_VeLhUqF!M?nNeRk;@%uA;6nyo3r^w7{o>FX2U%@VN ze!&b!&i^qAfF!$p%E!McTuuCVIItNA@^N#+0(%^nioxl{t$c9KkpqU7c*RSSbt{02 zFgL@Plz~93DRZhR3X!A)KQ`dgVL5^J0|+DzObb?0$+-fYMm{&*k#xoq(dN+wiLj{#W!>ML@SAc;iMU zlbUy6I!342v5(lt}6V=2L41eqZ{AnwH@Y#U(=_9~c&HRUt}OP_*`KkYfZc3hkS z&tbbSF=R|%&{Q7*S0YkvjN7RjS-?{3y8x24YDv`$k$!oYs_szJ1XO~YY7HK8x4bOg zZDA|75yy6@8rNCeN@SN2eSL{L_Hw@qUIQM{FSeH=nM>J$6JU6?sBHFJPIpI-Wmhc$$vVQj3v#wD!X^p{{jf&D1Us=48MTemyv@_MzxI zL2}W1*ZRsqFcemJ^{^w5c)S#@*WsVs@v(RrtL^7a3ja3XvJe?p%B%|KYM!&2vl|{{ zQEUjcvZ1Q=ZNU58P)wlgKz|3pR;y+kf28-_q>oo@xi2LXt;qFAL<<0vb+L0S<>p-#S`j8x$z)~ zI6>n2m^j04D2@ILicpv>4Sxd*dwx!itzpps00D(*LqkwWLqi~Na&Km7Y-Iodc$|Ha zJxIeq9K~N#OGT?9b`a^1p*mR*6>*d*7QsSkE41oha_JW|X-HCB90k{cgCC1k2N!2u z9b5%L@B_rj(Mi!oO8j3_Xc6PVaX;SOd)&PPgnF5&X4eFuYL=0VMa4{ZRrJ5Yhko=T zgh7d!dOWq5hU@schlj6s5uW9K?$6PuBbKWNovZACApA(N8 zbV1@ruFDR;aV|7j;F&=qot!5Q5{rcnmOGdg4V8GBIIO4|0qkw-GXw+=```ES{CxG`ExYFAGN*$Q}B)!(w!biZsHgIv>*5p0l zat9cG(j`M`N?w{mJ`cQ~(Kls*p4H?WW4KN*c`~m}ALI9U#H_x7DU`X+& ze=ab$G+=oA-~|Jhuq17>VP(xsxFu~atNx=$O?yi^Z5{CK?Q;fM1qlWQ1_p+zJzt(E2FQ(nk{m#b_$SE$w1|JI zL;)r7PjY31t@eX~{LBW1iPIZs>i}H7ef;1B?L&Y|SQ4*Ai_@% diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_hv.rsi/mag-3.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_hv.rsi/mag-3.png deleted file mode 100644 index 06f19ec207247013648af5534e55286eb6d5547d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2351 zcmV+~3DEY5P) zaB^>EX>4U6ba`-PAZ2)IW&i+q+U-|cmgOc4{AU$e0tkfAa(L;S>>$fe3H#pL-P4oI z^vqx4`@qInh^ms1!~W|}3xD9C++rv!t!k|iN716xanj;-Ty2Ww{GWsFTeyDLAD%Y| zT^Vh@F6+L>cl7h?0V#L?c;6pn-geq;=)UnVn0;oSZQV}ZhB96K>AntnyVUEO<=j7; zq~68jy7lq82*6kjdzk|5oN_$>bj_5nU&oK}pK|emXnXdf=aN6cFFc|91i{*XBY@b z4;&4i)hPHe&gFa*pB8(ZU~OTkBgBCVO$5X(m9$b%miB39nsBkuCP7Oyfw=dzETl9+ z28i%aGLn!ruiU`O1aleP^z?4zgpVCx{k$_|<}yzywkKBb zi(FrD!$o5Iz^kB1YR!5|-)8y48(xJ(RAFKy++bB-J^w8Sf3lC0YR zAi~@XXHo_Ov8K$arYJ;`5^!wbr^9oC><1V~9GDioq>^(5IgNa7JR|9hC8nzz=>vW&3>tZq!J`ftZRqF|@|k7wtW##2I{TuP7g9i2b;)W= zSKnzvO1o^{b<1vBcQiCe}=?KUuq3eb3rQ=Kh(rbhAc>C?6*;*3d2TFp)f+ zuyY2+s3b5h&Hw~W&RJ}!6msUAv#69q&P?!Tm7WldueRY=4g7EDtA@aCMexRr zOeQt&Mx6$P(D&$LN*}5QS;; zHrdH9BQ%vUD#CKzeMHk?P;0QE(5$+BN;}fBIxPAljgWeC;e=XjkSO*-Kle)JlQw+s z#*egYc_Stw<0R}=tw`5Qsg9)thY@6k^nkb*kFafoG1#l%BG#1C5G;KPHvY8d@Y->4 z3OtAHzQm9*eL+)w1fWEu+88&e8(F|o>$`xGwQ5P#43T~zOjUQNX@V+2PPGPv9F~{I zyDe)$Q)7mDgClA;OWx zbI!e>kxf{gZjR6sAZxBdTtSdlGn9w~wvj(EX2ntZ&2>dl@?+8tKM@OOwo>7g0=pp$ zakXV9BuW4q$mTTX*c}Y+?U!tQIrEw!@KRBnFDwh4eL|S)puACub*aW1Nq_gS7?m;S z1V}ndE_Iv;YkgM9yJG8j@Du-WmEkLqjtOSp6G+=>x~7bGk#kp-&a~i(>P8)X99@ki zS?R07Nm(RUN^uHXJw4J zz=~gvzD$NGg*~O9{sk?QR>%E^3{TThT52&;kJf&aCe*cVteM(H!ki2`!mkI%)jkY; zCrB=N?^<6u2#&%FuO4;;6OV_&^*Hd!9WRTQv)X>%rSNY9E)S7$rOc`TSM!|JT-`vB zMX@2&%7&`ew*kNIhGGI`2lA8nYu{?sD+hGeJa=s;rZ^%Z5cZD0@s;hgjS<5lm_TrO zRR%b6R)gM@+YxbZsr}gM!VklcEY~BnDeL5_f{Nky__({Cl&=WV!SF_%hc{aJ zJsy4T;mAwcgr@;M<~pz&y)vizdmS73F>!|9P#XOg452Vv8vX{5+*d*7QsSkE41oha_JW|X-HCB90k{cgCC1k2N!2u z9b5%L@B_rj(Mi!oO8j3_Xc6PVaX;SOd)&PPgnF5&X4eFuYL=0VMa4{ZRrJ5Yhko=T zgh7d!dOWq5hU@schlj6s5uW9K?$6PuBbKWNovZACApA(N8 zbV1@ruFDR;aV|7j;F&=qot!5Q5{rcnmOGdg4V8GBIIO4|0qkw-GXw+=```ES{CxG`ExYFAGN*$Q}B)!(w!biZsHgIv>*5p0l zat9cG(j`M`N?w{mJ`cQ~(Kls*p4H?WW4KN*c`~m}ALI9U#H_x7DU`X+& ze=ab$G+=oA-~|Jhuq17>VP(xsxFu~atNx=$O?yi^Z5{CK?Q;fM1qlWQ1_p+zJzY5@y|ew_$SE$Xz@RI z8YGm&KgpF5w%QK{@-rJ4CQfgltpjlR_VI%kv=0F;VM)9ek(&z`N4sXD4j5<$002uT VXGtr3tlR(q002ovPDHLkV1iu4R%rkL diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_hv.rsi/mag-4.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_hv.rsi/mag-4.png deleted file mode 100644 index 5b9929303c7bcef5666c7f87b6791dfc56f07649..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2347 zcmV+`3Dow9P) zaB^>EX>4U6ba`-PAZ2)IW&i+q+U-|en&c)7eCHH70tkfAaro2sX;o{DIEogfj*Awr<7!hZ=l?nAeuVpX{o(n5 z(3R2V>$dKDd`CaOUXXJ4kN5pS=543lhVBOsgV|^H+1BmkZ79>#pYHphw@bagSH~gp z-u?Ln$7SfTtoi|`yFc;g_#KqqdX(rnGrjdFm!}ZE#m`nV+t=!PsR3}+dr^<2oGT0j zq$Qu%Do(+VaV_UmoGtb^!P>%7M~DMAnh1znDru#jEbY_IG~r^QO@fwa0&(waSx9Mu z3=rXGGLn!ruiU`I1aleP^z?2d!^e)Vp6?8qxy)0F?THoq zBG(t(aOV6!MuCuIH>P~>P2pTscP?-w3iNB9pgJX28}$*;8BN+Hgxm}`OGqT)+w`1oqf^D3n?J1x@5Jb ztM9ZSrCm1fx@EVmyBoA-*^04M6Kkf{pRC=izGv+tbN|d*x>=(`l#i1aYv>kvm`I*Z z*f|4ZR1z2$X8?jG=Pb5V3ORGmSyaj)XC`>bPR>fs7#J)&5nFn4_hRn5yak~9v%Jw~ z%mt_JcQ6;6x;M;y%iAZct$xyNJ_LCb0#jtjjPSD(J2m{pueRY=4g7EDtA@aCMexRr zOeQt&Mx6$P(D&$LN*}5QS;YQblY>; zHrdH4 z3OtAHzQm9*eL+)w1fWEu+88&e8(F|o>$`xGwQ5P#43T~zOjUQNX@V+2PPGPv9F~{I zyDekxf{gZjR6sAZxBd+(D35Gn9w~wvj(EX2ntZ&2>dl@?+8tKM@OOwo>7g0=pp$ zakXV9BuW4q$mTTX*c}Y+?YC@wIrEw!@KRBnFDwh4eL|S)puACub*aW1Nq_gS7?m;S z1V}ndE_Iv;YkgM9yJG8j@Du-WmEkLqjtOSp6G+=>x~7b8k@HlQ&a~i(>P8)X99@ki zS?R07Nm(RUN^uHXJw4J zz>43FzD$NGg*~O9{sk?QR>$*)3{T@99$JjlqqQHU33aU-Yo>OQFeihK@aw^GwGTtz z36e|RyVh3@f}`-ltA`!I#N(xKy$*bG$H(I3thS$bDg4`j%R^*bDYGiT)jVf4S2qx3 zQEUjcvZ1Q=ZNTrlp_o9~f&3)?*|%Et$^o4<&t2PzDUOH;guUZ$d}TXrW5losCJv^N)u1=!c0}A;YCpER@WU`9%k>Ct$~w8KprX1TPL1IaKJKn3) zk4K+-IP#J<;c0-6xen|`ugt0bU588qUOdkt?L^Nz(_KRVacU@0*GqLrKOz6BfbKSY z-|-CvA2QiDcf*Gfq7GXZM9?FWdtOMP_+ZjAG~C3C4|R=fSzdvhENOM^;t6%4+;|8? zTp)3MOq}62lt%vrLnzFahQ9&U;C@R_gc$??00D(*LqkwWLqi~Na&Km7Y-Iodc$|Ha zJxIeq9K~N#OGT?9b`a^1p*mR*6>*d*7QsSkE41oha_JW|X-HCB90k{cgCC1k2N!2u z9b5%L@B_rj(Mi!oO8j3_Xc6PVaX;SOd)&PPgnF5&X4eFuYL=0VMa4{ZRrJ5Yhko=T zgh7d!dOWq5hU@schlj6s5uW9K?$6PuBbKWNovZACApA(N8 zbV1@ruFDR;aV|7j;F&=qot!5Q5{rcnmOGdg4V8GBIIO4|0qkw-GXw+=```ES{CxG`ExYFAGN*$Q}B)!(w!biZsHgIv>*5p0l zat9cG(j`M`N?w{mJ`cQ~(Kls*p4H?WW4KN*c`~m}ALI9U#H_x7DU`X+& ze=ab$G+=oA-~|Jhuq17>VP(xsxFu~atNx=$O?yi^Z5{CK?Q;fM1qlWQ1_p+zJzY{h<}nCK#TaNN)%8M z|0GvN*lIr*$j@wGm^i(GwhqAM+s6-H&^`pXgeCD>L~br%9POHoI$)q3005owXi2=h Ru}J^`002ovPDHLkV1gOGSmFQx diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_hv.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_hv.rsi/meta.json deleted file mode 100644 index 43b96fbef7..0000000000 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_hv.rsi/meta.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi", - "states": [ - { - "name": "icon" - }, - { - "name": "base" - }, - { - "name": "mag-1" - }, - { - "name": "mag-2" - }, - { - "name": "mag-3" - }, - { - "name": "mag-4" - } - ] -} \ No newline at end of file diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_practice.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_practice.rsi/icon.png deleted file mode 100644 index 99aa029e731c5b7f3538ce3ec93d39053c348572..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 416 zcmV;R0bl-!P)ANvT5)WVx4f-iPzvlgrg?+h&+CGF0^lAOiRg0HZ2N#ZtvL zy>qhZueD4r#py|l{E@9mY6a>*CYSpBCKi^-rr~mD(U;Uv>Ht7ZFHoy~Td2MQ1<)Zs zXaLV`Gc%vYw2a?i_l~HRatC^eJwDW7W2NsJp-q8l88jOm^mtN~Ck7~%D*lJa!P3Q# zJA?ZIg=rb$!xt(5pya<8AZ-7|0Ac$t2Iv++{0{{H z)cqF$48ng9{EDr&I%~5@po4oi&93eMFg_Ne73-*I10h)Oa(fdfzwZuQKPO1dt#{pf z@*K9e%Kq_LS!{#oHtcoUn+ zaB^>EX>4U6ba`-PAZ2)IW&i+q+U-|en&c)7eCHH70!RqKaro2s;*(o$)NxYd^|{&<^Z7p?x^Ln7U4MAq zAapTWzAnqY$9MG0>jBMo|9IaYbl!IAZRo!7Fvvc$&$ezSZ$nI1f4Z+jyItz#&2sLa zO={jHHYbkfpRSqs`gQyS|B15?MBAA;pML!ozwm_a69AuQAMlIw z?&lXAm!Ze9$_Je8{v@B{cTjrkQKIL}^wuNJPa%AZpRH=PuhsQj0^ln5q8>{*XBY@b zGoQx_4#iJ!uIFetYV2`>wS}dQ5C<+=A|P%lrkDo;bN-J}ASBt1sT_P$xSII!Npn)JdY7b&G^@jTU)HLGY*)v8T<<(jM1Qnl9FYH!pS zX-q;ZOUawS6yxO zoi?Pj^OjwX-0lBW}K z&cGPu1jf}FfS}1ai#6p;&YW`=8*yM3f|ugttmKS=!MqcRr6+eU=Dy2Y0J=ZR8-2!H zaO!>sbHS;5!`!#LeZt!6C*ATP$fFRLB11C5&vNWk@r_??!>=0n-_TbLf!%`OjT@Ov z3-3yu287V}=woUhtr=vcqd^JC%f4@Hfi8vwt7%VqZwtqp@(gN+8wHn&e{M_N{fMSr9cQZHvosKo|p!(Qm;UdepYhVR|@ zkyea1Vj>Do!d}I)_QsUTSdHK?g3OQ}5cld4wv8|bdlg*7nm7%`(x+nMPkRop9hama zbJ*@n4H?rHG@FkAl!#Ot;|6sj3s|asXHc?M$*Gtj(l3Omv>i&Cph}TbtpXv3<>m3N z3tPF3IJQ$&rOfPJBD;*}>r2wHm-|`p8t`=eVtX0VxtdsR>zp9f?e3{n)>ytF!jUC& z&b^?KO;}yq5}_wRR$Ya-f*`Fhl!yejkv}nJ#gY5XbwN?`W6};k5esLwT;Nm#c0&c? zs>@DDg4y>3(sr8O660Ou+-;4{wBU)#Mjd?|T~#z$ z?yJB_U8Gm!d8zX;T*6o5>`i+Fj1ZwTr+ZO+7fe!<43mY(OSINJlsF^JcP3iS${2Hj z6~7#PnGS0d_SB5}7qm=T9rqtHJWWSw*|JgdXzfR7O1+hhHB-Gvm{UMU`1Rnp+J~X< z1j!}uUCJv5!BKeO)x(Zp;_*5kpn$+kjtpLotD}1Nlk)^={STl><5p&t2+?DT#;(guUZ$a%H<#$B1DOOdzN>e9qoTTR&KAQXeB516%2x!nA@HU-4{x;c zdp!Ew!@*1Igr@;Mav9i-UYWD`dmS;y+h@eL#cV0-LcwuU1Xt;@2AL<&}y1W88S<=ed*%RtSx$zK) zx*d*7QsSkE41oha_JW|X-HCB90k{cgCC1k2N!2u z9b5%L@B_rj(Mi!oO8j3_Xc6PVaX;SOd)&PPgnF5&X4eFuYL=0VMa4{ZRrJ5Yhko=T zgh7d!dOWq5hU@schlj6s5uW9K?$6PuBbKWNovZACApA(N8 zbV1@ruFDR;aV|7j;F&=qot!5Q5{rcnmOGdg4V8GBIIO4|0qkw-GXw+=```ES{CxG`ExYFAGN*$Q}B)!(w!biZsHgIv>*5p0l zat9cG(j`M`N?w{mJ`cQ~(Kls*p4H?WW4KN*c`~m}ALI9U#H_x7DU`X+& ze=ab$G+=oA-~|Jhuq17>VP(xsxFu~at1zOby(OKt4*2%=IfJZ%1Oo#D14GrGu)$Ff znOho=ocO4o2FQtjk{v+p_$S!`)Q*3uL;)r7Pqj2aZv2zv09wR9Ne-Yz{8J?gD2acP zDR9}MJYHZV+_-auOi;PUO`2QO$J0$jq9cr79~7ch=?%|;zC&<+3qr7C4f$ry!& P00000NkvXXu0mjfVX9Kr diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_practice.rsi/mag-2.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_practice.rsi/mag-2.png deleted file mode 100644 index 046845943972d4584ed1ecddedf41835239f26f5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2350 zcmV+}3DNe6P) zaB^>EX>4U6ba`-PAZ2)IW&i+q+U-|cmgFW3{bv>$g}6?Rp1_w*z) zJ@c2?<-*8V2;D0ohyB-|7XH9Nxy4XeTGd)3j-o}WuI;5`@utD_L+UQbsKpr%5=%o-4A-3)a#q&+?P#K z7xB0ree4&3GZsT%ra(KV9M3;pGv({*xETK_7axeWXFocm^;`dir|Uj(;PdW-|Khym z`Q?sF(PLTlgP(4B;?Mney!6(hM9-P&twp&!iSVueY&Elet*)0E;I4Wv>amn_hk+6-Q*bfv<(!JM#U3Y6TUhD{aiF7#;BiYOt<;mHecG8OOf0lX&=O5}++{5bDNTR@ zApA^560+u%8&H`*E<;RDThf_VeLhUqF!M?nNeRk;@%uA;6nyo3r^w7{o>FX2U%@VN ze!&b!&i^qAfF!$p%E!McTuuCVIItNA@^N#+0(%^nioxl{t$c9KkpqU7c*RSSbt{02 zFgL@Plz~93DRZhR3X!A)KQ`dgVL5^J0|+DzObb?0$+-fYMm{&*k#xoq(dN+wiLj{#W!>ML@SAc;iMU zlbUy6I!342v5(lt}6V=2L41eqZ{AnwH@Y#U(=_9~c&HRUt}OP_*`KkYfZc3hkS z&tbbSF=R|%&{Q7*S0YkvjN7RjS-?{3y8x24YDv`$k$!oYs_szJ1XO~YY7HK8x4bOg zZDA|75yy6@8rNCeN@SN2eSL{L_Hw@qUIQM{FSeH=nM>J$6JU6?sBHFJPIpI-Wmhc$$vVQj3v#wD!X^p{{jf&D1Us=48MTemyv@_MzxI zL2}W1*ZRsqFcemJ^{^w5c)S#@*WsVs@v(RrtL^7a3ja3XvJe?p%B%|KYM!&2vl|{{ zQEUjcvZ1Q=ZNU58P)wlgKz|3pR;y+kf28-_q>oo@xi2LXt;qFAL<<0vb+L0S<>p-#S`j8x$z)~ zI6>n2m^j04D2@ILicpv>4Sxd*dwx!itzpps00D(*LqkwWLqi~Na&Km7Y-Iodc$|Ha zJxIeq9K~N#OGT?9b`a^1p*mR*6>*d*7QsSkE41oha_JW|X-HCB90k{cgCC1k2N!2u z9b5%L@B_rj(Mi!oO8j3_Xc6PVaX;SOd)&PPgnF5&X4eFuYL=0VMa4{ZRrJ5Yhko=T zgh7d!dOWq5hU@schlj6s5uW9K?$6PuBbKWNovZACApA(N8 zbV1@ruFDR;aV|7j;F&=qot!5Q5{rcnmOGdg4V8GBIIO4|0qkw-GXw+=```ES{CxG`ExYFAGN*$Q}B)!(w!biZsHgIv>*5p0l zat9cG(j`M`N?w{mJ`cQ~(Kls*p4H?WW4KN*c`~m}ALI9U#H_x7DU`X+& ze=ab$G+=oA-~|Jhuq17>VP(xsxFu~atNx=$O?yi^Z5{CK?Q;fM1qlWQ1_p+zJzt(E2FQ(nk{m#b_$SE$w1|JI zL;)r7PjY31t@eX~{LBW1iPIZs>i}H7ef;1B?L&Y|SQ4*Ai_@% diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_practice.rsi/mag-3.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_practice.rsi/mag-3.png deleted file mode 100644 index 06f19ec207247013648af5534e55286eb6d5547d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2351 zcmV+~3DEY5P) zaB^>EX>4U6ba`-PAZ2)IW&i+q+U-|cmgOc4{AU$e0tkfAa(L;S>>$fe3H#pL-P4oI z^vqx4`@qInh^ms1!~W|}3xD9C++rv!t!k|iN716xanj;-Ty2Ww{GWsFTeyDLAD%Y| zT^Vh@F6+L>cl7h?0V#L?c;6pn-geq;=)UnVn0;oSZQV}ZhB96K>AntnyVUEO<=j7; zq~68jy7lq82*6kjdzk|5oN_$>bj_5nU&oK}pK|emXnXdf=aN6cFFc|91i{*XBY@b z4;&4i)hPHe&gFa*pB8(ZU~OTkBgBCVO$5X(m9$b%miB39nsBkuCP7Oyfw=dzETl9+ z28i%aGLn!ruiU`O1aleP^z?4zgpVCx{k$_|<}yzywkKBb zi(FrD!$o5Iz^kB1YR!5|-)8y48(xJ(RAFKy++bB-J^w8Sf3lC0YR zAi~@XXHo_Ov8K$arYJ;`5^!wbr^9oC><1V~9GDioq>^(5IgNa7JR|9hC8nzz=>vW&3>tZq!J`ftZRqF|@|k7wtW##2I{TuP7g9i2b;)W= zSKnzvO1o^{b<1vBcQiCe}=?KUuq3eb3rQ=Kh(rbhAc>C?6*;*3d2TFp)f+ zuyY2+s3b5h&Hw~W&RJ}!6msUAv#69q&P?!Tm7WldueRY=4g7EDtA@aCMexRr zOeQt&Mx6$P(D&$LN*}5QS;; zHrdH9BQ%vUD#CKzeMHk?P;0QE(5$+BN;}fBIxPAljgWeC;e=XjkSO*-Kle)JlQw+s z#*egYc_Stw<0R}=tw`5Qsg9)thY@6k^nkb*kFafoG1#l%BG#1C5G;KPHvY8d@Y->4 z3OtAHzQm9*eL+)w1fWEu+88&e8(F|o>$`xGwQ5P#43T~zOjUQNX@V+2PPGPv9F~{I zyDe)$Q)7mDgClA;OWx zbI!e>kxf{gZjR6sAZxBdTtSdlGn9w~wvj(EX2ntZ&2>dl@?+8tKM@OOwo>7g0=pp$ zakXV9BuW4q$mTTX*c}Y+?U!tQIrEw!@KRBnFDwh4eL|S)puACub*aW1Nq_gS7?m;S z1V}ndE_Iv;YkgM9yJG8j@Du-WmEkLqjtOSp6G+=>x~7bGk#kp-&a~i(>P8)X99@ki zS?R07Nm(RUN^uHXJw4J zz=~gvzD$NGg*~O9{sk?QR>%E^3{TThT52&;kJf&aCe*cVteM(H!ki2`!mkI%)jkY; zCrB=N?^<6u2#&%FuO4;;6OV_&^*Hd!9WRTQv)X>%rSNY9E)S7$rOc`TSM!|JT-`vB zMX@2&%7&`ew*kNIhGGI`2lA8nYu{?sD+hGeJa=s;rZ^%Z5cZD0@s;hgjS<5lm_TrO zRR%b6R)gM@+YxbZsr}gM!VklcEY~BnDeL5_f{Nky__({Cl&=WV!SF_%hc{aJ zJsy4T;mAwcgr@;M<~pz&y)vizdmS73F>!|9P#XOg452Vv8vX{5+*d*7QsSkE41oha_JW|X-HCB90k{cgCC1k2N!2u z9b5%L@B_rj(Mi!oO8j3_Xc6PVaX;SOd)&PPgnF5&X4eFuYL=0VMa4{ZRrJ5Yhko=T zgh7d!dOWq5hU@schlj6s5uW9K?$6PuBbKWNovZACApA(N8 zbV1@ruFDR;aV|7j;F&=qot!5Q5{rcnmOGdg4V8GBIIO4|0qkw-GXw+=```ES{CxG`ExYFAGN*$Q}B)!(w!biZsHgIv>*5p0l zat9cG(j`M`N?w{mJ`cQ~(Kls*p4H?WW4KN*c`~m}ALI9U#H_x7DU`X+& ze=ab$G+=oA-~|Jhuq17>VP(xsxFu~atNx=$O?yi^Z5{CK?Q;fM1qlWQ1_p+zJzY5@y|ew_$SE$Xz@RI z8YGm&KgpF5w%QK{@-rJ4CQfgltpjlR_VI%kv=0F;VM)9ek(&z`N4sXD4j5<$002uT VXGtr3tlR(q002ovPDHLkV1iu4R%rkL diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_practice.rsi/mag-4.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_practice.rsi/mag-4.png deleted file mode 100644 index 5b9929303c7bcef5666c7f87b6791dfc56f07649..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2347 zcmV+`3Dow9P) zaB^>EX>4U6ba`-PAZ2)IW&i+q+U-|en&c)7eCHH70tkfAaro2sX;o{DIEogfj*Awr<7!hZ=l?nAeuVpX{o(n5 z(3R2V>$dKDd`CaOUXXJ4kN5pS=543lhVBOsgV|^H+1BmkZ79>#pYHphw@bagSH~gp z-u?Ln$7SfTtoi|`yFc;g_#KqqdX(rnGrjdFm!}ZE#m`nV+t=!PsR3}+dr^<2oGT0j zq$Qu%Do(+VaV_UmoGtb^!P>%7M~DMAnh1znDru#jEbY_IG~r^QO@fwa0&(waSx9Mu z3=rXGGLn!ruiU`I1aleP^z?2d!^e)Vp6?8qxy)0F?THoq zBG(t(aOV6!MuCuIH>P~>P2pTscP?-w3iNB9pgJX28}$*;8BN+Hgxm}`OGqT)+w`1oqf^D3n?J1x@5Jb ztM9ZSrCm1fx@EVmyBoA-*^04M6Kkf{pRC=izGv+tbN|d*x>=(`l#i1aYv>kvm`I*Z z*f|4ZR1z2$X8?jG=Pb5V3ORGmSyaj)XC`>bPR>fs7#J)&5nFn4_hRn5yak~9v%Jw~ z%mt_JcQ6;6x;M;y%iAZct$xyNJ_LCb0#jtjjPSD(J2m{pueRY=4g7EDtA@aCMexRr zOeQt&Mx6$P(D&$LN*}5QS;YQblY>; zHrdH4 z3OtAHzQm9*eL+)w1fWEu+88&e8(F|o>$`xGwQ5P#43T~zOjUQNX@V+2PPGPv9F~{I zyDekxf{gZjR6sAZxBd+(D35Gn9w~wvj(EX2ntZ&2>dl@?+8tKM@OOwo>7g0=pp$ zakXV9BuW4q$mTTX*c}Y+?YC@wIrEw!@KRBnFDwh4eL|S)puACub*aW1Nq_gS7?m;S z1V}ndE_Iv;YkgM9yJG8j@Du-WmEkLqjtOSp6G+=>x~7b8k@HlQ&a~i(>P8)X99@ki zS?R07Nm(RUN^uHXJw4J zz>43FzD$NGg*~O9{sk?QR>$*)3{T@99$JjlqqQHU33aU-Yo>OQFeihK@aw^GwGTtz z36e|RyVh3@f}`-ltA`!I#N(xKy$*bG$H(I3thS$bDg4`j%R^*bDYGiT)jVf4S2qx3 zQEUjcvZ1Q=ZNTrlp_o9~f&3)?*|%Et$^o4<&t2PzDUOH;guUZ$d}TXrW5losCJv^N)u1=!c0}A;YCpER@WU`9%k>Ct$~w8KprX1TPL1IaKJKn3) zk4K+-IP#J<;c0-6xen|`ugt0bU588qUOdkt?L^Nz(_KRVacU@0*GqLrKOz6BfbKSY z-|-CvA2QiDcf*Gfq7GXZM9?FWdtOMP_+ZjAG~C3C4|R=fSzdvhENOM^;t6%4+;|8? zTp)3MOq}62lt%vrLnzFahQ9&U;C@R_gc$??00D(*LqkwWLqi~Na&Km7Y-Iodc$|Ha zJxIeq9K~N#OGT?9b`a^1p*mR*6>*d*7QsSkE41oha_JW|X-HCB90k{cgCC1k2N!2u z9b5%L@B_rj(Mi!oO8j3_Xc6PVaX;SOd)&PPgnF5&X4eFuYL=0VMa4{ZRrJ5Yhko=T zgh7d!dOWq5hU@schlj6s5uW9K?$6PuBbKWNovZACApA(N8 zbV1@ruFDR;aV|7j;F&=qot!5Q5{rcnmOGdg4V8GBIIO4|0qkw-GXw+=```ES{CxG`ExYFAGN*$Q}B)!(w!biZsHgIv>*5p0l zat9cG(j`M`N?w{mJ`cQ~(Kls*p4H?WW4KN*c`~m}ALI9U#H_x7DU`X+& ze=ab$G+=oA-~|Jhuq17>VP(xsxFu~atNx=$O?yi^Z5{CK?Q;fM1qlWQ1_p+zJzY{h<}nCK#TaNN)%8M z|0GvN*lIr*$j@wGm^i(GwhqAM+s6-H&^`pXgeCD>L~br%9POHoI$)q3005owXi2=h Ru}J^`002ovPDHLkV1gOGSmFQx diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_practice.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_practice.rsi/meta.json deleted file mode 100644 index 43b96fbef7..0000000000 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_practice.rsi/meta.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi", - "states": [ - { - "name": "icon" - }, - { - "name": "base" - }, - { - "name": "mag-1" - }, - { - "name": "mag-2" - }, - { - "name": "mag-3" - }, - { - "name": "mag-4" - } - ] -} \ No newline at end of file diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_rubber.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_rubber.rsi/icon.png deleted file mode 100644 index 10726c2bda52606819237a60fd0a868a57595532..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 414 zcmV;P0b%}$P)83@7Ix3C#J)z`zj6z`(`85I}1Oe0%$x zLEYGp!Q9dS(_zOikYpCwA%M%Wn`h56Fr@esZ3fkHfw`pt!{Y}p7`TKbNzzBM11f7~ z{)bu8=CTS!?%Uhv4DBuHw9N(I-acoLRghp{U|?XV+7m{qcFG-q4VYURkev9a>Hr1? z2D0LxWCu_?{z-NKwd0>;2Vet~#6MLWz`#I${FCGWTEssC0|`a(%YXa~e*$Ixd=@-Tj@=9l3{;4Mxffnhq@U;z;C+9CA&&VzR=JZ(oDBJy4gV)j zZy-4uNU9BSrS``UUXW@p=?>r$mc(ljxw(LGv}-o%fPr=Z0MyNJf7J8VkpKVy07*qo IM6N<$g0}>($N&HU diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_rubber.rsi/mag-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_rubber.rsi/mag-1.png deleted file mode 100644 index ef549ebdfc5aa77cdbfe3a615a72486554625d41..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2345 zcmV+^3D)+BP) zaB^>EX>4U6ba`-PAZ2)IW&i+q+U-|en&c)7eCHH70!RqKaro2s;*(o$)NxYd^|{&<^Z7p?x^Ln7U4MAq zAapTWzAnqY$9MG0>jBMo|9IaYbl!IAZRo!7Fvvc$&$ezSZ$nI1f4Z+jyItz#&2sLa zO={jHHYbkfpRSqs`gQyS|B15?MBAA;pML!ozwm_a69AuQAMlIw z?&lXAm!Ze9$_Je8{v@B{cTjrkQKIL}^wuNJPa%AZpRH=PuhsQj0^ln5q8>{*XBY@b zGoQx_4#iJ!uIFetYV2`>wS}dQ5C<+=A|P%lrkDo;bN-J}ASBt1sT_P$xSII!Npn)JdY7b&G^@jTU)HLGY*)v8T<<(jM1Qnl9FYH!pS zX-q;ZOUawS6yxO zoi?Pj^OjwX-0lBW}K z&cGPu1jf}FfS}1ai#6p;&YW`=8*yM3f|ugttmKS=!MqcRr6+eU=Dy2Y0J=ZR8-2!H zaO!>sbHS;5!`!#LeZt!6C*ATP$fFRLB11C5&vNWk@r_??!>=0n-_TbLf!%`OjT@Ov z3-3yu287V}=woUhtr=vcqd^JC%f4@Hfi8vwt7%VqZwtqp@(gN+8wHn&e{M_N{fMSr9cQZHvosKo|p!(Qm;UdepYhVR|@ zkyea1Vj>Do!d}I)_QsUTSdHK?g3OQ}5cld4wv8|bdlg*7nm7%`(x+nMPkRop9hama zbJ*@n4H?rHG@FkAl!#Ot;|6sj3s|asXHc?M$*Gtj(l3Omv>i&Cph}TbtpXv3<>m3N z3tPF3IJQ$&rOfPJBD;*}>r2wHm-|`p8t`=eVtX0VxtdsR>zp9f?e3{n)>ytF!jUC& z&b^?KO;}yq5}_wRR$Ya-f*`Fhl!yejkv}nJ#gY5XbwN?`W6};k5esLwT;Nm#c0&c? zs>@DDg4y>3(sr8O660Ou+-;4{wBU)#Mjd?|T~#z$ z?yJB_U8Gm!d8zX;T*6o5>`i+Fj1ZwTr+ZO+7fe!<43mY(OSINJlsF^JcP3iS${2Hj z6~7#PnGS0d_SB5}7qm=T9rqtHJWWSw*|JgdXzfR7O1+hhHB-Gvm{UMU`1Rnp+J~X< z1j!}uUCJv5!BKeO)x(Zp;_*5kpn$+kjtpLotD}1Nlk)^={STl><5p&t2+?DT#;(guUZ$a%H<#$B1DOOdzN>e9qoTTR&KAQXeB516%2x!nA@HU-4{x;c zdp!Ew!@*1Igr@;Mav9i-UYWD`dmS;y+h@eL#cV0-LcwuU1Xt;@2AL<&}y1W88S<=ed*%RtSx$zK) zx*d*7QsSkE41oha_JW|X-HCB90k{cgCC1k2N!2u z9b5%L@B_rj(Mi!oO8j3_Xc6PVaX;SOd)&PPgnF5&X4eFuYL=0VMa4{ZRrJ5Yhko=T zgh7d!dOWq5hU@schlj6s5uW9K?$6PuBbKWNovZACApA(N8 zbV1@ruFDR;aV|7j;F&=qot!5Q5{rcnmOGdg4V8GBIIO4|0qkw-GXw+=```ES{CxG`ExYFAGN*$Q}B)!(w!biZsHgIv>*5p0l zat9cG(j`M`N?w{mJ`cQ~(Kls*p4H?WW4KN*c`~m}ALI9U#H_x7DU`X+& ze=ab$G+=oA-~|Jhuq17>VP(xsxFu~at1zOby(OKt4*2%=IfJZ%1Oo#D14GrGu)$Ff znOho=ocO4o2FQtjk{v+p_$S!`)Q*3uL;)r7Pqj2aZv2zv09wR9Ne-Yz{8J?gD2acP zDR9}MJYHZV+_-auOi;PUO`2QO$J0$jq9cr79~7ch=?%|;zC&<+3qr7C4f$ry!& P00000NkvXXu0mjfVX9Kr diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_rubber.rsi/mag-2.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_rubber.rsi/mag-2.png deleted file mode 100644 index 046845943972d4584ed1ecddedf41835239f26f5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2350 zcmV+}3DNe6P) zaB^>EX>4U6ba`-PAZ2)IW&i+q+U-|cmgFW3{bv>$g}6?Rp1_w*z) zJ@c2?<-*8V2;D0ohyB-|7XH9Nxy4XeTGd)3j-o}WuI;5`@utD_L+UQbsKpr%5=%o-4A-3)a#q&+?P#K z7xB0ree4&3GZsT%ra(KV9M3;pGv({*xETK_7axeWXFocm^;`dir|Uj(;PdW-|Khym z`Q?sF(PLTlgP(4B;?Mney!6(hM9-P&twp&!iSVueY&Elet*)0E;I4Wv>amn_hk+6-Q*bfv<(!JM#U3Y6TUhD{aiF7#;BiYOt<;mHecG8OOf0lX&=O5}++{5bDNTR@ zApA^560+u%8&H`*E<;RDThf_VeLhUqF!M?nNeRk;@%uA;6nyo3r^w7{o>FX2U%@VN ze!&b!&i^qAfF!$p%E!McTuuCVIItNA@^N#+0(%^nioxl{t$c9KkpqU7c*RSSbt{02 zFgL@Plz~93DRZhR3X!A)KQ`dgVL5^J0|+DzObb?0$+-fYMm{&*k#xoq(dN+wiLj{#W!>ML@SAc;iMU zlbUy6I!342v5(lt}6V=2L41eqZ{AnwH@Y#U(=_9~c&HRUt}OP_*`KkYfZc3hkS z&tbbSF=R|%&{Q7*S0YkvjN7RjS-?{3y8x24YDv`$k$!oYs_szJ1XO~YY7HK8x4bOg zZDA|75yy6@8rNCeN@SN2eSL{L_Hw@qUIQM{FSeH=nM>J$6JU6?sBHFJPIpI-Wmhc$$vVQj3v#wD!X^p{{jf&D1Us=48MTemyv@_MzxI zL2}W1*ZRsqFcemJ^{^w5c)S#@*WsVs@v(RrtL^7a3ja3XvJe?p%B%|KYM!&2vl|{{ zQEUjcvZ1Q=ZNU58P)wlgKz|3pR;y+kf28-_q>oo@xi2LXt;qFAL<<0vb+L0S<>p-#S`j8x$z)~ zI6>n2m^j04D2@ILicpv>4Sxd*dwx!itzpps00D(*LqkwWLqi~Na&Km7Y-Iodc$|Ha zJxIeq9K~N#OGT?9b`a^1p*mR*6>*d*7QsSkE41oha_JW|X-HCB90k{cgCC1k2N!2u z9b5%L@B_rj(Mi!oO8j3_Xc6PVaX;SOd)&PPgnF5&X4eFuYL=0VMa4{ZRrJ5Yhko=T zgh7d!dOWq5hU@schlj6s5uW9K?$6PuBbKWNovZACApA(N8 zbV1@ruFDR;aV|7j;F&=qot!5Q5{rcnmOGdg4V8GBIIO4|0qkw-GXw+=```ES{CxG`ExYFAGN*$Q}B)!(w!biZsHgIv>*5p0l zat9cG(j`M`N?w{mJ`cQ~(Kls*p4H?WW4KN*c`~m}ALI9U#H_x7DU`X+& ze=ab$G+=oA-~|Jhuq17>VP(xsxFu~atNx=$O?yi^Z5{CK?Q;fM1qlWQ1_p+zJzt(E2FQ(nk{m#b_$SE$w1|JI zL;)r7PjY31t@eX~{LBW1iPIZs>i}H7ef;1B?L&Y|SQ4*Ai_@% diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_rubber.rsi/mag-3.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_rubber.rsi/mag-3.png deleted file mode 100644 index 06f19ec207247013648af5534e55286eb6d5547d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2351 zcmV+~3DEY5P) zaB^>EX>4U6ba`-PAZ2)IW&i+q+U-|cmgOc4{AU$e0tkfAa(L;S>>$fe3H#pL-P4oI z^vqx4`@qInh^ms1!~W|}3xD9C++rv!t!k|iN716xanj;-Ty2Ww{GWsFTeyDLAD%Y| zT^Vh@F6+L>cl7h?0V#L?c;6pn-geq;=)UnVn0;oSZQV}ZhB96K>AntnyVUEO<=j7; zq~68jy7lq82*6kjdzk|5oN_$>bj_5nU&oK}pK|emXnXdf=aN6cFFc|91i{*XBY@b z4;&4i)hPHe&gFa*pB8(ZU~OTkBgBCVO$5X(m9$b%miB39nsBkuCP7Oyfw=dzETl9+ z28i%aGLn!ruiU`O1aleP^z?4zgpVCx{k$_|<}yzywkKBb zi(FrD!$o5Iz^kB1YR!5|-)8y48(xJ(RAFKy++bB-J^w8Sf3lC0YR zAi~@XXHo_Ov8K$arYJ;`5^!wbr^9oC><1V~9GDioq>^(5IgNa7JR|9hC8nzz=>vW&3>tZq!J`ftZRqF|@|k7wtW##2I{TuP7g9i2b;)W= zSKnzvO1o^{b<1vBcQiCe}=?KUuq3eb3rQ=Kh(rbhAc>C?6*;*3d2TFp)f+ zuyY2+s3b5h&Hw~W&RJ}!6msUAv#69q&P?!Tm7WldueRY=4g7EDtA@aCMexRr zOeQt&Mx6$P(D&$LN*}5QS;; zHrdH9BQ%vUD#CKzeMHk?P;0QE(5$+BN;}fBIxPAljgWeC;e=XjkSO*-Kle)JlQw+s z#*egYc_Stw<0R}=tw`5Qsg9)thY@6k^nkb*kFafoG1#l%BG#1C5G;KPHvY8d@Y->4 z3OtAHzQm9*eL+)w1fWEu+88&e8(F|o>$`xGwQ5P#43T~zOjUQNX@V+2PPGPv9F~{I zyDe)$Q)7mDgClA;OWx zbI!e>kxf{gZjR6sAZxBdTtSdlGn9w~wvj(EX2ntZ&2>dl@?+8tKM@OOwo>7g0=pp$ zakXV9BuW4q$mTTX*c}Y+?U!tQIrEw!@KRBnFDwh4eL|S)puACub*aW1Nq_gS7?m;S z1V}ndE_Iv;YkgM9yJG8j@Du-WmEkLqjtOSp6G+=>x~7bGk#kp-&a~i(>P8)X99@ki zS?R07Nm(RUN^uHXJw4J zz=~gvzD$NGg*~O9{sk?QR>%E^3{TThT52&;kJf&aCe*cVteM(H!ki2`!mkI%)jkY; zCrB=N?^<6u2#&%FuO4;;6OV_&^*Hd!9WRTQv)X>%rSNY9E)S7$rOc`TSM!|JT-`vB zMX@2&%7&`ew*kNIhGGI`2lA8nYu{?sD+hGeJa=s;rZ^%Z5cZD0@s;hgjS<5lm_TrO zRR%b6R)gM@+YxbZsr}gM!VklcEY~BnDeL5_f{Nky__({Cl&=WV!SF_%hc{aJ zJsy4T;mAwcgr@;M<~pz&y)vizdmS73F>!|9P#XOg452Vv8vX{5+*d*7QsSkE41oha_JW|X-HCB90k{cgCC1k2N!2u z9b5%L@B_rj(Mi!oO8j3_Xc6PVaX;SOd)&PPgnF5&X4eFuYL=0VMa4{ZRrJ5Yhko=T zgh7d!dOWq5hU@schlj6s5uW9K?$6PuBbKWNovZACApA(N8 zbV1@ruFDR;aV|7j;F&=qot!5Q5{rcnmOGdg4V8GBIIO4|0qkw-GXw+=```ES{CxG`ExYFAGN*$Q}B)!(w!biZsHgIv>*5p0l zat9cG(j`M`N?w{mJ`cQ~(Kls*p4H?WW4KN*c`~m}ALI9U#H_x7DU`X+& ze=ab$G+=oA-~|Jhuq17>VP(xsxFu~atNx=$O?yi^Z5{CK?Q;fM1qlWQ1_p+zJzY5@y|ew_$SE$Xz@RI z8YGm&KgpF5w%QK{@-rJ4CQfgltpjlR_VI%kv=0F;VM)9ek(&z`N4sXD4j5<$002uT VXGtr3tlR(q002ovPDHLkV1iu4R%rkL diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_rubber.rsi/mag-4.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_rubber.rsi/mag-4.png deleted file mode 100644 index 5b9929303c7bcef5666c7f87b6791dfc56f07649..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2347 zcmV+`3Dow9P) zaB^>EX>4U6ba`-PAZ2)IW&i+q+U-|en&c)7eCHH70tkfAaro2sX;o{DIEogfj*Awr<7!hZ=l?nAeuVpX{o(n5 z(3R2V>$dKDd`CaOUXXJ4kN5pS=543lhVBOsgV|^H+1BmkZ79>#pYHphw@bagSH~gp z-u?Ln$7SfTtoi|`yFc;g_#KqqdX(rnGrjdFm!}ZE#m`nV+t=!PsR3}+dr^<2oGT0j zq$Qu%Do(+VaV_UmoGtb^!P>%7M~DMAnh1znDru#jEbY_IG~r^QO@fwa0&(waSx9Mu z3=rXGGLn!ruiU`I1aleP^z?2d!^e)Vp6?8qxy)0F?THoq zBG(t(aOV6!MuCuIH>P~>P2pTscP?-w3iNB9pgJX28}$*;8BN+Hgxm}`OGqT)+w`1oqf^D3n?J1x@5Jb ztM9ZSrCm1fx@EVmyBoA-*^04M6Kkf{pRC=izGv+tbN|d*x>=(`l#i1aYv>kvm`I*Z z*f|4ZR1z2$X8?jG=Pb5V3ORGmSyaj)XC`>bPR>fs7#J)&5nFn4_hRn5yak~9v%Jw~ z%mt_JcQ6;6x;M;y%iAZct$xyNJ_LCb0#jtjjPSD(J2m{pueRY=4g7EDtA@aCMexRr zOeQt&Mx6$P(D&$LN*}5QS;YQblY>; zHrdH4 z3OtAHzQm9*eL+)w1fWEu+88&e8(F|o>$`xGwQ5P#43T~zOjUQNX@V+2PPGPv9F~{I zyDekxf{gZjR6sAZxBd+(D35Gn9w~wvj(EX2ntZ&2>dl@?+8tKM@OOwo>7g0=pp$ zakXV9BuW4q$mTTX*c}Y+?YC@wIrEw!@KRBnFDwh4eL|S)puACub*aW1Nq_gS7?m;S z1V}ndE_Iv;YkgM9yJG8j@Du-WmEkLqjtOSp6G+=>x~7b8k@HlQ&a~i(>P8)X99@ki zS?R07Nm(RUN^uHXJw4J zz>43FzD$NGg*~O9{sk?QR>$*)3{T@99$JjlqqQHU33aU-Yo>OQFeihK@aw^GwGTtz z36e|RyVh3@f}`-ltA`!I#N(xKy$*bG$H(I3thS$bDg4`j%R^*bDYGiT)jVf4S2qx3 zQEUjcvZ1Q=ZNTrlp_o9~f&3)?*|%Et$^o4<&t2PzDUOH;guUZ$d}TXrW5losCJv^N)u1=!c0}A;YCpER@WU`9%k>Ct$~w8KprX1TPL1IaKJKn3) zk4K+-IP#J<;c0-6xen|`ugt0bU588qUOdkt?L^Nz(_KRVacU@0*GqLrKOz6BfbKSY z-|-CvA2QiDcf*Gfq7GXZM9?FWdtOMP_+ZjAG~C3C4|R=fSzdvhENOM^;t6%4+;|8? zTp)3MOq}62lt%vrLnzFahQ9&U;C@R_gc$??00D(*LqkwWLqi~Na&Km7Y-Iodc$|Ha zJxIeq9K~N#OGT?9b`a^1p*mR*6>*d*7QsSkE41oha_JW|X-HCB90k{cgCC1k2N!2u z9b5%L@B_rj(Mi!oO8j3_Xc6PVaX;SOd)&PPgnF5&X4eFuYL=0VMa4{ZRrJ5Yhko=T zgh7d!dOWq5hU@schlj6s5uW9K?$6PuBbKWNovZACApA(N8 zbV1@ruFDR;aV|7j;F&=qot!5Q5{rcnmOGdg4V8GBIIO4|0qkw-GXw+=```ES{CxG`ExYFAGN*$Q}B)!(w!biZsHgIv>*5p0l zat9cG(j`M`N?w{mJ`cQ~(Kls*p4H?WW4KN*c`~m}ALI9U#H_x7DU`X+& ze=ab$G+=oA-~|Jhuq17>VP(xsxFu~atNx=$O?yi^Z5{CK?Q;fM1qlWQ1_p+zJzY{h<}nCK#TaNN)%8M z|0GvN*lIr*$j@wGm^i(GwhqAM+s6-H&^`pXgeCD>L~br%9POHoI$)q3005owXi2=h Ru}J^`002ovPDHLkV1gOGSmFQx diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_rubber.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_rubber.rsi/meta.json deleted file mode 100644 index 43b96fbef7..0000000000 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag_rubber.rsi/meta.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi", - "states": [ - { - "name": "icon" - }, - { - "name": "base" - }, - { - "name": "mag-1" - }, - { - "name": "mag-2" - }, - { - "name": "mag-3" - }, - { - "name": "mag-4" - } - ] -} \ No newline at end of file diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag.rsi/base.png index 386e4284837e278bbbdfbdaada3ee52cc6152467..90e20a9a55a857ce693d04d6386483adba2ce307 100644 GIT binary patch delta 69 zcmbQk^o?4lc)I$ztaD0e0sv+07@PnA delta 107 zcmV-x0F?js0h|JmBmv`*C75484M0{RbpP>^!S^+)+xaiPVfdg^NU~W29s&dI0J5TB zCxx8-@=$g(RCb;2|*J z4j?NEc5;X_JQPK(dhPTr7-kjL{GZ(4LQ<<}z(as)4mfo51jFm+&q&rsRusH`{tUx1 mQAsIsjACFM?Hi7G2LJ%n!9fZw$LR?G00008c>PMy)pfu7O^ITXYZo!{Gp@3HaN(k`#95Q10}b0b gCEb6wDc@scxF2d2w~D8c}*yo>(NGz|<*89^QTKg5JKJsTPHgSZZYs071bEjb*93tX8Sa zb`I2=u+MV3(Az224^~!vI$+h%*!U@6!41YKZA`9w8#ZrC0OAEF7*n1%Nt@>x-Put% z+0og#HbKT=?R2c@zKu diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag_base.rsi/mag-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag_base.rsi/mag-1.png deleted file mode 100644 index c7810c79a695be7856bd869a49543733bc5079a0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1980 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 diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag_hv.rsi/mag-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag_hv.rsi/mag-1.png deleted file mode 100644 index c7810c79a695be7856bd869a49543733bc5079a0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1980 zcmV;t2SfOYP) zaB^>EX>4U6ba`-PAZ2)IW&i+q+SONEb}K0i{AU%j1SBB@%i(#>>|mBZ1>JTW$H|T3 z{M_!id6*VbRY^E*{P*v4|KMV#>lchE zK`X~Fj&ps%yuQ6);heAU=bg3FPC5;df48-)oman~PM(H@k9j)BE}t)ycoWX~;dYw6 zgmpI#1~9t9p0MK~Bz`~n*h!90!AJ2V32Pzlg0bN#5&tE)~H#iPM zm$2d;PUk%7-Mn14;ddSpUw7tPk1~1lx7Q7RbM`dnIHD^dI=~grpe~{89u`)>Df_jE z+wf8JZQmJp^2Il>))8uTzG9Gxf%v3AoeE7FyKU6qV&K7smbtO)xg^G!8^{0=>!!)( zBukeBP8ygKO!L(j+WY3UA2v(axf510!5D2GZ*F%#@zeXAp*fe#iF~?Z1;2Rd3vMjt z))T8h2+b2y-T0C_8h?K+Vg(H9hB+a?;_G3eD!pk-HqYYKVQKJ3zL53P03gEN3TH^b zfR7|f5n^CABH)<7Pl4wQ*;gXbXYK=)bR_z`n%QTH3n zxkcR#b02woz*;Z6+{z|sWg##{g%qUU48Cx}pZ{s=UN!Ky8d})aJZiTIL3ExtA33R? zpb!j283`(@t#Wc@ip&~q)(lcmBBf$1826cMHbP1cnB-PQFIDoe+>k7wYpf>k)?GTUwud1wloYVf-O(08 z8%GqVP~qr!KgK{cDkw9nNg2oAwiJ@zhMp49r>*;-whOVVv#Pz6?GVF-3)WI=84w)` zHyZd1S-PDR{5nkTvo9XQR^iK}w)_i=Zu|z^p-^|d8;*{acY~iFC%5@oZMj!O8129o znaS=F3r?-2xQp;Ys)q&W?n3{Ut^3o0M{OMj|B8&=sW>EaKftEt!YKjj_pr6^z~){n z{BN+i2e|zRHuoevpTg!I;PxZf+%KJvH-^5H+bwKEvW~XfkbTc9#VI(%kaKvww7Ea$ zEH?#Sq3xeO6^BVG>pZ&|;=g8tvK1#!k4>ZCKXQbY#|E-t!4p8aUqSlsH6#;1Kp{T& zKU^gxXE(0gz5oCLglR)VP)S2WAaHVTW@&6?004NLeUUv#!$2IxUsH=BRR=p1amY}e zEQpG9lqwd%LTM|s>R@u|7c^-|Qd}Gb*Mfr|i&X~~XI&j!1wrrw#L3Y~(M3x9Us7lh z+H7*Gl(1AHR!9McVpc!PL$)6zNb6Ngw?Qi#uqCk(nE@gvt|m)|&-92R(H$jGMW zi9^I>j5;c) z!a|f*jT94U+K+qqM;w2OTr#;TVB}ap4JstZ5B>+gyETi`Q*Kf)4g_9o`(q5~-33|= z+x|Yb?bZq4e+I6!j=$CfVxOcpI$Goi7}^Fdt~;8%2VCv|;U`@(BuDbo6pBUQ{fxdT z4-DS|{cCP-?R}g+09op4`35*R1jb90z3%buzV6=sJ=5;*2cLg(x&HslaR2}S24YJ` zL;(K){{a7>y{D4^000SaNLh0L04^f{04^f|c%?sf00007bV*G`2jm3~3^^oHqnmgD z006{EL_t(o!(%*f-~huw0w#t52BQuba0jrEqiI8t!+$G71mDP3n&FAUQbxKt0A?u+ z$XK{Coa=V@FBW@%kuDBc@l1(vMFq0RAqG)N8-~fTbP54cNhyZ32;FsrcU|K$D_l3GOr9s*Qzz@eij7+ybrMzTJ#qTu!OXBd`= lN=lJq6a(XE-*Ch`003n6KWP;Wzrz3k002ovPDHLkV1gpfioyT@ diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag_practice.rsi/mag-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag_practice.rsi/mag-1.png deleted file mode 100644 index c7810c79a695be7856bd869a49543733bc5079a0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1980 zcmV;t2SfOYP) zaB^>EX>4U6ba`-PAZ2)IW&i+q+SONEb}K0i{AU%j1SBB@%i(#>>|mBZ1>JTW$H|T3 z{M_!id6*VbRY^E*{P*v4|KMV#>lchE zK`X~Fj&ps%yuQ6);heAU=bg3FPC5;df48-)oman~PM(H@k9j)BE}t)ycoWX~;dYw6 zgmpI#1~9t9p0MK~Bz`~n*h!90!AJ2V32Pzlg0bN#5&tE)~H#iPM zm$2d;PUk%7-Mn14;ddSpUw7tPk1~1lx7Q7RbM`dnIHD^dI=~grpe~{89u`)>Df_jE z+wf8JZQmJp^2Il>))8uTzG9Gxf%v3AoeE7FyKU6qV&K7smbtO)xg^G!8^{0=>!!)( zBukeBP8ygKO!L(j+WY3UA2v(axf510!5D2GZ*F%#@zeXAp*fe#iF~?Z1;2Rd3vMjt z))T8h2+b2y-T0C_8h?K+Vg(H9hB+a?;_G3eD!pk-HqYYKVQKJ3zL53P03gEN3TH^b zfR7|f5n^CABH)<7Pl4wQ*;gXbXYK=)bR_z`n%QTH3n zxkcR#b02woz*;Z6+{z|sWg##{g%qUU48Cx}pZ{s=UN!Ky8d})aJZiTIL3ExtA33R? zpb!j283`(@t#Wc@ip&~q)(lcmBBf$1826cMHbP1cnB-PQFIDoe+>k7wYpf>k)?GTUwud1wloYVf-O(08 z8%GqVP~qr!KgK{cDkw9nNg2oAwiJ@zhMp49r>*;-whOVVv#Pz6?GVF-3)WI=84w)` zHyZd1S-PDR{5nkTvo9XQR^iK}w)_i=Zu|z^p-^|d8;*{acY~iFC%5@oZMj!O8129o znaS=F3r?-2xQp;Ys)q&W?n3{Ut^3o0M{OMj|B8&=sW>EaKftEt!YKjj_pr6^z~){n z{BN+i2e|zRHuoevpTg!I;PxZf+%KJvH-^5H+bwKEvW~XfkbTc9#VI(%kaKvww7Ea$ zEH?#Sq3xeO6^BVG>pZ&|;=g8tvK1#!k4>ZCKXQbY#|E-t!4p8aUqSlsH6#;1Kp{T& zKU^gxXE(0gz5oCLglR)VP)S2WAaHVTW@&6?004NLeUUv#!$2IxUsH=BRR=p1amY}e zEQpG9lqwd%LTM|s>R@u|7c^-|Qd}Gb*Mfr|i&X~~XI&j!1wrrw#L3Y~(M3x9Us7lh z+H7*Gl(1AHR!9McVpc!PL$)6zNb6Ngw?Qi#uqCk(nE@gvt|m)|&-92R(H$jGMW zi9^I>j5;c) z!a|f*jT94U+K+qqM;w2OTr#;TVB}ap4JstZ5B>+gyETi`Q*Kf)4g_9o`(q5~-33|= z+x|Yb?bZq4e+I6!j=$CfVxOcpI$Goi7}^Fdt~;8%2VCv|;U`@(BuDbo6pBUQ{fxdT z4-DS|{cCP-?R}g+09op4`35*R1jb90z3%buzV6=sJ=5;*2cLg(x&HslaR2}S24YJ` zL;(K){{a7>y{D4^000SaNLh0L04^f{04^f|c%?sf00007bV*G`2jm3~3^^oHqnmgD z006{EL_t(o!(%*f-~huw0w#t52BQuba0jrEqiI8t!+$G71mDP3n&FAUQbxKt0A?u+ z$XK{Coa=V@FBW@%kuDBc@l1(vMFq0RAqG)N8-~fTbP54cNhyZ3a*SeN9PJy9cn1Igg~&j!z-_W!00000NkvXXu0mjf5hRO! diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag_rubber.rsi/mag-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag_rubber.rsi/mag-1.png deleted file mode 100644 index c7810c79a695be7856bd869a49543733bc5079a0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1980 zcmV;t2SfOYP) zaB^>EX>4U6ba`-PAZ2)IW&i+q+SONEb}K0i{AU%j1SBB@%i(#>>|mBZ1>JTW$H|T3 z{M_!id6*VbRY^E*{P*v4|KMV#>lchE zK`X~Fj&ps%yuQ6);heAU=bg3FPC5;df48-)oman~PM(H@k9j)BE}t)ycoWX~;dYw6 zgmpI#1~9t9p0MK~Bz`~n*h!90!AJ2V32Pzlg0bN#5&tE)~H#iPM zm$2d;PUk%7-Mn14;ddSpUw7tPk1~1lx7Q7RbM`dnIHD^dI=~grpe~{89u`)>Df_jE z+wf8JZQmJp^2Il>))8uTzG9Gxf%v3AoeE7FyKU6qV&K7smbtO)xg^G!8^{0=>!!)( zBukeBP8ygKO!L(j+WY3UA2v(axf510!5D2GZ*F%#@zeXAp*fe#iF~?Z1;2Rd3vMjt z))T8h2+b2y-T0C_8h?K+Vg(H9hB+a?;_G3eD!pk-HqYYKVQKJ3zL53P03gEN3TH^b zfR7|f5n^CABH)<7Pl4wQ*;gXbXYK=)bR_z`n%QTH3n zxkcR#b02woz*;Z6+{z|sWg##{g%qUU48Cx}pZ{s=UN!Ky8d})aJZiTIL3ExtA33R? zpb!j283`(@t#Wc@ip&~q)(lcmBBf$1826cMHbP1cnB-PQFIDoe+>k7wYpf>k)?GTUwud1wloYVf-O(08 z8%GqVP~qr!KgK{cDkw9nNg2oAwiJ@zhMp49r>*;-whOVVv#Pz6?GVF-3)WI=84w)` zHyZd1S-PDR{5nkTvo9XQR^iK}w)_i=Zu|z^p-^|d8;*{acY~iFC%5@oZMj!O8129o znaS=F3r?-2xQp;Ys)q&W?n3{Ut^3o0M{OMj|B8&=sW>EaKftEt!YKjj_pr6^z~){n z{BN+i2e|zRHuoevpTg!I;PxZf+%KJvH-^5H+bwKEvW~XfkbTc9#VI(%kaKvww7Ea$ zEH?#Sq3xeO6^BVG>pZ&|;=g8tvK1#!k4>ZCKXQbY#|E-t!4p8aUqSlsH6#;1Kp{T& zKU^gxXE(0gz5oCLglR)VP)S2WAaHVTW@&6?004NLeUUv#!$2IxUsH=BRR=p1amY}e zEQpG9lqwd%LTM|s>R@u|7c^-|Qd}Gb*Mfr|i&X~~XI&j!1wrrw#L3Y~(M3x9Us7lh z+H7*Gl(1AHR!9McVpc!PL$)6zNb6Ngw?Qi#uqCk(nE@gvt|m)|&-92R(H$jGMW zi9^I>j5;c) z!a|f*jT94U+K+qqM;w2OTr#;TVB}ap4JstZ5B>+gyETi`Q*Kf)4g_9o`(q5~-33|= z+x|Yb?bZq4e+I6!j=$CfVxOcpI$Goi7}^Fdt~;8%2VCv|;U`@(BuDbo6pBUQ{fxdT z4-DS|{cCP-?R}g+09op4`35*R1jb90z3%buzV6=sJ=5;*2cLg(x&HslaR2}S24YJ` zL;(K){{a7>y{D4^000SaNLh0L04^f{04^f|c%?sf00007bV*G`2jm3~3^^oHqnmgD z006{EL_t(o!(%*f-~huw0w#t52BQuba0jrEqiI8t!+$G71mDP3n&FAUQbxKt0A?u+ z$XK{Coa=V@FBW@%kuDBc@l1(vMFq0RAqG)N8-~fTbP54cNhyZ3#Ar*7pPBY{>Y{28X-@ARD z!UWUs51uB^a%>%r#VCqjm|?p5pf|7VBEMHbPKrm)34B$O#_w`xdJ1JW$DW8|G?rgi8rz;4dBNoDv!fE`_S1i_ zKg>79#pU;dPX;73etuk;3iJ|#r>mdKI;Vst0NM0u A-~a#s diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag_top_mounted.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag_top_mounted.rsi/meta.json index 3c247876eb..cfc60ae1e0 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag_top_mounted.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/smg_mag_top_mounted.rsi/meta.json @@ -7,9 +7,6 @@ "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi", "states": [ - { - "name": "icon" - }, { "name": "base" }, diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/SRifle/s_rifle_mag_base.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/base.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/SRifle/s_rifle_mag_base.rsi/base.png rename to Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/base.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/SRifle/s_rifle_mag_flash.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/flash.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/SRifle/s_rifle_mag_flash.rsi/base.png rename to Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/flash.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/SRifle/s_rifle_mag_hv.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/high_velocity.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/SRifle/s_rifle_mag_hv.rsi/base.png rename to Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/high_velocity.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/SRifle/s_rifle_mag.rsi/mag-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/mag-1.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/SRifle/s_rifle_mag.rsi/mag-1.png rename to Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/mag-1.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_mag_flash.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/meta.json similarity index 72% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_mag_flash.rsi/meta.json rename to Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/meta.json index 43b96fbef7..0da5f470a4 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Magnum/magnum_mag_flash.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/meta.json @@ -7,23 +7,26 @@ "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_mags.dmi", "states": [ - { - "name": "icon" - }, { "name": "base" }, + { + "name": "flash" + }, + { + "name": "high_velocity" + }, + { + "name": "practice" + }, + { + "name": "red" + }, + { + "name": "rubber" + }, { "name": "mag-1" - }, - { - "name": "mag-2" - }, - { - "name": "mag-3" - }, - { - "name": "mag-4" } ] } \ No newline at end of file diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/SRifle/s_rifle_mag_practice.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/practice.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/SRifle/s_rifle_mag_practice.rsi/base.png rename to Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/practice.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/SRifle/s_rifle_mag.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/red.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/SRifle/s_rifle_mag.rsi/base.png rename to Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/red.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/SRifle/s_rifle_mag_rubber.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/rubber.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/SRifle/s_rifle_mag_rubber.rsi/base.png rename to Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/rifle_mag.rsi/rubber.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/SRifle/s_rifle_mag.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/SRifle/s_rifle_mag.rsi/icon.png deleted file mode 100644 index 1641c3591a6c574f317d0159a0af1db6daa5c9f1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 369 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 N002ovPDHLkV1m4lo(=#2 diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/SRifle/s_rifle_mag_hv.rsi/mag-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/SRifle/s_rifle_mag_hv.rsi/mag-1.png deleted file mode 100644 index bbd335adc75d789cc1e5e52f9bb15b297ff1ac70..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2133 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 JPDHLkV1l}PoiG3Z diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/SRifle/s_rifle_mag_practice.rsi/mag-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/SRifle/s_rifle_mag_practice.rsi/mag-1.png deleted file mode 100644 index bbd335adc75d789cc1e5e52f9bb15b297ff1ac70..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2133 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 P00000NkvXXu0mjf-jbM` diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/SRifle/s_rifle_mag_rubber.rsi/mag-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/SRifle/s_rifle_mag_rubber.rsi/mag-1.png deleted file mode 100644 index bbd335adc75d789cc1e5e52f9bb15b297ff1ac70..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2133 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 Q0ssI207*qoM6N<$g6L(ei~s-t diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Shotgun/m12.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Shotgun/m12.rsi/meta.json index 8b190de6f1..9b309e8193 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Shotgun/m12.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Shotgun/m12.rsi/meta.json @@ -8,10 +8,16 @@ "copyright": "https://github.com/discordia-space/CEV-Eris/raw/831c7c2743530e8a31910d781bae9dc34f3f1ec8/icons/obj/ammo_mags.dmi", "states": [ { - "name": "icon" + "name": "base" }, { - "name": "base" + "name": "beanbag" + }, + { + "name": "pellets" + }, + { + "name": "slug" }, { "name": "mag-1" diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Shotgun/m12_pellets.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Shotgun/m12.rsi/pellets.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Shotgun/m12_pellets.rsi/base.png rename to Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Shotgun/m12.rsi/pellets.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Shotgun/m12_slug.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Shotgun/m12.rsi/slug.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Shotgun/m12_slug.rsi/base.png rename to Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Shotgun/m12.rsi/slug.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Shotgun/m12_beanbag.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Shotgun/m12_beanbag.rsi/icon.png deleted file mode 100644 index 8d4c60d93cde541038bea988271a20c62bf481b6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 483 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 QFaQ7m07*qoM6N<$f)S!HQUCw| diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Shotgun/m12_beanbag.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Shotgun/m12_beanbag.rsi/meta.json deleted file mode 100644 index 8b190de6f1..0000000000 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Shotgun/m12_beanbag.rsi/meta.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/831c7c2743530e8a31910d781bae9dc34f3f1ec8/icons/obj/ammo_mags.dmi", - "states": [ - { - "name": "icon" - }, - { - "name": "base" - }, - { - "name": "mag-1" - } - ] -} \ No newline at end of file diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Shotgun/m12_pellets.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Shotgun/m12_pellets.rsi/icon.png deleted file mode 100644 index f677531ced7111fe2c5b27366b0042f9b10b637e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 505 zcmVvmyDZKr1fp7#Jzn52muuLc6-`U!BbM1Y?5d@>L zu@go;(D8e@Z8v#wA7k51lu8kfKsbVKHldqMit8j!XtlkS<=G0L8t06Y(GkkTa#BR+n* zG;*P|356p7xOLwx#g$44!w7(*C;%Yjgd|SNUTY4ZmBdL=V-2MxrHjWDfY~4WrF092 z_5!d;VHj=gfbk?$DkX^%lu9cDZc?cO+H(CRX#1;Vxk(!x7!3Q?x{Q@di-B|=T?6w* z)xf61sI&xwVc%M8reHM2wwnk?EFE68L_3Y*C%?V{@bmFAVD5?@Ql_KW7+@99;!dc# v2X+F`5R0*@>v$)CedyqSL^VJSPy_r1+nK((DOs}_00000NkvXXu0mjfN9^82 diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Shotgun/m12_pellets.rsi/mag-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Shotgun/m12_pellets.rsi/mag-1.png deleted file mode 100644 index 200edcb027a4828a3dfabe88808c1565d133946e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2420 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 a4Dbs=PQL`v251`q0000 zaB^>EX>4U6ba`-PAZ2)IW&i+q+U-|umg^=A{m&}81SAlG<$!^6x`QsiS3ojJCeyw* z?Vt8Mdu*_b^>wcl#*IIIpYAstOfk7Ano~*1%I;?ukidNclQ?z zQNS4XV;X0DggMO%Qo-F$)hOnmeYB5<$O@nLpbN+>!`hj z_3|7Q$>;)ofgO)P!LK`SOJQFXm*CDJVIhUG=eSGI&-rur)V)dIefE++fAcJSq+=_( zg_U0NbmSy2@^Cl9PaYB9E%T#Cv3m87$3y<+?0L?yqpQZF64MFl7Rs7oVS}o$K1(OY8^7R&A!m22 z0w6R`PG#kn+#dYvVZa6;C@akw0ao9(iYD~It*~$oUL2N2zw3px9|cGeYzv&B00exZ zAe6`}vl1bX8TeFq&LMIG0whkj!%L02uef&4ax;z#V9eM z-ZCguodk&@l0+p-k(xq^Nm5FhtWQ-98dWr@YSyAPha9uylr`sEaxGi}+L*YKik4hT zsTD?Rtk6}lzCzHrg%+E%)U@SRTD?G@D_(M?ORs#Dt9I_8qXoF0y7t^luY(4tG~$qv zhK@YSs1sb9Va6#lO`Um`S?{PFRG(3MMeeUrqk|eRplqFfpa!w(O$Avy5yK3KaU>wF zh5!i7hMCV4BO7vtnJ*k%2*U7E44h7e7!ZtuSSH=E`#|nX+#Is|v$*j)u8_n9#K}IGV~lvh0y%bI2*Nd{7#8^kuq~pEpuIlOV(=@X@$}ggY-^UulDF-Z ztREcpYWPVI6ZFu)>>0MTo00U1em8=xpcdPYD;tCz+#)1x^6%GT%#Q_ie=_uAM1Nnj z_fi5$<3LNu$k;X`i$Z(;koVv=<(KiB>)XjKUdY`7*{ZEjLHd{8;=Wa|Z${@=_EDrW z@f2;`qTg_hFpMrnj{R}@k zY5)KMg=s@WP)S2WAaHVTW@&6?004NLeUUv#!$2IxUsFp}DhhTe#UVp=vLGtrC{-+i zh0<1N)xqS_FKE(`q_{W=t_24_7OM^}&bm6d3WDGVh?Ap}qKlOHzogJ2)`R1Iyu0_f zdj|-O3RBIV2|(2>BNdN{+1#q=e}xZW^dW>HiJ5vLy_iAQ@pTUmU+$AFSI z8Q>9#=a_C-#2dsjo0iUbpE$@$l0tk=JZ{hhi66NxyZpwv=&-;ugGMGbPaGr`iybU? zFe@1<@icKnQ8mgJvMwu}w>Ybn8f)E?zc7&3R?=LjIf6KrkU$b5WYkbb1s0;TYNVJ* z(SEFpKkWFEVz~DA;aoyJBJ>YT&2tDbNAvuzlrcfvV?`QN)Ibiq}=wEYt zYwhFo0mx8S%QwKmAuv{??Da11?(OXD-!rZLegINfa+-cXRo(yq00v@9M??Vs0RI60 zpuMM)00009a7bBm001r{001r{0eGc9b^rhX2XskIMF->s8VMRY&$ZK80004INklv1-FG5Qcw;JcYRNv~(}UAdF34p<8K4$2>unWb7*>V?(<2C1QfW4`GeMuh9-g z!fq2{*=_^HTFePq_nq$Um!dq+am_KomB$D$0*nCDK0nWAiyw2l{WfTiC{&0xo6Sev zeznH0IJQL4G&_09NZIhy+Y&pi~T&45i{>x}YApwN>LwBs|3Y`RS_wU*Diq z46O^S*2`9>aIp(mvXA=vytNgyE*fB37ciw6UI*N!r#4qA29W@f2u{Ov2r<#R`27>G zwt^{*cl2jUXi5W?>}$Z)L`amKPhhv-o{iYr%6EwChBQk&a9c6Dn1bDY>m9g}AC4dr z-cj9oXo`ACaa|Lf?L?}r6h~cO#dVSDdJpshxY~6*KFLOa5#Zked;;j3wFc%6a}WRk N002ovPDHLkV1n;yLx diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Shotgun/m12_slug.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Shotgun/m12_slug.rsi/meta.json deleted file mode 100644 index 8b190de6f1..0000000000 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Magazine/Shotgun/m12_slug.rsi/meta.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/831c7c2743530e8a31910d781bae9dc34f3f1ec8/icons/obj/ammo_mags.dmi", - "states": [ - { - "name": "icon" - }, - { - "name": "base" - }, - { - "name": "mag-1" - } - ] -} \ No newline at end of file diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/LRifle/l_rifle_sl.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/LRifle/l_rifle_sl.rsi/icon.png deleted file mode 100644 index 10f1d89bf568f6a99a4a97cc5326b0f56ed4b747..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 497 zcmVMBq^bEkc7sAk8+1gG18L($LUYxFjw$In*Eo;SEL? zC@O{oVj@CtO}RL}raR=gJMZ0rlKA@r?(=yc-aCFwxm?C9XKAMNg}_`1hy{)W`=`G% z5fBR;Ifw;^CB9~xx`0^V$nJIkCB9~}AD0>05~c;B>vu#fa3mb};^nmt2~JzWlz_9B zBml5=xQX}24;gNz1hs&(mn6>UJ_c{k_-ri0wh@4p5>x`?aA~+iz)}gr0!nyiz=BHz zESJy~s0b~R&SZ%m+-eC;fr`)~jcOBamj_2TZcVt=5}E?V;sXFc5O`Ta4{o%ClEdij z1L;hbxLqCy0*^=}hHk%&`;+d(5}g4H02qGN5srIh88wFP9k{x@V7mRb47XB3i!t#P zND^+BN0vByTBEuXdSmDrs!8mfuNo?`vU9C@dcy*05|Ky@soY4n#3VSCfR=<-2_tZ7 z0i}dLASfB00000NkvXXu0mjf>=@HL diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/LRifle/l_rifle_sl.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/LightRifle/light_rifle_speed_loader.rsi/base.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/LRifle/l_rifle_sl.rsi/base.png rename to Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/LightRifle/light_rifle_speed_loader.rsi/base.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/LRifle/l_rifle_sl.rsi/mag-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/LightRifle/light_rifle_speed_loader.rsi/mag-1.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/LRifle/l_rifle_sl.rsi/mag-1.png rename to Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/LightRifle/light_rifle_speed_loader.rsi/mag-1.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/LRifle/l_rifle_sl.rsi/mag-2.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/LightRifle/light_rifle_speed_loader.rsi/mag-2.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/LRifle/l_rifle_sl.rsi/mag-2.png rename to Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/LightRifle/light_rifle_speed_loader.rsi/mag-2.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/LRifle/l_rifle_sl.rsi/mag-3.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/LightRifle/light_rifle_speed_loader.rsi/mag-3.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/LRifle/l_rifle_sl.rsi/mag-3.png rename to Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/LightRifle/light_rifle_speed_loader.rsi/mag-3.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/LRifle/l_rifle_sl.rsi/mag-4.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/LightRifle/light_rifle_speed_loader.rsi/mag-4.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/LRifle/l_rifle_sl.rsi/mag-4.png rename to Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/LightRifle/light_rifle_speed_loader.rsi/mag-4.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/LRifle/l_rifle_sl.rsi/mag-5.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/LightRifle/light_rifle_speed_loader.rsi/mag-5.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/LRifle/l_rifle_sl.rsi/mag-5.png rename to Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/LightRifle/light_rifle_speed_loader.rsi/mag-5.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/LRifle/l_rifle_sl.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/LightRifle/light_rifle_speed_loader.rsi/meta.json similarity index 92% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/LRifle/l_rifle_sl.rsi/meta.json rename to Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/LightRifle/light_rifle_speed_loader.rsi/meta.json index ea52c0128f..c13d991fee 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/LRifle/l_rifle_sl.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/LightRifle/light_rifle_speed_loader.rsi/meta.json @@ -7,9 +7,6 @@ "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/d1120fc8287cca2632e834069b5019bf941a0170/icons/obj/ammo_speed.dmi", "states": [ - { - "name": "icon" - }, { "name": "base" }, diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl.rsi/icon.png deleted file mode 100644 index 83623071fd5dd8a1d5f6a6ffa2e499fc51fc4aa4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 546 zcmV+-0^R+IP)3K~R+5R`+6hzRXeUKd|XOlaO+ECI=HIqq@reSGg7JS~+<(a33OD7`7r z6u376$wX8n6H(C+fn*{ohWoo1?(br0eAKl>T>=sgaCv-z{zt=Y3C{wB)dBI|ddla_ z0hh-Yd_Q&YQo@r!VRb+ZPK^NY^3|^*9BxXeO1Ks%g`aG0u>Iqd+a=_vNGJ#5n_5Dm|5m=xV;Q6WqO~$SG$8)pslRLzoupZ2?vNohFHIf zRfPlm+<~`~zspKQ=Raw63CMZW(_MV7U&Z(~vs?impJ=}>aij!S5}5t)PRr%973jRK``nck=SvF$Xa=fbD^vCcc) zvTF;BjlIw;Ypn>+<+GeQ1y)uTwKJzs{7$ZU5zthw<)#@IKHXmdGR?REJj0a*?h00y k!2g>2aVKmFGzIFJzhie0H{BZJ*#H0l07*qoM6N<$g3QM8cK`qY diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl.rsi/meta.json deleted file mode 100644 index 147ceca10f..0000000000 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl.rsi/meta.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_speed.dmi", - "states": [ - { - "name": "icon" - }, - { - "name": "base" - }, - { - "name": "mag-1" - }, - { - "name": "mag-2" - }, - { - "name": "mag-3" - }, - { - "name": "mag-4" - }, - { - "name": "mag-5" - }, - { - "name": "mag-6" - } - ] -} \ No newline at end of file diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_flash.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_flash.rsi/icon.png deleted file mode 100644 index 4ba720b53d00769f943bcad824c9afc06581a9f7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 532 zcmV+v0_**WP) z0ozUs+fIv?2-tR7Bxc4*%#1U?kn}Cllz@Z-T;{GYbQ8ZN0t;03hsECFU$(w)bD6v1 z=k+gwln5kH*&h}kzl;I!b>!HE!@m-$621kh;di+cew_W`WeGVd63PPe3rSHA{;~u> z>9&Yv#gs~Ps=^K3Bvk-bb{L5Ec;HgzbN42xLKMr2c}o0m8Wxan0LzMT_&8A)4sdY; z2U8_aiPhyLttkOH{eyk(^YC$kqm`W+`0QMdTS5h{B(S=?q?K-qHS4KDlyB>`aQUtR zR}zpCj*|g!^BTIzc~`V9{L@-i39c+)+i780F{FeXLpO0AdOaolz@fn@kQ-3`e?vFP z=T8|L`T#s{vQQ+9QwDB+`-Ve<0@ZMtJ`@R)&!1AgFG7(p&O@(Xc4L9*=~2ybGM-~~ zU#_sbyP@5eEADr4Er@`oaxIU?Cq*a{t^vj4lL80~R~C3JSW^OTHSgn2*cNCDG&4`} WH4|bz>RP-20000Nkl=?pA_%Ay{fHh5nGwX6{x&kPG0w{neAc~XqG(Z$5t7Y1UAxHoo4gkI%peSzA2%#3Z zp0gcg5hOsKrED1c-MUOW$UBf{DXZ%{0O0v}0RUuXf;AtEyzn zGz*0b0RZem`8hQl5NN^C^`9Rj1yBG5P=F)r4L;0iQu7Nmn*aa+07*qoM6N<$g0Wq3 A-T(jq diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_hv.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_hv.rsi/icon.png deleted file mode 100644 index d86513750cf4e60acc8948f5e5cbab2ea21c88cc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 543 zcmV+)0^t3LP)IZv8OZwa&n z9*saUrHf=r7flgJrgSkJi!vOG@^UKTSfU{T2?sc}Y@T&>;IxEmfx>D;e4UN6w!O=# zW%J|b1#U{X5-6-j#L)C80Gr0sA{_peP?c~jPzwKjw9B{sKU9{GqavX!@aFA1Q43yK z0^su3E&5=eQi(QIcrXxR?i`p;^E~V?gG-tBoiKI``e0vKiTkE*0SN~%j5r%N<2B&` zhbM40Em|pRR%@U;F=-xK)BH34EOSpyh0*bK&uMF|WIwvg->> zPL61%xn6|lY>TUWft8hI?J8d=eka%52xuzT@Nkl=?pA_%Ay{fHh5nGwX6{x&kPG0w{neAc~XqG(Z$5t7Y1UAxHoo4gkI%peSzA2%#3Z zp0gcg5hOsKrED1c-MUOW$UBf{DXZ%{0O0v}0RUuXf;AtEyzn zGz*0b0RZem`8hQl5NN^C^`9Rj1yBG5P=F)r4L;0iQu7Nmn*aa+07*qoM6N<$g0Wq3 A-T(jq diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_practice.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_practice.rsi/icon.png deleted file mode 100644 index 649c558b4aab102808510e98209faefc0576cc07..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 542 zcmV+(0^$9MP)yFhx5ce ziT`=Ll<*|r?DUI)ufqTg4&@7Qcq*YP;aZ>={_psJKZz@zmyn|(p)4>nJ0~i^pO*kg zUEVU?+p1LJgDTuK0xX>Y%Ug5>TT0+k#`tu_kDn&fy{#oBUYe=}Bpe_V3bS`JRuK;H z>jV~N?@CHctZiyF3CQXE+);S$-Hfrnyj2FDinctKI8}lx30RBsS|*z=TVFa0^8H&m zT)wNol?0@OZN~uk`}-6C(+F_%F<22kxDr=_D+{cy?ut+-jFgaL8UgHldr1j5aH#SZ z$O9<%-!uXwlZW*5^Z}5`rt$f8>>O}%;TjHA3KYX-dY@k>nLMQUT=@JtcD~&$ySl*S zNkl=?pA_%Ay{fHh5nGwX6{x&kPG0w{neAc~XqG(Z$5t7Y1UAxHoo4gkI%peSzA2%#3Z zp0gcg5hOsKrED1c-MUOW$UBf{DXZ%{0O0v}0RUuXf;AtEyzn zGz*0b0RZem`8hQl5NN^C^`9Rj1yBG5P=F)r4L;0iQu7Nmn*aa+07*qoM6N<$g0Wq3 A-T(jq diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_rubber.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_rubber.rsi/icon.png deleted file mode 100644 index 3c6dbb5d0b771ab2766105ac4b5a22f12731dae4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 536 zcmV+z0_XjSP)U`mGwQXC}0Avg&|RHPIUIw-Y`b0t-?mvj zaWT#uf|Lj(;BNGZ!KrruWP3h&aQIh3Rl>JGCH(4Om!sc*d00Y@iiEO2#+(uL;15dx zxaXJL4UZ_5P!hwPEpf(U3T*YZ?qOhgR529!#T2_P_BS>S)cLJ2(8JdZnJOQ0nX aX6^ydA{8ft#4+vw0000Nkl=?pA_%Ay{fHh5nGwX6{x&kPG0w{neAc~XqG(Z$5t7Y1UAxHoo4gkI%peSzA2%#3Z zp0gcg5hOsKrED1c-MUOW$UBf{DXZ%{0O0v}0RUuXf;AtEyzn zGz*0b0RZem`8hQl5NN^C^`9Rj1yBG5P=F)r4L;0iQu7Nmn*aa+07*qoM6N<$g0Wq3 A-T(jq diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl.rsi/icon.png deleted file mode 100644 index b1fbabf2c8071f0abc2121f469ffa31883799b75..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 526 zcmV+p0`dKcP)}*E# zG7IDtlhmk*ZjB@`g|{Cc` QB>(^b07*qoM6N<$f+lM06#xJL diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl.rsi/meta.json deleted file mode 100644 index 147ceca10f..0000000000 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl.rsi/meta.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_speed.dmi", - "states": [ - { - "name": "icon" - }, - { - "name": "base" - }, - { - "name": "mag-1" - }, - { - "name": "mag-2" - }, - { - "name": "mag-3" - }, - { - "name": "mag-4" - }, - { - "name": "mag-5" - }, - { - "name": "mag-6" - } - ] -} \ No newline at end of file diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_flash.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_flash.rsi/base.png deleted file mode 100644 index 4ba33eff44f80b9903a3dbae6e2c1d867945abb1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 302 zcmV+}0nz@6P)Nkl=?pA_%Ay{fHh5nGwX6{x&kPG0w{neAc~XqG(Z$5t7Y1UAxHoo4gkI%peSzA2%#3Z zp0gcg5hOsKrED1c-MUOW$UBf{DXZ%{0O0v}0RUuXf;AtEyzn zGz*0b0RZem`8hQl5NN^C^`9Rj1yBG5P=F)r4L;0iQu7Nmn*aa+07*qoM6N<$g0Wq3 A-T(jq diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_flash.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_flash.rsi/icon.png deleted file mode 100644 index bdb7164bf97f63a72854691bdd67cee038d7cfe1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 515 zcmV+e0{s1nP)!;r zI2NcJ4v3+-F#r|^&kQ(xmvACsTOg542{ZgTch2p_3)Lme=Nl%FNTx(67-spgkJFVs z172MMpjaxPsu9~IY6?g=fT~6~d7rSrrOZg%wgESns9Qj;uI^6bd-6VEDFJYK2S-yy zONrH`1*L9*)ujccSStM3Uw-UkWBnUGGuv({VFwPN*nJTtk||N0w^%CB`*C5wrOfbJ z#uglGUV)~ig{nr-^<&F^C>Tb6>#&q?0taaQ?WY_-dH3sn|`Fs}hT=)Wh^tTSD?AikH_^6`m$Ck-{Emzpz-%?)772}-Tb0c7D z2&2(S;S2bGfTGb!0l0?S7HAZ#E`h&V|Nlwm33vkau1~D`1G)veeZc?#002ovPDHLk FV1kY4Nkl=?pA_%Ay{fHh5nGwX6{x&kPG0w{neAc~XqG(Z$5t7Y1UAxHoo4gkI%peSzA2%#3Z zp0gcg5hOsKrED1c-MUOW$UBf{DXZ%{0O0v}0RUuXf;AtEyzn zGz*0b0RZem`8hQl5NN^C^`9Rj1yBG5P=F)r4L;0iQu7Nmn*aa+07*qoM6N<$g0Wq3 A-T(jq diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_hv.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_hv.rsi/icon.png deleted file mode 100644 index 4d25c62c86ccec3db73f7b838d9a4af2185c437a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 529 zcmV+s0`C2ZP)*qY{W@%8>Cny)&oKyxdtr;eN}5cMrag@80mVLZLuA=UH3nzJM>_ z3p|BDCZ80Ud{VSUAd^pu;lX}}2m2YAOt_M8Eg<0lC#J>gS1)i=!j(W}Eg^m^r1-Y8 z$BAiiadnB?5-kf<))Hc9`U3!4`b!%Q_a$19P!^b)$%;n!pQAl~eZS#h2|20~N&-_e zSrLuI$eqX8UR<%^4@&@C|E`mK_g1+?QvnGF(Df9XwNVFL%FK4wZFpk|&jNC~d*0aV zW^L3_0^sl%PA9{T61$%ZnrDHJ^K)9sG9T^d&f_e7xrb*a!j2Lua3ujLVHg_#oc=rm zAR38r&=GgQrHm?ESzvj2UFdoWDIq5siD6W`93|d=QilUP|Jz4-0p~BCM>NCOu;C@kNkl=?pA_%Ay{fHh5nGwX6{x&kPG0w{neAc~XqG(Z$5t7Y1UAxHoo4gkI%peSzA2%#3Z zp0gcg5hOsKrED1c-MUOW$UBf{DXZ%{0O0v}0RUuXf;AtEyzn zGz*0b0RZem`8hQl5NN^C^`9Rj1yBG5P=F)r4L;0iQu7Nmn*aa+07*qoM6N<$g0Wq3 A-T(jq diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_practice.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_practice.rsi/icon.png deleted file mode 100644 index a29da0a91f885acabf9a6b27510e28f4e01f4012..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 529 zcmV+s0`C2ZP)T=m0x?hsxI~1+5JI3}A&XNx6nk_K5k-)SAOr#j zt}Y1?X&`NAAjCq+5Nrb{nRIcG*Xf-(h34g=1mS+mgLebYH+1 z@CEKdplW7C)y#^K2vp6iNW^p!F`doSq9+N@0ul~zQodqp{0Ux4coMMpW<}@a#SUh1eS9v zB4mVFZA3Wu{MCWqECEpceZjle&y`E`6_9X%Xf#IQJn4c<8RKc)f%ldeT0qW=SCh_K zI8VAt036rgWA4&bBDJ}r4J}}P`k=Mi&0G7cjR@;&*YHgCnX7~fTuDGmSXLf@pWo{M zgp4ppk0UO)lu?B%3v6uci)b{4l#mlL!dTr2SBbeVMP)d^qyK%B7f}BHkP)U*DKS0$ z27p$(Ng$|Wb%5Hhf#J}nKrdXT4+M28l@h)8A`sNEx)X!4`wOJg^O|Ml9eAtVbF4g_>urT!<7Z@3O1C$ea*vvlKBF@z_9ZVNeBKI TOImSe00000NkvXXu0mjfuTk+c diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_practice.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_practice.rsi/meta.json deleted file mode 100644 index 147ceca10f..0000000000 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_practice.rsi/meta.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_speed.dmi", - "states": [ - { - "name": "icon" - }, - { - "name": "base" - }, - { - "name": "mag-1" - }, - { - "name": "mag-2" - }, - { - "name": "mag-3" - }, - { - "name": "mag-4" - }, - { - "name": "mag-5" - }, - { - "name": "mag-6" - } - ] -} \ No newline at end of file diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_rubber.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_rubber.rsi/base.png deleted file mode 100644 index 4ba33eff44f80b9903a3dbae6e2c1d867945abb1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 302 zcmV+}0nz@6P)Nkl=?pA_%Ay{fHh5nGwX6{x&kPG0w{neAc~XqG(Z$5t7Y1UAxHoo4gkI%peSzA2%#3Z zp0gcg5hOsKrED1c-MUOW$UBf{DXZ%{0O0v}0RUuXf;AtEyzn zGz*0b0RZem`8hQl5NN^C^`9Rj1yBG5P=F)r4L;0iQu7Nmn*aa+07*qoM6N<$g0Wq3 A-T(jq diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_rubber.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_rubber.rsi/icon.png deleted file mode 100644 index 2f5d345277df6dfd6eab2aa55d774afa31d6f5a0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 530 zcmV+t0`2{YP)LI=ekK`I0e z6dZIpQHn=sV*_dE&TIJUMayiM`>J9wW{1aaZ6}Xasl(4LQ0KR`M z0T7GEIqysQ;8I2vt}L*=z9&+taioNtSTv4x)$c1Y_R&^`13bR#qr8Cf|HqVI}?Dhh4bCa57?R)TQtwN*j zvc3IDYt&uuoZJf{ps75|)9G0eG4xxYbb3|*f#J#m_XX=p;D61-f0Bg)p+L9u4{K8X U7=(h6R{#J207*qoM6N<$g8i57*8l(j diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_rubber.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_rubber.rsi/meta.json deleted file mode 100644 index 147ceca10f..0000000000 --- a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_rubber.rsi/meta.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_speed.dmi", - "states": [ - { - "name": "icon" - }, - { - "name": "base" - }, - { - "name": "mag-1" - }, - { - "name": "mag-2" - }, - { - "name": "mag-3" - }, - { - "name": "mag-4" - }, - { - "name": "mag-5" - }, - { - "name": "mag-6" - } - ] -} \ No newline at end of file diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl.rsi/mag-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/base-1.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl.rsi/mag-1.png rename to Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/base-1.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl.rsi/mag-2.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/base-2.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl.rsi/mag-2.png rename to Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/base-2.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl.rsi/mag-3.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/base-3.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl.rsi/mag-3.png rename to Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/base-3.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl.rsi/mag-4.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/base-4.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl.rsi/mag-4.png rename to Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/base-4.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl.rsi/mag-5.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/base-5.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl.rsi/mag-5.png rename to Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/base-5.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl.rsi/mag-6.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/base-6.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl.rsi/mag-6.png rename to Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/base-6.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_flash.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/base.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_sl_flash.rsi/base.png rename to Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/base.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_flash.rsi/mag-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/flash-1.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_flash.rsi/mag-1.png rename to Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/flash-1.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_flash.rsi/mag-2.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/flash-2.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_flash.rsi/mag-2.png rename to Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/flash-2.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_flash.rsi/mag-3.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/flash-3.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_flash.rsi/mag-3.png rename to Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/flash-3.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_flash.rsi/mag-4.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/flash-4.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_flash.rsi/mag-4.png rename to Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/flash-4.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_flash.rsi/mag-5.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/flash-5.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_flash.rsi/mag-5.png rename to Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/flash-5.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_flash.rsi/mag-6.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/flash-6.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_flash.rsi/mag-6.png rename to Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/flash-6.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_hv.rsi/mag-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/high-velocity-1.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_hv.rsi/mag-1.png rename to Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/high-velocity-1.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_hv.rsi/mag-2.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/high-velocity-2.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_hv.rsi/mag-2.png rename to Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/high-velocity-2.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_hv.rsi/mag-3.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/high-velocity-3.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_hv.rsi/mag-3.png rename to Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/high-velocity-3.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_hv.rsi/mag-4.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/high-velocity-4.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_hv.rsi/mag-4.png rename to Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/high-velocity-4.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_hv.rsi/mag-5.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/high-velocity-5.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_hv.rsi/mag-5.png rename to Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/high-velocity-5.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_hv.rsi/mag-6.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/high-velocity-6.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_hv.rsi/mag-6.png rename to Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/high-velocity-6.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/meta.json new file mode 100644 index 0000000000..f4c28a4760 --- /dev/null +++ b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/meta.json @@ -0,0 +1,104 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from and modified https://github.com/discordia-space/CEV-Eris/raw/aed9cbddbf9039dae1e4f02bab592248b0539431/icons/obj/ammo_speed.dmi", + "states": [ + { + "name": "base" + }, + { + "name": "base-1" + }, + { + "name": "base-2" + }, + { + "name": "base-3" + }, + { + "name": "base-4" + }, + { + "name": "base-5" + }, + { + "name": "base-6" + }, + { + "name": "flash-1" + }, + { + "name": "flash-2" + }, + { + "name": "flash-3" + }, + { + "name": "flash-4" + }, + { + "name": "flash-5" + }, + { + "name": "flash-6" + }, + { + "name": "high-velocity-1" + }, + { + "name": "high-velocity-2" + }, + { + "name": "high-velocity-3" + }, + { + "name": "high-velocity-4" + }, + { + "name": "high-velocity-5" + }, + { + "name": "high-velocity-6" + }, + { + "name": "practice-1" + }, + { + "name": "practice-2" + }, + { + "name": "practice-3" + }, + { + "name": "practice-4" + }, + { + "name": "practice-5" + }, + { + "name": "practice-6" + }, + { + "name": "rubber-1" + }, + { + "name": "rubber-2" + }, + { + "name": "rubber-3" + }, + { + "name": "rubber-4" + }, + { + "name": "rubber-5" + }, + { + "name": "rubber-6" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_practice.rsi/mag-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/practice-1.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_practice.rsi/mag-1.png rename to Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/practice-1.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_practice.rsi/mag-2.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/practice-2.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_practice.rsi/mag-2.png rename to Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/practice-2.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_practice.rsi/mag-3.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/practice-3.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_practice.rsi/mag-3.png rename to Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/practice-3.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_practice.rsi/mag-4.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/practice-4.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_practice.rsi/mag-4.png rename to Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/practice-4.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_practice.rsi/mag-5.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/practice-5.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_practice.rsi/mag-5.png rename to Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/practice-5.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_practice.rsi/mag-6.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/practice-6.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_practice.rsi/mag-6.png rename to Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/practice-6.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_rubber.rsi/mag-1.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/rubber-1.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_rubber.rsi/mag-1.png rename to Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/rubber-1.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_rubber.rsi/mag-2.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/rubber-2.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_rubber.rsi/mag-2.png rename to Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/rubber-2.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_rubber.rsi/mag-3.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/rubber-3.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_rubber.rsi/mag-3.png rename to Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/rubber-3.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_rubber.rsi/mag-4.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/rubber-4.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_rubber.rsi/mag-4.png rename to Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/rubber-4.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_rubber.rsi/mag-5.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/rubber-5.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_rubber.rsi/mag-5.png rename to Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/rubber-5.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_rubber.rsi/mag-6.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/rubber-6.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_sl_rubber.rsi/mag-6.png rename to Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Pistol/pistol_speed_loader.rsi/rubber-6.png diff --git a/Resources/Textures/Objects/Weapons/Guns/HMGs/minigun.rsi/bolt-closed.png b/Resources/Textures/Objects/Weapons/Guns/HMGs/minigun.rsi/bolt-closed.png deleted file mode 100644 index 3b435f7b8829db247521662f5c216620ed56d9ab..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 825 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�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 X4jVazSyqOFqX==db!KF*4~+XanZ5QB delta 2329 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 M07*qoM6N<$g0i}EHvj+t diff --git a/Resources/Textures/Objects/Weapons/Guns/LMGs/l6.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/LMGs/l6.rsi/meta.json index 5349478708..7f39743823 100644 --- a/Resources/Textures/Objects/Weapons/Guns/LMGs/l6.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/LMGs/l6.rsi/meta.json @@ -13,12 +13,6 @@ { "name": "base" }, - { - "name": "bolt-closed" - }, - { - "name": "bolt-open" - }, { "name": "mag-0" }, diff --git a/Resources/Textures/Objects/Weapons/Guns/LMGs/pk.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/LMGs/pk.rsi/base.png index e068cb506dfd88096a28e5d5ea4f04b04f9b4cd5..2451562b38b9827e4dcb3b5ee244cc7d05674a88 100644 GIT binary patch literal 5674 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 UVRJJ=;FJ*_3?F)_^YWDc0yPr8Qvd(} delta 261 zcmZ3bvxjMdvIYZVage(cP9K zX@i&$P=LE6$S;`TKOEGS)m{Y(&-HY145^rtoFGx-5D>u7dOjs7>4-p=&Y~qt4$SIX z)V8;=)+$0dJ0l~*)!nr^GowPIc|-T&gp{aTXI?(Nd@23h9IIZ(BR6hXCOqOHZv_IB|8DZg1eL7a0i&0b(IZ8vN@s@)KS}F_=XLb~ZL%+%T6p(Ne&8 zmr22b8~RBh7aPu`mzX(y68Jt3=EIGl>72S&b0wu%HZkh=d#Wzp$Pyn C*lJAx diff --git a/Resources/Textures/Objects/Weapons/Guns/LMGs/pk.rsi/bolt-closed.png b/Resources/Textures/Objects/Weapons/Guns/LMGs/pk.rsi/bolt-closed.png deleted file mode 100644 index bea51b9d117c66e27c892b5e08200d0889eb707a..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?31 zWe{epSZZGe6yy)^32_C|mNt=lkDu(Fx=>%!p>CN{EKrEGB*-tA;Xe?_Tu=iUujT3D z7*a7OIYFYxAs~RERei;hB^@dXIXO885}H&NJbLu#zylZcl7T|3B|(0{4F7>Z=7Ji?cuh|i z$B>FS$q5H|C0H-8w5(7_Xi{9zp{DSrL$6_>lcetfj@Sf|08R#mmFJk;%y#ke0W~pr My85}Sb4q9e0CmAI2LJ#7 diff --git a/Resources/Textures/Objects/Weapons/Guns/LMGs/pk.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/LMGs/pk.rsi/meta.json index 367c02ede6..c8c6ed8321 100644 --- a/Resources/Textures/Objects/Weapons/Guns/LMGs/pk.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/LMGs/pk.rsi/meta.json @@ -13,12 +13,6 @@ { "name": "base" }, - { - "name": "bolt-closed" - }, - { - "name": "bolt-open" - }, { "name": "mag-0" }, diff --git a/Resources/Textures/Objects/Weapons/Guns/Launchers/china_lake.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Launchers/china_lake.rsi/base.png deleted file mode 100644 index ac612a2905aa98e795de3c9623aa7d0b7a75bf8b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2465 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 Hu0mjfUdX>t diff --git a/Resources/Textures/Objects/Weapons/Guns/Launchers/china_lake.rsi/bolt-open.png b/Resources/Textures/Objects/Weapons/Guns/Launchers/china_lake.rsi/bolt-open.png deleted file mode 100644 index 91b1d160835d36293e7c317639f4113b012aab96..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2517 zcmV;`2`cu9P) zaB^>EX>4U6ba`-PAZ2)IW&i+q+U-|cmK-Mx{bvSgUhd=Nkt}$fMTC9|aPqu8-@KEFRx!M%-xt|Z+LwJAb56=Lh zi_!A+TGlP!&@b;3G~fOGwLj>%_0(HYiZ4sEuk6qBHu6@)boHnEJ=i^=l@IRRKN`2% zH@7~$X9XBjppPlg;>7XX=~{`eU&BvuPh22~`{~J7|CjiM2fD8S_&j~WFTPpE?{Hj- z-rOpmaJu`GeCp?C8G5lO(X%prw21i$gfH;hd)B?z)GeMFPl!4>dD}3(w+3Q8o-X7*D#rj|cyU61UW;kun%>MjkTC&{2ntHfi!i2?(=Hopsu5D=mc5%1c&R zy6UpkHezk_&Rcfby6d*x9@cJFUs?Oi+_zavH*0i=ayflx4c)45Dw3BIan8UPpKZghD)?W~Z>flvW`A6jI`+vCcIjuR z+nDjlwD{Gw`^;8HSya~0nbZ$^O_Io{v_fGdMnwg4{VT_HI{FZwYy%mbSd}}L>lHFK zD_%WQ8m*(;A6f}5qOhEW$7ny~k2?cJmq)JU%nnQWL!ND$x8DU$jLg^S)MtS_Th+qD zAhM;SHj}kNrLMJlfVtjc)F^f4OMgbaNg3amW)%+^%d z+~fpjkfO;1TA<8v@Y!)@!G3^U7G6vkv~kPD%_)lV&MI-iMd&z@g=m_{H8jA7^Bo;z z%Gl=K!vz6fK-nU!Qr$*xVl{?Wokdz3vv3e?IC2pbsf;qR$Q1_KcZUC^;@;81o7O+PhDYFQ&qii6?(z>h(qA-vl7p!NYCVj!E*D*vQPWYoq_6WoM8r73b#pA*vgYN#!xvQYZd&Hr zy6`t7V!RmsN9k7GiDxOOt~iqgNDu539S1EW)*Q|eNEYCUb*`PNkImoQs?dh-3H)gL zzoOq<(Z)&MVhn!+JWruSX|v=H0004nX+uL$Nkc;*aB^>EX>4Tx0C=2zkv&MmP!xqv zQ;Q-M1v`io$xxjvh>AE$6^me@v=v%)FnQ@8G-*guTpR`0f`dPcRRg44N3P2* zzi}=)Ebz>bkx9)Hhls^u2g@DIN`^{2O&n2Fjq-)8%L?Z$&T6H`T7B{t2J_lVn(I_y z#Ib|~k`N)IhB7L!5T#us#YBqEV;=rt$DbsZOs+B*ITlcb3d!+<|H1FsnuV!JHz^nc z0x!1xF$#3=0?oQ@e;?a+^91le16NwxUu^)hpQP8@TI2}m-v%zO+nT%wTy{D4^000SaNLh0L04^f{04^f|c%?sf00007bV*G` z2jm411_TAkb7tZI00GTOL_t(o!|j*PO9DX@$G=lvHBa3NS@7x)(2Ixufi+=P(+f139W>0+X)N-*mMG+ z%`LRvx-hRWa)4ril{aS4?^6I|b9qJIX*B|nRQ_(Hq=Lw!RKAuIk`-V~19)u!@Qh5A zpm=%q>#?I%y1EtcC@!M=qV(@eg$lZi%FhME-8(}ec^cA@AuyC_kF+bz27@w7zVvW zsHfQj0s(=5!2dv?Z@&UPk3W>rYgg)Qnd}-jwL9WK2$)t0vI<)Zga95tT9Mrn(2@yZ zS|$E|iWR%%I$;Cfd>o5t-=763a#JAC|b6o8k@%Tl|S z6y7(`PPx2!za$iDw#`DmX`XA_Ead4w0_M6!e&8_XdNoh6SOJ_0xRcu@0Z_KL05}mo z&AH(Vp8f5c3=|x{GnRi=9PfaaSbvhLNl>=8&{KDy9;sU Ugf}Pl9{>OV07*qoM6N<$g7=gJH~;_u diff --git a/Resources/Textures/Objects/Weapons/Guns/Launchers/rocket.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Launchers/rocket.rsi/meta.json index e66bd7fa92..0a43455140 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Launchers/rocket.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Launchers/rocket.rsi/meta.json @@ -7,9 +7,6 @@ "y": 32 }, "states": [ - { - "name": "icon" - }, { "name": "base" }, @@ -34,6 +31,6 @@ { "name": "rocket0-inhand-right", "directions": 4 - }, + } ] } diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/clarissa.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/clarissa.rsi/base.png index 4ff228d54dd1a7a9df7a14be714761b9a7aece5b..e627393429fc4226e58c4b1b5f77293396337637 100644 GIT binary patch literal 5361 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 SsVg8xVLqOI9>?9HlK%@V95Z+T delta 1930 zcmV;52X*-IDZ~$uB!A+1R9JLUVRs;Ka&Km7Y-J#Hd2nSQWq4_3004N}tyWuhD=7^8 zXBD#q5D39?#Os{d!7P7DblZ*}x$#ZXZ8so5NL51M=70Y#_YWQlDY?W_a?RP}Ni|hc zREj^IqYOUn?|$g)LiZ4}p67UloNp5(o$_`scYo4PJ>^ss{N2*gR<`;$ zjXV`aI^^MOyLwL0{K1{`PyJMTaqFR-1Yit?zDSN{4AJi|9V^A-ulO^*A!ZE3ch@Vv zDatc`?h4%t0I#(N{QSkTc!T3mba5*`;B?9ZKgi>C8M?D5&~;_{Xi*X`{^RojzqLkL zYaZTd$_{Yl(|@UpE4zk)4XWavmhlSyjJoW%;w@f%2WtbaHs>1}H4qSAA%zh%tT1=k zLx+ipCJ9QSPI1dh6spvtQIPBni^PG45esh4f#dtv zJqo`2-YHtk!aM|Du2{h?viO1-#+-dI3WS7pV#*ue;D3(7KR!lm1cSU`E^ttNJ5)3d zx7doC=jhpCX!6H?2{KLvfCy_dj0q78_#7gK9J~-o2*9y`ABE)<6E!dp*f9-QNhx9{ z2o4{B7ar1#F7e^T%?pzi&m-;X^dUXRcfiVs$x-13SElv3PGb5TWZ{LlU7=7+7UiI zb?&)KFTHjhG~z%Ca3c>HWz?ZFOoY-*lV_eX%dAruVr|8h7O%Wyl~tEsSvy(1XYG-> zKeHB2)@T!DMf zQo+xEw{(9yA8WK&2(+ohxUty%q1x=ZCni9nu@qPDAT^3q(nTWe*n(>vAfr(D|# zKd^hKjdIKkcW&CCQ+PL`4d-X;3**RJlXUk*zHcn8Hf*-xNptesH->jN_ua1GxL@NQ znlL7z+!|JF~5}GYaYxp&uP_S6O}@2GT)2!^b|6j4Sf)!1@J~=k#U=MF&j)Tm{IyNae`)l4 zwq9Mcq*qSr0IlEj9?`m!**46GAETeM)5p+rFJtkm@TJBSp?P@OD@ia1IYi(sL&6g44N3P2*zi}=)Ebz>bkx9)Hhls^u2g@DIN`^{2O&n2Fjq-)8%L?Z$ z&T6H`T7B{t2J_lVn(I_y#Ib|~k`N)IhB7L!5T#us#YBqEV;=rt$A6zBmrSlQ7&#VD zg$l{>ga5(r*_wr^NjE7N0|GC${V@u3?*h%bZGRuzcJl=AKLb}<+h1(}v!A5b+gjuZ z=-&n|uG^Zt2VCv|Lr=P7NRH&E5()+2{fxdT2MpcrLxj6c60)S2o6gWeS?as81A5ye2qCyQVjr?^NG#A zgr@G5lCz1KSba*qcfN>$s;rS^8I+QX-2tn+Q~~-o;3ourq)i8jAP8b^o*7C}#bc04 Q5C8xG07*qoM6N<$g3#2U+5i9m diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/clarissa.rsi/bolt-closed.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/clarissa.rsi/bolt-closed.png deleted file mode 100644 index 06018a260a452a42a3f00ba5acbdefa101217781..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1905 zcmV-%2afoOP) zaB^>EX>4U6ba`-PAZ2)IW&i+q+O1Ywmg^`C{AU%j1cVTR?U-uEtN4S5oyZeIx6Qkwh zHqCQSpevn0-9p(t3~X@4`?Z8q@fY-U zp9N?3)pw{i5NdP2;ieFh(=UoNsM4aj+fE%2W0*nFhR_3VTV@Rd^n7x(mZdq7&v&kXD_DL3hAC%PjDjGv zPEKX>OYUg=^)O)>3d*KABf#q0;i3sWa*Mal?8RYd^v8N39j60Ogt-M^h@pT_#6pR@ zhM+{?F+-mUy2la`vc+)Aq*>CRGM+hOjBo` zW!8mUTfE|um6oo&%BpwOPF0^(yDIm&YILd=woo=sAF9EudUHWmPQ)~WVj&U~S5p89 z9ZWNyDaK&RnP$EOcFYohQcRpdrWh2AlY%U|Yxhv@L){$M{i$x@J>{H9_Z!MNlkSaj zue!aX+NitS@)pQeAvi^aWGufGeGM5u|EI0{=?gr0y_mYM?(c9sTK9K29wzrYc)oD- zHI7H?eh1IHj(&pUY*$e?OBKb)dORr}6*h`(Rz7Y8S&9^n6i0360~fR3uB(4(k;wCE zYOkZ)lvSH+GMc2)Tk_nO!A!nRUl9*hQD`HFmTf;c^?Ycdb}XQZuW`r?^c6{4us2-eYI5mmm@ym&c2;%Hu;r~e9`W#zF=UBqV5A*bPH<3-OHSJXs3h=% zC2>0ccp1L7?py1#88tTVUZ6E+ngw~$2Z*KEBgl0J$GCb+5tH{(B=A)}cmv~KVRBy$ z_+Bkp#qCwTr31Bo%X_5jE?FCx2|vbd*+>79RMxty;gj~$Ty@`e^F{0a4##7(`yD(V zJNhP$N9%qE&(+b7ar~M5UpjgZ$HE4$xc>oh%J5u@faK2r00D(*LqkwWLqi~Na&Km7 zY-Iodc$|HaJxIe)6opSyiy{>TJBSp?P@OD@ia1IYi(sL&6r`RHv4jMY5Fw+6GAghTrClS%M2gO19{yp+pCp$|t}+-o7Epx> z$?=2#!SC6cg{et5DHsC+FSh+L3Uu!R&AM%WAKP~G1n@rtS6bU&Z2+^Mq}SV8G?f^qix@1U>pURz9|O`-U7XA?%Z1EIDG&zG^^zs;NTD#D^m8l z$Gdwv=l1WN*8F||Tnuua)4A7F00006VoOIv0RI600RN!9r;`8x010qNS#tmYE+YT{ zE+YYWr9XB6000McNlirud rutmXW_8SGGU=)mkQ7{Td!H5C?(E~Eton>ZV00000NkvXXu0mjf(c5W= diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/clarissa.rsi/bolt-open.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/clarissa.rsi/bolt-open.png deleted file mode 100644 index 8d0fc07b3d3469edbc346d1e089d4b6381fc696f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1947 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 PWrSFo?lCDe@{IUjP^4H> delta 2477 zcmV;e2~zf$E{+tCBmpLoB_DrTlH@21{pS>O1dtGjS2{RsC@CCQ z1^s%ChC^eI6Ra(`IzoROxM_)i_)a;k)YDFO+L4VWrd+AfWTznekv7%9 zjTbBUm|%`EOb=Vq(c4@flqoc?gqf5e3>-fn;dS6wk0(KUdzhyb^??=aB9AYa;mr9J zvp`7NH>Ps%P2p(7a0FenFRg@ZkgOT>`$9$S2P<|qMEbG(1nORDP@0EnPlU`%2# z5KCf7CB;fqQv!|(emX2C&NRS4k|4BTC1u7+sHEh&@lH)=E(u-3NG~8luuv+fY1~0p z&XNn(n<9jI5SA<=MXIPY>4i%!Qc9`C^Hi@~bCp_Zty){{%9>TQXjRpwy-{PNF$t}- z+O)OSJCyd^A*+95e#gL|!6OeDWz?agjXn`RGf$ai)~U12zG(463J9yLx^%VGEg3?| zvWXR|rq--)#MbpTIL;QK7NhM|RozGV-)C*@Uf--lhoyIJ9 zDRh%KRIq;{#U`xnlCY*kE%l+f@0wwxqV`sZ7~LgJDPB(XJj6Wp`N0Onje&fy33k!( z|DMtMig_ZX=q+$P$)F=)#{sKWSnjB$!dh@YTDNYEk;U3ZwQ>L}M8Vpc&HX_}Y3?TS zjC}MsTpjn@UrKrLh^>3#+G#>64Wu9#Ru{u@lsA8ws8Ok{wH&Y5a!lS2A8yc*^Bfx^ z!W-9I_Xc3W+HpH`lT~g(UOHt4GkAPppqVOTwpkemhcf_scCR!Hdq}%*_sDVI@<-po z2U>weUNp1~MASfngpz^UZR~1gfm@VgBr%(1buj~xNbqsGsgs>Cacg27RphW^Fujj0I*NzqluQbThI#BFHqT?f zT3ZbGqkykFyns-lD~6KwXP6F*HAAq ztx#4r>!1RuYG-79tQ76Db!;=$5OxrU47morK>7))-O3eRTTlwrE*nDD_`Mry_`_}Z zT><|K`Xhqy6}(pq{{q?^Z|X4LMTJBSp?P@OD@ia1IYi(sL& z6g44N3P2*zi}=)Ebz>bkx9)Hhls^u2g@DI zN`^{2O&n2Fjq-)8%L?Z$&T6H`T7B{t2J_lVn(I_y#Ib|~k`N)IhB7L!5T#us#YBqE zV;=rt$DbsZOs+B*ITlcb3d!+<|G|In*_wr^NjE7N0|GC${V@u3?*h%bZGRuzcJl=A zKLb}<+h1(}v!A5b+gjuZ=-&n|uG^Zt2VCv|Lr=P7NRH&E5()+2{fxdT2MpcnP#brZ~k2d{qIyZ5ZOrtD6V#{e~6QGA(CDV}QCzPbp zP@7y)8k&`HaJ$@Sx1UFsfKLcelnRbQ`^Xg~_&lzG?GWM)sg@} zFnFj@zaJY!RQ=s!OAlUdTJU}Fs?ixhCY^-yUoo!Mx&SPCjf25My-_on6!}pC_m?4! zs;8jpzZ-0#%jjMGFI`6c>I+u?)YN|}1Ky4}HTBFMsMflu)?To&Zqe7Kp`J-#_xy$c r!0qXQM$->yQ^^1^Uq&W@e^1~IDhtzKU(z5h00000NkvXXu0mjf5%ILy diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/colt.rsi/bolt-closed.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/colt.rsi/bolt-closed.png deleted file mode 100644 index 470890b4d5f1bb9a140dcbc2df7a34339192d248..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2581 zcmV+w3hMQVP) zaB^>EX>4U6ba`-PAZ2)IW&i+q+U-|alH@21{pS>O1dtGjS2{RsC@*nONP3SgK0I@jfT=lN>m}873jjpWEifiA z7>FgYq>^GKswn|S1wS2@6K5J=AW0Bfu#z%kB~(&!-FT;_Gna&}VWbxjAy_CC)HLoO zD`&|C>rD|tJqSw{ks?)8n)JdY7b&IG;(4l9uDMDrwN|aIc4f^fTC}Qa)842t(wKx+ zT5Z}|>m5pa?vT|nzhhv~;E{)nGV0LLMxO|unWxM$>(tq1U$l531%y>rUAo%pmJFd} z*~E%fQ)|{YVr}!zTXxxX>u$S0Si4z$X6==^@3WR}*60xB^XfZm7_RkAMDlbZ&KVe^ zoWOW>1`yEXoJCDJlQZX>#YP;MgW^?-% zYX+%D=c^X#g)@8NY&ji>$skJ#4bYuw!k^APgZ*_|)C__7ZkJtQx_>>&g94TaFkL_6l z%xX4F^mIC9xx!jd01p)Ly_L;yZyhtUO)ALY^MJ5R0G7DvU|qpF(6QDB>WMcdebmf` zuY-zRp-Alm=5E!=d!$oX8Ul>Q9-$0tWngtlW9iGUOLFaKcTWu^uS`b-E;P$)qNace zL$yNXLQP|LW?`+(dim4_teJz8p429#%i+jz#_qi^IBJkqHCxZnN}z(n{`lu zRJAj*K30nM**dnFY6v@sLxx-fUm*Pi)o$gAt}Q49YL^WmYy4g{{NXnIu7Ljq{SiU< z3f`-Qe*wtJZ|NsSoWuYC0flKpLr_UWLm+T+Z)Rz1WdHzpoPCi!NW)MRg-=t9A{7NY zh!n|Coh*ooI7$_ZV4<`XT6Hja=^r#{NK#xJ1=oUuKZ{id7iV1^Tm?b!2gJ$INzp}0 zye}!Vi1ESYeVq5s;lBF-p;2L~*);*Enq{QoF)^E46}w*%zyQ?2eE>2vtK}Qu;1C!qQueyXyL&q4_V1n6{C)sj404{+xz|(x z000JJOGiWi{{a60|De66lK=n!32;bRa{vG?BLDy{BLR4&KXw2B00(qQO+^Rf1rP=q zD09G8ivR!t-$_J4R9M69mpxD0P!xtAH!ziMWuQwX0*Z$)uq7fO_z7%T5C~8^R16Gk zjBE@H;2}tS$xF8Wgjj(n-VlmaIRZt>5)bK6J~k9x2Jn?bxCtessKRHleb3kXo^y1r ztXY=DTgnICSV90HfDpj{0l>(Z!pNASn?$M@TBl8DWK1zNkpLiHuv_#$zRzhvTUDH3 zjG#}SDyjc&9vC>z1pvuJvdOM!7a17%EP_cM+XN*ZA7OXzh>~+I#^R%z5`Z6Uckc+t zxu9qlpR~yr>?fYgA%~X z>UuXbC+c2}$(flJ#c?i2HoM<`23A(r(e;>Y!*bN4Qf*MWi~vyoIE1dp+9IfXHC(sc z5vg(peCOq;$N1+@>7OQbYc(Z% z=p_K@^rG|wv{zX~KKs-2Yni-s8R6HJ@OMDho3QV1j4Ra!5RpAjrx&Fzo85n10B1W( zlD#iJ`N2`#|Bo)CAp4X4>7KEFRs~YGR?pZgXP{DTP^tc5_-jO-^@6<;!0hHB r06*6jWcfk#qyk#_XA}Z>_W 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 delta 2276 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 JPDHLkV1g5bJSPAE diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/giskard.rsi/bolt-open.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/giskard.rsi/bolt-open.png deleted file mode 100644 index b327442a102c51a9d16fba048506c6f6c1290d5e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2260 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 IxmT3xzw$UcdjJ3c delta 252 zcmbQLHJxdKayFSSNqTM9x~u*mGu{} z<`KBWnzegxv(!788}(v7lfs%9CuIG6^xn4gKjR!*3ztu4_HqfCbXNKmGrMH2-m3R? zquuO>rp+@VH$5%NPUv>H=a_P*ZNX~!_Ud03R(oeHTRLT5iqg4^uX>A;R~s%oy^2{S x(c$@-LWWb--**)6|H1I*ulOZ?2AvPzE0{Br1+K1p$PaQDgQu&X%Q~loCIHx?Xa4{I diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/gyro_pistol.rsi/bolt-closed.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/gyro_pistol.rsi/bolt-closed.png deleted file mode 100644 index 60d4d46b0a26f4a572dff83ec7191249fc5cbf72..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 147 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnH3?%tPCZz)@#^NA%C&rs6b?Si}&H|6fVg?3o zVGw3ym^DWNBpBcm;tHgvOrK$H=A^ggEEAB!ToU9L%<%ueOTaZnAXmiG#WAE}PI7`o jf&y1^2JaH>0wxBv;|vb5)0c1qk44ofvPP)Tsw@I14-?iy0WW zg+Z8+Vb&Z8pded-Plzj!R!~x(KZz#=$YLr9@(X78A3afNE08DP>EaktF()};0iQ;L b@D)}D?*fL0rZ+l4)-iax`njxgN@xNAbdw*X diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/gyro_pistol.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Pistols/gyro_pistol.rsi/meta.json index 56988b6b09..b2895ae87f 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Pistols/gyro_pistol.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Pistols/gyro_pistol.rsi/meta.json @@ -13,12 +13,6 @@ { "name": "base" }, - { - "name": "bolt-closed" - }, - { - "name": "bolt-open" - }, { "name": "mag-0" }, diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/hm_pistol.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/hm_pistol.rsi/base.png index d5b22cb67fafa8216adc45dc9089a7f9d97170f9..1e53236afcac7dd5070c14a8d47a71b69ae105a1 100644 GIT binary patch literal 5855 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 F{{fb?L+=0p delta 2384 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 qeGEJ9u);C50pn=bY}5e*?EnDjqNnE7 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 diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/hm_pistol.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Pistols/hm_pistol.rsi/meta.json index 99a121e05a..f6a7c5e2b7 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Pistols/hm_pistol.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Pistols/hm_pistol.rsi/meta.json @@ -13,12 +13,6 @@ { "name": "base" }, - { - "name": "bolt-closed" - }, - { - "name": "bolt-open" - }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/lamia.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/lamia.rsi/base.png index a7ede7f31f5dd26beff531acb30bf2a0ddbf0e0e..f5b6bc47452db63b71887939c4aaf06aee80d40d 100644 GIT binary patch literal 5648 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 diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/lamia.rsi/bolt-open.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/lamia.rsi/bolt-open.png deleted file mode 100644 index 47f32ac170abbd53da4e5ee841d8871e8bc2214e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 211 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv#^NA%C&rs6b?Si}&H|6fVg?3o zVGw3ym^DWNC@31>6XFV_Yqs1}P}U6yP1$|)xPhr#U;m7&5qYbC66_^Ge!&d?!C-0q zvfn@<7f%<*kcv6U2@8Y;oE{r%N-p4%kd|KDVK95gjvY$eGj=Rps;bOALseaUd23r6 vn*#R^hR~&lSf=>;`u6so4cOYtB*egQK9R@B*FQxbXdZ*7tDnm{r-UW|P9{J9 diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/lamia.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Pistols/lamia.rsi/meta.json index 934030079e..4dbab2cffe 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Pistols/lamia.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Pistols/lamia.rsi/meta.json @@ -16,14 +16,6 @@ { "name": "mag-0" }, - { - "name": "bolt-open" - - }, - { - "name": "bolt-closed" - - }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/mandella.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/mandella.rsi/base.png index 1d37db3ba4978e15bae89eea0d50a0754caa1329..3c14338eb1899ad3922604a383f3ab5767c55c64 100644 GIT binary patch literal 5909 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 IV&xz8A5FtRNdN!< delta 2469 zcmV;W30n4*E}ImPB!2{YR9JLUVRs;Ka&Km7Y-J#Hd2nSQWq4_3004N}?N?it?I;NS zcN9GY1rZ$%zSim)^zeIQQm5+Fa8fnr={6f z_WOAoc`IVNja%)DTkoE;A{bMkk15dN#PM9|T8Xcp;U~BzE|{3O zUiY|WZXe?p9-;drfRDR(@ry5(@oP9PMK5lZcX7JqN#4o%u?#&~l<2WCy|rk!sPXOb zCVqR*y7#)gvwvIy!c}gkUR*hMnAj0cKCcy=il5+K&)IO+XmJ3w30HfF9SJ;sN9sVtUw;&brOl!(tUH&xDzj zpbQv4pW(gWSI;L!dppfjiuDmI*hS7SnBmCz6|(?H+JARU<-|9IYl!a;2bO`LoG@27 zXt7@^x};Zb@xhs+1We8G%9o_`R)7#;ZGka~fj}&YC6yGFNK--_EATN`PMoO&fh0j_ z!b-}FOi-%iYvUbFXD$g{Vw4vEAxIGgG>r{ly#;LR)5i=s#Tj><(jM1Qnl9Fsx@kiGA5ywrmeQt%&@3sgD%5-gP>FAp1btYwb$Od z4bW%gA)^c(b+loVCQp=rFw4|gXPdUt0+m)?vdYp`S6jBhwaq(k*=6glyKQ@*cBA@? z+I!@_jas@QvS*$5%a^xJd*oXtO5Udmj zXC_As29+fncrf<_Ttpo$(qiopj4m-bdh;YK9-^9Jad7;Y)0*aC?qz zQr!4zYg(5YhPE6Lntjcz6W*NH&}%Fzcz+AN%!2utRhwbU_;f-zZ^NBNXj8|8=?#wM zIZA00JtE>PxZ`|<>$tjR@hCQU7i)**04R9IxU>FP!=Xd?#}j##H+kq-OC zW4H6jst80uDbF^TQA#bqAo?(`)XNw*uplBNz8=c2#97nq^W$T9Jg@1|ZrA}b*niUH z>j!7m(S-KhCOG6Q3wfat0}DNFPK-Kh++t79WE@Wt_B8LIXhNTG z1;HXZ|9!2Sz013~oEh(Le%- z=L#yu$}lIn^#~#%ze{yuqkoNZn9z!$XA^H&TnuVSj;#l;?lT|81BN-rjePq_qr!J5 z@{nWkCI$!bVYE~?r|DbA0QxWjq)Gu$Jdp?mk&x(y`ry}|3qHO)@UFJO=wrP2cly&9 z;urt;*%6AsLFCU&Ua90zUdK8KyieUo8FdHs8cm=R`^eVHo9k6fY8iEN!|&Lx|Idne zqo-~$hJOKWKX`V9)K$ZiQ3fCiQ%kE)W&;^Mfxh}i>#<}RQz%#=}CN)nSCKihw zEO#&~87hDAG;u^xHOd#VE-Re3IIEQ!Yu%H-Fqqd?(p;xGf;g6tKoTNk)KEqR7NWFj zq?kz2eyods*zqUHC6lWRMvetkp+a)};D7MDTeC1V=_UnZfbYe&KSlxnF3_yo_V=-E zH%|cXGjOG~{nZ9A`$>AetwoN2&^B;!-PYti;Br3)7<$qrLvkc9O`%W#-p}Zpa=_p% z(6{FH*4oGE1CXJvmT!QALtv~(+3Q{29q8=s-!rZLegF>Fa({J1kUEnF6)=C~1rP`j zGFARLvH$=A2T4RhR9M69S4&F*Q561e&7ws@DM9ZnqSie?B9i`1hRdw}KoI7lO(8+L ztEg4sACRJ8B5Bn^8T3}94m49)F<9xesJYGPgcX?t^KH(Y`#Rrw%(*ip8jYfss6&lm z5wHkY1S|pu0^v{u;ZUTi20edXA3R#_;Gk(Fg~#kJ1!4y>a*C7yvL?ihzFwNg=^>jf}_ZV+MM<+HroFMo(9} zVQ;Cfp}tsfFyjIL3JNa;>}>Cq$)m$#0DvHzK~Wx{C=bXhdC+qS`Nw}JbawPXyb@uv zwLrWQp*$ofvp)1du!P~NzMWQ zo0H@$9QIaLuzHY6A0&T%@0>c=-DVhzUt~TAy^~m2oFVU|)!~4d5Vh8|m za$78$53U7>Bxey0Mbw}41@1eGN1M#~>OD3~$&U%_`j=Jr#1QrmPEErf+*~KqQ?shx zxR#2lM4*!Q|MD{8z8e0M+ahc^(GdPWy^cRCz^X+cevv_ZBf~9T#XnEM{OS_XHzU(d j_zNJ`ubD-l)&yPww~hmWoF zaB^>EX>4U6ba`-PAZ2)IW&i+q+O1b@b|Whe{m&|92_PXr%MoAa%nsi2=ZY#j?Ib;& zytI8>P%27D_ew$z>!1Jb@E?4L3xzDT6)h#=lQk-o_A2=_1Y@O(fJ zF-E>_%evPa);B)p4zxc3>-{80u zJ=`kqaJuD5-pTp74ZT>D=(#h!P@SHE@BzQQXWM&S-dQdIaFyGshbw1>g&lD6d9C1E z@e|DJ`6|9GS{z_)!qpyP$BiZe;ydLulck;38Alp0G1H=ok!TPfS>sAdgPnrx-?XU) zR-Rylcz`*En4Y$zv#dZ+I{Gx8D~>@h2JBsXA ztO6lv-|l~gF!hkH#lgqUn;t!x7gytGe-$nn&Xu(sm@ygAi~}PV-kab zSQ1MrDORGI5^!wb$6z^erVa*@1fdBlDKj#mQX}6R@6>eGlF%hac>xiE6se#_*+5p# zk_+;!A%rXlOBRtLRhp<+;gXA#Qfl!!WtD5LQcJD1Rjt;z60~U5 zrmAMx)UrXBVZA}nsdLX=dg-;duH6R0XXGKHj5^xTVUs3Llz=eHtg}s>w$efMLvSnfw2&rJFT6MESb<#u~)6K2#(xC*queG0F*y zS7!hLP0m?tDQ9x#oU^FJfmsMvijy;wGX@6pN+dfyxqD;ox4Z?Q`(57XGv&J{I&jU>n(Omj9K zBi4>nKo;^u^6tDjDb{$$xM#}MC6Q-y)=&lw$)&e&wQST^@eGD~sk~4VF3ISIUa;$y zJfS_IZtxNaR#@GY3zqNP6$gEtbc<5nN8rZP3?tA(?CLrP8I)ODlIB=)W28wp8VxM; ze(*US(`9xkJGD)%QSbXw(&mVlMl>Xg3KYh`bCzZckTo?NEFV_*g7Y>!RYEVT@TVB? zfdjE8R70^YVa!QO@O&0vDqzVw#OHH7PNNsJlmm+T^m6G6R);@OPgVw6=~)8mx{N(h znuZ;>M8U;u$3yY<_ZsVfsguMt0WoZR&r6Yrcx_L#VXlvQ-$_ ziyc6y!67ITkC~$#R#uyCBFN3sqQ{u8^is`ub(WX=XdQ8YqHdN#V>SSb*z_RLGH|}! zF6w74CfUC2B*cV}8@6Cz*Kmc12|=w+?y}L3Z$OKX#|mAACc47vu~$n!cnVC4OD8r~ zk**S@1e|CCrx>%2IKfP3#N+CMGuET|L^G1W+OIWVkSu;cN{K90(>uv z(^%JQX9ZFWeBvjZq{h@?{(sI>-c$X$()GQy1U>Y2_Hwg9LH+&_x11zWwNrN&D@{s4sRU zE#~9nGWTqkenwUN5omQ;tt#;D9tz^m@&$z2R|084ld5RI=Bjg;0K74qm!bGl=#1-&?44@<9@um_qclp2#pF;&7KKB z)hr_wkBQmbs_1`(4+97wgkFi6dLq4;LD%th4-a4OqCBhnxj#q0k~bOP5sBxRZdk+{ z#50?g&Uv3W%u13%d`>)W&;^Mfxh}i>#<}RQz%#=}CN)nSCKihwEO#&~87lEKaYRuy z$``UOE1b7DtCbpS-IKpCnAcX)T&FpLIF^t=5+Y>OP(}q7qO@wHm`Krntc!ox@h8b8 zldB9yjs;YqLUR1zfAG6ovoJO3CIw@F@5Q!1MgjjW(5&0`_pxm^PXO;TaHX~V)dn#8 zNqW7lMUH^bHgIv>*5p0lat9cC(j`N3Bri>&PypV~=$mrD;4RR%=JwXw$LRx*p{|y1 zfP+I|tVr4GUEUq&?Csw(t^R%h4%c#jbwrRl00006VoOIv0RI600RN!9r;`8x010qN zS#tmYE+YT{E+YYWr9XB6000McNlirua|?r8*%}tR};6Zm$5e7Maf$bYvRP*0kHpoclpWQ{%Ngz5=V6GcC!;m;z%F6TL0D{@K9G%MKPv)aTB#ypa$;b z2I9Of@0OgLp4HYBy;31k{Z?up;qd%218}YHH1R5P@vbwhtlP;AUHh=)A0F>p=1(yg e3 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 GV*dkC3qL9V delta 2496 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 KMNUMnLSTa6ro>DD diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/mk58.rsi/bolt-closed.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/mk58.rsi/bolt-closed.png deleted file mode 100644 index 814e3528d33f72a688ac5fb5f85eb29a1e976ecd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2584 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 RbpvY!Av<|EN;mCH`VZ>0_n!a& delta 2251 zcmV;+2sHPBEyNO#B!7&0R9JLUVRs;Ka&Km7Y-J#Hd2nSQWq4_3004N}?N?ip>?RET zXBAljk`RLB@T|%XviuxjPtQ!x+_|}rO64PV+h7nvI!6dPtiS%;;SXHQ7DG}ix#k>k zrJ5=?R7$+AtE8CD`&@i?;rm^CcyutD1f^V`dEN32?fN>v(tq9F-?s-Fx1Mq?7c4UT7Sv`aOK;n7gtUVf*o+m8J2My9!1^GU2&J#;s9$CuJ#Z+J}NN~-;`)l zqfP6Sg9c1YyclpZ^I$n`1@KoMa#4VrHd~M?QwrD^U{27?4_oNWTYWxERxtAAm0fTyAE^x5L zeyQk6udyYEXNejhn&P!y$mXp85MgeGF(hChW)h`L(U35RfMWqa4VJSc?qGm4C{I|) zNhE`u!ag^~7#&$wzM7F>uwL$ZdTv3 z_RQSZtkKOHAEI2&URgu4*^3JDbfV4~7~@1>+<%+_1T;Hmu~16v%sFSVvIG%jSgB6V zBxei^rbVoq9^Ab$_f6gc(EU-~_%r5$Q};WV3r^h|=05WF32U>RbSsA-UxmOF8B(zP zc8ZM)e(`6^@T&^`SM;A%w5haQb);F>*nXrMYF)6cXu&?_B7w2poFUDRHs38>CAVFn zOn;#DbQCH|II;N&2e0pzZiXZTe;(X>Z#&~dR%_cRk6>gv7>3%Uv{uAARAVfO)TfOG z1>=hQJ~j-kuoa?bcUy0g3?AYZx}X9CD#750)a)K*^^ zig_)`4iqU4R|&hwQkr9D^GP!_A(!*IB!5PohRnjiG#@9GKd>Pf1Y5%Du)|%RRGE&K zcAP~LtaDBrJoG9O$9(spNE!ucshzR#Ae1(4S@OP5*msX08QXF{ZMZMP;E$`8S(bA- z!jVz9ChnT~@IfXEsjzML9;3F3=ike@R6c}@$3#F91J?TlN6{?H+=$as0BWZ#<$sW` zq$$>*dkO{g12BSH(AK=ZGs}B12}A2rLK@1mXfP= zOi`WzilB*iFZRz7Ao?m#$*?s%eScpI4xxCl7C$e;UC}K~5e7_S08yW1B30C_t?QbN zR`tGukUjRNlmT)sRg2@)D*_TyaT({PY2hpjv;fhr?xbV2D*+0((q=j=)ZR-}8|zqr zJXI=I{|0;q`Z3zCWXW(3<@BrY;qV z9^9YG#GkM#YRzr$FQlY8%Si4n)>ZSwXk)~eC3Dya|1>{-QIZoC37&u_rg1ou5rY`3b0Em)uo~QqB$>R_|jgtV~wg#el~7MH#4nPaDu~;jXD-c zrs-j!p-BOdIPxG~-h?#PGanZ6J2<~KEBqF}{#W!bD#E|YFf0E2{|$nkIet8OhLh|C zAqvx$N~wt2LBt_LlNSamf0Lt=qKlOHzogJ2)`R1Iyu0_fdj|-O3R6wr1fXh`k&4H} zY;IKyyuy!u_z=W^#7sSrUd*8D__~LOuXj3t5*H z&Rd+-N{zMd$zK@CYb$B4(;Pt@OGqFI5i)8hqXG+2S~XHkq-a0Z#Xs!$ljM@gRR$x+ z0;*6UIezdz_}#5pn3{BxLNUPqV%s01KwuYW)@}Ry*tVM|fcF`=(%SxN1DO3Jz24R$ zM?l{;aB&PypV~=$mrD;4Khbb9-y;?ES3?x-A3pNAntS#Vd1_lO(8#it;XlSTo zu(1I42$PaWjKBDDvF{||4W!;$8fdDo%@CWIjn!eg ze>$qTLtyI6#SD1`Sq!u1EM_=#^aR`|cGeaQwvLV{nl79^hu2p(Zro%@OO8hoGcYw` z`1}1c{wTm@Ff2;&0rX&>HFqHjU*qTrhV1lM+)*%f=3<5$H*Qibbx-bZAw3NsgWSTJ z|M(Ica&W_ai9`L38#fsy_qQ+-l?#x3f56zDQ~2LOk&}VPJrN~XUq63_pwm>U$hc+&s?002ovPDHLkV1ha#HV6O! diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/mk58_wood.rsi/bolt-closed.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/mk58_wood.rsi/bolt-closed.png deleted file mode 100644 index 1e1577878fe51b8b854a7c619e12f445415c9133..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2453 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 diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/mk58_wood.rsi/bolt-open.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/mk58_wood.rsi/bolt-open.png deleted file mode 100644 index c69443f80e0e1a2fb789e811bbe9710c29f99d49..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2369 zcmV-H3BLA;P) zaB^>EX>4U6ba`-PAZ2)IW&i+q+U-|clI$i7{bvpLyN#4ek0mz|!5`-?s-Fx1MqAQ)9^csh#xcaTZ@K9i*K(t`0YK*-s|$Nr5pfPzMXn;<1kL=gh0eUy=fh+LGf#pf6O_?m@XZ~b8-DhFr)X~vbD~%tSivs#_<|YE zoWCIjLTKNZ>cN-7RmA7Zi4`!Y2j&6?TkMyLuJjsPa(I@g0ir2h>xFFI3IGx2Rv1G9 z24W^r$`lO=g9tbl@Y7&9OX3a&NQ3f(m7GK}$SLe|V~o*}W#y|G=>e_R+UV80qAbds|I`XhlMjdVPl!+7&W}Y_7tg|gz2&I*l zuDooORae`HwJkes-Fe$CyYBX2?Pm2oYtPJm%^KaT@gd6P?3Fb%o4u$YPbcb}fiX@5 z#?2W(K(lie3#G))oO2c{OAt|pmFnb7a>l@5TEx2P!QCr!-{dU--5=$RKVvR9b-#nT z;MBcg?jvuXur}LCw{i&bRR~OxAqC5Cr`WjQ7k{=4zpCJWMgLhvn@Y=7N1Anw?MJGi z)&<*&7VKj#5*XXf8Pfb{^WD-_a@!Tk1X@o=p`wHno1bv-`fllFNJ8-E!M*pkGd^Us zwvF-#My7*ds7*?1MXWV+GtQPuDI`G!+=a!)7-HRv2xmOeN`8r7$7mbo4Byq zCO1BB*xL*8rJHdkfGk#FF9}0!^_8KR*OKf&k>YTbu!}6EId(RmG(!_|Ij>7%)M>~p z3{3NJQuzZLf2$Hca_tS>^G7SE>YMEs@mm?e*g=^xjnGYXivXBbfcJDE2t9bssoJ-|HxOhwi zBr#yUPjD2?vdoP*Ed`)<+ENbrN}5s~9R|%46ZEbgzSYs^+YtKD{|InW8BKMB2VEV` zT!i5;a5?b9|{Z@_n;AEW(BmJC;A*NHaltesm`sUU`CPr1ys zTXiSn*1K4s6}IM-F7jvUQlaR<{i#g+39F*k-1h!LN~*JrVv*fW6hO*-R=<%#VIAyc6jfM+~e0yQETG8p{@#}v@|Dq!N zs|>T^&;Q@-)H!wT20~~600D(*LqkwWLqi~Na&Km7Y-Iodc$|HaJxIeq9K~PLmP)CJ z+Cju2Lv^wsD&i2R|084ld5RI=Bjg;0K74qm!bG zl=#1-&?44@<9@um_qclp2#pF;P2U8dYL=0T$HZ)IRSdkskACJ|`YG=z_$LT$f#b<6LxD z;F)0~lbRU_><(4$yEj;#{#NQAvu2VKlt6PS(uu1lR`1T|6*5p0lat9cC(j`N3Bri>& zPypV~=$mrD;4Khbb9-y;O9P%*Fr7F_2Wf zEZ7XNv$lY<85kHCZrr%ZprN78fX>DS?5r&q4jnx~w1XLui{hy>7yn;8e=5W2i&s$; zh5Co0@Kp? zh@$Dj>2r8}b>qfOhP32(6fpx+BZj}T_E~cmqVP42o?ysMkHsAY zQ)e#zf8)kYs-^D9{Vj|nrvYS;TUdiPu^|UH+?P1i-?(v;VRC;9ak&7=2Mp~wg$xdg zoD4kfi73JP`uQ^q^`eqe3^#7v#41NpHpB+L?3~ZA>44B*Dd3te8ig zk`U&5Lwgkl1_lO(D4Bl@Q8NGFmLU67R8opz#fo_(TaMEK$d;c!cn2btTmaLv-ke?-rwHmoSCc&@b@-^o55i) zm?7JT6$o7s>QhG>`dt0F#6Q7%b^-Z&*ax zV~4T-c{WL|GhTnyqbw9pjIG->DIw&d^6a9E@8g}XL{-cJVh&Gi_*DIC&IH^ zLgT7KB85O#%z3nP)1-#vg6uxW^B2v=HI2Cx;I-pu*pa~xbxA4kax>=oMf%N)=e)UX ze5C!=+qH#DihIn?n7lT*DfZY_x=LYi>_zx-@}@1`T`yvvJ+evplaYorihe~PgOKKe$N_KRci8u9}V?x0gUq_E{*}0+T7Jq%H?C66# zdj7%Fy^v)dzyIOY_r?tsK6femQ(^vmv4tH#)ECm9%(573BiJ6WVRqx>c8B*ZL#*bA*?y)* zrrua>hdPe^m|JwriqCQvlsX-5Z;dV8D?1W$P|tItldZn*%# z=_mZR(c4aLGVv2`syT#?ID5CuFsO~zQT_URX z*E3nKq?a0}>K6x0G@Y^!Hk#8IaWfcBlQ%}h>l}?r-_VnP?eUsrm1PqL{Kxf;TCj#L zzu$@SNv@gp2`#TY@DVBRPyU#7s#_RiUW>*k0{ANixoHP-x7(jf6b;399_pR$u~g>| z?+O9=IhZ+1YBlz-?uk=Il(r*Bmn>svpXs)vhVPpHvFBF%(q@$b+gpo1xzCR=`f@>9 zbSG%~j5EPH8#nXRYu0wt=etNxtEDci{N_bjD_^5+VqzwRU8{Of8`omAcdG(Pyt=si z{s!5Mo|?9ON48#jFfV!EX&-&J3;uq-&pjus*c=?jnP%OXC%k;+Q11Nk3wP7~C(1Ie zxHyR$eeLrW%ktmj(f9&If(#_cjXrhhZ&mA>Jkg8l&q`8w7Glup@# z!f8@Zs;;x?EEnlD0)-)?sNu|D^7YW8`NAFNt`RvHf@d}5jlBhFo;*PG^ z&uO4_YRxRHt=CVT4&mEkEPL{FK~kVt&Tdq3g7@+-qXGy&-$QW%7Vn zG)Zs6J;WYFWil?EH_0x)c&H(OVn|6HBuK(yMJcgwwH3g_MT2Q8RrA>oRBL+43Yuc& z)FOH*b#z%v<>(64)sQB~F!vqPUM+q1CwzG0hMbWPZ$V zbiY1AYbUAYbn9VCYRKmP)ePsV_%p>5kLOwCxXRm82f<;lPU*1pKSsHVR{Y<6Z zO(Vm)$Y+X^md9RREOdxN#s|Mj&>k##@Hk<2TdhkMOW014pFlD7QTJqg7?KILz1d2?s_fWR5$rz)EaDEk6l7~^j1@* z%`4OY1d1>l3Sz&kZh0727k(rGb87plDIYd4tW}-It@JZPv+XO04z3TwTFv2wCEG(v z(NiHFtAl)Hgblv6N|L`RE`L91!W`O*t4#`r2M6u%^kP&zh>%Z$_&1YTD>#9 zV?Ap6Di};FQ^;fnu$j!S3qG{W=l_w*@Tqb)uURzD_f)WX527e%x3UZ|qthY8DLu0} zH0D<2<7P}ubIzV}D!f!z&&}kJ5xVg#y&RtYKrgF!H(0(z zFKI_ei7CTaRkS^YK4FUNeTdadxSQ9Fm53rF;Uply8QdOFjvKeApXbu>seM=RBDCq) zm-^LmzrQ)1hMn6uL66SQF&BVy?Og3GZ+E9xub;ogJnhl^vO5igsuVI~j=7!5>;+Cr z+{_p70pem-Xz-Q6r{E0}KKl$mw(wFDv6;nywHkqBOFEwSZMeb2kVn|LeKDL%c z+N=7fmIpe2jx^r-$>ze18%Xbp3bJ(Zy&HQN4`h0#Db1_}CvB&5B**p7@47*GvaE6* zqWtNbmX5k^?VP=(nShO@+`79M18h z^CcoQ7m)BkbdpF4?a(loi(8VE%Z~#U2p$+M6f=EFOc$ zqaY2GJXx&ZCZWV~Yc<3$1`Cw)WkRV!C=nynm|UJjsbCVf`Zn!2f11Rm$Qu z=>U8T7!QgdRXOAp_mfL+HYeblg_?qBp-8H+g2?_!Qy~<5C+nx!)DlfPKL!Gsf5ZJr z`)lqRWk`#|p|d1>r8+z|i-A=8rvnnc5TI*rc{CE9z@t!5R0__P{fS}F;a1~MxZ8~?h(LdAn|DI_mO~ju0jAAKyyGS1|*5{@1kI#2n>@+0dCX zkgJf$f+do822u@yP+Mvm9N{ut79XJ;(nwbK{7Baafs2Qqh9^P1P$NPhG>uE=@`s(s zxd|YkaRk{7i}*2IaWn|c@R64KIxhT&a)A`6P5_^aB2cMNx$s0Pib{f}A(StGB~u9m z9Dg{CZ|HJ~K#|CmfgaINrcgFe3u&@JIE;|#_;WOgF`$|$EHuBdBov+&jHA)<6grlS z#Ec}1QP1hG*}7ohLdmfS`Xn`6YgT z)AgIKUt-{wlz(^EZ@PYofnQSo-Ch4Ty5QeGcR(@p29yYW%r|^`_oqF|4Wz_&)1s;%hI** zfgZ+4eIn#An1QkS)Pil#H-!fE6l{*C-cwzRG1EpncIcs?p)G8dN3cWFtsD=yw$)fq z=39g*>JAc8g(ZUCKq;s!ex_hMW+4Jji zCzE{4@Sz83+Lr$4K7 IR#f_b0geod^8f$< delta 250 zcmaE)J(X#KayFfy;nfN?X!^ zbN6%wmKITw8Lg^P52Kh^MI~mmPCUaQ!Y0JwZqUue#Vl%|z%8Mm%`i(-Bco?YL!;-7 o8y*5jrMo@S`x1ZVpDQQIfKFlXboFyt=akR{097PW>;M1& diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/molly.rsi/bolt-closed.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/molly.rsi/bolt-closed.png deleted file mode 100644 index eaf9a9b3dbc3df67d331f9fe786c3df8c51aac22..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 204 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv#^NA%C&rs6b?Si}&H|6fVg?3o zVGw3ym^DWNC@31>6XFV_142{!`e*DudfdR&?fTt&3Tg(-O6=2s66_^Ge!&d?!C-0q zvfn@n+a diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/molly.rsi/bolt-open.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/molly.rsi/bolt-open.png deleted file mode 100644 index 50514b9f0a78762ea8254200ebdf67ef6ffd5f92..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 199 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv#^NA%C&rs6b?Si}&H|6fVg?3o zVGw3ym^DWNC@31>6XFV_142{!`ezuJx?R6}Z}-vT3Tg&UjT#?;66_^Ge!&d?!C-0q zvfn@<3r`ovkcv6U2@*~Y0&~}^WN@?;*e%Y^$cT!{S|Ajo;NfxN#tjcc5w!z3bLPyM jHZ3R3t@=10KLbPMDfX_nU0EqWGZ;Kw{an^LB{Ts5peR0Q diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/molly.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Pistols/molly.rsi/meta.json index fc8bfe1dec..3396599224 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Pistols/molly.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Pistols/molly.rsi/meta.json @@ -13,12 +13,6 @@ { "name": "base" }, - { - "name": "bolt-closed" - }, - { - "name": "bolt-open" - }, { "name": "mag-0" }, diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/olivaw_civil.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/olivaw_civil.rsi/base.png deleted file mode 100644 index d37194554c5f98e530a82f773631abf41d8731f2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2465 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 diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/olivaw_civil.rsi/bolt-closed.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/olivaw_civil.rsi/bolt-closed.png deleted file mode 100644 index e4b0ab94f796ee008a48d6afdc342ab4832a3788..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2461 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 z

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 qrvX@L2#*3PP) zaB^>EX>4U6ba`-PAZ2)IW&i+q+O1b>n(QD7{qHJf2?~O`9DIG>>|mBZ2a~Gq>f86# zw=0!sh*3BPkc9QW|L*V~{3ufnSxVKW8u805H!^f;yna`kVm{aNqx%u=U*zHWfFNSD zeBJ80#~bAG_Cm?GyuZpr8TUN(o+!narP){Z{=AjECt|wf>Anx`e!=veIrmB9p7vqZ zhx=Rr#uUuQ6lihcc&>D<#Mfy!1=qxifr0w|8oP1tW90jMK zU(V5R)M#;lwFy&uh#faA5fI-gr$bO_vC2-@( z6+8_v#}Ly~mvq)`z8)5VlWUD z&YU#GLR3-$jureEG$+o~!9bEAG@&JBMkExfI#)^1i`S^LP`uUShsYjlY6apjFQh)a1)kvyG?W9{i1bGw!Q)Ea+`0X5xD*o}SZTR~aq1WnbT%G5G5ZPt_rj57ZJG60S z!gpx%ml*wAn=hF5&lvq$n=jJ;WsH8K4YpOYI)X0JHAUI<;n-aJ^VA?|BKf=ImOHLVk``ajN%ra#oO|4y4%)4iv+xjYMy~t`)+E}ghv^*h9Udp2d45-aEBEJ{w z*bq>Kwo6;bq9@c2jtK&u`eFoszdK%cUJqOpun^2PTGb&#vQb+lZ5bqmkv+0btvi!+ zR_)240=5Y<$vGL%4(k_dugH)nvoKVr3qS&8(-yb#LUzO2(y;8p&bxtBX@-*|<%yiV z%1j+-_$B0t1nfDwV|J)Vwxt`gCw7Z53#O`W;p|(}(o#DB)-BTx=Ea(z0%L0dH4?2p z$C@McUF(M0t{zas>#zpe)HO2<)|8R)YfwiIjK#;(u>-7p-e*B3hObp03&k~Z1rNQu3*(bvZ1)VTB-jywncYI}QgvkJGGnx> z6LX!Y0}uU(&8y?z7N~oCb4BUrJ^$*up1ABW2(5>;pibbDxM;M6ec#qv0CqIESGuDu z7Y@Nln~Fy0}IH?_#W%^%z7AlM5+Zdpzg0?;6&Xagk1GN=>o3) zO5!j=E##w)cm`9KKUe+4{GVHYOg}!V@NBqQRnM!_jY0Z=?%M$=tGl`l_MLhcc!m$OK zq9oMe)s=JX!EH!o+4ll~FqXc!#V2iuzZnq!5dCoV9W{5RE|(YKBUK6^LnoKAJDV4* zBi{+?I7;RQEbW>wym$D2X~Uno%kz&}n{UDB0ZsTpn~hI| z7GwB7i(;R48cF6$0004mX+uL$Nkc;*aB^>EX>4Tx0C=2zkv&MmKpe$iQ%glE3U&~2 z$WWau_=Px16^me@v=v%)FuC*#nlvOSE{=k0!NHHks)LKOt`4q(Aou~|}?mh0_0Yam~RI_UwP&La)#baVNw<-o-5kNl#Odu#RQ%|H9Gw>W=_we!c zF3PjK&;2=imAuISpGZ8%bi*RvAfDN@bk6(4VOEk9;&b9LgDyz?$aUG}H_ki6e@tQNECMS>e3JS*_Gq>z@3Dp}e+|<~q$`#Ib|~k`N)I zhB7L!5T#Wk#YBqsV;=q?$DbsZOs+B*ITlcb3d!+<|H1EW&BD~An-q!xffw8U7y*L2 zK(lV!-^aGyJOTXAz?IhaR~x|WC+YRJ7C8d?wtOx|0M|)GK~z}7V_+BsqhJ(_f>D441cavi4+u^9PY=6TU=}hkFfeRbJ%=$MH08gY zl?hB9?uhJyWVoiO6XwF%4<0;XxNv$GBSj8)@Zb?cTvQMP0|UeV_KqrsCof(yFfcGM z=$h#>FfcGMTt0P?K}JFxuF1~I1THsq!d!+6rzs2ps1N>kPiSP=zG)Z3p<`zl?5s@S z^rB_!7#1yChoUhKDFi41@SsyrGx#sSFUG*Yz`*d~<0}RMelZjp9U!ZHaO(o&XwDf0 kqhJ(_f>AIEM!}E;0KG&=n5!=CP5=M^07*qoM6N<$g7({88UO$Q diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/paco.rsi/bolt-open.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/paco.rsi/bolt-open.png deleted file mode 100644 index a910690554a2e4b9a1e7bc947a2d6029d6923889..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2623 zcmV-F3c&S=P) zaB^>EX>4U6ba`-PAZ2)IW&i+q+U;0dmSd|8{bv*z0+JAd;qY85Gsy6>1*cq9?oQuF zlE1dQ3`Yhb?JWtp!}`}hclZZhER{o2E4k(z@k%vSZkUvKUw5RK&gXgY^A(=I$;0al zhDb2Vea!1w-yqk|4VE5x|1J+U9zEqzMDg3v;wSrjK1M!@gs+^Q=TM&wEq`(6`Q!1Z z{c!8;IT^s13Vp(XmypEs$@e6=e+_?%Pm+vA-=zySOJ52U@ma5#eP+ErO()s!?Q#USeoL^7qa;%07N)jVGIcv zh?ztwQ#58H0*(dzG+54(xPt-GpgdtECqX6{7xuHU$LOqOYT9J~9mRziqQcJ5`1!YV_&DCnD zwYG*sTWZkNu)aaixl2!7d+ydtue}X~&qzZ@9yZFTqfMSNQ3Aru(`K1Z`)oW;r#M3iBrIysY^F))}Gv2J>C_sQIU{{V$jc zPTd#ge&p>Ztj%`HtsH_p3xR1kbujJ}8yEbGe|HT3t%Bc*ek=N}2=`;--g}$MOHm4t zQElhm5bPaOYAZ+F(~xi<${kUzqtF;O$xiFnloBpe6I#=*z>pVLw3ANK#WgA2Z5;wU zXsrpOja7BVpt+8c_DctDQ=Pg|Th_J})9y*;Zhcv9-E`Hd6)863sxpc%MnaeCeOW1f6`b@=!DXv_aU1QJ)Uq2dmtbw4jQ|=tw>)MR zHR?K80WPdxv!^2oF2dGi9kpZ(Rk*0jdqYNbE(02Sg1*+{=L4Ea7~OSCRcmvi%|V4^ z!3KQ07Hma5g7+wPJGtTo#oZF>VeWvy4|jaKEflx03H5Nz)jKXo_Y%;y6^H35YSVh1 z9Ze95_Bj%@AC~4e(H70(7LfY}_%imP0z)<0V-T4mwjKl1;eF!z$dAca!syEiw%%9( zGSNmm#8)>n``zCwV<`lRrM_w7Qfh!>jSId-0UiDb7IPFQqIVBuH2+SpZzKd{iB2HM zbV$#-iB)~()o@fxz`++A3|eb(7D^Wz+I9J7`jR{Y9z^zkJDBY}~ysDFN`W6x}!1tad3U0&KqGcv*(%wQQzF9Y{d z#?}+HV~6Rav>H$LK!yMQITLb2^0;3#!Vj>E)zw{A27+nV>R|=@LvMLbT)Ef_p@Znj zj-e$MIh6t7Q3jAtu={*g17@+63aD+0Auu`UnGHe{R{*{rkG|qe&|3UzJnSo#3Abkn z+*|x8Lmi!-7olSZy6J<}LCq$ky?G8lXD7`G;n@MxIX!Ga7f}X&FhVVyMgHzO@1%Ld zP<^Y1A_6+~ibmu?=7J@UB>X6N+**YBiCXvsuf1le`*S7~)X{hAbJ1JRSS2px?<;0dWwD$*KMs8OQFU#M@pBCC zfs5CaV!lpoft0005*Nklv|cbyoNi&!*u3`2VvBn zo2FgY%j^_<)ANkU>ze_WQ?i`Rgo69h6&yp;?C#_J9!BlCqY|(l2yPMhy#5A-?;O-S zTVGwqC6|Fk=>f+lr`HPu;3PH=m7vIY6Xj3t@1+vv;=e#Cf002ovPDHLkV1g=>+>HPL diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/paco.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Pistols/paco.rsi/meta.json index b305e142c4..2cef1c3096 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Pistols/paco.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Pistols/paco.rsi/meta.json @@ -13,12 +13,6 @@ { "name": "base" }, - { - "name": "bolt-closed" - }, - { - "name": "bolt-open" - }, { "name": "mag-0" }, diff --git a/Resources/Textures/Objects/Weapons/Guns/Projectiles/buckshot.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Projectiles/buckshot.rsi/meta.json deleted file mode 100644 index 706868841e..0000000000 --- a/Resources/Textures/Objects/Weapons/Guns/Projectiles/buckshot.rsi/meta.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/2acc4d34a894dbcc9dbf3779b696ddf296aa2c56/icons/obj/projectiles.dmi", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "base" - } - ] -} diff --git a/Resources/Textures/Objects/Weapons/Guns/Projectiles/bullet.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Projectiles/bullet.rsi/meta.json deleted file mode 100644 index 315049577d..0000000000 --- a/Resources/Textures/Objects/Weapons/Guns/Projectiles/bullet.rsi/meta.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/2acc4d34a894dbcc9dbf3779b696ddf296aa2c56/icons/obj/projectiles.dmi", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "bullet", - "delays": [ - [ - 0.05, - 0.05 - ] - ] - } - ] -} diff --git a/Resources/Textures/Objects/Weapons/Guns/Projectiles/copyright.json b/Resources/Textures/Objects/Weapons/Guns/Projectiles/copyright.json deleted file mode 100644 index 64ef2340c6..0000000000 --- a/Resources/Textures/Objects/Weapons/Guns/Projectiles/copyright.json +++ /dev/null @@ -1,13 +0,0 @@ -[ - {"name": "buckshot", - "source": "https://github.com/vgstation-coders/vgstation13/blob/Bleeding-Edge/icons/obj/projectiles.dmi", - "copyright": ""}, - - {"name": "bullet", - "source": "", - "copyright": ""}, - - {"name": "plasma", - "source": "https://github.com/vgstation-coders/vgstation13/blob/Bleeding-Edge/icons/obj/projectiles.dmi", - "copyright": ""} -] \ No newline at end of file diff --git a/Resources/Textures/Objects/Weapons/Guns/Projectiles/flare_buckshot.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Projectiles/flare_buckshot.rsi/meta.json deleted file mode 100644 index 706868841e..0000000000 --- a/Resources/Textures/Objects/Weapons/Guns/Projectiles/flare_buckshot.rsi/meta.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/2acc4d34a894dbcc9dbf3779b696ddf296aa2c56/icons/obj/projectiles.dmi", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "base" - } - ] -} diff --git a/Resources/Textures/Objects/Weapons/Guns/Projectiles/grenade.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Projectiles/grenade.rsi/meta.json deleted file mode 100644 index db2bdf642c..0000000000 --- a/Resources/Textures/Objects/Weapons/Guns/Projectiles/grenade.rsi/meta.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/2acc4d34a894dbcc9dbf3779b696ddf296aa2c56/icons/obj/projectiles.dmi", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "grenade", - "delays": [ - [ - 0.05, - 0.05 - ] - ] - } - ] -} diff --git a/Resources/Textures/Objects/Weapons/Guns/Projectiles/heavy_laser.png b/Resources/Textures/Objects/Weapons/Guns/Projectiles/heavy_laser.png deleted file mode 100644 index abd70d245bbf3fb8ab3dac8ff01c269ae77d8fb0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 155 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJBu^K|kcif|*ER|^81Og;&h$QQ zGP6ZVSNLMUCRXJgDN{sbv}YJzsnK6ht}fblX3A%=Y%8EP28IbDTl;TwM|`zl{Khq_ zFOT)e@42b0SFWy=PH6GHJ;Tr8!xScFVdQ&MBb@0P^iK A$p8QV diff --git a/Resources/Textures/Objects/Weapons/Guns/Projectiles/heavy_laser_impact.png b/Resources/Textures/Objects/Weapons/Guns/Projectiles/heavy_laser_impact.png deleted file mode 100644 index 16ef14f51b773a0f0d6d6dede3b16ef66f8ac6da..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2795 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 diff --git a/Resources/Textures/Objects/Weapons/Guns/Projectiles/heavy_laser_muzzle.png b/Resources/Textures/Objects/Weapons/Guns/Projectiles/heavy_laser_muzzle.png deleted file mode 100644 index 5c20948001251e1be9e0d6290ed61aaa27a949d4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2301 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 qz$`E{IdqHh(K3Yn%wOB?7rWT-XEX6`vZIo zvC@UhlACF)vy&q;Nt}F?E7CY|{D6mJrc7+gixUeQLb9g`E25xLvd4S3(&IE59vNRU0>F zt3?RKBnV;y#5*MoGT$s@G1d$Z0CV27CV31C| zd_8z_EL~A5{%=w5<)_Gs!yStLs;ub?#D=V4Er?3AOG)6%@DUO;vcf5{8jW}hZHR2V z)hOG|&6`Me$2pZqwszvP?owcGv26P*3z zu*`oiadhwBRdF4VNBDm7eeA)~rJm@Vwloo9!iC=!l7volMU(hy;}Sg3P>T~&7W&T* zz$PP3-W^ty@EBCbG>f!sgZp~3<6rrT$VPS!R&^JU(%~ra*Bb(J6%7a)A|RhrgrEZt z)b?O=%W}THCjkyde){(_Nax2e>6{FT!H5r*RpL@H$m8l9A|)5P4HTIk2Zu}ek$)Vh zNCmO*8-s*hC^})f#nG&2q!W#i9&EUGDb{~6L0ZDVxCLxzPoQRk;GL{0P*W9{ly>qS z^FeHe5{n=&Dhi#0t$2Y|xd?=ZBss81Edy_t1hx!Kq2<`x`Xy{%y$Cg;hnN7AC_ym~ z3}3v0^puCIq=@tUGGt9bEDp#rfh745M28c?2q6{MfaqBf(S;dy!RzCyP>-f?JC@b! zxK9j_VI<%xKp99h1iHL?9+tHUIDWAK!nuW*$PDY^hH@nT?-lesZ0J{>{pf(}~82!a5<7iD6tBaqpQC-=X76(@5Uj1;b- zA806kBSek2P%3x=sWv1cKOdXou)9AXMCTI%ha43$QE91y$ z7N>Gk$gpuln`Y3etGur6G88!qN@Wm22qjgK5dV7Y8*Ec}?;NDsqVE-_1A~tVGnRJjl8eCLD9rgdlb=P-8|5~g5_P$# zn3$C`YUaz59f?c6VU`&-bG-ZNK;=dFuKKxir zGqTh6j0pM>Ku=l2r6H9358$#HZ>X>z5eXFB5JFH?xDxKEr*jkar0vDm?#dsMYqq>` z=mM#I>3IT_PzOuSL5=}T(?hJCTf`$#-h(&Z2(9O&eL&JQgAwIjA!g-FDig*@+!505wodlMygNzsA?BACbr z@_Ey9OkHx7?4-n}3oR7LkZOW|iU0tlQ!nsz>J480*P|GG5U%ozc{XZkP9mX?WU%=` zKH8r(`Giu`I?OlrncBgf#jMv|QV|kcAG(4twCgtht{o8oJpIATH2KGeDf)K=*+(b+ zzO5Ut*x=_1D26vY-8VcQH76RM*wawlI7k=1^$a`MZQG+im|>yrO-QG^_>Cs#P9V1% z%|4&pPUq=m>ddzpK8!(G7mXALZ2M&DPwuMZTFr%zIV7z5hmu_S_F5cjY~@{DX_8Lg z*$v%Rflq#R^K3Q}{C4pg{NYCr^X!0Bj(s7Im9Hd80UdLpHrV=Bi_Yr(IMmq60ic@T zz#S%|bm|2T0N+bKi`>R7B$axME!~&&Q~{)ZXcxhGu-Pp@q_3}VS)*8>L*aJDiC9$+Z{$e{I+ zVb5zHhJL2cf9x6j7(M>nn+sINSQ6wH%;50sMjDXg>FMGaqA@W!VS!?Ti+F-kEH~Q$ zgJ#KC2UkYl14kHq58MROBEGD%S4quk*e$(^p?w$IEQcz#Sqs{an^LB{Ts5VjwtH diff --git a/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles.rsi/beam.png b/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles.rsi/beam.png new file mode 100644 index 0000000000000000000000000000000000000000..737be0b1d72c5a21cb19f375e141f332e58f04fe GIT binary patch literal 1036 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGooCO|{#S9F5M?jcysy3fA0|WCu zPZ!6KiaBp*`)3O~N*q()6wsB_I_=&Xmny-QFBhucY5rif`97t4dkurXWyOaFXZ;s$ zG3WourYlm#>GgVT$Oc8N)=Q=L?(UoIxoLM^`X#%AHuf67)4$DpcP`(^^MP*)hX@yg zGh>1V0}pG%LIwj7hBl@H0Sppof^2#VzE|j)6+6}b?ToDacqT?>{*3%|`{lRP&YxA1 zKPtxjh)7~9(JoD zc_vg=vCg=6BJE<%wa@musxKSgQs$3un$=wVf<+^xAkSxi{NFw4a(W3Dak~hsGqDI3 zt3D_xHl9}HdB5oBg_`FFFYoyJ;{4uc#*9UugG{O}Sj)V2=uZEC_2rsR(cj*G`Jr;} z#rN!A0h`{&)$hN&N1<8$=w{pGM~i+>eXg1H`J}s*gHiFTvfY2*ZMA&+?r79SZCN$P z+biEazq<4Hv+wPvPkuXm-TShYwMq0@w@vyldW3d0PxLvvXmE)bD z9q{dY`!a#~H7e#hs#luMD6EXVKJ&?@yEi?zUDC_VtF7_a_ijpMx57(rwzYfrRR(X{ zH)UF7bYqdq+qYl8)W0nB*jKw}ijUY-rJK_trDyA0ns&-Nb=TW>rglGH99WrYZdv-~ zS3~LDX;+U|Ke;UJpTE!g#q~>)$^Grqm;J5L+_@}sx^N}K&an7rMfVrad^3N3%&aF< zCmC3n&zhK>a$%BW-fw@SptO01b3X?@yp^N>$bG!PLFE>`#9ern(f9+=Ev%8F$ zb9=9O-#x_~XChtrH|;?BT>V%2r*A*r^u6)+GjDrV+dH-K+E(#Tr|T~Kxu`v6V^C@C z-qm}yn6v-PzZ1%~KkMG_wdB3YZb=^L89VHxT4@;zCs+=h_;i_Jh z(5!fqV=O68?;L*Qs3ZO0!XG6gH3v4e)$eo{4De`%^FsWfpQZh%#t1gfXmPh+y2nl)!obMd0VJ;=QL>@BROGeA3y&V)+~H-S{bP zT{o}pEmOBWy^1-* z=D;NsBQfm2AuxOQ=j>gxSLWKszs!0P6F;{{^>(jg{(;Jpa>Hpo^$Qk$e{8yM-a7sT zAJZG`4qW;w)kT&qAiwt1D{lVs^ue~p8~-(73j~-0zwz&UZ?Zn6ZqaFAL@;=|`njxg HN@xNAE()O6 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles.rsi/beam_omni.png b/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles.rsi/beam_omni.png new file mode 100644 index 0000000000000000000000000000000000000000..4ac3db70c0d2a62d58adc491713e3f3f73d4a04c GIT binary patch literal 407 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGooCO|{#S9F5M?jcysy3fA0|TR{ zr;B4q#hkad7y7z5ia1yG!j@=x&ORQ$c zv#tLBd_Dc#{Oj}WOB#>PZ#cerakJnuZwVBA7zW`HxM8!ucF}+KjQsNHUkX3%*>UsK z&p(yFPCjd`YbdVYKl$_VtcX7>FIcCoqreVa{zGwA{l;(dGlD;+>;#51gQu&X%Q~lo FCIFRMidO&t literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles.rsi/bolt.png b/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles.rsi/bolt.png new file mode 100644 index 0000000000000000000000000000000000000000..c3cfc55e7948286cb805e930dbfeb9adba0c0de6 GIT binary patch literal 274 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jBOuH;Rhv&5D0sxv z#WAE}PI96|g2AhXK=vN1ge#1T`6NmYJSaX;pZvInEmzfj){U~S_v(&qPFGJVWw?NP*r}MhYA{_gLjbY_Q=XnJO*g1gyVeoYI Kb6Mw<&;$USRA5a2 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles.rsi/impact_beam_heavy.png b/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles.rsi/impact_beam_heavy.png new file mode 100644 index 0000000000000000000000000000000000000000..135de26e8c464f19fe05604b2ea651c19d61c255 GIT binary patch literal 1555 zcmbW1YdF&j0LK5b37L&j2}L1V9js2|I*g(RL)0l`VrSjV*b&v*B(V(t9F-Mqb9C{T zQ|@ibWtdgcR@R{qx#yv2xh-psKA)#A=Xrkb`+j~uyzkYZ!2NowjaLHzpy%i79kP=6 zAJSg6;zO+Dy(^(Z_B}!Y07TmlL2m3om;ivL$j{p|G^J?zj)c^^Pruy}7!cY9-ObeS z%-Sq_LTZ$)$~K)fS~H2=Y?*2JCT3*N$d~ddAbA1bW;2M*21x9*(Z^%uhYXje5CT&J zmYF`I_)I6c=^f^7W5BKw#$OuRB|in;-1QAqWxnOu?QP;|*b5p|ZWuud0mRuw6Q)C0{stP}&C4Igta(X28Djk$chcsQdUkX6LJq$^)H z)@NDUWbSg$+__wzdn)zvV0+JJ@h0d=)40}0v+WUC`zkm|U!73ydq}>4Ip<~>oP--L zzReMpwAwlsGwNCAc~m_UCWx(DB9|f{{`S;b%G-YE`5DRNx4{SsvIoxI-+qhF9#7?Y zjsf(r*WY({|4nILz>UBD@;It-6T7^~g$3Qb!)ulyxt$&vv-@Ub*m3L5@R+HPnUNt{ z6VWh7f9VK*j@ey4aYSGw``@GyBKRhGEB3~b0=kQz(HJ7y%y<^cHB~i4i zfo;}6WpZWS4y3K@>!%EO>qiRM1A9rB^FIXm_31~fmPDpO*Wm$v4l)#o{vWh86r-xWqRwf`;@ytQwS_a4>zfq3a z*Uuy6>fc2~9go~0BKT5p>!OM|4T2))cUc(9F5~_8@GXUmdA}$<@B29 zSG_Jl(hyu{EpiqTW`~_tR2AVPt*&8~E$ElMwF4~~o*hC(L)R#&@L-t<8s+}0bC^?l z1ryRX5K%c?O=`1|cJ=PQVC^4ChL>*O#~mQd#jmyX{DkO3T)g2DZJZ_evV_q^nM92o z2?{kdTn;1^{mJwF?!vU74)2+9V4u|PTM?i5?x8JJ~ zv`RUWY995bWy)XRgHjs$FpSfl-3~aEkP?f3abQ}a)%d+lltNSx3<^){VOFKVW*lwK zxRs!CiF=KNoG2ny(NJc3dJ!$P@wgM;IH}LRAisAeUB7!HF}?+Tt#(fh?iszt-a*Vd zxO49F2}$163B@zrs_`JUO%66F%;>$DCRL&?cOCmSjOAW!%8|{_hI;>k#auVBq%!LW zFgmT@AqbUvedxiqQyY)QQ4?1`m>-840;I*hiyja)R@46Nq?WKl>Ofbm^j`xR4}2P# ze~@NrP>XF>4)<4cDGO}BY NHMbNN+FMU)zgG?u;NRXXK|{D;$(3M8`hQWHi70V; UBqKt^%F6?OK7rm3z3^%O0#b3$TL1t6 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles.rsi/impact_blue.png b/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles.rsi/impact_blue.png new file mode 100644 index 0000000000000000000000000000000000000000..395d9533a5250681804a8ba311719f57b5b6f91d GIT binary patch literal 1613 zcmaKte>~HPAICqNVdlpylX09MbzM$h;VzA|9}LZ}8~L4t)JAAmmk{%N)Yoe5%U5b+ za`+DUF`W6)5WYy5Z@SBNU0Vuut++BWv*Z5m@%`iVe!U-$_kYjV)4i1OS8K9f8X1488yWO*N5#4^CstPqw8`*3^jZ&`NwV_euCoT*oiQweYe1$yWJE{%okAA*wT2(I4F z0S9JhZM8+yHdTz5YBP{KRrCYffAmLXU~1Kr(ei6a#?kBz;{WtYG_@=9F}OEU zoE5dNLb|vQRq>WS_bwBKnC#y|K5sDwjbYF@%^A7ndHxwIzCpzFoc6ATe~4qR!qd)@ zm0gqY^*tR}Djs?Fkx*Yc+_Ji%NOsdPuhmxO=X$D2ww@x4lL(u!F4zvr*%$rD(C*hxsX)KFG14|Ecl(Wa)cQ zx1n>zR1rhd%4ye~I)tBgJ*U z*`1CR)!yD~r2`_Hh9u}QxEf{7A8i=sL4E@PS{>n~*FBF*FWNsmtSR)jAsCUuwCC4G zl-c_aqnBE-nVEHG&MJ8g2X6xgZraa?N~&CL{0i6(u~I@iF7?i)MVP?D(p_UAUq)O$ zT1Z;$3)VoE>Oi*%}#ShD_ zI`o>=CIdv`T1BR!(MCAfg6jJjf7-J%Mq9y|BwkVGkEph+e|I#^N)ta z;cl0i_^t^;@kqDq5Cb@Hg{i`^R&&@(zEaZ{#*Q9lALEd-JN0tR36|K7m(5z+0H9MV zh(DR5nS7>DW(7tMxk#JL=zce9=b7?X4PZrnzdHoh*&Hg32Cv5=q$Hl+A@M_BBnN|3 zuNRBi)XT8+7bZ^~=hup3dxK28DGW%kziv9i4bqm2sl+yvW0h6?o;ID%MXINt{#$|w z5en|>*UZmN=X!yoT$D*(hRkO}J)zk>DrcQ7$jWRCHYK6)NfF$mWp4C$EpzLe)7@d{ zuN2PsX8D@@$n_^(1Y~scI~^BA^fOY08zBhC5_T_iDA%Unv0aPvU1Mo!Q)3O^P#PK2 zb2@b6NM7j?*o*@bgznvJTfphTpDvLpUaWD!gXjmttvu-8DEL;VnKdT9tdm|WP16&l wH#hICv zw=v~Kz^kj-Z7iu-Y-isFG#(Ui>6&|XNdV_f#ek~X|K(MeUh15@H20DHvj6fkF5mSm ze_y-*{octBt5;++b+JsC$Y3Po;Kp>qgF%v0L76c{rJ)B&(1CB3e0=XUbMJ5Nn^R}s zHE-3qzT*ND-}P&YwBu{i!sqQhapk8?$-aL^TKD$kg&Aq@&VBweZpu>G62=pYbmluh zQ)HOFzc%H#_0<=Lt^18VJ?_<)J{4}haPD8@-^wrFPy8;>tJJx3dvju0QfRhW^u;~O z3neUd)LGrHou4LuPww56Aob|W{p}1t-p)Nf^Bw<0#`zcfQn$y-eZE)lX8!W(<+np# z#lODUz4KlC8R0#yAAWz!TXufo<`Y&d|5KLF`uT6hes+~Oe<|LFJN%n^kF-Xu%s$Ie z%XRA42d8DS@8n%h9J4v!(E0uSKEv$o>T>UAxOylykq6ct}d)O!>axuW(%=9aG)Zx`?V z@8GavtN-+ytqRMfMa9$?ERralxb@iS760D9KEuoZJ-)nt#m_IP?PBb#w+pWy+j;7_ z_co184!f@W*=fS3&s=<8QZw(nUgWiX;?4~hJ43rqALW1Ds}aJo*zup+y1<8~=YBr8 zzdLWbx!g_9m09-}GoRgFeEoPk!~ZX@=H|+7{ZsnUYL0V&!(MA2wi1au|9?(f-xqgp zWmIvs`6+G2`Rl*x?R1ffQ=iFD@pq4Tjs30Qe_yw)wZF0X)W1s#na>t>@GWMMR$#8( zT4*mkc}lkVpKI5TSu@r(9&+1nCohy2=6-5-x@w9+L&6qT$MtL0d|keM=? z_H7c{Zo1PhVe7pP?di`|e5xI_-tA2dcb~-jJn3hl(F2>lsq*)_e%GD<`gb<-X{W*^ z%W8dOYgY8f^WLsItiUw$z4V7@Q?bd77PlXtyT1Fa)11P*{onHx(l4imNxVv&^<(45 zOYh$ETxVYrzU7RURkq_AU*$|&RCRmn>vxk^JTm%UYq!I> zn(ce}?~la~N)P&X$G?46&E{imnR{1MiiI=r)=8m1n`ekz*`UBYcisNwPZ>`Xu>4$8 z_EdEK>uinJuOC%TcrJa{=7qc=zHEpuMS&BfrK-XeyIB_EZY(^f4pvWARbllEt8-)d z5p{ZPv8`~15gFfu)Kc$`r*w*Geb9ab%V4y#_ z$;{gz@OJ-vzQo>rt_GjCFDUtN_#c1y`~d6oKmN{eH3~hTb2IX~vxWFCdz6v|!%NTX ZWuzws`g`9#3oIQOJYD@<);T3K0RRs6YgPaN literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles.rsi/impact_omni.png b/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles.rsi/impact_omni.png new file mode 100644 index 0000000000000000000000000000000000000000..7b999ed628703fbb095b984e34ace4401e7fbaf6 GIT binary patch literal 1644 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 F{sGEly`umC literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles.rsi/impact_xray.png b/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles.rsi/impact_xray.png new file mode 100644 index 0000000000000000000000000000000000000000..2767498be36d3a62b1400f15581f4500b31a2399 GIT binary patch literal 1106 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGooCO|{#S9F5M?jcysy3fA0|N_- zr;B4q#hkZu{5?biMUI`X=3TaO_O_(FBfgC{)Qk>xlr^4iQn>zd-J0CM+gr+R?OL!R zHDL7wCgWQoj=6_=J8zq1*0;=gCcW2a&pn$D^BViz@8=sAKQ|~&fA{{3?9^gkpMZ%B zMnVp5OeZ`TBsmq78BpQEf8@0OPh5a-Z<`=4GJEk_g=~TV5`?;i;+PPb&w&zOQ#B6^YD|_>A&+Xq2*X~VT z`$(cD|9|K4xEFUmv)RP{7rkr#Wa0nW*&nYTaCjEEcgxTGW$DM$j-8uwO!4sT`l2@u zy+-A1F~#L(wTTL5eslZwxh4Pa4URlrW>)*%rY>=|_<7gw_piw(UTZgR*nZvk$AY!2 z8&)bYVt5;CSYQ=g!Ej~zv1{z1N(X}H#j^67)h(ZF%bxjnagE_Ft6g2vAEu=Lf4_sZ z;`Hgg55BrL>I$E~J)fJSTgE}7jQ98jwzH3JEOOah{&VYVMyFmohqt!RE*J3R28hj< zx66!UY=3vhJG<7|`g;8TB>Q#oD_fH@p8qxPOzwV}|LW%H7g85hViNL74cE8Mx39Uh zY*YK;Wp8q2OP`*%UL@QyWG{jbNjZ@l~bx+Ujc+`kF;x$o(5 z95YVduhVzcxH&Rt*RlnVPQLgszv_orp-%oM9Y2oiJipJzJ)ZVa$I@nf{bN(Z6Tf@? zXYqe`pYijt`ZV6k*Pm@eK0e;=-H={6@y0>bhP_U$KTnGvFh9`!Pvqf(u9yCJk}cM# zLKRH&XV9wKs4FHddfm>nn>j?keOB%H-UUpOx04uiR(R=kxBm;=dS^|+Hdzm+S{pWj z-$$z|r!;NvN|t~6a__U~1&p(J6Fx@VWO&}~;kGu{^AMMaz^jMO&)Ul(Wu7N}u>Ehh zZ^qMwy}5>;Pd~cx{on5@Gtb9YHqI{--8!*%=HB^byZx+PzX+;f%X7%?tY`F`;!--p T$oeU;kYMn1^>bP0l+XkKS>5b1 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles.rsi/meta.json new file mode 100644 index 0000000000..804ab0bc91 --- /dev/null +++ b/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles.rsi/meta.json @@ -0,0 +1,293 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken and modified from cev-eris at https://github.com/discordia-space/CEV-Eris/tree/7ff8f28ea4de734f3cc3cb70f2d4e4b4263a988d", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "bolt" + }, + { + "name": "muzzle_bullet" + }, + { + "name": "muzzle_u_laser", + "delays": [ + [ + 0.060000002, + 0.060000002, + 0.060000002, + 0.060000002, + 0.060000002, + 0.060000002, + 0.060000002, + 0.060000002 + ] + ] + }, + { + "name": "u_laser", + "delays": [ + [ + 0.060000002, + 0.060000002, + 0.060000002, + 0.060000002, + 0.060000002, + 0.060000002, + 0.060000002, + 0.060000002 + ] + ] + }, + { + "name": "impact_u_laser", + "delays": [ + [ + 0.060000002, + 0.060000002, + 0.060000002, + 0.060000002, + 0.060000002, + 0.060000002, + 0.060000002, + 0.060000002 + ] + ] + }, + { + "name": "muzzle_beam_heavy", + "delays": [ + [ + 0.060000002, + 0.060000002, + 0.060000002, + 0.060000002, + 0.060000002, + 0.060000002, + 0.060000002, + 0.060000002 + ] + ] + }, + { + "name": "beam_heavy", + "delays": [ + [ + 0.060000002, + 0.060000002, + 0.060000002, + 0.060000002, + 0.060000002, + 0.060000002, + 0.060000002, + 0.060000002 + ] + ] + }, + { + "name": "impact_beam_heavy", + "delays": [ + [ + 0.060000002, + 0.060000002, + 0.060000002, + 0.060000002, + 0.060000002, + 0.060000002, + 0.060000002, + 0.060000002 + ] + ] + }, + { + "name": "muzzle_omni", + "delays": [ + [ + 0.060000002, + 0.060000002, + 0.060000002, + 0.060000002, + 0.060000002, + 0.060000002, + 0.060000002, + 0.060000002 + ] + ] + }, + { + "name": "beam_omni", + "delays": [ + [ + 0.060000002, + 0.060000002, + 0.060000002, + 0.060000002, + 0.060000002, + 0.060000002, + 0.060000002, + 0.060000002 + ] + ] + }, + { + "name": "impact_omni", + "delays": [ + [ + 0.060000002, + 0.060000002, + 0.060000002, + 0.060000002, + 0.060000002, + 0.060000002, + 0.060000002, + 0.060000002 + ] + ] + }, + { + "name": "muzzle_blue", + "delays": [ + [ + 0.060000002, + 0.060000002, + 0.060000002, + 0.060000002, + 0.060000002, + 0.060000002, + 0.060000002, + 0.060000002 + ] + ] + }, + { + "name": "beam_blue", + "delays": [ + [ + 0.060000002, + 0.060000002, + 0.060000002, + 0.060000002, + 0.060000002, + 0.060000002, + 0.060000002, + 0.060000002 + ] + ] + }, + { + "name": "impact_blue", + "delays": [ + [ + 0.060000002, + 0.060000002, + 0.060000002, + 0.060000002, + 0.060000002, + 0.060000002, + 0.060000002, + 0.060000002 + ] + ] + }, + { + "name": "muzzle_laser", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.5 + ] + ] + }, + { + "name": "beam", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.5 + ] + ] + }, + { + "name": "impact_laser", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.5 + ] + ] + }, + { + "name": "muzzle_xray", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.5 + ] + ] + }, + { + "name": "xray", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.5 + ] + ] + }, + { + "name": "impact_xray", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.5 + ] + ] + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles.rsi/muzzle_beam_heavy.png b/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles.rsi/muzzle_beam_heavy.png new file mode 100644 index 0000000000000000000000000000000000000000..c67cb08e0eed958b98b704e9eec47c686acb4135 GIT binary patch literal 1112 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGooCO|{#S9F5M?jcysy3fA0|N_} zr;B4q#hkZuHu_0B3bcu9zGs*i5ahDSLDS=XpPHkS<{ybUP6wLF ztEJUNSW$A`qoU3CBJA3vV{IXi!0 zZ~fl3ALqFyEIGY;?vLHVkL%C*EPt_t)xPkc@4uIy&Us0`e=lZOI4$&pQ_b9Zfp~jy z;rf*f(Qnt?GWj^~)Avlfnfv7rUi+P+$Y`|k;LU|Ad*lD@Nv^jw%}y-YT9Bz&XTjE4 zZ?omStVFrGRfv~x*nP&UN7#RK^(^}r#`S*3()Z=!_jGja_J-Z#yjr+L@^TiVp2uB< z6xoPqp{xm~CV53m*{|61?$P_J&mGp!g$z_3Yx{FLztE z^{Z{ob_mxw_Wo?w!cA-{ku87oj-Q%wrp!?`d_J$b=Z^g|b&H<5{GJ~FCuv3bz5dVf z%U0*EI41t-HoLYn_rd!!pYBL{Y<{cl+^T_$XHVU0bkf>E3k_Q|~MU75Y^ z?W7IaKNbFG#V-xi3Ef>|!B=^8Tj|Rw*~MWCCNj*gxUOt(Bco=$a*^=0b*Y}aWG3v0 zb1shxHsNo2d#>AJ$;UMf7q+amxGt|bd3yGwh8c1{)lObMwfamuwqRA=mC}hYUW>mAxQfa?*G= zOt!kZ(e?A8AE!HXo2D|&%W*F_uWltGcw79wNMwpLr)JW=mK$PUr!wUTzj@mn&wQvj zXja4P7WSuG6iTj7)G8Bwdv4mFl6&*ywzYd#Z~Jya{>kUbT`S8JCw*`%2-@_1ouX9f zQjTTrdzHTRI4#ay5nFTW{h5zX=hpL`5PG}+uS)Y|?M>Q~n~Rz+F7fy&6Yw`}!db^j z&l?IDUcZ@`?^IEwTE^Hb*S>(=J?fCXD@JC)8r*mVFESpF literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles.rsi/muzzle_blue.png b/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles.rsi/muzzle_blue.png new file mode 100644 index 0000000000000000000000000000000000000000..33a3a56db52f28dca248c29d0cb6e1c96cc87988 GIT binary patch literal 1212 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGooCO|{#S9F5M?jcysy3fA0|QH* zr;B4q#hkZu_WRuq5IM#lRL)kWmFgL;BDbJpseeO4(wk|#rOH|6N1mCVa5*ZRva*6v z<=UnQt!lP;2lhU{b$n;xI?c}7zo8%gs-*m8D}3{LcYV_L9r7&>3mFVV7}}T)1TaW& zF*q|OXfW`wHUI_JGVQxB+S+sK@9El!vh6%4?tOiqRAiyYf2Y#No=^JzImhkY-To(& z)^lz+(k^au^_#t`VGGCJjJ*keXa0M*gcUzbxVTfUlEub+O- zP<7>_^&Ayf<_gw?_w)Z*abacV z_v_71tepJ1oa)u*&sUwC@I1lr%@4~Td-{I_GS=;zT=em;;I@~G=7b;D(wKhkh}&GX zSn&s^&+Gl0{JJzq_k?=#$vpm=JD>BHPm+}vxis;{l;xYwo6g&R@3K?%UfJJsY`%)y z+cB+j=*nHX@$1{)muBAZn6<-Y{gL%46@JG~-zfFCo-9L!(*T2 z?&eNu;eU_h$F|%ST9fT)t0lB?(~h&Jd-t19czQPQ6syIz?{6#K@3{YC{XYH`jCZF> zS()xx`Xl>0<2T+Fnn^FLAEsG9@~i0hksTaRar}CX*pyGZ_a~nGe}5k9(p|sv;+gxx z=CktpevTAqn!^8($F7eJDeAGN2TZ}69u1*d3a>sNE|z#Cf4V(MnK5ir`{{QFyPK3{p-xUu`|b3-Y$I-b`IQPQ*C{AJi%P%C(F zdgg9T_ty{pZoGQt^d`GF)>6eXLAChDsaLxt+e#Vk_B~lvT>H=4lgHX&GxM*vF;>E& z0%}p)g*p3{UaY&Z)~(*kJ~}&i=UIs;E<4VoO3O>k6II$mD@MwF_i!;& z&E4O%rc9q6Scn8~Eth39EUEY{sPNe8*t%`I*XGOjR(J31*cuvIxlwSzCH2tu7s%uFq+PYd$K5s`4tPx*N+>yUv$kEdzSis^QMx+{?>Z?*7{DGU~sThN7gWp_e14N zMYq>VIi3+M$2a*L5a3Q&)BbbEPt6p@u#ym!YTvJ>2hSh;`m$$g0dTC@DeF_CXDIct!OQeZ9)l4Z%(-|w>R54_x^ruwI$lp*V}&0-Mz@;YyJ2A v=G$g9{i?ET%+YK(`JTUymlbbx|Ky&>?Y(+c#^aB`;)uc1)z4*}Q$iB}VmKHT literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Projectiles/bullet_muzzle.png b/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles.rsi/muzzle_bullet.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Projectiles/bullet_muzzle.png rename to Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles.rsi/muzzle_bullet.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles.rsi/muzzle_laser.png b/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles.rsi/muzzle_laser.png new file mode 100644 index 0000000000000000000000000000000000000000..f17e106e4eda2b459d67c3c94ce0d74791377eca GIT binary patch literal 1481 zcmaKseKgYx7{`A^-VR!5$jhReuD2=g(uOb`trT_Kvu4QVWzJ^O^1fQas)>|~P07ua zlGn%>^0Fc_n+r^zUMig?4wA8x~je^008Q~ zKAy)mI_8Izw{FxAzmuIdnhMb;I355rx_(IRhK0sX08mW!^>hzB$CzWZ#TX#8xrk8r zz58J2`w~tx-QELn((z06YPMa3UvsD$P)1ddbd>QRB2B6yR-glI7$*2<}CT_*zBx?Q~1V~pskxhQ+4xJgp|o&3y|Yg0H*_i z{pNt44&}-w+wvlS5E*+?7uml|E;VjVU78Zs6q4aPJb)HyCazdGb!(k8#9Zrq;!-+v z%D&^{;kpO`!i-Rs-Va5IUAu0p5yhP%5L(u|P*PlpW5*Tl%N<1o%5JrbnS?fna!nk* zh;B7fJ5*pscwWISqMc77p@(+hmlAqssl2c(RO@g;zY@s~`hip(+kHNMzuR>V*;@OR zg~gF)HZ$9RW6){tR1B9dw7tG0fR;Nrf&aiiH%eujOECPfEQ|u`;A0c%H`jz_e=m%+ zY5Q(Eyu?L2z;ZR$B0vUnZ88#~Lwdarjg`O@Lpj|1_*dih`SuuT|CQM#&?1quQ2o@t zebAA`x;kw2pumEq28<4I8DO-rQ%g8=eE1P$(k$}3bnVcyIkS z2f8LIggxH%X-UoXqVCSUQW1WB4Re==^9C3c%bG;80usTQ5Q@D9K3f-8yHAFI8t2wy zyEE6mjByJ~jNKCXIf%UbHPCl$%JXGSRROQtv&G*ydse3FAs#J^2d8HSoV`nO21paD z;dZ44$a{4NLuI%f7|UXV)?^~qi|;|EiVJcfMtaA8Gb1c)47IxVa->Z*ofnvV?%sTK zQ8V3J*fb!Z)}q7Us+#)~mxESn%HY`A+>U<7-om8!=ghHa1AwJ2$a#y^WNgXinJ359 z*R_EQoQwIL{==}D($)g4$QcYApv`VMbBesRg>#au3Q{nH3OdywXm9qzB^+nOM*ykW3gV6rP%tS2)kd_yH$|&`1s_&e2<;j6dsKx+SGfImcqW~+~ zadgUH^il1j7*qUv9{+)yjIIj_ekx8moQ}90qB)gzpM2ecR?cZYWhH)0o3W3jS|xb{ z!D=*@0%wAa-%&I8-M-^7+ytR5gExkB6%Q!6dN=oQ1g-F}~5bobY)&czsJ*P=~e1bOE4ETB>J*zx07ybqz CNwRJL literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles.rsi/muzzle_omni.png b/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles.rsi/muzzle_omni.png new file mode 100644 index 0000000000000000000000000000000000000000..b0dc8f5e69481f076e8235d05a98a8f3b421c5a2 GIT binary patch literal 1253 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGooCO|{#S9F5M?jcysy3fA0|U!+ zPZ!6KiaBrR*ymq%kT|xUb!C>M))m1c0S-xT56r7+Iy3b}(-qtM45_KF`ev~%@yhwh za`xPTD9$U4rM&^{T80fDi$Bhexl?@gh@E{092Q?p_!IFbab?^()kA&$qV%d}+h5bFdn(tUV6o`%;g#&3 z%Oj`B?kst;-}>~MKf9_Qq_a+2cK7r8cS6Q0>!tsldHTR$Cd=yPqZ?koe(>G*NI%yB zlf#19`--DC8+9}YFgTXQwcl9dygZrNu6EN~ySsl%|0X%V+gJDU*Ij1$?ZtOa|G(q< zEK4Z*lfv%iij4P#`iEC+&;G*s>PpC;6%5=g&yK&nR9Fl$qpo;Td5OgTJrf?DtT$hs zUa(JVVDEfP-mUk@`a3O$`S_-DzF{@f4%)b3 zC+{-$`uqpa%-uE3AKZ9;`)l0xn?El8ZrJ^g>GirR2QF>!`1{f7C1O�bx14_3 zWBt(V(fz2VHII|eHwD#wH(&D^$Y@&^dnny8)Su&3&`$Oi#@jD`7(GpQG5Zy-?gv49EeC36t8r8EcWR52F8Xv7gFA{FL+oX$mqG^M39@D&AMvWKAR1H zDmYd-uMt#}|LFGksDv3q!JYE-t)D-?e|4mQVG8>Kd%l?5MNEhKz8!yXYeP|Z%KEjZ zQkMu$i0*3)`4A^?`g9?$K&O1#)84K(7S+bbPURL{;guI{IJT%z{U|p_nQYg_PrHm2 z*p_XVPjo%5d`$1uXXR5LlU#x~s&Cw+q^)npyhdJNf9GBWEe83XhFbHpSLcgVGgu{r zoa*m4U7%MNDdFQjf9X=`x|=5--@f-mNT}?Cj#!${KK37VnF?-C)pF(;I8WC)lHvR@)kW| zoN%e_m}?c+yaP9H?zUXdfBQ#S?eEi1{x3Ok(Cy5-n(FP<8ExTC3j!DF>mF&zL4Zr;vxOn(2_^vnM2o1VW}+HiP%{j>ger8hReFR+Z`zdIhS@_%6-)3yKm2K@xuA?^RBEmnpUcPP z67?$GtU{-w80|j#F1mfh`$Or6O0J``mxoXCd-dm&PuS7#|G&q}pVZR`+jG5FzVD!S z!TQM?yX&i-q)OBUeo1*OdcpV4rS#*Qgu6=Rd(4l^|Iv!s{Ns&ny=uv^hfBYtEN0-| zlqIl>pJ!G}kRw20NZgYvD%}r*j_J%;0HR@oqKs>j+CJ&h_jqzx%omB6KbMZ`z85>s z7B*Oui4{*)>~)peAIqq-48u! z)|O?wt9j<#_8@mNm91wCN(FO77HFUKzp`qfvtVcG$J&d&W>Y38KQrqQ`hCTW>w@=MuI~+n z8`w=aFEB0%(agX7WZCpxx*XP}J!Kb`h+j@gzj|}l{DY@2AO7?qC?+9$TE?%%t9q6T z%>VH0$Lg;?Q$Ncs3b=k>@{Z`tTZ=EemRNP{>%2&|^Nc&y@(ZU~h5M}ye3vutv*m*7 z^b3a_r#){dVAv^b+Owf}=?(#j)l%+B57sL|vIy2dCQ@)l3gb#%F8!za4~|XJc~I}4 kptXm!5hVj+HRv-xgX)T)#V@9w0G1UDp00i_>zopr0Q=nKng9R* literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles.rsi/muzzle_xray.png b/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles.rsi/muzzle_xray.png new file mode 100644 index 0000000000000000000000000000000000000000..cf08e091c05f08ea6c13e02e3cc1a6a4ef647ed6 GIT binary patch literal 1068 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGooCO|{#S9F5M?jcysy3fA0|WCt zPZ!6KiaBp*8~TViO0+&d*V`52TJ0$1w3zdtTYyl{M&pfFjvR_w7rbTbf~kl3*6R8! zQQ2thA}o?)pms|_+GIukbw<0SjS z$^451KD_uHXJr+#l{4XtQ$Y21wYxiOmOeUWTwkVeLSm6X!R9(EYi5a)?9!8s({|4N z5pa?{kfS5<@t=hpM)td`P> zsGHGqZ%5j`zcvOpn)P_*r~R7`IM3GqXR)k!>bJ8B^DG;#*KPkZl~^?Y}dR)iamcl}X(HmsMxGXZqKLx&7}2kNh0Rm0d5lt-teowT;>S*6HV?n2nzuT)X=ikM!mXQZj5- z=6Cbt#ovGaar6!=yP9ii${{r_&!V@FA8obk_uues_sk0!=e@!&_eJ@toJhaJx5{?% ztgnW@w_o)ZE?c&1^XYV%bfz?Ap`s7}7SCPzqFJH5>}QYq&#m&Zv0vZJd;Ih4`xUhZ z%5CnqtF-o|S2KL((x~STGF!uN?DNLT8RiW+R(4$noRdxG@;bg0Xjm;;zVlc`OnPR` zDU&n15)Vc&TCqGym$RGB=^I$_qD3TL`$*P>&%YZau01lUu@U?#Zj^e1dy!ZG8;(?s z9#<%_y6mx};h!_%N>5f_sW~3#*fakpQ&@PYjM6!!!lUjUE*tO3h8FF6+_zY0;``6C z=@WOTdo-+0FE_rtwf0!|<_#9Xwa0I&9DTI>!rLSzr|ma0gw;??N6B3fcl>8q9>`tj UAEkN&nEe?%UHx3vIVCg!0ICww_5c6? literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles.rsi/u_laser.png b/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles.rsi/u_laser.png new file mode 100644 index 0000000000000000000000000000000000000000..5ec311e5dee7a2d992be5a7af16fdd0f39ba38bb GIT binary patch literal 439 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGooCO|{#S9F5M?jcysy3fA0|R5G zr;B4q#hkad7y7aUia1={fATwrjY{%?Nf#K~#4?g(#STTu_+DUYcfBaj1d5LM!zq>KLrqOMC8J>T;_3n7~A7FVdQ&MBb@ E0Ar$+O#lD@ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles.rsi/xray.png b/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles.rsi/xray.png new file mode 100644 index 0000000000000000000000000000000000000000..41b99b72f5afbd97f8b95f60835c0cc455c2f6da GIT binary patch literal 800 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGooCO|{#S9F5M?jcysy3fA0|V0~ zPZ!6KiaBp*+h>S4inQOK*DO^WdP{j3XQqf#jtj3wl6r(zM1-_;?>4c_vq$~b>aysz zmI&!AN?6=$mL#mYHuPNmgSEfS%ug47To;+P|Jirbl|<&(RHy&+TOZ{;w_RA*dFL(5u7Cf2YEOT2 z`uo1K=eNAMa^>M8o9A!;KANBPw(yZn&8x-r_WxKcQp5AU^Oa?7+_tO6FjLM??v#7_L3+7F^ zerJE6Nt1U+?~Jp$Q^lW77kTYjx%=6_2k{~ua|^OBOf6jY*X_5*Gw~@#`uwIZmgJ=` z{B!f#&83@yA77qo^j-bn?u+_M{(p16xpLpLrbj>_{<@AI|4)eXo!P8@F1g&I&huJ< z-JWODuavCgPoy}&fCj8&`Eg|3em?%mzoOOzKeuyyv;Hvin!;5(I_D@I`B}EV<6>pG z{8PWV?*GaK4`;6|?h@GV_~=OGw;MAz`pxVwdzi6&*}2R^FV56l{`$hzB=+(PX9+i^ f1QiCH#54Kajjn&(XY6GLCV2)=S3j3^P6eK@{oCO|{#S9GG z!XV7ZFl&wkP%tpSC&U#<3t!qQbZM*L7lhT8x~8Q+oX7UJrJp% zSgUkuz4EE`YA4r;T-+*paSOw=dWNa>0=?Ce@6SuTJ1_nAT;P?1&ZT*ddsex6Km7?b zRJtU{FPP!qzyJS%=>P8@-@ktU{`K!)AR7V-SylG|l|^{EIEGZrd3#|eUxR{(%f;=T zkMufj|F2&mq1kgIVy1+j@m*aug`a{hNl9rZL*jmFHu=nCDjvbdv uW{8V7dLLNl&&ucGl3U~c>vjJm@iLKp94!ZSi4+0tVDNPHb6Mw<&;$V3GlPEs diff --git a/Resources/Textures/Objects/Weapons/Guns/Projectiles/pulse_impact.png b/Resources/Textures/Objects/Weapons/Guns/Projectiles/pulse_impact.png deleted file mode 100644 index 3bbb25ea2a525fa08ba2a3e0be5552841ebe0fee..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2398 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 QDgXcg07*qoM6N<$g4#}TmH+?% diff --git a/Resources/Textures/Objects/Weapons/Guns/Projectiles/pulse_muzzle.png b/Resources/Textures/Objects/Weapons/Guns/Projectiles/pulse_muzzle.png deleted file mode 100644 index db3fd7b57cb4018464ff140537259329cdceb2cf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1931 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 i%hRj@ptu?9{p`P3gjKPh+>*%v0000SF diff --git a/Resources/Textures/Objects/Weapons/Guns/Projectiles/xray_muzzle.png b/Resources/Textures/Objects/Weapons/Guns/Projectiles/xray_muzzle.png deleted file mode 100644 index 32422e111f74be15f0ca868978b310de9e71a6c6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2087 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 ReqI0o002ovPDHLkV1iYj41fRt diff --git a/Resources/Textures/Objects/Weapons/Guns/Revolvers/deckard.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Revolvers/deckard.rsi/base.png index 6d733331b3b1fd9590475f0d285083de5feba583..06470ce3531ac46478b65bbdcb06b8c6a88bb394 100644 GIT binary patch literal 5964 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

    p1n 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 V*0DBHp_%{y002ovPDHLkV1nG{)~^5n diff --git a/Resources/Textures/Objects/Weapons/Guns/Revolvers/deckard.rsi/bolt-closed.png b/Resources/Textures/Objects/Weapons/Guns/Revolvers/deckard.rsi/bolt-closed.png deleted file mode 100644 index 23ef2df5f97d9da1859af24d49099c4802bc3bdb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2613 zcmV-53d;3~P) zaB^>EX>4U6ba`-PAZ2)IW&i+q+U-|ck|ZY#{O1%t0w9FMad;`hH}LVDqN;mldiHI9 z*b&<`(-agfBxNe0!v5<|3xD8~ORb@>Xl=Ddd`c@Vcid>aK3AJ!Ip61#??>o=7!S_} z8AF7Yu5R7;{El&c`+<~ue0&@aGH*M28@eAn43e+xtF7C~+YsezJl*}!ZkKv}7tZ}} zGdCaNaXotN7eO)>!ye_3HzkVaJ6|i&_22Q&_|Am2@U)%#g6~50bN<3Jbzex}^X?^o zao*$fmX6ENBdq$8r+Yl{m-BbB^xmVCpDXA09%+9P;dB0MsoB1w>jgY&rQSh3LOFMs zh?EvOKdZO||BQP%SHq>T#|hLHLLDIvbXv;DxTTU->dDeR?MxFcmb|l|&3R@zV@i@+ zp5zb|zmjDMKx2^tj|t=m!};k;I_oxH4~r>QUI{aEf-zwH@d~d4zj}QzWaczaDe5y< z@GCpN;D#gT-*Xt)g?<; zTYaYuD($j)*DYIj+ugu5BP+&MO-!v>f1-Ay`VqBP3sqD4!>9s9{*-VIsMl zuww?qa!Ej3903qIJ7!T+DcO;8%wo$Fh&aPbc5qg5#DHMgDYK;~c5ldi6}N!w{w!|! zOUMO>?%zNzICSrj`;6NcP+R@TEggWo3XxMNB%%DQ#GVy@@mJgMPYwJw^glB+CJLv6 zf}nE?G^Y$~W4x*HTufF$$Ar-ZQN<~2b1K8M8AM zLuvZz6C&q$U5S7=wVl(|56cs#zSwRRD{hFhoh;TIr8$IW=J4n%#LjrS{53d`9n5vW zY~iKxXjiNI`;-CJ!HEtA+q4=oveQzGojgJ7B7|8Z; zlDA?wp`!Avt=kK7Y94U$=)sTvzL108kf&l$-;}*EY@fWMiRKgZbl+eYJBc9lh-vDh zV`7gQ20W~;An*gnC)y|tr*=I)Y_r}BrgpLon|s?P!*+8qpnF6MX#_uT&h5~H0M58z z92Jq&jAHB9&jAN^MKr#dlZVF%d)&rK9g+Z1$lI`9wz2A9!$HdgcHya19Pknw7`q!- z3mRgxU7`gQS}QexEz|^QgW2U4##~^Mqdj)$Kpd$1qIZ$|nk!XcoZ24HrNi$s@P>86 zF}BEw4-i3lAdW;L5Ih~s>yjH?hpF~J=!ofsO;hZ1A4qj&VMBd7o zm3&gnTrd7~oWb5SGJIb|-?b;+D!frUyEEh90>Qz_W*AOvYbdC!hh`qS<`XM|95{-h z-N&5Cm2xTXCt2Hu9B0qqIiy=VI_dfihB4cjkXG2hh!USRboyoc%f z_07_FR7Q9$jbCkl8~X1U!b`rb7XAi6JijT&fIN=?00D(*LqkwWLqi~Na&Km7Y-Iod zc$|HaJxIeq9K~N#OI0ck78Fs)P@OD@ia1IYi(sL&62R|08 z4ld5RI=Bjg;0K74qm!bGl=#1-&?3fz<9@um_qclp2=y{k&5m(E)hr_wkBQmbiWq!F z0K@1)KLm-HdLq4$f#>+ThmWs!QJ&>}?$6Pq z(&Rnhat9cA(j`N3BtK1|PypV~=$mpt-!0I+>h{*$$LRx*p{|y0fP+I|v`E=&9`EjK z@9p0+&HjD>G>meNv`+U!00006VoOIv0RI600RN!9r;`8x010qNS#tmYE+YT{E+YYW zr9XB6000McNliru(sW9isJ!3rv(i;EOobaS&qA%sZDD1n1)o!V78>CjwyN!ujF zNCfkiTrQVB&k8>oaE?`E!8-%*y|E2~fVYV&vc|Dl@XCN9YiKn~-pf#J)Fz@P1O+K1M!;}{ z&X8XyaJT=4)7L%g=*Jds3jo|ajX`2OL`guanzt=cq8oHyK<;t_fPtL80Z{@TAD%q{ zIQEOkIeV*r0Fc;p=4>jc%swc=zgvz;j7NX%2x=k~UOAptuF3k%m`lxBLVpE-zGTa6tw97A{TW37{~q8Q XYmURR(~gRy00000NkvXXu0mjfbX?N6 diff --git a/Resources/Textures/Objects/Weapons/Guns/Revolvers/deckard.rsi/bolt-open.png b/Resources/Textures/Objects/Weapons/Guns/Revolvers/deckard.rsi/bolt-open.png deleted file mode 100644 index 915ccf8f9546de6d15bc5e193bd746cb8ba02636..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2623 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 diff --git a/Resources/Textures/Objects/Weapons/Guns/Revolvers/deckard.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Revolvers/deckard.rsi/icon.png deleted file mode 100644 index cf14e2eca907eb67e820b33d82ac0b59f368a3fd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2631 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 diff --git a/Resources/Textures/Objects/Weapons/Guns/Revolvers/deckard.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Revolvers/deckard.rsi/meta.json index 7c0154a65a..1787114199 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Revolvers/deckard.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Revolvers/deckard.rsi/meta.json @@ -7,18 +7,9 @@ "y": 32 }, "states": [ - { - "name": "icon" - }, { "name": "base" }, - { - "name": "bolt-closed" - }, - { - "name": "bolt-open" - }, { "name": "mag-unshaded-0" }, diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/ak.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/ak.rsi/base.png index 44c71ed23f71972888e47607453cfa97e08ec513..86ebcfd5c10b0cf3a4d435040630b45c7485c6af 100644 GIT binary patch literal 5681 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 delta 229 zcmdm}vz}>!GB*Qbage(c$d_r6&D~c-CtNm%d&%nUIT@vIM%Xgb7m=8&FVAJdtGJbHS3JUt5=dCsV1X8LuV zImPoXQ&VqI*P*7Sw@>x-jx{y$b6Et9af$eJa~_$TY^P9NuTEJak5}?bl bf}Npfri|eEYUv3;$1!-i`njxgN@xNASqNn~ diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/ak.rsi/bolt-closed.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/ak.rsi/bolt-closed.png deleted file mode 100644 index a405474fdde8197e8ba100ab91443d8989371e43..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 153 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnH3?%tPCZz)@#^NA%C&rs6b?Si}&H|6fVg?3o zVGw3ym^DWND997w6XFV_!(s}1r!L%k{N&8FTbBU&EG0pH!3_WZ|KF_Z&;jI&dAc}; rRLn_EkWe`AiXpW?RzgEvfSF_% diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/ak.rsi/bolt-open.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/ak.rsi/bolt-open.png deleted file mode 100644 index 281690b3f9b2b07749aa767aa9b2a58f0c3fe8f4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 140 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnL3?x0byx0z;7>k44ofvPP)Tsw@I14-?iy0WW zg+Z8+Vb&Z8pded-Plzj!*4K1c@+K`4$YLr9@(X78A3afNE08DX>EaktF()};frNqi c0S+k!h8TNBc5a=myMU4mp00i_>zopr0H`n@761SM diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/ak.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Rifles/ak.rsi/meta.json index bd1faf9098..24bb58570e 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Rifles/ak.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Rifles/ak.rsi/meta.json @@ -13,12 +13,6 @@ { "name": "base" }, - { - "name": "bolt-closed" - }, - { - "name": "bolt-open" - }, { "name": "mag-0" }, diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/black_ak.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/black_ak.rsi/base.png index 555798e3177ed1c65047b6c52c64c56ac02b8dbd..970d3f666532c432a2dbb39d5fffbc082580fa63 100644 GIT binary patch literal 5463 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 VJn^b9vK;aZM)zdWiWY|?{}+QoV2S_$ delta 241 zcmcbvwTNkgvIYZVage(ctQa7?lQqg#x%K-Wo&G?YQ-tXwd7viAN{x(@4vsM j9J_haMn320`=^{m@1@_w%}!YbbQgoCtDnm{r-UW|t@U8_ diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/black_ak.rsi/bolt-closed.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/black_ak.rsi/bolt-closed.png deleted file mode 100644 index a405474fdde8197e8ba100ab91443d8989371e43..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 153 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnH3?%tPCZz)@#^NA%C&rs6b?Si}&H|6fVg?3o zVGw3ym^DWND997w6XFV_!(s}1r!L%k{N&8FTbBU&EG0pH!3_WZ|KF_Z&;jI&dAc}; rRLn_EkWe`AiXpW?RzgEvfSF_% diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/black_ak.rsi/bolt-open.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/black_ak.rsi/bolt-open.png deleted file mode 100644 index 281690b3f9b2b07749aa767aa9b2a58f0c3fe8f4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 140 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnL3?x0byx0z;7>k44ofvPP)Tsw@I14-?iy0WW zg+Z8+Vb&Z8pded-Plzj!*4K1c@+K`4$YLr9@(X78A3afNE08DX>EaktF()};frNqi c0S+k!h8TNBc5a=myMU4mp00i_>zopr0H`n@761SM diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/black_ak.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Rifles/black_ak.rsi/meta.json index bd1faf9098..24bb58570e 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Rifles/black_ak.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Rifles/black_ak.rsi/meta.json @@ -13,12 +13,6 @@ { "name": "base" }, - { - "name": "bolt-closed" - }, - { - "name": "bolt-open" - }, { "name": "mag-0" }, diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/base.png index c9f14980b19e75685f40d353e33863212aed54fe..4615b8e355900eca2c54a0aa413daaf36760ac68 100644 GIT binary patch literal 5598 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 LALmM^@Ra`oZS$7| delta 281 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 delta 215 zcmaE)wUB9oGB*Qbage(cff;j{qvHx!9tXSPnVAe-+Gm0<&Pi?4J0NwyK!<_h$_}x;JrakO1D(U* M>FVdQ&MBb@09%w*1ONa4 diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/sts.rsi/bolt-closed.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/sts.rsi/bolt-closed.png deleted file mode 100644 index edf449189db21a3cbb52fadfecd6d2ad5357932b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 145 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnH3?%tPCZz)@#^NA%C&rs6b?Si}&H|6fVg?3o zVGw3ym^DWNBpBcm;tHgDr!L%k{AAkCJdhxBNswPK!~g#-0oN3PTp>>v$B>FS$q5Ve g6S5aM=i)78&qol`;+0D<)+uK)l5 diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/sts.rsi/bolt-open.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/sts.rsi/bolt-open.png deleted file mode 100644 index 629432be86e29b198c8af0e48e60ed8202cda006..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 141 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 B6Au6Y diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/vintorez.rsi/bolt-open.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/vintorez.rsi/bolt-open.png deleted file mode 100644 index b6abedda93f1a61a27de2dbef9037014dd096f64..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2793 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 delta 293 zcmcbw^MGlBgfR;<0|P^2NcwRg#aJBV?!jsCEtbNPmi8=suHYt1Vm z(bCJ?yEMI|nCU9h*{OzXS%OohnxuVX(VCx}lapgS`{1P??^>(h-@7;0@-o{JrwNWf z^q867@2<9)W}JI&j%9H}Bjbtm2Y>4uj|&}XZ2X;n|DI*@lcIa|`GI>6{eH(dEB*Z< dZXPBEhN%aQSq^*J1p-~p;OXk;vd$@?2>_podzb(K diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/wintermute.rsi/bolt-closed.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/wintermute.rsi/bolt-closed.png deleted file mode 100644 index 1c207de6f38dc41563a7619f6b23447dd99770e6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 140 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%C&rs6b?Si}&H|6fVg?3o zVGw3ym^DWNC}`;E;uumf=k2+ToD2#AEC=7)U$_$2b97VOnKuq{X$d>OC^0mwijuD^ iUpF^@e?23^R~eCo{AZWE&*K4VX7F_Nb6Mw<&;$Ta$0>FI diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/wintermute.rsi/bolt-open.png b/Resources/Textures/Objects/Weapons/Guns/Rifles/wintermute.rsi/bolt-open.png deleted file mode 100644 index ba36de46affa05f60620f9b182079b95e1ccdbf1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 136 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%C&rs6b?Si}&H|6fVg?3o zVGw3ym^DWND5&e{;uumf=k2+ToD2pWE`jczsdN8M_trYd>r%mQcRh}UVZ+svzq6_@ d?`LSJwX2-U?sfP2-a4R022WQ%mvv4FO#o3+CdU8( diff --git a/Resources/Textures/Objects/Weapons/Guns/Rifles/wintermute.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Rifles/wintermute.rsi/meta.json index 66daf324e1..448662e02a 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Rifles/wintermute.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Rifles/wintermute.rsi/meta.json @@ -13,12 +13,6 @@ { "name": "base" }, - { - "name": "bolt-closed" - }, - { - "name": "bolt-open" - }, { "name": "mag-0" }, diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/atreides.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/SMGs/atreides.rsi/base.png index 1b4a0041ef70f28d7cef67330b0e29f2a28c294e..02e0b566e58317de4b8977c60f7b9f0cd85c81c9 100644 GIT binary patch literal 5695 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 diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/atreides.rsi/bolt-closed.png b/Resources/Textures/Objects/Weapons/Guns/SMGs/atreides.rsi/bolt-closed.png deleted file mode 100644 index 46f4cb7541ec4affafbcfe58975e6a6af5b9b587..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2567 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 diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/atreides.rsi/bolt-open.png b/Resources/Textures/Objects/Weapons/Guns/SMGs/atreides.rsi/bolt-open.png deleted file mode 100644 index 40ae4d772780a5e4440ccbe463caede30490b24d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2115 zcmV-J2)y@+P) zaB^>EX>4U6ba`-PAZ2)IW&i+q+O1YumLw+({O1%t0+Im1aaiB;4Salu$fcIB*h*&;3+;x%KuQ z6kv=9eZr2Xkof)NVuC;hB?E*>f52BMS8@RY@WqOhpE9I`9eBQ1%L=^M;Jo_27Drkl*lWy z5&_2yekv?S0pSJ)D7wf4R&o$zf^ueC8{a7Hxg7Zrqr8BKC`lC56saI9gcuU?EhB`g zixNYOF-46zmROUdkYY+nlhvuJqCul3Rn1zoX2~JPoU-PeORj~Bpo~RVQqhu2DYatJ z8Y*;E%&!nMZqh=FEj4Yql~y~#r-vSU>e_QJy$&8SPy*aYLq{HE)JYSeG{cNDO`Um` zSr=k$$qFm3v~=ZFR=rs}S$$>gow@&JjZW5h6J_)C!5YM>mkP3S5{)x3#(}`N8UqMu zHqLye5ZIVA&U|5UB9UQbG;#(RV_+~$;<)JM?!nxbyg8uzyS(vd%sHd(Czx|a-4k;k zdHaO5QFpnOO^{_FFhzwFq~8j@a>mbpw{^e&A?%uM_M>wTI4>sSHWkmh3bt^Wd7Y9~ zWdgD0IZ=rCG3B^>-rud}9@X)Rvui|pf@781pH&c43^~?BrQAycA8tKy1A!|^9fbUs z=1S+NY+%aJt`saRQ#L*Ov)=13dFO0I8g1o^dY!N+a#&R{Rq}psts+QJ^QEilYKV-) z0+YCnj0K~T!|p`p4&gl!g3+u{Q{NE&K&)X$3CQSlXt4!3H^k%d-B!et+#ZLTHs+Ry zbT|zNfE+AG7>7BreXJ;h;*uQIUi^rep3!p`d{Yo=?d;eo=NOnhnIi~MYevWyPy&B1 zDA0|r`Gq75b+Z6z$r+(s$BmBHR;BU+~p_&(qkD5IefF@ab^q1vY^_-4y!aq0F38u=24uw0!T!5ZH#{J z%ZPaQG_Hx!3$k152D^P)9J*R6ADzbl9im1XC<;Sxa$npXB0emeB7j9^G`+UMLRqMo zg;EaNV(I`E6=mn*K~9lv?J>Q$G<&2wg`oP-TrFyw>0PzV-NBBwoiHCT{1`>Hm*Mgm z)G&INK>xAD4!3M~I69936Ww#&H5o^Ll*+YR+fn7Db{CaOd@yP*1w+})-n9S@a{}*< z(*cs93sjQ2?(I)V(xxoPqQuU!v?uS>42E+B-AW*k5GIL{ED6bC1Tvd*_G;rX8JM) z{;zev6ePdUy6>$1S;V@Zux7jV6V{k9?kBAIV~n1OazA0sA7S(!Htr{^`8GzM1+n`H zYrciiS1ILm;Q(IH`4<34ZCjw<7gqoP0fcEoLr_UWLm+T+Z)Rz1WdHzpoPCi!NW(xJ z#a~lPMJft*5OK&*ohs5CazjM>IgL0001PNkl#+a; diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/atreides.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/SMGs/atreides.rsi/meta.json index 0e540736a2..cf7c1acc4a 100644 --- a/Resources/Textures/Objects/Weapons/Guns/SMGs/atreides.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/SMGs/atreides.rsi/meta.json @@ -13,12 +13,6 @@ { "name": "base" }, - { - "name": "bolt-closed" - }, - { - "name": "bolt-open" - }, { "name": "mag-0" }, diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/base.png index 4c79d3db74d3f67c2ec116c85243a57783fddf25..43d1497535c3089a8d1889bf829ee77c8f1d9bcb 100644 GIT binary patch literal 5473 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 delta 249 zcmaE;b&_dk44ofvPP)Tsw@I14-?iy0WW zg+Z8+Vb&Z8pded-Plzj!R*=)=z8NtG$YLr9@(X78A3afNE08DP>EaktF()};0arr1 ba0nX%YcvCY);q>Tpd5pztDnm{r-UW|Vuc<$ diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/meta.json index ad5d5a991d..1b7ea466ec 100644 --- a/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/meta.json @@ -13,12 +13,6 @@ { "name": "base" }, - { - "name": "bolt-closed" - }, - { - "name": "bolt-open" - }, { "name": "mag-0" }, diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/drozd.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/SMGs/drozd.rsi/base.png index 445d8709a15a4140f2cb0a89bd0eaa552b0389a7..b4b511cb8ad960babc6c0f133d9e1dcadba24667 100644 GIT binary patch literal 5741 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 delta 287 zcmaE>bD3#^vIYZVage(cr}? zTtSc>P=Ko>$S;`TKMd4$ii810cX+xuhE&W+PLK$35a3~XP~(=GED+Gb%^|sqp>eTd zhwL;il@?zIA2C6JnQ_k!Jb0lYG;P|nQ;(PeA0ALhSu!auE>2B}Nl-vUM9hq3r9mSH z3v;iy8ILb7_ty^sCJ6~M%(4YvFt|GkicfbF6ijAaa6n{1tFE4$tgNn_oE{$!&m3cx zURI04r=uifENm3k6}`+z;PA~(C~)}1l^v<&&b{gWq02#mw$jtY8ng^VV;hQ}u`Fut bGh<*_RIc{mxRG@n&=U-vu6{1-oD!M<4Y6M+ diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/drozd.rsi/bolt-closed.png b/Resources/Textures/Objects/Weapons/Guns/SMGs/drozd.rsi/bolt-closed.png deleted file mode 100644 index b85461ce7e94bc3467def990f344fbf6c27b79c3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2663 zcmV-t3YhhYP) zaB^>EX>4U6ba`-PAZ2)IW&i+q+U-|uk{l-t{m&_K1SBB@$KkUoH^}kxMEB0_jMt81 zyHb@ZPtP=s8ie$oB$%-N`g4ar@L{nWl3K|%=ZH_LsdB?ZiPz_9DW-EjAHH9q|0EBO z7Yvc0m8+ZAJ-$J%?-MND^8PFjHf}xTRz&e>Y4Mf)dEQ3eii9sY-ThGS2`ztc=l=1y z)xNp)(oY63rb3@^;3XvS-1%Bbu3y7XaVNtV5il_y~&6O@7D=PSGle)M`$w6}*jQ7jLvU>AFQ!3<~4 z?-&I_Xy2IX!I#3-#Mh4#D_~F$%mog%*e?}b={>gO@GMaShNgJs3)#FC03xidFopyS z#7v@;DH^j80mlM<8Z2i?+`#~8P@b@olOPj}3;WubV|2!{@+C%j0TGHsF;G*bfvl7? zW#n5y2(_T1Nma9&7OmQ{cN-eE&6_hazHCL;p z*4i2tZK*+5!}tb4=Po^U?YUboz4kT`J|hhsdDtkUjy8G9Li&!^3xO->rtGorE`)_&U&zK8N-LGIS zICUSG`;xa$SexyXTR8-I76MaLNJ0AT6dMRU^~2Gl4X=VvTPsVg z%XH0HP$xD66NyME?%j|_5}J|w+gB-`v9ntx9nHpqfi~S%TC)#Sjv?lrD$9UX&3%^D{TWDhAUSFEs>2-{Qw8U{P(K9f5nipk zff6BOa9+a&@QJipPaJn0tE0*shk71yxpfPMhE`XOGRpma)`bG25G|8q9A>QHdrl#o z58WbIQ*}$7nm|ZoND}!u+e;&gSw`t>3#J|siYRQrCgOTYQM4R^&!95~7JH4o_qtSGmTJBSp?P@OD@ia1IYi(sL&6r`RHv4jMY5Fw+6GAghTrClS%M2gO19{yp+pCp$| zt}+-o7Epx>$?=2#!SC6cg{et5DHsC+FSh+L3Uu!R&AM%WAKP~G1n@rtS6bU&Z2+^M zq}SV8G?f^qix@1U>pURz9|O`-U7XA?%Z1EIDG&zG^^zs z;NTD#D^m8l$Gdwv=l1WN*8F||Tnuua)4A7F00006VoOIv0RI600RN!9r;`8x010qN zS#tmYE+YT{E+YYWr9XB6000McNliru2N>rfQ_ z^5|G_ctHx)5*i4CgGIrre?dh0hKF+ziaHc26uQ{j#m56F8LS8*xQLri-XExoF@qYB zf&>ymu~IIv{LMnGu_;K&iTG`PR_{x$X&036S&xz~0U=;^|*7szB~rX+8HB0#|Hz^bBg&eW@l#?-cEny%nA zvyS=SznJJnN$3bHJ{x<@fOd7q96A+01Byh$sF`&DVAe;6|IltVVAvwI3waJ0y44k+ z(*Zvkg`r!xtv=9sc3XWwyVb zaB^>EX>4U6ba`-PAZ2)IW&i+q+O3vZmcu9vMgO&mUILO3!*VdgIlY5kem`u-uB1{^ zVpBF)VCkU?RH*;=@1TEhaZZW6#T0S~4wuh9OF<*K?b>Q~etoW&>|J=jv(wQbFez%? zUPIr<7ufCmAo|_D+}kPE-A~#b?HxCVIwQ|$Z5O#aQrYahzf;~NmGEIY`#q}UX|iSO zdVKd0$!G?DDkNQ5-TIU*l5TgwZFq{x9Ekpcn^(Jh&L17Ady>GT^^iYTce|eH*c{!a z6&~`m+u5GyZ_Uz2MJz{T`KYMWBgE(Yjh4pf+w6)Dgmi^{Qn#tBEeu3Ty{?}Hl!)8V zj%&#%$rV>YtzoJQxdkto1sNagxpCpaeXT23Nc7Srq86#h__QUBlBFW)tbP_A5=pZ* zO`uXiPGOcq3$JnWjE7(eksD*AFr4wE`LWQW;ni~IXpFhcnO!<^1zj>%4P;Dm^NCRa z!eh^=t@&lzD))FzunK~97`BY!6h8kF(1vSUTlN!u1-dylJPHZv*G4TxI zaT36SmdVT|_Fg8r$;@R@QZ<1}n{XOWVj$={iw!>5o#ejcM#%18xydtfG|^o_jwZSf zS<`zuP8sx`j&Je*MaL=Qdi<~H zxE%kFj()#P=^8y>IC^Ef&^3DQ9KE+~uUkiVI!4R%Kb!r02ueWyWB>pGg=s@WP)S2W zAaHVTW@&6?004NLeUUv#!$2IxUt3G1RvauM>X4y2Sr8R*lqwd%LTM|s>R@u|7c^-| zQd}Gb*Mfr|i&X~~XI&j!1wrrw#L3Y~(M3x9Us7lhs77Ggk{X8Q90000tNklAIEM!_f;XaE2TUIYZd-i|f^0000< KMNUMnLSTXbKA)KY diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/drozd.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/SMGs/drozd.rsi/meta.json index 17e6f3319e..27d4d1c637 100644 --- a/Resources/Textures/Objects/Weapons/Guns/SMGs/drozd.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/SMGs/drozd.rsi/meta.json @@ -13,12 +13,6 @@ { "name": "base" }, - { - "name": "bolt-closed" - }, - { - "name": "bolt-open" - }, { "name": "mag-0" }, diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/zoric.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/SMGs/zoric.rsi/base.png index 5253d0f532079b370bcb423ec3915ac21882d386..4f4ca0d6054ff0a393f82e4bf45b1ba544879195 100644 GIT binary patch literal 6388 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 delta 2993 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 NutTC)dxH5({tKiBP+|Z8 delta 267 zcmZqEzRfg2nVW&JILO_J@#aaL`pFYSBv{o0d_r6&dyA;obF9ez!oa}5TN30K%C{~b&BtlDN`Dnl-dkfo0N_nb9D0Z%F5(<%F4rY z=$M+Go?hFzW5u!%$*n^i5(JQYlXbMg?*A&=r9L0 zW$DE^EM}2(X$YEnSyJNCrAwO*EK{FtXt2RQIl*JT?gqvq>BfT194TK68dxVaT1ngx zlDJ`&UDjN>#6qp%WzS53S&D%?PU(K_TpN};zW8Efvj33E3l0X!Y~|-oi&m`%dVs;x L)z4*}Q$iB}9vNqa diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/bojevic.rsi/bolt-closed.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/bojevic.rsi/bolt-closed.png deleted file mode 100644 index d0010185f4b22ec9609ec5d1d3a3f5f0640b6754..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 146 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnH3?%tPCZz)@#^NA%C&rs6b?Si}&H|6fVg?31 zWe{epSZZGe5)AMOaRt&>uiu?Bd%-+G@jpNgb4ie2FvI`k44ofvPP)Tsw@I14-?iy0X7 zltGxWVyS%@P>?OaC&U#<+uOQxFtoo1vY1MO{DK+&M^9AR3gq#7x;TbZ%t=mIU^Zd# as!RsXBMkDzs{i|eQVgE1elF{r5}E+G#~~~L diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/bojevic.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Shotguns/bojevic.rsi/meta.json index 46a3afd214..52667dbcc7 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Shotguns/bojevic.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Shotguns/bojevic.rsi/meta.json @@ -13,12 +13,6 @@ { "name": "base" }, - { - "name": "bolt-closed" - }, - { - "name": "bolt-open" - }, { "name": "mag-0" }, diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/db_shotgun.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/db_shotgun.rsi/base.png deleted file mode 100644 index 92d04499b2c1ded66e0a404ee3b219e81bede0c8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2325 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 diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/db_shotgun.rsi/bolt-open.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/db_shotgun.rsi/bolt-open.png deleted file mode 100644 index 46c7c5f9cb828d3c246bc888898c5a32a530ca85..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2360 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 BMuz|Z diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/flaregun.rsi/bolt-open.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/flaregun.rsi/bolt-open.png deleted file mode 100644 index 7c08e619f1743580f3f0c09d0a7b5f51e88662ce..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 284 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}*F0SuLn2y} z6C_v{C+uic@_qV$$%^zP%bwQ$HU4L8U|?V~^Xl0P<$v`8(~JX8e`>fOA~IiCT1e;0 z2AhZ(@BhcMv9&oLKWCs3d-MDR;X_9YUcU-wV`F>zzs0F3D^Nh^%=h>>pD71@g&!4~ z=H|6UhwnFfv+G=kxz&nUY$pm?LS-HLlvliC2$FRaW}ongW0qw@gnPhRnFDOs_WeDw zqu+gI;`P!F`~29yrxq+bd-lPypYm~j7fe_Z7@|EiOykp*%x1nI`*7nsxw~&zopr0Q5t0KL7v# diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/flaregun.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Shotguns/flaregun.rsi/meta.json index 77ebe0e6e7..98a415c185 100644 --- a/Resources/Textures/Objects/Weapons/Guns/Shotguns/flaregun.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Guns/Shotguns/flaregun.rsi/meta.json @@ -10,15 +10,6 @@ { "name": "icon" }, - { - "name": "bolt-closed" - }, - { - "name": "bolt-open" - }, - { - "name": "base" - }, { "name": "inhand-right", "directions": 4 diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/sawn.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/sawn.rsi/base.png deleted file mode 100644 index 8a451be3d50ead2174670d42fa505230da31a7dc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2310 zcmV+h3HkPkP) zaB^>EX>4U6ba`-PAZ2)IW&i+q+U-|aj^s8B{nsgS1d$X)@i^KDjH`HY?s#bVzV4B7xxTN9pP%slX+FJv zU`z={xnJvk)_2V7`vxn|{P;YdY(8?@BZ%^+qvf1@p4S8N5hQ%i)AOGE+0g3;b)FB; zN9>zgU*3zs7)v2fIPn&ee0}qMlH8w;kK&u9o`v|mi(u?{qHpb&UZ(qw0bfsF?3dq= z$-6mjL2qi+FLrw7Nx#g?>lproi1>9fe?$~BTmE=`uwTS#5&PDzmzrR%`Y83L%JqbW z1Ll-#Tg7eoD4y-Q9e2w;Pq4P2>PUIu#ff3@phAl}1?_8`Gy$>jX2ZxlVevE9#MpU) z43ctg3brIJOB&diU`{a2FD!JO>*qWi)^PG7tYm^PaQyjBUnhR{{v;^kxH(a7FIxc@ zAO8Z3!`%7CDiA{P*in1d(9e_?(SBM%P+azNe91K!i#a z12rxkWR;?&BHkKYs3#RIs#?{wscWxNOVwJd)sv^Xi4{|;X4cHDH)*A5tIb+#-nz33 z(wHW%Zr^ztF02^E4YF%K3ifnwW(<~;jLnTy|K4PP9*gMY3s~N?CSaQ@lTN|Uj<_>iT z!iCmcK!BPXcNdBxyLL=LC+g@d)CB8#8l#Fpv({0U_CdPGfSKHRY}5=#^C!1=qIbPG z)zdJCoQlDE%&iTz--B0!>S$Vg!&rdbRL9T_|D$=Tl0V*Y_Adbfz$mDpbLuI8g4)F+ zfg98^^vn(d_O$_mmgEM=KA;||v)U4a_d#dd6YjtEHo)kpb#;&^yQ#97<082z0QMDAMIT+{74ebZl*0;1u1NAqZsyG4#eig0d@BzXAdas!6I3o%# z*27_?*&62bW}O2bWg10$hPQOZc(3I>I6jZ}zG`olL$^_F!o8Mv&Bz8YAgZ?}KnMku zL5LZ6Ut7m?>qN$eTL7#B3H*DEK!BWxxPa3Ie2s+_a6`n}1#wkiL{>3)!UyiTy9}6I z&wPQJC-k}14HwdOD^qUgNdF)yLipBPy5X0gUxNN? zL59xS)1O9)R<6diWXk{m0fcEoLr_UWLm+T+Z)Rz1WdHzpoPCi!NW(xJ#a~m4QYsF1 zkm8V`I$01Eb(AU=!9r;(wCZ4T=@&F?0rQ55d<-Vn8ZvynOV%jb9~*y z$Je_U&+0dehQ5?-PevSyG74iN_4OAn_yDWtZPLmmC&& zX4uH4=ZV9_VyTPeE@ovzC7vRVDyl~LLe6D{^A=~dT4(Kh@)w2*+DeA&G>4JE5|T(k zgp4{WsKP>wR*e)BY1)r__#=)#MJ}0K6)&@IM1rTE|~&0<)i_H#%DM2pHG~F0MP8ya!zF07Fl@WJr$WrzsSR z!220}Qyv(+1%hjCZ|!}YJ^)$jYWW5@I0QyZl)dip?!NBc{yo#~?+5B*a@Uj$HzNQ5 z00v@9M??Vs0RI60puMM)00009a7bBm001r{001r{0eGc9b^rhX2XskIMF->s8Veu{ zCL&DN0004PNklze@sP7{@;zIXJik z;d~%SLu29IAPr6j{f#oF*N(yI$7`eDCNW{0m@Dmrc=-)tS@g#e~K8)MLD-guJ|@=+=Q gB!C2v0NV!m1^t_bXi?Lcq5uE@07*qoM6N<$g3&=y*8l(j diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/sawn.rsi/bolt-closed.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/sawn.rsi/bolt-closed.png deleted file mode 100644 index 07000a4ca4db83655174877c37957fd75547a255..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2301 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 XW~zQ@B1`y}00000NkvXXu0mjfWH2b? diff --git a/Resources/Textures/Objects/Weapons/Guns/Shotguns/sawn.rsi/bolt-open.png b/Resources/Textures/Objects/Weapons/Guns/Shotguns/sawn.rsi/bolt-open.png deleted file mode 100644 index 63a1f7e77e2c28af589b4580af1b2af098899cb1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2192 zcmV;B2ygd^P) zaB^>EX>4U6ba`-PAZ2)IW&i+q+U-|cvLvYu{bvRhs?ZnyKZ;e zGd+%QIHD`7@}UGh&JjYD;-7!)^bdSkq^6?QYOgipQ+nw zAFoI4M_6B;ivbK*=o3yHLXxjD-Q)itv+w5~Jq|Yi#S6#N+>T5W=I7&eB>gLV6kDx#* zMG1`>7A<;=ja=KZ%hp}D?Y8?KFV-Gb-&y<0+`ngy9@h9G>Ws5b)*v?fP(i1h=-~{E zaUn2nhXEusAI@^4Qur`;ILn)nY#=u|+V%_xO?vuHn@|J+^U*(N|#9TVm z{Wq9Phq`Z=`<}NSu;$|`w{j75Rv|D&g%m8mUGm_DZ~oP5`nw8#EBdYI|5(vRyR>3x zi84_VcByS+9S2r2#qPQV#b2=u%Nlc#S|5AlF+Fe85HFj{;ORAHD_l zx4R!R3Q3wZDx)A&LVvrWqg3rFIjTg%`x#cConur*|LHQDVk9Y=x;Nj`w?Ui;wyo_U%_hQLP6oMl)T@b)k1zc%_V* zh_Zw^>r6q73IJ5B`&QYJwne_C!6NE+pk7<}Tw~cl;bd}Aqp8LdbsE!oHao>`O(9Z5yO#vV9&tm+5{sG$v$aA4>nv`mA_7=(?DuaQsiO zSO+=a2sZ{cusX3d0-Fo)I~?2q7z9Z-0ce)B!&xEuzL&^2|J9BN+a$t%Y&fz6-J!^FI~LZa!E3&JZe#Az_qMj~?5^l^ zlA;U%FDxL%x>?U+K_he)98bQZfj&e8F;Xwkl^l(;oZNMR*8nqpEX>4Tx0C=2zkv&MmKpe$iQ;Sk64t9{@kfAzR5EXTlDi*;) zX)CnqU~=gfG-*guTpR`0f`cE6RR%KKJM7R|+Nr zd?N82(+!JwgLrz=(mC%Fhgn%th|h_~47wokBiCh@-#C{X7ItBhU+wkk-!p?NI`^*Ix48bLX1|86ccIM zk9+tdjz2{%nOqexax9<*6_Voz|AXJ%n#IWpHz^bc0x!1xF#`1N0jdyW z16NwdUuy!hpQJZBTJ#7Q*aj}HJDR))TSJ=(lngf`00006VoOIv0RI600RN!9 zr;`8x010qNS#tmYE+YT{E+YYWr9XB6000McNliruAIEs0<8D-ToVxy8S0sJqxuR5Em5$W5OMA;q)#>T