Merge pull request #4270 from Baystation12/master

Merge master into Dev
This commit is contained in:
Ccomp5950
2014-01-11 18:18:03 -08:00
5 changed files with 29 additions and 8 deletions

View File

@@ -1451,7 +1451,7 @@ datum/design/chemsprayer
build_type = PROTOLATHE
materials = list("$metal" = 5000, "$glass" = 1000)
reliability_base = 100
build_path = "/obj/item/weapon/chemsprayer"
build_path = "/obj/item/weapon/reagent_containers/spray/chemsprayer"
datum/design/rapidsyringe
name = "Rapid Syringe Gun"