From 1e1ac5eb23c060af7dbc931da0cd7f1145a9fb8b Mon Sep 17 00:00:00 2001
From: bleaky <bleaky@users.noreply.github.com>
Date: Mon, 17 Jun 2024 21:54:43 -0700
Subject: [PATCH] adding tiny bottles and modifying nicotine liquid bottles
 (#74614)

* Initial commit

* adding tiny bottles and modifying nicotine liquid bottles
---
 data/json/items/ammo.json                  |  8 +++---
 data/json/items/containers/containers.json | 31 ++++++++++++++++++++++
 2 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/data/json/items/ammo.json b/data/json/items/ammo.json
index 6b101aa26aba2..f79c2dd3c61b5 100644
--- a/data/json/items/ammo.json
+++ b/data/json/items/ammo.json
@@ -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",
diff --git a/data/json/items/containers/containers.json b/data/json/items/containers/containers.json
index 497d6b5821ff6..aca895c209a5d 100644
--- a/data/json/items/containers/containers.json
+++ b/data/json/items/containers/containers.json
@@ -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",