diff --git a/code/game/objects/items/storage/belt.dm b/code/game/objects/items/storage/belt.dm
index 082cbe245d..70a41c3d21 100755
--- a/code/game/objects/items/storage/belt.dm
+++ b/code/game/objects/items/storage/belt.dm
@@ -179,17 +179,23 @@
 		/obj/item/pinpointer/crew
 		))
 
-
 /obj/item/storage/belt/medical/surgery_belt_adv
 	name = "surgical supply belt"
 	desc = "A specialized belt designed for holding surgical equipment. It seems to have specific pockets for each and every surgical tool you can think of."
 	content_overlays = FALSE
+	var/advanced_drapes = FALSE
 
 /obj/item/storage/belt/medical/surgery_belt_adv/PopulateContents()
 	new /obj/item/scalpel/advanced(src)
 	new /obj/item/retractor/advanced(src)
 	new /obj/item/surgicaldrill/advanced(src)
-	new /obj/item/surgical_drapes(src)
+	if(advanced_drapes)
+		new /obj/item/surgical_drapes/advanced(src)
+	else
+		new /obj/item/surgical_drapes(src)
+
+/obj/item/storage/belt/medical/surgery_belt_adv/cmo
+	advanced_drapes = TRUE
 
 /obj/item/storage/belt/security
 	name = "security belt"
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm
index 3167d8ac18..90b57471b4 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm
@@ -76,7 +76,7 @@
 	new /obj/item/door_remote/chief_medical_officer(src)
 	new /obj/item/clothing/neck/petcollar(src)
 	new /obj/item/pet_carrier(src)
-	new /obj/item/storage/belt/medical/surgery_belt_adv(src)
+	new /obj/item/storage/belt/medical/surgery_belt_adv/cmo(src)
 	new /obj/item/wallframe/defib_mount(src)
 	new /obj/item/circuitboard/machine/techfab/department/medical(src)
 	new /obj/item/storage/photo_album/CMO(src)
diff --git a/code/modules/surgery/helpers.dm b/code/modules/surgery/helpers.dm
index cdae1aea48..773048f838 100644
--- a/code/modules/surgery/helpers.dm
+++ b/code/modules/surgery/helpers.dm
@@ -34,7 +34,7 @@
 				continue
 			if(S.lying_required && !(M.lying))
 				continue
-			if(!S.can_start(user, M))
+			if(!S.can_start(user, M, I))
 				continue
 			for(var/path in S.target_mobtypes)
 				if(istype(M, path))
@@ -64,7 +64,7 @@
 				return
 			if(S.lying_required && !(M.lying))
 				return
-			if(!S.can_start(user, M))
+			if(!S.can_start(user, M, I))
 				return
 
 			if(S.ignore_clothes || get_location_accessible(M, selected_zone))
diff --git a/code/modules/surgery/surgery.dm b/code/modules/surgery/surgery.dm
index 292984ac3e..a289f25d8b 100644
--- a/code/modules/surgery/surgery.dm
+++ b/code/modules/surgery/surgery.dm
@@ -55,27 +55,26 @@
 	if(requires_tech)
 		. = FALSE
 
+	var/list/advanced_surgeries = list()
 	if(iscyborg(user))
 		var/mob/living/silicon/robot/R = user
 		var/obj/item/surgical_processor/SP = locate() in R.module.modules
 		if(SP)
-			if (replaced_by in SP.advanced_surgeries)
-				return .
-			if(type in SP.advanced_surgeries)
-				return TRUE
-
+			advanced_surgeries |= SP.advanced_surgeries
 
 	var/turf/T = get_turf(patient)
 	var/obj/structure/table/optable/table = locate(/obj/structure/table/optable, T)
-	if(table)
-		if(!table.computer)
-			return .
-		if(table.computer.stat & (NOPOWER|BROKEN))
-			return .
-		if(replaced_by in table.computer.advanced_surgeries)
-			return FALSE
-		if(type in table.computer.advanced_surgeries)
-			return TRUE
+	if(table?.computer && !CHECK_BITFIELD(table.computer.stat, NOPOWER|BROKEN))
+		advanced_surgeries |= table.computer.advanced_surgeries
+
+	if(istype(tool, /obj/item/surgical_drapes/advanced))
+		var/obj/item/surgical_drapes/advanced/A = tool
+		advanced_surgeries |= A.get_advanced_surgeries()
+
+	if(replaced_by in advanced_surgeries)
+		return FALSE
+	if(type in advanced_surgeries)
+		return TRUE
 
 /datum/surgery/proc/next_step(mob/user, intent)
 	if(step_in_progress)
diff --git a/code/modules/surgery/tools.dm b/code/modules/surgery/tools.dm
index c8fe7597da..1a56a510c5 100644
--- a/code/modules/surgery/tools.dm
+++ b/code/modules/surgery/tools.dm
@@ -287,6 +287,26 @@
 	if(!attempt_initiate_surgery(src, M, user))
 		..()
 
+/obj/item/surgical_drapes/advanced
+	name = "smart surgical drapes"
+	desc = "A quite quirky set of drapes with wireless synchronization to the station's research networks, with an integrated display allowing users to execute advanced surgeries without the aid of an operating computer."
+	var/datum/techweb/linked_techweb
+
+/obj/item/surgical_drapes/advanced/Initialize(mapload)
+	. = ..()
+	linked_techweb = SSresearch.science_tech
+
+/obj/item/surgical_drapes/advanced/proc/get_advanced_surgeries()
+	. = list()
+	if(!linked_techweb)
+		return
+	for(var/subtype in subtypesof(/datum/design/surgery))
+		var/datum/design/surgery/prototype = subtype
+		var/id = initial(prototype.id)
+		if(id in linked_techweb.researched_designs)
+			prototype = SSresearch.techweb_design_by_id(id)
+			. |= prototype.surgery
+
 /obj/item/organ_storage //allows medical cyborgs to manipulate organs without hands
 	name = "organ storage bag"
 	desc = "A container for holding body parts."