From 4e1d24609fb585b8c7cabf30b26c8f36f2b764ea Mon Sep 17 00:00:00 2001
From: ZomgPonies <lorden@zomgponies.com>
Date: Sun, 20 Jul 2014 04:31:32 -0400
Subject: [PATCH] Fireball explosion fixes

---
 code/datums/spells/explosion.dm   | 3 +--
 code/datums/spells/wizard.dm      | 5 ++---
 code/modules/admin/admin_verbs.dm | 9 ++++-----
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/code/datums/spells/explosion.dm b/code/datums/spells/explosion.dm
index 7bb7195c2dd..ceb93b53d8b 100644
--- a/code/datums/spells/explosion.dm
+++ b/code/datums/spells/explosion.dm
@@ -5,11 +5,10 @@
 	var/ex_severe = 1
 	var/ex_heavy = 2
 	var/ex_light = 3
-	var/ex_flash = 4
 
 /obj/effect/proc_holder/spell/targeted/explosion/cast(list/targets)
 
 	for(var/mob/living/target in targets)
-		explosion(target.loc,ex_severe,ex_heavy,ex_light,ex_flash)
+		explosion(target.loc,ex_severe,ex_heavy,ex_light)
 
 	return
\ No newline at end of file
diff --git a/code/datums/spells/wizard.dm b/code/datums/spells/wizard.dm
index 9e64a8a7f47..28035156969 100644
--- a/code/datums/spells/wizard.dm
+++ b/code/datums/spells/wizard.dm
@@ -268,7 +268,7 @@
 	icon_power_button = "spell_fireball"
 
 /obj/effect/proc_holder/spell/turf/fireball/cast(var/turf/T)
-	explosion(T, -1, 0, 2, 3, 0, flame_range = 2)
+	explosion(T, -1, 0, 2, 0)
 
 
 /obj/effect/proc_holder/spell/targeted/inflict_handler/fireball
@@ -277,6 +277,5 @@
 
 /obj/effect/proc_holder/spell/targeted/explosion/fireball
 	ex_severe = -1
-	ex_heavy = -1
+	ex_heavy = 0
 	ex_light = 2
-	ex_flash = 5
diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm
index 8befbf65a86..605c526022c 100644
--- a/code/modules/admin/admin_verbs.dm
+++ b/code/modules/admin/admin_verbs.dm
@@ -378,17 +378,16 @@ var/list/admin_verbs_mod = list(
 		if(null)
 			return 0
 		if("Small Bomb")
-			explosion(epicenter, 1, 2, 3, 3)
+			explosion(epicenter, 1, 2, 3)
 		if("Medium Bomb")
-			explosion(epicenter, 2, 3, 4, 4)
+			explosion(epicenter, 2, 3, 4)
 		if("Big Bomb")
-			explosion(epicenter, 3, 5, 7, 5)
+			explosion(epicenter, 3, 5, 7)
 		if("Custom Bomb")
 			var/devastation_range = input("Devastation range (in tiles):") as num
 			var/heavy_impact_range = input("Heavy impact range (in tiles):") as num
 			var/light_impact_range = input("Light impact range (in tiles):") as num
-			var/flash_range = input("Flash range (in tiles):") as num
-			explosion(epicenter, devastation_range, heavy_impact_range, light_impact_range, flash_range)
+			explosion(epicenter, devastation_range, heavy_impact_range, light_impact_range)
 	message_admins("\blue [ckey] creating an admin explosion at [epicenter.loc].")
 	feedback_add_details("admin_verb","DB") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!