diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm
index d743a13d9bd..bd948459fcf 100644
--- a/code/modules/mob/living/silicon/robot/robot.dm
+++ b/code/modules/mob/living/silicon/robot/robot.dm
@@ -1033,4 +1033,16 @@
 	if(R)
 		R.UnlinkSelf()
 		R << "Buffers flushed and reset. Camera system shutdown.  All systems operational."
-		src.verbs -= /mob/living/silicon/robot/proc/ResetSecurityCodes
\ No newline at end of file
+		src.verbs -= /mob/living/silicon/robot/proc/ResetSecurityCodes
+
+/mob/living/silicon/robot/mode()
+	set name = "Activate Held Object"
+	set category = "IC"
+	set src = usr
+
+	if(module_active)
+
+		var/obj/item/W = module_active
+		if (W)
+			W.attack_self(src)
+	return
\ No newline at end of file
diff --git a/code/modules/mob/mob_movement.dm b/code/modules/mob/mob_movement.dm
index a6c3ebe5877..ad32d6b3cbe 100644
--- a/code/modules/mob/mob_movement.dm
+++ b/code/modules/mob/mob_movement.dm
@@ -143,14 +143,8 @@
 
 /client/verb/attack_self()
 	set hidden = 1
-	if(mob.hand)
-		if(mob.l_hand)
-			mob.l_hand.attack_self(mob)
-			mob.update_inv_l_hand()
-	else
-		if(mob.r_hand)
-			mob.r_hand.attack_self(mob)
-			mob.update_inv_r_hand()
+	if(mob)
+		mob.mode()
 	return