mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-22 19:47:22 +01:00
Changes a lot of lighting colors, ranges, and powers (#28226)
* 8u hiubntgvby9 gb * colors * undo airlock * bluer light * spaghetti review
This commit is contained in:
@@ -278,7 +278,7 @@
|
||||
/// Light intensity when in night shift mode
|
||||
var/nightshift_light_power = 0.45
|
||||
/// The colour of the light while it's in night shift mode
|
||||
var/nightshift_light_color = "#FFDDCC"
|
||||
var/nightshift_light_color = "#e0eeff"
|
||||
/// The colour of the light while it's in emergency mode
|
||||
var/bulb_emergency_colour = "#FF3232"
|
||||
|
||||
@@ -299,8 +299,9 @@
|
||||
exposure_icon_state = "circle"
|
||||
base_state = "bulb"
|
||||
brightness_range = 4
|
||||
brightness_color = "#a0a080"
|
||||
brightness_color = "#ffebb0"
|
||||
nightshift_light_range = 4
|
||||
nightshift_light_color = "#ffefa0" // #a0a080
|
||||
light_type = /obj/item/light/bulb
|
||||
deconstruct_type = /obj/machinery/light_construct/small
|
||||
|
||||
@@ -393,12 +394,10 @@
|
||||
break_light_tube(TRUE)
|
||||
if("bulb")
|
||||
brightness_range = 4
|
||||
brightness_color = "#a0a080"
|
||||
if(prob(5))
|
||||
break_light_tube(TRUE)
|
||||
if("floor")
|
||||
brightness_range = 6
|
||||
brightness_color = "#a0a080"
|
||||
if(prob(3))
|
||||
break_light_tube(TRUE)
|
||||
update(FALSE, TRUE, FALSE)
|
||||
@@ -631,9 +630,12 @@
|
||||
to_chat(user, "<span class='notice'>You insert [L].</span>")
|
||||
switchcount = L.switchcount
|
||||
rigged = L.rigged
|
||||
brightness_range = L.brightness_range
|
||||
brightness_power = L.brightness_power
|
||||
brightness_color = L.brightness_color
|
||||
if(L.brightness_range)
|
||||
brightness_range = L.brightness_range
|
||||
if(L.brightness_power)
|
||||
brightness_power = L.brightness_power
|
||||
if(L.brightness_color)
|
||||
brightness_color = L.brightness_color
|
||||
lightmaterials = L.materials
|
||||
on = has_power()
|
||||
update(TRUE, TRUE, FALSE)
|
||||
@@ -769,7 +771,7 @@
|
||||
update_icon()
|
||||
return
|
||||
emergency_mode = TRUE
|
||||
set_light(3, 1.7, bulb_emergency_colour)
|
||||
set_light((fitting == "tube" ? 3 : 2), 1, bulb_emergency_colour)
|
||||
update_icon()
|
||||
RegisterSignal(machine_powernet, COMSIG_POWERNET_POWER_CHANGE, PROC_REF(update), override = TRUE)
|
||||
|
||||
@@ -1037,7 +1039,6 @@
|
||||
base_state = "ltube"
|
||||
item_state = "c_tube"
|
||||
brightness_range = 8
|
||||
brightness_color = "#ffffff"
|
||||
|
||||
/obj/item/light/tube/large
|
||||
w_class = WEIGHT_CLASS_SMALL
|
||||
@@ -1057,7 +1058,6 @@
|
||||
base_state = "lbulb"
|
||||
item_state = "contvapour"
|
||||
brightness_range = 5
|
||||
brightness_color = "#a0a080"
|
||||
|
||||
/obj/item/light/throw_impact(atom/hit_atom)
|
||||
..()
|
||||
|
||||
Reference in New Issue
Block a user