From d2b43bd5a4bd04040593fc6722cb9f4f8d88b6a8 Mon Sep 17 00:00:00 2001
From: Anewbe <matthwledder@gmail.com>
Date: Sun, 22 May 2016 14:51:35 -0500
Subject: [PATCH] Prevents the Robocalypse

---
 code/game/objects/items/weapons/stunbaton.dm        |  3 +++
 .../mob/living/silicon/robot/drone/drone_items.dm   | 13 ++++++++++++-
 .../mob/living/silicon/robot/robot_modules.dm       |  2 +-
 code/modules/projectiles/guns/energy/stun.dm        |  4 ++--
 4 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/code/game/objects/items/weapons/stunbaton.dm b/code/game/objects/items/weapons/stunbaton.dm
index a4d771aa81..e7f7435ab4 100644
--- a/code/game/objects/items/weapons/stunbaton.dm
+++ b/code/game/objects/items/weapons/stunbaton.dm
@@ -176,6 +176,9 @@
 	..()
 
 //secborg stun baton module
+/obj/item/weapon/melee/baton/robot
+	hitcost = 500
+
 /obj/item/weapon/melee/baton/robot/attack_self(mob/user)
 	//try to find our power cell
 	var/mob/living/silicon/robot/R = loc
diff --git a/code/modules/mob/living/silicon/robot/drone/drone_items.dm b/code/modules/mob/living/silicon/robot/drone/drone_items.dm
index 9fb22d315c..3fd496f179 100644
--- a/code/modules/mob/living/silicon/robot/drone/drone_items.dm
+++ b/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"
diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm
index 927f54ef9d..634cdd81af 100644
--- a/code/modules/mob/living/silicon/robot/robot_modules.dm
+++ b/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)
diff --git a/code/modules/projectiles/guns/energy/stun.dm b/code/modules/projectiles/guns/energy/stun.dm
index e20b43b2fd..20fa18b09e 100644
--- a/code/modules/projectiles/guns/energy/stun.dm
+++ b/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