From f661561a596b68e7e6f5274c2b71d0b29c741a26 Mon Sep 17 00:00:00 2001 From: Aviu00 Date: Wed, 24 Jan 2024 10:22:37 +0300 Subject: [PATCH] Oppsie --- .../Catalog/Fills/Boxes/ammunition.yml | 133 ------------------ .../Entities/Clothing/Belt/belts.yml | 13 -- 2 files changed, 146 deletions(-) diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/ammunition.yml b/Resources/Prototypes/Catalog/Fills/Boxes/ammunition.yml index c272adcbcd..ba8fd6fb25 100644 --- a/Resources/Prototypes/Catalog/Fills/Boxes/ammunition.yml +++ b/Resources/Prototypes/Catalog/Fills/Boxes/ammunition.yml @@ -268,139 +268,6 @@ - id: MagazineShotgunIncendiary amount: 4 -# base BallisticAmmoProvider dispensers -- type: entity - parent: BaseItem - id: BaseAmmoProvider - abstract: true - components: - - type: ContainerContainer - containers: - ballistic-ammo: !type:Container - - type: Item - size: 30 - - type: Sprite - sprite: Objects/Storage/boxes.rsi - # WD edit sounds start - - type: EmitSoundOnPickup - sound: - path: /Audio/White/Items/handling/cardboardbox_pickup.ogg - - type: EmitSoundOnDrop - sound: - path: /Audio/White/Items/handling/cardboardbox_drop.ogg - - type: EmitSoundOnLand - sound: - path: /Audio/White/Items/handling/cardboardbox_drop.ogg - - type: EmitSoundOnCollide - sound: - path: /Audio/White/Items/handling/cardboardbox_drop.ogg - # WD edit sounds end - -- type: entity - parent: BaseAmmoProvider - id: AmmoProviderShotgunShell - abstract: true - components: - - type: BallisticAmmoProvider - whitelist: - tags: - - ShellShotgun - capacity: 12 - -# Shotgun Shells -- type: entity - name: shotgun beanbag cartridges dispenser - parent: AmmoProviderShotgunShell - id: BoxBeanbag - description: A dispenser box full of beanbag shots, designed for riot shotguns. - components: - - type: BallisticAmmoProvider - proto: ShellShotgunBeanbag - - type: Sprite - layers: - - state: boxwide - - state: shellbeanbag - -- type: entity - name: shotgun lethal cartridges dispenser - parent: AmmoProviderShotgunShell - id: BoxLethalshot - description: A dispenser box full of lethal pellet shots, designed for riot shotguns. - components: - - type: BallisticAmmoProvider - proto: ShellShotgun - - type: Sprite - layers: - - state: boxwide - - state: shelllethal - -- type: entity - name: shotgun slug cartridges dispenser - parent: AmmoProviderShotgunShell - id: BoxShotgunSlug - description: A dispenser box full of slugs, designed for riot shotguns. - components: - - type: BallisticAmmoProvider - proto: ShellShotgunSlug - - type: Sprite - layers: - - state: boxwide - - state: shellslug - -- type: entity - name: shotgun flare cartridges dispenser - parent: AmmoProviderShotgunShell - id: BoxShotgunFlare - description: A dispenser box full of flare cartridges, designed for riot shotguns. - components: - - type: BallisticAmmoProvider - proto: ShellShotgunFlare - - type: Sprite - layers: - - state: boxwide - - state: shellflare - -- type: entity - name: shotgun incendiary cartridges dispenser - parent: AmmoProviderShotgunShell - id: BoxShotgunIncendiary - description: A dispenser box full of incendiary cartridges, designed for riot shotguns. - components: - - type: BallisticAmmoProvider - proto: ShellShotgunIncendiary - - type: Sprite - layers: - - state: boxwide - - state: shellincendiary - -- type: entity - name: shotgun practice cartridges dispenser - parent: AmmoProviderShotgunShell - id: BoxShotgunPractice - description: A dispenser box full of practice cartridges, designed for riot shotguns. - components: - - type: BallisticAmmoProvider - proto: ShellShotgunPractice - - type: Sprite - layers: - - state: boxwide - - state: shellpractice - -- type: entity - name: tranquilizer cartridges dispenser - parent: AmmoProviderShotgunShell - id: BoxShellTranquilizer - description: A dispenser box full of tranquilizer cartridges, designed for riot shotguns. - components: - - type: BallisticAmmoProvider - proto: ShellTranquilizer - - type: Sprite - layers: - - state: boxwide - - state: shellslug - ->>>>>>> 640bbaf329 (Куча звуков из сс13 (#457)) - # Rifle - type: entity name: box of .20 rifle magazines diff --git a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml index eadc08a8ea..7b8c20382d 100644 --- a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml +++ b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml @@ -171,19 +171,6 @@ sprite: Clothing/Belt/belt_overlay.rsi - type: Appearance -- type: entity - parent: ClothingBeltUtility # WD edit - id: ClothingBeltChiefEngineer - name: chief engineer's toolbelt - description: Holds tools, looks snazzy. - components: - - type: Sprite - sprite: Clothing/Belt/ce.rsi - - type: Clothing - sprite: Clothing/Belt/ce.rsi - - type: Storage - capacity: 105 - - type: entity parent: ClothingBeltSecurity # WD edit id: ClothingBeltAssault