diff --git a/code/game/atoms.dm b/code/game/atoms.dm
index 148a18108a..94cd260407 100644
--- a/code/game/atoms.dm
+++ b/code/game/atoms.dm
@@ -179,7 +179,7 @@
return
-/atom/proc/Bumped(AM as mob|obj)
+/atom/proc/CollidedWith(atom/movable/AM)
return
// Convenience proc to see if a container is open for chemistry handling
diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm
index 7e9436d546..dd778b453e 100644
--- a/code/game/atoms_movable.dm
+++ b/code/game/atoms_movable.dm
@@ -228,7 +228,7 @@
. = 1
if(!A || QDELETED(A))
return
- A.Bumped(src)
+ A.CollidedWith(src)
/atom/movable/proc/forceMove(atom/destination)
if(destination)
diff --git a/code/game/gamemodes/clock_cult/clock_effects/spatial_gateway.dm b/code/game/gamemodes/clock_cult/clock_effects/spatial_gateway.dm
index 74d360efd1..72ed326b26 100644
--- a/code/game/gamemodes/clock_cult/clock_effects/spatial_gateway.dm
+++ b/code/game/gamemodes/clock_cult/clock_effects/spatial_gateway.dm
@@ -109,10 +109,10 @@
return TRUE
return FALSE
-/obj/effect/clockwork/spatial_gateway/Bumped(atom/A)
+/obj/effect/clockwork/spatial_gateway/CollidedWith(atom/movable/AM)
..()
- if(A && !QDELETED(A))
- pass_through_gateway(A)
+ if(!QDELETED(AM))
+ pass_through_gateway(AM, FALSE)
/obj/effect/clockwork/spatial_gateway/proc/pass_through_gateway(atom/movable/A, no_cost)
if(!linked_gateway)
diff --git a/code/game/gamemodes/clock_cult/clock_structures/taunting_trail.dm b/code/game/gamemodes/clock_cult/clock_structures/taunting_trail.dm
index fdf7f882e4..9d4667ee9f 100644
--- a/code/game/gamemodes/clock_cult/clock_structures/taunting_trail.dm
+++ b/code/game/gamemodes/clock_cult/clock_structures/taunting_trail.dm
@@ -43,7 +43,7 @@
affect_mob(AM)
return ..()
-/obj/structure/destructible/clockwork/taunting_trail/Bumped(atom/movable/AM)
+/obj/structure/destructible/clockwork/taunting_trail/CollidedWith(atom/movable/AM)
affect_mob(AM)
return ..()
diff --git a/code/game/machinery/doors/door.dm b/code/game/machinery/doors/door.dm
index 471da1ba0a..72c9a64771 100644
--- a/code/game/machinery/doors/door.dm
+++ b/code/game/machinery/doors/door.dm
@@ -62,7 +62,7 @@
//process()
//return
-/obj/machinery/door/Bumped(atom/AM)
+/obj/machinery/door/CollidedWith(atom/movable/AM)
if(operating || emagged)
return
if(ismob(AM))
diff --git a/code/game/machinery/doors/firedoor.dm b/code/game/machinery/doors/firedoor.dm
index 90cb9c8942..9a57593b3f 100644
--- a/code/game/machinery/doors/firedoor.dm
+++ b/code/game/machinery/doors/firedoor.dm
@@ -67,7 +67,7 @@
affecting_areas.Cut()
return ..()
-/obj/machinery/door/firedoor/Bumped(atom/AM)
+/obj/machinery/door/firedoor/CollidedWith(atom/movable/AM)
if(panel_open || operating)
return
if(!density)
diff --git a/code/game/machinery/doors/poddoor.dm b/code/game/machinery/doors/poddoor.dm
index 1d0004f390..fd66892048 100644
--- a/code/game/machinery/doors/poddoor.dm
+++ b/code/game/machinery/doors/poddoor.dm
@@ -33,7 +33,7 @@
else
INVOKE_ASYNC(src, .proc/close)
-/obj/machinery/door/poddoor/Bumped(atom/AM)
+/obj/machinery/door/poddoor/CollidedWith(atom/movable/AM)
if(density)
return 0
else
diff --git a/code/game/machinery/doors/unpowered.dm b/code/game/machinery/doors/unpowered.dm
index 63ba0601aa..4b7ec4b3dd 100644
--- a/code/game/machinery/doors/unpowered.dm
+++ b/code/game/machinery/doors/unpowered.dm
@@ -1,6 +1,6 @@
/obj/machinery/door/unpowered
-/obj/machinery/door/unpowered/Bumped(atom/AM)
+/obj/machinery/door/unpowered/CollidedWith(atom/movable/AM)
if(src.locked)
return
..()
diff --git a/code/game/machinery/doors/windowdoor.dm b/code/game/machinery/doors/windowdoor.dm
index 93fbd54e85..ef27815d99 100644
--- a/code/game/machinery/doors/windowdoor.dm
+++ b/code/game/machinery/doors/windowdoor.dm
@@ -58,7 +58,7 @@
sleep(20)
close()
-/obj/machinery/door/window/Bumped(atom/movable/AM as mob|obj)
+/obj/machinery/door/window/CollidedWith(atom/movable/AM)
if( operating || !src.density )
return
if (!( ismob(AM) ))
diff --git a/code/game/machinery/recycler.dm b/code/game/machinery/recycler.dm
index 09061005c0..6e04988be1 100644
--- a/code/game/machinery/recycler.dm
+++ b/code/game/machinery/recycler.dm
@@ -88,7 +88,7 @@
is_powered = FALSE
icon_state = icon_name + "[is_powered]" + "[(blood ? "bld" : "")]" // add the blood tag at the end
-/obj/machinery/recycler/Bumped(atom/movable/AM)
+/obj/machinery/recycler/CollidedWith(atom/movable/AM)
if(stat & (BROKEN|NOPOWER))
return
diff --git a/code/game/machinery/teleporter.dm b/code/game/machinery/teleporter.dm
index e50843c49f..b737b7e77e 100644
--- a/code/game/machinery/teleporter.dm
+++ b/code/game/machinery/teleporter.dm
@@ -272,11 +272,11 @@
break
return power_station
-/obj/machinery/teleport/hub/Bumped(M as mob|obj)
+/obj/machinery/teleport/hub/CollidedWith(atom/movable/AM)
if(z == ZLEVEL_CENTCOM)
- to_chat(M, "You can't use this here.")
+ to_chat(AM, "You can't use this here.")
if(is_ready())
- teleport(M)
+ teleport(AM)
use_power(5000)
return
diff --git a/code/game/machinery/transformer.dm b/code/game/machinery/transformer.dm
index 3263af9e56..3215727740 100644
--- a/code/game/machinery/transformer.dm
+++ b/code/game/machinery/transformer.dm
@@ -49,7 +49,7 @@
else
icon_state = initial(icon_state)
-/obj/machinery/transformer/Bumped(atom/movable/AM)
+/obj/machinery/transformer/CollidedWith(atom/movable/AM)
if(cooldown == 1)
return
diff --git a/code/game/objects/effects/anomalies.dm b/code/game/objects/effects/anomalies.dm
index 3a0882ef1d..2bf3b525ac 100644
--- a/code/game/objects/effects/anomalies.dm
+++ b/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))
diff --git a/code/game/objects/effects/bump_teleporter.dm b/code/game/objects/effects/bump_teleporter.dm
index 308419d6ea..5ba643e943 100644
--- a/code/game/objects/effects/bump_teleporter.dm
+++ b/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
\ No newline at end of file
+ AM.forceMove(BT.loc) //Teleport to location with correct id.
diff --git a/code/game/objects/items/weapons/melee/misc.dm b/code/game/objects/items/weapons/melee/misc.dm
index e10d04611a..2bee842813 100644
--- a/code/game/objects/items/weapons/melee/misc.dm
+++ b/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("[user] touches [src]'s blade. It looks like [user.p_theyre()] tired of waiting for the radiation to kill [user.p_them()]!")
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)
diff --git a/code/game/objects/structures/grille.dm b/code/game/objects/structures/grille.dm
index e50fe4bc28..5f33ea0566 100644
--- a/code/game/objects/structures/grille.dm
+++ b/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)
diff --git a/code/game/objects/structures/holosign.dm b/code/game/objects/structures/holosign.dm
index 080356bff0..673f16c114 100644
--- a/code/game/objects/structures/holosign.dm
+++ b/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)
diff --git a/code/game/objects/structures/mineral_doors.dm b/code/game/objects/structures/mineral_doors.dm
index 97e1430979..8d938c536c 100644
--- a/code/game/objects/structures/mineral_doors.dm
+++ b/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
diff --git a/code/game/objects/structures/statues.dm b/code/game/objects/structures/statues.dm
index d6017a0f86..884853b6d8 100644
--- a/code/game/objects/structures/statues.dm
+++ b/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()
..()
diff --git a/code/game/objects/structures/transit_tubes/station.dm b/code/game/objects/structures/transit_tubes/station.dm
index f96fc04482..fcb317528c 100644
--- a/code/game/objects/structures/transit_tubes/station.dm
+++ b/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)
diff --git a/code/game/turfs/simulated/minerals.dm b/code/game/turfs/simulated/minerals.dm
index 6c09c5586f..852e3e1cee 100644
--- a/code/game/turfs/simulated/minerals.dm
+++ b/code/game/turfs/simulated/minerals.dm
@@ -98,7 +98,7 @@
to_chat(M, "You tunnel into the rock.")
gets_drilled(M)
-/turf/closed/mineral/Bumped(AM as mob|obj)
+/turf/closed/mineral/CollidedWith(atom/movable/AM)
..()
if(ishuman(AM))
var/mob/living/carbon/human/H = AM
diff --git a/code/game/turfs/simulated/wall/mineral_walls.dm b/code/game/turfs/simulated/wall/mineral_walls.dm
index 2cfb32f6dc..a122131942 100644
--- a/code/game/turfs/simulated/wall/mineral_walls.dm
+++ b/code/game/turfs/simulated/wall/mineral_walls.dm
@@ -86,7 +86,7 @@
radiate()
..()
-/turf/closed/wall/mineral/uranium/Bumped(AM as mob|obj)
+/turf/closed/wall/mineral/uranium/CollidedWith(atom/movable/AM)
radiate()
..()
diff --git a/code/modules/admin/fun_balloon.dm b/code/modules/admin/fun_balloon.dm
index bd8a245533..44b9e29581 100644
--- a/code/modules/admin/fun_balloon.dm
+++ b/code/modules/admin/fun_balloon.dm
@@ -120,29 +120,29 @@
var/list/warp_points = list()
-/obj/effect/forcefield/arena_shuttle/Bumped(mob/M as mob|obj)
+/obj/effect/forcefield/arena_shuttle/CollidedWith(atom/movable/AM)
+ if(!isliving(AM))
+ return
if(!warp_points.len)
warp_points = get_area_turfs(/area/shuttle/escape)
for(var/turf/T in warp_points)
- for(var/atom/movable/AM in T)
- if(AM.density && AM.anchored)
+ for(var/atom/movable/TAM in T)
+ if(TAM.density && TAM.anchored)
warp_points -= T
break
- if(!isliving(M))
- return
+
+ var/mob/living/L = AM
+ if(L.pulling && istype(L.pulling, /obj/item/bodypart/head))
+ to_chat(L, "Your offering is accepted. You may pass.")
+ qdel(L.pulling)
+ var/turf/LA = pick(warp_points)
+ L.forceMove(LA)
+ L.hallucination = 0
+ to_chat(L, "The battle is won. Your bloodlust subsides.")
+ for(var/obj/item/weapon/twohanded/required/chainsaw/doomslayer/chainsaw in L)
+ qdel(chainsaw)
else
- var/mob/living/L = M
- if(L.pulling && istype(L.pulling, /obj/item/bodypart/head))
- to_chat(L, "Your offering is accepted. You may pass.")
- qdel(L.pulling)
- var/turf/LA = pick(warp_points)
- L.forceMove(LA)
- L.hallucination = 0
- to_chat(L, "The battle is won. Your bloodlust subsides.")
- for(var/obj/item/weapon/twohanded/required/chainsaw/doomslayer/chainsaw in L)
- qdel(chainsaw)
- else
- to_chat(L, "You are not yet worthy of passing. Drag a severed head to the barrier to be allowed entry to the hall of champions.")
+ to_chat(L, "You are not yet worthy of passing. Drag a severed head to the barrier to be allowed entry to the hall of champions.")
/obj/effect/landmark/shuttle_arena_safe
name = "hall of champions"
@@ -157,19 +157,20 @@
name = "portal"
var/list/warp_points = list()
-/obj/effect/forcefield/arena_shuttle_entrance/Bumped(mob/M as mob|obj)
+/obj/effect/forcefield/arena_shuttle_entrance/CollidedWith(atom/movable/AM)
+ if(!isliving(AM))
+ return
+
if(!warp_points.len)
for(var/obj/effect/landmark/shuttle_arena_entrance/S in GLOB.landmarks_list)
warp_points |= S
- if(!isliving(M))
- return
var/obj/effect/landmark/LA = pick(warp_points)
-
+ var/mob/living/M = AM
M.forceMove(get_turf(LA))
to_chat(M, "You're trapped in a deadly arena! To escape, you'll need to drag a severed head to the escape portals.")
spawn()
- var/obj/effect/mine/pickup/bloodbath/B = new(M)
+ var/obj/effect/mine/pickup/bloodbath/B = new (M)
B.mineEffect(M)
diff --git a/code/modules/assembly/infrared.dm b/code/modules/assembly/infrared.dm
index 2592bc7191..be1659546f 100644
--- a/code/modules/assembly/infrared.dm
+++ b/code/modules/assembly/infrared.dm
@@ -214,7 +214,7 @@
qdel(src)
return
-/obj/effect/beam/i_beam/Bumped()
+/obj/effect/beam/i_beam/CollidedWith(atom/movable/AM)
hit()
/obj/effect/beam/i_beam/Crossed(atom/movable/AM as mob|obj)
diff --git a/code/modules/awaymissions/capture_the_flag.dm b/code/modules/awaymissions/capture_the_flag.dm
index b8e5321aef..f824bf0c56 100644
--- a/code/modules/awaymissions/capture_the_flag.dm
+++ b/code/modules/awaymissions/capture_the_flag.dm
@@ -588,7 +588,7 @@
/obj/effect/ctf/ammo/Collide(atom/movable/AM)
reload(AM)
-/obj/effect/ctf/ammo/Bumped(atom/movable/AM)
+/obj/effect/ctf/ammo/CollidedWith(atom/movable/AM)
reload(AM)
/obj/effect/ctf/ammo/proc/reload(mob/living/M)
diff --git a/code/modules/awaymissions/gateway.dm b/code/modules/awaymissions/gateway.dm
index 4ccdf0e58b..1eaeb4a82b 100644
--- a/code/modules/awaymissions/gateway.dm
+++ b/code/modules/awaymissions/gateway.dm
@@ -136,7 +136,7 @@ GLOBAL_DATUM(the_gateway, /obj/machinery/gateway/centerstation)
update_icon()
//okay, here's the good teleporting stuff
-/obj/machinery/gateway/centerstation/Bumped(atom/movable/AM)
+/obj/machinery/gateway/centerstation/CollidedWith(atom/movable/AM)
if(!active)
return
if(!detect())
@@ -212,7 +212,7 @@ GLOBAL_DATUM(the_gateway, /obj/machinery/gateway/centerstation)
return TRUE
return FALSE
-/obj/machinery/gateway/centeraway/Bumped(atom/movable/AM)
+/obj/machinery/gateway/centeraway/CollidedWith(atom/movable/AM)
if(!detect())
return
if(!active)
diff --git a/code/modules/awaymissions/mission_code/wildwest.dm b/code/modules/awaymissions/mission_code/wildwest.dm
index 43a620f748..95cf0d718c 100644
--- a/code/modules/awaymissions/mission_code/wildwest.dm
+++ b/code/modules/awaymissions/mission_code/wildwest.dm
@@ -91,16 +91,19 @@
icon_state = "blobpod"
var/triggered = 0
-/obj/effect/meatgrinder/Crossed(AM)
- Bumped(AM)
+/obj/effect/meatgrinder/Crossed(atom/movable/AM)
+ CollidedWith(AM)
-/obj/effect/meatgrinder/Bumped(mob/M)
+/obj/effect/meatgrinder/CollidedWith(atom/movable/AM)
if(triggered)
return
+ if(!ishuman(AM))
+ return
- if(ishuman(M) && M.stat != DEAD && M.ckey)
- for(var/mob/O in viewers(world.view, src.loc))
+ var/mob/living/carbon/human/M = AM
+
+ if(M.stat != DEAD && M.ckey)
visible_message("[M] triggered the [src]!")
triggered = 1
diff --git a/code/modules/food_and_drinks/kitchen_machinery/gibber.dm b/code/modules/food_and_drinks/kitchen_machinery/gibber.dm
index 1600c0a2a8..2d6bc81f0b 100644
--- a/code/modules/food_and_drinks/kitchen_machinery/gibber.dm
+++ b/code/modules/food_and_drinks/kitchen_machinery/gibber.dm
@@ -33,11 +33,12 @@
CRASH("Didn't find an input plate.")
return
-/obj/machinery/gibber/autogibber/Bumped(atom/A)
- if(!input_plate) return
+/obj/machinery/gibber/autogibber/CollidedWith(atom/movable/AM)
+ if(!input_plate)
+ return
- if(ismob(A))
- var/mob/M = A
+ if(ismob(AM))
+ var/mob/M = AM
if(M.loc == input_plate)
M.loc = src
diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index 74c6a9ff72..829b031d21 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -99,7 +99,7 @@
if(PushAM(AM))
return
-/mob/living/Bumped(atom/movable/AM)
+/mob/living/CollidedWith(atom/movable/AM)
..()
last_bumped = world.time
diff --git a/code/modules/mob/living/simple_animal/guardian/types/fire.dm b/code/modules/mob/living/simple_animal/guardian/types/fire.dm
index c42dbb0783..b0a8ba5215 100644
--- a/code/modules/mob/living/simple_animal/guardian/types/fire.dm
+++ b/code/modules/mob/living/simple_animal/guardian/types/fire.dm
@@ -27,7 +27,7 @@
..()
collision_ignite(AM)
-/mob/living/simple_animal/hostile/guardian/fire/Bumped(AM as mob|obj)
+/mob/living/simple_animal/hostile/guardian/fire/CollidedWith(atom/movable/AM)
..()
collision_ignite(AM)
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm
index 32a579520f..04a625826f 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm
@@ -437,7 +437,7 @@ Difficulty: Very Hard
playsound(user, activation_sound, 100, 1)
return TRUE
-/obj/machinery/anomalous_crystal/Bumped(atom/AM as mob|obj)
+/obj/machinery/anomalous_crystal/CollidedWith(atom/movable/AM)
..()
if(ismob(AM))
ActivationReaction(AM, ACTIVATE_MOB_BUMP)
diff --git a/code/modules/power/singularity/singularity.dm b/code/modules/power/singularity/singularity.dm
index eb88503cf2..07190b102c 100644
--- a/code/modules/power/singularity/singularity.dm
+++ b/code/modules/power/singularity/singularity.dm
@@ -107,9 +107,8 @@
return
-/obj/singularity/Bumped(atom/A)
- consume(A)
- return
+/obj/singularity/CollidedWith(atom/movable/AM)
+ consume(AM)
/obj/singularity/process()
diff --git a/code/modules/power/supermatter/supermatter.dm b/code/modules/power/supermatter/supermatter.dm
index 315450d000..b37c8aadca 100644
--- a/code/modules/power/supermatter/supermatter.dm
+++ b/code/modules/power/supermatter/supermatter.dm
@@ -546,7 +546,7 @@
radiation_pulse(get_turf(src), 1, 1, 150, 1)
-/obj/machinery/power/supermatter_shard/Bumped(atom/AM)
+/obj/machinery/power/supermatter_shard/CollidedWith(atom/movable/AM)
if(isliving(AM))
AM.visible_message("\The [AM] slams into \the [src] inducing a resonance... [AM.p_their()] body starts to glow and catch flame before flashing into ash.",\
"You slam into \the [src] as your ears are filled with unearthly ringing. Your last thought is \"Oh, fuck.\"",\
diff --git a/code/modules/power/tesla/energy_ball.dm b/code/modules/power/tesla/energy_ball.dm
index 4f2cfbc234..042d827bff 100644
--- a/code/modules/power/tesla/energy_ball.dm
+++ b/code/modules/power/tesla/energy_ball.dm
@@ -141,8 +141,8 @@ GLOBAL_LIST_INIT(blacklisted_tesla_types, typecacheof(list(/obj/machinery/atmosp
/obj/singularity/energy_ball/Collide(atom/A)
dust_mobs(A)
-/obj/singularity/energy_ball/Bumped(atom/A)
- dust_mobs(A)
+/obj/singularity/energy_ball/CollidedWith(atom/movable/AM)
+ dust_mobs(AM)
/obj/singularity/energy_ball/orbit(obj/singularity/energy_ball/target)
if (istype(target))
diff --git a/code/modules/recycling/disposal-unit.dm b/code/modules/recycling/disposal-unit.dm
index 618a17e8d6..806fa8103c 100644
--- a/code/modules/recycling/disposal-unit.dm
+++ b/code/modules/recycling/disposal-unit.dm
@@ -458,7 +458,7 @@
..()
flush()
-/obj/machinery/disposal/deliveryChute/Bumped(atom/movable/AM) //Go straight into the chute
+/obj/machinery/disposal/deliveryChute/CollidedWith(atom/movable/AM) //Go straight into the chute
if(!AM.disposalEnterTry())
return
switch(dir)
diff --git a/code/modules/vehicles/vehicle.dm b/code/modules/vehicles/vehicle.dm
index ef7b5eea92..b26a8054aa 100644
--- a/code/modules/vehicles/vehicle.dm
+++ b/code/modules/vehicles/vehicle.dm
@@ -68,7 +68,7 @@
if(auto_door_open)
if(istype(M, /obj/machinery/door) && has_buckled_mobs())
for(var/m in buckled_mobs)
- M.Bumped(m)
+ M.CollidedWith(m)
/obj/vehicle/Process_Spacemove(direction)