Skip to content

Commit

Permalink
Replace volume ints with strings
Browse files Browse the repository at this point in the history
  • Loading branch information
anothersimulacrum authored and kevingranade committed Dec 22, 2019
1 parent 807d578 commit 29f4edc
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 9 deletions.
4 changes: 2 additions & 2 deletions data/json/items/armor.json
Original file line number Diff line number Diff line change
Expand Up @@ -2352,7 +2352,7 @@
"material_thickness": 1,
"encumbrance": 2,
"max_encumbrance": 18,
"storage": 96,
"storage": "24 L",
"warmth": 5,
"flags": [ "BELTED", "OVERSIZE", "STURDY" ]
},
Expand Down Expand Up @@ -7854,7 +7854,7 @@
"covers": [ "TORSO", "ARMS" ],
"coverage": 95,
"encumbrance": 22,
"storage": 8,
"storage": "2 L",
"warmth": 80,
"material_thickness": 5,
"valid_mods": [ "steel_padded" ],
Expand Down
8 changes: 4 additions & 4 deletions data/json/items/generic/bathroom_house.json
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@
"price": 89,
"price_postapoc": 180,
"weight": 227,
"volume": 1,
"volume": "250 ml",
"material": "paper",
"to_hit": -2,
"snippet_category": [
Expand Down Expand Up @@ -189,7 +189,7 @@
"price": 2100,
"price_postapoc": 0,
"weight": 680,
"volume": 2,
"volume": "500 ml",
"material": [ "plastic", "steel" ],
"bashing": 3,
"to_hit": -1
Expand All @@ -204,7 +204,7 @@
"price": 2500,
"price_postapoc": 0,
"weight": 590,
"volume": 1,
"volume": "250 ml",
"material": [ "ceramic", "steel" ],
"bashing": 3,
"to_hit": 1
Expand All @@ -219,7 +219,7 @@
"price": 1700,
"price_postapoc": 0,
"weight": 160,
"volume": 2,
"volume": "500 ml",
"material": [ "steel", "plastic" ],
"bashing": 3,
"to_hit": 1
Expand Down
4 changes: 2 additions & 2 deletions data/json/items/generic/dining_kitchen.json
Original file line number Diff line number Diff line change
Expand Up @@ -808,7 +808,7 @@
"category": "other",
"description": "A stainless steel mesh colander, for washing rice, vegetables or straining liquid off from noodles or other foods.",
"type": "GENERIC",
"volume": 2,
"volume": "500 ml",
"weight": 318,
"symbol": ")",
"price": 600,
Expand All @@ -819,7 +819,7 @@
"name": "splatter guard",
"description": "A stainless steel mesh screen for preventing flying oil from getting all over your nice counters (or you) when frying.",
"type": "GENERIC",
"volume": 2,
"volume": "500 ml",
"weight": 357,
"symbol": ")",
"price": 600,
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -884,7 +884,7 @@
"name": "sieve",
"description": "This is no mere strainer for noodles; it's a sieve used to separate particles of certain sizes. You could use this to do a really good job sifting flour, remove dust and soil from grain, or perhaps conduct gradiation tests for any civil engineers you might know. This one has been constructed from steel mesh.",
"weight": 318,
"volume": 2,
"volume": "500 ml",
"price": 700,
"bashing": 2,
"material": [ "steel" ],
Expand Down

0 comments on commit 29f4edc

Please sign in to comment.