Merge branch 'master' into Spookytime

2019-10-11 19:10:48 +01:00
parent bfd97a82ca ae843435f0
commit cd47412db2
126 changed files with 56362 additions and 55928 deletions
@@ -87,7 +87,7 @@

 	var/atom/xeno_loc = get_turf(owner)
 	var/mob/living/carbon/alien/larva/new_xeno = new(xeno_loc)
-	new_xeno.key = ghost.key
+	ghost.transfer_ckey(new_xeno, FALSE)
 	SEND_SOUND(new_xeno, sound('sound/voice/hiss5.ogg',0,0,0,100))	//To get the player's attention
 	new_xeno.canmove = 0 //so we don't move during the bursting animation
 	new_xeno.notransform = 1