From 2a9c375b4161e009b65acd92946ccbb8e05b949b Mon Sep 17 00:00:00 2001
From: I-am-Erk <45136638+I-am-Erk@users.noreply.github.com>
Date: Tue, 21 Dec 2021 10:24:51 -0800
Subject: [PATCH 01/42] Update construction_group.json

---
 data/json/construction_group.json | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/data/json/construction_group.json b/data/json/construction_group.json
index 5175d5d2265da..21af586f657ca 100644
--- a/data/json/construction_group.json
+++ b/data/json/construction_group.json
@@ -1074,6 +1074,11 @@
     "id": "place_fridge",
     "name": "Place Fridge"
   },
+  {
+    "type": "construction_group",
+    "id": "place_oven",
+    "name": "Place Oven"
+  },
   {
     "type": "construction_group",
     "id": "place_forge",

From c881ba1d36a7fb4ecf5482db5d1cbe940c0077b2 Mon Sep 17 00:00:00 2001
From: I-am-Erk <45136638+I-am-Erk@users.noreply.github.com>
Date: Tue, 21 Dec 2021 10:32:03 -0800
Subject: [PATCH 02/42] Update construction.json

---
 data/json/construction.json | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/data/json/construction.json b/data/json/construction.json
index c18b50d938280..3c07ab16cc1f4 100644
--- a/data/json/construction.json
+++ b/data/json/construction.json
@@ -2964,6 +2964,17 @@
     "pre_special": "check_empty",
     "post_special": "done_appliance"
   },
+  {
+    "type": "construction",
+    "id": "app_oven",
+    "group": "place_oven",
+    "category": "APPLIANCE",
+    "required_skills": [ [ "fabrication", 0 ] ],
+    "time": "5 m",
+    "components": [ [ [ "oven", 1 ] ] ],
+    "pre_special": "check_empty",
+    "post_special": "done_appliance"
+  },
   {
     "type": "construction",
     "id": "constr_pontoon_dp",

From d4f9a7cfecbf15c3c2536114b4a1d38c7e9c94f4 Mon Sep 17 00:00:00 2001
From: I-am-Erk <45136638+I-am-Erk@users.noreply.github.com>
Date: Tue, 21 Dec 2021 10:45:21 -0800
Subject: [PATCH 03/42] Update appliances.json

---
 data/json/items/appliances.json | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/data/json/items/appliances.json b/data/json/items/appliances.json
index cc6b393fa73fa..868dbba26283b 100644
--- a/data/json/items/appliances.json
+++ b/data/json/items/appliances.json
@@ -21,6 +21,27 @@
       }
     ]
   },
+  {
+    "type": "GENERIC",
+    "id": "oven",
+    "looks_like": "f_oven",
+    "symbol": "#",
+    "description": "A disconnected electric convection-based oven, commonly used for heating and cooking food.",
+    "color": "gray",
+    "name": { "str": "disconnected oven" },
+    "longest_side": "69 cm",
+    "insulation": 3,
+    "volume": "290 L",
+    "weight": "77 kg",
+    "pocket_data": [
+      {
+        "pocket_type": "CONTAINER",
+        "rigid": true,
+        "max_contains_volume": "120 L",
+        "max_contains_weight": "200 kg"
+      }
+    ]
+  },
   {
     "type": "TOOL",
     "id": "power_cord",

From 5350acd86c51370fd6f87bfabc64f74bbca760f3 Mon Sep 17 00:00:00 2001
From: I-am-Erk <45136638+I-am-Erk@users.noreply.github.com>
Date: Tue, 21 Dec 2021 10:48:45 -0800
Subject: [PATCH 04/42] Update and rename
 data/json/vehicleparts/appliances.json to
 data/json/furniture_and_terrain/appliances.json

---
 .../appliances.json                           | 34 +++++++++++++++++++
 1 file changed, 34 insertions(+)
 rename data/json/{vehicleparts => furniture_and_terrain}/appliances.json (60%)

diff --git a/data/json/vehicleparts/appliances.json b/data/json/furniture_and_terrain/appliances.json
similarity index 60%
rename from data/json/vehicleparts/appliances.json
rename to data/json/furniture_and_terrain/appliances.json
index 8928271dd5a8e..154fadf0f5d40 100644
--- a/data/json/vehicleparts/appliances.json
+++ b/data/json/furniture_and_terrain/appliances.json
@@ -32,6 +32,40 @@
     ],
     "damage_reduction": { "all": 32 }
   },
+  {
+    "id": "ap_oven",
+    "name": { "str": "oven" },
+    "description": "A standard electric convection-based oven, commonly used for heating and cooking food.",
+    "symbol": "#",
+    "color": "dark_gray",
+    "broken_color": "light_cyan",
+    "broken_symbol": "x",
+    "categories": [ "utility" ],
+    "damage_modifier": 10,
+    "damage_reduction": { "all": 30 },
+    "durability": 80,
+    "flags": [ "CARGO", "OBSTACLE", "COVERED", "FLAT_SURF" ],
+    "pseudo_tools": [ { "id": "hotplate", "hotkey": "h" } ],
+    "epower": 0,
+    "item": "oven",
+    "location": "center",
+    "looks_like": "f_oven",
+    "requirements": {
+      "install": { "skills": [ [ "mechanics", 0 ] ], "time": "5 m", "using": [ [ "vehicle_wrench_2", 1 ] ] },
+      "removal": { "skills": [ [ "mechanics", 0 ] ], "time": "5 m", "using": [ [ "vehicle_wrench_2", 1 ] ] },
+      "repair": { "skills": [ [ "mechanics", 4 ] ], "time": "60 m", "using": [ [ "welding_standard", 5 ] ] }
+    },
+    "breaks_into": [
+        { "item": "sheet_metal", "count": [ 1, 4 ] },
+        { "item": "sheet_metal_small", "count": [ 8, 12 ] },
+        { "item": "steel_chunk", "count": [ 0, 3 ] },
+        { "item": "scrap", "count": [ 0, 6 ] },
+        { "item": "element", "count": [ 1, 3 ] },
+        { "item": "cable", "charges": [ 1, 3 ] }
+    ],
+    "size": 200,
+    "type": "vehicle_part"
+  },
   {
     "type": "vehicle_part",
     "id": "power_cord",

From 68a791bf8d7b5906dc5fcd2b9f37defdced3b554 Mon Sep 17 00:00:00 2001
From: I-am-Erk <45136638+I-am-Erk@users.noreply.github.com>
Date: Tue, 21 Dec 2021 11:22:15 -0800
Subject: [PATCH 05/42] ovens can be disconnected and aren't fireplaces anymore

---
 .../furniture-appliances.json                 | 20 ++++---------------
 1 file changed, 4 insertions(+), 16 deletions(-)

diff --git a/data/json/furniture_and_terrain/furniture-appliances.json b/data/json/furniture_and_terrain/furniture-appliances.json
index 32aec2c82e6ac..6278ea03ca8a2 100644
--- a/data/json/furniture_and_terrain/furniture-appliances.json
+++ b/data/json/furniture_and_terrain/furniture-appliances.json
@@ -342,26 +342,14 @@
     "id": "f_oven",
     "name": "oven",
     "symbol": "#",
-    "description": "A standard convection-based oven, commonly used for heating and cooking food.  You could safely light a fire inside or power it with UPS.",
+    "description": "A standard convection-based oven, commonly used for heating and cooking food.  You could disconnect it and plug it in to a working power grid, or power it with UPS.",
     "color": "dark_gray",
     "move_cost_mod": 2,
     "coverage": 60,
     "required_str": 10,
-    "flags": [ "PLACE_ITEM", "TRANSPARENT", "FIRE_CONTAINER", "CONTAINER", "BLOCKSDOOR", "MOUNTABLE" ],
-    "examine_action": "fireplace",
-    "deconstruct": {
-      "items": [
-        { "item": "sheet_metal", "count": [ 2, 6 ] },
-        { "item": "sheet_metal_small", "count": [ 0, 4 ] },
-        { "item": "steel_chunk", "count": [ 2, 3 ] },
-        { "item": "scrap", "count": [ 2, 6 ] },
-        { "item": "element", "count": [ 1, 4 ] },
-        { "item": "cable", "charges": [ 1, 3 ] },
-        { "item": "pipe_fittings", "count": [ 1, 3 ] },
-        { "item": "pilot_light", "count": 1 }
-      ]
-    },
-    "max_volume": "40 L",
+    "flags": [ "PLACE_ITEM", "TRANSPARENT", "EASY_DECONSTRUCT", "CONTAINER", "BLOCKSDOOR", "MOUNTABLE" ],
+    "deconstruct": { "items": [ { "item": "oven", "count": 1 } ] },
+    "max_volume": "120 L",
     "bash": {
       "str_min": 8,
       "str_max": 30,

From eeb12b8dfaf907673e1f414bd3a139050da800c5 Mon Sep 17 00:00:00 2001
From: I-am-Erk <45136638+I-am-Erk@users.noreply.github.com>
Date: Tue, 21 Dec 2021 11:30:07 -0800
Subject: [PATCH 06/42] changing oven fireplace shoudl be a separate PR

---
 data/json/furniture_and_terrain/furniture-appliances.json | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/data/json/furniture_and_terrain/furniture-appliances.json b/data/json/furniture_and_terrain/furniture-appliances.json
index 6278ea03ca8a2..df45e9553aed1 100644
--- a/data/json/furniture_and_terrain/furniture-appliances.json
+++ b/data/json/furniture_and_terrain/furniture-appliances.json
@@ -342,13 +342,14 @@
     "id": "f_oven",
     "name": "oven",
     "symbol": "#",
-    "description": "A standard convection-based oven, commonly used for heating and cooking food.  You could disconnect it and plug it in to a working power grid, or power it with UPS.",
+    "description": "A standard convection-based oven, commonly used for heating and cooking food.  It can safely contain a fire, although it's not adequately ventilated.  You could disconnect it and plug it in to a working power grid, or power it with UPS.",
     "color": "dark_gray",
     "move_cost_mod": 2,
     "coverage": 60,
     "required_str": 10,
-    "flags": [ "PLACE_ITEM", "TRANSPARENT", "EASY_DECONSTRUCT", "CONTAINER", "BLOCKSDOOR", "MOUNTABLE" ],
+    "flags": [ "PLACE_ITEM", "TRANSPARENT", "EASY_DECONSTRUCT", "FIRE_CONTAINER", "CONTAINER", "BLOCKSDOOR", "MOUNTABLE" ],
     "deconstruct": { "items": [ { "item": "oven", "count": 1 } ] },
+    "examine_action": "fireplace",
     "max_volume": "120 L",
     "bash": {
       "str_min": 8,

From 8b6d11993710d10f219a4af224ee50108b7eab41 Mon Sep 17 00:00:00 2001
From: I-am-Erk <45136638+I-am-Erk@users.noreply.github.com>
Date: Tue, 21 Dec 2021 12:29:13 -0800
Subject: [PATCH 07/42] Apply suggestions from code review

Co-authored-by: Fris0uman <41293484+Fris0uman@users.noreply.github.com>
---
 data/json/furniture_and_terrain/appliances.json | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/data/json/furniture_and_terrain/appliances.json b/data/json/furniture_and_terrain/appliances.json
index 154fadf0f5d40..1be67f77d0e7c 100644
--- a/data/json/furniture_and_terrain/appliances.json
+++ b/data/json/furniture_and_terrain/appliances.json
@@ -40,21 +40,14 @@
     "color": "dark_gray",
     "broken_color": "light_cyan",
     "broken_symbol": "x",
-    "categories": [ "utility" ],
     "damage_modifier": 10,
     "damage_reduction": { "all": 30 },
     "durability": 80,
-    "flags": [ "CARGO", "OBSTACLE", "COVERED", "FLAT_SURF" ],
+    "flags": [ "CARGO", "OBSTACLE", "COVERED", "FLAT_SURF", "APPLIANCE", "CTRL_ELECTRONIC"  ],
     "pseudo_tools": [ { "id": "hotplate", "hotkey": "h" } ],
     "epower": 0,
     "item": "oven",
-    "location": "center",
     "looks_like": "f_oven",
-    "requirements": {
-      "install": { "skills": [ [ "mechanics", 0 ] ], "time": "5 m", "using": [ [ "vehicle_wrench_2", 1 ] ] },
-      "removal": { "skills": [ [ "mechanics", 0 ] ], "time": "5 m", "using": [ [ "vehicle_wrench_2", 1 ] ] },
-      "repair": { "skills": [ [ "mechanics", 4 ] ], "time": "60 m", "using": [ [ "welding_standard", 5 ] ] }
-    },
     "breaks_into": [
         { "item": "sheet_metal", "count": [ 1, 4 ] },
         { "item": "sheet_metal_small", "count": [ 8, 12 ] },

From 672e5c3fcfead247db4f832b8ee6fd72a094bed9 Mon Sep 17 00:00:00 2001
From: I-am-Erk <45136638+I-am-Erk@users.noreply.github.com>
Date: Tue, 21 Dec 2021 12:36:43 -0800
Subject: [PATCH 08/42] Update appliances.json

---
 data/json/items/appliances.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/json/items/appliances.json b/data/json/items/appliances.json
index 868dbba26283b..ea8956898940a 100644
--- a/data/json/items/appliances.json
+++ b/data/json/items/appliances.json
@@ -27,7 +27,7 @@
     "looks_like": "f_oven",
     "symbol": "#",
     "description": "A disconnected electric convection-based oven, commonly used for heating and cooking food.",
-    "color": "gray",
+    "color": "dark_gray_white",
     "name": { "str": "disconnected oven" },
     "longest_side": "69 cm",
     "insulation": 3,

From e1d1c38eb0b7588b83c2c9f78fc7d2f55e3ab3ba Mon Sep 17 00:00:00 2001
From: I-am-Erk <45136638+I-am-Erk@users.noreply.github.com>
Date: Tue, 21 Dec 2021 12:50:54 -0800
Subject: [PATCH 09/42] Update appliances.json

---
 data/json/furniture_and_terrain/appliances.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/json/furniture_and_terrain/appliances.json b/data/json/furniture_and_terrain/appliances.json
index 1be67f77d0e7c..ff0657031e48a 100644
--- a/data/json/furniture_and_terrain/appliances.json
+++ b/data/json/furniture_and_terrain/appliances.json
@@ -38,7 +38,7 @@
     "description": "A standard electric convection-based oven, commonly used for heating and cooking food.",
     "symbol": "#",
     "color": "dark_gray",
-    "broken_color": "light_cyan",
+    "broken_color": "dark_gray_white",
     "broken_symbol": "x",
     "damage_modifier": 10,
     "damage_reduction": { "all": 30 },

From c697454f6559ce91aa2e813f6764fe5836ffed73 Mon Sep 17 00:00:00 2001
From: I-am-Erk <45136638+I-am-Erk@users.noreply.github.com>
Date: Tue, 21 Dec 2021 12:56:44 -0800
Subject: [PATCH 10/42] Update appliances.json

---
 data/json/items/appliances.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/data/json/items/appliances.json b/data/json/items/appliances.json
index ea8956898940a..cfa48d1d28edc 100644
--- a/data/json/items/appliances.json
+++ b/data/json/items/appliances.json
@@ -29,6 +29,7 @@
     "description": "A disconnected electric convection-based oven, commonly used for heating and cooking food.",
     "color": "dark_gray_white",
     "name": { "str": "disconnected oven" },
+    "material": [ "budget_steel" ],
     "longest_side": "69 cm",
     "insulation": 3,
     "volume": "290 L",

From 9d23d841ef8d3fe423c144541ca2d5981921d117 Mon Sep 17 00:00:00 2001
From: I-am-Erk <45136638+I-am-Erk@users.noreply.github.com>
Date: Tue, 21 Dec 2021 13:01:14 -0800
Subject: [PATCH 11/42] Create appliance_parts.json

Parting out the specific components of an oven
---
 .../json/items/resources/appliance_parts.json | 62 +++++++++++++++++++
 1 file changed, 62 insertions(+)
 create mode 100644 data/json/items/resources/appliance_parts.json

diff --git a/data/json/items/resources/appliance_parts.json b/data/json/items/resources/appliance_parts.json
new file mode 100644
index 0000000000000..4e57486bf0905
--- /dev/null
+++ b/data/json/items/resources/appliance_parts.json
@@ -0,0 +1,62 @@
+[
+  {
+    "type": "GENERIC",
+    "id": "oven_stovetop",
+    "symbol": "_",
+    "color": "dark_gray",
+    "name": { "str": "dismantled stovetop" },
+    "category": "spare_parts",
+    "description": "The dismantled stovetop of an electric oven.  Some electric components are still attached but the heating elements have been pulled off.",
+    "price": 100,
+    "price_postapoc": 5,
+    "material": [ "budget_steel" ],
+    "weight": "5 kg",
+    "volume": "20 L",
+    "longest_side": "60 cm"
+  },
+  {
+    "type": "GENERIC",
+    "id": "oven_cabinet",
+    "symbol": "x",
+    "color": "dark_gray_white",
+    "name": { "str": "stripped oven cabinet" },
+    "category": "spare_parts",
+    "description": "A large hefty steel box that was once the main body of an electric oven.  Most of the parts have been stripped.  It could be further disassembled into base materials.",
+    "price": 200,
+    "price_postapoc": 10,
+    "material": [ "budget_steel" ],
+    "weight": "25 kg",
+    "volume": "250 L",
+    "longest_side": "69 cm"
+  },
+  {
+    "type": "GENERIC",
+    "id": "oven_door",
+    "symbol": "#",
+    "color": "dark_blue_white",
+    "name": { "str": "oven door" },
+    "category": "spare_parts",
+    "description": "The removed glass and steel door of an electric oven.",
+    "price": 100,
+    "price_postapoc": 5,
+    "material": [ "budget_steel", "glass" ],
+    "weight": "10 kg",
+    "volume": "20 L",
+    "longest_side": "69 cm"
+  },
+  {
+    "type": "GENERIC",
+    "id": "oven_broiler_pan",
+    "symbol": "_",
+    "color": "dark_gray_white",
+    "name": { "str": "broiler pan" },
+    "category": "spare_parts",
+    "description": "A simple sheet metal drawer that goes in the bottom of an electric oven.",
+    "price": 50,
+    "price_postapoc": 1,
+    "material": [ "budget_steel" ],
+    "weight": "5 kg",
+    "volume": "20 L",
+    "longest_side": "69 cm"
+  }
+]

From ce081a3fc9777566add856066796d10509b4c502 Mon Sep 17 00:00:00 2001
From: I-am-Erk <45136638+I-am-Erk@users.noreply.github.com>
Date: Tue, 21 Dec 2021 13:07:21 -0800
Subject: [PATCH 12/42] Create oven.json

Making a separate folder for appliance construction because I think these are going to add up to a lot.
---
 data/json/recipes/appliances/oven.json | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 data/json/recipes/appliances/oven.json

diff --git a/data/json/recipes/appliances/oven.json b/data/json/recipes/appliances/oven.json
new file mode 100644
index 0000000000000..7afbde1aa9d78
--- /dev/null
+++ b/data/json/recipes/appliances/oven.json
@@ -0,0 +1,20 @@
+[
+  {
+    "result": "oven",
+    "type": "uncraft",
+    "activity_level": "MODERATE_EXERCISE",
+    "time": "1 h",
+    "qualities": [ { "id": "SCREWDRIVER", "level": 1 }, { "id": "WRENCH", "level": 1 } ],
+    "components": [
+      [ [ "oven_stovetop", 1 ] ],
+      [ [ "oven_cabinet", 1 ] ],
+      [ [ "oven_controls", 1 ] ],
+      [ [ "oven_door", 1 ] ],
+      [ [ "oven_broiler_pan", 1 ] ],
+      [ [ "element", 4 ] ],
+      [ [ "cable", 4 ] ],
+      [ [ "pipe_fittings", 4 ] ],
+      [ [ "pilot_light", 1 ] ]
+    ]
+  }
+]

From fb3caffc857c1c4bca694bc291ed01a22f84b011 Mon Sep 17 00:00:00 2001
From: I-am-Erk <45136638+I-am-Erk@users.noreply.github.com>
Date: Tue, 21 Dec 2021 13:08:14 -0800
Subject: [PATCH 13/42] Update appliance_parts.json

---
 data/json/items/resources/appliance_parts.json | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/data/json/items/resources/appliance_parts.json b/data/json/items/resources/appliance_parts.json
index 4e57486bf0905..07a7efd1aa33f 100644
--- a/data/json/items/resources/appliance_parts.json
+++ b/data/json/items/resources/appliance_parts.json
@@ -29,6 +29,21 @@
     "volume": "250 L",
     "longest_side": "69 cm"
   },
+  {
+    "type": "GENERIC",
+    "id": "oven_controls",
+    "symbol": "#",
+    "color": "dark_blue_white",
+    "name": { "str": "oven door" },
+    "category": "spare_parts",
+    "description": "The control panel and LCD from a dismantled electric oven.",
+    "price": 100,
+    "price_postapoc": 5,
+    "material": [ "budget_steel", "glass" ],
+    "weight": "1 kg",
+    "volume": "2 L",
+    "longest_side": "65 cm"
+  },
   {
     "type": "GENERIC",
     "id": "oven_door",

From 2ec5bdb7b8311d0c9d270c6d05a07bd911a489e2 Mon Sep 17 00:00:00 2001
From: I-am-Erk <45136638+I-am-Erk@users.noreply.github.com>
Date: Tue, 21 Dec 2021 13:31:47 -0800
Subject: [PATCH 14/42] Update oven.json

Start adding some craft/uncraft recipes. Will need to add rock_wool_bat item.
---
 data/json/recipes/appliances/oven.json | 73 ++++++++++++++++++++++++++
 1 file changed, 73 insertions(+)

diff --git a/data/json/recipes/appliances/oven.json b/data/json/recipes/appliances/oven.json
index 7afbde1aa9d78..caf9acca594ec 100644
--- a/data/json/recipes/appliances/oven.json
+++ b/data/json/recipes/appliances/oven.json
@@ -1,4 +1,26 @@
 [
+  {
+    "result": "oven",
+    "type": "recipe",
+    "category": "CC_OTHER",
+    "subcategory": "CSC_OTHER_OTHER",
+    "activity_level": "MODERATE_EXERCISE",
+    "time": "1 h",
+    "skill_used": "fabrication",
+    "difficulty": 1,
+    "autolearn": true,
+    "skills_required": [ "electronics", 1 ],
+    "qualities": [ { "id": "SCREWDRIVER", "level": 1 }, { "id": "WRENCH", "level": 1 } ],
+    "components": [
+      [ [ "oven_stovetop", 1 ] ],
+      [ [ "oven_cabinet", 1 ] ],
+      [ [ "oven_controls", 1 ] ],
+      [ [ "oven_door", 1 ] ],
+      [ [ "oven_broiler_pan", 1 ] ],
+      [ [ "element", 4 ] ],
+      [ [ "cable", 1 ] ]
+    ]
+  },
   {
     "result": "oven",
     "type": "uncraft",
@@ -16,5 +38,56 @@
       [ [ "pipe_fittings", 4 ] ],
       [ [ "pilot_light", 1 ] ]
     ]
+  },
+  {
+    "result": "oven_stovetop",
+    "type": "uncraft",
+    "activity_level": "MODERATE_EXERCISE",
+    "time": "30 m",
+    "qualities": [ { "id": "SCREWDRIVER", "level": 1 }, { "id": "WRENCH", "level": 1 }, { "id": "HAMMER", "level": 1 }, { "id": "SAW_M", "level": 1 } ],
+    "components": [
+      [ [ "sheet_metal_small", 2 ] ],
+      [ [ "spring", 1 ] ],
+      [ [ "hinge", 1 ] ],
+      [ [ "wire", 1 ] ],
+      [ [ "escrap", 4 ] ]
+    ]
+  },
+  {
+    "result": "oven_cabinet",
+    "type": "uncraft",
+    "activity_level": "MODERATE_EXERCISE",
+    "time": "1 h",
+    "qualities": [ { "id": "SCREWDRIVER", "level": 1 }, { "id": "WRENCH", "level": 1 }, { "id": "HAMMER", "level": 1 }, { "id": "SAW_M", "level": 1 } ],
+    "//": "Pilot lights shouldn't be part of an electric oven but we don't have gas ones yet. Can be removed when that changes.",
+    "components": [
+      [ [ "sheet_metal", 2 ] ],
+      [ [ "sheet_metal_small", 2 ] ],
+      [ [ "rock_wool_bat", 3 ] ],
+      [ [ "element", 2 ] ],
+      [ [ "scrap", 4 ] ],
+      [ [ "escrap", 2 ] ],
+      [ [ "wire", 8 ] ],
+      [ [ "cable", 2 ] ],
+      [ [ "pilot_light", 1 ] ],
+      [ [ "pipe_fittings", 4 ] ]
+    ]
+  },
+  {
+    "result": "oven_door",
+    "type": "uncraft",
+    "activity_level": "MODERATE_EXERCISE",
+    "time": "1 h",
+    "qualities": [ { "id": "SCREWDRIVER", "level": 1 }, { "id": "WRENCH", "level": 1 }, { "id": "HAMMER", "level": 1 }, { "id": "SAW_M", "level": 1 } ],
+    "components": [
+      [ [ "reinforced_glass_sheet", 1 ] ],
+      [ [ "sheet_metal_small", 2 ] ],
+      [ [ "rock_wool_bat", 1 ] ],
+      [ [ "element", 2 ] ],
+      [ [ "scrap", 4 ] ],
+      [ [ "escrap", 2 ] ],
+      [ [ "cable", 2 ] ],
+      [ [ "hinge", 2 ] ]
+    ]
   }
 ]

From c3412cbe74a8618631553b4608b25abbad4a4c16 Mon Sep 17 00:00:00 2001
From: I-am-Erk <45136638+I-am-Erk@users.noreply.github.com>
Date: Tue, 21 Dec 2021 13:51:33 -0800
Subject: [PATCH 15/42] Update oven.json

will need an appliance repair proficiency
---
 data/json/recipes/appliances/oven.json | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/data/json/recipes/appliances/oven.json b/data/json/recipes/appliances/oven.json
index caf9acca594ec..1c65ec73866ad 100644
--- a/data/json/recipes/appliances/oven.json
+++ b/data/json/recipes/appliances/oven.json
@@ -11,6 +11,7 @@
     "autolearn": true,
     "skills_required": [ "electronics", 1 ],
     "qualities": [ { "id": "SCREWDRIVER", "level": 1 }, { "id": "WRENCH", "level": 1 } ],
+    "proficiencies": [ { "proficiency": "prof_appliance_repair" } ],
     "components": [
       [ [ "oven_stovetop", 1 ] ],
       [ [ "oven_cabinet", 1 ] ],
@@ -26,7 +27,10 @@
     "type": "uncraft",
     "activity_level": "MODERATE_EXERCISE",
     "time": "1 h",
+    "skill_used": "fabrication",
+    "difficulty": 0,
     "qualities": [ { "id": "SCREWDRIVER", "level": 1 }, { "id": "WRENCH", "level": 1 } ],
+    "proficiencies": [ { "proficiency": "prof_appliance_repair", "fail_mult": 1 } ],
     "components": [
       [ [ "oven_stovetop", 1 ] ],
       [ [ "oven_cabinet", 1 ] ],

From 5e6e96b644ea94010e6ed2196696b01054e61334 Mon Sep 17 00:00:00 2001
From: I-am-Erk <45136638+I-am-Erk@users.noreply.github.com>
Date: Tue, 21 Dec 2021 13:53:09 -0800
Subject: [PATCH 16/42] Update misc.json

---
 data/json/proficiencies/misc.json | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/data/json/proficiencies/misc.json b/data/json/proficiencies/misc.json
index b9a126bbd1a39..e7e767a251d35 100644
--- a/data/json/proficiencies/misc.json
+++ b/data/json/proficiencies/misc.json
@@ -152,5 +152,15 @@
     "name": { "str": "Parkour Expert" },
     "description": "You're skilled at clearing obstacles; terrain like railings or counters are as easy for you to move on as solid ground.",
     "can_learn": false
+  },
+  {
+    "type": "proficiency",
+    "id": "prof_appliance_repair",
+    "name": { "str": "General Appliance Repair" },
+    "description": "A base knowledge of how to put together and take apart common appliances, diagnose problems, and replace parts.",
+    "can_learn": true,
+    "default_time_multiplier": 2,
+    "default_fail_multiplier": 1.1,
+    "time_to_learn": "5 h"
   }
 ]

From 6dc87f4dc2cfe39034503f41598e43486ef13cd5 Mon Sep 17 00:00:00 2001
From: I-am-Erk <45136638+I-am-Erk@users.noreply.github.com>
Date: Tue, 21 Dec 2021 13:53:53 -0800
Subject: [PATCH 17/42] Update oven.json

---
 data/json/recipes/appliances/oven.json | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/data/json/recipes/appliances/oven.json b/data/json/recipes/appliances/oven.json
index 1c65ec73866ad..8bd7f23a10f1a 100644
--- a/data/json/recipes/appliances/oven.json
+++ b/data/json/recipes/appliances/oven.json
@@ -26,7 +26,7 @@
     "result": "oven",
     "type": "uncraft",
     "activity_level": "MODERATE_EXERCISE",
-    "time": "1 h",
+    "time": "45 m",
     "skill_used": "fabrication",
     "difficulty": 0,
     "qualities": [ { "id": "SCREWDRIVER", "level": 1 }, { "id": "WRENCH", "level": 1 } ],
@@ -48,6 +48,7 @@
     "type": "uncraft",
     "activity_level": "MODERATE_EXERCISE",
     "time": "30 m",
+    "proficiencies": [ { "proficiency": "prof_appliance_repair", "fail_mult": 1 } ],
     "qualities": [ { "id": "SCREWDRIVER", "level": 1 }, { "id": "WRENCH", "level": 1 }, { "id": "HAMMER", "level": 1 }, { "id": "SAW_M", "level": 1 } ],
     "components": [
       [ [ "sheet_metal_small", 2 ] ],
@@ -62,6 +63,7 @@
     "type": "uncraft",
     "activity_level": "MODERATE_EXERCISE",
     "time": "1 h",
+    "proficiencies": [ { "proficiency": "prof_appliance_repair", "fail_mult": 1 } ],
     "qualities": [ { "id": "SCREWDRIVER", "level": 1 }, { "id": "WRENCH", "level": 1 }, { "id": "HAMMER", "level": 1 }, { "id": "SAW_M", "level": 1 } ],
     "//": "Pilot lights shouldn't be part of an electric oven but we don't have gas ones yet. Can be removed when that changes.",
     "components": [
@@ -82,6 +84,7 @@
     "type": "uncraft",
     "activity_level": "MODERATE_EXERCISE",
     "time": "1 h",
+    "proficiencies": [ { "proficiency": "prof_appliance_repair", "fail_mult": 1 } ],
     "qualities": [ { "id": "SCREWDRIVER", "level": 1 }, { "id": "WRENCH", "level": 1 }, { "id": "HAMMER", "level": 1 }, { "id": "SAW_M", "level": 1 } ],
     "components": [
       [ [ "reinforced_glass_sheet", 1 ] ],

From bb745f51be47ed2a23bf8d77896033efe62eb815 Mon Sep 17 00:00:00 2001
From: I-am-Erk <45136638+I-am-Erk@users.noreply.github.com>
Date: Tue, 21 Dec 2021 14:09:20 -0800
Subject: [PATCH 18/42] Update oven.json

---
 data/json/recipes/appliances/oven.json | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/data/json/recipes/appliances/oven.json b/data/json/recipes/appliances/oven.json
index 8bd7f23a10f1a..40b2c4f19dfba 100644
--- a/data/json/recipes/appliances/oven.json
+++ b/data/json/recipes/appliances/oven.json
@@ -76,6 +76,8 @@
       [ [ "wire", 8 ] ],
       [ [ "cable", 2 ] ],
       [ [ "pilot_light", 1 ] ],
+      [ [ "motor_micro", 1 ] ],
+      [ [ "fanblade_metal", 1 ] ],
       [ [ "pipe_fittings", 4 ] ]
     ]
   },

From c684db2e7587639fc155d3edcc6a5fa0d5d4d2ac Mon Sep 17 00:00:00 2001
From: I-am-Erk <45136638+I-am-Erk@users.noreply.github.com>
Date: Tue, 21 Dec 2021 14:27:26 -0800
Subject: [PATCH 19/42] Update metal.json

---
 data/json/items/resources/metal.json | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/data/json/items/resources/metal.json b/data/json/items/resources/metal.json
index 05a365edf6f55..5eea65e602b66 100644
--- a/data/json/items/resources/metal.json
+++ b/data/json/items/resources/metal.json
@@ -364,5 +364,20 @@
     "longest_side": "1572 mm",
     "ammo_type": "components",
     "count": 1
+  },
+  {
+    "id": "fanblade_metal",
+    "type": "GENERIC",
+    "category": "spare_parts",
+    "name": { "str": "metal fan blade assembly" },
+    "description": "A multi-bladed metal fan, like you'd find on a larger desk fan or inside a convection oven.",
+    "weight": "150 g",
+    "volume": "2 L",
+    "longest_side": "30 cm",
+    "price": 50,
+    "price_postapoc": 10,
+    "material": [ "budget_steel" ],
+    "symbol": "*",
+    "color": "light_gray"
   }
 ]

From dc234756a8f64ece18e49caa029b743550ddbd32 Mon Sep 17 00:00:00 2001
From: I-am-Erk <45136638+I-am-Erk@users.noreply.github.com>
Date: Tue, 21 Dec 2021 14:29:04 -0800
Subject: [PATCH 20/42] Update stone.json

---
 data/json/items/resources/stone.json | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/data/json/items/resources/stone.json b/data/json/items/resources/stone.json
index 721898091bf60..130ee2b70d0e0 100644
--- a/data/json/items/resources/stone.json
+++ b/data/json/items/resources/stone.json
@@ -36,5 +36,17 @@
     "bashing": 28,
     "to_hit": -2,
     "qualities": [ [ "ANVIL", 1 ] ]
+  },
+  {
+    "type": "GENERIC",
+    "id": "rock_wool_bat",
+    "symbol": "#",
+    "color": "brown",
+    "name": { "str": "rock wool insulation bat" },
+    "description": "A tinfoil-wrapped bat of rock wool insulation: fire and moisture resistant, used for hot appliances like dishwashers and ovens.",
+    "category": "spare_parts",
+    "material": "stone",
+    "weight": "150 g",
+    "volume": "3 L"
   }
 ]

From e47cb4d05f51ecb9848c60aebcec2b276c1f5e35 Mon Sep 17 00:00:00 2001
From: I-am-Erk <45136638+I-am-Erk@users.noreply.github.com>
Date: Tue, 21 Dec 2021 14:29:48 -0800
Subject: [PATCH 21/42] Update stone.json

---
 data/json/items/resources/stone.json | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/data/json/items/resources/stone.json b/data/json/items/resources/stone.json
index 130ee2b70d0e0..91b3becd129a1 100644
--- a/data/json/items/resources/stone.json
+++ b/data/json/items/resources/stone.json
@@ -42,10 +42,11 @@
     "id": "rock_wool_bat",
     "symbol": "#",
     "color": "brown",
-    "name": { "str": "rock wool insulation bat" },
-    "description": "A tinfoil-wrapped bat of rock wool insulation: fire and moisture resistant, used for hot appliances like dishwashers and ovens.",
+    "name": { "str": "fiber insulation bat" },
+    "//": "I am assuming this is made of rock wool, but it could also be fiberglass.  There is almost no practical difference for our purposes.",
+    "description": "A foil-wrapped bat of fibrous insulation: fire and moisture resistant, used for hot appliances like dishwashers and ovens.",
     "category": "spare_parts",
-    "material": "stone",
+    "material": "epoxy",
     "weight": "150 g",
     "volume": "3 L"
   }

From c66b0fe078d1da78a121a84e1f107d3cb5dc14ca Mon Sep 17 00:00:00 2001
From: I-am-Erk <45136638+I-am-Erk@users.noreply.github.com>
Date: Tue, 21 Dec 2021 14:41:31 -0800
Subject: [PATCH 22/42] Update appliances.json

---
 data/json/furniture_and_terrain/appliances.json | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/data/json/furniture_and_terrain/appliances.json b/data/json/furniture_and_terrain/appliances.json
index ff0657031e48a..143d0abbc042d 100644
--- a/data/json/furniture_and_terrain/appliances.json
+++ b/data/json/furniture_and_terrain/appliances.json
@@ -43,18 +43,18 @@
     "damage_modifier": 10,
     "damage_reduction": { "all": 30 },
     "durability": 80,
-    "flags": [ "CARGO", "OBSTACLE", "COVERED", "FLAT_SURF", "APPLIANCE", "CTRL_ELECTRONIC"  ],
+    "flags": [ "CARGO", "OBSTACLE", "COVERED", "FLAT_SURF", "APPLIANCE", "CTRL_ELECTRONIC" ],
     "pseudo_tools": [ { "id": "hotplate", "hotkey": "h" } ],
     "epower": 0,
     "item": "oven",
     "looks_like": "f_oven",
     "breaks_into": [
-        { "item": "sheet_metal", "count": [ 1, 4 ] },
-        { "item": "sheet_metal_small", "count": [ 8, 12 ] },
-        { "item": "steel_chunk", "count": [ 0, 3 ] },
-        { "item": "scrap", "count": [ 0, 6 ] },
-        { "item": "element", "count": [ 1, 3 ] },
-        { "item": "cable", "charges": [ 1, 3 ] }
+      { "item": "sheet_metal", "count": [ 1, 4 ] },
+      { "item": "sheet_metal_small", "count": [ 8, 12 ] },
+      { "item": "steel_chunk", "count": [ 0, 3 ] },
+      { "item": "scrap", "count": [ 0, 6 ] },
+      { "item": "element", "count": [ 1, 3 ] },
+      { "item": "cable", "charges": [ 1, 3 ] }
     ],
     "size": 200,
     "type": "vehicle_part"

From 3b32beba500c3625301034bbbed1e80bbb128c1f Mon Sep 17 00:00:00 2001
From: I-am-Erk <45136638+I-am-Erk@users.noreply.github.com>
Date: Tue, 21 Dec 2021 14:57:40 -0800
Subject: [PATCH 23/42] Update metal.json

---
 data/json/items/resources/metal.json | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/data/json/items/resources/metal.json b/data/json/items/resources/metal.json
index 5eea65e602b66..8a53276e57640 100644
--- a/data/json/items/resources/metal.json
+++ b/data/json/items/resources/metal.json
@@ -379,5 +379,20 @@
     "material": [ "budget_steel" ],
     "symbol": "*",
     "color": "light_gray"
+  },
+  {
+    "id": "heavy_wire_rack",
+    "type": "GENERIC",
+    "category": "spare_parts",
+    "name": { "str": "heavy wire rack" },
+    "description": "A durable steel rack, the sort you might find in an oven or on a barbecue.",
+    "weight": "600 g",
+    "volume": "5 L",
+    "longest_side": "60 cm",
+    "price": 50,
+    "price_postapoc": 10,
+    "material": [ "steel" ],
+    "symbol": "#",
+    "color": "light_gray"
   }
 ]

From c8f3e7cd808eaa7c3a222991e83107317317a8e3 Mon Sep 17 00:00:00 2001
From: I-am-Erk <45136638+I-am-Erk@users.noreply.github.com>
Date: Tue, 21 Dec 2021 14:58:37 -0800
Subject: [PATCH 24/42] Update oven.json

---
 data/json/recipes/appliances/oven.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/json/recipes/appliances/oven.json b/data/json/recipes/appliances/oven.json
index 40b2c4f19dfba..f9dd1ae0b5a75 100644
--- a/data/json/recipes/appliances/oven.json
+++ b/data/json/recipes/appliances/oven.json
@@ -18,6 +18,7 @@
       [ [ "oven_controls", 1 ] ],
       [ [ "oven_door", 1 ] ],
       [ [ "oven_broiler_pan", 1 ] ],
+      [ [ "heavy_wire_rack", 2 ] ],
       [ [ "element", 4 ] ],
       [ [ "cable", 1 ] ]
     ]
@@ -73,7 +74,6 @@
       [ [ "element", 2 ] ],
       [ [ "scrap", 4 ] ],
       [ [ "escrap", 2 ] ],
-      [ [ "wire", 8 ] ],
       [ [ "cable", 2 ] ],
       [ [ "pilot_light", 1 ] ],
       [ [ "motor_micro", 1 ] ],

From 7e25b782961b0758bd39d3fcecfd683c05932b38 Mon Sep 17 00:00:00 2001
From: I-am-Erk <45136638+I-am-Erk@users.noreply.github.com>
Date: Tue, 21 Dec 2021 14:58:50 -0800
Subject: [PATCH 25/42] Update oven.json

---
 data/json/recipes/appliances/oven.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/data/json/recipes/appliances/oven.json b/data/json/recipes/appliances/oven.json
index f9dd1ae0b5a75..0f8b36d18a022 100644
--- a/data/json/recipes/appliances/oven.json
+++ b/data/json/recipes/appliances/oven.json
@@ -38,6 +38,7 @@
       [ [ "oven_controls", 1 ] ],
       [ [ "oven_door", 1 ] ],
       [ [ "oven_broiler_pan", 1 ] ],
+      [ [ "heavy_wire_rack", 2 ] ],
       [ [ "element", 4 ] ],
       [ [ "cable", 4 ] ],
       [ [ "pipe_fittings", 4 ] ],

From 8a790d5e817c1dcb9743f2908529d26d44c552ca Mon Sep 17 00:00:00 2001
From: I-am-Erk <45136638+I-am-Erk@users.noreply.github.com>
Date: Tue, 21 Dec 2021 14:59:27 -0800
Subject: [PATCH 26/42] Update oven.json

---
 data/json/recipes/appliances/oven.json | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/data/json/recipes/appliances/oven.json b/data/json/recipes/appliances/oven.json
index 0f8b36d18a022..16f0f1abcface 100644
--- a/data/json/recipes/appliances/oven.json
+++ b/data/json/recipes/appliances/oven.json
@@ -40,9 +40,7 @@
       [ [ "oven_broiler_pan", 1 ] ],
       [ [ "heavy_wire_rack", 2 ] ],
       [ [ "element", 4 ] ],
-      [ [ "cable", 4 ] ],
-      [ [ "pipe_fittings", 4 ] ],
-      [ [ "pilot_light", 1 ] ]
+      [ [ "cable", 4 ] ]
     ]
   },
   {

From 8146dde176952dc186b6ffdd0bd4d21805bc1d71 Mon Sep 17 00:00:00 2001
From: I-am-Erk <45136638+I-am-Erk@users.noreply.github.com>
Date: Tue, 21 Dec 2021 17:10:18 -0800
Subject: [PATCH 27/42] Update appliances.json

---
 data/json/items/appliances.json | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/data/json/items/appliances.json b/data/json/items/appliances.json
index cfa48d1d28edc..0968cdc14aa57 100644
--- a/data/json/items/appliances.json
+++ b/data/json/items/appliances.json
@@ -34,14 +34,7 @@
     "insulation": 3,
     "volume": "290 L",
     "weight": "77 kg",
-    "pocket_data": [
-      {
-        "pocket_type": "CONTAINER",
-        "rigid": true,
-        "max_contains_volume": "120 L",
-        "max_contains_weight": "200 kg"
-      }
-    ]
+    "pocket_data": [ { "pocket_type": "CONTAINER", "rigid": true, "max_contains_volume": "120 L", "max_contains_weight": "200 kg" } ]
   },
   {
     "type": "TOOL",

From f646aeb367356b3ef89c6ea7872bf12cc06a8a49 Mon Sep 17 00:00:00 2001
From: I-am-Erk <45136638+I-am-Erk@users.noreply.github.com>
Date: Tue, 21 Dec 2021 22:34:18 -0800
Subject: [PATCH 28/42] Update oven.json

---
 data/json/recipes/appliances/oven.json | 61 +++++++++++++++++++++-----
 1 file changed, 51 insertions(+), 10 deletions(-)

diff --git a/data/json/recipes/appliances/oven.json b/data/json/recipes/appliances/oven.json
index 16f0f1abcface..76daa7051f37f 100644
--- a/data/json/recipes/appliances/oven.json
+++ b/data/json/recipes/appliances/oven.json
@@ -49,14 +49,13 @@
     "activity_level": "MODERATE_EXERCISE",
     "time": "30 m",
     "proficiencies": [ { "proficiency": "prof_appliance_repair", "fail_mult": 1 } ],
-    "qualities": [ { "id": "SCREWDRIVER", "level": 1 }, { "id": "WRENCH", "level": 1 }, { "id": "HAMMER", "level": 1 }, { "id": "SAW_M", "level": 1 } ],
-    "components": [
-      [ [ "sheet_metal_small", 2 ] ],
-      [ [ "spring", 1 ] ],
-      [ [ "hinge", 1 ] ],
-      [ [ "wire", 1 ] ],
-      [ [ "escrap", 4 ] ]
-    ]
+    "qualities": [
+      { "id": "SCREWDRIVER", "level": 1 },
+      { "id": "WRENCH", "level": 1 },
+      { "id": "HAMMER", "level": 1 },
+      { "id": "SAW_M", "level": 1 }
+    ],
+    "components": [ [ [ "sheet_metal_small", 2 ] ], [ [ "spring", 1 ] ], [ [ "hinge", 1 ] ], [ [ "wire", 1 ] ], [ [ "escrap", 4 ] ] ]
   },
   {
     "result": "oven_cabinet",
@@ -64,7 +63,12 @@
     "activity_level": "MODERATE_EXERCISE",
     "time": "1 h",
     "proficiencies": [ { "proficiency": "prof_appliance_repair", "fail_mult": 1 } ],
-    "qualities": [ { "id": "SCREWDRIVER", "level": 1 }, { "id": "WRENCH", "level": 1 }, { "id": "HAMMER", "level": 1 }, { "id": "SAW_M", "level": 1 } ],
+    "qualities": [
+      { "id": "SCREWDRIVER", "level": 1 },
+      { "id": "WRENCH", "level": 1 },
+      { "id": "HAMMER", "level": 1 },
+      { "id": "SAW_M", "level": 1 }
+    ],
     "//": "Pilot lights shouldn't be part of an electric oven but we don't have gas ones yet. Can be removed when that changes.",
     "components": [
       [ [ "sheet_metal", 2 ] ],
@@ -86,7 +90,12 @@
     "activity_level": "MODERATE_EXERCISE",
     "time": "1 h",
     "proficiencies": [ { "proficiency": "prof_appliance_repair", "fail_mult": 1 } ],
-    "qualities": [ { "id": "SCREWDRIVER", "level": 1 }, { "id": "WRENCH", "level": 1 }, { "id": "HAMMER", "level": 1 }, { "id": "SAW_M", "level": 1 } ],
+    "qualities": [
+      { "id": "SCREWDRIVER", "level": 1 },
+      { "id": "WRENCH", "level": 1 },
+      { "id": "FINE_HAMMER", "level": 1 },
+      { "id": "SAW_M", "level": 1 }
+    ],
     "components": [
       [ [ "reinforced_glass_sheet", 1 ] ],
       [ [ "sheet_metal_small", 2 ] ],
@@ -97,5 +106,37 @@
       [ [ "cable", 2 ] ],
       [ [ "hinge", 2 ] ]
     ]
+  },
+  {
+    "result": "oven_broiler_pan",
+    "type": "uncraft",
+    "activity_level": "MODERATE_EXERCISE",
+    "time": "30 m",
+    "proficiencies": [ { "proficiency": "prof_appliance_repair", "fail_mult": 1 } ],
+    "qualities": [
+      { "id": "SCREWDRIVER", "level": 1 },
+      { "id": "WRENCH", "level": 1 },
+      { "id": "HAMMER", "level": 1 },
+      { "id": "SAW_M", "level": 1 }
+    ],
+    "components": [ [ [ "sheet_metal", 1 ] ], [ [ "sheet_metal_small", 2 ] ], [ [ "scrap", 2 ] ], [ [ "bearing", 12 ] ] ]
+  },
+  {
+    "result": "oven_controls",
+    "type": "uncraft",
+    "activity_level": "MODERATE_EXERCISE",
+    "time": "30 m",
+    "proficiencies": [ { "proficiency": "prof_elec_soldering", "fail_mult": 1 }, { "proficiency": "prof_elec_circuits", "fail_mult": 1 } ],
+    "qualities": [ { "id": "SCREWDRIVER", "level": 1 } ],
+    "tools": [ [ [ "soldering_iron", -1 ], [ "toolset", -1 ] ] ],
+    "components": [
+      [ [ "plastic_chunk", 4 ] ],
+      [ [ "sheet_metal_small", 1 ] ],
+      [ [ "scrap", 2 ] ],
+      [ [ "escrap", 6 ] ],
+      [ [ "cable", 2 ] ],
+      [ [ "solder", 8 ] ],
+      [ [ "small_lcd_screen", 1 ] ]
+    ]
   }
 ]

From 1ed7df4eafa2e795d984592c7749e1db87bdeea0 Mon Sep 17 00:00:00 2001
From: I-am-Erk <45136638+I-am-Erk@users.noreply.github.com>
Date: Tue, 21 Dec 2021 23:06:59 -0800
Subject: [PATCH 29/42] Merge remote-tracking branch 'upstream/master' into
 appliances1


From 0116acf87fd8556fcc56d6e10a5a8cdb0b131d68 Mon Sep 17 00:00:00 2001
From: I-am-Erk <45136638+I-am-Erk@users.noreply.github.com>
Date: Tue, 21 Dec 2021 23:11:58 -0800
Subject: [PATCH 30/42] Update oven.json

---
 data/json/recipes/appliances/oven.json | 34 ++++++++++++++------------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/data/json/recipes/appliances/oven.json b/data/json/recipes/appliances/oven.json
index 76daa7051f37f..4288644028b53 100644
--- a/data/json/recipes/appliances/oven.json
+++ b/data/json/recipes/appliances/oven.json
@@ -10,7 +10,7 @@
     "difficulty": 1,
     "autolearn": true,
     "skills_required": [ "electronics", 1 ],
-    "qualities": [ { "id": "SCREWDRIVER", "level": 1 }, { "id": "WRENCH", "level": 1 } ],
+    "qualities": [ { "id": "SCREW", "level": 1 }, { "id": "WRENCH", "level": 1 } ],
     "proficiencies": [ { "proficiency": "prof_appliance_repair" } ],
     "components": [
       [ [ "oven_stovetop", 1 ] ],
@@ -29,9 +29,8 @@
     "activity_level": "MODERATE_EXERCISE",
     "time": "45 m",
     "skill_used": "fabrication",
-    "difficulty": 0,
-    "qualities": [ { "id": "SCREWDRIVER", "level": 1 }, { "id": "WRENCH", "level": 1 } ],
-    "proficiencies": [ { "proficiency": "prof_appliance_repair", "fail_mult": 1 } ],
+    "qualities": [ { "id": "SCREW", "level": 1 }, { "id": "WRENCH", "level": 1 } ],
+    "proficiencies": [ { "proficiency": "prof_appliance_repair", "fail_multiplier": 1 } ],
     "components": [
       [ [ "oven_stovetop", 1 ] ],
       [ [ "oven_cabinet", 1 ] ],
@@ -48,9 +47,10 @@
     "type": "uncraft",
     "activity_level": "MODERATE_EXERCISE",
     "time": "30 m",
-    "proficiencies": [ { "proficiency": "prof_appliance_repair", "fail_mult": 1 } ],
+    "skill_used": "fabrication",
+    "proficiencies": [ { "proficiency": "prof_appliance_repair", "fail_multiplier": 1 } ],
     "qualities": [
-      { "id": "SCREWDRIVER", "level": 1 },
+      { "id": "SCREW", "level": 1 },
       { "id": "WRENCH", "level": 1 },
       { "id": "HAMMER", "level": 1 },
       { "id": "SAW_M", "level": 1 }
@@ -62,9 +62,10 @@
     "type": "uncraft",
     "activity_level": "MODERATE_EXERCISE",
     "time": "1 h",
-    "proficiencies": [ { "proficiency": "prof_appliance_repair", "fail_mult": 1 } ],
+    "skill_used": "fabrication",
+    "proficiencies": [ { "proficiency": "prof_appliance_repair", "fail_multiplier": 1 } ],
     "qualities": [
-      { "id": "SCREWDRIVER", "level": 1 },
+      { "id": "SCREW", "level": 1 },
       { "id": "WRENCH", "level": 1 },
       { "id": "HAMMER", "level": 1 },
       { "id": "SAW_M", "level": 1 }
@@ -89,9 +90,10 @@
     "type": "uncraft",
     "activity_level": "MODERATE_EXERCISE",
     "time": "1 h",
-    "proficiencies": [ { "proficiency": "prof_appliance_repair", "fail_mult": 1 } ],
+    "skill_used": "fabrication",
+    "proficiencies": [ { "proficiency": "prof_appliance_repair", "fail_multiplier": 1 } ],
     "qualities": [
-      { "id": "SCREWDRIVER", "level": 1 },
+      { "id": "SCREW", "level": 1 },
       { "id": "WRENCH", "level": 1 },
       { "id": "FINE_HAMMER", "level": 1 },
       { "id": "SAW_M", "level": 1 }
@@ -112,9 +114,10 @@
     "type": "uncraft",
     "activity_level": "MODERATE_EXERCISE",
     "time": "30 m",
-    "proficiencies": [ { "proficiency": "prof_appliance_repair", "fail_mult": 1 } ],
+    "skill_used": "fabrication",
+    "proficiencies": [ { "proficiency": "prof_appliance_repair", "fail_multiplier": 1 } ],
     "qualities": [
-      { "id": "SCREWDRIVER", "level": 1 },
+      { "id": "SCREW", "level": 1 },
       { "id": "WRENCH", "level": 1 },
       { "id": "HAMMER", "level": 1 },
       { "id": "SAW_M", "level": 1 }
@@ -125,9 +128,10 @@
     "result": "oven_controls",
     "type": "uncraft",
     "activity_level": "MODERATE_EXERCISE",
-    "time": "30 m",
-    "proficiencies": [ { "proficiency": "prof_elec_soldering", "fail_mult": 1 }, { "proficiency": "prof_elec_circuits", "fail_mult": 1 } ],
-    "qualities": [ { "id": "SCREWDRIVER", "level": 1 } ],
+    "time": "1 h",
+    "skill_used": "fabrication",
+    "proficiencies": [ { "proficiency": "prof_elec_soldering", "fail_multiplier": 1 }, { "proficiency": "prof_elec_circuits", "fail_multiplier": 1 } ],
+    "qualities": [ { "id": "SCREW", "level": 1 } ],
     "tools": [ [ [ "soldering_iron", -1 ], [ "toolset", -1 ] ] ],
     "components": [
       [ [ "plastic_chunk", 4 ] ],

From fa103369b35519d28ae1ebc979af2f9af017a468 Mon Sep 17 00:00:00 2001
From: I-am-Erk <45136638+I-am-Erk@users.noreply.github.com>
Date: Tue, 21 Dec 2021 23:13:06 -0800
Subject: [PATCH 31/42] Update appliance_parts.json

---
 data/json/items/resources/appliance_parts.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/data/json/items/resources/appliance_parts.json b/data/json/items/resources/appliance_parts.json
index 07a7efd1aa33f..e9496974d9ac0 100644
--- a/data/json/items/resources/appliance_parts.json
+++ b/data/json/items/resources/appliance_parts.json
@@ -33,7 +33,7 @@
     "type": "GENERIC",
     "id": "oven_controls",
     "symbol": "#",
-    "color": "dark_blue_white",
+    "color": "light_cyan",
     "name": { "str": "oven door" },
     "category": "spare_parts",
     "description": "The control panel and LCD from a dismantled electric oven.",
@@ -48,7 +48,7 @@
     "type": "GENERIC",
     "id": "oven_door",
     "symbol": "#",
-    "color": "dark_blue_white",
+    "color": "light_cyan",
     "name": { "str": "oven door" },
     "category": "spare_parts",
     "description": "The removed glass and steel door of an electric oven.",

From d500a8c9011381e816e6ead575916bae430c251e Mon Sep 17 00:00:00 2001
From: I-am-Erk <45136638+I-am-Erk@users.noreply.github.com>
Date: Tue, 21 Dec 2021 23:27:21 -0800
Subject: [PATCH 32/42] bugfixes

---
 data/json/items/resources/appliance_parts.json |  2 +-
 data/json/recipes/appliances/oven.json         | 11 ++++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/data/json/items/resources/appliance_parts.json b/data/json/items/resources/appliance_parts.json
index e9496974d9ac0..23c0ec72aa673 100644
--- a/data/json/items/resources/appliance_parts.json
+++ b/data/json/items/resources/appliance_parts.json
@@ -34,7 +34,7 @@
     "id": "oven_controls",
     "symbol": "#",
     "color": "light_cyan",
-    "name": { "str": "oven door" },
+    "name": { "str": "oven control panel" },
     "category": "spare_parts",
     "description": "The control panel and LCD from a dismantled electric oven.",
     "price": 100,
diff --git a/data/json/recipes/appliances/oven.json b/data/json/recipes/appliances/oven.json
index 4288644028b53..104b61b3a6786 100644
--- a/data/json/recipes/appliances/oven.json
+++ b/data/json/recipes/appliances/oven.json
@@ -55,7 +55,7 @@
       { "id": "HAMMER", "level": 1 },
       { "id": "SAW_M", "level": 1 }
     ],
-    "components": [ [ [ "sheet_metal_small", 2 ] ], [ [ "spring", 1 ] ], [ [ "hinge", 1 ] ], [ [ "wire", 1 ] ], [ [ "escrap", 4 ] ] ]
+    "components": [ [ [ "sheet_metal_small", 2 ] ], [ [ "spring", 1 ] ], [ [ "hinge", 1 ] ], [ [ "wire", 1 ] ], [ [ "e_scrap", 4 ] ] ]
   },
   {
     "result": "oven_cabinet",
@@ -77,11 +77,12 @@
       [ [ "rock_wool_bat", 3 ] ],
       [ [ "element", 2 ] ],
       [ [ "scrap", 4 ] ],
-      [ [ "escrap", 2 ] ],
+      [ [ "e_scrap", 2 ] ],
       [ [ "cable", 2 ] ],
       [ [ "pilot_light", 1 ] ],
       [ [ "motor_micro", 1 ] ],
       [ [ "fanblade_metal", 1 ] ],
+      [ [ "thermometer", 1 ] ],
       [ [ "pipe_fittings", 4 ] ]
     ]
   },
@@ -104,7 +105,7 @@
       [ [ "rock_wool_bat", 1 ] ],
       [ [ "element", 2 ] ],
       [ [ "scrap", 4 ] ],
-      [ [ "escrap", 2 ] ],
+      [ [ "e_scrap", 2 ] ],
       [ [ "cable", 2 ] ],
       [ [ "hinge", 2 ] ]
     ]
@@ -137,9 +138,9 @@
       [ [ "plastic_chunk", 4 ] ],
       [ [ "sheet_metal_small", 1 ] ],
       [ [ "scrap", 2 ] ],
-      [ [ "escrap", 6 ] ],
+      [ [ "e_scrap", 6 ] ],
       [ [ "cable", 2 ] ],
-      [ [ "solder", 8 ] ],
+      [ [ "solder_wire", 8 ] ],
       [ [ "small_lcd_screen", 1 ] ]
     ]
   }

From 725f6bb83b6acc7dbec771c55b9137fe9896dafc Mon Sep 17 00:00:00 2001
From: I-am-Erk <45136638+I-am-Erk@users.noreply.github.com>
Date: Wed, 22 Dec 2021 10:19:34 -0800
Subject: [PATCH 33/42] last bugfixes

---
 data/json/furniture_and_terrain/appliances.json | 2 +-
 data/json/recipes/appliances/oven.json          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/data/json/furniture_and_terrain/appliances.json b/data/json/furniture_and_terrain/appliances.json
index 143d0abbc042d..dab24e0e509d2 100644
--- a/data/json/furniture_and_terrain/appliances.json
+++ b/data/json/furniture_and_terrain/appliances.json
@@ -43,7 +43,7 @@
     "damage_modifier": 10,
     "damage_reduction": { "all": 30 },
     "durability": 80,
-    "flags": [ "CARGO", "OBSTACLE", "COVERED", "FLAT_SURF", "APPLIANCE", "CTRL_ELECTRONIC" ],
+    "flags": [ "CARGO", "OBSTACLE", "COVERED", "FLAT_SURF", "APPLIANCE" ],
     "pseudo_tools": [ { "id": "hotplate", "hotkey": "h" } ],
     "epower": 0,
     "item": "oven",
diff --git a/data/json/recipes/appliances/oven.json b/data/json/recipes/appliances/oven.json
index 104b61b3a6786..54d6596115195 100644
--- a/data/json/recipes/appliances/oven.json
+++ b/data/json/recipes/appliances/oven.json
@@ -96,7 +96,7 @@
     "qualities": [
       { "id": "SCREW", "level": 1 },
       { "id": "WRENCH", "level": 1 },
-      { "id": "FINE_HAMMER", "level": 1 },
+      { "id": "HAMMER_FINE", "level": 1 },
       { "id": "SAW_M", "level": 1 }
     ],
     "components": [

From fd516ccde66edf87c1f797f46064efb658764b28 Mon Sep 17 00:00:00 2001
From: I-am-Erk <45136638+I-am-Erk@users.noreply.github.com>
Date: Wed, 22 Dec 2021 11:29:01 -0800
Subject: [PATCH 34/42] lint

---
 data/json/recipes/appliances/oven.json | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/data/json/recipes/appliances/oven.json b/data/json/recipes/appliances/oven.json
index 54d6596115195..0072a2e84d28a 100644
--- a/data/json/recipes/appliances/oven.json
+++ b/data/json/recipes/appliances/oven.json
@@ -131,7 +131,10 @@
     "activity_level": "MODERATE_EXERCISE",
     "time": "1 h",
     "skill_used": "fabrication",
-    "proficiencies": [ { "proficiency": "prof_elec_soldering", "fail_multiplier": 1 }, { "proficiency": "prof_elec_circuits", "fail_multiplier": 1 } ],
+    "proficiencies": [
+      { "proficiency": "prof_elec_soldering", "fail_multiplier": 1 },
+      { "proficiency": "prof_elec_circuits", "fail_multiplier": 1 }
+    ],
     "qualities": [ { "id": "SCREW", "level": 1 } ],
     "tools": [ [ [ "soldering_iron", -1 ], [ "toolset", -1 ] ] ],
     "components": [

From 69ce64e874102fc7a711d44ee7fddf7161b9bada Mon Sep 17 00:00:00 2001
From: I-am-Erk <45136638+I-am-Erk@users.noreply.github.com>
Date: Wed, 22 Dec 2021 13:38:02 -0800
Subject: [PATCH 35/42] Update appliances.json

---
 data/json/furniture_and_terrain/appliances.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/data/json/furniture_and_terrain/appliances.json b/data/json/furniture_and_terrain/appliances.json
index dab24e0e509d2..19de2df6f1a32 100644
--- a/data/json/furniture_and_terrain/appliances.json
+++ b/data/json/furniture_and_terrain/appliances.json
@@ -35,6 +35,7 @@
   {
     "id": "ap_oven",
     "name": { "str": "oven" },
+    "categories": [ "utility" ],
     "description": "A standard electric convection-based oven, commonly used for heating and cooking food.",
     "symbol": "#",
     "color": "dark_gray",

From 88bfec1db9e660cfe2f050ac97245a52af94c0d4 Mon Sep 17 00:00:00 2001
From: I-am-Erk <45136638+I-am-Erk@users.noreply.github.com>
Date: Thu, 23 Dec 2021 09:17:55 -0800
Subject: [PATCH 36/42] Update appliances.json

---
 data/json/furniture_and_terrain/appliances.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/json/furniture_and_terrain/appliances.json b/data/json/furniture_and_terrain/appliances.json
index 19de2df6f1a32..ea1e7e0b6527f 100644
--- a/data/json/furniture_and_terrain/appliances.json
+++ b/data/json/furniture_and_terrain/appliances.json
@@ -16,7 +16,6 @@
     "epower": -30,
     "size": 300,
     "item": "fridge",
-    "location": "center",
     "requirements": {
       "install": { "skills": [ [ "mechanics", 3 ] ], "time": "60 m", "using": [ [ "vehicle_wrench_2", 1 ] ] },
       "removal": { "skills": [ [ "mechanics", 2 ] ], "time": "30 m", "using": [ [ "vehicle_wrench_2", 1 ] ] },
@@ -46,6 +45,7 @@
     "durability": 80,
     "flags": [ "CARGO", "OBSTACLE", "COVERED", "FLAT_SURF", "APPLIANCE" ],
     "pseudo_tools": [ { "id": "hotplate", "hotkey": "h" } ],
+    "//": "Doesn't draw power at baseline, only when cooking.",
     "epower": 0,
     "item": "oven",
     "looks_like": "f_oven",

From 862e51fe1ce75de4b4cb1081e7593b4ac3393400 Mon Sep 17 00:00:00 2001
From: I-am-Erk <45136638+I-am-Erk@users.noreply.github.com>
Date: Thu, 23 Dec 2021 13:52:02 -0800
Subject: [PATCH 37/42] Update construction.json

---
 data/json/construction.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/json/construction.json b/data/json/construction.json
index 0d2d93be346f2..dbaa3799988cd 100644
--- a/data/json/construction.json
+++ b/data/json/construction.json
@@ -3010,7 +3010,7 @@
     "time": "5 m",
     "components": [ [ [ "oven", 1 ] ] ],
     "pre_special": "check_empty",
-    "post_special": "done_appliance" 
+    "post_special": "done_appliance"
   },
   {
     "id": "app_standing_lamp",

From 2b306d11caae03fd21acb434b2d1976e1e13d6a0 Mon Sep 17 00:00:00 2001
From: I-am-Erk <45136638+I-am-Erk@users.noreply.github.com>
Date: Tue, 4 Jan 2022 21:13:47 -0800
Subject: [PATCH 38/42] Update misc.json

---
 data/json/proficiencies/misc.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/data/json/proficiencies/misc.json b/data/json/proficiencies/misc.json
index a16e7fabfe408..8861ea1f80a09 100644
--- a/data/json/proficiencies/misc.json
+++ b/data/json/proficiencies/misc.json
@@ -162,7 +162,6 @@
     "can_learn": true,
     "default_time_multiplier": 2,
     "default_fail_multiplier": 1.1,
-    "time_to_learn": "5 h"
     "can_learn": true,
     "time_to_learn": "8 h"
   }

From 312bf34e7749ff6f2b33e5a9cbea5b6bd32e43d9 Mon Sep 17 00:00:00 2001
From: I-am-Erk <45136638+I-am-Erk@users.noreply.github.com>
Date: Tue, 4 Jan 2022 21:22:31 -0800
Subject: [PATCH 39/42] Update metal.json

---
 data/json/items/resources/metal.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/json/items/resources/metal.json b/data/json/items/resources/metal.json
index 8a53276e57640..215091796dc8c 100644
--- a/data/json/items/resources/metal.json
+++ b/data/json/items/resources/metal.json
@@ -369,7 +369,7 @@
     "id": "fanblade_metal",
     "type": "GENERIC",
     "category": "spare_parts",
-    "name": { "str": "metal fan blade assembly" },
+    "name": { "str": "metal fan blade assembly", "str_pl": "metal fan blade assemblies" },
     "description": "A multi-bladed metal fan, like you'd find on a larger desk fan or inside a convection oven.",
     "weight": "150 g",
     "volume": "2 L",

From f316da3eeeb130c08312d29e72925c8aec5ee5bc Mon Sep 17 00:00:00 2001
From: I-am-Erk <45136638+I-am-Erk@users.noreply.github.com>
Date: Wed, 5 Jan 2022 11:51:42 -0800
Subject: [PATCH 40/42] Update data/json/construction.json

Co-authored-by: Wishbringer <wishbringer@telia.com>
---
 data/json/construction.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/data/json/construction.json b/data/json/construction.json
index f865bb55d50b2..6098c38cbef11 100644
--- a/data/json/construction.json
+++ b/data/json/construction.json
@@ -3013,6 +3013,7 @@
     "post_special": "done_appliance"
   },
   {
+    "type": "construction",
     "id": "app_standing_lamp",
     "group": "place_standing_lamp",
     "category": "APPLIANCE",

From eeab4f7b7c429725c83ddf6481c96d442163b64f Mon Sep 17 00:00:00 2001
From: I-am-Erk <45136638+I-am-Erk@users.noreply.github.com>
Date: Wed, 5 Jan 2022 13:11:56 -0800
Subject: [PATCH 41/42] Update misc.json

---
 data/json/proficiencies/misc.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/data/json/proficiencies/misc.json b/data/json/proficiencies/misc.json
index 8861ea1f80a09..6835a35bce09f 100644
--- a/data/json/proficiencies/misc.json
+++ b/data/json/proficiencies/misc.json
@@ -162,7 +162,6 @@
     "can_learn": true,
     "default_time_multiplier": 2,
     "default_fail_multiplier": 1.1,
-    "can_learn": true,
     "time_to_learn": "8 h"
   }
 ]

From b296e4ecabd2088008dee1c70029663706a0e795 Mon Sep 17 00:00:00 2001
From: I-am-Erk <45136638+I-am-Erk@users.noreply.github.com>
Date: Wed, 5 Jan 2022 14:21:31 -0800
Subject: [PATCH 42/42] move appliances back to try to fix an error

---
 data/json/{furniture_and_terrain => vehicleparts}/appliances.json | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename data/json/{furniture_and_terrain => vehicleparts}/appliances.json (100%)

diff --git a/data/json/furniture_and_terrain/appliances.json b/data/json/vehicleparts/appliances.json
similarity index 100%
rename from data/json/furniture_and_terrain/appliances.json
rename to data/json/vehicleparts/appliances.json