Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs

code/modules/virus2/curer.dm

@@ -1,7 +1,8 @@
 /obj/machinery/computer/curer
 	name = "cure research machine"
 	icon = 'icons/obj/computer.dmi'
-	icon_state = "dna"
+	icon_keyboard = "med_key"
+	icon_screen = "dna"
 	circuit = /obj/item/weapon/circuitboard/curefab
 	var/curing
 	var/virusing

code/modules/virus2/disease2.dm

@@ -46,7 +46,7 @@
 	for (var/specie in all_species)
 		var/datum/species/S = all_species[specie]
 		if(!S.virus_immune)
-			meat += S.name
+			meat += S
 	if(meat.len)
 		var/num = rand(1,meat.len)
 		for(var/i=0,i<num,i++)
@@ -270,4 +270,4 @@ proc/virology_letterhead(var/report_name)
 		if(H.effect.type == type)
 			return 0
 
-	return 1
+	return 1