Merge pull request #10835 from Ghommie/Ghommie-cit546

Something about runtime errors.
2020-02-02 16:31:15 -07:00
parent 497a691da2 8923810de2
commit c24c83c1bd
4 changed files with 10 additions and 6 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)