Clean up some stragglers

data/json/itemgroups/SUS/lodge.json

@@ -61,12 +61,13 @@
     "id": "cannibal_food",
     "type": "item_group",
     "subtype": "collection",
+    "//": "Cannibal food, currently lacking any cannibalism as cannibalism is no longer defined by flag.",
     "entries": [
       { "item": "machete", "prob": 20 },
-      { "group": "preserved_food", "custom-flags": [ "CANNIBALISM" ], "prob": 30 },
+      { "group": "preserved_food", "prob": 30 },
       { "group": "preserved_food", "prob": 20 },
       { "group": "dry_goods", "prob": 30 },
-      { "group": "dry_goods", "custom-flags": [ "CANNIBALISM" ], "prob": 60 },
+      { "group": "dry_goods", "prob": 60 },
       { "group": "pantry", "prob": 10 }
     ]
   }

data/json/items/comestibles/carnivore.json

@@ -1589,12 +1589,13 @@
     "flags": [ "TRADER_AVOID", "RAW" ]
   },
   {
-    "type": "GENERIC",
+    "type": "COMESTIBLE",
     "id": "bone_human",
     "copy-from": "bone",
     "name": { "str": "human bone" },
     "description": "A bone from a human being.  Could be used to make some stuff, if you're feeling sufficiently ghoulish.",
-    "flags": [ "CANNIBALISM" ]
+    "//": "No extend support for vitamins, we need to overwrite",
+    "vitamins": [ [ "calcium", 96 ], [ "human_flesh_vitamin", 100 ] ]
   },
   {
     "type": "GENERIC",

data/json/items/comestibles/seed.json

@@ -1074,7 +1074,8 @@
     "price_postapoc": "1 cent",
     "material": [ "veggy", "bone" ],
     "symbol": ".",
-    "flags": [ "TRADER_AVOID", "CANNIBALISM" ],
+    "flags": [ "TRADER_AVOID" ],
+    "vitamins": [ [ "human_flesh_vitamin", 10 ] ],
     "color": "brown",
     "seed_data": {
       "plant_name": "mutant",

data/json/items/generic/skulls.json

@@ -19,8 +19,7 @@
     "id": "skull_human",
     "name": { "str": "human skull" },
     "description": "The skull of a human being.  Carrying this around probably isn't going to win you any friends.",
-    "copy-from": "skull_abstract",
-    "extend": { "flags": [ "CANNIBALISM" ] }
+    "copy-from": "skull_abstract"
   },
   {
     "type": "GENERIC",

doc/JSON_INFO.md

@@ -3942,6 +3942,7 @@ You can list as many conditional names for a given item as you want. Each condit
     - `COMPONENT_ID_SUBSTRING` searches all the components of the item (and all of *their* components, and so on) for an item with the condition string in their ID. The ID only needs to *contain* the condition, not match it perfectly (though it is case sensitive). For example, supplying a condition `mutant` would match `mutant_meat`.
     - `COMPONENT_ID` Similar to `COMPONENT_ID_SUBSTRING`, but search the exact component match
     - `FLAG` which checks if an item has the specified flag (exact match).
+    - `VITAMIN` which checks if an item has the specified vitamin (exact match).
     - `VAR` which checks if an item has a variable with the given name (exact match) and value = `value`. Variables set with effect_on_conditions will have `npctalk_var_` in front of their name.  So a variable created with: `"npc_add_var": "MORALE", "type": "DISPLAY","context":"NAME", "value": "Felt Great" }` would be named: `npctalk_var_DISPLAY_NAME_MORALE`.
     - `SNIPPET_ID`which checks if an item has a snippet id variable set by an effect_on_condition with the given name (exact match) and snippets id = `value`.
 2. The condition you want to look for.