Merge pull request #1989 from Citadel-Station-13/upstream-merge-29215

[MIRROR] Replaces ex_act and emp_act numbers with defines
2017-07-13 23:57:35 -05:00
parent 67379f4ec4 55462ed7d1
commit 9d3c4d4702
38 changed files with 74 additions and 66 deletions
@@ -308,7 +308,7 @@
 			if(target && !target.stat)
 				O.throw_at(target, 7, 5)
 		else
-			O.ex_act(2)
+			O.ex_act(EXPLODE_HEAVY)

 /obj/effect/anomaly/bhole/proc/grav(r, ex_act_force, pull_chance, turf_removal_chance)
 	for(var/t = -r, t < r, t++)