Merge branch 'master' into upstream-merge-37582

This commit is contained in:
LetterJay
2018-05-22 07:22:42 -05:00
committed by GitHub
302 changed files with 2217 additions and 1980 deletions
+1 -1
View File
@@ -5,7 +5,7 @@
icon = 'icons/obj/device.dmi'
icon_state = "pinpointer"
flags_1 = CONDUCT_1
slot_flags = SLOT_BELT
slot_flags = ITEM_SLOT_BELT
w_class = WEIGHT_CLASS_SMALL
item_state = "electronic"
lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi'