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
@@ -57,7 +57,7 @@
 				M.speak = rampant_speeches.Copy()
 				M.speak_chance = 7
 			else
-				explosion(upriser.loc, -1, 1, 2, 4, 0)
+				explosion(upriser.loc, -1, 1, 2, 4, 0)
 				qdel(upriser)

 		kill()