Code

Finish making consume take time#40177

Code

Merged

kevingranade merged 12 commits intoCleverRaven:masterCleverRaven/Cataclysm-DDA:masterfrom Ramza13:consume_correct_plus_plusRamza13/Cataclysm-DDA:consume_correct_plus_plusCopy head branch name to clipboardMay 11, 2020

+85-60

Commits

Commits on May 8, 2020

• Add activity for consume

  Ramza13

  committed
  d93f6e5

  Copy full SHA for d93f6e5

• Added new json mutation flag and updated existing traits using existing values

  Ramza13

  committed
  9d47e29

  Copy full SHA for 9d47e29

• Add time to consume menu

  Ramza13

  committed
  bd8e438

  Copy full SHA for bd8e438

• Remove debug line

  Ramza13

  committed
  a2ae034

  Copy full SHA for a2ae034

• Break up drug/medicine use times

  Ramza13

  committed
  44e9ead

  Copy full SHA for 44e9ead

• Make rigid table manners slow down eating

  Ramza13

  committed
  b38bcec

  Copy full SHA for b38bcec

• Sync variables names

  Ramza13

  committed
  b3ce428

  Copy full SHA for b3ce428

• Fixed merge error

  Ramza13

  committed
  f5e0147

  Copy full SHA for f5e0147

Commits on May 9, 2020

• Fixes auto eat, drink by making it simply insta consume.

  Ramza13

  committed
  e34d2e0

  Copy full SHA for e34d2e0

• fix crafting tests

  Ramza13

  committed
  4f79d9b

  Copy full SHA for 4f79d9b

• Undo unneeded fix

  Ramza13

  committed
  555f591

  Copy full SHA for 555f591

• Add in support for resuming consume

  Ramza13

  committed
  b8ebfe6

  Copy full SHA for b8ebfe6