diff --git a/data/json/construction.json b/data/json/construction.json
index 2e01e281b523..baebe08489ba 100644
--- a/data/json/construction.json
+++ b/data/json/construction.json
@@ -1926,6 +1926,18 @@
     "dark_craftable": true,
     "post_furniture": "f_workbench"
   },
+  {
+    "type": "construction",
+    "id": "constr_place_robobench",
+    "group": "place_workbench",
+    "category": "FURN",
+    "required_skills": [ [ "fabrication", 0 ] ],
+    "time": "1 m",
+    "components": [ [ [ "robobench", 1 ] ] ],
+    "pre_special": "check_empty",
+    "dark_craftable": true,
+    "post_furniture": "f_robobench"
+  },
   {
     "type": "construction",
     "id": "constr_chair",
diff --git a/data/json/furniture_and_terrain/furniture-surfaces.json b/data/json/furniture_and_terrain/furniture-surfaces.json
index 884370177934..99931f12392b 100644
--- a/data/json/furniture_and_terrain/furniture-surfaces.json
+++ b/data/json/furniture_and_terrain/furniture-surfaces.json
@@ -170,6 +170,36 @@
     "examine_action": "workbench",
     "workbench": { "multiplier": 1.2, "mass": "500 kg", "volume": "200L" }
   },
+  {
+    "type": "furniture",
+    "id": "f_robobench",
+    "name": "Robotic workbench",
+    "description": "Having upgraded the basic workbench, you've now created a robotic workbench that helps speed up crafting.",
+    "symbol": "#",
+    "color": "red",
+    "move_cost_mod": 2,
+    "coverage": 50,
+    "required_str": 10,
+    "looks_like": "machinery_heavy",
+    "flags": [ "TRANSPARENT", "PLACE_ITEM", "MOUNTABLE", "FLAT_SURF", "EASY_DECONSTRUCT" ],
+    "deconstruct": { "items": [ { "item": "robobench", "count": 1 } ] },
+    "bash": {
+      "str_min": 35,
+      "str_max": 80,
+      "sound": "metal screeching!",
+      "sound_fail": "clang!",
+      "items": [
+        { "item": "pipe", "count": [ 4, 6 ] },
+        { "item": "sheet_metal", "count": [ 0, 1 ] },
+        { "item": "sheet_metal_small", "count": [ 12, 24 ] },
+        { "item": "steel_chunk", "count": [ 4, 8 ] },
+        { "item": "scrap", "count": [ 12, 24 ] }
+      ],
+      "ranged": { "reduction": [ 35, 35 ], "destroy_threshold": 80, "block_unaimed_chance": "50%" }
+    },
+    "examine_action": "workbench",
+    "workbench": { "multiplier": 1.5, "mass": "500 kg", "volume": "200L" }
+  },
   {
     "type": "furniture",
     "id": "f_leather_tarp",
diff --git a/data/json/items/vehicle/tables.json b/data/json/items/vehicle/tables.json
index ff059258d3f2..f9f84128bc00 100644
--- a/data/json/items/vehicle/tables.json
+++ b/data/json/items/vehicle/tables.json
@@ -34,5 +34,16 @@
     "bashing": 8,
     "price": "400 USD",
     "copy-from": "v_table"
+  },
+  {
+    "type": "GENERIC",
+    "id": "robobench",
+    "name": { "str": "robobench", "str_pl": "robobenches" },
+    "description": "Having upgraded the basic workbench, you've now created a robotic workbench that helps speed up crafting.",
+    "weight": "43000 g",
+    "material": [ "steel" ],
+    "bashing": 9,
+    "price": "4000 USD",
+    "copy-from": "v_table"
   }
 ]
diff --git a/data/json/recipes/other/vehicles.json b/data/json/recipes/other/vehicles.json
index 031ce59bcb57..3ecbfb840029 100644
--- a/data/json/recipes/other/vehicles.json
+++ b/data/json/recipes/other/vehicles.json
@@ -24,6 +24,29 @@
       [ [ "rock", 40 ] ]
     ]
   },
+  {
+    "type": "recipe",
+    "result": "robobench",
+    "category": "CC_OTHER",
+    "subcategory": "CSC_OTHER_VEHICLE",
+    "skill_used": "electronics",
+    "skills_required": [ [ "computer", 5 ], [ "fabrication", 3 ] ],
+    "difficulty": 7,
+    "time": "4 h",
+    "reversible": true,
+    "decomp_learn": 1,
+    "book_learn": [ [ "recipe_lab_elec", 6 ], [ "recipe_mil_augs", 6 ], [ "textbook_robots", 6 ] ],
+    "using": [ [ "welding_standard", 15 ], [ "soldering_standard", 40 ] ],
+    "components": [
+      [ [ "workbench", 1 ] ],
+      [ [ "plut_cell", 2 ] ],
+      [ [ "motor_small", 6 ] ],
+      [ [ "cable", 60 ] ],
+      [ [ "sensor_module", 1 ] ],
+      [ [ "ai_module", 1 ] ],
+      [ [ "sheet_metal_small", 10 ] ]
+    ]
+  },
   {
     "type": "recipe",
     "result": "pump_complex",
diff --git a/data/json/vehicleparts/vehicle_parts.json b/data/json/vehicleparts/vehicle_parts.json
index 72b7876f1877..c25332310c4e 100644
--- a/data/json/vehicleparts/vehicle_parts.json
+++ b/data/json/vehicleparts/vehicle_parts.json
@@ -1172,6 +1172,36 @@
     "workbench": { "multiplier": 1.2, "mass": "300 kg", "volume": "30L" },
     "damage_reduction": { "all": 29 }
   },
+  {
+    "type": "vehicle_part",
+    "id": "robobench",
+    "name": { "str": "robobench" },
+    "symbol": "#",
+    "looks_like": "machinery_heavy",
+    "color": "red",
+    "broken_symbol": "#",
+    "broken_color": "light_gray",
+    "damage_modifier": 60,
+    "durability": 300,
+    "size": "30 L",
+    "item": "robobench",
+    "location": "center",
+    "requirements": {
+      "install": { "skills": [ [ "mechanics", 1 ] ], "time": "15 m", "using": [ [ "vehicle_bolt", 1 ] ] },
+      "removal": { "skills": [ [ "mechanics", 1 ] ], "time": "15 m", "using": [ [ "vehicle_bolt", 1 ] ] },
+      "repair": { "skills": [ [ "mechanics", 2 ] ], "time": "15 m", "using": [ [ "welding_standard", 5 ], [ "steel_tiny", 1 ] ] }
+    },
+    "flags": [ "CARGO", "OBSTACLE", "FLAT_SURF", "WORKBENCH" ],
+    "breaks_into": [
+      { "item": "pipe", "count": [ 4, 6 ] },
+      { "item": "sheet_metal", "count": [ 0, 1 ] },
+      { "item": "sheet_metal_small", "count": [ 12, 24 ] },
+      { "item": "steel_chunk", "count": [ 4, 8 ] },
+      { "item": "scrap", "count": [ 12, 24 ] }
+    ],
+    "workbench": { "multiplier": 1.5, "mass": "300 kg", "volume": "30L" },
+    "damage_reduction": { "all": 25 }
+  },
   {
     "type": "vehicle_part",
     "id": "boat_board",