Merge remote-tracking branch 'origin/master' into modular_computers

This commit is contained in:
davipatury
2017-03-04 15:44:20 -03:00
323 changed files with 13245 additions and 7898 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