[MIRROR] Rename Bump to Collide (#2002)
* Rename Bump to Collide * Delete bubblegum.dm.rej * Update bubblegum.dm
This commit is contained in:
committed by
kevinz000
parent
80d06fe843
commit
2d3905457e
@@ -114,7 +114,7 @@
|
||||
return clashing
|
||||
|
||||
|
||||
/obj/singularity/narsie/Bump(atom/A)
|
||||
/obj/singularity/narsie/Collide(atom/A)
|
||||
var/turf/T = get_turf(A)
|
||||
if(T == loc)
|
||||
T = get_step(A, A.dir) //please don't slam into a window like a bird, nar-sie
|
||||
|
||||
@@ -28,7 +28,7 @@
|
||||
addtimer(CALLBACK(src, .proc/move), 1)
|
||||
|
||||
|
||||
/obj/effect/accelerated_particle/Bump(atom/A)
|
||||
/obj/effect/accelerated_particle/Collide(atom/A)
|
||||
if(A)
|
||||
if(isliving(A))
|
||||
toxmob(A)
|
||||
|
||||
@@ -102,7 +102,7 @@
|
||||
return 0 //Will there be an impact? Who knows. Will we see it? No.
|
||||
|
||||
|
||||
/obj/singularity/Bump(atom/A)
|
||||
/obj/singularity/Collide(atom/A)
|
||||
consume(A)
|
||||
return
|
||||
|
||||
|
||||
Reference in New Issue
Block a user