From 7ac1ddbabef14ed2605f2ad78c6f0d8ea84d66ae Mon Sep 17 00:00:00 2001 From: joep van der velden Date: Wed, 7 Nov 2018 17:43:12 +0100 Subject: [PATCH] Fixed it. SortNames sucks sortAtom rocks --- code/datums/mind.dm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/code/datums/mind.dm b/code/datums/mind.dm index 3c30249bd03..6f1fb59e8f8 100644 --- a/code/datums/mind.dm +++ b/code/datums/mind.dm @@ -471,7 +471,7 @@ var/objective_type_text = copytext(new_obj_type, 2)//Leave the rest of the text. var/objective_type = "[objective_type_capital][objective_type_text]"//Add them together into a text string. - var/list/possible_targets = list("Free objective") + var/list/possible_targets = list() for(var/datum/mind/possible_target in ticker.minds) if((possible_target != src) && istype(possible_target.current, /mob/living/carbon/human)) possible_targets += possible_target.current @@ -480,8 +480,8 @@ var/objective_list[] = list(/datum/objective/assassinate, /datum/objective/protect, /datum/objective/debrain) if(objective&&(objective.type in objective_list) && objective:target) def_target = objective:target.current - possible_targets = sortNames(possible_targets) - + possible_targets = sortAtom(possible_targets) + possible_targets += "Free objective" var/new_target = input("Select target:", "Objective target", def_target) as null|anything in possible_targets if(!new_target) @@ -571,11 +571,12 @@ new_objective.target_amount = target_number if("identity theft") - var/list/possible_targets = list("Free objective") + var/list/possible_targets = list() for(var/datum/mind/possible_target in ticker.minds) if((possible_target != src) && ishuman(possible_target.current)) possible_targets += possible_target - possible_targets = sortByKey(possible_targets) + possible_targets = sortAtom(possible_targets) + possible_targets += "Free objective" var/new_target = input("Select target:", "Objective target") as null|anything in possible_targets if(!new_target) return