Merge with dev-freeze.

This commit is contained in:
Zuhayr
2015-06-21 20:45:47 +09:30
62 changed files with 706 additions and 600 deletions
@@ -94,6 +94,7 @@
icon_state = "penlight"
item_state = ""
flags = CONDUCT
slot_flags = SLOT_EARS
brightness_on = 2
w_class = 1