Merge branch 'master' into upstream-merge-37476

This commit is contained in:
LetterJay
2018-05-20 23:12:07 -05:00
committed by GitHub
172 changed files with 6336 additions and 4958 deletions
+1 -1
View File
@@ -236,7 +236,7 @@
/obj/item/twohanded/fireaxe/Initialize()
. = ..()
AddComponent(/datum/component/butchering, 100, 80, hitsound) //axes are not known for being precision butchering tools
AddComponent(/datum/component/butchering, 100, 80, 0 , hitsound) //axes are not known for being precision butchering tools
/obj/item/twohanded/fireaxe/update_icon() //Currently only here to fuck with the on-mob icons.
icon_state = "fireaxe[wielded]"