Skip to content

Commit

Permalink
adding tiny bottles and modifying nicotine liquid bottles (#74614)
Browse files Browse the repository at this point in the history
* Initial commit

* adding tiny bottles and modifying nicotine liquid bottles
  • Loading branch information
bleaky authored Jun 18, 2024
1 parent 1bf81ff commit 1e1ac5e
Show file tree
Hide file tree
Showing 2 changed files with 35 additions and 4 deletions.
8 changes: 4 additions & 4 deletions data/json/items/ammo.json
Original file line number Diff line number Diff line change
Expand Up @@ -1201,12 +1201,12 @@
"symbol": "=",
"color": "yellow",
"description": "Liquid made up of propylene glycol, vegetable glycerin, flavorings, and nicotine. Intended for use in an advanced electronic cigarette.",
"container": "bottle_plastic_small",
"container": "bottle_plastic_tiny",
"phase": "liquid",
"volume": "250 ml",
"weight": "2 g",
"volume": "30 ml",
"weight": "1 g",
"ammo_type": "components",
"count": 50
"count": 30
},
{
"id": "fish_bait",
Expand Down
31 changes: 31 additions & 0 deletions data/json/items/containers/containers.json
Original file line number Diff line number Diff line change
Expand Up @@ -636,6 +636,37 @@
"color": "white",
"flags": [ "COLLAPSE_CONTENTS" ]
},
{
"id": "bottle_plastic_tiny",
"type": "GENERIC",
"category": "container",
"name": { "str": "tiny plastic bottle" },
"looks_like": "bottle_plastic",
"description": "A watertight plastic bottle, holds 30 mL of liquid.",
"ascii_picture": "bottle_plastic_small",
"weight": "2 g",
"volume": "35 ml",
"longest_side": "4 cm",
"pocket_data": [
{
"pocket_type": "CONTAINER",
"watertight": true,
"rigid": true,
"transparent": true,
"max_contains_volume": "30 ml",
"max_item_volume": "1 ml",
"max_contains_weight": "1 kg",
"moves": 400
}
],
"price": "0 cent",
"price_postapoc": "0 cent",
"to_hit": 1,
"material": [ "plastic" ],
"symbol": ")",
"color": "white",
"flags": [ "COLLAPSE_CONTENTS" ]
},
{
"id": "bottle_plastic_pill_prescription",
"type": "GENERIC",
Expand Down

0 comments on commit 1e1ac5e

Please sign in to comment.