[MIRROR] Rename Bump to Collide (#2002)

* Rename Bump to Collide * Delete bubblegum.dm.rej * Update bubblegum.dm
2017-07-14 23:35:56 -05:00
parent 80d06fe843
commit 2d3905457e
37 changed files with 78 additions and 86 deletions
@@ -355,7 +355,7 @@
 	if(proxdet)
 		for(var/mob/living/L in range(1, get_turf(src)))
 			if(L.stat != DEAD && L != firer)
-				return Bump(L, TRUE)
+				return Collide(L)
 	..()

 /obj/item/projectile/magic/aoe/lightning