diff --git a/data/json/itemgroups/SUS/mre_packages.json b/data/json/itemgroups/SUS/mre_packages.json index 1ddc8ebce1303..3f60a4a103406 100644 --- a/data/json/itemgroups/SUS/mre_packages.json +++ b/data/json/itemgroups/SUS/mre_packages.json @@ -72,13 +72,13 @@ { "item": "spork" }, { "distribution": [ - { "item": "instant_coffee", "count": 2, "container-item": "beverage_bag" }, - { "item": "herbal_tea_bag", "count": 2, "container-item": "beverage_bag" }, - { "item": "tea_bag", "count": 2, "container-item": "beverage_bag" }, - { "item": "tea_bag_chamomile", "count": 2, "container-item": "beverage_bag" }, - { "item": "tea_bag_dandelion", "count": 2, "container-item": "beverage_bag" }, - { "item": "tea_fruit_bag", "count": 2, "container-item": "beverage_bag" }, - { "item": "tea_green_bag", "count": 2, "container-item": "beverage_bag" } + { "item": "instant_coffee", "count": 2, "container-item": "bag_zipper" }, + { "item": "herbal_tea_bag", "count": 2, "container-item": "bag_zipper" }, + { "item": "tea_bag", "count": 2, "container-item": "bag_zipper" }, + { "item": "tea_bag_chamomile", "count": 2, "container-item": "bag_zipper" }, + { "item": "tea_bag_dandelion", "count": 2, "container-item": "bag_zipper" }, + { "item": "tea_fruit_bag", "count": 2, "container-item": "bag_zipper" }, + { "item": "tea_green_bag", "count": 2, "container-item": "bag_zipper" } ] } ] @@ -168,7 +168,7 @@ "id": "pur_tablets_beverage_bag_6", "subtype": "collection", "//": "This group was created automatically and may contain errors.", - "container-item": "beverage_bag", + "container-item": "bag_zipper", "entries": [ { "item": "pur_tablets", "count": 6 } ] }, { @@ -176,7 +176,7 @@ "id": "sugar_beverage_bag_2", "subtype": "collection", "//": "This group was created automatically and may contain errors.", - "container-item": "beverage_bag", + "container-item": "bag_zipper", "entries": [ { "item": "sugar", "container-item": "null", "count": 2 } ] }, { @@ -192,7 +192,7 @@ "id": "pur_tablets_beverage_bag_0_6", "subtype": "collection", "//": "This group was created automatically and may contain errors.", - "container-item": "beverage_bag", + "container-item": "bag_zipper", "entries": [ { "item": "pur_tablets", "count": [ 0, 6 ] } ] }, { @@ -200,7 +200,7 @@ "id": "sugar_beverage_bag_0_2", "subtype": "collection", "//": "This group was created automatically and may contain errors.", - "container-item": "beverage_bag", + "container-item": "bag_zipper", "entries": [ { "item": "sugar", "container-item": "null", "count": [ 0, 2 ] } ] }, { diff --git a/data/json/items/containers/containers.json b/data/json/items/containers/containers.json index 7650ac891cca3..affff8f25d899 100644 --- a/data/json/items/containers/containers.json +++ b/data/json/items/containers/containers.json @@ -3632,7 +3632,7 @@ "pocket_data": [ { "pocket_type": "CONTAINER", - "max_contains_volume": "2263 ml", + "max_contains_volume": "1769 ml", "max_contains_weight": "4 kg", "airtight": true, "moves": 50, @@ -3699,34 +3699,6 @@ "symbol": ")", "color": "light_gray" }, - { - "id": "beverage_bag", - "type": "GENERIC", - "category": "container", - "name": { "str": "plastic beverage bag" }, - "description": "A transparent, watertight plastic bag meant for holding drinks.", - "looks_like": "bag_plastic", - "weight": "6 g", - "volume": "262 ml", - "price": 0, - "price_postapoc": 0, - "to_hit": 1, - "material": [ "plastic" ], - "symbol": ")", - "color": "white", - "pocket_data": [ - { - "pocket_type": "CONTAINER", - "rigid": false, - "watertight": true, - "open_container": true, - "max_contains_volume": "250 ml", - "max_contains_weight": "1 kg", - "//": "sealed_data is here so the container can be sealed to avoid spilling", - "sealed_data": { "spoil_multiplier": 1.0 } - } - ] - }, { "id": "ipok", "type": "GENERIC", diff --git a/data/json/obsoletion/migration_items.json b/data/json/obsoletion/migration_items.json index c0d03ae9ca6d5..f979a902ea1c3 100644 --- a/data/json/obsoletion/migration_items.json +++ b/data/json/obsoletion/migration_items.json @@ -228,5 +228,11 @@ "id": "burdock_stalk", "type": "MIGRATION", "replace": "plant_stalk" + }, + { + "id": "beverage_bag", + "type": "MIGRATION", + "replace": "bag_zipper", + "sealed": false } ]