From b5e0cb58afcfea8ea3f86fbba4853a12b12aad59 Mon Sep 17 00:00:00 2001
From: Drew4484 <57647637+Drew4484@users.noreply.github.com>
Date: Mon, 29 Aug 2022 14:05:19 -0700
Subject: [PATCH] Welding kit appliance (#60449)

* Adds welding kit appliance

* Update appliances.json

* Update workshop.json

* Update appliances.json

* Add vehicle rig

* Update rigs.json

* Update appliances.json

* Update appliances.json

* Update construction_group.json
---
 data/json/construction.json                     | 11 +++++++++++
 data/json/construction_group.json               |  5 +++++
 data/json/furniture_and_terrain/appliances.json |  9 +++++++++
 data/json/items/tool/workshop.json              |  8 ++------
 data/json/items/vehicle/rigs.json               |  7 +++++++
 5 files changed, 34 insertions(+), 6 deletions(-)

diff --git a/data/json/construction.json b/data/json/construction.json
index 20a316354cd85..d9e4bd9777e73 100644
--- a/data/json/construction.json
+++ b/data/json/construction.json
@@ -3337,6 +3337,17 @@
     "pre_special": "check_empty",
     "post_special": "done_appliance"
   },
+  {
+    "type": "construction",
+    "id": "app_welding_kit",
+    "group": "place_weldkit",
+    "category": "APPLIANCE",
+    "required_skills": [ [ "fabrication", 0 ] ],
+    "time": "5 m",
+    "components": [ [ [ "welding_kit", 1 ] ] ],
+    "pre_special": "check_empty",
+    "post_special": "done_appliance"
+  },
   {
     "type": "construction",
     "id": "app_water_purifier",
diff --git a/data/json/construction_group.json b/data/json/construction_group.json
index 2844c233b777f..ba8207a5f6261 100644
--- a/data/json/construction_group.json
+++ b/data/json/construction_group.json
@@ -1179,6 +1179,11 @@
     "id": "place_weldrig",
     "name": "Place Welding Rig"
   },
+  {
+    "type": "construction_group",
+    "id": "place_weldkit",
+    "name": "Place Welding Kit"
+  },
   {
     "type": "construction_group",
     "id": "place_arcade_machine",
diff --git a/data/json/furniture_and_terrain/appliances.json b/data/json/furniture_and_terrain/appliances.json
index eda23dd4b1424..783938fb7c4ce 100644
--- a/data/json/furniture_and_terrain/appliances.json
+++ b/data/json/furniture_and_terrain/appliances.json
@@ -215,6 +215,15 @@
     "flags": [ "CARGO", "OBSTACLE", "APPLIANCE" ],
     "copy-from": "welding_rig"
   },
+  {
+    "type": "vehicle_part",
+    "id": "ap_weldkit",
+    "name": { "str": "welding kit rig" },
+    "description": "A welding rig combined with a fireproof insulating blanket allows for advanced welds and repairs to tempered steels that draws power from the vehicle's batteries.  You still need glare protection.  'e'xamine the tile with the rig to use it to repair items in your inventory.  If you attempt to craft an item or perform a repair that requires a welder, you will be given the option of using the welding rig.",
+    "item": "welding_kit",
+    "flags": [ "CARGO", "OBSTACLE", "APPLIANCE" ],
+    "copy-from": "welding_rig"
+  },
   {
     "type": "vehicle_part",
     "id": "ap_kiln",
diff --git a/data/json/items/tool/workshop.json b/data/json/items/tool/workshop.json
index dc934b75e8497..c8bc5310cbd38 100644
--- a/data/json/items/tool/workshop.json
+++ b/data/json/items/tool/workshop.json
@@ -1263,12 +1263,10 @@
           "mc_steel",
           "hc_steel",
           "ch_steel",
-          "qt_steel",
           "lc_steel_chain",
           "mc_steel_chain",
           "hc_steel_chain",
           "ch_steel_chain",
-          "qt_steel_chain",
           "aluminum",
           "copper",
           "bronze",
@@ -1395,12 +1393,10 @@
           "mc_steel",
           "hc_steel",
           "ch_steel",
-          "qt_steel",
           "lc_steel_chain",
           "mc_steel_chain",
           "hc_steel_chain",
-          "ch_steel_chain",
-          "qt_steel_chain"
+          "ch_steel_chain"
         ],
         "skill": "fabrication",
         "tool_quality": 5,
@@ -1422,7 +1418,7 @@
     "id": "welding_kit",
     "type": "TOOL",
     "name": { "str": "welding kit" },
-    "description": "An welder combined with a fireproof insulating blanket allows for advanced welds and repairs to tempered steels.",
+    "description": "A welder combined with a fireproof insulating blanket allows for advanced welds and repairs to tempered steels.",
     "weight": "10500 g",
     "volume": "12500 ml",
     "price": 9000,
diff --git a/data/json/items/vehicle/rigs.json b/data/json/items/vehicle/rigs.json
index 987862c805872..680898d059f31 100644
--- a/data/json/items/vehicle/rigs.json
+++ b/data/json/items/vehicle/rigs.json
@@ -53,5 +53,12 @@
     "type": "GENERIC",
     "name": { "str": "vehicle welding rig" },
     "description": "A welding rig made to run off a vehicle's storage battery.  It has a soldering iron attachment for delicate work, and a compartment to store your extra tools in."
+  },
+  {
+    "id": "weldkit",
+    "copy-from": "vehicle_rig",
+    "type": "GENERIC",
+    "name": { "str": "vehicle welding kit" },
+    "description": "A welder combined with a fireproof insulating blanket allows for advanced welds and repairs to tempered steels."
   }
 ]