Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229

2020-02-04 03:54:52 +01:00
parent 55fa48737e 0c57a78851
commit a726f09201
631 changed files with 38158 additions and 6475 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)