Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into dissection

2019-10-11 20:06:26 -05:00
parent 323460efee f57fa7f471
commit b50804dfc3
581 changed files with 63735 additions and 58634 deletions
@@ -429,8 +429,8 @@ It's fairly easy to fix if dealing with single letters but not so much with comp
 		var/mob/dead/observer/C = pick(candidates)
 		to_chat(M, "Your mob has been taken over by a ghost!")
 		message_admins("[key_name_admin(C)] has taken control of ([key_name_admin(M)])")
-		M.ghostize(0)
-		M.key = C.key
+		M.ghostize(FALSE, TRUE)
+		C.transfer_ckey(M, FALSE)
 		return TRUE
 	else
 		to_chat(M, "There were no ghosts willing to take control.")