Code

Update and overhaul survivor masks#70666

Code

Merged

Maleclypse merged 21 commits intoCleverRaven:masterCleverRaven/Cataclysm-DDA:masterfrom worm-girl:survivormaskCopy head branch name to clipboardJan 9, 2024

+535-611

Commits

Commits on Jan 5, 2024

• updates

  worm-girl

  committed
  f36cb4e

  Copy full SHA for f36cb4e

• Update data/json/items/tool_armor.json

  Show description for fd5161e
  

  worm-girl

  and

  TheShadowFerret

  authored
  fd5161e

  Copy full SHA for fd5161e

• oiled leather

  worm-girl

  committed
  709325a

  Copy full SHA for 709325a

• Merge branch 'survivormask' of https://github.com/fairyarmadillo/Cataclysm-DDA into survivormask

  worm-girl

  committed
  ad08f50

  Copy full SHA for ad08f50

• standard enc and recipes

  worm-girl

  committed
  d418991

  Copy full SHA for d418991

• ok then

  worm-girl

  committed
  25d9afa

  Copy full SHA for 25d9afa

• polycarb it up

  worm-girl

  committed
  659d31c

  Copy full SHA for 659d31c

• Update utility.json

  worm-girl

  committed
  fc23d67

  Copy full SHA for fc23d67

• lint and astyle

  worm-girl

  committed
  675c6e4

  Copy full SHA for 675c6e4

• Update data/json/items/tool_armor.json

  Show description for 0157ad4
  

  worm-girl

  and

  github-actions[bot]

  authored
  0157ad4

  Copy full SHA for 0157ad4

• Update data/json/items/tool_armor.json

  Show description for 1f0fbf4
  

  worm-girl

  and

  github-actions[bot]

  authored
  1f0fbf4

  Copy full SHA for 1f0fbf4

• Update data/json/items/tool_armor.json

  Show description for cb16895
  

  worm-girl

  and

  github-actions[bot]

  authored
  cb16895

  Copy full SHA for cb16895

• Update data/json/recipes/armor/head.json

  Show description for daac7b6
  

  worm-girl

  and

  github-actions[bot]

  authored
  daac7b6

  Copy full SHA for daac7b6

• Update data/json/recipes/armor/head.json

  Show description for c9cd3b2
  

  worm-girl

  and

  github-actions[bot]

  authored
  c9cd3b2

  Copy full SHA for c9cd3b2

• Update data/json/recipes/armor/head.json

  Show description for d1c3253
  

  worm-girl

  and

  github-actions[bot]

  authored
  d1c3253

  Copy full SHA for d1c3253

• Update data/json/items/tool_armor.json

  Show description for d58f346
  

  worm-girl

  and

  github-actions[bot]

  authored
  d58f346

  Copy full SHA for d58f346

• Update data/json/items/tool_armor.json

  Show description for 7e1a9ee
  

  worm-girl

  and

  github-actions[bot]

  authored
  7e1a9ee

  Copy full SHA for 7e1a9ee

Commits on Jan 6, 2024

• Update plastic.json

  worm-girl

  committed
  741bb6e

  Copy full SHA for 741bb6e

• Merge branch 'master' into survivormask

  worm-girl

  authored
  0f5fecd

  Copy full SHA for 0f5fecd

• Update flags.json

  worm-girl

  authored
  b56431b

  Copy full SHA for b56431b

• Update flag.cpp

  worm-girl

  committed
  2e9d3e3

  Copy full SHA for 2e9d3e3