cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-06 15:34:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7620 from VOREStation/aro-apcnight

Browse Source 
Allow locked APCs to still toggle night lighting
This commit is contained in:
Aronai Sieyes
2020-05-03 22:24:40 -04:00
committed by GitHub
parent 9ecbb2feb1 f270f276bc
commit d8802c844c
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
code/modules/power/apc.dm
View File

@@ -921,6 +921,14 @@
if(!can_use(usr, 1))
return 1
if(href_list["nightshift"])
if(last_nightshift_switch > world.time + 10 SECONDS) // don't spam...
to_chat(usr, "<span class='warning'>[src]'s night lighting circuit breaker is still cycling!</span>")
return 0
last_nightshift_switch = world.time
set_nightshift(!nightshift_lights)
return 1
if(locked && !issilicon(usr) )
if(isobserver(usr) )
var/mob/observer/dead/O = usr //Added to allow admin nanoUI interactions.
@@ -974,13 +982,6 @@
update_icon()
update()
else if(href_list["nightshift"])
if(last_nightshift_switch > world.time + 10 SECONDS) // don't spam...
to_chat(usr, "<span class='warning'>[src]'s night lighting circuit breaker is still cycling!</span>")
return 0
last_nightshift_switch = world.time
set_nightshift(!nightshift_lights)
else if (href_list["overload"])
if(istype(usr, /mob/living/silicon))
src.overload_lighting()