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.
author: jc_gargma <jc_gargma@iserlohn-fortress.net> 2023-05-03 15:58:03 -0700
committer: jc_gargma <jc_gargma@iserlohn-fortress.net> 2023-05-03 15:58:03 -0700
commit: 6b8d5abd7fc1d2f1d6f794640117c649eae3e01a (patch)
tree: 0ad0436287ad1f9bbd3cfb28f7574d5a6710592f
parent: Updated to 2023-04-15-1344 (diff)
download: cataclysm-bn-6b8d5abd7fc1d2f1d6f794640117c649eae3e01a.tar.xz
18 files changed, 1104 insertions, 85 deletions
diff --git a/PKGBUILD b/PKGBUILD
index e8a2d03..0246900 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -15,8 +15,8 @@ pkgbase=cataclysm-bn
 pkgname=(cataclysm-bn cataclysm-bn-tiles)
 pkgname=cataclysm-bn
 _pkgname=Cataclysm-BN-cbn-experimental
-pkgver=202304151344
-_pkgver=2023-04-15-1344
+pkgver=202304302223
+_pkgver=2023-04-30-2223
 pkgrel=1
 pkgdesc="A post-apocalyptic roguelike."
 #url="http://cataclysmrl.blogspot.com/"
@@ -43,6 +43,9 @@ source=("$pkgname-$_pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm-
         "revert-09_undo-yet-more-ammo-balancing.patch"
         "revert-10_still-another-ammo-patch-to-undo.patch"
         "revert-11_Obsoletion-and-removal-of-useless-bathroom-fluff-247.patch"
+        "revert-12_fix-i18n-metric-bullets-part-1-rename-.223-5.56x45mm.patch"
+        "revert-13_fix-i18n-metric-bullets-part-2-rename-.308-7.62x51mm.patch"
+        "revert-14_Removed-unrelated-references-2738.patch"
 
         "ammo-01_inconsistent-ammo-names.patch"
         "ammo-02_fix-20x66mm-loudness.patch"
@@ -112,7 +115,6 @@ source=("$pkgname-$_pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm-
         "terrain-12_add_fmc_stairs.patch"
 
         "tools-01_foldable-bottle-is-container.patch"
-        "tools-02_vacutainer-is-not-a-weapon.patch"
         "tools-03_shears-use-light-battery.patch"
         "tools-04_normalize-drone-volume.patch"
 
@@ -127,16 +129,16 @@ source=("$pkgname-$_pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm-
         "etc-02_add-missing-price-postapoc.patch"
         "etc-03_fix-abstracts.patch"
 
-        "jc_radio-can-use-ups.patch"
-        "jc_ammo-loudness-ap-times-2.patch"
-        "jc_allow-bio-firestarter-on-smoker.patch"
-        "jc_stop-non-faction-npc-sleep-depirvation.patch"
-        "jc_stop-non-faction-npc-malnourishment.patch"
-        "jc_stop-sleeping-on-tables.patch"
-        "jc_allow-hacker-laptop.patch"
-        "jc_more-military-base-overmap.patch"
-        "jc_npc-eat-from-further-camp.patch"
-        "jc_reduced-kcal-during-sleep.patch"
+        "src-01_radio-can-use-ups.patch"
+        "src-02_ammo-loudness-ap-times-2.patch"
+        "src-03_allow-bio-firestarter-on-smoker.patch"
+        "src-04_stop-non-faction-npc-sleep-depirvation.patch"
+        "src-05_stop-non-faction-npc-malnourishment.patch"
+        "src-06_stop-sleeping-on-tables.patch"
+        "src-07_allow-hacker-laptop.patch"
+        "src-08_more-military-base-overmap.patch"
+        "src-09_npc-eat-from-further-camp.patch"
+        "src-10_reduced-kcal-during-sleep.patch"
         
         "vampirism.patch"
 
@@ -145,12 +147,12 @@ source=("$pkgname-$_pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm-
         "cataclysm-dda-soundpack_jcsoundpack.tar.xz::https://library.iserlohn-fortress.net/cataclysm-dda-soundpack_jcsoundpack.git/snapshot/cataclysm-dda-soundpack_jcsoundpack-master.tar.xz"
         "cataclysm-dda-musicpack_coag-musicpack.tar.xz::https://library.iserlohn-fortress.net/cataclysm-dda-musicpack_coag-musicpack.git/snapshot/cataclysm-dda-musicpack_coag-musicpack-master.tar.xz"
         )
-b2sums=('449da5e813f511ac1ab9d3a30a6320137b9c42dd7868b3c8e31e6092fff55dbc2d7deaf0fbf0651be9c1b67430f4875ab3a9c834b8d80997a94f77787a81f658'
+b2sums=('7471f22385c1e1056011f85b00c37d0bcad724d0336d09f80b26d2c31c077abbf97a05a247f5b5844f6cbf6e20ae7c5495cf8115e002a4f0ba0875cd111eca0c'
         '069ecde58859b3d44cd687c4b6e718610cefb693ff86e66f199ebfb1b3072023ad2b6f0c28e27ef9c1ce4997f6a5b2ca0d45046996b3ff35a4aeaeb1a7cf9421'
         'ad88bc6c1e3c8183a313b5eec42f98d6956afea349feff34a86e4536c9921fa99d2594282caf27de8ebb7ffb56376ed2e76d572227bfd6d8173c7bb1f01e23b8'
         '6f70e90359a14e4839d9a2683debb88850e5dd387add911ad68fd87e5512cfcdd435da63e1e370358153673fd5a72a9b1e9c94f1979edb7948b4da8c82407bad'
-        'e319c834d76c0d530762842cec9ac54247bac768ba1c2d3ffe01c41de4f3bb3458696abf2791871bce2b113a712085876d8351aa826a461559a2eb2e98918c55'
-        'f3549372dec640f5fc51d2c7e2c439e34dc5e9b0cbabfc689d6d449814cfd997413360a363ace85835aec5a1fc2dd8e4bb2c54135fb63f617efdb00565d1616e'
+        'fdef1f81084e7b08203b8464f37a00e2efc8b11d423c6e6b82e612392d91047160d2bc472b63c836ebc48adee0b4f2b3434c3e07eed5876275b234e69d7f6b9c'
+        'b143b75105f875159b7766b316c6e36feeba21bc5151fc11bb85785949e905dd964ec14b818e9424cc94773a001eb406cd5ef50fe1f73aacc7f2f82a3545b7ee'
         'e417a1786fbafb685099431f7f9926201ab80636bf3812da67acc341c7ef2b6a3853734d5b8b1bc355acbd5c0bedefb0401f8854aa5cb00032550afc8a7b9ebe'
         '4563b0454c67b003fc1e266345d609d8cce5d60f5d19e9936f441c3b75a98d7c162959286da9507e79def7544675cba8c9e589cca55ed9a1ed261ac608ac7c1a'
         '2d197903715263628e767e867e9b20b9ebd3d85f8983ac8f1e2b534f2b6f8c0470886c79a409f117ad43348aa6aef2a6298925ae27faa32814183ad7677528ac'
@@ -158,7 +160,10 @@ b2sums=('449da5e813f511ac1ab9d3a30a6320137b9c42dd7868b3c8e31e6092fff55dbc2d7deaf
         '0ac92184f85d8b3dceee4a210b2f7f367aeb14c609d468e87205d0eb630e1b6bad6903b863ea61c3a032b665b2316871b6c70aa8508c604a7237a378fae39d92'
         'd62bcb01bcb2934bf405e205a511bd076bc793bb8699dd205a5441afddfe8bbb161f7925de8294c51a528318155af4d2261e2ca2a7a2614d22053d5bbe4359a1'
         '1950d2cacc8697b3f0602f3eb232744fd0f7de4489b7747089abfa8784ec9e4433db4dcdf925d0bc37686ee14d607dcd5345e3db5b5b155a6208bde8b1706e23'
-        '80e2ee7966c8e2218f8d2df0a1aa9a3c1512682aa437423892efa7d43a45e51fa71f678e993f6cb9d090470fac73b7e49326df548b638384b20d1224577775a4'
+        '5df4497d779d6980a540f0f1dd54959ca403e8b00a9f4bd1a91fee3c41d351e216abb08f1ae6729ca0fcb04efda789804b5df5c86e0003d25998e988254712f7'
+        '68cc05b6224d873a2a5728e0120ce09e5c45f53f8c7bc03148a0ede00582975d740e42ddad1aa02c58fabf6d25aa649ddf73e3af2b7c98090e840c808e0742c8'
+        'e79914e7c5388a9fba22b0853e16e1f625f908bcbb5094f3b59fd05ae0195429a4f596a44b782ac9966ebecab3f4135506c68176daca650ece170e350f7e5120'
+        '3999499f63c50ab9fb38edab7592bcba4f8ab9a51b63d96445a9a6af843d5c5a36f36838735528fc42e5eec5c9e375e704fab1aa55df03f5a804e54d247edaa5'
         'ea9e227eff0a9470a06effc35d8e991c0e21d5521e0325317ab36760b5bb3256676fee29dd948fcc7f4b09ce9235c2d859cd22d6839ebf14deb369cdf97b20f0'
         '6dbcf4833dabb68443e50a644cc26309785593f757f7484771a101873aeb02d2e8f3869c0679132a6883ea86bd5fd47494281d0f70dcae9f4bec9b06a7d69b19'
         '124893f23b7d865709fa87a9fade8fb01e596c1f31b0811ab32d5e730e1101c62af672eaf5fe9cdefa338fc25164407023f4c7dcc7cacdb0c86b4713180d345d'
@@ -212,7 +217,6 @@ b2sums=('449da5e813f511ac1ab9d3a30a6320137b9c42dd7868b3c8e31e6092fff55dbc2d7deaf
         'eb1fb44a8d27b731a966fbc72c3692065102896bdb2d074c99b0f7327119fc88ff31848f42913a30631b65c4741dbd5f62aac88ada56ba4c36c24f34d7063072'
         '032c426a0e3a9d8282f5ce9ce4952bef051e2dedb0e56f90d9e18ccc32ea86acec84e42bcff695888f133a48b48418c59ea985dc9c5b179ca13cf9de44004618'
         '7cae5e42b6e16f3c4bf64dca3c7573c1b552424ff70bb6da0a21f121b53b2546b239c87953a090cd90f46a1c3c124e2fe19c560b1830b11334f8e64c92fb614d'
-        '9b55cdad86ddd8c941c89802f13149e85d690a631ff3bf108bc7c06358f24598e66651170bcf675b80dbf680cfe6c15a14323eb3db14a7d4ee786051cc5c2a4c'
         '4c178d330117886848d232372a25ecf5cac46ad48a6fed580957d295eb1c4266836f4f807593d381f9089b2078c4185ba972f697ab353a850ebf35b6f140a4ac'
         '77bfba77f3548d267dc8142125bf26608c723bbdb2834317b3ea031ac64d9ff49bb4d75e29e2c759c03a662955697576d1c93153e9fb3e5dee86466bc29c78e1'
         '74a51f04237fba3caa25b2e0d49659f2e8330ce82288de866943d06b53690f31d48a77a4dd2e57db1f435b715fbca792268f2e191ffb59e57170d327ed41ac0a'
@@ -234,7 +238,7 @@ b2sums=('449da5e813f511ac1ab9d3a30a6320137b9c42dd7868b3c8e31e6092fff55dbc2d7deaf
         '4bd44cbe85c53902b8a360509703e3d38e8a5da75dd2c534a77f03ce6440632f6c83c92939069c60473c88ffb3abab0fbf11e39271f44f813b9f6432ea5f9a6b'
         'f115314dd2bb1da07bba7a90fec5c3acb7ccb5145efaea03d6806942e24d402c9a144a2fd07b82e727a0b79dedd4bdd87de0bbaf0944236563164fb6f117965e'
         'fbe96133bb6aedadc8e846c2495cda5c06b9cc76663e06b236a7721ede96798207f857ae8e0d4b672166ef7e16f024bba14422fb5481fd132ada7117e52fffb5'
-        'd30bc1b6193e7ed024a34b9e0b6fee5995e6e05a070d42746f785c82d941fbf0a7925aad7ae27cb8a9c32c23640b85510b951b1b23cd20ac8f01f5fddb70edd8'
+        '6d8fbbe178fcb84dbfcf301e0e8da47be322f0d35fe510bbd779b0072f077d1a09eded217748d7b1c50d35391d71dcf98aba4194697ac6f2b55acbb1810935d2'
         'a56efdaae0344726debf5b74846edce8df7aa2357fbc7a05a3d369d1f457b02934a0d0ce2330072e03f1ac901e06e333c9393f795c761f8440307e7649ed5596'
         'f032ed44a6bc7f5b8dd7a545706c7733c4043ded755c12c622314c3b1f206363d27358f2d765a774f6f32abbdd8c31994b1e075c5307dcf65fc4e7a77081a5c7'
         'b9309da09b165fb57e83f84e3584d2479bd3336ed86e181e5df2d27daa92bd55d03d7f3fc226f03696af5f0f32d8e0e7ecd26ae7e50eed0200d0b0feaad07efb')
@@ -270,7 +274,7 @@ prepare() {
   sed -i 's|cataclysm-dda|cataclysm-bn|' src/path_info.cpp
 
   # Fix version
-  sed -i 's|VERSION = unstable|VERSION = "0.2-experimental 2023-04-15-1344"|' Makefile
+  sed -i 's|VERSION = unstable|VERSION = "0.2-experimental 2023-04-30-2223"|' Makefile
 
 
   # # # Hotfixes
@@ -279,6 +283,18 @@ prepare() {
 
   # # # Reverts
   echo "Applying revert patches"
+  # # More reverts fot changes to books
+  # Upstream seems to have as serious dislike of in game books.
+  patch -NREp1 --no-backup-if-mismatch -i "$srcdir"/revert-14_Removed-unrelated-references-2738.patch
+
+  # # Yet more bad ammo ideas pt2
+  # Same as below just 308 and 762.
+  patch -NREp1 --no-backup-if-mismatch -i "$srcdir"/revert-13_fix-i18n-metric-bullets-part-2-rename-.308-7.62x51mm.patch
+
+  # # Yet more bad ammo ideas pt1
+  # This prevents sorting 223 and 556 ammo into different piles as sorting is assumed wildcard.
+  patch -NREp1 --no-backup-if-mismatch -i "$srcdir"/revert-12_fix-i18n-metric-bullets-part-1-rename-.223-5.56x45mm.patch
+
   # Needless item removal
   patch -NREp1 --no-backup-if-mismatch -i "$srcdir"/revert-11_Obsoletion-and-removal-of-useless-bathroom-fluff-247.patch
 
@@ -557,10 +573,6 @@ prepare() {
   # Being counted as tools didn't seem to fit their role.
   patch -Np1 --no-backup-if-mismatch -i "$srcdir"/tools-01_foldable-bottle-is-container.patch
 
-  # Fix blood draw kit being categorized as a weapon:
-  # Upstream changed item templates, so this sets it back to be a tool.
-  patch -Np1 --no-backup-if-mismatch -i "$srcdir"/tools-02_vacutainer-is-not-a-weapon.patch
-
   # Fix electric shears not using batteries nor charging via UPS:
   # Item was unusable without this patch.
   patch -Np1 --no-backup-if-mismatch -i "$srcdir"/tools-03_shears-use-light-battery.patch
@@ -614,36 +626,36 @@ prepare() {
   # # # Various other fixes for bugs I came across that modify src
   echo "Applying source code fixes"
   # Fix radio, e-ink reader music, tactical tonfa not working with UPS.
-  patch -Np1 --no-backup-if-mismatch -i "$srcdir"/jc_radio-can-use-ups.patch
+  patch -Np1 --no-backup-if-mismatch -i "$srcdir"/src-01_radio-can-use-ups.patch
 
   # Fix ammo loudness mulitplying by six instead of two.
-  patch -Np1 --no-backup-if-mismatch -i "$srcdir"/jc_ammo-loudness-ap-times-2.patch
+  patch -Np1 --no-backup-if-mismatch -i "$srcdir"/src-02_ammo-loudness-ap-times-2.patch
 
   # Fix smoker racks not accepting bionic firestarter.
-  patch -Np1 --no-backup-if-mismatch -i "$srcdir"/jc_allow-bio-firestarter-on-smoker.patch
+  patch -Np1 --no-backup-if-mismatch -i "$srcdir"/src-03_allow-bio-firestarter-on-smoker.patch
 
   # Fix Non-Player facton NPCs from becoming sleep deprived.
-  patch -Np1 --no-backup-if-mismatch -i "$srcdir"/jc_stop-non-faction-npc-sleep-depirvation.patch
+  patch -Np1 --no-backup-if-mismatch -i "$srcdir"/src-04_stop-non-faction-npc-sleep-depirvation.patch
 
   # Fix Non-Player facton NPCs from becoming malnourished.
-  patch -Np1 --no-backup-if-mismatch -i "$srcdir"/jc_stop-non-faction-npc-malnourishment.patch
+  patch -Np1 --no-backup-if-mismatch -i "$srcdir"/src-05_stop-non-faction-npc-malnourishment.patch
 
   # Fix NPCs preferring tables to cots or woodstoves to the floor.
-  patch -Np1 --no-backup-if-mismatch -i "$srcdir"/jc_stop-sleeping-on-tables.patch
+  patch -Np1 --no-backup-if-mismatch -i "$srcdir"/src-06_stop-sleeping-on-tables.patch
 
   # Allow the hacker_laptop to utilize the extra functions.
-  patch -Np1 --no-backup-if-mismatch -i "$srcdir"/jc_allow-hacker-laptop.patch
+  patch -Np1 --no-backup-if-mismatch -i "$srcdir"/src-07_allow-hacker-laptop.patch
 
   # Expand the overmap tiles for the miltiary base to be less MMMM
-  patch -Np1 --no-backup-if-mismatch -i "$srcdir"/jc_more-military-base-overmap.patch
+  patch -Np1 --no-backup-if-mismatch -i "$srcdir"/src-08_more-military-base-overmap.patch
 
   # Allow npcs to pull food from the camp larder at the full range of tiles camp actions can be assigned from:
   # Should allow bases larger than 3x3 to have less food micromanagment for NPCs.
-  patch -Np1 --no-backup-if-mismatch -i "$srcdir"/jc_npc-eat-from-further-camp.patch
+  patch -Np1 --no-backup-if-mismatch -i "$srcdir"/src-09_npc-eat-from-further-camp.patch
 
   # Revert removal of half calorie consumption while sleeping:
   # Managing the food supply of more than a few NPCs in BN is extremely difficult compared to DDA.
-  patch -Np1 --no-backup-if-mismatch -i "$srcdir"/jc_reduced-kcal-during-sleep.patch
+  patch -Np1 --no-backup-if-mismatch -i "$srcdir"/src-10_reduced-kcal-during-sleep.patch
 
 
   # # # Additional changes
diff --git a/revert-01_removed-traits.patch b/revert-01_removed-traits.patch
index f926d3a..9b98d83 100644
--- a/revert-01_removed-traits.patch
+++ b/revert-01_removed-traits.patch
@@ -6,7 +6,7 @@
      "id": "INFRESIST",
 -    "name": { "str": "Infection Immune" },
 -    "points": 1,
--    "description": "Your immune system is particularly good at resisting infections.  Your wounds will no longer become infected, altough existing infections are still dangerous.",
+-    "description": "Your immune system is particularly good at resisting infections.  Your wounds will no longer become infected, altough existing infections are still dangerous.  You will also be able to install non-sterile CBMs.",
 +    "name": { "str": "Infection Resistant" },
 +    "points": 2,
 +    "description": "Your immune system is particularly good at resisting infections.  You have an increased chance for bad wounds and infections to heal on their own, and only suffer reduced penalties from them.",
@@ -16,6 +16,18 @@
    },
    {
 
+--- a/data/json/obsoletion/mutations.json
++++ b/data/json/obsoletion/mutations.json
+@@ -109,7 +109,7 @@
+     "id": "INFIMMUNE",
+     "name": { "str": "Infection Immune" },
+     "points": 3,
+-    "description": "Your bloodstream has developed antibiotic properties.  Your wounds will never become infected.",
++    "description": "Your bloodstream has developed antibiotic properties.  Your wounds will never become infected. You will also be able to install non-sterile CBMs.",
+     "prereqs": [ "DISRESISTANT" ],
+     "prereqs2": [ "INFRESIST" ],
+     "valid": false
+
 --- a/data/json/scenarios.json
 +++ b/data/json/scenarios.json
 @@ -319,7 +319,7 @@
@@ -93,3 +105,45 @@
  
      //Human only effects
      for( auto &elem : *effects ) {
+
+--- a/src/game_inventory.cpp
++++ b/src/game_inventory.cpp
+@@ -79,7 +79,7 @@
+ static const trait_id trait_NOPAIN( "NOPAIN" );
+ static const trait_id trait_SAPROPHAGE( "SAPROPHAGE" );
+ static const trait_id trait_SAPROVORE( "SAPROVORE" );
+-static const trait_id trait_INFRESIST( "INFRESIST" );
++static const trait_id trait_INFIMMUNE( "INFIMMUNE" );
+ 
+ static const std::string flag_ALLOWS_REMOTE_USE( "ALLOWS_REMOTE_USE" );
+ static const std::string flag_FILTHY( "FILTHY" );
+@@ -1879,7 +1879,7 @@
+             const itype *itemtype = it->type;
+             const bionic_id &bid = itemtype->bionic->id;
+ 
+-            if( it->has_fault( fault_bionic_nonsterile ) && !p.has_trait( trait_INFRESIST ) ) {
++            if( it->has_fault( fault_bionic_nonsterile ) && !p.has_trait( trait_INFIMMUNE ) ) {
+                 // NOLINTNEXTLINE(cata-text-style): single space after the period for symmetry
+                 return _( "/!\\ CBM is not sterile. /!\\ Please use autoclave or other methods to sterilize." );
+             } else if( pa.has_bionic( bid ) ) {
+
+--- a/src/iuse_actor.cpp
++++ b/src/iuse_actor.cpp
+@@ -131,7 +131,7 @@
+ static const trait_id trait_CENOBITE( "CENOBITE" );
+ static const trait_id trait_DEBUG_BIONICS( "DEBUG_BIONICS" );
+ static const trait_id trait_TOLERANCE( "TOLERANCE" );
+-static const trait_id trait_INFRESIST( "INFRESIST" );
++static const trait_id trait_INFIMMUNE( "INFIMMUNE" );
+ static const trait_id trait_LIGHTWEIGHT( "LIGHTWEIGHT" );
+ static const trait_id trait_PACIFIST( "PACIFIST" );
+ static const trait_id trait_PSYCHOPATH( "PSYCHOPATH" );
+@@ -4419,7 +4419,7 @@
+         !p.has_trait( trait_DEBUG_BIONICS ) ) {
+         return ret_val<bool>::make_failure( _( "You can't self-install bionics." ) );
+     } else if( !p.has_trait( trait_DEBUG_BIONICS ) ) {
+-        if( it.has_fault( fault_bionic_nonsterile ) && !p.has_trait( trait_INFRESIST ) ) {
++        if( it.has_fault( fault_bionic_nonsterile ) && !p.has_trait( trait_INFIMMUNE ) ) {
+             return ret_val<bool>::make_failure( _( "This CBM is not sterile, you can't install it." ) );
+         } else if( units::energy_max - p.get_max_power_level() < bid->capacity ) {
+             return ret_val<bool>::make_failure( _( "Max power capacity already reached" ) );
diff --git a/revert-02_revert-book-revamp.patch b/revert-02_revert-book-revamp.patch
index 5888378..d932ec1 100644
--- a/revert-02_revert-book-revamp.patch
+++ b/revert-02_revert-book-revamp.patch
@@ -406,25 +406,10 @@
      "//": "The ids below represent the Aarne-Thompson System of folklore classification.  Do not change.",
      "snippet_category": [
        {
-@@ -202,473 +165,61 @@
-         "id": "fairyat_1084",
-         "text": "This book of rustic folk tales bears the title: \"How to Shout Down the Devil.\""
-       },
--      {
--        "id": "fairyat_1287",
--        "text": "The title of this book is \"Village Folk-tales of Ceylon.\"  It includes fables about logical errors and foolish misjudgements of the Kadambawa men."
--      },
--      {
--        "id": "fairyat_1461",
--        "text": "This book of folk tales is titled, \"The Girl with the Ugly Name, and Other Stories.\""
--      },
--      {
--        "id": "fairyat_2025",
--        "text": "Titled \"The Fleeing Pancake\", this collection of silly folk tales is suitable for small children."
--      }
--    ]
--  },
--  {
+@@ -217,458 +180,46 @@
+     ]
+   },
+   {
 -    "id": "guidebook",
 -    "type": "BOOK",
 -    "name": { "str": "The Hitchhiker's Guide to the Cataclysm", "str_pl": "copies of The Hitchhiker's Guide to the Cataclysm" },
@@ -797,21 +782,8 @@
 -    "color": "light_cyan",
 -    "time": "7 m",
 -    "fun": 2
-+      {
-+        "id": "fairyat_1287",
-+        "text": "The title of this book is \"Village Folk-tales of Ceylon.\"  It includes fables about logical errors and foolish misjudgements of the Kadambawa men."
-+      },
-+      {
-+        "id": "fairyat_1461",
-+        "text": "This book of folk tales is titled, \"The Girl with the Ugly Name, and Other Stories.\""
-+      },
-+      {
-+        "id": "fairyat_2025",
-+        "text": "Titled \"The Fleeing Pancake\", this collection of silly folk tales is suitable for small children."
-+      }
-+    ]
-   },
-   {
+-  },
+-  {
      "id": "mag_gaming",
      "type": "BOOK",
      "name": { "str": "Computer Gaming", "str_pl": "issues of Computer Gaming" },
@@ -1539,7 +1511,7 @@
      "snippet_category": [
        { "id": "fancy1", "text": "This is a high-quality leather bound copy of Charles Dickens' \"A Tale of Two Cities\"." },
        { "id": "fancy2", "text": "This is a very old but well-preserved copy of Charles Dickens' \"Oliver Twist\"." },
-@@ -1717,18 +954,9 @@
+@@ -1717,17 +954,8 @@
          "text": "This is a first edition copy of Terry Pratchett's \"The Colour of Magic\".  In the inner cover is a handwritten note that reads \"To Chris, thanks for believing I could do it.  Best regards, Terry.\""
        }
      ],
@@ -1557,7 +1529,7 @@
 -    "fun": 4
 +    "fun": 3
    },
-   {
+ ]
      "id": "sa_cryptology_key",
 
 --- a/data/json/obsoletion/items.json
diff --git a/revert-11_Obsoletion-and-removal-of-useless-bathroom-fluff-247.patch b/revert-11_Obsoletion-and-removal-of-useless-bathroom-fluff-247.patch
index a923498..d77abe5 100644
--- a/revert-11_Obsoletion-and-removal-of-useless-bathroom-fluff-247.patch
+++ b/revert-11_Obsoletion-and-removal-of-useless-bathroom-fluff-247.patch
@@ -358,7 +358,7 @@ diff --git a/data/json/obsoletion/items.json b/data/json/obsoletion/items.json
 index f2a8063e7ef..e0a1a36ce29 100644
 --- a/data/json/obsoletion/items.json
 +++ b/data/json/obsoletion/items.json
-@@ -4354,5 +4354,131 @@
+@@ -4354,6 +4354,132 @@
      "cutting": 3,
      "to_hit": -3,
      "flags": [ "STAB", "SHEATH_KNIFE", "CONDUCTIVE" ]
@@ -488,8 +488,9 @@ index f2a8063e7ef..e0a1a36ce29 100644
 +    "material": [ "steel", "plastic" ],
 +    "bashing": 3,
 +    "to_hit": 1
-   }
- ]
+   },
+   {
+     "id": "lycra_patch",
 diff --git a/data/json/uncraft/generic.json b/data/json/uncraft/generic.json
 index 30a4c1b1ace..ceacdc75895 100644
 --- a/data/json/uncraft/generic.json
diff --git a/revert-12_fix-i18n-metric-bullets-part-1-rename-.223-5.56x45mm.patch b/revert-12_fix-i18n-metric-bullets-part-1-rename-.223-5.56x45mm.patch
new file mode 100644
index 0000000..d810723
--- /dev/null
+++ b/revert-12_fix-i18n-metric-bullets-part-1-rename-.223-5.56x45mm.patch
@@ -0,0 +1,305 @@
+From 413fd9596300b354af1c75186631b85956fde57c Mon Sep 17 00:00:00 2001
+From: scarf <greenscarf005@gmail.com>
+Date: Sat, 29 Apr 2023 11:19:43 +0900
+Subject: [PATCH 01/31] fix(i18n): metric bullets part 1: rename `.223` ->
+ `5.56x45mm` (#2691)
+
+* refactor: fully specify milimetre for 5.56x45mm
+
+* refactor: change display name of `.223` to `5.56x45mm`
+
+* refactor: `.223` to `5.56x45mm`
+
+* refactor: make metric diameter primary
+---
+ data/help/texts.json                  |  2 +-
+ data/json/items/ammo/223.json         | 14 +++++++-------
+ data/json/items/ammo_types.json       |  3 ++-
+ data/json/items/generic/ammolink.json |  2 +-
+ data/json/items/generic/casing.json   |  4 ++--
+ data/json/items/gun/223.json          |  8 ++++----
+ data/json/items/magazine/223.json     | 12 ++++++------
+ data/json/obsoletion/items.json       | 12 ++++++------
+ data/mods/No_Hope/Items/guns.json     |  2 +-
+ 9 files changed, 30 insertions(+), 29 deletions(-)
+
+diff --git a/data/help/texts.json b/data/help/texts.json
+index e8599a549fb..a155169f812 100644
+--- a/data/help/texts.json
++++ b/data/help/texts.json
+@@ -316,7 +316,7 @@
+       "Q: Why can't I carry anything?\nA: At the start of the game you only have the space in your pockets.  A good first goal of many survivors is to find a backpack or pouch to store things in.",
+       "Q: Help!  I started a fire and now my house is burning down!\nA: Fires will spread to nearby flammable tiles if they are able.  Lighting a fire in a set-up brazier, stove, wood stove, stone fireplace, pit, or even in a kitchen stove will stop it from spreading.  Fire extinguishers can put out fires that get out of control.  You can put out a fire in the fireplace by examining it.",
+       "Q: I'm cold and can't sleep at night!\nA: Gather some clothes and put them in the place you use to sleep in.  Being hungry, thirsty, wet, or injured can also make you feel the cold more, so try to avoid these effects before you go to sleep.  Pillows and some other appliances will help you sleep, and the quality of your sleeping spot is also very important.",
+-      "Q: There are too many calibers and guns.  It confuses me - I don't usually understand what is compatible with what.\nA: Try to remember few usual calibers: \n9x19 (or simply 9mm) - fits most basic pistols (Glock, for example) and SMGs, quite easy to find and gets job done versus usual zombies;\n 00 buckshot - for most shotguns.  Very powerful against unarmored target at closer ranges;\n .223 (5.56) - for rifles.  Good long range option.\n .308 (7.62) - for even more powerful rifles.  Also good long range option.\n  It should be enough in the beginning.  Or even just grab any shotgun, fill it with buckshot and give them hell!",
++      "Q: There are too many calibers and guns.  It confuses me - I don't usually understand what is compatible with what.\nA: Try to remember few usual calibers: \n9x19mm (or simply 9mm) - fits most basic pistols (Glock, for example) and SMGs, quite easy to find and gets job done versus usual zombies;\n 00 buckshot - for most shotguns.  Very powerful against unarmored target at closer ranges;\n 5.56mm (.223) - for rifles.  Good long range option.\n 7.62mm (.308) - for even more powerful rifles.  Also good long range option.\n  It should be enough in the beginning.  Or even just grab any shotgun, fill it with buckshot and give them hell!",
+       "Q: I have a question that's not addressed here. How can I get an answer?\nA: Check the wiki, or ask the helpful people on the forum or at the chat channels. Links are provided in MOTD in the main menu."
+     ]
+   }
+diff --git a/data/json/items/ammo/223.json b/data/json/items/ammo/223.json
+index beaea0d4e9f..254058920f2 100644
+--- a/data/json/items/ammo/223.json
++++ b/data/json/items/ammo/223.json
+@@ -2,8 +2,8 @@
+   {
+     "id": "223",
+     "type": "AMMO",
+-    "name": { "str": ".223 Remington" },
+-    "description": ".223 Remington ammunition with 36gr JHP bullets.  The .223 round has been very popular with civilian shooters for almost a century, finding use in a wide variety of weapons.  It generates lower pressure than 5.56 NATO leading to slightly decreased accuracy and recoil.",
++    "name": { "str": "5.56x45mm '.223 Remington'" },
++    "description": ".223 Remington ammunition with 36gr JHP bullets.  The .223 round has been very popular with civilian shooters for almost a century, finding use in a wide variety of weapons.  It generates lower pressure than 5.56x45mm NATO leading to slightly decreased accuracy and recoil.",
+     "weight": "12 g",
+     "volume": "250 ml",
+     "price": 280,
+@@ -27,7 +27,7 @@
+     "id": "556",
+     "copy-from": "223",
+     "type": "AMMO",
+-    "name": { "str": "5.56 NATO M855A1" },
++    "name": { "str": "5.56x45mm NATO M855A1" },
+     "description": "5.56x45mm ammunition with a 62gr FMJ bullet containing a steel penetrator.  Its light weight, high accuracy, and manageable recoil lead to widespread use in the 20th century and it remains popular among militaries and civilians.",
+     "price": 290,
+     "price_postapoc": 900,
+@@ -41,7 +41,7 @@
+     "id": "556_incendiary",
+     "copy-from": "556",
+     "type": "AMMO",
+-    "name": { "str": "5.56 NATO tracer" },
++    "name": { "str": "5.56x45mm NATO tracer" },
+     "description": "This ammunition is a one-in-five mix of M855A1 and M856 tracer rounds to help keep the weapon they are fired from on target.",
+     "extend": { "effects": [ "INCENDIARY" ] }
+   },
+@@ -49,7 +49,7 @@
+     "id": "bp_223",
+     "copy-from": "223",
+     "type": "AMMO",
+-    "name": { "str": ".223 Remington, black powder" },
++    "name": { "str": "5.56x45mm '.223 Remington', black powder" },
+     "proportional": {
+       "price": 0.3,
+       "damage": { "damage_type": "bullet", "amount": 0.57, "armor_penetration": 0.5 },
+@@ -63,7 +63,7 @@
+     "id": "bp_556",
+     "copy-from": "556",
+     "type": "AMMO",
+-    "name": { "str": "5.56 NATO, black powder" },
++    "name": { "str": "5.56x45mm NATO, black powder" },
+     "proportional": {
+       "price": 0.3,
+       "damage": { "damage_type": "bullet", "amount": 0.57, "armor_penetration": 0.5 },
+@@ -77,7 +77,7 @@
+     "id": "bp_556_incendiary",
+     "copy-from": "556_incendiary",
+     "type": "AMMO",
+-    "name": { "str": "5.56 NATO tracer, black powder" },
++    "name": { "str": "5.56x45mm NATO tracer, black powder" },
+     "proportional": {
+       "price": 0.3,
+       "damage": { "damage_type": "bullet", "amount": 0.57, "armor_penetration": 0.5 },
+diff --git a/data/json/items/ammo_types.json b/data/json/items/ammo_types.json
+index 62583254eb9..06cbf7f7e8a 100644
+--- a/data/json/items/ammo_types.json
++++ b/data/json/items/ammo_types.json
+@@ -212,7 +212,8 @@
+   {
+     "type": "ammunition_type",
+     "id": "223",
+-    "name": ".223",
++    "//": "This is a 5.56x45mm round, but it's called 223 because legacy migration reasons.",
++    "name": "5.56x45mm",
+     "default": "556"
+   },
+   {
+diff --git a/data/json/items/generic/ammolink.json b/data/json/items/generic/ammolink.json
+index 2f23920986f..b7108aedbbd 100644
+--- a/data/json/items/generic/ammolink.json
++++ b/data/json/items/generic/ammolink.json
+@@ -17,7 +17,7 @@
+     "id": "ammolink223",
+     "copy-from": "ammolink",
+     "type": "GENERIC",
+-    "name": { "str": ".223 ammo belt linkage" },
++    "name": { "str": "5.56x45mm ammo belt linkage" },
+     "use_action": { "type": "ammobelt", "belt": "belt223" }
+   },
+   {
+diff --git a/data/json/items/generic/casing.json b/data/json/items/generic/casing.json
+index f486ad3126a..133ceb06528 100644
+--- a/data/json/items/generic/casing.json
++++ b/data/json/items/generic/casing.json
+@@ -14,8 +14,8 @@
+     "id": "223_casing",
+     "copy-from": "casing",
+     "type": "GENERIC",
+-    "name": { "str": ".223 casing" },
+-    "description": "An empty casing from a .223 round.",
++    "name": { "str": "5.56x45mm casing" },
++    "description": "An empty casing from a 5.56x45mm round.",
+     "weight": "5 g",
+     "volume": "5ml"
+   },
+diff --git a/data/json/items/gun/223.json b/data/json/items/gun/223.json
+index d197c2cade4..5b754865152 100644
+--- a/data/json/items/gun/223.json
++++ b/data/json/items/gun/223.json
+@@ -4,7 +4,7 @@
+     "copy-from": "rifle_auto",
+     "type": "GUN",
+     "name": { "str": "Remington ACR" },
+-    "description": "This carbine was developed for military use in the early 21st century.  It is damaging and accurate, though its rate of fire is a bit slower than competing .223 carbines.",
++    "description": "This carbine was developed for military use in the early 21st century.  It is damaging and accurate, though its rate of fire is a bit slower than competing 5.56x45mm carbines.",
+     "weight": "3590 g",
+     "volume": "2 L",
+     "price": 234300,
+@@ -179,7 +179,7 @@
+     "copy-from": "rifle_auto",
+     "type": "GUN",
+     "name": { "str": "H&K G36" },
+-    "description": "Designed as a replacement for the early H&K G3 battle rifle, the G36 is more accurate, and uses the much-lighter .223 round, allowing for a higher ammo capacity.",
++    "description": "Designed as a replacement for the early H&K G3 battle rifle, the G36 is more accurate, and uses the much-lighter 5.56x45mm round, allowing for a higher ammo capacity.",
+     "weight": "3630 g",
+     "volume": "2500 ml",
+     "barrel_length": "250 ml",
+@@ -396,7 +396,7 @@
+     "id": "rifle_223",
+     "copy-from": "rifle_home_made",
+     "type": "GUN",
+-    "name": { "str": "pipe rifle: .223", "str_pl": "pipe rifles: .223" },
++    "name": { "str": "pipe rifle: 5.56x45mm", "str_pl": "pipe rifles: 5.56x45mm" },
+     "description": "A home-made rifle.  It is simply a pipe attached to a stock, with a hammer to strike the single round it holds.",
+     "weight": "4080 g",
+     "volume": "3 L",
+@@ -447,7 +447,7 @@
+     "copy-from": "rifle_auto",
+     "type": "GUN",
+     "name": { "str": "FN SCAR-L" },
+-    "description": "A highly accurate and modular assault rifle specially designed for the United States Special Operations Command.  The 'L' in its name stands for light, as it uses the lightweight .223 round.",
++    "description": "A highly accurate and modular assault rifle specially designed for the United States Special Operations Command.  The 'L' in its name stands for light, as it uses the lightweight 5.56x45mm round.",
+     "weight": "3300 g",
+     "volume": "2250 ml",
+     "barrel_length": "250 ml",
+diff --git a/data/json/items/magazine/223.json b/data/json/items/magazine/223.json
+index 74ffa8b8ba1..11ac7ac14b1 100644
+--- a/data/json/items/magazine/223.json
++++ b/data/json/items/magazine/223.json
+@@ -33,7 +33,7 @@
+     "id": "ruger5",
+     "looks_like": "stanag30",
+     "type": "MAGAZINE",
+-    "name": { "str": "Ruger .223 5-round magazine" },
++    "name": { "str": "Ruger 5.56x45mm 5-round magazine" },
+     "description": "A compact 5-round box magazine used with the Ruger Mini-14 rifle.",
+     "weight": "60 g",
+     "volume": "250 ml",
+@@ -70,7 +70,7 @@
+     "copy-from": "stanag10",
+     "looks_like": "stanag30",
+     "type": "MAGAZINE",
+-    "name": { "str": "Ruger .223 10-round magazine" },
++    "name": { "str": "Ruger 5.56x45mm 10-round magazine" },
+     "description": "A compact 10-round box magazine used with the Ruger Mini-14 rifle.",
+     "ammo_type": "223"
+   },
+@@ -79,7 +79,7 @@
+     "copy-from": "stanag20",
+     "looks_like": "stanag30",
+     "type": "MAGAZINE",
+-    "name": { "str": "Ruger .223 20-round magazine" },
++    "name": { "str": "Ruger 5.56x45mm 20-round magazine" },
+     "description": "A 20-round box magazine used with the Ruger Mini-14 rifle.",
+     "ammo_type": "223"
+   },
+@@ -87,7 +87,7 @@
+     "id": "ruger30",
+     "looks_like": "stanag30",
+     "type": "MAGAZINE",
+-    "name": { "str": "Ruger .223 30-round magazine" },
++    "name": { "str": "Ruger 5.56x45mm 30-round magazine" },
+     "description": "A high-capacity box magazine for use with the Ruger Mini-14 rifle.",
+     "weight": "360 g",
+     "volume": "500 ml",
+@@ -106,7 +106,7 @@
+     "copy-from": "stanag90",
+     "looks_like": "stanag30",
+     "type": "MAGAZINE",
+-    "name": { "str": "Ruger .223 90-round snail drum magazine" },
++    "name": { "str": "Ruger 5.56x45mm 90-round snail drum magazine" },
+     "description": "A bulky 90-round snail drum magazine for use with the Ruger Mini-14 rifle.",
+     "ammo_type": "223"
+   },
+@@ -115,7 +115,7 @@
+     "copy-from": "stanag100drum",
+     "looks_like": "stanag30",
+     "type": "MAGAZINE",
+-    "name": { "str": "Ruger .223 100-round double drum magazine" },
++    "name": { "str": "Ruger 5.56x45mm 100-round double drum magazine" },
+     "description": "A bulky 100-round double drum magazine for use with the Ruger Mini-14 rifle.",
+     "ammo_type": "223"
+   },
+diff --git a/data/json/obsoletion/items.json b/data/json/obsoletion/items.json
+index 4355e98444f..f90219f33a8 100644
+--- a/data/json/obsoletion/items.json
++++ b/data/json/obsoletion/items.json
+@@ -195,8 +195,8 @@
+   {
+     "id": "retool_223",
+     "type": "GUNMOD",
+-    "name": { "str": ".223 caliber conversion kit" },
+-    "description": "This kit is used to convert a shotgun, 5.45x39mm, 7.62x39mm, .30-06, or .308 rifle to the popular, accurate, and lighter .223 caliber.  The conversion results in slight reductions to both accuracy and ammo capacity.",
++    "name": { "str": "5.56x45mm caliber conversion kit" },
++    "description": "This kit is used to convert a shotgun, 5.45x39mm, 7.62x39mm, .30-06, or .308 rifle to the popular, accurate, and lighter 5.56x45mm caliber.  The conversion results in slight reductions to both accuracy and ammo capacity.",
+     "weight": "114 g",
+     "volume": "500 ml",
+     "integral_volume": 0,
+@@ -1662,7 +1662,7 @@
+     "looks_like": "sw_619",
+     "type": "GUN",
+     "name": { "str": "L2037 Backup" },
+-    "description": "The logical extension of Leadworks' autorevolver series, this massive 'sidearm' fires 5.56 NATO to share ammo with a soldier's rifle.  The muzzle flash and report of this 5-shot revolver are incredible, producing ballistics similar to .357 Magnum.  Similar to other Leadworks products it doesn't accept third-party modifications.",
++    "description": "The logical extension of Leadworks' autorevolver series, this massive 'sidearm' fires 5.56x45mm NATO to share ammo with a soldier's rifle.  The muzzle flash and report of this 5-shot revolver are incredible, producing ballistics similar to .357 Magnum.  Similar to other Leadworks products it doesn't accept third-party modifications.",
+     "weight": "2370 g",
+     "volume": "750 ml",
+     "price": 267000,
+@@ -3971,7 +3971,7 @@
+     "id": "reloaded_223",
+     "copy-from": "223",
+     "type": "AMMO",
+-    "name": { "str": ".223 Remington, reloaded" },
++    "name": { "str": "5.56x45mm '.223 Remington', reloaded" },
+     "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
+     "extend": { "effects": [ "RECYCLED" ] },
+     "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
+@@ -3980,7 +3980,7 @@
+     "id": "reloaded_556",
+     "copy-from": "556",
+     "type": "AMMO",
+-    "name": { "str": "5.56 NATO, reloaded" },
++    "name": { "str": "5.56x45mm NATO, reloaded" },
+     "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
+     "extend": { "effects": [ "RECYCLED" ] },
+     "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
+@@ -3989,7 +3989,7 @@
+     "id": "reloaded_556_incendiary",
+     "copy-from": "556_incendiary",
+     "type": "AMMO",
+-    "name": { "str": "5.56 NATO tracer, reloaded" },
++    "name": { "str": "5.56x45mm NATO tracer, reloaded" },
+     "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
+     "extend": { "effects": [ "RECYCLED" ] },
+     "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
+diff --git a/data/mods/No_Hope/Items/guns.json b/data/mods/No_Hope/Items/guns.json
+index a1c1a71b68e..59909c44730 100644
+--- a/data/mods/No_Hope/Items/guns.json
++++ b/data/mods/No_Hope/Items/guns.json
+@@ -251,7 +251,7 @@
+     "type": "GUN",
+     "name": { "str": "L2037 Backup" },
+     "//": "Most real-life autorevolvers use 6-7.5 inch barrel, but this one's mentioned to be particularly massive.",
+-    "description": "The logical extension of Leadworks' autorevolver series, this massive 'sidearm' fires 5.56 NATO to share ammo with a soldier's rifle.  The muzzle flash and report of this 5-shot revolver are incredible, producing ballistics similar to .357 Magnum.  Similar to other Leadworks products it doesn't accept third-party modifications.",
++    "description": "The logical extension of Leadworks' autorevolver series, this massive 'sidearm' fires 5.56x45mm NATO to share ammo with a soldier's rifle.  The muzzle flash and report of this 5-shot revolver are incredible, producing ballistics similar to .357 Magnum.  Similar to other Leadworks products it doesn't accept third-party modifications.",
+     "weight": "2370 g",
+     "volume": "750 ml",
+     "price": 267000,
+-- 
+2.40.0
+
diff --git a/revert-13_fix-i18n-metric-bullets-part-2-rename-.308-7.62x51mm.patch b/revert-13_fix-i18n-metric-bullets-part-2-rename-.308-7.62x51mm.patch
new file mode 100644
index 0000000..2cef13b
--- /dev/null
+++ b/revert-13_fix-i18n-metric-bullets-part-2-rename-.308-7.62x51mm.patch
@@ -0,0 +1,498 @@
+From 4aceff1708412b5778d89a44d0ad178c064c04e6 Mon Sep 17 00:00:00 2001
+From: scarf <greenscarf005@gmail.com>
+Date: Sat, 29 Apr 2023 13:21:19 +0900
+Subject: [PATCH 03/31] fix(i18n): metric bullets part 2: rename `.308` ->
+ `7.62x51mm` (#2724)
+
+* refactor: `7.62` -> `7.62x51mm`
+
+since there's many 7.62mm calibre rounds with different lengths.
+
+* refactor: `.308`-> `7.62x51mm`
+---
+ data/help/texts.json                                 |  2 +-
+ data/json/items/ammo/308.json                        | 10 +++++-----
+ data/json/items/ammo_types.json                      |  2 +-
+ data/json/items/generic/ammolink.json                |  2 +-
+ data/json/items/generic/casing.json                  |  4 ++--
+ data/json/items/gun/308.json                         |  8 ++++----
+ data/json/monsters/turrets.json                      |  2 +-
+ data/json/obsoletion/items.json                      |  8 ++++----
+ data/json/requirements/ammo.json                     |  4 ++--
+ data/mods/Aftershock/items/corpses.json              |  2 +-
+ data/mods/Aftershock/items/inactiverobot.json        |  2 +-
+ data/mods/Aftershock/mobs/robots.json                |  2 +-
+ data/mods/EW_Pack/obsolete.json                      | 12 ++++++------
+ data/mods/Modular_Turrets/corpses.json               |  4 ++--
+ data/mods/Modular_Turrets/items.json                 |  6 +++---
+ data/mods/Modular_Turrets/monster.json               |  4 ++--
+ data/mods/Modular_Turrets/roboguns.json              |  2 +-
+ data/mods/Salvaged_Robots/corpses.json               |  2 +-
+ data/mods/Salvaged_Robots/items.json                 |  2 +-
+ data/mods/Salvaged_Robots/monsters.json              |  2 +-
+ .../blazemod/vehicleparts/blaze_turrets_vanilla.json |  4 ++--
+ doc/GAME_BALANCE.md                                  |  4 ++--
+ tests/ranged_burst_balance_test.cpp                  |  8 ++++----
+ 23 files changed, 49 insertions(+), 49 deletions(-)
+
+diff --git a/data/help/texts.json b/data/help/texts.json
+index a155169f812..45f26483c03 100644
+--- a/data/help/texts.json
++++ b/data/help/texts.json
+@@ -316,7 +316,7 @@
+       "Q: Why can't I carry anything?\nA: At the start of the game you only have the space in your pockets.  A good first goal of many survivors is to find a backpack or pouch to store things in.",
+       "Q: Help!  I started a fire and now my house is burning down!\nA: Fires will spread to nearby flammable tiles if they are able.  Lighting a fire in a set-up brazier, stove, wood stove, stone fireplace, pit, or even in a kitchen stove will stop it from spreading.  Fire extinguishers can put out fires that get out of control.  You can put out a fire in the fireplace by examining it.",
+       "Q: I'm cold and can't sleep at night!\nA: Gather some clothes and put them in the place you use to sleep in.  Being hungry, thirsty, wet, or injured can also make you feel the cold more, so try to avoid these effects before you go to sleep.  Pillows and some other appliances will help you sleep, and the quality of your sleeping spot is also very important.",
+-      "Q: There are too many calibers and guns.  It confuses me - I don't usually understand what is compatible with what.\nA: Try to remember few usual calibers: \n9x19mm (or simply 9mm) - fits most basic pistols (Glock, for example) and SMGs, quite easy to find and gets job done versus usual zombies;\n 00 buckshot - for most shotguns.  Very powerful against unarmored target at closer ranges;\n 5.56mm (.223) - for rifles.  Good long range option.\n 7.62mm (.308) - for even more powerful rifles.  Also good long range option.\n  It should be enough in the beginning.  Or even just grab any shotgun, fill it with buckshot and give them hell!",
++      "Q: There are too many calibers and guns.  It confuses me - I don't usually understand what is compatible with what.\nA: Try to remember few usual calibers: \n9x19mm (or simply 9mm) - fits most basic pistols (Glock, for example) and SMGs, quite easy to find and gets job done versus usual zombies;\n 00 buckshot - for most shotguns.  Very powerful against unarmored target at closer ranges;\n 5.56x45mm (.223) - for rifles.  Good long range option.\n 7.62x51mm (.308) - for even more powerful rifles.  Also good long range option.\n  It should be enough in the beginning.  Or even just grab any shotgun, fill it with buckshot and give them hell!",
+       "Q: I have a question that's not addressed here. How can I get an answer?\nA: Check the wiki, or ask the helpful people on the forum or at the chat channels. Links are provided in MOTD in the main menu."
+     ]
+   }
+diff --git a/data/json/items/ammo/308.json b/data/json/items/ammo/308.json
+index 52e9c588eda..c8832a73794 100644
+--- a/data/json/items/ammo/308.json
++++ b/data/json/items/ammo/308.json
+@@ -2,7 +2,7 @@
+   {
+     "id": "308",
+     "type": "AMMO",
+-    "name": { "str": ".308 Winchester" },
++    "name": { "str": "7.62x51mm '.308 Winchester'" },
+     "description": ".308 Winchester ammunition with 168gr hollow point bullets.  The .308 round is one of the most popular hunting cartridges in the world due to its accuracy and power.",
+     "weight": "18 g",
+     "volume": "250 ml",
+@@ -27,7 +27,7 @@
+     "id": "762_51",
+     "copy-from": "308",
+     "type": "AMMO",
+-    "name": { "str": "7.62x51mm M80" },
++    "name": { "str": "7.62x51mm NATO M80" },
+     "casing": "762_51_casing",
+     "description": "A 7.62x51mm NATO round with a 147gr FMJ bullet.  It is a powerful rifle cartridge commonly used by hunters and military snipers because of its high accuracy and long range.",
+     "relative": { "damage": { "damage_type": "bullet", "amount": -7, "armor_penetration": 17 }, "dispersion": -10 },
+@@ -46,7 +46,7 @@
+     "id": "bp_308",
+     "copy-from": "308",
+     "type": "AMMO",
+-    "name": { "str": ".308 Winchester, black powder" },
++    "name": { "str": "7.62x51mm '.308 Winchester', black powder" },
+     "proportional": {
+       "price": 0.3,
+       "damage": { "damage_type": "bullet", "amount": 0.76, "armor_penetration": 0.5 },
+@@ -60,7 +60,7 @@
+     "id": "bp_762_51",
+     "copy-from": "762_51",
+     "type": "AMMO",
+-    "name": { "str": "7.62x51mm, black powder" },
++    "name": { "str": "7.62x51mm NATO, black powder" },
+     "proportional": {
+       "price": 0.3,
+       "damage": { "damage_type": "bullet", "amount": 0.76, "armor_penetration": 0.5 },
+@@ -74,7 +74,7 @@
+     "id": "bp_762_51_incendiary",
+     "copy-from": "762_51_incendiary",
+     "type": "AMMO",
+-    "name": { "str": "7.62x51mm tracer, black powder" },
++    "name": { "str": "7.62x51mm NATO tracer, black powder" },
+     "proportional": {
+       "price": 0.3,
+       "damage": { "damage_type": "bullet", "amount": 0.76, "armor_penetration": 0.5 },
+diff --git a/data/json/items/ammo_types.json b/data/json/items/ammo_types.json
+index 06cbf7f7e8a..19c14a9397d 100644
+--- a/data/json/items/ammo_types.json
++++ b/data/json/items/ammo_types.json
+@@ -231,7 +231,7 @@
+   {
+     "type": "ammunition_type",
+     "id": "308",
+-    "name": ".308",
++    "name": "7.62x51mm",
+     "default": "762_51"
+   },
+   {
+diff --git a/data/json/items/generic/ammolink.json b/data/json/items/generic/ammolink.json
+index b7108aedbbd..4635d1a3bf4 100644
+--- a/data/json/items/generic/ammolink.json
++++ b/data/json/items/generic/ammolink.json
+@@ -24,7 +24,7 @@
+     "id": "ammolink308",
+     "copy-from": "ammolink",
+     "type": "GENERIC",
+-    "name": { "str": ".308 ammo belt linkage" },
++    "name": { "str": "7.62x51mm ammo belt linkage" },
+     "use_action": { "type": "ammobelt", "belt": "belt308" }
+   },
+   {
+diff --git a/data/json/items/generic/casing.json b/data/json/items/generic/casing.json
+index 133ceb06528..1643fd856e7 100644
+--- a/data/json/items/generic/casing.json
++++ b/data/json/items/generic/casing.json
+@@ -78,8 +78,8 @@
+     "copy-from": "casing",
+     "looks_like": "223_casing",
+     "type": "GENERIC",
+-    "name": { "str": ".308 casing" },
+-    "description": "An empty casing from a .308 round.",
++    "name": { "str": "7.62x51mm '.308 Winchester' casing" },
++    "description": "An empty casing from a 7.62x51mm '.308 Winchester' round.",
+     "weight": "6 g",
+     "volume": "9ml"
+   },
+diff --git a/data/json/items/gun/308.json b/data/json/items/gun/308.json
+index 0bc0eecb631..30c25837e42 100644
+--- a/data/json/items/gun/308.json
++++ b/data/json/items/gun/308.json
+@@ -206,8 +206,8 @@
+     "copy-from": "rifle_manual",
+     "type": "GUN",
+     "name": { "str": "handmade heavy carbine" },
+-    "//": "It's amongst the smallest of the .308 firearms, and a scrap weapon as well. This means a short handmade barrel, and considerable loss of energy.",
+-    "description": "A homemade lever-action magazine-fed smoothbore rifle.  While still a primitive pipe and 2x4 design, some minor improvements have been made, such as being able to accept G3 compatible magazines, and chambering the more powerful .308 rounds.",
++    "//": "It's amongst the smallest of the 7.62x51mm(.308) firearms, and a scrap weapon as well. This means a short handmade barrel, and considerable loss of energy.",
++    "description": "A homemade lever-action magazine-fed smoothbore rifle.  While still a primitive pipe and 2x4 design, some minor improvements have been made, such as being able to accept G3 compatible magazines, and chambering the more powerful 7.62x51mm (.308) rounds.",
+     "weight": "2311 g",
+     "volume": "2 L",
+     "price": 10000,
+@@ -243,7 +243,7 @@
+     "copy-from": "rifle_manual",
+     "type": "GUN",
+     "name": { "str_sp": "Savage 111F" },
+-    "description": "A very accurate rifle chambered for the powerful .308 round.  Its very low ammo capacity is offset by its accuracy and near-complete lack of recoil.",
++    "description": "A very accurate rifle chambered for the powerful 7.62x51mm (.308) round.  Its very low ammo capacity is offset by its accuracy and near-complete lack of recoil.",
+     "weight": "2993 g",
+     "volume": "3 L",
+     "price": 53000,
+@@ -264,7 +264,7 @@
+     "copy-from": "scar_l",
+     "type": "GUN",
+     "name": { "str_sp": "FN SCAR-H" },
+-    "description": "A highly accurate and modular battle rifle specially designed for the United States Special Operations Command.  The 'H' in its name stands for heavy, as it uses the powerful .308 round.",
++    "description": "A highly accurate and modular battle rifle specially designed for the United States Special Operations Command.  The 'H' in its name stands for heavy, as it uses the powerful 7.62x51mm (.308) round.",
+     "weight": "3640 g",
+     "ascii_picture": "scar-H",
+     "ammo": "308",
+diff --git a/data/json/monsters/turrets.json b/data/json/monsters/turrets.json
+index df9783c632d..396a7007c88 100644
+--- a/data/json/monsters/turrets.json
++++ b/data/json/monsters/turrets.json
+@@ -254,7 +254,7 @@
+     "id": "mon_turret_longrange",
+     "type": "MONSTER",
+     "name": { "str": "longrange milspec turret" },
+-    "description": "The General Atomics TX-7 Sniper, an automated milspec turret equipped with a 7.62mm gun.  Designed as a counter-sniper turret to cover the vulnerability of TX-5 Sentinel to sniper fire.  Its advanced target recognition system and 7.62mm gun allows it to engage targets protected by modern body armor at very long range.",
++    "description": "The General Atomics TX-7 Sniper, an automated milspec turret equipped with a 7.62x51mm gun.  Designed as a counter-sniper turret to cover the vulnerability of TX-5 Sentinel to sniper fire.  Its advanced target recognition system and 7.62x51mm gun allows it to engage targets protected by modern body armor at very long range.",
+     "default_faction": "military",
+     "species": [ "ROBOT" ],
+     "looks_like": "mon_turret_bmg",
+diff --git a/data/json/obsoletion/items.json b/data/json/obsoletion/items.json
+index f90219f33a8..1b029a72e13 100644
+--- a/data/json/obsoletion/items.json
++++ b/data/json/obsoletion/items.json
+@@ -196,7 +196,7 @@
+     "id": "retool_223",
+     "type": "GUNMOD",
+     "name": { "str": "5.56x45mm caliber conversion kit" },
+-    "description": "This kit is used to convert a shotgun, 5.45x39mm, 7.62x39mm, .30-06, or .308 rifle to the popular, accurate, and lighter 5.56x45mm caliber.  The conversion results in slight reductions to both accuracy and ammo capacity.",
++    "description": "This kit is used to convert a shotgun, 5.45x39mm, 7.62x39mm, .30-06, or 7.62x51mm rifle to the popular, accurate, and lighter 5.56x45mm caliber.  The conversion results in slight reductions to both accuracy and ammo capacity.",
+     "weight": "114 g",
+     "volume": "500 ml",
+     "integral_volume": 0,
+@@ -215,8 +215,8 @@
+   {
+     "id": "retool_308",
+     "type": "GUNMOD",
+-    "name": { "str": ".308 caliber conversion kit" },
+-    "description": "This kit is used to convert a shotgun or 7.62x39mm, .223 or .30-06 rifle to the popular and powerful .308 caliber.  The conversion results in reduced ammo capacity and a slight reduction to accuracy.",
++    "name": { "str": "7.62x51mm caliber conversion kit" },
++    "description": "This kit is used to convert a shotgun or 7.62x39mm, .223 or .30-06 rifle to the popular and powerful 7.62x51mm caliber.  The conversion results in reduced ammo capacity and a slight reduction to accuracy.",
+     "weight": "114 g",
+     "volume": "500 ml",
+     "integral_volume": 0,
+@@ -4027,7 +4027,7 @@
+     "id": "reloaded_308",
+     "copy-from": "308",
+     "type": "AMMO",
+-    "name": { "str": ".308 Winchester, reloaded" },
++    "name": { "str": "7.62x51mm '.308 Winchester', reloaded" },
+     "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
+     "extend": { "effects": [ "RECYCLED" ] },
+     "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
+diff --git a/data/json/requirements/ammo.json b/data/json/requirements/ammo.json
+index add42666055..7b1a6d112fa 100644
+--- a/data/json/requirements/ammo.json
++++ b/data/json/requirements/ammo.json
+@@ -97,7 +97,7 @@
+   {
+     "id": "223_casehead",
+     "type": "requirement",
+-    "//": "References needed for boltfaces and magazines using .223 or derivatives",
++    "//": "References needed for boltfaces and magazines using 5.56x45mm (.223) or derivatives",
+     "tools": [
+       [
+         [ "300blk_casing", -1 ],
+@@ -121,7 +121,7 @@
+   {
+     "id": "308_casehead",
+     "type": "requirement",
+-    "//": "References needed for boltfaces and magazines using .308 or derivatives",
++    "//": "References needed for boltfaces and magazines using 7.62x51mm (.308) or derivatives",
+     "tools": [
+       [
+         [ "308_casing", -1 ],
+diff --git a/data/mods/Aftershock/items/corpses.json b/data/mods/Aftershock/items/corpses.json
+index bf33efab485..b0f8b35d8a4 100644
+--- a/data/mods/Aftershock/items/corpses.json
++++ b/data/mods/Aftershock/items/corpses.json
+@@ -142,7 +142,7 @@
+     "copy-from": "broken_milbot_disarmed",
+     "color": "light_gray",
+     "name": "broken military robot",
+-    "description": "A broken military robot, shattered and inert.  This one is armed with an integrated 7.62mm firearm.  Could be stripped for parts."
++    "description": "A broken military robot, shattered and inert.  This one is armed with an integrated 7.62x51mm firearm.  Could be stripped for parts."
+   },
+   {
+     "type": "GENERIC",
+diff --git a/data/mods/Aftershock/items/inactiverobot.json b/data/mods/Aftershock/items/inactiverobot.json
+index b7e97390ea3..a06dba740ae 100644
+--- a/data/mods/Aftershock/items/inactiverobot.json
++++ b/data/mods/Aftershock/items/inactiverobot.json
+@@ -352,7 +352,7 @@
+     "type": "TOOL",
+     "copy-from": "bot_milbot_base",
+     "name": "inactive military robot",
+-    "description": "An unpowered military robot fitted with an integrated 7.62 firearm and electric prod.  Activate this item, with ammo in your inventory, to load and deploy the robot.",
++    "description": "An unpowered military robot fitted with an integrated 7.62x51mm firearm and electric prod.  Activate this item, with ammo in your inventory, to load and deploy the robot.",
+     "color": "green",
+     "use_action": {
+       "type": "place_monster",
+diff --git a/data/mods/Aftershock/mobs/robots.json b/data/mods/Aftershock/mobs/robots.json
+index 29e3f463f74..df35663319b 100644
+--- a/data/mods/Aftershock/mobs/robots.json
++++ b/data/mods/Aftershock/mobs/robots.json
+@@ -541,7 +541,7 @@
+     "type": "MONSTER",
+     "copy-from": "mon_milbot_base",
+     "name": "military robot",
+-    "description": "A military robot still operating due to its internal power core.  This one is armed with an electric prod and an integrated 7.62mm firearm.",
++    "description": "A military robot still operating due to its internal power core.  This one is armed with an electric prod and an integrated 7.62x51mm firearm.",
+     "diff": 20,
+     "melee_damage": [ { "damage_type": "electric", "amount": 6 } ],
+     "starting_ammo": { "762_51": 1000 },
+diff --git a/data/mods/EW_Pack/obsolete.json b/data/mods/EW_Pack/obsolete.json
+index bbda9e0f7a0..41d98b843fa 100644
+--- a/data/mods/EW_Pack/obsolete.json
++++ b/data/mods/EW_Pack/obsolete.json
+@@ -2,12 +2,12 @@
+   {
+     "type": "GUNMOD",
+     "id": "retool_545",
+-    "name": "5.45 caliber conversion kit",
++    "name": "5.45x42mm caliber conversion kit",
+     "location": "bore",
+     "weight": "114 g",
+     "color": "green",
+     "price": 50000,
+-    "description": "This kit is used to convert 6.54 rifle to the 5.45 caliber.  The conversion results in slight reductions to recoil.",
++    "description": "This kit is used to convert 6.54x42mm rifle to the 5.45x39mm caliber.  The conversion results in slight reductions to recoil.",
+     "symbol": ":",
+     "material": [ "steel" ],
+     "volume": "500 ml",
+@@ -19,12 +19,12 @@
+   {
+     "type": "GUNMOD",
+     "id": "retool_654",
+-    "name": "6.54 caliber conversion kit",
++    "name": "6.54x42mm caliber conversion kit",
+     "location": "bore",
+     "weight": "114 g",
+     "color": "green",
+     "price": 50000,
+-    "description": "This kit is used to convert 5.45 rifle to the 6.54 caliber.  The conversion results in increased recoil.",
++    "description": "This kit is used to convert 5.45x39mm rifle to the 6.54x42mm caliber.  The conversion results in increased recoil.",
+     "symbol": ":",
+     "material": [ "steel" ],
+     "volume": "500 ml",
+@@ -36,12 +36,12 @@
+   {
+     "type": "GUNMOD",
+     "id": "retool_762",
+-    "name": "7.62 caliber conversion kit",
++    "name": "7.62x39mm caliber conversion kit",
+     "location": "bore",
+     "weight": "114 g",
+     "color": "green",
+     "price": 50000,
+-    "description": "This kit is used to convert 6.54 rifle to the 7.62 caliber.  The conversion results in increased recoil.",
++    "description": "This kit is used to convert 6.54x42mm rifle to the 7.62x39mm caliber.  The conversion results in increased recoil.",
+     "symbol": ":",
+     "material": [ "steel" ],
+     "volume": "500 ml",
+diff --git a/data/mods/Modular_Turrets/corpses.json b/data/mods/Modular_Turrets/corpses.json
+index 85812093300..aff9f781350 100644
+--- a/data/mods/Modular_Turrets/corpses.json
++++ b/data/mods/Modular_Turrets/corpses.json
+@@ -118,8 +118,8 @@
+     "type": "GENERIC",
+     "copy-from": "broken_turret_base",
+     "color": "light_green",
+-    "name": "broken 7.62mm turret",
+-    "description": "A broken military-grade 7.62mm turret.  Much less threatening now that it lies limp on solid ground.  Could be gutted for parts."
++    "name": "broken 7.62x51mm turret",
++    "description": "A broken military-grade 7.62x51mm turret.  Much less threatening now that it lies limp on solid ground.  Could be gutted for parts."
+   },
+   {
+     "id": "broken_milturret_50bmg",
+diff --git a/data/mods/Modular_Turrets/items.json b/data/mods/Modular_Turrets/items.json
+index 1671f3c5673..5055135e79e 100644
+--- a/data/mods/Modular_Turrets/items.json
++++ b/data/mods/Modular_Turrets/items.json
+@@ -84,7 +84,7 @@
+     "id": "robopart_308",
+     "type": "GENERIC",
+     "copy-from": "robopart_base",
+-    "name": "integral 7.62mm firearm"
++    "name": "integral 7.62x51mm firearm"
+   },
+   {
+     "id": "robopart_shot",
+@@ -356,8 +356,8 @@
+     "id": "bot_milturret_308",
+     "copy-from": "bot_turret_base",
+     "type": "TOOL",
+-    "name": "inactive 7.62mm military turret",
+-    "description": "An inactive 7.62mm military turret.  Up to 100 standard 7.62mm NATO rounds will be automatically loaded from your inventory into the turret upon activation.  Place the turret and it will ID you as friendly with its advanced IFF software.  Consult your safety manual in the event of a malfunction.",
++    "name": "inactive 7.62x51mm military turret",
++    "description": "An inactive 7.62x51mm military turret.  Up to 100 standard 7.62x51mm NATO rounds will be automatically loaded from your inventory into the turret upon activation.  Place the turret and it will ID you as friendly with its advanced IFF software.  Consult your safety manual in the event of a malfunction.",
+     "color": "green",
+     "price": 10000,
+     "price_postapoc": 10000,
+diff --git a/data/mods/Modular_Turrets/monster.json b/data/mods/Modular_Turrets/monster.json
+index c1b765fe26d..fc52cf074a8 100644
+--- a/data/mods/Modular_Turrets/monster.json
++++ b/data/mods/Modular_Turrets/monster.json
+@@ -195,9 +195,9 @@
+     "id": "mon_milturret_308",
+     "type": "MONSTER",
+     "copy-from": "base_turret",
+-    "name": "7.62mm turret",
++    "name": "7.62x51mm turret",
+     "symbol": "t",
+-    "description": "The Leadworks LLC's TX-32H Sentry, a military-grade automated machinegun turret using state of the art ATR systems to dynamically reorient itself to new friends and enemies alike.  Its integrated 7.62 rifle can swivel a full 360 degrees.",
++    "description": "The Leadworks LLC's TX-32H Sentry, a military-grade automated machinegun turret using state of the art ATR systems to dynamically reorient itself to new friends and enemies alike.  Its integrated 7.62x51mm rifle can swivel a full 360 degrees.",
+     "default_faction": "military",
+     "diff": 20,
+     "color": "green",
+diff --git a/data/mods/Modular_Turrets/roboguns.json b/data/mods/Modular_Turrets/roboguns.json
+index 5dad0377169..a3678fd4127 100644
+--- a/data/mods/Modular_Turrets/roboguns.json
++++ b/data/mods/Modular_Turrets/roboguns.json
+@@ -75,7 +75,7 @@
+     "id": "robogun_308",
+     "type": "GUN",
+     "copy-from": "robogun_base",
+-    "name": "integral 7.62mm firearm",
++    "name": "integral 7.62x51mm firearm",
+     "skill": "rifle",
+     "ammo": "308",
+     "clip_size": 100,
+diff --git a/data/mods/Salvaged_Robots/corpses.json b/data/mods/Salvaged_Robots/corpses.json
+index 920c4317c40..e1884e9efb4 100644
+--- a/data/mods/Salvaged_Robots/corpses.json
++++ b/data/mods/Salvaged_Robots/corpses.json
+@@ -375,7 +375,7 @@
+     "copy-from": "broken_milbot_disarmed",
+     "color": "light_gray",
+     "name": "broken military robot",
+-    "description": "A broken military robot, shattered and inert.  This one is armed with an integrated 7.62mm firearm.  Could be stripped for parts."
++    "description": "A broken military robot, shattered and inert.  This one is armed with an integrated 7.62x51mm firearm.  Could be stripped for parts."
+   },
+   {
+     "type": "GENERIC",
+diff --git a/data/mods/Salvaged_Robots/items.json b/data/mods/Salvaged_Robots/items.json
+index f393489d2c8..0179b65c561 100644
+--- a/data/mods/Salvaged_Robots/items.json
++++ b/data/mods/Salvaged_Robots/items.json
+@@ -720,7 +720,7 @@
+     "type": "TOOL",
+     "copy-from": "bot_milbot_base",
+     "name": "inactive military robot",
+-    "description": "An unpowered military robot fitted with an integrated 7.62 firearm and electric prod.  Activate this item, with ammo in your inventory, to load and deploy the robot.",
++    "description": "An unpowered military robot fitted with an integrated 7.62x51mm firearm and electric prod.  Activate this item, with ammo in your inventory, to load and deploy the robot.",
+     "color": "green",
+     "use_action": {
+       "type": "place_monster",
+diff --git a/data/mods/Salvaged_Robots/monsters.json b/data/mods/Salvaged_Robots/monsters.json
+index 9e9cf18b476..2f62bec75cf 100644
+--- a/data/mods/Salvaged_Robots/monsters.json
++++ b/data/mods/Salvaged_Robots/monsters.json
+@@ -813,7 +813,7 @@
+     "type": "MONSTER",
+     "copy-from": "mon_milbot_base",
+     "name": "military robot",
+-    "description": "A military robot still operating due to its internal power core.  This one is armed with an electric prod and an integrated 7.62mm firearm.",
++    "description": "A military robot still operating due to its internal power core.  This one is armed with an electric prod and an integrated 7.62x51mm firearm.",
+     "diff": 20,
+     "melee_damage": [ { "damage_type": "electric", "amount": 6 } ],
+     "starting_ammo": { "762_51": 1000 },
+diff --git a/data/mods/blazemod/vehicleparts/blaze_turrets_vanilla.json b/data/mods/blazemod/vehicleparts/blaze_turrets_vanilla.json
+index 7a80bf31e28..6dce9cf0142 100644
+--- a/data/mods/blazemod/vehicleparts/blaze_turrets_vanilla.json
++++ b/data/mods/blazemod/vehicleparts/blaze_turrets_vanilla.json
+@@ -457,7 +457,7 @@
+     "id": "mounted_rifle_308",
+     "copy-from": "turret",
+     "type": "vehicle_part",
+-    "name": { "str": "mounted .308 pipe rifle" },
++    "name": { "str": "mounted 7.62x51mm pipe rifle" },
+     "item": "rifle_308",
+     "breaks_into": [ { "item": "rifle_308", "prob": 50 } ],
+     "requirements": { "install": { "skills": [ [ "mechanics", 4 ] ] }, "removal": { "skills": [ [ "mechanics", 2 ] ] } }
+@@ -631,7 +631,7 @@
+     "id": "mounted_surv_carbine_223",
+     "copy-from": "turret",
+     "type": "vehicle_part",
+-    "name": { "str": "mounted 223 carbine" },
++    "name": { "str": "mounted 5.56x45mm carbine" },
+     "item": "surv_carbine_223",
+     "breaks_into": [ { "item": "surv_carbine_223", "prob": 50 } ],
+     "requirements": { "install": { "skills": [ [ "mechanics", 4 ] ] }, "removal": { "skills": [ [ "mechanics", 2 ] ] } }
+diff --git a/doc/GAME_BALANCE.md b/doc/GAME_BALANCE.md
+index 5a51a530d5c..2e7ef664f27 100644
+--- a/doc/GAME_BALANCE.md
++++ b/doc/GAME_BALANCE.md
+@@ -253,8 +253,8 @@ Ammo ID            | Description                 | Energy, J | Dmg | Base Brl |
+ ,300BLK subsonic   | 220gr OTM                   | 675       | 26  | 16in     |  subsonic
+ 7.62x54mmR         | 150gr FMJ bullet            | 3629      | 60  | 28in     |                              |
+ .308 Winchester    | 168gr hollow point bullet   | 3570      | 60  | 24in     |                              |
+-7.62 NATO M80      | 147gr FMJ bullet            | 3304      | 57  | 24in     |                              |
+-7.62 NATO M62      | 142gr tracer bullet         | 3232      | 57  | 24in     |  Belt with 1/5 tracer rounds |
++7.62x51mm NATO M80 | 147gr FMJ bullet            | 3304      | 57  | 24in     |                              |
++7.62x51mm NATO M62 | 142gr tracer bullet         | 3232      | 57  | 24in     |  Belt with 1/5 tracer rounds |
+ .270 Winchester    | 130gr soft point bullet     | 3663      | 61  | 24in     |                              |
+ .30-06 Springfield | 165gr soft point bullet     | 3894      | 62  | 24in     |        damage increased by 4 |
+ .30-06 M2          | 165.7gr AP bullet           | 3676      | 60  | 24in     |         damage reduced by 10 |
+diff --git a/tests/ranged_burst_balance_test.cpp b/tests/ranged_burst_balance_test.cpp
+index ec61fad0613..de55646f92d 100644
+--- a/tests/ranged_burst_balance_test.cpp
++++ b/tests/ranged_burst_balance_test.cpp
+@@ -61,13 +61,13 @@ TEST_CASE( "unskilled_burst_no_mods", "[ranged] [balance]" )
+     check_burst_penalty( shooter, "american_180", 0 );
+     // 9mm SMG - should be manageable
+     check_burst_penalty( shooter, "calico", 60 );
+-    // .223 machine gun - should have lower penalty than a rifle of the same caliber
++    // 5.56x45mm machine gun - should have lower penalty than a rifle of the same caliber
+     check_burst_penalty( shooter, "m249", 250 );
+-    // .223 rifle
++    // 5.56x45mm rifle
+     check_burst_penalty( shooter, "m4a1", 600 );
+-    // 7.62 rifle
++    // 7.62x39mm rifle
+     check_burst_penalty( shooter, "ak47", 700 );
+-    // .50 machine gun - heaviest expected burst fire
++    // 12.7mm '.50 BMG' machine gun - heaviest expected burst fire
+     check_burst_penalty( shooter, "m2browning", 800 );
+ }
+ 
+-- 
+2.40.0
+
diff --git a/revert-14_Removed-unrelated-references-2738.patch b/revert-14_Removed-unrelated-references-2738.patch
new file mode 100644
index 0000000..1b793d7
--- /dev/null
+++ b/revert-14_Removed-unrelated-references-2738.patch
@@ -0,0 +1,188 @@
+From e1ebb6449aeaa27a841a96a5590b6a5df5d1038d Mon Sep 17 00:00:00 2001
+From: AniDemi <60388907+AniDemi@users.noreply.github.com>
+Date: Mon, 1 May 2023 00:23:09 +0200
+Subject: [PATCH 01/13] Removed unrelated references (#2738)
+
+* Removed references
+
+* Revert id change
+
+* Obsoletion and migration
+
+* Quick fix
+
+* Revert 1
+
+* Revert 2
+
+* Revert 3
+---
+ data/json/items/book/misc.json | 98 ++++++++++++++++------------------
+ 1 file changed, 45 insertions(+), 53 deletions(-)
+
+diff --git a/data/json/items/book/misc.json b/data/json/items/book/misc.json
+index 0c3fb6f8994..3842cf0d27a 100644
+--- a/data/json/items/book/misc.json
++++ b/data/json/items/book/misc.json
+@@ -795,78 +795,74 @@
+       },
+       {
+         "id": "classic14",
+-        "text": "This is a paperback copy of the well-known classic \"Dark Days Ahead\", by K. G. Ranade.  There are scrawled margin notes all over it, apparently the workings of a confused and feverish mind."
+-      },
+-      {
+-        "id": "classic15",
+         "text": "This is a copy of \"Jane Eyre\".  The cover art is quite out of place, making it look more like a dime-store romance novel."
+       },
+       {
+-        "id": "classic16",
++        "id": "classic15",
+         "text": "This is a perfectly preserved hardcover copy of \"The Gunslinger\" by Stephen King, autographed by the author.  It contains a certificate of authenticity pronouncing it to be a first edition."
+       },
+       {
+-        "id": "classic17",
++        "id": "classic16",
+         "text": "This paperback copy of \"Wuthering Heights\" has a large coffee stain on the first page."
+       },
+       {
+-        "id": "classic18",
++        "id": "classic17",
+         "text": "This is a hardbound copy of \"Lady Chatterly's Lover\", by D. H. Lawrence.  It has some very explicit illustrations."
+       },
+       {
+-        "id": "classic19",
++        "id": "classic18",
+         "text": "This is a hardbound copy of \"The Catcher in the Rye.\".  It has some very nicely done illustrations."
+       },
+       {
+-        "id": "classic20",
++        "id": "classic19",
+         "text": "This is a collection of classic renaissance era stories, headlined by \"Don Quixote\"."
+       },
+-      { "id": "classic21", "text": "This is a paperback copy of \"The Fellowship of the Ring\" by Tolkien." },
+-      { "id": "classic22", "text": "This is a paperback copy of \"The Two Towers\" by Tolkien." },
+-      { "id": "classic23", "text": "This is a paperback copy of \"The Return of the King\" by Tolkien." },
++      { "id": "classic20", "text": "This is a paperback copy of \"The Fellowship of the Ring\" by Tolkien." },
++      { "id": "classic21", "text": "This is a paperback copy of \"The Two Towers\" by Tolkien." },
++      { "id": "classic22", "text": "This is a paperback copy of \"The Return of the King\" by Tolkien." },
+       {
+-        "id": "classic24",
++        "id": "classic23",
+         "text": "This is a hardbound collection of George Orwell's works, including \"1984\" and \"Animal Farm\" as well as many of his less infamous titles."
+       },
+       {
+-        "id": "classic25",
++        "id": "classic24",
+         "text": "This is a paperback copy of \"Little Women\" by Louisa May Alcott.  It appears to have been read a great many times."
+       },
+-      { "id": "classic26", "text": "This is a paperback copy of \"Of Mice and Men\" by Steinbeck." },
++      { "id": "classic25", "text": "This is a paperback copy of \"Of Mice and Men\" by Steinbeck." },
+       {
+-        "id": "classic27",
++        "id": "classic26",
+         "text": "This is a hefty hardcover copy of \"Run and Run Again\" by Finn Calpay.  There is a lengthy forward about the controversy around the book's release."
+       },
+       {
+-        "id": "classic28",
++        "id": "classic27",
+         "text": "This is a hardcover copy of \"The Gates Have Opened\" by Arianna Methusalah.  You feel like you've read this before, but can't remember where.  Something about the book fills you with unease."
+       },
+-      { "id": "classic29", "text": "This is a copy of \"The Count of Monte Cristo\" by Dumas." },
+-      { "id": "classic30", "text": "This is a copy of \"The Secret Garden\" by Frances Burnett." },
+-      { "id": "classic31", "text": "This is a copy of \"Lieutenant Hornblower\" by C.S. Forester." },
+-      { "id": "classic32", "text": "This is a copy of \"Master and Commander\" by Patrick O'Brian." },
+-      { "id": "classic33", "text": "This is a copy of \"The Warden\" by Anthony Trollope." },
+-      { "id": "classic34", "text": "This is a copy of \"The Far Side of the World\" by Patrick O'Brian." },
+-      { "id": "classic35", "text": "This is a copy of \"HMS Surprise\" by Patrick O'Brian." },
+-      { "id": "classic36", "text": "This is a copy of \"Barchester Towers\" by Anthony Trollope." },
+-      { "id": "classic37", "text": "This is a copy of \"The Land Ironclads\" by H.G. Wells." },
+-      { "id": "classic38", "text": "This is a copy of \"The Great Boer War\" by Arthur Conan Doyle." },
+-      { "id": "classic39", "text": "This is a copy of \"The Crime of the Congo\" by Arthur Conan Doyle." },
+-      { "id": "classic40", "text": "This is a copy of \"The Parasite\" by Arthur Conan Doyle." },
+-      { "id": "classic41", "text": "This is a copy of \"By Stroke of Sword\" by Andrew Balfour." },
+-      { "id": "classic42", "text": "This is a copy of \"The Secret Agent\" by Joseph Conrad." },
+-      { "id": "classic43", "text": "This is a copy of \"Lord Jim\" by Joseph Conrad." },
+-      { "id": "classic44", "text": "This is a copy of \"Vanity Fair\" by William Makepeace Thackeray." },
+-      { "id": "classic45", "text": "This is a copy of \"The Luck of Barry Lyndon\" by William Makepeace Thackeray." },
+-      { "id": "classic46", "text": "This is a copy of \"North and South\" by Elizabeth Gaskell." },
+-      { "id": "classic47", "text": "This is a copy of \"The Mayor of Casterbridge\" by Thomas Hardy." },
+-      { "id": "classic48", "text": "This is a copy of \"Wessex Tales\" by Thomas Hardy." },
+-      { "id": "classic49", "text": "This is a copy of \"Far from the Madding Crowd\" by Thomas Hardy." },
+-      { "id": "classic50", "text": "This is a copy of \"Captains Courageous\" by Rudyard Kipling." },
+-      { "id": "classic51", "text": "This is a copy of \"The Canterbury Tales\" by Geoffrey Chaucer." },
+-      { "id": "classic52", "text": "This is a copy of \"Harold, the Last of the Saxons\" by Edward Bulwer-Lytton." },
+-      { "id": "classic53", "text": "This is a copy of \"Mr Midshipman Easy\" by Frederick Marryat." },
+-      { "id": "classic54", "text": "This is a copy of \"Peter Simple\" by Frederick Marryat." }
++      { "id": "classic28", "text": "This is a copy of \"The Count of Monte Cristo\" by Dumas." },
++      { "id": "classic29", "text": "This is a copy of \"The Secret Garden\" by Frances Burnett." },
++      { "id": "classic30", "text": "This is a copy of \"Lieutenant Hornblower\" by C.S. Forester." },
++      { "id": "classic31", "text": "This is a copy of \"Master and Commander\" by Patrick O'Brian." },
++      { "id": "classic32", "text": "This is a copy of \"The Warden\" by Anthony Trollope." },
++      { "id": "classic33", "text": "This is a copy of \"The Far Side of the World\" by Patrick O'Brian." },
++      { "id": "classic34", "text": "This is a copy of \"HMS Surprise\" by Patrick O'Brian." },
++      { "id": "classic35", "text": "This is a copy of \"Barchester Towers\" by Anthony Trollope." },
++      { "id": "classic36", "text": "This is a copy of \"The Land Ironclads\" by H.G. Wells." },
++      { "id": "classic37", "text": "This is a copy of \"The Great Boer War\" by Arthur Conan Doyle." },
++      { "id": "classic38", "text": "This is a copy of \"The Crime of the Congo\" by Arthur Conan Doyle." },
++      { "id": "classic39", "text": "This is a copy of \"The Parasite\" by Arthur Conan Doyle." },
++      { "id": "classic40", "text": "This is a copy of \"By Stroke of Sword\" by Andrew Balfour." },
++      { "id": "classic41", "text": "This is a copy of \"The Secret Agent\" by Joseph Conrad." },
++      { "id": "classic42", "text": "This is a copy of \"Lord Jim\" by Joseph Conrad." },
++      { "id": "classic43", "text": "This is a copy of \"Vanity Fair\" by William Makepeace Thackeray." },
++      { "id": "classic44", "text": "This is a copy of \"The Luck of Barry Lyndon\" by William Makepeace Thackeray." },
++      { "id": "classic45", "text": "This is a copy of \"North and South\" by Elizabeth Gaskell." },
++      { "id": "classic46", "text": "This is a copy of \"The Mayor of Casterbridge\" by Thomas Hardy." },
++      { "id": "classic47", "text": "This is a copy of \"Wessex Tales\" by Thomas Hardy." },
++      { "id": "classic48", "text": "This is a copy of \"Far from the Madding Crowd\" by Thomas Hardy." },
++      { "id": "classic49", "text": "This is a copy of \"Captains Courageous\" by Rudyard Kipling." },
++      { "id": "classic50", "text": "This is a copy of \"The Canterbury Tales\" by Geoffrey Chaucer." },
++      { "id": "classic51", "text": "This is a copy of \"Harold, the Last of the Saxons\" by Edward Bulwer-Lytton." },
++      { "id": "classic52", "text": "This is a copy of \"Mr Midshipman Easy\" by Frederick Marryat." },
++      { "id": "classic53", "text": "This is a copy of \"Peter Simple\" by Frederick Marryat." }
+     ],
+     "price": 2000,
+     "looks_like": "tall_tales"
+@@ -923,34 +919,30 @@
+       },
+       {
+         "id": "fancy14",
+-        "text": "This is a high-quality leather bound copy of the well-known classic \"Dark Days Ahead\", by K. G. Ranade."
+-      },
+-      {
+-        "id": "fancy15",
+         "text": "This is a well-kept leather bound copy of \"Oryx and Crake\" by Margaret Atwood.  Inscribed in the inner cover is a faded note wishing the owner a happy birthday."
+       },
+       {
+-        "id": "fancy16",
++        "id": "fancy15",
+         "text": "This is a perfectly preserved hardcover copy of \"The Gunslinger\" by Stephen King, autographed by the author.  It contains a certificate of authenticity pronouncing it to be a first edition."
+       },
+       {
+-        "id": "fancy17",
++        "id": "fancy16",
+         "text": "This bright orange hardcover copy of \"1984\" by George Orwell has been carefully preserved, and appears to be a first or second edition judging from the publisher's information."
+       },
+       {
+-        "id": "fancy18",
++        "id": "fancy17",
+         "text": "This is a very nice copy of \"Lady Chatterly's Lover\", probably quite expensive in the days before the apocalypse."
+       },
+       {
+-        "id": "fancy19",
++        "id": "fancy18",
+         "text": "This is a high quality early edition hardcover copy of \"The Handmaid's Tale\" by Margaret Atwood, signed by the author."
+       },
+       {
+-        "id": "fancy20",
++        "id": "fancy19",
+         "text": "This ancient and worn book looks to be an 18th or early 19th century handwritten copy of \"Don Quixote\".  In the days of book traders it would have been worth an absolute fortune.  Now it's either a priceless piece of history, some light reading before bed, or excellent kindling."
+       },
+       {
+-        "id": "fancy21",
++        "id": "fancy20",
+         "text": "This is a first edition copy of Terry Pratchett's \"The Colour of Magic\".  In the inner cover is a handwritten note that reads \"To Chris, thanks for believing I could do it.  Best regards, Terry.\""
+       }
+     ],
+-- 
+2.40.0
+
diff --git a/jc_radio-can-use-ups.patch b/src-01_radio-can-use-ups.patch
index a47b1d4..a47b1d4 100644
--- a/jc_radio-can-use-ups.patch
+++ b/src-01_radio-can-use-ups.patch
diff --git a/jc_ammo-loudness-ap-times-2.patch b/src-02_ammo-loudness-ap-times-2.patch
index 3def080..3def080 100644
--- a/jc_ammo-loudness-ap-times-2.patch
+++ b/src-02_ammo-loudness-ap-times-2.patch
diff --git a/jc_allow-bio-firestarter-on-smoker.patch b/src-03_allow-bio-firestarter-on-smoker.patch
index 21043e6..21043e6 100644
--- a/jc_allow-bio-firestarter-on-smoker.patch
+++ b/src-03_allow-bio-firestarter-on-smoker.patch
diff --git a/jc_stop-non-faction-npc-sleep-depirvation.patch b/src-04_stop-non-faction-npc-sleep-depirvation.patch
index fb8941c..fb8941c 100644
--- a/jc_stop-non-faction-npc-sleep-depirvation.patch
+++ b/src-04_stop-non-faction-npc-sleep-depirvation.patch
diff --git a/jc_stop-non-faction-npc-malnourishment.patch b/src-05_stop-non-faction-npc-malnourishment.patch
index 096a5a8..096a5a8 100644
--- a/jc_stop-non-faction-npc-malnourishment.patch
+++ b/src-05_stop-non-faction-npc-malnourishment.patch
diff --git a/jc_stop-sleeping-on-tables.patch b/src-06_stop-sleeping-on-tables.patch
index eb3dc41..eb3dc41 100644
--- a/jc_stop-sleeping-on-tables.patch
+++ b/src-06_stop-sleeping-on-tables.patch
diff --git a/jc_allow-hacker-laptop.patch b/src-07_allow-hacker-laptop.patch
index 07f44ba..07f44ba 100644
--- a/jc_allow-hacker-laptop.patch
+++ b/src-07_allow-hacker-laptop.patch
diff --git a/jc_more-military-base-overmap.patch b/src-08_more-military-base-overmap.patch
index f2bc3cb..f2bc3cb 100644
--- a/jc_more-military-base-overmap.patch
+++ b/src-08_more-military-base-overmap.patch
diff --git a/jc_npc-eat-from-further-camp.patch b/src-09_npc-eat-from-further-camp.patch
index ed1442d..ed1442d 100644
--- a/jc_npc-eat-from-further-camp.patch
+++ b/src-09_npc-eat-from-further-camp.patch
diff --git a/jc_reduced-kcal-during-sleep.patch b/src-10_reduced-kcal-during-sleep.patch
index d376754..d376754 100644
--- a/jc_reduced-kcal-during-sleep.patch
+++ b/src-10_reduced-kcal-during-sleep.patch
diff --git a/tools-02_vacutainer-is-not-a-weapon.patch b/tools-02_vacutainer-is-not-a-weapon.patch
deleted file mode 100644
index 4ba5e83..0000000
--- a/tools-02_vacutainer-is-not-a-weapon.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/data/json/items/tool/med.json
-+++ b/data/json/items/tool/med.json
-@@ -174,7 +174,8 @@
-   },
-   {
-     "id": "vacutainer",
-     "type": "CONTAINER",
-+    "category": "tools",
-     "name": { "str": "blood draw kit" },
-     "description": "This is a kit for drawing blood, including a test tube for holding the sample.  Use this tool to draw blood, either from yourself or from a corpse you are standing on.",
-     "weight": "13 g",
author	jc_gargma <jc_gargma@iserlohn-fortress.net>	2023-05-03 15:58:03 -0700
committer	jc_gargma <jc_gargma@iserlohn-fortress.net>	2023-05-03 15:58:03 -0700
commit	6b8d5abd7fc1d2f1d6f794640117c649eae3e01a (patch)
tree	0ad0436287ad1f9bbd3cfb28f7574d5a6710592f
parent	Updated to 2023-04-15-1344 (diff)
download	cataclysm-bn-6b8d5abd7fc1d2f1d6f794640117c649eae3e01a.tar.xz