Code

Add staff sling and ammo#35417

Code

Merged

kevingranade merged 31 commits intoCleverRaven:masterCleverRaven/Cataclysm-DDA:masterfrom snipercup:add-staff-sling-and-ammoCopy head branch name to clipboardNov 12, 2019

+75-16

Commits

Commits on Oct 24, 2019

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

  snipercup

  committed
  d6941e7

Commits on Oct 25, 2019

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

  snipercup

  committed
  c74dd17

Commits on Oct 28, 2019

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

  snipercup

  committed
  8f7710e

Commits on Oct 29, 2019

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

  snipercup

  committed
  adf523b

Commits on Oct 30, 2019

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

  snipercup

  committed
  dbe3e9b

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

  snipercup

  committed
  a2958bd

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

  snipercup

  committed
  8e4280a

Commits on Oct 31, 2019

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

  snipercup

  committed
  8d518d8

Commits on Nov 1, 2019

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

  snipercup

  committed
  f57c82c

Commits on Nov 3, 2019

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

  snipercup

  committed
  1ce3ca0

Commits on Nov 4, 2019

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

  snipercup

  committed
  6fded34

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

  snipercup

  committed
  7b88e44

Commits on Nov 5, 2019

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

  snipercup

  committed
  c747d0f

Commits on Nov 6, 2019

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

  snipercup

  committed
  0d4beeb

Commits on Nov 8, 2019

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

  snipercup

  committed
  1d3345e

Commits on Nov 9, 2019

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

  snipercup

  committed
  1b087c1

• Add staff sling and ammo

  snipercup

  committed
  9eb63b2

• Update data/json/items/ammo.json

  snipercup

  authored
  0012c0c

Commits on Nov 10, 2019

• staff sling update

  TJKing293

  committed
  81f6938

• Merge branch 'add-staff-sling-and-ammo' of https://github.com/tjking293/Cataclysm-DDA into add-staff-sling-and-ammo

  snipercup

  committed
  865a015

• Removed rock from melee.json, removed copy from from rock

  snipercup

  committed
  c83a7d1

• Removed double rock ammo item

  snipercup

  committed
  0250310

• Remove ammo type rock duplicate

  snipercup

  committed
  b1b5dde

• Remove staff sling duplicate

  snipercup

  committed
  a0581b0

• Web Linter

  snipercup

  committed
  fd0b8ce

• Added sling staff recipe

  snipercup

  committed
  00149e7

• Update data/json/items/ranged.json

  Show description for aaa5b8a
  

  snipercup

  and

  TJKing293

  authored
  aaa5b8a

• Update data/json/recipes/weapon/ranged.json

  Show description for 26eec83
  

  snipercup

  and

  TJKing293

  authored
  26eec83

• Update data/json/recipes/weapon/ranged.json

  Show description for 3a998bc
  

  snipercup

  and

  TJKing293

  authored
  3a998bc

• Web linter

  snipercup

  committed
  9a96abe

Commits on Nov 11, 2019

• Update data/json/recipes/weapon/ranged.json

  snipercup

  authored
  3c3f36c