Rename Bumped to CollidedWith

In light of the change of Bump to Collide, this should also be done
as it will make it less confusing for devs in the future

I also ended up changing a bunch of the code in the CollidedWith procs,
things that were assuming types, doing bad loc changes and so forth
This commit is contained in:
oranges
2017-07-15 00:25:22 +00:00
parent 2d805255ae
commit e04fd83b9d
36 changed files with 102 additions and 104 deletions
+1 -1
View File
@@ -99,7 +99,7 @@
if(PushAM(AM))
return
/mob/living/Bumped(atom/movable/AM)
/mob/living/CollidedWith(atom/movable/AM)
..()
last_bumped = world.time
@@ -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)
@@ -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)