Code

Add 2 new weapon to 50.json#34200

Code

Closed

RickyVanz wants to merge 30 commits intoCleverRaven:masterCleverRaven/Cataclysm-DDA:masterfrom RickyVanz:RickyVanz-weapons-updateCopy head branch name to clipboard

+56-11

Commits

Commits on Sep 23, 2019

• 2 new weapon

  Show description for 2496db3
  RickyVanz

  authored
  2496db3

  Copy full SHA for 2496db3

• 2 new magazine

  RickyVanz

  authored
  997563a

  Copy full SHA for 997563a

• Update guns.json

  RickyVanz

  authored
  ed17354

  Copy full SHA for ed17354

• Update magazines.json

  RickyVanz

  authored
  d5c2da6

  Copy full SHA for d5c2da6

• fix description

  Show description for 1d6f2c9
  

  RickyVanz

  and

  Anton Burmistrov

  authored
  1d6f2c9

  Copy full SHA for 1d6f2c9

• fix capital misplacement.

  Show description for 50030f0
  

  RickyVanz

  and

  Anton Burmistrov

  authored
  50030f0

  Copy full SHA for 50030f0

• fix capital misplacement 2

  Show description for 9cebe40
  

  RickyVanz

  and

  Anton Burmistrov

  authored
  9cebe40

  Copy full SHA for 9cebe40

• fix magazine price (added "price_postapoc" )

  RickyVanz

  authored
  dc6ce82

  Copy full SHA for dc6ce82

• capital fix

  Show description for 597575c
  

  RickyVanz

  and

  Anton Burmistrov

  authored
  597575c

  Copy full SHA for 597575c

• capital fix 2

  Show description for fbd605d
  

  RickyVanz

  and

  Anton Burmistrov

  authored
  fbd605d

  Copy full SHA for fbd605d

• magazine capital fix

  Show description for 1647db9
  

  RickyVanz

  and

  Anton Burmistrov

  authored
  1647db9

  Copy full SHA for 1647db9

• price fix

  RickyVanz

  authored
  13977c2

  Copy full SHA for 13977c2

• price fix 2 (based on current 50 BMG price)

  RickyVanz

  authored
  f894292

  Copy full SHA for f894292

• change to weapon's range

  RickyVanz

  authored
  7a3cc0e

  Copy full SHA for 7a3cc0e

Commits on Sep 24, 2019

• weapon change (requested)

  RickyVanz

  authored
  e0e47d4

  Copy full SHA for e0e47d4

• magazine change (requested)

  RickyVanz

  authored
  89d476e

  Copy full SHA for 89d476e

• final touch (requested)

  RickyVanz

  authored
  44e4ff3

  Copy full SHA for 44e4ff3

• description fix

  Show description for dfa30da
  

  RickyVanz

  and

  tenmillimaster

  authored
  dfa30da

  Copy full SHA for dfa30da

• change request

  RickyVanz

  authored
  bb1b6cc

  Copy full SHA for bb1b6cc

• description fix

  Show description for e763ab5
  

  RickyVanz

  and

  tenmillimaster

  authored
  e763ab5

  Copy full SHA for e763ab5

• itemgroup change

  RickyVanz

  authored
  9ed1178

  Copy full SHA for 9ed1178

• magazine itemgroup change

  RickyVanz

  authored
  c22e0b9

  Copy full SHA for c22e0b9

• itemgroup re-adjustment

  RickyVanz

  authored
  dc458cc

  Copy full SHA for dc458cc

• probability adjustment

  RickyVanz

  authored
  30a7496

  Copy full SHA for 30a7496

• small bit of change

  RickyVanz

  authored
  177cbda

  Copy full SHA for 177cbda

Commits on Sep 25, 2019

• Merge branch 'master' into RickyVanz-weapons-update

  RickyVanz

  authored
  afb865e

  Copy full SHA for afb865e

Commits on Sep 26, 2019

• moved AS-50 to obscure category

  RickyVanz

  authored
  da99ab5

  Copy full SHA for da99ab5

• removed AS 50 from group.

  RickyVanz

  authored
  fae5ccc

  Copy full SHA for fae5ccc

• Removed AS 50

  RickyVanz

  authored
  207c74e

  Copy full SHA for 207c74e

• AS 50 magazine removal

  RickyVanz

  authored
  eec4d06

  Copy full SHA for eec4d06