Merge pull request #3584 from Citadel-Station-13/revert-3580-upstream-merge-31560
Revert "[MIRROR] Late join antagonists will try to target late join players"
This commit is contained in:
@@ -64,7 +64,6 @@
|
|||||||
var/mob/living/enslaved_to //If this mind's master is another mob (i.e. adamantine golems)
|
var/mob/living/enslaved_to //If this mind's master is another mob (i.e. adamantine golems)
|
||||||
var/datum/language_holder/language_holder
|
var/datum/language_holder/language_holder
|
||||||
var/unconvertable = FALSE
|
var/unconvertable = FALSE
|
||||||
var/late_joiner = FALSE
|
|
||||||
|
|
||||||
/datum/mind/New(var/key)
|
/datum/mind/New(var/key)
|
||||||
src.key = key
|
src.key = key
|
||||||
|
|||||||
@@ -54,22 +54,9 @@
|
|||||||
/datum/objective/proc/find_target()
|
/datum/objective/proc/find_target()
|
||||||
var/list/datum/mind/owners = get_owners()
|
var/list/datum/mind/owners = get_owners()
|
||||||
var/list/possible_targets = list()
|
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())
|
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))
|
if(!(possible_target in owners) && ishuman(possible_target.current) && (possible_target.current.stat != DEAD) && is_unique_objective(possible_target))
|
||||||
possible_targets += 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)
|
if(possible_targets.len > 0)
|
||||||
target = pick(possible_targets)
|
target = pick(possible_targets)
|
||||||
update_explanation_text()
|
update_explanation_text()
|
||||||
|
|||||||
@@ -488,7 +488,6 @@
|
|||||||
. = H
|
. = H
|
||||||
new_character = .
|
new_character = .
|
||||||
if(transfer_after)
|
if(transfer_after)
|
||||||
mind.late_joiner = TRUE
|
|
||||||
transfer_character()
|
transfer_character()
|
||||||
|
|
||||||
/mob/dead/new_player/proc/transfer_character()
|
/mob/dead/new_player/proc/transfer_character()
|
||||||
|
|||||||
Reference in New Issue
Block a user