Code

Adding More Furniture#35272

Code

Closed

WhaleyWhaley wants to merge 20 commits intoCleverRaven:masterCleverRaven/Cataclysm-DDA:masterfrom WhaleyWhaley:testbranchWhaleyWhaley/Cataclysm-DDA:testbranchCopy head branch name to clipboard

+835-28

Commits

Commits on Nov 3, 2019

• Adding More Furniture

  Show description for bc4cddf
  WhaleyWhaley

  committed
  bc4cddf

• Linting

  WhaleyWhaley

  committed
  6d5542a

• Fixing Typos and Color Misnaming

  WhaleyWhaley

  committed
  f0b5b60

• Removing "count" definitions

  WhaleyWhaley

  committed
  a5d7b06

• Added Furniture to a select few Homes and Businesses

  WhaleyWhaley

  committed
  6161666

• Update data/json/furniture_and_terrain/furniture-appliances.json

  Show description for 53bfb8e
  

  WhaleyWhaley

  and

  matskuman5

  authored
  53bfb8e

• Update data/json/furniture_and_terrain/furniture-decorative.json

  Show description for ed75981
  

  WhaleyWhaley

  and

  matskuman5

  authored
  ed75981

• Update data/json/snippets/snippets.json

  Show description for 39f7099
  

  WhaleyWhaley

  and

  matskuman5

  authored
  39f7099

• Update data/json/items/generic.json

  Show description for ff48342
  

  WhaleyWhaley

  and

  matskuman5

  authored
  ff48342

• Update data/json/snippets/snippets.json

  Show description for c58d085
  

  WhaleyWhaley

  and

  matskuman5

  authored
  c58d085

• Update data/json/snippets/snippets.json

  Show description for b02b274
  

  WhaleyWhaley

  and

  matskuman5

  authored
  b02b274

• Update data/json/furniture_and_terrain/furniture-seats.json

  Show description for f0a91c8
  

  WhaleyWhaley

  and

  matskuman5

  authored
  f0a91c8

• Update data/json/furniture_and_terrain/furniture-decorative.json

  Show description for d9c063d
  

  WhaleyWhaley

  and

  matskuman5

  authored
  d9c063d

• Update data/json/furniture_and_terrain/furniture-decorative.json

  Show description for e3e7cd1
  

  WhaleyWhaley

  and

  matskuman5

  authored
  e3e7cd1

• Update data/json/furniture_and_terrain/furniture-decorative.json

  Show description for 84481f4
  

  WhaleyWhaley

  and

  matskuman5

  authored
  84481f4

• Update data/json/furniture_and_terrain/furniture-decorative.json

  Show description for 94344d2
  

  WhaleyWhaley

  and

  Davi-DeGanne

  authored
  94344d2

• Update data/json/furniture_and_terrain/furniture-decorative.json

  Show description for 2ae55d8
  

  WhaleyWhaley

  and

  Davi-DeGanne

  authored
  2ae55d8

• Update data/json/furniture_and_terrain/furniture-decorative.json

  Show description for 8452013
  

  WhaleyWhaley

  and

  Davi-DeGanne

  authored
  8452013

• Update data/json/furniture_and_terrain/furniture-seats.json

  Show description for 20298ab
  

  WhaleyWhaley

  and

  Davi-DeGanne

  authored
  20298ab

Commits on Dec 16, 2019

• Merge branch 'master' into testbranch

  I-am-Erk

  authored
  1660661