From 1de511b545c5e2550bef3a83b01c748a8cb2ab40 Mon Sep 17 00:00:00 2001 From: Cael Aislinn Date: Mon, 31 Aug 2015 16:41:43 +1000 Subject: [PATCH] fixes emitter runtime by using new calling syntax Signed-off-by: Cael Aislinn --- code/modules/power/singularity/emitter.dm | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/code/modules/power/singularity/emitter.dm b/code/modules/power/singularity/emitter.dm index ceb41d4588..51093296b2 100644 --- a/code/modules/power/singularity/emitter.dm +++ b/code/modules/power/singularity/emitter.dm @@ -126,27 +126,16 @@ //need to calculate the power per shot as the emitter doesn't fire continuously. var/burst_time = (min_burst_delay + max_burst_delay)/2 + 2*(burst_shots-1) var/power_per_shot = active_power_usage * (burst_time/10) / burst_shots - var/obj/item/projectile/beam/emitter/A = new /obj/item/projectile/beam/emitter( src.loc ) - A.damage = round(power_per_shot/EMITTER_DAMAGE_POWER_TRANSFER) playsound(src.loc, 'sound/weapons/emitter.ogg', 25, 1) if(prob(35)) var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread s.set_up(5, 1, src) s.start() - A.set_dir(src.dir) - A.starting = get_turf(src) - switch(dir) - if(NORTH) - A.original = locate(x, y+1, z) - if(EAST) - A.original = locate(x+1, y, z) - if(WEST) - A.original = locate(x-1, y, z) - else // Any other - A.original = locate(x, y-1, z) - A.process() + var/obj/item/projectile/beam/emitter/A = new /obj/item/projectile/beam/emitter( src.loc ) + A.damage = round(power_per_shot/EMITTER_DAMAGE_POWER_TRANSFER) + A.launch( get_step(src.loc, src.dir) ) /obj/machinery/power/emitter/attackby(obj/item/W, mob/user) @@ -225,7 +214,7 @@ return ..() return - + /obj/machinery/power/emitter/emag_act(var/remaining_charges, var/mob/user) if(!emagged) locked = 0