cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 03:33:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update lighting.dm

Browse Source
This commit is contained in:
Novacat
2020-03-21 16:47:52 -04:00
committed by GitHub
parent 9f250ce3c9
commit 90e6e1fea2
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -9,12 +9,8 @@
#define LIGHT_BROKEN 2 #define LIGHT_BROKEN 2
#define LIGHT_BURNED 3 #define LIGHT_BURNED 3
#define LIGHT_BULB_TEMPERATURE 400 //K - used value for a 60W bulb #define LIGHT_BULB_TEMPERATURE 400 //K - used value for a 60W bulb
<<<<<<< HEAD
#define LIGHTING_POWER_FACTOR 2 //5W per luminosity * range //VOREStation Edit: why the fuck are lights eating so much power, 2W per thing #define LIGHTING_POWER_FACTOR 2 //5W per luminosity * range //VOREStation Edit: why the fuck are lights eating so much power, 2W per thing
=======
#define LIGHTING_POWER_FACTOR 5 //5W per luminosity * range
#define LIGHT_EMERGENCY_POWER_USE 0.2 //How much power emergency lights will consume per tick #define LIGHT_EMERGENCY_POWER_USE 0.2 //How much power emergency lights will consume per tick
>>>>>>> 28f34f1... Merge pull request #6820 from Meghan-Rossi/Emergency-Lighting
var/global/list/light_type_cache = list() var/global/list/light_type_cache = list()
/proc/get_light_type_instance(var/light_type) /proc/get_light_type_instance(var/light_type)