Merge pull request #33796 from Fris0uman/shaken_not_stirred

5 portions of martini coming right up!
CleverRaven · Sep 4, 2019 · fdc99b2 · fdc99b2
2 parents b149e2e + 675f445
commit fdc99b2
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/data/json/items/comestibles/alcohol.json b/data/json/items/comestibles/alcohol.json
@@ -1256,22 +1256,23 @@
     "type": "COMESTIBLE",
     "id": "drink_martini",
     "name": "martini",
-    "weight": "248 g",
+    "weight": "49600 mg",
     "color": "white",
     "addiction_type": "alcohol",
     "use_action": "ALCOHOL",
     "stim": -11,
     "container": "bottle_glass",
     "comestible_type": "DRINK",
     "symbol": "~",
-    "quench": 25,
+    "quench": 5,
     "addiction_potential": 4,
-    "calories": 61,
+    "calories": 13,
     "description": "This is a popular cocktail made with gin and dry vermouth, dating from the Prohibition era.",
     "price": 850,
     "material": [ "alcohol", "water" ],
     "primary_material": "alcohol",
     "volume": "500 ml",
+    "charges": 5,
     "phase": "liquid",
     "flags": [ "EATEN_COLD" ],
     "freezing_point": -22,