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
@@ -897,9 +897,9 @@ GLOBAL_LIST_EMPTY(PDAs)
 	if(T)
 		T.hotspot_expose(700,125)
 		if(istype(cartridge, /obj/item/weapon/cartridge/syndicate))
-			explosion(T, -1, 1, 3, 4)
+			explosion(T, -1, 1, 3, 4)
 		else
-			explosion(T, -1, -1, 2, 3)
+			explosion(T, -1, -1, 2, 3)
 	qdel(src)
 	return

@@ -141,5 +141,5 @@

 	if(power_drained >= max_power)
 		STOP_PROCESSING(SSobj, src)
-		explosion(src.loc, 4,8,16,32)
+		explosion(src.loc, 4,8,16,32)
 		qdel(src)