From 3e0c5f2e4926256386b115afd83d5d2008ca3418 Mon Sep 17 00:00:00 2001 From: Atlantis Date: Wed, 17 Feb 2016 12:39:40 +0100 Subject: [PATCH 1/2] Light switches now glow - Adds a relatively weak light to light switches (slightly weaker than a light bulb), so it is not that hard to find them when the room is dark. Colour can be red or green depending on whether the light switch is turned on or off. - Increases light switch power usage to 20 Watts. For comparsion, a light bulb has 60 so it feels apropriate. - Light switches now run off LIGHT APC channel rather than EQUIP. - Updated: Light switches now layer above darkness when powered. Light intensity slightly reduced. --- code/game/machinery/lightswitch.dm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/code/game/machinery/lightswitch.dm b/code/game/machinery/lightswitch.dm index ded7ebc9b98..7bf740889cb 100644 --- a/code/game/machinery/lightswitch.dm +++ b/code/game/machinery/lightswitch.dm @@ -7,10 +7,12 @@ icon = 'icons/obj/power.dmi' icon_state = "light1" anchored = 1.0 + use_power = 1 + idle_power_usage = 20 + power_channel = LIGHT var/on = 1 var/area/area = null var/otherarea = null - // luminosity = 1 /obj/machinery/light_switch/New() ..() @@ -31,8 +33,12 @@ /obj/machinery/light_switch/proc/updateicon() if(stat & NOPOWER) icon_state = "light-p" + set_light(0) + layer = OBJ_LAYER else icon_state = "light[on]" + set_light(2, 1.5, on ? "#82FF4C" : "#F86060") + layer = LIGHTING_LAYER+0.1 /obj/machinery/light_switch/examine(mob/user) if(..(user, 1)) From eb085f1160783b7ca39e0f222789779d378e1655 Mon Sep 17 00:00:00 2001 From: Yoshax Date: Wed, 23 Mar 2016 13:43:34 +0000 Subject: [PATCH 2/2] Adjusts lightswitch light cost --- code/game/machinery/lightswitch.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/machinery/lightswitch.dm b/code/game/machinery/lightswitch.dm index 7bf740889cb..74f60a3a729 100644 --- a/code/game/machinery/lightswitch.dm +++ b/code/game/machinery/lightswitch.dm @@ -8,7 +8,7 @@ icon_state = "light1" anchored = 1.0 use_power = 1 - idle_power_usage = 20 + idle_power_usage = 10 power_channel = LIGHT var/on = 1 var/area/area = null