From b62fb4a3183375d686aeb0507e06cb4a33514cec Mon Sep 17 00:00:00 2001 From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Date: Wed, 4 Sep 2019 06:35:19 +1000 Subject: [PATCH] Add ammo boxes (#325) Same as magazines except they can't be loaded into a weapon. You can transfer ammo to and from magazines / boxes freely where the caliber matches so you don't need to necessarily match the magazine type. Used popups to reflect transfer amount. Also fixed the mag sprite showing as 0 capacity on spawn and the 10mm smg flash magazine prototype --- Content.Client/EntryPoint.cs | 1 + .../Ranged/Projectile/AmmoBoxComponent.cs | 238 ++++++++++++++++++ .../Projectile/BallisticMagazineComponent.cs | 108 +++++++- .../Entities/Weapons/Ammunition/.32/boxes.yml | 118 +++++++++ .../Weapons/Ammunition/.357/boxes.yml | 118 +++++++++ .../Entities/Weapons/Ammunition/.44/boxes.yml | 118 +++++++++ .../Weapons/Ammunition/.45mm/boxes.yml | 99 ++++++++ .../Weapons/Ammunition/.50/ammunition.yml | 20 +- .../Entities/Weapons/Ammunition/.50/boxes.yml | 99 ++++++++ .../Weapons/Ammunition/10mm/ammunition.yml | 2 +- .../Weapons/Ammunition/10mm/boxes.yml | 118 +++++++++ .../Weapons/Ammunition/24mm/boxes.yml | 34 +++ .../Weapons/Ammunition/5.56mm/boxes.yml | 55 ++++ .../Weapons/Ammunition/6.5mm/boxes.yml | 55 ++++ .../Weapons/Ammunition/7.62mm/boxes.yml | 34 +++ .../Entities/Weapons/Ammunition/9mm/boxes.yml | 118 +++++++++ .../.32/box32-flash.rsi/box32-flash-0.png | Bin 0 -> 407 bytes .../.32/box32-flash.rsi/box32-flash-1.png | Bin 0 -> 439 bytes .../Boxes/.32/box32-flash.rsi/box32-flash.png | Bin 0 -> 439 bytes .../Boxes/.32/box32-flash.rsi/meta.json | 1 + .../Boxes/.32/box32-hv.rsi/box32-hv-0.png | Bin 0 -> 445 bytes .../Boxes/.32/box32-hv.rsi/box32-hv-1.png | Bin 0 -> 460 bytes .../Boxes/.32/box32-hv.rsi/box32-hv.png | Bin 0 -> 460 bytes .../Boxes/.32/box32-hv.rsi/meta.json | 1 + .../box32-practice.rsi/box32-practice-0.png | Bin 0 -> 435 bytes .../box32-practice.rsi/box32-practice-1.png | Bin 0 -> 467 bytes .../.32/box32-practice.rsi/box32-practice.png | Bin 0 -> 467 bytes .../Boxes/.32/box32-practice.rsi/meta.json | 1 + .../.32/box32-rubber.rsi/box32-rubber-0.png | Bin 0 -> 431 bytes .../.32/box32-rubber.rsi/box32-rubber-1.png | Bin 0 -> 464 bytes .../.32/box32-rubber.rsi/box32-rubber.png | Bin 0 -> 464 bytes .../Boxes/.32/box32-rubber.rsi/meta.json | 1 + .../Boxes/.32/box32.rsi/box32-0.png | Bin 0 -> 420 bytes .../Boxes/.32/box32.rsi/box32-1.png | Bin 0 -> 453 bytes .../Ammunition/Boxes/.32/box32.rsi/box32.png | Bin 0 -> 453 bytes .../Ammunition/Boxes/.32/box32.rsi/meta.json | 1 + .../.357/box357-flash.rsi/box357-flash-0.png | Bin 0 -> 392 bytes .../.357/box357-flash.rsi/box357-flash-1.png | Bin 0 -> 471 bytes .../.357/box357-flash.rsi/box357-flash.png | Bin 0 -> 471 bytes .../Boxes/.357/box357-flash.rsi/meta.json | 1 + .../Boxes/.357/box357-hv.rsi/box357-hv-0.png | Bin 0 -> 409 bytes .../Boxes/.357/box357-hv.rsi/box357-hv-1.png | Bin 0 -> 476 bytes .../Boxes/.357/box357-hv.rsi/box357-hv.png | Bin 0 -> 476 bytes .../Boxes/.357/box357-hv.rsi/meta.json | 1 + .../box357-practice.rsi/box357-practice-0.png | Bin 0 -> 399 bytes .../box357-practice.rsi/box357-practice-1.png | Bin 0 -> 453 bytes .../box357-practice.rsi/box357-practice.png | Bin 0 -> 453 bytes .../Boxes/.357/box357-practice.rsi/meta.json | 1 + .../box357-rubber.rsi/box357-rubber-0.png | Bin 0 -> 402 bytes .../box357-rubber.rsi/box357-rubber-1.png | Bin 0 -> 478 bytes .../.357/box357-rubber.rsi/box357-rubber.png | Bin 0 -> 478 bytes .../Boxes/.357/box357-rubber.rsi/meta.json | 1 + .../Boxes/.357/box357.rsi/box357-0.png | Bin 0 -> 393 bytes .../Boxes/.357/box357.rsi/box357-1.png | Bin 0 -> 450 bytes .../Boxes/.357/box357.rsi/box357.png | Bin 0 -> 450 bytes .../Boxes/.357/box357.rsi/meta.json | 1 + .../.44/box44-flash.rsi/box44-flash-0.png | Bin 0 -> 416 bytes .../.44/box44-flash.rsi/box44-flash-1.png | Bin 0 -> 441 bytes .../Boxes/.44/box44-flash.rsi/box44-flash.png | Bin 0 -> 441 bytes .../Boxes/.44/box44-flash.rsi/meta.json | 1 + .../Boxes/.44/box44-hv.rsi/box44-hv-0.png | Bin 0 -> 423 bytes .../Boxes/.44/box44-hv.rsi/box44-hv-1.png | Bin 0 -> 442 bytes .../Boxes/.44/box44-hv.rsi/box44-hv.png | Bin 0 -> 442 bytes .../Boxes/.44/box44-hv.rsi/meta.json | 1 + .../box44-practice.rsi/box44-practice-0.png | Bin 0 -> 423 bytes .../box44-practice.rsi/box44-practice-1.png | Bin 0 -> 442 bytes .../.44/box44-practice.rsi/box44-practice.png | Bin 0 -> 442 bytes .../Boxes/.44/box44-practice.rsi/meta.json | 1 + .../.44/box44-rubber.rsi/box44-rubber-0.png | Bin 0 -> 424 bytes .../.44/box44-rubber.rsi/box44-rubber-1.png | Bin 0 -> 443 bytes .../.44/box44-rubber.rsi/box44-rubber.png | Bin 0 -> 443 bytes .../Boxes/.44/box44-rubber.rsi/meta.json | 1 + .../Boxes/.44/box44.rsi/box44-0.png | Bin 0 -> 412 bytes .../Boxes/.44/box44.rsi/box44-1.png | Bin 0 -> 436 bytes .../Ammunition/Boxes/.44/box44.rsi/box44.png | Bin 0 -> 436 bytes .../Ammunition/Boxes/.44/box44.rsi/meta.json | 1 + .../.45mm/box45-flash.rsi/box45-flash-0.png | Bin 0 -> 457 bytes .../.45mm/box45-flash.rsi/box45-flash-1.png | Bin 0 -> 494 bytes .../.45mm/box45-flash.rsi/box45-flash.png | Bin 0 -> 494 bytes .../Boxes/.45mm/box45-flash.rsi/meta.json | 1 + .../box45-practice.rsi/box45-practice-0.png | Bin 0 -> 457 bytes .../box45-practice.rsi/box45-practice-1.png | Bin 0 -> 491 bytes .../box45-practice.rsi/box45-practice.png | Bin 0 -> 491 bytes .../Boxes/.45mm/box45-practice.rsi/meta.json | 1 + .../.45mm/box45-rubber.rsi/box45-rubber-0.png | Bin 0 -> 457 bytes .../.45mm/box45-rubber.rsi/box45-rubber-1.png | Bin 0 -> 498 bytes .../.45mm/box45-rubber.rsi/box45-rubber.png | Bin 0 -> 498 bytes .../Boxes/.45mm/box45-rubber.rsi/meta.json | 1 + .../Boxes/.45mm/box45.rsi/box45-0.png | Bin 0 -> 453 bytes .../Boxes/.45mm/box45.rsi/box45-1.png | Bin 0 -> 487 bytes .../Boxes/.45mm/box45.rsi/box45.png | Bin 0 -> 487 bytes .../Boxes/.45mm/box45.rsi/meta.json | 1 + .../.50/box50-flash.rsi/box50-flash-0.png | Bin 0 -> 392 bytes .../.50/box50-flash.rsi/box50-flash-1.png | Bin 0 -> 421 bytes .../Boxes/.50/box50-flash.rsi/box50-flash.png | Bin 0 -> 421 bytes .../Boxes/.50/box50-flash.rsi/meta.json | 1 + .../Boxes/.50/box50-hv.rsi/box50-hv-0.png | Bin 0 -> 393 bytes .../Boxes/.50/box50-hv.rsi/box50-hv-1.png | Bin 0 -> 421 bytes .../Boxes/.50/box50-hv.rsi/box50-hv.png | Bin 0 -> 421 bytes .../Boxes/.50/box50-hv.rsi/meta.json | 1 + .../box50-practice.rsi/box50-practice-0.png | Bin 0 -> 392 bytes .../box50-practice.rsi/box50-practice-1.png | Bin 0 -> 421 bytes .../.50/box50-practice.rsi/box50-practice.png | Bin 0 -> 421 bytes .../Boxes/.50/box50-practice.rsi/meta.json | 1 + .../.50/box50-rubber.rsi/box50-rubber-0.png | Bin 0 -> 392 bytes .../.50/box50-rubber.rsi/box50-rubber-1.png | Bin 0 -> 422 bytes .../.50/box50-rubber.rsi/box50-rubber.png | Bin 0 -> 422 bytes .../Boxes/.50/box50-rubber.rsi/meta.json | 1 + .../Boxes/.50/box50.rsi/box50-0.png | Bin 0 -> 393 bytes .../Boxes/.50/box50.rsi/box50-1.png | Bin 0 -> 421 bytes .../Ammunition/Boxes/.50/box50.rsi/box50.png | Bin 0 -> 421 bytes .../Ammunition/Boxes/.50/box50.rsi/meta.json | 1 + .../box10mm-flash.rsi/box10mm-flash-0.png | Bin 0 -> 400 bytes .../box10mm-flash.rsi/box10mm-flash-1.png | Bin 0 -> 450 bytes .../10mm/box10mm-flash.rsi/box10mm-flash.png | Bin 0 -> 450 bytes .../Boxes/10mm/box10mm-flash.rsi/meta.json | 1 + .../10mm/box10mm-hv.rsi/box10mm-hv-0.png | Bin 0 -> 419 bytes .../10mm/box10mm-hv.rsi/box10mm-hv-1.png | Bin 0 -> 451 bytes .../Boxes/10mm/box10mm-hv.rsi/box10mm-hv.png | Bin 0 -> 451 bytes .../Boxes/10mm/box10mm-hv.rsi/meta.json | 1 + .../box10mm-practice-0.png | Bin 0 -> 408 bytes .../box10mm-practice-1.png | Bin 0 -> 440 bytes .../box10mm-practice.rsi/box10mm-practice.png | Bin 0 -> 440 bytes .../Boxes/10mm/box10mm-practice.rsi/meta.json | 1 + .../box10mm-rubber.rsi/box10mm-rubber-0.png | Bin 0 -> 417 bytes .../box10mm-rubber.rsi/box10mm-rubber-1.png | Bin 0 -> 452 bytes .../box10mm-rubber.rsi/box10mm-rubber.png | Bin 0 -> 452 bytes .../Boxes/10mm/box10mm-rubber.rsi/meta.json | 1 + .../Boxes/10mm/box10mm.rsi/box10mm-0.png | Bin 0 -> 402 bytes .../Boxes/10mm/box10mm.rsi/box10mm-1.png | Bin 0 -> 435 bytes .../Boxes/10mm/box10mm.rsi/box10mm.png | Bin 0 -> 435 bytes .../Boxes/10mm/box10mm.rsi/meta.json | 1 + .../Boxes/24mm/box10x24.rsi/box10x24-0.png | Bin 0 -> 355 bytes .../Boxes/24mm/box10x24.rsi/box10x24-1.png | Bin 0 -> 395 bytes .../Boxes/24mm/box10x24.rsi/box10x24.png | Bin 0 -> 395 bytes .../Boxes/24mm/box10x24.rsi/meta.json | 1 + .../box556mm-practice-0.png | Bin 0 -> 307 bytes .../box556mm-practice-1.png | Bin 0 -> 341 bytes .../box556mm-practice.png | Bin 0 -> 341 bytes .../5.56mm/box556mm-practice.rsi/meta.json | 1 + .../Boxes/5.56mm/box556mm.rsi/box556mm-0.png | Bin 0 -> 304 bytes .../Boxes/5.56mm/box556mm.rsi/box556mm-1.png | Bin 0 -> 337 bytes .../Boxes/5.56mm/box556mm.rsi/box556mm.png | Bin 0 -> 337 bytes .../Boxes/5.56mm/box556mm.rsi/meta.json | 1 + .../box65mm-rubber.rsi/box65mm-rubber-0.png | Bin 0 -> 294 bytes .../box65mm-rubber.rsi/box65mm-rubber-1.png | Bin 0 -> 331 bytes .../box65mm-rubber.rsi/box65mm-rubber.png | Bin 0 -> 331 bytes .../Boxes/6.5mm/box65mm-rubber.rsi/meta.json | 1 + .../Boxes/6.5mm/box65mm.rsi/box65mm-0.png | Bin 0 -> 292 bytes .../Boxes/6.5mm/box65mm.rsi/box65mm-1.png | Bin 0 -> 328 bytes .../Boxes/6.5mm/box65mm.rsi/box65mm.png | Bin 0 -> 328 bytes .../Boxes/6.5mm/box65mm.rsi/meta.json | 1 + .../Boxes/7.62mm/box762mm.rsi/box762mm-0.png | Bin 0 -> 303 bytes .../Boxes/7.62mm/box762mm.rsi/box762mm-1.png | Bin 0 -> 340 bytes .../Boxes/7.62mm/box762mm.rsi/box762mm.png | Bin 0 -> 340 bytes .../Boxes/7.62mm/box762mm.rsi/meta.json | 1 + .../9mm/box9mm-flash.rsi/box9mm-flash-0.png | Bin 0 -> 458 bytes .../9mm/box9mm-flash.rsi/box9mm-flash-1.png | Bin 0 -> 466 bytes .../9mm/box9mm-flash.rsi/box9mm-flash.png | Bin 0 -> 466 bytes .../Boxes/9mm/box9mm-flash.rsi/meta.json | 1 + .../Boxes/9mm/box9mm-hv.rsi/box9mm-hv-0.png | Bin 0 -> 459 bytes .../Boxes/9mm/box9mm-hv.rsi/box9mm-hv-1.png | Bin 0 -> 467 bytes .../Boxes/9mm/box9mm-hv.rsi/box9mm-hv.png | Bin 0 -> 467 bytes .../Boxes/9mm/box9mm-hv.rsi/meta.json | 1 + .../box9mm-practice.rsi/box9mm-practice-0.png | Bin 0 -> 463 bytes .../box9mm-practice.rsi/box9mm-practice-1.png | Bin 0 -> 471 bytes .../box9mm-practice.rsi/box9mm-practice.png | Bin 0 -> 471 bytes .../Boxes/9mm/box9mm-practice.rsi/meta.json | 1 + .../9mm/box9mm-rubber.rsi/box9mm-rubber-0.png | Bin 0 -> 460 bytes .../9mm/box9mm-rubber.rsi/box9mm-rubber-1.png | Bin 0 -> 466 bytes .../9mm/box9mm-rubber.rsi/box9mm-rubber.png | Bin 0 -> 466 bytes .../Boxes/9mm/box9mm-rubber.rsi/meta.json | 1 + .../Boxes/9mm/box9mm.rsi/box9mm-0.png | Bin 0 -> 452 bytes .../Boxes/9mm/box9mm.rsi/box9mm-1.png | Bin 0 -> 459 bytes .../Boxes/9mm/box9mm.rsi/box9mm.png | Bin 0 -> 459 bytes .../Ammunition/Boxes/9mm/box9mm.rsi/meta.json | 1 + 176 files changed, 1360 insertions(+), 15 deletions(-) create mode 100644 Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/AmmoBoxComponent.cs create mode 100644 Resources/Prototypes/Entities/Weapons/Ammunition/.32/boxes.yml create mode 100644 Resources/Prototypes/Entities/Weapons/Ammunition/.357/boxes.yml create mode 100644 Resources/Prototypes/Entities/Weapons/Ammunition/.44/boxes.yml create mode 100644 Resources/Prototypes/Entities/Weapons/Ammunition/.45mm/boxes.yml create mode 100644 Resources/Prototypes/Entities/Weapons/Ammunition/.50/boxes.yml create mode 100644 Resources/Prototypes/Entities/Weapons/Ammunition/10mm/boxes.yml create mode 100644 Resources/Prototypes/Entities/Weapons/Ammunition/24mm/boxes.yml create mode 100644 Resources/Prototypes/Entities/Weapons/Ammunition/5.56mm/boxes.yml create mode 100644 Resources/Prototypes/Entities/Weapons/Ammunition/6.5mm/boxes.yml create mode 100644 Resources/Prototypes/Entities/Weapons/Ammunition/7.62mm/boxes.yml create mode 100644 Resources/Prototypes/Entities/Weapons/Ammunition/9mm/boxes.yml create mode 100644 Resources/Textures/Objects/Guns/Ammunition/Boxes/.32/box32-flash.rsi/box32-flash-0.png create mode 100644 Resources/Textures/Objects/Guns/Ammunition/Boxes/.32/box32-flash.rsi/box32-flash-1.png create mode 100644 Resources/Textures/Objects/Guns/Ammunition/Boxes/.32/box32-flash.rsi/box32-flash.png create mode 100644 Resources/Textures/Objects/Guns/Ammunition/Boxes/.32/box32-flash.rsi/meta.json create mode 100644 Resources/Textures/Objects/Guns/Ammunition/Boxes/.32/box32-hv.rsi/box32-hv-0.png create mode 100644 Resources/Textures/Objects/Guns/Ammunition/Boxes/.32/box32-hv.rsi/box32-hv-1.png create mode 100644 Resources/Textures/Objects/Guns/Ammunition/Boxes/.32/box32-hv.rsi/box32-hv.png create mode 100644 Resources/Textures/Objects/Guns/Ammunition/Boxes/.32/box32-hv.rsi/meta.json create mode 100644 Resources/Textures/Objects/Guns/Ammunition/Boxes/.32/box32-practice.rsi/box32-practice-0.png create mode 100644 Resources/Textures/Objects/Guns/Ammunition/Boxes/.32/box32-practice.rsi/box32-practice-1.png create mode 100644 Resources/Textures/Objects/Guns/Ammunition/Boxes/.32/box32-practice.rsi/box32-practice.png create mode 100644 Resources/Textures/Objects/Guns/Ammunition/Boxes/.32/box32-practice.rsi/meta.json create mode 100644 Resources/Textures/Objects/Guns/Ammunition/Boxes/.32/box32-rubber.rsi/box32-rubber-0.png create mode 100644 Resources/Textures/Objects/Guns/Ammunition/Boxes/.32/box32-rubber.rsi/box32-rubber-1.png create mode 100644 Resources/Textures/Objects/Guns/Ammunition/Boxes/.32/box32-rubber.rsi/box32-rubber.png create mode 100644 Resources/Textures/Objects/Guns/Ammunition/Boxes/.32/box32-rubber.rsi/meta.json create mode 100644 Resources/Textures/Objects/Guns/Ammunition/Boxes/.32/box32.rsi/box32-0.png create mode 100644 Resources/Textures/Objects/Guns/Ammunition/Boxes/.32/box32.rsi/box32-1.png create mode 100644 Resources/Textures/Objects/Guns/Ammunition/Boxes/.32/box32.rsi/box32.png create mode 100644 Resources/Textures/Objects/Guns/Ammunition/Boxes/.32/box32.rsi/meta.json create mode 100644 Resources/Textures/Objects/Guns/Ammunition/Boxes/.357/box357-flash.rsi/box357-flash-0.png create mode 100644 Resources/Textures/Objects/Guns/Ammunition/Boxes/.357/box357-flash.rsi/box357-flash-1.png create mode 100644 Resources/Textures/Objects/Guns/Ammunition/Boxes/.357/box357-flash.rsi/box357-flash.png create mode 100644 Resources/Textures/Objects/Guns/Ammunition/Boxes/.357/box357-flash.rsi/meta.json create mode 100644 Resources/Textures/Objects/Guns/Ammunition/Boxes/.357/box357-hv.rsi/box357-hv-0.png create mode 100644 Resources/Textures/Objects/Guns/Ammunition/Boxes/.357/box357-hv.rsi/box357-hv-1.png create mode 100644 Resources/Textures/Objects/Guns/Ammunition/Boxes/.357/box357-hv.rsi/box357-hv.png create mode 100644 Resources/Textures/Objects/Guns/Ammunition/Boxes/.357/box357-hv.rsi/meta.json create mode 100644 Resources/Textures/Objects/Guns/Ammunition/Boxes/.357/box357-practice.rsi/box357-practice-0.png create mode 100644 Resources/Textures/Objects/Guns/Ammunition/Boxes/.357/box357-practice.rsi/box357-practice-1.png create mode 100644 Resources/Textures/Objects/Guns/Ammunition/Boxes/.357/box357-practice.rsi/box357-practice.png create mode 100644 Resources/Textures/Objects/Guns/Ammunition/Boxes/.357/box357-practice.rsi/meta.json create mode 100644 Resources/Textures/Objects/Guns/Ammunition/Boxes/.357/box357-rubber.rsi/box357-rubber-0.png create mode 100644 Resources/Textures/Objects/Guns/Ammunition/Boxes/.357/box357-rubber.rsi/box357-rubber-1.png create mode 100644 Resources/Textures/Objects/Guns/Ammunition/Boxes/.357/box357-rubber.rsi/box357-rubber.png create mode 100644 Resources/Textures/Objects/Guns/Ammunition/Boxes/.357/box357-rubber.rsi/meta.json create mode 100644 Resources/Textures/Objects/Guns/Ammunition/Boxes/.357/box357.rsi/box357-0.png create mode 100644 Resources/Textures/Objects/Guns/Ammunition/Boxes/.357/box357.rsi/box357-1.png create mode 100644 Resources/Textures/Objects/Guns/Ammunition/Boxes/.357/box357.rsi/box357.png create mode 100644 Resources/Textures/Objects/Guns/Ammunition/Boxes/.357/box357.rsi/meta.json create mode 100644 Resources/Textures/Objects/Guns/Ammunition/Boxes/.44/box44-flash.rsi/box44-flash-0.png create mode 100644 Resources/Textures/Objects/Guns/Ammunition/Boxes/.44/box44-flash.rsi/box44-flash-1.png create mode 100644 Resources/Textures/Objects/Guns/Ammunition/Boxes/.44/box44-flash.rsi/box44-flash.png create mode 100644 Resources/Textures/Objects/Guns/Ammunition/Boxes/.44/box44-flash.rsi/meta.json create mode 100644 Resources/Textures/Objects/Guns/Ammunition/Boxes/.44/box44-hv.rsi/box44-hv-0.png create mode 100644 Resources/Textures/Objects/Guns/Ammunition/Boxes/.44/box44-hv.rsi/box44-hv-1.png create mode 100644 Resources/Textures/Objects/Guns/Ammunition/Boxes/.44/box44-hv.rsi/box44-hv.png create mode 100644 Resources/Textures/Objects/Guns/Ammunition/Boxes/.44/box44-hv.rsi/meta.json create mode 100644 Resources/Textures/Objects/Guns/Ammunition/Boxes/.44/box44-practice.rsi/box44-practice-0.png create mode 100644 Resources/Textures/Objects/Guns/Ammunition/Boxes/.44/box44-practice.rsi/box44-practice-1.png create mode 100644 Resources/Textures/Objects/Guns/Ammunition/Boxes/.44/box44-practice.rsi/box44-practice.png create mode 100644 Resources/Textures/Objects/Guns/Ammunition/Boxes/.44/box44-practice.rsi/meta.json create mode 100644 Resources/Textures/Objects/Guns/Ammunition/Boxes/.44/box44-rubber.rsi/box44-rubber-0.png create mode 100644 Resources/Textures/Objects/Guns/Ammunition/Boxes/.44/box44-rubber.rsi/box44-rubber-1.png create mode 100644 Resources/Textures/Objects/Guns/Ammunition/Boxes/.44/box44-rubber.rsi/box44-rubber.png create mode 100644 Resources/Textures/Objects/Guns/Ammunition/Boxes/.44/box44-rubber.rsi/meta.json create mode 100644 Resources/Textures/Objects/Guns/Ammunition/Boxes/.44/box44.rsi/box44-0.png create mode 100644 Resources/Textures/Objects/Guns/Ammunition/Boxes/.44/box44.rsi/box44-1.png create mode 100644 Resources/Textures/Objects/Guns/Ammunition/Boxes/.44/box44.rsi/box44.png create mode 100644 Resources/Textures/Objects/Guns/Ammunition/Boxes/.44/box44.rsi/meta.json create mode 100644 Resources/Textures/Objects/Guns/Ammunition/Boxes/.45mm/box45-flash.rsi/box45-flash-0.png create mode 100644 Resources/Textures/Objects/Guns/Ammunition/Boxes/.45mm/box45-flash.rsi/box45-flash-1.png create mode 100644 Resources/Textures/Objects/Guns/Ammunition/Boxes/.45mm/box45-flash.rsi/box45-flash.png create mode 100644 Resources/Textures/Objects/Guns/Ammunition/Boxes/.45mm/box45-flash.rsi/meta.json create mode 100644 Resources/Textures/Objects/Guns/Ammunition/Boxes/.45mm/box45-practice.rsi/box45-practice-0.png create mode 100644 Resources/Textures/Objects/Guns/Ammunition/Boxes/.45mm/box45-practice.rsi/box45-practice-1.png create mode 100644 Resources/Textures/Objects/Guns/Ammunition/Boxes/.45mm/box45-practice.rsi/box45-practice.png create mode 100644 Resources/Textures/Objects/Guns/Ammunition/Boxes/.45mm/box45-practice.rsi/meta.json create mode 100644 Resources/Textures/Objects/Guns/Ammunition/Boxes/.45mm/box45-rubber.rsi/box45-rubber-0.png create mode 100644 Resources/Textures/Objects/Guns/Ammunition/Boxes/.45mm/box45-rubber.rsi/box45-rubber-1.png create mode 100644 Resources/Textures/Objects/Guns/Ammunition/Boxes/.45mm/box45-rubber.rsi/box45-rubber.png create mode 100644 Resources/Textures/Objects/Guns/Ammunition/Boxes/.45mm/box45-rubber.rsi/meta.json create mode 100644 Resources/Textures/Objects/Guns/Ammunition/Boxes/.45mm/box45.rsi/box45-0.png create mode 100644 Resources/Textures/Objects/Guns/Ammunition/Boxes/.45mm/box45.rsi/box45-1.png create mode 100644 Resources/Textures/Objects/Guns/Ammunition/Boxes/.45mm/box45.rsi/box45.png create mode 100644 Resources/Textures/Objects/Guns/Ammunition/Boxes/.45mm/box45.rsi/meta.json create mode 100644 Resources/Textures/Objects/Guns/Ammunition/Boxes/.50/box50-flash.rsi/box50-flash-0.png create mode 100644 Resources/Textures/Objects/Guns/Ammunition/Boxes/.50/box50-flash.rsi/box50-flash-1.png create mode 100644 Resources/Textures/Objects/Guns/Ammunition/Boxes/.50/box50-flash.rsi/box50-flash.png create mode 100644 Resources/Textures/Objects/Guns/Ammunition/Boxes/.50/box50-flash.rsi/meta.json create mode 100644 Resources/Textures/Objects/Guns/Ammunition/Boxes/.50/box50-hv.rsi/box50-hv-0.png create mode 100644 Resources/Textures/Objects/Guns/Ammunition/Boxes/.50/box50-hv.rsi/box50-hv-1.png create mode 100644 Resources/Textures/Objects/Guns/Ammunition/Boxes/.50/box50-hv.rsi/box50-hv.png create mode 100644 Resources/Textures/Objects/Guns/Ammunition/Boxes/.50/box50-hv.rsi/meta.json create mode 100644 Resources/Textures/Objects/Guns/Ammunition/Boxes/.50/box50-practice.rsi/box50-practice-0.png create mode 100644 Resources/Textures/Objects/Guns/Ammunition/Boxes/.50/box50-practice.rsi/box50-practice-1.png create mode 100644 Resources/Textures/Objects/Guns/Ammunition/Boxes/.50/box50-practice.rsi/box50-practice.png create mode 100644 Resources/Textures/Objects/Guns/Ammunition/Boxes/.50/box50-practice.rsi/meta.json create mode 100644 Resources/Textures/Objects/Guns/Ammunition/Boxes/.50/box50-rubber.rsi/box50-rubber-0.png create mode 100644 Resources/Textures/Objects/Guns/Ammunition/Boxes/.50/box50-rubber.rsi/box50-rubber-1.png create mode 100644 Resources/Textures/Objects/Guns/Ammunition/Boxes/.50/box50-rubber.rsi/box50-rubber.png create mode 100644 Resources/Textures/Objects/Guns/Ammunition/Boxes/.50/box50-rubber.rsi/meta.json create mode 100644 Resources/Textures/Objects/Guns/Ammunition/Boxes/.50/box50.rsi/box50-0.png create mode 100644 Resources/Textures/Objects/Guns/Ammunition/Boxes/.50/box50.rsi/box50-1.png create mode 100644 Resources/Textures/Objects/Guns/Ammunition/Boxes/.50/box50.rsi/box50.png create mode 100644 Resources/Textures/Objects/Guns/Ammunition/Boxes/.50/box50.rsi/meta.json create mode 100644 Resources/Textures/Objects/Guns/Ammunition/Boxes/10mm/box10mm-flash.rsi/box10mm-flash-0.png create mode 100644 Resources/Textures/Objects/Guns/Ammunition/Boxes/10mm/box10mm-flash.rsi/box10mm-flash-1.png create mode 100644 Resources/Textures/Objects/Guns/Ammunition/Boxes/10mm/box10mm-flash.rsi/box10mm-flash.png create mode 100644 Resources/Textures/Objects/Guns/Ammunition/Boxes/10mm/box10mm-flash.rsi/meta.json create mode 100644 Resources/Textures/Objects/Guns/Ammunition/Boxes/10mm/box10mm-hv.rsi/box10mm-hv-0.png create mode 100644 Resources/Textures/Objects/Guns/Ammunition/Boxes/10mm/box10mm-hv.rsi/box10mm-hv-1.png create mode 100644 Resources/Textures/Objects/Guns/Ammunition/Boxes/10mm/box10mm-hv.rsi/box10mm-hv.png create mode 100644 Resources/Textures/Objects/Guns/Ammunition/Boxes/10mm/box10mm-hv.rsi/meta.json create mode 100644 Resources/Textures/Objects/Guns/Ammunition/Boxes/10mm/box10mm-practice.rsi/box10mm-practice-0.png create mode 100644 Resources/Textures/Objects/Guns/Ammunition/Boxes/10mm/box10mm-practice.rsi/box10mm-practice-1.png create mode 100644 Resources/Textures/Objects/Guns/Ammunition/Boxes/10mm/box10mm-practice.rsi/box10mm-practice.png create mode 100644 Resources/Textures/Objects/Guns/Ammunition/Boxes/10mm/box10mm-practice.rsi/meta.json create mode 100644 Resources/Textures/Objects/Guns/Ammunition/Boxes/10mm/box10mm-rubber.rsi/box10mm-rubber-0.png create mode 100644 Resources/Textures/Objects/Guns/Ammunition/Boxes/10mm/box10mm-rubber.rsi/box10mm-rubber-1.png create mode 100644 Resources/Textures/Objects/Guns/Ammunition/Boxes/10mm/box10mm-rubber.rsi/box10mm-rubber.png create mode 100644 Resources/Textures/Objects/Guns/Ammunition/Boxes/10mm/box10mm-rubber.rsi/meta.json create mode 100644 Resources/Textures/Objects/Guns/Ammunition/Boxes/10mm/box10mm.rsi/box10mm-0.png create mode 100644 Resources/Textures/Objects/Guns/Ammunition/Boxes/10mm/box10mm.rsi/box10mm-1.png create mode 100644 Resources/Textures/Objects/Guns/Ammunition/Boxes/10mm/box10mm.rsi/box10mm.png create mode 100644 Resources/Textures/Objects/Guns/Ammunition/Boxes/10mm/box10mm.rsi/meta.json create mode 100644 Resources/Textures/Objects/Guns/Ammunition/Boxes/24mm/box10x24.rsi/box10x24-0.png create mode 100644 Resources/Textures/Objects/Guns/Ammunition/Boxes/24mm/box10x24.rsi/box10x24-1.png create mode 100644 Resources/Textures/Objects/Guns/Ammunition/Boxes/24mm/box10x24.rsi/box10x24.png create mode 100644 Resources/Textures/Objects/Guns/Ammunition/Boxes/24mm/box10x24.rsi/meta.json create mode 100644 Resources/Textures/Objects/Guns/Ammunition/Boxes/5.56mm/box556mm-practice.rsi/box556mm-practice-0.png create mode 100644 Resources/Textures/Objects/Guns/Ammunition/Boxes/5.56mm/box556mm-practice.rsi/box556mm-practice-1.png create mode 100644 Resources/Textures/Objects/Guns/Ammunition/Boxes/5.56mm/box556mm-practice.rsi/box556mm-practice.png create mode 100644 Resources/Textures/Objects/Guns/Ammunition/Boxes/5.56mm/box556mm-practice.rsi/meta.json create mode 100644 Resources/Textures/Objects/Guns/Ammunition/Boxes/5.56mm/box556mm.rsi/box556mm-0.png create mode 100644 Resources/Textures/Objects/Guns/Ammunition/Boxes/5.56mm/box556mm.rsi/box556mm-1.png create mode 100644 Resources/Textures/Objects/Guns/Ammunition/Boxes/5.56mm/box556mm.rsi/box556mm.png create mode 100644 Resources/Textures/Objects/Guns/Ammunition/Boxes/5.56mm/box556mm.rsi/meta.json create mode 100644 Resources/Textures/Objects/Guns/Ammunition/Boxes/6.5mm/box65mm-rubber.rsi/box65mm-rubber-0.png create mode 100644 Resources/Textures/Objects/Guns/Ammunition/Boxes/6.5mm/box65mm-rubber.rsi/box65mm-rubber-1.png create mode 100644 Resources/Textures/Objects/Guns/Ammunition/Boxes/6.5mm/box65mm-rubber.rsi/box65mm-rubber.png create mode 100644 Resources/Textures/Objects/Guns/Ammunition/Boxes/6.5mm/box65mm-rubber.rsi/meta.json create mode 100644 Resources/Textures/Objects/Guns/Ammunition/Boxes/6.5mm/box65mm.rsi/box65mm-0.png create mode 100644 Resources/Textures/Objects/Guns/Ammunition/Boxes/6.5mm/box65mm.rsi/box65mm-1.png create mode 100644 Resources/Textures/Objects/Guns/Ammunition/Boxes/6.5mm/box65mm.rsi/box65mm.png create mode 100644 Resources/Textures/Objects/Guns/Ammunition/Boxes/6.5mm/box65mm.rsi/meta.json create mode 100644 Resources/Textures/Objects/Guns/Ammunition/Boxes/7.62mm/box762mm.rsi/box762mm-0.png create mode 100644 Resources/Textures/Objects/Guns/Ammunition/Boxes/7.62mm/box762mm.rsi/box762mm-1.png create mode 100644 Resources/Textures/Objects/Guns/Ammunition/Boxes/7.62mm/box762mm.rsi/box762mm.png create mode 100644 Resources/Textures/Objects/Guns/Ammunition/Boxes/7.62mm/box762mm.rsi/meta.json create mode 100644 Resources/Textures/Objects/Guns/Ammunition/Boxes/9mm/box9mm-flash.rsi/box9mm-flash-0.png create mode 100644 Resources/Textures/Objects/Guns/Ammunition/Boxes/9mm/box9mm-flash.rsi/box9mm-flash-1.png create mode 100644 Resources/Textures/Objects/Guns/Ammunition/Boxes/9mm/box9mm-flash.rsi/box9mm-flash.png create mode 100644 Resources/Textures/Objects/Guns/Ammunition/Boxes/9mm/box9mm-flash.rsi/meta.json create mode 100644 Resources/Textures/Objects/Guns/Ammunition/Boxes/9mm/box9mm-hv.rsi/box9mm-hv-0.png create mode 100644 Resources/Textures/Objects/Guns/Ammunition/Boxes/9mm/box9mm-hv.rsi/box9mm-hv-1.png create mode 100644 Resources/Textures/Objects/Guns/Ammunition/Boxes/9mm/box9mm-hv.rsi/box9mm-hv.png create mode 100644 Resources/Textures/Objects/Guns/Ammunition/Boxes/9mm/box9mm-hv.rsi/meta.json create mode 100644 Resources/Textures/Objects/Guns/Ammunition/Boxes/9mm/box9mm-practice.rsi/box9mm-practice-0.png create mode 100644 Resources/Textures/Objects/Guns/Ammunition/Boxes/9mm/box9mm-practice.rsi/box9mm-practice-1.png create mode 100644 Resources/Textures/Objects/Guns/Ammunition/Boxes/9mm/box9mm-practice.rsi/box9mm-practice.png create mode 100644 Resources/Textures/Objects/Guns/Ammunition/Boxes/9mm/box9mm-practice.rsi/meta.json create mode 100644 Resources/Textures/Objects/Guns/Ammunition/Boxes/9mm/box9mm-rubber.rsi/box9mm-rubber-0.png create mode 100644 Resources/Textures/Objects/Guns/Ammunition/Boxes/9mm/box9mm-rubber.rsi/box9mm-rubber-1.png create mode 100644 Resources/Textures/Objects/Guns/Ammunition/Boxes/9mm/box9mm-rubber.rsi/box9mm-rubber.png create mode 100644 Resources/Textures/Objects/Guns/Ammunition/Boxes/9mm/box9mm-rubber.rsi/meta.json create mode 100644 Resources/Textures/Objects/Guns/Ammunition/Boxes/9mm/box9mm.rsi/box9mm-0.png create mode 100644 Resources/Textures/Objects/Guns/Ammunition/Boxes/9mm/box9mm.rsi/box9mm-1.png create mode 100644 Resources/Textures/Objects/Guns/Ammunition/Boxes/9mm/box9mm.rsi/box9mm.png create mode 100644 Resources/Textures/Objects/Guns/Ammunition/Boxes/9mm/box9mm.rsi/meta.json diff --git a/Content.Client/EntryPoint.cs b/Content.Client/EntryPoint.cs index 2c7040f6f2..be324065ca 100644 --- a/Content.Client/EntryPoint.cs +++ b/Content.Client/EntryPoint.cs @@ -43,6 +43,7 @@ namespace Content.Client var registerIgnore = new[] { + "AmmoBox", "Breakable", "Pickaxe", "Interactable", diff --git a/Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/AmmoBoxComponent.cs b/Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/AmmoBoxComponent.cs new file mode 100644 index 0000000000..a44420adf9 --- /dev/null +++ b/Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/AmmoBoxComponent.cs @@ -0,0 +1,238 @@ +using System; +using Content.Server.GameObjects.EntitySystems; +using Robust.Shared.GameObjects; +using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.ViewVariables; +using System.Collections.Generic; +using Content.Shared.GameObjects.Components.Weapons.Ranged; +using Content.Shared.Interfaces; +using Robust.Server.GameObjects; +using Robust.Server.GameObjects.Components.Container; +using Robust.Server.Interfaces.GameObjects; +using Robust.Shared.Serialization; + +namespace Content.Server.GameObjects.Components.Weapon.Ranged.Projectile +{ + [RegisterComponent] + public class AmmoBoxComponent : Component, IAttackBy, IMapInit + // TODO: Potential improvements: + // Add verbs for stack splitting + // Behaviour is largely the same as BallisticMagazine except you can't insert it into a gun. + { + public override string Name => "AmmoBox"; + private BallisticCaliber _caliber; + private int _capacity; + [ViewVariables] private int _availableSpawnCount; + + [ViewVariables] private readonly Stack _loadedBullets = new Stack(); + + [ViewVariables] + public string FillType => _fillType; + private string _fillType; + + [ViewVariables] private Container _bulletContainer; + [ViewVariables] private AppearanceComponent _appearance; + + [ViewVariables] public int Capacity => _capacity; + [ViewVariables] public BallisticCaliber Caliber => _caliber; + [ViewVariables] public int CountLeft => _loadedBullets.Count + _availableSpawnCount; + + + public override void ExposeData(ObjectSerializer serializer) + { + base.ExposeData(serializer); + + serializer.DataField(ref _caliber, "caliber", BallisticCaliber.Unspecified); + serializer.DataField(ref _fillType, "fill", null); + serializer.DataField(ref _capacity, "capacity", 30); + serializer.DataField(ref _availableSpawnCount, "availableSpawnCount", Capacity); + } + + private void _updateAppearance() + { + _appearance.SetData(BallisticMagazineVisuals.AmmoLeft, CountLeft); + } + + public void MapInit() + { + _availableSpawnCount = Capacity; + } + + public override void Initialize() + { + base.Initialize(); + + _appearance = Owner.GetComponent(); + } + + public override void Startup() + { + base.Startup(); + + _bulletContainer = + ContainerManagerComponent.Ensure("box_bullet_container", Owner, out var existed); + + if (existed) + { + foreach (var entity in _bulletContainer.ContainedEntities) + { + _loadedBullets.Push(entity); + } + } + + _updateAppearance(); + _appearance.SetData(BallisticMagazineVisuals.AmmoCapacity, Capacity); + } + + AmmoBoxTransferPopupMessage CanTransferFrom(IEntity source) + { + // Currently the below duplicates mags but at some stage these will likely differ + if (source.TryGetComponent(out BallisticMagazineComponent magazineComponent)) + { + if (magazineComponent.Caliber != Caliber) + { + return new AmmoBoxTransferPopupMessage(result: false, message: "Wrong caliber"); + } + + if (CountLeft == Capacity) + { + return new AmmoBoxTransferPopupMessage(result: false, message: "Already full"); + } + + if (magazineComponent.CountLoaded == 0) + { + return new AmmoBoxTransferPopupMessage(result: false, message: "No ammo to transfer"); + } + + return new AmmoBoxTransferPopupMessage(result: true, message: ""); + } + + if (source.TryGetComponent(out AmmoBoxComponent boxComponent)) + { + if (boxComponent.Caliber != Caliber) + { + return new AmmoBoxTransferPopupMessage(result: false, message: "Wrong caliber"); + } + + if (CountLeft == Capacity) + { + return new AmmoBoxTransferPopupMessage(result: false, message: "Already full"); + } + + if (boxComponent.CountLeft == 0) + { + return new AmmoBoxTransferPopupMessage(result: false, message: "No ammo to transfer"); + } + + return new AmmoBoxTransferPopupMessage(result: true, message: ""); + } + + return new AmmoBoxTransferPopupMessage(result: false, message: ""); + } + + // TODO: Potentially abstract out to reduce duplicate structs + private struct AmmoBoxTransferPopupMessage + { + public readonly bool Result; + public readonly string Message; + + public AmmoBoxTransferPopupMessage(bool result, string message) + { + Result = result; + Message = message; + } + } + + bool IAttackBy.AttackBy(AttackByEventArgs eventArgs) + { + var ammoBoxTransfer = CanTransferFrom(eventArgs.AttackWith); + if (ammoBoxTransfer.Result) { + IEntity bullet; + if (eventArgs.AttackWith.TryGetComponent(out BallisticMagazineComponent magazineComponent)) + { + int fillCount = Math.Min(magazineComponent.CountLoaded, Capacity - CountLeft); + for (int i = 0; i < fillCount; i++) + { + bullet = magazineComponent.TakeBullet(); + AddBullet(bullet); + } + eventArgs.User.PopupMessage(eventArgs.User, $"Transferred {fillCount} rounds"); + return true; + } + if (eventArgs.AttackWith.TryGetComponent(out AmmoBoxComponent boxComponent)) + { + int fillCount = Math.Min(boxComponent.CountLeft, Capacity - CountLeft); + for (int i = 0; i < fillCount; i++) + { + bullet = boxComponent.TakeBullet(); + AddBullet(bullet); + } + eventArgs.User.PopupMessage(eventArgs.User, $"Transferred {fillCount} rounds"); + return true; + } + } + else + { + eventArgs.User.PopupMessage(eventArgs.User, ammoBoxTransfer.Message); + } + + return false; + } + + public void AddBullet(IEntity bullet) + { + if (Owner.TryGetComponent(out BallisticMagazineComponent magazineComponent)) + { + magazineComponent.AddBullet(bullet); + return; + } + if (!bullet.TryGetComponent(out BallisticBulletComponent component)) + { + throw new ArgumentException("entity isn't a bullet.", nameof(bullet)); + } + + if (component.Caliber != Caliber) + { + throw new ArgumentException("entity is of the wrong caliber.", nameof(bullet)); + } + + if (CountLeft >= Capacity) + { + throw new InvalidOperationException("Box is full."); + } + + _bulletContainer.Insert(bullet); + _loadedBullets.Push(bullet); + _updateAppearance(); + } + + public IEntity TakeBullet() + { + IEntity bullet; + if (Owner.TryGetComponent(out BallisticMagazineComponent magazineComponent)) + { + bullet = magazineComponent.TakeBullet(); + return bullet; + } + if (_loadedBullets.Count == 0) + { + if (_availableSpawnCount == 0) + { + return null; + } + + _availableSpawnCount -= 1; + bullet = Owner.EntityManager.SpawnEntity(FillType); + } + else + { + bullet = _loadedBullets.Pop(); + _bulletContainer.Remove(bullet); + } + + _updateAppearance(); + return bullet; + } + + } +} diff --git a/Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/BallisticMagazineComponent.cs b/Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/BallisticMagazineComponent.cs index bfb79bbfd2..a8ddb953c8 100644 --- a/Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/BallisticMagazineComponent.cs +++ b/Content.Server/GameObjects/Components/Weapon/Ranged/Projectile/BallisticMagazineComponent.cs @@ -1,6 +1,8 @@ using System; using System.Collections.Generic; +using Content.Server.GameObjects.EntitySystems; using Content.Shared.GameObjects.Components.Weapons.Ranged; +using Content.Shared.Interfaces; using Robust.Server.GameObjects; using Robust.Server.GameObjects.Components.Container; using Robust.Server.Interfaces.GameObjects; @@ -12,13 +14,13 @@ using Robust.Shared.ViewVariables; namespace Content.Server.GameObjects.Components.Weapon.Ranged.Projectile { [RegisterComponent] - public class BallisticMagazineComponent : Component, IMapInit + public class BallisticMagazineComponent : Component, IMapInit, IAttackBy { public override string Name => "BallisticMagazine"; // Stack of loaded bullets. [ViewVariables] private readonly Stack _loadedBullets = new Stack(); - [ViewVariables] private string _fillType; + private string _fillType; [ViewVariables] private Container _bulletContainer; [ViewVariables] private AppearanceComponent _appearance; @@ -27,6 +29,7 @@ namespace Content.Server.GameObjects.Components.Weapon.Ranged.Projectile private BallisticCaliber _caliber; private int _capacity; + [ViewVariables] public string FillType => _fillType; [ViewVariables] public BallisticMagazineType MagazineType => _magazineType; [ViewVariables] public BallisticCaliber Caliber => _caliber; [ViewVariables] public int Capacity => _capacity; @@ -45,7 +48,7 @@ namespace Content.Server.GameObjects.Components.Weapon.Ranged.Projectile serializer.DataField(ref _caliber, "caliber", BallisticCaliber.Unspecified); serializer.DataField(ref _fillType, "fill", null); serializer.DataField(ref _capacity, "capacity", 20); - serializer.DataField(ref _availableSpawnCount, "availableSpawnCount", 0); + serializer.DataField(ref _availableSpawnCount, "availableSpawnCount", Capacity); } public override void Initialize() @@ -110,7 +113,7 @@ namespace Content.Server.GameObjects.Components.Weapon.Ranged.Projectile } _availableSpawnCount -= 1; - bullet = Owner.EntityManager.SpawnEntity(_fillType); + bullet = Owner.EntityManager.SpawnEntity(FillType); } else { @@ -123,6 +126,103 @@ namespace Content.Server.GameObjects.Components.Weapon.Ranged.Projectile return bullet; } + // TODO: Allow putting individual casings into mag (also box) + AmmoMagTransferPopupMessage CanTransferFrom(IEntity source) + { + // Currently the below duplicates box but at some stage these will likely differ + if (source.TryGetComponent(out BallisticMagazineComponent magazineComponent)) + { + if (magazineComponent.Caliber != Caliber) + { + return new AmmoMagTransferPopupMessage(result: false, message: "Wrong caliber"); + } + + if (CountLoaded == Capacity) + { + return new AmmoMagTransferPopupMessage(result: false, message: "Already full"); + } + + if (magazineComponent.CountLoaded == 0) + { + return new AmmoMagTransferPopupMessage(result: false, message: "No ammo to transfer"); + } + + return new AmmoMagTransferPopupMessage(result: true, message: ""); + } + + // If box + if (source.TryGetComponent(out AmmoBoxComponent boxComponent)) + { + if (boxComponent.Caliber != Caliber) + { + return new AmmoMagTransferPopupMessage(result: false, message: "Wrong caliber"); + } + + if (CountLoaded == Capacity) + { + return new AmmoMagTransferPopupMessage(result: false, message: "Already full"); + } + + if (boxComponent.CountLeft == 0) + { + return new AmmoMagTransferPopupMessage(result: false, message: "No ammo to transfer"); + } + + return new AmmoMagTransferPopupMessage(result: true, message: ""); + } + + return new AmmoMagTransferPopupMessage(result: false, message: ""); + } + + // TODO: Potentially abstract out to reduce duplicate structs + private struct AmmoMagTransferPopupMessage + { + public readonly bool Result; + public readonly string Message; + + public AmmoMagTransferPopupMessage(bool result, string message) + { + Result = result; + Message = message; + } + } + + bool IAttackBy.AttackBy(AttackByEventArgs eventArgs) + { + var ammoMagTransfer = CanTransferFrom(eventArgs.AttackWith); + if (ammoMagTransfer.Result) { + IEntity bullet; + if (eventArgs.AttackWith.TryGetComponent(out BallisticMagazineComponent magazineComponent)) + { + int fillCount = Math.Min(magazineComponent.CountLoaded, Capacity - CountLoaded); + for (int i = 0; i < fillCount; i++) + { + bullet = magazineComponent.TakeBullet(); + AddBullet(bullet); + } + eventArgs.User.PopupMessage(eventArgs.User, $"Transferred {fillCount} rounds"); + return true; + } + if (eventArgs.AttackWith.TryGetComponent(out AmmoBoxComponent boxComponent)) + { + int fillCount = Math.Min(boxComponent.CountLeft, Capacity - CountLoaded); + for (int i = 0; i < fillCount; i++) + { + bullet = boxComponent.TakeBullet(); + AddBullet(bullet); + } + eventArgs.User.PopupMessage(eventArgs.User, $"Transferred {fillCount} rounds"); + return true; + } + } + else + { + eventArgs.User.PopupMessage(eventArgs.User, ammoMagTransfer.Message); + } + + return false; + } + private void _updateAppearance() { _appearance.SetData(BallisticMagazineVisuals.AmmoLeft, CountLoaded); diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/.32/boxes.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/.32/boxes.yml new file mode 100644 index 0000000000..f200741511 --- /dev/null +++ b/Resources/Prototypes/Entities/Weapons/Ammunition/.32/boxes.yml @@ -0,0 +1,118 @@ +# Empty boxes +- type: entity + id: box_32_empty + name: ".32 box - empty" + parent: BaseItem + abstract: true + components: + - type: AmmoBox + caliber: A32 + capacity: 40 + - type: Sprite + netsync: false + +# Ammo boxes +- type: entity + id: box_32 + name: ".32 box" + parent: box_32_empty + components: + - type: AmmoBox + fill: ammo_casing_32 + caliber: A32 + capacity: 40 + - type: Icon + sprite: Objects/Guns/Ammunition/Boxes/.32/box32.rsi + state: box32-1 + - type: Sprite + sprite: Objects/Guns/Ammunition/Boxes/.32/box32.rsi + state: box32-1 + - type: Appearance + visuals: + - type: BallisticMagazineVisualizer2D + base_state: box32 + steps: 2 + +- type: entity + id: box_32f + name: ".32 box (Flash)" + parent: box_32_empty + components: + - type: AmmoBox + fill: ammo_casing_32_flash + caliber: A32 + capacity: 40 + - type: Icon + sprite: Objects/Guns/Ammunition/Boxes/.32/box32-flash.rsi + state: box32-flash-1 + - type: Sprite + sprite: Objects/Guns/Ammunition/Boxes/.32/box32-flash.rsi + state: box32-flash-1 + - type: Appearance + visuals: + - type: BallisticMagazineVisualizer2D + base_state: box32-flash + steps: 2 + +- type: entity + id: box_32hv + name: ".32 box (High-velocity)" + parent: box_32_empty + components: + - type: AmmoBox + fill: ammo_casing_32_hv + caliber: A32 + capacity: 40 + - type: Icon + sprite: Objects/Guns/Ammunition/Boxes/.32/box32-hv.rsi + state: box32-hv-1 + - type: Sprite + sprite: Objects/Guns/Ammunition/Boxes/.32/box32-hv.rsi + state: box32-hv-1 + - type: Appearance + visuals: + - type: BallisticMagazineVisualizer2D + base_state: box32-hv + steps: 2 + +- type: entity + id: box_32p + name: ".32 box (Practice)" + parent: box_32_empty + components: + - type: AmmoBox + fill: ammo_casing_32_p + caliber: A32 + capacity: 40 + - type: Icon + sprite: Objects/Guns/Ammunition/Boxes/.32/box32-practice.rsi + state: box32-practice-1 + - type: Sprite + sprite: Objects/Guns/Ammunition/Boxes/.32/box32-practice.rsi + state: box32-practice-1 + - type: Appearance + visuals: + - type: BallisticMagazineVisualizer2D + base_state: box32-practice + steps: 2 + +- type: entity + id: box_32r + name: ".32 box (Rubber)" + parent: box_32_empty + components: + - type: AmmoBox + fill: ammo_casing_32_r + caliber: A32 + capacity: 40 + - type: Icon + sprite: Objects/Guns/Ammunition/Boxes/.32/box32-rubber.rsi + state: box32-rubber-1 + - type: Sprite + sprite: Objects/Guns/Ammunition/Boxes/.32/box32-rubber.rsi + state: box32-rubber-1 + - type: Appearance + visuals: + - type: BallisticMagazineVisualizer2D + base_state: box32-rubber + steps: 2 diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/.357/boxes.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/.357/boxes.yml new file mode 100644 index 0000000000..20bc25a942 --- /dev/null +++ b/Resources/Prototypes/Entities/Weapons/Ammunition/.357/boxes.yml @@ -0,0 +1,118 @@ +# Empty boxes +- type: entity + id: box_357_empty + name: ".357 box - empty" + parent: BaseItem + abstract: true + components: + - type: AmmoBox + caliber: A357 + capacity: 40 + - type: Sprite + netsync: false + +# Ammo boxes +- type: entity + id: box_357 + name: ".357 box" + parent: box_357_empty + components: + - type: AmmoBox + fill: ammo_casing_357 + caliber: A357 + capacity: 40 + - type: Icon + sprite: Objects/Guns/Ammunition/Boxes/.357/box357.rsi + state: box357-1 + - type: Sprite + sprite: Objects/Guns/Ammunition/Boxes/.357/box357.rsi + state: box357-1 + - type: Appearance + visuals: + - type: BallisticMagazineVisualizer2D + base_state: box357 + steps: 2 + +- type: entity + id: box_357f + name: ".357 box (Flash)" + parent: box_357_empty + components: + - type: AmmoBox + fill: ammo_casing_357_flash + caliber: A357 + capacity: 40 + - type: Icon + sprite: Objects/Guns/Ammunition/Boxes/.357/box357-flash.rsi + state: box357-flash-1 + - type: Sprite + sprite: Objects/Guns/Ammunition/Boxes/.357/box357-flash.rsi + state: box357-flash-1 + - type: Appearance + visuals: + - type: BallisticMagazineVisualizer2D + base_state: box357-flash + steps: 2 + +- type: entity + id: box_357hv + name: ".357 box (High-velocity)" + parent: box_357_empty + components: + - type: AmmoBox + fill: ammo_casing_357_hv + caliber: A357 + capacity: 40 + - type: Icon + sprite: Objects/Guns/Ammunition/Boxes/.357/box357-hv.rsi + state: box357-hv-1 + - type: Sprite + sprite: Objects/Guns/Ammunition/Boxes/.357/box357-hv.rsi + state: box357-hv-1 + - type: Appearance + visuals: + - type: BallisticMagazineVisualizer2D + base_state: box357-hv + steps: 2 + +- type: entity + id: box_357p + name: ".357 box (Practice)" + parent: box_357_empty + components: + - type: AmmoBox + fill: ammo_casing_357_p + caliber: A357 + capacity: 40 + - type: Icon + sprite: Objects/Guns/Ammunition/Boxes/.357/box357-practice.rsi + state: box357-practice-1 + - type: Sprite + sprite: Objects/Guns/Ammunition/Boxes/.357/box357-practice.rsi + state: box357-practice-1 + - type: Appearance + visuals: + - type: BallisticMagazineVisualizer2D + base_state: box357-practice + steps: 2 + +- type: entity + id: box_357r + name: ".357 box (Rubber)" + parent: box_357_empty + components: + - type: AmmoBox + fill: ammo_casing_357_r + caliber: A357 + capacity: 40 + - type: Icon + sprite: Objects/Guns/Ammunition/Boxes/.357/box357-rubber.rsi + state: box357-rubber-1 + - type: Sprite + sprite: Objects/Guns/Ammunition/Boxes/.357/box357-rubber.rsi + state: box357-rubber-1 + - type: Appearance + visuals: + - type: BallisticMagazineVisualizer2D + base_state: box357-rubber + steps: 2 diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/.44/boxes.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/.44/boxes.yml new file mode 100644 index 0000000000..d40e9241b2 --- /dev/null +++ b/Resources/Prototypes/Entities/Weapons/Ammunition/.44/boxes.yml @@ -0,0 +1,118 @@ +# Empty boxes +- type: entity + id: box_44_empty + name: ".44 box - empty" + parent: BaseItem + abstract: true + components: + - type: AmmoBox + caliber: A44 + capacity: 20 + - type: Sprite + netsync: false + +# Ammo boxes +- type: entity + id: box_44 + name: ".44 box" + parent: box_44_empty + components: + - type: AmmoBox + fill: ammo_casing_44 + caliber: A44 + capacity: 20 + - type: Icon + sprite: Objects/Guns/Ammunition/Boxes/.44/box44.rsi + state: box44-1 + - type: Sprite + sprite: Objects/Guns/Ammunition/Boxes/.44/box44.rsi + state: box44-1 + - type: Appearance + visuals: + - type: BallisticMagazineVisualizer2D + base_state: box44 + steps: 2 + +- type: entity + id: box_44f + name: ".44 box (Flash)" + parent: box_44_empty + components: + - type: AmmoBox + fill: ammo_casing_44_flash + caliber: A44 + capacity: 20 + - type: Icon + sprite: Objects/Guns/Ammunition/Boxes/.44/box44-flash.rsi + state: box44-flash-1 + - type: Sprite + sprite: Objects/Guns/Ammunition/Boxes/.44/box44-flash.rsi + state: box44-flash-1 + - type: Appearance + visuals: + - type: BallisticMagazineVisualizer2D + base_state: box44-flash + steps: 2 + +- type: entity + id: box_44hv + name: ".44 box (High-velocity)" + parent: box_44_empty + components: + - type: AmmoBox + fill: ammo_casing_44_hv + caliber: A44 + capacity: 20 + - type: Icon + sprite: Objects/Guns/Ammunition/Boxes/.44/box44-hv.rsi + state: box44-hv-1 + - type: Sprite + sprite: Objects/Guns/Ammunition/Boxes/.44/box44-hv.rsi + state: box44-hv-1 + - type: Appearance + visuals: + - type: BallisticMagazineVisualizer2D + base_state: box44-hv + steps: 2 + +- type: entity + id: box_44p + name: ".44 box (Practice)" + parent: box_44_empty + components: + - type: AmmoBox + fill: ammo_casing_44_p + caliber: A44 + capacity: 20 + - type: Icon + sprite: Objects/Guns/Ammunition/Boxes/.44/box44-practice.rsi + state: box44-practice-1 + - type: Sprite + sprite: Objects/Guns/Ammunition/Boxes/.44/box44-practice.rsi + state: box44-practice-1 + - type: Appearance + visuals: + - type: BallisticMagazineVisualizer2D + base_state: box44-practice + steps: 2 + +- type: entity + id: box_44r + name: ".44 box (Rubber)" + parent: box_44_empty + components: + - type: AmmoBox + fill: ammo_casing_44_r + caliber: A44 + capacity: 20 + - type: Icon + sprite: Objects/Guns/Ammunition/Boxes/.44/box44-rubber.rsi + state: box44-rubber-1 + - type: Sprite + sprite: Objects/Guns/Ammunition/Boxes/.44/box44-rubber.rsi + state: box44-rubber-1 + - type: Appearance + visuals: + - type: BallisticMagazineVisualizer2D + base_state: box44-rubber + steps: 2 diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/.45mm/boxes.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/.45mm/boxes.yml new file mode 100644 index 0000000000..57beb18e9b --- /dev/null +++ b/Resources/Prototypes/Entities/Weapons/Ammunition/.45mm/boxes.yml @@ -0,0 +1,99 @@ +# Empty boxes +- type: entity + id: box_45_empty + name: ".45mm box - empty" + parent: BaseItem + abstract: true + components: + - type: AmmoBox + caliber: A45 + capacity: 30 + - type: Sprite + netsync: false + +# Ammo boxes +- type: entity + id: box_45 + name: ".45mm box" + parent: box_45_empty + components: + - type: AmmoBox + fill: ammo_casing_45 + caliber: A45 + capacity: 30 + - type: Icon + sprite: Objects/Guns/Ammunition/Boxes/.45mm/box45.rsi + state: box45-1 + - type: Sprite + sprite: Objects/Guns/Ammunition/Boxes/.45mm/box45.rsi + state: box45-1 + - type: Appearance + visuals: + - type: BallisticMagazineVisualizer2D + base_state: box45 + steps: 2 + +- type: entity + id: box_45f + name: ".45mm box (Flash)" + parent: box_45_empty + components: + - type: AmmoBox + fill: ammo_casing_45_flash + caliber: A45 + capacity: 30 + - type: Icon + sprite: Objects/Guns/Ammunition/Boxes/.45mm/box45-flash.rsi + state: box45-flash-1 + - type: Sprite + sprite: Objects/Guns/Ammunition/Boxes/.45mm/box45-flash.rsi + state: box45-flash-1 + - type: Appearance + visuals: + - type: BallisticMagazineVisualizer2D + base_state: box45-flash + steps: 2 + +# Surprise: no HV + +- type: entity + id: box_45p + name: ".45mm box (Practice)" + parent: box_45_empty + components: + - type: AmmoBox + fill: ammo_casing_45_p + caliber: A45 + capacity: 30 + - type: Icon + sprite: Objects/Guns/Ammunition/Boxes/.45mm/box45-practice.rsi + state: box45-practice-1 + - type: Sprite + sprite: Objects/Guns/Ammunition/Boxes/.45mm/box45-practice.rsi + state: box45-practice-1 + - type: Appearance + visuals: + - type: BallisticMagazineVisualizer2D + base_state: box45-practice + steps: 2 + +- type: entity + id: box_45r + name: ".45mm box (Rubber)" + parent: box_45_empty + components: + - type: AmmoBox + fill: ammo_casing_45_r + caliber: A45 + capacity: 30 + - type: Icon + sprite: Objects/Guns/Ammunition/Boxes/.45mm/box45-rubber.rsi + state: box45-rubber-1 + - type: Sprite + sprite: Objects/Guns/Ammunition/Boxes/.45mm/box45-rubber.rsi + state: box45-rubber-1 + - type: Appearance + visuals: + - type: BallisticMagazineVisualizer2D + base_state: box45-rubber + steps: 2 diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/.50/ammunition.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/.50/ammunition.yml index 4737c16ce7..3c5f84eb74 100644 --- a/Resources/Prototypes/Entities/Weapons/Ammunition/.50/ammunition.yml +++ b/Resources/Prototypes/Entities/Weapons/Ammunition/.50/ammunition.yml @@ -38,7 +38,7 @@ parent: magazine_50_empty components: - type: BallisticMagazine - fill: ammo_casing_50f + fill: ammo_casing_50_f capacity: 7 - type: Icon sprite: Objects/Guns/Ammunition/Magazine/.50/50aef.rsi @@ -58,7 +58,7 @@ parent: magazine_50_empty components: - type: BallisticMagazine - fill: ammo_casing_50hv + fill: ammo_casing_50_hv capacity: 7 - type: Icon sprite: Objects/Guns/Ammunition/Magazine/.50/50aehv.rsi @@ -78,7 +78,7 @@ parent: magazine_50_empty components: - type: BallisticMagazine - fill: ammo_casing_50l + fill: ammo_casing_50_l capacity: 7 - type: Icon sprite: Objects/Guns/Ammunition/Magazine/.50/50ael.rsi @@ -98,7 +98,7 @@ parent: magazine_50_empty components: - type: BallisticMagazine - fill: ammo_casing_50p + fill: ammo_casing_50_p capacity: 7 - type: Icon sprite: Objects/Guns/Ammunition/Magazine/.50/50aep.rsi @@ -118,7 +118,7 @@ parent: magazine_50_empty components: - type: BallisticMagazine - fill: ammo_casing_50r + fill: ammo_casing_50_r capacity: 7 - type: Icon sprite: Objects/Guns/Ammunition/Magazine/.50/50aer.rsi @@ -150,7 +150,7 @@ state: s-casing - type: entity - id: ammo_casing_50f + id: ammo_casing_50_f name: ".50 cal casing (Flash)" parent: BaseItem components: @@ -166,7 +166,7 @@ state: s-casing - type: entity - id: ammo_casing_50hv + id: ammo_casing_50_hv name: ".50 cal casing (High-Velocity)" parent: BaseItem components: @@ -182,7 +182,7 @@ state: s-casing - type: entity - id: ammo_casing_50l + id: ammo_casing_50_l name: ".50 cal casing (L)" parent: BaseItem components: @@ -198,7 +198,7 @@ state: s-casing - type: entity - id: ammo_casing_50p + id: ammo_casing_50_p name: ".50 cal casing (Practice)" parent: BaseItem components: @@ -214,7 +214,7 @@ state: s-casing - type: entity - id: ammo_casing_50r + id: ammo_casing_50_r name: ".50 cal casing (Rubber)" parent: BaseItem components: diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/.50/boxes.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/.50/boxes.yml new file mode 100644 index 0000000000..8e95540d3d --- /dev/null +++ b/Resources/Prototypes/Entities/Weapons/Ammunition/.50/boxes.yml @@ -0,0 +1,99 @@ +# Empty boxes +- type: entity + id: box_50_empty + name: ".50 cal box - empty" + parent: BaseItem + abstract: true + components: + - type: AmmoBox + caliber: A50 + capacity: 20 + - type: Sprite + netsync: false + +# Ammo boxes +- type: entity + id: box_50 + name: ".50 cal box" + parent: box_50_empty + components: + - type: AmmoBox + fill: ammo_casing_50 + caliber: A50 + capacity: 20 + - type: Icon + sprite: Objects/Guns/Ammunition/Boxes/.50/box50.rsi + state: box50-1 + - type: Sprite + sprite: Objects/Guns/Ammunition/Boxes/.50/box50.rsi + state: box50-1 + - type: Appearance + visuals: + - type: BallisticMagazineVisualizer2D + base_state: box50 + steps: 2 + +- type: entity + id: box_50f + name: ".50 cal box (Flash)" + parent: box_50_empty + components: + - type: AmmoBox + fill: ammo_casing_50_f + caliber: A50 + capacity: 20 + - type: Icon + sprite: Objects/Guns/Ammunition/Boxes/.50/box50-flash.rsi + state: box50-flash-1 + - type: Sprite + sprite: Objects/Guns/Ammunition/Boxes/.50/box50-flash.rsi + state: box50-flash-1 + - type: Appearance + visuals: + - type: BallisticMagazineVisualizer2D + base_state: box50-flash + steps: 2 + +# Surprise: no HV + +- type: entity + id: box_50p + name: ".50 cal box (Practice)" + parent: box_50_empty + components: + - type: AmmoBox + fill: ammo_casing_50_p + caliber: A50 + capacity: 20 + - type: Icon + sprite: Objects/Guns/Ammunition/Boxes/.50/box50-practice.rsi + state: box50-practice-1 + - type: Sprite + sprite: Objects/Guns/Ammunition/Boxes/.50/box50-practice.rsi + state: box50-practice-1 + - type: Appearance + visuals: + - type: BallisticMagazineVisualizer2D + base_state: box50-practice + steps: 2 + +- type: entity + id: box_50r + name: ".50 cal box (Rubber)" + parent: box_50_empty + components: + - type: AmmoBox + fill: ammo_casing_50_r + caliber: A50 + capacity: 20 + - type: Icon + sprite: Objects/Guns/Ammunition/Boxes/.50/box50-rubber.rsi + state: box50-rubber-1 + - type: Sprite + sprite: Objects/Guns/Ammunition/Boxes/.50/box50-rubber.rsi + state: box50-rubber-1 + - type: Appearance + visuals: + - type: BallisticMagazineVisualizer2D + base_state: box50-rubber + steps: 2 diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/10mm/ammunition.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/10mm/ammunition.yml index 2a12168c78..f73af3ebba 100644 --- a/Resources/Prototypes/Entities/Weapons/Ammunition/10mm/ammunition.yml +++ b/Resources/Prototypes/Entities/Weapons/Ammunition/10mm/ammunition.yml @@ -166,7 +166,7 @@ parent: magazine_10mm_empty components: - type: BallisticMagazine - fill: ammo_casing_10mm_f + fill: ammo_casing_10mm_flash caliber: A10mm magazine: A10mmSMG capacity: 20 diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/10mm/boxes.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/10mm/boxes.yml new file mode 100644 index 0000000000..a8dd32922b --- /dev/null +++ b/Resources/Prototypes/Entities/Weapons/Ammunition/10mm/boxes.yml @@ -0,0 +1,118 @@ +# Empty boxes +- type: entity + id: box_10mm_empty + name: "10mm box - empty" + parent: BaseItem + abstract: true + components: + - type: AmmoBox + caliber: A10mm + capacity: 30 + - type: Sprite + netsync: false + +# Ammo boxes +- type: entity + id: box_10mm + name: "10mm box" + parent: box_10mm_empty + components: + - type: AmmoBox + fill: ammo_casing_10mm + caliber: A10mm + capacity: 30 + - type: Icon + sprite: Objects/Guns/Ammunition/Boxes/10mm/box10mm.rsi + state: box10mm-1 + - type: Sprite + sprite: Objects/Guns/Ammunition/Boxes/10mm/box10mm.rsi + state: box10mm-1 + - type: Appearance + visuals: + - type: BallisticMagazineVisualizer2D + base_state: box10mm + steps: 2 + +- type: entity + id: box_10mmf + name: "10mm box (Flash)" + parent: box_10mm_empty + components: + - type: AmmoBox + fill: ammo_casing_10mm_flash + caliber: A10mm + capacity: 30 + - type: Icon + sprite: Objects/Guns/Ammunition/Boxes/10mm/box10mm-flash.rsi + state: box10mm-flash-1 + - type: Sprite + sprite: Objects/Guns/Ammunition/Boxes/10mm/box10mm-flash.rsi + state: box10mm-flash-1 + - type: Appearance + visuals: + - type: BallisticMagazineVisualizer2D + base_state: box10mm-flash + steps: 2 + +- type: entity + id: box_10mmhv + name: "10mm box (High-velocity)" + parent: box_10mm_empty + components: + - type: AmmoBox + fill: ammo_casing_10mm_hv + caliber: A10mm + capacity: 30 + - type: Icon + sprite: Objects/Guns/Ammunition/Boxes/10mm/box10mm-hv.rsi + state: box10mm-hv-1 + - type: Sprite + sprite: Objects/Guns/Ammunition/Boxes/10mm/box10mm-hv.rsi + state: box10mm-hv-1 + - type: Appearance + visuals: + - type: BallisticMagazineVisualizer2D + base_state: box10mm-hv + steps: 2 + +- type: entity + id: box_10mmp + name: "10mm box (Practice)" + parent: box_10mm_empty + components: + - type: AmmoBox + fill: ammo_casing_10mm_p + caliber: A10mm + capacity: 30 + - type: Icon + sprite: Objects/Guns/Ammunition/Boxes/10mm/box10mm-practice.rsi + state: box10mm-practice-1 + - type: Sprite + sprite: Objects/Guns/Ammunition/Boxes/10mm/box10mm-practice.rsi + state: box10mm-practice-1 + - type: Appearance + visuals: + - type: BallisticMagazineVisualizer2D + base_state: box10mm-practice + steps: 2 + +- type: entity + id: box_10mmr + name: "10mm box (Rubber)" + parent: box_10mm_empty + components: + - type: AmmoBox + fill: ammo_casing_10mm_r + caliber: A10mm + capacity: 30 + - type: Icon + sprite: Objects/Guns/Ammunition/Boxes/10mm/box10mm-rubber.rsi + state: box10mm-rubber-1 + - type: Sprite + sprite: Objects/Guns/Ammunition/Boxes/10mm/box10mm-rubber.rsi + state: box10mm-rubber-1 + - type: Appearance + visuals: + - type: BallisticMagazineVisualizer2D + base_state: box10mm-rubber + steps: 2 diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/24mm/boxes.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/24mm/boxes.yml new file mode 100644 index 0000000000..767f228846 --- /dev/null +++ b/Resources/Prototypes/Entities/Weapons/Ammunition/24mm/boxes.yml @@ -0,0 +1,34 @@ +# Empty boxes +- type: entity + id: box_24mm_empty + name: "7.62mm box - empty" + parent: BaseItem + abstract: true + components: + - type: AmmoBox + caliber: A24mm + capacity: 200 + - type: Sprite + netsync: false + +# Ammo boxes +- type: entity + id: box_24mm + name: "24mm box" + parent: box_24mm_empty + components: + - type: AmmoBox + fill: ammo_casing_24mm + caliber: A24mm + capacity: 200 + - type: Icon + sprite: Objects/Guns/Ammunition/Boxes/24mm/box10x24.rsi + state: box10x24-1 + - type: Sprite + sprite: Objects/Guns/Ammunition/Boxes/24mm/box10x24.rsi + state: box10x24-1 + - type: Appearance + visuals: + - type: BallisticMagazineVisualizer2D + base_state: box10x24 + steps: 2 diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/5.56mm/boxes.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/5.56mm/boxes.yml new file mode 100644 index 0000000000..aa1b2222b1 --- /dev/null +++ b/Resources/Prototypes/Entities/Weapons/Ammunition/5.56mm/boxes.yml @@ -0,0 +1,55 @@ +# Empty boxes +- type: entity + id: box_556mm_empty + name: "5.56mm box - empty" + parent: BaseItem + abstract: true + components: + - type: AmmoBox + caliber: A556mm + capacity: 80 + - type: Sprite + netsync: false + +# Ammo boxes +- type: entity + id: box_556mm + name: "5.56mm box" + parent: box_556mm_empty + components: + - type: AmmoBox + fill: ammo_casing_556mm + caliber: A556mm + capacity: 80 + - type: Icon + sprite: Objects/Guns/Ammunition/Boxes/5.56mm/box556mm.rsi + state: box556mm-1 + - type: Sprite + sprite: Objects/Guns/Ammunition/Boxes/5.56mm/box556mm.rsi + state: box556mm-1 + - type: Appearance + visuals: + - type: BallisticMagazineVisualizer2D + base_state: box556mm + steps: 2 + +- type: entity + id: box_556mmp + name: "5.56mm box (Practice)" + parent: box_556mm_empty + components: + - type: AmmoBox + fill: ammo_casing_556mm_p + caliber: A556mm + capacity: 80 + - type: Icon + sprite: Objects/Guns/Ammunition/Boxes/5.56mm/box556mm-practice.rsi + state: box556mm-practice-1 + - type: Sprite + sprite: Objects/Guns/Ammunition/Boxes/5.56mm/box556mm-practice.rsi + state: box556mm-practice-1 + - type: Appearance + visuals: + - type: BallisticMagazineVisualizer2D + base_state: box556mm-practice + steps: 2 diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/6.5mm/boxes.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/6.5mm/boxes.yml new file mode 100644 index 0000000000..ebf76555c9 --- /dev/null +++ b/Resources/Prototypes/Entities/Weapons/Ammunition/6.5mm/boxes.yml @@ -0,0 +1,55 @@ +# Empty boxes +- type: entity + id: box_65mm_empty + name: "6.5mm box - empty" + parent: BaseItem + abstract: true + components: + - type: AmmoBox + caliber: A65mm + capacity: 80 + - type: Sprite + netsync: false + +# Ammo boxes +- type: entity + id: box_65mm + name: "6.5mm box" + parent: box_65mm_empty + components: + - type: AmmoBox + fill: ammo_casing_65mm + caliber: A65mm + capacity: 80 + - type: Icon + sprite: Objects/Guns/Ammunition/Boxes/6.5mm/box65mm.rsi + state: box65mm-1 + - type: Sprite + sprite: Objects/Guns/Ammunition/Boxes/6.5mm/box65mm.rsi + state: box65mm-1 + - type: Appearance + visuals: + - type: BallisticMagazineVisualizer2D + base_state: box65mm + steps: 2 + +- type: entity + id: box_65mmr + name: "6.5mm box (Rubber)" + parent: box_65mm_empty + components: + - type: AmmoBox + fill: ammo_casing_65mm_r + caliber: A65mm + capacity: 80 + - type: Icon + sprite: Objects/Guns/Ammunition/Boxes/6.5mm/box65mm-rubber.rsi + state: box65mm-rubber-1 + - type: Sprite + sprite: Objects/Guns/Ammunition/Boxes/6.5mm/box65mm-rubber.rsi + state: box65mm-rubber-1 + - type: Appearance + visuals: + - type: BallisticMagazineVisualizer2D + base_state: box65mm-rubber + steps: 2 diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/7.62mm/boxes.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/7.62mm/boxes.yml new file mode 100644 index 0000000000..d3570fb613 --- /dev/null +++ b/Resources/Prototypes/Entities/Weapons/Ammunition/7.62mm/boxes.yml @@ -0,0 +1,34 @@ +# Empty boxes +- type: entity + id: box_762mm_empty + name: "7.62mm box - empty" + parent: BaseItem + abstract: true + components: + - type: AmmoBox + caliber: A762mm + capacity: 80 + - type: Sprite + netsync: false + +# Ammo boxes +- type: entity + id: box_762mm + name: "7.62mm box" + parent: box_762mm_empty + components: + - type: AmmoBox + fill: ammo_casing_762mm + caliber: A762mm + capacity: 80 + - type: Icon + sprite: Objects/Guns/Ammunition/Boxes/7.62mm/box762mm.rsi + state: box762mm-1 + - type: Sprite + sprite: Objects/Guns/Ammunition/Boxes/7.62mm/box762mm.rsi + state: box762mm-1 + - type: Appearance + visuals: + - type: BallisticMagazineVisualizer2D + base_state: box762mm + steps: 2 diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/9mm/boxes.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/9mm/boxes.yml new file mode 100644 index 0000000000..bcb87c4d6e --- /dev/null +++ b/Resources/Prototypes/Entities/Weapons/Ammunition/9mm/boxes.yml @@ -0,0 +1,118 @@ +# Empty boxes +- type: entity + id: box_9mm_empty + name: "9mm box - empty" + parent: BaseItem + abstract: true + components: + - type: AmmoBox + caliber: A9mm + capacity: 30 + - type: Sprite + netsync: false + +# Ammo boxes +- type: entity + id: box_9mm + name: "9mm box" + parent: box_9mm_empty + components: + - type: AmmoBox + fill: ammo_casing_9mm + caliber: A9mm + capacity: 30 + - type: Icon + sprite: Objects/Guns/Ammunition/Boxes/9mm/box9mm.rsi + state: box9mm-1 + - type: Sprite + sprite: Objects/Guns/Ammunition/Boxes/9mm/box9mm.rsi + state: box9mm-1 + - type: Appearance + visuals: + - type: BallisticMagazineVisualizer2D + base_state: box9mm + steps: 2 + +- type: entity + id: box_9mmf + name: "9mm box (Flash)" + parent: box_9mm_empty + components: + - type: AmmoBox + fill: ammo_casing_9mm_flash + caliber: A9mm + capacity: 30 + - type: Icon + sprite: Objects/Guns/Ammunition/Boxes/9mm/box9mm-flash.rsi + state: box9mm-flash-1 + - type: Sprite + sprite: Objects/Guns/Ammunition/Boxes/9mm/box9mm-flash.rsi + state: box9mm-flash-1 + - type: Appearance + visuals: + - type: BallisticMagazineVisualizer2D + base_state: box9mm-flash + steps: 2 + +- type: entity + id: box_9mmhv + name: "9mm box (High-velocity)" + parent: box_9mm_empty + components: + - type: AmmoBox + fill: ammo_casing_9mm_hv + caliber: A9mm + capacity: 30 + - type: Icon + sprite: Objects/Guns/Ammunition/Boxes/9mm/box9mm-hv.rsi + state: box9mm-hv-1 + - type: Sprite + sprite: Objects/Guns/Ammunition/Boxes/9mm/box9mm-hv.rsi + state: box9mm-hv-1 + - type: Appearance + visuals: + - type: BallisticMagazineVisualizer2D + base_state: box9mm-hv + steps: 2 + +- type: entity + id: box_9mmp + name: "9mm box (Practice)" + parent: box_9mm_empty + components: + - type: AmmoBox + fill: ammo_casing_9mm_p + caliber: A9mm + capacity: 30 + - type: Icon + sprite: Objects/Guns/Ammunition/Boxes/9mm/box9mm-practice.rsi + state: box9mm-practice-1 + - type: Sprite + sprite: Objects/Guns/Ammunition/Boxes/9mm/box9mm-practice.rsi + state: box9mm-practice-1 + - type: Appearance + visuals: + - type: BallisticMagazineVisualizer2D + base_state: box9mm-practice + steps: 2 + +- type: entity + id: box_9mmr + name: "9mm box (Rubber)" + parent: box_9mm_empty + components: + - type: AmmoBox + fill: ammo_casing_9mm_r + caliber: A9mm + capacity: 30 + - type: Icon + sprite: Objects/Guns/Ammunition/Boxes/9mm/box9mm-rubber.rsi + state: box9mm-rubber-1 + - type: Sprite + sprite: Objects/Guns/Ammunition/Boxes/9mm/box9mm-rubber.rsi + state: box9mm-rubber-1 + - type: Appearance + visuals: + - type: BallisticMagazineVisualizer2D + base_state: box9mm-rubber + steps: 2 diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.32/box32-flash.rsi/box32-flash-0.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/.32/box32-flash.rsi/box32-flash-0.png new file mode 100644 index 0000000000000000000000000000000000000000..2a5fce22295ed88a8addc73f41fef1ce67a2355d GIT binary patch literal 407 zcmV;I0cie-P)1vS;H3Y-)gi%#mOA+xx+rz((xscA(8Wn8ih_0UmLfPsbg57T2Zy+cVnk89 zRp=uA2O$pOLX2WBmq1bSO_vLo=i$3Iml&?=GR~S9D?Jy;1#*F`1cY#WAsk<4?PL~k z%QnL?K%=o@sIE8CoP@1*&tF`a{Wkw__lT;9_7=3-J%4?5DZDO~iDVrP_5Sh zIPM$)!Rr=uWjciKZ#R|U$^xTAbm55wq9V~eyuUqb!9gJdgJGX;_vF|6x^PJFEs)1* zrLqhJhfR{Srxu8d0IA_x0$JDp_#?^%a)CcB@Cg==qv)&xeE$Fd002ovPDHLkV1mOX Bv{(QD literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.32/box32-flash.rsi/box32-flash-1.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/.32/box32-flash.rsi/box32-flash-1.png new file mode 100644 index 0000000000000000000000000000000000000000..1926376d6a61d0d1dd8015b8b0b062bfdf9ff1a7 GIT binary patch literal 439 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=hEVFxGjxIEGZrNwz6?z;M`sX&K|z z+AEBU`6Nmiw#pdf-rDs4@-p4u{(W&`SrO~<*RZD>8yFa*q`Ddkt)4$|(xeT!ho1fa zHmytIk@)$zB!z2=DejK9Th9LX=05zO#+W;p4TM3UHrW=0+a`5IHC=R?#(Y7yy)jtb z@9@nH0Sk69ugJ7yX721PxV0tqKW}eOz>$Q5e9YB+^VE-eJaSF|i8@!L8=ADuO}KGy zQpZ)Ll#SK>>x{pYm;|c}9@6=)?VC_hlw{uAddHNfeL}KjAm0qL+?)STTw!6m){)HP z@AoFnqWp(um-CMs{|!pMuWwp?e`6{0#c9R{0yEjx&9!DvlvtaV(3=1>MQO^zI}exh zY`?n9L0Crr&Zo|~qAt;XTbK(hpFDcQT3}hEqkfa|1fS!%EdBZMs;7(C*px0E*z0~> z^4j|N&hU9LrzIskR&XaA%}PkHU}k1svO!UGYw#O}l6GLQ1>{&p@+~lvkkefh$lha> d;98yFa*q`Ddkt)4$|(xeT!ho1fa zHmytIk@)$zB!z2=DejK9Th9LX=05zO#+W;p4TM3UHrW=0+a`5IHC=R?#(Y7yy)jtb z@9@nH0Sk69ugJ7yX721PxV0tqKW}eOz>$Q5e9YB+^VE-eJaSF|i8@!L8=ADuO}KGy zQpZ)Ll#SK>>x{pYm;|c}9@6=)?VC_hlw{uAddHNfeL}KjAm0qL+?)STTw!6m){)HP z@AoFnqWp(um-CMs{|!pMuWwp?e`6{0#c9R{0yEjx&9!DvlvtaV(3=1>MQO^zI}exh zY`?n9L0Crr&Zo|~qAt;XTbK(hpFDcQT3}hEqkfa|1fS!%EdBZMs;7(C*px0E*z0~> z^4j|N&hU9LrzIskR&XaA%}PkHU}k1svO!UGYw#O}l6GLQ1>{&p@+~lvkkefh$lha> d;9p+V8PVapm?>-;C?|XO8qw6~TjDfz=T>)3X6>v%*qa{Q} zO9(rA2c3Wi{9bbmu)3&tWcPc1^Ce6xnwVawcje2qCbA;7k07mRVq#6TCi^$R3@1f!d=rcYRl;py)lDQ0gr(;FV&vYi)Eq#N14<4W7ANk%EIn1ynUB zqVX7G9i=y7Waxvvg9~$hQ@E0bgJci9lu7_Z<1qlvvZnxiS7q3QAMPfl;nD)VMC`&X z3$%)~_QU(zvn@DC^gyFoBcDJ2aosK)Ec^@BlbZq{5?KbIQmoQw*4W?KvJJN+&?y4^ n8g5I#>G&TvB3Hl__|pQP#rUDVXYh!K00000NkvXXu0mjf*jL2A literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.32/box32-hv.rsi/box32-hv-1.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/.32/box32-hv.rsi/box32-hv-1.png new file mode 100644 index 0000000000000000000000000000000000000000..e5f6c8fba7656947459a841e45bb0881971a612e GIT binary patch literal 460 zcmV;-0WIEY#l1tXLox;O>Yp@mQ?R3TE3 zI5f5e+o8~*w20q9IER{}FQ}JmpeT8!CwIC0etGU8IhUqs7-fu&l;~$1n%$? zT6!Kvq1_`gIq`wx(;IsKT{goE2N-*xY8ahFyoEaqwDc7ig*NI_DU^#903HfIJBl;I znFYQRDPLaEIUcxWfo_q`n|I>IEY#l1tXLox;O>Yp@mQ?R3TE3 zI5f5e+o8~*w20q9IER{}FQ}JmpeT8!CwIC0etGU8IhUqs7-fu&l;~$1n%$? zT6!Kvq1_`gIq`wx(;IsKT{goE2N-*xY8ahFyoEaqwDc7ig*NI_DU^#903HfIJBl;I znFYQRDPLaEIUcxWfo_q`n|I>*1Vx zXaC^JnBU%9OT$632OjF5&$>Sp1mGfj2Ecb!<_-AaUQ8M;Eig_*6>eH!P-L(lUY_rj z;2_Zhoo<_a{_@v#RXCXV7DQva0>J0n1fW@K(do8HCF9C)Qv$;xz{GGR0juMG{1Mp# dw!ohj_yDGxr*I7ZKLY>&002ovPDHLkV1hJb$Z`Mx literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.32/box32-practice.rsi/box32-practice-1.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/.32/box32-practice.rsi/box32-practice-1.png new file mode 100644 index 0000000000000000000000000000000000000000..18653cb207fcc883cb245af7a2cc3b73c7362dbc GIT binary patch literal 467 zcmV;^0WAKBP)Z66IkMgXY)&g#~S^xk-Ph!b`Vqjfw80SqGj-_d6P8!Jz?RT(>aBo34mZpInr*htL zN6>Lc004HY1$L_iaqrfz+rlL<441=v6;zJpDrhdCB^*%MgoGsMqRlptlglngHebSQ zn=oIKxdMbF=&I=qdrlGe`mjIKvC#SA2&H6UW1`NZMTjWYk?F2xK77<-^9^`3RxEsQRpDXu{hT6kVKMY&i3 zU{c`62SH{yv%q&E02mw2C7^Zuk3S+^Ko|Ja0$-;^wu%Qx1fu`|002ov JPDHLkV1gce#+d*B literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.32/box32-practice.rsi/box32-practice.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/.32/box32-practice.rsi/box32-practice.png new file mode 100644 index 0000000000000000000000000000000000000000..18653cb207fcc883cb245af7a2cc3b73c7362dbc GIT binary patch literal 467 zcmV;^0WAKBP)Z66IkMgXY)&g#~S^xk-Ph!b`Vqjfw80SqGj-_d6P8!Jz?RT(>aBo34mZpInr*htL zN6>Lc004HY1$L_iaqrfz+rlL<441=v6;zJpDrhdCB^*%MgoGsMqRlptlglngHebSQ zn=oIKxdMbF=&I=qdrlGe`mjIKvC#SA2&H6UW1`NZMTjWYk?F2xK77<-^9^`3RxEsQRpDXu{hT6kVKMY&i3 zU{c`62SH{yv%q&E02mw2C7^Zuk3S+^Ko|Ja0$-;^wu%Qx1fu`|002ov JPDHLkV1gce#+d*B literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.32/box32-practice.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Boxes/.32/box32-practice.rsi/meta.json new file mode 100644 index 0000000000..88da33c31f --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Boxes/.32/box32-practice.rsi/meta.json @@ -0,0 +1 @@ +{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/89456d18dd3e7c330839121e3c6bc8c609700137/icons/obj/ammo.dmi", "states": [{"name": "box32-practice", "directions": 1}, {"name": "box32-practice-0", "directions": 1}, {"name": "box32-practice-1", "directions": 1}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.32/box32-rubber.rsi/box32-rubber-0.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/.32/box32-rubber.rsi/box32-rubber-0.png new file mode 100644 index 0000000000000000000000000000000000000000..2ca3a79259b37ba89124b0d1a5d2034c074065ba GIT binary patch literal 431 zcmV;g0Z{&lP)!i!!9eM(qEynw z$V>DKqzI-H7SvtZfXu79{~QT#wbpn=#g_V7q{waIn~fnwAx_Uhj{bUUof7l{!}zo+(`cP0I?; z+zd~5HPVO2lq&VUJ-xa2=UYxv+x9e}4sTSOM$Rmv0+$ldw5$k*Lrj}Wug8@8gT3U1 zF)v}StFf?3A!0z}Te?*ReBk-pM ZJ^@SUrI)|uN@)N9002ovPDHLkV1no!yL0WbcEP)MfVAwh@^QAtrSgBVc~orLOOA(^1TM2KCS zOh}19NR;R=kRo_H*oHc)cdr8}_MD!*Klb_Tc^|e}1VKPQW1z2eQ@|831&k61aA^|Y z(u8I2pb_w<%l(z72ml-fCoQ!5Exo)6Bhe&zoS4>(58b6eE5dvPk!X^Hf?oAH=CC2= zumJ#?E;pJkHx^gcemxc@fo`}GOY)nVD^)ODz(_ctvk7@VPR5+hjxnX|N@R0IT={{fL(~;dT$ez%2!Nj9Oaey7|M(*^1x$fIE$|6UlC-fU>b2zn00000WbcEP)MfVAwh@^QAtrSgBVc~orLOOA(^1TM2KCS zOh}19NR;R=kRo_H*oHc)cdr8}_MD!*Klb_Tc^|e}1VKPQW1z2eQ@|831&k61aA^|Y z(u8I2pb_w<%l(z72ml-fCoQ!5Exo)6Bhe&zoS4>(58b6eE5dvPk!X^Hf?oAH=CC2= zumJ#?E;pJkHx^gcemxc@fo`}GOY)nVD^)ODz(_ctvk7@VPR5+hjxnX|N@R0IT={{fL(~;dT$ez%2!Nj9Oaey7|M(*^1x$fIE$|6UlC-fU>b2zn0000BX^f?fgs`Fvj=p&ES6%iPjhzJ?Wi}}tadWecS=`4*UKWhtnqYbQYxNN zZ?wPc8J)X*gf%0eCbZ#J%dM?fLuuAKa)b}bDD$sTwx zO#qVV6aW{ca{%0`%sTMn{hTyhT40=rD%`igsK{tPygc74!9k)2`hzZ&%H_A~s&Iga z?5}t$w<7=&i46d(R)_we%i-RxGTfJdR|NPmTuC74_#Z!_P#_fe(*kdcN}$YC9Ln?n O00005hOS;0V|y&<^vY z9p(wk+F?83KChlD?-FAtqU%=#;)x77^?tNjM3|o-p2(2sTEJ}ABPG-$B~!%b1+x72 z&%z|o3pZloc-qVrm2NM~0(Qayi!~q!NixN8U46#28<8(mFsp{C_oTi7K}eDX&lxrY z5^lCvkS|pF=5+SmJpyy0O+{$H=c6HLQVuiY)jkmxIF*1PB+2q>2=3rLG${wU*y<7) z9eKsx!Ie4xHk+n~1C%vTm1RBQuHg;>nzRVH*uvA~5tOnDz+=J>cVpCWYJty0l=BO7 zj0J94pi@LYxgIai4@_`?q6Qkx8d9mtFUMKo0N|qi6|cuO2mtu~O8@|+tfJAZVSi_f v8E#3SR|LS1;Y5hOS;0V|y&<^vY z9p(wk+F?83KChlD?-FAtqU%=#;)x77^?tNjM3|o-p2(2sTEJ}ABPG-$B~!%b1+x72 z&%z|o3pZloc-qVrm2NM~0(Qayi!~q!NixN8U46#28<8(mFsp{C_oTi7K}eDX&lxrY z5^lCvkS|pF=5+SmJpyy0O+{$H=c6HLQVuiY)jkmxIF*1PB+2q>2=3rLG${wU*y<7) z9eKsx!Ie4xHk+n~1C%vTm1RBQuHg;>nzRVH*uvA~5tOnDz+=J>cVpCWYJty0l=BO7 zj0J94pi@LYxgIai4@_`?q6Qkx8d9mtFUMKo0N|qi6|cuO2mtu~O8@|+tfJAZVSi_f v8E#3SR|LS1;YkNu z;>Z2AQnZ!g?*1vaQ1=RGJxscuD}vi>dq*q)FbhMvo=ewrcfvp3KgDnmbiphP0a&iS zsMpSzjHfhPjSa8_E)qz`etotTv+#Hx;Sc(`MYvZWo=3#jcf5O_&;5Sy-961TO-7lqkbly6?iUt-yDlCe6oOHssih{@&cp7Ew(;77z)3p&dVaC*M* zb-x3?kevVaOiI^D={mdnM}6BeumwVtyv?l)mHZ+=yX=-7{}nFt@?0Ap@o=@UpOdy2@AQbR>);FxAjK3 zeDmu#6*wqVpgXc6vNfh*;I`hB;6n*?ivY^-KM@!<|Mx%=2m}Iul}{=D$Q`G#XBhwh N002ovPDHLkV1h$i(H#H) literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.357/box357-flash.rsi/box357-flash.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/.357/box357-flash.rsi/box357-flash.png new file mode 100644 index 0000000000000000000000000000000000000000..43b716d1b6a07bc0bc6c690c8634620e782140d7 GIT binary patch literal 471 zcmV;|0Vw{7P)jcf5O_&;5Sy-961TO-7lqkbly6?iUt-yDlCe6oOHssih{@&cp7Ew(;77z)3p&dVaC*M* zb-x3?kevVaOiI^D={mdnM}6BeumwVtyv?l)mHZ+=yX=-7{}nFt@?0Ap@o=@UpOdy2@AQbR>);FxAjK3 zeDmu#6*wqVpgXc6vNfh*;I`hB;6n*?ivY^-KM@!<|Mx%=2m}Iul}{=D$Q`G#XBhwh N002ovPDHLkV1h$i(H#H) literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.357/box357-flash.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Boxes/.357/box357-flash.rsi/meta.json new file mode 100644 index 0000000000..74416c04bb --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Boxes/.357/box357-flash.rsi/meta.json @@ -0,0 +1 @@ +{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/89456d18dd3e7c330839121e3c6bc8c609700137/icons/obj/ammo.dmi", "states": [{"name": "box357-flash", "directions": 1}, {"name": "box357-flash-0", "directions": 1}, {"name": "box357-flash-1", "directions": 1}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.357/box357-hv.rsi/box357-hv-0.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/.357/box357-hv.rsi/box357-hv-0.png new file mode 100644 index 0000000000000000000000000000000000000000..ef8e31e13b5edf55ddcb237726bf40056eb97caa GIT binary patch literal 409 zcmV;K0cQS*P)WeZ67D%%zIzkRaU52ewUyFifmk3Ghy@lAuH{C<~~- z!%-DcDxnH|XY(>LUdUxB`pD}Oaa@j_-4@(!Gkot!K~@kR-om&m_-Y-X#EO* z?cRvtAlL;h*BxHJo=7EUz$8WI8#eFQ=mWa=np*d z`J<^K?OumeA}N9^3EbUYYXE2GSHm`MOumybblSa+7!JaN2pDavi}GP)yjp9JN+d;a zn4<&1;V{Pvj3<21Na0HnSTz6lha?t=1(ua>qmZX@rai8p00000NkvXXu0mjf DE8Vhh literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.357/box357-hv.rsi/box357-hv-1.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/.357/box357-hv.rsi/box357-hv-1.png new file mode 100644 index 0000000000000000000000000000000000000000..3231de5d9035fcd22070316a75ae758b3e544f92 GIT binary patch literal 476 zcmV<20VDp2P)k zxE68p4~fHJThQKe4e~;>^j-!M+;_XjyZ8Cr@BQxGIWn0H-Aqqc>9&9^U<=p+od^h# zFoj5%T@er>VP5RMGxGM(v52yOgje-6(^?)W5{(DUXgr`S(yIzz95|z@JIUU^u&@!K zs;7ZL!a+X(QsQ*&)?sB$ht;p4eDYN69Nq9Tt>u}Rbs{bY8Cr5R%}-vZu_9t=3+l@b zaBwnN8?S>;jczyG6Ati&b8c@wp$=X!dza7kc!O!e3o4|yg$Naas{K^^45AF zpUvV8KLU`7&3p@gdfr!tTNaQK09UX5xX1f23I;xp)&y38D+$!c=g}HK^7bP?HW^pTM{@r+;ae|Z|>B(dANCw&!bT+mz3e4a1O}G z*J>-e&@i67PUCisDZ$|vJs=nVPDB+Bzo@|1)E_je@IMjgH2?R9#1^mx{wg2dqr=CV S&PVM40000k zxE68p4~fHJThQKe4e~;>^j-!M+;_XjyZ8Cr@BQxGIWn0H-Aqqc>9&9^U<=p+od^h# zFoj5%T@er>VP5RMGxGM(v52yOgje-6(^?)W5{(DUXgr`S(yIzz95|z@JIUU^u&@!K zs;7ZL!a+X(QsQ*&)?sB$ht;p4eDYN69Nq9Tt>u}Rbs{bY8Cr5R%}-vZu_9t=3+l@b zaBwnN8?S>;jczyG6Ati&b8c@wp$=X!dza7kc!O!e3o4|yg$Naas{K^^45AF zpUvV8KLU`7&3p@gdfr!tTNaQK09UX5xX1f23I;xp)&y38D+$!c=g}HK^7bP?HW^pTM{@r+;ae|Z|>B(dANCw&!bT+mz3e4a1O}G z*J>-e&@i67PUCisDZ$|vJs=nVPDB+Bzo@|1)E_je@IMjgH2?R9#1^mx{wg2dqr=CV S&PVM40000KcoE?{fb z_`%`+Xk>mjWE8?ptk{aaS&|7i|UmRP)H3ibNbx)&zuBG=-^T)j@NO0fn;O?H!y>~C1qg*bt%5ko=ZUbz94X^==0EEaJLgbB= z0EEaJk2eFhKb{tbCV4wem*vDo$H30dBOQ z4}iiCBAU)RtlZP`3dko15IHvhZM}rZxzYAE&GWRN4=w1kydstW!^;kkzB@1>GX8mb zJ93SLWD{pI5p!RG5P9R|JWeqa0x*|dZw02t{q)6f>cT@r_(k zIc^ys5dgi$K7NmjN~cHI@BI~4i7NqyC+zo*gyivf{N?qFMD}6kZkP*bwi+~B4Pr5E zCZy9J;P?^%JHQD7M=h5Lt+DLz_R8WiA%^T2me}B00000NkvXXu0mjfEl0+d literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.357/box357-practice.rsi/box357-practice.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/.357/box357-practice.rsi/box357-practice.png new file mode 100644 index 0000000000000000000000000000000000000000..b927c72ad0d7f4f11a83e3571daacdf5694a7fc1 GIT binary patch literal 453 zcmV;$0XqJPP))&zuBG=-^T)j@NO0fn;O?H!y>~C1qg*bt%5ko=ZUbz94X^==0EEaJLgbB= z0EEaJk2eFhKb{tbCV4wem*vDo$H30dBOQ z4}iiCBAU)RtlZP`3dko15IHvhZM}rZxzYAE&GWRN4=w1kydstW!^;kkzB@1>GX8mb zJ93SLWD{pI5p!RG5P9R|JWeqa0x*|dZw02t{q)6f>cT@r_(k zIc^ys5dgi$K7NmjN~cHI@BI~4i7NqyC+zo*gyivf{N?qFMD}6kZkP*bwi+~B4Pr5E zCZy9J;P?^%JHQD7M=h5Lt+DLz_R8WiA%^T2me}B00000NkvXXu0mjfEl0+d literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.357/box357-practice.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Boxes/.357/box357-practice.rsi/meta.json new file mode 100644 index 0000000000..6b76fbc8b4 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Boxes/.357/box357-practice.rsi/meta.json @@ -0,0 +1 @@ +{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/89456d18dd3e7c330839121e3c6bc8c609700137/icons/obj/ammo.dmi", "states": [{"name": "box357-practice", "directions": 1}, {"name": "box357-practice-0", "directions": 1}, {"name": "box357-practice-1", "directions": 1}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.357/box357-rubber.rsi/box357-rubber-0.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/.357/box357-rubber.rsi/box357-rubber-0.png new file mode 100644 index 0000000000000000000000000000000000000000..00fa197d658a78846827f57efa5345a16bb51c40 GIT binary patch literal 402 zcmV;D0d4+?P)IGoRe|kg z;mL#j$umHybZq^JfP%MQ-vLk}cIDm&c&MC-L@deAXcivK%i#$C(Rvk$h_-+ZJQ!UO zttQlgKPGpk_PuNoFI%Kgz6x#Bg#wOK^K*7y1XqbQ8;g$Dt3bzf$=P{wcK%oRY5PkI z2f-9{To-`1!6%V;f>^V`D3zWAOW-1bU`DC*6iBUS;oiqHPj@$=O}J2?*YDEncgbXq zLPf^IK9P7r1P8$wo?l%10K?rqylipqeY9Sk2RA4s24~-PQ7J*gse=j6PzzD1>-<_4GwI?MFmH+?%07*qoM6N<$f}A##_%TTT0JVQW7r{ZK;MA?4U=jS7O0m+hgMuPL5!9iJARMKNh+sE6bm&qF z1w}FiT;gQGP-p2R1|$w8CAQk+tWbpfwj9YlPu_bkIbXF}rJot-E8P?D1Uvyxpcerl z@}>}Zvo8WdPi{#V?>hxB+^+E;4HoAb2F#U?cdOP^J3-_MGrC;(3qK@KwSH|S;%(WKU`>zIf=Mh z0(;p3j!tKr<2LyD^vIWIjA#-gnk1gu>$)tCOCUtvTua0#WEM0L#Fo1nhYWN4|ip z>vp*De9OhjVb>;f6sYNs)bvM|mR7ood^B_h{Q)UBNNmHcoqZFaF*?=S^Y#oEvMm9( za47*R*0%bHAAc(#1BYMqfHiqMwc8;g3x{7+pgr~vjV%061bWT?J&A##_%TTT0JVQW7r{ZK;MA?4U=jS7O0m+hgMuPL5!9iJARMKNh+sE6bm&qF z1w}FiT;gQGP-p2R1|$w8CAQk+tWbpfwj9YlPu_bkIbXF}rJot-E8P?D1Uvyxpcerl z@}>}Zvo8WdPi{#V?>hxB+^+E;4HoAb2F#U?cdOP^J3-_MGrC;(3qK@KwSH|S;%(WKU`>zIf=Mh z0(;p3j!tKr<2LyD^vIWIjA#-gnk1gu>$)tCOCUtvTua0#WEM0L#Fo1nhYWN4|ip z>vp*De9OhjVb>;f6sYNs)bvM|mR7ood^B_h{Q)UBNNmHcoqZFaF*?=S^Y#oEvMm9( za47*R*0%bHAAc(#1BYMqfHiqMwc8;g3x{7+pgr~vjV%061bWT?J&h9TR`&Q|G-KqJryGy>}gC^d+c8pP`g?AC=_ z2j*f7;QJTGp9pC9=esLcuG6ERs||zX zTqaVf39G=ru3l61lTLCx+xE&vEfr8|5IdeLg6oX(x5xzm#!-ahxj3HtD}3+qPz(n_ z6ON+@fTN&Ky9Fb_GV@>wTqLj@%S?mxJPUvMgyV2^6P5~0XA`Eg3El4bN|E_Dv|BQG zC4qB^~F literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.357/box357.rsi/box357-1.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/.357/box357.rsi/box357-1.png new file mode 100644 index 0000000000000000000000000000000000000000..836bafb06719127b52cd1bca2bc1c39cd6680a2a GIT binary patch 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^solxF6m119Ed>$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^solxD@J@DE*DeU7qLu_mb0sAYhj{*eQK4pd#RUe%5MtvYiOHo}ZmnkIQ1q z2`s|vjV5JPK}cX5BNrA}1uv@#g#z0gxsbqQoECOIJUYSk{LJ-yB(iWRfyp>!aXXd) z2Z<@jKYs5#W&rwWbz?XP9L1}$c+#oDHxei-fA3bj7uXB@JAo;w9G{P$;=()t0000< KMNUMnLSTaQhOwjo literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.44/box44-flash.rsi/box44-flash-1.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/.44/box44-flash.rsi/box44-flash-1.png new file mode 100644 index 0000000000000000000000000000000000000000..cd17ee8a38111b2b241206071b00562e23adcba9 GIT binary patch literal 441 zcmV;q0Y?6bP)oVg{tYcs_C9H;qyAt ziL}3j(G8($*Z^1O2a3piW!k?WlPlQKSmMX~X2T-wFA>kC=owEmp5HLKAzEwuh=_RV zgulV#*%YV8@1*@D_96k-1v*urT+Azv5BF2y&a)M)P^))bFUEBZG#eIxR5-ZYf^sph z0Gym1Vg)PG;2?MkjJipuWy0}4LLv$m5*YN`j2=fBa1hu6=i?XoYa1Z29iABuE?V)p80~ak;WG)y jiobU&UJ5J){++-V!{E^q&Lx2G00000NkvXXu0mjfBZ$F{ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.44/box44-flash.rsi/box44-flash.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/.44/box44-flash.rsi/box44-flash.png new file mode 100644 index 0000000000000000000000000000000000000000..cd17ee8a38111b2b241206071b00562e23adcba9 GIT binary patch literal 441 zcmV;q0Y?6bP)oVg{tYcs_C9H;qyAt ziL}3j(G8($*Z^1O2a3piW!k?WlPlQKSmMX~X2T-wFA>kC=owEmp5HLKAzEwuh=_RV zgulV#*%YV8@1*@D_96k-1v*urT+Azv5BF2y&a)M)P^))bFUEBZG#eIxR5-ZYf^sph z0Gym1Vg)PG;2?MkjJipuWy0}4LLv$m5*YN`j2=fBa1hu6=i?XoYa1Z29iABuE?V)p80~ak;WG)y jiobU&UJ5J){++-V!{E^q&Lx2G00000NkvXXu0mjfBZ$F{ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.44/box44-flash.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Boxes/.44/box44-flash.rsi/meta.json new file mode 100644 index 0000000000..a84e5636b4 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Boxes/.44/box44-flash.rsi/meta.json @@ -0,0 +1 @@ +{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/89456d18dd3e7c330839121e3c6bc8c609700137/icons/obj/ammo.dmi", "states": [{"name": "box44-flash", "directions": 1}, {"name": "box44-flash-0", "directions": 1}, {"name": "box44-flash-1", "directions": 1}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.44/box44-hv.rsi/box44-hv-0.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/.44/box44-hv.rsi/box44-hv-0.png new file mode 100644 index 0000000000000000000000000000000000000000..67541b8bb649bba295d3b0cf199a04e1fa4a9a14 GIT binary patch literal 423 zcmV;Y0a*TtP)#Slbef!D70IPA0V__I*6Y_5P~31b!wNs1xkkw zLWkDQet>h3lv-(ecfC@S{>FrVp6CAelC!GSD(lSFTIm}B9Rbe|M6OU0YZ37LKpY)3P}Appr#0)V&LJ1QbtC*dp{pwkHHG(ud* z#&vAz1-ek6QZ8CA&rh-N*+gBCiS!z1HTwXu@MJ2X1P93}sFaHq!1c{JV&~NuTv{MX zy%y5$4M?1PaB+3HG#oUyVY@fra~Mt}9_}B1ydRIcldi2qAWFR!PS%DF91LGbRN+bj z<58FC?PvlH3R4h$Jd-~b0Jmq$!$IOGo|oy9P8YtEfT{ewTk%F@fR0^Ugc(j#es_m}bmPl|B>jBA^?llSpTssR-zX z>1=MTs$$Ct^uvRp2&%FmBru7U3kwW_tIEPqfl01hNTAbh44u5Ryn$|*j&7KqGcoUV zq8o8v9?SNl8#n+L$$d>`zBcM#kVt2pU?}qAeXZIg?#mNS#b{agR3F~4Y(Gznd&r1* z>V&_+!>Jgj$6eySJUf9E;Q}2gP{?JpyW5+QaQC^nc1gMNCcGHo8mLv907~H?xCMn= zMgurGJLDx0Rt5*jQ(#r)dA`4L{UtND2@3b4e ztW89~4XaY`)rJ>1D87)$!leW{?FRkFQ3V_%w!r;(D7otZoF9x22Z2^RDEd2{SNK>0 ks^ah6ie~~dfqy6P1!GUq+71RW-v9sr07*qoM6N<$f~&^CuK)l5 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.44/box44-hv.rsi/box44-hv.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/.44/box44-hv.rsi/box44-hv.png new file mode 100644 index 0000000000000000000000000000000000000000..ed485e993a0c8d2efbb4f0a4871870d6988e8ec2 GIT binary patch literal 442 zcmV;r0Y(0aP)@fR0^Ugc(j#es_m}bmPl|B>jBA^?llSpTssR-zX z>1=MTs$$Ct^uvRp2&%FmBru7U3kwW_tIEPqfl01hNTAbh44u5Ryn$|*j&7KqGcoUV zq8o8v9?SNl8#n+L$$d>`zBcM#kVt2pU?}qAeXZIg?#mNS#b{agR3F~4Y(Gznd&r1* z>V&_+!>Jgj$6eySJUf9E;Q}2gP{?JpyW5+QaQC^nc1gMNCcGHo8mLv907~H?xCMn= zMgurGJLDx0Rt5*jQ(#r)dA`4L{UtND2@3b4e ztW89~4XaY`)rJ>1D87)$!leW{?FRkFQ3V_%w!r;(D7otZoF9x22Z2^RDEd2{SNK>0 ks^ah6ie~~dfqy6P1!GUq+71RW-v9sr07*qoM6N<$f~&^CuK)l5 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.44/box44-hv.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Boxes/.44/box44-hv.rsi/meta.json new file mode 100644 index 0000000000..d0c396314f --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Boxes/.44/box44-hv.rsi/meta.json @@ -0,0 +1 @@ +{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/89456d18dd3e7c330839121e3c6bc8c609700137/icons/obj/ammo.dmi", "states": [{"name": "box44-hv", "directions": 1}, {"name": "box44-hv-0", "directions": 1}, {"name": "box44-hv-1", "directions": 1}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.44/box44-practice.rsi/box44-practice-0.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/.44/box44-practice.rsi/box44-practice-0.png new file mode 100644 index 0000000000000000000000000000000000000000..4f307e7df1107122812ba903db7ad0a57d20d366 GIT binary patch literal 423 zcmV;Y0a*TtP)YE0EfSb58x(FlEF!6(SndEi$kFZ1t&KV1jV6(LyHd(+ASSKUqTRq;8^L9E^TR` zQz>pOMfwbJkc3)kdUw52l>WxR<@@rxKRKgTtFg*#tdzbMP!VukFDw+x;YtJ?*9#90 z_jIx41Sa9xTpnF52nj6X%Y_AI!F9EeD6q^g7ZMl^yNQFhclL2yFLYc_xrt5Hfl+MB z1isq>xW7FyWX2ow{so0%In3trzn-^SJ#5RQ(+mJeXHo#X`ya@ND4m4UaDYxTpwkSn zEfd=^g%{{tfoi2>yuH38!lx6pAQIs<&~Ehr65;7gN(v5wQ&6px41nvKQ;z%3+Tg+h zQ5t?geK6*3tH;^p`ND8e+=lhRm`^{5B_1DswlW%aB2JEkcWgLq7&vMClJWbP!G`=zoYHID()>5xkpD zkenO>DMiAezu=lqj8fm7Po(fW9rt+m`MmG@zVAJyTrM-uSeh$+A>c(o)pR?Z&D(Pk zP&M7&-r1DJb|)|lk3{3h%7T!P@HcoYljQvPla#;6UU);eKqm^63OVKJ@nIs|d2R)-sTi-qixIAYy43=Z3J1Y0 zC>3%Fz}dwSf#rQ^aA5%_Ort@y)2Ckx;!D(~hJ(jrSnc%rFd7iP!B2JEkcWgLq7&vMClJWbP!G`=zoYHID()>5xkpD zkenO>DMiAezu=lqj8fm7Po(fW9rt+m`MmG@zVAJyTrM-uSeh$+A>c(o)pR?Z&D(Pk zP&M7&-r1DJb|)|lk3{3h%7T!P@HcoYljQvPla#;6UU);eKqm^63OVKJ@nIs|d2R)-sTi-qixIAYy43=Z3J1Y0 zC>3%Fz}dwSf#rQ^aA5%_Ort@y)2Ckx;!D(~hJ(jrSnc%rFd7iP!As=7>1veF8+ej%?zCiO6wFTWEG?!bSiWxg$|{IZc4ic-QrLR{SSpgsB{tRq#aZY zI5~8bZ2br6AQ5XZ-km3*#dl1&JkNc1_vMUsyG@eWNtC`7P!VukFDzARVIl&K>xD%+?7uaneoP|e?h5I3-g8IujhmQ7~3)#_Iv=cxeNgBolj&$lse%e9AMb<8TNc^ z%fz-!;SIV{pi!?HZ?7-0@Wn(`5Q*>}81%;gvG8mzBLxS+C1}*E2Efhj8BeK4oa<=SviJcg-OlkQh~Ch_?2{NsHv8O^G;5rHV(jz8NQDsa$zA(4ek z2?Uc7^T$yK93++?`uJ7(e%fGi>9ye?(2AF3zSF6~*Amc`zjrI%3Ty@boxnGd0iNnP Stl>WZ00001-JTv|ibbW_!I$Ca3O zI?;-_Cy&wgp=y`_C&@j<&U|ImzaWv$nt@>W$NPG%Mck7ol#20U+);aY#c2C@TG+*o zh@(#U8$6VXaTI+g?#Z+5Ul!h=BLxb%jBD5#9s!S_?ob90Zr3 zkjp3lhsXP**6*dkg$1lIstw$wB0C=!xFU~Z!@=P(beD=4Z(i_U;)+1!{Oa3yx6|xZ zZ6X3z7}Z8^Z#aR21-JTv|ibbW_!I$Ca3O zI?;-_Cy&wgp=y`_C&@j<&U|ImzaWv$nt@>W$NPG%Mck7ol#20U+);aY#c2C@TG+*o zh@(#U8$6VXaTI+g?#Z+5Ul!h=BLxb%jBD5#9s!S_?ob90Zr3 zkjp3lhsXP**6*dkg$1lIstw$wB0C=!xFU~Z!@=P(beD=4Z(i_U;)+1!{Oa3yx6|xZ zZ6X3z7}Z8^Z#aR2A#feuvUAL#Kk$I%P^nK?*{rcIwihv|u;I4-j;VLn-t-6beCbOsBX+$$^tY zNAXjngGAI~ygN^%#ow6l=6UYDKRGK5L-v`Yz0wZ?Is%>_q_ui0-HU+d2kFJ-nJKoK zz#_a{sbZ=NQUbdexwODKxT!AW3hZ*^QUcS-D7X0J^c>F*QqK>xJ8`UAn8kH$VAd^w z=F7FEQg3bg7u4#lv|OqFdOjSCaUGi^7624W1pvOHZ&XCIPQq0j9A=`Cg7kj z1=+{DSG^RL&2`}*aTKr1;z_3q-%7w#{@$(lAaD@)cLG1&f}m8ndtp@o0000gg3w|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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.44/box44.rsi/box44.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/.44/box44.rsi/box44.png new file mode 100644 index 0000000000000000000000000000000000000000..a36da3f38cc20b7a03b8f38e9535ed984a156f52 GIT binary patch literal 436 zcmV;l0ZaagP)gg3w|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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.44/box44.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Boxes/.44/box44.rsi/meta.json new file mode 100644 index 0000000000..f76b4efc13 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Boxes/.44/box44.rsi/meta.json @@ -0,0 +1 @@ +{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/89456d18dd3e7c330839121e3c6bc8c609700137/icons/obj/ammo.dmi", "states": [{"name": "box44", "directions": 1}, {"name": "box44-0", "directions": 1}, {"name": "box44-1", "directions": 1}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.45mm/box45-flash.rsi/box45-flash-0.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/.45mm/box45-flash.rsi/box45-flash-0.png new file mode 100644 index 0000000000000000000000000000000000000000..e9c470da940f788a60590c37b72232729c547ff2 GIT binary patch literal 457 zcmV;)0XF`LP)A#esHw4~xg3Ji(6ON{8XFR^$tZ4ch=PVdbTER5z=m*;!e}Ut7H20N8cj=% zAR@8B&B+#9uIc<+=XWZJaKGj5zI)+$?&IbCPReGpj5Ch0(rp1-z!sQjfpjXOr&AGq zSb?cQ;Va&S<~_j1_ObLY0tWms{|`psx$wO854Q!i5A339VGXQLVAQSm*7j{%c)8Ry*Jy zpRb&sn$HKzbHM4D1!zhb&+TiX@V)|C`3tRFMA=+670KkjSzDd94DTxtj>RQ_ljwmC zAkXyHI6bpuaIn;!?5FV0XXzXWiLt-4Yxuj$$J*Wk(0Nx|j#xGG3!t zX%J0bTRxBm66h8I27(VQFp5m>ACWC!3ydm1mL0kufApNQ00000NkvXXu0mjfn{~`P literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.45mm/box45-flash.rsi/box45-flash-1.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/.45mm/box45-flash.rsi/box45-flash-1.png new file mode 100644 index 0000000000000000000000000000000000000000..dab0167c65ddb89a26283b082691011fc717ec81 GIT binary patch literal 494 zcmV>85}wU<&+efn+S8 zC1U}tB?8GS2L&G+PhHWgb>i0)O z0oj=!=ccP7BH}6NMYji%v4H0FOmVWc08j&WPPlNAsDX=77T!<*K+RP{l0Bg2GN`!>m&F0P`|RAOpTDhhTN5?#$KoB^;dR|6H1rw*SR7pdRS9wY z`J61gp@5oyLCt6JPTF-vPS4*M8|^R*Zz$joMHGOI;F1Pl?X0h{IJ!7JuQUY*$sX{B zB8op0QL=?s<`>I9)@>d=8-jy@FX88eymK1B!A=hVdyxv+!Yjf3LqqVU1-^;^O~HRH k@E7^NJ0erS6!@#W0}UANz;up;(EtDd07*qoM6N<$f-zgw%>V!Z literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.45mm/box45-flash.rsi/box45-flash.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/.45mm/box45-flash.rsi/box45-flash.png new file mode 100644 index 0000000000000000000000000000000000000000..dab0167c65ddb89a26283b082691011fc717ec81 GIT binary patch literal 494 zcmV>85}wU<&+efn+S8 zC1U}tB?8GS2L&G+PhHWgb>i0)O z0oj=!=ccP7BH}6NMYji%v4H0FOmVWc08j&WPPlNAsDX=77T!<*K+RP{l0Bg2GN`!>m&F0P`|RAOpTDhhTN5?#$KoB^;dR|6H1rw*SR7pdRS9wY z`J61gp@5oyLCt6JPTF-vPS4*M8|^R*Zz$joMHGOI;F1Pl?X0h{IJ!7JuQUY*$sX{B zB8op0QL=?s<`>I9)@>d=8-jy@FX88eymK1B!A=hVdyxv+!Yjf3LqqVU1-^;^O~HRH k@E7^NJ0erS6!@#W0}UANz;up;(EtDd07*qoM6N<$f-zgw%>V!Z literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.45mm/box45-flash.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Boxes/.45mm/box45-flash.rsi/meta.json new file mode 100644 index 0000000000..3a7cab3cdb --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Boxes/.45mm/box45-flash.rsi/meta.json @@ -0,0 +1 @@ +{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/89456d18dd3e7c330839121e3c6bc8c609700137/icons/obj/ammo.dmi", "states": [{"name": "box45-flash", "directions": 1}, {"name": "box45-flash-0", "directions": 1}, {"name": "box45-flash-1", "directions": 1}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.45mm/box45-practice.rsi/box45-practice-0.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/.45mm/box45-practice.rsi/box45-practice-0.png new file mode 100644 index 0000000000000000000000000000000000000000..f1bb30648f5ab5f7e6484125dccd3be32d709d7c GIT binary patch literal 457 zcmV;)0XF`LP)~9E*Y3=FT@Ji12l3#cX`_x55Z(D_sw-l|sDfEcn=qA(=xV@E;_-Rt zTWAlU-3K?GqHqwXK&hBV4fs(5{sDM5gXI^63ket!rD7gitqEcnC%)5!e(5m^G3z_juWBXYYSFDo4V00000NkvXXu0mjfIv>Xl literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.45mm/box45-practice.rsi/box45-practice-1.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/.45mm/box45-practice.rsi/box45-practice-1.png new file mode 100644 index 0000000000000000000000000000000000000000..4d6507596c83706cb87d1d873e144f73d83c5a39 GIT binary patch literal 491 zcmV72g8MGV9lyKJ=e_s4yC)@+Nje!vN9neJEno}$YXLbP zQssC^?TCOJ52^b*!#K*7KZ{rv(BO}mYo-To&_uFF0X2IRuq@KuDm<5dVt#w&OXP{c zu2}%mUlLPWQAy;PlIYK<5j>Z!!Hr3mD~N~)ErAH!<*nlKR`q*4?tVP(eq#Pr(`9KY zAUg7Axmy>}qRoO?OnX3%hg9Fn5?6--fI9fpf(NM9!L_3(yr}?yQp_{990kxtKH;@! zqt*mO;UL%pN->X8%#(Q-rEh40+uX~qbuMqU4xYVx#UHycZ9+@0A;8F_6F`^H&W+bZ z;Y|gU(kn`-fNycaR3wplXKtp)GQ6okFdUHp_I5W_fbrg+H6xQw5-DrbZj4Y51j7+2 z7>-DV`#07%$_?udE?+Fc!NQl&n6Ph61voo)18@?lP`H0%_w?Knyk&v!B0x*j1h6&K>{&002ovPDHLkV1ngy)baoT literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.45mm/box45-practice.rsi/box45-practice.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/.45mm/box45-practice.rsi/box45-practice.png new file mode 100644 index 0000000000000000000000000000000000000000..4d6507596c83706cb87d1d873e144f73d83c5a39 GIT binary patch literal 491 zcmV72g8MGV9lyKJ=e_s4yC)@+Nje!vN9neJEno}$YXLbP zQssC^?TCOJ52^b*!#K*7KZ{rv(BO}mYo-To&_uFF0X2IRuq@KuDm<5dVt#w&OXP{c zu2}%mUlLPWQAy;PlIYK<5j>Z!!Hr3mD~N~)ErAH!<*nlKR`q*4?tVP(eq#Pr(`9KY zAUg7Axmy>}qRoO?OnX3%hg9Fn5?6--fI9fpf(NM9!L_3(yr}?yQp_{990kxtKH;@! zqt*mO;UL%pN->X8%#(Q-rEh40+uX~qbuMqU4xYVx#UHycZ9+@0A;8F_6F`^H&W+bZ z;Y|gU(kn`-fNycaR3wplXKtp)GQ6okFdUHp_I5W_fbrg+H6xQw5-DrbZj4Y51j7+2 z7>-DV`#07%$_?udE?+Fc!NQl&n6Ph61voo)18@?lP`H0%_w?Knyk&v!B0x*j1h6&K>{&002ovPDHLkV1ngy)baoT literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.45mm/box45-practice.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Boxes/.45mm/box45-practice.rsi/meta.json new file mode 100644 index 0000000000..d1d9a3e821 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Boxes/.45mm/box45-practice.rsi/meta.json @@ -0,0 +1 @@ +{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/89456d18dd3e7c330839121e3c6bc8c609700137/icons/obj/ammo.dmi", "states": [{"name": "box45-practice", "directions": 1}, {"name": "box45-practice-0", "directions": 1}, {"name": "box45-practice-1", "directions": 1}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.45mm/box45-rubber.rsi/box45-rubber-0.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/.45mm/box45-rubber.rsi/box45-rubber-0.png new file mode 100644 index 0000000000000000000000000000000000000000..290ebc79908a42e3bada568b881890ab1363fdfe GIT binary patch literal 457 zcmV;)0XF`LP)3&KnL_n2_+On2?Yn>{TXh*C|pRul+Y_BmKsg`8!bLRTEEuiWpx1F zt-o@cN?Hz~?R~)QaRKxs%;)|!QTSK^z4nD(E2A82S&HO}UG{cXY{SP2s0mF1NXDZE zz~<^`joafQS8PrM2f-Oo6PlzZG^t$ga2jd+S$A>YvIPg5Td|pha$*2nr`7?u)S8s* z9pdR5+XvD_0>dJ}MDVEvW|77HBXR^Bfm!7n*-5)H3j{I-00000NkvXXu0mjfT;ReL literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.45mm/box45-rubber.rsi/box45-rubber-1.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/.45mm/box45-rubber.rsi/box45-rubber-1.png new file mode 100644 index 0000000000000000000000000000000000000000..ecbc57cf2f868d1d83c18ee8686fb0df3c4b55c7 GIT binary patch literal 498 zcmVx>waoWrB zx@@^EwgRFvpLzokvC0WakeoJ7KwP3Y(`1n3{_ z1Sm_G$KTJ1!fgfg>^pikjemZ`QsnBk#LQ%yW4Nt=98x5J@b-oQFx39Lrhl}PtJ^|N za1iVPIiyH(NRiUH4_4P-tJdwFzBz(}gE!&#g#0T8z)_?dfCHsKI`_f$;jtrl%>q9~ ofSTZS3p67C_m9XGa0MEbPk`?1Q;}%AOaK4?07*qoM6N<$g0w>59{>OV literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.45mm/box45-rubber.rsi/box45-rubber.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/.45mm/box45-rubber.rsi/box45-rubber.png new file mode 100644 index 0000000000000000000000000000000000000000..ecbc57cf2f868d1d83c18ee8686fb0df3c4b55c7 GIT binary patch literal 498 zcmVx>waoWrB zx@@^EwgRFvpLzokvC0WakeoJ7KwP3Y(`1n3{_ z1Sm_G$KTJ1!fgfg>^pikjemZ`QsnBk#LQ%yW4Nt=98x5J@b-oQFx39Lrhl}PtJ^|N za1iVPIiyH(NRiUH4_4P-tJdwFzBz(}gE!&#g#0T8z)_?dfCHsKI`_f$;jtrl%>q9~ ofSTZS3p67C_m9XGa0MEbPk`?1Q;}%AOaK4?07*qoM6N<$g0w>59{>OV literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.45mm/box45-rubber.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Boxes/.45mm/box45-rubber.rsi/meta.json new file mode 100644 index 0000000000..562a647cdc --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Boxes/.45mm/box45-rubber.rsi/meta.json @@ -0,0 +1 @@ +{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/89456d18dd3e7c330839121e3c6bc8c609700137/icons/obj/ammo.dmi", "states": [{"name": "box45-rubber", "directions": 1}, {"name": "box45-rubber-0", "directions": 1}, {"name": "box45-rubber-1", "directions": 1}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.45mm/box45.rsi/box45-0.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/.45mm/box45.rsi/box45-0.png new file mode 100644 index 0000000000000000000000000000000000000000..dbb0cf05939538d896e1bed731871783d439e837 GIT binary patch literal 453 zcmV;$0XqJPP)-9-(b8f=Lr9^twz#x7orGg)$w5RQ zE^b0#5VpJqIXkt^cPfc+UpVgGyB~Z$_xSPNDTZM%%J@b~_XIovPhhMCGO4J@q@rR_ zfr)gTxA$r2@JZM%Th^aCcgr>H^^DnSr zI5(l|eIO9@1GFTpv3*V!-c!IVe_)o2=vzyUBH7#*Ypav4;XMT+@q_|!8aoyM^Hbe5 zfuNskuGSYEBzqtdPbiUiLMc`n>>XAAtUJ4@yMlwut=LLj-xUB?=Q99YBx)2Z4Pwb_ v*9THx0-Yj2U+{qihLQ38Bk}}1fnntvfZMulZ(Fuq00000NkvXXu0mjfWH88? literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.45mm/box45.rsi/box45-1.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/.45mm/box45.rsi/box45-1.png new file mode 100644 index 0000000000000000000000000000000000000000..0d5caad0fea90cf2413987a70c2422bd6119ab2d GIT binary patch literal 487 zcmVw}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`mV2w}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`mV21t{e}F&2NfGQRF8&55?c~zwKwNZE)DtOKaIy{}bU6o|v~W-a$8#v^&{mXl zs&o|hE>3Z=XDrnwxk6F$PT>p5^CW!a&WWOkVP<5gbSq#5tiZnzC=@HAP^<{k^`mLw zE31p2?H{f3DY)`h@EyJ`CCmswJsbqZXgVNF+VfT`^z~uXB$01x^QKI4!l}xCbe!66S$H< z82G}=Wtp7H^qij^yH7g5lk2NcsR2Q;2jZs&0A4N&K8~yrpRXs42wD|xlrI@b~u8v;-0000A!oKY*V=Cl~*q%^>1;&_(OwQb7vhqJt=EMGF?{VjW7MOWm~)C_=%dP>OMA z6(wCPbZHUy?r~5i&RN_}coy`#5I<>~73yGG}P2SFs!JPCAuCMnp-#4X;(J&itsZJLALs7-xx{UnQh_ zpj+kcm^Tl?=SlT|k&W6xeYs=KU9~J6B%XkgjoPz;5=ToWrIXcfL9%dRfe-lnR+y%F z&CF2ki--yw1YUuWjoOiL2nf+M6I4qrmq-h3@RoGyiJ(5>>?vFsLJcS+0AM}d0WdbP z&G;~mh&H)Gxl#wFmEghx-9$3y7ai-eaA^Uz$Xn&!;LxLw(aW=?1Q!yp8f`L{_dl+y z!a?FHK0esA0V0c20F*0rtVWx?*r_sHO5n2y;2EwY(ChsDKO$ei7x0=_0Xn8j0E@ex P00000NkvXXu0mjfZc)99 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.50/box50-flash.rsi/box50-flash.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/.50/box50-flash.rsi/box50-flash.png new file mode 100644 index 0000000000000000000000000000000000000000..06841b0c6aa577244d41668fc536b56da0d9538e GIT binary patch literal 421 zcmV;W0b2fvP)A!oKY*V=Cl~*q%^>1;&_(OwQb7vhqJt=EMGF?{VjW7MOWm~)C_=%dP>OMA z6(wCPbZHUy?r~5i&RN_}coy`#5I<>~73yGG}P2SFs!JPCAuCMnp-#4X;(J&itsZJLALs7-xx{UnQh_ zpj+kcm^Tl?=SlT|k&W6xeYs=KU9~J6B%XkgjoPz;5=ToWrIXcfL9%dRfe-lnR+y%F z&CF2ki--yw1YUuWjoOiL2nf+M6I4qrmq-h3@RoGyiJ(5>>?vFsLJcS+0AM}d0WdbP z&G;~mh&H)Gxl#wFmEghx-9$3y7ai-eaA^Uz$Xn&!;LxLw(aW=?1Q!yp8f`L{_dl+y z!a?FHK0esA0V0c20F*0rtVWx?*r_sHO5n2y;2EwY(ChsDKO$ei7x0=_0Xn8j0E@ex P00000NkvXXu0mjfZc)99 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.50/box50-flash.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Boxes/.50/box50-flash.rsi/meta.json new file mode 100644 index 0000000000..788923bc3a --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Boxes/.50/box50-flash.rsi/meta.json @@ -0,0 +1 @@ +{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/89456d18dd3e7c330839121e3c6bc8c609700137/icons/obj/ammo.dmi", "states": [{"name": "box50-flash", "directions": 1}, {"name": "box50-flash-0", "directions": 1}, {"name": "box50-flash-1", "directions": 1}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.50/box50-hv.rsi/box50-hv-0.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/.50/box50-hv.rsi/box50-hv-0.png new file mode 100644 index 0000000000000000000000000000000000000000..f2019f98b6f42de96f5d28c8d3b20ed8fdf84d12 GIT binary patch literal 393 zcmV;40e1e0P)1t{e}MnM#jOZd#l_#?q@7$k9f*rg7WG657M-kv2wl!WCoLQl!LbfS9ZE&H ztx}xCy^B*^>={e7$#;dK+&hIYB+rxZkvpeatuoAv43(Y;Bm#-RzYr)CE2>beDCzpq zxbT(L#m{kB0c@@p3|tVYn3y#V0rR^~)-V}X7mQn#fNHId*=VzsI8ug7349g-T*H+FdY!-jN8|~30&epP$ke8P_nNL_ P00000NkvXXu0mjf2*S5c literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.50/box50-hv.rsi/box50-hv.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/.50/box50-hv.rsi/box50-hv.png new file mode 100644 index 0000000000000000000000000000000000000000..561b152c6d0c32e75ccd22522e86fb06fdbc3266 GIT binary patch literal 421 zcmV;W0b2fvP)#fNHId*=VzsI8ug7349g-T*H+FdY!-jN8|~30&epP$ke8P_nNL_ P00000NkvXXu0mjf2*S5c literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.50/box50-hv.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Boxes/.50/box50-hv.rsi/meta.json new file mode 100644 index 0000000000..e6d51dea12 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Boxes/.50/box50-hv.rsi/meta.json @@ -0,0 +1 @@ +{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/89456d18dd3e7c330839121e3c6bc8c609700137/icons/obj/ammo.dmi", "states": [{"name": "box50-hv", "directions": 1}, {"name": "box50-hv-0", "directions": 1}, {"name": "box50-hv-1", "directions": 1}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.50/box50-practice.rsi/box50-practice-0.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/.50/box50-practice.rsi/box50-practice-0.png new file mode 100644 index 0000000000000000000000000000000000000000..ff4f04cfb1759e90dc672fe9f656a35a424215e9 GIT binary patch literal 392 zcmV;30eAk1P)1t{e}J>In+R6L#oyqhH@S2=5Eq>k>xmRvaIy{}bU6o|YT=*=j^|L+p;VOH zD%}+KE>3Z=XDrnwxk6F$PT>p5^CW!a&WWOkQD$tUbSq#5tiZnzD3)rXSgHxr_2X&b z>l-Vd?H{pRDAP`iomg#s_fqfiE(1Yu{?}sdeF?aRXuCi>3J~-k&eHIp6LJ(uFGvbm8?zE2;I0n81|; z!oU|^)@6Do(|3Mh;y&s8ZmzFFr3M7W9*Ccs0C-s!fbv-dfUjFwG=eJ&3=%PgYYWIC zazB{DVMrgNx7XMRt|Sn*JCrXUew{akgT_-_*xwQW-s&s>^+t=h-65AhGKOmj^ojtf m;YI?(&fotdvI15hZ9V{|?3v-MCRCIF0000ty#YFRi)JOMoy6|=qyhf4;Pqt$OgvT(-&AMp9D5KZHP znc;^oA}Vlj@Cx)?RD?r8AV||la$RZJL|SNrS7g$U_yeQXp3=GQr~w@b0GRhT0E|s+ zGd_YPqD`()t<`~PCAedOZX(&!e8;*hTw1^`@>aP!IP~aa^zv*f!5s;hjW*e{+aK3e z;UIAp$M-h{KzMNqfNHId*=Q4q9V^471U`!ZuHi}oz0TkNBk}}10k?Ste1WHZOXh@X P00000NkvXXu0mjflxDcN literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.50/box50-practice.rsi/box50-practice.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/.50/box50-practice.rsi/box50-practice.png new file mode 100644 index 0000000000000000000000000000000000000000..1872d4d7addc6489540357bd2789446e3a46f955 GIT binary patch literal 421 zcmV;W0b2fvP)ty#YFRi)JOMoy6|=qyhf4;Pqt$OgvT(-&AMp9D5KZHP znc;^oA}Vlj@Cx)?RD?r8AV||la$RZJL|SNrS7g$U_yeQXp3=GQr~w@b0GRhT0E|s+ zGd_YPqD`()t<`~PCAedOZX(&!e8;*hTw1^`@>aP!IP~aa^zv*f!5s;hjW*e{+aK3e z;UIAp$M-h{KzMNqfNHId*=Q4q9V^471U`!ZuHi}oz0TkNBk}}10k?Ste1WHZOXh@X P00000NkvXXu0mjflxDcN literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.50/box50-practice.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Boxes/.50/box50-practice.rsi/meta.json new file mode 100644 index 0000000000..95f87e255c --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Boxes/.50/box50-practice.rsi/meta.json @@ -0,0 +1 @@ +{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/89456d18dd3e7c330839121e3c6bc8c609700137/icons/obj/ammo.dmi", "states": [{"name": "box50-practice", "directions": 1}, {"name": "box50-practice-0", "directions": 1}, {"name": "box50-practice-1", "directions": 1}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/.50/box50-rubber.rsi/box50-rubber-0.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/.50/box50-rubber.rsi/box50-rubber-0.png new file mode 100644 index 0000000000000000000000000000000000000000..e9b318398254406b6b3ead2585f4594a13ddc351 GIT binary patch literal 392 zcmV;30eAk1P)kQo{%-3nL%EATG_ihe~D{faPMKb#i6 zvby*=E(?Io{DPyihhzE_%WyfzM`d(Gj09x3fBl}+^YbIgcz3(N;r>QX3GE*E>Ev?m zZXcER)9QgR@I+>6`CCmswJsbqZXgUiF*iNN+w&PWr|Vrox^QKIHoRJIB(+Wv6S$H< z7 mh8qd=JAeO=$O>42wD|y&i8lW@K8EIYU#uibc4XbSj68h?0N^PhPy(^O31ud%U|H<0!H5tAun9 zw5wc#1qi7QESpyVsGA{bg=X-NEYr`-~&Fh7NTyP zGtvL>MMMP-4qkztjauPQ5C~E?5?q%Wf=C0c?}~Kl5r1IN-g8#a9W|gM0RZ#<27sZF zb%qD9MYPdH%9ScGt^{{1&`u8lW@K8EIYU#uibc4XbSj68h?0N^PhPy(^O31ud%U|H<0!H5tAun9 zw5wc#1qi7QESpyVsGA{bg=X-NEYr`-~&Fh7NTyP zGtvL>MMMP-4qkztjauPQ5C~E?5?q%Wf=C0c?}~Kl5r1IN-g8#a9W|gM0RZ#<27sZF zb%qD9MYPdH%9ScGt^{{1&`ucc?x*`DsR>nevSj0jr4J-t~axLOd5e&+9 zk(6Se#%gTLI)-Rw?goOgUp3re=A0QWv+D#wz#ua;P+t*zDm*pJE-Z=lH0MjfhA=@=(@$*+2a6l-rr-%e@ zB;c1kvG4N+7^2?@4jg9tX*Uc!L{L5m>PHCR$y zOM;6M?e5o59cN{|_fC-FzSHA9-urxhcR${pRxB3jW%_zb_XIovPvBn&BvJ({kt$fK z`+aWVOUu*mG(S#jKF8#NMny>0seokSttS-~&Fj7NKEW zGBNP@MMMP-0N#jI!~41{SINp4F`he#8x|AtKZi9m43-g9xT3pJpS0D$>$2f*;? zIwOPFBHGwIvG4N+7^2?@4jg9tX*Uc!L{L5m>PHCR$y zOM;6M?e5o59cN{|_fC-FzSHA9-urxhcR${pRxB3jW%_zb_XIovPvBn&BvJ({kt$fK z`+aWVOUu*mG(S#jKF8#NMny>0seokSttS-~&Fj7NKEW zGBNP@MMMP-0N#jI!~41{SINp4F`he#8x|AtKZi9m43-g9xT3pJpS0D$>$2f*;? zIwOPFBHGwIAh`39G~fB_wJ%aGNA z_yp;6Lz>u_(@3Ro|0!^8_&)AECpT6Q1e`KwC#4$!BVYuKKpg?!pC-OPP3j7q{}$fq zw$o>T@%Y;M69Elh%$ERYk*DXE1mNNRMkHcME~7j=8!Zwjg+!#XKoxj4RYfW_p%f0# za~yh(!|mN;X`>z#@cn5r7!6C|E!(DL+l4jz-VqA`tiq7NXvknREWiQYU*7<})vLfk zFa@hH1Yo=Sq}jM&F<+(X zML*4N$J@eVKh_HYSAHFqydE?*WF+59WqXpT6(On-}v*bbcmU`yOw zpG$7uDY^X`&Vw7x5pSXUnfi^(I{4DGOtyt0HiW$Avg#OVb?GK(1#~% z1$Us`ak7oX!p^z~Tu9(&*kBtpuk8Ink5VDKa0r(Q^anlqgC2>*=|T~6^8QsB0XPU8 zLwlOHg1f|Jd1hVLG)KTK90YE{QXwmq3R%gVjH%Zj=k61MgFpqQ!>)+k8eP*cCu1SF sCxK}ZKp4If0k83Ye@J`*Utm@73GU$BVX zML*4N$J@eVKh_HYSAHFqydE?*WF+59WqXpT6(On-}v*bbcmU`yOw zpG$7uDY^X`&Vw7x5pSXUnfi^(I{4DGOtyt0HiW$Avg#OVb?GK(1#~% z1$Us`ak7oX!p^z~Tu9(&*kBtpuk8Ink5VDKa0r(Q^anlqgC2>*=|T~6^8QsB0XPU8 zLwlOHg1f|Jd1hVLG)KTK90YE{QXwmq3R%gVjH%Zj=k61MgFpqQ!>)+k8eP*cCu1SF sCxK}ZKp4If0k83Ye@J`*Utm@73GU$BVp};Z%N;NE{8rHG` zn?d2*JL%~$K&5h`{fU4Le|vogz!s_A9#{bP=WUUQCixh-;m)M@z5r;pI!Hu(3;2OM z<5$F238ip=LM}@om*wzm*R!Y#1(a%7#d66Lo{H8;MQe1;@yvDiJdglD&oC&KOBBnc zIXJ-Ma|M9YeI6Gtht`&sutiX5ajd2mAqfSij24#`aVRLTp`{kVz=rtd2sCFU3?w)(r0H-eIxZiyDJP@AutV6h&d4S(q!`6fgx$0aIWa0U=VF5Gidg z0z#y;yNhpDzn-TSkrvS5A1`?}Y-MzjNW!Z{5?*PM#Yy36p@si6)Dda1yy*u(m$*63 zS&Xb{G5R$e23HF$-a7E!q_cU9h!|>tEF2){^APlT*ge`F*_N>_5F(}RABM=pw*Ush z*Vm!|Bp<`LUAFGKrAl+`<_uM!tg2XpMXbRhnfPtr&XbQ}01kG96dWXmu&k;8+vhn&JlZHzP^hO8kpkZatJ(YO4Rz?otSb;{fLZewB5ZD_jQmxn8m63oO z61a+8S^!R>=j~};>3_!UvQe$qq~RcO59ra4)mh~C@k?j(IPDH8I7~1D`r?B`WZ^JD t1^%Y@qLGEqL}1$d-yafFz!aEOegLxz*LTkbI;a2u002ovPDHLkV1m_@$<6=( literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/10mm/box10mm-hv.rsi/box10mm-hv.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/10mm/box10mm-hv.rsi/box10mm-hv.png new file mode 100644 index 0000000000000000000000000000000000000000..6bda43eb64fafa7a86a57ae34b3ddf15725e2180 GIT binary patch literal 451 zcmV;!0X+VRP)6Gtht`&sutiX5ajd2mAqfSij24#`aVRLTp`{kVz=rtd2sCFU3?w)(r0H-eIxZiyDJP@AutV6h&d4S(q!`6fgx$0aIWa0U=VF5Gidg z0z#y;yNhpDzn-TSkrvS5A1`?}Y-MzjNW!Z{5?*PM#Yy36p@si6)Dda1yy*u(m$*63 zS&Xb{G5R$e23HF$-a7E!q_cU9h!|>tEF2){^APlT*ge`F*_N>_5F(}RABM=pw*Ush z*Vm!|Bp<`LUAFGKrAl+`<_uM!tg2XpMXbRhnfPtr&XbQ}01kG96dWXmu&k;8+vhn&JlZHzP^hO8kpkZatJ(YO4Rz?otSb;{fLZewB5ZD_jQmxn8m63oO z61a+8S^!R>=j~};>3_!UvQe$qq~RcO59ra4)mh~C@k?j(IPDH8I7~1D`r?B`WZ^JD t1^%Y@qLGEqL}1$d-yafFz!aEOegLxz*LTkbI;a2u002ovPDHLkV1m_@$<6=( literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/10mm/box10mm-hv.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Boxes/10mm/box10mm-hv.rsi/meta.json new file mode 100644 index 0000000000..3e575f4308 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Boxes/10mm/box10mm-hv.rsi/meta.json @@ -0,0 +1 @@ +{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/89456d18dd3e7c330839121e3c6bc8c609700137/icons/obj/ammo.dmi", "states": [{"name": "box10mm-hv", "directions": 1}, {"name": "box10mm-hv-0", "directions": 1}, {"name": "box10mm-hv-1", "directions": 1}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/10mm/box10mm-practice.rsi/box10mm-practice-0.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/10mm/box10mm-practice.rsi/box10mm-practice-0.png new file mode 100644 index 0000000000000000000000000000000000000000..cccfc242f9e91d3ca69e451c30dea58b9d1890bb GIT binary patch literal 408 zcmV;J0cZY+P)!&*AbT0QFWM2_!NgN_>2x zLLwbPX&k`FX&5;T$Jz@$s8a#9UGvRyDKzdCt9ZpKP4Dg7esDb#0HE!L9=NBR~?L z3Gf@F-s90ItTo_1VV&0000f*5mH`dG5L6E>JF)S?2`TTK54yzz6sMF9225ZB^Cn zwE$FAw;yi?Y<<0Wh6n?k_{Zxrd)sv!NGY$_rMw~x*<3bmRyw3FazjXm_{ISM#t@Od z(*ka;8F2eGoE0}Kzwz-gYF*qwTy24996(OQkP|U9<#_J4EZhQB)$OB`9HqiOz|^>P zcnd(YsF0MRqjM`(Z{gxx-GRDk63SKyWvi454-+eI78L+?PBo!82t0&!(*&T`*hPwj zY1136HYr8n=}I^*1Q;JD?1X0B_P6(M6zzWQL%0yoYBy-L8)P!_T!_^lAVtDLaS(V7 z&o8fSfK>1kIT4#UZq&LXfZMnbz!~SYI!nc;0z~3V0cJsrS{JK75Q=*O{DlC*@s$9) i&j0-(@c}+yRr3Qu64*Voh?GYF0000f*5mH`dG5L6E>JF)S?2`TTK54yzz6sMF9225ZB^Cn zwE$FAw;yi?Y<<0Wh6n?k_{Zxrd)sv!NGY$_rMw~x*<3bmRyw3FazjXm_{ISM#t@Od z(*ka;8F2eGoE0}Kzwz-gYF*qwTy24996(OQkP|U9<#_J4EZhQB)$OB`9HqiOz|^>P zcnd(YsF0MRqjM`(Z{gxx-GRDk63SKyWvi454-+eI78L+?PBo!82t0&!(*&T`*hPwj zY1136HYr8n=}I^*1Q;JD?1X0B_P6(M6zzWQL%0yoYBy-L8)P!_T!_^lAVtDLaS(V7 z&o8fSfK>1kIT4#UZq&LXfZMnbz!~SYI!nc;0z~3V0cJsrS{JK75Q=*O{DlC*@s$9) i&j0-(@c}+yRr3Qu64*Voh?GYF0000+i(6b3r{oapt?>v+Mz|b@)X=O@U zc>xa4xOo7eb#^F%gP;qBrU}5y$0zZ0hE%`DG?xcpn#)rkeTm^B0e2Kwfz;d!x8EPR z*ROqxaH+u98Zov;6beVaBD0A_Je?82LC}Wh7gr9zWP1m@SY238cH47-pm33ZifXG_ zrS+?T1P&o;Ky6;BHx@*sa0qb%-ncIsDSRygtLFcHNFsqqU|snJF-fYRd$<6L00000 LNkvXXu0mjfq4}?b literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/10mm/box10mm-rubber.rsi/box10mm-rubber-1.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/10mm/box10mm-rubber.rsi/box10mm-rubber-1.png new file mode 100644 index 0000000000000000000000000000000000000000..eb460e4e004ef193011bb3d7528757508c8a81a0 GIT binary patch literal 452 zcmV;#0XzPQP)6G-B`5!Za&KylRyPMhm#j$y!=b?;A&EeOaBy*uLkvP1Zp*>JB?QTkrWJSYMX&lEL) zyUdxxN==8=ui;;CrP(KS@NBr>T^S3RiC7weC>%fyCs4x)V#%w8V=*0pB+1%IJW4fp z1TYt#-yfGr7pe^XfyuL;dJWa2zNHSd6$MwMg)7pcnkySto-R}Y$ess(!L7vdCTuGT z0Ohw+oL(QEdTp}Wp+7*f^Cb)y5}1w-)3@OCp=L(3xVTnDU7mp>=1`$y> uEYX44OuuME;cF3CHUIaA#1^mx)|GF2;@t`U7ZnTu0000K-{ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/10mm/box10mm-rubber.rsi/box10mm-rubber.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/10mm/box10mm-rubber.rsi/box10mm-rubber.png new file mode 100644 index 0000000000000000000000000000000000000000..eb460e4e004ef193011bb3d7528757508c8a81a0 GIT binary patch literal 452 zcmV;#0XzPQP)6G-B`5!Za&KylRyPMhm#j$y!=b?;A&EeOaBy*uLkvP1Zp*>JB?QTkrWJSYMX&lEL) zyUdxxN==8=ui;;CrP(KS@NBr>T^S3RiC7weC>%fyCs4x)V#%w8V=*0pB+1%IJW4fp z1TYt#-yfGr7pe^XfyuL;dJWa2zNHSd6$MwMg)7pcnkySto-R}Y$ess(!L7vdCTuGT z0Ohw+oL(QEdTp}Wp+7*f^Cb)y5}1w-)3@OCp=L(3xVTnDU7mp>=1`$y> uEYX44OuuME;cF3CHUIaA#1^mx)|GF2;@t`U7ZnTu0000K-{ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/10mm/box10mm-rubber.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Boxes/10mm/box10mm-rubber.rsi/meta.json new file mode 100644 index 0000000000..07f7d048ac --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Boxes/10mm/box10mm-rubber.rsi/meta.json @@ -0,0 +1 @@ +{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/89456d18dd3e7c330839121e3c6bc8c609700137/icons/obj/ammo.dmi", "states": [{"name": "box10mm-rubber", "directions": 1}, {"name": "box10mm-rubber-0", "directions": 1}, {"name": "box10mm-rubber-1", "directions": 1}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/10mm/box10mm.rsi/box10mm-0.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/10mm/box10mm.rsi/box10mm-0.png new file mode 100644 index 0000000000000000000000000000000000000000..5f674c75f245c8c0e29f5df0497d053cfac7b390 GIT binary patch literal 402 zcmV;D0d4+?P)A#TAE9eMg3aJo5K32F3ZlftE?Ek04lYhEEw~9c)V-5qT|*YL8Cr$bsYAQ^ z9nK+KscA^_ro|%M55oQ7$n$W#cZm~*A^Xh1Ug=iA3RnRvu#JFH1Fh6RZ!2(E7VaL` zmVJOu=gRpL0Rtbue*j=aKF=E(;OHe3iHHQ!aA4W*HIwmBDB=|T8fL*wdi2-khC$M9 z5-C)KQaHd_GkIPcjod=rD4^6pdwx3?KJp_*e#AJnBt0%A05FMTJim?Sx7XkR&P^Qv z{S=AdASl8~90PC?^r=>047kYwNZRMR7%mc6jR6~w8K>cIUvL`c7vV;M*?h`uKBd*V z%oSODL$xA<7ZP~vJ~#lkclR3LI%ADngGC^RgWw)8F~_QN@q2z4Bs(C1Lx~zNFIO2N wQaF^@fpk_c8Yz4y0^8>Q{*YJ!E3m8l0EH8nSJ|SL{{R3007*qoM6N<$f7hU<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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/10mm/box10mm.rsi/box10mm.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/10mm/box10mm.rsi/box10mm.png new file mode 100644 index 0000000000000000000000000000000000000000..d864a73b1bad3393df0b97d41487cef997c14bfd GIT binary patch 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/10mm/box10mm.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Boxes/10mm/box10mm.rsi/meta.json new file mode 100644 index 0000000000..bd20ae4a01 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Boxes/10mm/box10mm.rsi/meta.json @@ -0,0 +1 @@ +{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/89456d18dd3e7c330839121e3c6bc8c609700137/icons/obj/ammo.dmi", "states": [{"name": "box10mm", "directions": 1}, {"name": "box10mm-0", "directions": 1}, {"name": "box10mm-1", "directions": 1}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/24mm/box10x24.rsi/box10x24-0.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/24mm/box10x24.rsi/box10x24-0.png new file mode 100644 index 0000000000000000000000000000000000000000..225ec3175894fe9e531626fdd9cc156db69d2139 GIT binary patch literal 355 zcmV-p0i6DcP)I_N7>Oo^jf9_IuTx1ww0*5L#DqJM zlyJ`LqYs=s&oN{sgVINVzZJ;Rke#AE8$=*WL*{#~4Yt032oKf^*w_WKfbGh)1U|uS z?1EC@SC#WPvQbQd7iHaDuXaaAS70hzteO_Sr+x^R%+iqQibw@iDasnY=XSebA|h=8 z0Gy&d3)TxITnraUZVw#dvsA)p63XD>J(MT~4)NJZZVxhCCDsr59T59$3l0!l!21|% zH<-@3YYV7Ebm7JVqKIkbJmh0oH7&%`@NQif4iE-W zKm6;*hf`73#&9Enz6bzg_*Vk9@}GajqrfO&GcRGAtzKlog>wJ^002ovPDHLkV1iWl BlI;Kh literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/24mm/box10x24.rsi/box10x24-1.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/24mm/box10x24.rsi/box10x24-1.png new file mode 100644 index 0000000000000000000000000000000000000000..26ed4ff109545e9c3f694200e0a8bcef24ea481c GIT binary patch literal 395 zcmV;60d)R}P)1ve;NNiRredL6`ya%iPA=_|!OcM&N*pQ6ElgBFTEO(ll?1ZjCaO><@LwkvvGPW-41Bg&{;f|3x0b3vZUv$^k=mqVhcrIF z@I5#6Jy+>UN)4jfVoApiIl1a{asI6(k}EJAO|0qTYax6!f8sg(*bwQqn^F%{s{&bY zv9^u}8*ihOz;+c(!U1gA55=Y?;ZV?q>+wA|b^2!j?7fc*;ZdA098C(_Qn~^F(c23E z2S?W&?!#(6E(KQ>$P$^}KWM?V1=dA$Pc9-X%nz4$=vr>T_^AK@002ovPDHLkV1l(ot+W6D literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/24mm/box10x24.rsi/box10x24.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/24mm/box10x24.rsi/box10x24.png new file mode 100644 index 0000000000000000000000000000000000000000..26ed4ff109545e9c3f694200e0a8bcef24ea481c GIT binary patch literal 395 zcmV;60d)R}P)1ve;NNiRredL6`ya%iPA=_|!OcM&N*pQ6ElgBFTEO(ll?1ZjCaO><@LwkvvGPW-41Bg&{;f|3x0b3vZUv$^k=mqVhcrIF z@I5#6Jy+>UN)4jfVoApiIl1a{asI6(k}EJAO|0qTYax6!f8sg(*bwQqn^F%{s{&bY zv9^u}8*ihOz;+c(!U1gA55=Y?;ZV?q>+wA|b^2!j?7fc*;ZdA098C(_Qn~^F(c23E z2S?W&?!#(6E(KQ>$P$^}KWM?V1=dA$Pc9-X%nz4$=vr>T_^AK@002ovPDHLkV1l(ot+W6D literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/24mm/box10x24.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Boxes/24mm/box10x24.rsi/meta.json new file mode 100644 index 0000000000..7ee1067450 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Boxes/24mm/box10x24.rsi/meta.json @@ -0,0 +1 @@ +{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/89456d18dd3e7c330839121e3c6bc8c609700137/icons/obj/ammo.dmi", "states": [{"name": "box10x24", "directions": 1}, {"name": "box10x24-0", "directions": 1}, {"name": "box10x24-1", "directions": 1}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/5.56mm/box556mm-practice.rsi/box556mm-practice-0.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/5.56mm/box556mm-practice.rsi/box556mm-practice-0.png new file mode 100644 index 0000000000000000000000000000000000000000..43a6eae23f70974aca80e0afd994f26489cdb3b2 GIT binary patch literal 307 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJU!E?GAr*6yZ3-SR9Clz@#<;ci z3gcoviP8fJ1q|GFC$H@~^#96+CA(J6pQyub00c`~B@AS2tJ`(D*Y<`=q^;fA5YFoe zmWkQ>ztx9bAk6qdX2JnkhY%5;93Pd_A68F4AN;N%GF#8UK)}Oe3d0`0ioc&Yo10tN zT*YK83Y%+ynjMN9qB(Kuz8W(wzk#Z_Zuu}m6(wF zQ%A{(FJEtlL9wY9BY1YyColA z?3SMpBc8CC$1>!CtUHImRNjla?&U0cg-Hy7iUnWZ$WG!_3*!eezy1>kTBASV4M!5g jgTe~DWM4f1)hPy literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/5.56mm/box556mm-practice.rsi/box556mm-practice.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/5.56mm/box556mm-practice.rsi/box556mm-practice.png new file mode 100644 index 0000000000000000000000000000000000000000..90ccd7de5c26b75e6b14f16d5ee20e2d0b3102b4 GIT binary patch literal 341 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=hEVFv@tkIEGZrNwz6?z;M`sX&K|z z+AEBU`6NmYBor`k+nv0&>(Kuz8W(wzk#Z_Zuu}m6(wF zQ%A{(FJEtlL9wY9BY1YyColA z?3SMpBc8CC$1>!CtUHImRNjla?&U0cg-Hy7iUnWZ$WG!_3*!eezy1>kTBASV4M!5g jgTe~DWM4f1)hPy literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/5.56mm/box556mm-practice.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Boxes/5.56mm/box556mm-practice.rsi/meta.json new file mode 100644 index 0000000000..f72c8a82b7 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Boxes/5.56mm/box556mm-practice.rsi/meta.json @@ -0,0 +1 @@ +{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/89456d18dd3e7c330839121e3c6bc8c609700137/icons/obj/ammo.dmi", "states": [{"name": "box556mm-practice", "directions": 1}, {"name": "box556mm-practice-0", "directions": 1}, {"name": "box556mm-practice-1", "directions": 1}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/5.56mm/box556mm.rsi/box556mm-0.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/5.56mm/box556mm.rsi/box556mm-0.png new file mode 100644 index 0000000000000000000000000000000000000000..9f98573eb5b422c0fbaaf00016215da7f2e287a4 GIT binary patch literal 304 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ@18D>Ar*6yZ3-SR9Clz@#<;ci z3gcoviP8fJ1q|GFC$H@~^#96+CA(J6pQyub00c`~B@AS2tJ`(D*Y<`=q^;fA5YFoe zmWkQ>ztx9bAk6qdX2JnkhY%5;93Pd_A68F4AN;N%GF#8UK)}Oe3d0`0ioc&Yo10tN zT*YK83Y%+ynjMN9qBj2o*u w)^V@9x8GrtatCA2;=fIS>^)WqN30nbju?d5s=6{;0fT_S)78&qol`;+04m>ckN^Mx literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/5.56mm/box556mm.rsi/box556mm-1.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/5.56mm/box556mm.rsi/box556mm-1.png new file mode 100644 index 0000000000000000000000000000000000000000..bedb1d82a1ae8d113c8e80ad412a5d195d373251 GIT binary patch literal 337 zcmV-X0j~auP)8VL7#J8Bo}AcC7EK7?O#?7+>^uVl1H)7DXdWs!Agy;20|NsC zgH8+sNi?JWd4{WNE>PxxS!*sZFc2_=5`fnMuU|f4aInyz$bthWZjkQ)1_lO(tM|V! zq=gueW%(>3LJn^(m@soSN&#~8>>Y-qXYat-=;FxoxXeHY1ViBU%O?yB3ir8OJAxR% jINC25b-<_tM!W+6a)6p1mSV_300000NkvXXu0mjf!Xtlt literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/5.56mm/box556mm.rsi/box556mm.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/5.56mm/box556mm.rsi/box556mm.png new file mode 100644 index 0000000000000000000000000000000000000000..bedb1d82a1ae8d113c8e80ad412a5d195d373251 GIT binary patch literal 337 zcmV-X0j~auP)8VL7#J8Bo}AcC7EK7?O#?7+>^uVl1H)7DXdWs!Agy;20|NsC zgH8+sNi?JWd4{WNE>PxxS!*sZFc2_=5`fnMuU|f4aInyz$bthWZjkQ)1_lO(tM|V! zq=gueW%(>3LJn^(m@soSN&#~8>>Y-qXYat-=;FxoxXeHY1ViBU%O?yB3ir8OJAxR% jINC25b-<_tM!W+6a)6p1mSV_300000NkvXXu0mjf!Xtlt literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/5.56mm/box556mm.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Boxes/5.56mm/box556mm.rsi/meta.json new file mode 100644 index 0000000000..27f15c101e --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Boxes/5.56mm/box556mm.rsi/meta.json @@ -0,0 +1 @@ +{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/89456d18dd3e7c330839121e3c6bc8c609700137/icons/obj/ammo.dmi", "states": [{"name": "box556mm", "directions": 1}, {"name": "box556mm-0", "directions": 1}, {"name": "box556mm-1", "directions": 1}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/6.5mm/box65mm-rubber.rsi/box65mm-rubber-0.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/6.5mm/box65mm-rubber.rsi/box65mm-rubber-0.png new file mode 100644 index 0000000000000000000000000000000000000000..8ff5d05644ae91eae8a805ab3d2f110ab708de7d GIT binary patch literal 294 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJx1KJJAr*6yZ3-SR9Clz@#<;ci z3gcoviP8fJ1q|GFCnt5?`hR7^lI4qMPSjyH00I`aHsctZ>Q0^Ruf1O-uC0&n4Ci$O z%iO6hnVZ8dz{EU{jqMJji>qUGI)7x_e5=A)MeJ+h_fJZ2TEz08^uX)q>m|;deXF_Y z!IP8CPplgn87DC_F&{p;Y0iuZhi7w$>&@v5YS6L!){^*fqk4haE{jbzdd3$R4+>QL z{Uh2Yu}gJhn32nCS9XJ}Q`^N1iYw)T;@I3=VKvbA;Oz4H5K#wzcy85}Sb4q9e0B7TH<^TWy literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/6.5mm/box65mm-rubber.rsi/box65mm-rubber-1.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/6.5mm/box65mm-rubber.rsi/box65mm-rubber-1.png new file mode 100644 index 0000000000000000000000000000000000000000..ac5b51bebf7af45437900c830b3a1b70d0326907 GIT binary patch literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=hEVFba9PIEGZrNwz6?z;M`sX&K|z z+AEBU`6NmYBor`k+nt=$b?g6?4NI0Uo+&t8=AZxv4^R4rpQSSrU60vr%5Z8}p|Qaz zC1JwG0@dziUCa_dFmKKcUol^f2foY(1#fJanVAmSlR}pHtDFVJ^Apg zsg*l@k%&Tfzinbf%^S`+y?T8*{ik_K91K|E?CV<<+wwfuOy#*)b&>I8DWlox3C^r{ z3tJchZwlNkDsg`xq|PQF$|Qb1PU&Vs(pMn!yIgGgj_)t5PWCCV8T5VQc9S)D)gbtu af#J%}StZ6VkLdveiNVv=&t;ucLK6VtW`u75 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/6.5mm/box65mm-rubber.rsi/box65mm-rubber.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/6.5mm/box65mm-rubber.rsi/box65mm-rubber.png new file mode 100644 index 0000000000000000000000000000000000000000..ac5b51bebf7af45437900c830b3a1b70d0326907 GIT binary patch literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=hEVFba9PIEGZrNwz6?z;M`sX&K|z z+AEBU`6NmYBor`k+nt=$b?g6?4NI0Uo+&t8=AZxv4^R4rpQSSrU60vr%5Z8}p|Qaz zC1JwG0@dziUCa_dFmKKcUol^f2foY(1#fJanVAmSlR}pHtDFVJ^Apg zsg*l@k%&Tfzinbf%^S`+y?T8*{ik_K91K|E?CV<<+wwfuOy#*)b&>I8DWlox3C^r{ z3tJchZwlNkDsg`xq|PQF$|Qb1PU&Vs(pMn!yIgGgj_)t5PWCCV8T5VQc9S)D)gbtu af#J%}StZ6VkLdveiNVv=&t;ucLK6VtW`u75 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/6.5mm/box65mm-rubber.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Boxes/6.5mm/box65mm-rubber.rsi/meta.json new file mode 100644 index 0000000000..739cc4f8c4 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Boxes/6.5mm/box65mm-rubber.rsi/meta.json @@ -0,0 +1 @@ +{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/89456d18dd3e7c330839121e3c6bc8c609700137/icons/obj/ammo.dmi", "states": [{"name": "box65mm-rubber", "directions": 1}, {"name": "box65mm-rubber-0", "directions": 1}, {"name": "box65mm-rubber-1", "directions": 1}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/6.5mm/box65mm.rsi/box65mm-0.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/6.5mm/box65mm.rsi/box65mm-0.png new file mode 100644 index 0000000000000000000000000000000000000000..010fae34ad47291254adaf6177d6d7f684947fb6 GIT binary patch literal 292 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ*PbqpAr*6yZ3-SR9Clz@#<;ci z3gcoviP8fJ1q|GFCnt5?`hR7^lI4qMPSjyH00I`aHsctZ>Q0^Ruf1O-uC0&n4Ci$O z%iO6hnVZ8dz{EU{jqMJji>qUGI)7x_e5=A)MeJ+h_fJZ2TEz08^uX)q>m|;deXF_Y z!IP8CPplgn87DC_F&{p;Y0iuZhi7w$>&@v5Y5>~68KWPI;St~t5%v`q1+!fq$q?6I5mBF%h;E^l?LtSpzp)XQrZUVi{;OXk;vd$@?2>>}daIOFV literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/6.5mm/box65mm.rsi/box65mm-1.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/6.5mm/box65mm.rsi/box65mm-1.png new file mode 100644 index 0000000000000000000000000000000000000000..7d4c64d7f43c5f404281967676b1f9d7b086a20e GIT binary patch literal 328 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=hEVF!Fo4IEGZrNwz6?z;M`sX&K|z z+AEBU`6NmYBor`k+nt=$b?g6?4NI0Uo+&t8=AZxv4^R4rpQSSrU60vr%5Z8}p|Qaz zC1JwG0@dziUCa_dFmKKcUol^f2foY(1#fJanVAmSlR}pHtDFVJ^Apg zsg*l@k%)r$`M9JV72kyB^y>BL^q=M_aWG(sv#)PeY|HE1w^8n5)kVgWrHp2$Cpfd- zEo@;3yeV+EsKot&kUE=yDAST(T_UzFtq1nHUzdDmyUTBratCA2;=fIS>^)WqN30nb Yn5Abc&&*^K2Zj)Xr>mdKI;Vst0H3FV3jhEB literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/6.5mm/box65mm.rsi/box65mm.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/6.5mm/box65mm.rsi/box65mm.png new file mode 100644 index 0000000000000000000000000000000000000000..7d4c64d7f43c5f404281967676b1f9d7b086a20e GIT binary patch literal 328 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=hEVF!Fo4IEGZrNwz6?z;M`sX&K|z z+AEBU`6NmYBor`k+nt=$b?g6?4NI0Uo+&t8=AZxv4^R4rpQSSrU60vr%5Z8}p|Qaz zC1JwG0@dziUCa_dFmKKcUol^f2foY(1#fJanVAmSlR}pHtDFVJ^Apg zsg*l@k%)r$`M9JV72kyB^y>BL^q=M_aWG(sv#)PeY|HE1w^8n5)kVgWrHp2$Cpfd- zEo@;3yeV+EsKot&kUE=yDAST(T_UzFtq1nHUzdDmyUTBratCA2;=fIS>^)WqN30nb Yn5Abc&&*^K2Zj)Xr>mdKI;Vst0H3FV3jhEB literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/6.5mm/box65mm.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Boxes/6.5mm/box65mm.rsi/meta.json new file mode 100644 index 0000000000..12da7e8a18 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Boxes/6.5mm/box65mm.rsi/meta.json @@ -0,0 +1 @@ +{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/89456d18dd3e7c330839121e3c6bc8c609700137/icons/obj/ammo.dmi", "states": [{"name": "box65mm", "directions": 1}, {"name": "box65mm-0", "directions": 1}, {"name": "box65mm-1", "directions": 1}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/7.62mm/box762mm.rsi/box762mm-0.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/7.62mm/box762mm.rsi/box762mm-0.png new file mode 100644 index 0000000000000000000000000000000000000000..7d578e51940432265a26f6acf11bf64a676f2b0f GIT binary patch literal 303 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJZ=NoWAr*6yZ3-SR9Clz@#<;ci z3gcoviP8fJ1q|GFC+F0i|9@peir2$3w@oq!fI#5k>r({}e<^R$F}pA&Ibvg_d7LSW zEJ&u{@j2g3vJM;j^!#?i(njcWdPT2HY~IQr}^i?EO?!+K`BJ%7$6B<4Cy zWL58rQ@GE_!!tn!XsFk;r$<_3?z!w(@|eMku?T2G#mt5nvjayaJ}sQt$j8xkpndv% z!y^}T4^F+m@ue%fO1g8-G{ttVl}ptEZwlNkDsg`xw0swH2XECX>j#Ivy7REjDpHB` w$O#dMm7Ex@D9F^aSaxzCdyiGZ0$B!z?6BzmC8s8M07HPm)78&qol`;+0Njvx8UO$Q literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/7.62mm/box762mm.rsi/box762mm-1.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/7.62mm/box762mm.rsi/box762mm-1.png new file mode 100644 index 0000000000000000000000000000000000000000..3b2fa0a3f13cb6a622a2ebc8f6b6c5caf2ce9162 GIT binary patch literal 340 zcmV-a0jvIrP)3Yg8CDQ5gc5+)0Uus|XRxp~pvZy~M=y}?00ssIh8uToGDP^g zl4UtDA%`~?Ea^CaQh;2z{)pki^+#|vx;U~tE;G;p!4UZH60)J4MjbHF4gdfsSDEVr_oVdz00003Yg8CDQ5gc5+)0Uus|XRxp~pvZy~M=y}?00ssIh8uToGDP^g zl4UtDA%`~?Ea^CaQh;2z{)pki^+#|vx;U~tE;G;p!4UZH60)J4MjbHF4gdfsSDEVr_oVdz0000yc(XvE@ zkfin|U7D`R<1&A|?`a5fpXoi`dwHJwe&6@y9Mx)-MP_B8bX&j{SSo>RwxDOT1zmRC z>b&4y)nkkSB9UW<$Xds&7m*om&P)9j5s{f%Fbog6i^kZidhn_qPGj+jZLusc2|mc6 z3Ue122fuF~Nx{LwCM+i-dMdgJv<;vcECUD03Y3!(-G8uVJO|yyKczRr-#^==Qx_9A zq3|gv<>LCjx`p=G0N}*0v%Rz!DBM+y#tEf~OS^$v>53BXmQ50$1;0)YQA@3qjs@y2o*RKKHvHcTdXa^O$Fr=1R8(Y=MOm(6kiMv=k9t z=dcPcdt7u30E%)X@vN0*y@*&io7eIictmD8f?>GdnWkgeemm#`kgRbNPrb#cV2JxO~ZjHO;~UBp+8qA&R<-{O~V1s z*Dw+e5da8!-2i}MxoHWUTVPlOfF*EYf&a+j{1e&&wt(6E0y_NKbw!eXYXATM07*qo IM6N<$g6G@IegFUf literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/9mm/box9mm-flash.rsi/box9mm-flash.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/9mm/box9mm-flash.rsi/box9mm-flash.png new file mode 100644 index 0000000000000000000000000000000000000000..ebb397a6bf01eaffe69c5f1be268120ca7809b4c GIT binary patch literal 466 zcmV;@0WJQCP)1;0)YQA@3qjs@y2o*RKKHvHcTdXa^O$Fr=1R8(Y=MOm(6kiMv=k9t z=dcPcdt7u30E%)X@vN0*y@*&io7eIictmD8f?>GdnWkgeemm#`kgRbNPrb#cV2JxO~ZjHO;~UBp+8qA&R<-{O~V1s z*Dw+e5da8!-2i}MxoHWUTVPlOfF*EYf&a+j{1e&&wt(6E0y_NKbw!eXYXATM07*qo IM6N<$g6G@IegFUf literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/9mm/box9mm-flash.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Boxes/9mm/box9mm-flash.rsi/meta.json new file mode 100644 index 0000000000..4aaac4563d --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Boxes/9mm/box9mm-flash.rsi/meta.json @@ -0,0 +1 @@ +{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/89456d18dd3e7c330839121e3c6bc8c609700137/icons/obj/ammo.dmi", "states": [{"name": "box9mm-flash", "directions": 1}, {"name": "box9mm-flash-0", "directions": 1}, {"name": "box9mm-flash-1", "directions": 1}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/9mm/box9mm-hv.rsi/box9mm-hv-0.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/9mm/box9mm-hv.rsi/box9mm-hv-0.png new file mode 100644 index 0000000000000000000000000000000000000000..0e7717e27afc07af8bdf304c090d3ebc428536a0 GIT binary patch literal 459 zcmV;+0W|)JP)2k zW8@~3J_Ut*Tz_M{F6 zi56Jl)@U9ln#W0J%||xpOz$#+>@<)kKM5O^NX}?I7r?D$wW*5 zgpYLqs8^k)uuuYOF-Fv4 zjEJuDI0aXHG93fJ=}}hVSu4$Y5wUPK=KB|TL}ogIVR*>frDMe>L-ENtjQJ-Xi*12P za4S|792Xb|zx!Slf&(_1u#k$9bbJj!mjYR^2pkZsKp_<+2m8zPJLK(-l%9n@KAR|I zb!VC|pG%Nk`3?Sn0yWdYN3Ay^A`0gg$mbGd&tu^DER0s=34e*OLcDM;fnj*fXb*_= zR(7CfI=0}zlqSsQ5+o810tlj2xf+1ij5eh06O^kBx(iYGQ~>~}zrFwfHnz^Oxeh8~ z!L6ikdnjpQa4vyyBHGP8oijgwkkqb);X(qe2)pxovu_&?OliV;vk&dToH&1RnXwHA zIA6n5GEM*>5>NmD8^k)uuuYOF-Fv4 zjEJuDI0aXHG93fJ=}}hVSu4$Y5wUPK=KB|TL}ogIVR*>frDMe>L-ENtjQJ-Xi*12P za4S|792Xb|zx!Slf&(_1u#k$9bbJj!mjYR^2pkZsKp_<+2m8zPJLK(-l%9n@KAR|I zb!VC|pG%Nk`3?Sn0yWdYN3Ay^A`0gg$mbGd&tu^DER0s=34e*OLcDM;fnj*fXb*_= zR(7CfI=0}zlqSsQ5+o810tlj2xf+1ij5eh06O^kBx(iYGQ~>~}zrFwfHnz^Oxeh8~ z!L6ikdnjpQa4vyyBHGP8oijgwkkqb);X(qe2)pxovu_&?OliV;vk&dToH&1RnXwHA zIA6n5GEM*>5>NmDCppuG;N-8Q; z&y70;_j_~z${!L-`zM;rS#8i4kri%D`S}$Yk%3y!4R>#}I%~g2$M4a}Mz;F4#kN2{ zcsuPXI4M-o_`EIv(nS-BCVK(F%);as zAz3&`RKNl3UTc`P;qc20)EXwa>uTTqgTst%I7ogC zlZluB2ye~-aC2LC1THPmEdn?KR~Gn-49`E|NMIyjH}BbM!{S@6?Ti2b002ovPDHLk FV1lB1%R>MF literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/9mm/box9mm-practice.rsi/box9mm-practice-1.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/9mm/box9mm-practice.rsi/box9mm-practice-1.png new file mode 100644 index 0000000000000000000000000000000000000000..3598ef7c9aec5777cc4f2290a54122ccd85bb034 GIT binary patch literal 471 zcmV;|0Vw{7P)VoKa!^KV4To#X!67)P z31LGB5@<^}=@JO9rMsS*=X>XcAorc#@pybbzu)_DcY>yAm}M4bN_PcZfw>YWXX2!s zi4)#)9;e`vPXqwyKN4Ff*84pNL%a$nsij z3s}L87+r8&U>y8Y{T(S5IACK43+Wg+PKW^dCXfd6zyZz<6w)!Wzq@EYdjtKE*3lg134e*uLacBmfnj)6 zZx4ucmo|}=`71YKIfQCHNh0A8fDl@x%K>;*Z$sEPM6uE^tKfxC6aaww%QFCAb^Q!$ zD=a2~oJnAuh;sK}?$zGEkWy~A;amc=2wi!-*|QA?CJbS{*@N;}v)n(w zkZr>O#;;*Il^_5R3Hkv5#Y)2wIJ3a82mnXm+yeiR`S~Yw1zZ8U`3Cbp+XR{HKqLSF N002ovPDHLkV1ljo$@c&N literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/9mm/box9mm-practice.rsi/box9mm-practice.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/9mm/box9mm-practice.rsi/box9mm-practice.png new file mode 100644 index 0000000000000000000000000000000000000000..3598ef7c9aec5777cc4f2290a54122ccd85bb034 GIT binary patch literal 471 zcmV;|0Vw{7P)VoKa!^KV4To#X!67)P z31LGB5@<^}=@JO9rMsS*=X>XcAorc#@pybbzu)_DcY>yAm}M4bN_PcZfw>YWXX2!s zi4)#)9;e`vPXqwyKN4Ff*84pNL%a$nsij z3s}L87+r8&U>y8Y{T(S5IACK43+Wg+PKW^dCXfd6zyZz<6w)!Wzq@EYdjtKE*3lg134e*uLacBmfnj)6 zZx4ucmo|}=`71YKIfQCHNh0A8fDl@x%K>;*Z$sEPM6uE^tKfxC6aaww%QFCAb^Q!$ zD=a2~oJnAuh;sK}?$zGEkWy~A;amc=2wi!-*|QA?CJbS{*@N;}v)n(w zkZr>O#;;*Il^_5R3Hkv5#Y)2wIJ3a82mnXm+yeiR`S~Yw1zZ8U`3Cbp+XR{HKqLSF N002ovPDHLkV1ljo$@c&N literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/9mm/box9mm-practice.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Boxes/9mm/box9mm-practice.rsi/meta.json new file mode 100644 index 0000000000..2fa4a9ca9b --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Boxes/9mm/box9mm-practice.rsi/meta.json @@ -0,0 +1 @@ +{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/89456d18dd3e7c330839121e3c6bc8c609700137/icons/obj/ammo.dmi", "states": [{"name": "box9mm-practice", "directions": 1}, {"name": "box9mm-practice-0", "directions": 1}, {"name": "box9mm-practice-1", "directions": 1}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/9mm/box9mm-rubber.rsi/box9mm-rubber-0.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/9mm/box9mm-rubber.rsi/box9mm-rubber-0.png new file mode 100644 index 0000000000000000000000000000000000000000..38154c90d90457a6abdc04a2fe82e530bd2a634a GIT binary patch literal 460 zcmV;-0Wm3$&ma657X`p|{Kz4*)-mlxWQAL^{!~OpWU3Yn!Yl5CIqvy`^!!0iP7`C>Vq0Jw zyq|s*W-c%ae%R8K;9z4D7POcs#TP)rpL5-n)Hy#f#khXBajJq(3k z+;_=l(n@eCfk`3&jm{^j%&jt9Nx&*%{qknpunmU^d!X4i%wsodK5?$whJ)liprzsh zAacA5K&{@I30zuWPz0C>Tv^~hvN->QOM#_;-FyRPyTVtH@?`J;0000KXstmUM2Jujp+ytI zh7csk(MdsSc`e;>TI#*?LI{7;J06ekd;j<6y>sOAdB&NkvC=036M=svaHwX*p_&!4 z>!$63cif)uaYg`KgmxWf);dPLh>UP!W*;(`5gF+Sdf_=|SRZ%X9y)Fh2S?$7$6{Gv z5L}B^1=|Js!MAIQ6dWuxVOj}_OlTe`>Odn{1`d)HNGn0HvpJ)G=bYgmr8mMq-wIsC z6nmO5m5hk>g%`HGF5+sF*K+HJh%DT+Kq?s#8`A~$j{Uqp-t(J?QOGRZlt3@MTxfKO zwC2``t4&LA7}A8PWJCn~KETKO<5?HHTxj4}-KSWp>AR4H4;28YK0g7lv~t4oBD#nM z*K&T-;wll7f}0ZPCz80n)#oa2A4C(E(r_sOqlj_m)q2}99ELPuwcaLiR~a}TK2fWoN&o-=07*qo IM6N<$g5-_Jv;Y7A literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/9mm/box9mm-rubber.rsi/box9mm-rubber.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/9mm/box9mm-rubber.rsi/box9mm-rubber.png new file mode 100644 index 0000000000000000000000000000000000000000..8e077f76150ef0e19f24f870979d6eb112db7830 GIT binary patch literal 466 zcmV;@0WJQCP)KXstmUM2Jujp+ytI zh7csk(MdsSc`e;>TI#*?LI{7;J06ekd;j<6y>sOAdB&NkvC=036M=svaHwX*p_&!4 z>!$63cif)uaYg`KgmxWf);dPLh>UP!W*;(`5gF+Sdf_=|SRZ%X9y)Fh2S?$7$6{Gv z5L}B^1=|Js!MAIQ6dWuxVOj}_OlTe`>Odn{1`d)HNGn0HvpJ)G=bYgmr8mMq-wIsC z6nmO5m5hk>g%`HGF5+sF*K+HJh%DT+Kq?s#8`A~$j{Uqp-t(J?QOGRZlt3@MTxfKO zwC2``t4&LA7}A8PWJCn~KETKO<5?HHTxj4}-KSWp>AR4H4;28YK0g7lv~t4oBD#nM z*K&T-;wll7f}0ZPCz80n)#oa2A4C(E(r_sOqlj_m)q2}99ELPuwcaLiR~a}TK2fWoN&o-=07*qo IM6N<$g5-_Jv;Y7A literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/9mm/box9mm-rubber.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Boxes/9mm/box9mm-rubber.rsi/meta.json new file mode 100644 index 0000000000..aa73b23a21 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Boxes/9mm/box9mm-rubber.rsi/meta.json @@ -0,0 +1 @@ +{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/89456d18dd3e7c330839121e3c6bc8c609700137/icons/obj/ammo.dmi", "states": [{"name": "box9mm-rubber", "directions": 1}, {"name": "box9mm-rubber-0", "directions": 1}, {"name": "box9mm-rubber-1", "directions": 1}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/9mm/box9mm.rsi/box9mm-0.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/9mm/box9mm.rsi/box9mm-0.png new file mode 100644 index 0000000000000000000000000000000000000000..28b5df59159ec5e42bc7f1907bdf9e972c834567 GIT binary patch literal 452 zcmV;#0XzPQP))2Mt_0fgkZ8w4LU-Mw zQ*i%gZ(RG9SiLq4m9@sS2aybyqgL4D|5#C#}o<%hHC-pMC{0jT#_$E}|1%+Hv z?Cz|Qy{`gr5*Dm)FaLU{e*BXO6*wrCpbsxsn)tjP04_>hD0MB7x2KLa9280*!{zXK zJ@~vHIx7LLG9R|!69o#nq=-c$_%;GV=Lf}f;h<20#>+DRv1kN3_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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/9mm/box9mm.rsi/box9mm.png b/Resources/Textures/Objects/Guns/Ammunition/Boxes/9mm/box9mm.rsi/box9mm.png new file mode 100644 index 0000000000000000000000000000000000000000..59f8dc24f795d165eba2a7ec6dac81d32710fa3c GIT binary patch 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Guns/Ammunition/Boxes/9mm/box9mm.rsi/meta.json b/Resources/Textures/Objects/Guns/Ammunition/Boxes/9mm/box9mm.rsi/meta.json new file mode 100644 index 0000000000..78082924c8 --- /dev/null +++ b/Resources/Textures/Objects/Guns/Ammunition/Boxes/9mm/box9mm.rsi/meta.json @@ -0,0 +1 @@ +{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/89456d18dd3e7c330839121e3c6bc8c609700137/icons/obj/ammo.dmi", "states": [{"name": "box9mm", "directions": 1}, {"name": "box9mm-0", "directions": 1}, {"name": "box9mm-1", "directions": 1}]} \ No newline at end of file