[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 21:35:56 -07:00
committed by kevinz000
parent 80d06fe843
commit 2d3905457e
37 changed files with 78 additions and 86 deletions
+2 -2
View File
@@ -107,7 +107,7 @@
/obj/effect/anomaly/grav/Crossed(mob/A)
gravShock(A)
/obj/effect/anomaly/grav/Bump(mob/A)
/obj/effect/anomaly/grav/Collide(mob/A)
gravShock(A)
/obj/effect/anomaly/grav/Bumped(mob/A)
@@ -143,7 +143,7 @@
/obj/effect/anomaly/flux/Crossed(mob/living/M)
mobShock(M)
/obj/effect/anomaly/flux/Bump(mob/living/M)
/obj/effect/anomaly/flux/Collide(mob/living/M)
mobShock(M)
/obj/effect/anomaly/flux/Bumped(mob/living/M)