Merge branch 'master' into findnreplace

This commit is contained in:
Mark van Alphen
2017-02-22 16:39:53 +01:00
committed by GitHub
37 changed files with 529 additions and 1004 deletions
@@ -184,7 +184,7 @@
id = "s_holster"
build_type = BIOGENERATOR
materials = list(MAT_BIOMASS = 400)
build_path = /obj/item/weapon/storage/belt/holster
build_path = /obj/item/clothing/accessory/holster
category = list("initial","Leather and Cloth")
/datum/design/leather_satchel