From 6e918f08483bbf159a20d1c76437540c6ce4fe02 Mon Sep 17 00:00:00 2001 From: Albert Iordache Date: Sun, 18 Mar 2012 16:35:49 +0200 Subject: [PATCH] Made lightbulbs weaker, added a subclass for bulbs which gives out a bit more light --- code/modules/power/lighting.dm | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/code/modules/power/lighting.dm b/code/modules/power/lighting.dm index 141fd3180bd..83b6b3cb51d 100644 --- a/code/modules/power/lighting.dm +++ b/code/modules/power/lighting.dm @@ -41,10 +41,12 @@ icon_state = "bulb1" base_state = "bulb" fitting = "bulb" - brightness = 5 + brightness = 3 desc = "A small lighting fixture." light_type = /obj/item/weapon/light/bulb - + +/obj/machinery/light/small/spot + brightness = 5 /obj/machinery/light/spot name = "spotlight" @@ -77,9 +79,15 @@ spawn(2) switch(fitting) if("tube") + if(src.loc && src.loc.loc && isarea(src.loc.loc)) + var/area/A = src.loc.loc + brightness = A.area_lights_luminosity + else + brightness = rand(6,9) if(prob(10)) broken(1) if("bulb") + brightness = 3 if(prob(25)) broken(1) spawn(1)