From 8079b34a2731dcff19675d7e0bf8623f944d6f75 Mon Sep 17 00:00:00 2001
From: HarpyEagle <mwerezak@gmail.com>
Date: Wed, 13 Apr 2016 02:13:54 -0400
Subject: [PATCH] Updates flashbangs and flash/flare rounds to take advantage
 of new lighting.

Main improvement is somewhat brighter flashes, coloured flares.
---
 code/game/objects/effects/effect_system.dm    |  4 ++--
 .../items/weapons/grenades/flashbang.dm       |  4 ++--
 code/modules/projectiles/projectile/energy.dm | 21 +++++++++++++------
 3 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/code/game/objects/effects/effect_system.dm b/code/game/objects/effects/effect_system.dm
index fcb52986a4..01fc592690 100644
--- a/code/game/objects/effects/effect_system.dm
+++ b/code/game/objects/effects/effect_system.dm
@@ -213,10 +213,10 @@ steam.start() -- spawns the effect
 	icon = 'icons/effects/effects.dmi'
 	icon_state = "sparks"
 
-/obj/effect/effect/smoke/illumination/New(var/newloc, var/brightness=15, var/lifetime=10)
+/obj/effect/effect/smoke/illumination/New(var/newloc, var/lifetime=10, var/range=null, var/power=null, var/color=null)
 	time_to_live=lifetime
 	..()
-	set_light(brightness)
+	set_light(range, power, color)
 
 /////////////////////////////////////////////
 // Bad smoke
diff --git a/code/game/objects/items/weapons/grenades/flashbang.dm b/code/game/objects/items/weapons/grenades/flashbang.dm
index a95d3b1382..17616942c1 100644
--- a/code/game/objects/items/weapons/grenades/flashbang.dm
+++ b/code/game/objects/items/weapons/grenades/flashbang.dm
@@ -22,13 +22,13 @@
 			B.update_icon()
 
 		new/obj/effect/effect/sparks(src.loc)
-		new/obj/effect/effect/smoke/illumination(src.loc, brightness=15)
+		new/obj/effect/effect/smoke/illumination(src.loc, 5, range=30, power=30, color="#FFFFFF")
 		qdel(src)
 		return
 
 	proc/bang(var/turf/T , var/mob/living/carbon/M)					// Added a new proc called 'bang' that takes a location and a person to be banged.
 		M << "<span class='danger'>BANG</span>"						// Called during the loop that bangs people in lockers/containers and when banging
-		playsound(src.loc, 'sound/effects/bang.ogg', 50, 1, 5)		// people in normal view.  Could theroetically be called during other explosions.
+		playsound(src.loc, 'sound/effects/bang.ogg', 50, 1, 30)		// people in normal view.  Could theroetically be called during other explosions.
 																	// -- Polymorph
 
 //Checking for protections
diff --git a/code/modules/projectiles/projectile/energy.dm b/code/modules/projectiles/projectile/energy.dm
index d56c298b6c..66155da7ea 100644
--- a/code/modules/projectiles/projectile/energy.dm
+++ b/code/modules/projectiles/projectile/energy.dm
@@ -14,7 +14,7 @@
 	kill_count = 15 //if the shell hasn't hit anything after travelling this far it just explodes.
 	var/flash_range = 0
 	var/brightness = 7
-	var/light_duration = 5
+	var/light_colour = "#ffffff"
 
 /obj/item/projectile/energy/flash/on_impact(var/atom/A)
 	var/turf/T = flash_range? src.loc : get_turf(A)
@@ -29,16 +29,25 @@
 	playsound(src, 'sound/effects/snap.ogg', 50, 1)
 	src.visible_message("<span class='warning'>\The [src] explodes in a bright flash!</span>")
 
-	new /obj/effect/decal/cleanable/ash(src.loc) //always use src.loc so that ash doesn't end up inside windows
-	new /obj/effect/effect/sparks(T)
-	new /obj/effect/effect/smoke/illumination(T, brightness=max(flash_range*2, brightness), lifetime=light_duration)
+	var/datum/effect/effect/system/spark_spread/sparks = PoolOrNew(/datum/effect/effect/system/spark_spread)
+	sparks.set_up(2, 1, T)
+	sparks.start()
 
+	new /obj/effect/decal/cleanable/ash(src.loc) //always use src.loc so that ash doesn't end up inside windows
+	new /obj/effect/effect/smoke/illumination(T, 5, brightness, brightness, light_colour)
 //blinds people like the flash round, but can also be used for temporary illumination
 /obj/item/projectile/energy/flash/flare
 	damage = 10
 	flash_range = 1
-	brightness = 9 //similar to a flare
-	light_duration = 200
+	brightness = 15
+
+/obj/item/projectile/energy/flash/flare/on_impact(var/atom/A)
+	light_colour = pick("#e58775", "#ffffff", "#90ff90", "#a09030")
+
+	..() //initial flash
+
+	//residual illumination
+	new /obj/effect/effect/smoke/illumination(src.loc, rand(190,240) SECONDS, range=8, power=3, color=light_colour) //same lighting power as flare
 
 /obj/item/projectile/energy/electrode
 	name = "electrode"