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

[MIRROR]  Refactors explosions

code/modules/awaymissions/bluespaceartillery.dm

@@ -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()

code/modules/awaymissions/mission_code/wildwest.dm

@@ -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///////////

code/modules/events/brand_intelligence.dm

@@ -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()

code/modules/events/processor_overload.dm

@@ -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)

code/modules/mining/ores_coins.dm

@@ -263,11 +263,11 @@
 		spawn(det_time)
 		if(primed)
 			if(quality == 3)
-				explosion(src.loc,2,4,9,adminlog = notify_admins)
+				explosion(src.loc,2,4,9,adminlog = notify_admins)
 			if(quality == 2)
-				explosion(src.loc,1,2,5,adminlog = notify_admins)
+				explosion(src.loc,1,2,5,adminlog = notify_admins)
 			if(quality == 1)
-				explosion(src.loc,-1,1,3,adminlog = notify_admins)
+				explosion(src.loc,-1,1,3,adminlog = notify_admins)
 			qdel(src)
 
 /obj/item/weapon/ore/Initialize()

code/modules/mob/living/silicon/ai/death.dm

@@ -23,7 +23,7 @@
 
 	if(explosive)
 		spawn(10)
-			explosion(src.loc, 3, 6, 12, 15)
+			explosion(src.loc, 3, 6, 12, 15)
 
 	for(var/obj/machinery/ai_status_display/O in world) //change status
 		if(src.key)

code/modules/power/antimatter/containment_jar.dm

@@ -18,12 +18,12 @@
 /obj/item/weapon/am_containment/ex_act(severity, target)
 	switch(severity)
 		if(1)
-			explosion(get_turf(src), 1, 2, 3, 5)//Should likely be larger but this works fine for now I guess
+			explosion(get_turf(src), 1, 2, 3, 5)//Should likely be larger but this works fine for now I guess
 			if(src)
 				qdel(src)
 		if(2)
 			if(prob((fuel/10)-stability))
-				explosion(get_turf(src), 1, 2, 3, 5)
+				explosion(get_turf(src), 1, 2, 3, 5)
 				if(src)
 					qdel(src)
 				return

code/modules/power/antimatter/control.dm

@@ -46,7 +46,7 @@
 
 /obj/machinery/power/am_control_unit/process()
 	if(exploding)
-		explosion(get_turf(src),8,12,18,12)
+		explosion(get_turf(src),8,12,18,12)
 		if(src)
 			qdel(src)
 

code/modules/power/cell.dm

@@ -123,7 +123,7 @@
 		corrupt()
 		return
 	//explosion(T, 0, 1, 2, 2)
-	explosion(T, devastation_range, heavy_impact_range, light_impact_range, flash_range)
+	explosion(T, devastation_range, heavy_impact_range, light_impact_range, flash_range)
 	qdel(src)
 
 /obj/item/weapon/stock_parts/cell/proc/corrupt()

code/modules/power/port_gen.dm

@@ -167,7 +167,7 @@
 		src.updateDialog()
 
 /obj/machinery/power/port_gen/pacman/proc/overheat()
-	explosion(src.loc, 2, 5, 2, -1)
+	explosion(src.loc, 2, 5, 2, -1)
 
 /obj/machinery/power/port_gen/pacman/attackby(obj/item/O, mob/user, params)
 	if(istype(O, sheet_path))
@@ -294,7 +294,7 @@
 	board_path = /obj/item/weapon/circuitboard/machine/pacman/super
 
 /obj/machinery/power/port_gen/pacman/super/overheat()
-	explosion(src.loc, 3, 3, 3, -1)
+	explosion(src.loc, 3, 3, 3, -1)
 
 /obj/machinery/power/port_gen/pacman/mrs
 	name = "\improper M.R.S.P.A.C.M.A.N.-type portable generator"
@@ -305,4 +305,4 @@
 	board_path = /obj/item/weapon/circuitboard/machine/pacman/mrs
 
 /obj/machinery/power/port_gen/pacman/mrs/overheat()
-	explosion(src.loc, 4, 4, 4, -1)
+	explosion(src.loc, 4, 4, 4, -1)

code/modules/projectiles/guns/magic/wand.dm

@@ -166,5 +166,5 @@
 
 /obj/item/weapon/gun/magic/wand/fireball/zap_self(mob/living/user)
 	..()
-	explosion(user.loc, -1, 0, 2, 3, 0, flame_range = 2)
+	explosion(user.loc, -1, 0, 2, 3, 0, flame_range = 2)
 	charges--

code/modules/projectiles/projectile/bullets.dm

@@ -61,10 +61,10 @@
 
 /obj/item/projectile/bullet/pellet/overload/on_hit(atom/target, blocked = 0)
  	..()
- 	explosion(target, 0, 0, 2)
+ 	explosion(target, 0, 0, 2)
 
 /obj/item/projectile/bullet/pellet/overload/on_range()
-	explosion(src, 0, 0, 2)
+	explosion(src, 0, 0, 2)
 	do_sparks(3, TRUE, src)
 	..()
 

code/modules/reagents/reagent_dispenser.dm

@@ -66,7 +66,7 @@
 	reagent_id = "welding_fuel"
 
 /obj/structure/reagent_dispensers/fueltank/boom()
-	explosion(get_turf(src), 0, 1, 5, flame_range = 5)
+	explosion(get_turf(src), 0, 1, 5, flame_range = 5)
 	qdel(src)
 
 /obj/structure/reagent_dispensers/fueltank/blob_act(obj/structure/blob/B)
@@ -165,7 +165,7 @@
 	reagent_id = "beer"
 
 /obj/structure/reagent_dispensers/beerkeg/blob_act(obj/structure/blob/B)
-	explosion(src.loc,0,3,5,7,10)
+	explosion(src.loc,0,3,5,7,10)
 	if(!QDELETED(src))
 		qdel(src)
 

code/modules/research/experimentor.dm

@@ -683,7 +683,7 @@
 	spawn(rand(35,100))
 		if(src.loc == user)
 			visible_message("<span class='notice'>The [src]'s top opens, releasing a powerful blast!</span>")
-			explosion(user.loc, -1, rand(1,5), rand(1,5), rand(1,5), rand(1,5), flame_range = 2)
+			explosion(user.loc, -1, rand(1,5), rand(1,5), rand(1,5), rand(1,5), flame_range = 2)
 			warn_admins(user, "Explosion")
 			qdel(src) //Comment this line to produce a light grenade (the bomb that keeps on exploding when used)!!
 

code/modules/spells/spell_types/explosion.dm

@@ -10,6 +10,6 @@
 /obj/effect/proc_holder/spell/targeted/explosion/cast(list/targets,mob/user = usr)
 
 	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,ex_flash)
 
 	return