Merge branch 'master' of github.com:Baystation12/Baystation12

This commit is contained in:
SkyMarshal
2012-01-28 21:32:56 -07:00
10 changed files with 171 additions and 12 deletions
+9
View File
@@ -1421,6 +1421,15 @@
g_amt = 10000
origin_tech = "materials=1;biotech=1"
/obj/item/weapon/autopsy_scanner
name = "autopscy scanner"
desc = "Extracts information on wounds."
icon = 'autopsy_scanner.dmi'
icon_state = ""
flags = FPRINT | TABLEPASS | CONDUCT
w_class = 1.0
origin_tech = "materials=1;biotech=1"
/obj/item/weapon/syntiflesh
name = "Syntiflesh"
desc = "Meat that appears...strange..."