Merge branch 'master' into findnreplace

This commit is contained in:
Mark van Alphen
2017-04-19 20:41:05 +02:00
committed by GitHub
64 changed files with 973 additions and 502 deletions
@@ -579,7 +579,9 @@
item_state = "zippo"
storage_slots = 10
w_class = 1
max_w_class = 1
slot_flags = SLOT_BELT
can_hold = list(/obj/item/weapon/match)
New()
..()