cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-21 03:55:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes

Browse Source
This commit is contained in:
DGamerL
2024-04-14 02:20:40 +02:00
parent ea053f3b94
commit ea29aa92b2
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/gamemodes/objective.dm
+11 -3
View File
@@ -59,7 +59,7 @@ GLOBAL_LIST_INIT(potential_theft_objectives, (subtypesof(/datum/theft_objective)
return completed
/datum/objective/proc/found_target()
return (delayed_objective ? TRUE : target)
return target
/**
* This is for objectives that need to register signals, so place them in here.
@@ -113,9 +113,11 @@ GLOBAL_LIST_INIT(potential_theft_objectives, (subtypesof(/datum/theft_objective)
/datum/objective/proc/find_target(list/target_blacklist)
if(!needs_target || delayed_objective)
if(!needs_target)
return
if(delayed_objective)
target = TRUE // To fool `found_target`
return
var/list/possible_targets = list()
for(var/datum/mind/possible_target in SSticker.minds)
if(is_invalid_target(possible_target) || (possible_target in target_blacklist))
@@ -555,6 +557,12 @@ GLOBAL_LIST_INIT(potential_theft_objectives, (subtypesof(/datum/theft_objective)
return steal_target.location_override || "an unknown area"
/datum/objective/steal/find_target(list/target_blacklist)
if(delayed_objective)
steal_target = TRUE // To fool that pesky `found_target`
update_explanation_text()
return
steal_target = null // In case it was set to `TRUE` from being a delayed objective.
var/potential = GLOB.potential_theft_objectives.Copy()
while(!steal_target && length(potential))
var/thefttype = pick_n_take(potential)