Merge pull request #3593 from Citadel-Station-13/revert-3584-revert-3580-upstream-merge-31560

Revert "Revert "[MIRROR] Late join antagonists will try to target late join players""
2017-10-24 21:30:11 -04:00
parent 40c2a8d40b 3822aa83a3
commit bb6cbd8528
3 changed files with 16 additions and 0 deletions
--- a/code/modules/mob/dead/new_player/new_player.dm
+++ b/code/modules/mob/dead/new_player/new_player.dm
@@ -480,6 +480,8 @@
 	client.prefs.copy_to(H)
 	H.dna.update_dna_identity()
 	if(mind)
+		if(transfer_after)
+			mind.late_joiner = TRUE
 		mind.active = 0					//we wish to transfer the key manually
 		mind.transfer_to(H)					//won't transfer key since the mind is not active