[MIRROR] Rename Bump to Collide (#2002)

* Rename Bump to Collide

* Delete bubblegum.dm.rej

* Update bubblegum.dm
This commit is contained in:
CitadelStationBot
2017-07-14 21:35:56 -07:00
committed by kevinz000
parent 80d06fe843
commit 2d3905457e
37 changed files with 78 additions and 86 deletions
@@ -148,7 +148,7 @@
. += config.slime_delay
/mob/living/simple_animal/slime/ObjBump(obj/O)
/mob/living/simple_animal/slime/ObjCollide(obj/O)
if(!client && powerlevel > 0)
var/probab = 10
switch(powerlevel)