diff --git a/code/modules/power/lighting.dm b/code/modules/power/lighting.dm index 1a310274b93..4e14c7e48dd 100644 --- a/code/modules/power/lighting.dm +++ b/code/modules/power/lighting.dm @@ -227,7 +227,7 @@ var/static_power_used = 0 var/brightness = 8 // luminosity when on, also used in power calculation var/bulb_power = 1 // basically the alpha of the emitted light source - var/bulb_colour = "#FFFFFF" // befault colour of the light. + var/bulb_colour = "#f3fffa" // befault colour of the light. var/status = LIGHT_OK // LIGHT_OK, _EMPTY, _BURNED or _BROKEN var/flickering = FALSE var/light_type = /obj/item/light/tube // the type of light item @@ -259,30 +259,6 @@ status = LIGHT_BROKEN icon_state = "tube-broken" -/obj/machinery/light/dim - nightshift_allowed = FALSE - bulb_colour = "#FFDDCC" - bulb_power = 0.8 - -// the smaller bulb light fixture - -/obj/machinery/light/small - icon_state = "bulb" - base_state = "bulb" - fitting = "bulb" - brightness = 4 - desc = "A small lighting fixture." - light_type = /obj/item/light/bulb - -/obj/machinery/light/small/broken - status = LIGHT_BROKEN - icon_state = "bulb-broken" - -/obj/machinery/light/Move() - if(status != LIGHT_BROKEN) - break_light_tube(1) - return ..() - /obj/machinery/light/built icon_state = "tube-empty" start_with_cell = FALSE @@ -292,6 +268,57 @@ status = LIGHT_EMPTY update(0) + +/obj/machinery/light/no_nightlight + nightshift_enabled = FALSE + +/obj/machinery/light/warm + bulb_colour = "#fae5c1" + +/obj/machinery/light/warm/no_nightlight + nightshift_allowed = FALSE + +/obj/machinery/light/cold + bulb_colour = "#deefff" + nightshift_light_color = "#deefff" + +/obj/machinery/light/cold/no_nightlight + nightshift_allowed = FALSE + +/obj/machinery/light/red + bulb_colour = "#FF3232" + nightshift_allowed = FALSE + no_emergency = TRUE + brightness = 2 + bulb_power = 0.7 + +/obj/machinery/light/blacklight + bulb_colour = "#A700FF" + nightshift_allowed = FALSE + brightness = 2 + bulb_power = 0.8 + +/obj/machinery/light/dim + nightshift_allowed = FALSE + bulb_colour = "#FFDDCC" + bulb_power = 0.6 + +// the smaller bulb light fixture + +/obj/machinery/light/small + icon_state = "bulb" + base_state = "bulb" + fitting = "bulb" + brightness = 4 + nightshift_brightness = 4 + bulb_colour = "#FFD6AA" + desc = "A small lighting fixture." + light_type = /obj/item/light/bulb + +/obj/machinery/light/small/broken + status = LIGHT_BROKEN + icon_state = "bulb-broken" + /obj/machinery/light/small/built icon_state = "bulb-empty" start_with_cell = FALSE @@ -301,7 +328,23 @@ status = LIGHT_EMPTY update(0) +/obj/machinery/light/small/red + bulb_colour = "#FF3232" + no_emergency = TRUE + nightshift_allowed = FALSE + brightness = 1 + bulb_power = 0.8 +/obj/machinery/light/small/blacklight + bulb_colour = "#A700FF" + nightshift_allowed = FALSE + brightness = 1 + bulb_power = 0.9 + +/obj/machinery/light/Move() + if(status != LIGHT_BROKEN) + break_light_tube(1) + return ..() // create a new lighting fixture /obj/machinery/light/Initialize(mapload) @@ -888,7 +931,7 @@ /obj/item/light/on_reagent_change(changetype) rigged = (reagents.has_reagent(/datum/reagent/toxin/plasma, LIGHT_REAGENT_CAPACITY)) //has_reagent returns the reagent datum return ..() - + #undef LIGHT_REAGENT_CAPACITY /obj/item/light/attack(mob/living/M, mob/living/user, def_zone)