diff --git a/code/modules/surgery/cavity_implant.dm b/code/modules/surgery/cavity_implant.dm
index 8bad429102..0d13e81188 100644
--- a/code/modules/surgery/cavity_implant.dm
+++ b/code/modules/surgery/cavity_implant.dm
@@ -17,6 +17,11 @@
 	var/obj/item/bodypart/chest/CH = target.get_bodypart("chest")
 	IC = CH.cavity_item
 	if(tool)
+		if(istype(tool, /obj/item/surgical_drapes) || istype(tool, /obj/item/bedsheet))
+			var/obj/item/inactive = user.get_inactive_held_item()
+			if(istype(inactive, /obj/item/cautery) || istype(inactive, /obj/item/screwdriver) || iscyborg(user))
+				attempt_cancel_surgery(surgery, tool, target, user)
+				return -1
 		user.visible_message("[user] begins to insert [tool] into [target]'s [target_zone].", "<span class='notice'>You begin to insert [tool] into [target]'s [target_zone]...</span>")
 	else
 		user.visible_message("[user] checks for items in [target]'s [target_zone].", "<span class='notice'>You check for items in [target]'s [target_zone]...</span>")
diff --git a/code/modules/surgery/helpers.dm b/code/modules/surgery/helpers.dm
index a4e9b16989..d37b17ae35 100644
--- a/code/modules/surgery/helpers.dm
+++ b/code/modules/surgery/helpers.dm
@@ -1,173 +1,171 @@
-/proc/attempt_initiate_surgery(obj/item/I, mob/living/M, mob/user)
-	if(!istype(M))
-		return
-
-	var/mob/living/carbon/C
-	var/obj/item/bodypart/affecting
-	var/selected_zone = user.zone_selected
-
-	if(iscarbon(M))
-		C = M
-		affecting = C.get_bodypart(check_zone(selected_zone))
-
-	if(!M.lying && !isslime(M))	//if they're prone or a slime
-		return
-
-	var/datum/surgery/current_surgery
-
-	for(var/datum/surgery/S in M.surgeries)
-		if(S.location == selected_zone)
-			current_surgery = S
-
-	if(!current_surgery)
-		var/list/all_surgeries = GLOB.surgeries_list.Copy()
-		var/list/available_surgeries = list()
-
-		for(var/datum/surgery/S in all_surgeries)
-			if(!S.possible_locs.Find(selected_zone))
-				continue
-			if(affecting)
-				if(!S.requires_bodypart)
-					continue
-				if(S.requires_bodypart_type && affecting.status == BODYPART_ROBOTIC)
-					continue
-				if(S.requires_real_bodypart && affecting.is_pseudopart)
-					continue
-			else if(C && S.requires_bodypart) //mob with no limb in surgery zone when we need a limb
-				continue
-			if(!S.can_start(user, M))
-				continue
-			for(var/path in S.species)
-				if(istype(M, path))
-					available_surgeries[S.name] = S
-					break
-
-		var/P = input("Begin which procedure?", "Surgery", null, null) as null|anything in available_surgeries
-		if(P && user && user.Adjacent(M) && (I in user))
-			var/datum/surgery/S = available_surgeries[P]
-
-			for(var/datum/surgery/other in M.surgeries)
-				if(other.location == S.location)
-					return //during the input() another surgery was started at the same location.
-
-			//we check that the surgery is still doable after the input() wait.
-			if(C)
-				affecting = C.get_bodypart(check_zone(selected_zone))
-			if(affecting)
-				if(!S.requires_bodypart)
-					return
-				if(S.requires_bodypart_type && affecting.status == BODYPART_ROBOTIC)
-					return
-			else if(C && S.requires_bodypart)
-				return
-			if(!S.can_start(user, M))
-				return
-
-			if(S.ignore_clothes || get_location_accessible(M, selected_zone))
-				var/datum/surgery/procedure = new S.type(M, selected_zone, affecting)
-				user.visible_message("[user] drapes [I] over [M]'s [parse_zone(selected_zone)] to prepare for \an [procedure.name].", \
-					"<span class='notice'>You drape [I] over [M]'s [parse_zone(selected_zone)] to prepare for \an [procedure.name].</span>")
-
-				add_logs(user, M, "operated", addition="Operation type: [procedure.name], location: [selected_zone]")
-			else
-				to_chat(user, "<span class='warning'>You need to expose [M]'s [parse_zone(selected_zone)] first!</span>")
-
-	else if(!current_surgery.step_in_progress)
-		if(current_surgery.status == 1)
-			M.surgeries -= current_surgery
-			user.visible_message("[user] removes the drapes from [M]'s [parse_zone(selected_zone)].", \
-				"<span class='notice'>You remove the drapes from [M]'s [parse_zone(selected_zone)].</span>")
-			qdel(current_surgery)
-		else if(current_surgery.can_cancel)
-			if(current_surgery.requires_bodypart_type == BODYPART_ORGANIC)
-				if(istype(user.get_inactive_held_item(), /obj/item/cautery))
-					M.surgeries -= current_surgery
-					user.visible_message("[user] mends the incision and removes the drapes from [M]'s [parse_zone(selected_zone)].", \
-						"<span class='notice'>You mend the incision and remove the drapes from [M]'s [parse_zone(selected_zone)].</span>")
-					qdel(current_surgery)
-				else
-					to_chat(user, "<span class='warning'>You need to hold a cautery in inactive hand to stop [M]'s surgery!</span>")
-			else if(current_surgery.requires_bodypart_type == BODYPART_ROBOTIC)
-				if(istype(user.get_inactive_held_item(), /obj/item/screwdriver))
-					M.surgeries -= current_surgery
-					user.visible_message("[user] screw the shell and removes the drapes from [M]'s [parse_zone(selected_zone)].", \
-						"<span class='notice'>You screw the shell and remove the drapes from [M]'s [parse_zone(selected_zone)].</span>")
-					qdel(current_surgery)
-				else
-					to_chat(user, "<span class='warning'>You need to hold a screwdriver in inactive hand to stop [M]'s surgery!</span>")
-
-	return 1
-
-
-
-/proc/get_location_modifier(mob/M)
-	var/turf/T = get_turf(M)
-	if(locate(/obj/structure/table/optable, T))
-		return 1
-	else if(locate(/obj/structure/table, T))
-		return 0.8
-	else if(locate(/obj/structure/bed, T))
-		return 0.7
-	else
-		return 0.5
-
-
-/proc/get_location_accessible(mob/M, location)
-	var/covered_locations = 0	//based on body_parts_covered
-	var/face_covered = 0	//based on flags_inv
-	var/eyesmouth_covered = 0	//based on flags_cover
-	if(iscarbon(M))
-		var/mob/living/carbon/C = M
-		for(var/obj/item/clothing/I in list(C.back, C.wear_mask, C.head))
-			covered_locations |= I.body_parts_covered
-			face_covered |= I.flags_inv
-			eyesmouth_covered |= I.flags_cover
-		if(ishuman(C))
-			var/mob/living/carbon/human/H = C
-			for(var/obj/item/I in list(H.wear_suit, H.w_uniform, H.shoes, H.belt, H.gloves, H.glasses, H.ears))
-				covered_locations |= I.body_parts_covered
-				face_covered |= I.flags_inv
-				eyesmouth_covered |= I.flags_cover
-
-	switch(location)
-		if("head")
-			if(covered_locations & HEAD)
-				return 0
-		if("eyes")
-			if(covered_locations & HEAD || face_covered & HIDEEYES || eyesmouth_covered & GLASSESCOVERSEYES)
-				return 0
-		if("mouth")
-			if(covered_locations & HEAD || face_covered & HIDEFACE || eyesmouth_covered & MASKCOVERSMOUTH || eyesmouth_covered & HEADCOVERSMOUTH)
-				return 0
-		if("chest")
-			if(covered_locations & CHEST)
-				return 0
-		if("groin")
-			if(covered_locations & GROIN)
-				return 0
-		if("l_arm")
-			if(covered_locations & ARM_LEFT)
-				return 0
-		if("r_arm")
-			if(covered_locations & ARM_RIGHT)
-				return 0
-		if("l_leg")
-			if(covered_locations & LEG_LEFT)
-				return 0
-		if("r_leg")
-			if(covered_locations & LEG_RIGHT)
-				return 0
-		if("l_hand")
-			if(covered_locations & HAND_LEFT)
-				return 0
-		if("r_hand")
-			if(covered_locations & HAND_RIGHT)
-				return 0
-		if("l_foot")
-			if(covered_locations & FOOT_LEFT)
-				return 0
-		if("r_foot")
-			if(covered_locations & FOOT_RIGHT)
-				return 0
-
-	return 1
+/proc/attempt_initiate_surgery(obj/item/I, mob/living/M, mob/user)
+	if(!istype(M))
+		return
+
+	var/mob/living/carbon/C
+	var/obj/item/bodypart/affecting
+	var/selected_zone = user.zone_selected
+
+	if(iscarbon(M))
+		C = M
+		affecting = C.get_bodypart(check_zone(selected_zone))
+
+	if(!M.lying && !isslime(M))	//if they're prone or a slime
+		return
+
+	var/datum/surgery/current_surgery
+
+	for(var/datum/surgery/S in M.surgeries)
+		if(S.location == selected_zone)
+			current_surgery = S
+
+	if(!current_surgery)
+		var/list/all_surgeries = GLOB.surgeries_list.Copy()
+		var/list/available_surgeries = list()
+
+		for(var/datum/surgery/S in all_surgeries)
+			if(!S.possible_locs.Find(selected_zone))
+				continue
+			if(affecting)
+				if(!S.requires_bodypart)
+					continue
+				if(S.requires_bodypart_type && affecting.status != S.requires_bodypart_type)
+					continue
+				if(S.requires_real_bodypart && affecting.is_pseudopart)
+					continue
+			else if(C && S.requires_bodypart) //mob with no limb in surgery zone when we need a limb
+				continue
+			if(!S.can_start(user, M))
+				continue
+			for(var/path in S.species)
+				if(istype(M, path))
+					available_surgeries[S.name] = S
+					break
+
+		var/P = input("Begin which procedure?", "Surgery", null, null) as null|anything in available_surgeries
+		if(P && user && user.Adjacent(M) && (I in user))
+			var/datum/surgery/S = available_surgeries[P]
+
+			for(var/datum/surgery/other in M.surgeries)
+				if(other.location == S.location)
+					return //during the input() another surgery was started at the same location.
+
+			//we check that the surgery is still doable after the input() wait.
+			if(C)
+				affecting = C.get_bodypart(check_zone(selected_zone))
+			if(affecting)
+				if(!S.requires_bodypart)
+					return
+				if(S.requires_bodypart_type && affecting.status != S.requires_bodypart_type)
+					return
+			else if(C && S.requires_bodypart)
+				return
+			if(!S.can_start(user, M))
+				return
+
+			if(S.ignore_clothes || get_location_accessible(M, selected_zone))
+				var/datum/surgery/procedure = new S.type(M, selected_zone, affecting)
+				user.visible_message("[user] drapes [I] over [M]'s [parse_zone(selected_zone)] to prepare for \an [procedure.name].", \
+					"<span class='notice'>You drape [I] over [M]'s [parse_zone(selected_zone)] to prepare for \an [procedure.name].</span>")
+
+				add_logs(user, M, "operated", addition="Operation type: [procedure.name], location: [selected_zone]")
+			else
+				to_chat(user, "<span class='warning'>You need to expose [M]'s [parse_zone(selected_zone)] first!</span>")
+
+	else if(!current_surgery.step_in_progress)
+		attempt_cancel_surgery(current_surgery, I, M, user)
+
+	return 1
+
+/proc/attempt_cancel_surgery(datum/surgery/S, obj/item/I, mob/living/M, mob/user)
+	var/selected_zone = user.zone_selected
+	if(S.status == 1)
+		M.surgeries -= S
+		user.visible_message("[user] removes [I] from [M]'s [parse_zone(selected_zone)].", \
+			"<span class='notice'>You remove [I] from [M]'s [parse_zone(selected_zone)].</span>")
+		qdel(S)
+	else if(S.can_cancel)
+		var/close_tool_type = /obj/item/cautery
+		var/obj/item/close_tool = user.get_inactive_held_item()
+		var/is_robotic = S.requires_bodypart_type == BODYPART_ROBOTIC
+		if(is_robotic)
+			close_tool_type = /obj/item/screwdriver
+		if(istype(close_tool, close_tool_type) || iscyborg(user))
+			M.surgeries -= S
+			user.visible_message("[user] closes [M]'s [parse_zone(selected_zone)] with [close_tool] and removes [I].", \
+				"<span class='notice'>You close [M]'s [parse_zone(selected_zone)] with [close_tool] and remove [I].</span>")
+			qdel(S)
+		else
+			to_chat(user, "<span class='warning'>You need to hold a [is_robotic ? "screwdriver" : "cautery"] in your inactive hand to stop [M]'s surgery!</span>")
+
+/proc/get_location_modifier(mob/M)
+	var/turf/T = get_turf(M)
+	if(locate(/obj/structure/table/optable, T))
+		return 1
+	else if(locate(/obj/structure/table, T))
+		return 0.8
+	else if(locate(/obj/structure/bed, T))
+		return 0.7
+	else
+		return 0.5
+
+
+/proc/get_location_accessible(mob/M, location)
+	var/covered_locations = 0	//based on body_parts_covered
+	var/face_covered = 0	//based on flags_inv
+	var/eyesmouth_covered = 0	//based on flags_cover
+	if(iscarbon(M))
+		var/mob/living/carbon/C = M
+		for(var/obj/item/clothing/I in list(C.back, C.wear_mask, C.head))
+			covered_locations |= I.body_parts_covered
+			face_covered |= I.flags_inv
+			eyesmouth_covered |= I.flags_cover
+		if(ishuman(C))
+			var/mob/living/carbon/human/H = C
+			for(var/obj/item/I in list(H.wear_suit, H.w_uniform, H.shoes, H.belt, H.gloves, H.glasses, H.ears))
+				covered_locations |= I.body_parts_covered
+				face_covered |= I.flags_inv
+				eyesmouth_covered |= I.flags_cover
+
+	switch(location)
+		if("head")
+			if(covered_locations & HEAD)
+				return 0
+		if("eyes")
+			if(covered_locations & HEAD || face_covered & HIDEEYES || eyesmouth_covered & GLASSESCOVERSEYES)
+				return 0
+		if("mouth")
+			if(covered_locations & HEAD || face_covered & HIDEFACE || eyesmouth_covered & MASKCOVERSMOUTH || eyesmouth_covered & HEADCOVERSMOUTH)
+				return 0
+		if("chest")
+			if(covered_locations & CHEST)
+				return 0
+		if("groin")
+			if(covered_locations & GROIN)
+				return 0
+		if("l_arm")
+			if(covered_locations & ARM_LEFT)
+				return 0
+		if("r_arm")
+			if(covered_locations & ARM_RIGHT)
+				return 0
+		if("l_leg")
+			if(covered_locations & LEG_LEFT)
+				return 0
+		if("r_leg")
+			if(covered_locations & LEG_RIGHT)
+				return 0
+		if("l_hand")
+			if(covered_locations & HAND_LEFT)
+				return 0
+		if("r_hand")
+			if(covered_locations & HAND_RIGHT)
+				return 0
+		if("l_foot")
+			if(covered_locations & FOOT_LEFT)
+				return 0
+		if("r_foot")
+			if(covered_locations & FOOT_RIGHT)
+				return 0
+
+	return 1