diff --git a/data/mods/Isolation-Protocol/Map/mapgen/hallway.json b/data/mods/Isolation-Protocol/Map/mapgen/hallway.json
index 4dc6781acf2c3..f80ea49b2e900 100644
--- a/data/mods/Isolation-Protocol/Map/mapgen/hallway.json
+++ b/data/mods/Isolation-Protocol/Map/mapgen/hallway.json
@@ -66,7 +66,43 @@
       "furniture": { "A": "f_xedra_antenna" },
       "item": { "m": { "item": "xedra_microphone", "chance": 90 }, "s": { "item": "xedra_seismograph", "chance": 90 } },
       "items": { "ú": { "item": "SUS_evac_shelter_locker_used", "chance": 95 } },
-      "signs": { "S": { "signage": "\nNRE-SAFEPOINT\nStatus: ACTIVE" } }
+      "signs": { "S": { "signage": "\nNRE-SAFEPOINT\nStatus: ACTIVE" } },
+      "place_nested": [ { "chunks": [ "safe_tile_center" ], "x": 10, "y": 10 } ]
+    }
+  },
+  {
+    "type": "mapgen",
+    "method": "json",
+    "nested_mapgen_id": "safe_tile_center",
+    "//": "Plants variant",
+    "object": {
+      "mapgensize": [ 4, 4 ],
+      "rows": [
+        "====",
+        "XXXX",
+        "XXXX",
+        "===="
+      ],
+      "palettes": [ "microlab_generic" ]
+    }
+  },
+  {
+    "type": "mapgen",
+    "method": "json",
+    "nested_mapgen_id": "safe_tile_center",
+    "//": "Autodoc variant",
+    "weight": 500,
+    "object": {
+      "mapgensize": [ 4, 4 ],
+      "rows": [
+        "====",
+        "PĀɃP",
+        "PPPP",
+        "=55="
+      ],
+      "palettes": [ "microlab_generic" ],
+      "terrain": { "5": "t_door_metal_c", "Ā": "t_carpet_concrete_red", "Ƀ": "t_carpet_concrete_red" },
+      "furniture": { "A": "f_xedra_antenna", "Ā": "f_autodoc_couch", "Ƀ": "f_autodoc_super" }
     }
   }
 ]
diff --git a/data/mods/Isolation-Protocol/furniture.json b/data/mods/Isolation-Protocol/furniture.json
index 4572ed235a4d8..8858ba0755107 100644
--- a/data/mods/Isolation-Protocol/furniture.json
+++ b/data/mods/Isolation-Protocol/furniture.json
@@ -12,5 +12,50 @@
     "connect_groups": "INDOORFLOOR",
     "flags": [ "NOITEM", "INDOORS" ],
     "examine_action": { "type": "effect_on_condition", "effect_on_conditions": [ "EOC_ISO_ELEVATOR" ] }
+  },
+  {
+    "type": "furniture",
+    "id": "f_autodoc_super",
+    "name": "chirurgic suite",
+    "symbol": "&",
+    "color": "light_cyan",
+    "copy-from": "f_autodoc",
+    "flags": [ "TRANSPARENT", "AUTODOC" ],
+    "description": "A multitude of surgical arms seamlessly meld with the chromed ceiling.  They expectantly unravel with your approach, animated by an AI whose performances blur the lines between medicine and art.",
+    "examine_action": "autodoc",
+    "//": "Easy installation",
+    "surgery_skill_multiplier": 999999,
+    "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 }
+      ]
+    }
   }
 ]