[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
+1 -1
View File
@@ -48,7 +48,7 @@
density = FALSE
..()
/obj/vehicle/scooter/skateboard/Bump(atom/A)
/obj/vehicle/scooter/skateboard/Collide(atom/A)
..()
if(A.density && has_buckled_mobs())
var/mob/living/carbon/H = buckled_mobs[1]