Revert "Merge branch 'master' into fatterfish"

This reverts commit 640af27, reversing
changes made to 0270a59.

.clang-tidy

@@ -35,7 +35,6 @@ readability-*,\
 -modernize-use-default-member-init,\
 -modernize-use-emplace,\
 -modernize-use-transparent-functors,\
--modernize-use-trailing-return-type,\
 -performance-for-range-copy,\
 -performance-inefficient-vector-operation,\
 -performance-noexcept-move-constructor,\

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

@@ -237,12 +237,12 @@
   {
     "type": "terrain",
     "id": "t_screen_door_o",
-    "name": "open screen door",
+    "name": "closed screen door",
     "description": "A simple wooden doorway with screen mesh.",
     "symbol": "+",
     "color": "brown",
     "looks_like": "t_chickenwire_gate_o",
-    "move_cost": 2,
+    "move_cost": 0,
     "flags": [ "TRANSPARENT", "DOOR", "PERMEABLE", "BURROWABLE", "CONNECT_TO_WALL" ],
     "close": "t_screen_door_c",
     "deconstruct": {

data/json/items/armor.json

@@ -5499,7 +5499,7 @@
     "warmth": 35,
     "material_thickness": 4,
     "environmental_protection": 2,
-    "flags": [ "VARSIZE", "WATERPROOF" ]
+    "flags": [ "VARSIZE", "RAINPROOF" ]
   },
   {
     "id": "motorbike_pants",
@@ -5520,7 +5520,7 @@
     "warmth": 35,
     "material_thickness": 3,
     "environmental_protection": 2,
-    "flags": [ "VARSIZE", "WATERPROOF" ]
+    "flags": [ "VARSIZE", "RAINPROOF" ]
   },
   {
     "id": "mouthpiece",

data/json/items/armor/boots.json

@@ -927,11 +927,11 @@
     "color": "dark_gray",
     "covers": [ "FEET" ],
     "coverage": 95,
-    "encumbrance": 30,
+    "encumbrance": 18,
     "warmth": 35,
     "material_thickness": 4,
     "environmental_protection": 3,
-    "flags": [ "VARSIZE", "WATERPROOF" ]
+    "flags": [ "VARSIZE", "RAINPROOF" ]
   },
   {
     "id": "roller_blades",

data/json/items/book/maps.json

@@ -43,7 +43,7 @@
     "copy-from": "abstractmap",
     "type": "GENERIC",
     "name": "survivor's map",
-    "description": "This is a hand-drawn map of the local area.  Whoever created it has marked down the locations of nearby supply sources including gun stores and gas stations.  Using it will add points of interest to your map.",
+    "description": "This is a hand-drawn map of the local area.  Whomever created it has marked down the locations of nearby supply sources including gun stores and gas stations.  Using it will add points of interest to your map.",
     "color": "white",
     "use_action": {
       "type": "reveal_map",