Merge pull request #8615 from Ghommie/Ghommie-cit45

Virtual reality componentization.
2019-10-10 02:09:51 -07:00
parent e80923fdf0 2ac24b2ac6
commit f686ea75d3
58 changed files with 1013 additions and 910 deletions
@@ -681,7 +681,7 @@
 	var/list/candidates = pollCandidatesForMob("Do you want to play as [SM.name]?", ROLE_SENTIENCE, null, ROLE_SENTIENCE, 50, SM, POLL_IGNORE_SENTIENCE_POTION) // see poll_ignore.dm
 	if(LAZYLEN(candidates))
 		var/mob/dead/observer/C = pick(candidates)
-		SM.key = C.key
+		C.transfer_ckey(SM, FALSE)
 		SM.mind.enslave_mind_to_creator(user)
 		SM.sentience_act()
 		to_chat(SM, "<span class='warning'>All at once it makes sense: you know what you are and who you are! Self awareness is yours!</span>")