Skip to content

Commit f37eb56

Browse files
Kapu1178Kapu1178
committed
darken most emissives
1 parent ec7a28b commit f37eb56

File tree

28 files changed

+67
-67
lines changed

28 files changed

+67
-67
lines changed

‎code/game/machinery/computer/_computer.dm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ DEFINE_INTERACTABLE(/obj/machinery/computer)
4848
return
4949

5050
. += mutable_appearance(icon, icon_screen)
51-
. += emissive_appearance(icon, icon_screen)
51+
. += emissive_appearance(icon, icon_screen, alpha = 90)
5252

5353
/obj/machinery/computer/power_change()
5454
. = ..()

‎code/game/machinery/firealarm.dm

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -129,25 +129,25 @@ DEFINE_INTERACTABLE(/obj/machinery/firealarm)
129129
. += mutable_appearance(icon, "fire_overlay")
130130
if(is_station_level(z))
131131
. += mutable_appearance(icon, "fire_[SSsecurity_level.current_level]")
132-
. += emissive_appearance(icon, "fire_[SSsecurity_level.current_level]", alpha = src.alpha)
132+
. += emissive_appearance(icon, "fire_[SSsecurity_level.current_level]", alpha = 90)
133133
else
134134
. += mutable_appearance(icon, "fire_[SEC_LEVEL_GREEN]")
135-
. += emissive_appearance(icon, "fire_[SEC_LEVEL_GREEN]", alpha = src.alpha)
135+
. += emissive_appearance(icon, "fire_[SEC_LEVEL_GREEN]", alpha = 90)
136136

137137
if(!alert_type)
138138
if(my_area?.fire_detect) //If this is false, leave the green light missing. A good hint to anyone paying attention.
139139
. += mutable_appearance(icon, "fire_off")
140-
. += emissive_appearance(icon, "fire_off", alpha = src.alpha)
140+
. += emissive_appearance(icon, "fire_off", alpha = 90)
141141
else if(obj_flags & EMAGGED)
142142
. += mutable_appearance(icon, "fire_emagged")
143-
. += emissive_appearance(icon, "fire_emagged", alpha = src.alpha)
143+
. += emissive_appearance(icon, "fire_emagged", alpha = 90)
144144
else
145145
. += mutable_appearance(icon, "fire_on")
146-
. += emissive_appearance(icon, "fire_on", alpha = src.alpha)
146+
. += emissive_appearance(icon, "fire_on", alpha = 90)
147147

148148
if(!panel_open && alert_type) //It just looks horrible with the panel open
149149
. += mutable_appearance(icon, "fire_detected")
150-
. += emissive_appearance(icon, "fire_detected", alpha = src.alpha) //Pain
150+
. += emissive_appearance(icon, "fire_detected", alpha = 90) //Pain
151151

152152
/obj/machinery/firealarm/emp_act(severity)
153153
. = ..()

‎code/game/machinery/lightswitch.dm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/light_switch, 26)
8080
if(is_operational)
8181
var/target_state = "[base_icon_state]-[(area.lightswitch ? "on" : "off")]"
8282
. += mutable_appearance(icon, target_state, alpha = src.alpha)
83-
. += emissive_appearance(icon, target_state, alpha = src.alpha)
83+
. += emissive_appearance(icon, target_state, alpha = 90)
8484
else
8585
if(panel_open && has_wires)
8686
. += mutable_appearance(icon, "[base_icon_state]-wires")

‎code/game/machinery/newscaster/newscaster_machine.dm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,11 +83,11 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/newscaster, 30)
8383
if(!(machine_stat & (NOPOWER|BROKEN)))
8484
var/state = "[base_icon_state]_[GLOB.news_network.wanted_issue.active ? "wanted" : "normal"]"
8585
. += mutable_appearance(icon, state)
86-
. += emissive_appearance(icon, state, alpha = src.alpha)
86+
. += emissive_appearance(icon, state, alpha = 90)
8787

8888
if(GLOB.news_network.wanted_issue.active && alert)
8989
. += mutable_appearance(icon, "[base_icon_state]_alert")
90-
. += emissive_appearance(icon, "[base_icon_state]_alert", alpha = src.alpha)
90+
. += emissive_appearance(icon, "[base_icon_state]_alert", alpha = 90)
9191

9292
var/hp_percent = atom_integrity * 100 / max_integrity
9393
switch(hp_percent)

‎code/game/machinery/recharger.dm

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -191,13 +191,13 @@
191191

192192
if(!charging)
193193
. += mutable_appearance(icon, "[base_icon_state]-empty", alpha = src.alpha)
194-
. += emissive_appearance(icon, "[base_icon_state]-empty", alpha = src.alpha)
194+
. += emissive_appearance(icon, "[base_icon_state]-empty", alpha = 90)
195195
return
196196

197197
if(using_power)
198198
. += mutable_appearance(icon, "[base_icon_state]-charging", alpha = src.alpha)
199-
. += emissive_appearance(icon, "[base_icon_state]-charging", alpha = src.alpha)
199+
. += emissive_appearance(icon, "[base_icon_state]-charging", alpha = 90)
200200
return
201201

202202
. += mutable_appearance(icon, "[base_icon_state]-full", alpha = src.alpha)
203-
. += emissive_appearance(icon, "[base_icon_state]-full", alpha = src.alpha)
203+
. += emissive_appearance(icon, "[base_icon_state]-full", alpha = 90)

‎code/game/machinery/requests_console.dm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/requests_console, 30)
106106
screen_state = "[base_icon_state]0"
107107

108108
. += mutable_appearance(icon, screen_state)
109-
. += emissive_appearance(icon, screen_state, alpha = src.alpha)
109+
. += emissive_appearance(icon, screen_state, alpha = 90)
110110

111111
/obj/machinery/requests_console/Initialize(mapload)
112112
. = ..()

‎code/game/machinery/status_display.dm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@
170170
if(message1 == "" && message2 == "")
171171
return
172172

173-
. += emissive_appearance(icon, "outline", alpha = src.alpha)
173+
. += emissive_appearance(icon, "outline", alpha = 90)
174174

175175
// Timed process - performs nothing in the base class
176176
/obj/machinery/status_display/process()

‎code/game/objects/structures/crates_lockers/closets.dm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ DEFINE_INTERACTABLE(/obj/structure/closet)
135135
if(broken || !secure)
136136
return
137137
//Overlay is similar enough for both that we can use the same mask for both
138-
. += emissive_appearance(icon, "locked", alpha = src.alpha)
138+
. += emissive_appearance(icon, "locked", alpha = 90)
139139
. += locked ? "locked" : "unlocked"
140140

141141
/// Animates the closet door opening and closing

‎code/modules/atmospherics/machinery/airalarm.dm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -672,7 +672,7 @@ DEFINE_INTERACTABLE(/obj/machinery/airalarm)
672672
state = "alarm1"
673673

674674
. += mutable_appearance(icon, state)
675-
. += emissive_appearance(icon, state, alpha = src.alpha)
675+
. += emissive_appearance(icon, state, alpha = 90)
676676

677677
/obj/machinery/airalarm/fire_act(exposed_temperature, exposed_volume, turf/adjacent)
678678
. = ..()

‎code/modules/atmospherics/machinery/portable/canister.dm

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,7 @@ GLOBAL_LIST_INIT(gas_id_to_canister, init_gas_id_to_canister())
318318

319319
if(shielding_powered)
320320
. += mutable_appearance(canister_overlay_file, "shielding")
321-
. += emissive_appearance(canister_overlay_file, "shielding")
321+
. += emissive_appearance(canister_overlay_file, "shielding", alpha = 90)
322322

323323
if(cell_container_opened)
324324
. += mutable_appearance(canister_overlay_file, "cell_hatch")
@@ -337,16 +337,16 @@ GLOBAL_LIST_INIT(gas_id_to_canister, init_gas_id_to_canister())
337337
switch(air_pressure)
338338
if((40 * ONE_ATMOSPHERE) to INFINITY)
339339
. += mutable_appearance(canister_overlay_file, "can-3")
340-
. += emissive_appearance(canister_overlay_file, "can-3-light", alpha = src.alpha)
340+
. += emissive_appearance(canister_overlay_file, "can-3-light", alpha = 90)
341341
if((10 * ONE_ATMOSPHERE) to (40 * ONE_ATMOSPHERE))
342342
. += mutable_appearance(canister_overlay_file, "can-2")
343-
. += emissive_appearance(canister_overlay_file, "can-2-light", alpha = src.alpha)
343+
. += emissive_appearance(canister_overlay_file, "can-2-light", alpha = 90)
344344
if((5 * ONE_ATMOSPHERE) to (10 * ONE_ATMOSPHERE))
345345
. += mutable_appearance(canister_overlay_file, "can-1")
346-
. += emissive_appearance(canister_overlay_file, "can-1-light", alpha = src.alpha)
346+
. += emissive_appearance(canister_overlay_file, "can-1-light", alpha = 90)
347347
if((10) to (5 * ONE_ATMOSPHERE))
348348
. += mutable_appearance(canister_overlay_file, "can-0")
349-
. += emissive_appearance(canister_overlay_file, "can-0-light", alpha = src.alpha)
349+
. += emissive_appearance(canister_overlay_file, "can-0-light", alpha = 90)
350350

351351
update_window()
352352

0 commit comments

Comments
 (0)