Merge branch 'master' of github.com:Baystation12/Baystation12

This commit is contained in:
cib
2012-03-20 03:53:46 -08:00
86 changed files with 15752 additions and 12382 deletions
+3 -1
View File
@@ -44,7 +44,9 @@
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"