diff --git a/data/json/furniture_and_terrain/furniture-sleep.json b/data/json/furniture_and_terrain/furniture-sleep.json
index 8724fae6c80cc..d85715f97af47 100644
--- a/data/json/furniture_and_terrain/furniture-sleep.json
+++ b/data/json/furniture_and_terrain/furniture-sleep.json
@@ -121,7 +121,7 @@
     "type": "furniture",
     "id": "f_floor_mattress",
     "name": "mattress",
-    "description": "An ordinary mattress left on the floor.  While it's not as comfortable as an entire bed without the mattress, it's pretty close.  If it's someplace actually safe to sleep, it's practically a luxury in of itself.",
+    "description": "An ordinary mattress left on the floor.  While it's not as comfortable as an entire bed without the mattress, it's pretty close.  If it's someplace actually safe to sleep, it's practically a luxury in and of itself.",
     "symbol": "0",
     "color": "magenta",
     "move_cost_mod": 3,
@@ -145,7 +145,7 @@
     "type": "furniture",
     "id": "f_down_mattress",
     "name": "down mattress",
-    "description": "A squishy feather-stuffed mattress left on the floor.  While it's not as comfortable as an entire bed without the mattress, it's pretty close.  If it's someplace actually safe to sleep, it's practically a luxury in of itself.",
+    "description": "A squishy feather-stuffed mattress left on the floor.  While it's not as comfortable as an entire bed without the mattress, it's pretty close.  If it's someplace actually safe to sleep, it's practically a luxury in and of itself.",
     "symbol": "0",
     "color": "magenta",
     "move_cost_mod": 3,
diff --git a/data/json/furniture_and_terrain/terrain-mechanisms.json b/data/json/furniture_and_terrain/terrain-mechanisms.json
index 6f544699eb44f..bb6b08b466b06 100644
--- a/data/json/furniture_and_terrain/terrain-mechanisms.json
+++ b/data/json/furniture_and_terrain/terrain-mechanisms.json
@@ -218,6 +218,7 @@
   {
     "type": "terrain",
     "id": "t_palisade_pulley_wood",
+    "looks_like": "t_palisade_pulley",
     "name": "gate pulley",
     "description": "A system of ropes and wooden pulleys that allows to pull up heavy doors or gates.",
     "symbol": "|",
diff --git a/data/json/gates.json b/data/json/gates.json
index 9cb3ba8a572e7..5dc7d9a8f46f0 100644
--- a/data/json/gates.json
+++ b/data/json/gates.json
@@ -83,6 +83,21 @@
     "moves": 1800,
     "bashing_damage": 30
   },
+  {
+    "type": "gate",
+    "id": "t_palisade_pulley_wood",
+    "door": "t_palisade_gate",
+    "floor": "t_palisade_gate_o",
+    "walls": "t_palisade",
+    "messages": {
+      "pull": "You pull the rope…",
+      "open": "The palisade gate swings open!",
+      "close": "The palisade gate swings closed with a crash!",
+      "fail": "The palisade gate can't be closed!"
+    },
+    "moves": 1800,
+    "bashing_damage": 30
+  },
   {
     "type": "gate",
     "id": "t_gates_control_metal",
diff --git a/data/json/items/ammo.json b/data/json/items/ammo.json
index 458f4b52fa82e..87b308e45a56c 100644
--- a/data/json/items/ammo.json
+++ b/data/json/items/ammo.json
@@ -1390,7 +1390,7 @@
     "symbol": "=",
     "color": "light_gray",
     "looks_like": "marble",
-    "description": "A metal die used to play various role-playing games",
+    "description": "A metal die used to play various role-playing games.",
     "material": [ "zinc" ],
     "volume": "250 ml",
     "weight": "1 g",
diff --git a/data/json/items/armor/robofac_armor.json b/data/json/items/armor/robofac_armor.json
index 4f762166230d8..5acf7f5c56c2b 100644
--- a/data/json/items/armor/robofac_armor.json
+++ b/data/json/items/armor/robofac_armor.json
@@ -16,7 +16,7 @@
     "material": [ "nylon", "kevlar" ],
     "color": "light_gray",
     "warmth": 5,
-    "flags": [ "STURDY", "OUTER", "WATERPROOF", "VARSIZE", "RAINPROOF", "HOOD" ],
+    "flags": [ "STURDY", "OUTER", "WATERPROOF", "VARSIZE", "RAINPROOF", "HOOD", "SOFT" ],
     "material_thickness": 3,
     "pocket_data": [
       {
@@ -241,7 +241,7 @@
       "msg": "The Hub logo on your front stops glowing.",
       "target": "robofac_armor_anchor"
     },
-    "flags": [ "DIMENSIONAL_ANCHOR", "PORTAL_PROOF", "STURDY", "OUTER", "WATERPROOF", "VARSIZE", "RAINPROOF", "HOOD" ]
+    "flags": [ "DIMENSIONAL_ANCHOR", "PORTAL_PROOF", "STURDY", "OUTER", "WATERPROOF", "VARSIZE", "RAINPROOF", "HOOD", "SOFT" ]
   },
   {
     "abstract": "robofac_mantle",
diff --git a/data/json/items/biosignatures.json b/data/json/items/biosignatures.json
index 6f18670e5951e..619c7a577a2b8 100644
--- a/data/json/items/biosignatures.json
+++ b/data/json/items/biosignatures.json
@@ -71,5 +71,23 @@
       "charges_to_use": 1,
       "effects": [ { "id": "fetid_goop", "duration": 3600 } ]
     }
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "insect_dust",
+    "name": { "str_sp": "chitin dust" },
+    "category": "spare_parts",
+    "weight": "40 g",
+    "color": "white",
+    "comestible_type": "FOOD",
+    "symbol": "%",
+    "description": "The dust left over by winged insects such as butterflies or moths.  It's mostly chitin but may also contain dirt and other gross materials.",
+    "price": 0,
+    "price_postapoc": 0,
+    "material": [ "chitin" ],
+    "flags": [ "NO_SALVAGE" ],
+    "volume": "250 ml",
+    "charges": 4,
+    "stack_size": 4
   }
 ]
diff --git a/data/json/items/comestibles/egg.json b/data/json/items/comestibles/egg.json
index bfd818499dab5..b4e076728249a 100644
--- a/data/json/items/comestibles/egg.json
+++ b/data/json/items/comestibles/egg.json
@@ -3,7 +3,7 @@
     "type": "COMESTIBLE",
     "id": "egg_bird",
     "name": { "str": "bird egg" },
-    "weight": "57 g",
+    "weight": "55 g",
     "color": "brown",
     "spoils_in": "7 days",
     "comestible_type": "FOOD",
@@ -113,8 +113,8 @@
     "name": { "str": "goose egg" },
     "copy-from": "egg_chicken",
     "calories": 266,
-    "volume": "125 ml",
-    "weight": "144 g",
+    "volume": "130 ml",
+    "weight": "143 g",
     "vitamins": [ [ "calcium", 9 ], [ "iron", 29 ] ],
     "rot_spawn": "GROUP_EGG_GOOSE_CANADIAN"
   },
@@ -176,7 +176,7 @@
     "material": [ "egg" ],
     "stack_size": 1,
     "volume": "250 ml",
-    "weight": "300 g",
+    "weight": "275 g",
     "calories": 240,
     "quench": 10,
     "fun": -20,
@@ -637,5 +637,104 @@
     "volume": "650 ml",
     "description": "A large clump of the eggs of a frog.  The eggs themselves are gelatinous and transparent.",
     "rot_spawn": "GROUP_EGG_FROG"
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "egg_goose",
+    "name": "goose egg",
+    "copy-from": "egg_goose_canadian",
+    "rot_spawn": "GROUP_EGG_GOOSE"
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "egg_goose_golden",
+    "name": "golden goose egg",
+    "copy-from": "egg_goose_canadian",
+    "proportional": { "weight": 2, "calories": 2, "volume": 2 },
+    "rot_spawn": "GROUP_EGG_GOOSE"
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "egg_hummingbird",
+    "name": "hummingbird egg",
+    "copy-from": "egg_crow",
+    "volume": "1 ml",
+    "weight": "1 g",
+    "rot_spawn": "GROUP_EGG_HUMMINGBIRD"
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "egg_woodpecker",
+    "name": "woodpecker egg",
+    "copy-from": "egg_crow",
+    "rot_spawn": "GROUP_EGG_WOODPECKER"
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "egg_coot",
+    "name": "coot egg",
+    "copy-from": "egg_chicken",
+    "rot_spawn": "GROUP_EGG_COOT"
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "egg_cormorant",
+    "name": "cormorant egg",
+    "copy-from": "egg_chicken",
+    "rot_spawn": "GROUP_EGG_CORMORANT"
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "egg_moorhen",
+    "name": "moorhen egg",
+    "copy-from": "egg_chicken",
+    "rot_spawn": "GROUP_EGG_MOORHEN"
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "egg_grebe",
+    "name": "grebe egg",
+    "copy-from": "egg_chicken",
+    "rot_spawn": "GROUP_EGG_GREBE"
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "egg_toad",
+    "name": { "str": "cluster of toad's eggs", "str_pl": "clusters of toad's eggs" },
+    "copy-from": "egg_frog",
+    "description": "A large clump of the eggs of a toad.  The eggs themselves are gelatinous and transparent.",
+    "rot_spawn": "GROUP_EGG_TOAD"
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "egg_water_beetle",
+    "name": "water beetle egg",
+    "copy-from": "egg_strider",
+    "description": "The egg of a water beetle, usually found near aquatic grass.",
+    "rot_spawn": "GROUP_EGG_WATER_BEETLE"
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "egg_water_bug",
+    "name": "water scorpion egg",
+    "copy-from": "egg_strider",
+    "description": "The egg of a water scorpion, usually found near aquatic grass.",
+    "rot_spawn": "GROUP_EGG_WATER_BUG"
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "egg_butterfly",
+    "name": "butterfly egg",
+    "copy-from": "egg_insect",
+    "description": "The egg of a butterfly.  They are usually found clustered on leaves.",
+    "rot_spawn": "GROUP_EGG_BUTTERFLY"
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "egg_cicada",
+    "name": "cicada egg",
+    "copy-from": "egg_insect",
+    "description": "The egg of a cicada.  They are usually found near trees.",
+    "rot_spawn": "GROUP_EGG_CICADA"
   }
 ]
diff --git a/data/json/items/containers.json b/data/json/items/containers.json
index 7ee0dc9e214d3..ff9704d6df1b2 100644
--- a/data/json/items/containers.json
+++ b/data/json/items/containers.json
@@ -245,7 +245,7 @@
     "copy-from": "bag_zipper",
     "type": "GENERIC",
     "name": { "str": "gallon-sized zipper bag" },
-    "description": "An inexpensive flexible rectangular storage bag, noticeably larger than it's more common counterpart.  Transparent and made of plastic, it can be sealed and opened by a slider which works in a similar way to a zip fastener.",
+    "description": "An inexpensive flexible rectangular storage bag, noticeably larger than its more common counterpart.  Transparent and made of plastic, it can be sealed and opened by a slider which works in a similar way to a zip fastener.",
     "weight": "20 g",
     "volume": "75 ml",
     "price_postapoc": 13,
diff --git a/data/json/items/gun/shot.json b/data/json/items/gun/shot.json
index 5f4e21d77be89..faa359702a7ce 100644
--- a/data/json/items/gun/shot.json
+++ b/data/json/items/gun/shot.json
@@ -264,7 +264,7 @@
     "copy-from": "shotgun_base",
     "type": "GUN",
     "name": { "str": "gas-operated semi-automatic shotgun" },
-    "description": "A semi-automatic smooth-bore shotgun, this weapon features respectable ergonomics and room for 8 shotshells within its tubular magazine.  Suitable both for competition shooting and offensive combat rolls, this firearm is faster to shoot than a traditional pump-action model, with the caveat that its harder to maintain than its manually operated siblings as it relies on an internal gas system to cycle rounds rather than the user’s own physical input.",
+    "description": "A semi-automatic smooth-bore shotgun, this weapon features respectable ergonomics and room for 8 shotshells within its tubular magazine.  Suitable both for competition shooting and offensive combat roles, this firearm is faster to shoot than a traditional pump-action model, with the caveat that its harder to maintain than its manually operated siblings as it relies on an internal gas system to cycle rounds rather than the user’s own physical input.",
     "variant_type": "gun",
     "variants": [
       {
@@ -375,7 +375,7 @@
     "//": "Tileset whitelist for shotguns.",
     "type": "GUN",
     "name": { "str": "12 gauge hunting shotgun" },
-    "description": "A classic shotgun in nearly every respect; big, bulky, and intimidating, guns such as this one have been made for over a century in one form or another, coming in both pump-action and semi-automatic models.  Serving both competition-shooting, law-enforcement, and hunting rolls, this firearm is sporting a standard-capacity 5-round magazine tube.  Despite the firearm’s low magazine space, what it lacks in capacity it makes up for in sheer close-range effectiveness and stopping power.",
+    "description": "A classic shotgun in nearly every respect; big, bulky, and intimidating, guns such as this one have been made for over a century in one form or another, coming in both pump-action and semi-automatic models.  Serving both competition-shooting, law-enforcement, and hunting roles, this firearm is sporting a standard-capacity 5-round magazine tube.  Despite the firearm’s low magazine space, what it lacks in capacity it makes up for in sheer close-range effectiveness and stopping power.",
     "variant_type": "gun",
     "variants": [
       {
diff --git a/data/json/items/tool/landscaping.json b/data/json/items/tool/landscaping.json
index d131d6da6db4b..b558720fe9a03 100644
--- a/data/json/items/tool/landscaping.json
+++ b/data/json/items/tool/landscaping.json
@@ -328,7 +328,7 @@
     "material": [ "wood", "steel" ],
     "symbol": "/",
     "color": "brown",
-    "looks_like": "light_gray",
+    "looks_like": "glaive",
     "qualities": [ [ "AXE", 1 ], [ "GRASS_CUT", 1 ], [ "CUT", 1 ], [ "BUTCHER", -70 ] ],
     "techniques": [ "WBLOCK_1", "BRUTAL", "WIDE", "SWEEP" ],
     "flags": [ "DURABLE_MELEE", "REACH_ATTACK", "NONCONDUCTIVE", "POLEARM", "SHEATH_SPEAR", "ALWAYS_TWOHAND" ],
diff --git a/data/json/mapgen/lmoe.json b/data/json/mapgen/lmoe.json
index c04678423abde..178e5883ff340 100644
--- a/data/json/mapgen/lmoe.json
+++ b/data/json/mapgen/lmoe.json
@@ -191,6 +191,84 @@
       ]
     }
   },
+  {
+    "type": "mapgen",
+    "method": "json",
+    "om_terrain": [ "lmoe_prepperquest" ],
+    "//": "Above ground",
+    "//2": "The front door to this LMOE is locked and can be unlocked by doing the prepper_1 quest line.",
+    "weight": 100,
+    "object": {
+      "fill_ter": "t_metal_floor",
+      "rows": [
+        "       S     S         S",
+        "   S       S     S      ",
+        " S     S            S   ",
+        "          S             ",
+        "   S    S SSSSS      S  ",
+        "      SSSSSSSSSSSS      ",
+        "     SS$$$$$$$$$$SS     ",
+        "     S$$TTTTTTTT$$S   S ",
+        "    SS$$T))))))T$$S     ",
+        " S  SS$$T)####)T$$SS    ",
+        "    SS$$T)#>>#)T$$SS    ",
+        "    SS$$T)#..#)T$$SS    ",
+        "    SS$$T)#X##)T$$SS   S",
+        "  S  S$$T))_)))T$$SS    ",
+        "     S$$$$$_$$$$$$S     ",
+        "     SS$$$$_$$$$$SS  S  ",
+        "      SSSSS_ SSSSS      ",
+        "S      S S   SS S       ",
+        "                 S    S ",
+        "   S   S                ",
+        "            S  S        ",
+        "                       S",
+        "    S      S            ",
+        "                  S     "
+      ],
+      "place_signs": [ { "signage": "Private property!  Keep out!", "x": 12, "y": 16 } ],
+      "terrain": { "X": "t_door_metal_locked" },
+      "palettes": [ "bunker_ext" ]
+    }
+  },
+  {
+    "type": "mapgen",
+    "method": "json",
+    "om_terrain": [ "lmoe_under_empty_prepperquest" ],
+    "//": "This particular 2-bed shelter is a more professionally done, all metal bomb shelter with kitchen, secret safe room / gun locker, and workshop.",
+    "//2": "This terrain is the destination for the prepper_1 quest.  The front door is locked and can be unlocked by completing the quest.",
+    "weight": 100,
+    "object": {
+      "fill_ter": "t_metal_floor",
+      "rows": [
+        "########################",
+        "########################",
+        "##||||||||||||||||||||##",
+        "##|{{{{{|UUUUUU|w__BB|##",
+        "##|u____|U____U|d__BB|##",
+        "##|u___h|U_UU_U|A,,,_|##",
+        "##|u___D|=*==*=|_,,,}|##",
+        "##|A____:______+_,,,}|##",
+        "##|||||||_1,,1_|S__hD|##",
+        "##|VVVVV=_e,,P_|||||||##",
+        "##|_____*__,,____|s_K|##",
+        "##|vvvvv=_E,,f___+__t|##",
+        "##|||||||||++|||||||||##",
+        "##|c_bbbbA|,,|CSCCKCC|##",
+        "##|c______|,,|u_____C|##",
+        "##|c_TT___|,,|u_hLh_F|##",
+        "##|c_TTh__+__+_______|##",
+        "##|c_TT___|__|rrrr__~|##",
+        "##|c______|__|||||+|||##",
+        "##|c______|__*__a|__A|##",
+        "##|ccccccc|<<=G_a|HlW|##",
+        "##||||||||||||||||||||##",
+        "########################",
+        "########################"
+      ],
+      "palettes": [ "bunker", "empty_prepperquest_bunker_items" ]
+    }
+  },
   {
     "type": "mapgen",
     "method": "json",
diff --git a/data/json/mapgen_palettes/lmoe.json b/data/json/mapgen_palettes/lmoe.json
index 189bc41a14f69..47b28c03613ef 100644
--- a/data/json/mapgen_palettes/lmoe.json
+++ b/data/json/mapgen_palettes/lmoe.json
@@ -85,6 +85,39 @@
       "}": { "item": "novels", "chance": 90, "repeat": [ 3, 8 ] }
     }
   },
+  {
+    "type": "palette",
+    "id": "empty_prepperquest_bunker_items",
+    "//": "Used for the prepper_1 NPC's bunker. Nearly identical to empty_bunker_items but with some added item groups and other spawns buffed ~15-25%, especially food and ammo.",
+    "items": {
+      "b": [ { "item": "manuals", "chance": 70 }, { "item": "textbooks", "chance": 50 } ],
+      "B": { "item": "bed", "chance": 70, "repeat": [ 1, 2 ] },
+      "c": { "item": "hardware", "chance": 70 },
+      "C": [
+        { "item": "dining", "chance": 35, "repeat": [ 1, 3 ] },
+        { "item": "oven", "chance": 20 },
+        { "item": "cleaning", "chance": 40, "repeat": [ 1, 2 ] }
+      ],
+      "d": { "item": "allclothes", "chance": 85, "repeat": [ 2, 4 ] },
+      "D": { "item": "office", "chance": 75 },
+      "F": { "item": "SUS_fridge_survivor", "chance": 100 },
+      "l": { "item": "hardware", "chance": 65, "repeat": [ 1, 3 ] },
+      "L": { "item": "dining", "chance": 30 },
+      "r": { "item": "stash_wood", "chance": 80, "repeat": [ 1, 4 ] },
+      "R": { "item": "hardware", "chance": 80 },
+      "S": { "item": "oven", "chance": 80 },
+      "T": { "item": "tools_common", "chance": 70, "repeat": [ 1, 2 ] },
+      "U": { "item": "gear_survival", "chance": 30, "repeat": [ 3, 5 ] },
+      "u": [ { "item": "cannedfood", "chance": 50, "repeat": [ 1, 5 ] }, { "item": "pasta", "chance": 20, "repeat": [ 1, 3 ] } ],
+      "v": { "item": "softdrugs", "chance": 75, "repeat": [ 1, 3 ] },
+      "V": [ { "item": "bags", "chance": 30 }, { "item": "large_bags", "chance": 8 } ],
+      "w": { "item": "allclothes", "chance": 80, "repeat": [ 2, 4 ] },
+      "Y": [ { "item": "jackets", "chance": 20 }, { "item": "hatstore_hats", "chance": 20 }, { "item": "winter", "chance": 15 } ],
+      "^": { "item": "shelter", "chance": 30 },
+      "{": [ { "item": "lmoe_guns", "chance": 90 }, { "item": "ammo", "chance": 30, "repeat": [ 2, 8 ] } ],
+      "}": [ { "item": "novels", "chance": 90, "repeat": [ 3, 8 ] }, { "item": "religious_books", "chance": 25 } ]
+    }
+  },
   {
     "type": "palette",
     "id": "bunker_ext",
diff --git a/data/json/martialarts.json b/data/json/martialarts.json
index 08c6de9edd556..3b71e53a4e9c2 100644
--- a/data/json/martialarts.json
+++ b/data/json/martialarts.json
@@ -25,7 +25,7 @@
     "id": "style_aikido",
     "name": { "str": "Aikido" },
     "description": "Aikido is a Japanese martial art focused on self-defense, while minimizing injury to the attacker.  It uses defensive throws and disarms but its techniques lack offensive power.",
-    "initiate": [ "You enter the hamni stance.", "%s changes into a relaxed combat posture." ],
+    "initiate": [ "You enter the hanmi stance.", "%s changes into a relaxed combat posture." ],
     "learn_difficulty": 5,
     "arm_block": 0,
     "static_buffs": [
diff --git a/data/json/monster_factions.json b/data/json/monster_factions.json
index 6c38f882af378..8e8d36f250c40 100644
--- a/data/json/monster_factions.json
+++ b/data/json/monster_factions.json
@@ -603,5 +603,10 @@
     "name": "dark_wyrm",
     "base_faction": "mutant",
     "neutral": [ "dark_wyrm" ]
+  },
+  {
+    "type": "MONSTER_FACTION",
+    "name": "beetle",
+    "//": "faction for non-stag beetles, ported from TropiCata"
   }
 ]
diff --git a/data/json/monster_special_attacks/spells.json b/data/json/monster_special_attacks/spells.json
index 6cc3fcc7fddcb..e4990c1c83983 100644
--- a/data/json/monster_special_attacks/spells.json
+++ b/data/json/monster_special_attacks/spells.json
@@ -575,9 +575,9 @@
     "valid_targets": [ "hostile", "ally", "self" ],
     "effect": "attack",
     "shape": "blast",
-    "damage_type": "pure",
-    "min_damage": 100000000,
-    "max_damage": 100000000
+    "damage_type": "biological",
+    "min_damage": 9999,
+    "max_damage": 9999
   },
   {
     "type": "SPELL",
@@ -720,6 +720,19 @@
     "effect": [ { "queue_eocs": "EOC_PORTAL_STORM_SHADOW_SPAWN", "time_in_future": [ "30 seconds", "1 minutes" ] } ],
     "false_effect": [ { "u_lose_trait": "TAINTED_SHADOW" } ]
   },
+  {
+    "id": "hallu_touch_suicide",
+    "type": "SPELL",
+    "name": { "str": "Hallucination Touch Dissipation" },
+    "description": "Nothing to see here.",
+    "valid_targets": [ "hostile", "ally", "self" ],
+    "effect": "attack",
+    "shape": "blast",
+    "flags": [ "SILENT" ],
+    "damage_type": "pure",
+    "min_damage": 100000000,
+    "max_damage": 100000000
+  },
   {
     "id": "hallucinator_touch",
     "type": "SPELL",
@@ -735,6 +748,6 @@
     "max_range": 1,
     "min_duration": 25920000,
     "max_duration": 25920000,
-    "extra_effects": [ { "id": "boomer_claymore_suicide", "hit_self": true } ]
+    "extra_effects": [ { "id": "hallu_touch_suicide", "hit_self": true } ]
   }
 ]
diff --git a/data/json/monstergroups/bugs.json b/data/json/monstergroups/bugs.json
index 931d81620240a..d93a633b971a2 100644
--- a/data/json/monstergroups/bugs.json
+++ b/data/json/monstergroups/bugs.json
@@ -269,5 +269,22 @@
       { "monster": "mon_halfworm", "weight": 0, "cost_multiplier": 0 },
       { "monster": "mon_worm_small", "weight": 970, "cost_multiplier": 0 }
     ]
+  },
+  {
+    "type": "monstergroup",
+    "name": "GROUP_BUTTERFLY",
+    "default": "mon_butterfly",
+    "monsters": [ { "monster": "mon_butterfly", "weight": 50 }, { "monster": "mon_moth", "weight": 50 } ]
+  },
+  {
+    "type": "monstergroup",
+    "name": "GROUP_BUTTERFLY_GIANT",
+    "default": "mon_butterfly_giant",
+    "monsters": [
+      { "monster": "mon_butterfly_giant", "weight": 45 },
+      { "monster": "mon_butterfly_titan", "weight": 5, "cost_multiplier": 2 },
+      { "monster": "mon_moth_giant", "weight": 45 },
+      { "monster": "mon_moth_titan", "weight": 5, "cost_multiplier": 2 }
+    ]
   }
 ]
diff --git a/data/json/monstergroups/eggs.json b/data/json/monstergroups/eggs.json
index 4b208bf8a8c47..d39977095c168 100644
--- a/data/json/monstergroups/eggs.json
+++ b/data/json/monstergroups/eggs.json
@@ -15,6 +15,8 @@
       { "monster": "mon_cardinal_chick", "weight": 15 },
       { "monster": "mon_sparrow_chick", "weight": 15 },
       { "monster": "mon_goose_canadian_chick", "weight": 100 },
+      { "monster": "mon_goose_chick", "freq": 100, "cost_multiplier": 1 },
+      { "monster": "mon_goose_golden_chick", "freq": 100, "cost_multiplier": 1 },
       { "monster": "mon_rattlesnake", "weight": 65 }
     ]
   },
@@ -179,5 +181,74 @@
     "name": "GROUP_EGG_FROG",
     "type": "monstergroup",
     "monsters": [ { "monster": "mon_tadpole" } ]
+  },
+  {
+    "name": "GROUP_EGG_GOOSE",
+    "type": "monstergroup",
+    "monsters": [ { "monster": "mon_goose_chick" } ]
+  },
+  {
+    "name": "GROUP_EGG_GOOSE_GOLD",
+    "type": "monstergroup",
+    "monsters": [ { "monster": "mon_goose_golden_chick" } ]
+  },
+  {
+    "name": "GROUP_EGG_HUMMINGBIRD",
+    "type": "monstergroup",
+    "monsters": [ { "monster": "mon_hummingbird_chick" } ]
+  },
+  {
+    "name": "GROUP_EGG_WOODPECKER",
+    "type": "monstergroup",
+    "monsters": [ { "monster": "mon_woodpecker_chick" } ]
+  },
+  {
+    "name": "GROUP_EGG_COOT",
+    "type": "monstergroup",
+    "monsters": [ { "monster": "mon_coot_chick" } ]
+  },
+  {
+    "name": "GROUP_EGG_CORMORANT",
+    "type": "monstergroup",
+    "monsters": [ { "monster": "mon_cormorant_chick" } ]
+  },
+  {
+    "name": "GROUP_EGG_MOORHEN",
+    "type": "monstergroup",
+    "monsters": [ { "monster": "mon_moorhen_chick" } ]
+  },
+  {
+    "name": "GROUP_EGG_GREBE",
+    "type": "monstergroup",
+    "monsters": [ { "monster": "mon_grebe_chick" } ]
+  },
+  {
+    "name": "GROUP_EGG_TOAD",
+    "type": "monstergroup",
+    "monsters": [ { "monster": "mon_tadpole_brown" } ]
+  },
+  {
+    "name": "GROUP_EGG_WATER_BEETLE",
+    "type": "monstergroup",
+    "monsters": [ { "monster": "mon_diving_larva" } ]
+  },
+  {
+    "name": "GROUP_EGG_WATER_BUG",
+    "type": "monstergroup",
+    "monsters": [ { "monster": "mon_water_scorpion_larva" } ]
+  },
+  {
+    "name": "GROUP_EGG_CICADA",
+    "type": "monstergroup",
+    "monsters": [ { "monster": "mon_cicada_nymph" } ]
+  },
+  {
+    "name": "GROUP_EGG_BUTTERFLY",
+    "type": "monstergroup",
+    "default": "mon_caterpillar",
+    "monsters": [
+      { "monster": "mon_caterpillar_giant", "freq": 25, "cost_multiplier": 1, "starts": "28 days" },
+      { "monster": "mon_caterpillar", "freq": 100, "cost_multiplier": 1 }
+    ]
   }
 ]
diff --git a/data/json/monstergroups/misc.json b/data/json/monstergroups/misc.json
index 90946f6d8fcbe..7dd91f3fa20b3 100644
--- a/data/json/monstergroups/misc.json
+++ b/data/json/monstergroups/misc.json
@@ -92,6 +92,7 @@
     "//": "Z-2 subways, some lost nether things but otherwise mostly normal mobs",
     "default": "mon_spider_jumping_small",
     "monsters": [
+      { "monster": "mon_woodlouse", "weight": 300, "pack_size": [ 1, 3 ] },
       { "monster": "mon_slug_small", "weight": 180, "ends": "180 hours" },
       { "monster": "mon_slug_giant", "weight": 180, "starts": "180 hours" },
       { "monster": "mon_nakedmolerat_giant", "weight": 100, "cost_multiplier": 2, "ends": "180 hours" },
@@ -231,6 +232,8 @@
       { "monster": "mon_pig", "weight": 10, "cost_multiplier": 25, "ends": "90 days", "pack_size": [ 1, 6 ] },
       { "monster": "mon_sheep", "weight": 50, "cost_multiplier": 25, "pack_size": [ 1, 12 ] },
       { "monster": "mon_goat", "weight": 25, "cost_multiplier": 25, "pack_size": [ 1, 12 ] },
+      { "monster": "mon_goose", "weight": 10, "cost_multiplier": 25, "pack_size": [ 1, 6 ] },
+      { "monster": "mon_llama", "weight": 50, "cost_multiplier": 25, "pack_size": [ 1, 8 ] },
       { "monster": "mon_zombie_pig", "weight": 10, "cost_multiplier": 25, "starts": "3 days", "pack_size": [ 1, 5 ] },
       { "monster": "mon_zombie_pig", "weight": 10, "cost_multiplier": 25, "starts": "7 days", "pack_size": [ 1, 5 ] },
       { "monster": "mon_zombie_pig", "weight": 10, "cost_multiplier": 25, "starts": "28 days", "pack_size": [ 1, 5 ] },
@@ -238,7 +241,9 @@
       { "monster": "mon_giant_cockroach", "weight": 10, "pack_size": [ 1, 5 ] },
       { "monster": "mon_pregnant_giant_cockroach", "weight": 1, "cost_multiplier": 3 },
       { "monster": "mon_giant_cockroach_nymph", "weight": 5 },
-      { "monster": "mon_tiger", "weight": 1, "cost_multiplier": 30 }
+      { "monster": "mon_tiger", "weight": 1, "cost_multiplier": 30 },
+      { "monster": "mon_woodlouse", "weight": 10, "pack_size": [ 1, 5 ] },
+      { "monster": "mon_woodlouse_manca", "weight": 5 }
     ]
   },
   {
@@ -282,7 +287,12 @@
       { "monster": "mon_pig", "weight": 10 },
       { "monster": "mon_sheep", "weight": 10 },
       { "monster": "mon_goat", "weight": 10 },
-      { "monster": "mon_lemming", "weight": 10 }
+      { "monster": "mon_lemming", "weight": 10 },
+      { "monster": "mon_goose", "weight": 10 },
+      { "monster": "mon_goose_golden", "weight": 1 },
+      { "monster": "mon_llama", "weight": 10 },
+      { "monster": "mon_woodlouse", "weight": 10 },
+      { "monster": "mon_cicada_nymph", "weight": 10 }
     ]
   },
   {
@@ -331,7 +341,8 @@
       { "monster": "mon_zombie_child", "weight": 20, "pack_size": [ 2, 6 ] },
       { "monster": "mon_zombie", "weight": 20, "pack_size": [ 2, 6 ] },
       { "monster": "mon_zombie_rot", "weight": 10, "pack_size": [ 1, 5 ] },
-      { "monster": "mon_beekeeper", "weight": 10, "pack_size": [ 1, 5 ] }
+      { "monster": "mon_beekeeper", "weight": 10, "pack_size": [ 1, 5 ] },
+      { "monster": "mon_woodlouse", "weight": 30, "pack_size": [ 4, 8 ] }
     ]
   },
   {
@@ -350,6 +361,9 @@
       { "monster": "mon_slug_giant", "weight": 75, "starts": "180 hours" },
       { "monster": "mon_sludge_crawler", "weight": 25 },
       { "monster": "mon_zombie_mancroc", "weight": 100, "starts": "180 hours" },
+      { "monster": "mon_toad", "weight": 100, "cost_multiplier": 0 },
+      { "monster": "mon_toad_small", "weight": 100, "cost_multiplier": 0 },
+      { "monster": "mon_gastro_bufo", "weight": 5, "cost_multiplier": 3, "starts": "15 days" },
       { "monster": "mon_zombullfrog", "weight": 10, "cost_multiplier": 2 },
       { "monster": "mon_frog_mother", "weight": 5, "cost_multiplier": 3, "starts": "15 days" }
     ]
diff --git a/data/json/monstergroups/wilderness.json b/data/json/monstergroups/wilderness.json
index 07d19238b2c7f..0ba9d2f496014 100644
--- a/data/json/monstergroups/wilderness.json
+++ b/data/json/monstergroups/wilderness.json
@@ -11,6 +11,7 @@
       { "monster": "mon_mutant_experimental", "weight": 25, "cost_multiplier": 3 },
       { "monster": "mon_nakedmolerat_giant", "weight": 100, "cost_multiplier": 3 },
       { "monster": "mon_mole_cricket", "weight": 60, "cost_multiplier": 3 },
+      { "monster": "mon_woodlouse", "weight": 60, "cost_multiplier": 3, "pack_size": [ 2, 4 ] },
       { "monster": "mon_stag_beetle_larva", "freq": 40, "cost_multiplier": 5 }
     ]
   },
@@ -1825,7 +1826,44 @@
       { "monster": "mon_antlion_giant", "weight": 2, "cost_multiplier": 10 },
       { "monster": "mon_stag_beetle_small", "freq": 2, "cost_multiplier": 0, "starts": 168, "ends": 720 },
       { "monster": "mon_stag_beetle_small", "freq": 2, "cost_multiplier": 0, "starts": 168 },
-      { "monster": "mon_stag_beetle_giant", "freq": 1, "cost_multiplier": 0, "starts": 720 }
+      { "monster": "mon_stag_beetle_giant", "freq": 1, "cost_multiplier": 0, "starts": 720 },
+      { "monster": "mon_caterpillar", "weight": 3, "cost_multiplier": 0 },
+      { "monster": "mon_woodlouse", "weight": 3, "cost_multiplier": 0 },
+      { "monster": "mon_caterpillar_giant", "weight": 2, "cost_multiplier": 0, "starts": "120 hours" },
+      { "monster": "mon_butterfly", "weight": 2, "cost_multiplier": 0 },
+      { "monster": "mon_moth", "weight": 2, "cost_multiplier": 0, "conditions": [ "DAWN", "DUSK" ] },
+      { "monster": "mon_butterfly_giant", "weight": 1, "cost_multiplier": 3, "starts": "240 hours" },
+      { "monster": "mon_butterfly_titan", "weight": 1, "cost_multiplier": 3, "starts": "480 hours" },
+      {
+        "monster": "mon_moth_giant",
+        "weight": 1,
+        "cost_multiplier": 3,
+        "conditions": [ "DAWN", "DUSK" ],
+        "starts": "240 hours"
+      },
+      {
+        "monster": "mon_moth_titan",
+        "weight": 1,
+        "cost_multiplier": 3,
+        "conditions": [ "DAWN", "DUSK" ],
+        "starts": "480 hours"
+      },
+      { "monster": "mon_cicada", "weight": 1, "cost_multiplier": 3, "starts": "240 hours" },
+      { "monster": "mon_toad", "weight": 5, "cost_multiplier": 10, "pack_size": [ 1, 3 ] },
+      {
+        "monster": "mon_hummingbird",
+        "weight": 5,
+        "cost_multiplier": 0,
+        "pack_size": [ 1, 3 ],
+        "conditions": [ "DAWN", "DUSK", "DAY" ]
+      },
+      {
+        "monster": "mon_woodpecker",
+        "weight": 5,
+        "cost_multiplier": 0,
+        "pack_size": [ 1, 3 ],
+        "conditions": [ "DAWN", "DUSK", "DAY" ]
+      }
     ]
   },
   {
@@ -2249,7 +2287,25 @@
         "starts": "7 days",
         "pack_size": [ 1, 3 ]
       },
-      { "monster": "mon_strider_small", "weight": 15, "cost_multiplier": 3, "pack_size": [ 2, 4 ] }
+      { "monster": "mon_strider_small", "weight": 15, "cost_multiplier": 3, "pack_size": [ 2, 4 ] },
+      { "monster": "mon_goose", "weight": 15, "cost_multiplier": 5, "pack_size": [ 1, 4 ] },
+      { "monster": "mon_coot", "weight": 15, "cost_multiplier": 5, "pack_size": [ 1, 6 ] },
+      { "monster": "mon_moorhen", "weight": 15, "cost_multiplier": 5, "pack_size": [ 1, 6 ] },
+      { "monster": "mon_cormorant", "weight": 15, "cost_multiplier": 5, "pack_size": [ 1, 4 ] },
+      { "monster": "mon_grebe", "weight": 15, "cost_multiplier": 5, "pack_size": [ 1, 4 ] },
+      { "monster": "mon_toad", "weight": 5, "cost_multiplier": 10, "pack_size": [ 1, 3 ] },
+      { "monster": "mon_diving_larva", "weight": 10, "cost_multiplier": 2, "ends": "7 days" },
+      { "monster": "mon_diving_larva", "weight": 30, "cost_multiplier": 3, "starts": "7 days", "pack_size": [ 1, 3 ] },
+      { "monster": "mon_water_scorpion_larva", "weight": 10, "cost_multiplier": 2, "ends": "7 days" },
+      {
+        "monster": "mon_water_scorpion_larva",
+        "weight": 30,
+        "cost_multiplier": 3,
+        "starts": "7 days",
+        "pack_size": [ 1, 3 ]
+      },
+      { "monster": "mon_diving_beetle_small", "weight": 4, "cost_multiplier": 10 },
+      { "monster": "mon_water_scorpion", "weight": 4, "cost_multiplier": 10 }
     ]
   },
   {
@@ -2853,7 +2909,69 @@
       },
       { "monster": "mon_mutant_experimental", "weight": 2, "cost_multiplier": 6 },
       { "monster": "mon_mantis_small", "weight": 2, "cost_multiplier": 8 },
-      { "monster": "mon_antlion_giant", "weight": 4, "cost_multiplier": 10 }
+      { "monster": "mon_antlion_giant", "weight": 4, "cost_multiplier": 10 },
+      {
+        "monster": "mon_toad",
+        "weight": 30,
+        "cost_multiplier": 2,
+        "ends": 24,
+        "conditions": [ "SPRING", "SUMMER", "AUTUMN" ]
+      },
+      {
+        "monster": "mon_toad",
+        "weight": 35,
+        "cost_multiplier": 2,
+        "starts": 24,
+        "ends": 95,
+        "conditions": [ "SPRING", "SUMMER", "AUTUMN" ]
+      },
+      {
+        "monster": "mon_toad",
+        "weight": 40,
+        "cost_multiplier": 2,
+        "starts": 95,
+        "ends": 180,
+        "conditions": [ "SPRING", "SUMMER", "AUTUMN" ]
+      },
+      {
+        "monster": "mon_toad_small",
+        "weight": 20,
+        "cost_multiplier": 2,
+        "ends": "84 hours",
+        "conditions": [ "SPRING", "SUMMER", "AUTUMN" ]
+      },
+      {
+        "monster": "mon_toad_small",
+        "weight": 25,
+        "cost_multiplier": 2,
+        "starts": "84 hours",
+        "ends": "180 hours",
+        "conditions": [ "SPRING", "SUMMER", "AUTUMN" ]
+      },
+      {
+        "monster": "mon_toad_small",
+        "weight": 30,
+        "cost_multiplier": 2,
+        "starts": "180 hours",
+        "ends": "15 days",
+        "conditions": [ "SPRING", "SUMMER", "AUTUMN" ]
+      },
+      {
+        "monster": "mon_toad_giant",
+        "weight": 30,
+        "cost_multiplier": 2,
+        "starts": "15 days",
+        "ends": "540 hours",
+        "conditions": [ "SPRING", "SUMMER", "AUTUMN" ]
+      },
+      {
+        "monster": "mon_toad_giant",
+        "weight": 40,
+        "cost_multiplier": 2,
+        "starts": "540 hours",
+        "conditions": [ "SPRING", "SUMMER", "AUTUMN" ]
+      },
+      { "monster": "mon_toad", "weight": 20, "cost_multiplier": 2, "pack_size": [ 1, 3 ] }
     ]
   },
   {
@@ -2896,7 +3014,9 @@
       { "monster": "mon_aphid", "weight": 20, "cost_multiplier": 0 },
       { "monster": "mon_grasshopper_small", "weight": 30, "cost_multiplier": 0 },
       { "monster": "mon_antlion_larva", "weight": 7, "cost_multiplier": 10 },
-      { "monster": "mon_antlion_giant", "weight": 5, "cost_multiplier": 10 }
+      { "monster": "mon_antlion_giant", "weight": 5, "cost_multiplier": 10 },
+      { "monster": "mon_hummingbird", "weight": 25, "cost_multiplier": 0 },
+      { "monster": "mon_woodpecker", "weight": 25, "cost_multiplier": 0 }
     ]
   },
   {
@@ -2951,7 +3071,8 @@
         "cost_multiplier": 0,
         "pack_size": [ 6, 12 ],
         "conditions": [ "DAWN", "DUSK", "NIGHT", "SPRING", "SUMMER", "AUTUMN" ]
-      }
+      },
+      { "monster": "mon_woodpecker", "weight": 25, "cost_multiplier": 0 }
     ]
   },
   {
@@ -2964,7 +3085,8 @@
       { "monster": "mon_rabbit", "weight": 50, "cost_multiplier": 0 },
       { "monster": "mon_squirrel_red", "weight": 50, "cost_multiplier": 0 },
       { "monster": "mon_squirrel", "weight": 50, "cost_multiplier": 0 },
-      { "monster": "mon_frog", "weight": 50, "cost_multiplier": 0 }
+      { "monster": "mon_frog", "weight": 50, "cost_multiplier": 0 },
+      { "monster": "mon_toad", "weight": 50, "cost_multiplier": 0 }
     ]
   },
   {
@@ -2975,7 +3097,13 @@
     "monsters": [
       { "monster": "mon_null", "weight": 900, "cost_multiplier": 0 },
       { "monster": "mon_duck", "weight": 50, "cost_multiplier": 0 },
-      { "monster": "mon_goose_canadian", "weight": 50, "cost_multiplier": 0 }
+      { "monster": "mon_goose_canadian", "weight": 50, "cost_multiplier": 0 },
+      { "monster": "mon_goose", "weight": 50, "cost_multiplier": 0 },
+      { "monster": "mon_coot", "weight": 50, "cost_multiplier": 0 },
+      { "monster": "mon_moorhen", "weight": 50, "cost_multiplier": 0 },
+      { "monster": "mon_cormorant", "weight": 50, "cost_multiplier": 0 },
+      { "monster": "mon_grebe", "weight": 50, "cost_multiplier": 0 },
+      { "monster": "mon_goose_golden", "weight": 10, "cost_multiplier": 0 }
     ]
   },
   {
@@ -2988,7 +3116,8 @@
       { "monster": "mon_fish_bluegill", "weight": 50, "cost_multiplier": 0 },
       { "monster": "mon_fish_carp", "weight": 50, "cost_multiplier": 0 },
       { "monster": "mon_fish_sbass", "weight": 50, "cost_multiplier": 0 },
-      { "monster": "mon_strider_small", "weight": 30, "cost_multiplier": 0, "pack_size": [ 3, 6 ] }
+      { "monster": "mon_strider_small", "weight": 30, "cost_multiplier": 0, "pack_size": [ 3, 6 ] },
+      { "monster": "mon_water_scorpion_larva", "weight": 30, "cost_multiplier": 0 }
     ]
   },
   {
@@ -3002,7 +3131,9 @@
       { "monster": "mon_cardinal", "weight": 50, "cost_multiplier": 0 },
       { "monster": "mon_robin", "weight": 50, "cost_multiplier": 0 },
       { "monster": "mon_sparrow", "weight": 50, "cost_multiplier": 0 },
-      { "monster": "mon_squirrel", "weight": 25, "cost_multiplier": 0 }
+      { "monster": "mon_squirrel", "weight": 25, "cost_multiplier": 0 },
+      { "monster": "mon_hummingbird", "weight": 50, "cost_multiplier": 0 },
+      { "monster": "mon_woodpecker", "weight": 50, "cost_multiplier": 0 }
     ]
   }
 ]
diff --git a/data/json/monsters/bird.json b/data/json/monsters/bird.json
index 72f1d6c935def..cd2e15b14a782 100644
--- a/data/json/monsters/bird.json
+++ b/data/json/monsters/bird.json
@@ -594,5 +594,230 @@
       "pet": "The %s runs around your leg."
     },
     "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM", "FLIES", "SWARMS", "CANPLAY" ]
+  },
+  {
+    "id": "mon_goose",
+    "type": "MONSTER",
+    "copy-from": "mon_duck",
+    "name": { "str": "goose", "str_pl": "geese" },
+    "description": "The domestic goose.  A waterfowl well known for its loud honking and aggressive behavior.",
+    "volume": "5 L",
+    "weight": "3750 g",
+    "hp": 15,
+    "looks_like": "mon_goose_canadian",
+    "aggression": 1,
+    "morale": 15,
+    "dodge": 3,
+    "melee_damage": [ { "damage_type": "cut", "amount": 2 } ],
+    "fear_triggers": [ "FRIEND_ATTACKED", "FRIEND_DIED", "FIRE", "HURT" ],
+    "anger_triggers": [ "PLAYER_CLOSE" ],
+    "reproduction": { "baby_egg": "egg_goose", "baby_count": 5, "baby_timer": 10 },
+    "biosignature": { "biosig_item": "feces_bird", "biosig_timer": 4 },
+    "petfood": {
+      "food": [ "BIRDFOOD" ],
+      "feed": "The %s seems to like you!  It runs around your legs and seems friendly.",
+      "pet": "The %s runs around your leg."
+    },
+    "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM" ]
+  },
+  {
+    "id": "mon_goose_golden",
+    "type": "MONSTER",
+    "copy-from": "mon_goose",
+    "name": { "str": "royal honker" },
+    "description": "This strange colored goose seems larger than the rest.  Even more strange is its docile, almost regal demeanor.",
+    "volume": "8 L",
+    "weight": "4000 g",
+    "hp": 25,
+    "symbol": "g",
+    "color": "yellow",
+    "aggression": 0,
+    "morale": 30,
+    "melee_damage": [ { "damage_type": "cut", "amount": 2 } ],
+    "reproduction": { "baby_egg": "egg_goose_golden", "baby_count": 1, "baby_timer": 10 }
+  },
+  {
+    "id": "mon_goose_chick",
+    "type": "MONSTER",
+    "copy-from": "mon_duck_chick",
+    "upgrades": { "age_grow": 16, "into": "mon_goose" }
+  },
+  {
+    "id": "mon_goose_golden_chick",
+    "type": "MONSTER",
+    "copy-from": "mon_goose_chick",
+    "upgrades": { "age_grow": 16, "into": "mon_goose_golden" }
+  },
+  {
+    "id": "mon_hummingbird",
+    "type": "MONSTER",
+    "name": { "str": "hummingbird" },
+    "description": "A very small bird of varied colored feathers depending on species.  It flies at incredible speeds while seeking nectar among flowers.",
+    "bodytype": "bird",
+    "default_faction": "small_animal",
+    "categories": [ "WILDLIFE" ],
+    "species": [ "BIRD" ],
+    "volume": "150 ml",
+    "weight": "18 g",
+    "hp": 3,
+    "speed": 160,
+    "material": [ "flesh" ],
+    "symbol": "v",
+    "color": "brown",
+    "aggression": -99,
+    "morale": -8,
+    "melee_dice": 1,
+    "melee_dice_sides": 1,
+    "melee_damage": [ { "damage_type": "cut", "amount": 0 } ],
+    "dodge": 4,
+    "harvest": "bird_tiny",
+    "fear_triggers": [ "SOUND", "PLAYER_CLOSE", "FRIEND_ATTACKED", "FRIEND_DIED", "FIRE", "HURT" ],
+    "reproduction": { "baby_egg": "egg_hummingbird", "baby_count": 5, "baby_timer": 14 },
+    "baby_flags": [ "SPRING" ],
+    "biosignature": { "biosig_item": "feces_bird", "biosig_timer": 8 },
+    "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM", "FLIES" ]
+  },
+  {
+    "id": "mon_woodpecker",
+    "type": "MONSTER",
+    "name": { "str": "woodpecker" },
+    "description": "A small bird with woody colors and a colored crest on its head.  These birds are well known for their ability to poke holes on trees while looking for grubs.",
+    "bodytype": "bird",
+    "default_faction": "small_animal",
+    "categories": [ "WILDLIFE" ],
+    "species": [ "BIRD" ],
+    "volume": "400 ml",
+    "weight": "400 g",
+    "hp": 10,
+    "speed": 140,
+    "material": [ "flesh" ],
+    "symbol": "v",
+    "color": "brown",
+    "aggression": -99,
+    "morale": -8,
+    "melee_dice": 1,
+    "melee_dice_sides": 1,
+    "melee_damage": [ { "damage_type": "cut", "amount": 0 } ],
+    "dodge": 4,
+    "harvest": "bird_small",
+    "fear_triggers": [ "SOUND", "PLAYER_CLOSE", "FRIEND_ATTACKED", "FRIEND_DIED", "FIRE", "HURT" ],
+    "reproduction": { "baby_egg": "egg_woodpecker", "baby_count": 5, "baby_timer": 14 },
+    "baby_flags": [ "SPRING" ],
+    "biosignature": { "biosig_item": "feces_bird", "biosig_timer": 8 },
+    "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM", "FLIES" ]
+  },
+  {
+    "id": "mon_hummingbird_chick",
+    "type": "MONSTER",
+    "copy-from": "mon_crow_chick",
+    "name": { "str": "brown chick" },
+    "volume": "80 ml",
+    "weight": "7 g",
+    "upgrades": { "age_grow": 11, "into": "mon_hummingbird" }
+  },
+  {
+    "id": "mon_woodpecker_chick",
+    "type": "MONSTER",
+    "copy-from": "mon_crow_chick",
+    "name": { "str": "brown chick" },
+    "volume": "200 ml",
+    "weight": "15 g",
+    "upgrades": { "age_grow": 11, "into": "mon_woodpecker" }
+  },
+  {
+    "id": "mon_coot",
+    "type": "MONSTER",
+    "name": { "str": "coot" },
+    "description": "A bird belonging to the Rallidae family.  They can be found worldwide on freshwater habitats, including many islands in the not so distant past.",
+    "default_faction": "small_animal",
+    "bodytype": "bird",
+    "categories": [ "WILDLIFE" ],
+    "species": [ "BIRD" ],
+    "volume": "800 ml",
+    "weight": "800 g",
+    "hp": 5,
+    "speed": 110,
+    "material": [ "flesh" ],
+    "symbol": "v",
+    "color": "brown",
+    "aggression": -99,
+    "morale": -8,
+    "melee_dice": 1,
+    "melee_dice_sides": 1,
+    "melee_damage": [ { "damage_type": "cut", "amount": 0 } ],
+    "dodge": 4,
+    "harvest": "bird_small",
+    "fear_triggers": [ "SOUND", "PLAYER_CLOSE", "FRIEND_ATTACKED", "FRIEND_DIED", "FIRE", "HURT" ],
+    "reproduction": { "baby_egg": "egg_coot", "baby_count": 3, "baby_timer": 5 },
+    "baby_flags": [ "SPRING" ],
+    "biosignature": { "biosig_item": "feces_bird", "biosig_timer": 5 },
+    "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM", "FLIES", "SWARMS" ]
+  },
+  {
+    "id": "mon_cormorant",
+    "type": "MONSTER",
+    "copy-from": "mon_coot",
+    "name": { "str": "cormorant" },
+    "description": "An aquatic bird with a long snake-like neck.  They are considered coastal birds but many species can also be found on freshwater habitats.",
+    "volume": "340 ml",
+    "weight": "340 g",
+    "color": "brown",
+    "reproduction": { "baby_egg": "egg_cormorant", "baby_count": 2, "baby_timer": 6 },
+    "baby_flags": [ "SPRING", "SUMMER" ],
+    "biosignature": { "biosig_item": "feces_bird", "biosig_timer": 8 }
+  },
+  {
+    "id": "mon_moorhen",
+    "type": "MONSTER",
+    "copy-from": "mon_coot",
+    "name": { "str": "moorhen" },
+    "description": "A bird belonging to the Rallidae family.  They are relatives of the coots but have a distinctive red coloration on their heads and brownish plumage.",
+    "volume": "400 ml",
+    "weight": "400 g",
+    "color": "brown",
+    "reproduction": { "baby_egg": "egg_moorhen", "baby_count": 2, "baby_timer": 6 },
+    "baby_flags": [ "SPRING", "SUMMER" ],
+    "biosignature": { "biosig_item": "feces_bird", "biosig_timer": 8 }
+  },
+  {
+    "id": "mon_grebe",
+    "type": "MONSTER",
+    "copy-from": "mon_coot",
+    "name": { "str": "grebe" },
+    "description": "A medium sized aquatic bird with a long neck.  These birds can be distinguished by their strange leg placement which makes them great at diving.",
+    "volume": "500 ml",
+    "weight": "500 g",
+    "color": "brown",
+    "reproduction": { "baby_egg": "egg_grebe", "baby_count": 2, "baby_timer": 6 },
+    "baby_flags": [ "SPRING", "SUMMER" ],
+    "biosignature": { "biosig_item": "feces_bird", "biosig_timer": 8 }
+  },
+  {
+    "id": "mon_coot_chick",
+    "type": "MONSTER",
+    "copy-from": "mon_duck_chick",
+    "name": { "str": "brown chick" },
+    "upgrades": { "age_grow": 14, "into": "mon_coot" }
+  },
+  {
+    "id": "mon_cormorant_chick",
+    "type": "MONSTER",
+    "copy-from": "mon_duck_chick",
+    "name": { "str": "brown chick" },
+    "upgrades": { "age_grow": 14, "into": "mon_cormorant" }
+  },
+  {
+    "id": "mon_moorhen_chick",
+    "type": "MONSTER",
+    "copy-from": "mon_duck_chick",
+    "name": { "str": "brown chick" },
+    "upgrades": { "age_grow": 14, "into": "mon_moorhen" }
+  },
+  {
+    "id": "mon_grebe_chick",
+    "type": "MONSTER",
+    "copy-from": "mon_duck_chick",
+    "name": { "str": "brown chick" },
+    "upgrades": { "age_grow": 14, "into": "mon_grebe" }
   }
 ]
diff --git a/data/json/monsters/insect_spider.json b/data/json/monsters/insect_spider.json
index 39766b0a59d72..5c08697534f4f 100644
--- a/data/json/monsters/insect_spider.json
+++ b/data/json/monsters/insect_spider.json
@@ -2969,5 +2969,380 @@
     "anger_triggers": [ "PLAYER_WEAK" ],
     "fear_triggers": [ "FIRE", "PLAYER_CLOSE" ],
     "flags": [ "SEES", "HEARS", "SMELLS", "SWIMS" ]
+  },
+  {
+    "id": "mon_butterfly",
+    "type": "MONSTER",
+    "name": { "str": "mutated butterfly", "str_pl": "mutated butterflies" },
+    "description": "An oversized butterfly with vibrant colored markings.  Unlike the other big insects of the Cataclysm this is a very peaceful nectivore.",
+    "bodytype": "flying insect",
+    "species": [ "INSECT_FLYING" ],
+    "default_faction": "insect",
+    "material": [ "iflesh" ],
+    "symbol": "l",
+    "color": "white",
+    "volume": "15 L",
+    "weight": "20 kg",
+    "hp": 25,
+    "speed": 95,
+    "vision_day": 15,
+    "dodge": 2,
+    "harvest": "arachnid_flying",
+    "reproduction": { "baby_egg": "egg_butterfly", "baby_count": 1, "baby_timer": 15 },
+    "upgrades": { "age_grow": 30, "into": "mon_butterfly_giant" },
+    "baby_flags": [ "SPRING", "SUMMER" ],
+    "fear_triggers": [ "HURT", "FIRE" ],
+    "flags": [ "SEES", "HEARS", "FLIES", "STUMBLES" ]
+  },
+  {
+    "id": "mon_butterfly_giant",
+    "type": "MONSTER",
+    "name": { "str": "giant butterfly", "str_pl": "giant butterflies" },
+    "description": "A mutated butterfly larger than a human.  Despite its size it is very lightweight and feeds mainly on the nectar produced by triffid flowers.",
+    "bodytype": "flying insect",
+    "species": [ "INSECT_FLYING" ],
+    "default_faction": "insect",
+    "material": [ "iflesh" ],
+    "symbol": "L",
+    "color": "white",
+    "volume": "75 L",
+    "weight": "40 kg",
+    "hp": 50,
+    "speed": 95,
+    "vision_day": 15,
+    "dodge": 2,
+    "harvest": "arachnid_flying",
+    "biosignature": { "biosig_item": "insect_dust", "biosig_timer": 3 },
+    "reproduction": { "baby_egg": "egg_butterfly", "baby_count": 1, "baby_timer": 15 },
+    "baby_flags": [ "SPRING", "SUMMER" ],
+    "fear_triggers": [ "HURT", "FIRE" ],
+    "flags": [ "SEES", "HEARS", "FLIES", "STUMBLES" ]
+  },
+  {
+    "id": "mon_butterfly_titan",
+    "type": "MONSTER",
+    "name": { "str": "emperor butterfly", "str_pl": "emperor butterflies" },
+    "description": "An enormous butterfly with regal looking wings.  This giant of the sky flies cheerfully under the sun, leaving dust as it passes.",
+    "copy-from": "mon_butterfly_giant",
+    "proportional": { "hp": 3, "speed": 1.1, "morale": 1.1, "melee_dice_sides": 1.1 },
+    "symbol": "L",
+    "color": "yellow",
+    "volume": "120 L",
+    "weight": "75 kg"
+  },
+  {
+    "id": "mon_moth",
+    "type": "MONSTER",
+    "name": { "str": "mutated moth" },
+    "description": "An oversized moth with its typical wood-like motifs.  It is as peaceful as the mutated butterflies found during the day.",
+    "bodytype": "flying insect",
+    "species": [ "INSECT_FLYING" ],
+    "default_faction": "insect",
+    "material": [ "iflesh" ],
+    "symbol": "l",
+    "color": "light_gray",
+    "volume": "15 L",
+    "weight": "20 kg",
+    "hp": 25,
+    "speed": 95,
+    "vision_night": 15,
+    "dodge": 2,
+    "harvest": "arachnid_flying",
+    "reproduction": { "baby_egg": "egg_butterfly", "baby_count": 1, "baby_timer": 15 },
+    "upgrades": { "age_grow": 30, "into": "mon_moth_giant" },
+    "baby_flags": [ "SPRING", "SUMMER" ],
+    "fear_triggers": [ "HURT", "FIRE" ],
+    "flags": [ "SEES", "HEARS", "FLIES", "STUMBLES" ]
+  },
+  {
+    "id": "mon_moth_giant",
+    "type": "MONSTER",
+    "name": { "str": "giant moth" },
+    "description": "A mutated moth larger than a human.  It silently flies with its huge wings after dusk looking for nocturnal flowers to feed upon.",
+    "bodytype": "flying insect",
+    "species": [ "INSECT_FLYING" ],
+    "default_faction": "insect",
+    "material": [ "iflesh" ],
+    "symbol": "L",
+    "color": "light_gray",
+    "volume": "70 L",
+    "weight": "40 kg",
+    "hp": 50,
+    "speed": 95,
+    "vision_night": 15,
+    "dodge": 2,
+    "harvest": "arachnid_flying",
+    "biosignature": { "biosig_item": "insect_dust", "biosig_timer": 3 },
+    "reproduction": { "baby_egg": "egg_butterfly", "baby_count": 1, "baby_timer": 15 },
+    "baby_flags": [ "SPRING", "SUMMER" ],
+    "fear_triggers": [ "HURT", "FIRE" ],
+    "flags": [ "SEES", "HEARS", "FLIES", "STUMBLES" ]
+  },
+  {
+    "id": "mon_moth_titan",
+    "type": "MONSTER",
+    "name": { "str": "lunar moth" },
+    "description": "A majestic moth painted in pale colors.  This giant of the night only comes out after the moon is out, leaving glittering dust.",
+    "copy-from": "mon_moth_giant",
+    "proportional": { "hp": 3, "speed": 1.1, "morale": 1.1, "melee_dice_sides": 1.1 },
+    "symbol": "L",
+    "color": "cyan",
+    "volume": "120 L",
+    "weight": "75 kg"
+  },
+  {
+    "id": "mon_caterpillar",
+    "type": "MONSTER",
+    "name": { "str": "caterpillar" },
+    "description": "Caterpillars are the larval stage of butterflies and moths.  This one seems newly hatched from an egg but even now it is large as a cat.",
+    "default_faction": "ant",
+    "bodytype": "insect",
+    "species": [ "INSECT" ],
+    "volume": "5 L",
+    "weight": "6 kg",
+    "hp": 10,
+    "material": [ "iflesh" ],
+    "symbol": "c",
+    "color": "green",
+    "speed": 30,
+    "vision_day": 15,
+    "dodge": 2,
+    "harvest": "arachnid",
+    "upgrades": { "age_grow": 15, "into_group": "GROUP_BUTTERFLY" },
+    "flags": [ "SEES", "SMELLS", "CLIMBS", "HEARS", "STUMBLES", "PATH_AVOID_FIRE" ]
+  },
+  {
+    "id": "mon_caterpillar_giant",
+    "type": "MONSTER",
+    "name": { "str": "giant caterpillar" },
+    "description": "This caterpillar has reached the size of a person and it looks close to make a cocoon.  You can only imagine the size of the insect that will emerge.",
+    "copy-from": "mon_caterpillar",
+    "proportional": { "hp": 3, "speed": 1.1, "morale": 1.1, "melee_dice_sides": 1.1 },
+    "symbol": "C",
+    "volume": "60 L",
+    "weight": "75 kg",
+    "upgrades": { "age_grow": 15, "into_group": "GROUP_BUTTERFLY_GIANT" }
+  },
+  {
+    "id": "mon_cicada_nymph",
+    "type": "MONSTER",
+    "name": { "str": "cicada nymph" },
+    "description": "The mutated larval form of a Cicada.  It doesn't produce noise like the adults but its digging claws seem suited for scratching.",
+    "default_faction": "insect",
+    "bodytype": "insect",
+    "species": [ "INSECT" ],
+    "volume": "40 L",
+    "weight": "40 kg",
+    "hp": 80,
+    "speed": 80,
+    "material": [ "iflesh" ],
+    "symbol": "c",
+    "color": "white",
+    "aggression": -5,
+    "morale": 60,
+    "melee_skill": 3,
+    "melee_dice": 1,
+    "melee_dice_sides": 2,
+    "melee_damage": [ { "damage_type": "cut", "amount": 3 } ],
+    "armor_bash": 1,
+    "armor_cut": 3,
+    "armor_bullet": 2,
+    "armor_elec": 2,
+    "vision_day": 10,
+    "vision_night": 15,
+    "harvest": "arachnid",
+    "upgrades": { "age_grow": 21, "into": "mon_cicada" },
+    "special_attacks": [ { "id": "scratch", "attack_upper": false, "cooldown": 15 } ],
+    "anger_triggers": [ "HURT", "PLAYER_CLOSE" ],
+    "fear_triggers": [ "FIRE" ],
+    "flags": [ "SEES", "BORES", "HEARS", "KEENNOSE", "PATH_AVOID_DANGER_1", "SMELLS" ]
+  },
+  {
+    "id": "mon_cicada",
+    "type": "MONSTER",
+    "name": { "str": "giant cicada" },
+    "description": "A huge Cicada the size of a person.  These insects are mostly harmless but may bite if attacked and produce a loud buzzing sound.",
+    "default_faction": "insect",
+    "bodytype": "insect",
+    "species": [ "INSECT" ],
+    "volume": "80 L",
+    "weight": "80 kg",
+    "hp": 100,
+    "speed": 80,
+    "material": [ "iflesh" ],
+    "symbol": "C",
+    "color": "light_gray",
+    "aggression": -5,
+    "morale": 60,
+    "melee_skill": 3,
+    "melee_dice": 1,
+    "melee_dice_sides": 2,
+    "melee_damage": [ { "damage_type": "cut", "amount": 3 } ],
+    "armor_bash": 1,
+    "armor_cut": 3,
+    "armor_bullet": 2,
+    "armor_elec": 2,
+    "vision_day": 10,
+    "vision_night": 15,
+    "harvest": "arachnid_flying",
+    "reproduction": { "baby_egg": "egg_cicada", "baby_count": 3, "baby_timer": 20 },
+    "baby_flags": [ "SUMMER" ],
+    "special_attacks": [ [ "SHRIEK_ALERT", 10 ], [ "SHRIEK_STUN", 5 ] ],
+    "anger_triggers": [ "PLAYER_CLOSE" ],
+    "fear_triggers": [ "FIRE", "HURT" ],
+    "flags": [ "SEES", "FLIES", "HEARS", "KEENNOSE", "PATH_AVOID_DANGER_1", "SMELLS" ]
+  },
+  {
+    "id": "mon_woodlouse",
+    "type": "MONSTER",
+    "name": { "str": "giant woodlouse", "str_pl": "giant woodlice" },
+    "description": "A woodlouse grown to the size of a dog.  These humble crustaceans are harmless and enjoy damp places.",
+    "default_faction": "insect",
+    "bodytype": "insect",
+    "species": [ "INSECT" ],
+    "volume": "50 L",
+    "weight": "50 kg",
+    "hp": 90,
+    "speed": 80,
+    "material": [ "iflesh" ],
+    "symbol": "w",
+    "color": "brown",
+    "armor_bash": 15,
+    "armor_cut": 18,
+    "armor_bullet": 20,
+    "armor_elec": 2,
+    "vision_day": 10,
+    "vision_night": 15,
+    "harvest": "shellfish",
+    "reproduction": { "baby_monster": "mon_woodlouse_manca", "baby_count": 5, "baby_timer": 210 },
+    "petfood": { "food": [ "CATTLEFOOD" ], "feed": "The %s seems to like you!  It lets you pat its head and seems friendly." },
+    "fear_triggers": [ "FIRE", "HURT" ],
+    "flags": [ "SEES", "HEARS", "KEENNOSE", "PATH_AVOID_DANGER_1", "SMELLS" ]
+  },
+  {
+    "id": "mon_woodlouse_manca",
+    "type": "MONSTER",
+    "name": { "str": "baby woodlouse", "str_pl": "baby woodlice" },
+    "description": "Woodlice reproduce by carrying their eggs in a pouch and releasing them as juveniles.  Their mancae look like small adults except for their pale color.",
+    "copy-from": "mon_woodlouse",
+    "proportional": { "hp": 0.25, "speed": 1.1, "morale": 0.67, "melee_dice_sides": 0.67 },
+    "symbol": "w",
+    "color": "white",
+    "volume": "5 L",
+    "weight": "5 kg",
+    "upgrades": { "half_life": 14, "into": "mon_woodlouse" }
+  },
+  {
+    "id": "mon_diving_larva",
+    "type": "MONSTER",
+    "name": { "str": "giant water tiger" },
+    "description": "The predatory, aquatic larva of a diving beetle grown to large proportions.  It is quite slow but still a good ambusher.",
+    "species": [ "INSECT" ],
+    "bodytype": "insect",
+    "material": [ "iflesh" ],
+    "volume": "8 L",
+    "weight": "10 kg",
+    "hp": 35,
+    "speed": 50,
+    "symbol": "b",
+    "color": "light_gray",
+    "default_faction": "aquatic_predator",
+    "aggression": 8,
+    "melee_skill": 4,
+    "melee_dice": 1,
+    "melee_dice_sides": 6,
+    "melee_damage": [ { "damage_type": "cut", "amount": 5 } ],
+    "dodge": 2,
+    "vision_day": 10,
+    "vision_night": 5,
+    "harvest": "arachnid",
+    "anger_triggers": [ "PLAYER_CLOSE" ],
+    "fear_triggers": [ "HURT" ],
+    "flags": [ "AQUATIC", "SEES", "WATER_CAMOUFLAGE" ],
+    "upgrades": { "age_grow": 21, "into": "mon_diving_beetle_small" }
+  },
+  {
+    "id": "mon_diving_beetle_small",
+    "type": "MONSTER",
+    "name": { "str": "giant diving beetle" },
+    "description": "Water beetles can be found in all freshwater environments, with diving beetles being their predatory variant.  These however seem to have grown far larger with the Cataclysm.",
+    "bodytype": "insect",
+    "species": [ "INSECT" ],
+    "default_faction": "beetle",
+    "volume": "62500 ml",
+    "weight": "81500 g",
+    "hp": 90,
+    "speed": 50,
+    "material": [ "iflesh" ],
+    "symbol": "B",
+    "color": "light_gray",
+    "aggression": 15,
+    "morale": 30,
+    "melee_skill": 5,
+    "melee_dice": 4,
+    "melee_dice_sides": 4,
+    "melee_damage": [ { "damage_type": "cut", "amount": 3 } ],
+    "dodge": 1,
+    "armor_bash": 7,
+    "armor_cut": 9,
+    "armor_bullet": 10,
+    "armor_elec": 2,
+    "weakpoints": [
+      { "name": "a soft section of chitin", "armor_mult": { "physical": 0.33 }, "coverage": 20 },
+      { "name": "a crack in the chitin", "armor_mult": { "physical": 0 }, "coverage": 5 }
+    ],
+    "vision_day": 14,
+    "vision_night": 12,
+    "harvest": "arachnid_beetle",
+    "reproduction": { "baby_egg": "egg_water_beetle", "baby_count": 3, "baby_timer": 15 },
+    "anger_triggers": [ "FRIEND_ATTACKED", "FRIEND_DIED", "HURT" ],
+    "fear_triggers": [ "FIRE" ],
+    "flags": [ "SEES", "HEARS", "GOODHEARING", "SWIMS", "WATER_CAMOUFLAGE" ]
+  },
+  {
+    "id": "mon_water_scorpion",
+    "type": "MONSTER",
+    "name": { "str": "giant water scorpion" },
+    "description": "A slender relative of the water bug, grown close to human size.  It uses its long tail as a snorkel while ambushing prey.",
+    "default_faction": "strider",
+    "bodytype": "insect",
+    "species": [ "INSECT" ],
+    "volume": "40 L",
+    "weight": "50 kg",
+    "hp": 45,
+    "speed": 50,
+    "attack_cost": 50,
+    "material": [ "iflesh" ],
+    "symbol": "W",
+    "color": "light_gray",
+    "aggression": 10,
+    "morale": 30,
+    "melee_skill": 3,
+    "melee_dice": 1,
+    "melee_dice_sides": 5,
+    "melee_damage": [ { "damage_type": "cut", "amount": 4 } ],
+    "dodge": 3,
+    "armor_bash": 1,
+    "armor_cut": 3,
+    "armor_bullet": 2,
+    "vision_day": 12,
+    "vision_night": 5,
+    "harvest": "arachnid",
+    "reproduction": { "baby_egg": "egg_water_bug", "baby_count": 3, "baby_timer": 10 },
+    "anger_triggers": [ "PLAYER_WEAK", "PLAYER_CLOSE" ],
+    "fear_triggers": [ "HURT" ],
+    "flags": [ "SEES", "HEARS", "SMELLS", "SWIMS", "GRABS", "AQUATIC" ]
+  },
+  {
+    "id": "mon_water_scorpion_larva",
+    "type": "MONSTER",
+    "name": { "str": "water scorpion nymph" },
+    "description": "The nymph of a water scorpion, looks like a smaller version of its parents.",
+    "copy-from": "mon_water_scorpion",
+    "proportional": { "hp": 0.5, "speed": 1.1, "morale": 0.67, "melee_dice_sides": 0.67 },
+    "symbol": "w",
+    "volume": "10 L",
+    "weight": "15 kg",
+    "upgrades": { "half_life": 14, "into": "mon_water_scorpion" }
   }
 ]
diff --git a/data/json/monsters/mammal.json b/data/json/monsters/mammal.json
index 12a84d835fb79..acf2cbe5bcb9b 100644
--- a/data/json/monsters/mammal.json
+++ b/data/json/monsters/mammal.json
@@ -2818,5 +2818,71 @@
     "dissect": "dissect_cattle_sample_single",
     "special_attacks": [ [ "EAT_FOOD", 60 ] ],
     "upgrades": { "age_grow": 500, "into": "mon_reindeer" }
+  },
+  {
+    "id": "mon_llama_calf",
+    "type": "MONSTER",
+    "name": { "str": "llama calf" },
+    "description": "A baby llama.  Unlike their parents, the calves tend to be more friendly in demeanor.",
+    "default_faction": "herbivore",
+    "bodytype": "horse",
+    "looks_like": "mon_llama",
+    "categories": [ "WILDLIFE" ],
+    "species": [ "MAMMAL" ],
+    "volume": "60000 ml",
+    "weight": "60000 g",
+    "hp": 35,
+    "speed": 90,
+    "material": [ "flesh" ],
+    "symbol": "l",
+    "color": "white",
+    "melee_skill": 1,
+    "melee_dice": 1,
+    "melee_dice_sides": 2,
+    "melee_damage": [ { "damage_type": "cut", "amount": 1 } ],
+    "dodge": 2,
+    "anger_triggers": [  ],
+    "harvest": "mammal_small_wool",
+    "fear_triggers": [ "SOUND", "PLAYER_CLOSE", "FRIEND_ATTACKED" ],
+    "placate_triggers": [ "PLAYER_WEAK" ],
+    "upgrades": { "age_grow": 240, "into": "mon_llama" },
+    "//": "Puberty reached in 6-9 months, copied from lamb but it probably applies the same on llamas.",
+    "biosignature": { "biosig_item": "feces_manure", "biosig_timer": 7 },
+    "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM" ]
+  },
+  {
+    "id": "mon_llama",
+    "type": "MONSTER",
+    "name": { "str_sp": "llama" },
+    "description": "A big and wooly herbivore domesticated by the Andean cultures of South America.  Llamas and their kin are distant relatives to camels and are adapted to mountain environments.",
+    "default_faction": "herbivore",
+    "bodytype": "horse",
+    "categories": [ "WILDLIFE" ],
+    "species": [ "MAMMAL" ],
+    "volume": "200000 ml",
+    "weight": "200000 g",
+    "hp": 90,
+    "speed": 90,
+    "material": [ "flesh" ],
+    "symbol": "L",
+    "color": "white",
+    "melee_skill": 3,
+    "melee_dice": 1,
+    "melee_dice_sides": 6,
+    "melee_damage": [ { "damage_type": "cut", "amount": 2 } ],
+    "dodge": 2,
+    "starting_ammo": { "milk_raw": 5 },
+    "anger_triggers": [  ],
+    "shearing": [ { "result": "wool_staple", "amount": 22 } ],
+    "harvest": "mammal_large_wool",
+    "reproduction": { "baby_monster": "mon_llama_calf", "baby_count": 1, "baby_timer": 275 },
+    "//": "Llamas produce offspring between summer and fall according to internet sources, makes sense due to the southern hemisphere seasons.",
+    "baby_flags": [ "FALL" ],
+    "biosignature": { "biosig_item": "feces_manure", "biosig_timer": 3 },
+    "fear_triggers": [ "SOUND", "PLAYER_CLOSE", "FRIEND_ATTACKED" ],
+    "placate_triggers": [ "PLAYER_WEAK" ],
+    "special_attacks": [ [ "EAT_CROP", 120 ] ],
+    "petfood": { "food": [ "CATTLEFOOD" ], "feed": "The %s seems to like you!  It lets you pat its head and seems friendly." },
+    "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM", "PET_WONT_FOLLOW", "MILKABLE" ]
   }
 ]
diff --git a/data/json/monsters/reptile_amphibian.json b/data/json/monsters/reptile_amphibian.json
index cc8e47179e1cf..6956e83936138 100644
--- a/data/json/monsters/reptile_amphibian.json
+++ b/data/json/monsters/reptile_amphibian.json
@@ -344,5 +344,62 @@
     "dissect": "dissect_lizard_sample_single",
     "path_settings": { "max_dist": 5 },
     "flags": [ "SEES", "SMELLS", "WARM", "VENOM", "SWIMS" ]
+  },
+  {
+    "id": "mon_toad",
+    "type": "MONSTER",
+    "name": { "str": "toad" },
+    "description": "Toads are a diverse and varied family of amphibians sister to frogs.  Very distinguishable for their warty and dry skin.",
+    "copy-from": "mon_frog",
+    "reproduction": { "baby_egg": "egg_toad", "baby_count": 8, "baby_timer": 26 }
+  },
+  {
+    "id": "mon_tadpole_brown",
+    "type": "MONSTER",
+    "name": { "str": "toad tadpole" },
+    "description": "Toad tadpoles looks exactly like a frog tadpoles at birth.  The main difference is that they keep this color during their whole larval stage.",
+    "copy-from": "mon_tadpole",
+    "color": "brown",
+    "upgrades": { "age_grow": 365, "into": "mon_toad" }
+  },
+  {
+    "id": "mon_toad_small",
+    "type": "MONSTER",
+    "name": { "str": "huge toad" },
+    "description": "The cane toad is a regular sight in tropical America and some other parts of the world.  This one however, seems to have been mutated to absurd size by the Cataclysm.",
+    "copy-from": "mon_frog_small",
+    "upgrades": { "half_life": 14, "into": "mon_toad_giant" }
+  },
+  {
+    "id": "mon_toad_giant",
+    "type": "MONSTER",
+    "name": { "str": "giant toad" },
+    "description": "This cane toad has grown bigger than a human.  It looks uninterested in eating you but you better not give it a chance.",
+    "default_faction": "frog",
+    "bodytype": "frog",
+    "looks_like": "mon_frog_giant",
+    "categories": [ "WILDLIFE" ],
+    "species": [ "AMPHIBIAN" ],
+    "volume": "92500 ml",
+    "weight": "120 kg",
+    "hp": 70,
+    "speed": 90,
+    "material": [ "flesh" ],
+    "symbol": "M",
+    "color": "light_green",
+    "aggression": 10,
+    "morale": 100,
+    "melee_skill": 5,
+    "melee_dice": 1,
+    "melee_dice_sides": 12,
+    "melee_damage": [ { "damage_type": "cut", "amount": 1 } ],
+    "dodge": 2,
+    "armor_bash": 4,
+    "harvest": "mutant_animal_large_noskin",
+    "path_settings": { "max_dist": 5 },
+    "upgrades": { "half_life": 50, "into": "mon_gastro_bufo" },
+    "special_attacks": [ { "type": "leap", "cooldown": 10, "move_cost": 0, "max_range": 10, "min_consider_range": 2 } ],
+    "anger_triggers": [ "STALK", "PLAYER_WEAK", "PLAYER_CLOSE" ],
+    "flags": [ "SEES", "SMELLS", "HEARS", "SWIMS" ]
   }
 ]
diff --git a/data/json/monsters/zed-animal.json b/data/json/monsters/zed-animal.json
index 34780ee08e5a4..4b7ea04e66270 100644
--- a/data/json/monsters/zed-animal.json
+++ b/data/json/monsters/zed-animal.json
@@ -590,5 +590,52 @@
     "vision_night": 10,
     "harvest": "zombie_leather",
     "flags": [ "SEES", "HEARS", "SMELLS", "STUMBLES", "WARM", "POISON", "NO_BREATHE", "REVIVES", "FILTHY" ]
+  },
+  {
+    "id": "mon_gastro_bufo",
+    "type": "MONSTER",
+    "name": { "str": "gastro bufo" },
+    "description": "A massive toad stumbling around while leaking acid from its skin.  Doesn't look friendly at all.",
+    "default_faction": "zombie",
+    "species": [ "ZOMBIE", "AMPHIBIAN" ],
+    "volume": "200 L",
+    "weight": "280 kg",
+    "hp": 200,
+    "speed": 75,
+    "material": [ "flesh" ],
+    "symbol": "F",
+    "color": "black_green",
+    "aggression": 100,
+    "morale": 100,
+    "melee_skill": 5,
+    "melee_dice": 5,
+    "melee_dice_sides": 6,
+    "melee_damage": [ { "damage_type": "bash", "amount": 5 } ],
+    "dodge": 2,
+    "armor_bash": 8,
+    "armor_cut": 2,
+    "armor_bullet": 1,
+    "vision_night": 7,
+    "harvest": "zombie",
+    "path_settings": { "max_dist": 5 },
+    "special_attacks": [ { "type": "leap", "cooldown": 10, "move_cost": 0, "max_range": 10, "min_consider_range": 2 } ],
+    "special_when_hit": [ "ACIDSPLASH", 100 ],
+    "death_function": { "message": "The %s's body leaks acid.", "effect": { "id": "death_acid", "hit_self": true } },
+    "flags": [
+      "SEES",
+      "HEARS",
+      "SMELLS",
+      "KEENNOSE",
+      "STUMBLES",
+      "WARM",
+      "BASHES",
+      "POISON",
+      "NO_BREATHE",
+      "REVIVES",
+      "PUSH_MON",
+      "FILTHY",
+      "ACIDPROOF",
+      "ACID_BLOOD"
+    ]
   }
 ]
diff --git a/data/json/mutations/mutation_appearance.json b/data/json/mutations/mutation_appearance.json
index 7f3535f663ead..cd9d88b83f298 100644
--- a/data/json/mutations/mutation_appearance.json
+++ b/data/json/mutations/mutation_appearance.json
@@ -731,7 +731,7 @@
     "id": "FACIAL_HAIR_CHIN_STRAP",
     "type": "mutation",
     "name": { "str": "Facial hair: chin strap" },
-    "description": "You have beard along the jaw lines, circling the chin, and no moustache.",
+    "description": "You have a beard along the jaw lines, circling the chin, and no moustache.",
     "points": 0,
     "valid": false,
     "starting_trait": true,
@@ -839,7 +839,7 @@
     "id": "FACIAL_HAIR_VANDYKE",
     "type": "mutation",
     "name": { "str": "Facial hair: Van Dyke" },
-    "description": "You have handlebar moustache with a chin strip or a small goatee.",
+    "description": "You have a handlebar moustache with a chin strip or a small goatee.",
     "points": 0,
     "valid": false,
     "starting_trait": true,
@@ -851,7 +851,7 @@
     "id": "FACIAL_HAIR_WALRUS",
     "type": "mutation",
     "name": { "str": "Facial hair: walrus" },
-    "description": "You have long thick moustache, overshadowing you lips, that somewhat resembles facial hair of a walrus.",
+    "description": "You have a long thick moustache, overshadowing your lips, that somewhat resembles the facial hair of a walrus.",
     "points": 0,
     "valid": false,
     "starting_trait": true,
diff --git a/data/json/npcs/Backgrounds/prepper_1.json b/data/json/npcs/Backgrounds/prepper_1.json
index 4992046fa6365..d84a792d8115a 100644
--- a/data/json/npcs/Backgrounds/prepper_1.json
+++ b/data/json/npcs/Backgrounds/prepper_1.json
@@ -6,6 +6,11 @@
     "responses": [
       { "text": "What happened to you?", "topic": "BGSS_PREPPER_1_STORY2" },
       { "text": "What about your shelter?", "topic": "BGSS_PREPPER_1_LMOE" },
+      {
+        "text": "You said you could tell me more about the shelter if I wanted.  How did these things get built?",
+        "topic": "BGSS_PREPPER_1_LMOE2",
+        "condition": { "u_has_var": "prepper_1_finished_quest", "type": "mission", "context": "BGSS", "value": "yes" }
+      },
       { "text": "<done_conversation_section>", "topic": "TALK_FRIEND" },
       { "text": "<end_talking>", "topic": "TALK_DONE" }
     ]
@@ -65,7 +70,7 @@
             }
           ]
         },
-        "trial": { "type": "PERSUADE", "difficulty": 60, "mod": [ [ "TRUST", 4 ], [ "VALUE", 2 ], [ "ANGER", -6 ] ] },
+        "trial": { "type": "PERSUADE", "difficulty": 10, "mod": [ [ "TRUST", 2 ], [ "VALUE", 2 ], [ "ANGER", -6 ] ] },
         "success": {
           "topic": "BGSS_PREPPER_1_SHELTERSUCCESS",
           "effect": [
@@ -90,6 +95,146 @@
       { "text": "<end_talking>", "topic": "TALK_DONE" }
     ]
   },
+  {
+    "id": "BGSS_PREPPER_1_LMOE2",
+    "type": "talk_topic",
+    "dynamic_line": "The shelter?  I hired a contractor to build this but did the door myself.  Metal pin in the door frame.  Can't open unless you remove it.  There's a little pulley inside you have to pull up to reset.  They made dozens of these in the area, and I couldn't sleep knowing just any <name_b> at that company could waltz in as soon as shit hit the fan.  They'd know exactly where to go and what to do!  Nah… how do you think I've made it this long?  Always keep a trick up your sleeve.",
+    "responses": [
+      { "text": "A contractor?  How much does something like a survivalist shelter cost?", "topic": "BGSS_PREPPER_1_LMOE4" },
+      {
+        "text": "But we're good to go, right?  I mean… the door is the only trick you had?  No clever traps hidden in the walls or anything?",
+        "topic": "BGSS_PREPPER_1_LMOE3"
+      },
+      {
+        "text": "You wouldn't keep ALL your tricks and secrets from me, though, would you?  After everything we've been through?",
+        "condition": { "not": { "u_has_var": "prepper_1_asked_about_secrets", "type": "mission", "context": "BGSS", "value": "yes" } },
+        "//": "Even though material possessions have been made trivially easy to obtain in the apocalypse, the prepper still values their stash, hence the difficult trial here.",
+        "trial": { "type": "PERSUADE", "difficulty": -75, "mod": [ [ "TRUST", 1 ], [ "VALUE", 1 ], [ "ANGER", -8 ] ] },
+        "success": {
+          "topic": "BGSS_PREPPER_1_SHARELOOTSUCCESS",
+          "effect": { "u_add_var": "prepper_1_asked_about_secrets", "type": "mission", "context": "BGSS", "value": "yes" }
+        },
+        "failure": {
+          "topic": "BGSS_PREPPER_1_SHARELOOTFAILURE",
+          "effect": { "u_add_var": "prepper_1_asked_about_secrets", "type": "mission", "context": "BGSS", "value": "yes" },
+          "opinion": { "trust": -6, "value": -3, "anger": 5 }
+        }
+      },
+      { "text": "That's all I wanted to know.", "topic": "TALK_DONE" }
+    ]
+  },
+  {
+    "id": "BGSS_PREPPER_1_LMOE3",
+    "type": "talk_topic",
+    "dynamic_line": "Nope, that's it.  Got the idea for the door from a book on medieval castles, in case you were wondering.  But instead of a counterweight holding a drawbridge up, I just ram a hex key in a hole.",
+    "responses": [ { "text": "Interesting…", "topic": "TALK_NONE" } ]
+  },
+  {
+    "id": "BGSS_PREPPER_1_LMOE4",
+    "type": "talk_topic",
+    "dynamic_line": "Almost as much as my house, in the end.  I think they realized they could make a lot of money as things got worse and worse.  But it's nicer than my house, too.  They said the ventilation system was built to withstand a month of anything: nuclear fallout, biological attack, you name it.  Concrete and soil above me to absorb radiation, appliances and supplies…  I even brought some old books I've never read.  I always knew it would come to this.",
+    "responses": [ { "text": "How many of these places did the company build?", "topic": "BGSS_PREPPER_1_LMOE5" } ]
+  },
+  {
+    "id": "BGSS_PREPPER_1_LMOE5",
+    "type": "talk_topic",
+    "dynamic_line": "Dozens, they told me.  Probably more by the end of it.  But they obviously didn't say where or who for.  It was kind of a hot business and I think they were some of the best doing it.",
+    "responses": [ { "text": "Right…", "topic": "BGSS_PREPPER_1_LMOE2" } ]
+  },
+  {
+    "id": "BGSS_PREPPER_1_SHARELOOTSUCCESS",
+    "type": "talk_topic",
+    "dynamic_line": "Okay, listen… across the hall from the bedroom… by the pillars… it's a fake wall.  Directly across the hall.  If you push in a little bit, the whole thing kinda slides aside.  I hid some guns back there and a handful of rounds, too.  I meant to bring a lot more - I had boxes on back order - but it started getting hard to buy past a certain point.  Might as well share now that we're here.  A spare bullet could save your life.",
+    "responses": [ { "text": "The wall thing is pretty nifty, I have to admit.", "topic": "BGSS_PREPPER_1_SHARELOOTSUCCESS2" } ]
+  },
+  {
+    "id": "BGSS_PREPPER_1_SHARELOOTSUCCESS2",
+    "type": "talk_topic",
+    "dynamic_line": "Yeah, but they put the secret room in their advertising.  Not really a secret then, is it?",
+    "responses": [ { "text": "Hmm, good point.", "topic": "TALK_DONE" } ]
+  },
+  {
+    "id": "BGSS_PREPPER_1_SHARELOOTFAILURE",
+    "type": "talk_topic",
+    "dynamic_line": "What, like some secret Batcave?  Pull back the curtain and it turns out I'm the communist <name_b> who brewed up a demon bio-weapon in their basement?  I just gave you food, all the tools in my workshop, and the safest hole in the ground in the county.  If I've got any secrets left, they're mine to keep.",
+    "responses": [
+      { "text": "No, you're right!  I'm sorry for intruding!", "topic": "BGSS_PREPPER_1_SHARELOOTAPOLOGIZE" },
+      {
+        "text": "For all I know, you COULD have something to do with this.  Who really knows what happened?",
+        "topic": "BGSS_PREPPER_1_SHARELOOTFAILURE2",
+        "opinion": { "anger": 2 }
+      }
+    ]
+  },
+  {
+    "id": "BGSS_PREPPER_1_SHARELOOTFAILURE2",
+    "type": "talk_topic",
+    "dynamic_line": "Well, I certainly wouldn't tell you.  The way you talk… the questions you ask… they're extremely suspicious.  Why did you ask about the shelter anyway?  What do you want from me?",
+    "responses": [
+      {
+        "text": "I just wanted the loot, I'll be honest.",
+        "topic": "TALK_DONE",
+        "opinion": { "anger": 5, "value": -5, "trust": -8, "fear": -2 },
+        "effect": "insult_combat"
+      },
+      {
+        "text": "Well… I'm actually a government agent sent to assassinate you.  I just had to find out the location of your secret stash before I took you out!",
+        "topic": "BGSS_PREPPER_1_SHARELOOTFAILURE3"
+      },
+      {
+        "text": "I thought we could team up.  It sounded like a good place to stay safe.",
+        "topic": "BGSS_PREPPER_1_SHARELOOTAPOLOGIZE2",
+        "opinion": { "anger": -4 }
+      }
+    ]
+  },
+  {
+    "id": "BGSS_PREPPER_1_SHARELOOTFAILURE3",
+    "type": "talk_topic",
+    "dynamic_line": "*tenses up and stares in disbelief.  \"You're playing with me.  The government doesn't exist anymore…  You better be messing around or I-\"",
+    "responses": [
+      {
+        "text": "Why else would I ask about your shelter?  I don't need your gear.  I don't need your help.  Look around you!  I'm tracking down the last free thinkers who have been putting the puzzle pieces together.  It's YOU I'm after!",
+        "topic": "BGSS_PREPPER_1_SHARELOOTFAILURE4"
+      },
+      {
+        "text": "Yeah, I'm just messing with you, don't worry.  What, can't take a joke?",
+        "topic": "BGSS_PREPPER_1_SHARELOOTAPOLOGIZE3",
+        "opinion": { "trust": -3 }
+      }
+    ]
+  },
+  {
+    "id": "BGSS_PREPPER_1_SHARELOOTFAILURE4",
+    "type": "talk_topic",
+    "dynamic_line": "I knew it…  This whole time.  It was all part of the plan.  The riots, the storms…  You always had control…",
+    "responses": [
+      {
+        "text": "Prepare to meet your end, <npc_name>.  *Attack*",
+        "topic": "TALK_DONE",
+        "opinion": { "anger": 40, "value": -30, "trust": -30, "fear": -10 },
+        "effect": "hostile"
+      }
+    ]
+  },
+  {
+    "id": "BGSS_PREPPER_1_SHARELOOTAPOLOGIZE",
+    "type": "talk_topic",
+    "dynamic_line": "Yeah, listen, just keep your questions to yourself.  I don't trust you and you shouldn't trust me, either.",
+    "responses": [ { "text": "Sorry, I won't ask again.", "topic": "TALK_DONE", "opinion": { "anger": -1 } } ]
+  },
+  {
+    "id": "BGSS_PREPPER_1_SHARELOOTAPOLOGIZE2",
+    "type": "talk_topic",
+    "dynamic_line": "It IS a good place to stay safe.  Just don't go prying, okay?",
+    "responses": [ { "text": "You got it.", "topic": "TALK_DONE" } ]
+  },
+  {
+    "id": "BGSS_PREPPER_1_SHARELOOTAPOLOGIZE3",
+    "type": "talk_topic",
+    "dynamic_line": "You think that's funny?!  Some of us watched the warning signs for years.  All the news, all the violence and the secret plots…  Now the dead are walking, reality itself is tearing apart, and you're making jokes like that?!",
+    "responses": [ { "text": "Yeah…?  I didn't realize it bothered you so much.", "topic": "TALK_DONE" } ]
+  },
   {
     "id": "BGSS_PREPPER_1_SHELTERSUCCESS",
     "type": "talk_topic",
@@ -111,10 +256,21 @@
     "difficulty": 2,
     "value": 0,
     "start": {
-      "assign_mission_target": { "om_special": "LMOE Shelter", "om_terrain": "lmoe", "reveal_radius": 3, "search_range": 400 },
+      "assign_mission_target": { "om_special": "Locked LMOE Shelter", "om_terrain": "lmoe_prepperquest", "reveal_radius": 3, "search_range": 400 },
       "effect": { "u_add_var": "prepper_1_started_quest", "type": "mission", "context": "BGSS", "value": "yes" }
     },
-    "end": { "opinion": { "trust": 1, "value": 1 } },
+    "end": {
+      "opinion": { "trust": 1, "value": 1 },
+      "effect": [
+        {
+          "u_message": "<npc_name> walks up to the front door and pries back a thin piece of metal from the top of the doorframe, revealing an opening.  They reach inside, pull hard on something, and you hear a heavy metal *clunk*.",
+          "type": "good",
+          "popup": true
+        },
+        { "mapgen_update": "LMOE_unlock_door", "om_terrain": "lmoe_prepperquest" },
+        { "u_add_var": "prepper_1_finished_quest", "type": "mission", "context": "BGSS", "value": "yes" }
+      ]
+    },
     "origins": [ "ORIGIN_SECONDARY" ],
     "dialogue": {
       "describe": "…",
@@ -122,10 +278,16 @@
       "accepted": "…",
       "rejected": "…",
       "advice": "…",
-      "inquire": "Any luck finding the LMOE shelter?",
-      "success": "Thank you!  I'm so glad we made it.  I've tucked away some real loot back here.",
-      "success_lie": "Great!",
+      "inquire": "Any luck finding the LMOE shelter?  Don't forget to take me with you.  I changed the design and you sure as hell aren't getting in unless you know the trick.",
+      "success": "Damn, can't believe we finally made it.  I was smart enough not to store anything that might rot, so as long as nobody else already broke in, I bet there's at least two weeks of good food just sitting there.  Pristine workshop down there, too.  It cost me a pretty penny to get built.  I could tell you all about it sometime if you ever wanted.  Anyway, thanks for helping me get back here.  It sure ain't safe to travel on your own anymore.",
+      "success_lie": "…",
       "failure": "Not that surprising."
     }
+  },
+  {
+    "type": "mapgen",
+    "update_mapgen_id": "LMOE_unlock_door",
+    "method": "json",
+    "object": { "translate_ter": [ { "from": "t_door_metal_locked", "to": "t_door_metal_c", "x": 0, "y": 0 } ] }
   }
 ]
diff --git a/data/json/npcs/refugee_center/surface_staff/Smokes/free_merchant_shopkeep_talk.json b/data/json/npcs/refugee_center/surface_staff/Smokes/free_merchant_shopkeep_talk.json
index 40938e6ac57d2..e73b70a8a6091 100644
--- a/data/json/npcs/refugee_center/surface_staff/Smokes/free_merchant_shopkeep_talk.json
+++ b/data/json/npcs/refugee_center/surface_staff/Smokes/free_merchant_shopkeep_talk.json
@@ -275,7 +275,7 @@
   {
     "id": "TALK_FREE_MERCHANTS_MERCHANT_SellingHardware1",
     "type": "talk_topic",
-    "dynamic_line": "We've had some issues with scavengers.  Apparently a big part of the marketing for these shelters was high-end radio equipment that they could use to keep in touch with each other, and a lot of the people we've traded with have asked about it.  Not that we don't have any radios, mind you, but they're all absolutely awful.  Even if we *could* spare any, they'd be useless to anyone that actually needed it - not much point in lugging around a ham radio that can't pick hear anything more than a mile away."
+    "dynamic_line": "We've had some issues with scavengers.  Apparently a big part of the marketing for these shelters was high-end radio equipment that they could use to keep in touch with each other, and a lot of the people we've traded with have asked about it.  Not that we don't have any radios, mind you, but they're all absolutely awful.  Even if we *could* spare any, they'd be useless to anyone that actually needed it - not much point in lugging around a ham radio that can't pick up anything more than a mile away."
   },
   {
     "id": "TALK_FREE_MERCHANTS_MERCHANT_TroubleWithFood",
diff --git a/data/json/npcs/robofac/robofac_intercom/robofac_intercom_prototypes.json b/data/json/npcs/robofac/robofac_intercom/robofac_intercom_prototypes.json
index be912ec39df47..d39e8d22210b4 100644
--- a/data/json/npcs/robofac/robofac_intercom/robofac_intercom_prototypes.json
+++ b/data/json/npcs/robofac/robofac_intercom/robofac_intercom_prototypes.json
@@ -426,7 +426,7 @@
     "id": "TALK_ROBOFAC_INTERCOM_ANCHOR_PT_1_COMPLETE",
     "//": "creating better MDS",
     "type": "talk_topic",
-    "dynamic_line": "We've made some notable progress.  We believe that we can integrate this into our current modular armor system leading to extradimensional protection, however it will make it heavier and it will no longer fold up conveniently for travel.",
+    "dynamic_line": "We've made some notable progress.  We believe that we can integrate this into our current modular armor system leading to extradimensional protection, however it will make it heavier and it won't be quite as easy to fold up for travel.  The poncho will remain wearable outside of metal armor although it will be a more snug fit than the anchor alone would have been.",
     "responses": [
       {
         "text": "Interesting.",
diff --git a/data/json/overmap/overmap_special/specials.json b/data/json/overmap/overmap_special/specials.json
index 5012d3679c3fe..d431cff1ce782 100644
--- a/data/json/overmap/overmap_special/specials.json
+++ b/data/json/overmap/overmap_special/specials.json
@@ -319,6 +319,20 @@
     "occurrences": [ 0, 2 ],
     "flags": [ "CLASSIC", "MAN_MADE" ]
   },
+  {
+    "type": "overmap_special",
+    "id": "Locked LMOE Shelter",
+    "overmaps": [
+      { "point": [ 0, 0, 0 ], "overmap": "lmoe_prepperquest_north" },
+      { "point": [ 0, 0, 1 ], "overmap": "lmoe_roof_north" },
+      { "point": [ 0, 0, -1 ], "overmap": "lmoe_under_empty_prepperquest_north" }
+    ],
+    "locations": [ "forest_without_trail" ],
+    "city_distance": [ 25, -1 ],
+    "city_sizes": [ 0, 12 ],
+    "occurrences": [ 80, 100 ],
+    "flags": [ "CLASSIC", "MAN_MADE", "UNIQUE" ]
+  },
   {
     "type": "overmap_special",
     "id": "Occupied LMOE Shelter",
diff --git a/data/json/overmap/overmap_terrain/overmap_terrain_military.json b/data/json/overmap/overmap_terrain/overmap_terrain_military.json
index c2399ea65f3fc..c564d3d9cd772 100644
--- a/data/json/overmap/overmap_terrain/overmap_terrain_military.json
+++ b/data/json/overmap/overmap_terrain/overmap_terrain_military.json
@@ -188,6 +188,15 @@
     "see_cost": 2,
     "flags": [ "KNOWN_DOWN", "SOURCE_PEOPLE", "SOURCE_SAFETY", "SOURCE_GUN", "SOURCE_AMMO", "SOURCE_FOOD" ]
   },
+  {
+    "type": "overmap_terrain",
+    "id": "lmoe_prepperquest",
+    "name": "LMOE shelter",
+    "sym": "+",
+    "color": "red",
+    "see_cost": 2,
+    "flags": [ "KNOWN_DOWN", "SOURCE_PEOPLE", "SOURCE_SAFETY", "SOURCE_GUN", "SOURCE_AMMO", "SOURCE_FOOD" ]
+  },
   {
     "type": "overmap_terrain",
     "id": "lmoe_roof",
@@ -215,6 +224,15 @@
     "see_cost": 2,
     "flags": [ "KNOWN_UP", "SOURCE_PEOPLE", "SOURCE_SAFETY", "SOURCE_GUN", "SOURCE_AMMO", "SOURCE_FOOD" ]
   },
+  {
+    "type": "overmap_terrain",
+    "id": "lmoe_under_empty_prepperquest",
+    "name": "LMOE shelter",
+    "sym": "+",
+    "color": "red",
+    "see_cost": 2,
+    "flags": [ "KNOWN_UP", "SOURCE_PEOPLE", "SOURCE_SAFETY", "SOURCE_GUN", "SOURCE_AMMO", "SOURCE_FOOD" ]
+  },
   {
     "type": "overmap_terrain",
     "id": "lmoe_zombie",
diff --git a/data/json/recipes/armor/arms.json b/data/json/recipes/armor/arms.json
index a7f2220cb2c12..0cd6e60943119 100644
--- a/data/json/recipes/armor/arms.json
+++ b/data/json/recipes/armor/arms.json
@@ -482,8 +482,8 @@
     "result": "lc_chainmail_arms",
     "type": "recipe",
     "activity_level": "LIGHT_EXERCISE",
-    "category": "CC_ARMOR",
-    "subcategory": "CSC_ARMOR_ARMS",
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
     "skill_used": "fabrication",
     "difficulty": 7,
     "skills_required": [ [ "tailor", 2 ] ],
@@ -516,8 +516,8 @@
     "result": "mc_chainmail_arms",
     "type": "recipe",
     "activity_level": "LIGHT_EXERCISE",
-    "category": "CC_ARMOR",
-    "subcategory": "CSC_ARMOR_ARMS",
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
     "skill_used": "fabrication",
     "difficulty": 7,
     "skills_required": [ [ "tailor", 2 ] ],
@@ -550,8 +550,8 @@
     "result": "hc_chainmail_arms",
     "type": "recipe",
     "activity_level": "LIGHT_EXERCISE",
-    "category": "CC_ARMOR",
-    "subcategory": "CSC_ARMOR_ARMS",
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
     "skill_used": "fabrication",
     "difficulty": 7,
     "skills_required": [ [ "tailor", 2 ] ],
@@ -584,8 +584,8 @@
     "result": "ch_chainmail_arms",
     "type": "recipe",
     "activity_level": "LIGHT_EXERCISE",
-    "category": "CC_ARMOR",
-    "subcategory": "CSC_ARMOR_ARMS",
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
     "skill_used": "fabrication",
     "difficulty": 7,
     "skills_required": [ [ "tailor", 2 ] ],
@@ -618,8 +618,8 @@
     "result": "qt_chainmail_arms",
     "type": "recipe",
     "activity_level": "LIGHT_EXERCISE",
-    "category": "CC_ARMOR",
-    "subcategory": "CSC_ARMOR_ARMS",
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
     "skill_used": "fabrication",
     "difficulty": 7,
     "skills_required": [ [ "tailor", 2 ] ],
diff --git a/data/json/recipes/armor/feet.json b/data/json/recipes/armor/feet.json
index c20dc60b78acd..2c7f3a32f975e 100644
--- a/data/json/recipes/armor/feet.json
+++ b/data/json/recipes/armor/feet.json
@@ -996,8 +996,8 @@
     "result": "lc_chainmail_feet",
     "type": "recipe",
     "activity_level": "LIGHT_EXERCISE",
-    "category": "CC_ARMOR",
-    "subcategory": "CSC_ARMOR_FEET",
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
     "skill_used": "fabrication",
     "difficulty": 7,
     "time": "3 h",
@@ -1023,8 +1023,8 @@
     "result": "mc_chainmail_feet",
     "type": "recipe",
     "activity_level": "LIGHT_EXERCISE",
-    "category": "CC_ARMOR",
-    "subcategory": "CSC_ARMOR_FEET",
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
     "skill_used": "fabrication",
     "difficulty": 7,
     "time": "3 h",
@@ -1050,8 +1050,8 @@
     "result": "hc_chainmail_feet",
     "type": "recipe",
     "activity_level": "LIGHT_EXERCISE",
-    "category": "CC_ARMOR",
-    "subcategory": "CSC_ARMOR_FEET",
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
     "skill_used": "fabrication",
     "difficulty": 7,
     "time": "3 h",
@@ -1077,8 +1077,8 @@
     "result": "ch_chainmail_feet",
     "type": "recipe",
     "activity_level": "LIGHT_EXERCISE",
-    "category": "CC_ARMOR",
-    "subcategory": "CSC_ARMOR_FEET",
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
     "skill_used": "fabrication",
     "difficulty": 7,
     "time": "3 h",
@@ -1104,8 +1104,8 @@
     "result": "qt_chainmail_feet",
     "type": "recipe",
     "activity_level": "LIGHT_EXERCISE",
-    "category": "CC_ARMOR",
-    "subcategory": "CSC_ARMOR_FEET",
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
     "skill_used": "fabrication",
     "difficulty": 7,
     "time": "3 h",
diff --git a/data/json/recipes/armor/hands.json b/data/json/recipes/armor/hands.json
index 8ac8dd82ac8a9..1882e32c973af 100644
--- a/data/json/recipes/armor/hands.json
+++ b/data/json/recipes/armor/hands.json
@@ -931,8 +931,8 @@
     "result": "lc_chainmail_hands",
     "type": "recipe",
     "activity_level": "LIGHT_EXERCISE",
-    "category": "CC_ARMOR",
-    "subcategory": "CSC_ARMOR_HANDS",
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
     "skill_used": "fabrication",
     "difficulty": 7,
     "time": "2 h",
@@ -958,8 +958,8 @@
     "result": "mc_chainmail_hands",
     "type": "recipe",
     "activity_level": "LIGHT_EXERCISE",
-    "category": "CC_ARMOR",
-    "subcategory": "CSC_ARMOR_HANDS",
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
     "skill_used": "fabrication",
     "difficulty": 7,
     "time": "2 h",
@@ -985,8 +985,8 @@
     "result": "hc_chainmail_hands",
     "type": "recipe",
     "activity_level": "LIGHT_EXERCISE",
-    "category": "CC_ARMOR",
-    "subcategory": "CSC_ARMOR_HANDS",
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
     "skill_used": "fabrication",
     "difficulty": 7,
     "time": "2 h",
@@ -1012,8 +1012,8 @@
     "result": "ch_chainmail_hands",
     "type": "recipe",
     "activity_level": "LIGHT_EXERCISE",
-    "category": "CC_ARMOR",
-    "subcategory": "CSC_ARMOR_HANDS",
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
     "skill_used": "fabrication",
     "difficulty": 7,
     "time": "2 h",
@@ -1039,8 +1039,8 @@
     "result": "qt_chainmail_hands",
     "type": "recipe",
     "activity_level": "LIGHT_EXERCISE",
-    "category": "CC_ARMOR",
-    "subcategory": "CSC_ARMOR_HANDS",
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
     "skill_used": "fabrication",
     "difficulty": 7,
     "time": "2 h",
diff --git a/data/json/recipes/armor/head.json b/data/json/recipes/armor/head.json
index 3e9f3c990502e..eab7cdb2832e7 100644
--- a/data/json/recipes/armor/head.json
+++ b/data/json/recipes/armor/head.json
@@ -2266,8 +2266,8 @@
     "result": "lc_chainmail_hood",
     "type": "recipe",
     "activity_level": "LIGHT_EXERCISE",
-    "category": "CC_ARMOR",
-    "subcategory": "CSC_ARMOR_HEAD",
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
     "skill_used": "fabrication",
     "difficulty": 7,
     "time": "3 h",
@@ -2277,45 +2277,26 @@
     "components": [ [ [ "lc_link_sheet", 2 ] ], [ [ "lc_chain_link", 50 ] ], [ [ "lc_wire", 1 ] ], [ [ "cotton_patchwork", 4 ] ] ],
     "proficiencies": [ { "proficiency": "prof_chain_armour" } ]
   },
-  {
-    "result": "xs_lc_chainmail_hood",
-    "type": "recipe",
-    "id_suffix": "less_charges",
-    "copy-from": "lc_chainmail_hood",
-    "time": "3 h",
-    "using": [ [ "chainmail_standard", 1 ] ],
-    "components": [ [ [ "lc_link_sheet", 2 ] ], [ [ "lc_chain_link", 38 ] ], [ [ "lc_wire", 2 ] ], [ [ "cotton_patchwork", 3 ] ] ]
-  },
   {
     "result": "xl_lc_chainmail_hood",
     "type": "recipe",
-    "id_suffix": "more_charges",
     "copy-from": "lc_chainmail_hood",
     "time": "3 h 20 m",
     "using": [ [ "chainmail_standard", 4 ] ],
     "components": [ [ [ "lc_link_sheet", 3 ] ], [ [ "lc_chain_link", 75 ] ], [ [ "lc_wire", 2 ] ], [ [ "cotton_patchwork", 6 ] ] ]
   },
-  {
-    "result": "xl_lc_chainmail_hood",
-    "type": "recipe",
-    "id_suffix": "standard_charges",
-    "copy-from": "lc_chainmail_hood",
-    "components": [ [ [ "lc_link_sheet", 3 ] ], [ [ "lc_chain_link", 75 ] ], [ [ "lc_wire", 2 ] ], [ [ "cotton_patchwork", 6 ] ] ]
-  },
   {
     "result": "xs_lc_chainmail_hood",
     "type": "recipe",
-    "id_suffix": "standard_charges",
     "copy-from": "lc_chainmail_hood",
-    "time": "3 h 20 m",
     "components": [ [ [ "lc_link_sheet", 2 ] ], [ [ "lc_chain_link", 50 ] ], [ [ "lc_wire", 2 ] ], [ [ "cotton_patchwork", 4 ] ] ]
   },
   {
     "result": "mc_chainmail_hood",
     "type": "recipe",
     "activity_level": "LIGHT_EXERCISE",
-    "category": "CC_ARMOR",
-    "subcategory": "CSC_ARMOR_HEAD",
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
     "skill_used": "fabrication",
     "difficulty": 7,
     "time": "3 h",
@@ -2325,45 +2306,26 @@
     "components": [ [ [ "mc_link_sheet", 2 ] ], [ [ "mc_chain_link", 50 ] ], [ [ "mc_wire", 1 ] ], [ [ "cotton_patchwork", 4 ] ] ],
     "proficiencies": [ { "proficiency": "prof_chain_armour" } ]
   },
-  {
-    "result": "xs_mc_chainmail_hood",
-    "type": "recipe",
-    "id_suffix": "less_charges",
-    "copy-from": "mc_chainmail_hood",
-    "time": "3 h",
-    "using": [ [ "chainmail_standard", 1 ] ],
-    "components": [ [ [ "mc_link_sheet", 2 ] ], [ [ "mc_chain_link", 38 ] ], [ [ "mc_wire", 2 ] ], [ [ "cotton_patchwork", 3 ] ] ]
-  },
   {
     "result": "xl_mc_chainmail_hood",
     "type": "recipe",
-    "id_suffix": "more_charges",
     "copy-from": "mc_chainmail_hood",
     "time": "3 h 20 m",
     "using": [ [ "chainmail_standard", 4 ] ],
     "components": [ [ [ "mc_link_sheet", 3 ] ], [ [ "mc_chain_link", 75 ] ], [ [ "mc_wire", 2 ] ], [ [ "cotton_patchwork", 6 ] ] ]
   },
-  {
-    "result": "xl_mc_chainmail_hood",
-    "type": "recipe",
-    "id_suffix": "standard_charges",
-    "copy-from": "mc_chainmail_hood",
-    "components": [ [ [ "mc_link_sheet", 3 ] ], [ [ "mc_chain_link", 75 ] ], [ [ "mc_wire", 2 ] ], [ [ "cotton_patchwork", 6 ] ] ]
-  },
   {
     "result": "xs_mc_chainmail_hood",
     "type": "recipe",
-    "id_suffix": "standard_charges",
     "copy-from": "mc_chainmail_hood",
-    "time": "3 h 20 m",
     "components": [ [ [ "mc_link_sheet", 2 ] ], [ [ "mc_chain_link", 50 ] ], [ [ "mc_wire", 2 ] ], [ [ "cotton_patchwork", 4 ] ] ]
   },
   {
     "result": "hc_chainmail_hood",
     "type": "recipe",
     "activity_level": "LIGHT_EXERCISE",
-    "category": "CC_ARMOR",
-    "subcategory": "CSC_ARMOR_HEAD",
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
     "skill_used": "fabrication",
     "difficulty": 7,
     "time": "3 h",
@@ -2373,45 +2335,26 @@
     "components": [ [ [ "hc_link_sheet", 2 ] ], [ [ "hc_chain_link", 50 ] ], [ [ "hc_wire", 1 ] ], [ [ "cotton_patchwork", 4 ] ] ],
     "proficiencies": [ { "proficiency": "prof_chain_armour" } ]
   },
-  {
-    "result": "xs_hc_chainmail_hood",
-    "type": "recipe",
-    "id_suffix": "less_charges",
-    "copy-from": "hc_chainmail_hood",
-    "time": "3 h",
-    "using": [ [ "chainmail_standard", 1 ] ],
-    "components": [ [ [ "hc_link_sheet", 2 ] ], [ [ "hc_chain_link", 38 ] ], [ [ "hc_wire", 2 ] ], [ [ "cotton_patchwork", 3 ] ] ]
-  },
   {
     "result": "xl_hc_chainmail_hood",
     "type": "recipe",
-    "id_suffix": "more_charges",
     "copy-from": "hc_chainmail_hood",
     "time": "3 h 20 m",
     "using": [ [ "chainmail_standard", 4 ] ],
     "components": [ [ [ "hc_link_sheet", 3 ] ], [ [ "hc_chain_link", 75 ] ], [ [ "hc_wire", 2 ] ], [ [ "cotton_patchwork", 6 ] ] ]
   },
-  {
-    "result": "xl_hc_chainmail_hood",
-    "type": "recipe",
-    "id_suffix": "standard_charges",
-    "copy-from": "hc_chainmail_hood",
-    "components": [ [ [ "hc_link_sheet", 3 ] ], [ [ "hc_chain_link", 75 ] ], [ [ "hc_wire", 2 ] ], [ [ "cotton_patchwork", 6 ] ] ]
-  },
   {
     "result": "xs_hc_chainmail_hood",
     "type": "recipe",
-    "id_suffix": "standard_charges",
     "copy-from": "hc_chainmail_hood",
-    "time": "3 h 20 m",
     "components": [ [ [ "hc_link_sheet", 2 ] ], [ [ "hc_chain_link", 50 ] ], [ [ "hc_wire", 2 ] ], [ [ "cotton_patchwork", 4 ] ] ]
   },
   {
     "result": "ch_chainmail_hood",
     "type": "recipe",
     "activity_level": "LIGHT_EXERCISE",
-    "category": "CC_ARMOR",
-    "subcategory": "CSC_ARMOR_HEAD",
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
     "skill_used": "fabrication",
     "difficulty": 7,
     "time": "3 h",
@@ -2424,42 +2367,24 @@
   {
     "result": "xs_ch_chainmail_hood",
     "type": "recipe",
-    "id_suffix": "less_charges",
     "copy-from": "ch_chainmail_hood",
-    "time": "3 h",
     "using": [ [ "chainmail_standard", 1 ] ],
     "components": [ [ [ "ch_link_sheet", 2 ] ], [ [ "ch_chain_link", 38 ] ], [ [ "ch_wire", 2 ] ], [ [ "cotton_patchwork", 3 ] ] ]
   },
   {
     "result": "xl_ch_chainmail_hood",
     "type": "recipe",
-    "id_suffix": "more_charges",
     "copy-from": "ch_chainmail_hood",
     "time": "3 h 20 m",
     "using": [ [ "chainmail_standard", 4 ] ],
     "components": [ [ [ "ch_link_sheet", 3 ] ], [ [ "ch_chain_link", 75 ] ], [ [ "ch_wire", 2 ] ], [ [ "cotton_patchwork", 6 ] ] ]
   },
-  {
-    "result": "xl_ch_chainmail_hood",
-    "type": "recipe",
-    "id_suffix": "standard_charges",
-    "copy-from": "ch_chainmail_hood",
-    "components": [ [ [ "ch_link_sheet", 3 ] ], [ [ "ch_chain_link", 75 ] ], [ [ "ch_wire", 2 ] ], [ [ "cotton_patchwork", 6 ] ] ]
-  },
-  {
-    "result": "xs_ch_chainmail_hood",
-    "type": "recipe",
-    "id_suffix": "standard_charges",
-    "copy-from": "ch_chainmail_hood",
-    "time": "3 h 20 m",
-    "components": [ [ [ "ch_link_sheet", 2 ] ], [ [ "ch_chain_link", 50 ] ], [ [ "ch_wire", 2 ] ], [ [ "cotton_patchwork", 4 ] ] ]
-  },
   {
     "result": "qt_chainmail_hood",
     "type": "recipe",
     "activity_level": "LIGHT_EXERCISE",
-    "category": "CC_ARMOR",
-    "subcategory": "CSC_ARMOR_HEAD",
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
     "skill_used": "fabrication",
     "difficulty": 7,
     "time": "3 h",
@@ -2472,36 +2397,18 @@
   {
     "result": "xs_qt_chainmail_hood",
     "type": "recipe",
-    "id_suffix": "less_charges",
     "copy-from": "qt_chainmail_hood",
-    "time": "3 h",
     "using": [ [ "chainmail_standard", 1 ] ],
     "components": [ [ [ "qt_link_sheet", 2 ] ], [ [ "qt_chain_link", 38 ] ], [ [ "qt_wire", 2 ] ], [ [ "cotton_patchwork", 3 ] ] ]
   },
   {
     "result": "xl_qt_chainmail_hood",
     "type": "recipe",
-    "id_suffix": "more_charges",
     "copy-from": "qt_chainmail_hood",
     "time": "3 h 20 m",
     "using": [ [ "chainmail_standard", 4 ] ],
     "components": [ [ [ "qt_link_sheet", 3 ] ], [ [ "qt_chain_link", 75 ] ], [ [ "qt_wire", 2 ] ], [ [ "cotton_patchwork", 6 ] ] ]
   },
-  {
-    "result": "xl_qt_chainmail_hood",
-    "id_suffix": "standard_charges",
-    "type": "recipe",
-    "copy-from": "qt_chainmail_hood",
-    "components": [ [ [ "qt_link_sheet", 3 ] ], [ [ "qt_chain_link", 75 ] ], [ [ "qt_wire", 2 ] ], [ [ "cotton_patchwork", 6 ] ] ]
-  },
-  {
-    "result": "xs_qt_chainmail_hood",
-    "type": "recipe",
-    "id_suffix": "standard_charges",
-    "copy-from": "qt_chainmail_hood",
-    "time": "3 h 20 m",
-    "components": [ [ [ "qt_link_sheet", 2 ] ], [ [ "qt_chain_link", 50 ] ], [ [ "qt_wire", 2 ] ], [ [ "cotton_patchwork", 4 ] ] ]
-  },
   {
     "result": "pot_xlhelmet",
     "type": "recipe",
diff --git a/data/json/recipes/armor/legs.json b/data/json/recipes/armor/legs.json
index d9a5e58f0b732..c1a6ee1737213 100644
--- a/data/json/recipes/armor/legs.json
+++ b/data/json/recipes/armor/legs.json
@@ -1093,8 +1093,8 @@
     "result": "lc_chainmail_legs",
     "type": "recipe",
     "activity_level": "LIGHT_EXERCISE",
-    "category": "CC_ARMOR",
-    "subcategory": "CSC_ARMOR_LEGS",
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
     "skill_used": "fabrication",
     "difficulty": 7,
     "time": "4 h",
@@ -1120,8 +1120,8 @@
     "result": "mc_chainmail_legs",
     "type": "recipe",
     "activity_level": "LIGHT_EXERCISE",
-    "category": "CC_ARMOR",
-    "subcategory": "CSC_ARMOR_LEGS",
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
     "skill_used": "fabrication",
     "difficulty": 7,
     "time": "4 h",
@@ -1147,8 +1147,8 @@
     "result": "hc_chainmail_legs",
     "type": "recipe",
     "activity_level": "LIGHT_EXERCISE",
-    "category": "CC_ARMOR",
-    "subcategory": "CSC_ARMOR_LEGS",
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
     "skill_used": "fabrication",
     "difficulty": 7,
     "time": "4 h",
@@ -1174,8 +1174,8 @@
     "result": "ch_chainmail_legs",
     "type": "recipe",
     "activity_level": "LIGHT_EXERCISE",
-    "category": "CC_ARMOR",
-    "subcategory": "CSC_ARMOR_LEGS",
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
     "skill_used": "fabrication",
     "difficulty": 7,
     "time": "4 h",
@@ -1201,8 +1201,8 @@
     "result": "qt_chainmail_legs",
     "type": "recipe",
     "activity_level": "LIGHT_EXERCISE",
-    "category": "CC_ARMOR",
-    "subcategory": "CSC_ARMOR_LEGS",
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
     "skill_used": "fabrication",
     "difficulty": 7,
     "time": "4 h",
diff --git a/data/json/recipes/armor/suit.json b/data/json/recipes/armor/suit.json
index 5797cb2fcf6e2..9c2fa6af98bb1 100644
--- a/data/json/recipes/armor/suit.json
+++ b/data/json/recipes/armor/suit.json
@@ -508,8 +508,8 @@
     "result": "lc_chainmail_hauberk",
     "type": "recipe",
     "activity_level": "LIGHT_EXERCISE",
-    "category": "CC_ARMOR",
-    "subcategory": "CSC_ARMOR_SUIT",
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
     "skill_used": "fabrication",
     "difficulty": 2,
     "time": "1 h 45 m",
@@ -537,8 +537,8 @@
     "result": "mc_chainmail_hauberk",
     "type": "recipe",
     "activity_level": "LIGHT_EXERCISE",
-    "category": "CC_ARMOR",
-    "subcategory": "CSC_ARMOR_SUIT",
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
     "skill_used": "fabrication",
     "difficulty": 2,
     "time": "1 h 45 m",
@@ -566,8 +566,8 @@
     "result": "hc_chainmail_hauberk",
     "type": "recipe",
     "activity_level": "LIGHT_EXERCISE",
-    "category": "CC_ARMOR",
-    "subcategory": "CSC_ARMOR_SUIT",
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
     "skill_used": "fabrication",
     "difficulty": 2,
     "time": "1 h 45 m",
@@ -595,8 +595,8 @@
     "result": "ch_chainmail_hauberk",
     "type": "recipe",
     "activity_level": "LIGHT_EXERCISE",
-    "category": "CC_ARMOR",
-    "subcategory": "CSC_ARMOR_SUIT",
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
     "skill_used": "fabrication",
     "difficulty": 2,
     "time": "1 h 45 m",
@@ -624,8 +624,8 @@
     "result": "qt_chainmail_hauberk",
     "type": "recipe",
     "activity_level": "LIGHT_EXERCISE",
-    "category": "CC_ARMOR",
-    "subcategory": "CSC_ARMOR_SUIT",
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
     "skill_used": "fabrication",
     "difficulty": 2,
     "time": "1 h 45 m",
@@ -653,8 +653,8 @@
     "result": "lc_chainmail_suit",
     "type": "recipe",
     "activity_level": "LIGHT_EXERCISE",
-    "category": "CC_ARMOR",
-    "subcategory": "CSC_ARMOR_SUIT",
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
     "skill_used": "fabrication",
     "difficulty": 3,
     "time": "1 h 50 m",
@@ -698,8 +698,8 @@
     "type": "recipe",
     "activity_level": "LIGHT_EXERCISE",
     "id_suffix": "hauberk",
-    "category": "CC_ARMOR",
-    "subcategory": "CSC_ARMOR_SUIT",
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
     "skill_used": "fabrication",
     "difficulty": 3,
     "time": "5 m",
@@ -717,8 +717,8 @@
     "type": "recipe",
     "activity_level": "MODERATE_EXERCISE",
     "id_suffix": "hauberk",
-    "category": "CC_ARMOR",
-    "subcategory": "CSC_ARMOR_SUIT",
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
     "skill_used": "fabrication",
     "difficulty": 3,
     "time": "5 m",
@@ -735,8 +735,8 @@
     "result": "mc_chainmail_suit",
     "type": "recipe",
     "activity_level": "LIGHT_EXERCISE",
-    "category": "CC_ARMOR",
-    "subcategory": "CSC_ARMOR_SUIT",
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
     "skill_used": "fabrication",
     "difficulty": 3,
     "time": "1 h 50 m",
@@ -780,8 +780,8 @@
     "type": "recipe",
     "activity_level": "LIGHT_EXERCISE",
     "id_suffix": "hauberk",
-    "category": "CC_ARMOR",
-    "subcategory": "CSC_ARMOR_SUIT",
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
     "skill_used": "fabrication",
     "difficulty": 3,
     "time": "5 m",
@@ -799,8 +799,8 @@
     "type": "recipe",
     "activity_level": "MODERATE_EXERCISE",
     "id_suffix": "hauberk",
-    "category": "CC_ARMOR",
-    "subcategory": "CSC_ARMOR_SUIT",
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
     "skill_used": "fabrication",
     "difficulty": 3,
     "time": "5 m",
@@ -817,8 +817,8 @@
     "result": "hc_chainmail_suit",
     "type": "recipe",
     "activity_level": "LIGHT_EXERCISE",
-    "category": "CC_ARMOR",
-    "subcategory": "CSC_ARMOR_SUIT",
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
     "skill_used": "fabrication",
     "difficulty": 3,
     "time": "1 h 50 m",
@@ -862,8 +862,8 @@
     "type": "recipe",
     "activity_level": "LIGHT_EXERCISE",
     "id_suffix": "hauberk",
-    "category": "CC_ARMOR",
-    "subcategory": "CSC_ARMOR_SUIT",
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
     "skill_used": "fabrication",
     "difficulty": 3,
     "time": "5 m",
@@ -881,8 +881,8 @@
     "type": "recipe",
     "activity_level": "MODERATE_EXERCISE",
     "id_suffix": "hauberk",
-    "category": "CC_ARMOR",
-    "subcategory": "CSC_ARMOR_SUIT",
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
     "skill_used": "fabrication",
     "difficulty": 3,
     "time": "5 m",
@@ -899,8 +899,8 @@
     "result": "ch_chainmail_suit",
     "type": "recipe",
     "activity_level": "LIGHT_EXERCISE",
-    "category": "CC_ARMOR",
-    "subcategory": "CSC_ARMOR_SUIT",
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
     "skill_used": "fabrication",
     "difficulty": 3,
     "time": "1 h 50 m",
@@ -944,8 +944,8 @@
     "type": "recipe",
     "activity_level": "LIGHT_EXERCISE",
     "id_suffix": "hauberk",
-    "category": "CC_ARMOR",
-    "subcategory": "CSC_ARMOR_SUIT",
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
     "skill_used": "fabrication",
     "difficulty": 3,
     "time": "5 m",
@@ -963,8 +963,8 @@
     "type": "recipe",
     "activity_level": "MODERATE_EXERCISE",
     "id_suffix": "hauberk",
-    "category": "CC_ARMOR",
-    "subcategory": "CSC_ARMOR_SUIT",
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
     "skill_used": "fabrication",
     "difficulty": 3,
     "time": "5 m",
@@ -981,8 +981,8 @@
     "result": "qt_chainmail_suit",
     "type": "recipe",
     "activity_level": "LIGHT_EXERCISE",
-    "category": "CC_ARMOR",
-    "subcategory": "CSC_ARMOR_SUIT",
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
     "skill_used": "fabrication",
     "difficulty": 3,
     "time": "1 h 50 m",
@@ -1026,8 +1026,8 @@
     "type": "recipe",
     "activity_level": "LIGHT_EXERCISE",
     "id_suffix": "hauberk",
-    "category": "CC_ARMOR",
-    "subcategory": "CSC_ARMOR_SUIT",
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
     "skill_used": "fabrication",
     "difficulty": 3,
     "time": "5 m",
@@ -1045,8 +1045,8 @@
     "type": "recipe",
     "activity_level": "MODERATE_EXERCISE",
     "id_suffix": "hauberk",
-    "category": "CC_ARMOR",
-    "subcategory": "CSC_ARMOR_SUIT",
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
     "skill_used": "fabrication",
     "difficulty": 3,
     "time": "5 m",
@@ -1063,8 +1063,8 @@
     "result": "chainmail_suit_faraday",
     "type": "recipe",
     "activity_level": "LIGHT_EXERCISE",
-    "category": "CC_ARMOR",
-    "subcategory": "CSC_ARMOR_SUIT",
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
     "skill_used": "fabrication",
     "difficulty": 7,
     "skills_required": [ "electronics", 3 ],
diff --git a/data/json/recipes/armor/torso.json b/data/json/recipes/armor/torso.json
index b9392a875ef76..90be12cba599c 100644
--- a/data/json/recipes/armor/torso.json
+++ b/data/json/recipes/armor/torso.json
@@ -2070,8 +2070,8 @@
     "result": "lc_chainmail_vest",
     "type": "recipe",
     "activity_level": "LIGHT_EXERCISE",
-    "category": "CC_ARMOR",
-    "subcategory": "CSC_ARMOR_TORSO",
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
     "skill_used": "fabrication",
     "difficulty": 7,
     "time": "7 h 10 m",
@@ -2100,8 +2100,8 @@
     "result": "mc_chainmail_vest",
     "type": "recipe",
     "activity_level": "LIGHT_EXERCISE",
-    "category": "CC_ARMOR",
-    "subcategory": "CSC_ARMOR_TORSO",
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
     "skill_used": "fabrication",
     "difficulty": 7,
     "time": "7 h 10 m",
@@ -2130,8 +2130,8 @@
     "result": "hc_chainmail_vest",
     "type": "recipe",
     "activity_level": "LIGHT_EXERCISE",
-    "category": "CC_ARMOR",
-    "subcategory": "CSC_ARMOR_TORSO",
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
     "skill_used": "fabrication",
     "difficulty": 7,
     "time": "7 h 10 m",
@@ -2160,8 +2160,8 @@
     "result": "ch_chainmail_vest",
     "type": "recipe",
     "activity_level": "LIGHT_EXERCISE",
-    "category": "CC_ARMOR",
-    "subcategory": "CSC_ARMOR_TORSO",
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
     "skill_used": "fabrication",
     "difficulty": 7,
     "time": "7 h 10 m",
@@ -2190,8 +2190,8 @@
     "result": "qt_chainmail_vest",
     "type": "recipe",
     "activity_level": "LIGHT_EXERCISE",
-    "category": "CC_ARMOR",
-    "subcategory": "CSC_ARMOR_TORSO",
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
     "skill_used": "fabrication",
     "difficulty": 7,
     "time": "7 h 10 m",
diff --git a/data/json/recipes/food/vegetable_dishes.json b/data/json/recipes/food/vegetable_dishes.json
index a8a7daefb220b..7e57914d7a1c2 100644
--- a/data/json/recipes/food/vegetable_dishes.json
+++ b/data/json/recipes/food/vegetable_dishes.json
@@ -143,8 +143,8 @@
     "type": "recipe",
     "result": "peanut_shelled",
     "activity_level": "MODERATE_EXERCISE",
-    "category": "CC_FOOD",
-    "subcategory": "CSC_FOOD_VEGGI",
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
     "skill_used": "cooking",
     "difficulty": 1,
     "time": "10 m",
@@ -159,8 +159,8 @@
     "type": "recipe",
     "result": "hickory_nut_shelled",
     "activity_level": "MODERATE_EXERCISE",
-    "category": "CC_FOOD",
-    "subcategory": "CSC_FOOD_VEGGI",
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
     "skill_used": "cooking",
     "difficulty": 1,
     "time": "10 m",
@@ -175,8 +175,8 @@
     "type": "recipe",
     "result": "walnut_shelled",
     "activity_level": "MODERATE_EXERCISE",
-    "category": "CC_FOOD",
-    "subcategory": "CSC_FOOD_VEGGI",
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
     "skill_used": "cooking",
     "difficulty": 1,
     "time": "10 m",
@@ -191,8 +191,8 @@
     "type": "recipe",
     "result": "hazelnut_shelled",
     "activity_level": "MODERATE_EXERCISE",
-    "category": "CC_FOOD",
-    "subcategory": "CSC_FOOD_VEGGI",
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
     "skill_used": "cooking",
     "difficulty": 1,
     "time": "10 m",
@@ -207,8 +207,8 @@
     "type": "recipe",
     "result": "hazelnut_shelled",
     "activity_level": "MODERATE_EXERCISE",
-    "category": "CC_FOOD",
-    "subcategory": "CSC_FOOD_VEGGI",
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
     "skill_used": "cooking",
     "difficulty": 1,
     "time": "10 m",
@@ -223,8 +223,8 @@
     "type": "recipe",
     "result": "chestnut_shelled",
     "activity_level": "MODERATE_EXERCISE",
-    "category": "CC_FOOD",
-    "subcategory": "CSC_FOOD_VEGGI",
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
     "skill_used": "cooking",
     "difficulty": 1,
     "time": "10 m",
@@ -239,8 +239,8 @@
     "type": "recipe",
     "result": "hazelnut_shelled",
     "activity_level": "MODERATE_EXERCISE",
-    "category": "CC_FOOD",
-    "subcategory": "CSC_FOOD_VEGGI",
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
     "skill_used": "cooking",
     "difficulty": 1,
     "time": "10 m",
@@ -255,8 +255,8 @@
     "type": "recipe",
     "result": "pecan_shelled",
     "activity_level": "MODERATE_EXERCISE",
-    "category": "CC_FOOD",
-    "subcategory": "CSC_FOOD_VEGGI",
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
     "skill_used": "cooking",
     "difficulty": 1,
     "time": "10 m",
@@ -271,8 +271,8 @@
     "type": "recipe",
     "result": "almond_shelled",
     "activity_level": "MODERATE_EXERCISE",
-    "category": "CC_FOOD",
-    "subcategory": "CSC_FOOD_VEGGI",
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
     "skill_used": "cooking",
     "difficulty": 1,
     "time": "10 m",
@@ -287,8 +287,8 @@
     "type": "recipe",
     "result": "pistachio_shelled",
     "activity_level": "MODERATE_EXERCISE",
-    "category": "CC_FOOD",
-    "subcategory": "CSC_FOOD_VEGGI",
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
     "skill_used": "cooking",
     "difficulty": 1,
     "time": "10 m",
diff --git a/data/json/recipes/nested.json b/data/json/recipes/nested.json
index 087ba285e56a0..a7ee9ea3fa052 100644
--- a/data/json/recipes/nested.json
+++ b/data/json/recipes/nested.json
@@ -314,6 +314,223 @@
     "difficulty": 5,
     "autolearn": [ [ "fabrication", 5 ] ]
   },
+  {
+    "id": "nested_lc_chainmail_hauberk",
+    "type": "nested_category",
+    "activity_level": "MODERATE_EXERCISE",
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
+    "name": "low steel chain hauberks",
+    "description": "Recipes related to constructing chainmail hauberks in various sizes.",
+    "skill_used": "fabrication",
+    "nested_category_data": [ "lc_chainmail_hauberk", "lc_chainmail_hauberk_xs", "xl_lc_chainmail_hauberk" ],
+    "difficulty": 2,
+    "autolearn": [ [ "fabrication", 1 ] ]
+  },
+  {
+    "id": "nested_mc_chainmail_hauberk",
+    "type": "nested_category",
+    "activity_level": "MODERATE_EXERCISE",
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
+    "name": "medium steel chain hauberks",
+    "description": "Recipes related to constructing chainmail hauberks in various sizes.",
+    "skill_used": "fabrication",
+    "nested_category_data": [ "mc_chainmail_hauberk", "mc_chainmail_hauberk_xs", "xl_mc_chainmail_hauberk" ],
+    "difficulty": 2,
+    "autolearn": [ [ "fabrication", 1 ] ]
+  },
+  {
+    "id": "nested_hc_chainmail_hauberk",
+    "type": "nested_category",
+    "activity_level": "MODERATE_EXERCISE",
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
+    "name": "high steel chain hauberks",
+    "description": "Recipes related to constructing chainmail hauberks in various sizes.",
+    "skill_used": "fabrication",
+    "nested_category_data": [ "hc_chainmail_hauberk", "hc_chainmail_hauberk_xs", "xl_hc_chainmail_hauberk" ],
+    "difficulty": 2,
+    "autolearn": [ [ "fabrication", 1 ] ]
+  },
+  {
+    "id": "nested_ch_chainmail_hauberk",
+    "type": "nested_category",
+    "activity_level": "MODERATE_EXERCISE",
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
+    "name": "hardened steel chain hauberks",
+    "description": "Recipes related to constructing chainmail hauberks in various sizes.",
+    "skill_used": "fabrication",
+    "nested_category_data": [ "ch_chainmail_hauberk", "ch_chainmail_hauberk_xs", "xl_ch_chainmail_hauberk" ],
+    "difficulty": 2,
+    "autolearn": [ [ "fabrication", 1 ] ]
+  },
+  {
+    "id": "nested_qt_chainmail_hauberk",
+    "type": "nested_category",
+    "activity_level": "MODERATE_EXERCISE",
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
+    "name": "tempered steel chain hauberks",
+    "description": "Recipes related to constructing chainmail hauberks in various sizes.",
+    "skill_used": "fabrication",
+    "nested_category_data": [ "qt_chainmail_hauberk", "qt_chainmail_hauberk_xs", "xl_qt_chainmail_hauberk" ],
+    "difficulty": 2,
+    "autolearn": [ [ "fabrication", 1 ] ]
+  },
+  {
+    "id": "nested_all_chainmail_hauberk",
+    "type": "nested_category",
+    "activity_level": "MODERATE_EXERCISE",
+    "category": "CC_ARMOR",
+    "subcategory": "CSC_ARMOR_SUIT",
+    "name": "all steel chain hauberks",
+    "description": "Recipes related to constructing chainmail hauberks in various types and sizes.",
+    "skill_used": "fabrication",
+    "nested_category_data": [
+      "nested_lc_chainmail_hauberk",
+      "nested_mc_chainmail_hauberk",
+      "nested_hc_chainmail_hauberk",
+      "nested_ch_chainmail_hauberk",
+      "nested_qt_chainmail_hauberk"
+    ],
+    "difficulty": 2,
+    "autolearn": [ [ "fabrication", 1 ] ]
+  },
+  {
+    "id": "nested_lc_chainmail_suit",
+    "type": "nested_category",
+    "activity_level": "MODERATE_EXERCISE",
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
+    "name": "mild steel chain suits",
+    "description": "Recipes related to constructing chainmail suits in various sizes.",
+    "skill_used": "fabrication",
+    "nested_category_data": [
+      "lc_chainmail_suit",
+      "lc_chainmail_suit_xs",
+      "xl_lc_chainmail_suit",
+      "lc_chainmail_suit_hauberk",
+      "lc_chainmail_suit_xs_hauberk",
+      "xl_lc_chainmail_suit_hauberk"
+    ],
+    "difficulty": 2,
+    "autolearn": [ [ "fabrication", 1 ] ]
+  },
+  {
+    "id": "nested_mc_chainmail_suit",
+    "type": "nested_category",
+    "activity_level": "MODERATE_EXERCISE",
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
+    "name": "medium steel chain suits",
+    "description": "Recipes related to constructing chainmail suits in various sizes.",
+    "skill_used": "fabrication",
+    "nested_category_data": [
+      "mc_chainmail_suit",
+      "mc_chainmail_suit_xs",
+      "xl_mc_chainmail_suit",
+      "mc_chainmail_suit_hauberk",
+      "mc_chainmail_suit_xs_hauberk",
+      "xl_mc_chainmail_suit_hauberk"
+    ],
+    "difficulty": 2,
+    "autolearn": [ [ "fabrication", 1 ] ]
+  },
+  {
+    "id": "nested_hc_chainmail_suit",
+    "type": "nested_category",
+    "activity_level": "MODERATE_EXERCISE",
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
+    "name": "high steel chain suits",
+    "description": "Recipes related to constructing chainmail suits in various sizes.",
+    "skill_used": "fabrication",
+    "nested_category_data": [
+      "hc_chainmail_suit",
+      "hc_chainmail_suit_xs",
+      "xl_hc_chainmail_suit",
+      "hc_chainmail_suit_hauberk",
+      "hc_chainmail_suit_xs_hauberk",
+      "xl_hc_chainmail_suit_hauberk"
+    ],
+    "difficulty": 2,
+    "autolearn": [ [ "fabrication", 1 ] ]
+  },
+  {
+    "id": "nested_ch_chainmail_suit",
+    "type": "nested_category",
+    "activity_level": "MODERATE_EXERCISE",
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
+    "name": "hardened steel chain suits",
+    "description": "Recipes related to constructing chainmail suits in various sizes.",
+    "skill_used": "fabrication",
+    "nested_category_data": [
+      "ch_chainmail_suit",
+      "ch_chainmail_suit_xs",
+      "xl_ch_chainmail_suit",
+      "ch_chainmail_suit_hauberk",
+      "ch_chainmail_suit_xs_hauberk",
+      "xl_ch_chainmail_suit_hauberk"
+    ],
+    "difficulty": 2,
+    "autolearn": [ [ "fabrication", 1 ] ]
+  },
+  {
+    "id": "nested_qt_chainmail_suit",
+    "type": "nested_category",
+    "activity_level": "MODERATE_EXERCISE",
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
+    "name": "tempered steel chain suits",
+    "description": "Recipes related to constructing chainmail suits in various sizes.",
+    "skill_used": "fabrication",
+    "nested_category_data": [
+      "qt_chainmail_suit",
+      "qt_chainmail_suit_xs",
+      "xl_qt_chainmail_suit",
+      "qt_chainmail_suit_hauberk",
+      "qt_chainmail_suit_xs_hauberk",
+      "xl_qt_chainmail_suit_hauberk"
+    ],
+    "difficulty": 2,
+    "autolearn": [ [ "fabrication", 1 ] ]
+  },
+  {
+    "id": "nested_chainmail_suit_faraday",
+    "type": "nested_category",
+    "activity_level": "MODERATE_EXERCISE",
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
+    "name": "faraday chain suits",
+    "description": "Recipes related to constructing chainmail suits that resist electricity.",
+    "skill_used": "fabrication",
+    "nested_category_data": [ "chainmail_suit_faraday", "chainmail_suit_faraday_xs", "xl_chainmail_suit_faraday" ],
+    "difficulty": 2,
+    "autolearn": [ [ "fabrication", 1 ] ]
+  },
+  {
+    "id": "nested_all_chainmail_suit",
+    "type": "nested_category",
+    "activity_level": "MODERATE_EXERCISE",
+    "category": "CC_ARMOR",
+    "subcategory": "CSC_ARMOR_SUIT",
+    "name": "all steel chain suits",
+    "description": "Recipes related to constructing chainmail suits in various types and sizes.",
+    "skill_used": "fabrication",
+    "nested_category_data": [
+      "nested_lc_chainmail_suit",
+      "nested_mc_chainmail_suit",
+      "nested_hc_chainmail_suit",
+      "nested_ch_chainmail_suit",
+      "nested_chainmail_suit_faraday",
+      "nested_qt_chainmail_suit"
+    ],
+    "difficulty": 2,
+    "autolearn": [ [ "fabrication", 1 ] ]
+  },
   {
     "id": "nested_scrap_cuirass",
     "type": "nested_category",
@@ -651,6 +868,90 @@
     "difficulty": 5,
     "autolearn": [ [ "tailor", 4 ] ]
   },
+  {
+    "id": "nested_lc_chainmail_hood",
+    "type": "nested_category",
+    "activity_level": "LIGHT_EXERCISE",
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
+    "name": "low steel chain coifs",
+    "description": "Recipes related to constructing various sizes of chainmail hoods designed to protect the wearer.",
+    "skill_used": "fabrication",
+    "nested_category_data": [ "lc_chainmail_hood", "xl_lc_chainmail_hood", "xs_lc_chainmail_hood" ],
+    "difficulty": 5,
+    "autolearn": [ [ "fabrication", 5 ] ]
+  },
+  {
+    "id": "nested_mc_chainmail_hood",
+    "type": "nested_category",
+    "activity_level": "LIGHT_EXERCISE",
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
+    "name": "medium steel chain coifs",
+    "description": "Recipes related to constructing various sizes of chainmail hoods designed to protect the wearer.",
+    "skill_used": "fabrication",
+    "nested_category_data": [ "mc_chainmail_hood", "xl_mc_chainmail_hood", "xs_mc_chainmail_hood" ],
+    "difficulty": 5,
+    "autolearn": [ [ "fabrication", 5 ] ]
+  },
+  {
+    "id": "nested_hc_chainmail_hood",
+    "type": "nested_category",
+    "activity_level": "LIGHT_EXERCISE",
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
+    "name": "high steel chain coifs",
+    "description": "Recipes related to constructing various sizes of chainmail hoods designed to protect the wearer.",
+    "skill_used": "fabrication",
+    "nested_category_data": [ "hc_chainmail_hood", "xl_hc_chainmail_hood", "xs_hc_chainmail_hood" ],
+    "difficulty": 5,
+    "autolearn": [ [ "fabrication", 5 ] ]
+  },
+  {
+    "id": "nested_ch_chainmail_hood",
+    "type": "nested_category",
+    "activity_level": "LIGHT_EXERCISE",
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
+    "name": "hardened steel chain coifs",
+    "description": "Recipes related to constructing various sizes of chainmail hoods designed to protect the wearer.",
+    "skill_used": "fabrication",
+    "nested_category_data": [ "ch_chainmail_hood", "xl_ch_chainmail_hood", "xs_ch_chainmail_hood" ],
+    "difficulty": 5,
+    "autolearn": [ [ "fabrication", 5 ] ]
+  },
+  {
+    "id": "nested_qt_chainmail_hood",
+    "type": "nested_category",
+    "activity_level": "LIGHT_EXERCISE",
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
+    "name": "tempered steel chain coifs",
+    "description": "Recipes related to constructing various sizes of chainmail hoods designed to protect the wearer.",
+    "skill_used": "fabrication",
+    "nested_category_data": [ "qt_chainmail_hood", "xl_qt_chainmail_hood", "xs_qt_chainmail_hood" ],
+    "difficulty": 5,
+    "autolearn": [ [ "fabrication", 5 ] ]
+  },
+  {
+    "id": "nested_all_chainmail_hood",
+    "type": "nested_category",
+    "activity_level": "LIGHT_EXERCISE",
+    "category": "CC_ARMOR",
+    "subcategory": "CSC_ARMOR_HEAD",
+    "name": "all steel chain coifs",
+    "description": "Recipes related to constructing various types and sizes of chainmail hoods designed to protect the wearer.",
+    "skill_used": "fabrication",
+    "nested_category_data": [
+      "nested_lc_chainmail_hood",
+      "nested_mc_chainmail_hood",
+      "nested_hc_chainmail_hood",
+      "nested_ch_chainmail_hood",
+      "nested_qt_chainmail_hood"
+    ],
+    "difficulty": 5,
+    "autolearn": [ [ "fabrication", 5 ] ]
+  },
   {
     "id": "nested_mask_gas",
     "type": "nested_category",
@@ -782,6 +1083,90 @@
     "difficulty": 6,
     "autolearn": [ [ "fabrication", 6 ] ]
   },
+  {
+    "id": "nested_lc_chainmail_vest",
+    "type": "nested_category",
+    "activity_level": "LIGHT_EXERCISE",
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
+    "name": "mild steel chain vest",
+    "description": "Recipes related to constructing various sizes of chainmail vests.",
+    "skill_used": "fabrication",
+    "nested_category_data": [ "lc_chainmail_vest", "xs_lc_chainmail_vest", "xl_lc_chainmail_vest" ],
+    "difficulty": 5,
+    "autolearn": [ [ "fabrication", 5 ] ]
+  },
+  {
+    "id": "nested_mc_chainmail_vest",
+    "type": "nested_category",
+    "activity_level": "LIGHT_EXERCISE",
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
+    "name": "medium steel chain vest",
+    "description": "Recipes related to constructing various sizes of chainmail vests.",
+    "skill_used": "fabrication",
+    "nested_category_data": [ "mc_chainmail_vest", "xs_mc_chainmail_vest", "xl_mc_chainmail_vest" ],
+    "difficulty": 5,
+    "autolearn": [ [ "fabrication", 5 ] ]
+  },
+  {
+    "id": "nested_hc_chainmail_vest",
+    "type": "nested_category",
+    "activity_level": "LIGHT_EXERCISE",
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
+    "name": "high steel chain vest",
+    "description": "Recipes related to constructing various sizes of chainmail vests.",
+    "skill_used": "fabrication",
+    "nested_category_data": [ "hc_chainmail_vest", "xs_hc_chainmail_vest", "xl_hc_chainmail_vest" ],
+    "difficulty": 5,
+    "autolearn": [ [ "fabrication", 5 ] ]
+  },
+  {
+    "id": "nested_ch_chainmail_vest",
+    "type": "nested_category",
+    "activity_level": "LIGHT_EXERCISE",
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
+    "name": "hardened steel chain vest",
+    "description": "Recipes related to constructing various sizes of chainmail vests.",
+    "skill_used": "fabrication",
+    "nested_category_data": [ "ch_chainmail_vest", "xs_ch_chainmail_vest", "xl_ch_chainmail_vest" ],
+    "difficulty": 5,
+    "autolearn": [ [ "fabrication", 5 ] ]
+  },
+  {
+    "id": "nested_qt_chainmail_vest",
+    "type": "nested_category",
+    "activity_level": "LIGHT_EXERCISE",
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
+    "name": "tempered steel chain vest",
+    "description": "Recipes related to constructing various sizes of chainmail vests.",
+    "skill_used": "fabrication",
+    "nested_category_data": [ "qt_chainmail_vest", "xs_qt_chainmail_vest", "xl_qt_chainmail_vest" ],
+    "difficulty": 5,
+    "autolearn": [ [ "fabrication", 5 ] ]
+  },
+  {
+    "id": "nested_all_chainmail_vest",
+    "type": "nested_category",
+    "activity_level": "LIGHT_EXERCISE",
+    "category": "CC_ARMOR",
+    "subcategory": "CSC_ARMOR_TORSO",
+    "name": "all steel chain vest",
+    "description": "Recipes related to constructing various sizes of chainmail vests.",
+    "skill_used": "fabrication",
+    "nested_category_data": [
+      "nested_lc_chainmail_vest",
+      "nested_mc_chainmail_vest",
+      "nested_hc_chainmail_vest",
+      "nested_ch_chainmail_vest",
+      "nested_qt_chainmail_vest"
+    ],
+    "difficulty": 5,
+    "autolearn": [ [ "fabrication", 5 ] ]
+  },
   {
     "id": "nested_gloves_fsurvivor",
     "type": "nested_category",
@@ -909,44 +1294,296 @@
     "autolearn": [ [ "tailor", 0 ] ]
   },
   {
-    "id": "nested_lsurvivor_pants",
+    "id": "nested_lc_chainmail_hands",
     "type": "nested_category",
     "activity_level": "LIGHT_EXERCISE",
     "category": "CC_*",
     "subcategory": "CSC_*_NESTED",
-    "name": "light survivor pants",
-    "description": "Recipes related to constructing various sizes of light survivor cargo pants.",
-    "skill_used": "tailor",
-    "nested_category_data": [ "lsurvivor_pants", "xs_lsurvivor_pants", "xl_lsurvivor_pants" ],
+    "name": "mild steel chain gloves",
+    "description": "Recipes related to constructing various sizes of chain gloves.",
+    "skill_used": "fabrication",
+    "nested_category_data": [ "lc_chainmail_hands", "xs_lc_chainmail_hands", "xl_lc_chainmail_hands" ],
     "difficulty": 5,
-    "autolearn": [ [ "tailor", 4 ] ]
+    "autolearn": [ [ "fabrication", 5 ] ]
   },
   {
-    "id": "nested_survivor_pants",
+    "id": "nested_mc_chainmail_hands",
     "type": "nested_category",
     "activity_level": "LIGHT_EXERCISE",
     "category": "CC_*",
     "subcategory": "CSC_*_NESTED",
-    "name": "survivor pants",
-    "description": "Recipes related to constructing various sizes of survivor cargo pants.",
-    "skill_used": "tailor",
-    "nested_category_data": [ "pants_survivor", "xs_pants_survivor", "xl_pants_survivor" ],
+    "name": "medium steel chain gloves",
+    "description": "Recipes related to constructing various sizes of chain gloves.",
+    "skill_used": "fabrication",
+    "nested_category_data": [ "mc_chainmail_hands", "xs_mc_chainmail_hands", "xl_mc_chainmail_hands" ],
     "difficulty": 5,
-    "autolearn": [ [ "tailor", 4 ] ]
+    "autolearn": [ [ "fabrication", 5 ] ]
   },
   {
-    "id": "nested_all_survivor_pants",
+    "id": "nested_hc_chainmail_hands",
     "type": "nested_category",
     "activity_level": "LIGHT_EXERCISE",
-    "category": "CC_ARMOR",
-    "subcategory": "CSC_ARMOR_LEGS",
-    "name": "all survivor pants",
-    "description": "Recipes related to constructing various sizes and variations of survivor cargo pants.",
-    "skill_used": "tailor",
-    "nested_category_data": [ "nested_lsurvivor_pants", "nested_survivor_pants" ],
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
+    "name": "high steel chain gloves",
+    "description": "Recipes related to constructing various sizes of chain gloves.",
+    "skill_used": "fabrication",
+    "nested_category_data": [ "hc_chainmail_hands", "xs_hc_chainmail_hands", "xl_hc_chainmail_hands" ],
+    "difficulty": 5,
+    "autolearn": [ [ "fabrication", 5 ] ]
+  },
+  {
+    "id": "nested_ch_chainmail_hands",
+    "type": "nested_category",
+    "activity_level": "LIGHT_EXERCISE",
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
+    "name": "hardened steel chain gloves",
+    "description": "Recipes related to constructing various sizes of chain gloves.",
+    "skill_used": "fabrication",
+    "nested_category_data": [ "ch_chainmail_hands", "xs_ch_chainmail_hands", "xl_ch_chainmail_hands" ],
+    "difficulty": 5,
+    "autolearn": [ [ "fabrication", 5 ] ]
+  },
+  {
+    "id": "nested_qt_chainmail_hands",
+    "type": "nested_category",
+    "activity_level": "LIGHT_EXERCISE",
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
+    "name": "tempered steel chain gloves",
+    "description": "Recipes related to constructing various sizes of chain gloves.",
+    "skill_used": "fabrication",
+    "nested_category_data": [ "qt_chainmail_hands", "xs_qt_chainmail_hands", "xl_qt_chainmail_hands" ],
+    "difficulty": 5,
+    "autolearn": [ [ "fabrication", 5 ] ]
+  },
+  {
+    "id": "nested_all_chainmail_hands",
+    "type": "nested_category",
+    "activity_level": "LIGHT_EXERCISE",
+    "category": "CC_ARMOR",
+    "subcategory": "CSC_ARMOR_HANDS",
+    "name": "all steel chain gloves",
+    "description": "Recipes related to constructing various types and sizes of chain gloves.",
+    "skill_used": "fabrication",
+    "nested_category_data": [
+      "nested_lc_chainmail_hands",
+      "nested_mc_chainmail_hands",
+      "nested_hc_chainmail_hands",
+      "nested_ch_chainmail_hands",
+      "nested_qt_chainmail_hands"
+    ],
+    "difficulty": 5,
+    "autolearn": [ [ "fabrication", 5 ] ]
+  },
+  {
+    "id": "nested_lc_chainmail_arms",
+    "type": "nested_category",
+    "activity_level": "LIGHT_EXERCISE",
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
+    "name": "mild steel chain sleeves",
+    "description": "Recipes related to constructing various sizes of chain sleeves.",
+    "skill_used": "fabrication",
+    "nested_category_data": [ "lc_chainmail_arms", "xs_lc_chainmail_arms", "xl_lc_chainmail_arms" ],
+    "difficulty": 5,
+    "autolearn": [ [ "fabrication", 5 ] ]
+  },
+  {
+    "id": "nested_mc_chainmail_arms",
+    "type": "nested_category",
+    "activity_level": "LIGHT_EXERCISE",
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
+    "name": "medium steel chain sleeves",
+    "description": "Recipes related to constructing various sizes of chain sleeves.",
+    "skill_used": "fabrication",
+    "nested_category_data": [ "mc_chainmail_arms", "xs_mc_chainmail_arms", "xl_mc_chainmail_arms" ],
+    "difficulty": 5,
+    "autolearn": [ [ "fabrication", 5 ] ]
+  },
+  {
+    "id": "nested_hc_chainmail_arms",
+    "type": "nested_category",
+    "activity_level": "LIGHT_EXERCISE",
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
+    "name": "high steel chain sleeves",
+    "description": "Recipes related to constructing various sizes of chain sleeves.",
+    "skill_used": "fabrication",
+    "nested_category_data": [ "hc_chainmail_arms", "xs_hc_chainmail_arms", "xl_hc_chainmail_arms" ],
+    "difficulty": 5,
+    "autolearn": [ [ "fabrication", 5 ] ]
+  },
+  {
+    "id": "nested_ch_chainmail_arms",
+    "type": "nested_category",
+    "activity_level": "LIGHT_EXERCISE",
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
+    "name": "hardened steel chain sleeves",
+    "description": "Recipes related to constructing various sizes of chain sleeves.",
+    "skill_used": "fabrication",
+    "nested_category_data": [ "ch_chainmail_arms", "xs_ch_chainmail_arms", "xl_ch_chainmail_arms" ],
+    "difficulty": 5,
+    "autolearn": [ [ "fabrication", 5 ] ]
+  },
+  {
+    "id": "nested_qt_chainmail_arms",
+    "type": "nested_category",
+    "activity_level": "LIGHT_EXERCISE",
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
+    "name": "tempered steel chain sleeves",
+    "description": "Recipes related to constructing various sizes of chain sleeves.",
+    "skill_used": "fabrication",
+    "nested_category_data": [ "qt_chainmail_arms", "xs_qt_chainmail_arms", "xl_qt_chainmail_arms" ],
+    "difficulty": 5,
+    "autolearn": [ [ "fabrication", 5 ] ]
+  },
+  {
+    "id": "nested_all_chainmail_arms",
+    "type": "nested_category",
+    "activity_level": "LIGHT_EXERCISE",
+    "category": "CC_ARMOR",
+    "subcategory": "CSC_ARMOR_ARMS",
+    "name": "all steel chain sleeves",
+    "description": "Recipes related to constructing various sizes of chain sleeves.",
+    "skill_used": "fabrication",
+    "nested_category_data": [
+      "nested_lc_chainmail_arms",
+      "nested_mc_chainmail_arms",
+      "nested_hc_chainmail_arms",
+      "nested_ch_chainmail_arms",
+      "nested_qt_chainmail_arms"
+    ],
+    "difficulty": 5,
+    "autolearn": [ [ "fabrication", 5 ] ]
+  },
+  {
+    "id": "nested_lsurvivor_pants",
+    "type": "nested_category",
+    "activity_level": "LIGHT_EXERCISE",
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
+    "name": "light survivor pants",
+    "description": "Recipes related to constructing various sizes of light survivor cargo pants.",
+    "skill_used": "tailor",
+    "nested_category_data": [ "lsurvivor_pants", "xs_lsurvivor_pants", "xl_lsurvivor_pants" ],
+    "difficulty": 5,
+    "autolearn": [ [ "tailor", 4 ] ]
+  },
+  {
+    "id": "nested_survivor_pants",
+    "type": "nested_category",
+    "activity_level": "LIGHT_EXERCISE",
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
+    "name": "survivor pants",
+    "description": "Recipes related to constructing various sizes of survivor cargo pants.",
+    "skill_used": "tailor",
+    "nested_category_data": [ "pants_survivor", "xs_pants_survivor", "xl_pants_survivor" ],
     "difficulty": 5,
     "autolearn": [ [ "tailor", 4 ] ]
   },
+  {
+    "id": "nested_all_survivor_pants",
+    "type": "nested_category",
+    "activity_level": "LIGHT_EXERCISE",
+    "category": "CC_ARMOR",
+    "subcategory": "CSC_ARMOR_LEGS",
+    "name": "all survivor pants",
+    "description": "Recipes related to constructing various sizes and variations of survivor cargo pants.",
+    "skill_used": "tailor",
+    "nested_category_data": [ "nested_lsurvivor_pants", "nested_survivor_pants" ],
+    "difficulty": 5,
+    "autolearn": [ [ "tailor", 4 ] ]
+  },
+  {
+    "id": "nested_lc_chainmail_legs",
+    "type": "nested_category",
+    "activity_level": "LIGHT_EXERCISE",
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
+    "name": "mild steel chain legs",
+    "description": "Recipes related to constructing various sizes of chainmail leggings.",
+    "skill_used": "fabrication",
+    "nested_category_data": [ "lc_chainmail_legs", "xs_lc_chainmail_legs", "xl_lc_chainmail_legs" ],
+    "difficulty": 5,
+    "autolearn": [ [ "fabrication", 5 ] ]
+  },
+  {
+    "id": "nested_mc_chainmail_legs",
+    "type": "nested_category",
+    "activity_level": "LIGHT_EXERCISE",
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
+    "name": "medium steel chain legs",
+    "description": "Recipes related to constructing various sizes of chainmail leggings.",
+    "skill_used": "fabrication",
+    "nested_category_data": [ "mc_chainmail_legs", "xs_mc_chainmail_legs", "xl_mc_chainmail_legs" ],
+    "difficulty": 5,
+    "autolearn": [ [ "fabrication", 5 ] ]
+  },
+  {
+    "id": "nested_hc_chainmail_legs",
+    "type": "nested_category",
+    "activity_level": "LIGHT_EXERCISE",
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
+    "name": "high steel chain legs",
+    "description": "Recipes related to constructing various sizes of chainmail leggings.",
+    "skill_used": "fabrication",
+    "nested_category_data": [ "hc_chainmail_legs", "xs_hc_chainmail_legs", "xl_hc_chainmail_legs" ],
+    "difficulty": 5,
+    "autolearn": [ [ "fabrication", 5 ] ]
+  },
+  {
+    "id": "nested_ch_chainmail_legs",
+    "type": "nested_category",
+    "activity_level": "LIGHT_EXERCISE",
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
+    "name": "hardened steel chain legs",
+    "description": "Recipes related to constructing various sizes of chainmail leggings.",
+    "skill_used": "fabrication",
+    "nested_category_data": [ "ch_chainmail_legs", "xs_ch_chainmail_legs", "xl_ch_chainmail_legs" ],
+    "difficulty": 5,
+    "autolearn": [ [ "fabrication", 5 ] ]
+  },
+  {
+    "id": "nested_qt_chainmail_legs",
+    "type": "nested_category",
+    "activity_level": "LIGHT_EXERCISE",
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
+    "name": "tempered steel chain legs",
+    "description": "Recipes related to constructing various sizes of chainmail leggings.",
+    "skill_used": "fabrication",
+    "nested_category_data": [ "qt_chainmail_legs", "xs_qt_chainmail_legs", "xl_qt_chainmail_legs" ],
+    "difficulty": 5,
+    "autolearn": [ [ "fabrication", 5 ] ]
+  },
+  {
+    "id": "nested_all_chainmail_legs",
+    "type": "nested_category",
+    "activity_level": "LIGHT_EXERCISE",
+    "category": "CC_ARMOR",
+    "subcategory": "CSC_ARMOR_LEGS",
+    "name": "all steel chain legs",
+    "description": "Recipes related to constructing various sizes and types of chainmail leggings.",
+    "skill_used": "fabrication",
+    "nested_category_data": [
+      "nested_lc_chainmail_legs",
+      "nested_mc_chainmail_legs",
+      "nested_hc_chainmail_legs",
+      "nested_ch_chainmail_legs",
+      "nested_qt_chainmail_legs"
+    ],
+    "difficulty": 5,
+    "autolearn": [ [ "fabrication", 5 ] ]
+  },
   {
     "id": "nested_boots_fsurvivor",
     "type": "nested_category",
@@ -1052,6 +1689,90 @@
     "difficulty": 5,
     "autolearn": [ [ "tailor", 5 ] ]
   },
+  {
+    "id": "nested_lc_chainmail_feet",
+    "type": "nested_category",
+    "activity_level": "LIGHT_EXERCISE",
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
+    "name": "mild steel chain chausses",
+    "description": "Recipes related to constructing various sizes of chainmail chausses.",
+    "skill_used": "fabrication",
+    "nested_category_data": [ "lc_chainmail_feet", "xs_lc_chainmail_feet", "xl_lc_chainmail_feet" ],
+    "difficulty": 5,
+    "autolearn": [ [ "fabrication", 5 ] ]
+  },
+  {
+    "id": "nested_mc_chainmail_feet",
+    "type": "nested_category",
+    "activity_level": "LIGHT_EXERCISE",
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
+    "name": "medium steel chain chausses",
+    "description": "Recipes related to constructing various sizes of chainmail chausses.",
+    "skill_used": "fabrication",
+    "nested_category_data": [ "mc_chainmail_feet", "xs_mc_chainmail_feet", "xl_mc_chainmail_feet" ],
+    "difficulty": 5,
+    "autolearn": [ [ "fabrication", 5 ] ]
+  },
+  {
+    "id": "nested_hc_chainmail_feet",
+    "type": "nested_category",
+    "activity_level": "LIGHT_EXERCISE",
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
+    "name": "high steel chain chausses",
+    "description": "Recipes related to constructing various sizes of chainmail chausses.",
+    "skill_used": "fabrication",
+    "nested_category_data": [ "hc_chainmail_feet", "xs_hc_chainmail_feet", "xl_hc_chainmail_feet" ],
+    "difficulty": 5,
+    "autolearn": [ [ "fabrication", 5 ] ]
+  },
+  {
+    "id": "nested_ch_chainmail_feet",
+    "type": "nested_category",
+    "activity_level": "LIGHT_EXERCISE",
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
+    "name": "hardened steel chain chausses",
+    "description": "Recipes related to constructing various sizes of chainmail chausses.",
+    "skill_used": "fabrication",
+    "nested_category_data": [ "ch_chainmail_feet", "xs_ch_chainmail_feet", "xl_ch_chainmail_feet" ],
+    "difficulty": 5,
+    "autolearn": [ [ "fabrication", 5 ] ]
+  },
+  {
+    "id": "nested_qt_chainmail_feet",
+    "type": "nested_category",
+    "activity_level": "LIGHT_EXERCISE",
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
+    "name": "tempered steel chain chausses",
+    "description": "Recipes related to constructing various sizes of chainmail chausses.",
+    "skill_used": "fabrication",
+    "nested_category_data": [ "qt_chainmail_feet", "xs_qt_chainmail_feet", "xl_qt_chainmail_feet" ],
+    "difficulty": 5,
+    "autolearn": [ [ "fabrication", 5 ] ]
+  },
+  {
+    "id": "nested_all_chainmail_feet",
+    "type": "nested_category",
+    "activity_level": "LIGHT_EXERCISE",
+    "category": "CC_ARMOR",
+    "subcategory": "CSC_ARMOR_FEET",
+    "name": "all steel chain chausses",
+    "description": "Recipes related to constructing various types and sizes of chainmail chausses.",
+    "skill_used": "fabrication",
+    "nested_category_data": [
+      "nested_lc_chainmail_feet",
+      "nested_mc_chainmail_feet",
+      "nested_hc_chainmail_feet",
+      "nested_ch_chainmail_feet",
+      "nested_qt_chainmail_feet"
+    ],
+    "difficulty": 5,
+    "autolearn": [ [ "fabrication", 5 ] ]
+  },
   {
     "id": "nested_sling_ready_explosives",
     "type": "nested_category",
@@ -1071,6 +1792,212 @@
     ],
     "autolearn": [ [ "fabrication", 0 ] ]
   },
+  {
+    "id": "nested_bundle_of_items",
+    "type": "nested_category",
+    "activity_level": "LIGHT_EXERCISE",
+    "category": "CC_OTHER",
+    "subcategory": "CSC_OTHER_MATERIALS",
+    "name": "bundle of items",
+    "description": "Recipes related to tying items into compact bundles for transport or storage.",
+    "skill_used": "fabrication",
+    "nested_category_data": [
+      "bundle_rag",
+      "bundle_leather",
+      "bundle_wool",
+      "bundle_plank",
+      "bundle_rebar",
+      "bundle_pipe",
+      "bundle_copper_pipe",
+      "bundle_branch",
+      "bundle_branch_long"
+    ],
+    "difficulty": 1,
+    "autolearn": [ [ "tailor", 0 ] ]
+  },
+  {
+    "id": "nested_shelled_nuts",
+    "type": "nested_category",
+    "activity_level": "LIGHT_EXERCISE",
+    "category": "CC_FOOD",
+    "subcategory": "CSC_FOOD_VEGGI",
+    "name": "shelled nuts",
+    "description": "Recipes related to shelling nuts.",
+    "skill_used": "cooking",
+    "nested_category_data": [
+      "peanut_shelled",
+      "hickory_nut_shelled",
+      "walnut_shelled",
+      "hazelnut_shelled",
+      "chestnut_shelled",
+      "pecan_shelled",
+      "almond_shelled",
+      "pistachio_shelled"
+    ],
+    "difficulty": 1,
+    "autolearn": [ [ "cooking", 0 ] ]
+  },
+  {
+    "id": "nested_short_string",
+    "type": "nested_category",
+    "activity_level": "LIGHT_EXERCISE",
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
+    "name": "short strings",
+    "description": "Recipes related to constructing short strings.",
+    "skill_used": "tailor",
+    "nested_category_data": [ "string_6", "string_6_spinwheel" ],
+    "difficulty": 1,
+    "autolearn": [ [ "tailor", 0 ] ]
+  },
+  {
+    "id": "nested_short_rope",
+    "type": "nested_category",
+    "activity_level": "LIGHT_EXERCISE",
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
+    "name": "short ropes",
+    "description": "Recipes related to constructing short ropes.",
+    "skill_used": "tailor",
+    "nested_category_data": [
+      "rope_6",
+      "rope_6_spinwheel_string",
+      "rope_6_from_filament",
+      "rope_6_spinwheel_filament",
+      "rope_6_from_cloth",
+      "rope_6_spinwheel_cloth"
+    ],
+    "difficulty": 1,
+    "autolearn": [ [ "tailor", 0 ] ]
+  },
+  {
+    "id": "nested_long_string",
+    "type": "nested_category",
+    "activity_level": "LIGHT_EXERCISE",
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
+    "name": "long strings",
+    "description": "Recipes related to constructing long strings.",
+    "skill_used": "tailor",
+    "nested_category_data": [ "string_36", "string_36_spinwheel" ],
+    "difficulty": 1,
+    "autolearn": [ [ "tailor", 0 ] ]
+  },
+  {
+    "id": "nested_long_rope",
+    "type": "nested_category",
+    "activity_level": "LIGHT_EXERCISE",
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
+    "name": "long ropes",
+    "description": "Recipes related to constructing long ropes.",
+    "skill_used": "tailor",
+    "nested_category_data": [
+      "rope_30",
+      "rope_30_spinwheel_ropes",
+      "rope_30_from_cloth",
+      "rope_30_spinwheel_cloth",
+      "rope_30_from_string",
+      "rope_30_spinwheel_string",
+      "rope_30_from_filament",
+      "rope_30_spinwheel_filament"
+    ],
+    "difficulty": 1,
+    "autolearn": [ [ "tailor", 0 ] ]
+  },
+  {
+    "id": "nested_short_cordage_piece",
+    "type": "nested_category",
+    "activity_level": "LIGHT_EXERCISE",
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
+    "name": "short cordage pieces",
+    "description": "Recipes related to constructing short cordage pieces.",
+    "skill_used": "tailor",
+    "nested_category_data": [ "cordage_6", "cordage_6_spinwheel_plant" ],
+    "difficulty": 1,
+    "autolearn": [ [ "tailor", 0 ] ]
+  },
+  {
+    "id": "nested_long_cordage_piece",
+    "type": "nested_category",
+    "activity_level": "LIGHT_EXERCISE",
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
+    "name": "long cordage pieces",
+    "description": "Recipes related to constructing long cordage pieces.",
+    "skill_used": "tailor",
+    "nested_category_data": [ "cordage_36", "cordage_36_spinwheel_plant", "cordage_36_from_cordage_6", "cordage_36_spinwheel_ropes" ],
+    "difficulty": 1,
+    "autolearn": [ [ "tailor", 0 ] ]
+  },
+  {
+    "id": "nested_leather_lace",
+    "type": "nested_category",
+    "activity_level": "LIGHT_EXERCISE",
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
+    "name": "leather laces",
+    "description": "Recipes related to constructing leather laces.",
+    "skill_used": "tailor",
+    "nested_category_data": [ "cordage_6_leather", "cordage_36_leather" ],
+    "difficulty": 1,
+    "autolearn": [ [ "tailor", 0 ] ]
+  },
+  {
+    "id": "nested_short_cordage_rope",
+    "type": "nested_category",
+    "activity_level": "LIGHT_EXERCISE",
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
+    "name": "short cordage ropes",
+    "description": "Recipes related to constructing short cordage ropes.",
+    "skill_used": "tailor",
+    "nested_category_data": [ "rope_makeshift_6", "rope_makeshift_6_spinwheel_cordages" ],
+    "difficulty": 1,
+    "autolearn": [ [ "tailor", 0 ] ]
+  },
+  {
+    "id": "nested_long_cordage_rope",
+    "type": "nested_category",
+    "activity_level": "LIGHT_EXERCISE",
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
+    "name": "long cordage ropes",
+    "description": "Recipes related to constructing long cordage ropes.",
+    "skill_used": "tailor",
+    "nested_category_data": [
+      "rope_makeshift_30",
+      "rope_makeshift_30_spinwheel_cordages",
+      "rope_makeshift_30_from_rope_makeshift_6",
+      "rope_makeshift_30_spinwheel_ropes"
+    ],
+    "difficulty": 1,
+    "autolearn": [ [ "tailor", 0 ] ]
+  },
+  {
+    "id": "nested_rope_and_cord",
+    "type": "nested_category",
+    "activity_level": "LIGHT_EXERCISE",
+    "category": "CC_OTHER",
+    "subcategory": "CSC_OTHER_MATERIALS",
+    "name": "ropes and cordage",
+    "description": "Recipes related to constructing ropes and cordage.",
+    "skill_used": "tailor",
+    "nested_category_data": [
+      "nested_short_string",
+      "nested_short_rope",
+      "nested_long_string",
+      "nested_long_rope",
+      "nested_short_cordage_piece",
+      "nested_long_cordage_piece",
+      "nested_leather_lace",
+      "nested_short_cordage_rope",
+      "nested_long_cordage_rope"
+    ],
+    "difficulty": 1,
+    "autolearn": [ [ "tailor", 0 ] ]
+  },
   {
     "id": "nested_modified_gunmods",
     "type": "nested_category",
diff --git a/data/json/recipes/other/cords_and_ropes.json b/data/json/recipes/other/cords_and_ropes.json
index 6d791add8bb66..ab03e04cef79b 100644
--- a/data/json/recipes/other/cords_and_ropes.json
+++ b/data/json/recipes/other/cords_and_ropes.json
@@ -3,8 +3,8 @@
     "type": "recipe",
     "activity_level": "fake",
     "result": "string_6",
-    "category": "CC_OTHER",
-    "subcategory": "CSC_OTHER_MATERIALS",
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
     "skill_used": "tailor",
     "time": "5 m",
     "reversible": true,
@@ -18,8 +18,8 @@
     "result": "string_6",
     "id_suffix": "spinwheel",
     "batch_time_factors": [ 70, 1 ],
-    "category": "CC_OTHER",
-    "subcategory": "CSC_OTHER_MATERIALS",
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
     "skill_used": "tailor",
     "time": "15 s",
     "reversible": true,
@@ -28,42 +28,13 @@
     "proficiencies": [ { "proficiency": "prof_fibers" } ],
     "components": [ [ [ "filament", 50, "LIST" ] ] ]
   },
-  {
-    "type": "recipe",
-    "activity_level": "fake",
-    "result": "string_36",
-    "category": "CC_OTHER",
-    "subcategory": "CSC_OTHER_MATERIALS",
-    "skill_used": "tailor",
-    "time": "30 m",
-    "reversible": true,
-    "autolearn": true,
-    "proficiencies": [ { "proficiency": "prof_fibers" } ],
-    "components": [ [ [ "string_6", 6 ], [ "filament", 300, "LIST" ] ] ]
-  },
-  {
-    "type": "recipe",
-    "activity_level": "LIGHT_EXERCISE",
-    "result": "string_36",
-    "id_suffix": "spinwheel",
-    "batch_time_factors": [ 70, 1 ],
-    "category": "CC_OTHER",
-    "subcategory": "CSC_OTHER_MATERIALS",
-    "skill_used": "tailor",
-    "time": "90 s",
-    "reversible": true,
-    "autolearn": true,
-    "tools": [ [ [ "spinwheelitem", -1 ] ] ],
-    "proficiencies": [ { "proficiency": "prof_fibers" } ],
-    "components": [ [ [ "string_6", 6 ], [ "filament", 300, "LIST" ] ] ]
-  },
   {
     "type": "recipe",
     "activity_level": "LIGHT_EXERCISE",
     "result": "rope_6",
     "id_suffix": "from_string",
-    "category": "CC_OTHER",
-    "subcategory": "CSC_OTHER_MATERIALS",
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
     "skill_used": "tailor",
     "time": "30 m",
     "reversible": true,
@@ -77,8 +48,8 @@
     "result": "rope_6",
     "id_suffix": "spinwheel_string",
     "batch_time_factors": [ 70, 1 ],
-    "category": "CC_OTHER",
-    "subcategory": "CSC_OTHER_MATERIALS",
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
     "skill_used": "tailor",
     "time": "90 s",
     "reversible": true,
@@ -92,8 +63,8 @@
     "activity_level": "fake",
     "result": "rope_6",
     "id_suffix": "from_filament",
-    "category": "CC_OTHER",
-    "subcategory": "CSC_OTHER_MATERIALS",
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
     "skill_used": "tailor",
     "time": "2 h",
     "reversible": true,
@@ -107,8 +78,8 @@
     "result": "rope_6",
     "id_suffix": "spinwheel_filament",
     "batch_time_factors": [ 70, 1 ],
-    "category": "CC_OTHER",
-    "subcategory": "CSC_OTHER_MATERIALS",
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
     "skill_used": "tailor",
     "time": "6 m",
     "reversible": true,
@@ -122,8 +93,8 @@
     "activity_level": "LIGHT_EXERCISE",
     "result": "rope_6",
     "id_suffix": "from_cloth",
-    "category": "CC_OTHER",
-    "subcategory": "CSC_OTHER_MATERIALS",
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
     "skill_used": "tailor",
     "difficulty": 3,
     "time": "1 h",
@@ -138,8 +109,8 @@
     "result": "rope_6",
     "id_suffix": "spinwheel_cloth",
     "batch_time_factors": [ 70, 1 ],
-    "category": "CC_OTHER",
-    "subcategory": "CSC_OTHER_MATERIALS",
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
     "skill_used": "tailor",
     "time": "3 m",
     "reversible": true,
@@ -149,12 +120,41 @@
     "proficiencies": [ { "proficiency": "prof_fibers" }, { "proficiency": "prof_fibers_rope" } ],
     "components": [ [ [ "cotton_patchwork", 30 ], [ "leather", 30 ], [ "felt_patch", 30 ], [ "tanned_hide", 5 ] ] ]
   },
+  {
+    "type": "recipe",
+    "activity_level": "fake",
+    "result": "string_36",
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
+    "skill_used": "tailor",
+    "time": "30 m",
+    "reversible": true,
+    "autolearn": true,
+    "proficiencies": [ { "proficiency": "prof_fibers" } ],
+    "components": [ [ [ "string_6", 6 ], [ "filament", 300, "LIST" ] ] ]
+  },
+  {
+    "type": "recipe",
+    "activity_level": "LIGHT_EXERCISE",
+    "result": "string_36",
+    "id_suffix": "spinwheel",
+    "batch_time_factors": [ 70, 1 ],
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
+    "skill_used": "tailor",
+    "time": "90 s",
+    "reversible": true,
+    "autolearn": true,
+    "tools": [ [ [ "spinwheelitem", -1 ] ] ],
+    "proficiencies": [ { "proficiency": "prof_fibers" } ],
+    "components": [ [ [ "string_6", 6 ], [ "filament", 300, "LIST" ] ] ]
+  },
   {
     "type": "recipe",
     "activity_level": "fake",
     "result": "rope_30",
-    "category": "CC_OTHER",
-    "subcategory": "CSC_OTHER_MATERIALS",
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
     "skill_used": "tailor",
     "time": "20 m",
     "reversible": true,
@@ -168,8 +168,8 @@
     "result": "rope_30",
     "id_suffix": "spinwheel_ropes",
     "batch_time_factors": [ 70, 1 ],
-    "category": "CC_OTHER",
-    "subcategory": "CSC_OTHER_MATERIALS",
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
     "skill_used": "tailor",
     "time": "5 m",
     "reversible": true,
@@ -183,8 +183,8 @@
     "activity_level": "fake",
     "result": "rope_30",
     "id_suffix": "from_cloth",
-    "category": "CC_OTHER",
-    "subcategory": "CSC_OTHER_MATERIALS",
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
     "skill_used": "tailor",
     "difficulty": 3,
     "time": "5 h",
@@ -199,8 +199,8 @@
     "result": "rope_30",
     "id_suffix": "spinwheel_cloth",
     "batch_time_factors": [ 70, 1 ],
-    "category": "CC_OTHER",
-    "subcategory": "CSC_OTHER_MATERIALS",
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
     "skill_used": "tailor",
     "time": "15 m",
     "reversible": true,
@@ -215,8 +215,8 @@
     "activity_level": "fake",
     "result": "rope_30",
     "id_suffix": "from_string",
-    "category": "CC_OTHER",
-    "subcategory": "CSC_OTHER_MATERIALS",
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
     "skill_used": "tailor",
     "time": "2h 30 m",
     "reversible": true,
@@ -230,8 +230,8 @@
     "result": "rope_30",
     "id_suffix": "spinwheel_string",
     "batch_time_factors": [ 70, 1 ],
-    "category": "CC_OTHER",
-    "subcategory": "CSC_OTHER_MATERIALS",
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
     "skill_used": "tailor",
     "time": "10 m",
     "reversible": true,
@@ -245,8 +245,8 @@
     "activity_level": "fake",
     "result": "rope_30",
     "id_suffix": "from_filament",
-    "category": "CC_OTHER",
-    "subcategory": "CSC_OTHER_MATERIALS",
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
     "skill_used": "tailor",
     "time": "10 h",
     "reversible": true,
@@ -260,8 +260,8 @@
     "result": "rope_30",
     "id_suffix": "spinwheel_filament",
     "batch_time_factors": [ 70, 1 ],
-    "category": "CC_OTHER",
-    "subcategory": "CSC_OTHER_MATERIALS",
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
     "skill_used": "tailor",
     "time": "30 m",
     "reversible": true,
@@ -274,8 +274,8 @@
     "type": "recipe",
     "activity_level": "NO_EXERCISE",
     "result": "cordage_6",
-    "category": "CC_OTHER",
-    "subcategory": "CSC_OTHER_MATERIALS",
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
     "skill_used": "tailor",
     "time": "5 m",
     "reversible": true,
@@ -289,8 +289,8 @@
     "result": "cordage_6",
     "id_suffix": "spinwheel_plant",
     "batch_time_factors": [ 70, 1 ],
-    "category": "CC_OTHER",
-    "subcategory": "CSC_OTHER_MATERIALS",
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
     "skill_used": "tailor",
     "time": "15 s",
     "reversible": true,
@@ -303,8 +303,8 @@
     "type": "recipe",
     "activity_level": "NO_EXERCISE",
     "result": "cordage_36",
-    "category": "CC_OTHER",
-    "subcategory": "CSC_OTHER_MATERIALS",
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
     "skill_used": "tailor",
     "time": "30 m",
     "reversible": true,
@@ -318,8 +318,8 @@
     "result": "cordage_36",
     "id_suffix": "spinwheel_plant",
     "batch_time_factors": [ 70, 1 ],
-    "category": "CC_OTHER",
-    "subcategory": "CSC_OTHER_MATERIALS",
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
     "skill_used": "tailor",
     "time": "90 s",
     "reversible": true,
@@ -333,8 +333,8 @@
     "activity_level": "NO_EXERCISE",
     "result": "cordage_36",
     "id_suffix": "from_cordage_6",
-    "category": "CC_OTHER",
-    "subcategory": "CSC_OTHER_MATERIALS",
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
     "skill_used": "tailor",
     "time": "2 m",
     "reversible": true,
@@ -348,8 +348,8 @@
     "result": "cordage_36",
     "id_suffix": "spinwheel_ropes",
     "batch_time_factors": [ 70, 1 ],
-    "category": "CC_OTHER",
-    "subcategory": "CSC_OTHER_MATERIALS",
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
     "skill_used": "tailor",
     "time": "8 s",
     "reversible": true,
@@ -362,8 +362,8 @@
     "type": "recipe",
     "activity_level": "LIGHT_EXERCISE",
     "result": "cordage_6_leather",
-    "category": "CC_OTHER",
-    "subcategory": "CSC_OTHER_MATERIALS",
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
     "skill_used": "tailor",
     "time": "2 m",
     "autolearn": true,
@@ -374,8 +374,8 @@
     "type": "recipe",
     "activity_level": "LIGHT_EXERCISE",
     "result": "cordage_36_leather",
-    "category": "CC_OTHER",
-    "subcategory": "CSC_OTHER_MATERIALS",
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
     "skill_used": "tailor",
     "time": "5 m",
     "autolearn": true,
@@ -386,8 +386,8 @@
     "type": "recipe",
     "activity_level": "fake",
     "result": "rope_makeshift_6",
-    "category": "CC_OTHER",
-    "subcategory": "CSC_OTHER_MATERIALS",
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
     "skill_used": "survival",
     "time": "30 m",
     "reversible": true,
@@ -401,8 +401,8 @@
     "result": "rope_makeshift_6",
     "id_suffix": "spinwheel_cordages",
     "batch_time_factors": [ 70, 1 ],
-    "category": "CC_OTHER",
-    "subcategory": "CSC_OTHER_MATERIALS",
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
     "skill_used": "tailor",
     "time": "90 s",
     "reversible": true,
@@ -416,8 +416,8 @@
     "activity_level": "fake",
     "result": "rope_makeshift_30",
     "id_suffix": "from_cordage",
-    "category": "CC_OTHER",
-    "subcategory": "CSC_OTHER_MATERIALS",
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
     "skill_used": "survival",
     "time": "2h 30 m",
     "reversible": true,
@@ -431,8 +431,8 @@
     "result": "rope_makeshift_30",
     "id_suffix": "spinwheel_cordages",
     "batch_time_factors": [ 70, 1 ],
-    "category": "CC_OTHER",
-    "subcategory": "CSC_OTHER_MATERIALS",
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
     "skill_used": "tailor",
     "time": "8 m",
     "reversible": true,
@@ -446,8 +446,8 @@
     "activity_level": "fake",
     "result": "rope_makeshift_30",
     "id_suffix": "from_rope_makeshift_6",
-    "category": "CC_OTHER",
-    "subcategory": "CSC_OTHER_MATERIALS",
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
     "skill_used": "survival",
     "time": "10 m",
     "reversible": true,
@@ -461,8 +461,8 @@
     "result": "rope_makeshift_30",
     "id_suffix": "spinwheel_ropes",
     "batch_time_factors": [ 70, 1 ],
-    "category": "CC_OTHER",
-    "subcategory": "CSC_OTHER_MATERIALS",
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
     "skill_used": "tailor",
     "time": "30 s",
     "reversible": true,
diff --git a/data/json/recipes/recipe_others.json b/data/json/recipes/recipe_others.json
index f86964d66c463..8ecefa3c97233 100644
--- a/data/json/recipes/recipe_others.json
+++ b/data/json/recipes/recipe_others.json
@@ -196,7 +196,7 @@
     "batch_time_factors": [ 83, 3 ],
     "flags": [ "BLIND_EASY" ],
     "tools": [ [ [ "rock_quern", -1 ], [ "clay_quern", -1 ] ] ],
-    "components": [ [ [ "chitin_piece", 1 ], [ "acidchitin_piece", 1 ], [ "endochitin", 1 ] ] ]
+    "components": [ [ [ "chitin_piece", 1 ], [ "acidchitin_piece", 1 ], [ "endochitin", 1 ], [ "insect_dust", 1 ] ] ]
   },
   {
     "type": "recipe",
@@ -213,7 +213,7 @@
     "batch_time_factors": [ 83, 3 ],
     "flags": [ "BLIND_EASY" ],
     "qualities": [ { "id": "FINE_GRIND", "level": 1 } ],
-    "components": [ [ [ "chitin_piece", 1 ], [ "acidchitin_piece", 1 ], [ "endochitin", 1 ] ] ]
+    "components": [ [ [ "chitin_piece", 1 ], [ "acidchitin_piece", 1 ], [ "endochitin", 1 ], [ "insect_dust", 1 ] ] ]
   },
   {
     "type": "recipe",
@@ -2317,8 +2317,8 @@
     "result": "bundle_rag",
     "type": "recipe",
     "activity_level": "NO_EXERCISE",
-    "category": "CC_OTHER",
-    "subcategory": "CSC_OTHER_MATERIALS",
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
     "skill_used": "fabrication",
     "time": "1 m",
     "autolearn": true,
@@ -2331,8 +2331,8 @@
     "result": "bundle_leather",
     "type": "recipe",
     "activity_level": "NO_EXERCISE",
-    "category": "CC_OTHER",
-    "subcategory": "CSC_OTHER_MATERIALS",
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
     "skill_used": "fabrication",
     "time": "1 m",
     "autolearn": true,
@@ -2345,8 +2345,8 @@
     "result": "bundle_wool",
     "type": "recipe",
     "activity_level": "NO_EXERCISE",
-    "category": "CC_OTHER",
-    "subcategory": "CSC_OTHER_MATERIALS",
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
     "skill_used": "fabrication",
     "time": "1 m",
     "autolearn": true,
@@ -2359,8 +2359,8 @@
     "result": "bundle_plank",
     "type": "recipe",
     "activity_level": "fake",
-    "category": "CC_OTHER",
-    "subcategory": "CSC_OTHER_MATERIALS",
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
     "skill_used": "fabrication",
     "time": "1 m",
     "autolearn": true,
@@ -2372,8 +2372,8 @@
     "result": "bundle_rebar",
     "type": "recipe",
     "activity_level": "fake",
-    "category": "CC_OTHER",
-    "subcategory": "CSC_OTHER_MATERIALS",
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
     "skill_used": "fabrication",
     "time": "1 m",
     "autolearn": true,
@@ -2385,8 +2385,8 @@
     "result": "bundle_pipe",
     "type": "recipe",
     "activity_level": "fake",
-    "category": "CC_OTHER",
-    "subcategory": "CSC_OTHER_MATERIALS",
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
     "skill_used": "fabrication",
     "time": "1 m",
     "autolearn": true,
@@ -2398,8 +2398,8 @@
     "result": "bundle_copper_pipe",
     "type": "recipe",
     "activity_level": "fake",
-    "category": "CC_OTHER",
-    "subcategory": "CSC_OTHER_MATERIALS",
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
     "skill_used": "fabrication",
     "time": "1 m",
     "autolearn": true,
@@ -2411,8 +2411,8 @@
     "result": "bundle_branch",
     "type": "recipe",
     "activity_level": "fake",
-    "category": "CC_OTHER",
-    "subcategory": "CSC_OTHER_MATERIALS",
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
     "skill_used": "fabrication",
     "time": "1 m",
     "autolearn": true,
@@ -2424,8 +2424,8 @@
     "result": "bundle_branch_long",
     "type": "recipe",
     "activity_level": "fake",
-    "category": "CC_OTHER",
-    "subcategory": "CSC_OTHER_MATERIALS",
+    "category": "CC_*",
+    "subcategory": "CSC_*_NESTED",
     "skill_used": "fabrication",
     "time": "1 m",
     "autolearn": true,
diff --git a/data/json/scenarios.json b/data/json/scenarios.json
index 9703ddc3d794e..8b199ff121f76 100644
--- a/data/json/scenarios.json
+++ b/data/json/scenarios.json
@@ -227,7 +227,7 @@
   {
     "type": "scenario",
     "name": "(un)living History",
-    "description": "After doing historical reenactment you and your friend are taking break inside the fort, and then you heard a scream and gunshot noises.",
+    "description": "After doing historical reenactment, you and your friend were taking a break inside the fort, and then you heard a scream and gunshot noises.",
     "id": "BastionFortStart",
     "points": -2,
     "start_name": "Bastion Fort",
@@ -694,7 +694,7 @@
     "id": "strong_portal_storm",
     "name": "Splintering Reality",
     "points": -3,
-    "description": "You found yourself alone in an open field when reality begun to heave and crack all around you.  You need to find shelter, and fast.",
+    "description": "You found yourself alone in an open field when reality began to heave and crack all around you.  You need to find shelter, and fast.",
     "flags": [ "CHALLENGE", "LONE_START" ],
     "start_name": "Field",
     "allowed_locs": [ "sloc_field" ],
diff --git a/data/json/snippets/newspapers.json b/data/json/snippets/newspapers.json
index 7480a57b48d2e..380bb81a89f16 100644
--- a/data/json/snippets/newspapers.json
+++ b/data/json/snippets/newspapers.json
@@ -295,7 +295,7 @@
       },
       {
         "id": "months_old_news_19",
-        "text": "MORE ORDAINED MINISTERS NEEDED.  Wedlock is down, but last minute nuptials, elopements, vow-renewals and 'micromonies' have been on the rise, supposedly in response to many of the recent events and uneasing developments as more people are feeling less secure about dating in these troubled times, therefore rushing to the alter in preparation for the worst, or to cross items off the bucket list before it's too late.  As a result, the nation is experiencing a shortage of marriage officiants.  Luckily, now more than ever, since the beginning of the 21st century it's become increasingly easier to become qualified to help couples of all kinds celebrate their commitment to each other.  However, not enough people are rising to the occasion."
+        "text": "MORE ORDAINED MINISTERS NEEDED.  Wedlock is down, but last minute nuptials, elopements, vow-renewals and 'micromonies' have been on the rise, supposedly in response to many of the recent events and uneasing developments as more people are feeling less secure about dating in these troubled times, therefore rushing to the altar in preparation for the worst, or to cross items off the bucket list before it's too late.  As a result, the nation is experiencing a shortage of marriage officiants.  Luckily, now more than ever, since the beginning of the 21st century it's become increasingly easier to become qualified to help couples of all kinds celebrate their commitment to each other.  However, not enough people are rising to the occasion."
       },
       {
         "id": "months_old_news_20",
diff --git a/data/json/ui/structured/sidebar-structured.json b/data/json/ui/structured/sidebar-structured.json
index dc246803d7225..90ea4ac9515b6 100644
--- a/data/json/ui/structured/sidebar-structured.json
+++ b/data/json/ui/structured/sidebar-structured.json
@@ -20,6 +20,7 @@
       "structured_health_temp_layout",
       "structured_health_overmap_layout",
       "structured_health_sa_layout",
+      "structured_all_body_graphs_layout",
       "separator",
       "structured_all_weariness_text_layout",
       "structured_all_weariness_graph_layout",
diff --git a/data/json/ui/structured/structured_health_blocks.json b/data/json/ui/structured/structured_health_blocks.json
index ac1ad4e534920..6cfc2eb64ac41 100644
--- a/data/json/ui/structured/structured_health_blocks.json
+++ b/data/json/ui/structured/structured_health_blocks.json
@@ -79,6 +79,19 @@
       "structured_health_right_layout"
     ]
   },
+  {
+    "id": "structured_all_body_graphs_layout",
+    "type": "widget",
+    "copy-from": "structured_health_encumb_layout",
+    "label": "All Bodygraphs",
+    "description": "Bodygraphs for bodypart <color_yellow>encumbrance</color>, <color_yellow>hitpoints</color>, <color_yellow>temperature</color>, and <color_yellow>status</color> (bite, etc.).\n\nIntended for use with the <color_yellow>Health + Overmap</color> widget.",
+    "widgets": [
+      "structured_body_graph_encumb_layout",
+      "structured_body_graph_layout",
+      "structured_body_graph_temp_layout",
+      "structured_body_graph_status_layout"
+    ]
+  },
   {
     "id": "structured_health_tiny_body_graphs_layout",
     "type": "widget",
diff --git a/data/mods/DinoMod/monsters/zed-dinosaur.json b/data/mods/DinoMod/monsters/zed-dinosaur.json
index 16c6b951a6129..8761465ec5a23 100644
--- a/data/mods/DinoMod/monsters/zed-dinosaur.json
+++ b/data/mods/DinoMod/monsters/zed-dinosaur.json
@@ -23,7 +23,7 @@
     "description": "The shuffling corpse of a medium-sized dinosaur with sharp teeth and two prominent bony crests on its head, with ragged strips of ripped flesh hanging down like a frill.",
     "burn_into": "mon_zilophosaurus_scorched",
     "fungalize_into": "mon_zilophosaurus_fungus",
-    "upgrades": { "half_life": 14, "into_group": "GROUP_zilophosaurus_UPGRADE" }
+    "upgrades": { "half_life": 30, "into_group": "GROUP_zilophosaurus_UPGRADE" }
   },
   {
     "type": "MONSTER",
@@ -48,7 +48,7 @@
     "description": "This zombie is enormous, scaly, and studded with bony spikes; it moves with horrible speed.  Its colorful horns are worn and wet with filth and its bright scales and bone spikes have taken a beating.",
     "burn_into": "mon_zeratosaurus_scorched",
     "fungalize_into": "mon_zeratosaurus_fungus",
-    "upgrades": { "half_life": 14, "into_group": "GROUP_zeratosaurus_UPGRADE" },
+    "upgrades": { "half_life": 30, "into_group": "GROUP_zeratosaurus_UPGRADE" },
     "flags": [ "SEES", "SMELLS", "HEARS", "BASHES", "POISON", "STUMBLES", "NO_BREATHE", "REVIVES", "FILTHY", "WARM", "SWIMS" ]
   },
   {
@@ -81,7 +81,7 @@
     "special_attacks": [ [ "scratch", 10 ], [ "GRAB", 10 ], { "type": "bite", "cooldown": 5 } ],
     "burn_into": "mon_zpinosaurus_scorched",
     "fungalize_into": "mon_zpinosaurus_fungus",
-    "upgrades": { "half_life": 14, "into_group": "GROUP_zpinosaurus_UPGRADE" },
+    "upgrades": { "half_life": 30, "into_group": "GROUP_zpinosaurus_UPGRADE" },
     "flags": [
       "SEES",
       "SMELLS",
@@ -132,7 +132,7 @@
     "special_attacks": [ [ "scratch", 10 ], [ "GRAB", 10 ], { "type": "bite", "cooldown": 5 } ],
     "burn_into": "mon_zorvosaurus_scorched",
     "fungalize_into": "mon_zorvosaurus_fungus",
-    "upgrades": { "half_life": 14, "into_group": "GROUP_zorvosaurus_UPGRADE" },
+    "upgrades": { "half_life": 30, "into_group": "GROUP_zorvosaurus_UPGRADE" },
     "flags": [ "SEES", "SMELLS", "HEARS", "POISON", "STUMBLES", "BASHES", "DESTROYS", "NO_BREATHE", "REVIVES", "FILTHY", "WARM" ],
     "vision_night": 3,
     "harvest": "zed_dino_leather",
@@ -162,7 +162,7 @@
     "description": "The shambling corpse of a large predatory bipedal dinosaur with a mouth full of sharp serrated teeth.",
     "burn_into": "mon_zallosaurus_scorched",
     "fungalize_into": "mon_zallosaurus_fungus",
-    "upgrades": { "half_life": 14, "into_group": "GROUP_zallosaurus_UPGRADE" },
+    "upgrades": { "half_life": 30, "into_group": "GROUP_zallosaurus_UPGRADE" },
     "flags": [ "SEES", "SMELLS", "HEARS", "POISON", "STUMBLES", "BASHES", "NO_BREATHE", "REVIVES", "FILTHY", "WARM" ]
   },
   {
@@ -188,7 +188,7 @@
     "description": "The shambling corpse of a huge, bipedal dinosaur predator, with a tall ridge running down the length of its back covered with heavy muscles.  Its teeth are curved and serrated like sawblades.",
     "burn_into": "mon_zacrocanthosaurus_scorched",
     "fungalize_into": "mon_zacrocanthosaurus_fungus",
-    "upgrades": { "half_life": 14, "into_group": "GROUP_zacrocanthosaurus_UPGRADE" },
+    "upgrades": { "half_life": 30, "into_group": "GROUP_zacrocanthosaurus_UPGRADE" },
     "flags": [ "SEES", "SMELLS", "HEARS", "POISON", "STUMBLES", "BASHES", "NO_BREATHE", "REVIVES", "FILTHY", "WARM" ]
   },
   {
@@ -214,7 +214,7 @@
     "description": "The shambling corpse of a huge, bipedal dinosaur predator with long claws and strong arms for grappling.",
     "burn_into": "mon_ziats_scorched",
     "fungalize_into": "mon_ziats_fungus",
-    "upgrades": { "half_life": 14, "into_group": "GROUP_ziats_UPGRADE" },
+    "upgrades": { "half_life": 30, "into_group": "GROUP_ziats_UPGRADE" },
     "flags": [ "SEES", "SMELLS", "HEARS", "POISON", "STUMBLES", "BASHES", "NO_BREATHE", "REVIVES", "FILTHY", "WARM" ]
   },
   {
@@ -231,7 +231,7 @@
     ],
     "burn_into": "mon_zryptosaurus_scorched",
     "fungalize_into": "mon_zryptosaurus_fungus",
-    "upgrades": { "half_life": 14, "into_group": "GROUP_zryptosaurus_UPGRADE" }
+    "upgrades": { "half_life": 30, "into_group": "GROUP_zryptosaurus_UPGRADE" }
   },
   {
     "type": "MONSTER",
@@ -245,7 +245,7 @@
     "special_attacks": [ { "type": "bite", "cooldown": 15 }, [ "GRAB", 15 ], [ "scratch", 20 ], [ "LUNGE", 20 ] ],
     "burn_into": "mon_zappalachiosaurus_scorched",
     "fungalize_into": "mon_zappalachiosaurus_fungus",
-    "upgrades": { "half_life": 14, "into_group": "GROUP_zappalachiosaurus_UPGRADE" }
+    "upgrades": { "half_life": 30, "into_group": "GROUP_zappalachiosaurus_UPGRADE" }
   },
   {
     "type": "MONSTER",
@@ -260,7 +260,7 @@
     "special_attacks": [ { "type": "bite", "cooldown": 10 }, [ "GRAB", 15 ], [ "scratch", 20 ], [ "LUNGE", 15 ] ],
     "burn_into": "mon_zorgosaurus_scorched",
     "fungalize_into": "mon_zorgosaurus_fungus",
-    "upgrades": { "half_life": 14, "into_group": "GROUP_zorgosaurus_UPGRADE" }
+    "upgrades": { "half_life": 30, "into_group": "GROUP_zorgosaurus_UPGRADE" }
   },
   {
     "type": "MONSTER",
@@ -278,7 +278,7 @@
     "description": "Massive jaws drooling black liquid, lifted over grasping claws by a huge shuffling dinosaur corpse.",
     "burn_into": "mon_zalbertosaurus_scorched",
     "fungalize_into": "mon_zalbertosaurus_fungus",
-    "upgrades": { "half_life": 14, "into_group": "GROUP_zalbertosaurus_UPGRADE" }
+    "upgrades": { "half_life": 30, "into_group": "GROUP_zalbertosaurus_UPGRADE" }
   },
   {
     "type": "MONSTER",
@@ -300,7 +300,7 @@
     "description": "Massive, long jaws drooling black liquid, lifted by a huge but shuffling dinosaur corpse.",
     "burn_into": "mon_zianzhousaurus_scorched",
     "fungalize_into": "mon_zianzhousaurus_fungus",
-    "upgrades": { "half_life": 14, "into_group": "GROUP_zianzhousaurus_UPGRADE" },
+    "upgrades": { "half_life": 30, "into_group": "GROUP_zianzhousaurus_UPGRADE" },
     "flags": [ "SEES", "SMELLS", "HEARS", "BASHES", "POISON", "STUMBLES", "NO_BREATHE", "REVIVES", "FILTHY", "WARM" ]
   },
   {
@@ -314,7 +314,7 @@
     "description": "Huge jaws with long sharp teeth drooling black liquid over white feathers, lifted by a huge but shuffling dinosaur corpse.",
     "burn_into": "mon_zanuqsaurus_scorched",
     "fungalize_into": "mon_zanuqsaurus_fungus",
-    "upgrades": { "half_life": 14, "into_group": "GROUP_zanuqsaurus_UPGRADE" }
+    "upgrades": { "half_life": 30, "into_group": "GROUP_zanuqsaurus_UPGRADE" }
   },
   {
     "type": "MONSTER",
@@ -329,7 +329,7 @@
     "description": "Huge jaws with long sharp teeth drooling black liquid, lifted by a huge but shuffling dinosaur corpse.",
     "burn_into": "mon_zaspletosaurus_scorched",
     "fungalize_into": "mon_zaspletosaurus_fungus",
-    "upgrades": { "half_life": 14, "into_group": "GROUP_zaspletosaurus_UPGRADE" },
+    "upgrades": { "half_life": 30, "into_group": "GROUP_zaspletosaurus_UPGRADE" },
     "flags": [ "SEES", "SMELLS", "HEARS", "BASHES", "POISON", "STUMBLES", "NO_BREATHE", "REVIVES", "FILTHY", "WARM" ]
   },
   {
@@ -361,7 +361,7 @@
     "special_attacks": [ [ "scratch", 10 ], [ "GRAB", 7 ], { "type": "bite", "cooldown": 5 } ],
     "burn_into": "mon_zyrannosaurus_scorched",
     "fungalize_into": "mon_zyrannosaurus_fungus",
-    "upgrades": { "half_life": 14, "into_group": "GROUP_zyrannosaurus_UPGRADE" },
+    "upgrades": { "half_life": 30, "into_group": "GROUP_zyrannosaurus_UPGRADE" },
     "flags": [
       "SEES",
       "SMELLS",
@@ -423,7 +423,7 @@
     "description": "The shuffling corpse of a medium-sized bipedal dinosaur, covered with tattered feathers and black, putrid liquid.",
     "burn_into": "mon_zallimimus_scorched",
     "fungalize_into": "mon_zallimimus_fungus",
-    "upgrades": { "half_life": 14, "into_group": "GROUP_zallimimus_UPGRADE" },
+    "upgrades": { "half_life": 30, "into_group": "GROUP_zallimimus_UPGRADE" },
     "flags": [ "SEES", "SMELLS", "HEARS", "PET_MOUNTABLE", "POISON", "STUMBLES", "NO_BREATHE", "REVIVES", "FILTHY", "WARM" ],
     "vision_night": 3,
     "harvest": "zed_dino_feather",
@@ -441,7 +441,7 @@
     "attack_cost": 140,
     "burn_into": "mon_ztruthiomimus_scorched",
     "fungalize_into": "mon_ztruthiomimus_fungus",
-    "upgrades": { "half_life": 14, "into_group": "GROUP_ztruthiomimus_UPGRADE" }
+    "upgrades": { "half_life": 30, "into_group": "GROUP_ztruthiomimus_UPGRADE" }
   },
   {
     "type": "MONSTER",
@@ -455,7 +455,7 @@
     "attack_cost": 125,
     "burn_into": "mon_zornithomimus_scorched",
     "fungalize_into": "mon_zornithomimus_fungus",
-    "upgrades": { "half_life": 14, "into_group": "GROUP_zornithomimus_UPGRADE" },
+    "upgrades": { "half_life": 30, "into_group": "GROUP_zornithomimus_UPGRADE" },
     "extend": { "flags": [ "CLIMBS" ] }
   },
   {
@@ -479,7 +479,7 @@
     "description": "The shuffling corpse of a large-sized bipedal dinosaur covered with tattered feathers and black putrid liquid.  Sharp curved claws protrude from its hands.",
     "burn_into": "mon_zothronychus_scorched",
     "fungalize_into": "mon_zothronychus_fungus",
-    "upgrades": { "half_life": 14, "into_group": "GROUP_zothronychus_UPGRADE" }
+    "upgrades": { "half_life": 30, "into_group": "GROUP_zothronychus_UPGRADE" }
   },
   {
     "type": "MONSTER",
@@ -501,7 +501,7 @@
     "description": "The shuffling corpse of a large bipedal dinosaur covered with tattered feathers and black putrid liquid.  Long claws protrude from its hands.",
     "burn_into": "mon_zanzu_scorched",
     "fungalize_into": "mon_zanzu_fungus",
-    "upgrades": { "half_life": 14, "into_group": "GROUP_zanzu_UPGRADE" }
+    "upgrades": { "half_life": 30, "into_group": "GROUP_zanzu_UPGRADE" }
   },
   {
     "type": "MONSTER",
@@ -539,7 +539,7 @@
     "description": "The shuffling corpse of a medium-sized bipedal dinosaur covered with tattered feathers and black putrid liquid.  Both feet brandish a large sickle-like claw.",
     "burn_into": "mon_zeinonychus_scorched",
     "fungalize_into": "mon_zeinonychus_fungus",
-    "upgrades": { "half_life": 14, "into_group": "GROUP_zeinonychus_UPGRADE" },
+    "upgrades": { "half_life": 30, "into_group": "GROUP_zeinonychus_UPGRADE" },
     "flags": [ "SEES", "SMELLS", "HEARS", "KEENNOSE", "POISON", "STUMBLES", "NO_BREATHE", "REVIVES", "FILTHY", "WARM" ],
     "vision_day": 30,
     "vision_night": 10,
@@ -567,7 +567,7 @@
     "description": "The swaying, hopping corpse of a large bipedal dinosaur with feathered arms, a long tail, and long, sharp scythe-like claws.",
     "burn_into": "mon_zutahraptor_scorched",
     "fungalize_into": "mon_zutahraptor_fungus",
-    "upgrades": { "half_life": 14, "into_group": "GROUP_zutahraptor_UPGRADE" }
+    "upgrades": { "half_life": 30, "into_group": "GROUP_zutahraptor_UPGRADE" }
   },
   {
     "type": "MONSTER",
@@ -589,7 +589,7 @@
     "description": "Large, long-necked, two-legged dinosaur corpse with a long tail.",
     "burn_into": "mon_zissi_scorched",
     "fungalize_into": "mon_zissi_fungus",
-    "upgrades": { "half_life": 14, "into_group": "GROUP_zissi_UPGRADE" },
+    "upgrades": { "half_life": 30, "into_group": "GROUP_zissi_UPGRADE" },
     "special_attacks": [
       [ "scratch", 10 ],
       [ "GRAB", 20 ],
@@ -618,7 +618,7 @@
     "description": "Huge, long-necked, four-legged dinosaur corpse with two parallel rows of tall spines down its neck and back and a whip-like tail.",
     "burn_into": "mon_zamargasaurus_scorched",
     "fungalize_into": "mon_zamargasaurus_fungus",
-    "upgrades": { "half_life": 14, "into_group": "GROUP_zamargasaurus_UPGRADE" },
+    "upgrades": { "half_life": 30, "into_group": "GROUP_zamargasaurus_UPGRADE" },
     "flags": [ "SEES", "SMELLS", "HEARS", "BASHES", "POISON", "STUMBLES", "NO_BREATHE", "REVIVES", "FILTHY", "WARM" ]
   },
   {
@@ -647,7 +647,7 @@
     "description": "A massive, long-necked, four-legged dinosaur corpse with a long, whip-like tail.  The head is still upright and the neck looks like it would still make a good, strong club.",
     "burn_into": "mon_zapatosaurus_scorched",
     "fungalize_into": "mon_zapatosaurus_fungus",
-    "upgrades": { "half_life": 14, "into_group": "GROUP_zapatosaurus_UPGRADE" }
+    "upgrades": { "half_life": 30, "into_group": "GROUP_zapatosaurus_UPGRADE" }
   },
   {
     "type": "MONSTER",
@@ -658,7 +658,7 @@
     "description": "Massive, long-necked, four-legged dinosaur corpse with a bulky torso and a long, whip-like tail.",
     "burn_into": "mon_zrontosaurus_scorched",
     "fungalize_into": "mon_zrontosaurus_fungus",
-    "upgrades": { "half_life": 14, "into_group": "GROUP_zrontosaurus_UPGRADE" }
+    "upgrades": { "half_life": 30, "into_group": "GROUP_zrontosaurus_UPGRADE" }
   },
   {
     "type": "MONSTER",
@@ -684,7 +684,7 @@
     "description": "Huge, long-necked, four-legged dinosaur with a long, whip-like tail and a tiny head with vacant white eyes.  Sways and staggers.",
     "burn_into": "mon_ziplodocus_scorched",
     "fungalize_into": "mon_ziplodocus_fungus",
-    "upgrades": { "half_life": 14, "into_group": "GROUP_ziplodocus_UPGRADE" }
+    "upgrades": { "half_life": 30, "into_group": "GROUP_ziplodocus_UPGRADE" }
   },
   {
     "type": "MONSTER",
@@ -698,7 +698,7 @@
     "description": "Massive, long-necked, four-legged dinosaur corpse with a long, whip-like tail.  The head is still upright and the neck looks like it would still make a good, strong club.",
     "burn_into": "mon_zamarasaurus_scorched",
     "fungalize_into": "mon_zamarasaurus_fungus",
-    "upgrades": { "half_life": 14, "into_group": "GROUP_zamarasaurus_UPGRADE" }
+    "upgrades": { "half_life": 30, "into_group": "GROUP_zamarasaurus_UPGRADE" }
   },
   {
     "type": "MONSTER",
@@ -716,7 +716,7 @@
     "description": "Gigantic, long-necked, four-legged dinosaur corpse with longer forelegs and a whip-like tail.",
     "burn_into": "mon_zrachiosaurus_scorched",
     "fungalize_into": "mon_zrachiosaurus_fungus",
-    "upgrades": { "half_life": 14, "into_group": "GROUP_zrachiosaurus_UPGRADE" }
+    "upgrades": { "half_life": 30, "into_group": "GROUP_zrachiosaurus_UPGRADE" }
   },
   {
     "type": "MONSTER",
@@ -732,7 +732,7 @@
     "description": "Gigantic, long-necked, four-legged dinosaur corpse, protected by natural bone armor and a spiked tail.",
     "burn_into": "mon_zalamosaurus_scorched",
     "fungalize_into": "mon_zalamosaurus_fungus",
-    "upgrades": { "half_life": 14, "into_group": "GROUP_zalamosaurus_UPGRADE" }
+    "upgrades": { "half_life": 30, "into_group": "GROUP_zalamosaurus_UPGRADE" }
   },
   {
     "type": "MONSTER",
@@ -765,7 +765,7 @@
     "description": "A large, shambling quadruped dinosaur corpse, dragging with the weight of the plates on its back - waving a much livelier-looking spiked tail.",
     "burn_into": "mon_ztegosaurus_scorched",
     "fungalize_into": "mon_ztegosaurus_fungus",
-    "upgrades": { "half_life": 14, "into_group": "GROUP_ztegosaurus_UPGRADE" }
+    "upgrades": { "half_life": 30, "into_group": "GROUP_ztegosaurus_UPGRADE" }
   },
   {
     "type": "MONSTER",
@@ -778,7 +778,7 @@
     "description": "This armored dinosaur corpse looks like a giant prehistoric armadillo.  Its tail ends in a spiked club of bone.",
     "burn_into": "mon_zyoplosaurus_scorched",
     "fungalize_into": "mon_zyoplosaurus_fungus",
-    "upgrades": { "half_life": 14, "into_group": "GROUP_zyoplosaurus_UPGRADE" }
+    "upgrades": { "half_life": 30, "into_group": "GROUP_zyoplosaurus_UPGRADE" }
   },
   {
     "type": "MONSTER",
@@ -811,7 +811,7 @@
     "description": "The shuffling corpse of what looks like a giant armadillo with peeling armored plates and black, glistening eyes.  Its tail ends in a massive spiked club of bone.",
     "burn_into": "mon_zankylosaurus_scorched",
     "fungalize_into": "mon_zankylosaurus_fungus",
-    "upgrades": { "half_life": 14, "into_group": "GROUP_zankylosaurus_UPGRADE" },
+    "upgrades": { "half_life": 30, "into_group": "GROUP_zankylosaurus_UPGRADE" },
     "flags": [ "SEES", "SMELLS", "HEARS", "POISON", "STUMBLES", "NO_BREATHE", "REVIVES", "FILTHY", "WARM", "BASHES" ],
     "vision_night": 3,
     "harvest": "zed_dino_leather",
@@ -831,7 +831,7 @@
     "description": "This heavily-armored dinosaur corpse looks like a giant prehistoric armadillo.",
     "burn_into": "mon_zodosaurus_scorched",
     "fungalize_into": "mon_zodosaurus_fungus",
-    "upgrades": { "half_life": 14, "into_group": "GROUP_zodosaurus_UPGRADE" }
+    "upgrades": { "half_life": 30, "into_group": "GROUP_zodosaurus_UPGRADE" }
   },
   {
     "type": "MONSTER",
@@ -848,7 +848,7 @@
     "description": "This heavily-armored dinosaur corpse looks like a giant prehistoric armadillo with long, bony spikes.",
     "burn_into": "mon_zedmontonia_scorched",
     "fungalize_into": "mon_zedmontonia_fungus",
-    "upgrades": { "half_life": 14, "into_group": "GROUP_zedmontonia_UPGRADE" }
+    "upgrades": { "half_life": 30, "into_group": "GROUP_zedmontonia_UPGRADE" }
   },
   {
     "type": "MONSTER",
@@ -881,7 +881,7 @@
     "description": "The shuffling corpse of a large, feathered, bipedal dinosaur with strong legs, broad shoulders, and a pointed beak.  Its tattered feathers are stained with black, sticky liquid.",
     "burn_into": "mon_zamptosaurus_scorched",
     "fungalize_into": "mon_zamptosaurus_fungus",
-    "upgrades": { "half_life": 14, "into_group": "GROUP_zamptosaurus_UPGRADE" },
+    "upgrades": { "half_life": 30, "into_group": "GROUP_zamptosaurus_UPGRADE" },
     "flags": [ "SEES", "SMELLS", "HEARS", "POISON", "STUMBLES", "NO_BREATHE", "REVIVES", "FILTHY", "WARM", "BASHES" ],
     "vision_night": 3,
     "harvest": "zed_dino_leather",
@@ -914,7 +914,7 @@
     "description": "A bulky, beaked dinosaur, dead but walking, eyes vacant and swollen.",
     "burn_into": "mon_zadrosaurus_scorched",
     "fungalize_into": "mon_zadrosaurus_fungus",
-    "upgrades": { "half_life": 14, "into_group": "GROUP_zadrosaurus_UPGRADE" }
+    "upgrades": { "half_life": 30, "into_group": "GROUP_zadrosaurus_UPGRADE" }
   },
   {
     "type": "MONSTER",
@@ -943,7 +943,7 @@
     "description": "A huge, mottled dinosaur with a blunt head crest, dead but walking, eyes vacant and swollen.",
     "burn_into": "mon_zarasaurolophus_scorched",
     "fungalize_into": "mon_zarasaurolophus_fungus",
-    "upgrades": { "half_life": 14, "into_group": "GROUP_zarasaurolophus_UPGRADE" }
+    "upgrades": { "half_life": 30, "into_group": "GROUP_zarasaurolophus_UPGRADE" }
   },
   {
     "type": "MONSTER",
@@ -964,7 +964,7 @@
     "description": "A huge, scaly dinosaur with a short beak and a tall head crest, dead but walking, eyes vacant and swollen.",
     "burn_into": "mon_zorythosaurus_scorched",
     "fungalize_into": "mon_zorythosaurus_fungus",
-    "upgrades": { "half_life": 14, "into_group": "GROUP_zorythosaurus_UPGRADE" },
+    "upgrades": { "half_life": 30, "into_group": "GROUP_zorythosaurus_UPGRADE" },
     "special_attacks": [ [ "SHRIEK", 5 ] ]
   },
   {
@@ -997,7 +997,7 @@
     "description": "A huge, scaly dinosaur with a broad, toothless beak, dead but walking, eyes vacant and swollen.",
     "burn_into": "mon_zedmontosaurus_scorched",
     "fungalize_into": "mon_zedmontosaurus_fungus",
-    "upgrades": { "half_life": 14, "into_group": "GROUP_zedmontosaurus_UPGRADE" }
+    "upgrades": { "half_life": 30, "into_group": "GROUP_zedmontosaurus_UPGRADE" }
   },
   {
     "type": "MONSTER",
@@ -1028,7 +1028,7 @@
     "description": "The shuffling corpse of a medium-sized bipedal dinosaur covered with tattered feathers and black, putrid liquid.  It resembles a reptilian ostrich with a hard-looking domed head.",
     "burn_into": "mon_zachycephalosaurus_scorched",
     "fungalize_into": "mon_zachycephalosaurus_fungus",
-    "upgrades": { "half_life": 14, "into_group": "GROUP_zachycephalosaurus_UPGRADE" },
+    "upgrades": { "half_life": 30, "into_group": "GROUP_zachycephalosaurus_UPGRADE" },
     "flags": [ "SEES", "SMELLS", "HEARS", "PET_MOUNTABLE", "POISON", "STUMBLES", "NO_BREATHE", "REVIVES", "FILTHY", "WARM" ],
     "vision_night": 3,
     "harvest": "zed_dino_feather",
@@ -1055,7 +1055,7 @@
     "description": "A massive, shambling, rhino-like dinosaur corpse with two massive bony bosses on its brow and nose.  Its eyes ooze black, putrid tears.",
     "burn_into": "mon_zachyrhinosaurus_scorched",
     "fungalize_into": "mon_zachyrhinosaurus_fungus",
-    "upgrades": { "half_life": 14, "into_group": "GROUP_zachyrhinosaurus_UPGRADE" },
+    "upgrades": { "half_life": 30, "into_group": "GROUP_zachyrhinosaurus_UPGRADE" },
     "special_attacks": [
       { "id": "slam", "cooldown": 10, "damage_max_instance": [ { "damage_type": "bash", "amount": 12 } ] },
       [ "SMASH", 30 ]
@@ -1072,7 +1072,7 @@
     "description": "A massive, shambling, rhino-like dinosaur corpse with a tall, bony crest from which four long horns and a short nose horn emerge.  Its eyes ooze black, putrid tears.",
     "burn_into": "mon_zentaceratops_scorched",
     "fungalize_into": "mon_zentaceratops_fungus",
-    "upgrades": { "half_life": 14, "into_group": "GROUP_zentaceratops_UPGRADE" }
+    "upgrades": { "half_life": 30, "into_group": "GROUP_zentaceratops_UPGRADE" }
   },
   {
     "type": "MONSTER",
@@ -1094,7 +1094,7 @@
     "description": "A massive, shambling, rhino-like dinosaur corpse with a bony crest and two wavy side horns.  Its eyes ooze black, putrid tears.",
     "burn_into": "mon_zosmoceratops_scorched",
     "fungalize_into": "mon_zosmoceratops_fungus",
-    "upgrades": { "half_life": 14, "into_group": "GROUP_zosmoceratops_UPGRADE" },
+    "upgrades": { "half_life": 30, "into_group": "GROUP_zosmoceratops_UPGRADE" },
     "special_attacks": [ { "id": "impale" }, [ "stretch_horn_DinoMod", 7 ] ],
     "flags": [ "SEES", "SMELLS", "HEARS", "BASHES", "POISON", "STUMBLES", "NO_BREATHE", "REVIVES", "FILTHY", "WARM" ]
   },
@@ -1108,7 +1108,7 @@
     "description": "A massive, shambling, rhino-like dinosaur corpse with a tall, bony crest from which two wicked-looking horns emerge.  Its eyes ooze black, putrid tears.",
     "burn_into": "mon_zorosaurus_scorched",
     "fungalize_into": "mon_zorosaurus_fungus",
-    "upgrades": { "half_life": 14, "into_group": "GROUP_zorosaurus_UPGRADE" },
+    "upgrades": { "half_life": 30, "into_group": "GROUP_zorosaurus_UPGRADE" },
     "special_attacks": [ { "id": "impale" }, [ "stretch_horn_DinoMod", 5 ] ]
   },
   {
@@ -1135,7 +1135,7 @@
     "description": "A massive, shambling, rhino-like dinosaur corpse with a bony crest from which three wicked-looking horns emerge.  Its eyes ooze black, putrid tears.",
     "burn_into": "mon_zriceratops_scorched",
     "fungalize_into": "mon_zriceratops_fungus",
-    "upgrades": { "half_life": 14, "into_group": "GROUP_zriceratops_UPGRADE" },
+    "upgrades": { "half_life": 30, "into_group": "GROUP_zriceratops_UPGRADE" },
     "special_attacks": [
       { "id": "impale" },
       { "id": "stomp_DinoMod", "cooldown": 10, "damage_max_instance": [ { "damage_type": "bash", "amount": 12 } ] }
@@ -1165,7 +1165,7 @@
     "description": "A shambling, two-legged dinosaur corpse with strong arms and a toothy beak.  Its eyes ooze black, putrid tears.",
     "burn_into": "mon_zescelosaurus_scorched",
     "fungalize_into": "mon_zescelosaurus_fungus",
-    "upgrades": { "half_life": 14, "into_group": "GROUP_zescelosaurus_UPGRADE" }
+    "upgrades": { "half_life": 30, "into_group": "GROUP_zescelosaurus_UPGRADE" }
   },
   {
     "type": "MONSTER",
@@ -1197,7 +1197,7 @@
     "description": "The ragged but flying corpse of a large, feathered reptile with a long, pointy, toothless beak and a long, pointy head crest.",
     "burn_into": "mon_zteranodon_scorched",
     "fungalize_into": "mon_zteranodon_fungus",
-    "upgrades": { "half_life": 14, "into": "mon_zteranodon_brute" },
+    "upgrades": { "half_life": 30, "into": "mon_zteranodon_brute" },
     "flags": [
       "SEES",
       "SMELLS",
@@ -1279,7 +1279,7 @@
     "looks_like": "mon_issi",
     "burn_into": "mon_zissi_scorched",
     "fungalize_into": "mon_zissi_fungus",
-    "upgrades": { "half_life": 14, "into": "mon_zissi" },
+    "upgrades": { "half_life": 30, "into": "mon_zissi" },
     "volume": "500 L",
     "weight": "500 kg",
     "bodytype": "ostrich",
@@ -1295,7 +1295,7 @@
     "looks_like": "mon_apatosaurus",
     "burn_into": "mon_zamargasaurus_scorched",
     "fungalize_into": "mon_zamargasaurus_fungus",
-    "upgrades": { "half_life": 14, "into": "mon_zamargasaurus" }
+    "upgrades": { "half_life": 30, "into": "mon_zamargasaurus" }
   },
   {
     "type": "MONSTER",
@@ -1331,7 +1331,7 @@
     "description": "A small, four-legged, herbivorous dinosaur juvenile's corpse that could be from a number of different species.",
     "burn_into": "mon_zapatosaurus_scorched",
     "fungalize_into": "mon_zapatosaurus_fungus",
-    "upgrades": { "half_life": 14, "into": "mon_zapatosaurus" },
+    "upgrades": { "half_life": 30, "into": "mon_zapatosaurus" },
     "flags": [ "SEES", "SMELLS", "HEARS", "POISON", "STUMBLES", "NO_BREATHE", "REVIVES", "FILTHY", "WARM", "BASHES" ],
     "vision_night": 3,
     "harvest": "zed_dino_leather",
@@ -1345,7 +1345,7 @@
     "looks_like": "mon_apatosaurus",
     "burn_into": "mon_zrontosaurus_scorched",
     "fungalize_into": "mon_zrontosaurus_fungus",
-    "upgrades": { "half_life": 14, "into": "mon_zrontosaurus" }
+    "upgrades": { "half_life": 30, "into": "mon_zrontosaurus" }
   },
   {
     "type": "MONSTER",
@@ -1355,7 +1355,7 @@
     "looks_like": "mon_apatosaurus",
     "burn_into": "mon_ziplodocus_scorched",
     "fungalize_into": "mon_ziplodocus_fungus",
-    "upgrades": { "half_life": 14, "into": "mon_ziplodocus" }
+    "upgrades": { "half_life": 30, "into": "mon_ziplodocus" }
   },
   {
     "type": "MONSTER",
@@ -1365,7 +1365,7 @@
     "looks_like": "mon_apatosaurus",
     "burn_into": "mon_zamarasaurus_scorched",
     "fungalize_into": "mon_zamarasaurus_fungus",
-    "upgrades": { "half_life": 14, "into": "mon_zamarasaurus" }
+    "upgrades": { "half_life": 30, "into": "mon_zamarasaurus" }
   },
   {
     "type": "MONSTER",
@@ -1380,7 +1380,7 @@
     "armor_bullet": 3,
     "burn_into": "mon_zrachiosaurus_scorched",
     "fungalize_into": "mon_zrachiosaurus_fungus",
-    "upgrades": { "half_life": 14, "into": "mon_zrachiosaurus" }
+    "upgrades": { "half_life": 30, "into": "mon_zrachiosaurus" }
   },
   {
     "type": "MONSTER",
@@ -1393,6 +1393,6 @@
     "description": "The corpse of a small, four-legged, herbivorous dinosaur juvenile, with cracked bone armor plates.",
     "burn_into": "mon_zalamosaurus_scorched",
     "fungalize_into": "mon_zalamosaurus_fungus",
-    "upgrades": { "half_life": 14, "into": "mon_zalamosaurus" }
+    "upgrades": { "half_life": 30, "into": "mon_zalamosaurus" }
   }
 ]
diff --git a/data/mods/DinoMod/monsters/zinosaur_upgrade.json b/data/mods/DinoMod/monsters/zinosaur_upgrade.json
index 1001321d00a73..5ad177ee11b8e 100644
--- a/data/mods/DinoMod/monsters/zinosaur_upgrade.json
+++ b/data/mods/DinoMod/monsters/zinosaur_upgrade.json
@@ -115,7 +115,7 @@
       "vision_night": 1
     },
     "bleed_rate": 50,
-    "upgrades": { "half_life": 21, "into_group": "GROUP_zallosaurus_BRUTE" },
+    "upgrades": { "half_life": 42, "into_group": "GROUP_zallosaurus_BRUTE" },
     "special_attacks": [ [ "SMASH", 30 ] ],
     "extend": { "flags": [ "GROUP_BASH", "PUSH_MON", "PUSH_VEH" ] },
     "categories": [ "DINOSAUR" ]
@@ -139,7 +139,7 @@
       "vision_night": 1
     },
     "bleed_rate": 50,
-    "upgrades": { "half_life": 21, "into_group": "GROUP_zallosaurus_BRUTE" },
+    "upgrades": { "half_life": 42, "into_group": "GROUP_zallosaurus_BRUTE" },
     "special_attacks": [ [ "SMASH", 30 ] ],
     "extend": { "flags": [ "GROUP_BASH", "PUSH_MON", "PUSH_VEH" ] },
     "categories": [ "DINOSAUR" ]
@@ -163,7 +163,7 @@
       "vision_night": 1
     },
     "bleed_rate": 50,
-    "upgrades": { "half_life": 21, "into_group": "GROUP_zallosaurus_BRUTE" },
+    "upgrades": { "half_life": 42, "into_group": "GROUP_zallosaurus_BRUTE" },
     "special_attacks": [ [ "SMASH", 30 ] ],
     "extend": { "flags": [ "GROUP_BASH", "PUSH_MON", "PUSH_VEH" ] },
     "categories": [ "DINOSAUR" ]
@@ -188,7 +188,7 @@
       "vision_night": 1
     },
     "bleed_rate": 50,
-    "upgrades": { "half_life": 21, "into_group": "GROUP_zyrannosaurus_BRUTE" },
+    "upgrades": { "half_life": 42, "into_group": "GROUP_zyrannosaurus_BRUTE" },
     "special_attacks": [ [ "SMASH", 30 ], [ "GRAB", 7 ] ],
     "extend": { "flags": [ "GROUP_BASH", "PUSH_MON", "PUSH_VEH" ] },
     "categories": [ "DINOSAUR" ]
@@ -213,7 +213,7 @@
       "vision_night": 1
     },
     "bleed_rate": 50,
-    "upgrades": { "half_life": 21, "into_group": "GROUP_zyrannosaurus_BRUTE" },
+    "upgrades": { "half_life": 42, "into_group": "GROUP_zyrannosaurus_BRUTE" },
     "special_attacks": [ [ "SMASH", 30 ], [ "GRAB", 7 ] ],
     "extend": { "flags": [ "GROUP_BASH", "PUSH_MON", "PUSH_VEH" ] },
     "categories": [ "DINOSAUR" ]
@@ -238,7 +238,7 @@
       "vision_night": 1
     },
     "bleed_rate": 50,
-    "upgrades": { "half_life": 21, "into_group": "GROUP_zyrannosaurus_BRUTE" },
+    "upgrades": { "half_life": 42, "into_group": "GROUP_zyrannosaurus_BRUTE" },
     "special_attacks": [ [ "SMASH", 30 ], [ "GRAB", 7 ] ],
     "extend": { "flags": [ "GROUP_BASH", "PUSH_MON", "PUSH_VEH" ] },
     "categories": [ "DINOSAUR" ]
@@ -263,7 +263,7 @@
       "vision_night": 1
     },
     "bleed_rate": 50,
-    "upgrades": { "half_life": 21, "into_group": "GROUP_zyrannosaurus_BRUTE" },
+    "upgrades": { "half_life": 42, "into_group": "GROUP_zyrannosaurus_BRUTE" },
     "special_attacks": [ [ "SMASH", 30 ], [ "GRAB", 7 ] ],
     "extend": { "flags": [ "GROUP_BASH", "PUSH_MON", "PUSH_VEH" ] },
     "categories": [ "DINOSAUR" ]
@@ -288,7 +288,7 @@
       "vision_night": 1
     },
     "bleed_rate": 50,
-    "upgrades": { "half_life": 21, "into_group": "GROUP_zyrannosaurus_BRUTE" },
+    "upgrades": { "half_life": 42, "into_group": "GROUP_zyrannosaurus_BRUTE" },
     "special_attacks": [ [ "SMASH", 30 ], [ "GRAB", 7 ] ],
     "extend": { "flags": [ "GROUP_BASH", "PUSH_MON", "PUSH_VEH" ] },
     "categories": [ "DINOSAUR" ]
@@ -311,7 +311,7 @@
       "vision_night": 1
     },
     "bleed_rate": 50,
-    "upgrades": { "half_life": 21, "into_group": "GROUP_zyrannosaurus_BRUTE" },
+    "upgrades": { "half_life": 42, "into_group": "GROUP_zyrannosaurus_BRUTE" },
     "special_attacks": [ [ "SMASH", 30 ], [ "GRAB", 7 ] ],
     "extend": { "flags": [ "GROUP_BASH", "PUSH_MON", "PUSH_VEH" ] },
     "categories": [ "DINOSAUR" ]
@@ -336,7 +336,7 @@
       "vision_night": 1
     },
     "bleed_rate": 50,
-    "upgrades": { "half_life": 21, "into_group": "GROUP_zyrannosaurus_BRUTE" },
+    "upgrades": { "half_life": 42, "into_group": "GROUP_zyrannosaurus_BRUTE" },
     "special_attacks": [ [ "SMASH", 30 ], [ "GRAB", 7 ] ],
     "extend": { "flags": [ "GROUP_BASH", "PUSH_MON", "PUSH_VEH" ] },
     "categories": [ "DINOSAUR" ]
@@ -361,7 +361,7 @@
       "vision_night": 1
     },
     "bleed_rate": 50,
-    "upgrades": { "half_life": 21, "into_group": "GROUP_zyrannosaurus_BRUTE" },
+    "upgrades": { "half_life": 42, "into_group": "GROUP_zyrannosaurus_BRUTE" },
     "special_attacks": [ [ "SMASH", 30 ] ],
     "extend": { "flags": [ "GROUP_BASH", "PUSH_MON", "PUSH_VEH" ] },
     "categories": [ "DINOSAUR" ]
@@ -606,7 +606,7 @@
       "vision_night": 1
     },
     "bleed_rate": 50,
-    "upgrades": { "half_life": 21, "into_group": "GROUP_zapatosaurus_BRUTE" },
+    "upgrades": { "half_life": 42, "into_group": "GROUP_zapatosaurus_BRUTE" },
     "special_attacks": [ [ "SMASH", 30 ] ],
     "extend": { "flags": [ "GROUP_BASH", "PUSH_MON", "PUSH_VEH" ] },
     "categories": [ "DINOSAUR" ]
@@ -630,7 +630,7 @@
       "vision_night": 1
     },
     "bleed_rate": 50,
-    "upgrades": { "half_life": 21, "into_group": "GROUP_zapatosaurus_BRUTE" },
+    "upgrades": { "half_life": 42, "into_group": "GROUP_zapatosaurus_BRUTE" },
     "special_attacks": [ [ "SMASH", 30 ] ],
     "extend": { "flags": [ "GROUP_BASH", "PUSH_MON", "PUSH_VEH" ] },
     "categories": [ "DINOSAUR" ]
@@ -654,7 +654,7 @@
       "vision_night": 1
     },
     "bleed_rate": 50,
-    "upgrades": { "half_life": 21, "into_group": "GROUP_zapatosaurus_BRUTE" },
+    "upgrades": { "half_life": 42, "into_group": "GROUP_zapatosaurus_BRUTE" },
     "special_attacks": [ [ "SMASH", 30 ] ],
     "extend": { "flags": [ "GROUP_BASH", "PUSH_MON", "PUSH_VEH" ] },
     "categories": [ "DINOSAUR" ]
@@ -678,7 +678,7 @@
       "vision_night": 1
     },
     "bleed_rate": 50,
-    "upgrades": { "half_life": 21, "into_group": "GROUP_zapatosaurus_BRUTE" },
+    "upgrades": { "half_life": 42, "into_group": "GROUP_zapatosaurus_BRUTE" },
     "special_attacks": [ [ "SMASH", 30 ] ],
     "extend": { "flags": [ "GROUP_BASH", "PUSH_MON", "PUSH_VEH" ] },
     "categories": [ "DINOSAUR" ]
@@ -702,7 +702,7 @@
       "vision_night": 1
     },
     "bleed_rate": 50,
-    "upgrades": { "half_life": 21, "into_group": "GROUP_zapatosaurus_BRUTE" },
+    "upgrades": { "half_life": 42, "into_group": "GROUP_zapatosaurus_BRUTE" },
     "special_attacks": [ [ "SMASH", 30 ] ],
     "extend": { "flags": [ "GROUP_BASH", "PUSH_MON", "PUSH_VEH" ] },
     "categories": [ "DINOSAUR" ]
@@ -750,7 +750,7 @@
       "vision_night": 1
     },
     "bleed_rate": 50,
-    "upgrades": { "half_life": 21, "into_group": "GROUP_zankylosaurus_BRUTE" },
+    "upgrades": { "half_life": 42, "into_group": "GROUP_zankylosaurus_BRUTE" },
     "special_attacks": [ [ "SMASH", 30 ] ],
     "extend": { "flags": [ "GROUP_BASH", "PUSH_MON", "PUSH_VEH" ] },
     "categories": [ "DINOSAUR" ]
@@ -774,7 +774,7 @@
       "vision_night": 1
     },
     "bleed_rate": 50,
-    "upgrades": { "half_life": 21, "into_group": "GROUP_zankylosaurus_BRUTE" },
+    "upgrades": { "half_life": 42, "into_group": "GROUP_zankylosaurus_BRUTE" },
     "special_attacks": [ [ "SMASH", 30 ] ],
     "extend": { "flags": [ "GROUP_BASH", "PUSH_MON", "PUSH_VEH" ] },
     "categories": [ "DINOSAUR" ]
@@ -798,7 +798,7 @@
       "vision_night": 1
     },
     "bleed_rate": 50,
-    "upgrades": { "half_life": 21, "into_group": "GROUP_zankylosaurus_BRUTE" },
+    "upgrades": { "half_life": 42, "into_group": "GROUP_zankylosaurus_BRUTE" },
     "special_attacks": [ [ "SMASH", 30 ] ],
     "extend": { "flags": [ "GROUP_BASH", "PUSH_MON", "PUSH_VEH" ] },
     "categories": [ "DINOSAUR" ]
@@ -822,7 +822,7 @@
       "vision_night": 1
     },
     "bleed_rate": 50,
-    "upgrades": { "half_life": 21, "into_group": "GROUP_zankylosaurus_BRUTE" },
+    "upgrades": { "half_life": 42, "into_group": "GROUP_zankylosaurus_BRUTE" },
     "special_attacks": [ [ "SMASH", 30 ] ],
     "extend": { "flags": [ "GROUP_BASH", "PUSH_MON", "PUSH_VEH" ] },
     "categories": [ "DINOSAUR" ]
@@ -1014,7 +1014,7 @@
       "vision_night": 1
     },
     "bleed_rate": 50,
-    "upgrades": { "half_life": 21, "into_group": "GROUP_zriceratops_BRUTE" },
+    "upgrades": { "half_life": 42, "into_group": "GROUP_zriceratops_BRUTE" },
     "special_attacks": [ [ "SMASH", 30 ] ],
     "extend": { "flags": [ "GROUP_BASH", "PUSH_MON", "PUSH_VEH" ] },
     "categories": [ "DINOSAUR" ]
@@ -1038,7 +1038,7 @@
       "vision_night": 1
     },
     "bleed_rate": 50,
-    "upgrades": { "half_life": 21, "into_group": "GROUP_zriceratops_BRUTE" },
+    "upgrades": { "half_life": 42, "into_group": "GROUP_zriceratops_BRUTE" },
     "special_attacks": [ [ "SMASH", 30 ] ],
     "extend": { "flags": [ "GROUP_BASH", "PUSH_MON", "PUSH_VEH" ] },
     "categories": [ "DINOSAUR" ]
@@ -1062,7 +1062,7 @@
       "vision_night": 1
     },
     "bleed_rate": 50,
-    "upgrades": { "half_life": 21, "into_group": "GROUP_zriceratops_BRUTE" },
+    "upgrades": { "half_life": 42, "into_group": "GROUP_zriceratops_BRUTE" },
     "special_attacks": [ [ "SMASH", 30 ] ],
     "extend": { "flags": [ "GROUP_BASH", "PUSH_MON", "PUSH_VEH" ] },
     "categories": [ "DINOSAUR" ]
@@ -1086,7 +1086,7 @@
       "vision_night": 1
     },
     "bleed_rate": 50,
-    "upgrades": { "half_life": 21, "into_group": "GROUP_zriceratops_BRUTE" },
+    "upgrades": { "half_life": 42, "into_group": "GROUP_zriceratops_BRUTE" },
     "special_attacks": [ [ "SMASH", 30 ] ],
     "extend": { "flags": [ "GROUP_BASH", "PUSH_MON", "PUSH_VEH" ] },
     "categories": [ "DINOSAUR" ]
@@ -1110,7 +1110,7 @@
       "vision_night": 1
     },
     "bleed_rate": 50,
-    "upgrades": { "half_life": 21, "into_group": "GROUP_zriceratops_BRUTE" },
+    "upgrades": { "half_life": 42, "into_group": "GROUP_zriceratops_BRUTE" },
     "special_attacks": [ [ "SMASH", 30 ] ],
     "extend": { "flags": [ "GROUP_BASH", "PUSH_MON", "PUSH_VEH" ] },
     "categories": [ "DINOSAUR" ]
diff --git a/data/mods/TEST_DATA/known_bad_density.json b/data/mods/TEST_DATA/known_bad_density.json
index dbf81594c11d9..b9c22f64d7ed5 100644
--- a/data/mods/TEST_DATA/known_bad_density.json
+++ b/data/mods/TEST_DATA/known_bad_density.json
@@ -25,7 +25,6 @@
       "brew_sake_koji",
       "artifact_slow_aura",
       "coffee_raw",
-      "egg_roach",
       "v_rockwheel_item",
       "art_knot",
       "glassblowing_book",
@@ -46,7 +45,6 @@
       "AID_bio_flashlight",
       "loom_frame",
       "raw_curing_fatty_meat",
-      "egg_bird",
       "art_napkin",
       "light_minus_battery_cell",
       "shot_beanbag",
@@ -86,7 +84,6 @@
       "cuvettes",
       "mp3_on",
       "mutant_cracklins",
-      "egg_pheasant",
       "venom_wasp",
       "art_sphere",
       "id_science",
@@ -101,7 +98,6 @@
       "awl_bone",
       "beer",
       "chem_hexamine",
-      "egg_raven",
       "sandwich_sauce_wheat_free",
       "mutant_human_flesh",
       "adobe_pallet_full",
@@ -145,13 +141,10 @@
       "dynamite",
       "bot_lab_security_drone_GR",
       "parkour_practice",
-      "egg_centipede",
       "flatbread_wheat_free",
-      "egg_roach_plague",
       "butchery_rack_pseudo",
       "birchbark",
       "material_zincite",
-      "egg_mantis",
       "small_lcd_screen",
       "corpse_child_calm",
       "biscuit",
@@ -182,7 +175,6 @@
       "wasp_sting",
       "corpse_generic_girl",
       "pipe_tobacco",
-      "egg_grouse",
       "carbon_electrode",
       "hotdogs_cooked",
       "candy",
@@ -194,7 +186,6 @@
       "broken_lab_security_drone_BM2",
       "bot_lab_security_drone_BS",
       "book_anthology_sst",
-      "egg_dragonfly",
       "protein_drink",
       "badge_cybercop",
       "id_science_maintenance_yellow",
@@ -272,7 +263,6 @@
       "motorcycle_headlight",
       "altered_rubicks_cube",
       "hi_q_shatter",
-      "egg_mole_cricket",
       "meal_bone",
       "corpse_generic_gunned",
       "bellywrap_leather",
@@ -284,7 +274,6 @@
       "can_peach",
       "bowling_pin",
       "fake_firestarter",
-      "egg_stag_beetle",
       "rehydration_drink",
       "bee_sting",
       "test_cracklins",
@@ -336,7 +325,6 @@
       "chem_chloroform",
       "soaked_dandelion",
       "coffee_syrup",
-      "egg_strider",
       "bot_lab_security_drone_GM",
       "fertilizer_liquid",
       "neccowafers",
@@ -453,7 +441,6 @@
       "arrow_fire_hardened_fletched",
       "mutant_human_cooked",
       "plastic_fork",
-      "egg_lady_bug",
       "brew_whiskey",
       "human_meat_scrap",
       "manual_bashing",
@@ -473,7 +460,6 @@
       "joint_roach",
       "sandwich_deluxe_wheat_free",
       "base_toiletries",
-      "egg_locust",
       "glass_tinted",
       "stomach_sealed",
       "sake_koji_rice",
@@ -489,7 +475,6 @@
       "tourniquet_upper_XS",
       "disinfectant_makeshift",
       "choco_coffee_beans",
-      "boiled_egg",
       "sourdough_young_uncovered",
       "fishing_rod_basic",
       "mre_dessert",
@@ -596,7 +581,6 @@
       "art_spiral",
       "conc_paralytic",
       "soft_adobe_brick",
-      "spider_egg",
       "radio_car",
       "seed_sugar_beet",
       "manual_stabbing",
@@ -626,7 +610,6 @@
       "fake_drop_hammer",
       "fake_oven",
       "fetid_goop",
-      "egg_bird_unfert",
       "tinder",
       "rehydrated_meat",
       "art_teardrop",
@@ -653,7 +636,6 @@
       "textbook_arthropod",
       "vitamins",
       "chem_match_head_powder",
-      "egg_salad",
       "wood_panel",
       "unfinished_charcoal",
       "con_milk",
@@ -682,7 +664,6 @@
       "cheeseburger",
       "k_gambeson_vest_xs_loose",
       "tramadol",
-      "egg_firefly",
       "helmet_eod",
       "car_wide_headlight",
       "hc_steel_lump",
@@ -702,8 +683,6 @@
       "integrated_chitin3",
       "pointy_stick_long",
       "chem_phenol",
-      "ant_egg",
-      "egg_wasp",
       "empty_corn_cob",
       "combination_gun_shotgun",
       "mask_dust",
@@ -816,7 +795,6 @@
       "test_bullwhip",
       "amplifier_head",
       "sarcophagus_access_code",
-      "egg_goose_canadian",
       "mutant_blood",
       "8mm_fmj",
       "chestnut",
@@ -835,7 +813,6 @@
       "toothbrush_plain",
       "solar_panel",
       "homemade_burrito",
-      "egg_cockatrice",
       "bot_lab_security_drone_BM",
       "dog_whistle",
       "training_dummy_light",
@@ -914,7 +891,6 @@
       "migo_bio_tech",
       "material_cement",
       "textbook_toxicology",
-      "egg_chicken",
       "gasdiscount_platinum",
       "meat_fatty_cooked",
       "mutant_bug_organs",
@@ -943,7 +919,6 @@
       "brew_mycus_wine",
       "integrated_chitin2",
       "chicory_coffee",
-      "pickled_egg",
       "AID_bio_power_armor_interface",
       "juice_pulp",
       "peanutbutter",
@@ -965,7 +940,6 @@
       "seasoning_italian",
       "crossbow",
       "qt_steel_lump",
-      "egg_antlion",
       "corpse_generic_male",
       "5llead",
       "cookies",
@@ -1005,7 +979,6 @@
       "XL_holster",
       "xs_tacvest",
       "bat",
-      "egg_grasshopper",
       "xl_gambeson_hood",
       "corpse_child_gunned",
       "plastic_spoon_kids",
@@ -1075,7 +1048,6 @@
       "mortar_adobe",
       "chilidogs_wheat_free",
       "deviled_kidney",
-      "egg_lady_bug_giant",
       "v_plow_item",
       "cinnamon",
       "meat_mutant_tainted_smoked",
@@ -1117,7 +1089,6 @@
       "techno_basic",
       "sledge_heavy_plus_one",
       "wizard_advanced",
-      "egg_owlbear",
       "summon_scroll_smudged",
       "wolfshead_cufflinks",
       "magic_armormaking",
diff --git a/data/mods/TropiCataclysm/items/comestibles/biosignatures.json b/data/mods/TropiCataclysm/items/comestibles/biosignatures.json
deleted file mode 100644
index 81d1ac3cdf732..0000000000000
--- a/data/mods/TropiCataclysm/items/comestibles/biosignatures.json
+++ /dev/null
@@ -1,23 +0,0 @@
-[
-  {
-    "type": "COMESTIBLE",
-    "id": "insect_dust",
-    "name": { "str_sp": "chitin dust" },
-    "category": "chems",
-    "weight": "40 g",
-    "color": "white",
-    "comestible_type": "FOOD",
-    "symbol": "%",
-    "quench": -3,
-    "healthy": -10,
-    "calories": 26,
-    "description": "The dust left over by winged insects such as butterflies or moths.  It's mostly chitin but may also contain dirt and other gross materials.",
-    "price": 0,
-    "price_postapoc": 0,
-    "material": [ "feces" ],
-    "volume": "250 ml",
-    "charges": 4,
-    "stack_size": 4,
-    "fun": -25
-  }
-]
diff --git a/data/mods/TropiCataclysm/items/comestibles/egg.json b/data/mods/TropiCataclysm/items/comestibles/egg.json
index cd59ef1fa2839..23398f0c16c05 100644
--- a/data/mods/TropiCataclysm/items/comestibles/egg.json
+++ b/data/mods/TropiCataclysm/items/comestibles/egg.json
@@ -7,28 +7,6 @@
     "rot_spawn": "GROUP_EGG_GUINEA_FOWL",
     "rot_spawn_chance": 70
   },
-  {
-    "type": "COMESTIBLE",
-    "id": "egg_goose",
-    "name": "goose egg",
-    "copy-from": "egg_guinea_fowl",
-    "calories": 266,
-    "volume": "125 ml",
-    "weight": "144 g",
-    "vitamins": [ [ "calcium", 9 ], [ "iron", 29 ] ],
-    "rot_spawn": "GROUP_EGG_GOOSE"
-  },
-  {
-    "type": "COMESTIBLE",
-    "id": "egg_goose_golden",
-    "name": "golden goose egg",
-    "copy-from": "egg_goose",
-    "calories": 300,
-    "volume": "125 ml",
-    "weight": "144 g",
-    "vitamins": [ [ "calcium", 9 ], [ "iron", 29 ] ],
-    "rot_spawn": "GROUP_EGG_GOOSE"
-  },
   {
     "type": "COMESTIBLE",
     "id": "egg_quail",
@@ -46,22 +24,6 @@
     "calories": 1000,
     "rot_spawn": "GROUP_EGG_RHEA"
   },
-  {
-    "type": "COMESTIBLE",
-    "id": "egg_hummingbird",
-    "name": "hummingbird egg",
-    "copy-from": "egg_bird",
-    "rot_spawn": "GROUP_EGG_HUMMINGBIRD",
-    "rot_spawn_chance": 70
-  },
-  {
-    "type": "COMESTIBLE",
-    "id": "egg_woodpecker",
-    "name": "woodpecker egg",
-    "copy-from": "egg_bird",
-    "rot_spawn": "GROUP_EGG_WOODPECKER",
-    "rot_spawn_chance": 70
-  },
   {
     "type": "COMESTIBLE",
     "id": "egg_toucan",
@@ -150,48 +112,6 @@
     "rot_spawn": "GROUP_EGG_FLAMINGO",
     "rot_spawn_chance": 70
   },
-  {
-    "type": "COMESTIBLE",
-    "id": "egg_coot",
-    "name": "coot egg",
-    "copy-from": "egg_bird",
-    "rot_spawn": "GROUP_EGG_COOT",
-    "rot_spawn_chance": 70
-  },
-  {
-    "type": "COMESTIBLE",
-    "id": "egg_cormorant",
-    "name": "cormorant egg",
-    "copy-from": "egg_bird",
-    "rot_spawn": "GROUP_EGG_CORMORANT",
-    "rot_spawn_chance": 70
-  },
-  {
-    "type": "COMESTIBLE",
-    "id": "egg_moorhen",
-    "name": "moorhen egg",
-    "copy-from": "egg_bird",
-    "rot_spawn": "GROUP_EGG_MOORHEN",
-    "rot_spawn_chance": 70
-  },
-  {
-    "type": "COMESTIBLE",
-    "id": "egg_grebe",
-    "name": "grebe egg",
-    "copy-from": "egg_bird",
-    "rot_spawn": "GROUP_EGG_GREBE",
-    "rot_spawn_chance": 70
-  },
-  {
-    "type": "COMESTIBLE",
-    "id": "egg_toad",
-    "name": { "str": "cluster of toad's eggs", "str_pl": "clusters of toad's eggs" },
-    "copy-from": "egg_chicken",
-    "weight": "20 g",
-    "volume": "650 ml",
-    "description": "A large clump of the eggs of a toad.  The eggs themselves are gelatinous and transparent.",
-    "rot_spawn": "GROUP_EGG_TOAD"
-  },
   {
     "type": "COMESTIBLE",
     "id": "egg_constrictor",
@@ -224,22 +144,6 @@
     "description": "The egg of an iguana.",
     "rot_spawn": "GROUP_EGG_IGUANA"
   },
-  {
-    "type": "COMESTIBLE",
-    "id": "egg_water_beetle",
-    "name": "water beetle egg",
-    "copy-from": "egg_strider",
-    "description": "The egg of a water beetle, usually found near aquatic grass.",
-    "rot_spawn": "GROUP_EGG_WATER_BEETLE"
-  },
-  {
-    "type": "COMESTIBLE",
-    "id": "egg_water_bug",
-    "name": "water scorpion egg",
-    "copy-from": "egg_strider",
-    "description": "The egg of a water scorpion, usually found near aquatic grass.",
-    "rot_spawn": "GROUP_EGG_WATER_BUG"
-  },
   {
     "type": "COMESTIBLE",
     "id": "egg_turtle",
@@ -272,22 +176,6 @@
     "description": "The small translucent egg of a termite.  It will grow quickly into a nymph if allowed.",
     "rot_spawn": "GROUP_EGG_TERMITE"
   },
-  {
-    "type": "COMESTIBLE",
-    "id": "egg_butterfly",
-    "name": "butterfly egg",
-    "copy-from": "egg_insect",
-    "description": "The egg of a butterfly.  They are usually found clustered on leaves.",
-    "rot_spawn": "GROUP_EGG_BUTTERFLY"
-  },
-  {
-    "type": "COMESTIBLE",
-    "id": "egg_cicada",
-    "name": "cicada egg",
-    "copy-from": "egg_insect",
-    "description": "The egg of a cicada.  They are usually found near trees.",
-    "rot_spawn": "GROUP_EGG_CICADA"
-  },
   {
     "type": "COMESTIBLE",
     "id": "triffid_pod",
diff --git a/data/mods/TropiCataclysm/monstergroups/eggs.json b/data/mods/TropiCataclysm/monstergroups/eggs.json
index 6aa7aa2535e79..65d35b916642e 100644
--- a/data/mods/TropiCataclysm/monstergroups/eggs.json
+++ b/data/mods/TropiCataclysm/monstergroups/eggs.json
@@ -6,9 +6,7 @@
     "monsters": [
       { "monster": "mon_guinea_fowl_chick", "freq": 50, "cost_multiplier": 1 },
       { "monster": "mon_quail_chick", "freq": 100, "cost_multiplier": 1 },
-      { "monster": "mon_rhea_chick", "freq": 250, "cost_multiplier": 1 },
-      { "monster": "mon_goose_chick", "freq": 100, "cost_multiplier": 1 },
-      { "monster": "mon_goose_golden_chick", "freq": 100, "cost_multiplier": 1 }
+      { "monster": "mon_rhea_chick", "freq": 250, "cost_multiplier": 1 }
     ]
   },
   {
@@ -17,18 +15,6 @@
     "default": "mon_guinea_fowl_chick",
     "monsters": [ { "monster": "mon_guinea_fowl_chick", "freq": 100, "cost_multiplier": 1 } ]
   },
-  {
-    "name": "GROUP_EGG_GOOSE",
-    "type": "monstergroup",
-    "default": "mon_goose_chick",
-    "monsters": [ { "monster": "mon_goose_chick", "freq": 100, "cost_multiplier": 1 } ]
-  },
-  {
-    "name": "GROUP_EGG_GOOSE_GOLD",
-    "type": "monstergroup",
-    "default": "mon_goose_golden_chick",
-    "monsters": [ { "monster": "mon_goose_golden_chick", "freq": 100, "cost_multiplier": 1 } ]
-  },
   {
     "name": "GROUP_EGG_QUAIL",
     "type": "monstergroup",
@@ -41,18 +27,6 @@
     "default": "mon_rhea_chick",
     "monsters": [ { "monster": "mon_rhea_chick", "freq": 100, "cost_multiplier": 1 } ]
   },
-  {
-    "name": "GROUP_EGG_HUMMINGBIRD",
-    "type": "monstergroup",
-    "default": "mon_hummingbird_chick",
-    "monsters": [ { "monster": "mon_hummingbird_chick", "freq": 100, "cost_multiplier": 1 } ]
-  },
-  {
-    "name": "GROUP_EGG_WOODPECKER",
-    "type": "monstergroup",
-    "default": "mon_woodpecker_chick",
-    "monsters": [ { "monster": "mon_woodpecker_chick", "freq": 100, "cost_multiplier": 1 } ]
-  },
   {
     "name": "GROUP_EGG_TOUCAN",
     "type": "monstergroup",
@@ -119,36 +93,6 @@
     "default": "mon_flamingo_chick",
     "monsters": [ { "monster": "mon_flamingo_chick", "freq": 100, "cost_multiplier": 1 } ]
   },
-  {
-    "name": "GROUP_EGG_COOT",
-    "type": "monstergroup",
-    "default": "mon_coot_chick",
-    "monsters": [ { "monster": "mon_coot_chick", "freq": 100, "cost_multiplier": 1 } ]
-  },
-  {
-    "name": "GROUP_EGG_CORMORANT",
-    "type": "monstergroup",
-    "default": "mon_cormorant_chick",
-    "monsters": [ { "monster": "mon_cormorant_chick", "freq": 100, "cost_multiplier": 1 } ]
-  },
-  {
-    "name": "GROUP_EGG_MOORHEN",
-    "type": "monstergroup",
-    "default": "mon_moorhen_chick",
-    "monsters": [ { "monster": "mon_moorhen_chick", "freq": 100, "cost_multiplier": 1 } ]
-  },
-  {
-    "name": "GROUP_EGG_GREBE",
-    "type": "monstergroup",
-    "default": "mon_grebe_chick",
-    "monsters": [ { "monster": "mon_grebe_chick", "freq": 100, "cost_multiplier": 1 } ]
-  },
-  {
-    "name": "GROUP_EGG_TOAD",
-    "type": "monstergroup",
-    "default": "mon_tadpole_brown",
-    "monsters": [ { "monster": "mon_tadpole_brown", "freq": 100, "cost_multiplier": 1 } ]
-  },
   {
     "name": "GROUP_EGG_CONSTRICTOR",
     "type": "monstergroup",
@@ -176,18 +120,6 @@
     "default": "mon_iguana",
     "monsters": [ { "monster": "mon_iguana", "freq": 100, "cost_multiplier": 1 } ]
   },
-  {
-    "name": "GROUP_EGG_WATER_BEETLE",
-    "type": "monstergroup",
-    "default": "mon_diving_larva",
-    "monsters": [ { "monster": "mon_diving_larva", "freq": 100, "cost_multiplier": 1 } ]
-  },
-  {
-    "name": "GROUP_EGG_WATER_BUG",
-    "type": "monstergroup",
-    "default": "mon_water_scorpion_larva",
-    "monsters": [ { "monster": "mon_water_scorpion_larva", "freq": 100, "cost_multiplier": 1 } ]
-  },
   {
     "name": "GROUP_EGG_TURTLE",
     "type": "monstergroup",
@@ -212,21 +144,6 @@
     "default": "mon_termite_nymph",
     "monsters": [ { "monster": "mon_termite_nymph", "freq": 100, "cost_multiplier": 1 } ]
   },
-  {
-    "name": "GROUP_EGG_CICADA",
-    "type": "monstergroup",
-    "default": "mon_cicada_nymph",
-    "monsters": [ { "monster": "mon_cicada_nymph", "freq": 100, "cost_multiplier": 1 } ]
-  },
-  {
-    "name": "GROUP_EGG_BUTTERFLY",
-    "type": "monstergroup",
-    "default": "mon_caterpillar",
-    "monsters": [
-      { "monster": "mon_caterpillar_giant", "freq": 25, "cost_multiplier": 1 },
-      { "monster": "mon_caterpillar", "freq": 100, "cost_multiplier": 1 }
-    ]
-  },
   {
     "name": "GROUP_EGG_TRIFFID",
     "type": "monstergroup",
diff --git a/data/mods/TropiCataclysm/monstergroups/misc.json b/data/mods/TropiCataclysm/monstergroups/misc.json
index a8a5270b05b8e..30aa0a601d38a 100644
--- a/data/mods/TropiCataclysm/monstergroups/misc.json
+++ b/data/mods/TropiCataclysm/monstergroups/misc.json
@@ -6,15 +6,10 @@
     "is_animal": true,
     "monsters": [
       { "monster": "mon_guinea_fowl", "weight": 50, "cost_multiplier": 10, "pack_size": [ 1, 12 ] },
-      { "monster": "mon_goose", "weight": 10, "cost_multiplier": 25, "pack_size": [ 1, 6 ] },
       { "monster": "mon_llama", "weight": 50, "cost_multiplier": 25, "pack_size": [ 1, 8 ] },
       { "monster": "mon_camel", "weight": 50, "cost_multiplier": 25, "pack_size": [ 1, 4 ] },
       { "monster": "mon_guinea_pig", "weight": 10, "cost_multiplier": 25, "pack_size": [ 1, 6 ] },
-      { "monster": "mon_turkey", "weight": 10, "cost_multiplier": 25, "pack_size": [ 1, 6 ] },
-      { "monster": "mon_duck", "weight": 50, "cost_multiplier": 10, "pack_size": [ 1, 12 ] },
-      { "monster": "mon_quail", "weight": 50, "cost_multiplier": 10, "pack_size": [ 1, 16 ] },
-      { "monster": "mon_woodlouse", "weight": 10, "pack_size": [ 1, 5 ] },
-      { "monster": "mon_woodlouse_manca", "weight": 5 }
+      { "monster": "mon_quail", "weight": 50, "cost_multiplier": 10, "pack_size": [ 1, 16 ] }
     ]
   },
   {
@@ -25,34 +20,13 @@
     "monsters": [
       { "monster": "mon_tapir", "weight": 10 },
       { "monster": "mon_capybara", "weight": 10 },
-      { "monster": "mon_goose", "weight": 10 },
-      { "monster": "mon_goose_golden", "weight": 1 },
       { "monster": "mon_guinea_pig", "weight": 10 },
       { "monster": "mon_bushdog", "weight": 10 },
       { "monster": "mon_guinea_fowl", "weight": 10 },
       { "monster": "mon_quail", "weight": 10 },
       { "monster": "mon_camel", "weight": 10 },
-      { "monster": "mon_llama", "weight": 10 },
       { "monster": "mon_boa", "weight": 10 },
-      { "monster": "mon_anaconda", "weight": 10 },
-      { "monster": "mon_woodlouse", "weight": 10 },
-      { "monster": "mon_cicada_nymph", "weight": 10 }
-    ]
-  },
-  {
-    "type": "monstergroup",
-    "name": "GROUP_PEST",
-    "is_animal": true,
-    "monsters": [ { "monster": "mon_woodlouse", "weight": 30, "pack_size": [ 4, 8 ] } ]
-  },
-  {
-    "type": "monstergroup",
-    "name": "GROUP_SEWER",
-    "//": "Freqs sum to 555 since there's no way to define spawn chance for map extras",
-    "monsters": [
-      { "monster": "mon_toad", "weight": 100, "cost_multiplier": 0 },
-      { "monster": "mon_toad_small", "weight": 100, "cost_multiplier": 0 },
-      { "monster": "mon_gastro_bufo", "weight": 5, "cost_multiplier": 3, "starts": "15 days" }
+      { "monster": "mon_anaconda", "weight": 10 }
     ]
   },
   {
@@ -62,8 +36,7 @@
     "default": "mon_spider_cellar_giant",
     "monsters": [
       { "monster": "mon_onicophore", "weight": 180, "ends": "180 hours" },
-      { "monster": "mon_onicophore_giant", "weight": 180, "starts": "180 hours" },
-      { "monster": "mon_woodlouse", "weight": 300, "pack_size": [ 1, 3 ] }
+      { "monster": "mon_onicophore_giant", "weight": 180, "starts": "180 hours" }
     ]
   }
 ]
diff --git a/data/mods/TropiCataclysm/monstergroups/tropical_bugs.json b/data/mods/TropiCataclysm/monstergroups/tropical_bugs.json
index fc53a21563220..4ebbcd2694501 100644
--- a/data/mods/TropiCataclysm/monstergroups/tropical_bugs.json
+++ b/data/mods/TropiCataclysm/monstergroups/tropical_bugs.json
@@ -24,23 +24,6 @@
       { "monster": "mon_termite_worker", "weight": 852, "cost_multiplier": 0 }
     ]
   },
-  {
-    "type": "monstergroup",
-    "name": "GROUP_BUTTERFLY",
-    "default": "mon_butterfly",
-    "monsters": [ { "monster": "mon_butterfly", "weight": 50 }, { "monster": "mon_moth", "weight": 50 } ]
-  },
-  {
-    "type": "monstergroup",
-    "name": "GROUP_BUTTERFLY_GIANT",
-    "default": "mon_butterfly_giant",
-    "monsters": [
-      { "monster": "mon_butterfly_giant", "weight": 45 },
-      { "monster": "mon_butterfly_titan", "weight": 5, "cost_multiplier": 2 },
-      { "monster": "mon_moth_giant", "weight": 45 },
-      { "monster": "mon_moth_titan", "weight": 5, "cost_multiplier": 2 }
-    ]
-  },
   {
     "type": "monstergroup",
     "name": "GROUP_TERMITE_ALATE",
diff --git a/data/mods/TropiCataclysm/monstergroups/wilderness.json b/data/mods/TropiCataclysm/monstergroups/wilderness.json
index 52bd14b42c68c..23b089a9f279f 100644
--- a/data/mods/TropiCataclysm/monstergroups/wilderness.json
+++ b/data/mods/TropiCataclysm/monstergroups/wilderness.json
@@ -8,7 +8,6 @@
       { "monster": "mon_jaguar", "weight": 100, "cost_multiplier": 20, "pack_size": [ 1, 2 ] },
       { "monster": "mon_bear_andean", "weight": 100, "cost_multiplier": 10, "pack_size": [ 1, 3 ] },
       { "monster": "mon_large_scorpion", "weight": 60, "cost_multiplier": 3, "pack_size": [ 2, 4 ] },
-      { "monster": "mon_woodlouse", "weight": 60, "cost_multiplier": 3, "pack_size": [ 2, 4 ] },
       { "monster": "mon_scorpion_giant", "weight": 40, "cost_multiplier": 5, "pack_size": [ 1, 2 ], "starts": 240 }
     ]
   },
@@ -32,13 +31,8 @@
       { "monster": "mon_jaguar", "weight": 1, "cost_multiplier": 3 },
       { "monster": "mon_jaguar", "weight": 2, "cost_multiplier": 3, "conditions": [ "DAWN", "DUSK" ] },
       { "monster": "mon_peccari", "weight": 15, "cost_multiplier": 2, "pack_size": [ 1, 4 ] },
-      { "monster": "mon_caterpillar", "weight": 3, "cost_multiplier": 0 },
-      { "monster": "mon_woodlouse", "weight": 3, "cost_multiplier": 0 },
-      { "monster": "mon_caterpillar_giant", "weight": 2, "cost_multiplier": 0 },
       { "monster": "mon_large_scorpion", "weight": 2, "cost_multiplier": 0 },
       { "monster": "mon_onicophore", "weight": 2, "cost_multiplier": 0, "conditions": [ "DAWN", "DUSK" ] },
-      { "monster": "mon_butterfly", "weight": 2, "cost_multiplier": 0 },
-      { "monster": "mon_moth", "weight": 2, "cost_multiplier": 0, "conditions": [ "DAWN", "DUSK" ] },
       { "monster": "mon_scorpion_giant", "weight": 1, "cost_multiplier": 3, "starts": "240 hours" },
       {
         "monster": "mon_onicophore_giant",
@@ -47,23 +41,6 @@
         "starts": "240 hours",
         "conditions": [ "DAWN", "DUSK" ]
       },
-      { "monster": "mon_butterfly_giant", "weight": 1, "cost_multiplier": 3, "starts": "240 hours" },
-      { "monster": "mon_butterfly_titan", "weight": 1, "cost_multiplier": 3, "starts": "480 hours" },
-      {
-        "monster": "mon_moth_giant",
-        "weight": 1,
-        "cost_multiplier": 3,
-        "conditions": [ "DAWN", "DUSK" ],
-        "starts": "240 hours"
-      },
-      {
-        "monster": "mon_moth_titan",
-        "weight": 1,
-        "cost_multiplier": 3,
-        "conditions": [ "DAWN", "DUSK" ],
-        "starts": "480 hours"
-      },
-      { "monster": "mon_cicada", "weight": 1, "cost_multiplier": 3, "starts": "240 hours" },
       { "monster": "mon_bushelephant", "weight": 1, "cost_multiplier": 3 },
       { "monster": "mon_hippo", "weight": 1, "cost_multiplier": 3 },
       { "monster": "mon_guinea_pig", "weight": 12, "cost_multiplier": 2, "pack_size": [ 1, 6 ] },
@@ -78,23 +55,8 @@
       { "monster": "mon_monitor_lizard", "weight": 15, "cost_multiplier": 10 },
       { "monster": "mon_boa", "weight": 15, "cost_multiplier": 10 },
       { "monster": "mon_anaconda", "weight": 15, "cost_multiplier": 10 },
-      { "monster": "mon_toad", "weight": 5, "cost_multiplier": 10, "pack_size": [ 1, 3 ] },
       { "monster": "mon_tortoise_small", "weight": 3, "pack_size": [ 1, 3 ], "starts": "240 hours" },
       { "monster": "mon_tortoise_giant", "weight": 3, "pack_size": [ 1, 3 ], "starts": "480 hours" },
-      {
-        "monster": "mon_hummingbird",
-        "weight": 5,
-        "cost_multiplier": 0,
-        "pack_size": [ 1, 3 ],
-        "conditions": [ "DAWN", "DUSK", "DAY" ]
-      },
-      {
-        "monster": "mon_woodpecker",
-        "weight": 5,
-        "cost_multiplier": 0,
-        "pack_size": [ 1, 3 ],
-        "conditions": [ "DAWN", "DUSK", "DAY" ]
-      },
       { "monster": "mon_parrot", "weight": 5, "cost_multiplier": 0, "pack_size": [ 1, 14 ] },
       { "monster": "mon_budgerigar", "weight": 5, "cost_multiplier": 0, "pack_size": [ 1, 14 ] },
       { "monster": "mon_toucan", "weight": 2, "cost_multiplier": 0, "pack_size": [ 1, 10 ] },
@@ -115,12 +77,7 @@
     "monsters": [
       { "monster": "mon_coypus", "weight": 15, "cost_multiplier": 10, "pack_size": [ 1, 3 ] },
       { "monster": "mon_turtle", "weight": 15, "cost_multiplier": 10, "pack_size": [ 1, 3 ] },
-      { "monster": "mon_goose", "weight": 15, "cost_multiplier": 5, "pack_size": [ 1, 4 ] },
       { "monster": "mon_flamingo", "weight": 15, "cost_multiplier": 5, "pack_size": [ 1, 4 ] },
-      { "monster": "mon_coot", "weight": 15, "cost_multiplier": 5, "pack_size": [ 1, 6 ] },
-      { "monster": "mon_moorhen", "weight": 15, "cost_multiplier": 5, "pack_size": [ 1, 6 ] },
-      { "monster": "mon_cormorant", "weight": 15, "cost_multiplier": 5, "pack_size": [ 1, 4 ] },
-      { "monster": "mon_grebe", "weight": 15, "cost_multiplier": 5, "pack_size": [ 1, 4 ] },
       { "monster": "mon_capybara", "weight": 15, "cost_multiplier": 5, "pack_size": [ 1, 4 ] },
       { "monster": "mon_goose_golden", "weight": 5, "cost_multiplier": 5 },
       { "monster": "mon_caiman", "weight": 10, "cost_multiplier": 5 },
@@ -130,17 +87,6 @@
       { "monster": "mon_hippo", "weight": 5, "cost_multiplier": 10, "pack_size": [ 1, 3 ] },
       { "monster": "mon_tadpole_small", "weight": 5, "cost_multiplier": 10, "starts": "168 hours" },
       { "monster": "mon_axolotl_giant", "weight": 5, "cost_multiplier": 10, "starts": "168 hours" },
-      { "monster": "mon_toad", "weight": 5, "cost_multiplier": 10, "pack_size": [ 1, 3 ] },
-      { "monster": "mon_diving_larva", "weight": 10, "cost_multiplier": 2, "ends": "7 days" },
-      { "monster": "mon_diving_larva", "weight": 30, "cost_multiplier": 3, "starts": "7 days", "pack_size": [ 1, 3 ] },
-      { "monster": "mon_water_scorpion_larva", "weight": 10, "cost_multiplier": 2, "ends": "7 days" },
-      {
-        "monster": "mon_water_scorpion_larva",
-        "weight": 30,
-        "cost_multiplier": 3,
-        "starts": "7 days",
-        "pack_size": [ 1, 3 ]
-      },
       {
         "monster": "mon_tadpole_small",
         "weight": 30,
@@ -148,8 +94,6 @@
         "starts": "7 days",
         "pack_size": [ 1, 3 ]
       },
-      { "monster": "mon_diving_beetle_small", "weight": 4, "cost_multiplier": 10 },
-      { "monster": "mon_water_scorpion", "weight": 4, "cost_multiplier": 10 },
       { "monster": "mon_shark", "weight": 3, "cost_multiplier": 15 },
       { "monster": "mon_shark_pup", "weight": 6, "cost_multiplier": 3, "pack_size": [ 1, 3 ] },
       { "monster": "mon_fish_lungfish", "weight": 6, "cost_multiplier": 3, "pack_size": [ 1, 3 ] },
@@ -185,69 +129,7 @@
       { "monster": "mon_anaconda", "weight": 50, "cost_multiplier": 2 },
       { "monster": "mon_caiman", "weight": 50, "cost_multiplier": 2 },
       { "monster": "mon_turtle", "weight": 60, "cost_multiplier": 2 },
-      {
-        "monster": "mon_toad",
-        "weight": 30,
-        "cost_multiplier": 2,
-        "ends": 24,
-        "conditions": [ "SPRING", "SUMMER", "AUTUMN" ]
-      },
-      {
-        "monster": "mon_toad",
-        "weight": 35,
-        "cost_multiplier": 2,
-        "starts": 24,
-        "ends": 95,
-        "conditions": [ "SPRING", "SUMMER", "AUTUMN" ]
-      },
-      {
-        "monster": "mon_toad",
-        "weight": 40,
-        "cost_multiplier": 2,
-        "starts": 95,
-        "ends": 180,
-        "conditions": [ "SPRING", "SUMMER", "AUTUMN" ]
-      },
-      {
-        "monster": "mon_toad_small",
-        "weight": 20,
-        "cost_multiplier": 2,
-        "ends": "84 hours",
-        "conditions": [ "SPRING", "SUMMER", "AUTUMN" ]
-      },
-      {
-        "monster": "mon_toad_small",
-        "weight": 25,
-        "cost_multiplier": 2,
-        "starts": "84 hours",
-        "ends": "180 hours",
-        "conditions": [ "SPRING", "SUMMER", "AUTUMN" ]
-      },
-      {
-        "monster": "mon_toad_small",
-        "weight": 30,
-        "cost_multiplier": 2,
-        "starts": "180 hours",
-        "ends": "15 days",
-        "conditions": [ "SPRING", "SUMMER", "AUTUMN" ]
-      },
-      {
-        "monster": "mon_toad_giant",
-        "weight": 30,
-        "cost_multiplier": 2,
-        "starts": "15 days",
-        "ends": "540 hours",
-        "conditions": [ "SPRING", "SUMMER", "AUTUMN" ]
-      },
-      {
-        "monster": "mon_toad_giant",
-        "weight": 40,
-        "cost_multiplier": 2,
-        "starts": "540 hours",
-        "conditions": [ "SPRING", "SUMMER", "AUTUMN" ]
-      },
       { "monster": "mon_capybara", "weight": 60, "cost_multiplier": 2, "pack_size": [ 1, 3 ] },
-      { "monster": "mon_toad", "weight": 20, "cost_multiplier": 2, "pack_size": [ 1, 3 ] },
       { "monster": "mon_fish_crab", "weight": 10, "conditions": [ "SPRING", "SUMMER", "AUTUMN" ] },
       { "monster": "mon_fish_pancora", "weight": 10, "conditions": [ "SPRING", "SUMMER", "AUTUMN" ] }
     ]
@@ -258,8 +140,6 @@
     "//": "Current SPRING first DAY count is 425.  Note that 'freq' units are tenth of a percent, with default filling in the gap.",
     "is_animal": true,
     "monsters": [
-      { "monster": "mon_hummingbird", "weight": 25, "cost_multiplier": 0 },
-      { "monster": "mon_woodpecker", "weight": 25, "cost_multiplier": 0 },
       { "monster": "mon_budgerigar", "weight": 35, "cost_multiplier": 0 },
       { "monster": "mon_parrot", "weight": 25, "cost_multiplier": 0 },
       { "monster": "mon_cockatoo", "weight": 25, "cost_multiplier": 0 },
@@ -275,7 +155,6 @@
       { "monster": "mon_budgerigar", "weight": 45, "cost_multiplier": 0 },
       { "monster": "mon_parrot", "weight": 25, "cost_multiplier": 0 },
       { "monster": "mon_cockatoo", "weight": 25, "cost_multiplier": 0 },
-      { "monster": "mon_woodpecker", "weight": 25, "cost_multiplier": 0 },
       { "monster": "mon_guinea_fowl", "weight": 10, "cost_multiplier": 0 },
       { "monster": "mon_macaw", "weight": 10, "cost_multiplier": 0 },
       {
@@ -297,9 +176,7 @@
       { "monster": "mon_turtle", "weight": 50, "cost_multiplier": 0, "pack_size": [ 1, 3 ] },
       { "monster": "mon_capybara", "weight": 50, "cost_multiplier": 0, "pack_size": [ 1, 3 ] },
       { "monster": "mon_caiman", "weight": 40, "cost_multiplier": 0 },
-      { "monster": "mon_anaconda", "weight": 40, "cost_multiplier": 0 },
-      { "monster": "mon_toad", "weight": 50, "cost_multiplier": 0 },
-      { "monster": "mon_water_scorpion_larva", "weight": 30, "cost_multiplier": 0 }
+      { "monster": "mon_anaconda", "weight": 40, "cost_multiplier": 0 }
     ]
   },
   {
@@ -307,15 +184,7 @@
     "name": "GROUP_POND_BIRD",
     "default": "mon_null",
     "is_animal": true,
-    "monsters": [
-      { "monster": "mon_goose", "weight": 50, "cost_multiplier": 0 },
-      { "monster": "mon_flamingo", "weight": 50, "cost_multiplier": 0 },
-      { "monster": "mon_coot", "weight": 50, "cost_multiplier": 0 },
-      { "monster": "mon_moorhen", "weight": 50, "cost_multiplier": 0 },
-      { "monster": "mon_cormorant", "weight": 50, "cost_multiplier": 0 },
-      { "monster": "mon_grebe", "weight": 50, "cost_multiplier": 0 },
-      { "monster": "mon_goose_golden", "weight": 10, "cost_multiplier": 0 }
-    ]
+    "monsters": [ { "monster": "mon_flamingo", "weight": 50, "cost_multiplier": 0 } ]
   },
   {
     "type": "monstergroup",
@@ -323,8 +192,6 @@
     "//": "Current count is 225.  Note that 'freq' units are tenth of a percent, with default filling in the gap.",
     "is_animal": true,
     "monsters": [
-      { "monster": "mon_hummingbird", "weight": 50, "cost_multiplier": 0 },
-      { "monster": "mon_woodpecker", "weight": 50, "cost_multiplier": 0 },
       { "monster": "mon_parrot", "weight": 35, "cost_multiplier": 0 },
       { "monster": "mon_cockatoo", "weight": 35, "cost_multiplier": 0 },
       { "monster": "mon_budgerigar", "weight": 50, "cost_multiplier": 0 }
diff --git a/data/mods/TropiCataclysm/monsters/tropical_bird.json b/data/mods/TropiCataclysm/monsters/tropical_bird.json
index 6d3f580836239..0d0f0272810f2 100644
--- a/data/mods/TropiCataclysm/monsters/tropical_bird.json
+++ b/data/mods/TropiCataclysm/monsters/tropical_bird.json
@@ -1,46 +1,4 @@
 [
-  {
-    "id": "mon_goose",
-    "type": "MONSTER",
-    "copy-from": "mon_duck",
-    "name": { "str": "goose", "str_pl": "geese" },
-    "description": "The domestic goose.  A waterfowl well known for its loud honking and aggressive behavior.",
-    "volume": "5 L",
-    "weight": "3750 g",
-    "hp": 15,
-    "looks_like": "mon_goose_canadian",
-    "aggression": 1,
-    "morale": 15,
-    "dodge": 3,
-    "melee_damage": [ { "damage_type": "cut", "amount": 2 } ],
-    "fear_triggers": [ "FRIEND_ATTACKED", "FRIEND_DIED", "FIRE", "HURT" ],
-    "anger_triggers": [ "PLAYER_CLOSE" ],
-    "reproduction": { "baby_egg": "egg_goose", "baby_count": 5, "baby_timer": 10 },
-    "biosignature": { "biosig_item": "feces_bird", "biosig_timer": 4 },
-    "petfood": {
-      "food": [ "BIRDFOOD" ],
-      "feed": "The %s seems to like you!  It runs around your legs and seems friendly.",
-      "pet": "The %s runs around your leg."
-    },
-    "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM" ]
-  },
-  {
-    "id": "mon_goose_golden",
-    "type": "MONSTER",
-    "copy-from": "mon_goose",
-    "name": { "str": "regal honker" },
-    "description": "This strange colored goose seems larger than the rest.  Even more strange is its docile demeanor.",
-    "volume": "8 L",
-    "weight": "4000 g",
-    "hp": 25,
-    "symbol": "g",
-    "color": "yellow",
-    "aggression": 0,
-    "morale": 30,
-    "dodge": 3,
-    "melee_damage": [ { "damage_type": "cut", "amount": 2 } ],
-    "reproduction": { "baby_egg": "egg_goose_golden", "baby_count": 1, "baby_timer": 10 }
-  },
   {
     "id": "mon_rhea",
     "type": "MONSTER",
@@ -163,76 +121,6 @@
     "name": { "str": "brown chick" },
     "upgrades": { "age_grow": 18, "into": "mon_rhea" }
   },
-  {
-    "id": "mon_goose_chick",
-    "type": "MONSTER",
-    "copy-from": "mon_duck_chick",
-    "upgrades": { "age_grow": 16, "into": "mon_goose" }
-  },
-  {
-    "id": "mon_goose_golden_chick",
-    "type": "MONSTER",
-    "copy-from": "mon_goose_chick",
-    "upgrades": { "age_grow": 16, "into": "mon_goose_golden" }
-  },
-  {
-    "id": "mon_hummingbird",
-    "type": "MONSTER",
-    "name": { "str": "hummingbird" },
-    "description": "A very small bird of varied colored feathers depending on species.  It flies at incredible speeds while seeking nectar among flowers.",
-    "bodytype": "bird",
-    "default_faction": "small_animal",
-    "categories": [ "WILDLIFE" ],
-    "species": [ "BIRD" ],
-    "volume": "150 ml",
-    "weight": "18 g",
-    "hp": 3,
-    "speed": 160,
-    "material": [ "flesh" ],
-    "symbol": "v",
-    "color": "brown",
-    "aggression": -99,
-    "morale": -8,
-    "melee_dice": 1,
-    "melee_dice_sides": 1,
-    "melee_damage": [ { "damage_type": "cut", "amount": 0 } ],
-    "dodge": 4,
-    "harvest": "bird_tiny",
-    "fear_triggers": [ "SOUND", "PLAYER_CLOSE", "FRIEND_ATTACKED", "FRIEND_DIED", "FIRE", "HURT" ],
-    "reproduction": { "baby_egg": "egg_hummingbird", "baby_count": 5, "baby_timer": 14 },
-    "baby_flags": [ "SPRING" ],
-    "biosignature": { "biosig_item": "feces_bird", "biosig_timer": 8 },
-    "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM", "FLIES" ]
-  },
-  {
-    "id": "mon_woodpecker",
-    "type": "MONSTER",
-    "name": { "str": "woodpecker" },
-    "description": "A small bird with woody colors and a colored crest on its head.  These birds are well known for their ability to poke holes on trees while looking for grubs.",
-    "bodytype": "bird",
-    "default_faction": "small_animal",
-    "categories": [ "WILDLIFE" ],
-    "species": [ "BIRD" ],
-    "volume": "400 ml",
-    "weight": "400 g",
-    "hp": 10,
-    "speed": 140,
-    "material": [ "flesh" ],
-    "symbol": "v",
-    "color": "brown",
-    "aggression": -99,
-    "morale": -8,
-    "melee_dice": 1,
-    "melee_dice_sides": 1,
-    "melee_damage": [ { "damage_type": "cut", "amount": 0 } ],
-    "dodge": 4,
-    "harvest": "bird_small",
-    "fear_triggers": [ "SOUND", "PLAYER_CLOSE", "FRIEND_ATTACKED", "FRIEND_DIED", "FIRE", "HURT" ],
-    "reproduction": { "baby_egg": "egg_woodpecker", "baby_count": 5, "baby_timer": 14 },
-    "baby_flags": [ "SPRING" ],
-    "biosignature": { "biosig_item": "feces_bird", "biosig_timer": 8 },
-    "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM", "FLIES" ]
-  },
   {
     "id": "mon_toucan",
     "type": "MONSTER",
@@ -398,24 +286,6 @@
     },
     "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM", "FLIES", "SWARMS", "CANPLAY" ]
   },
-  {
-    "id": "mon_hummingbird_chick",
-    "type": "MONSTER",
-    "copy-from": "mon_crow_chick",
-    "name": { "str": "brown chick" },
-    "volume": "80 ml",
-    "weight": "7 g",
-    "upgrades": { "age_grow": 11, "into": "mon_hummingbird" }
-  },
-  {
-    "id": "mon_woodpecker_chick",
-    "type": "MONSTER",
-    "copy-from": "mon_crow_chick",
-    "name": { "str": "brown chick" },
-    "volume": "200 ml",
-    "weight": "15 g",
-    "upgrades": { "age_grow": 11, "into": "mon_woodpecker" }
-  },
   {
     "id": "mon_toucan_chick",
     "type": "MONSTER",
@@ -620,80 +490,6 @@
     "biosignature": { "biosig_item": "feces_bird", "biosig_timer": 8 },
     "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM", "FLIES", "SWARMS" ]
   },
-  {
-    "id": "mon_coot",
-    "type": "MONSTER",
-    "name": { "str": "coot" },
-    "description": "A bird belonging to the Rallidae family.  They can be found worldwide on freshwater habitats, including many islands in the not so distant past.",
-    "default_faction": "small_animal",
-    "bodytype": "bird",
-    "categories": [ "WILDLIFE" ],
-    "species": [ "BIRD" ],
-    "volume": "800 ml",
-    "weight": "800 g",
-    "hp": 5,
-    "speed": 110,
-    "material": [ "flesh" ],
-    "symbol": "v",
-    "color": "brown",
-    "aggression": -99,
-    "morale": -8,
-    "melee_dice": 1,
-    "melee_dice_sides": 1,
-    "melee_damage": [ { "damage_type": "cut", "amount": 0 } ],
-    "dodge": 4,
-    "harvest": "bird_small",
-    "fear_triggers": [ "SOUND", "PLAYER_CLOSE", "FRIEND_ATTACKED", "FRIEND_DIED", "FIRE", "HURT" ],
-    "reproduction": { "baby_egg": "egg_coot", "baby_count": 3, "baby_timer": 5 },
-    "baby_flags": [ "SPRING" ],
-    "biosignature": { "biosig_item": "feces_bird", "biosig_timer": 5 },
-    "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM", "FLIES", "SWARMS" ]
-  },
-  {
-    "id": "mon_cormorant",
-    "type": "MONSTER",
-    "copy-from": "mon_coot",
-    "name": { "str": "cormorant" },
-    "description": "An aquatic bird with a long snake-like neck.  They are considered coastal birds but many species can also be found on freshwater habitats.",
-    "volume": "340 ml",
-    "weight": "340 g",
-    "hp": 5,
-    "speed": 110,
-    "color": "brown",
-    "reproduction": { "baby_egg": "egg_cormorant", "baby_count": 2, "baby_timer": 6 },
-    "baby_flags": [ "SPRING", "SUMMER" ],
-    "biosignature": { "biosig_item": "feces_bird", "biosig_timer": 8 }
-  },
-  {
-    "id": "mon_moorhen",
-    "type": "MONSTER",
-    "copy-from": "mon_coot",
-    "name": { "str": "moorhen" },
-    "description": "A bird belonging to the Rallidae family.  They are relatives of the coots but have a distinctive red coloration on their heads and brownish plumage.",
-    "volume": "400 ml",
-    "weight": "400 g",
-    "hp": 5,
-    "speed": 110,
-    "color": "brown",
-    "reproduction": { "baby_egg": "egg_moorhen", "baby_count": 2, "baby_timer": 6 },
-    "baby_flags": [ "SPRING", "SUMMER" ],
-    "biosignature": { "biosig_item": "feces_bird", "biosig_timer": 8 }
-  },
-  {
-    "id": "mon_grebe",
-    "type": "MONSTER",
-    "copy-from": "mon_coot",
-    "name": { "str": "grebe" },
-    "description": "A medium sized aquatic bird with a long neck.  These birds can be distinguished by their strange leg placement which makes them great at diving.",
-    "volume": "500 ml",
-    "weight": "500 g",
-    "hp": 5,
-    "speed": 110,
-    "color": "brown",
-    "reproduction": { "baby_egg": "egg_grebe", "baby_count": 2, "baby_timer": 6 },
-    "baby_flags": [ "SPRING", "SUMMER" ],
-    "biosignature": { "biosig_item": "feces_bird", "biosig_timer": 8 }
-  },
   {
     "id": "mon_flamingo_chick",
     "type": "MONSTER",
@@ -704,33 +500,5 @@
     "weight": "280 g",
     "color": "light_gray",
     "upgrades": { "age_grow": 16, "into": "mon_flamingo" }
-  },
-  {
-    "id": "mon_coot_chick",
-    "type": "MONSTER",
-    "copy-from": "mon_duck_chick",
-    "name": { "str": "brown chick" },
-    "upgrades": { "age_grow": 14, "into": "mon_coot" }
-  },
-  {
-    "id": "mon_cormorant_chick",
-    "type": "MONSTER",
-    "copy-from": "mon_duck_chick",
-    "name": { "str": "brown chick" },
-    "upgrades": { "age_grow": 14, "into": "mon_cormorant" }
-  },
-  {
-    "id": "mon_moorhen_chick",
-    "type": "MONSTER",
-    "copy-from": "mon_duck_chick",
-    "name": { "str": "brown chick" },
-    "upgrades": { "age_grow": 14, "into": "mon_moorhen" }
-  },
-  {
-    "id": "mon_grebe_chick",
-    "type": "MONSTER",
-    "copy-from": "mon_duck_chick",
-    "name": { "str": "brown chick" },
-    "upgrades": { "age_grow": 14, "into": "mon_grebe" }
   }
 ]
diff --git a/data/mods/TropiCataclysm/monsters/tropical_insect_spider.json b/data/mods/TropiCataclysm/monsters/tropical_insect_spider.json
index 11d8fc7692688..40b22c8898c2b 100644
--- a/data/mods/TropiCataclysm/monsters/tropical_insect_spider.json
+++ b/data/mods/TropiCataclysm/monsters/tropical_insect_spider.json
@@ -41,159 +41,6 @@
     "fungalize_into": "mon_scorpion_fungus",
     "flags": [ "SEES", "SMELLS", "HEARS", "BADVENOM", "PARALYZEVENOM", "GRABS" ]
   },
-  {
-    "id": "mon_butterfly",
-    "type": "MONSTER",
-    "name": { "str": "mutated butterfly", "str_pl": "mutated butterflies" },
-    "description": "An oversized butterfly with vibrant colored markings.  Unlike the other big insects of the Cataclysm this is a very peaceful nectivore.",
-    "bodytype": "flying insect",
-    "species": [ "INSECT_FLYING" ],
-    "default_faction": "insect",
-    "material": [ "iflesh" ],
-    "symbol": "l",
-    "color": "white",
-    "volume": "15 L",
-    "weight": "20 kg",
-    "hp": 25,
-    "speed": 95,
-    "vision_day": 15,
-    "dodge": 2,
-    "harvest": "arachnid_firefly",
-    "reproduction": { "baby_egg": "egg_butterfly", "baby_count": 1, "baby_timer": 15 },
-    "upgrades": { "half_life": 14, "into": "mon_butterfly_giant" },
-    "baby_flags": [ "SPRING", "SUMMER" ],
-    "fear_triggers": [ "HURT", "FIRE" ],
-    "flags": [ "SEES", "HEARS", "FLIES", "STUMBLES" ]
-  },
-  {
-    "id": "mon_butterfly_giant",
-    "type": "MONSTER",
-    "name": { "str": "giant butterfly", "str_pl": "giant butterflies" },
-    "description": "A mutated butterfly larger than a human.  Despite its size it is very lightweight and feeds mainly on the nectar produced by triffid flowers.",
-    "bodytype": "flying insect",
-    "species": [ "INSECT_FLYING" ],
-    "default_faction": "insect",
-    "material": [ "iflesh" ],
-    "symbol": "L",
-    "color": "white",
-    "volume": "75 L",
-    "weight": "40 kg",
-    "hp": 50,
-    "speed": 95,
-    "vision_day": 15,
-    "dodge": 2,
-    "harvest": "arachnid_firefly",
-    "biosignature": { "biosig_item": "insect_dust", "biosig_timer": 3 },
-    "reproduction": { "baby_egg": "egg_butterfly", "baby_count": 1, "baby_timer": 15 },
-    "baby_flags": [ "SPRING", "SUMMER" ],
-    "fear_triggers": [ "HURT", "FIRE" ],
-    "flags": [ "SEES", "HEARS", "FLIES", "STUMBLES" ]
-  },
-  {
-    "id": "mon_butterfly_titan",
-    "type": "MONSTER",
-    "name": { "str": "emperor butterfly", "str_pl": "emperor butterflies" },
-    "description": "An enormous butterfly with regal looking wings.  This giant of the sky flies cheerfully under the sun, leaving dust as it passes.",
-    "copy-from": "mon_butterfly_giant",
-    "proportional": { "hp": 3, "speed": 1.1, "morale": 1.1, "melee_dice_sides": 1.1 },
-    "symbol": "L",
-    "color": "yellow",
-    "volume": "120 L",
-    "weight": "75 kg"
-  },
-  {
-    "id": "mon_moth",
-    "type": "MONSTER",
-    "name": { "str": "mutated moth" },
-    "description": "An oversized moth with its typical wood-like motifs.  It is as peaceful as the mutated butterflies found during the day.",
-    "bodytype": "flying insect",
-    "species": [ "INSECT_FLYING" ],
-    "default_faction": "insect",
-    "material": [ "iflesh" ],
-    "symbol": "l",
-    "color": "light_gray",
-    "volume": "15 L",
-    "weight": "20 kg",
-    "hp": 25,
-    "speed": 95,
-    "vision_night": 15,
-    "dodge": 2,
-    "harvest": "arachnid_firefly",
-    "reproduction": { "baby_egg": "egg_butterfly", "baby_count": 1, "baby_timer": 15 },
-    "upgrades": { "half_life": 14, "into": "mon_moth_giant" },
-    "baby_flags": [ "SPRING", "SUMMER" ],
-    "fear_triggers": [ "HURT", "FIRE" ],
-    "flags": [ "SEES", "HEARS", "FLIES", "STUMBLES" ]
-  },
-  {
-    "id": "mon_moth_giant",
-    "type": "MONSTER",
-    "name": { "str": "giant moth" },
-    "description": "A mutated moth larger than a human.  It silently flies with its huge wings after dusk looking for nocturnal flowers to feed upon.",
-    "bodytype": "flying insect",
-    "species": [ "INSECT_FLYING" ],
-    "default_faction": "insect",
-    "material": [ "iflesh" ],
-    "symbol": "L",
-    "color": "light_gray",
-    "volume": "70 L",
-    "weight": "40 kg",
-    "hp": 50,
-    "speed": 95,
-    "vision_night": 15,
-    "dodge": 2,
-    "harvest": "arachnid_firefly",
-    "biosignature": { "biosig_item": "insect_dust", "biosig_timer": 3 },
-    "reproduction": { "baby_egg": "egg_butterfly", "baby_count": 1, "baby_timer": 15 },
-    "baby_flags": [ "SPRING", "SUMMER" ],
-    "fear_triggers": [ "HURT", "FIRE" ],
-    "flags": [ "SEES", "HEARS", "FLIES", "STUMBLES" ]
-  },
-  {
-    "id": "mon_moth_titan",
-    "type": "MONSTER",
-    "name": { "str": "lunar moth" },
-    "description": "A majestic moth painted in pale colors.  This giant of the night only comes out after the moon is out, leaving glittering dust.",
-    "copy-from": "mon_moth_giant",
-    "proportional": { "hp": 3, "speed": 1.1, "morale": 1.1, "melee_dice_sides": 1.1 },
-    "symbol": "L",
-    "color": "cyan",
-    "volume": "120 L",
-    "weight": "75 kg"
-  },
-  {
-    "id": "mon_caterpillar",
-    "type": "MONSTER",
-    "name": { "str": "caterpillar" },
-    "description": "Caterpillars are the larval stage of butterflies and moths.  This one seems newly hatched from an egg but even now it is large as a cat.",
-    "default_faction": "ant",
-    "bodytype": "insect",
-    "species": [ "INSECT" ],
-    "volume": "5 L",
-    "weight": "6 kg",
-    "hp": 10,
-    "material": [ "iflesh" ],
-    "symbol": "c",
-    "color": "green",
-    "speed": 50,
-    "vision_day": 15,
-    "dodge": 2,
-    "harvest": "arachnid",
-    "upgrades": { "age_grow": 15, "into_group": "GROUP_BUTTERFLY" },
-    "flags": [ "SEES", "SMELLS", "CLIMBS", "HEARS", "STUMBLES", "PATH_AVOID_FIRE" ]
-  },
-  {
-    "id": "mon_caterpillar_giant",
-    "type": "MONSTER",
-    "name": { "str": "giant caterpillar" },
-    "description": "This caterpillar has reached the size of a person and it looks close to make a cocoon.  You can only imagine the size of the insect that will emerge.",
-    "copy-from": "mon_caterpillar",
-    "proportional": { "hp": 3, "speed": 1.1, "morale": 1.1, "melee_dice_sides": 1.1 },
-    "symbol": "C",
-    "volume": "60 L",
-    "weight": "75 kg",
-    "upgrades": { "age_grow": 15, "into_group": "GROUP_BUTTERFLY_GIANT" }
-  },
   {
     "id": "mon_termite_nymph",
     "type": "MONSTER",
@@ -436,115 +283,6 @@
     "anger_triggers": [ "FRIEND_ATTACKED", "FRIEND_DIED", "HURT" ],
     "flags": [ "SMELLS", "QUEEN", "CLIMBS", "PATH_AVOID_FIRE", "PATH_AVOID_FALL" ]
   },
-  {
-    "id": "mon_cicada_nymph",
-    "type": "MONSTER",
-    "name": { "str": "cicada nymph" },
-    "description": "The mutated larval form of a Cicada.  It doesn't produce noise like the adults but its digging claws seem suited for scratching.",
-    "default_faction": "insect",
-    "bodytype": "insect",
-    "species": [ "INSECT" ],
-    "volume": "40 L",
-    "weight": "40 kg",
-    "hp": 80,
-    "speed": 80,
-    "material": [ "iflesh" ],
-    "symbol": "c",
-    "color": "white",
-    "aggression": -10,
-    "morale": 60,
-    "melee_skill": 3,
-    "melee_dice": 4,
-    "melee_dice_sides": 4,
-    "melee_damage": [ { "damage_type": "cut", "amount": 6 } ],
-    "armor_bash": 15,
-    "armor_cut": 18,
-    "armor_bullet": 20,
-    "armor_elec": 2,
-    "vision_day": 10,
-    "vision_night": 15,
-    "harvest": "arachnid",
-    "upgrades": { "age_grow": 21, "into": "mon_cicada" },
-    "special_attacks": [ { "id": "scratch", "attack_upper": false, "cooldown": 15 } ],
-    "anger_triggers": [ "HURT", "PLAYER_CLOSE" ],
-    "fear_triggers": [ "FIRE" ],
-    "flags": [ "SEES", "BORES", "HEARS", "KEENNOSE", "PATH_AVOID_DANGER_1", "SMELLS" ]
-  },
-  {
-    "id": "mon_cicada",
-    "type": "MONSTER",
-    "name": { "str": "giant cicada" },
-    "description": "A huge Cicada the size of a person.  These insects are mostly harmless but may bite if attacked and produce a loud buzzing sound.",
-    "default_faction": "insect",
-    "bodytype": "insect",
-    "species": [ "INSECT" ],
-    "volume": "80 L",
-    "weight": "80 kg",
-    "hp": 100,
-    "speed": 80,
-    "material": [ "iflesh" ],
-    "symbol": "C",
-    "color": "light_gray",
-    "aggression": -10,
-    "morale": 60,
-    "melee_skill": 4,
-    "melee_dice": 4,
-    "melee_dice_sides": 6,
-    "melee_damage": [ { "damage_type": "cut", "amount": 5 } ],
-    "armor_bash": 8,
-    "armor_cut": 10,
-    "armor_bullet": 10,
-    "armor_elec": 2,
-    "vision_day": 10,
-    "vision_night": 15,
-    "harvest": "arachnid",
-    "reproduction": { "baby_egg": "egg_cicada", "baby_count": 3, "baby_timer": 20 },
-    "baby_flags": [ "SUMMER" ],
-    "special_attacks": [ [ "SHRIEK_ALERT", 10 ], [ "SHRIEK_STUN", 5 ] ],
-    "anger_triggers": [ "PLAYER_CLOSE" ],
-    "fear_triggers": [ "FIRE", "HURT" ],
-    "flags": [ "SEES", "FLIES", "HEARS", "KEENNOSE", "PATH_AVOID_DANGER_1", "SMELLS" ]
-  },
-  {
-    "id": "mon_woodlouse",
-    "type": "MONSTER",
-    "name": { "str": "giant woodlouse", "str_pl": "giant woodlice" },
-    "description": "A woodlouse grown to the size of a dog.  These humble crustaceans are harmless and enjoy damp places.",
-    "default_faction": "insect",
-    "bodytype": "insect",
-    "species": [ "INSECT" ],
-    "volume": "50 L",
-    "weight": "50 kg",
-    "hp": 90,
-    "speed": 80,
-    "material": [ "iflesh" ],
-    "symbol": "w",
-    "color": "brown",
-    "armor_bash": 15,
-    "armor_cut": 18,
-    "armor_bullet": 20,
-    "armor_elec": 2,
-    "vision_day": 10,
-    "vision_night": 15,
-    "harvest": "shellfish",
-    "reproduction": { "baby_monster": "mon_woodlouse_manca", "baby_count": 5, "baby_timer": 210 },
-    "petfood": { "food": [ "CATTLEFOOD" ], "feed": "The %s seems to like you!  It lets you pat its head and seems friendly." },
-    "fear_triggers": [ "FIRE", "HURT" ],
-    "flags": [ "SEES", "HEARS", "KEENNOSE", "PATH_AVOID_DANGER_1", "SMELLS" ]
-  },
-  {
-    "id": "mon_woodlouse_manca",
-    "type": "MONSTER",
-    "name": { "str": "baby woodlouse", "str_pl": "baby woodlice" },
-    "description": "Woodlice reproduce by carrying their eggs in a pouch and releasing them as juveniles.  Their mancae look like small adults except for their pale color.",
-    "copy-from": "mon_woodlouse",
-    "proportional": { "hp": 0.25, "speed": 1.1, "morale": 0.67, "melee_dice_sides": 0.67 },
-    "symbol": "w",
-    "color": "white",
-    "volume": "5 L",
-    "weight": "5 kg",
-    "upgrades": { "half_life": 14, "into": "mon_woodlouse" }
-  },
   {
     "id": "mon_onicophore",
     "type": "MONSTER",
@@ -616,117 +354,5 @@
     "anger_triggers": [ "PLAYER_CLOSE", "PLAYER_WEAK" ],
     "fear_triggers": [ "FIRE", "HURT" ],
     "flags": [ "SEES", "HEARS", "KEENNOSE", "PATH_AVOID_DANGER_1", "SMELLS", "CLIMBS" ]
-  },
-  {
-    "id": "mon_diving_larva",
-    "type": "MONSTER",
-    "name": { "str": "giant water tiger" },
-    "description": "The predatory, aquatic larva of a diving beetle grown to large proportions.  It is quite slow but still a good ambusher.",
-    "species": [ "INSECT" ],
-    "bodytype": "insect",
-    "material": [ "iflesh" ],
-    "volume": "8 L",
-    "weight": "10 kg",
-    "hp": 35,
-    "speed": 50,
-    "symbol": "b",
-    "color": "light_gray",
-    "default_faction": "aquatic_predator",
-    "aggression": 8,
-    "melee_skill": 4,
-    "melee_dice": 1,
-    "melee_dice_sides": 6,
-    "melee_damage": [ { "damage_type": "cut", "amount": 5 } ],
-    "dodge": 2,
-    "vision_day": 10,
-    "vision_night": 5,
-    "harvest": "arachnid",
-    "anger_triggers": [ "PLAYER_CLOSE" ],
-    "fear_triggers": [ "HURT" ],
-    "flags": [ "AQUATIC", "SEES", "WATER_CAMOUFLAGE" ],
-    "upgrades": { "age_grow": 21, "into": "mon_diving_beetle_small" }
-  },
-  {
-    "id": "mon_diving_beetle_small",
-    "type": "MONSTER",
-    "name": { "str": "giant diving beetle" },
-    "description": "Water beetles can be found in all freshwater environments, with diving beetles being their predatory variant.  These however seem to have grown far larger with the Cataclysm.",
-    "bodytype": "insect",
-    "species": [ "INSECT" ],
-    "default_faction": "beetle",
-    "volume": "62500 ml",
-    "weight": "81500 g",
-    "hp": 90,
-    "speed": 50,
-    "material": [ "iflesh" ],
-    "symbol": "B",
-    "color": "light_gray",
-    "aggression": 15,
-    "morale": 30,
-    "melee_skill": 5,
-    "melee_dice": 4,
-    "melee_dice_sides": 4,
-    "melee_damage": [ { "damage_type": "cut", "amount": 3 } ],
-    "dodge": 1,
-    "armor_bash": 1,
-    "armor_cut": 3,
-    "armor_bullet": 2,
-    "weakpoints": [
-      { "name": "a soft section of chitin", "armor_mult": { "physical": 0.33 }, "coverage": 20 },
-      { "name": "a crack in the chitin", "armor_mult": { "physical": 0 }, "coverage": 5 }
-    ],
-    "vision_day": 14,
-    "vision_night": 12,
-    "harvest": "arachnid_beetle",
-    "reproduction": { "baby_egg": "egg_water_beetle", "baby_count": 3, "baby_timer": 15 },
-    "anger_triggers": [ "FRIEND_ATTACKED", "FRIEND_DIED", "HURT" ],
-    "fear_triggers": [ "FIRE" ],
-    "flags": [ "SEES", "HEARS", "GOODHEARING", "SWIMS", "WATER_CAMOUFLAGE" ]
-  },
-  {
-    "id": "mon_water_scorpion",
-    "type": "MONSTER",
-    "name": { "str": "giant water scorpion" },
-    "description": "A slender relative of the water bug, grown close to human size.  It uses its long tail as a snorkel while ambushing prey.",
-    "default_faction": "strider",
-    "bodytype": "insect",
-    "species": [ "INSECT" ],
-    "volume": "40 L",
-    "weight": "50 kg",
-    "hp": 45,
-    "speed": 50,
-    "attack_cost": 50,
-    "material": [ "iflesh" ],
-    "symbol": "W",
-    "color": "light_gray",
-    "aggression": 10,
-    "morale": 30,
-    "melee_skill": 3,
-    "melee_dice": 1,
-    "melee_dice_sides": 5,
-    "melee_damage": [ { "damage_type": "cut", "amount": 4 } ],
-    "dodge": 3,
-    "armor_bash": 1,
-    "armor_cut": 3,
-    "armor_bullet": 2,
-    "vision_day": 12,
-    "vision_night": 5,
-    "harvest": "arachnid",
-    "reproduction": { "baby_egg": "egg_water_bug", "baby_count": 3, "baby_timer": 10 },
-    "anger_triggers": [ "PLAYER_WEAK", "PLAYER_CLOSE" ],
-    "fear_triggers": [ "HURT" ],
-    "flags": [ "SEES", "HEARS", "SMELLS", "SWIMS", "GRABS", "AQUATIC" ]
-  },
-  {
-    "id": "mon_water_scorpion_larva",
-    "type": "MONSTER",
-    "name": { "str": "water scorpion nymph" },
-    "description": "The nymph of a water scorpion, looks like a smaller version of its parents.",
-    "copy-from": "mon_water_scorpion",
-    "proportional": { "hp": 0.5, "speed": 1.1, "morale": 0.67, "melee_dice_sides": 0.67 },
-    "symbol": "w",
-    "volume": "10 L",
-    "weight": "15 kg",
-    "upgrades": { "half_life": 14, "into": "mon_water_scorpion" }
   }
 ]
diff --git a/data/mods/TropiCataclysm/monsters/tropical_mammal.json b/data/mods/TropiCataclysm/monsters/tropical_mammal.json
index 172e67de1b1cd..7c68e1ba528d5 100644
--- a/data/mods/TropiCataclysm/monsters/tropical_mammal.json
+++ b/data/mods/TropiCataclysm/monsters/tropical_mammal.json
@@ -389,72 +389,6 @@
     "petfood": { "food": [ "CATTLEFOOD" ], "feed": "The %s seems to like you!  It lets you pat its head and seems friendly." },
     "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM", "KEENNOSE" ]
   },
-  {
-    "id": "mon_llama_calf",
-    "type": "MONSTER",
-    "name": { "str": "llama calf" },
-    "description": "A baby llama.  Unlike their parents, the calves tend to be more friendly in demeanor.",
-    "default_faction": "herbivore",
-    "bodytype": "horse",
-    "looks_like": "mon_llama",
-    "categories": [ "WILDLIFE" ],
-    "species": [ "MAMMAL" ],
-    "volume": "60000 ml",
-    "weight": "60000 g",
-    "hp": 35,
-    "speed": 90,
-    "material": [ "flesh" ],
-    "symbol": "l",
-    "color": "white",
-    "melee_skill": 1,
-    "melee_dice": 1,
-    "melee_dice_sides": 2,
-    "melee_damage": [ { "damage_type": "cut", "amount": 1 } ],
-    "dodge": 2,
-    "anger_triggers": [  ],
-    "harvest": "mammal_small_wool",
-    "fear_triggers": [ "SOUND", "PLAYER_CLOSE", "FRIEND_ATTACKED" ],
-    "placate_triggers": [ "PLAYER_WEAK" ],
-    "upgrades": { "age_grow": 240, "into": "mon_llama" },
-    "//": "Puberty reached in 6-9 months, copied from lamb but it probably applies the same on llamas.",
-    "biosignature": { "biosig_item": "feces_manure", "biosig_timer": 7 },
-    "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM" ]
-  },
-  {
-    "id": "mon_llama",
-    "type": "MONSTER",
-    "name": { "str_sp": "llama" },
-    "description": "A big and wooly herbivore domesticated by the Andean cultures of South America.  Llamas and their kin are distant relatives to camels and are adapted to mountain environments.",
-    "default_faction": "herbivore",
-    "bodytype": "horse",
-    "categories": [ "WILDLIFE" ],
-    "species": [ "MAMMAL" ],
-    "volume": "200000 ml",
-    "weight": "200000 g",
-    "hp": 90,
-    "speed": 90,
-    "material": [ "flesh" ],
-    "symbol": "L",
-    "color": "white",
-    "melee_skill": 3,
-    "melee_dice": 1,
-    "melee_dice_sides": 6,
-    "melee_damage": [ { "damage_type": "cut", "amount": 2 } ],
-    "dodge": 2,
-    "starting_ammo": { "milk_raw": 5 },
-    "anger_triggers": [  ],
-    "shearing": [ { "result": "wool_staple", "amount": 22 } ],
-    "harvest": "mammal_large_wool",
-    "reproduction": { "baby_monster": "mon_llama_calf", "baby_count": 1, "baby_timer": 275 },
-    "//": "Llamas produce offspring between summer and fall according to internet sources, makes sense due to the southern hemisphere seasons.",
-    "baby_flags": [ "FALL" ],
-    "biosignature": { "biosig_item": "feces_manure", "biosig_timer": 3 },
-    "fear_triggers": [ "SOUND", "PLAYER_CLOSE", "FRIEND_ATTACKED" ],
-    "placate_triggers": [ "PLAYER_WEAK" ],
-    "special_attacks": [ [ "EAT_CROP", 120 ] ],
-    "petfood": { "food": [ "CATTLEFOOD" ], "feed": "The %s seems to like you!  It lets you pat its head and seems friendly." },
-    "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM", "PET_WONT_FOLLOW", "MILKABLE" ]
-  },
   {
     "id": "mon_guinea_pig",
     "type": "MONSTER",
diff --git a/data/mods/TropiCataclysm/monsters/tropical_reptile_amphibian.json b/data/mods/TropiCataclysm/monsters/tropical_reptile_amphibian.json
index b90f4c6751e05..1d712665f1377 100644
--- a/data/mods/TropiCataclysm/monsters/tropical_reptile_amphibian.json
+++ b/data/mods/TropiCataclysm/monsters/tropical_reptile_amphibian.json
@@ -179,31 +179,6 @@
     "fear_triggers": [ "FIRE", "HURT" ],
     "flags": [ "SEES", "HEARS", "SMELLS", "KEENNOSE", "PATH_AVOID_DANGER_1", "ANIMAL", "PUSH_MON", "SWIMS" ]
   },
-  {
-    "id": "mon_toad",
-    "type": "MONSTER",
-    "name": { "str": "toad" },
-    "description": "Toads are a diverse and varied family of amphibians sister to frogs.  Very distinguishable for their warty and dry skin.",
-    "copy-from": "mon_frog",
-    "reproduction": { "baby_egg": "egg_toad", "baby_count": 8, "baby_timer": 26 }
-  },
-  {
-    "id": "mon_tadpole_brown",
-    "type": "MONSTER",
-    "name": { "str": "toad tadpole" },
-    "description": "Toad tadpoles looks exactly like a frog tadpoles at birth.  The main difference is that they keep this color during their whole larval stage.",
-    "copy-from": "mon_tadpole",
-    "color": "brown",
-    "upgrades": { "age_grow": 365, "into": "mon_toad" }
-  },
-  {
-    "id": "mon_toad_small",
-    "type": "MONSTER",
-    "name": { "str": "huge toad" },
-    "description": "The cane toad is a regular sight in tropical America and some other parts of the world.  This one however, seems to have been mutated to absurd size by the Cataclysm.",
-    "copy-from": "mon_frog_small",
-    "upgrades": { "half_life": 14, "into": "mon_toad_giant" }
-  },
   {
     "id": "mon_tadpole_small",
     "type": "MONSTER",
@@ -264,38 +239,6 @@
     "fear_triggers": [ "HURT" ],
     "flags": [ "SEES", "SMELLS", "WARM", "SWIMS", "AQUATIC", "WATER_CAMOUFLAGE" ]
   },
-  {
-    "id": "mon_toad_giant",
-    "type": "MONSTER",
-    "name": { "str": "giant toad" },
-    "description": "This cane toad has grown bigger than a human.  It looks uninterested in eating you but you better not give it a chance.",
-    "default_faction": "frog",
-    "bodytype": "frog",
-    "looks_like": "mon_frog_giant",
-    "categories": [ "WILDLIFE" ],
-    "species": [ "AMPHIBIAN" ],
-    "volume": "92500 ml",
-    "weight": "120 kg",
-    "hp": 70,
-    "speed": 90,
-    "material": [ "flesh" ],
-    "symbol": "M",
-    "color": "light_green",
-    "aggression": 10,
-    "morale": 100,
-    "melee_skill": 5,
-    "melee_dice": 1,
-    "melee_dice_sides": 12,
-    "melee_damage": [ { "damage_type": "cut", "amount": 1 } ],
-    "dodge": 2,
-    "armor_bash": 4,
-    "harvest": "mutant_animal_large_noskin",
-    "path_settings": { "max_dist": 5 },
-    "upgrades": { "half_life": 50, "into": "mon_gastro_bufo" },
-    "special_attacks": [ { "type": "leap", "cooldown": 10, "move_cost": 0, "max_range": 10, "min_consider_range": 2 } ],
-    "anger_triggers": [ "STALK", "PLAYER_WEAK", "PLAYER_CLOSE" ],
-    "flags": [ "SEES", "SMELLS", "HEARS", "SWIMS" ]
-  },
   {
     "id": "mon_anaconda",
     "type": "MONSTER",
diff --git a/data/mods/TropiCataclysm/monsters/tropical_zanimals.json b/data/mods/TropiCataclysm/monsters/tropical_zanimals.json
deleted file mode 100644
index 9e129c7b3123d..0000000000000
--- a/data/mods/TropiCataclysm/monsters/tropical_zanimals.json
+++ /dev/null
@@ -1,49 +0,0 @@
-[
-  {
-    "id": "mon_gastro_bufo",
-    "type": "MONSTER",
-    "name": { "str": "gastro bufo" },
-    "description": "A massive toad stumbling around while leaking acid from its skin.  Doesn't look friendly at all.",
-    "default_faction": "zombie",
-    "species": [ "ZOMBIE", "AMPHIBIAN" ],
-    "volume": "200 L",
-    "weight": "280 kg",
-    "hp": 200,
-    "speed": 75,
-    "material": [ "flesh" ],
-    "symbol": "F",
-    "color": "black_green",
-    "aggression": 100,
-    "morale": 100,
-    "melee_skill": 5,
-    "melee_dice": 5,
-    "melee_dice_sides": 6,
-    "melee_damage": [ { "damage_type": "bash", "amount": 5 } ],
-    "dodge": 2,
-    "armor_bash": 8,
-    "armor_cut": 2,
-    "armor_bullet": 1,
-    "vision_night": 7,
-    "harvest": "zombie",
-    "path_settings": { "max_dist": 5 },
-    "special_attacks": [ { "type": "leap", "cooldown": 10, "move_cost": 0, "max_range": 10, "min_consider_range": 2 } ],
-    "special_when_hit": [ "ACIDSPLASH", 100 ],
-    "death_function": { "message": "The %s's body leaks acid.", "effect": { "id": "death_acid", "hit_self": true } },
-    "flags": [
-      "SEES",
-      "HEARS",
-      "SMELLS",
-      "KEENNOSE",
-      "STUMBLES",
-      "WARM",
-      "BASHES",
-      "POISON",
-      "NO_BREATHE",
-      "REVIVES",
-      "PUSH_MON",
-      "FILTHY",
-      "ACIDPROOF",
-      "ACID_BLOOD"
-    ]
-  }
-]
diff --git a/data/mods/TropiCataclysm/recipes/recipe_others.json b/data/mods/TropiCataclysm/recipes/recipe_others.json
deleted file mode 100644
index 56e2cd9b4b460..0000000000000
--- a/data/mods/TropiCataclysm/recipes/recipe_others.json
+++ /dev/null
@@ -1,49 +0,0 @@
-[
-  {
-    "type": "recipe",
-    "activity_level": "fake",
-    "result": "meal_chitin_piece",
-    "category": "CC_OTHER",
-    "subcategory": "CSC_OTHER_MATERIALS",
-    "skill_used": "cooking",
-    "difficulty": 2,
-    "time": "1 h",
-    "autolearn": true,
-    "batch_time_factors": [ 83, 3 ],
-    "flags": [ "BLIND_EASY" ],
-    "tools": [ [ [ "rock_quern", -1 ], [ "clay_quern", -1 ] ] ],
-    "components": [ [ [ "chitin_piece", 1 ], [ "acidchitin_piece", 1 ], [ "endochitin", 1 ], [ "insect_dust", 1 ] ] ]
-  },
-  {
-    "type": "recipe",
-    "activity_level": "fake",
-    "result": "meal_chitin_piece",
-    "id_suffix": "mortar",
-    "category": "CC_OTHER",
-    "subcategory": "CSC_OTHER_MATERIALS",
-    "skill_used": "cooking",
-    "skills_required": [ [ "survival", 1 ] ],
-    "difficulty": 2,
-    "time": "1 h 30 m",
-    "autolearn": true,
-    "batch_time_factors": [ 83, 3 ],
-    "flags": [ "BLIND_EASY" ],
-    "tools": [ [ [ "mortar_pestle", -1 ] ] ],
-    "components": [ [ [ "chitin_piece", 1 ], [ "acidchitin_piece", 1 ], [ "endochitin", 1 ], [ "insect_dust", 1 ] ] ]
-  },
-  {
-    "result": "meal_chitin_piece",
-    "type": "recipe",
-    "activity_level": "NO_EXERCISE",
-    "id_suffix": "with_from_food_processor",
-    "category": "CC_FOOD",
-    "subcategory": "CSC_FOOD_OTHER",
-    "skill_used": "cooking",
-    "difficulty": 2,
-    "time": "15 m",
-    "autolearn": true,
-    "batch_time_factors": [ 83, 3 ],
-    "tools": [ [ [ "food_processor", 20 ] ] ],
-    "components": [ [ [ "chitin_piece", 1 ], [ "acidchitin_piece", 1 ], [ "endochitin", 1 ], [ "insect_dust", 1 ] ] ]
-  }
-]
diff --git a/data/mods/Xedra_Evolved/itemgroups/itemgroups.json b/data/mods/Xedra_Evolved/itemgroups/itemgroups.json
index 7a93bc14c2c52..96917a000674e 100644
--- a/data/mods/Xedra_Evolved/itemgroups/itemgroups.json
+++ b/data/mods/Xedra_Evolved/itemgroups/itemgroups.json
@@ -240,5 +240,65 @@
       { "item": "xs_mt_chainmail_legs", "prob": 20 },
       { "item": "xs_mt_chainmail_vest", "prob": 20 }
     ]
+  },
+  {
+    "id": "SUS_junk_drawer",
+    "type": "item_group",
+    "copy-from": "SUS_junk_drawer",
+    "subtype": "collection",
+    "extend": {
+      "items": [
+        [ "fire_ball", 5 ],
+        [ "glass_dagger_paperweight", 5 ],
+        [ "deck_of_tarot_cards", 5 ],
+        [ "polaroid_of_missing_person", 5 ],
+        [ "brass_cylinders", 1 ],
+        [ "glass_berries", 1 ],
+        [ "occult_seal", 1 ],
+        [ "hurricane_lamp_thorns", 1 ],
+        [ "caravaggio_self_portrait", 1 ],
+        [ "magick_8_ball", 1 ]
+      ]
+    }
+  },
+  {
+    "id": "SUS_junk_drawer_messy",
+    "type": "item_group",
+    "copy-from": "SUS_junk_drawer_messy",
+    "subtype": "collection",
+    "extend": {
+      "items": [
+        [ "fire_ball", 1 ],
+        [ "glass_dagger_paperweight", 1 ],
+        [ "deck_of_tarot_cards", 1 ],
+        [ "polaroid_of_missing_person", 1 ],
+        [ "brass_cylinders", 5 ],
+        [ "glass_berries", 5 ],
+        [ "occult_seal", 5 ],
+        [ "hurricane_lamp_thorns", 1 ],
+        [ "caravaggio_self_portrait", 1 ],
+        [ "magick_8_ball", 1 ]
+      ]
+    }
+  },
+  {
+    "id": "SUS_office_filing_cabinet",
+    "type": "item_group",
+    "copy-from": "SUS_office_filing_cabinet",
+    "subtype": "collection",
+    "extend": {
+      "items": [
+        [ "hurricane_lamp_thorns", 5 ],
+        [ "caravaggio_self_portrait", 5 ],
+        [ "magick_8_ball", 5 ],
+        [ "fire_ball", 1 ],
+        [ "glass_dagger_paperweight", 1 ],
+        [ "deck_of_tarot_cards", 1 ],
+        [ "polaroid_of_missing_person", 1 ],
+        [ "brass_cylinders", 1 ],
+        [ "glass_berries", 1 ],
+        [ "occult_seal", 1 ]
+      ]
+    }
   }
 ]
diff --git a/data/mods/Xedra_Evolved/items/spell_learning_items/spell_learning_items_eater.json b/data/mods/Xedra_Evolved/items/spell_learning_items/spell_learning_items_eater.json
index 6456c96659744..ad83ba53d1f5d 100644
--- a/data/mods/Xedra_Evolved/items/spell_learning_items/spell_learning_items_eater.json
+++ b/data/mods/Xedra_Evolved/items/spell_learning_items/spell_learning_items_eater.json
@@ -1,6 +1,6 @@
 [
   {
-    "id": "deck_of_cards",
+    "id": "deck_of_tarot_cards",
     "type": "GENERIC",
     "category": "artifacts",
     "name": { "str": "deck of tarot cards", "str_pl": "decks of tarot cards" },
diff --git a/data/mods/Xedra_Evolved/mutations/mutations.json b/data/mods/Xedra_Evolved/mutations/mutations.json
index c25fca9bc766d..2a430ee9c77bf 100644
--- a/data/mods/Xedra_Evolved/mutations/mutations.json
+++ b/data/mods/Xedra_Evolved/mutations/mutations.json
@@ -23,13 +23,29 @@
     "player_display": false,
     "description": "You don't feel very well.  On an existential level."
   },
+  {
+    "type": "mutation",
+    "id": "MANIFESTED_DESTINY_GOBLIN",
+    "name": { "str": "Transformed into Goblin" },
+    "points": 0,
+    "player_display": false,
+    "description": "You feel like you've left behind your old life and form."
+  },
+  {
+    "type": "mutation",
+    "id": "MANIFEST_DESTINY_SPIDER",
+    "name": { "str": "Transforming into Spider" },
+    "points": 0,
+    "player_display": false,
+    "description": "You don't feel very well.  On an existential level."
+  },
   {
     "type": "mutation",
     "id": "MANIFESTED_DESTINY_SPIDER",
     "name": { "str": "Transformed into Spider" },
     "points": 0,
     "player_display": false,
-    "description": "You don't feel very well.  On an existential level."
+    "description": "You feel like you've left behind your old life and form."
   },
   {
     "type": "mutation",
diff --git a/src/effect_on_condition.cpp b/src/effect_on_condition.cpp
index 12c7ff794d7a8..a56d1cb2b2b97 100644
--- a/src/effect_on_condition.cpp
+++ b/src/effect_on_condition.cpp
@@ -387,9 +387,12 @@ void effect_on_conditions::write_global_eocs_to_file( )
 void effect_on_conditions::avatar_death()
 {
     avatar &player_character = get_avatar();
-    dialogue d( get_talker_for( get_avatar() ),
-                player_character.get_killer() == nullptr ? nullptr : get_talker_for(
-                    player_character.get_killer() ) );
+    Creature *klr = player_character.get_killer();
+    // Make sure the creature still exists in game
+    klr = !klr ? klr : g->get_creature_if( [klr]( const Creature & c ) {
+        return klr == &c;
+    } );
+    dialogue d( get_talker_for( get_avatar() ), klr == nullptr ? nullptr : get_talker_for( klr ) );
     for( const effect_on_condition &eoc : effect_on_conditions::get_all() ) {
         if( eoc.type == eoc_type::AVATAR_DEATH ) {
             eoc.activate( d );