Merge pull request #1168 from Citadel-Station-13/upstream-merge-26361

[MIRROR] Refactors explosions
2017-05-30 15:15:51 -05:00
parent d91a9ac177 ae22a1876a
commit f2730839d4
30 changed files with 780 additions and 166 deletions
@@ -61,10 +61,10 @@

 /obj/item/projectile/bullet/pellet/overload/on_hit(atom/target, blocked = 0)
 	..()
- 	explosion(target, 0, 0, 2)
+ 	explosion(target, 0, 0, 2)

 /obj/item/projectile/bullet/pellet/overload/on_range()
-	explosion(src, 0, 0, 2)
+	explosion(src, 0, 0, 2)
 	do_sparks(3, TRUE, src)
 	..()