darken most emissives

Kapu1178 · Kapu1178 · commit f37eb56ffd7a · 2024-12-02T22:46:24.000-05:00
diff --git a/code/game/machinery/computer/_computer.dm b/code/game/machinery/computer/_computer.dm
@@ -48,7 +48,7 @@ DEFINE_INTERACTABLE(/obj/machinery/computer)
 		return
 
 	. += mutable_appearance(icon, icon_screen)
-	. += emissive_appearance(icon, icon_screen)
+	. += emissive_appearance(icon, icon_screen, alpha = 90)
 
 /obj/machinery/computer/power_change()
 	. = ..()
diff --git a/code/game/machinery/firealarm.dm b/code/game/machinery/firealarm.dm
@@ -129,25 +129,25 @@ DEFINE_INTERACTABLE(/obj/machinery/firealarm)
 	. += mutable_appearance(icon, "fire_overlay")
 	if(is_station_level(z))
 		. += mutable_appearance(icon, "fire_[SSsecurity_level.current_level]")
-		. += emissive_appearance(icon, "fire_[SSsecurity_level.current_level]", alpha = src.alpha)
+		. += emissive_appearance(icon, "fire_[SSsecurity_level.current_level]", alpha = 90)
 	else
 		. += mutable_appearance(icon, "fire_[SEC_LEVEL_GREEN]")
-		. += emissive_appearance(icon, "fire_[SEC_LEVEL_GREEN]", alpha = src.alpha)
+		. += emissive_appearance(icon, "fire_[SEC_LEVEL_GREEN]", alpha = 90)
 
 	if(!alert_type)
 		if(my_area?.fire_detect) //If this is false, leave the green light missing. A good hint to anyone paying attention.
 			. += mutable_appearance(icon, "fire_off")
-			. += emissive_appearance(icon, "fire_off", alpha = src.alpha)
+			. += emissive_appearance(icon, "fire_off", alpha = 90)
 	else if(obj_flags & EMAGGED)
 		. += mutable_appearance(icon, "fire_emagged")
-		. += emissive_appearance(icon, "fire_emagged", alpha = src.alpha)
+		. += emissive_appearance(icon, "fire_emagged", alpha = 90)
 	else
 		. += mutable_appearance(icon, "fire_on")
-		. += emissive_appearance(icon, "fire_on", alpha = src.alpha)
+		. += emissive_appearance(icon, "fire_on", alpha = 90)
 
 	if(!panel_open && alert_type) //It just looks horrible with the panel open
 		. += mutable_appearance(icon, "fire_detected")
-		. += emissive_appearance(icon, "fire_detected", alpha = src.alpha) //Pain
+		. += emissive_appearance(icon, "fire_detected", alpha = 90) //Pain
 
 /obj/machinery/firealarm/emp_act(severity)
 	. = ..()
diff --git a/code/game/machinery/lightswitch.dm b/code/game/machinery/lightswitch.dm
@@ -80,7 +80,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/light_switch, 26)
 	if(is_operational)
 		var/target_state = "[base_icon_state]-[(area.lightswitch ? "on" : "off")]"
 		. += mutable_appearance(icon, target_state, alpha = src.alpha)
-		. += emissive_appearance(icon, target_state, alpha = src.alpha)
+		. += emissive_appearance(icon, target_state, alpha = 90)
 	else
 		if(panel_open && has_wires)
 			. += mutable_appearance(icon, "[base_icon_state]-wires")
diff --git a/code/game/machinery/newscaster/newscaster_machine.dm b/code/game/machinery/newscaster/newscaster_machine.dm
@@ -83,11 +83,11 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/newscaster, 30)
 	if(!(machine_stat & (NOPOWER|BROKEN)))
 		var/state = "[base_icon_state]_[GLOB.news_network.wanted_issue.active ? "wanted" : "normal"]"
 		. += mutable_appearance(icon, state)
-		. += emissive_appearance(icon, state, alpha = src.alpha)
+		. += emissive_appearance(icon, state, alpha = 90)
 
 		if(GLOB.news_network.wanted_issue.active && alert)
 			. += mutable_appearance(icon, "[base_icon_state]_alert")
-			. += emissive_appearance(icon, "[base_icon_state]_alert", alpha = src.alpha)
+			. += emissive_appearance(icon, "[base_icon_state]_alert", alpha = 90)
 
 	var/hp_percent = atom_integrity * 100 / max_integrity
 	switch(hp_percent)
diff --git a/code/game/machinery/recharger.dm b/code/game/machinery/recharger.dm
@@ -191,13 +191,13 @@
 
 	if(!charging)
 		. += mutable_appearance(icon, "[base_icon_state]-empty", alpha = src.alpha)
-		. += emissive_appearance(icon, "[base_icon_state]-empty", alpha = src.alpha)
+		. += emissive_appearance(icon, "[base_icon_state]-empty", alpha = 90)
 		return
 
 	if(using_power)
 		. += mutable_appearance(icon, "[base_icon_state]-charging", alpha = src.alpha)
-		. += emissive_appearance(icon, "[base_icon_state]-charging", alpha = src.alpha)
+		. += emissive_appearance(icon, "[base_icon_state]-charging", alpha = 90)
 		return
 
 	. += mutable_appearance(icon, "[base_icon_state]-full", alpha = src.alpha)
-	. += emissive_appearance(icon, "[base_icon_state]-full", alpha = src.alpha)
+	. += emissive_appearance(icon, "[base_icon_state]-full", alpha = 90)
diff --git a/code/game/machinery/requests_console.dm b/code/game/machinery/requests_console.dm
@@ -106,7 +106,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/requests_console, 30)
 		screen_state = "[base_icon_state]0"
 
 	. += mutable_appearance(icon, screen_state)
-	. += emissive_appearance(icon, screen_state, alpha = src.alpha)
+	. += emissive_appearance(icon, screen_state, alpha = 90)
 
 /obj/machinery/requests_console/Initialize(mapload)
 	. = ..()
diff --git a/code/game/machinery/status_display.dm b/code/game/machinery/status_display.dm
@@ -170,7 +170,7 @@
 			if(message1 == "" && message2 == "")
 				return
 
-	. += emissive_appearance(icon, "outline", alpha = src.alpha)
+	. += emissive_appearance(icon, "outline", alpha = 90)
 
 // Timed process - performs nothing in the base class
 /obj/machinery/status_display/process()
diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm
@@ -135,7 +135,7 @@ DEFINE_INTERACTABLE(/obj/structure/closet)
 	if(broken || !secure)
 		return
 	//Overlay is similar enough for both that we can use the same mask for both
-	. += emissive_appearance(icon, "locked", alpha = src.alpha)
+	. += emissive_appearance(icon, "locked", alpha = 90)
 	. += locked ? "locked" : "unlocked"
 
 /// Animates the closet door opening and closing
diff --git a/code/modules/atmospherics/machinery/airalarm.dm b/code/modules/atmospherics/machinery/airalarm.dm
@@ -672,7 +672,7 @@ DEFINE_INTERACTABLE(/obj/machinery/airalarm)
 			state = "alarm1"
 
 	. += mutable_appearance(icon, state)
-	. += emissive_appearance(icon, state, alpha = src.alpha)
+	. += emissive_appearance(icon, state, alpha = 90)
 
 /obj/machinery/airalarm/fire_act(exposed_temperature, exposed_volume, turf/adjacent)
 	. = ..()
diff --git a/code/modules/atmospherics/machinery/portable/canister.dm b/code/modules/atmospherics/machinery/portable/canister.dm
@@ -318,7 +318,7 @@ GLOBAL_LIST_INIT(gas_id_to_canister, init_gas_id_to_canister())
 
 	if(shielding_powered)
 		. += mutable_appearance(canister_overlay_file, "shielding")
-		. += emissive_appearance(canister_overlay_file, "shielding")
+		. += emissive_appearance(canister_overlay_file, "shielding", alpha = 90)
 
 	if(cell_container_opened)
 		. += mutable_appearance(canister_overlay_file, "cell_hatch")
@@ -337,16 +337,16 @@ GLOBAL_LIST_INIT(gas_id_to_canister, init_gas_id_to_canister())
 	switch(air_pressure)
 		if((40 * ONE_ATMOSPHERE) to INFINITY)
 			. += mutable_appearance(canister_overlay_file, "can-3")
-			. += emissive_appearance(canister_overlay_file, "can-3-light", alpha = src.alpha)
+			. += emissive_appearance(canister_overlay_file, "can-3-light", alpha = 90)
 		if((10 * ONE_ATMOSPHERE) to (40 * ONE_ATMOSPHERE))
 			. += mutable_appearance(canister_overlay_file, "can-2")
-			. += emissive_appearance(canister_overlay_file, "can-2-light", alpha = src.alpha)
+			. += emissive_appearance(canister_overlay_file, "can-2-light", alpha = 90)
 		if((5 * ONE_ATMOSPHERE) to (10 * ONE_ATMOSPHERE))
 			. += mutable_appearance(canister_overlay_file, "can-1")
-			. += emissive_appearance(canister_overlay_file, "can-1-light", alpha = src.alpha)
+			. += emissive_appearance(canister_overlay_file, "can-1-light", alpha = 90)
 		if((10) to (5 * ONE_ATMOSPHERE))
 			. += mutable_appearance(canister_overlay_file, "can-0")
-			. += emissive_appearance(canister_overlay_file, "can-0-light", alpha = src.alpha)
+			. += emissive_appearance(canister_overlay_file, "can-0-light", alpha = 90)
 
 	update_window()
 
diff --git a/code/modules/clothing/head/cone.dm b/code/modules/clothing/head/cone.dm
@@ -18,6 +18,6 @@
 /obj/item/clothing/head/cone/worn_overlays(mob/living/carbon/human/wearer, mutable_appearance/standing, isinhands, icon_file)
 	. = ..()
 	if(!isinhands)
-		. += emissive_appearance(icon_file, "[icon_state]-emissive", alpha = src.alpha)
+		. += emissive_appearance(icon_file, "[icon_state]-emissive", alpha = 90)
 
 
diff --git a/code/modules/clothing/suits/jobs.dm b/code/modules/clothing/suits/jobs.dm
@@ -125,7 +125,7 @@
 /obj/item/clothing/suit/hazardvest/worn_overlays(mob/living/carbon/human/wearer, mutable_appearance/standing, isinhands, icon_file)
 	. = ..()
 	if(!isinhands)
-		. += emissive_appearance(icon_file, "[icon_state]-emissive", alpha = src.alpha)
+		. += emissive_appearance(icon_file, "[icon_state]-emissive", alpha = 90)
 
 //Lawyer
 /obj/item/clothing/suit/toggle/lawyer
diff --git a/code/modules/clothing/suits/utility.dm b/code/modules/clothing/suits/utility.dm
@@ -32,7 +32,7 @@
 /obj/item/clothing/suit/fire/worn_overlays(mob/living/carbon/human/wearer, mutable_appearance/standing, isinhands, icon_file)
 	. = ..()
 	if(!isinhands)
-		. += emissive_appearance(icon_file, "[icon_state]-emissive", alpha = src.alpha)
+		. += emissive_appearance(icon_file, "[icon_state]-emissive", alpha = 90)
 
 /obj/item/clothing/suit/fire/firefighter
 	icon_state = "firesuit"
@@ -159,4 +159,4 @@
 /obj/item/clothing/suit/radiation/worn_overlays(mob/living/carbon/human/wearer, mutable_appearance/standing, isinhands, icon_file)
 	. = ..()
 	if(!isinhands)
-		. += emissive_appearance(icon_file, "[icon_state]-emissive", alpha = src.alpha)
+		. += emissive_appearance(icon_file, "[icon_state]-emissive", alpha = 90)
diff --git a/code/modules/clothing/suits/wintercoats.dm b/code/modules/clothing/suits/wintercoats.dm
@@ -347,7 +347,7 @@
 /obj/item/clothing/suit/hooded/wintercoat/engineering/worn_overlays(mob/living/carbon/human/wearer, mutable_appearance/standing, isinhands, icon_file)
 	. = ..()
 	if(!isinhands)
-		. += emissive_appearance(icon_file, "[icon_state]-emissive", alpha = src.alpha)
+		. += emissive_appearance(icon_file, "[icon_state]-emissive", alpha = 90)
 
 /obj/item/clothing/head/hooded/winterhood/engineering
 	desc = "A yellow winter coat hood. Definitely not a replacement for a hard hat."
@@ -358,7 +358,7 @@
 /obj/item/clothing/head/hooded/winterhood/engineering/worn_overlays(mob/living/carbon/human/wearer, mutable_appearance/standing, isinhands, icon_file)
 	. = ..()
 	if(!isinhands)
-		. += emissive_appearance(icon_file, "[icon_state]-emissive", alpha = src.alpha)
+		. += emissive_appearance(icon_file, "[icon_state]-emissive", alpha = 90)
 
 // Chief Engineer
 /obj/item/clothing/suit/hooded/wintercoat/engineering/ce
diff --git a/code/modules/detectivework/dna_analyzer.dm b/code/modules/detectivework/dna_analyzer.dm
@@ -19,7 +19,7 @@
 
 	if(working)
 		. += "dna_working"
-		. += emissive_appearance(icon, "dna_screen_working")
+		. += emissive_appearance(icon, "dna_screen_working", alpha = 90)
 		. += "dna_screen_working"
 	else
 		. += "dna_closed"
diff --git a/code/modules/detectivework/microscope.dm b/code/modules/detectivework/microscope.dm
@@ -13,10 +13,10 @@
 /obj/machinery/microscope/update_overlays()
 	. = ..()
 	if(!(machine_stat & NOPOWER))
-		. += emissive_appearance(icon, "[icon_state]_lights")
+		. += emissive_appearance(icon, "[icon_state]_lights", alpha = 90)
 		. += "[icon_state]_lights"
 	if(sample)
-		. += emissive_appearance(icon, "[icon_state]_lights_working")
+		. += emissive_appearance(icon, "[icon_state]_lights_working", alpha = 90)
 		. +="[icon_state]_lights_working"
 
 /obj/machinery/microscope/attackby(obj/item/weapon, mob/user, params)
diff --git a/code/modules/food_and_drinks/kitchen_machinery/oven.dm b/code/modules/food_and_drinks/kitchen_machinery/oven.dm
@@ -56,7 +56,7 @@
 	else
 		. += mutable_appearance(icon, "oven_lid_closed")
 		if(used_tray?.contents.len)
-			. += emissive_appearance(icon, "oven_light_mask", alpha = src.alpha)
+			. += emissive_appearance(icon, "oven_light_mask", alpha = 90)
 
 /obj/machinery/oven/process(delta_time)
 	..()
diff --git a/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm b/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm
@@ -68,7 +68,7 @@
 /obj/machinery/smartfridge/update_overlays()
 	. = ..()
 	if(!machine_stat)
-		. += emissive_appearance(icon, "[initial(icon_state)]-light-mask", alpha = src.alpha)
+		. += emissive_appearance(icon, "[initial(icon_state)]-light-mask", alpha = 90)
 
 /obj/machinery/smartfridge/wrench_act(mob/living/user, obj/item/tool)
 	. = ..()
diff --git a/code/modules/holomap/holomap.dm b/code/modules/holomap/holomap.dm
@@ -58,7 +58,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/holomap, 32)
 
 	if(!bogus && is_operational && SSholomap.initialized && (initial_z <= length(SSholomap.minimaps)))
 		. += SSholomap.minimaps[initial_z]["[dir]"]
-		. += emissive_appearance(SSholomap.minimap_icons[initial_z]["[dir]"])
+		. += emissive_appearance(SSholomap.minimap_icons[initial_z]["[dir]"], alpha = 90)
 
 /obj/machinery/holomap/update_icon_state()
 	if(is_operational)
diff --git a/code/modules/power/apc/apc_appearance.dm b/code/modules/power/apc/apc_appearance.dm
@@ -55,9 +55,9 @@
 		return
 
 	. += mutable_appearance(icon, "apcox-[locked]")
-	. += emissive_appearance(icon, "apcox-[locked]")
+	. += emissive_appearance(icon, "apcox-[locked]", alpha = 90)
 	. += mutable_appearance(icon, "apco3-[charging]")
-	. += emissive_appearance(icon, "apco3-[charging]")
+	. += emissive_appearance(icon, "apco3-[charging]", alpha = 90)
 	if(!operating)
 		return
 
@@ -73,17 +73,17 @@
 	colorbuffer = mutable_appearance(icon, "apco0")
 	colorbuffer.color = map_apc_statcode_to_color[equipment+1]
 	. += colorbuffer
-	. += emissive_appearance(icon, "apco0")
+	. += emissive_appearance(icon, "apco0", alpha = 90)
 
 	colorbuffer = mutable_appearance(icon, "apco1")
 	colorbuffer.color = map_apc_statcode_to_color[lighting+1]
 	. += colorbuffer
 	. += emissive_appearance(icon, "apco1")
 
-	colorbuffer = mutable_appearance(icon, "apco2")
+	colorbuffer = mutable_appearance(icon, "apco2", alpha = 90)
 	colorbuffer.color = map_apc_statcode_to_color[environ+1]
 	. += colorbuffer
-	. += emissive_appearance(icon, "apco2")
+	. += emissive_appearance(icon, "apco2", alpha = 90)
 
 /// Checks for what icon updates we will need to handle
 /obj/machinery/power/apc/proc/check_updates()
diff --git a/code/modules/power/generator.dm b/code/modules/power/generator.dm
@@ -54,10 +54,10 @@
 	var/L = min(round(lastgenlev / 100000), 8)
 	if(L != 0)
 		. += mutable_appearance(icon, "teg-op[L]")
-		. += emissive_appearance(icon, "teg-op[L]")
+		. += emissive_appearance(icon, "teg-op[L]", alpha = 90)
 	if(circ1 && circ2)
 		. += mutable_appearance(icon, "teg-oc[lastcirc]")
-		. += emissive_appearance(icon, "teg-oc[lastcirc]")
+		. += emissive_appearance(icon, "teg-oc[lastcirc]", alpha = 90)
 
 
 #define GENRATE 800 // generator output coefficient from Q
diff --git a/code/modules/recycling/disposal/bin.dm b/code/modules/recycling/disposal/bin.dm
@@ -389,15 +389,15 @@
 	//check for items in disposal - occupied light
 	if(contents.len > 0)
 		. += "dispover-full"
-		. += emissive_appearance(icon, "dispover-full", alpha = src.alpha)
+		. += emissive_appearance(icon, "dispover-full", alpha = 90)
 
 	//charging and ready light
 	if(pressure_charging)
 		. += "dispover-charge"
-		. += emissive_appearance(icon, "dispover-charge-glow", alpha = src.alpha)
+		. += emissive_appearance(icon, "dispover-charge-glow", alpha = 90)
 	else if(full_pressure)
 		. += "dispover-ready"
-		. += emissive_appearance(icon, "dispover-ready-glow", alpha = src.alpha)
+		. += emissive_appearance(icon, "dispover-ready-glow", alpha = 90)
 
 /obj/machinery/disposal/bin/proc/do_flush()
 	set waitfor = FALSE
diff --git a/code/modules/research/machinery/fabricator.dm b/code/modules/research/machinery/fabricator.dm
@@ -27,10 +27,10 @@
 	if(busy)
 		. += image(icon, "fab-work3")
 		. += image(icon, "light-working")
-		. += emissive_appearance(icon, "light-working")
+		. += emissive_appearance(icon, "light-working", alpha = 90)
 	else
 		. += image(icon, "light-ready")
-		. += emissive_appearance(icon, "light-ready")
+		. += emissive_appearance(icon, "light-ready", alpha = 90)
 
 /// Special subtype fabricator for offstation use. Has a more limited available design selection.
 /obj/machinery/rnd/production/fabricator/offstation
diff --git a/code/modules/security_levels/keycard_auth/keycard_authentication.dm b/code/modules/security_levels/keycard_auth/keycard_authentication.dm
@@ -109,7 +109,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/keycard_auth, 26)
 
 	if(event_source && !(machine_stat & (NOPOWER|BROKEN)))
 		. += mutable_appearance(icon, "auth_on")
-		. += emissive_appearance(icon, "auth_on", alpha = src.alpha)
+		. += emissive_appearance(icon, "auth_on", alpha = 90)
 
 /obj/machinery/keycard_auth/proc/sendEvent(event_type)
 	triggerer = usr
diff --git a/code/modules/surgery/machines/bodyscanner_display.dm b/code/modules/surgery/machines/bodyscanner_display.dm
@@ -50,7 +50,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/body_scan_display, 32)
 		return
 
 	. += image(icon, "operating")
-	. += emissive_appearance(icon, "operating")
+	. += emissive_appearance(icon, "operating", alpha = 90)
 
 /obj/machinery/body_scan_display/Topic(href, href_list)
 	. = ..()
diff --git a/code/modules/surgery/machines/vitals_monitor.dm b/code/modules/surgery/machines/vitals_monitor.dm
diff --git a/code/modules/surgery/organs/external/ipc.dm b/code/modules/surgery/organs/external/ipc.dm
diff --git a/code/modules/vending/_vending.dm b/code/modules/vending/_vending.dm
