Code

Split 40mm grenade types#35865

Code

Merged

kevingranade merged 16 commits intoCleverRaven:masterCleverRaven/Cataclysm-DDA:masterfrom ymber:40mmymber/Cataclysm-DDA:40mmCopy head branch name to clipboardDec 15, 2019

+686-294

Commits

Commits on Dec 12, 2019

• Add new 40mm types

  

  ymber

  committed
  aae067c

  Copy full SHA for aae067c

• Update weapon ammotypes

  

  ymber

  committed
  9cbab5d

  Copy full SHA for 9cbab5d

• Replace references to old 40mm_ items with new

  

  ymber

  committed
  ec26ab6

  Copy full SHA for ec26ab6

• Remove 40mm grenade recipes

  

  ymber

  committed
  ff0d409

  Copy full SHA for ff0d409

• Fix hardcoded references to 40mm grenades

  

  ymber

  committed
  f6630c9

  Copy full SHA for f6630c9

• Fix old migrations

  

  ymber

  committed
  6bdc5f5

  Copy full SHA for 6bdc5f5

• Misc fixes

  

  ymber

  committed
  4d513d3

  Copy full SHA for 4d513d3

• Update grenades to use correct casings

  

  ymber

  committed
  00577fe

  Copy full SHA for 00577fe

• Remove duplicate migration

  

  ymber

  committed
  e137f82

  Copy full SHA for e137f82

• Update M1006 description

  

  ymber

  committed
  8eab216

  Copy full SHA for 8eab216

• Reduce default 40x46mm count

  

  ymber

  committed
  e7326af

  Copy full SHA for e7326af

• Update weights and volumes

  

  ymber

  committed
  619dbd0

  Copy full SHA for 619dbd0

• Add 40x46mm reloads

  

  ymber

  committed
  57bbf51

  Copy full SHA for 57bbf51

• Add 40x53mm reloads

  

  ymber

  committed
  50d2b1c

  Copy full SHA for 50d2b1c

• Update new itemgroups

  

  ymber

  committed
  21a69e6

  Copy full SHA for 21a69e6

Commits on Dec 15, 2019

• 40mm fixes

  

  ymber

  committed
  b6c04be

  Copy full SHA for b6c04be