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>

diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/science.yml b/Resources/Prototypes/Catalog/Fills/Boxes/science.yml
index 13cae992e946dbbac2c9c4ef6d4ee1002584eb1c..b4bfb578c19b7f7e57b36ddb7e47d1e41fb9b438 100644 (file)
--- 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 d6a0570e2899f8e2e68c84c0db255780de93e4df..66c9c404c475a1ec3e6432e76db82c381d72a008 100644 (file)
--- 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 597f48744cb4bc3c064968b22c99c966f1ddc760..a221b2ca1f8543cdfc1ce2deecce609da2dd9dff 100644 (file)
--- 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 d8924895df8721783317f07b9a5a56e44b204f63..9e8140943ee94c8bc2b7699077aea988e07c3ab6 100644 (file)
--- 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: