Code

Update to sleep menu 2#38768

Code

Merged

ZhilkinSerg merged 20 commits intoCleverRaven:masterCleverRaven/Cataclysm-DDA:masterfrom Pupsi-Mupsi:PM-sleep-updatePupsi-Mupsi/Cataclysm-DDA:PM-sleep-updateCopy head branch name to clipboardApr 7, 2020

+45-1,418

Commits

Commits on Mar 14, 2020

• change sentence and inactive-item-default

  Pupsi-Mupsi

  authored
  bb8aa08

  Copy full SHA for bb8aa08

• Update src/handle_action.cpp

  Show description for 7100263
  

  Pupsi-Mupsi

  and

  akirashirosawa

  authored
  7100263

  Copy full SHA for 7100263

• Use selected instead

  Pupsi-Mupsi

  authored
  3d8eef2

  Copy full SHA for 3d8eef2

• Ignore GASMASK

  Pupsi-Mupsi

  authored
  cf10e91

  Copy full SHA for cf10e91

• Ignore musical_instrument

  Pupsi-Mupsi

  authored
  5c1707c

  Copy full SHA for 5c1707c

Commits on Mar 15, 2020

• Add SLEEP_IGNORE flag info

  Pupsi-Mupsi

  authored
  5c7d28f

  Copy full SHA for 5c7d28f

• Add SLEEP_IGNORE-flag to tool_armor.json

  Pupsi-Mupsi

  authored
  34819e3

  Copy full SHA for 34819e3

• Add SLEEP_IGNORE-flag to crt_toolarmor.json

  Pupsi-Mupsi

  authored
  636478d

  Copy full SHA for 636478d

• Add test to ignore SLEEP_IGNORE-flag items

  Pupsi-Mupsi

  authored
  f404f2b

  Copy full SHA for f404f2b

• Add SLEEP_IGNORE flag to glowstick

  Pupsi-Mupsi

  authored
  aff9533

  Copy full SHA for aff9533

• Add missing comma

  Pupsi-Mupsi

  authored
  5aee92d

  Copy full SHA for 5aee92d

• Linted crt_toolarmor.json

  Pupsi-Mupsi

  authored
  6e27eac

  Copy full SHA for 6e27eac

• Bugfix

  Pupsi-Mupsi

  authored
  279d743

  Copy full SHA for 279d743

• Add new SLEEP_IGNORE flag

  Pupsi-Mupsi

  authored
  a56aaf5

  Copy full SHA for a56aaf5

• Bugfix 2

  Pupsi-Mupsi

  authored
  002a08b

  Copy full SHA for 002a08b

Commits on Mar 19, 2020

• Change wording

  Pupsi-Mupsi

  authored
  cfe1b09

  Copy full SHA for cfe1b09

Commits on Apr 4, 2020

• Resolve conflict with cata_string_consts.h

  Pupsi-Mupsi

  authored
  50abecd

  Copy full SHA for 50abecd

• Add static const to handle_action.cpp

  Pupsi-Mupsi

  authored
  f293c11

  Copy full SHA for f293c11

Commits on Apr 7, 2020

• Update handle_action.cpp

  ZhilkinSerg

  authored
  84a6609

  Copy full SHA for 84a6609

• Update handle_action.cpp

  ZhilkinSerg

  authored
  15061ae

  Copy full SHA for 15061ae