cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-22 04:22:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into development

Browse Source
This commit is contained in:
skull132
2016-07-10 14:25:54 -04:00
parent bcf840e02f 8dfb08dab1
commit 443a49a49b
42 changed files with 335 additions and 253 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/power/singularity/emitter.dm
+5 -16
View File
@@ -129,27 +129,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 )
playsound(src.loc, 'sound/weapons/emitter.ogg', 25, 1)
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)
@@ -235,4 +224,4 @@
return
..()
return
return