Bumped() > BumpedBy()

code/__DEFINES/dcs/signals/signals_atom/signals_atom_main.dm

@@ -54,7 +54,7 @@
 #define COMSIG_ATOM_EXITED "atom_exited"
 ///from base of atom/movable/Moved(): (atom/movable/gone, direction)
 #define COMSIG_ATOM_ABSTRACT_EXITED "atom_abstract_exited"
-///from base of atom/Bumped(): (/atom/movable)
+///from base of atom/BumpedBy(): (/atom/movable)
 #define COMSIG_ATOM_BUMPED "atom_bumped"
 ///from base of atom/handle_atom_del(): (atom/deleted)
 #define COMSIG_ATOM_CONTENTS_DEL "atom_contents_del"

code/game/area/areas/shuttles.dm

@@ -249,7 +249,7 @@
 	for(var/obj/effect/landmark/shuttle_arena_safe/exit in GLOB.landmarks_list)
 		warp_points += exit
 
-/obj/effect/forcefield/arena_shuttle/Bumped(atom/movable/AM)
+/obj/effect/forcefield/arena_shuttle/BumpedBy(atom/movable/AM)
 	if(!isliving(AM))
 		return
 
@@ -281,7 +281,7 @@
 	initial_duration = 0
 	var/list/warp_points = list()
 
-/obj/effect/forcefield/arena_shuttle_entrance/Bumped(atom/movable/AM)
+/obj/effect/forcefield/arena_shuttle_entrance/BumpedBy(atom/movable/AM)
 	if(!isliving(AM))
 		return
 

code/game/atoms.dm

@@ -550,7 +550,7 @@
 	SIGNAL_HANDLER
 	return
 
-/atom/proc/Bumped(atom/movable/bumped_atom)
+/atom/proc/BumpedBy(atom/movable/bumped_atom)
 	set waitfor = FALSE
 	SEND_SIGNAL(src, COMSIG_ATOM_BUMPED, bumped_atom)
 

code/game/atoms_movable.dm

@@ -998,7 +998,7 @@
 		. = TRUE
 		if(QDELETED(bumped_atom))
 			return
-	bumped_atom.Bumped(src)
+	bumped_atom.BumpedBy(src)
 
 /atom/movable/Exited(atom/movable/gone, direction)
 	. = ..()

code/game/machinery/doors/door.dm

@@ -237,7 +237,7 @@
 /obj/machinery/door/proc/try_remove_seal(mob/user)
 	return
 
-/obj/machinery/door/Bumped(atom/movable/AM)
+/obj/machinery/door/BumpedBy(atom/movable/AM)
 	. = ..()
 	if(operating || (obj_flags & EMAGGED) || (!can_open_with_hands && density))
 		return

code/game/machinery/doors/firedoor.dm

@@ -180,7 +180,7 @@
 	obj_flags |= EMAGGED
 	INVOKE_ASYNC(src, PROC_REF(open))
 
-/obj/machinery/door/firedoor/Bumped(atom/movable/AM)
+/obj/machinery/door/firedoor/BumpedBy(atom/movable/AM)
 	if(panel_open || operating)
 		return
 	if(!density)

code/game/machinery/doors/passworddoor.dm

@@ -29,7 +29,7 @@
 	if(findtext(raw_message,password))
 		open()
 
-/obj/machinery/door/password/Bumped(atom/movable/AM)
+/obj/machinery/door/password/BumpedBy(atom/movable/AM)
 	return !density && ..()
 
 /obj/machinery/door/password/try_to_activate_door(mob/user, access_bypass = FALSE)

code/game/machinery/doors/unpowered.dm

@@ -1,6 +1,6 @@
 /obj/machinery/door/unpowered
 
-/obj/machinery/door/unpowered/Bumped(atom/movable/AM)
+/obj/machinery/door/unpowered/BumpedBy(atom/movable/AM)
 	if(src.locked)
 		return
 	..()

code/game/machinery/doors/windowdoor.dm

@@ -118,7 +118,7 @@
 	if(!density && autoclose) //did someone change state while we slept?
 		close()
 
-/obj/machinery/door/window/Bumped(atom/movable/AM)
+/obj/machinery/door/window/BumpedBy(atom/movable/AM)
 	if(operating || !density)
 		return
 	if(!ismob(AM))

code/game/machinery/teleporter.dm

@@ -45,7 +45,7 @@
 			break
 	return power_station
 
-/obj/machinery/teleport/hub/Bumped(atom/movable/AM)
+/obj/machinery/teleport/hub/BumpedBy(atom/movable/AM)
 	if(is_centcom_level(z))
 		to_chat(AM, span_warning("You can't use this here!"))
 		return

code/game/machinery/transformer.dm

@@ -42,7 +42,7 @@
 		icon_state = initial(icon_state)
 	return ..()
 
-/obj/machinery/transformer/Bumped(atom/movable/AM)
+/obj/machinery/transformer/BumpedBy(atom/movable/AM)
 	if(cooldown == 1)
 		return
 

code/game/objects/effects/anomalies.dm

@@ -158,7 +158,7 @@
 /obj/effect/anomaly/grav/Bump(atom/A)
 	gravShock(A)
 
-/obj/effect/anomaly/grav/Bumped(atom/movable/AM)
+/obj/effect/anomaly/grav/BumpedBy(atom/movable/AM)
 	gravShock(AM)
 
 /obj/effect/anomaly/grav/proc/gravShock(mob/living/A)
@@ -215,7 +215,7 @@
 /obj/effect/anomaly/flux/Bump(atom/A)
 	mobShock(A)
 
-/obj/effect/anomaly/flux/Bumped(atom/movable/AM)
+/obj/effect/anomaly/flux/BumpedBy(atom/movable/AM)
 	mobShock(AM)
 
 /obj/effect/anomaly/flux/proc/mobShock(mob/living/M)
@@ -244,7 +244,7 @@
 	for(var/mob/living/M in range(1,src))
 		do_teleport(M, locate(M.x, M.y, M.z), 4, channel = TELEPORT_CHANNEL_BLUESPACE)
 
-/obj/effect/anomaly/bluespace/Bumped(atom/movable/AM)
+/obj/effect/anomaly/bluespace/BumpedBy(atom/movable/AM)
 	if(isliving(AM))
 		do_teleport(AM, locate(AM.x, AM.y, AM.z), 8, channel = TELEPORT_CHANNEL_BLUESPACE)
 

code/game/objects/effects/bump_teleporter.dm

@@ -26,7 +26,7 @@
 /obj/effect/bump_teleporter/singularity_pull()
 	return
 
-/obj/effect/bump_teleporter/Bumped(atom/movable/AM)
+/obj/effect/bump_teleporter/BumpedBy(atom/movable/AM)
 	if(!ismob(AM))
 		return
 	if(!id_target)

code/game/objects/effects/decals/cleanable/food.dm

@@ -37,7 +37,7 @@
 	if(is_species(mover, /datum/species/snail))
 		return FALSE
 
-/obj/effect/decal/cleanable/food/salt/Bumped(atom/movable/AM)
+/obj/effect/decal/cleanable/food/salt/BumpedBy(atom/movable/AM)
 	. = ..()
 	if(is_species(AM, /datum/species/snail))
 		to_chat(AM, span_danger("Your path is obstructed by [span_phobia("salt")]."))

code/game/objects/effects/portals.dm

@@ -57,7 +57,7 @@
 	if(HAS_TRAIT(mover, TRAIT_NO_TELEPORT) && !force_teleport)
 		return TRUE
 
-/obj/effect/portal/Bumped(atom/movable/bumper)
+/obj/effect/portal/BumpedBy(atom/movable/bumper)
 	teleport(bumper)
 
 /obj/effect/portal/attack_hand(mob/user, list/modifiers)

code/game/objects/effects/powerup.dm

@@ -33,7 +33,7 @@
 /obj/effect/powerup/Bump(atom/bumped_atom)
 	trigger(bumped_atom)
 
-/obj/effect/powerup/Bumped(atom/movable/movable_atom)
+/obj/effect/powerup/BumpedBy(atom/movable/movable_atom)
 	trigger(movable_atom)
 
 /// Triggers the effect of the powerup on the target, returns FALSE if the target is not /mob/living, is dead or the cooldown hasn't finished, returns TRUE otherwise

code/game/objects/items/drug_items.dm

@@ -58,4 +58,4 @@
 	spillable = TRUE
 	SplashReagents(hit_atom, TRUE)
 	qdel(src)
-	hit_atom.Bumped(ampoule_shard)
+	hit_atom.BumpedBy(ampoule_shard)

code/game/objects/items/implants/implant_stealth.dm

@@ -40,7 +40,7 @@
 	if(isliving(A))
 		reveal()
 
-/obj/structure/closet/cardboard/agent/Bumped(atom/movable/A)
+/obj/structure/closet/cardboard/agent/BumpedBy(atom/movable/A)
 	. = ..()
 	if(isliving(A))
 		reveal()

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

@@ -243,13 +243,13 @@
 /obj/item/melee/supermatter_sword/suicide_act(mob/user)
 	user.visible_message(span_suicide("[user] touches [src]'s blade. It looks like [user.p_theyre()] tired of waiting for the radiation to kill [user.p_them()]!"))
 	user.dropItemToGround(src, TRUE)
-	shard.Bumped(user)
+	shard.BumpedBy(user)
 
 /obj/item/melee/supermatter_sword/proc/consume_everything(target)
 	if(isnull(target))
 		shard.Consume()
 	else if(!isturf(target))
-		shard.Bumped(target)
+		shard.BumpedBy(target)
 	else
 		consume_turf(target)
 

code/game/objects/items/puzzle_pieces.dm

@@ -49,7 +49,7 @@
 	var/open_message = "The door beeps, and slides opens."
 
 //Standard Expressions to make keycard doors basically un-cheeseable
-/obj/machinery/door/puzzle/Bumped(atom/movable/AM)
+/obj/machinery/door/puzzle/BumpedBy(atom/movable/AM)
 	return !density && ..()
 
 /obj/machinery/door/puzzle/emp_act(severity)

code/game/objects/structures/grille.dm

@@ -98,7 +98,7 @@
 			return TRUE
 	return FALSE
 
-/obj/structure/grille/Bumped(atom/movable/AM)
+/obj/structure/grille/BumpedBy(atom/movable/AM)
 	if(!ismob(AM))
 		return
 	var/mob/M = AM

code/game/objects/structures/holosign.dm

@@ -156,7 +156,7 @@
 		return CheckHuman(mover)
 	return TRUE
 
-/obj/structure/holosign/barrier/medical/Bumped(atom/movable/AM)
+/obj/structure/holosign/barrier/medical/BumpedBy(atom/movable/AM)
 	. = ..()
 	icon_state = "holo_medical"
 	if(ishuman(AM) && !CheckHuman(AM))
@@ -202,7 +202,7 @@
 			shockcd = TRUE
 			addtimer(CALLBACK(src, PROC_REF(cooldown)), 5)
 
-/obj/structure/holosign/barrier/cyborg/hacked/Bumped(atom/movable/AM)
+/obj/structure/holosign/barrier/cyborg/hacked/BumpedBy(atom/movable/AM)
 	if(shockcd)
 		return
 

code/game/objects/structures/mineral_doors.dm

@@ -39,7 +39,7 @@
 	. = ..()
 	zas_update_loc()
 
-/obj/structure/mineral_door/Bumped(atom/movable/AM)
+/obj/structure/mineral_door/BumpedBy(atom/movable/AM)
 	..()
 	if(!door_opened)
 		return TryToSwitchState(AM)

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

@@ -32,7 +32,7 @@
 /obj/structure/transit_tube/station/should_stop_pod(pod, from_dir)
 	return TRUE
 
-/obj/structure/transit_tube/station/Bumped(atom/movable/AM)
+/obj/structure/transit_tube/station/BumpedBy(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)
@@ -76,7 +76,7 @@
 						if(do_after(user, src, 15))
 							if(open_status == STATION_TUBE_OPEN && GM && user.grab_state >= GRAB_AGGRESSIVE && user.pulling == GM && !GM.buckled && !GM.has_buckled_mobs())
 								GM.Paralyze(100)
-								src.Bumped(GM)
+								src.BumpedBy(GM)
 						break
 		else
 			for(var/obj/structure/transit_tube_pod/pod in loc)
@@ -249,7 +249,7 @@
 	. = ..()
 	. += span_notice("This station will create a pod for you to ride, no need to wait for one.")
 
-/obj/structure/transit_tube/station/dispenser/Bumped(atom/movable/AM)
+/obj/structure/transit_tube/station/dispenser/BumpedBy(atom/movable/AM)
 	if(!(istype(AM) && AM.dir == boarding_dir) || AM.anchored)
 		return
 	var/obj/structure/transit_tube_pod/dispensed/pod = new(loc)

code/game/turfs/closed/minerals.dm

@@ -97,7 +97,7 @@
 	return INITIALIZE_HINT_NORMAL
 
 // Inlined version of the bump click element. way faster this way, the element's nice but it's too much overhead
-/turf/closed/mineral/Bumped(atom/movable/bumped_atom)
+/turf/closed/mineral/BumpedBy(atom/movable/bumped_atom)
 	. = ..()
 	if(!isliving(bumped_atom))
 		return

code/game/turfs/closed/wall/mineral_walls.dm

@@ -77,7 +77,7 @@
 	radiate()
 	..()
 
-/turf/closed/wall/mineral/uranium/Bumped(atom/movable/AM)
+/turf/closed/wall/mineral/uranium/BumpedBy(atom/movable/AM)
 	radiate()
 	..()
 

code/modules/awaymissions/gateway.dm

@@ -132,7 +132,7 @@ GLOBAL_LIST_EMPTY(gateway_destinations)
 	density = TRUE
 	invisibility = INVISIBILITY_ABSTRACT
 
-/obj/effect/gateway_portal_bumper/Bumped(atom/movable/AM)
+/obj/effect/gateway_portal_bumper/BumpedBy(atom/movable/AM)
 	if(get_dir(src,AM) == SOUTH)
 		gateway.Transfer(AM)
 

code/modules/awaymissions/mission_code/wildwest.dm

@@ -137,9 +137,9 @@
 	SIGNAL_HANDLER
 	if(AM == src)
 		return
-	Bumped(AM)
+	BumpedBy(AM)
 
-/obj/effect/meatgrinder/Bumped(atom/movable/AM)
+/obj/effect/meatgrinder/BumpedBy(atom/movable/AM)
 
 	if(triggered)
 		return

code/modules/food_and_drinks/drinks/drinks.dm

@@ -152,7 +152,7 @@
 	var/obj/item/broken_bottle/B = new (loc)
 	B.mimic_broken(src, target)
 	qdel(src)
-	target.Bumped(B)
+	target.BumpedBy(B)
 
 /obj/item/reagent_containers/food/drinks/bullet_act(obj/projectile/P)
 	. = ..()
@@ -539,7 +539,7 @@
 	var/obj/item/broken_bottle/B = new (loc)
 	B.mimic_broken(src, target)
 	qdel(src)
-	target.Bumped(B)
+	target.BumpedBy(B)
 
 /obj/item/reagent_containers/food/drinks/colocup
 	name = "colo cup"

code/modules/food_and_drinks/drinks/drinks/bottle.dm

@@ -41,7 +41,7 @@
 	B.mimic_broken(src, target)
 
 	qdel(src)
-	target.Bumped(B)
+	target.BumpedBy(B)
 
 /obj/item/reagent_containers/food/drinks/bottle/attack_secondary(atom/target, mob/living/user, params)
 
@@ -146,7 +146,7 @@
 	if(to_mimic.isGlass)
 		if(prob(33))
 			var/obj/item/shard/stab_with = new(to_mimic.drop_location())
-			target.Bumped(stab_with)
+			target.BumpedBy(stab_with)
 		playsound(src, SFX_SHATTER, 70, TRUE)
 	else
 		force = 0

code/modules/food_and_drinks/kitchen_machinery/gibber.dm

@@ -229,7 +229,7 @@
 /obj/machinery/gibber/autogibber
 	var/input_dir = NORTH
 
-/obj/machinery/gibber/autogibber/Bumped(atom/movable/AM)
+/obj/machinery/gibber/autogibber/BumpedBy(atom/movable/AM)
 	var/atom/input = get_step(src, input_dir)
 	if(isliving(AM))
 		var/mob/living/victim = AM

code/modules/mob/living/living.dm

@@ -93,7 +93,7 @@
 		if(PushAM(AM, move_force))
 			return
 
-/mob/living/Bumped(atom/movable/AM)
+/mob/living/BumpedBy(atom/movable/AM)
 	..()
 	last_bumped = world.time
 

code/modules/mob/living/simple_animal/guardian/types/fire.dm

@@ -38,7 +38,7 @@
 		return
 	collision_ignite(AM)
 
-/mob/living/simple_animal/hostile/guardian/fire/Bumped(atom/movable/AM)
+/mob/living/simple_animal/hostile/guardian/fire/BumpedBy(atom/movable/AM)
 	..()
 	collision_ignite(AM)
 

code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm

@@ -296,7 +296,7 @@
 	set_anchored(FALSE)
 	return TRUE
 
-/obj/machinery/anomalous_crystal/Bumped(atom/movable/AM)
+/obj/machinery/anomalous_crystal/BumpedBy(atom/movable/AM)
 	..()
 	if(ismob(AM))
 		ActivationReaction(AM, ACTIVATE_MOB_BUMP)

code/modules/power/singularity/containment_field.dm

@@ -118,7 +118,7 @@
 	///Used to add a delay between shocks. In some cases this used to crash servers by spawning hundreds of sparks every second.
 	var/has_shocked = FALSE
 
-/obj/machinery/field/Bumped(atom/movable/mover)
+/obj/machinery/field/BumpedBy(atom/movable/mover)
 	if(has_shocked)
 		return
 	if(isliving(mover))