[MIRROR] Overlay Lighting Color/Intensity Pass (#26825)

Overlay Lighting Color/Intensity Pass

Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com>

code/game/objects/effects/effect_system/effects_sparks.dm

@@ -17,8 +17,8 @@
 	icon_state = "sparks"
 	anchored = TRUE
 	light_system = OVERLAY_LIGHT
-	light_range = 2
-	light_power = 0.5
+	light_range = 1.5
+	light_power = 0.8
 	light_color = LIGHT_COLOR_FIRE
 
 /obj/effect/particle_effect/sparks/Initialize(mapload)

code/game/objects/effects/lighting.dm

@@ -37,6 +37,7 @@
 	name = "mob fire lighting"
 	light_color = LIGHT_COLOR_FIRE
 	light_range = LIGHT_RANGE_FIRE
+	light_power = 2
 
 /obj/effect/dummy/lighting_obj/moblight/species
 	name = "species lighting"

code/game/objects/items/cigs_lighters.dm

@@ -744,7 +744,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 	custom_price = PAYCHECK_CREW * 1.1
 	light_system = OVERLAY_LIGHT
 	light_range = 2
-	light_power = 0.6
+	light_power = 1.3
 	light_color = LIGHT_COLOR_FIRE
 	light_on = FALSE
 	/// Whether the lighter is lit.

code/game/objects/items/devices/flashlight.dm

@@ -20,6 +20,7 @@
 	custom_materials = list(/datum/material/iron= SMALL_MATERIAL_AMOUNT * 0.5, /datum/material/glass= SMALL_MATERIAL_AMOUNT * 0.2)
 	actions_types = list(/datum/action/item_action/toggle_light)
 	light_system = OVERLAY_LIGHT_DIRECTIONAL
+	light_color = COLOR_LIGHT_ORANGE
 	light_range = 4
 	light_power = 1
 	light_on = FALSE
@@ -295,6 +296,8 @@
 	w_class = WEIGHT_CLASS_TINY
 	obj_flags = CONDUCTS_ELECTRICITY
 	light_range = 2
+	light_power = 0.8
+	light_color = "#CCFFFF"
 	COOLDOWN_DECLARE(holosign_cooldown)
 
 /obj/item/flashlight/pen/afterattack(atom/target, mob/user, proximity_flag)
@@ -352,6 +355,8 @@
 	righthand_file = 'icons/mob/inhands/equipment/security_righthand.dmi'
 	force = 9 // Not as good as a stun baton.
 	light_range = 5 // A little better than the standard flashlight.
+	light_power = 0.8
+	light_color = "#99ccff"
 	hitsound = 'sound/weapons/genhit1.ogg'
 
 // the desk lamps are a bit special
@@ -398,6 +403,7 @@
 	heat = 1000
 	light_color = LIGHT_COLOR_FLARE
 	light_system = OVERLAY_LIGHT
+	light_power = 2
 	grind_results = list(/datum/reagent/sulfur = 15)
 	sound_on = 'sound/items/match_strike.ogg'
 	toggle_context = FALSE
@@ -523,8 +529,9 @@
 	righthand_file = 'icons/mob/inhands/items_righthand.dmi'
 	w_class = WEIGHT_CLASS_TINY
 	heat = 1000
-	light_color = LIGHT_COLOR_FIRE
 	light_range = 2
+	light_power = 1.5
+	light_color = LIGHT_COLOR_FIRE
 	fuel = 35 MINUTES
 	randomize_fuel = FALSE
 	trash_type = /obj/item/trash/candle
@@ -638,6 +645,7 @@
 	name = "torch"
 	desc = "A torch fashioned from some leaves and a log."
 	light_range = 4
+	light_power = 1.3
 	icon_state = "torch"
 	inhand_icon_state = "torch"
 	lefthand_file = 'icons/mob/inhands/items_lefthand.dmi'
@@ -655,20 +663,24 @@
 	lefthand_file = 'icons/mob/inhands/equipment/mining_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/equipment/mining_righthand.dmi'
 	desc = "A mining lantern."
-	light_range = 6 // luminosity when on
+	light_range = 5 // luminosity when on
+	light_power = 1.5
+	light_color = "#ffcc66"
 	light_system = OVERLAY_LIGHT
 
 /obj/item/flashlight/lantern/heirloom_moth
 	name = "old lantern"
 	desc = "An old lantern that has seen plenty of use."
-	light_range = 4
+	light_range = 3.5
 
 /obj/item/flashlight/lantern/syndicate
 	name = "suspicious lantern"
 	desc = "A suspicious looking lantern."
 	icon_state = "syndilantern"
 	inhand_icon_state = "syndilantern"
-	light_range = 10
+	light_range = 6
+	light_power = 2
+	light_color = "#ffffe6"
 
 /obj/item/flashlight/lantern/jade
 	name = "jade lantern"
@@ -686,7 +698,8 @@
 	w_class = WEIGHT_CLASS_SMALL
 	slot_flags = ITEM_SLOT_BELT
 	custom_materials = null
-	light_range = 7 //luminosity when on
+	light_range = 6 //luminosity when on
+	light_color = "#ffff66"
 	light_system = OVERLAY_LIGHT
 
 /obj/item/flashlight/emp
@@ -752,7 +765,8 @@
 	desc = "A military-grade glowstick."
 	custom_price = PAYCHECK_LOWER
 	w_class = WEIGHT_CLASS_SMALL
-	light_range = 4
+	light_range = 3.5
+	light_power = 2
 	light_system = OVERLAY_LIGHT
 	color = LIGHT_COLOR_GREEN
 	icon_state = "glowstick"
@@ -908,7 +922,7 @@
 	icon_state = null
 	light_system = OVERLAY_LIGHT
 	light_range = 4
-	light_power = 10
+	light_power = 2
 	alpha = 0
 	plane = FLOOR_PLANE
 	anchored = TRUE
@@ -953,9 +967,6 @@
 /obj/item/flashlight/eyelight
 	name = "eyelight"
 	desc = "This shouldn't exist outside of someone's head, how are you seeing this?"
-	light_system = OVERLAY_LIGHT
-	light_range = 15
-	light_power = 1
 	obj_flags = CONDUCTS_ELECTRICITY
 	item_flags = DROPDEL
 	actions_types = list()

code/game/objects/items/flamethrower.dm

@@ -16,6 +16,9 @@
 	resistance_flags = FIRE_PROOF
 	trigger_guard = TRIGGER_GUARD_NORMAL
 	light_system = OVERLAY_LIGHT
+	light_color = LIGHT_COLOR_FLARE
+	light_range = 2
+	light_power = 2
 	light_on = FALSE
 	var/status = FALSE
 	var/lit = FALSE //on or off

code/game/objects/items/stacks/golem_food/golem_status_effects.dm

@@ -433,15 +433,14 @@
 	var/glow_range = 3
 	var/glow_power = 1
 	var/glow_color = LIGHT_COLOR_DEFAULT
-	var/datum/component/overlay_lighting/lightbulb
+	var/obj/effect/dummy/lighting_obj/moblight/lightbulb
 
 /datum/status_effect/golem_lightbulb/on_apply()
 	. = ..()
 	if (!.)
 		return
 	to_chat(owner, span_notice("You start to emit a healthy glow."))
-	owner.light_system = OVERLAY_LIGHT
-	lightbulb = owner.AddComponent(/datum/component/overlay_lighting, _range = glow_range, _power = glow_power, _color = glow_color)
+	lightbulb = owner.mob_light(glow_range, glow_power, glow_color)
 	owner.add_filter(LIGHTBULB_FILTER, 2, list("type" = "outline", "color" = glow_color, "alpha" = 60, "size" = 1))
 
 /datum/status_effect/golem_lightbulb/on_remove()

code/game/objects/items/tools/weldingtool.dm

@@ -19,7 +19,7 @@
 	pickup_sound = 'sound/items/handling/weldingtool_pickup.ogg'
 	light_system = OVERLAY_LIGHT
 	light_range = 2
-	light_power = 0.75
+	light_power = 1.5
 	light_color = LIGHT_COLOR_FIRE
 	light_on = FALSE
 	throw_speed = 3