[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
@@ -19,7 +19,7 @@
return 0
.=..()
/obj/effect/particle_effect/water/Bump(atom/A)
/obj/effect/particle_effect/water/Collide(atom/A)
if(reagents)
reagents.reaction(A)
return ..()