July 5th TG sync (#1883)

July 5th TG sync
2017-07-05 22:14:19 -05:00
parent 454b9c3d68
commit b1b4826c0c
1264 changed files with 149689 additions and 570309 deletions
@@ -30,7 +30,7 @@
 /obj/item/weapon/inducer/emp_act(severity)
 	..()
 	if(cell)
-		cell.emp_act()
+		cell.emp_act(severity)

 /obj/item/weapon/inducer/attack_obj(obj/O, mob/living/carbon/user)
 	if(user.a_intent == INTENT_HARM)