Merge branch 'Kenan2000:master' into Fallout-Expansion

Author: Theawesomeboophis

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

@@ -0,0 +1,29 @@
+[
+  {
+    "id": "rad_x",
+    "type": "COMESTIBLE",
+    "comestible_type": "MED",
+    "name": { "str": "Rad-X" },
+    "description": "Rad-X Pill, designed to suit all your anti-radiation needs.",
+    "weight": "1 g",
+    "volume": "212 ml",
+    "price": 50,
+    "price_postapoc": 90,
+    "charges": 76,
+    "stack_size": 200,
+    "material": [ "powder" ],
+    "flags": [ "NPC_SAFE", "IRREPLACEABLE_CONSUMABLE" ],
+    "symbol": "r",
+    "color": "red",
+    "use_action": {
+      "type": "consume_drug",
+      "activation_message": "You take some Rad-X.",
+      "effects": [ { "id": "pblue", "duration": 7200 } ]
+    }
+  },
+  {
+    "id": "drugs_rare",
+    "type": "item_group",
+    "items": [ [ "rad_x", 50 ] ]
+  }
+]

Kenan-Modpack/Fallout_CDDA/monsters/undead.json

@@ -41,8 +41,9 @@
     "melee_dice_sides": 8,
     "luminance": 120,
     "harvest": "zombie",
+    "emit_fields": [ { "emit_id": "emit_rad_cloud", "delay": "2 s" } ],
     "death_function": [ "NORMAL" ],
-    "flags": [ "SEES", "SMELLS", "SWIMS", "POISON" ]
+    "flags": [ "SEES", "SMELLS", "SWIMS", "POISON", "NO_BREATHE" ]
   },
   {
     "id": "mon_scorched",

Kenan-Modpack/blazemod/monsters/blob_monster.json

@@ -28,7 +28,7 @@
     "weight": "40750 g",
     "hp": 1,
     "speed": 60,
-    "material": [ "flesh" ],
+    "material": [ "slime" ],
     "symbol": "o",
     "color": "light_green",
     "phase": "LIQUID",
@@ -59,7 +59,7 @@
     "weight": "200 kg",
     "hp": 1,
     "speed": 60,
-    "material": [ "flesh" ],
+    "material": [ "slime" ],
     "symbol": "O",
     "color": "light_gray",
     "phase": "LIQUID",
@@ -90,7 +90,7 @@
     "weight": "120 kg",
     "hp": 1,
     "speed": 60,
-    "material": [ "flesh" ],
+    "material": [ "slime" ],
     "symbol": "O",
     "color": "green",
     "phase": "LIQUID",