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

+1-1
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

+6-6
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

+1-1
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

+2-2
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

+3-3
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

+1-1
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

+1-1
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

+1-1
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

+1-1
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

+5-5
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

‎code/modules/clothing/head/cone.dm

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@
1818
/obj/item/clothing/head/cone/worn_overlays(mob/living/carbon/human/wearer, mutable_appearance/standing, isinhands, icon_file)
1919
. = ..()
2020
if(!isinhands)
21-
. += emissive_appearance(icon_file, "[icon_state]-emissive", alpha = src.alpha)
21+
. += emissive_appearance(icon_file, "[icon_state]-emissive", alpha = 90)
2222

2323

‎code/modules/clothing/suits/jobs.dm

+1-1
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@
125125
/obj/item/clothing/suit/hazardvest/worn_overlays(mob/living/carbon/human/wearer, mutable_appearance/standing, isinhands, icon_file)
126126
. = ..()
127127
if(!isinhands)
128-
. += emissive_appearance(icon_file, "[icon_state]-emissive", alpha = src.alpha)
128+
. += emissive_appearance(icon_file, "[icon_state]-emissive", alpha = 90)
129129

130130
//Lawyer
131131
/obj/item/clothing/suit/toggle/lawyer

‎code/modules/clothing/suits/utility.dm

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
/obj/item/clothing/suit/fire/worn_overlays(mob/living/carbon/human/wearer, mutable_appearance/standing, isinhands, icon_file)
3333
. = ..()
3434
if(!isinhands)
35-
. += emissive_appearance(icon_file, "[icon_state]-emissive", alpha = src.alpha)
35+
. += emissive_appearance(icon_file, "[icon_state]-emissive", alpha = 90)
3636

3737
/obj/item/clothing/suit/fire/firefighter
3838
icon_state = "firesuit"
@@ -159,4 +159,4 @@
159159
/obj/item/clothing/suit/radiation/worn_overlays(mob/living/carbon/human/wearer, mutable_appearance/standing, isinhands, icon_file)
160160
. = ..()
161161
if(!isinhands)
162-
. += emissive_appearance(icon_file, "[icon_state]-emissive", alpha = src.alpha)
162+
. += emissive_appearance(icon_file, "[icon_state]-emissive", alpha = 90)

‎code/modules/clothing/suits/wintercoats.dm

+2-2
Original file line numberDiff line numberDiff line change
@@ -347,7 +347,7 @@
347347
/obj/item/clothing/suit/hooded/wintercoat/engineering/worn_overlays(mob/living/carbon/human/wearer, mutable_appearance/standing, isinhands, icon_file)
348348
. = ..()
349349
if(!isinhands)
350-
. += emissive_appearance(icon_file, "[icon_state]-emissive", alpha = src.alpha)
350+
. += emissive_appearance(icon_file, "[icon_state]-emissive", alpha = 90)
351351

352352
/obj/item/clothing/head/hooded/winterhood/engineering
353353
desc = "A yellow winter coat hood. Definitely not a replacement for a hard hat."
@@ -358,7 +358,7 @@
358358
/obj/item/clothing/head/hooded/winterhood/engineering/worn_overlays(mob/living/carbon/human/wearer, mutable_appearance/standing, isinhands, icon_file)
359359
. = ..()
360360
if(!isinhands)
361-
. += emissive_appearance(icon_file, "[icon_state]-emissive", alpha = src.alpha)
361+
. += emissive_appearance(icon_file, "[icon_state]-emissive", alpha = 90)
362362

363363
// Chief Engineer
364364
/obj/item/clothing/suit/hooded/wintercoat/engineering/ce

‎code/modules/detectivework/dna_analyzer.dm

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
if(working)
2121
. += "dna_working"
22-
. += emissive_appearance(icon, "dna_screen_working")
22+
. += emissive_appearance(icon, "dna_screen_working", alpha = 90)
2323
. += "dna_screen_working"
2424
else
2525
. += "dna_closed"

‎code/modules/detectivework/microscope.dm

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@
1313
/obj/machinery/microscope/update_overlays()
1414
. = ..()
1515
if(!(machine_stat & NOPOWER))
16-
. += emissive_appearance(icon, "[icon_state]_lights")
16+
. += emissive_appearance(icon, "[icon_state]_lights", alpha = 90)
1717
. += "[icon_state]_lights"
1818
if(sample)
19-
. += emissive_appearance(icon, "[icon_state]_lights_working")
19+
. += emissive_appearance(icon, "[icon_state]_lights_working", alpha = 90)
2020
. +="[icon_state]_lights_working"
2121

2222
/obj/machinery/microscope/attackby(obj/item/weapon, mob/user, params)

‎code/modules/food_and_drinks/kitchen_machinery/oven.dm

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
else
5757
. += mutable_appearance(icon, "oven_lid_closed")
5858
if(used_tray?.contents.len)
59-
. += emissive_appearance(icon, "oven_light_mask", alpha = src.alpha)
59+
. += emissive_appearance(icon, "oven_light_mask", alpha = 90)
6060

6161
/obj/machinery/oven/process(delta_time)
6262
..()

‎code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
/obj/machinery/smartfridge/update_overlays()
6969
. = ..()
7070
if(!machine_stat)
71-
. += emissive_appearance(icon, "[initial(icon_state)]-light-mask", alpha = src.alpha)
71+
. += emissive_appearance(icon, "[initial(icon_state)]-light-mask", alpha = 90)
7272

7373
/obj/machinery/smartfridge/wrench_act(mob/living/user, obj/item/tool)
7474
. = ..()

‎code/modules/holomap/holomap.dm

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/holomap, 32)
5858

5959
if(!bogus && is_operational && SSholomap.initialized && (initial_z <= length(SSholomap.minimaps)))
6060
. += SSholomap.minimaps[initial_z]["[dir]"]
61-
. += emissive_appearance(SSholomap.minimap_icons[initial_z]["[dir]"])
61+
. += emissive_appearance(SSholomap.minimap_icons[initial_z]["[dir]"], alpha = 90)
6262

6363
/obj/machinery/holomap/update_icon_state()
6464
if(is_operational)

‎code/modules/power/apc/apc_appearance.dm

+5-5
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,9 @@
5555
return
5656

5757
. += mutable_appearance(icon, "apcox-[locked]")
58-
. += emissive_appearance(icon, "apcox-[locked]")
58+
. += emissive_appearance(icon, "apcox-[locked]", alpha = 90)
5959
. += mutable_appearance(icon, "apco3-[charging]")
60-
. += emissive_appearance(icon, "apco3-[charging]")
60+
. += emissive_appearance(icon, "apco3-[charging]", alpha = 90)
6161
if(!operating)
6262
return
6363

@@ -73,17 +73,17 @@
7373
colorbuffer = mutable_appearance(icon, "apco0")
7474
colorbuffer.color = map_apc_statcode_to_color[equipment+1]
7575
. += colorbuffer
76-
. += emissive_appearance(icon, "apco0")
76+
. += emissive_appearance(icon, "apco0", alpha = 90)
7777

7878
colorbuffer = mutable_appearance(icon, "apco1")
7979
colorbuffer.color = map_apc_statcode_to_color[lighting+1]
8080
. += colorbuffer
8181
. += emissive_appearance(icon, "apco1")
8282

83-
colorbuffer = mutable_appearance(icon, "apco2")
83+
colorbuffer = mutable_appearance(icon, "apco2", alpha = 90)
8484
colorbuffer.color = map_apc_statcode_to_color[environ+1]
8585
. += colorbuffer
86-
. += emissive_appearance(icon, "apco2")
86+
. += emissive_appearance(icon, "apco2", alpha = 90)
8787

8888
/// Checks for what icon updates we will need to handle
8989
/obj/machinery/power/apc/proc/check_updates()

‎code/modules/power/generator.dm

+2-2
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,10 @@
5454
var/L = min(round(lastgenlev / 100000), 8)
5555
if(L != 0)
5656
. += mutable_appearance(icon, "teg-op[L]")
57-
. += emissive_appearance(icon, "teg-op[L]")
57+
. += emissive_appearance(icon, "teg-op[L]", alpha = 90)
5858
if(circ1 && circ2)
5959
. += mutable_appearance(icon, "teg-oc[lastcirc]")
60-
. += emissive_appearance(icon, "teg-oc[lastcirc]")
60+
. += emissive_appearance(icon, "teg-oc[lastcirc]", alpha = 90)
6161

6262

6363
#define GENRATE 800 // generator output coefficient from Q

‎code/modules/recycling/disposal/bin.dm

+3-3
Original file line numberDiff line numberDiff line change
@@ -389,15 +389,15 @@
389389
//check for items in disposal - occupied light
390390
if(contents.len > 0)
391391
. += "dispover-full"
392-
. += emissive_appearance(icon, "dispover-full", alpha = src.alpha)
392+
. += emissive_appearance(icon, "dispover-full", alpha = 90)
393393

394394
//charging and ready light
395395
if(pressure_charging)
396396
. += "dispover-charge"
397-
. += emissive_appearance(icon, "dispover-charge-glow", alpha = src.alpha)
397+
. += emissive_appearance(icon, "dispover-charge-glow", alpha = 90)
398398
else if(full_pressure)
399399
. += "dispover-ready"
400-
. += emissive_appearance(icon, "dispover-ready-glow", alpha = src.alpha)
400+
. += emissive_appearance(icon, "dispover-ready-glow", alpha = 90)
401401

402402
/obj/machinery/disposal/bin/proc/do_flush()
403403
set waitfor = FALSE

‎code/modules/research/machinery/fabricator.dm

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@
2727
if(busy)
2828
. += image(icon, "fab-work3")
2929
. += image(icon, "light-working")
30-
. += emissive_appearance(icon, "light-working")
30+
. += emissive_appearance(icon, "light-working", alpha = 90)
3131
else
3232
. += image(icon, "light-ready")
33-
. += emissive_appearance(icon, "light-ready")
33+
. += emissive_appearance(icon, "light-ready", alpha = 90)
3434

3535
/// Special subtype fabricator for offstation use. Has a more limited available design selection.
3636
/obj/machinery/rnd/production/fabricator/offstation

‎code/modules/security_levels/keycard_auth/keycard_authentication.dm

+1-1
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/keycard_auth, 26)
109109

110110
if(event_source && !(machine_stat & (NOPOWER|BROKEN)))
111111
. += mutable_appearance(icon, "auth_on")
112-
. += emissive_appearance(icon, "auth_on", alpha = src.alpha)
112+
. += emissive_appearance(icon, "auth_on", alpha = 90)
113113

114114
/obj/machinery/keycard_auth/proc/sendEvent(event_type)
115115
triggerer = usr

‎code/modules/surgery/machines/bodyscanner_display.dm

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/body_scan_display, 32)
5050
return
5151

5252
. += image(icon, "operating")
53-
. += emissive_appearance(icon, "operating")
53+
. += emissive_appearance(icon, "operating", alpha = 90)
5454

5555
/obj/machinery/body_scan_display/Topic(href, href_list)
5656
. = ..()

0 commit comments

Comments
 (0)