Merge pull request #6082 from Citadel-Station-13/upstream-merge-36147

[MIRROR] [READY] ~SPELL CARDS~, homing projectiles, and more!
This commit is contained in:
LetterJay
2018-04-01 01:01:55 -05:00
committed by GitHub
19 changed files with 1456 additions and 1007 deletions
@@ -776,7 +776,6 @@
impact_effect_type = /obj/effect/temp_visual/dir_setting/bloodsplatter
/obj/item/projectile/magic/arcane_barrage/blood/Collide(atom/target)
colliding = TRUE
var/turf/T = get_turf(target)
playsound(T, 'sound/effects/splat.ogg', 50, TRUE)
if(iscultist(target))
@@ -790,7 +789,6 @@
M.adjustHealth(-5)
new /obj/effect/temp_visual/cult/sparks(T)
qdel(src)
colliding = FALSE
else
..()
File diff suppressed because it is too large Load Diff