Rename Bumped to CollidedWith (#2017)

2017-07-15 11:44:12 -07:00
parent 738eaa1d54
commit 54da14ea6b
36 changed files with 102 additions and 104 deletions
@@ -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))
@@ -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)
@@ -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
@@ -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
 	..()
@@ -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) ))
@@ -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
@@ -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

@@ -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