Code

Generic Guns rework#36839

Code

Merged

I-am-Erk merged 12 commits intoCleverRaven:masterCleverRaven/Cataclysm-DDA:masterfrom tenmillimaster:gguns4tenmillimaster/Cataclysm-DDA:gguns4Copy head branch name to clipboardJan 24, 2020

+5,653-1,813

Commits

Commits on Jan 12, 2020

• Rework generic guns

  

  tenmillimaster

  authored and

  ifreund

  committed
  5c4f61d

Commits on Jan 14, 2020

• Recipe redefs

  

  tenmillimaster

  committed
  1abfce6

• 20x66 migrations

  

  tenmillimaster

  committed
  2af1c60

• turrets, descriptions, magazine ammo types

  

  tenmillimaster

  committed
  73a0b89

Commits on Jan 18, 2020

• Smörgåsbord of stuff

  

  tenmillimaster

  committed
  c677f28

• Update gg_ammo_migration.json

  

  tenmillimaster

  committed
  3ab8c5a

• black powder recipes &defs, make more recipes standalone

  

  tenmillimaster

  committed
  9dd0732

Commits on Jan 19, 2020

• fix circular error caused by obsoletion

  

  tenmillimaster

  committed
  ffdc52b

• Update recipes_pistol.json

  

  tenmillimaster

  committed
  9175d62

• Update modinfo.json

  

  tenmillimaster

  committed
  d7f4199

• Update pistol.json

  

  tenmillimaster

  committed
  34e0dd4

• Update shot.json

  

  tenmillimaster

  committed
  1edcd82