From 28df26b36c00aad389338ad0e78d192f4ed373b3 Mon Sep 17 00:00:00 2001
From: mwerezak <mwerezak@gmail.com>
Date: Mon, 23 Mar 2015 02:34:17 -0400
Subject: [PATCH] Reduces the effect of EMP on robot power cells

Temporary fix to resolve #8454
---
 code/modules/mob/living/silicon/robot/drone/drone.dm | 1 +
 code/modules/mob/living/silicon/robot/robot.dm       | 2 ++
 code/modules/power/cell.dm                           | 5 +++++
 3 files changed, 8 insertions(+)

diff --git a/code/modules/mob/living/silicon/robot/drone/drone.dm b/code/modules/mob/living/silicon/robot/drone/drone.dm
index 9d2af7af56..0fcdc10875 100644
--- a/code/modules/mob/living/silicon/robot/drone/drone.dm
+++ b/code/modules/mob/living/silicon/robot/drone/drone.dm
@@ -5,6 +5,7 @@
 	icon_state = "repairbot"
 	maxHealth = 35
 	health = 35
+	cell_emp_mult = 1
 	universal_speak = 0
 	universal_understand = 1
 	gender = NEUTER
diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm
index 3647352aab..fd324f2c6e 100644
--- a/code/modules/mob/living/silicon/robot/robot.dm
+++ b/code/modules/mob/living/silicon/robot/robot.dm
@@ -50,6 +50,8 @@ var/list/robot_verbs_default = list(
 	var/obj/item/weapon/cell/cell = null
 	var/obj/machinery/camera/camera = null
 
+	var/cell_emp_mult = 2
+
 	// Components are basically robot organs.
 	var/list/components = list()
 
diff --git a/code/modules/power/cell.dm b/code/modules/power/cell.dm
index 69f0b92a48..b919658bba 100644
--- a/code/modules/power/cell.dm
+++ b/code/modules/power/cell.dm
@@ -128,6 +128,11 @@
 		rigged = 1 //broken batterys are dangerous
 
 /obj/item/weapon/cell/emp_act(severity)
+	//remove this once emp changes on dev are merged in
+	if(isrobot(loc))
+        var/mob/living/silicon/robot/R = loc
+        severity *= R.cell_emp_mult
+
 	charge -= maxcharge / severity
 	if (charge < 0)
 		charge = 0