Lighting fixes part 307 (#1896)

changes:

Fixes missing icon for powered off night-mode tubes.
Nerfs borg floodlight back to sanity.
Reduces the light power on red-alert level fire alarms a bit.
This commit is contained in:
Lohikar
2017-03-12 11:51:07 +02:00
committed by skull132
parent 335f3f8261
commit cd52c36313
5 changed files with 14 additions and 12 deletions
@@ -22,7 +22,7 @@
var/custom_sprite = 0 //Due to all the sprites involved, a var for our custom borgs may be best
var/crisis //Admin-settable for combat module use.
var/crisis_override = 0
var/integrated_light_power = 6
var/integrated_light_power = 4
var/datum/wires/robot/wires
//Icon stuff
@@ -423,7 +423,7 @@
/mob/living/silicon/robot/proc/update_robot_light()
if(lights_on)
if(intenselight)
set_light(integrated_light_power * 2, integrated_light_power)
set_light(integrated_light_power * 2, 1)
else
set_light(integrated_light_power)
else
+7 -5
View File
@@ -229,13 +229,13 @@
..()
/obj/machinery/light/update_icon()
switch(status) // set icon_states
if(LIGHT_OK)
if (supports_nightmode && nightmode)
icon_state = "[base_state][on]_night"
icon_state = "[base_state][on]"
if (supports_nightmode && nightmode && on)
color = "#d2d2d2"
else
icon_state = "[base_state][on]"
color = null
if(LIGHT_EMPTY)
icon_state = "[base_state]-empty"
@@ -246,7 +246,9 @@
if(LIGHT_BROKEN)
icon_state = "[base_state]-broken"
on = 0
return
if (!on)
color = null
// update the icon_state and luminosity of the light depending on its state
/obj/machinery/light/proc/update(var/trigger = 1)