Use volume strings in mods

data/mods/Aftershock/items/afs__items.json

@@ -28,14 +28,14 @@
     "description": "A wide, shallow basin used to hold liquid, hammered from a piece of sheet metal.  Ideal for collecting water.",
     "weight": 5000,
     "looks_like": "ceramic_bowl",
-    "volume": 10,
+    "volume": "2500 ml",
     "price": 1000,
     "to_hit": -1,
     "bashing": 1,
     "material": "steel",
     "symbol": ")",
     "color": "dark_gray",
-    "contains": 10,
+    "contains": "2500 ml",
     "watertight": true,
     "qualities": [ [ "COOK", 1 ], [ "BOIL", 2 ], [ "CONTAIN", 1 ] ],
     "use_action": "HEAT_FOOD"
@@ -49,7 +49,7 @@
     "symbol": "{",
     "color": "white",
     "weight": 142882,
-    "volume": 1200,
+    "volume": "300 L",
     "price": 40000,
     "price_postapoc": 10000,
     "material": [ "steel" ],
@@ -80,7 +80,7 @@
     "material": "titanium",
     "looks_like": "scrap",
     "weight": 100,
-    "volume": 1,
+    "volume": "250 ml",
     "bashing": 1,
     "to_hit": -2
   },
@@ -96,7 +96,7 @@
     "material": [ "titanium" ],
     "looks_like": "xlframe",
     "techniques": [ "DEF_DISARM" ],
-    "volume": 30,
+    "volume": "7500 ml",
     "bashing": 15,
     "category": "veh_parts",
     "price": 4000
@@ -132,7 +132,7 @@
     "description": "A small pellet of silvery metal, still warm to the touch.",
     "looks_like": "medium_atomic_battery_cell",
     "weight": 30,
-    "volume": 1,
+    "volume": "250 ml",
     "price": 0,
     "material": "iron",
     "symbol": "*",

data/mods/Aftershock/items/afs_armor.json

@@ -5,7 +5,7 @@
     "name": "bag of holding",
     "description": "A sleek, unfathomably-complicated machine covered in dozens of blinking lights, worn on the back by sturdy faux-leather straps.  An electrode dangles from the back, attaching to your forehead.  How it operates without annihilating spacetime isn't quite clear, but a localized portal allows things to be stored in an extradimensional space.",
     "weight": 3401,
-    "volume": 12,
+    "volume": "3 L",
     "//": "sci-fantasy extradimensional gadget = pricey",
     "price": 1000000000,
     "//": "because nobody would have that amount after the world ends, it's worth $1000 in barter",
@@ -17,7 +17,7 @@
     "looks_like": "molle_pack",
     "coverage": 30,
     "encumbrance": 10,
-    "storage": 400,
+    "storage": "100 L",
     "warmth": 5,
     "material_thickness": 2,
     "flags": [ "BELTED", "ONLY_ONE", "LEAK_DAM" ]
@@ -28,7 +28,7 @@
     "name": "boot quiver",
     "description": "This is a makeshift quiver made from a thigh-high boot with the heel removed and patched shut, and strings used as a strap run through a hole punched into its side.  It can hold 40 arrows or bolts for easy access.",
     "weight": 770,
-    "volume": 8,
+    "volume": "2 L",
     "price": 500,
     "bashing": 4,
     "material": [ "leather" ],
@@ -50,15 +50,15 @@
     "symbol": "[",
     "color": "yellow",
     "weight": 3501,
-    "volume": 10,
+    "volume": "2500 ml",
     "price": 100000000,
     "price_postapoc": 50000,
     "material": [ "superalloy", "kevlar" ],
     "covers": [ "TORSO", "ARMS", "HANDS", "LEGS", "FEET" ],
     "coverage": 100,
     "material_thickness": 2,
     "encumbrance": 9,
-    "storage": 12,
+    "storage": "3 L",
     "warmth": 20,
     "environmental_protection": 5,
     "flags": [
@@ -82,7 +82,7 @@
     "symbol": "[",
     "color": "yellow",
     "weight": 581,
-    "volume": 8,
+    "volume": "2 L",
     "price": 10000000,
     "price_postapoc": 5000,
     "material": [ "superalloy", "plastic" ],
@@ -139,7 +139,7 @@
     "name": "quilt",
     "description": "A big, comfy quilt made of thick wool in a triangle pattern.  Extremely cozy!",
     "weight": 1814,
-    "volume": 20,
+    "volume": "5 L",
     "price": 5500,
     "to_hit": -1,
     "material": [ "wool" ],
@@ -173,7 +173,7 @@
       "type": "holster",
       "holster_prompt": "Attach what to belt loop?",
       "holster_msg": "You clip your %s to your %s",
-      "max_volume": 6,
+      "max_volume": "1500 ml",
       "max_weight": 2000,
       "draw_cost": 50,
       "flags": [ "BELT_CLIP" ]
@@ -191,7 +191,7 @@
     "name": "brigandine",
     "description": "A piece of body armor from the Middle Ages consisting of boiled leather with riveted metal plates lying underneath.  Typically used to protect from arrows, it has very good protection against cuts.",
     "weight": 3268,
-    "volume": 6,
+    "volume": "1500 ml",
     "price": 5000,
     "to_hit": -3,
     "material": [ "leather", "steel" ],
@@ -211,7 +211,7 @@
     "name": "crafted brigandine",
     "description": "Modelled after a proper brigandine from medieval times, this makeshift piece of body armor consists of layered cloth with small pieces of sheet metal affixed to the underside.  While not as protective as a proper piece of armor, it'll still keep you relatively safe.",
     "weight": 3268,
-    "volume": 6,
+    "volume": "1500 ml",
     "price": 1000,
     "to_hit": -3,
     "material": [ "cotton", "steel" ],
@@ -231,7 +231,7 @@
     "name": "titanium vest",
     "description": "A lightweight armor vest made of pieces of titanium sewn together, with cloth padding for comfort.  Brittle against blunt force, but highly resistant to cuts and corrosion.",
     "weight": 939,
-    "volume": 2,
+    "volume": "500 ml",
     "price": 1000,
     "to_hit": -3,
     "material": [ "titanium", "cotton" ],
@@ -251,7 +251,7 @@
     "name_plural": "MBR vests (titanium)",
     "description": "A Modular Bullet Resistant Vest.  Titanium scraps have been inserted to improve its protection.  It has four pouches capable of carrying magazines.",
     "weight": 3108,
-    "volume": 24,
+    "volume": "6 L",
     "price": 110000,
     "to_hit": -3,
     "bashing": 6,
@@ -262,16 +262,16 @@
     "covers": [ "TORSO" ],
     "coverage": 85,
     "encumbrance": 7,
-    "storage": 10,
+    "storage": "2500 ml",
     "warmth": 15,
     "material_thickness": 3,
     "use_action": {
       "type": "holster",
       "holster_prompt": "Stash ammo",
       "holster_msg": "You stash your %s.",
       "multi": 4,
-      "min_volume": 1,
-      "max_volume": 4,
+      "min_volume": "250 ml",
+      "max_volume": "1 L",
       "draw_cost": 60,
       "flags": [ "MAG_COMPACT" ]
     },

data/mods/Aftershock/items/afs_books.json

@@ -6,7 +6,7 @@
     "name_plural": "original copies of Housefly",
     "description": "The only copy of Housefly in existence - a long book about three individuals drawn together by fate in the early 1800s to save their English town of Victoria from a mysterious threat.  You never got to publish it, but reading it lets you forget the horrors of the Cataclysm, if only for a moment.",
     "weight": 700,
-    "volume": 3,
+    "volume": "750 ml",
     "price": 5000,
     "price_postapoc": 1000,
     "looks_like": "ZSG",

data/mods/Aftershock/items/afs_tools.json

@@ -61,7 +61,7 @@
     "name_plural": "chain wrenches",
     "description": "An adjustable chain wrench, designed for hard-to-reach places.  Being handmade, it lacks the precision of a proper wrench.",
     "weight": 1614,
-    "volume": 1,
+    "volume": "250 ml",
     "price": 4000,
     "price_postapoc": 1200,
     "to_hit": 1,
@@ -80,7 +80,7 @@
     "name_plural": "power cutter (off)",
     "description": "A huge, gas-powered saw with a diamond blade.  If it has gasoline, it can be turned on to turn it into a powerful metal cutting tool.",
     "weight": 9979,
-    "volume": 12,
+    "volume": "3 L",
     "price": 100000,
     "price_postapoc": 10000,
     "to_hit": -3,
@@ -117,7 +117,7 @@
     "name_plural": "murdersaws (off)",
     "description": "This former power cutter has been lightened and stripped of all those unnecessary safety measures, turning it into a gas-powered killing machine.  Use it to turn it on.",
     "weight": 4301,
-    "volume": 8,
+    "volume": "2 L",
     "price": 100000,
     "price_postapoc": 30000,
     "to_hit": -3,

data/mods/Aftershock/items/afs_weapons.json

@@ -5,7 +5,7 @@
     "name": "energy saber",
     "description": "A hefty black tube the size of your hand.  Activate to produce a hard-light blade, running off of UPS.",
     "weight": 240,
-    "volume": 1,
+    "volume": "250 ml",
     "price": 10000000,
     "price_postapoc": 20000,
     "material": [ "superalloy", "diamond" ],
@@ -46,7 +46,7 @@
     "name": "energy saber (active)",
     "description": "This glittering blue saber of cyan light hums gently, extending from its superalloy handle.  Its edge is lethally sharp, and being made of light, it's weightless, and immune to being damaged.  It's not white-hot like in pop culture, so it can't cut through anything, but there's not much in the way of flesh that it won't slice through easily.",
     "weight": 240,
-    "volume": 4,
+    "volume": "1 L",
     "price": 10000000,
     "price_postapoc": 20000,
     "material": [ "superalloy", "diamond" ],
@@ -82,7 +82,7 @@
     "skill": "archery",
     "min_strength": 4,
     "weight": 113,
-    "volume": 6,
+    "volume": "1500 ml",
     "bashing": 8,
     "armor_data": { "covers": [ "TORSO" ], "coverage": 5, "material_thickness": 1, "encumbrance": 7 },
     "reload_noise_volume": 0,
@@ -102,7 +102,7 @@
     "name": "hydraulic gauntlet",
     "description": "A huge, heavy metal gauntlet lined with tubing and gauges.  Slow and unwieldy, it uses internal pressure to deliver devastating blows, but takes tremendous strength to use effectively.  Thanks to an internal microreactor, it doesn't require power of its own.",
     "weight": 3778,
-    "volume": 8,
+    "volume": "2 L",
     "price": 10000000,
     "price_postapoc": 20000,
     "material": [ "hardsteel" ],
@@ -143,7 +143,7 @@
     "type": "GUN",
     "name": "deployed grenade launcher",
     "description": "A grenade launcher mounted onto your right-hand wrist.  Less powerful than a proper grenade launcher, but infinitely more portable, and quick to reload.",
-    "volume": 9,
+    "volume": "2250 ml",
     "price": 0,
     "to_hit": -2,
     "bashing": 9,
@@ -165,7 +165,7 @@
     "name": "shoddy laser rifle",
     "description": "This is a cheap laser rifle made from common components.  Weak, but can be powered with rechargeable batteries.",
     "weight": 8000,
-    "volume": 10,
+    "volume": "2500 ml",
     "price": 40000,
     "to_hit": -1,
     "bashing": 8,

data/mods/Aftershock/items/obsolete.json

@@ -10,7 +10,7 @@
   "quench": -5,
   "description": "Flour mixed with water, kneaded into a gooey paste.  This dough can be used to bake bread more efficiently than with just flour.",
   "price": 100,
-  "volume": 2,
+  "volume": "500 ml",
   "charges": 2,
   "flags": [
     "EATEN_HOT"

data/mods/Aftershock/maps/afs_furniture.json

@@ -11,7 +11,7 @@
     "insulation": 3,
     "flags": [ "CONTAINER", "PLACE_ITEM", "BLOCKSDOOR", "MINEABLE", "EASY_DECONSTRUCT" ],
     "deconstruct": { "items": [ { "item": "afs_fridge", "count": 1 } ] },
-    "max_volume": 4000,
+    "max_volume": "1000 L",
     "deployed_item": "afs_fridge",
     "examine_action": "deployed_furniture",
     "bash": {
@@ -45,7 +45,7 @@
     "insulation": 3,
     "flags": [ "CONTAINER", "PLACE_ITEM", "BLOCKSDOOR", "MINEABLE", "EASY_DECONSTRUCT" ],
     "deconstruct": { "items": [ { "item": "afs_freezer", "count": 1 } ] },
-    "max_volume": 4000,
+    "max_volume": "1000 L",
     "deployed_item": "afs_freezer",
     "examine_action": "deployed_furniture",
     "bash": {

data/mods/Aftershock/vehicles/afs_part_items.json

@@ -10,7 +10,7 @@
     "symbol": "]",
     "looks_like": "cargo_aisle",
     "material": [ "steel" ],
-    "volume": 400,
+    "volume": "100 L",
     "bashing": 2,
     "category": "veh_parts",
     "price": 50000
@@ -27,7 +27,7 @@
     "material": [ "titanium" ],
     "looks_like": "xlframe",
     "techniques": [ "DEF_DISARM" ],
-    "volume": 30,
+    "volume": "7500 ml",
     "bashing": 15,
     "category": "veh_parts",
     "price": 4000
@@ -67,7 +67,7 @@
     "color": "red",
     "symbol": "$",
     "material": [ "plastic", "steel" ],
-    "volume": 24,
+    "volume": "6 L",
     "bashing": 2,
     "category": "veh_parts",
     "price": 60000