From 488433c57e657b6e452bee6f7b40f36fe965c577 Mon Sep 17 00:00:00 2001 From: deltanedas <39013340+deltanedas@users.noreply.github.com> Date: Sun, 5 Nov 2023 23:49:29 +0000 Subject: [PATCH] give chemistry bag better storage (#21447) * chemistry bag better storage * large beaker and drink bottles are normal size * :trollface: * :trollface: --------- Co-authored-by: deltanedas <@deltanedas:kde.org> --- Resources/Prototypes/Catalog/Fills/Boxes/science.yml | 3 +++ .../Entities/Objects/Consumable/Drinks/drinks_bottles.yml | 2 ++ .../Entities/Objects/Specific/Chemistry/chem_bag.yml | 6 ++++-- .../Prototypes/Entities/Objects/Specific/chemistry.yml | 2 +- 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/science.yml b/Resources/Prototypes/Catalog/Fills/Boxes/science.yml index 13cae992e9..b4bfb578c1 100644 --- a/Resources/Prototypes/Catalog/Fills/Boxes/science.yml +++ b/Resources/Prototypes/Catalog/Fills/Boxes/science.yml @@ -4,6 +4,9 @@ id: BoxBeaker description: A box full of beakers. components: + - type: Storage + maxTotalWeight: 12 + maxItemSize: Normal - type: StorageFill contents: - id: Beaker diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml index d6a0570e28..66c9c404c4 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml @@ -12,6 +12,8 @@ maxVol: 100 - type: Sprite state: icon + - type: Item + size: Normal - type: DamageOnLand damage: types: diff --git a/Resources/Prototypes/Entities/Objects/Specific/Chemistry/chem_bag.yml b/Resources/Prototypes/Entities/Objects/Specific/Chemistry/chem_bag.yml index 597f48744c..a221b2ca1f 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Chemistry/chem_bag.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Chemistry/chem_bag.yml @@ -13,13 +13,15 @@ slots: - belt - type: Item - size: Normal + size: Ginormous - type: Storage - maxSlots: 40 + maxItemSize: Normal # allow up to 5 large beakers / 10 beakers / 10 pill canisters + maxTotalWeight: 20 quickInsert: true areaInsert: true whitelist: components: + - FitsInDispenser - Pill tags: - PillCanister diff --git a/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml b/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml index d8924895df..9e8140943e 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml @@ -187,7 +187,7 @@ map: ["enum.SolutionContainerLayers.Fill"] visible: false - type: Item - size: Small + size: Normal sprite: Objects/Specific/Chemistry/beaker_large.rsi - type: SolutionContainerManager solutions: -- 2.51.2