diff --git a/data/mods/Sky_Island/constructions.json b/data/mods/Sky_Island/constructions.json
index 799a9537192d1..9e98654e4618f 100644
--- a/data/mods/Sky_Island/constructions.json
+++ b/data/mods/Sky_Island/constructions.json
@@ -24,6 +24,30 @@
     "post_terrain": "f_autodoc",
     "activity_level": "LIGHT_EXERCISE"
   },
+  {
+    "type": "construction",
+    "id": "upgrade_autodoc_1",
+    "group": "autodoc_paste",
+    "category": "OTHER",
+    "required_skills": [ [ "survival", 0 ] ],
+    "time": "1 h",
+    "components": [ [ [ "warp_autodoc_active", 1 ], [ "warped_autodoc_upgrader_1", 1 ] ] ],
+    "pre_terrain": "f_autodoc",
+    "post_terrain": "f_si_autodoc_2",
+    "activity_level": "LIGHT_EXERCISE"
+  },
+  {
+    "type": "construction",
+    "id": "upgrade_autodoc_2",
+    "group": "autodoc_paste",
+    "category": "OTHER",
+    "required_skills": [ [ "survival", 0 ] ],
+    "time": "1 h",
+    "components": [ [ [ "warp_autodoc_active", 1 ], [ "warped_autodoc_upgrader_2", 1 ] ] ],
+    "pre_terrain": "f_si_autodoc_2",
+    "post_terrain": "f_si_autodoc_3",
+    "activity_level": "LIGHT_EXERCISE"
+  },
   {
     "type": "construction",
     "id": "constr_sofa",
diff --git a/data/mods/Sky_Island/furniture_and_terrain.json b/data/mods/Sky_Island/furniture_and_terrain.json
index 2090f937ab2d4..f31a90d872349 100644
--- a/data/mods/Sky_Island/furniture_and_terrain.json
+++ b/data/mods/Sky_Island/furniture_and_terrain.json
@@ -185,5 +185,100 @@
     "connects_to": "WALL",
     "flags": [ "NOITEM", "SUPPORTS_ROOF", "WALL", "NO_SCENT", "AUTO_WALL_SYMBOL", "BLOCK_WIND" ],
     "bash": { "str_min": 4000, "str_max": 5000, "sound": "crash!", "sound_fail": "glzt!", "ter_set": "t_warprock" }
+  },
+  {
+    "type": "furniture",
+    "id": "f_si_autodoc_2",
+    "name": "Warped Autodoc Mk. XXII",
+    "symbol": "&",
+    "description": "A surgical apparatus used for the installation and removal of bionics.  The term name 'Autodoc' is something of a misnomer, as it can only operate if programmed beforehand, something that a plethora of labels warn against doing without expertise.  Bluish-purple sparks occasionally emit from some of the mechanisms.",
+    "color": "light_cyan",
+    "looks_like": "f_autodoc",
+    "move_cost_mod": -1,
+    "coverage": 35,
+    "required_str": -1,
+    "flags": [ "TRANSPARENT", "AUTODOC", "CONTAINER", "NO_PICKUP_ON_EXAMINE" ],
+    "examine_action": "autodoc",
+    "surgery_skill_multiplier": 2.5,
+    "deconstruct": {
+      "items": [
+        { "item": "processor", "count": [ 1, 2 ] },
+        { "item": "RAM", "count": [ 4, 8 ] },
+        { "item": "cable", "charges": [ 4, 6 ] },
+        { "item": "small_lcd_screen", "count": [ 1, 2 ] },
+        { "item": "e_scrap", "count": [ 10, 16 ] },
+        { "item": "circuit", "count": [ 6, 10 ] },
+        { "item": "power_supply", "count": [ 2, 4 ] },
+        { "item": "amplifier", "count": [ 2, 4 ] },
+        { "item": "plastic_chunk", "count": [ 10, 12 ] },
+        { "item": "scrap", "count": [ 6, 8 ] }
+      ]
+    },
+    "bash": {
+      "str_min": 8,
+      "str_max": 150,
+      "sound": "crunch!",
+      "sound_fail": "whack!",
+      "items": [
+        { "item": "processor", "prob": 25 },
+        { "item": "RAM", "count": [ 0, 2 ], "prob": 50 },
+        { "item": "cable", "charges": [ 1, 2 ], "prob": 50 },
+        { "item": "small_lcd_screen", "prob": 25 },
+        { "item": "e_scrap", "count": [ 1, 4 ], "prob": 50 },
+        { "item": "circuit", "count": [ 0, 2 ], "prob": 50 },
+        { "item": "power_supply", "prob": 25 },
+        { "item": "amplifier", "prob": 25 },
+        { "item": "plastic_chunk", "count": [ 4, 10 ], "prob": 50 },
+        { "item": "scrap", "count": [ 2, 6 ], "prob": 50 }
+      ]
+    }
+  },
+  {
+    "type": "furniture",
+    "id": "f_si_autodoc_3",
+    "name": "Warped Autodoc Mk. XXXIII",
+    "symbol": "&",
+    "description": "A surgical apparatus used for the installation and removal of bionics.  The term name 'Autodoc' is something of a misnomer, as it can only operate if programmed beforehand, something that a plethora of labels warn against doing without expertise.  Bluish-purple sparks frequently emit from some of the mechanisms, and the entire machine has a faint violet glow.",
+    "color": "light_cyan",
+    "looks_like": "f_autodoc",
+    "move_cost_mod": -1,
+    "coverage": 35,
+    "required_str": -1,
+    "flags": [ "TRANSPARENT", "AUTODOC", "CONTAINER", "NO_PICKUP_ON_EXAMINE" ],
+    "examine_action": "autodoc",
+    "light_emitted": 3,
+    "surgery_skill_multiplier": 8,
+    "deconstruct": {
+      "items": [
+        { "item": "processor", "count": [ 1, 2 ] },
+        { "item": "RAM", "count": [ 4, 8 ] },
+        { "item": "cable", "charges": [ 4, 6 ] },
+        { "item": "small_lcd_screen", "count": [ 1, 2 ] },
+        { "item": "e_scrap", "count": [ 10, 16 ] },
+        { "item": "circuit", "count": [ 6, 10 ] },
+        { "item": "power_supply", "count": [ 2, 4 ] },
+        { "item": "amplifier", "count": [ 2, 4 ] },
+        { "item": "plastic_chunk", "count": [ 10, 12 ] },
+        { "item": "scrap", "count": [ 6, 8 ] }
+      ]
+    },
+    "bash": {
+      "str_min": 8,
+      "str_max": 150,
+      "sound": "crunch!",
+      "sound_fail": "whack!",
+      "items": [
+        { "item": "processor", "prob": 25 },
+        { "item": "RAM", "count": [ 0, 2 ], "prob": 50 },
+        { "item": "cable", "charges": [ 1, 2 ], "prob": 50 },
+        { "item": "small_lcd_screen", "prob": 25 },
+        { "item": "e_scrap", "count": [ 1, 4 ], "prob": 50 },
+        { "item": "circuit", "count": [ 0, 2 ], "prob": 50 },
+        { "item": "power_supply", "prob": 25 },
+        { "item": "amplifier", "prob": 25 },
+        { "item": "plastic_chunk", "count": [ 4, 10 ], "prob": 50 },
+        { "item": "scrap", "count": [ 2, 6 ], "prob": 50 }
+      ]
+    }
   }
 ]
diff --git a/data/mods/Sky_Island/items.json b/data/mods/Sky_Island/items.json
index 24ebd9832afc2..8637f1381719f 100644
--- a/data/mods/Sky_Island/items.json
+++ b/data/mods/Sky_Island/items.json
@@ -309,6 +309,28 @@
     "weight": "100 g",
     "volume": "200 ml"
   },
+  {
+    "id": "warped_autodoc_upgrader_1",
+    "type": "TOOL",
+    "name": { "str": "warped autodoc enhancer" },
+    "description": "A small device, so complex you can't entirely tell what it does.  You can see a miniature chair, a bed, some kind of machine, a computer console, a tangle of mechanical arms, all changing from moment to moment.  When used on an existing autodoc mark XI, you can upgrade it to a more advanced XXII model.",
+    "volume": "5 ml",
+    "weight": "5 g",
+    "material": [ "alien_resin" ],
+    "symbol": "A",
+    "color": "pink"
+  },
+  {
+    "id": "warped_autodoc_upgrader_2",
+    "type": "TOOL",
+    "name": { "str": "warped autodoc augmenter" },
+    "description": "A small device, so complex you can't entirely tell what it does.  You can see a miniature chair, a bed, some kind of machine, a computer console, a tangle of mechanical arms, all changing from moment to moment.  When used on an advanced autodoc mark XXII, you can upgrade it to its most advanced XXXIII form.",
+    "volume": "5 ml",
+    "weight": "5 g",
+    "material": [ "alien_resin" ],
+    "symbol": "A",
+    "color": "pink"
+  },
   {
     "id": "warp_grassbag",
     "type": "AMMO",
diff --git a/data/mods/Sky_Island/recipes.json b/data/mods/Sky_Island/recipes.json
index 0b426def0bc1c..2834d4035d323 100644
--- a/data/mods/Sky_Island/recipes.json
+++ b/data/mods/Sky_Island/recipes.json
@@ -301,5 +301,51 @@
     "components": [ [ [ "warptoken", 30 ] ] ],
     "flags": [ "BLIND_EASY" ],
     "result_eocs": [ "EOC_WARPED_POND_CREATION" ]
+  },
+  {
+    "result": "warped_autodoc_upgrader_1",
+    "type": "recipe",
+    "activity_level": "NO_EXERCISE",
+    "category": "CC_WARP",
+    "subcategory": "CSC_WARP_ITEMS",
+    "skill_used": "survival",
+    "time": "1 h",
+    "autolearn": true,
+    "reversible": false,
+    "flags": [ "BLIND_EASY" ],
+    "tools": [ [ [ "fakeitem_statue", -1 ] ] ],
+    "components": [
+      [ [ "warptoken", 20 ] ],
+      [ [ "ether", 150 ] ],
+      [ [ "xanax", 8 ] ],
+      [ [ "record_patient", 1 ] ],
+      [ [ "medical_sample", 2 ] ],
+      [ [ "vacutainer", 1 ] ],
+      [ [ "gloves_medical", 6 ] ],
+      [ [ "stethoscope", 2 ] ]
+    ]
+  },
+  {
+    "result": "warped_autodoc_upgrader_2",
+    "type": "recipe",
+    "activity_level": "NO_EXERCISE",
+    "category": "CC_WARP",
+    "subcategory": "CSC_WARP_ITEMS",
+    "skill_used": "survival",
+    "time": "1 h",
+    "autolearn": true,
+    "reversible": false,
+    "flags": [ "BLIND_EASY" ],
+    "tools": [ [ [ "fakeitem_statue", -1 ] ] ],
+    "components": [
+      [ [ "warptoken", 40 ] ],
+      [ [ "oxycodone", 10 ] ],
+      [ [ "record_patient", 3 ] ],
+      [ [ "diazepam", 5 ] ],
+      [ [ "morphine", 10 ] ],
+      [ [ "medical_sample", 10 ] ],
+      [ [ "badge_doctor", 1 ] ],
+      [ [ "software_medical", 1 ] ]
+    ]
   }
 ]