Merge pull request #5865 from Citadel-Station-13/upstream-merge-36073

[MIRROR] [READY AND TESTED]Projectiles now properly delete themselves if they try to move and their trajectory is at an invalid turf
2018-03-09 04:53:41 -06:00
parent 0db1c5e8b1 6d46c48f3c
commit ad0be11cbc
1 changed files with 3 additions and 0 deletions
@@ -419,6 +419,9 @@
 		transform = M
 	trajectory.increment(trajectory_multiplier)
 	var/turf/T = trajectory.return_turf()
+	if(!istype(T))
+		qdel(src)
+		return
 	if(T.z != loc.z)
 		var/old = loc
 		before_z_change(loc, T)