Merge remote-tracking branch 'citadel/master' into mobility_flags

2020-02-04 16:01:25 -07:00
parent 611fd7ea89 66638a39b7
commit 6a8a606f97
1118 changed files with 49543 additions and 11522 deletions
@@ -59,7 +59,12 @@

 /obj/effect/accelerated_particle/proc/move()
 	if(!step(src,dir))
-		forceMove(get_step(src,dir))
+		var/turf/T = get_step(src,dir)
+		if(T)
+			forceMove(T)
+		else
+			qdel(src)
+			return
 	movement_range--
 	if(movement_range == 0)
 		qdel(src)