From bcfb72519cda694740d4f3bd449fbc48f2620af9 Mon Sep 17 00:00:00 2001 From: Peptide90 <78795277+Peptide90@users.noreply.github.com> Date: Sun, 27 Feb 2022 19:56:27 +0000 Subject: [PATCH] Adds boxes of all magazine types + box of trashbags and flares (#6891) --- .../Catalog/Fills/Boxes/ammunition.yml | 699 ++++++++++++++++++ .../Catalog/Fills/Boxes/general.yml | 35 + .../Catalog/Fills/Boxes/security.yml | 30 +- .../Objects/Specific/Janitorial/trashbag.yml | 3 + .../Guns/Ammunition/Magazines/shotgun.yml | 10 + Resources/Prototypes/tags.yml | 3 + .../Objects/Storage/boxes.rsi/box_beanbag.png | Bin 337 -> 0 bytes .../Storage/boxes.rsi/box_lethalshot.png | Bin 359 -> 0 bytes .../Objects/Storage/boxes.rsi/boxwide.png | Bin 0 -> 268 bytes .../Objects/Storage/boxes.rsi/meta.json | 22 +- .../Storage/boxes.rsi/shellbeanbag.png | Bin 0 -> 203 bytes .../Objects/Storage/boxes.rsi/shellflare.png | Bin 0 -> 188 bytes .../Objects/Storage/boxes.rsi/shellflash.png | Bin 0 -> 181 bytes .../Storage/boxes.rsi/shellincendiary.png | Bin 0 -> 205 bytes .../Objects/Storage/boxes.rsi/shelllethal.png | Bin 0 -> 229 bytes .../Storage/boxes.rsi/shellpractice.png | Bin 0 -> 211 bytes .../Objects/Storage/boxes.rsi/shellslug.png | Bin 0 -> 176 bytes .../shotgun_shell_incendiary.rsi/base.png | Bin 340 -> 368 bytes .../shotgun_shell_incendiary.rsi/spent.png | Bin 342 -> 381 bytes 19 files changed, 771 insertions(+), 31 deletions(-) create mode 100644 Resources/Prototypes/Catalog/Fills/Boxes/ammunition.yml delete mode 100644 Resources/Textures/Objects/Storage/boxes.rsi/box_beanbag.png delete mode 100644 Resources/Textures/Objects/Storage/boxes.rsi/box_lethalshot.png create mode 100644 Resources/Textures/Objects/Storage/boxes.rsi/boxwide.png create mode 100644 Resources/Textures/Objects/Storage/boxes.rsi/shellbeanbag.png create mode 100644 Resources/Textures/Objects/Storage/boxes.rsi/shellflare.png create mode 100644 Resources/Textures/Objects/Storage/boxes.rsi/shellflash.png create mode 100644 Resources/Textures/Objects/Storage/boxes.rsi/shellincendiary.png create mode 100644 Resources/Textures/Objects/Storage/boxes.rsi/shelllethal.png create mode 100644 Resources/Textures/Objects/Storage/boxes.rsi/shellpractice.png create mode 100644 Resources/Textures/Objects/Storage/boxes.rsi/shellslug.png diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/ammunition.yml b/Resources/Prototypes/Catalog/Fills/Boxes/ammunition.yml new file mode 100644 index 0000000000..d01a506a63 --- /dev/null +++ b/Resources/Prototypes/Catalog/Fills/Boxes/ammunition.yml @@ -0,0 +1,699 @@ +# ClRifle +- type: entity + name: box of .25 caseless magazines + parent: BoxCardboard + id: BoxMagazineClRiflePistol + description: A box full of .25 caseless magazines. + components: + - type: StorageFill + contents: + - id: MagazineClRifleBase + amount: 6 + - type: Sprite + layers: + - state: box + +- type: entity + name: box of .25 caseless (high-velocity) magazines + parent: BoxCardboard + id: BoxMagazineClRiflePistolHV + description: A box full of .25 caseless high-velocity magazines. + components: + - type: StorageFill + contents: + - id: MagazineClRiflePistolHV + amount: 6 + - type: Sprite + layers: + - state: box + +- type: entity + name: box of .25 caseless (practice) magazines + parent: BoxCardboard + id: BoxMagazineClRiflePistolPractice + description: A box full of .25 caseless practice magazines. + components: + - type: StorageFill + contents: + - id: MagazineClRiflePistolPractice + amount: 6 + - type: Sprite + layers: + - state: box + +- type: entity + name: box of .25 caseless (rubber) magazines + parent: BoxCardboard + id: BoxMagazineClRifleRubber + description: A box full of + components: + - type: StorageFill + contents: + - id: MagazineClRifleRubber + amount: 6 + - type: Sprite + layers: + - state: box + +# LRifle +- type: entity + name: box of .30 rifle magazines + parent: BoxCardboard + id: BoxMagazineLRifle + description: A box full of .30 rifle magazines. + components: + - type: StorageFill + contents: + - id: MagazineLRifle + amount: 6 + - type: Sprite + layers: + - state: box + +- type: entity + name: box of .30 rifle (high-velocity) magazines + parent: BoxCardboard + id: BoxMagazineLRifleHV + description: A box full of .30 rifle (high-velocity) magazines. + components: + - type: StorageFill + contents: + - id: MagazineLRifleHV + amount: 6 + - type: Sprite + layers: + - state: box + +- type: entity + name: box of .30 rifle (practice) magazines + parent: BoxCardboard + id: BoxMagazineLRiflePractice + description: A box full of .30 rifle (practice) magazines. + components: + - type: StorageFill + contents: + - id: MagazineLRiflePractice + amount: 6 + - type: Sprite + layers: + - state: box + +- type: entity + name: box of .30 rifle (rubber) magazines + parent: BoxCardboard + id: BoxMagazineLRifleRubber + description: A box full of .30 rifle (practice) magazines. + components: + - type: StorageFill + contents: + - id: MagazineLRifleRubber + amount: 6 + - type: Sprite + layers: + - state: box + +# Magnum +- type: entity + name: box of .40 Lamia magazines + parent: BoxCardboard + id: BoxMagazineMagnum + description: A box full of .40 Lamia magazines. + components: + - type: StorageFill + contents: + - id: MagazineMagnum + amount: 6 + - type: Sprite + layers: + - state: box + +- type: entity + name: box of .40 Lamia (flash) magazines. + parent: BoxCardboard + id: BoxMagazineMagnumFlash + description: A box full of .40 Lamia (flash) magazines. + components: + - type: StorageFill + contents: + - id: MagazineMagnumFlash + amount: 6 + - type: Sprite + layers: + - state: box + +- type: entity + name: box of .40 Lamia (high-velocity) magazines + parent: BoxCardboard + id: BoxMagazineMagnumHV + description: A box full of .40 Lamia (high-velocity) magazines. + components: + - type: StorageFill + contents: + - id: MagazineMagnumHV + amount: 6 + - type: Sprite + layers: + - state: box + +- type: entity + name: box of .40 Lamia (practice) magazines + parent: BoxCardboard + id: BoxMagazineMagnumPractice + description: A box full of .40 Lamia (practice) magazines. + components: + - type: StorageFill + contents: + - id: MagazineMagnumPractice + amount: 6 + - type: Sprite + layers: + - state: box + +- type: entity + name: box of .40 Drozd magazines + parent: BoxCardboard + id: BoxMagazineMagnumSmg + description: A box full of .40 Drozd magazines. + components: + - type: StorageFill + contents: + - id: MagazineMagnumSmg + amount: 6 + - type: Sprite + layers: + - state: box + +- type: entity + name: box of .40 Drozd (high-velocity) magazines + parent: BoxCardboard + id: BoxMagazineMagnumSmgHV + description: A box full of .40 Drozd (high-velocity) magazines. + components: + - type: StorageFill + contents: + - id: MagazineMagnumSmgHV + amount: 6 + - type: Sprite + layers: + - state: box + +- type: entity + name: box of .40 Drozd (practice) magazines + parent: BoxCardboard + id: BoxMagazineMagnumSmgPractice + description: A box full of .40 Drozd (practice) magazines. + components: + - type: StorageFill + contents: + - id: MagazineMagnumSmgPractice + amount: 6 + - type: Sprite + layers: + - state: box + +- type: entity + name: box of .40 Drozd (rubber) magazines + parent: BoxCardboard + id: BoxMagazineMagnumSmgRubber + description: A box full of .40 Drozd (rubber) magazines. + components: + - type: StorageFill + contents: + - id: MagazineMagnumSmgRubber + amount: 6 + - type: Sprite + layers: + - state: box + +# Pistol +- type: entity + name: box of WT550 .35 auto magazines + parent: BoxCardboard + id: BoxMagazinePistolSmgTopMounted + description: A box full of WT550 .35 auto magazines. + components: + - type: StorageFill + contents: + - id: MagazinePistolSmgTopMounted + amount: 6 + - type: Sprite + layers: + - state: box + +- type: entity + name: box of Calico .35 auto magazines + parent: BoxCardboard + id: BoxMagazinePistolCalicoTopMounted + description: A box full of Calico .35 auto magazines. + components: + - type: StorageFill + contents: + - id: MagazinePistolCalicoTopMounted + amount: 6 + - type: Sprite + layers: + - state: box + +- type: entity + name: box of pistol .35 auto magazines + parent: BoxCardboard + id: BoxMagazinePistol + description: A box full of pistol .35 auto magazines. + components: + - type: StorageFill + contents: + - id: MagazinePistol + amount: 6 + - type: Sprite + layers: + - state: box + +- type: entity + name: box of pistol .35 auto (flash) magazines + parent: BoxCardboard + id: BoxMagazinePistolFlash + description: A box full of pistol .35 auto (flash) magazines. + components: + - type: StorageFill + contents: + - id: MagazinePistolFlash + amount: 6 + - type: Sprite + layers: + - state: box + +- type: entity + name: box of pistol .35 auto (high-velocity) magazines + parent: BoxCardboard + id: BoxMagazinePistolHV + description: A box full of pistol .35 auto (high-velocity) magazines. + components: + - type: StorageFill + contents: + - id: MagazinePistolHV + amount: 6 + - type: Sprite + layers: + - state: box + +- type: entity + name: box of pistol .35 auto (practice) magazines + parent: BoxCardboard + id: BoxMagazinePistolPractice + description: A box full of magazines. + components: + - type: StorageFill + contents: + - id: MagazinePistolPractice + amount: 6 + - type: Sprite + layers: + - state: box + +- type: entity + name: box of pistol .35 auto (rubber) magazines + parent: BoxCardboard + id: BoxMagazinePistolRubber + description: A box full of pistol .35 auto (rubber) magazines. + components: + - type: StorageFill + contents: + - id: MagazinePistolRubber + amount: 6 + - type: Sprite + layers: + - state: box + +- type: entity + name: box of machine pistol .35 auto magazines + parent: BoxCardboard + id: BoxMagazineHCPistol + description: A box full of machine pistol .35 auto magazines. + components: + - type: StorageFill + contents: + - id: MagazineHCPistol + amount: 6 + - type: Sprite + layers: + - state: box + +- type: entity + name: box of machine pistol .35 auto (high-velocity) magazines + parent: BoxCardboard + id: BoxMagazineHCPistolHV + description: A box full of machine pistol .35 auto (high-velocity) magazines. + components: + - type: StorageFill + contents: + - id: MagazineHCPistolHV + amount: 6 + - type: Sprite + layers: + - state: box + +- type: entity + name: box of machine pistol .35 auto (practice) magazines + parent: BoxCardboard + id: BoxMagazineHCPistolPractice + description: A box full of machine pistol .35 auto (practice) magazines. + components: + - type: StorageFill + contents: + - id: MagazineHCPistolPractice + amount: 6 + - type: Sprite + layers: + - state: box + +- type: entity + name: box of machine pistol .35 auto (rubber) magazines + parent: BoxCardboard + id: BoxMagazineHCPistolRubber + description: A box full of machine pistol .35 auto (rubber) magazines. + components: + - type: StorageFill + contents: + - id: MagazineHCPistolRubber + amount: 6 + - type: Sprite + layers: + - state: box + +- type: entity + name: box of SMG .35 auto magazines + parent: BoxCardboard + id: BoxMagazinePistolSmg + description: A box full of SMG .35 auto magazines. + components: + - type: StorageFill + contents: + - id: MagazinePistolSmg + amount: 6 + - type: Sprite + layers: + - state: box + +- type: entity + name: box of SMG .35 auto (flash) magazines + parent: BoxCardboard + id: BoxMagazinePistolSmgFlash + description: A box full of SMG .35 auto (flash) magazines. + components: + - type: StorageFill + contents: + - id: MagazinePistolSmgFlash + amount: 6 + - type: Sprite + layers: + - state: box + +- type: entity + name: box of SMG .35 auto (high-velocity) magazines + parent: BoxCardboard + id: BoxMagazinePistolSmgHV + description: A box full of SMG .35 auto (high-velocity) magazines. + components: + - type: StorageFill + contents: + - id: MagazinePistolSmgHV + amount: 6 + - type: Sprite + layers: + - state: box + +- type: entity + name: box of SMG .35 auto (practice) magazines + parent: BoxCardboard + id: BoxMagazinePistolSmgPractice + description: A box full of SMG .35 auto (practice) magazines. + components: + - type: StorageFill + contents: + - id: MagazinePistolSmgPractice + amount: 6 + - type: Sprite + layers: + - state: box + +- type: entity + name: box of SMG .35 auto (rubber) magazines + parent: BoxCardboard + id: BoxMagazinePistolSmgRubber + description: A box full of SMG .35 auto (rubber) magazines. + components: + - type: StorageFill + contents: + - id: MagazinePistolSmgRubber + amount: 6 + - type: Sprite + layers: + - state: box + +# Shotgun +- type: entity + name: box of (.50 pellet) ammo drums + parent: BoxCardboard + id: BoxMagazineShotgun + description: A box full of (.50 pellet) ammo drums. + components: + - type: StorageFill + contents: + - id: MagazineShotgun + amount: 6 + - type: Sprite + layers: + - state: box + +- type: entity + name: box of (.50 beanbag) ammo drums + parent: BoxCardboard + id: BoxMagazineShotgunBeanbag + description: A box full of (.50 beanbag) ammo drums. + components: + - type: StorageFill + contents: + - id: MagazineShotgunBeanbag + amount: 6 + - type: Sprite + layers: + - state: box + +- type: entity + name: box of (.50 slug) ammo drums + parent: BoxCardboard + id: BoxMagazineShotgunSlug + description: A box full of (.50 slug) ammo drums. + components: + - type: StorageFill + contents: + - id: MagazineShotgunSlug + amount: 6 + - type: Sprite + layers: + - state: box + +- type: entity + name: box of (.50 incendiary) ammo drums + parent: BoxCardboard + id: BoxMagazineShotgunIncendiary + description: A box full of (.50 incendiary) ammo drums. + components: + - type: StorageFill + contents: + - id: MagazineShotgunIncendiary + amount: 6 + - type: Sprite + layers: + - state: box + +- type: entity + name: box of shotgun beanbag cartridges + parent: BoxCardboard + id: BoxBeanbag + description: A box full of beanbag shots, designed for riot shotguns. + components: + - type: StorageFill + contents: + - id: ShellShotgunBeanbag + amount: 6 + - type: Sprite + layers: + - state: boxwide + - state: shellbeanbag + +- type: entity + name: box of shotgun lethal cartridges + parent: BoxCardboard + id: BoxLethalshot + description: A box full of lethal pellet shots, designed for riot shotguns. + components: + - type: StorageFill + contents: + - id: ShellShotgun + amount: 6 + - type: Sprite + layers: + - state: boxwide + - state: shelllethal + +- type: entity + name: box of shotgun slug cartridges + parent: BoxCardboard + id: BoxShotgunSlug + description: A box full of shotgun slugs, designed for riot shotguns. + components: + - type: StorageFill + contents: + - id: ShellShotgunSlug + amount: 6 + - type: Sprite + layers: + - state: boxwide + - state: shellslug + +- type: entity + name: box of shotgun flare cartridges + parent: BoxCardboard + id: BoxShotgunFlare + description: A box full of shotgun flare cartridges, designed for riot shotguns. + components: + - type: StorageFill + contents: + - id: ShellShotgunFlare + amount: 6 + - type: Sprite + layers: + - state: boxwide + - state: shellflare + +- type: entity + name: box of shotgun flash cartridges + parent: BoxCardboard + id: BoxShotgunFlash + description: A box full of shotgun flash cartridges, designed for riot shotguns. + components: + - type: StorageFill + contents: + - id: ShellShotgunFlash + amount: 6 + - type: Sprite + layers: + - state: boxwide + - state: shellflash + +- type: entity + name: box of shotgun incendiary cartridges + parent: BoxCardboard + id: BoxShotgunIncendiary + description: A box full of shotgun incendiary cartridges, designed for riot shotguns. + components: + - type: StorageFill + contents: + - id: ShellShotgunIncendiary + amount: 6 + - type: Sprite + layers: + - state: boxwide + - state: shellincendiary + +- type: entity + name: box of shotgun practice cartridges + parent: BoxCardboard + id: BoxShotgunPractice + description: A box full of shotgun practice cartridges, designed for riot shotguns. + components: + - type: StorageFill + contents: + - id: ShellShotgunPractice + amount: 6 + - type: Sprite + layers: + - state: boxwide + - state: shellpractice + +- type: entity + name: box of tranquilizer cartridges + parent: BoxCardboard + id: BoxShellTranquilizer + description: A box full of tranquilizer cartridges, designed for riot shotguns. + components: + - type: StorageFill + contents: + - id: ShellTranquilizer + amount: 6 + - type: Sprite + layers: + - state: boxwide + - state: shellslug + +# SRifle +- type: entity + name: box of .20 rifle magazines + parent: BoxCardboard + id: BoxMagazineSRifle + description: A box full of .20 rifle magazines. + components: + - type: StorageFill + contents: + - id: MagazineSRifle + amount: 6 + - type: Sprite + layers: + - state: box + +- type: entity + name: box of .20 rifle (flash) magazines + parent: BoxCardboard + id: BoxMagazineSRifleFlash + description: A box full of .20 rifle (flash) magazines. + components: + - type: StorageFill + contents: + - id: MagazineSRifleFlash + amount: 6 + - type: Sprite + layers: + - state: box + +- type: entity + name: box of .20 rifle (high-velocity) magazines + parent: BoxCardboard + id: BoxMagazineSRifleHV + description: A box full of .20 rifle (high-velocity) magazines. + components: + - type: StorageFill + contents: + - id: MagazineSRifleHV + amount: 6 + - type: Sprite + layers: + - state: box + +- type: entity + name: box of .20 rifle (practice) magazines + parent: BoxCardboard + id: BoxMagazineSRiflePractice + description: A box full of .20 rifle (practice) magazines. + components: + - type: StorageFill + contents: + - id: MagazineSRiflePractice + amount: 6 + - type: Sprite + layers: + - state: box + +- type: entity + name: box of .20 rifle (rubber) magazines + parent: BoxCardboard + id: BoxMagazineSRifleRubber + description: A box full of .20 rifle (rubber) magazines. + components: + - type: StorageFill + contents: + - id: MagazineSRifleRubber + amount: 6 + - type: Sprite + layers: + - state: box \ No newline at end of file diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/general.yml b/Resources/Prototypes/Catalog/Fills/Boxes/general.yml index a07f1709a7..5fb57d15e0 100644 --- a/Resources/Prototypes/Catalog/Fills/Boxes/general.yml +++ b/Resources/Prototypes/Catalog/Fills/Boxes/general.yml @@ -177,3 +177,38 @@ layers: - state: box - state: writing + +- type: entity + name: flare box + parent: BoxCardboard + id: BoxFlare + description: A box of flares. Party time. + components: + - type: StorageFill + contents: + - id: Flare + amount: 6 + - type: Sprite + layers: + - state: box + - state: writing + +- type: entity + name: trashbag box + parent: BoxCardboard + id: BoxTrashbag + description: A box of trashbags. Happy janitor noises. + components: + - type: StorageFill + contents: + - id: TrashBag + amount: 6 + - type: Storage + capacity: 800 + whitelist: + tags: + - TrashBag + - type: Sprite + layers: + - state: box + - state: writing \ No newline at end of file diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/security.yml b/Resources/Prototypes/Catalog/Fills/Boxes/security.yml index 155799c8fa..56e0973613 100644 --- a/Resources/Prototypes/Catalog/Fills/Boxes/security.yml +++ b/Resources/Prototypes/Catalog/Fills/Boxes/security.yml @@ -56,32 +56,4 @@ - type: Sprite layers: - state: box_security - - state: ziptie - -- type: entity - name: box of beanbag shots - parent: BoxCardboard - id: BoxBeanbag - description: A box full of beanbag shots, designed for riot shotguns. - components: - - type: StorageFill - contents: - - id: ShellShotgunBeanbag - amount: 6 - - type: Sprite - layers: - - state: box_beanbag - -- type: entity - name: box of lethal shots - parent: BoxCardboard - id: BoxLethalshot - description: A box full of lethal shots, designed for riot shotguns. - components: - - type: StorageFill - contents: - - id: ShellShotgunBase - amount: 6 - - type: Sprite - layers: - - state: box_lethalshot + - state: ziptie \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/trashbag.yml b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/trashbag.yml index ae82971cd1..1248d816d1 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/trashbag.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/trashbag.yml @@ -19,6 +19,9 @@ tags: - Cartridge - Trash + - type: Tag + tags: + - TrashBag - type: entity name: trash bag diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/shotgun.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/shotgun.yml index 702567b9ce..b03026f508 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/shotgun.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/shotgun.yml @@ -51,3 +51,13 @@ fillPrototype: ShellShotgunSlug - type: Sprite sprite: Objects/Weapons/Guns/Ammunition/Magazine/Shotgun/m12_slug.rsi + +- type: entity + id: MagazineShotgunIncendiary + name: ammo drum (.50 incendiary) + parent: MagazineShotgunBase + components: + - type: RangedMagazine + fillPrototype: ShellShotgunIncendiary + - type: Sprite + sprite: Objects/Weapons/Guns/Ammunition/Magazine/Shotgun/m12_slug.rsi diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml index f876d9f0be..612923d8cd 100644 --- a/Resources/Prototypes/tags.yml +++ b/Resources/Prototypes/tags.yml @@ -282,6 +282,9 @@ - type: Tag id: Trash + +- type: Tag + id: TrashBag - type: Tag id: Wall diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/box_beanbag.png b/Resources/Textures/Objects/Storage/boxes.rsi/box_beanbag.png deleted file mode 100644 index d83ddc20b350113a03dbe417b58f6ba0de00d5dc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 337 zcmV-X0j~auP) zKTE?v7{-6qfQzU&X&@&N0vUp2wZ+lmr*iO{_$^8trOp{L1VSAW2o4goB~I!&6=G{` z8WK+7e&aLT^W2~Jy%#hZ#q@p>Jv!*vWzrMduwMx jAw(xL;i9=lqXGB=0Sa|0XpS+E00000NkvXXu0mjfDB_Rh diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/box_lethalshot.png b/Resources/Textures/Objects/Storage/boxes.rsi/box_lethalshot.png deleted file mode 100644 index 03f3e809ef5d69dc9e89259e4bd36efd11605877..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 359 zcmV-t0hs=YP) zF-yZh7>1viKq)v#5sZNxWC&!)kkuAP`wRS2`jg@)bu~kVK8it)1Kh5XO@4z$+xpW)=o>wc( z^_q!k0x%knmD$%?he9ZIfl=4I>3S>HNgKZFIvTJk%f_s;cR&MVOV&6*RaMGgrz$(N zW}}x-O36oEw_=UEU|Y9$=a`cV0A9+P<-Js9|MxH0)|G$C=Px##z{m$R9J=WmN5#$AQV7LTQwt$0!mvPS(vS-YmD|jRa2O(PqN0*Q}oeFKD z6pF?|{~P^~_Yflj5JY8eu|*-oUP5NAJ^9#iK}xx|Z42J}ta3yI#@KF*d5gGbwR`~u zR1Y{E!Y7DWFJPYMOXSgj5CU+{i^!aFp95a$`#y_!nx^C|8KAX>bzQRrXsw~^y6CL> zUqAuTfNk5di&EeG%^jeCD@k5NN+}qIA&X=j$K)*fCTyCf$eVCkmZ*;){+kCY2QAPK SFZvt+0000TDnY literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/meta.json b/Resources/Textures/Objects/Storage/boxes.rsi/meta.json index 7b0c750a9e..2e5828ca83 100644 --- a/Resources/Textures/Objects/Storage/boxes.rsi/meta.json +++ b/Resources/Textures/Objects/Storage/boxes.rsi/meta.json @@ -28,6 +28,9 @@ { "name": "box" }, + { + "name": "boxwide" + }, { "name": "box_hug" }, @@ -114,10 +117,25 @@ "directions": 4 }, { - "name": "box_lethalshot" + "name": "shellbeanbag" }, { - "name": "box_beanbag" + "name": "shellflare" + }, + { + "name": "shellflash" + }, + { + "name": "shellincendiary" + }, + { + "name": "shelllethal" + }, + { + "name": "shellpractice" + }, + { + "name": "shellslug" }, { "name": "ziptie" diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/shellbeanbag.png b/Resources/Textures/Objects/Storage/boxes.rsi/shellbeanbag.png new file mode 100644 index 0000000000000000000000000000000000000000..c9f3e3aabc6b602948b4b1b0fdb8cbfa612c284a GIT binary patch literal 203 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}t)4E9ArY;~ z2@Z8~uMC{wO&C2!2$&7e0LXWxZslsB(&#@J+wvLK3A6 z+#9*<>wmdzlL(dh@cyj)rlT5V2b^px**F!`*npr-{QW(`(lRyVCc)I$ztaD0e0sy3MMMVGr literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/shellflare.png b/Resources/Textures/Objects/Storage/boxes.rsi/shellflare.png new file mode 100644 index 0000000000000000000000000000000000000000..af0e1d0a534c513e0019a5d312800b30f8e56c45 GIT binary patch literal 188 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Wu7jMArY-_ zFD>M4Fc4{Z*gQcX=&;b%oC6Ei91vsaJUmg#?SMi+`=Lwj%uP@1em*y~40LdDarw94 zy~Cx6C2y=hcy^!MFSCwOto3Vw)VC+!PBoNz=9e2imficEp+Vr#*K@b>{yye^lia*1 lkCEYc*ukxvcXoChnZuy!5wxR#aU0MD44$rjF6*2UngB~oOS1p~ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/shellflash.png b/Resources/Textures/Objects/Storage/boxes.rsi/shellflash.png new file mode 100644 index 0000000000000000000000000000000000000000..6503583d1201fe53f9a2b9c178d2f5ed8d63a99e GIT binary patch literal 181 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}`JOJ0ArY-_ z&)M=h1PHi36rPwNQl=PqqfzvRN#Lp%%Qmz0I=MQ({aGnkv_GrJ_$Z^Gpx{p?5$2J!GGx?Dxda!DwOGe zeBjKPGtU;}P6+YPx?=WXs!r<1vyTKLQ&yZSUVB=oq56KY#BrTjOUwTMVN$IB%Y6F9 zgP#^Y=j?(O?Dji)#uH$2wf`;bP|K7tDnm{r-UW| DcfnD) literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/shelllethal.png b/Resources/Textures/Objects/Storage/boxes.rsi/shelllethal.png new file mode 100644 index 0000000000000000000000000000000000000000..30e9bc7f8b33a29c6a377f4e9fffa0eb37599082 GIT binary patch literal 229 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}^F3W0Ln2z= zUNq!lG8A#WC~cge+|1LI`Sxx@>+S-MWj$h;GI_MUm}l%n$yCuiRuR z`C;dtZKjeFf*wgGhyGqRS?1PUu^ow=4g7+9;)SO*s~Y14_8v&HO}4tvv|-o0?pZ-z bPxmlf&kMG&*R?7EI+elG)z4*}Q$iB}7CKek literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/shellpractice.png b/Resources/Textures/Objects/Storage/boxes.rsi/shellpractice.png new file mode 100644 index 0000000000000000000000000000000000000000..9d3551edbd0e3200ffacc5baa02e7ca578022e32 GIT binary patch literal 211 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}y`Ci3kN##$@s(hZr zucV~(iT{jF?aateTjm^|cX&1LjCRI`r7!R3K9BhH!m3Zl*L}9yvwh`T=R6YLlKHFl zQEn*Po24&U7z~eHU3;oQ;LxjWl?VQQdQh^D@k5<$tgnm8bLRH=bQLep_`g7hF?hQA KxvX(v`Ib}-%*5jtaIc{9hZqod=*d8_k*Js-Ig z83Mc%pWmt6e(U`{%fHH80S(p%&KPW7_V(lhTOUo+{PoP2%nbFk8J=%6UjNV6Wyv!( Y?ob{5SCZS+fwnSuy85}Sb4q9e03hN&7ytkO literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell_incendiary.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell_incendiary.rsi/base.png index 88d79fd0dc77e8f6b66d1bc1bc3ffc086018655d..9cb4631d2efbbd68442d093d6b00e3a6f290b60c 100644 GIT binary patch delta 342 zcmV-c0jd7f0`LNmBYyw^b5ch_0Itp)=>Px$DoI2^R9J=WlCes|Kmb5rMM_95Kf^M$P`VIXAm(B&dICvRc8oCCuNWnqv(4|zwq2;Q46 z$>rX=RheHa2ZYaO3cn54 zr-ZFh;fP8B@A6dvej6^%^}F8)n5IH;7;E{Xgk%U?0gU595zA%eN8N^gsP97(=KJuOZ0|0l9Q(0~tkc|M??7eV2 o7*v)Q3dlx$$IdMli{;Po3J_gsYO`oskpKVy07*qoM6N<$f?qV7>Hq)$ delta 314 zcmV-A0mc6C0@MPKBYy!KNkl7Dj8fxy;wW8nee{F@7l0Mf_uk{FsfCz|y zt^oPftLYVhT9RL%c_D%U`PYMCGJ}_UuagJ@?Bf>&OlI)(Xn*hh2VkoU!(CL?c{Y`GaT#SI2?Eaqg0BGE)47d!Emfm zN(INk;WxAhyEA{2DM^w9$DIJb5nW8~1!xgn#k~MsuLy{M2R M07*qoM6N<$f_=S?p8x;= diff --git a/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell_incendiary.rsi/spent.png b/Resources/Textures/Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell_incendiary.rsi/spent.png index 21cbe680289f769bfec821e9b391fc0e7461a7e4..94a4985c5ed0621e7f7f8ca11a26557b6a5444b3 100644 GIT binary patch delta 355 zcmV-p0i6EU0{sGzBYyw^b5ch_0Itp)=>Px$H%UZ6R9J=Wl0QqsKpa3{M2c8C8f}(B z5QMH0K^zh(Sm;>rEA%6{#(aj3oy1kTSx_jZgG)o#KtaSQ&2Adyde2z#(=!6---v6@wW+$tuE!XboK z@;(X}99+H)qw_NXOL8C>%wWyOx-Blq1t}E`E zO#s^E(vn=?@mw>>r2|~o6}qmo-R;sYm3W*^xjri7mP-eCo~Ole%!O%U7zSsR3bXk< zw_G~lJpv$#A^__Ber|cH0Dw-Xqb)ua3WefN@CrL;YLM0JzD)oC002ovPDHLkV1j}2 Bq=5hc delta 316 zcmV-C0mJ_N0@ebMBYy!MNklonwWO8Bk z6?}wSE6>5`cDt;W!9{Xw6PTPxWLD#b1Kz0{g^MihLjMeWzcdULN-4%%JEPVuzyd75 z0=5MRPoJAn0qB(Q;-D8|Fd+QAYnaaAanb7}1_3tl;~7lnaDN}S@BRZ&7qf=zyp6vq z&?%e;u*!`PyM5y~x080*y8<1w`&CYM`5;WbWeoTe2lDJ4_7%a?#5isYkWw~EHNfFd z9C#_-ch+;`=^jS#oqz432jO#BnU@y2kfC zJkKMFBDB_n<29WDYXm@5RRB1SGdOMp07#NV{C;j@341NK01L2yu>oKIoMzrO_Lt!R O0000