Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Tastyfish
2011-12-07 11:21:50 -05:00
26 changed files with 407 additions and 92 deletions
+2
View File
@@ -65,6 +65,8 @@ MASS SPECTROMETER
icon_state = "forensic0"
var/amount = 20.0
var/printing = 0.0
var/list/stored_fibers = null
var/stored_name = null
w_class = 3.0
item_state = "electronic"
flags = FPRINT | TABLEPASS | ONBELT | CONDUCT | USEDELAY