Code

Military armor balance#36853

Code

Merged

kevingranade merged 21 commits intoCleverRaven:masterCleverRaven/Cataclysm-DDA:masterfrom Brian-Otten:Military-Armor-BalanceBrian-Otten/Cataclysm-DDA:Military-Armor-BalanceCopy head branch name to clipboardApr 11, 2020

+13-14

Commits

Commits on Feb 6, 2019

• Add files via upload

  Brian-Otten

  authored
  b2f6cd4

  Copy full SHA for b2f6cd4

Commits on Feb 8, 2019

• Rebalances martial arts.

  Show description for 966e6d4
  Brian-Otten

  authored
  966e6d4

  Copy full SHA for 966e6d4

• Merge pull request #1 from Brian-Otten/Martialartsrebalance

  Show description for 952be7a
  Brian-Otten

  authored
  952be7a

  Copy full SHA for 952be7a

• Add files via upload

  Brian-Otten

  authored
  006e175

  Copy full SHA for 006e175

• Delete martialarts.json

  Brian-Otten

  authored
  5d9f384

  Copy full SHA for 5d9f384

• Delete techniques.json

  Brian-Otten

  authored
  ffd82fa

  Copy full SHA for ffd82fa

• Delete mutations.json

  Brian-Otten

  authored
  83bdf99

  Copy full SHA for 83bdf99

• Add files via upload

  Brian-Otten

  authored
  64cfd0c

  Copy full SHA for 64cfd0c

• Delete monstergroups.json

  Brian-Otten

  authored
  6cf3cb1

  Copy full SHA for 6cf3cb1

• Add files via upload

  Brian-Otten

  authored
  3a71e81

  Copy full SHA for 3a71e81

• Add files via upload

  Brian-Otten

  authored
  77aecd4

  Copy full SHA for 77aecd4

• Mutations.json changed back to standard

  Show description for 9708690
  Brian-Otten

  authored
  9708690

  Copy full SHA for 9708690

Commits on Feb 9, 2019

• Description fixes

  Show description for 638356a
  Brian-Otten

  authored
  638356a

  Copy full SHA for 638356a

Commits on Jan 9, 2020

• Update martialarts.json

  Brian-Otten

  committed
  18d8939

  Copy full SHA for 18d8939

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

  Brian-Otten

  committed
  0061ec6

  Copy full SHA for 0061ec6

• Military armor rebalance

  Show description for eb0bed3
  Brian-Otten

  committed
  eb0bed3

  Copy full SHA for eb0bed3

Commits on Jan 10, 2020

• Made kevlar MBR more encumbering to fit new armor values.

  Show description for 315a308
  Brian-Otten

  committed
  315a308

  Copy full SHA for 315a308

Commits on Jan 11, 2020

• Remove storage from AEP suit

  Show description for 64d6bdd
  Brian-Otten

  authored
  64d6bdd

  Copy full SHA for 64d6bdd

Commits on Apr 6, 2020

• Merge branch 'Military-Armor-Balance' of https://github.com/Brian-Otten/Cataclysm-DDA into Military-Armor-Balance

  Brian-Otten

  committed
  8b2ff11

  Copy full SHA for 8b2ff11

• Merge branch 'master' into Military-Armor-Balance

  Brian-Otten

  committed
  b943e44

  Copy full SHA for b943e44

• Fix merge conflicts

  Brian-Otten

  committed
  df954a5

  Copy full SHA for df954a5