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

Conflicts:
	code/game/machinery/newscaster.dm
	code/modules/admin/admin.dm

code/modules/virus2/admin.dm

@@ -132,7 +132,7 @@
 				else if(href_list["reset"])
 					species = list()
 				if(infectee)
-					if(!infectee.species || !(infectee.species.name in species))
+					if(!infectee.species || !(infectee.species.get_bodytype() in species))
 						infectee = null
 			if("ichance")
 				var/I = input("Input infection chance", "Infection Chance", infectionchance) as null|num
@@ -160,16 +160,16 @@
 				var/list/candidates = list()
 				for(var/mob/living/carbon/G in living_mob_list)
 					if(G.stat != DEAD && G.species)
-						if(G.species.name in species)
+						if(G.species.get_bodytype() in species)
 							candidates["[G.name][G.client ? "" : " (no client)"]"] = G
 						else
-							candidates["[G.name] ([G.species.name])[G.client ? "" : " (no client)"]"] = G
+							candidates["[G.name] ([G.species.get_bodytype()])[G.client ? "" : " (no client)"]"] = G
 				if(!candidates.len) usr << "No possible candidates found!"
 
 				var/I = input("Choose initial infectee", "Infectee", infectee) as null|anything in candidates
 				if(!I || !candidates[I]) return
 				infectee = candidates[I]
-				species |= infectee.species.name
+				species |= infectee.species.get_bodytype()
 			if("go")
 				if(!antigens.len)
 					var/a = alert("This disease has no antigens; it will be impossible to permanently immunise anyone without them.\

code/modules/virus2/helpers.dm

@@ -87,9 +87,9 @@ proc/airborne_can_reach(turf/source, turf/target)
 	if(!disease.affected_species.len)
 		return
 
-	if (!(M.species.name in disease.affected_species))
+	if (!(M.species.get_bodytype() in disease.affected_species))
 		if (forced)
-			disease.affected_species[1] = M.species.name
+			disease.affected_species[1] = M.species.get_bodytype()
 		else
 			return //not compatible with this species