diff --git a/code/_helpers/unsorted.dm b/code/_helpers/unsorted.dm
index 48a4445e19..d6de4f25fe 100644
--- a/code/_helpers/unsorted.dm
+++ b/code/_helpers/unsorted.dm
@@ -1124,13 +1124,13 @@ Turf and target are seperate in case you want to teleport some distance from a t
 // The RNG with table/rollerbeds comes into play in do_surgery() so that fail_step() can be used instead.
 /proc/can_operate(mob/living/carbon/M, mob/living/user)
 	// You can, technically, always operate on yourself after standing still. Inadvised, but you can.
-	if(istype(user) && \
+	return M.lying || \
+		(
 			M == user && \
 			user.allow_self_surgery && \
 			user.a_intent == I_HELP && \
-			!M.isSynthetic())
-		return TRUE
-	return M.lying
+			!M.isSynthetic()
+		)
 
 // Returns an instance of a valid surgery surface.
 /mob/living/proc/get_surgery_surface(mob/living/user)
diff --git a/code/modules/surgery/robotics.dm b/code/modules/surgery/robotics.dm
index bc28847768..1f609c5486 100644
--- a/code/modules/surgery/robotics.dm
+++ b/code/modules/surgery/robotics.dm
@@ -34,7 +34,7 @@
 		/obj/item/weapon/material/knife = 50
 	)
 
-	allowed_procs = list(IS_SCREWDRIVER = 100)
+	allowed_procs = list(TOOL_SCREWDRIVER = 100)
 
 	req_open = 0
 
@@ -73,7 +73,7 @@
 		/obj/item/weapon/material/kitchen/utensil = 50
 	)
 
-	allowed_procs = list(IS_CROWBAR = 100)
+	allowed_procs = list(TOOL_CROWBAR = 100)
 
 	min_duration = 30
 	max_duration = 40
@@ -110,7 +110,7 @@
 		/obj/item/weapon/material/kitchen/utensil = 50
 	)
 
-	allowed_procs = list(IS_CROWBAR = 100)
+	allowed_procs = list(TOOL_CROWBAR = 100)
 
 	min_duration = 70
 	max_duration = 100
@@ -237,7 +237,7 @@
 	/obj/item/weapon/surgical/bonegel = 30, 		\
 	)
 
-	allowed_procs = list(IS_SCREWDRIVER = 100)
+	allowed_procs = list(TOOL_SCREWDRIVER = 100)
 
 	min_duration = 70
 	max_duration = 90
@@ -355,7 +355,7 @@
 ///////////////////////////////////////////////////////////////
 
 /decl/surgery_step/robotics/attach_organ_robotic
-	allowed_procs = list(IS_SCREWDRIVER = 100)
+	allowed_procs = list(TOOL_SCREWDRIVER = 100)
 
 	min_duration = 100
 	max_duration = 120
@@ -405,7 +405,7 @@
 
 /decl/surgery_step/robotics/install_mmi
 	allowed_tools = list(
-	/obj/item/device/mmi = 100
+		/obj/item/device/mmi = 100
 	)
 
 	min_duration = 60
@@ -487,7 +487,7 @@
 
 /decl/surgery_step/robotics/install_nymph
 	allowed_tools = list(
-	/obj/item/weapon/holder/diona = 100
+		/obj/item/weapon/holder/diona = 100
 	)
 
 	min_duration = 60