Merge pull request #10125 from Ghommie/Ghommie-cit449

Ports a few projectile code updates by ke:b:inz.
2020-01-17 15:15:08 -07:00
parent 32c496f70e 02fbbd4f95
commit aea0de30d1
81 changed files with 304 additions and 235 deletions
@@ -569,4 +569,4 @@

 /obj/item/projectile/beam/beam_rifle/hitscan/aiming_beam/on_hit()
 	qdel(src)
-	return FALSE
+	return BULLET_ACT_HIT
@@ -114,7 +114,7 @@
 	icon_state = "blastwave"
 	damage = 0
 	nodamage = FALSE
-	forcedodge = TRUE
+	movement_type = FLYING | UNSTOPPABLE
 	var/heavyr = 0
 	var/mediumr = 0
 	var/lightr = 0