Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Tastyfish
2012-01-24 15:47:07 -05:00
54 changed files with 1176 additions and 272 deletions
+1 -1
View File
@@ -173,7 +173,7 @@
/obj/item/weapon/diseasedisk
name = "Blank GNA disk"
icon = 'items.dmi'
icon = 'cloning.dmi'
icon_state = "datadisk0"
var/datum/disease2/effectholder/effect = null
var/stage = 1