Prevents the Robocalypse

code/modules/mob/living/silicon/robot/drone/drone_items.dm

@@ -62,7 +62,8 @@
 		/obj/item/robot_parts,
 		/obj/item/borg/upgrade,
 		/obj/item/device/flash, //to build borgs,
-		/obj/item/weapon/disk,		//Maaaaay be too general,
+		/obj/item/organ/internal/brain, //to insert into MMIs,
+		/obj/item/weapon/disk,
 		/obj/item/weapon/circuitboard,
 		/obj/item/slime_extract,
 		/obj/item/weapon/reagent_containers/glass,
@@ -91,6 +92,16 @@
 		/obj/item/organ
 		)
 
+/obj/item/weapon/gripper/no_use/organ/robotics
+	name = "external organ gripper"
+	icon_state = "gripper-flesh"
+	desc = "A specialized grasping tool used in robotics work."
+
+	can_hold = list(
+		/obj/item/organ/external,
+		/obj/item/organ/internal/cell
+		)
+
 /obj/item/weapon/gripper/no_use/mech
 	name = "exosuit gripper"
 	icon_state = "gripper-mech"

code/modules/mob/living/silicon/robot/robot_modules.dm

@@ -605,7 +605,7 @@ var/global/list/robot_modules = list(
 	src.modules += new /obj/item/device/flash(src)
 	src.modules += new /obj/item/weapon/portable_destructive_analyzer(src)
 	src.modules += new /obj/item/weapon/gripper/research(src)
-	src.modules += new /obj/item/weapon/gripper/no_use/organ(src)
+	src.modules += new /obj/item/weapon/gripper/no_use/organ/robotics(src)
 	src.modules += new /obj/item/weapon/gripper/no_use/mech(src)
 	src.modules += new /obj/item/weapon/gripper/no_use/loader(src)
 	src.modules += new /obj/item/device/robotanalyzer(src)

code/modules/projectiles/guns/energy/stun.dm

@@ -14,8 +14,8 @@
 
 /obj/item/weapon/gun/energy/taser/mounted/cyborg
 	name = "taser gun"
-	max_shots = 12
-	recharge_time = 10 //Time it takes for shots to recharge (in ticks)
+	max_shots = 6
+	recharge_time = 7 //Time it takes for shots to recharge (in ticks)
 
 
 /obj/item/weapon/gun/energy/stunrevolver