cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2026-01-01 21:13:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

tweaks a bunch of lighting values. reduces the amount of light_power values greater than 1

Browse Source
This commit is contained in:
deathride58
2018-05-16 01:42:01 -04:00
parent eabfa03891
commit 718ca41ea0
10 changed files with 53 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -346,7 +346,7 @@
if(update & 3)
if(update_state & UPDATE_BLUESCREEN)
set_light(l_range = 2, l_power = 0.5, l_color = "#0000FF")
set_light(l_range = 2, l_power = 0.25, l_color = "#0000FF")
else if(!(stat & (BROKEN|MAINT)) && update_state & UPDATE_ALLGOOD)
var/color
switch(charging)
@@ -356,7 +356,7 @@
color = "#A8B0F8"
if(2)
color = "#82FF4C"
set_light(l_range = 2, l_power = 0.5, l_color = color)
set_light(l_range = 2, l_power = 0.25, l_color = color)
else
set_light(0)

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

@@ -165,8 +165,8 @@
power_channel = LIGHT //Lights are calc'd via area so they dont need to be in the machine list
var/on = 0 // 1 if on, 0 if off
var/brightness_range = 6 // luminosity when on, also used in power calculation
var/brightness_power = 3
var/brightness_color = null
var/brightness_power = 0.8
var/brightness_color = LIGHT_COLOR_INCANDESCENT_TUBE
var/status = LIGHT_OK // LIGHT_OK, _EMPTY, _BURNED or _BROKEN
var/flickering = 0
var/light_type = /obj/item/weapon/light/tube // the type of light item
@@ -183,8 +183,7 @@
base_state = "bulb"
fitting = "bulb"
brightness_range = 4
brightness_power = 2
brightness_color = "#FFF4E5"
brightness_color = LIGHT_COLOR_INCANDESCENT_BULB
desc = "A small lighting fixture."
light_type = /obj/item/weapon/light/bulb
@@ -193,17 +192,15 @@
base_state = "flamp"
fitting = "bulb"
brightness_range = 5
brightness_power = 2
plane = OBJ_PLANE
layer = OBJ_LAYER
brightness_color = "#FFF4E5"
brightness_color = LIGHT_COLOR_INCANDESCENT_BULB
desc = "A floor lamp."
light_type = /obj/item/weapon/light/bulb
var/lamp_shade = 1
/obj/machinery/light/small/emergency
brightness_range = 4
brightness_power = 2
brightness_color = "#da0205"
/obj/machinery/light/spot
@@ -211,7 +208,7 @@
fitting = "large tube"
light_type = /obj/item/weapon/light/tube/large
brightness_range = 12
brightness_power = 4
brightness_power = 0.9
/obj/machinery/light/built/New()
status = LIGHT_EMPTY
@@ -716,8 +713,8 @@
matter = list(DEFAULT_WALL_MATERIAL = 60)
var/rigged = 0 // true if rigged to explode
var/brightness_range = 2 //how much light it gives off
var/brightness_power = 1
var/brightness_color = null
var/brightness_power = 0.8
var/brightness_color = LIGHT_COLOR_INCANDESCENT_TUBE
/obj/item/weapon/light/tube
name = "light tube"
@@ -727,13 +724,12 @@
item_state = "c_tube"
matter = list("glass" = 100)
brightness_range = 8
brightness_power = 3
/obj/item/weapon/light/tube/large
w_class = ITEMSIZE_SMALL
name = "large light tube"
brightness_range = 15
brightness_power = 4
brightness_power = 0.9
/obj/item/weapon/light/bulb
name = "light bulb"
@@ -743,8 +739,7 @@
item_state = "contvapour"
matter = list("glass" = 100)
brightness_range = 5
brightness_power = 2
brightness_color = "#a0a080"
brightness_color = LIGHT_COLOR_INCANDESCENT_BULB
/obj/item/weapon/light/throw_impact(atom/hit_atom)
..()
@@ -758,7 +753,6 @@
item_state = "egg4"
matter = list("glass" = 100)
brightness_range = 5
brightness_power = 2
// update the icon state and description of the light
@@ -834,4 +828,4 @@
desc = "A lamp shade for a lamp."
icon = 'icons/obj/lighting.dmi'
icon_state = "lampshade"
w_class = ITEMSIZE_TINY
w_class = ITEMSIZE_TINY