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

[MIRROR] Replaces ex_act and emp_act numbers with defines
This commit is contained in:
LetterJay
2017-07-13 23:57:35 -05:00
committed by GitHub
38 changed files with 74 additions and 66 deletions
@@ -76,7 +76,7 @@
stored_obj.forceMove(T)
playsound(T,'sound/effects/explosion2.ogg', 200, 1)
new /obj/effect/temp_visual/explosion(T)
user.ex_act(2)
user.ex_act(EXPLODE_HEAVY)
qdel(src)
else
to_chat(user, "<span class='holoparasite'>[src] glows with a strange <font color=\"[spawner.namedatum.colour]\">light</font>, and you don't touch it.</span>")
@@ -176,7 +176,7 @@ Difficulty: Hard
/mob/living/simple_animal/hostile/megafauna/bubblegum/Bump(atom/A)
if(charging)
if(isturf(A) || isobj(A) && A.density)
A.ex_act(2)
A.ex_act(EXPLODE_HEAVY)
DestroySurroundings()
..()
@@ -254,7 +254,7 @@ Difficulty: Very Hard
/obj/item/projectile/colossus/on_hit(atom/target, blocked = FALSE)
. = ..()
if(isturf(target) || isobj(target))
target.ex_act(2)
target.ex_act(EXPLODE_HEAVY)
/obj/item/device/gps/internal/colossus