Code

Portable smoking rack#29915

Code

Merged

ZhilkinSerg merged 19 commits intoCleverRaven:masterCleverRaven/Cataclysm-DDA:masterfrom Scischm:portable_smoking_rackScischm/Cataclysm-DDA:portable_smoking_rackCopy head branch name to clipboardMay 8, 2019

+166-22

Commits

Commits on Apr 25, 2019

• Added deployable smoking rack

  Scischm

  committed
  0e96c60

  Copy full SHA for 0e96c60

• Format changes

  Scischm

  committed
  fac1de6

  Copy full SHA for fac1de6

• Longer recipe times

  Scischm

  committed
  9aec17d

  Copy full SHA for 9aec17d

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

  Scischm

  committed
  a61c69a

  Copy full SHA for a61c69a

• Linted json again.

  Scischm

  committed
  b093a87

  Copy full SHA for b093a87

• astyle formatting

  Scischm

  committed
  11d6a8d

  Copy full SHA for 11d6a8d

• Linting again?

  Scischm

  committed
  7d64b06

  Copy full SHA for 7d64b06

• Fixed a color typo

  Scischm

  committed
  f56ddaa

  Copy full SHA for f56ddaa

Commits on Apr 26, 2019

• AStyle formatting

  Scischm

  committed
  f93fd08

  Copy full SHA for f93fd08

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

  Scischm

  committed
  b76edda

  Copy full SHA for b76edda

Commits on Apr 27, 2019

• Volume changes

  Scischm

  committed
  65b2b42

  Copy full SHA for 65b2b42

• Volume changes

  Scischm

  committed
  6ede123

  Copy full SHA for 6ede123

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

  Scischm

  committed
  ff8f246

  Copy full SHA for ff8f246

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

  Scischm

  committed
  35ffb08

  Copy full SHA for 35ffb08

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

  Scischm

  committed
  ca6d64b

  Copy full SHA for ca6d64b

Commits on Apr 29, 2019

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

  Scischm

  committed
  be13aec

  Copy full SHA for be13aec

Commits on May 3, 2019

• Fixed smoking time of zero and corrected a typo

  Scischm

  committed
  1054ae6

  Copy full SHA for 1054ae6

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

  Scischm

  committed
  cf90658

  Copy full SHA for cf90658

Commits on May 6, 2019

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

  Scischm

  committed
  3308275

  Copy full SHA for 3308275