[MIRROR] Rename Bump to Collide (#2002)

* Rename Bump to Collide

* Delete bubblegum.dm.rej

* Update bubblegum.dm

code/modules/vehicles/scooter.dm

@@ -48,7 +48,7 @@
 		density = FALSE
 	..()
 
-/obj/vehicle/scooter/skateboard/Bump(atom/A)
+/obj/vehicle/scooter/skateboard/Collide(atom/A)
 	..()
 	if(A.density && has_buckled_mobs())
 		var/mob/living/carbon/H = buckled_mobs[1]

code/modules/vehicles/speedbike.dm

@@ -38,7 +38,7 @@
 	pixel_y = -48 //to fix the offset when Initialized()
 	pixel_x = -48
 
-/obj/vehicle/space/speedbike/speedwagon/Bump(atom/movable/A)
+/obj/vehicle/space/speedbike/speedwagon/Collide(atom/movable/A)
 	. = ..()
 	if(A.density && has_buckled_mobs())
 		var/atom/throw_target = get_edge_target_turf(A, src.dir)
@@ -65,4 +65,4 @@
 	if(src.has_buckled_mobs())
 		for(var/atom/A in range(2, src))
 			if(!(A in src.buckled_mobs))
-				Bump(A)
+				Collide(A)

code/modules/vehicles/vehicle.dm

@@ -63,7 +63,7 @@
 		riding_datum.handle_vehicle_offsets()
 
 
-/obj/vehicle/Bump(atom/movable/M)
+/obj/vehicle/Collide(atom/movable/M)
 	. = ..()
 	if(auto_door_open)
 		if(istype(M, /obj/machinery/door) && has_buckled_mobs())