Code

Matchhead powder loaded bullets#67453

Code

Merged

Maleclypse merged 79 commits intoCleverRaven:masterCleverRaven/Cataclysm-DDA:masterfrom anoobindisguise:anoobindisguise-matchheadbulletsanoobindisguise/Cataclysm-DDA:anoobindisguise-matchheadbulletsCopy head branch name to clipboardAug 8, 2023

+796-14

Commits

Commits on Jul 21, 2023

• add 38 matchhead bullets

  anoobindisguise

  authored
  bd9ec11

  Copy full SHA for bd9ec11

• comma

  anoobindisguise

  authored
  e45f60e

  Copy full SHA for e45f60e

Commits on Aug 2, 2023

• Update data/json/items/ammo/38.json

  Show description for f26bf60
  

  anoobindisguise

  and

  github-actions[bot]

  authored
  f26bf60

  Copy full SHA for f26bf60

• Update data/json/items/ammo/38.json

  Show description for 3c59494
  

  anoobindisguise

  and

  github-actions[bot]

  authored
  3c59494

  Copy full SHA for 3c59494

• Update 38.json

  anoobindisguise

  authored
  f5c8dac

  Copy full SHA for f5c8dac

• matchhead bullets can cause pressure damage

  anoobindisguise

  authored
  ff8f4dc

  Copy full SHA for ff8f4dc

• document MATCHHEAD

  anoobindisguise

  authored
  93ede74

  Copy full SHA for 93ede74

• extend and delete

  anoobindisguise

  authored
  63255ae

  Copy full SHA for 63255ae

• red phosphorus adjustments

  anoobindisguise

  authored
  f259a9f

  Copy full SHA for f259a9f

• Update chemicals_and_resources.json

  anoobindisguise

  authored
  97246b2

  Copy full SHA for 97246b2

• red phosphorus recipe

  anoobindisguise

  authored
  c39ca65

  Copy full SHA for c39ca65

Commits on Aug 4, 2023

• Update src/ranged.cpp

  Show description for 092712f
  

  anoobindisguise

  and

  github-actions[bot]

  authored
  092712f

  Copy full SHA for 092712f

• matchhead 22lr bullets

  anoobindisguise

  authored
  9b6c3b2

  Copy full SHA for 9b6c3b2

• 10mm matchhead

  anoobindisguise

  authored
  3384c0b

  Copy full SHA for 3384c0b

• 30 carbine blackpowder

  anoobindisguise

  authored
  79bb32c

  Copy full SHA for 79bb32c

• matchhead 32 acp

  anoobindisguise

  authored
  6e3936c

  Copy full SHA for 6e3936c

• fix issue

  anoobindisguise

  authored
  ee00c21

  Copy full SHA for ee00c21

• matchhead 357 magnum

  anoobindisguise

  authored
  a294bab

  Copy full SHA for a294bab

• 357 sig matchheads

  anoobindisguise

  authored
  2731e5e

  Copy full SHA for 2731e5e

• matchhead .380

  anoobindisguise

  authored
  f01539f

  Copy full SHA for f01539f

• matchhead .40

  anoobindisguise

  authored
  f6d0f01

  Copy full SHA for f6d0f01

• matchhead 45 acp

  anoobindisguise

  authored
  8c52b9d

  Copy full SHA for 8c52b9d

• matchhead 9mm

  anoobindisguise

  authored
  a5ec209

  Copy full SHA for a5ec209

• matchhead 9x18mm

  anoobindisguise

  authored
  989fd7d

  Copy full SHA for 989fd7d

• fix description

  anoobindisguise

  authored
  3a7fb61

  Copy full SHA for 3a7fb61

• matchhead 45 acp

  anoobindisguise

  authored
  61633a8

  Copy full SHA for 61633a8

• matchhead 762x25

  anoobindisguise

  authored
  fce1b97

  Copy full SHA for fce1b97

• Update 380.json

  anoobindisguise

  authored
  956defe

  Copy full SHA for 956defe

• Update 38.json

  anoobindisguise

  authored
  a67cb9c

  Copy full SHA for a67cb9c

• Update 38.json

  anoobindisguise

  authored
  3f310d5

  Copy full SHA for 3f310d5

• matchhead recipes

  anoobindisguise

  authored
  c71ea74

  Copy full SHA for c71ea74

• matchhead recipes

  anoobindisguise

  authored
  41e7966

  Copy full SHA for 41e7966

• add missing recipe

  anoobindisguise

  authored
  42a18c0

  Copy full SHA for 42a18c0

• Update dictionary.txt

  anoobindisguise

  authored
  9b1b034

  Copy full SHA for 9b1b034

• Merge branch 'CleverRaven:master' into anoobindisguise-matchheadbullets

  anoobindisguise

  authored
  0fe30c8

  Copy full SHA for 0fe30c8

Commits on Aug 5, 2023

• red_phosphorous

  anoobindisguise

  authored
  b6779cc

  Copy full SHA for b6779cc

• Update rifle.json

  anoobindisguise

  authored
  cec6a97

  Copy full SHA for cec6a97

• Update 38.json

  anoobindisguise

  authored
  fd42133

  Copy full SHA for fd42133

• Update 38.json

  anoobindisguise

  authored
  5434bd5

  Copy full SHA for 5434bd5

• describe matchhead

  anoobindisguise

  authored
  b016b54

  Copy full SHA for b016b54

• increase red phosphorous requirements

  anoobindisguise

  authored
  b5b6aad

  Copy full SHA for b5b6aad

• increase red phosphorous req

  anoobindisguise

  authored
  9c5b924

  Copy full SHA for 9c5b924

• red phosphorus spawns

  anoobindisguise

  authored
  f1b52b7

  Copy full SHA for f1b52b7

• readd muzzle smoke

  anoobindisguise

  authored
  3ba0ddc

  Copy full SHA for 3ba0ddc

• readd muzzle smoke

  anoobindisguise

  authored
  01fa74f

  Copy full SHA for 01fa74f

• readd muzzle smoke

  anoobindisguise

  authored
  a72059a

  Copy full SHA for a72059a

• readd muzzle smoke

  anoobindisguise

  authored
  fcbaccc

  Copy full SHA for fcbaccc

• readd muzzle smoke

  anoobindisguise

  authored
  84df470

  Copy full SHA for 84df470

• readd muzzle smoke

  anoobindisguise

  authored
  b2a3208

  Copy full SHA for b2a3208

• readd muzzle smoke

  anoobindisguise

  authored
  a15cabb

  Copy full SHA for a15cabb

• readd muzzle smoke

  anoobindisguise

  authored
  4690f3d

  Copy full SHA for 4690f3d

• readd muzzle smoke

  anoobindisguise

  authored
  b18e2ed

  Copy full SHA for b18e2ed

• readd muzzle smoke

  anoobindisguise

  authored
  93f9b46

  Copy full SHA for 93f9b46

• readd muzzle smoke

  anoobindisguise

  authored
  4679e8b

  Copy full SHA for 4679e8b

• readd muzzle smoke

  anoobindisguise

  authored
  fac8150

  Copy full SHA for fac8150

• readd muzzle smoke

  anoobindisguise

  authored
  c11cffb

  Copy full SHA for c11cffb

• readd muzzle smoke

  anoobindisguise

  authored
  ee6852d

  Copy full SHA for ee6852d

• astyle

  Show description for 435031d
  

  anoobindisguise

  and

  github-actions[bot]

  authored
  435031d

  Copy full SHA for 435031d

• phosphorous

  anoobindisguise

  authored
  651f0dc

  Copy full SHA for 651f0dc

• phosphorous

  anoobindisguise

  authored
  afceb71

  Copy full SHA for afceb71

• phosphorous

  anoobindisguise

  authored
  691ad2b

  Copy full SHA for 691ad2b

• phosphorous

  anoobindisguise

  authored
  4afc9ba

  Copy full SHA for 4afc9ba

• phosphorous

  anoobindisguise

  authored
  7a9d794

  Copy full SHA for 7a9d794

• phosphorous

  anoobindisguise

  authored
  eb06b79

  Copy full SHA for eb06b79

• phosphorous

  anoobindisguise

  authored
  d43e82d

  Copy full SHA for d43e82d

• phosphorous

  anoobindisguise

  authored
  758c1ff

  Copy full SHA for 758c1ff

• phosphorous

  anoobindisguise

  authored
  ce51b2d

  Copy full SHA for ce51b2d

• phosphorous

  anoobindisguise

  authored
  4ca85a8

  Copy full SHA for 4ca85a8

• phosphorous

  anoobindisguise

  authored
  8d6f534

  Copy full SHA for 8d6f534

• phosphorous

  anoobindisguise

  authored
  bd1c1e5

  Copy full SHA for bd1c1e5

• phosphorous

  anoobindisguise

  authored
  d59befa

  Copy full SHA for d59befa

• phosphorous

  anoobindisguise

  authored
  f1e75eb

  Copy full SHA for f1e75eb

• Merge branch 'CleverRaven:master' into anoobindisguise-matchheadbullets

  anoobindisguise

  authored
  96af23c

  Copy full SHA for 96af23c

• migrations

  anoobindisguise

  authored
  c296ebe

  Copy full SHA for c296ebe

• matchhead generic ammos

  anoobindisguise

  authored
  6bbbfbe

  Copy full SHA for 6bbbfbe

• matchhead tiny pistol ammos

  anoobindisguise

  authored
  a50cb7a

  Copy full SHA for a50cb7a

• 30 carbine migration

  anoobindisguise

  authored
  56d4fa3

  Copy full SHA for 56d4fa3

• pistol handloads with matchheadpowder

  anoobindisguise

  authored
  20eff76

  Copy full SHA for 20eff76

• Apply suggestions from code review

  Show description for abc2ca7
  

  anoobindisguise

  and

  github-actions[bot]

  authored
  abc2ca7

  Copy full SHA for abc2ca7