Merge remote-tracking branch 'remotes/git-svn' 4847 into bs12_with_tgport

Conflicts:
	baystation12.dme
	code/game/verbs/ooc.dm
	code/modules/admin/admin_verbs.dm
	code/modules/food/recipes_microwave.dm
	html/changelog.html

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

code/game/objects/effects/aliens.dm

@@ -426,6 +426,8 @@ Alien plants should do something if theres a lot of poison
 		healthcheck()
 
 /obj/effect/alien/egg/HasProximity(atom/movable/AM as mob|obj)
+	if(!CanHug(AM))
+		return
 	if(status == GROWN && iscarbon(AM) && !isalien(AM))
 
 		var/mob/living/carbon/C = AM
@@ -439,6 +441,8 @@ Alien plants should do something if theres a lot of poison
 			Burst(0)
 			var/obj/item/clothing/mask/facehugger/child = GetFacehugger()
 			child.loc = pos
+			if(!CanHug(AM))
+				return
 			if(AM && in_range(AM, pos))
 				child.Attach(AM)