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.

code/game/objects/items/weapons/melee/misc.dm

@@ -256,13 +256,13 @@
 /obj/item/weapon/melee/supermatter_sword/suicide_act(mob/user)
 	user.visible_message("<span class='suicide'>[user] touches [src]'s blade. It looks like [user.p_theyre()] tired of waiting for the radiation to kill [user.p_them()]!</span>")
 	user.drop_item()
-	shard.Bumped(user)
+	shard.CollidedWith(user)
 
 /obj/item/weapon/melee/supermatter_sword/proc/consume_everything(target)
 	if(isnull(target))
 		shard.Consume()
 	else if(!isturf(target))
-		shard.Bumped(target)
+		shard.CollidedWith(target)
 	else
 		consume_turf(target)
 

code/game/objects/structures/grille.dm

@@ -49,17 +49,11 @@
 		new /obj/structure/grille/ratvar(src.loc)
 	qdel(src)
 
-/obj/structure/grille/Bumped(atom/user)
-	if(ismob(user))
-		var/tile_density = FALSE
-		for(var/atom/movable/AM in get_turf(src))
-			if(AM == src)
-				continue
-			if(AM.density && AM.layer >= layer)
-				tile_density = TRUE
-				break
-		if(!tile_density)
-			shock(user, 70)
+/obj/structure/grille/CollidedWith(atom/movable/AM)
+	if(!ismob(AM))
+		return
+	var/mob/M = AM
+	shock(M, 70)
 
 
 /obj/structure/grille/attack_paw(mob/user)

code/game/objects/structures/holosign.dm

@@ -115,10 +115,14 @@
 			shockcd = TRUE
 			addtimer(CALLBACK(src, .proc/cooldown), 5)
 
-/obj/structure/holosign/barrier/cyborg/hacked/Bumped(atom/user)
-	if(!shockcd)
-		if(ismob(user))
-			var/mob/living/M = user
-			M.electrocute_act(15,"Energy Barrier", safety=1)
-			shockcd = TRUE
-			addtimer(CALLBACK(src, .proc/cooldown), 5)
+/obj/structure/holosign/barrier/cyborg/hacked/CollidedWith(atom/movable/AM)
+	if(shockcd)
+		return
+
+	if(!ismob(AM))
+		return
+
+	var/mob/living/M = AM
+	M.electrocute_act(15,"Energy Barrier", safety=1)
+	shockcd = TRUE
+	addtimer(CALLBACK(src, .proc/cooldown), 5)

code/game/objects/structures/mineral_doors.dm

@@ -37,10 +37,10 @@
 	..()
 	move_update_air(T)
 
-/obj/structure/mineral_door/Bumped(atom/user)
+/obj/structure/mineral_door/CollidedWith(atom/movable/AM)
 	..()
 	if(!state)
-		return TryToSwitchState(user)
+		return TryToSwitchState(AM)
 
 /obj/structure/mineral_door/attack_ai(mob/user) //those aren't machinery, they're just big fucking slabs of a mineral
 	if(isAI(user)) //so the AI can't open it

code/game/objects/structures/statues.dm

@@ -115,7 +115,7 @@
 	radiate()
 	return ..()
 
-/obj/structure/statue/uranium/Bumped(atom/user)
+/obj/structure/statue/uranium/CollidedWith(atom/movable/AM)
 	radiate()
 	..()
 
@@ -273,7 +273,7 @@
 	name = "statue of a clown"
 	icon_state = "clown"
 
-/obj/structure/statue/bananium/Bumped(atom/user)
+/obj/structure/statue/bananium/CollidedWith(atom/movable/AM)
 	honk()
 	..()
 

code/game/objects/structures/transit_tubes/station.dm

@@ -32,7 +32,7 @@
 /obj/structure/transit_tube/station/should_stop_pod(pod, from_dir)
 	return 1
 
-/obj/structure/transit_tube/station/Bumped(atom/movable/AM)
+/obj/structure/transit_tube/station/CollidedWith(atom/movable/AM)
 	if(!pod_moving && open_status == STATION_TUBE_OPEN && ismob(AM) && AM.dir == boarding_dir)
 		for(var/obj/structure/transit_tube_pod/pod in loc)
 			if(!pod.moving)
@@ -71,7 +71,7 @@
 						if(do_after(user, 15, target = src))
 							if(open_status == STATION_TUBE_OPEN && GM && user.grab_state >= GRAB_AGGRESSIVE && user.pulling == GM && !GM.buckled && !GM.has_buckled_mobs())
 								GM.Knockdown(100)
-								src.Bumped(GM)
+								src.CollidedWith(GM)
 						break
 		else
 			for(var/obj/structure/transit_tube_pod/pod in loc)