cyberpresidentvanellope/Yogstation
1
0
Fork 0
mirror of https://github.com/yogstation13/Yogstation.git synced 2025-02-26 09:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

use_power var now uses a define to reflect it not being a bool

Browse Source 
NO_POWER_USE
IDLE_POWER_USE
ACTIVE_POWER_USE

holopads now correctly set use_power and the active_power_usage
This commit is contained in:
oranges
2017-06-29 23:20:47 +00:00
parent d7e1eee8e0
commit ae3740d84b
103 changed files with 155 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/modules/power/lighting.dm
View File

@@ -158,7 +158,7 @@
layer = WALL_OBJ_LAYER
obj_integrity = 100
max_integrity = 100
use_power = 2
use_power = ACTIVE_POWER_USE
idle_power_usage = 2
active_power_usage = 20
power_channel = LIGHT //Lights are calc'd via area so they dont need to be in the machine list
@@ -256,10 +256,10 @@
if(trigger)
burn_out()
else
use_power = 2
use_power = ACTIVE_POWER_USE
set_light(brightness)
else
use_power = 1
use_power = IDLE_POWER_USE
set_light(0)
active_power_usage = (brightness * 10)