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
@@ -53,7 +53,7 @@
 		for(var/turf/T in get_area_turfs(thearea.type))
 			L+=T
 		var/loc = pick(L)
-		explosion(loc,explosiondev,explosionmed,explosionlight)
+		explosion(loc,explosiondev,explosionmed,explosionlight)
 		reload = 0

 /*/mob/proc/openfire()
@@ -107,7 +107,7 @@
 		var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread
 		s.set_up(3, 1, src)
 		s.start()
-		explosion(M, 1, 0, 0, 0)
+		explosion(M, 1, 0, 0, 0)
 		qdel(src)

 /////For the Wishgranter///////////