Rename Bumped to CollidedWith (#2017)

2017-07-15 13:44:12 -05:00
parent 738eaa1d54
commit 54da14ea6b
36 changed files with 102 additions and 104 deletions
@@ -49,17 +49,11 @@
 		new /obj/structure/grille/ratvar(src.loc)
 	qdel(src)

-/obj/structure/grille/Bumped(atom/user)
-	if(ismob(user))
-		var/tile_density = FALSE
-		for(var/atom/movable/AM in get_turf(src))
-			if(AM == src)
-				continue
-			if(AM.density && AM.layer >= layer)
-				tile_density = TRUE
-				break
-		if(!tile_density)
-			shock(user, 70)
+/obj/structure/grille/CollidedWith(atom/movable/AM)
+	if(!ismob(AM))
+		return
+	var/mob/M = AM
+	shock(M, 70)


 /obj/structure/grille/attack_paw(mob/user)