Merge branch 'develop' into sabrecat/winter-2021

website/common/script/content/appearance/backgrounds.js

@@ -410,6 +410,11 @@ const backgrounds = {
     resting_in_the_inn: { },
     river_of_lava: { },
   },
+  backgrounds122020: {
+    gingerbread_house: { },
+    holiday_hearth: { },
+    inside_an_ornament: { },
+  },
   timeTravelBackgrounds: {
     airship: {
       price: 1,

website/common/script/content/gear/sets/armoire.js

@@ -334,6 +334,10 @@ const armor = {
     con: 10,
     set: 'jackOfClubs',
   },
+  dressingGown: {
+    con: 12,
+    set: 'dressingGown',
+  },
 };
 
 const body = {
@@ -668,6 +672,10 @@ const head = {
     int: 10,
     set: 'jackOfClubs',
   },
+  nightcap: {
+    per: 12,
+    set: 'dressingGown',
+  },
 };
 
 const shield = {
@@ -1143,6 +1151,10 @@ const weapon = {
     str: 10,
     set: 'jackOfClubs',
   },
+  eveningTea: {
+    int: 12,
+    set: 'dressingGown',
+  },
 };
 
 forEach({