diff --git a/data/json/items/chemicals_and_resources.json b/data/json/items/chemicals_and_resources.json index cb16caaa9b42..4aa7632a4492 100644 --- a/data/json/items/chemicals_and_resources.json +++ b/data/json/items/chemicals_and_resources.json @@ -276,7 +276,7 @@ "name": { "str_sp": "commercial fertilizer" }, "weight": "350 g", "color": "yellow", - "flags": [ "FERTILIZER" ], + "flags": [ "FERTILIZER", "UNSAFE_CONSUME" ], "use_action": "PLANTBLECH", "container": "bag_canvas", "comestible_type": "FOOD", diff --git a/data/json/items/comestibles/carnivore.json b/data/json/items/comestibles/carnivore.json index 31b47398ed37..aa51a313cfef 100644 --- a/data/json/items/comestibles/carnivore.json +++ b/data/json/items/comestibles/carnivore.json @@ -625,7 +625,7 @@ "material": "flesh", "volume": "250 ml", "fun": -10, - "flags": [ "TRADER_AVOID", "SMOKABLE", "NUTRIENT_OVERRIDE", "RAW" ], + "flags": [ "TRADER_AVOID", "SMOKABLE", "NUTRIENT_OVERRIDE", "RAW", "UNSAFE_CONSUME" ], "smoking_result": "dry_meat_tainted" }, { @@ -648,7 +648,7 @@ "volume": "250 ml", "milling": { "into": "meal_bone_tainted", "conversion_rate": 4 }, "fun": -10, - "flags": [ "NO_SALVAGE" ] + "flags": [ "NO_SALVAGE", "UNSAFE_CONSUME" ] }, { "type": "GENERIC", @@ -678,7 +678,7 @@ "material": "flesh", "volume": "250 ml", "fun": -10, - "flags": [ "RAW" ] + "flags": [ "RAW", "UNSAFE_CONSUME" ] }, { "type": "COMESTIBLE", @@ -701,7 +701,8 @@ "volume": "250 ml", "charges": 2, "stack_size": 4, - "fun": -18 + "fun": -18, + "flags": [ "UNSAFE_CONSUME" ] }, { "type": "COMESTIBLE", @@ -764,7 +765,7 @@ "price": 330, "price_postapoc": 20, "material": "flesh", - "flags": [ "RAW", "TRADER_AVOID" ], + "flags": [ "RAW", "TRADER_AVOID", "UNSAFE_CONSUME" ], "stack_size": 1, "fun": -12 }, @@ -819,7 +820,7 @@ "description": "A carefully folded raw skin harvested from a fur-bearing unnatural creature. It still has the fur attached and is poisonous. You can cure it for storage and tanning.", "price": 0, "price_postapoc": 50, - "flags": [ "NO_SALVAGE" ] + "flags": [ "NO_SALVAGE", "UNSAFE_CONSUME" ] }, { "type": "COMESTIBLE", @@ -920,7 +921,8 @@ { "id": "badpoison", "duration": 3600 }, { "id": "shakes", "duration": 810 } ] - } + }, + "flags": [ "UNSAFE_CONSUME" ] }, { "id": "meat_bark", diff --git a/data/json/items/comestibles/mushroom.json b/data/json/items/comestibles/mushroom.json index 47c5c5ddfdd9..56f1489835bd 100644 --- a/data/json/items/comestibles/mushroom.json +++ b/data/json/items/comestibles/mushroom.json @@ -30,7 +30,7 @@ "material": "mushroom", "volume": "250 ml", "fun": 1, - "flags": [ "SMOKABLE" ], + "flags": [ "SMOKABLE", "UNSAFE_CONSUME" ], "smoking_result": "dry_mushroom", "vitamins": [ [ "calcium", 2 ], [ "iron", 52 ] ] }, @@ -45,7 +45,8 @@ "price": 1500, "price_postapoc": 50, "fun": 4, - "vitamins": [ [ "calcium", 2 ], [ "iron", 52 ] ] + "vitamins": [ [ "calcium", 2 ], [ "iron", 52 ] ], + "delete": { "flags": [ "UNSAFE_CONSUME" ] } }, { "type": "COMESTIBLE", diff --git a/data/json/items/comestibles/other.json b/data/json/items/comestibles/other.json index 8c9fb42a5784..f1c6537dcba2 100644 --- a/data/json/items/comestibles/other.json +++ b/data/json/items/comestibles/other.json @@ -29,7 +29,8 @@ "price": 0, "price_postapoc": 0, "volume": "250 ml", - "fun": -10 + "fun": -10, + "flags": [ "UNSAFE_CONSUME" ] }, { "type": "COMESTIBLE", @@ -207,7 +208,8 @@ "material": "powder", "volume": "250 ml", "charges": 4, - "fun": -10 + "fun": -10, + "flags": [ "UNSAFE_CONSUME" ] }, { "type": "COMESTIBLE", @@ -568,7 +570,7 @@ "price": 80, "price_postapoc": 0, "material": "hflesh", - "flags": [ "TRADER_AVOID" ], + "flags": [ "TRADER_AVOID", "UNSAFE_CONSUME" ], "volume": "250 ml", "fun": -30 }, diff --git a/data/json/items/comestibles/raw_veggy.json b/data/json/items/comestibles/raw_veggy.json index bb986ff402d1..e48c6f2d7dd4 100644 --- a/data/json/items/comestibles/raw_veggy.json +++ b/data/json/items/comestibles/raw_veggy.json @@ -400,7 +400,8 @@ "material": [ "veggy" ], "volume": "250 ml", "price": 0, - "price_postapoc": 0 + "price_postapoc": 0, + "flags": [ "UNSAFE_CONSUME" ] }, { "type": "COMESTIBLE", @@ -792,7 +793,8 @@ "description": "This is a chunk of fungal matter from some sort of alien mushroom creature. Eating unfamiliar mushrooms is a bad idea.", "price": 0, "price_postapoc": 0, - "smoking_result": "dry_veggy_tainted" + "smoking_result": "dry_veggy_tainted", + "extend": { "flags": [ "UNSAFE_CONSUME" ] } }, { "type": "COMESTIBLE", diff --git a/data/json/items/comestibles/seed.json b/data/json/items/comestibles/seed.json index 56d452b3c3aa..af663305c16d 100644 --- a/data/json/items/comestibles/seed.json +++ b/data/json/items/comestibles/seed.json @@ -15,7 +15,7 @@ "primary_material": "dried_vegetable", "symbol": ".", "color": "brown", - "flags": [ "NUTRIENT_OVERRIDE", "PLANTABLE_SEED" ] + "flags": [ "NUTRIENT_OVERRIDE", "PLANTABLE_SEED", "UNSAFE_CONSUME" ] }, { "abstract": "seed_fruit", @@ -318,6 +318,7 @@ "material": "garlic", "volume": "150 ml", "fun": -3, + "flags": [ "UNSAFE_CONSUME" ], "seed_data": { "plant_name": "garlic", "fruit": "garlic", "byproducts": [ "withered" ], "grow": "10 days" } }, { @@ -382,7 +383,7 @@ "price": 100, "weight": "2 g", "charges": 2, - "flags": [ "RAW" ], + "flags": [ "RAW", "UNSAFE_CONSUME" ], "seed_data": { "plant_name": "cannabis", "fruit": "cannabis", "grow": "14 days" } }, { @@ -419,6 +420,7 @@ "volume": "100 ml", "stack_size": 10, "fun": 30, + "flags": [ "UNSAFE_CONSUME" ], "seed_data": { "fruit": "null", "//": "dummy entry, results are hardcoded", "plant_name": "marloss berry", "grow": "14 days" } }, {