Skip to content

Commit

Permalink
Merge pull request CleverRaven#56715 from Faalagorn/patch-15
Browse files Browse the repository at this point in the history
discontinuity → Discontinuity
  • Loading branch information
Rivet-the-Zombie authored Apr 10, 2022
2 parents b54ab40 + 5f4e2bc commit 9f9b09d
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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 },
Expand Down
2 changes: 1 addition & 1 deletion data/mods/Aftershock/player/bionics.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down

0 comments on commit 9f9b09d

Please sign in to comment.