Code

Vitamin-based allergy#74763

Code

Merged

dseguin merged 17 commits intoCleverRaven:masterCleverRaven/Cataclysm-DDA:masterfrom GuardianDll:allergensGuardianDll/Cataclysm-DDA:allergensCopy head branch name to clipboardJun 27, 2024

+1,523-894

Commits

Commits on Jun 22, 2024

• Allergens for base game data

  harakka

  committed
  7fdb178

  Copy full SHA for 7fdb178

• Allergens for mods

  harakka

  committed
  581052c

  Copy full SHA for 581052c

• Revert decimal changes

  harakka

  committed
  e071322

  Copy full SHA for e071322

Commits on Jun 23, 2024

• add vitamin definition

  GuardianDll

  committed
  bd2993d

  Copy full SHA for bd2993d

Commits on Jun 24, 2024

• Replace flag checks with vitamin checks

  Show description for 6381c34
  

  GuardianDll

  and

  RenechCDDA

  committed
  6381c34

  Copy full SHA for 6381c34

• add nut allergen and bread allergen

  GuardianDll

  committed
  2cad7c3

  Copy full SHA for 2cad7c3

• Allergens for mods

  

  harakka

  authored and

  GuardianDll

  committed
  4cf4b54

  Copy full SHA for 4cf4b54

• Revert decimal changes

  

  harakka

  authored and

  GuardianDll

  committed
  3cd8b55

  Copy full SHA for 3cd8b55

• Merge branch 'master' into allergens

  GuardianDll

  authored
  d85d16f

  Copy full SHA for d85d16f

• Astyle

  Show description for aa87341
  

  GuardianDll

  and

  github-actions[bot]

  authored
  aa87341

  Copy full SHA for aa87341

• fix broken branch update

  GuardianDll

  committed
  26a0456

  Copy full SHA for 26a0456

• it happens when you add vitamin manually

  GuardianDll

  committed
  1741126

  Copy full SHA for 1741126

Commits on Jun 25, 2024

• milk

  harakka

  committed
  60ac02b

  Copy full SHA for 60ac02b

• Add milk vitamin in json

  GuardianDll

  authored
  86f13b9

  Copy full SHA for 86f13b9

• satisfy clang-tidy

  GuardianDll

  authored
  eb0481e

  Copy full SHA for eb0481e

Commits on Jun 26, 2024

• Merge branch 'CleverRaven:master' into allergens

  GuardianDll

  authored
  15a9138

  Copy full SHA for 15a9138

• Merge branch 'CleverRaven:master' into allergens

  GuardianDll

  authored
  7a0192c

  Copy full SHA for 7a0192c