Syncs maps, and a bunch of other things that no one will care about/notice/give fucks about until they break. Welcome to conflict hell. (#2460)
* fuck pubby * fuck you too ceres * ree * this is going to be a disaster isn't it * disaster * dme * -_- * tg * woops * proper sync * Welcome to conflict hell. * lets hope this fixes more things than it breaks * gdi * goddamnit
This commit is contained in:
@@ -42,7 +42,6 @@
|
||||
return target
|
||||
|
||||
/datum/objective/proc/find_target_by_role(role, role_type=0, invert=0)//Option sets either to check assigned role or special role. Default to assigned., invert inverts the check, eg: "Don't choose a Ling"
|
||||
var/list/candidates = list() //Let's compile a list and THEN pick one randomly, not just first come first serve...
|
||||
for(var/datum/mind/possible_target in get_crewmember_minds())
|
||||
if((possible_target != owner) && ishuman(possible_target.current))
|
||||
var/is_role = 0
|
||||
@@ -56,11 +55,12 @@
|
||||
if(invert)
|
||||
if(is_role)
|
||||
continue
|
||||
candidates += possible_target
|
||||
target = possible_target
|
||||
break
|
||||
else if(is_role)
|
||||
candidates += possible_target
|
||||
if(candidates)
|
||||
target = pick(candidates)
|
||||
target = possible_target
|
||||
break
|
||||
|
||||
update_explanation_text()
|
||||
|
||||
/datum/objective/proc/update_explanation_text()
|
||||
@@ -442,7 +442,8 @@ GLOBAL_LIST_EMPTY(possible_items)
|
||||
/datum/objective/steal/New()
|
||||
..()
|
||||
if(!GLOB.possible_items.len)//Only need to fill the list when it's needed.
|
||||
init_subtypes(/datum/objective_item/steal,GLOB.possible_items)
|
||||
for(var/I in subtypesof(/datum/objective_item/steal))
|
||||
new I
|
||||
|
||||
/datum/objective/steal/find_target()
|
||||
var/approved_targets = list()
|
||||
@@ -507,8 +508,8 @@ GLOBAL_LIST_EMPTY(possible_items_special)
|
||||
/datum/objective/steal/special/New()
|
||||
..()
|
||||
if(!GLOB.possible_items_special.len)
|
||||
init_subtypes(/datum/objective_item/special,GLOB.possible_items_special)
|
||||
init_subtypes(/datum/objective_item/stack,GLOB.possible_items_special)
|
||||
for(var/I in subtypesof(/datum/objective_item/special) + subtypesof(/datum/objective_item/stack))
|
||||
new I
|
||||
|
||||
/datum/objective/steal/special/find_target()
|
||||
return set_target(pick(GLOB.possible_items_special))
|
||||
|
||||
Reference in New Issue
Block a user