Merge pull request #1018 from tigercat2000/OhMyLights

Add light color defs for more things
This commit is contained in:
ZomgPonies
2015-05-13 08:06:14 -04:00
28 changed files with 58 additions and 25 deletions
+2
View File
@@ -6,6 +6,8 @@
item_state = "candle1"
w_class = 1
light_color = "#E09D37"
var/wax = 200
var/lit = 0
proc
@@ -117,6 +117,7 @@
desc = "A red Nanotrasen issued flare. There are instructions on the side, it reads 'pull cord, make light'."
w_class = 2.0
brightness_on = 7 // Pretty bright.
light_color = "#e58775"
icon_state = "flare"
item_state = "flare"
var/fuel = 0
@@ -174,6 +175,7 @@
item_state = "slime"
w_class = 1
brightness_on = 6
light_color = "#FFBF00"
on = 1 //Bio-luminesence has one setting, on.
/obj/item/device/flashlight/slime/New()
@@ -157,6 +157,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
item_state = icon_on
var/turf/T = get_turf(src)
T.visible_message(flavor_text)
set_light(2, 0.25, "#E38F46")
processing_objects.Add(src)
@@ -203,6 +204,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
/obj/item/clothing/mask/cigarette/proc/die()
var/turf/T = get_turf(src)
set_light(0)
var/obj/item/butt = new type_butt(T)
transfer_fingerprints_to(butt)
if(ismob(loc))