Merge pull request #7387 from Citadel-Station-13/wormhole_update

wormhole guns now pass through mobs without doing anything but gain hitscan
This commit is contained in:
deathride58
2018-07-28 09:17:00 -04:00
committed by GitHub
10 changed files with 38 additions and 12 deletions
+2 -1
View File
@@ -597,8 +597,9 @@
if(!length(beam_segments))
return
if(tracer_type)
var/tempref = REF(src)
for(var/datum/point/p in beam_segments)
generate_tracer_between_points(p, beam_segments[p], tracer_type, color, duration, hitscan_light_range, hitscan_light_color_override, hitscan_light_intensity)
generate_tracer_between_points(p, beam_segments[p], tracer_type, color, duration, hitscan_light_range, hitscan_light_color_override, hitscan_light_intensity, tempref)
if(muzzle_type && duration > 0)
var/datum/point/p = beam_segments[1]
var/atom/movable/thing = new muzzle_type
@@ -2,9 +2,15 @@
name = "bluespace beam"
icon_state = "spark"
hitsound = "sparks"
damage = 3
damage = 0
nodamage = TRUE
hitscan = TRUE
pass_flags = PASSGLASS | PASSTABLE | PASSGRILLE | PASSMOB
var/obj/item/gun/energy/wormhole_projector/gun
color = "#33CCFF"
tracer_type = /obj/effect/projectile/tracer/wormhole
impact_type = /obj/effect/projectile/impact/wormhole
muzzle_type = /obj/effect/projectile/muzzle/wormhole
/obj/item/projectile/beam/wormhole/orange
name = "orange bluespace beam"
@@ -16,10 +22,6 @@
gun = casing.gun
/obj/item/projectile/beam/wormhole/on_hit(atom/target)
if(ismob(target))
var/turf/portal_destination = pick(orange(6, src))
do_teleport(target, portal_destination)
return ..()
if(!gun)
qdel(src)
gun.create_portal(src, get_turf(src))