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

Maleclypse · Apr 10, 2022 · 8a419d6 · 8a419d6
2 parents 4f3880c + 9f9b09d
commit 8a419d6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/data/mods/Aftershock/itemgroups/weapons/makeshift_gun_groups.json b/data/mods/Aftershock/itemgroups/weapons/makeshift_gun_groups.json
@@ -3,7 +3,7 @@
     "type": "item_group",
     "id": "afs_any_makeshift_gun",
     "subtype": "distribution",
-    "//": "Self made 'guns' for the post-discontinuity scavenger.  These vary quite a lot between them and ammo might be rare, so we spawn them together with some.",
+    "//": "Self made 'guns' for the post-Discontinuity scavenger.  These vary quite a lot between them and ammo might be rare, so we spawn them together with some.",
     "entries": [
       { "group": "afs_scrapbow_s", "prob": 5 },
       { "group": "afs_scrapcrossbow_s", "prob": 5 },

diff --git a/data/mods/Aftershock/player/bionics.json b/data/mods/Aftershock/player/bionics.json
@@ -145,7 +145,7 @@
     "id": "bio_forcefield_ballistic_heavy",
     "type": "bionic",
     "name": { "str": "Kinetic annulment system CBM" },
-    "description": "A kinetic attenuation system salvaged from a pre-discontinuity robotic warframe, crudely adapted for compatibility with biological hosts.  Powerful enough to completely stop most rifle cartridges.  Activating the field will reduce incoming ballistic and piercing damage by 40 points.",
+    "description": "A kinetic attenuation system salvaged from a pre-Discontinuity robotic warframe, crudely adapted for compatibility with biological hosts.  Powerful enough to completely stop most rifle cartridges.  Activating the field will reduce incoming ballistic and piercing damage by 40 points.",
     "occupied_bodyparts": [ [ "torso", 14 ] ],
     "upgraded_bionic": "bio_forcefield_ballistic_medium",
     "act_cost": "10 kJ",