Merge pull request #13375 from timothyteakettle/emp-rework

the emp rework (emp severity reduces as you move from epicentre, severity is 1-100)
2020-10-01 03:01:18 -07:00
parent 0505d65da7 a54314193e
commit 8b36cf6f64
95 changed files with 166 additions and 295 deletions
@@ -1449,7 +1449,7 @@
 	environ = 0
 	update_icon()
 	update()
-	addtimer(CALLBACK(src, .proc/reset, APC_RESET_EMP), 600)
+	addtimer(CALLBACK(src, .proc/reset, APC_RESET_EMP), severity*8)

 /obj/machinery/power/apc/blob_act(obj/structure/blob/B)
 	set_broken()