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

[MIRROR]  Refactors explosions
This commit is contained in:
LetterJay
2017-05-30 15:15:51 -05:00
committed by GitHub
30 changed files with 780 additions and 166 deletions
+1 -1
View File
@@ -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()
+1 -1
View File
@@ -32,7 +32,7 @@
var/obj/machinery/telecomms/processor/P = T
if(prob(10))
// Damage the surrounding area to indicate that it popped
explosion(get_turf(P), 0, 0, 2)
explosion(get_turf(P), 0, 0, 2)
// Only a level 1 explosion actually damages the machine
// at all
P.ex_act(1)