[MIRROR] Rename Bump to Collide (#2002)

* Rename Bump to Collide

* Delete bubblegum.dm.rej

* Update bubblegum.dm

code/modules/power/singularity/narsie.dm

@@ -114,7 +114,7 @@
 	return clashing
 
 
-/obj/singularity/narsie/Bump(atom/A)
+/obj/singularity/narsie/Collide(atom/A)
 	var/turf/T = get_turf(A)
 	if(T == loc)
 		T = get_step(A, A.dir) //please don't slam into a window like a bird, nar-sie

code/modules/power/singularity/particle_accelerator/particle.dm

@@ -28,7 +28,7 @@
 	addtimer(CALLBACK(src, .proc/move), 1)
 
 
-/obj/effect/accelerated_particle/Bump(atom/A)
+/obj/effect/accelerated_particle/Collide(atom/A)
 	if(A)
 		if(isliving(A))
 			toxmob(A)

code/modules/power/singularity/singularity.dm

@@ -102,7 +102,7 @@
 	return 0 //Will there be an impact? Who knows.  Will we see it? No.
 
 
-/obj/singularity/Bump(atom/A)
+/obj/singularity/Collide(atom/A)
 	consume(A)
 	return
 

code/modules/power/tesla/energy_ball.dm

@@ -138,7 +138,7 @@ GLOBAL_LIST_INIT(blacklisted_tesla_types, typecacheof(list(/obj/machinery/atmosp
 	EB.orbit(src, orbitsize, pick(FALSE, TRUE), rand(10, 25), pick(3, 4, 5, 6, 36))
 
 
-/obj/singularity/energy_ball/Bump(atom/A)
+/obj/singularity/energy_ball/Collide(atom/A)
 	dust_mobs(A)
 
 /obj/singularity/energy_ball/Bumped(atom/A)