Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Aesthetic Lighting #433

Merged
merged 1 commit into from
Jul 20, 2024
+12 −9
Merged

Aesthetic Lighting #433

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Aesthetic Lighting
@dj-34
dj-34 committed Jul 20, 2024
commit 7e0234af7bbd30219eaf5c8ffe949005f5dc11be
21 changes: 12 additions & 9 deletions modular_bandastation/aesthetics/lights/code/lights.dm
View file
Original file line number Diff line number Diff line change
@@ -1,22 +1,25 @@
/obj/machinery/light
icon = 'modular_bandastation/aesthetics/lights/icons/lighting.dmi'
overlay_icon = 'modular_bandastation/aesthetics/lights/icons/lighting_overlay.dmi'
icon = 'modular_bandastation/aesthetics/lights/icons/lighting.dmi'
overlay_icon = 'modular_bandastation/aesthetics/lights/icons/lighting_overlay.dmi'
bulb_colour = "#FFF7F2"
bulb_power = 0.8
nightshift_light_power = 0.6

/obj/machinery/light/small
icon = 'icons/obj/lighting.dmi'
icon = 'icons/obj/lighting.dmi'

/obj/machinery/light/floor
icon = 'icons/obj/lighting.dmi'
overlay_icon = 'icons/obj/lighting_overlay.dmi'
icon = 'icons/obj/lighting.dmi'
overlay_icon = 'icons/obj/lighting_overlay.dmi'

/obj/structure/light_construct
icon = 'modular_bandastation/aesthetics/lights/icons/lighting.dmi'
icon = 'modular_bandastation/aesthetics/lights/icons/lighting.dmi'

/obj/structure/light_construct/small
icon = 'icons/obj/lighting.dmi'
icon = 'icons/obj/lighting.dmi'

/obj/item/wallframe/light_fixture
icon = 'modular_bandastation/aesthetics/lights/icons/lighting.dmi'
icon = 'modular_bandastation/aesthetics/lights/icons/lighting.dmi'

/obj/item/wallframe/light_fixture/small
icon = 'icons/obj/lighting.dmi'
icon = 'icons/obj/lighting.dmi'

Unchanged files with check annotations Beta

View file
code/modules/unit_tests/subsystem_init.dm
continue
message_strings += "This subsystem is marked as SS_OK_TO_FAIL_INIT. This is still a bug, but it is non-blocking."
TEST_NOTICE(src, jointext(message_strings, "\n"))

Check notice on line 22 in code/modules/unit_tests/subsystem_init.dm

GitHub Actions / Integration Tests (birdshot) / run_integration_tests

Birdshot Station: /datum/unit_test/subsystem_init 

Lua Scripting (/datum/controller/subsystem/lua) is a subsystem meant to initialize but could not get initialized.
The subsystem reported the following: Error initializing SSlua: FAILED (Couldn't find call_proc_by_id)
This subsystem is marked as SS_OK_TO_FAIL_INIT. This is still a bug, but it is non-blocking.

Check notice on line 22 in code/modules/unit_tests/subsystem_init.dm

GitHub Actions / Integration Tests (deltastation) / run_integration_tests

Delta Station: /datum/unit_test/subsystem_init 

Lua Scripting (/datum/controller/subsystem/lua) is a subsystem meant to initialize but could not get initialized.
The subsystem reported the following: Error initializing SSlua: FAILED (Couldn't find call_proc_by_id)
This subsystem is marked as SS_OK_TO_FAIL_INIT. This is still a bug, but it is non-blocking.

Check notice on line 22 in code/modules/unit_tests/subsystem_init.dm

GitHub Actions / Integration Tests (gateway_test) / run_integration_tests

Gateway Test: /datum/unit_test/subsystem_init 

Lua Scripting (/datum/controller/subsystem/lua) is a subsystem meant to initialize but could not get initialized.
The subsystem reported the following: Error initializing SSlua: FAILED (Couldn't find call_proc_by_id)
This subsystem is marked as SS_OK_TO_FAIL_INIT. This is still a bug, but it is non-blocking.

Check notice on line 22 in code/modules/unit_tests/subsystem_init.dm

GitHub Actions / Integration Tests (icebox) / run_integration_tests

Ice Box Station: /datum/unit_test/subsystem_init 

Lua Scripting (/datum/controller/subsystem/lua) is a subsystem meant to initialize but could not get initialized.
The subsystem reported the following: Error initializing SSlua: FAILED (Couldn't find call_proc_by_id)
This subsystem is marked as SS_OK_TO_FAIL_INIT. This is still a bug, but it is non-blocking.

Check notice on line 22 in code/modules/unit_tests/subsystem_init.dm

GitHub Actions / Integration Tests (metastation) / run_integration_tests

MetaStation: /datum/unit_test/subsystem_init 

Lua Scripting (/datum/controller/subsystem/lua) is a subsystem meant to initialize but could not get initialized.
The subsystem reported the following: Error initializing SSlua: FAILED (Couldn't find call_proc_by_id)
This subsystem is marked as SS_OK_TO_FAIL_INIT. This is still a bug, but it is non-blocking.

Check notice on line 22 in code/modules/unit_tests/subsystem_init.dm

GitHub Actions / Integration Tests (multiz_debug) / run_integration_tests

MultiZ Debug: /datum/unit_test/subsystem_init 

Lua Scripting (/datum/controller/subsystem/lua) is a subsystem meant to initialize but could not get initialized.
The subsystem reported the following: Error initializing SSlua: FAILED (Couldn't find call_proc_by_id)
This subsystem is marked as SS_OK_TO_FAIL_INIT. This is still a bug, but it is non-blocking.

Check notice on line 22 in code/modules/unit_tests/subsystem_init.dm

GitHub Actions / Integration Tests (northstar) / run_integration_tests

NorthStar: /datum/unit_test/subsystem_init 

Lua Scripting (/datum/controller/subsystem/lua) is a subsystem meant to initialize but could not get initialized.
The subsystem reported the following: Error initializing SSlua: FAILED (Couldn't find call_proc_by_id)
This subsystem is marked as SS_OK_TO_FAIL_INIT. This is still a bug, but it is non-blocking.

Check notice on line 22 in code/modules/unit_tests/subsystem_init.dm

GitHub Actions / Integration Tests (runtimestation) / run_integration_tests

Runtime Station: /datum/unit_test/subsystem_init 

Lua Scripting (/datum/controller/subsystem/lua) is a subsystem meant to initialize but could not get initialized.
The subsystem reported the following: Error initializing SSlua: FAILED (Couldn't find call_proc_by_id)
This subsystem is marked as SS_OK_TO_FAIL_INIT. This is still a bug, but it is non-blocking.

Check notice on line 22 in code/modules/unit_tests/subsystem_init.dm

GitHub Actions / Integration Tests (tramstation) / run_integration_tests

Tramstation: /datum/unit_test/subsystem_init 

Lua Scripting (/datum/controller/subsystem/lua) is a subsystem meant to initialize but could not get initialized.
The subsystem reported the following: Error initializing SSlua: FAILED (Couldn't find call_proc_by_id)
This subsystem is marked as SS_OK_TO_FAIL_INIT. This is still a bug, but it is non-blocking.

Check notice on line 22 in code/modules/unit_tests/subsystem_init.dm

GitHub Actions / Integration Tests (wawastation) / run_integration_tests

Wawastation: /datum/unit_test/subsystem_init 

Lua Scripting (/datum/controller/subsystem/lua) is a subsystem meant to initialize but could not get initialized.
The subsystem reported the following: Error initializing SSlua: FAILED (Couldn't find call_proc_by_id)
This subsystem is marked as SS_OK_TO_FAIL_INIT. This is still a bug, but it is non-blocking.

Check notice on line 22 in code/modules/unit_tests/subsystem_init.dm

GitHub Actions / Alternate Tests (515, 1627, runtimestation) / run_integration_tests

Runtime Station: /datum/unit_test/subsystem_init 

Lua Scripting (/datum/controller/subsystem/lua) is a subsystem meant to initialize but could not get initialized.
The subsystem reported the following: Error initializing SSlua: FAILED (Couldn't find call_proc_by_id)
This subsystem is marked as SS_OK_TO_FAIL_INIT. This is still a bug, but it is non-blocking.