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

Merge pull request #579 from Citadel-Station-13/upstream-merge-26129

Browse Source 
[MIRROR] Unorphans the blackbox
This commit is contained in:
LetterJay
2017-05-02 05:13:49 -05:00
committed by GitHub
parent 4a6ffec412 a8e6de5795
commit 3b8484b52b
131 changed files with 2226 additions and 589 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/gamemodes/traitor/traitor.dm
+4 -4
View File
@@ -261,10 +261,10 @@
for(var/datum/objective/objective in traitor.objectives)
if(objective.check_completion())
objectives += "<br><B>Objective #[count]</B>: [objective.explanation_text] <font color='green'><B>Success!</B></font>"
feedback_add_details("traitor_objective","[objective.type]|SUCCESS")
SSblackbox.add_details("traitor_objective","[objective.type]|SUCCESS")
else
objectives += "<br><B>Objective #[count]</B>: [objective.explanation_text] <font color='red'>Fail.</font>"
feedback_add_details("traitor_objective","[objective.type]|FAIL")
SSblackbox.add_details("traitor_objective","[objective.type]|FAIL")
traitorwin = 0
count++
@@ -284,10 +284,10 @@
if(traitorwin)
text += "<br><font color='green'><B>The [special_role_text] was successful!</B></font>"
feedback_add_details("traitor_success","SUCCESS")
SSblackbox.add_details("traitor_success","SUCCESS")
else
text += "<br><font color='red'><B>The [special_role_text] has failed!</B></font>"
feedback_add_details("traitor_success","FAIL")
SSblackbox.add_details("traitor_success","FAIL")
text += "<br>"