Facehugger to Full alien, all player controlled

code/game/objects/effects/aliens.dm

@@ -417,24 +417,22 @@ Alien plants should do something if theres a lot of poison
 	proc/Grow()
 		icon_state = "egg"
 		status = GROWN
-		new /obj/item/clothing/mask/facehugger(src)
 		return
 
 	proc/Burst(var/kill = 1) //drops and kills the hugger if any is remaining
 		if(status == GROWN || status == GROWING)
-			var/obj/item/clothing/mask/facehugger/child = GetFacehugger()
 			icon_state = "egg_hatched"
 			flick("egg_opening", src)
 			status = BURSTING
 			spawn(15)
 				status = BURST
-				loc.contents += child//need to write the code for giving it to the alien later
-				if(kill && istype(child))
-					child.Die()
+				var/mob/living/carbon/alien/facehugger/F = new /mob/living/carbon/alien/facehugger(src.loc)
+				if(kill)
+					F.stat=2
 				else
 					for(var/mob/M in range(1,src))
 						if(CanHug(M))
-							child.Attach(M)
+							F.Attach(M)
 							break
 
 

code/game/objects/structures/lamarr_cage.dm

@@ -89,12 +89,12 @@
 
 /obj/structure/lamarr/proc/Break()
 	if(occupied)
-		new /obj/item/clothing/mask/facehugger/lamarr(src.loc)
+		new /mob/living/carbon/alien/facehugger/lamarr(src.loc)
 		occupied = 0
 	update_icon()
 	return
 
-/obj/item/clothing/mask/facehugger/lamarr
+/mob/living/carbon/alien/facehugger/lamarr
 	name = "Lamarr"
 	desc = "The worst she might do is attempt to... couple with your head."//hope we don't get sued over a harmless reference, rite?
 	sterile = 1