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
@@ -6,6 +6,7 @@
icon_state = "cypherkey"
item_state = ""
w_class = 1
slot_flags = SLOT_EARS
var/translate_binary = 0
var/translate_hive = 0
var/syndie = 0
@@ -9,6 +9,7 @@
flags = CONDUCT
force = 5.0
w_class = 1.0
slot_flags = SLOT_EARS
throwforce = 5.0
throw_range = 15
throw_speed = 3