cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-29 15:08:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

New and improved version!

Browse Source
This commit is contained in:
DGamerL
2024-04-14 01:38:20 +02:00
parent 7b512f9668
commit ea053f3b94
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/gamemodes/objective.dm
+2 -2
View File
@@ -59,7 +59,7 @@ GLOBAL_LIST_INIT(potential_theft_objectives, (subtypesof(/datum/theft_objective)
return completed
/datum/objective/proc/found_target()
return target
return (delayed_objective ? TRUE : target)
/**
* This is for objectives that need to register signals, so place them in here.
@@ -113,7 +113,7 @@ GLOBAL_LIST_INIT(potential_theft_objectives, (subtypesof(/datum/theft_objective)
/datum/objective/proc/find_target(list/target_blacklist)
if(!needs_target)
if(!needs_target || delayed_objective)
return
var/list/possible_targets = list()
code/game/gamemodes/traitor/traitor.dm
+4 -3
View File
@@ -86,10 +86,11 @@
continue
for(var/datum/antagonist/traitor/traitor_datum in traitor_mind.antag_datums)
for(var/datum/objective/objective in traitor_datum.objective_holder.objectives)
if(istype(objective, /datum/objective/hijack)) // This should have been shown already. Next objective.
continue
objective.delayed_objective = FALSE
var/datum/objective/steal/possible_steal_objective = objective
if(istype(possible_steal_objective) && possible_steal_objective.steal_target.special_equipment)
possible_steal_objective.give_kit(possible_steal_objective.steal_target.special_equipment)
objective.find_target(traitor_datum.objective_holder.assigned_targets)
SEND_SOUND(traitor_mind.current, sound('sound/ambience/alarm4.ogg'))
objective.update_explanation_text()
var/list/messages = traitor_mind.prepare_announce_objectives()