empulse using range
This commit is contained in:
Timothy Teakettle
@@ -646,12 +646,12 @@ Traitors and the like can also be revived with the previous role mostly intact.
|
||||
if(!check_rights(R_ADMIN))
|
||||
return
|
||||
|
||||
var/power = input("Power.", text("Input")) as num|null
|
||||
if(!power)
|
||||
var/range = input("Range.", text("Input")) as num|null
|
||||
if(!range)
|
||||
return
|
||||
log_admin("[key_name(usr)] created an EM Pulse - log below")
|
||||
message_admins("[key_name_admin(usr)] created an EM Pulse at [AREACOORD(O)] with power [power]")
|
||||
empulse(O, power, TRUE) //its details get shown too
|
||||
log_admin("[key_name(usr)] created an EM Pulse - log below") //because we'll just log the empulse itself
|
||||
message_admins("[key_name_admin(usr)] created an EM Pulse at [AREACOORD(O)] with range [range]")
|
||||
empulse_using_range(O, range, TRUE) //its details get shown too
|
||||
|
||||
SSblackbox.record_feedback("tally", "admin_verb", 1, "EM Pulse") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
|
||||
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
|
||||
/datum/blobstrain/reagent/electromagnetic_web/death_reaction(obj/structure/blob/B, damage_flag)
|
||||
if(damage_flag == "melee" || damage_flag == "bullet" || damage_flag == "laser")
|
||||
empulse(B.loc, 75) //less than screen range, so you can stand out of range to avoid it
|
||||
empulse_using_range(B.loc, 5) //less than screen range, so you can stand out of range to avoid it
|
||||
|
||||
/datum/reagent/blob/electromagnetic_web
|
||||
name = "Electromagnetic Web"
|
||||
|
||||
@@ -48,6 +48,6 @@
|
||||
for(var/obj/machinery/light/L in range(5, usr))
|
||||
L.on = 1
|
||||
L.break_light_tube()
|
||||
empulse(get_turf(user), 140, TRUE)
|
||||
empulse_using_range(get_turf(user), 8, TRUE)
|
||||
playsound(get_turf(user), 'sound/effects/lingempscreech.ogg', 75, TRUE, 5, soundenvwet = 0)
|
||||
return TRUE
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
/obj/structure/destructible/clockwork/trap/power_nullifier/activate()
|
||||
if(!activated)
|
||||
activated = TRUE
|
||||
empulse(get_turf(src),7,TRUE)
|
||||
empulse_using_range(get_turf(src),1,TRUE)
|
||||
|
||||
/obj/structure/destructible/clockwork/trap/power_nullifier/emp_act(var/strength=1)
|
||||
activate()
|
||||
|
||||
@@ -165,7 +165,7 @@
|
||||
/datum/action/innate/cult/blood_spell/emp/Activate()
|
||||
owner.visible_message("<span class='warning'>[owner]'s hand flashes a bright blue!</span>", \
|
||||
"<span class='cultitalic'>You speak the cursed words, emitting an EMP blast from your hand.</span>")
|
||||
empulse(owner, 140)
|
||||
empulse_using_range(owner, 8)
|
||||
owner.whisper(invocation, language = /datum/language/common)
|
||||
charges--
|
||||
if(charges<=0)
|
||||
|
||||
@@ -982,7 +982,7 @@ structure_check() searches for nearby cultist structures required for the invoca
|
||||
visible_message("<span class='warning'>A colossal shockwave of energy bursts from the rune, disintegrating it in the process!</span>")
|
||||
for(var/mob/living/L in range(src, 3))
|
||||
L.DefaultCombatKnockdown(30)
|
||||
empulse(T, 16*(intensity))
|
||||
empulse_using_range(T, 0.65*(intensity))
|
||||
var/list/images = list()
|
||||
var/zmatch = T.z
|
||||
var/datum/atom_hud/AH = GLOB.huds[DATA_HUD_SECURITY_ADVANCED]
|
||||
|
||||
@@ -424,7 +424,7 @@
|
||||
range = -1
|
||||
include_user = TRUE
|
||||
charge_max = 300
|
||||
power = 400
|
||||
range = 14
|
||||
sound = 'sound/effects/lingscreech.ogg'
|
||||
|
||||
/obj/effect/proc_holder/spell/aoe_turf/fire_cascade
|
||||
|
||||
@@ -6,5 +6,5 @@
|
||||
if(!ninjacost(250,N_STEALTH_CANCEL))
|
||||
var/mob/living/carbon/human/H = affecting
|
||||
playsound(H.loc, 'sound/effects/empulse.ogg', 60, 2)
|
||||
empulse(H, 200) //Procs sure are nice. Slightly weaker than wizard's disable tch.
|
||||
empulse_using_range(H, 9) //Procs sure are nice. Slightly weaker than wizard's disable tch.
|
||||
s_coold = 2
|
||||
|
||||
@@ -434,7 +434,7 @@
|
||||
|
||||
|
||||
/obj/singularity/proc/emp_area()
|
||||
empulse(src, 250)
|
||||
empulse_using_range(src, 10)
|
||||
return
|
||||
|
||||
/obj/singularity/singularity_act()
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
|
||||
/obj/item/projectile/ion/on_hit(atom/target, blocked = FALSE)
|
||||
..()
|
||||
empulse(target, emp_radius * 7)
|
||||
empulse_using_range(target, emp_radius)
|
||||
return BULLET_ACT_HIT
|
||||
|
||||
/obj/item/projectile/ion/weak
|
||||
|
||||
@@ -296,7 +296,7 @@
|
||||
required_other = TRUE
|
||||
|
||||
/datum/chemical_reaction/slime/slimeoverload/on_reaction(datum/reagents/holder, multiplier)
|
||||
empulse(get_turf(holder.my_atom), 200)
|
||||
empulse_using_range(get_turf(holder.my_atom), 10)
|
||||
..()
|
||||
|
||||
/datum/chemical_reaction/slime/slimecell
|
||||
|
||||
@@ -328,7 +328,7 @@
|
||||
throwSmoke(loc)
|
||||
else if(prob(EFFECT_PROB_MEDIUM-badThingCoeff))
|
||||
visible_message("<span class='warning'>[src] melts [exp_on], ionizing the air around it!</span>")
|
||||
empulse(loc, 150)
|
||||
empulse_using_range(loc, 9)
|
||||
investigate_log("Experimentor has generated an Electromagnetic Pulse.", INVESTIGATE_EXPERIMENTOR)
|
||||
ejectItem(TRUE)
|
||||
////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
@@ -123,7 +123,7 @@
|
||||
rogue_types = list(/datum/nanite_program/toxic)
|
||||
|
||||
/datum/nanite_program/emp/on_trigger(comm_message)
|
||||
empulse(host_mob, 40)
|
||||
empulse_using_range(host_mob, 3)
|
||||
|
||||
/datum/nanite_program/pyro/active_effect()
|
||||
host_mob.fire_stacks += 1
|
||||
|
||||
@@ -258,7 +258,7 @@
|
||||
if(SLIME_ACTIVATE_MAJOR)
|
||||
user.visible_message("<span class='warning'>[user]'s skin starts flashing intermittently...</span>", "<span class='warning'>Your skin starts flashing intermittently...</span>")
|
||||
if(do_after(user, 25, target = user))
|
||||
empulse(user, 40)
|
||||
empulse_using_range(user, 3)
|
||||
user.visible_message("<span class='warning'>[user]'s skin flashes!</span>", "<span class='warning'>Your skin flashes as you emit an electromagnetic pulse!</span>")
|
||||
return 600
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
desc = "This spell emplodes an area."
|
||||
charge_max = 250
|
||||
cooldown_min = 50
|
||||
var/power = 100 //same as a 50/50 reaction of uranium and iron
|
||||
var/range = 4 //same as a 50/50 reaction of uranium and iron
|
||||
|
||||
action_icon_state = "emp"
|
||||
sound = 'sound/weapons/zapbang.ogg'
|
||||
@@ -13,6 +13,6 @@
|
||||
for(var/mob/living/target in targets)
|
||||
if(target.anti_magic_check())
|
||||
continue
|
||||
empulse(target.loc, power)
|
||||
empulse_using_range(target.loc, range)
|
||||
|
||||
return
|
||||
return
|
||||
|
||||
@@ -96,7 +96,7 @@
|
||||
include_user = 1
|
||||
cooldown_min = 200 //50 deciseconds reduction per rank
|
||||
|
||||
power = 400
|
||||
range = 14
|
||||
sound = 'sound/magic/disable_tech.ogg'
|
||||
|
||||
/obj/effect/proc_holder/spell/targeted/turf_teleport/blink
|
||||
|
||||
Reference in New Issue
Block a user