Merge pull request #2992 from Fox-McCloud/emp-fix

EMP Fixes

code/modules/media/broadcast/transmitters/broadcast.dm

@@ -88,22 +88,6 @@
 	return screen
 */
 
-
-/obj/machinery/light_switch/power_change()
-	if(powered(LIGHT))
-		stat &= ~NOPOWER
-	else
-		stat |= NOPOWER
-
-	updateicon()
-
-/obj/machinery/light_switch/emp_act(severity)
-	if(stat & (BROKEN|NOPOWER))
-		..(severity)
-		return
-	power_change()
-	..(severity)
-
 /obj/machinery/media/transmitter/broadcast/update_icon()
 	overlays = 0
 	if(stat & (NOPOWER|BROKEN))

code/modules/projectiles/guns/energy/nuclear.dm

@@ -142,7 +142,7 @@
 
 	emp_act(severity)
 		..()
-		reliability -= round(15/severity)
+		reliability = max(reliability - round(15/severity), 0) //Do not allow it to go negative!
 
 
 	update_icon()