Replaces ex_act and emp_act numbers with defines

This commit is contained in:
CitadelStationBot
2017-07-13 17:46:41 -05:00
parent da324257fe
commit 55462ed7d1
38 changed files with 74 additions and 66 deletions
+3 -3
View File
@@ -1210,7 +1210,7 @@
playsound(get_turf(src), I.usesound, 50, 1)
if(!do_after(user, 150*I.toolspeed, target = src))
to_chat(user, "<span class='warning'>You slip and [charge] detonates!</span>")
charge.ex_act(1)
charge.ex_act(EXPLODE_DEVASTATE)
user.Knockdown(60)
return
user.visible_message("<span class='notice'>[user] removes [charge] from [src].</span>", \
@@ -1295,7 +1295,7 @@
update_icon(AIRLOCK_OPENING)
visible_message("<span class='warning'>[src]'s panel is blown off in a spray of deadly shrapnel!</span>")
charge.loc = get_turf(src)
charge.ex_act(1)
charge.ex_act(EXPLODE_DEVASTATE)
detonated = 1
charge = null
for(var/mob/living/carbon/human/H in orange(2,src))
@@ -1361,7 +1361,7 @@
var/obj/structure/window/killthis = (locate(/obj/structure/window) in get_turf(src))
if(killthis)
killthis.ex_act(2)//Smashin windows
killthis.ex_act(EXPLODE_HEAVY)//Smashin windows
if(density)
return TRUE
+2 -2
View File
@@ -491,9 +491,9 @@ Class Procs:
if(prob(85) && explosive)
explosion(src.loc,1,2,4,flame_range = 2, adminlog = 0, smoke = 0)
else if(prob(50))
emp_act(2)
emp_act(EMP_LIGHT)
else
ex_act(2)
ex_act(EXPLODE_HEAVY)
/obj/machinery/Exited(atom/movable/AM, atom/newloc)
. = ..()