Code

Carpet more floors#60622

Code

Merged

Fris0uman merged 18 commits intoCleverRaven:masterCleverRaven/Cataclysm-DDA:masterfrom gettingusedto:carpetfixgettingusedto/Cataclysm-DDA:carpetfixCopy head branch name to clipboardSep 19, 2022

+830-11

Commits

Commits on Aug 31, 2022

• adds more floor types to carpet

  gettingusedto

  authored
  2c12bc3

  Copy full SHA for 2c12bc3

• Update construction.json

  gettingusedto

  authored
  e4f5e3b

  Copy full SHA for e4f5e3b

• Merge branch 'CleverRaven:master' into carpetfix

  gettingusedto

  authored
  a136a42

  Copy full SHA for a136a42

• Update terrain-floors-indoor.json

  gettingusedto

  authored
  8a7b1bb

  Copy full SHA for 8a7b1bb

• Merge branch 'CleverRaven:master' into carpetfix

  gettingusedto

  authored
  a49be91

  Copy full SHA for a49be91

• changed nails component to duct tape

  gettingusedto

  authored
  e734ed3

  Copy full SHA for e734ed3

• removed nails in concrete and metal floor

  Show description for 723661a
  gettingusedto

  authored
  723661a

  Copy full SHA for 723661a

• Merge branch 'CleverRaven:master' into carpetfix

  gettingusedto

  authored
  eb31361

  Copy full SHA for eb31361

• Update terrain-floors-indoor.json

  gettingusedto

  authored
  63db7e3

  Copy full SHA for 63db7e3

Commits on Sep 1, 2022

• Update construction.json

  gettingusedto

  authored
  b52816b

  Copy full SHA for b52816b

• Merge branch 'CleverRaven:master' into carpetfix

  gettingusedto

  authored
  e36edfe

  Copy full SHA for e36edfe

• Update construction.json

  gettingusedto

  authored
  2c6ecbf

  Copy full SHA for 2c6ecbf

• Update terrain-floors-indoor.json

  gettingusedto

  authored
  4198348

  Copy full SHA for 4198348

Commits on Sep 2, 2022

• Merge branch 'CleverRaven:master' into carpetfix

  gettingusedto

  authored
  ef9b62e

  Copy full SHA for ef9b62e

Commits on Sep 4, 2022

• Merge branch 'CleverRaven:master' into carpetfix

  gettingusedto

  authored
  e556253

  Copy full SHA for e556253

Commits on Sep 5, 2022

• Merge branch 'CleverRaven:master' into carpetfix

  gettingusedto

  authored
  585b4cb

  Copy full SHA for 585b4cb

Commits on Sep 13, 2022

• Merge branch 'CleverRaven:master' into carpetfix

  gettingusedto

  authored
  62d9427

  Copy full SHA for 62d9427

Commits on Sep 15, 2022

• Update terrain-floors-indoor.json

  gettingusedto

  authored
  67594d9

  Copy full SHA for 67594d9