shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update traitor.dm

Browse Source
This commit is contained in:
LetterJay
2017-10-09 21:37:24 -05:00
committed by GitHub
parent af2d5e4a26
commit 3ee08632d2
1 changed files with 0 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/gamemodes/traitor/traitor.dm
-10
View File
@@ -118,19 +118,9 @@
objectives += "<br><B>Objective #[count]</B>: [objective.explanation_text] <font color='red'>Fail.</font> <font color='grey'>(Optional)</font>"
SSblackbox.add_details("traitor_objective","[objective.type]|FAIL")
else
<<<<<<< HEAD
if(objective.check_completion())
objectives += "<br><B>Objective #[count]</B>: [objective.explanation_text] <font color='green'><B>Success!</B></font>"
SSblackbox.add_details("traitor_objective","[objective.type]|SUCCESS")
else
objectives += "<br><B>Objective #[count]</B>: [objective.explanation_text] <font color='red'>Fail.</font>"
SSblackbox.add_details("traitor_objective","[objective.type]|FAIL")
traitorwin = 0
=======
objectives += "<br><B>Objective #[count]</B>: [objective.explanation_text] <font color='red'>Fail.</font>"
SSblackbox.add_details("traitor_objective","[objective.type]|FAIL")
traitorwin = FALSE
>>>>>>> b9e981a... Removes a spawn from traitor code (#31465)
count++
if(uplink_true)