Merge remote-tracking branch 'upstream/dev' into NarsiePort

Conflicts:
	code/modules/mob/living/carbon/human/say.dm

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