Code

Ankle socks#36347

Code

Merged

I-am-Erk merged 13 commits intoCleverRaven:masterCleverRaven/Cataclysm-DDA:masterfrom FuelType-Memes:ankle-socksCopy head branch name to clipboardDec 28, 2019

+55-14

Commits

Commits on Dec 22, 2019

• Add ankle socks

  FuelType-Memes

  committed
  5780686

• Fix warmth

  FuelType-Memes

  committed
  4cb74c7

• Merge remote-tracking branch 'upstream/master'

  FuelType-Memes

  committed
  283cfd4

• Fix merge conflict

  FuelType-Memes

  committed
  06a0365

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

  FuelType-Memes

  committed
  20f4ba9

• Use the same req as basic socks

  FuelType-Memes

  committed
  41c45f1

• Remove .0000000x from weights

  

  molkero

  authored and

  FuelType-Memes

  committed
  a5afdf3

• Remove .0000000x from weights

  

  molkero

  authored and

  FuelType-Memes

  committed
  93598b1

• Remove .0000000x from weights

  FuelType-Memes

  committed
  43603cf

• Merge branch 'ankle-socks' of https://github.com/FuelType-Memes/Cataclysm-DDA into ankle-socks

  FuelType-Memes

  committed
  67710b3

Commits on Dec 28, 2019

• Linting

  FuelType-Memes

  committed
  7bce6e5

• Merge remote-tracking branch 'upstream/master'

  FuelType-Memes

  committed
  edf287e

• Merge branch 'master' into ankle-socks

  FuelType-Memes

  committed
  46a4bbe