further conflicts and bugfixes

This commit is contained in:
paprka
2015-01-15 21:59:36 -08:00
parent ab7d50c90e
commit eae84c1c39
2 changed files with 3 additions and 5 deletions
+1 -1
View File
@@ -190,7 +190,7 @@
name = "foam dart crossbow"
desc = "A weapon favored by many overactive children. Ages 8 and up."
icon = 'icons/obj/gun.dmi'
icon_state = "crossbow"
icon_state = "crossbow100"
item_state = "crossbow"
w_class = 2.0
attack_verb = list("attacked", "struck", "hit")