Rename Bumped to CollidedWith (#2017)

code/game/objects/effects/anomalies.dm

@@ -110,8 +110,8 @@
 /obj/effect/anomaly/grav/Collide(mob/A)
 	gravShock(A)
 
-/obj/effect/anomaly/grav/Bumped(mob/A)
-	gravShock(A)
+/obj/effect/anomaly/grav/CollidedWith(atom/movable/AM)
+	gravShock(AM)
 
 /obj/effect/anomaly/grav/proc/gravShock(mob/living/A)
 	if(boing && isliving(A) && !A.stat)
@@ -146,8 +146,8 @@
 /obj/effect/anomaly/flux/Collide(mob/living/M)
 	mobShock(M)
 
-/obj/effect/anomaly/flux/Bumped(mob/living/M)
-	mobShock(M)
+/obj/effect/anomaly/flux/CollidedWith(atom/movable/AM)
+	mobShock(AM)
 
 /obj/effect/anomaly/flux/proc/mobShock(mob/living/M)
 	if(canshock && istype(M))
@@ -188,9 +188,9 @@
 	for(var/mob/living/M in range(1,src))
 		do_teleport(M, locate(M.x, M.y, M.z), 4)
 
-/obj/effect/anomaly/bluespace/Bumped(atom/A)
-	if(isliving(A))
-		do_teleport(A, locate(A.x, A.y, A.z), 8)
+/obj/effect/anomaly/bluespace/CollidedWith(atom/movable/AM)
+	if(isliving(AM))
+		do_teleport(AM, locate(AM.x, AM.y, AM.z), 8)
 
 /obj/effect/anomaly/bluespace/detonate()
 	var/turf/T = safepick(get_area_turfs(impact_area))

code/game/objects/effects/bump_teleporter.dm

@@ -19,16 +19,12 @@
 	LAZYREMOVE(AllTeleporters, src)
 	return ..()
 
-/obj/effect/bump_teleporter/Bumped(atom/user)
-	if(!ismob(user))
-		//user.loc = src.loc	//Stop at teleporter location
+/obj/effect/bump_teleporter/CollidedWith(atom/movable/AM)
+	if(!ismob(AM))
 		return
-
 	if(!id_target)
-		//user.loc = src.loc	//Stop at teleporter location, there is nowhere to teleport to.
 		return
 
 	for(var/obj/effect/bump_teleporter/BT in AllTeleporters)
 		if(BT.id == src.id_target)
-			usr.loc = BT.loc	//Teleport to location with correct id.
-			return
+			AM.forceMove(BT.loc) //Teleport to location with correct id.