Merge conflicts begone

This commit is contained in:
Crazylemon64
2016-08-01 18:28:47 -07:00
parent c48d216ebc
commit bc93078da5
169 changed files with 1524 additions and 745 deletions
+2
View File
@@ -7,6 +7,8 @@
flags = CONDUCT
force = 10.0
throwforce = 0
burn_state = FLAMMABLE
burntime = 20
w_class = 4
/obj/item/weapon/moneybag/attack_hand(user as mob)