Merge pull request #29233 from optimumtact/bumped

Rename Bumped to CollidedWith
This commit is contained in:
Jordan Brown
2017-07-15 11:29:41 -04:00
committed by GitHub
36 changed files with 102 additions and 104 deletions
@@ -107,9 +107,8 @@
return
/obj/singularity/Bumped(atom/A)
consume(A)
return
/obj/singularity/CollidedWith(atom/movable/AM)
consume(AM)
/obj/singularity/process()