From 8cb3b9218e148d9bba4d62731453c9e9fb7e7364 Mon Sep 17 00:00:00 2001 From: Peptide90 <78795277+Peptide90@users.noreply.github.com> Date: Sun, 24 Jul 2022 12:09:33 +0100 Subject: [PATCH] change shotgun shell boxes from 6 to 12 (#9540) --- .../Catalog/Fills/Boxes/ammunition.yml | 100 +++++++++++ .../Catalog/Fills/Boxes/security.yml | 164 +----------------- 2 files changed, 101 insertions(+), 163 deletions(-) diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/ammunition.yml b/Resources/Prototypes/Catalog/Fills/Boxes/ammunition.yml index c476b546db..c1fc8ee73b 100644 --- a/Resources/Prototypes/Catalog/Fills/Boxes/ammunition.yml +++ b/Resources/Prototypes/Catalog/Fills/Boxes/ammunition.yml @@ -367,6 +367,106 @@ - id: MagazineShotgunIncendiary amount: 6 +# Shotgun Shells +- 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: BallisticAmmoProvider + proto: ShellShotgunBeanbag + capacity: 12 + - 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: BallisticAmmoProvider + proto: ShellShotgun + capacity: 12 + - 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: BallisticAmmoProvider + proto: ShellShotgunSlug + capacity: 12 + - 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: BallisticAmmoProvider + proto: ShellShotgunFlare + capacity: 12 + - type: Sprite + layers: + - state: boxwide + - state: shellflare + +- 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: BallisticAmmoProvider + proto: ShellShotgunIncendiary + capacity: 12 + - 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: BallisticAmmoProvider + proto: ShellShotgunPractice + capacity: 12 + - 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: BallisticAmmoProvider + proto: ShellTranquilizer + capacity: 12 + - type: Sprite + layers: + - state: boxwide + - state: shellslug + + # Rifle - type: entity name: box of .20 rifle magazines diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/security.yml b/Resources/Prototypes/Catalog/Fills/Boxes/security.yml index ba4432f392..2fb402acae 100644 --- a/Resources/Prototypes/Catalog/Fills/Boxes/security.yml +++ b/Resources/Prototypes/Catalog/Fills/Boxes/security.yml @@ -70,166 +70,4 @@ amount: 10 - type: Sprite layers: - - state: box_security - -# TODO: THESE ARE BAD AND ARE DEPRECATED, DON'T USE THEM PLEASE -- 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 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: BoxMagazineRifle - description: A box full of .20 rifle magazines. - components: - - type: StorageFill - contents: - - id: MagazineRifle - amount: 6 - -- type: entity - name: box of .20 rifle (high-velocity) magazines - parent: BoxCardboard - id: BoxMagazineRifleHighVelocity - description: A box full of .20 rifle (high-velocity) magazines. - components: - - type: StorageFill - contents: - - id: MagazineRifleHighVelocity - amount: 6 - -- type: entity - name: box of .20 rifle (practice) magazines - parent: BoxCardboard - id: BoxMagazineRiflePractice - description: A box full of .20 rifle (practice) magazines. - components: - - type: StorageFill - contents: - - id: MagazineRiflePractice - amount: 6 - -- type: entity - name: box of .20 rifle (rubber) magazines - parent: BoxCardboard - id: BoxMagazineRifleRubber - description: A box full of .20 rifle (rubber) magazines. - components: - - type: StorageFill - contents: - - id: MagazineRifleRubber - amount: 6 - -- type: entity - name: box of .30 rifle bullets - parent: BoxCardboard - id: BoxBulletLightRifleSmall - description: A box full of individual .30 rifle bullets. - components: - - type: StorageFill - contents: - - id: CartridgeLightRifle - amount: 20 + - state: box_security \ No newline at end of file