Code

Vegan Trait#66511

Code

Merged

dseguin merged 136 commits intoCleverRaven:masterCleverRaven/Cataclysm-DDA:masterfrom Holli-Git:masterCopy head branch name to clipboardJun 29, 2023

+856-18

Commits

Commits on Jul 13, 2021

• Create polymer_plant

  Holli-Git

  authored
  2a836e1

Commits on Oct 29, 2022

• Merge branch 'master' of https://github.com/Paprika-H/Cataclysm-DDA

  Holli-Git

  committed
  1d70a6a

• Merge branch 'master' of https://github.com/Paprika-H/Cataclysm-DDA

  Holli-Git

  committed
  f786c19

• Update character_attire.cpp

  Holli-Git

  authored
  7d17941

• Update mutations.json

  Holli-Git

  authored
  5b93ca4

• Update character_attire.cpp

  Holli-Git

  authored
  51d106d

Commits on Nov 7, 2022

• faux fur gloves

  Holli-Git

  authored
  82f8f35

• faux fur feet styuff

  Holli-Git

  authored
  fe993c1

• faux fur scarfs

  Holli-Git

  authored
  ad9fdfb

• faux fur boots recipes

  Holli-Git

  authored
  60cf281

• Update hands.json

  Holli-Git

  authored
  93f988c

• Update feet.json

  Holli-Git

  authored
  82c9c23

• Update hands.json

  Holli-Git

  authored
  0d69444

• Update character_attire.cpp

  Holli-Git

  authored
  a8cb3a1

Commits on Nov 8, 2022

• Update flag.h

  Holli-Git

  authored
  020c6be

• Update flag.cpp

  Holli-Git

  authored
  e6d2239

• Update consumption.cpp

  Holli-Git

  authored
  c203308

• Update flags.json

  Holli-Git

  authored
  3569ad8

• Update dairy.json

  Holli-Git

  authored
  82c0a04

• Update consumption.cpp

  Holli-Git

  authored
  ff6653b

• Update flag.cpp

  Holli-Git

  authored
  c3ce82e

• Update consumption.cpp

  Holli-Git

  authored
  776e4d0

Commits on Nov 9, 2022

• Update flags.json

  Holli-Git

  authored
  f6b787c

Commits on Nov 10, 2022

• Update boots.json

  Holli-Git

  authored
  b0fcf08

• Update gloves.json

  Holli-Git

  authored
  ec572d7

Commits on Nov 11, 2022

• Update suits_protection.json

  Holli-Git

  authored
  ec10d7d

• Update suit.json

  Holli-Git

  authored
  9f0b6e4

• Update flag.h

  Holli-Git

  authored
  99eb999

• Update flag.cpp

  Holli-Git

  authored
  b0af7ca

• Update flags.json

  Holli-Git

  authored
  68394c7

• Update dairy.json

  Holli-Git

  authored
  ab79549

• Update character_attire.cpp

  Holli-Git

  authored
  ea872b2

• Update consumption.cpp

  Holli-Git

  authored
  54551d1

• Update suits_protection.json

  Holli-Git

  authored
  a8f833b

• Update scarfs.json

  Holli-Git

  authored
  5e1942c

• Update legs_armor.json

  Holli-Git

  authored
  4d25f26

• Update legs_armor.json

  Holli-Git

  authored
  3f82ca3

• Update legs.json

  Holli-Git

  authored
  5e98f35

• Update legs_armor.json

  Holli-Git

  authored
  ef59e6a

• Update holster.json

  Holli-Git

  authored
  7e39ffd

• Update storage.json

  Holli-Git

  authored
  0516caf

• Update holster.json

  Holli-Git

  authored
  2d93a1c

• Update holster.json

  Holli-Git

  authored
  db80acf

• Update holster.json

  Holli-Git

  authored
  538d737

• Update scarfs.json

  Holli-Git

  authored
  a8fd38b

• Update scarfs.json

  Holli-Git

  authored
  afd27a3

• Update legs.json

  Holli-Git

  authored
  b17c698

• Update nested.json

  Holli-Git

  authored
  38d26a0

• Update suits_protection.json

  Holli-Git

  authored
  4a39b7c

• Update wheat.json

  Holli-Git

  authored
  dce449b

• Update legs.json

  Holli-Git

  authored
  c4dbd88

• Update legs.json

  Holli-Git

  authored
  c3b4524

• Update mutations.json

  Holli-Git

  authored
  f7e2da0

• Merge branch 'master' of https://github.com/Paprika-H/Cataclysm-DDA

  Holli-Git

  committed
  3c92d6a

• Delete polymer_plant

  Holli-Git

  committed
  5725077

• Update boots.json

  Holli-Git

  authored
  5a740dd

• Update gloves.json

  Holli-Git

  authored
  e5559bb

• Update holster.json

  Holli-Git

  authored
  98a523a

• Update scarfs.json

  Holli-Git

  authored
  66d192f

• Update feet.json

  Holli-Git

  authored
  b40940b

• Update hands.json

  Holli-Git

  authored
  aa39d4a

• Update legs.json

  Holli-Git

  authored
  bed6289

• Update storage.json

  Holli-Git

  authored
  9299249

• lint

  Holli-Git

  committed
  793c3d8

• Merge branch 'master' of https://github.com/Paprika-h/Cataclysm-DDA

  Holli-Git

  committed
  f5a9e8d

• Update scarfs.json

  Holli-Git

  authored
  76cfbfe

• Update feet.json

  Holli-Git

  authored
  0ca5528

• Update mutations.json

  Holli-Git

  authored
  a373528

• Update holster.json

  Holli-Git

  authored
  4c53799

• Update holster.json

  Holli-Git

  authored
  1e928c6

• Update consumption.cpp

  Holli-Git

  authored
  4070e66

• Update flag.cpp

  Holli-Git

  authored
  af1381f

• Update character_attire.cpp

  Holli-Git

  authored
  9e6350c

• Update holster.json

  Holli-Git

  authored
  bff26db

• Update storage.json

  Holli-Git

  authored
  7eba2f5

• Update nested.json

  Holli-Git

  authored
  31e7c81

• Update consumption.cpp

  Holli-Git

  authored
  cc54844

Commits on Nov 12, 2022

• Update character_attire.cpp

  Holli-Git

  authored
  fca9f5d

• Update consumption.cpp

  Holli-Git

  authored
  52d46cf

• .22 ar

  Holli-Git

  committed
  f97cb3e

• Update magazines.json

  Holli-Git

  authored
  a4de08b

• Update magazines.json

  Holli-Git

  authored
  a42949d

• Update magazines.json

  Holli-Git

  authored
  c1fc6b7

• Update magazines.json

  Holli-Git

  authored
  67b27bf

• Update mechanism.json

  Holli-Git

  authored
  7078610

• Update 22.json

  Holli-Git

  authored
  5bfb674

• .22 ar

  Holli-Git

  committed
  05bd715

• Update gunmod.json

  Holli-Git

  committed
  94062a9

• Merge pull request #2 from Paprika-H/22ar

  Show description for d81ebc1
  Holli-Git

  authored
  d81ebc1

• lint

  Holli-Git

  committed
  2420af3

• Merge pull request #3 from Paprika-H/22ar

  Show description for d326a88
  Holli-Git

  authored
  d326a88

• Update gunmod.json

  Holli-Git

  authored
  1675ba0

• Update magazines.json

  Holli-Git

  authored
  5e0ff19

• Update 22.json

  Holli-Git

  authored
  98fae3f

• Update mechanism.json

  Holli-Git

  authored
  1ae8695

Commits on Nov 13, 2022

• Update data/json/mutations/mutations.json

  Show description for 8d9c1f4
  

  Holli-Git

  and

  NetSysFire

  authored
  8d9c1f4

Commits on Jun 26, 2023

• Update character_attire.cpp

  Holli-Git

  authored
  13abdaf

Commits on Jun 27, 2023

• Update holster.json

  Holli-Git

  authored
  b10d647

Commits on Jun 28, 2023

• Update item_factory.cpp

  Holli-Git

  authored
  2aeba53

• Update holster.json

  Holli-Git

  authored
  f28335d

• Update nested.json

  Holli-Git

  authored
  6b9b469

• Update storage.json

  Holli-Git

  authored
  a7b6e8d

• Update nested.json

  Holli-Git

  authored
  55e9f2b

• Update holster.json

  Holli-Git

  authored
  2966eb9

• Update holster.json

  Holli-Git

  authored
  df95668

• Update gear.json

  Holli-Git

  authored
  c894a6a

• Update gunstore.json

  Holli-Git

  authored
  ce69b19

• Update military.json

  Holli-Git

  authored
  2a26aeb

• Update clothing.json

  Holli-Git

  authored
  de4025f

• Update locations.json

  Holli-Git

  authored
  e4ddc6f

• Update item_factory.cpp

  Holli-Git

  authored
  2cae742

• Update item_factory.cpp

  Holli-Git

  authored
  c66e2ac

• Update holster.json

  Holli-Git

  authored
  7cf390c

• Update storage.json

  Holli-Git

  authored
  4073185

• Update sheath.json

  Holli-Git

  authored
  c439e3c

• Update storage.json

  Holli-Git

  authored
  7edb81d

• Update holster.json

  Holli-Git

  authored
  c70fa71

• Update storage.json

  Holli-Git

  authored
  795cbe7

• Update storage.json

  Holli-Git

  authored
  02e71d0

• Update storage.json

  Holli-Git

  authored
  662c107

• Merge branch 'master' into master

  Holli-Git

  authored
  6ad5374

• Apply suggestions from code review

  Show description for 7670c39
  

  Holli-Git

  and

  github-actions[bot]

  authored
  7670c39

• Update nested.json

  Holli-Git

  authored
  e932847

• Update holster.json

  Holli-Git

  authored
  5e79a4b

• Update boots.json

  Holli-Git

  authored
  e3a2033

• Update legs_armor.json

  Holli-Git

  authored
  12e96d3

• Update consumption.cpp

  Holli-Git

  authored
  a1161f0

• Update consumption.cpp

  Holli-Git

  authored
  378122f

• Update character_attire.cpp

  Holli-Git

  authored
  d107ce7

• Update sheath.json

  Holli-Git

  authored
  987cca0

• Update suits_protection.json

  Holli-Git

  authored
  e6943a7

• Update legs.json

  Holli-Git

  authored
  acf52a3

• Update holster.json

  Holli-Git

  authored
  81169d1

• Update holster.json

  Holli-Git

  authored
  94ccb85

Commits on Jun 29, 2023

• Apply suggestions from code review

  Show description for 2f131e3
  

  Holli-Git

  and

  dseguin

  authored
  2f131e3

• Update src/consumption.cpp

  Show description for 97a6a8d
  

  Holli-Git

  and

  github-actions[bot]

  authored
  97a6a8d