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

Removes die a glorious death, antagonists that would have rolled it now no longer need to escape alive (#21323)

Browse Source 
* Removes die a glorious death, antagonists that would have rolled it now no longer need to escape alive

* steels review
This commit is contained in:
GDN
2023-06-28 18:39:20 -05:00
committed by GitHub
parent ee83ab8d17
commit 8bb8000fc4
3 changed files with 3 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/antagonists/traitor/datum_traitor.dm
+3 -7
View File
@@ -100,21 +100,17 @@
for(var/i in 1 to GLOB.configuration.gamemode.traitor_objectives_amount)
forge_single_human_objective()
// Die a glorious death objective.
// Are they required to stay alive for their objectives?
var/martyr_compatibility = TRUE
if(prob(20))
var/martyr_compatibility = 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.
martyr_compatibility = FALSE
break
if(martyr_compatibility)
add_objective(/datum/objective/die)
return
// Give them an escape objective if they don't have one already.
if(!(locate(/datum/objective/escape) in owner.get_all_objectives()))
if(!(locate(/datum/objective/escape) in owner.get_all_objectives()) && martyr_compatibility)
add_objective(/datum/objective/escape)
/**