Merge pull request #94 from Theawesomeboophis/Fallout-Expansion

[Fallout]  Fallout Content Expansion thanks to Theawesomeboophis' work

Author: Kenan2000

Kenan-Modpack/Fallout_CDDA/Items/comestible/coreregion_comestible.json

@@ -113,6 +113,11 @@
     "calories": 35,
     "description": "Healing Powder mixed into a sweet drink. It tastes better, is better for you, and helps you sleep. It's a miracle drug. Just don't use it in combat.",
     "price": 80,
+    "use_action": {
+      "type": "consume_drug",
+      "activation_message": "You drink some Healing Drink.",
+      "effects": [ { "id": "pkill1", "duration": 1080 }, { "id": "sleep", "duration": 100 } ]
+    },
     "material": [ "fruit", "veggy" ],
     "volume": "250 ml",
     "phase": "liquid",

Kenan-Modpack/Fallout_CDDA/Items/comestible/med.json

@@ -21,9 +21,32 @@
       "effects": [ { "id": "pblue", "duration": 7200 } ]
     }
   },
+  {
+    "id": "med_x",
+    "type": "COMESTIBLE",
+    "comestible_type": "MED",
+    "name": { "str": "Med-X" },
+    "description": "Med-X, meant to make you resist poison.",
+    "weight": "1 g",
+    "volume": "212 ml",
+    "price": 67,
+    "price_postapoc": 90,
+    "charges": 76,
+    "stack_size": 100,
+    "flags": [ "NPC_SAFE", "IRREPLACEABLE_CONSUMABLE" ],
+    "symbol": "r",
+    "color": "red",
+    "phase": "liquid",
+    "use_action": {
+      "type": "consume_drug",
+      "activation_message": "You inject some Med-X.",
+      "tools_needed": { "syringe": -1 },
+      "effects": [ { "id": "med_x_effect", "duration": 100 } ]
+    }
+  },
   {
     "id": "drugs_rare",
     "type": "item_group",
-    "items": [ [ "rad_x", 50 ] ]
+    "items": [ [ "rad_x", 10 ], [ "med_x", 10 ] ]
   }
 ]

Kenan-Modpack/Fallout_CDDA/Items/comestible/other.json

@@ -0,0 +1,42 @@
+[
+  {
+    "type": "COMESTIBLE",
+    "id": "tato",
+    "name": { "str": "tato", "str_pl": "tatos" },
+    "looks_like": "tomato",
+    "weight": "77 g",
+    "color": "red",
+    "spoils_in": "4 days",
+    "comestible_type": "FOOD",
+    "symbol": "%",
+    "quench": 4,
+    "healthy": 15,
+    "calories": 136,
+    "description": "A combination of a tomato and potato.",
+    "price": 75,
+    "material": [ "fruit" ],
+    "volume": "250 ml",
+    "fun": 4,
+    "flags": [ "EDIBLE_FROZEN" ],
+    "vitamins": [ [ "vitC", 6 ] ]
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "carrot_flower",
+    "name": { "str": "carrot flower", "str_pl": "carrot flowers" },
+    "weight": "1 g",
+    "color": "yellow",
+    "spoils_in": "1 days",
+    "comestible_type": "FOOD",
+    "symbol": "%",
+    "healthy": 17,
+    "calories": 30,
+    "description": "A edible flower commonly farmed in boston for the taste.",
+    "price": 75,
+    "material": [ "veggy" ],
+    "volume": "250 ml",
+    "fun": 1,
+    "flags": [ "EDIBLE_FROZEN" ],
+    "vitamins": [ [ "vitA", 6 ] ]
+  }
+]