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
@@ -244,7 +244,7 @@
item_state = "flashshield"
lefthand_file = 'icons/mob/inhands/equipment/shields_lefthand.dmi'
righthand_file = 'icons/mob/inhands/equipment/shields_righthand.dmi'
slot_flags = SLOT_BACK
slot_flags = ITEM_SLOT_BACK
force = 10
throwforce = 5
throw_speed = 2