Code

Grenades.json into explosives.json#37506

Code

Merged

ZhilkinSerg merged 5 commits intoCleverRaven:masterCleverRaven/Cataclysm-DDA:masterfrom RarkGrames:Grenades.json-into-Explosives.jsonRarkGrames/Cataclysm-DDA:Grenades.json-into-Explosives.jsonCopy head branch name to clipboardJan 29, 2020

+579-581

Commits

Commits on Jan 28, 2020

• Undergarment.json and tool_armor.json

  RarkGrames

  committed
  873c253

  Copy full SHA for 873c253

• Revert "Undergarment.json and tool_armor.json"

  Show description for d146613
  RarkGrames

  committed
  d146613

  Copy full SHA for d146613

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

  RarkGrames

  committed
  52a3f40

  Copy full SHA for 52a3f40

Commits on Jan 29, 2020

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

  RarkGrames

  committed
  4a0b5e1

  Copy full SHA for 4a0b5e1

• Grenades.json into \tools\explosives.json

  RarkGrames

  committed
  ee0e94d

  Copy full SHA for ee0e94d