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

Fixes people not getting escape objectives when they should (#21522)

Browse Source
This commit is contained in:
GDN
2023-06-30 23:40:26 -05:00
committed by GitHub
parent 1a62646684
commit 8fc39f67b8
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/antagonists/traitor/datum_traitor.dm
+7 -9
View File
@@ -100,17 +100,15 @@
for(var/i in 1 to GLOB.configuration.gamemode.traitor_objectives_amount)
forge_single_human_objective()
// Are they required to stay alive for their objectives?
var/martyr_compatibility = TRUE
if(prob(20))
for(var/objective in owner.get_all_objectives())
var/datum/objective/O = objective
if(!O.martyr_compatible) // Check if our current objectives can co-exist with martyr.
martyr_compatibility = FALSE
break
var/can_succeed_if_dead = TRUE
for(var/objective in owner.get_all_objectives())
var/datum/objective/O = objective
if(!O.martyr_compatible) // Check if our current objectives can co-exist with martyr.
can_succeed_if_dead = FALSE
break
// Give them an escape objective if they don't have one already.
if(!(locate(/datum/objective/escape) in owner.get_all_objectives()) && !martyr_compatibility)
if(!(locate(/datum/objective/escape) in owner.get_all_objectives()) && (!can_succeed_if_dead || prob(80)))
add_objective(/datum/objective/escape)
/**