Merge pull request #7734 from deathride58/fancylightingwave2

Fancy lighting wave 2 - nonbinary colored lighting now applies to gun/helmet flashlights, borgs, bots, welders, and more
2018-11-19 18:05:27 -06:00
parent 34a8f9c8c4 9390707bfe
commit b76bb57609
13 changed files with 21 additions and 12 deletions
@@ -77,7 +77,7 @@

 /obj/effect/decal/cleanable/greenglow/Initialize(mapload)
 	. = ..()
-	set_light(1)
+	set_light(2, 0.8, "#22FFAA")

 /obj/effect/decal/cleanable/greenglow/ex_act()
 	return
@@ -47,7 +47,7 @@
 		//src.damtype = "fire"
 		if(show_message)
 			usr.visible_message(show_message)
-		set_light(CANDLE_LUMINOSITY)
+		set_light(CANDLE_LUMINOSITY, 0.8)
 		START_PROCESSING(SSobj, src)
 		update_icon()

@@ -542,7 +542,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 		damtype = "fire"
 		hitsound = 'sound/items/welder.ogg'
 		attack_verb = list("burnt", "singed")
-		set_light(1)
+		set_light(2, 0.6, LIGHT_COLOR_FIRE)
 		START_PROCESSING(SSobj, src)
 	else
 		hitsound = "swing_hit"
@@ -49,6 +49,8 @@ GLOBAL_LIST_EMPTY(PDAs)
 	var/scanmode = PDA_SCANNER_NONE
 	var/fon = FALSE //Is the flashlight function on?
 	var/f_lum = 2.3 //Luminosity for the flashlight function
+	var/f_pow = 0.6 //Power for the flashlight function
+	var/f_col = "#FFCC66" //Color for the flashlight function
 	var/silent = FALSE //To beep or not to beep, that is the question
 	var/toff = FALSE //If TRUE, messenger disabled
 	var/tnote = null //Current Texts
@@ -102,7 +104,7 @@ GLOBAL_LIST_EMPTY(PDAs)
 /obj/item/pda/Initialize()
 	. = ..()
 	if(fon)
-		set_light(f_lum)
+		set_light(f_lum, f_pow, f_col)

 	GLOB.PDAs += src
 	if(default_cartridge)
@@ -739,7 +741,7 @@ GLOBAL_LIST_EMPTY(PDAs)
 		set_light(0)
 	else if(f_lum)
 		fon = TRUE
-		set_light(f_lum)
+		set_light(f_lum, f_pow, f_col)
 	update_icon()

 /obj/item/pda/proc/remove_pen()
@@ -147,7 +147,7 @@
 		explode()
 	switched_on(user)
 	if(welding)
-		set_light(light_intensity)
+		set_light(light_intensity, 0.75, LIGHT_COLOR_FIRE)

 	update_icon()