diff --git a/code/datums/mind.dm b/code/datums/mind.dm index dd389d46d4..4036aaaf45 100644 --- a/code/datums/mind.dm +++ b/code/datums/mind.dm @@ -64,7 +64,6 @@ var/mob/living/enslaved_to //If this mind's master is another mob (i.e. adamantine golems) var/datum/language_holder/language_holder var/unconvertable = FALSE - var/late_joiner = FALSE /datum/mind/New(var/key) src.key = key diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm index cd3b2ba2b2..77e26f026a 100644 --- a/code/game/gamemodes/objective.dm +++ b/code/game/gamemodes/objective.dm @@ -54,22 +54,9 @@ /datum/objective/proc/find_target() var/list/datum/mind/owners = get_owners() var/list/possible_targets = list() - var/try_target_late_joiners = FALSE - for(var/I in owners) - var/datum/mind/O = I - if(O.late_joiner) - try_target_late_joiners = TRUE for(var/datum/mind/possible_target in get_crewmember_minds()) if(!(possible_target in owners) && ishuman(possible_target.current) && (possible_target.current.stat != DEAD) && is_unique_objective(possible_target)) possible_targets += possible_target - if(try_target_late_joiners) - var/list/all_possible_targets = possible_targets.Copy() - for(var/I in all_possible_targets) - var/datum/mind/PT = I - if(!PT.late_joiner) - possible_targets -= PT - if(!possible_targets.len) - possible_targets = all_possible_targets if(possible_targets.len > 0) target = pick(possible_targets) update_explanation_text() diff --git a/code/modules/mob/dead/new_player/new_player.dm b/code/modules/mob/dead/new_player/new_player.dm index 2ef2077cde..3839c87f08 100644 --- a/code/modules/mob/dead/new_player/new_player.dm +++ b/code/modules/mob/dead/new_player/new_player.dm @@ -488,7 +488,6 @@ . = H new_character = . if(transfer_after) - mind.late_joiner = TRUE transfer_character() /mob/dead/new_player/proc/transfer_character()