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
+1 -1
View File
@@ -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++)
+4 -4
View File
@@ -20,12 +20,12 @@
if(distance < 0)
distance = 0
if(distance < heavy_range)
T.emp_act(1)
T.emp_act(EMP_HEAVY)
else if(distance == heavy_range)
if(prob(50))
T.emp_act(1)
T.emp_act(EMP_HEAVY)
else
T.emp_act(2)
T.emp_act(EMP_LIGHT)
else if(distance <= light_range)
T.emp_act(2)
T.emp_act(EMP_LIGHT)
return 1
@@ -218,7 +218,7 @@
var/list/cameras = flatten_list(bugged_cameras)
var/obj/machinery/camera/C = locate(href_list["emp"]) in cameras
if(C && istype(C) && C.bug == src)
C.emp_act(1)
C.emp_act(EMP_HEAVY)
C.bug = null
bugged_cameras -= C.c_tag
interact()
@@ -20,10 +20,10 @@
qdel(src)
if(2)
if(prob(50))
ex_act(1)
ex_act(EXPLODE_DEVASTATE)
if(3)
if(prob(25))
ex_act(1)
ex_act(EXPLODE_DEVASTATE)
/obj/item/device/doorCharge/Destroy()
if(istype(loc, /obj/machinery/door/airlock))
@@ -381,7 +381,7 @@
else
A.visible_message("<span class='danger'>[user] blinks \the [src] at \the [A].")
to_chat(user, "\The [src] now has [emp_cur_charges] charge\s.")
A.emp_act(1)
A.emp_act(EMP_HEAVY)
else
to_chat(user, "<span class='warning'>\The [src] needs time to recharge!</span>")
return
@@ -119,7 +119,7 @@
else if(istype(target, /obj/machinery/camera))
var/obj/machinery/camera/C = target
if(prob(effectchance * diode.rating))
C.emp_act(1)
C.emp_act(EMP_HEAVY)
outmsg = "<span class='notice'>You hit the lens of [C] with [src], temporarily disabling the camera!</span>"
add_logs(user, C, "EMPed", src)
else
+1 -1
View File
@@ -495,7 +495,7 @@
if(homerun_ready)
user.visible_message("<span class='userdanger'>It's a home run!</span>")
target.throw_at(throw_target, rand(8,10), 14, user)
target.ex_act(2)
target.ex_act(EXPLODE_HEAVY)
playsound(get_turf(src), 'sound/weapons/homerun.ogg', 100, 1)
homerun_ready = 0
return
+1 -1
View File
@@ -142,7 +142,7 @@
return take_damage(M.force*3, mech_damtype, "melee", play_soundeffect, get_dir(src, M)) // multiplied by 3 so we can hit objs hard but not be overpowered against mobs.
/obj/singularity_act()
ex_act(1)
ex_act(EXPLODE_DEVASTATE)
if(src && !QDELETED(src))
qdel(src)
return 2