Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA …

…into CleverRaven-master

.github/workflows/pr-validator.yml

@@ -12,5 +12,5 @@ jobs:
       - name: "Validate SUMMARY"
         uses: CleverRaven/pr-validator@master
         with:
-          description-regex: '(\n|^)#### Summary\s+`{0,3}(SUMMARY:\s+)?(None|((Features|Content|Interface|Mods|Balance|Bugfixes|Performance|Infrastructure|Build|I18N) +".*"))`{0,3}\s*(\n|$)'
+          description-regex: '(\n|^)#### Summary\s+`{0,3}(SUMMARY:\s+)?(None|((Features|Content|Interface|Mods|Balance|Bugfixes|Performance|Infrastructure|Build|I18N) +".+"))`{0,3}\s*(\n|$)'
           description-regex-flags: 'i'

data/json/character_modifiers.json

@@ -86,21 +86,21 @@
   {
     "type": "character_mod",
     "id": "crawl_speed_movecost_mod",
-    "description": "Crawl speed movecost modifier <color_dark_gray>(Crawling)</color>",
+    "description": "Crawl speed move cost modifier <color_dark_gray>(Crawling)</color>",
     "mod_type": "x",
     "value": { "limb_score": "crawl", "max": "max_move_cost", "nominator": 1.2 }
   },
   {
     "type": "character_mod",
     "id": "limb_speed_movecost_mod",
-    "description": "Limb speed movecost modifier <color_dark_gray>(Movement Speed)</color>",
+    "description": "Limb speed move cost modifier <color_dark_gray>(Movement Speed)</color>",
     "mod_type": "x",
     "value": { "limb_score": "move_speed", "max": "max_move_cost", "nominator": 1.0 }
   },
   {
     "type": "character_mod",
     "id": "limb_footing_movecost_mod",
-    "description": "Footing movecost modifier <color_dark_gray>(Footing)</color>",
+    "description": "Footing move cost modifier <color_dark_gray>(Footing)</color>",
     "mod_type": "x",
     "value": { "limb_score": "footing", "max": "max_move_cost", "nominator": 1.0 }
   },

data/json/emit.json

@@ -171,6 +171,15 @@
     "chance": 1,
     "qty": 10
   },
+  {
+    "id": "emit_shock_burst_rat",
+    "type": "emit",
+    "//": "small cloud of lightning",
+    "field": "fd_electricity",
+    "intensity": 3,
+    "chance": 5,
+    "qty": 10
+  },
   {
     "id": "emit_shock_cloud",
     "type": "emit",

data/json/furniture_and_terrain/furniture-fungal.json

@@ -2,7 +2,7 @@
   {
     "type": "furniture",
     "id": "f_flower_marloss",
-    "name": "marloss flower",
+    "name": "Marloss flower",
     "description": "This flower is like the other flowers taken by the mushrooms, but its bulb is colored a brilliant cyan color.  It emits an aroma both overwhelming and strangely alluring.",
     "symbol": "f",
     "color": "cyan",
@@ -29,7 +29,7 @@
     "type": "furniture",
     "id": "f_fungal_mass",
     "name": "fungal mass",
-    "description": "Thick ropes of mycal matter have covered the ground here completely.  It's soft to the touch, but not firm enough to hold any weight.",
+    "description": "Thick ropes of Mycal matter have covered the ground here completely.  It's soft to the touch, but not firm enough to hold any weight.",
     "symbol": "O",
     "bgcolor": "dark_gray",
     "move_cost_mod": -10,

data/json/furniture_and_terrain/terrain-fences-gates.json

@@ -84,7 +84,7 @@
       "result": "t_dirt",
       "duration": "10 minutes",
       "message": "You finish cutting the metal.",
-      "byproducts": [ { "item": "pipe", "count": 6 }, { "item": "steel_chunk", "count": 20 } ]
+      "byproducts": [ { "item": "pipe", "count": 6 }, { "item": "wire", "count": [ 4, 20 ] } ]
     },
     "bash": {
       "str_min": 10,
@@ -117,7 +117,7 @@
       "result": "t_dirt",
       "duration": "10 minutes",
       "message": "You finish cutting the metal.",
-      "byproducts": [ { "item": "pipe", "count": 6 }, { "item": "steel_chunk", "count": 20 } ]
+      "byproducts": [ { "item": "pipe", "count": 6 }, { "item": "wire", "count": [ 4, 20 ] } ]
     },
     "bash": {
       "str_min": 10,
@@ -145,6 +145,17 @@
     "flags": [ "TRANSPARENT", "FLAT", "ROAD", "BURROWABLE" ],
     "connects_to": "CHAINFENCE",
     "close": "t_chaingate_c",
+    "oxytorch": {
+      "result": "t_dirt",
+      "duration": "9 seconds",
+      "byproducts": [ { "item": "pipe", "count": [ 1, 4 ] }, { "item": "wire", "count": [ 4, 16 ] } ]
+    },
+    "hacksaw": {
+      "result": "t_dirt",
+      "duration": "10 minutes",
+      "message": "You finish cutting the metal.",
+      "byproducts": [ { "item": "pipe", "count": 6 }, { "item": "wire", "count": [ 4, 20 ] } ]
+    },
     "bash": {
       "str_min": 5,
       "str_max": 150,

data/json/furniture_and_terrain/terrain-fungal.json

@@ -2,7 +2,7 @@
   {
     "type": "terrain",
     "id": "t_marloss",
-    "name": "marloss bush",
+    "name": "Marloss bush",
     "description": "This alien plant superficially resembles a blueberry bush, and hangs with large, juicy pink pomes that emit a heady, fruity aroma.",
     "symbol": "#",
     "color": "pink",
@@ -140,7 +140,7 @@
   {
     "type": "terrain",
     "id": "t_marloss_tree",
-    "name": "marloss tree",
+    "name": "Marloss tree",
     "description": "This tree stands as a stark outlier to the landscape around it.  Despite its infestation, its leaves wave proudly in the wind, colored pinkish-white.  Its branches are heavy with pink fruit that looks both mutated and delicious.",
     "symbol": "7",
     "color": "pink",

data/json/items/armor/ammo_pouch.json

@@ -190,7 +190,7 @@
     "name": { "str": "XL chest rig" },
     "description": "Popularized during the Vietnam War, chest rigs like these are typically plain, barebones affairs consisting of three or more pouches in a row, with straps to secure them on your chest.  This one can hold four magazines in its pouches and fits larger-than-human forms.",
     "proportional": { "weight": 1.25, "volume": 1.13, "price": 1.25 },
-    "flags": [ "WATER_FRIENDLY", "BELTED", "OVERSIZE" ]
+    "extend": { "flags": [ "OVERSIZE" ] }
   },
   {
     "id": "xs_chestrig",
@@ -200,7 +200,7 @@
     "name": { "str": "XS chest rig" },
     "description": "Popularized during the Vietnam War, chest rigs like these are typically plain, barebones affairs consisting of three or more pouches in a row, with straps to secure them on your chest.  This one can hold four magazines in its pouches and fits small forms.",
     "proportional": { "weight": 0.75, "volume": 0.75, "price": 0.5 },
-    "flags": [ "WATER_FRIENDLY", "BELTED", "UNDERSIZE" ]
+    "extend": { "flags": [ "UNDERSIZE" ] }
   },
   {
     "id": "javelin_bag",
@@ -503,7 +503,7 @@
     "name": { "str": "XL tac vest" },
     "description": "This light vest is meant to carry your gear and ammunition comfortably distributed about your torso.  They are popular amongst law enforcement, but less so than combination tactical vests incorporating Kevlar.  Oversized and easy to don, this vest can hold four magazines close at hand in its many pouches.",
     "proportional": { "weight": 1.25, "volume": 1.13, "price": 1.25 },
-    "flags": [ "WATER_FRIENDLY", "BELTED", "OVERSIZE" ]
+    "extend": { "flags": [ "OVERSIZE" ] }
   },
   {
     "id": "xs_tacvest",
@@ -513,7 +513,7 @@
     "name": { "str": "XS tac vest" },
     "description": "This light vest is meant to carry your magazines, shells and pistols.  They are popular amongst law enforcement, but less so than combination tactical vests incorporating Kevlar.",
     "proportional": { "weight": 0.75, "volume": 0.75, "price": 0.5 },
-    "flags": [ "WATER_FRIENDLY", "BELTED", "UNDERSIZE" ]
+    "extend": { "flags": [ "UNDERSIZE" ] }
   },
   {
     "id": "light_load_bearing_vest",

data/json/items/armor/arms_armor.json

@@ -70,7 +70,7 @@
     "name": { "str": "pair of XL chitin arm guards", "str_pl": "pairs of XL chitin arm guards" },
     "description": "A pair of arm guards made from the exoskeletons of insects.  Light and durable.  Larger than average.",
     "proportional": { "weight": 1.25, "volume": 1.23 },
-    "flags": [ "STURDY", "OUTER", "BLOCK_WHILE_WORN", "WATER_FRIENDLY", "OVERSIZE" ]
+    "extend": { "flags": [ "OVERSIZE" ] }
   },
   {
     "id": "xs_armguard_chitin",
@@ -80,7 +80,7 @@
     "name": { "str": "pair of XS chitin arm guards", "str_pl": "pairs of XS chitin arm guards" },
     "description": "A pair of arm guards made from the exoskeletons of insects.  Light and durable.  Smaller than average.",
     "proportional": { "weight": 0.75, "volume": 0.75, "price": 0.5 },
-    "flags": [ "STURDY", "OUTER", "BLOCK_WHILE_WORN", "WATER_FRIENDLY", "UNDERSIZE" ]
+    "extend": { "flags": [ "UNDERSIZE" ] }
   },
   {
     "id": "armguard_acidchitin",
@@ -154,7 +154,7 @@
     "weight": "550 g",
     "volume": "4 L",
     "copy-from": "armguard_hard",
-    "flags": [ "OUTER", "WATER_FRIENDLY", "BLOCK_WHILE_WORN", "OVERSIZE" ]
+    "extend": { "flags": [ "OVERSIZE" ] }
   },
   {
     "id": "xs_armguard_hard",
@@ -164,7 +164,7 @@
     "name": { "str": "pair of XS hard arm guards", "str_pl": "pairs of XS hard arm guards" },
     "description": "A pair of neoprene arm sleeves covered with molded plastic sheaths.  Tiny sized.",
     "proportional": { "weight": 0.75, "volume": 0.75, "price": 0.5 },
-    "flags": [ "OUTER", "WATER_FRIENDLY", "BLOCK_WHILE_WORN", "UNDERSIZE" ]
+    "extend": { "flags": [ "UNDERSIZE" ] }
   },
   {
     "id": "armguard_larmor",
@@ -205,7 +205,7 @@
     "weight": "730 g",
     "volume": "3 L",
     "copy-from": "armguard_larmor",
-    "flags": [ "STURDY", "OUTER", "BLOCK_WHILE_WORN", "WATER_FRIENDLY", "OVERSIZE" ]
+    "extend": { "flags": [ "OVERSIZE" ] }
   },
   {
     "id": "xs_armguard_larmor",
@@ -215,7 +215,7 @@
     "name": { "str": "pair of XS leather arm guards", "str_pl": "pairs of XS leather arm guards" },
     "description": "A pair of tiny, tough leather arm guards.  Light and comfortable.",
     "proportional": { "weight": 0.75, "volume": 0.75, "price": 0.5 },
-    "flags": [ "STURDY", "OUTER", "BLOCK_WHILE_WORN", "WATER_FRIENDLY", "UNDERSIZE" ]
+    "extend": { "flags": [ "UNDERSIZE" ] }
   },
   {
     "id": "armguard_lightplate",
@@ -255,7 +255,7 @@
     "weight": "3243 g",
     "volume": "7 L",
     "copy-from": "armguard_lightplate",
-    "flags": [ "VARSIZE", "OUTER", "STURDY", "BLOCK_WHILE_WORN", "OVERSIZE" ]
+    "extend": { "flags": [ "OVERSIZE" ] }
   },
   {
     "id": "xs_armguard_lightplate",
@@ -265,7 +265,7 @@
     "name": { "str": "pair of XS steel arm guards", "str_pl": "pairs of XS steel arm guards" },
     "description": "A full assembly of medieval arm protection.  Rerebraces, couters, and vambraces, with leather straps to secure each piece and connect it as part of a set.",
     "proportional": { "weight": 0.75, "volume": 0.75, "price": 0.5 },
-    "flags": [ "VARSIZE", "OUTER", "STURDY", "BLOCK_WHILE_WORN", "UNDERSIZE" ]
+    "extend": { "flags": [ "UNDERSIZE" ] }
   },
   {
     "id": "armguard_metal",
@@ -306,7 +306,7 @@
     "weight": "1380 g",
     "volume": "3250 ml",
     "copy-from": "armguard_metal",
-    "flags": [ "OUTER", "BLOCK_WHILE_WORN", "WATER_FRIENDLY", "OVERSIZE" ]
+    "extend": { "flags": [ "OVERSIZE" ] }
   },
   {
     "id": "xs_armguard_metal",
@@ -316,7 +316,7 @@
     "name": { "str": "pair of XS metal arm guards", "str_pl": "pairs of XS metal arm guards" },
     "description": "A pair of arm guards hammered out from metal.  Perfect for the Post-Apocalyptic Warrior look.  Smaller than average.",
     "proportional": { "weight": 0.75, "volume": 0.75, "price": 0.5 },
-    "flags": [ "OUTER", "BLOCK_WHILE_WORN", "WATER_FRIENDLY", "UNDERSIZE" ]
+    "extend": { "flags": [ "UNDERSIZE" ] }
   },
   {
     "id": "armguard_paper",
@@ -467,7 +467,7 @@
     "description": "A pair of oversized arm guards made from thick chunks of tire secured by simple strings; the loose collection of plates provides decent but not the most convenient protection.",
     "copy-from": "armguard_tire",
     "proportional": { "weight": 1.25, "volume": 1.13, "price": 1.25 },
-    "flags": [ "OUTER", "BLOCK_WHILE_WORN", "OVERSIZE", "NONCONDUCTIVE" ]
+    "extend": { "flags": [ "OVERSIZE" ] }
   },
   {
     "id": "xs_armguard_tire",
@@ -477,7 +477,7 @@
     "name": { "str": "pair of XS tire arm guards", "str_pl": "pairs of XS tire arm guards" },
     "description": "A pair of undersized arm guards made from thick chunks of tire secured by simple strings; the loose collection of plates provides decent but not the most convenient protection.",
     "proportional": { "weight": 0.75, "volume": 0.75, "price": 0.5 },
-    "flags": [ "OUTER", "BLOCK_WHILE_WORN", "NONCONDUCTIVE", "UNDERSIZE" ]
+    "extend": { "flags": [ "UNDERSIZE" ] }
   },
   {
     "id": "armguard_soft",
@@ -508,7 +508,7 @@
     "weight": "330 g",
     "volume": "1750 ml",
     "copy-from": "armguard_soft",
-    "flags": [ "VARSIZE", "SKINTIGHT", "WATER_FRIENDLY", "OVERSIZE" ]
+    "extend": { "flags": [ "OVERSIZE" ] }
   },
   {
     "id": "xs_armguard_soft",
@@ -518,7 +518,7 @@
     "name": { "str": "pair of XS neoprene arm sleeves", "str_pl": "pairs of XS neoprene arm sleeves" },
     "description": "A pair of extra small soft neoprene arm sleeves.  Often used in contact sports.",
     "proportional": { "weight": 0.75, "volume": 0.75, "price": 0.5 },
-    "flags": [ "VARSIZE", "SKINTIGHT", "WATER_FRIENDLY", "UNDERSIZE" ]
+    "extend": { "flags": [ "UNDERSIZE" ] }
   },
   {
     "id": "gambeson_sleeve",
@@ -548,7 +548,7 @@
     "description": "A pair of extra large sleeves made from heavy quilted fabric.",
     "copy-from": "gambeson_sleeve",
     "proportional": { "weight": 1.125, "volume": 1.13, "price": 1.25 },
-    "flags": [ "VARSIZE", "STURDY", "OVERSIZE" ]
+    "extend": { "flags": [ "OVERSIZE" ] }
   },
   {
     "id": "xs_gambeson_sleeve",
@@ -557,7 +557,7 @@
     "description": "A pair of extra large sleeves made from heavy quilted fabric.",
     "copy-from": "gambeson_sleeve",
     "proportional": { "weight": 0.75, "volume": 0.75, "price": 0.5 },
-    "flags": [ "VARSIZE", "STURDY", "UNDERSIZE" ]
+    "extend": { "flags": [ "UNDERSIZE" ] }
   },
   {
     "id": "k_gambeson_sleeve",
@@ -609,7 +609,7 @@
     "description": "A pair of extra large sleeves made from layers of kevlar.",
     "copy-from": "k_gambeson_sleeve",
     "proportional": { "weight": 1.125, "volume": 1.13, "price": 1.25 },
-    "flags": [ "VARSIZE", "STURDY", "OVERSIZE" ]
+    "extend": { "flags": [ "OVERSIZE" ] }
   },
   {
     "id": "xs_k_gambeson_sleeve",
@@ -618,7 +618,7 @@
     "description": "A pair of extra small sleeves made from heavy quilted fabric and kevlar.",
     "copy-from": "k_gambeson_sleeve",
     "proportional": { "weight": 0.75, "volume": 0.75, "price": 0.5 },
-    "flags": [ "VARSIZE", "STURDY", "UNDERSIZE" ]
+    "extend": { "flags": [ "UNDERSIZE" ] }
   },
   {
     "id": "chainmail_arms",
@@ -939,7 +939,7 @@
     "weight": "531 g",
     "volume": "1250 ml",
     "copy-from": "vambrace_larmor",
-    "flags": [ "STURDY", "OUTER", "WATER_FRIENDLY", "OVERSIZE" ]
+    "extend": { "flags": [ "OVERSIZE" ] }
   },
   {
     "id": "xs_vambrace_larmor",
@@ -949,7 +949,7 @@
     "name": { "str": "pair of XS leather vambraces", "str_pl": "pairs of XS leather vambraces" },
     "description": "A pair of light leather arm guards, made for archery.",
     "proportional": { "weight": 0.75, "volume": 0.75, "price": 0.5 },
-    "flags": [ "STURDY", "OUTER", "WATER_FRIENDLY", "UNDERSIZE" ]
+    "extend": { "flags": [ "UNDERSIZE" ] }
   },
   {
     "id": "armguard_cut_resistant",

data/json/items/armor/bespoke_armor/custom_boots.json

@@ -27,7 +27,7 @@
     "name": { "str": "pair of XL light survivor boots", "str_pl": "pairs of XL light survivor boots" },
     "copy-from": "boots_lsurvivor",
     "proportional": { "weight": 1.4, "volume": 1.4 },
-    "flags": [ "VARSIZE", "WATERPROOF", "OVERSIZE", "STURDY" ]
+    "extend": { "flags": [ "OVERSIZE" ] }
   },
   {
     "id": "xs_boots_lsurvivor",
@@ -36,7 +36,7 @@
     "looks_like": "boots_lsurvivor",
     "name": { "str": "pair of XS light survivor boots", "str_pl": "pairs of XS light survivor boots" },
     "proportional": { "weight": 0.75, "volume": 0.75, "price": 0.5 },
-    "flags": [ "VARSIZE", "WATERPROOF", "STURDY", "UNDERSIZE" ]
+    "extend": { "flags": [ "UNDERSIZE" ] }
   },
   {
     "id": "boots_survivor",
@@ -90,7 +90,7 @@
     "name": { "str": "pair of XS survivor boots", "str_pl": "pairs of XS survivor boots" },
     "description": "A tiny pair of customized leather boots armored with Kevlar.  Balancing comfort and protection, these boots will keep you alive, even when knee-deep in the dead.",
     "proportional": { "weight": 0.75, "volume": 0.75, "price": 0.5 },
-    "flags": [ "VARSIZE", "WATERPROOF", "STURDY", "UNDERSIZE" ]
+    "extend": { "flags": [ "UNDERSIZE" ] }
   },
   {
     "id": "boots_wsurvivor_nofur",
@@ -114,7 +114,7 @@
     "color": "pink",
     "warmth": 50,
     "proportional": { "weight": 1.3, "volume": 1.3 },
-    "flags": [ "VARSIZE", "WATERPROOF", "OVERSIZE", "STURDY" ]
+    "extend": { "flags": [ "OVERSIZE" ] }
   },
   {
     "id": "xs_boots_wsurvivor_nofur",
@@ -124,7 +124,7 @@
     "name": { "str": "pair of XS faux fur winter survivor boots", "str_pl": "pairs of XS faux fur winter survivor boots" },
     "description": "A pair of customized and undersized Kevlar-armored boots.  Warm thanks to a faux-fur lining, these will keep you alive even when knee-deep in the dead.",
     "proportional": { "weight": 0.75, "volume": 0.75, "price": 0.5 },
-    "flags": [ "UNDERSIZE" ]
+    "extend": { "flags": [ "UNDERSIZE" ] }
   },
   {
     "id": "boots_wsurvivor",
@@ -154,7 +154,7 @@
     "name": { "str": "pair of XL winter survivor boots", "str_pl": "pairs of XL winter survivor boots" },
     "copy-from": "boots_wsurvivor",
     "proportional": { "weight": 1.3, "volume": 1.3 },
-    "flags": [ "VARSIZE", "WATERPROOF", "OVERSIZE", "STURDY" ]
+    "extend": { "flags": [ "OVERSIZE" ] }
   },
   {
     "id": "xs_boots_wsurvivor",
@@ -163,7 +163,7 @@
     "looks_like": "boots_wsurvivor",
     "name": { "str": "pair of XS winter survivor boots", "str_pl": "pairs of XS winter survivor boots" },
     "proportional": { "weight": 0.75, "volume": 0.75, "price": 0.5 },
-    "flags": [ "VARSIZE", "WATERPROOF", "STURDY", "UNDERSIZE" ]
+    "extend": { "flags": [ "UNDERSIZE" ] }
   },
   {
     "id": "boots_h20survivor",