Code

more variety in shelter_supplies#36282

Code

Merged

I-am-Erk merged 8 commits intoCleverRaven:masterCleverRaven/Cataclysm-DDA:masterfrom Jerimee:shelteritemsJerimee/Cataclysm-DDA:shelteritemsCopy head branch name to clipboardDec 28, 2019

+17-3

Commits

Commits on Dec 18, 2019

• Merge pull request #1 from CleverRaven/master

  Show description for 9b47c0f
  Jerimee

  authored
  9b47c0f

  Copy full SHA for 9b47c0f

Commits on Dec 20, 2019

• shelter_supplies

  Jerimee

  committed
  ce38b63

  Copy full SHA for ce38b63

• Update generic.json

  Jerimee

  committed
  81ed04b

  Copy full SHA for 81ed04b

Commits on Dec 22, 2019

• Update data/json/itemgroups/item_groups.json

  Show description for 16ac0aa
  

  Jerimee

  and

  I-am-Erk

  authored
  16ac0aa

  Copy full SHA for 16ac0aa

• Update shelter.json

  Jerimee

  authored
  beebc45

  Copy full SHA for beebc45

• Update shelter.json

  Jerimee

  authored
  5b4f2cd

  Copy full SHA for 5b4f2cd

Commits on Dec 28, 2019

• Update data/json/mapgen/shelter.json

  Show description for 421ccbe
  

  Jerimee

  and

  I-am-Erk

  authored
  421ccbe

  Copy full SHA for 421ccbe

• Merge branch 'master' into shelteritems

  Jerimee

  authored
  322a496

  Copy full SHA for 322a496