cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-24 21:48:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes manual switching of night lighting on APCs (#96733)

Browse Source 
## About The Pull Request
The button which allows you to manually toggle night lighting on APCs is
currently broken. When pressed outside of night shift, the APC will
briefly swap to night lighting before immediately going back to
standard. I suspect this might be caused by the changes to 'apc_main.dm'
which occured during PR #95744.

Additionally, the low power night light enabling introduced in #69374
doesn't seem to account for station security level when APCs get
repowered. If a whole station loses power while on red alert during
night shift (perhaps by a powersink) then the station will be entirely
on night lighting when repowered.

I assume neither of these quirks are intentional and have attempted to
fix them here.
## Why It's Good For The Game
Unless I've completely misunderstood something, this should (probably)
fix a bug as per local testing.
## Changelog
🆑
fix: Night shift lighting can be manually enabled through APCs again.
fix: Night lighting is no longer automatically reenabled during red
alert night shifts when APCs are drained and recharged.
/🆑
This commit is contained in:
QuiteLiterallyAnything
2026-07-01 13:49:58 +02:00
committed by GitHub
parent 1cd3bb49c8
commit c68896e6f9
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/power/apc/apc_main.dm
+5 -4
View File
@@ -660,11 +660,12 @@
equipment = autoset(equipment, AUTOSET_ON)
lighting = autoset(lighting, AUTOSET_ON)
environ = autoset(environ, AUTOSET_ON)
//If nightlights are on, and we're recovering from low power/nightlight event, we'll remove it.
var/nightshift_disabled = !(locate(/datum/round_event/nightshift) in SSevents.running)
if(nightshift_lights && (nightshift_disabled || low_power_nightshift_lights))
//At this point the APC is fully powered. If we've swapped to night lights because of low power then
//that gets undone here. The night lights are disabled depending on nightshift or security level.
if(nightshift_lights && low_power_nightshift_lights)
low_power_nightshift_lights = FALSE
if(nightshift_disabled)
var/nightshift_disabled = !(locate(/datum/round_event/nightshift) in SSevents.running)
if(nightshift_disabled || SSsecurity_level.get_current_level_as_number() >= SEC_LEVEL_RED)
INVOKE_ASYNC(src, PROC_REF(set_nightshift), FALSE)
if(cell_percent > APC_CHANNEL_ALARM_TRESHOLD)
alarm_manager.clear_alarm(ALARM_POWER)