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

Fixes some objective issues (#30968)

Browse Source 
* Fixes some objective issues

* Update code/modules/antagonists/traitor/datum_traitor.dm

Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

---------

Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
This commit is contained in:
DGamerL
2025-11-12 15:49:53 +01:00
committed by GitHub
parent a843cee85f
commit c5aec06e34
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/gamemodes/objective.dm
+1 -1
View File
@@ -43,7 +43,7 @@ GLOBAL_LIST_INIT(potential_theft_objectives, (subtypesof(/datum/theft_objective)
var/datum/objective_holder/holder
/// What is the text we show when our objective is delayed?
var/delayed_objective_text = "This is a bug! Report it on the github and ask an admin what type of objective"
var/delayed_objective_text = "Someone forgot to set a delayed objective text! Report it on the github and ask an admin what type of objective this is!"
/// If the objective needs another person with a paired objective
var/needs_pair = FALSE
code/modules/antagonists/traitor/datum_traitor.dm
+2 -1
View File
@@ -151,9 +151,10 @@ RESTRICT_TYPE(/datum/antagonist/traitor)
var/can_succeed_if_dead = TRUE
// If our org has forced objectives, give them to us guaranteed.
if(organization && length(organization.forced_objectives))
var/list/instant_known_objs = list(/datum/objective/hijack, /datum/objective/nuke)
for(var/forced_objectives in organization.forced_objectives)
var/datum/objective/forced_obj = forced_objectives
if(!ispath(forced_obj, /datum/objective/hijack) && delayed_objectives) // Hijackers know their objective immediately
if(!is_path_in_list(forced_obj, instant_known_objs) && delayed_objectives) // Some objectives are known instantly
forced_obj = new /datum/objective/delayed(forced_obj)
add_antag_objective(forced_obj)
iteration++