shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Upstream mirror

Browse Source
This commit is contained in:
kevinz000
2018-07-14 15:24:35 -07:00
parent d62cb31e9b
commit bcb1b04c40
5 changed files with 109 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/projectiles/guns/misc/beam_rifle.dm
+5 -2
View File
@@ -564,10 +564,10 @@
if(highlander && istype(gun))
QDEL_LIST(gun.current_tracers)
for(var/datum/point/p in beam_segments)
gun.current_tracers += generate_tracer_between_points(p, beam_segments[p], tracer_type, color, 0)
gun.current_tracers += generate_tracer_between_points(p, beam_segments[p], tracer_type, color, 0, hitscan_light_range, hitscan_light_color_override, hitscan_light_intensity)
else
for(var/datum/point/p in beam_segments)
generate_tracer_between_points(p, beam_segments[p], tracer_type, color, duration)
generate_tracer_between_points(p, beam_segments[p], tracer_type, color, duration, hitscan_light_range, hitscan_light_color_override, hitscan_light_intensity)
if(cleanup)
QDEL_LIST(beam_segments)
beam_segments = null
@@ -581,6 +581,9 @@
nodamage = TRUE
damage = 0
constant_tracer = TRUE
hitscan_light_range = 0
hitscan_light_intensity = 0
hitscan_light_color_override = "#99ff99"
/obj/item/projectile/beam/beam_rifle/hitscan/aiming_beam/prehit(atom/target)
qdel(src)