[MIRROR] Rename Bump to Collide (#2002)

* Rename Bump to Collide

* Delete bubblegum.dm.rej

* Update bubblegum.dm
This commit is contained in:
CitadelStationBot
2017-07-14 23:35:56 -05:00
committed by kevinz000
parent 80d06fe843
commit 2d3905457e
37 changed files with 78 additions and 86 deletions
@@ -585,7 +585,7 @@
/obj/effect/ctf/ammo/Crossed(atom/movable/AM)
reload(AM)
/obj/effect/ctf/ammo/Bump(atom/movable/AM)
/obj/effect/ctf/ammo/Collide(atom/movable/AM)
reload(AM)
/obj/effect/ctf/ammo/Bumped(atom/movable/AM)