Merge branch 'incremental_tg' r4967 (27/10/2012) into bs12_with_tgport

Conflicts:
	baystation12.dme
	code/__HELPERS/game.dm
	code/__HELPERS/type2type.dm
	code/datums/helper_datums/getrev.dm
	code/game/atoms.dm
	code/game/gamemodes/events.dm
	code/game/machinery/atmo_control.dm
	code/game/machinery/atmoalter/area_atmos_computer.dm
	code/game/machinery/computer/HolodeckControl.dm
	code/game/machinery/computer/atmos_alert.dm
	code/game/machinery/computer/card.dm
	code/game/machinery/computer/cloning.dm
	code/game/machinery/computer/computer.dm
	code/game/machinery/computer/pod.dm
	code/game/machinery/computer/prisoner.dm
	code/game/machinery/computer/syndicate_shuttle.dm
	code/game/machinery/newscaster.dm
	code/game/machinery/spaceheater.dm
	code/game/machinery/telecomms/broadcaster.dm
	code/game/machinery/telecomms/logbrowser.dm
	code/game/machinery/telecomms/machine_interactions.dm
	code/game/machinery/telecomms/telemonitor.dm
	code/game/machinery/telecomms/traffic_control.dm
	code/game/machinery/wishgranter.dm
	code/game/objects/items/devices/uplinks.dm
	code/game/objects/items/stacks/stack.dm
	code/game/objects/objs.dm
	code/modules/DetectiveWork/detective_work.dm
	code/modules/admin/IsBanned.dm
	code/modules/admin/admin.dm
	code/modules/admin/verbs/adminsay.dm
	code/modules/admin/verbs/getlogs.dm
	code/modules/awaymissions/zlevel.dm
	code/modules/client/client procs.dm
	code/modules/clothing/masks/miscellaneous.dm
	code/modules/clothing/spacesuits/miscellaneous.dm
	code/modules/flufftext/TextFilters.dm
	code/modules/mining/machine_processing.dm
	code/modules/mining/machine_stacking.dm
	code/modules/mining/mine_items.dm
	code/modules/mining/mint.dm
	code/modules/mining/satchel_ore_boxdm.dm
	code/modules/mob/living/carbon/monkey/life.dm
	code/modules/mob/living/living_defense.dm
	code/modules/mob/living/simple_animal/friendly/corgi.dm
	code/modules/mob/mob.dm
	code/modules/paperwork/filingcabinet.dm
	code/modules/paperwork/photocopier.dm
	code/modules/power/gravitygenerator.dm
	html/changelog.html
	icons/mob/head.dmi
	icons/mob/human_face.dmi
	icons/mob/mask.dmi
	icons/mob/suit.dmi
	icons/obj/clothing/hats.dmi
	icons/obj/clothing/masks.dmi
	icons/obj/clothing/suits.dmi

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>

code/datums/diseases/alien_embryo.dm

@@ -5,7 +5,6 @@
 	if(!holder) return
 	if(holder == affected_mob)
 		stage_act()
-
 	if(affected_mob)
 		if(affected_mob.stat == DEAD)
 			if(prob(50))
@@ -45,16 +44,7 @@
 /datum/disease/alien_embryo/stage_act()
 	..()
 	switch(stage)
-		if(2)
-			if(prob(1))
-				affected_mob.emote("sneeze")
-			if(prob(1))
-				affected_mob.emote("cough")
-			if(prob(1))
-				affected_mob << "\red Your throat feels sore."
-			if(prob(1))
-				affected_mob << "\red Mucous runs down the back of your throat."
-		if(3)
+		if(2, 3)
 			if(prob(1))
 				affected_mob.emote("sneeze")
 			if(prob(1))
@@ -83,16 +73,7 @@
 			affected_mob.updatehealth()
 			if(prob(50))
 				if(gibbed != 0) return 0
-				var/list/candidates = list() //List of candidate KEYS to assume control of the new larva ~Carn
-				var/i = 0
-				while(candidates.len <= 0 && i < 5)
-					for(var/mob/dead/observer/G in player_list)
-						if(G.client.be_alien)
-							if(((G.client.inactivity/10)/60) <= ALIEN_SELECT_AFK_BUFFER + i) // the most active players are more likely to become an alien
-								if(!(G.mind && G.mind.current && G.mind.current.stat != DEAD))
-									candidates += G.key
-					i++
-
+				var/list/candidates = get_alien_candidates()
 				var/mob/living/carbon/alien/larva/new_xeno = new(affected_mob.loc)
 				if(candidates.len)
 					new_xeno.key = pick(candidates)
@@ -111,15 +92,15 @@ Des: Removes all infection images from aliens and places an infection image on a
 ----------------------------------------*/
 /datum/disease/alien_embryo/proc/RefreshInfectionImage()
 	spawn(0)
-		for (var/mob/living/carbon/alien/alien in world)
+		for (var/mob/living/carbon/alien/alien in player_list)
 			if (alien.client)
 				for(var/image/I in alien.client.images)
 					if(I.icon_state == "infected")
 						del(I)
 
-		for (var/mob/living/carbon/alien/alien in world)
+		for (var/mob/living/carbon/alien/alien in player_list)
 			if (alien.client)
-				for (var/mob/living/carbon/C in world)
+				for (var/mob/living/carbon/C in mob_list)
 					if(C)
 						if (C.status_flags & XENO_HOST)
 							var/I = image('icons/mob/alien.dmi', loc = C, icon_state = "infected")
@@ -132,7 +113,7 @@ Des: Checks if the passed mob (C) is infected with the alien egg, then gives eac
 ----------------------------------------*/
 /datum/disease/alien_embryo/proc/AddInfectionImages(var/mob/living/carbon/C)
 	if (C)
-		for (var/mob/living/carbon/alien/alien in world)
+		for (var/mob/living/carbon/alien/alien in player_list)
 			if (alien.client)
 				if (C.status_flags & XENO_HOST)
 					var/I = image('icons/mob/alien.dmi', loc = C, icon_state = "infected")
@@ -146,7 +127,7 @@ Des: Removes the alien infection image from all aliens in the world located in p
 
 /datum/disease/alien_embryo/proc/RemoveInfectionImages(var/mob/living/carbon/C)
 	if (C)
-		for (var/mob/living/carbon/alien/alien in world)
+		for (var/mob/living/carbon/alien/alien in player_list)
 			if (alien.client)
 				for(var/image/I in alien.client.images)
 					if(I.loc == C)