Merge remote-tracking branch 'upstream/dev-freeze' into dev

This commit is contained in:
PsiOmegaDelta
2015-08-27 09:01:50 +02:00
11 changed files with 571 additions and 565 deletions
+4
View File
@@ -166,6 +166,10 @@
desc = "A small lighting fixture."
light_type = /obj/item/weapon/light/bulb
/obj/machinery/light/small/emergency
brightness_range = 6
brightness_power = 2
brightness_color = "#da0205"
/obj/machinery/light/spot
name = "spotlight"