Updated to 2023-04-30-2223

Revert more ammo patches.
Revert more books patches.
Clean up old book patch.
Fix removed traits patch.
Fix bathroom fluff patch.
Remove obsolete vacutainer patch.
Rename source patches.

1 files changed, 257 insertions, 0 deletions

diff --git a/src-08_more-military-base-overmap.patch b/src-08_more-military-base-overmap.patch
new file mode 100644
index 0000000..f2bc3cb
--- /dev/null
+++ b/src-08_more-military-base-overmap.patch
@@ -0,0 +1,257 @@
+--- a/data/json/overmap/overmap_terrain/overmap_terrain_military.json
++++ b/data/json/overmap/overmap_terrain/overmap_terrain_military.json
+@@ -251,14 +251,10 @@
+       "mil_base_6b",
+       "mil_base_7b",
+       "mil_base_8b",
+-      "mil_base_1c",
+       "mil_base_2c",
+       "mil_base_3c",
+       "mil_base_8c",
+       "mil_base_1d",
+-      "mil_base_5d",
+-      "mil_base_6d",
+-      "mil_base_7d",
+       "mil_base_8d",
+       "mil_base_1e",
+       "mil_base_1f",
+@@ -267,17 +263,13 @@
+       "mil_base_2h",
+       "mil_base_1i",
+       "mil_base_2i",
+-      "mil_base_1j",
+       "mil_base_2j",
+-      "mil_base_3j",
+       "mil_base_8j",
+       "mil_base_1k",
+       "mil_base_2k",
+       "mil_base_3k",
+       "mil_base_4k",
+-      "mil_base_5k",
+       "mil_base_6k",
+-      "mil_base_7k",
+       "mil_base_8k"
+     ],
+     "copy-from": "generic_military_base",
+@@ -287,6 +279,22 @@
+   },
+   {
+     "type": "overmap_terrain",
++    "id": [ "mil_base_1c", "mil_base_1j", "mil_base_3j", "mil_base_5k", "mil_base_6k", "mil_base_7k" ],
++    "copy-from": "generic_military_base",
++    "name": "military base - storage containers",
++    "sym": "#",
++    "color": "yellow"
++  },
++  {
++    "type": "overmap_terrain",
++    "id": [ "mil_base_1c1", "mil_base_1j1", "mil_base_3j1", "mil_base_5k1", "mil_base_6k1", "mil_base_7k1" ],
++    "copy-from": "generic_military_base",
++    "name": "military base - storage container roofs",
++    "sym": "#",
++    "color": "yellow"
++  },
++  {
++    "type": "overmap_terrain",
+     "id": [ "mil_base_5a", "mil_base_6a", "mil_base_7a" ],
+     "copy-from": "generic_military_base",
+     "name": "parking lot",
+@@ -322,70 +330,99 @@
+       "mil_base_3e",
+       "mil_base_5c1",
+       "mil_base_5c",
++      "mil_base_5d1",
++      "mil_base_5d",
+       "mil_base_6c1",
+       "mil_base_6c",
++      "mil_base_6d1",
++      "mil_base_6d",
+       "mil_base_7c1",
+-      "mil_base_7c"
++      "mil_base_7c",
++      "mil_base_7d1",
++      "mil_base_7d"
+     ],
+     "copy-from": "generic_military_base",
+-    "name": "military base - barracks"
++    "name": "military base - barracks",
++    "color": "light_green"
++  },
++  {
++    "type": "overmap_terrain",
++    "id": [
++      "mil_base_1b1",
++      "mil_base_3b1",
++      "mil_base_5b1",
++      "mil_base_8b1",
++      "mil_base_1g1",
++      "mil_base_8g1",
++      "mil_base_1k1",
++      "mil_base_4k1",
++      "mil_base_8k1"
++    ],
++    "copy-from": "generic_military_base",
++    "name": "military base - watch tower",
++    "sym": "T"
+   },
+   {
+     "type": "overmap_terrain",
+     "id": [ "mil_base_2f1", "mil_base_2f", "mil_base_3f1", "mil_base_3f" ],
+     "copy-from": "generic_military_base",
+-    "name": "military base - mess hall"
++    "name": "military base - mess hall",
++    "sym": ">",
++    "color": "pink"
+   },
+   {
+     "type": "overmap_terrain",
+     "id": [ "mil_base_2g1", "mil_base_2g", "mil_base_3g1", "mil_base_3g" ],
+     "copy-from": "generic_military_base",
+-    "name": "military base - warehouse"
++    "name": "military base - warehouse",
++    "sym": "w",
++    "color": "light_blue"
+   },
+   {
+     "type": "overmap_terrain",
+     "id": [ "mil_base_3h1", "mil_base_3h" ],
+     "copy-from": "generic_military_base",
+-    "name": "military base - communications center"
++    "name": "military base - communications center",
++    "sym": "L",
++    "color": "light_gray"
+   },
+   {
+     "type": "overmap_terrain",
+-    "id": [ "mil_base_5e1", "mil_base_5e" ],
++    "id": [ "mil_base_5e1", "mil_base_5e", "mil_base_6e1", "mil_base_6e" ],
+     "copy-from": "generic_military_base",
+-    "name": "military base - armory"
++    "name": "military base - armory",
++    "sym": "v"
+   },
+   {
+     "type": "overmap_terrain",
+-    "id": [
+-      "mil_base_6e1",
+-      "mil_base_6e",
+-      "mil_base_7e1",
+-      "mil_base_7e",
+-      "mil_base_8e1",
+-      "mil_base_8e",
+-      "mil_base_7f1",
+-      "mil_base_7f"
+-    ],
++    "id": [ "mil_base_7e1", "mil_base_7e", "mil_base_8e1", "mil_base_8e", "mil_base_7f1", "mil_base_7f" ],
+     "copy-from": "generic_military_base",
+-    "name": "military base - motor pool"
++    "name": "military base - motor pool",
++    "sym": "O",
++    "color": "white"
+   },
+   {
+     "type": "overmap_terrain",
+     "id": [ "mil_base_5g1", "mil_base_5g" ],
+     "copy-from": "generic_military_base",
+-    "name": "military base - command center"
++    "name": "military base - command center",
++    "sym": "<",
++    "color": "light_gray"
+   },
+   {
+     "type": "overmap_terrain",
+     "id": [ "mil_base_5h1", "mil_base_5h", "mil_base_5i1", "mil_base_5i", "mil_base_6i1", "mil_base_6i" ],
+     "copy-from": "generic_military_base",
+-    "name": "military base - infirmary"
++    "name": "military base - infirmary",
++    "sym": "+"
+   },
+   {
+     "type": "overmap_terrain",
+     "id": "mil_base_8i",
+     "copy-from": "generic_military_base",
+-    "name": "military base - fuel depot"
++    "name": "military base - fuel depot",
++    "sym": "<",
++    "color": "light_blue"
+   },
+   {
+     "type": "overmap_terrain",
+@@ -416,7 +453,7 @@
+     "type": "overmap_terrain",
+     "id": "mil_base_7i",
+     "copy-from": "generic_military_base",
+-    "name": "military helipad",
++    "name": "military base - helipad",
+     "sym": "H"
+   },
+   {
+@@ -465,16 +502,11 @@
+     "type": "overmap_terrain",
+     "id": [
+       "mil_base_1a1",
+-      "mil_base_1b1",
+-      "mil_base_1c1",
+       "mil_base_1d1",
+       "mil_base_1e1",
+       "mil_base_1f1",
+-      "mil_base_1g1",
+       "mil_base_1h1",
+       "mil_base_1i1",
+-      "mil_base_1j1",
+-      "mil_base_1k1",
+       "mil_base_2a1",
+       "mil_base_2b1",
+       "mil_base_2c1",
+@@ -483,9 +515,7 @@
+       "mil_base_2j1",
+       "mil_base_2k1",
+       "mil_base_3a1",
+-      "mil_base_3b1",
+       "mil_base_3c1",
+-      "mil_base_3j1",
+       "mil_base_3k1",
+       "mil_base_4a1",
+       "mil_base_4b1",
+@@ -497,16 +527,11 @@
+       "mil_base_4h1",
+       "mil_base_4i1",
+       "mil_base_4j1",
+-      "mil_base_4k1",
+       "mil_base_5a1",
+-      "mil_base_5b1",
+-      "mil_base_5d1",
+       "mil_base_5f1",
+       "mil_base_5j1",
+-      "mil_base_5k1",
+       "mil_base_6a1",
+       "mil_base_6b1",
+-      "mil_base_6d1",
+       "mil_base_6f1",
+       "mil_base_6g1",
+       "mil_base_6h1",
+@@ -514,22 +539,17 @@
+       "mil_base_6k1",
+       "mil_base_7a1",
+       "mil_base_7b1",
+-      "mil_base_7d1",
+       "mil_base_7g1",
+       "mil_base_7h1",
+       "mil_base_7i1",
+       "mil_base_7j1",
+-      "mil_base_7k1",
+       "mil_base_8a1",
+-      "mil_base_8b1",
+       "mil_base_8c1",
+       "mil_base_8d1",
+       "mil_base_8f1",
+-      "mil_base_8g1",
+       "mil_base_8h1",
+-      "mil_base_8j1",
+-      "mil_base_8k1",
+-      "mil_base_8i1"
++      "mil_base_8i1",
++      "mil_base_8j1"
+     ],
+     "copy-from": "generic_military_base",
+     "name": "open air",