diff --git a/data/json/items/comestibles/carnivore.json b/data/json/items/comestibles/carnivore.json index 2748bf3a864f5..3b40e2f331912 100644 --- a/data/json/items/comestibles/carnivore.json +++ b/data/json/items/comestibles/carnivore.json @@ -2030,8 +2030,7 @@ "price_postapoc": "0 cent", "material": [ "mi-go_bone" ], "volume": "250 ml", - "fun": -10, - "flags": [ "NO_SALVAGE" ] + "fun": -10 }, { "id": "poultry", diff --git a/data/json/items/comestibles/soup.json b/data/json/items/comestibles/soup.json index 8dc7f77f00b82..2d8befbc1360c 100644 --- a/data/json/items/comestibles/soup.json +++ b/data/json/items/comestibles/soup.json @@ -48,7 +48,7 @@ "volume": "500 ml", "charges": 2, "phase": "liquid", - "flags": [ "EATEN_HOT", "NUTRIENT_OVERRIDE", "NO_SALVAGE" ], + "flags": [ "EATEN_HOT", "NUTRIENT_OVERRIDE" ], "fun": 10, "vitamins": [ [ "calcium", 7 ], [ "iron", 1 ], [ "meat_allergen", 1 ] ] }, diff --git a/data/json/items/resources/bone.json b/data/json/items/resources/bone.json index 7b90d01f9f4ca..d002f41b29c9b 100644 --- a/data/json/items/resources/bone.json +++ b/data/json/items/resources/bone.json @@ -51,7 +51,6 @@ "price_postapoc": "5 cent", "milling": { "into": "meal_bone_tainted", "recipe": "meal_bone_tainted_mill_1_4" }, "fun": -10, - "extend": { "flags": [ "NO_SALVAGE" ] }, "//": "Not for use in edible recipes, and should require ~200% as much as normal for applicable inedible recipes except for charcoal." }, { @@ -108,7 +107,7 @@ "description": "A thin skewer carved from bone. Sadly, it won't make squirrel on a stick taste better.", "category": "other", "material": [ "bone" ], - "flags": [ "NO_SALVAGE", "TRADER_AVOID" ], + "flags": [ "TRADER_AVOID" ], "weight": "10 g", "volume": "25 ml", "milling": { "into": "meal_bone_tainted", "recipe": "meal_bone_tainted_mill_6_1" }, diff --git a/data/json/materials.json b/data/json/materials.json index f19d406c70e21..1ba0eb6af8c7f 100644 --- a/data/json/materials.json +++ b/data/json/materials.json @@ -264,7 +264,6 @@ "chip_resist": 8, "wind_resist": 90, "repaired_with": "bone", - "salvaged_into": "skewer_bone", "dmg_adj": [ "scratched", "cut", "cracked", "shattered" ], "bash_dmg_verb": "cracked", "cut_dmg_verb": "chipped", diff --git a/data/mods/BombasticPerks/perkdata/thick_skull.json b/data/mods/BombasticPerks/perkdata/thick_skull.json index dd1f7f3718298..5e57c72153a66 100644 --- a/data/mods/BombasticPerks/perkdata/thick_skull.json +++ b/data/mods/BombasticPerks/perkdata/thick_skull.json @@ -11,7 +11,7 @@ "material_thickness": 3, "symbol": "x", "color": "magenta", - "flags": [ "INTEGRATED", "UNBREAKABLE", "PERSONAL", "ZERO_WEIGHT", "NO_SALVAGE", "SOFT" ], + "flags": [ "INTEGRATED", "UNBREAKABLE", "PERSONAL", "ZERO_WEIGHT", "SOFT" ], "armor": [ { "covers": [ "head" ], diff --git a/data/mods/Magiclysm/items/enchanted_ranged.json b/data/mods/Magiclysm/items/enchanted_ranged.json index 4319075a3dcbc..0081f27440bd5 100644 --- a/data/mods/Magiclysm/items/enchanted_ranged.json +++ b/data/mods/Magiclysm/items/enchanted_ranged.json @@ -172,7 +172,6 @@ "NEVER_JAMS", "NONCONDUCTIVE", "WATERPROOF_GUN", - "NO_SALVAGE", "NO_UNLOAD", "RELOAD_AND_SHOOT", "MAGIC_FOCUS", diff --git a/data/mods/Magiclysm/items/ethereal_items.json b/data/mods/Magiclysm/items/ethereal_items.json index 5b9d319deb2b4..3319fecb4b060 100644 --- a/data/mods/Magiclysm/items/ethereal_items.json +++ b/data/mods/Magiclysm/items/ethereal_items.json @@ -221,17 +221,7 @@ "longest_side": "40 cm", "material": [ "bone", "flesh" ], "techniques": [ "PRECISE", "RAPID", "WBLOCK_2" ], - "flags": [ - "REACH_ATTACK", - "REACH3", - "WHIP", - "STURDY", - "TRADER_AVOID", - "UNBREAKABLE_MELEE", - "NO_REPAIR", - "NO_SALVAGE", - "MAGIC_FOCUS" - ], + "flags": [ "REACH_ATTACK", "REACH3", "WHIP", "STURDY", "TRADER_AVOID", "UNBREAKABLE_MELEE", "NO_REPAIR", "MAGIC_FOCUS" ], "category": "weapons", "melee_damage": { "cut": 30 } }, @@ -313,7 +303,6 @@ "SHEATH_SPEAR", "ONLY_ONE", "NO_REPAIR", - "NO_SALVAGE", "MAGIC_FOCUS" ], "techniques": [ "WBLOCK_2", "WIDE", "SWEEP", "BRUTAL" ], @@ -688,16 +677,7 @@ "description": "A pulsating club made of bone, stained with an ever-moving blood coating eager to absorb the living.", "material": [ "bone", "flesh" ], "weapon_category": [ "BATONS" ], - "flags": [ - "UNBREAKABLE_MELEE", - "NONCONDUCTIVE", - "ONLY_ONE", - "NO_REPAIR", - "NO_SALVAGE", - "MAGIC_FOCUS", - "BELT_CLIP", - "TRADER_AVOID" - ], + "flags": [ "UNBREAKABLE_MELEE", "NONCONDUCTIVE", "ONLY_ONE", "NO_REPAIR", "MAGIC_FOCUS", "BELT_CLIP", "TRADER_AVOID" ], "techniques": [ "WBLOCK_2", "RAPID", "PRECISE" ], "weight": "700 g", "volume": "800 ml",