Merge branch 'master' of git://github.com/Baystation12/Baystation12 into TGUpdates

This commit is contained in:
Ren Erthilo
2012-04-22 04:04:01 +01:00
3 changed files with 6273 additions and 6278 deletions
+1 -1
View File
@@ -1333,7 +1333,7 @@ datum
req_tech = list("combat" = 3, "materials" = 3, "engineering" = 3, "biotech" = 2)
build_type = PROTOLATHE
materials = list("$metal" = 5000, "$glass" = 1000)
build_path = "/obj/item/weapon/gun/rapidsyringe"
build_path = "/obj/item/weapon/gun/syringe/rapidsyringe"
largecrossbow
name = "Energy Crossbow"