Merge pull request #8469 from mwerezak/robot-emp

Reduces the effect of EMP on robot power cells, some other things
This commit is contained in:
Zuhayr
2015-03-26 19:00:39 +10:30
10 changed files with 23 additions and 16 deletions
+5
View File
@@ -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